Revision: 201017
authorDremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
Fri, 14 May 2010 16:17:02 +0300
changeset 22 4c4ed41530db
parent 20 82ee1f804b63
child 25 73f6c2762ffe
child 26 e194edde476c
Revision: 201017 Kit: 201019
group/bld.inf
landmarks/locationlandmarks/server/src/EPos_CPosLmLocalAccessSubsession.cpp
landmarks/locationlandmarks/server/src/EPos_CPosLmNameIndex.cpp
locationmapnavfw/aiwprovider/data/1020690C.rss
locationmapnavfw/aiwprovider/data/mnaiwproviderres.rss
locationmapnavfw/aiwprovider/group/bld.inf
locationmapnavfw/aiwprovider/group/mnaiwprovider.mmp
locationmapnavfw/aiwprovider/inc/mnaiwcommandhandlerbase.h
locationmapnavfw/aiwprovider/inc/mnaiwdebug.h
locationmapnavfw/aiwprovider/inc/mnaiwinternal.h
locationmapnavfw/aiwprovider/inc/mnaiwmenus.hrh
locationmapnavfw/aiwprovider/inc/mnaiwprovider.h
locationmapnavfw/aiwprovider/inc/mnaiwprovideruids.hrh
locationmapnavfw/aiwprovider/inc/mnfetchaddresshandler.h
locationmapnavfw/aiwprovider/inc/mnfetchcoordinateshandler.h
locationmapnavfw/aiwprovider/inc/mngeocodingcmdhandlerbase.h
locationmapnavfw/aiwprovider/inc/mnmapviewcmdhandlerbase.h
locationmapnavfw/aiwprovider/inc/mnnavigatetohandler.h
locationmapnavfw/aiwprovider/inc/mnselectfrommaphandler.h
locationmapnavfw/aiwprovider/inc/mnshowonmaphandler.h
locationmapnavfw/aiwprovider/src/mnaiwcommandhandlerbase.cpp
locationmapnavfw/aiwprovider/src/mnaiwprovider.cpp
locationmapnavfw/aiwprovider/src/mnfetchaddresshandler.cpp
locationmapnavfw/aiwprovider/src/mnfetchcoordinateshandler.cpp
locationmapnavfw/aiwprovider/src/mngeocodingcmdhandlerbase.cpp
locationmapnavfw/aiwprovider/src/mnmapviewcmdhandlerbase.cpp
locationmapnavfw/aiwprovider/src/mnnavigatetohandler.cpp
locationmapnavfw/aiwprovider/src/mnselectfrommaphandler.cpp
locationmapnavfw/aiwprovider/src/mnshowonmaphandler.cpp
locationmapnavfw/data/locationmnfwstub.sis
locationmapnavfw/group/bld.inf
locationmapnavfw/install/locationmnfwstub.pkg
locationmapnavfw/install/locationmnfwupgrade.pkg
locationmapnavfw/library/BWINS/mnclientlibu.def
locationmapnavfw/library/BWINS/mnservicelibu.def
locationmapnavfw/library/data/mnclientlib.rss
locationmapnavfw/library/eabi/mnclientlibu.def
locationmapnavfw/library/eabi/mnservicelibu.def
locationmapnavfw/library/group/bld.inf
locationmapnavfw/library/group/mnclientlib.mmp
locationmapnavfw/library/group/mnservicelib.mmp
locationmapnavfw/library/inc/mnactivecallback.h
locationmapnavfw/library/inc/mndebug.h
locationmapnavfw/library/inc/mngeocodingserviceclient.h
locationmapnavfw/library/inc/mninternal.h
locationmapnavfw/library/inc/mninternal.inl
locationmapnavfw/library/inc/mnmapimageserviceclient.h
locationmapnavfw/library/inc/mnmapselectionresultinfo.h
locationmapnavfw/library/inc/mnmapselectionresultinfo.inl
locationmapnavfw/library/inc/mnmapviewserviceclient.h
locationmapnavfw/library/inc/mnnavigationserviceclient.h
locationmapnavfw/library/inc/mnproviderimpl.h
locationmapnavfw/library/inc/mnserviceclientbase.h
locationmapnavfw/library/inc/mnutils.h
locationmapnavfw/library/src/mnactivecallback.cpp
locationmapnavfw/library/src/mncoordinateconverterbase.cpp
locationmapnavfw/library/src/mngeocoder.cpp
locationmapnavfw/library/src/mngeocodingservicebase.cpp
locationmapnavfw/library/src/mngeocodingserviceclient.cpp
locationmapnavfw/library/src/mnmapimage.cpp
locationmapnavfw/library/src/mnmapimageparams.cpp
locationmapnavfw/library/src/mnmapimageservicebase.cpp
locationmapnavfw/library/src/mnmapimageserviceclient.cpp
locationmapnavfw/library/src/mnmapview.cpp
locationmapnavfw/library/src/mnmapviewservicebase.cpp
locationmapnavfw/library/src/mnmapviewserviceclient.cpp
locationmapnavfw/library/src/mnnavigationservicebase.cpp
locationmapnavfw/library/src/mnnavigationserviceclient.cpp
locationmapnavfw/library/src/mnnavigator.cpp
locationmapnavfw/library/src/mnprovider.cpp
locationmapnavfw/library/src/mnproviderfinder.cpp
locationmapnavfw/library/src/mnproviderimpl.cpp
locationmapnavfw/library/src/mnservicebase.cpp
locationmapnavfw/library/src/mnserviceclientbase.cpp
locationmapnavfw/library/src/mnutils.cpp
locationmapnavfw/loc/mnaiwprovider.loc
locationmapnavfw/loc/mnclientlib.loc
locationmapnavfw/rom/locationmnfw.iby
locationmapnavfw/rom/locationmnfw_resources.iby
locationmapnavfw/rom/locationmnfwstub.iby
locationsystemui/locationsysui/cenrep/keys_locbtnotifier.xls
locationsystemui/locationsysui/cenrep/keys_loclocalvariation.xls
locationsystemui/locationsysui/cenrep/keys_locnotprefplugin.xls
locationsystemui/locationsysui/cenrep/keys_locsuplsettings.xls
locationsystemui/locationsysui/conf/locbtnotifier.confml
locationsystemui/locationsysui/conf/locbtnotifier_2001FCBB.crml
locationsystemui/locationsysui/conf/locnotprefplugin.confml
locationsystemui/locationsysui/conf/locnotprefplugin_10206910.crml
locationsystemui/locationsysui/conf/locsuplsettings.confml
locationsystemui/locationsysui/conf/locsuplsettings_1028190A.crml
locationsystemui/locationsysui/data/locationsysuistub.sis
locationsystemui/locationsysui/group/bld.inf
locationsystemui/locationsysui/install/locationsysui.pkg
locationsystemui/locationsysui/install/locationsysuistub.pkg
locationsystemui/locationsysui/loc/Satellite.loc
locationsystemui/locationsysui/loc/location.loc
locationsystemui/locationsysui/loc/locbtnotifier.loc
locationsystemui/locationsysui/loc/locnotprefsettings.loc
locationsystemui/locationsysui/loc/locsuplsettings.loc
locationsystemui/locationsysui/locblidsatelliteinfo/bwins/SatInfoStubu.def
locationsystemui/locationsysui/locblidsatelliteinfo/bwins/SatInfou.def
locationsystemui/locationsysui/locblidsatelliteinfo/data/SatInfo.rss
locationsystemui/locationsysui/locblidsatelliteinfo/eabi/SatInfoStubu.def
locationsystemui/locationsysui/locblidsatelliteinfo/eabi/SatInfou.def
locationsystemui/locationsysui/locblidsatelliteinfo/group/Satellite.mmp
locationsystemui/locationsysui/locblidsatelliteinfo/group/SatelliteStub.mmp
locationsystemui/locationsysui/locblidsatelliteinfo/group/bld.inf
locationsystemui/locationsysui/locblidsatelliteinfo/group/satellite_icons_dc.mk
locationsystemui/locationsysui/locblidsatelliteinfo/inc/CSatellite.h
locationsystemui/locationsysui/locblidsatelliteinfo/inc/CSatelliteDialog.h
locationsystemui/locationsysui/locblidsatelliteinfo/inc/CSatelliteEng.h
locationsystemui/locationsysui/locblidsatelliteinfo/inc/Debug.h
locationsystemui/locationsysui/locblidsatelliteinfo/inc/DllMain.h
locationsystemui/locationsysui/locblidsatelliteinfo/inc/MEngObserver.h
locationsystemui/locationsysui/locblidsatelliteinfo/inc/MSatelliteEng.h
locationsystemui/locationsysui/locblidsatelliteinfo/inc/SatInfoConsts.h
locationsystemui/locationsysui/locblidsatelliteinfo/inc/SatInfoUID.h
locationsystemui/locationsysui/locblidsatelliteinfo/inc/csatellitemeasurementsetting.h
locationsystemui/locationsysui/locblidsatelliteinfo/inc/msatellitemeasurementsettingobserver.h
locationsystemui/locationsysui/locblidsatelliteinfo/inc/satellite.hrh
locationsystemui/locationsysui/locblidsatelliteinfo/inc/satellitecontrol.h
locationsystemui/locationsysui/locblidsatelliteinfo/src/CSatellite.cpp
locationsystemui/locationsysui/locblidsatelliteinfo/src/CSatelliteDialog.cpp
locationsystemui/locationsysui/locblidsatelliteinfo/src/CSatelliteEng.cpp
locationsystemui/locationsysui/locblidsatelliteinfo/src/CSatelliteInfoUI.cpp
locationsystemui/locationsysui/locblidsatelliteinfo/src/Debug.cpp
locationsystemui/locationsysui/locblidsatelliteinfo/src/DllMain.cpp
locationsystemui/locationsysui/locblidsatelliteinfo/src/csatellitemeasurementsetting.cpp
locationsystemui/locationsysui/locblidsatelliteinfo/src/satellitecontrol.cpp
locationsystemui/locationsysui/locblidsatelliteinfo/stub/CSatelliteInfoUI.cpp
locationsystemui/locationsysui/locbtnotifier/data/locbtgpspsypscontextstate.rul
locationsystemui/locationsysui/locbtnotifier/data/locbtgpspsypscontextstate.xml
locationsystemui/locationsysui/locbtnotifier/data/locbtnotifier.rss
locationsystemui/locationsysui/locbtnotifier/data/locbtnotifierresources.rss
locationsystemui/locationsysui/locbtnotifier/group/bld.inf
locationsystemui/locationsysui/locbtnotifier/group/locbtnotifier.mmp
locationsystemui/locationsysui/locbtnotifier/inc/locbtnotifierconstantsmanager.h
locationsystemui/locationsysui/locbtnotifier/inc/locbtnotifierdebug.h
locationsystemui/locationsysui/locbtnotifier/inc/locbtnotifierdebugconfig.hrh
locationsystemui/locationsysui/locbtnotifier/inc/locbtnotifierplugin.h
locationsystemui/locationsysui/locbtnotifier/inc/locbtnotifierpluginconstants.hrh
locationsystemui/locationsysui/locbtnotifier/inc/locbtnotifierprivatecrkeys.h
locationsystemui/locationsysui/locbtnotifier/src/locbtnotifier.cpp
locationsystemui/locationsysui/locbtnotifier/src/locbtnotifierconstantsmanager.cpp
locationsystemui/locationsysui/locbtnotifier/src/locbtnotifierdebug.cpp
locationsystemui/locationsysui/locbtnotifier/src/locbtnotifierplugin.cpp
locationsystemui/locationsysui/locgpsindicatorplugin/data/10275097.rss
locationsystemui/locationsysui/locgpsindicatorplugin/data/locgpsindicatorplugin.rss
locationsystemui/locationsysui/locgpsindicatorplugin/group/bld.inf
locationsystemui/locationsysui/locgpsindicatorplugin/group/locgpsindicatorplugin.mmp
locationsystemui/locationsysui/locgpsindicatorplugin/inc/locgpsindicatorplugin.h
locationsystemui/locationsysui/locgpsindicatorplugin/inc/locgpsindicatorpluginuids.h
locationsystemui/locationsysui/locgpsindicatorplugin/src/locgpsindicatorplugin.cpp
locationsystemui/locationsysui/locgpsindicatorplugin/src/locgpsindicatorpluginimptable.cpp
locationsystemui/locationsysui/locnotprefplugin/data/1020690F.rss
locationsystemui/locationsysui/locnotprefplugin/data/backup_registration.xml
locationsystemui/locationsysui/locnotprefplugin/data/locnotprefpluginview.rss
locationsystemui/locationsysui/locnotprefplugin/group/bld.inf
locationsystemui/locationsysui/locnotprefplugin/group/locnotprefplugin.mmp
locationsystemui/locationsysui/locnotprefplugin/inc/locnotprefadapterobserver.h
locationsystemui/locationsysui/locnotprefplugin/inc/locnotprefcorddisadapter.h
locationsystemui/locationsysui/locnotprefplugin/inc/locnotprefengobserver.h
locationsystemui/locationsysui/locnotprefplugin/inc/locnotprefplugin.h
locationsystemui/locationsysui/locnotprefplugin/inc/locnotprefplugin.hrh
locationsystemui/locationsysui/locnotprefplugin/inc/locnotprefplugincmdhdlr.h
locationsystemui/locationsysui/locnotprefplugin/inc/locnotprefplugincontainer.h
locationsystemui/locationsysui/locnotprefplugin/inc/locnotprefpluginengine.h
locationsystemui/locationsysui/locnotprefplugin/inc/locnotprefpluginuid.hrh
locationsystemui/locationsysui/locnotprefplugin/inc/locnotprefpluginview.h
locationsystemui/locationsysui/locnotprefplugin/inc/locnotprefsomadapter.h
locationsystemui/locationsysui/locnotprefplugin/src/locnotprefcorddisadapter.cpp
locationsystemui/locationsysui/locnotprefplugin/src/locnotprefplugin.cpp
locationsystemui/locationsysui/locnotprefplugin/src/locnotprefplugincontainer.cpp
locationsystemui/locationsysui/locnotprefplugin/src/locnotprefpluginengine.cpp
locationsystemui/locationsysui/locnotprefplugin/src/locnotprefpluginimptable.cpp
locationsystemui/locationsysui/locnotprefplugin/src/locnotprefpluginview.cpp
locationsystemui/locationsysui/locnotprefplugin/src/locnotprefsomadapter.cpp
locationsystemui/locationsysui/locpossettingsapp/data/locpossettingsapp.rss
locationsystemui/locationsysui/locpossettingsapp/data/locpossettingsapp_reg.rss
locationsystemui/locationsysui/locpossettingsapp/data/locpossettingsapp_reg.xml
locationsystemui/locationsysui/locpossettingsapp/group/bld.inf
locationsystemui/locationsysui/locpossettingsapp/group/locpossettingsapp.mmp
locationsystemui/locationsysui/locpossettingsapp/inc/locpossettingsapp.h
locationsystemui/locationsysui/locpossettingsapp/inc/locpossettingsappdocument.h
locationsystemui/locationsysui/locpossettingsapp/inc/locpossettingsappui.h
locationsystemui/locationsysui/locpossettingsapp/inc/locpossettingsuid.hrh
locationsystemui/locationsysui/locpossettingsapp/src/locpossettingsapp.cpp
locationsystemui/locationsysui/locpossettingsapp/src/locpossettingsappdocument.cpp
locationsystemui/locationsysui/locpossettingsapp/src/locpossettingsappui.cpp
locationsystemui/locationsysui/locpsysettings/group/bld.inf
locationsystemui/locationsysui/locpsysettings/locpsysettingseng/BWINS/locpsysettingsengu.def
locationsystemui/locationsysui/locpsysettings/locpsysettingseng/eabi/locpsysettingsengu.def
locationsystemui/locationsysui/locpsysettings/locpsysettingseng/group/bld.inf
locationsystemui/locationsysui/locpsysettings/locpsysettingseng/group/locpsysettingseng.mmp
locationsystemui/locationsysui/locpsysettings/locpsysettingseng/inc/locpsyconfigclientimpl.h
locationsystemui/locationsysui/locpsysettings/locpsysettingseng/inc/locpsyconfigclientwrapper.h
locationsystemui/locationsysui/locpsysettings/locpsysettingseng/inc/locpsyeng.h
locationsystemui/locationsysui/locpsysettings/locpsysettingseng/inc/locpsyengdebug.h
locationsystemui/locationsysui/locpsysettings/locpsysettingseng/inc/locpsyengdebugconfig.hrh
locationsystemui/locationsysui/locpsysettings/locpsysettingseng/inc/locpsyengobserver.h
locationsystemui/locationsysui/locpsysettings/locpsysettingseng/inc/locpsyinfo.h
locationsystemui/locationsysui/locpsysettings/locpsysettingseng/inc/locpsysenguid.hrh
locationsystemui/locationsysui/locpsysettings/locpsysettingseng/inc/locpsysettings.h
locationsystemui/locationsysui/locpsysettings/locpsysettingseng/inc/locpsysettingsengconsts.h
locationsystemui/locationsysui/locpsysettings/locpsysettingseng/inc/locpsysettingsinterface.h
locationsystemui/locationsysui/locpsysettings/locpsysettingseng/src/locpsyconfigclientimpl.cpp
locationsystemui/locationsysui/locpsysettings/locpsysettingseng/src/locpsyconfigclientwrapper.cpp
locationsystemui/locationsysui/locpsysettings/locpsysettingseng/src/locpsyeng.cpp
locationsystemui/locationsysui/locpsysettings/locpsysettingseng/src/locpsyinfo.cpp
locationsystemui/locationsysui/locpsysettings/locpsysettingseng/src/locpsysettings.cpp
locationsystemui/locationsysui/locpsysettings/locpsysettingseng/src/locpsysettingsengdebug.cpp
locationsystemui/locationsysui/locpsysettings/locpsysettingseng/src/locpsysettingsengdebugdummy.cpp
locationsystemui/locationsysui/locpsysettings/locpsysettingsui/data/10275062.rss
locationsystemui/locationsysui/locpsysettings/locpsysettingsui/data/locpsysettingsuiview.rss
locationsystemui/locationsysui/locpsysettings/locpsysettingsui/group/bld.inf
locationsystemui/locationsysui/locpsysettings/locpsysettingsui/group/locpsysettingsui.mmp
locationsystemui/locationsysui/locpsysettings/locpsysettingsui/inc/locpsyappdebug.h
locationsystemui/locationsysui/locpsysettings/locpsysettingsui/inc/locpsycommandhandler.h
locationsystemui/locationsysui/locpsysettings/locpsysettingsui/inc/locpsykeyprocessor.h
locationsystemui/locationsysui/locpsysettings/locpsysettingsui/inc/locpsylbmodel.h
locationsystemui/locationsysui/locpsysettings/locpsysettingsui/inc/locpsysettingscontainer.h
locationsystemui/locationsysui/locpsysettings/locpsysettingsui/inc/locpsysettingsui.h
locationsystemui/locationsysui/locpsysettings/locpsysettingsui/inc/locpsysettingsui.hrh
locationsystemui/locationsysui/locpsysettings/locpsysettingsui/inc/locpsysettingsuiconsts.h
locationsystemui/locationsysui/locpsysettings/locpsysettingsui/inc/locpsysettingsuiuid.hrh
locationsystemui/locationsysui/locpsysettings/locpsysettingsui/inc/locpsysettingsview.h
locationsystemui/locationsysui/locpsysettings/locpsysettingsui/src/locpsylbmodel.cpp
locationsystemui/locationsysui/locpsysettings/locpsysettingsui/src/locpsysettingscontainer.cpp
locationsystemui/locationsysui/locpsysettings/locpsysettingsui/src/locpsysettingsui.cpp
locationsystemui/locationsysui/locpsysettings/locpsysettingsui/src/locpsysettingsuiimptable.cpp
locationsystemui/locationsysui/locpsysettings/locpsysettingsui/src/locpsysettingsview.cpp
locationsystemui/locationsysui/locsettingsuiservice/group/bld.inf
locationsystemui/locationsysui/locsettingsuiservice/locsettingsuiclient/BWINS/locsettingsuiclientu.def
locationsystemui/locationsysui/locsettingsuiservice/locsettingsuiclient/eabi/locsettingsuiclientu.def
locationsystemui/locationsysui/locsettingsuiservice/locsettingsuiclient/group/bld.inf
locationsystemui/locationsysui/locsettingsuiservice/locsettingsuiclient/group/locsettingsuiclient.mmp
locationsystemui/locationsysui/locsettingsuiservice/locsettingsuiclient/inc/loclaunchuiao.h
locationsystemui/locationsysui/locsettingsuiservice/locsettingsuiclient/inc/loclaunchuiobserver.h
locationsystemui/locationsysui/locsettingsuiservice/locsettingsuiclient/inc/locsettingsuiclientuid.hrh
locationsystemui/locationsysui/locsettingsuiservice/locsettingsuiclient/inc/locsettingsuiservice.h
locationsystemui/locationsysui/locsettingsuiservice/locsettingsuiclient/src/loclaunchuiao.cpp
locationsystemui/locationsysui/locsettingsuiservice/locsettingsuiclient/src/locsettingsuiclient.cpp
locationsystemui/locationsysui/locsettingsuiservice/locsettingsuiclient/src/locsettingsuiservice.cpp
locationsystemui/locationsysui/locsettingsuiservice/locsettingsuiserver/data/locsettingsuiserver.rss
locationsystemui/locationsysui/locsettingsuiservice/locsettingsuiserver/data/locsettingsuiserver_reg.rss
locationsystemui/locationsysui/locsettingsuiservice/locsettingsuiserver/group/bld.inf
locationsystemui/locationsysui/locsettingsuiservice/locsettingsuiserver/group/locsettingsuiserver.mmp
locationsystemui/locationsysui/locsettingsuiservice/locsettingsuiserver/inc/locsettingsuiappserver.h
locationsystemui/locationsysui/locsettingsuiservice/locsettingsuiserver/inc/locsettingsuiinfo.h
locationsystemui/locationsysui/locsettingsuiservice/locsettingsuiserver/inc/locsettingsuilaunchao.h
locationsystemui/locationsysui/locsettingsuiservice/locsettingsuiserver/inc/locsettingsuilaunchmgr.h
locationsystemui/locationsysui/locsettingsuiservice/locsettingsuiserver/inc/locsettingsuiserverinterface.h
locationsystemui/locationsysui/locsettingsuiservice/locsettingsuiserver/inc/locsettingsuiservice.h
locationsystemui/locationsysui/locsettingsuiservice/locsettingsuiserver/inc/locsettingsuisrvapplication.h
locationsystemui/locationsysui/locsettingsuiservice/locsettingsuiserver/inc/locsettingsuisrvappui.h
locationsystemui/locationsysui/locsettingsuiservice/locsettingsuiserver/inc/locsettingsuisrvdocument.h
locationsystemui/locationsysui/locsettingsuiservice/locsettingsuiserver/inc/locsettingsuisrvshutdowntimer.h
locationsystemui/locationsysui/locsettingsuiservice/locsettingsuiserver/inc/locsettingsuisrvuid.hrh
locationsystemui/locationsysui/locsettingsuiservice/locsettingsuiserver/src/locsettingsuiappserver.cpp
locationsystemui/locationsysui/locsettingsuiservice/locsettingsuiserver/src/locsettingsuiinfo.cpp
locationsystemui/locationsysui/locsettingsuiservice/locsettingsuiserver/src/locsettingsuilaunchao.cpp
locationsystemui/locationsysui/locsettingsuiservice/locsettingsuiserver/src/locsettingsuilaunchmgr.cpp
locationsystemui/locationsysui/locsettingsuiservice/locsettingsuiserver/src/locsettingsuiservice.cpp
locationsystemui/locationsysui/locsettingsuiservice/locsettingsuiserver/src/locsettingsuisrvapplication.cpp
locationsystemui/locationsysui/locsettingsuiservice/locsettingsuiserver/src/locsettingsuisrvappui.cpp
locationsystemui/locationsysui/locsettingsuiservice/locsettingsuiserver/src/locsettingsuisrvdocument.cpp
locationsystemui/locationsysui/locsettingsuiservice/locsettingsuiserver/src/locsettingsuisrvshutdowntimer.cpp
locationsystemui/locationsysui/locsuplsettingsui/data/10275091.rss
locationsystemui/locationsysui/locsuplsettingsui/data/locsuplservereditor.rss
locationsystemui/locationsysui/locsuplsettingsui/data/locsuplsessioneditor.rss
locationsystemui/locationsysui/locsuplsettingsui/data/locsuplsettingsui.rss
locationsystemui/locationsysui/locsuplsettingsui/group/bld.inf
locationsystemui/locationsysui/locsuplsettingsui/group/locsuplsettings.mmp
locationsystemui/locationsysui/locsuplsettingsui/inc/locsupldebug.h
locationsystemui/locationsysui/locsuplsettingsui/inc/locsupldebugconfig.h
locationsystemui/locationsysui/locsuplsettingsui/inc/locsuplservercontainer.h
locationsystemui/locationsysui/locsuplsettingsui/inc/locsuplservereditor.h
locationsystemui/locationsysui/locsuplsettingsui/inc/locsuplserverlbmodel.h
locationsystemui/locationsysui/locsuplsettingsui/inc/locsuplserverview.h
locationsystemui/locationsysui/locsuplsettingsui/inc/locsuplsessioncontainer.h
locationsystemui/locationsysui/locsuplsettingsui/inc/locsuplsessioneditor.h
locationsystemui/locationsysui/locsuplsettingsui/inc/locsuplsessionlbmodel.h
locationsystemui/locationsysui/locsuplsettingsui/inc/locsuplsessionview.h
locationsystemui/locationsysui/locsuplsettingsui/inc/locsuplsettings.h
locationsystemui/locationsysui/locsuplsettingsui/inc/locsuplsettings.hrh
locationsystemui/locationsysui/locsuplsettingsui/inc/locsuplsettingsadapter.h
locationsystemui/locationsysui/locsuplsettingsui/inc/locsuplsettingsadapterobserver.h
locationsystemui/locationsysui/locsuplsettingsui/inc/locsuplsettingscontainer.h
locationsystemui/locationsysui/locsuplsettingsui/inc/locsuplsettingseventhandler.h
locationsystemui/locationsysui/locsuplsettingsui/inc/locsuplsettingslbmodel.h
locationsystemui/locationsysui/locsuplsettingsui/inc/locsuplsettingsprivatecrkeys.h
locationsystemui/locationsysui/locsuplsettingsui/inc/locsuplsettingssessionobserver.h
locationsystemui/locationsysui/locsuplsettingsui/inc/locsuplsettingsuid.hrh
locationsystemui/locationsysui/locsuplsettingsui/inc/locsuplsettingsuiengine.h
locationsystemui/locationsysui/locsuplsettingsui/inc/locsuplsettingsuiengobserver.h
locationsystemui/locationsysui/locsuplsettingsui/inc/locsuplsettingsview.h
locationsystemui/locationsysui/locsuplsettingsui/src/locsupldebug.cpp
locationsystemui/locationsysui/locsuplsettingsui/src/locsuplservercontainer.cpp
locationsystemui/locationsysui/locsuplsettingsui/src/locsuplservereditor.cpp
locationsystemui/locationsysui/locsuplsettingsui/src/locsuplserverlbmodel.cpp
locationsystemui/locationsysui/locsuplsettingsui/src/locsuplserverview.cpp
locationsystemui/locationsysui/locsuplsettingsui/src/locsuplsessioncontainer.cpp
locationsystemui/locationsysui/locsuplsettingsui/src/locsuplsessioneditor.cpp
locationsystemui/locationsysui/locsuplsettingsui/src/locsuplsessionlbmodel.cpp
locationsystemui/locationsysui/locsuplsettingsui/src/locsuplsessionview.cpp
locationsystemui/locationsysui/locsuplsettingsui/src/locsuplsettings.cpp
locationsystemui/locationsysui/locsuplsettingsui/src/locsuplsettingsadapter.cpp
locationsystemui/locationsysui/locsuplsettingsui/src/locsuplsettingscontainer.cpp
locationsystemui/locationsysui/locsuplsettingsui/src/locsuplsettingsimptable.cpp
locationsystemui/locationsysui/locsuplsettingsui/src/locsuplsettingslbmodel.cpp
locationsystemui/locationsysui/locsuplsettingsui/src/locsuplsettingsuiengine.cpp
locationsystemui/locationsysui/locsuplsettingsui/src/locsuplsettingsview.cpp
locationsystemui/locationsysui/locsysuiengine/BWINS/locsysuiengineu.def
locationsystemui/locationsysui/locsysuiengine/eabi/locsysuiengineu.def
locationsystemui/locationsysui/locsysuiengine/group/bld.inf
locationsystemui/locationsysui/locsysuiengine/group/locsysuiengine.mmp
locationsystemui/locationsysui/locsysuiengine/inc/locationui.h
locationsystemui/locationsysui/locsysuiengine/inc/locsysuiengine.h
locationsystemui/locationsysui/locsysuiengine/inc/locsysuiengineobserver.h
locationsystemui/locationsysui/locsysuiengine/inc/locsysuiengineuid.hrh
locationsystemui/locationsysui/locsysuiengine/src/locsysuiengine.cpp
locationsystemui/locationsysui/locsysuiview/BWINS/locsysuiviewu.def
locationsystemui/locationsysui/locsysuiview/data/10207462.rss
locationsystemui/locationsysui/locsysuiview/data/locsysuiviewrsc.rss
locationsystemui/locationsysui/locsysuiview/eabi/locsysuiviewu.def
locationsystemui/locationsysui/locsysuiview/group/bld.inf
locationsystemui/locationsysui/locsysuiview/group/locsysuiview.mmp
locationsystemui/locationsysui/locsysuiview/inc/locationsettings.h
locationsystemui/locationsysui/locsysuiview/inc/locpossettings.h
locationsystemui/locationsysui/locsysuiview/inc/locpossettingsobserver.h
locationsystemui/locationsysui/locsysuiview/inc/locsettingsui.h
locationsystemui/locationsysui/locsysuiview/inc/locsettingsui.inl
locationsystemui/locationsysui/locsysuiview/inc/locsettingsuiecomnotifier.h
locationsystemui/locationsysui/locsysuiview/inc/locsettingsuiengine.h
locationsystemui/locationsysui/locsysuiview/inc/locsettingsuiobserver.h
locationsystemui/locationsysui/locsysuiview/inc/locsettingsuiparams.h
locationsystemui/locationsysui/locsysuiview/inc/locsettingsuiparams.inl
locationsystemui/locationsysui/locsysuiview/inc/locsettingsuipluginloader.h
locationsystemui/locationsysui/locsysuiview/inc/locsysuicontainer.h
locationsystemui/locationsysui/locsysuiview/inc/locsysuicontainereventhandler.h
locationsystemui/locationsysui/locsysuiview/inc/locsysuilbmodel.h
locationsystemui/locationsysui/locsysuiview/inc/locsysuiview.h
locationsystemui/locationsysui/locsysuiview/inc/locsysuiview.hrh
locationsystemui/locationsysui/locsysuiview/inc/locsysuiviewuid.hrh
locationsystemui/locationsysui/locsysuiview/src/locationsettings.cpp
locationsystemui/locationsysui/locsysuiview/src/locpossettings.cpp
locationsystemui/locationsysui/locsysuiview/src/locsettingsuiengine.cpp
locationsystemui/locationsysui/locsysuiview/src/locsettingsuipluginloader.cpp
locationsystemui/locationsysui/locsysuiview/src/locsysuicontainer.cpp
locationsystemui/locationsysui/locsysuiview/src/locsysuilbmodel.cpp
locationsystemui/locationsysui/locsysuiview/src/locsysuiview.cpp
locationsystemui/locationsysui/locsysuiview/src/locsysuiviewimptable.cpp
locationsystemui/locationsysui/locutils/BWINS/LocUtils_32u.def
locationsystemui/locationsysui/locutils/eabi/LocUtils_32u.def
locationsystemui/locationsysui/locutils/group/bld.inf
locationsystemui/locationsysui/locutils/group/locutils.mmp
locationsystemui/locationsysui/locutils/inc/locfileutils.h
locationsystemui/locationsysui/locutils/inc/locphonenumberformat.h
locationsystemui/locationsysui/locutils/inc/locrequestorutilsresolver.h
locationsystemui/locationsysui/locutils/inc/locrequestorutilsresolverimpl2.h
locationsystemui/locationsysui/locutils/inc/loctextutils.h
locationsystemui/locationsysui/locutils/inc/locutilsdebug.h
locationsystemui/locationsysui/locutils/inc/locutilsdebugconfig.hrh
locationsystemui/locationsysui/locutils/inc/locutilsuid.hrh
locationsystemui/locationsysui/locutils/src/locfileutils.cpp
locationsystemui/locationsysui/locutils/src/locphonenumberformat.cpp
locationsystemui/locationsysui/locutils/src/locrequestorutilsresolverimpl2.cpp
locationsystemui/locationsysui/locutils/src/loctextutils.cpp
locationsystemui/locationsysui/locutils/src/locutilsdebug.cpp
locationsystemui/locationsysui/locutils/src/locutilsdebugdummy.cpp
locationsystemui/locationsysui/locverifier/BWINS/LocVerifierDlgu.def
locationsystemui/locationsysui/locverifier/eabi/LocVerifierDlgu.def
locationsystemui/locationsysui/locverifier/ecom/locnotifierwrapper.cpp
locationsystemui/locationsysui/locverifier/group/ABLD.BAT
locationsystemui/locationsysui/locverifier/group/bld.inf
locationsystemui/locationsysui/locverifier/group/locnotifierwrapper.mmp
locationsystemui/locationsysui/locverifier/group/locverifierdlg.mmp
locationsystemui/locationsysui/locverifier/inc/locconsts.h
locationsystemui/locationsysui/locverifier/inc/locnotifierwrapper.h
locationsystemui/locationsysui/locverifier/inc/locverifierdlg.hrh
locationsystemui/locationsysui/locverifier/inc/locverifierdlgdebug.h
locationsystemui/locationsysui/locverifier/inc/locverifieruid.h
locationsystemui/locationsysui/locverifier/inc/lpdbasemodel.h
locationsystemui/locationsysui/locverifier/inc/lpdbkupevtlistenerao.h
locationsystemui/locationsysui/locverifier/inc/lpdbkupevtobserver.h
locationsystemui/locationsysui/locverifier/inc/lpddlgobserver.h
locationsystemui/locationsysui/locverifier/inc/lpddllmain.h
locationsystemui/locationsysui/locverifier/inc/lpdglobalplugindialog.h
locationsystemui/locationsysui/locverifier/inc/lpdmessageplugindialog.h
locationsystemui/locationsysui/locverifier/inc/lpdnotifierquerylauncher.h
locationsystemui/locationsysui/locverifier/inc/lpdnotifreqinfo.h
locationsystemui/locationsysui/locverifier/inc/lpdperiodicprocessor.h
locationsystemui/locationsysui/locverifier/inc/lpdperiodicreqinfo.h
locationsystemui/locationsysui/locverifier/inc/lpdquerylauncherbase.h
locationsystemui/locationsysui/locverifier/inc/lpdrequestao.h
locationsystemui/locationsysui/locverifier/inc/lpdrequestorprocessor.h
locationsystemui/locationsysui/locverifier/inc/lpdresulthandler.h
locationsystemui/locationsysui/locverifier/inc/lpdsuplsettingsadapter.h
locationsystemui/locationsysui/locverifier/inc/lpdsuplsettingsadapterobserver.h
locationsystemui/locationsysui/locverifier/inc/lpdverifierplugin.h
locationsystemui/locationsysui/locverifier/inc/lpdverifierquerylauncher.h
locationsystemui/locationsysui/locverifier/inc/lpdverifiersettinglauncher.h
locationsystemui/locationsysui/locverifier/inc/lpdverifnotiflbmodel.h
locationsystemui/locationsysui/locverifier/location.loc
locationsystemui/locationsysui/locverifier/rss/10207242.rss
locationsystemui/locationsysui/locverifier/rss/locverifierdlg.rss
locationsystemui/locationsysui/locverifier/src/lpdbasemodel.cpp
locationsystemui/locationsysui/locverifier/src/lpdbkupevtlistenerao.cpp
locationsystemui/locationsysui/locverifier/src/lpddllmain.cpp
locationsystemui/locationsysui/locverifier/src/lpdglobalplugindialog.cpp
locationsystemui/locationsysui/locverifier/src/lpdmessageplugindialog.cpp
locationsystemui/locationsysui/locverifier/src/lpdnotifierquerylauncher.cpp
locationsystemui/locationsysui/locverifier/src/lpdnotifreqinfo.cpp
locationsystemui/locationsysui/locverifier/src/lpdperiodicprocessor.cpp
locationsystemui/locationsysui/locverifier/src/lpdquerylauncherbase.cpp
locationsystemui/locationsysui/locverifier/src/lpdrequestao.cpp
locationsystemui/locationsysui/locverifier/src/lpdrequestorprocessor.cpp
locationsystemui/locationsysui/locverifier/src/lpdsuplsettingsadapter.cpp
locationsystemui/locationsysui/locverifier/src/lpdverifierplugin.cpp
locationsystemui/locationsysui/locverifier/src/lpdverifierquerylauncher.cpp
locationsystemui/locationsysui/locverifier/src/lpdverifiersettinglauncher.cpp
locationsystemui/locationsysui/locverifier/src/lpdverifnotiflbmodel.cpp
locationsystemui/locationsysui/queryandnotification/inc/EPos_CPosPrivacyNotifierExtension.h
locationsystemui/locationsysui/queryandnotification/inc/EPos_CPosRequestHandler.h
locationsystemui/locationsysui/rom/locationsystemuistub.iby
locationsystemui/locationsysui/rom/locationsysui.iby
locationsystemui/locationsysui/rom/locationsysui_resources.iby
locationsystemui/locationsysui/rom/locbtnotifier.iby
locationsystemui/locationsysui/rom/locbtnotifier_resources.iby
locationsystemui/locationsysui/rom/locgpsindicatorplugin.iby
locationsystemui/locationsysui/rom/locgpsindicatorplugin_resources.iby
locationsystemui/locationsysui/rom/locnotprefplugin.iby
locationsystemui/locationsysui/rom/locnotprefplugin_resources.iby
locationsystemui/locationsysui/rom/locpossettingsapp.iby
locationsystemui/locationsysui/rom/locpossettingsapp_resources.iby
locationsystemui/locationsysui/rom/locpsysettings.iby
locationsystemui/locationsysui/rom/locpsysettings_resources.iby
locationsystemui/locationsysui/rom/locsettingsuiservice.iby
locationsystemui/locationsysui/rom/locsettingsuiservice_resources.iby
locationsystemui/locationsysui/rom/locsuplsettings.iby
locationsystemui/locationsysui/rom/locsuplsettings_resources.iby
locationsystemui/locationsysui/rom/locverifierdlg.iby
locationsystemui/locationsysui/rom/locverifierdlg_resources.iby
locationtriggering/data/lbtstub.sis
locationtriggering/group/bld.inf
locationtriggering/install/lbtstub.pkg
locationtriggering/lbtmgmtui/data/2001E66E.rss
locationtriggering/lbtmgmtui/data/lbtmgmtpluginview.rss
locationtriggering/lbtmgmtui/data/lbtmgmtuistub.sis
locationtriggering/lbtmgmtui/group/bld.inf
locationtriggering/lbtmgmtui/group/lbtmgmtui.mmp
locationtriggering/lbtmgmtui/inc/lbtmgmtadapterobserver.h
locationtriggering/lbtmgmtui/inc/lbtmgmtdebug.h
locationtriggering/lbtmgmtui/inc/lbtmgmtdebugconfig.hrh
locationtriggering/lbtmgmtui/inc/lbtmgmtengobserver.h
locationtriggering/lbtmgmtui/inc/lbtmgmtlbtadapter.h
locationtriggering/lbtmgmtui/inc/lbtmgmtplugin.h
locationtriggering/lbtmgmtui/inc/lbtmgmtplugin.hrh
locationtriggering/lbtmgmtui/inc/lbtmgmtplugincmdhdlr.h
locationtriggering/lbtmgmtui/inc/lbtmgmtplugincontainer.h
locationtriggering/lbtmgmtui/inc/lbtmgmtpluginengine.h
locationtriggering/lbtmgmtui/inc/lbtmgmtpluginuid.hrh
locationtriggering/lbtmgmtui/inc/lbtmgmtpluginview.h
locationtriggering/lbtmgmtui/install/lbtmgmtui.pkg
locationtriggering/lbtmgmtui/install/lbtmgmtui.sis
locationtriggering/lbtmgmtui/install/lbtmgmtui.sisx
locationtriggering/lbtmgmtui/install/lbtmgmtuistub.pkg
locationtriggering/lbtmgmtui/loc/lbtmgmtsettings.loc
locationtriggering/lbtmgmtui/rom/lbtmgmtui.iby
locationtriggering/lbtmgmtui/rom/lbtmgmtui_resources.iby
locationtriggering/lbtmgmtui/rom/lbtmgmtuistub.iby
locationtriggering/lbtmgmtui/src/lbtmgmtdebug.cpp
locationtriggering/lbtmgmtui/src/lbtmgmtlbtadapter.cpp
locationtriggering/lbtmgmtui/src/lbtmgmtplugin.cpp
locationtriggering/lbtmgmtui/src/lbtmgmtplugincontainer.cpp
locationtriggering/lbtmgmtui/src/lbtmgmtpluginengine.cpp
locationtriggering/lbtmgmtui/src/lbtmgmtpluginimptable.cpp
locationtriggering/lbtmgmtui/src/lbtmgmtpluginview.cpp
locsrv_plat/group/bld.inf
locsrv_plat/location_notation_preferences_settings_api/group/bld.inf
locsrv_plat/location_notation_preferences_settings_api/inc/locnotprefplugindomaincrkeys.h
locsrv_plat/location_notation_preferences_settings_api/location_notation_preferences_settings_api.metaxml
locsrv_plat/location_settings_launch_api/group/bld.inf
locsrv_plat/location_settings_launch_api/inc/locsettingsuiclient.h
locsrv_plat/location_settings_launch_api/location_settings_launch_api.metaxml
locsrv_plat/location_settings_launch_api/tsrc/bmarm/testlocsettingsuiclientu.def
locsrv_plat/location_settings_launch_api/tsrc/bwins/testlocsettingsuiclientu.def
locsrv_plat/location_settings_launch_api/tsrc/conf/testlocsettingsuiclient.cfg
locsrv_plat/location_settings_launch_api/tsrc/eabi/testlocsettingsuiclientu.def
locsrv_plat/location_settings_launch_api/tsrc/group/bld.inf
locsrv_plat/location_settings_launch_api/tsrc/group/testlocsettingsuiclient.mmp
locsrv_plat/location_settings_launch_api/tsrc/group/testlocsettingsuiclient.pkg
locsrv_plat/location_settings_launch_api/tsrc/inc/testlocsettingsuiclient.h
locsrv_plat/location_settings_launch_api/tsrc/inc/testlocsettingsuiclientao.h
locsrv_plat/location_settings_launch_api/tsrc/init/testframework.ini
locsrv_plat/location_settings_launch_api/tsrc/src/testlocsettingsuiclient.cpp
locsrv_plat/location_settings_launch_api/tsrc/src/testlocsettingsuiclientBlocks.cpp
locsrv_plat/location_settings_launch_api/tsrc/src/testlocsettingsuiclientao.cpp
locsrv_plat/map_and_navigation_aiw_api/group/bld.inf
locsrv_plat/map_and_navigation_aiw_api/inc/mnaiwservices.h
locsrv_plat/map_and_navigation_aiw_api/map_and_navigation_aiw_api.metaxml
locsrv_plat/map_and_navigation_api/group/bld.inf
locsrv_plat/map_and_navigation_api/inc/mnerrors.h
locsrv_plat/map_and_navigation_api/inc/mnmapview.h
locsrv_plat/map_and_navigation_api/inc/mnnavigator.h
locsrv_plat/map_and_navigation_api/map_and_navigation_api.metaxml
locsrv_plat/map_and_navigation_api/tsrc/bmarm/testmapandnavapiu.def
locsrv_plat/map_and_navigation_api/tsrc/bwins/testmapandnavapiu.def
locsrv_plat/map_and_navigation_api/tsrc/conf/testmapandnavapi.cfg
locsrv_plat/map_and_navigation_api/tsrc/data/armv5/urel/MnRefProvider.mbm
locsrv_plat/map_and_navigation_api/tsrc/data/armv5/urel/MnRefProvider.mif
locsrv_plat/map_and_navigation_api/tsrc/data/armv5/urel/MnRefProvider.rsc
locsrv_plat/map_and_navigation_api/tsrc/data/armv5/urel/MnRefProviderPlugin.dll
locsrv_plat/map_and_navigation_api/tsrc/data/armv5/urel/MnRefProviderPlugin.dll.map
locsrv_plat/map_and_navigation_api/tsrc/data/armv5/urel/MnRefProvider_reg.rsc
locsrv_plat/map_and_navigation_api/tsrc/data/armv5/urel/mnrefprovider.exe
locsrv_plat/map_and_navigation_api/tsrc/data/armv5/urel/mnrefprovider.exe.map
locsrv_plat/map_and_navigation_api/tsrc/data/armv5/urel/mnrefproviderback.exe
locsrv_plat/map_and_navigation_api/tsrc/data/armv5/urel/mnrefproviderback.exe.map
locsrv_plat/map_and_navigation_api/tsrc/data/armv5/urel/mnrefproviderback.rsc
locsrv_plat/map_and_navigation_api/tsrc/data/armv5/urel/mnrefproviderback_reg.rsc
locsrv_plat/map_and_navigation_api/tsrc/data/armv5/urel/mnrefproviderengine.dll
locsrv_plat/map_and_navigation_api/tsrc/data/armv5/urel/mnrefproviderengine.dll.map
locsrv_plat/map_and_navigation_api/tsrc/data/armv5/urel/mnrefproviderengine.rsc
locsrv_plat/map_and_navigation_api/tsrc/data/winscw/udeb/MnRefProviderPlugin.dll
locsrv_plat/map_and_navigation_api/tsrc/data/winscw/udeb/mnrefprovider.exe
locsrv_plat/map_and_navigation_api/tsrc/data/winscw/udeb/mnrefproviderback.exe
locsrv_plat/map_and_navigation_api/tsrc/data/winscw/udeb/mnrefproviderengine.dll
locsrv_plat/map_and_navigation_api/tsrc/eabi/testmapandnavapiu.def
locsrv_plat/map_and_navigation_api/tsrc/group/bld.inf
locsrv_plat/map_and_navigation_api/tsrc/group/map_and_navigation_api_test.pkg
locsrv_plat/map_and_navigation_api/tsrc/group/testmapandnavapi.mmp
locsrv_plat/map_and_navigation_api/tsrc/inc/testcmnmapview.h
locsrv_plat/map_and_navigation_api/tsrc/inc/testcmnnavigator.h
locsrv_plat/map_and_navigation_api/tsrc/inc/testmapandnavapi.h
locsrv_plat/map_and_navigation_api/tsrc/init/testframework.ini
locsrv_plat/map_and_navigation_api/tsrc/mapnavproviderrefapp/BWINS/mnrefproviderengine.50u.def
locsrv_plat/map_and_navigation_api/tsrc/mapnavproviderrefapp/BWINS/mnrefproviderengineu.def
locsrv_plat/map_and_navigation_api/tsrc/mapnavproviderrefapp/data/default_lm.bmp
locsrv_plat/map_and_navigation_api/tsrc/mapnavproviderrefapp/data/default_lm_mask_soft.bmp
locsrv_plat/map_and_navigation_api/tsrc/mapnavproviderrefapp/data/mnrefprovider.rss
locsrv_plat/map_and_navigation_api/tsrc/mapnavproviderrefapp/data/mnrefprovider_reg.rss
locsrv_plat/map_and_navigation_api/tsrc/mapnavproviderrefapp/data/mnrefproviderback.rss
locsrv_plat/map_and_navigation_api/tsrc/mapnavproviderrefapp/data/mnrefproviderback_reg.rss
locsrv_plat/map_and_navigation_api/tsrc/mapnavproviderrefapp/data/mnrefproviderengine.rss
locsrv_plat/map_and_navigation_api/tsrc/mapnavproviderrefapp/data/mnrefproviderplugin.rss
locsrv_plat/map_and_navigation_api/tsrc/mapnavproviderrefapp/eabi/mnrefproviderengine.50u.def
locsrv_plat/map_and_navigation_api/tsrc/mapnavproviderrefapp/eabi/mnrefproviderengineu.def
locsrv_plat/map_and_navigation_api/tsrc/mapnavproviderrefapp/group/bld.inf
locsrv_plat/map_and_navigation_api/tsrc/mapnavproviderrefapp/group/mapnavrefengine.mmp
locsrv_plat/map_and_navigation_api/tsrc/mapnavproviderrefapp/group/mapnavrefprovider.mmp
locsrv_plat/map_and_navigation_api/tsrc/mapnavproviderrefapp/group/mapnavrefproviderback.mmp
locsrv_plat/map_and_navigation_api/tsrc/mapnavproviderrefapp/group/mapnavrefproviderplugin.mmp
locsrv_plat/map_and_navigation_api/tsrc/mapnavproviderrefapp/inc/debug.h
locsrv_plat/map_and_navigation_api/tsrc/mapnavproviderrefapp/inc/mnrp.hrh
locsrv_plat/map_and_navigation_api/tsrc/mapnavproviderrefapp/inc/mnrpappcontrol.h
locsrv_plat/map_and_navigation_api/tsrc/mapnavproviderrefapp/inc/mnrpapplication.h
locsrv_plat/map_and_navigation_api/tsrc/mapnavproviderrefapp/inc/mnrpapplicationback.h
locsrv_plat/map_and_navigation_api/tsrc/mapnavproviderrefapp/inc/mnrpappserver.h
locsrv_plat/map_and_navigation_api/tsrc/mapnavproviderrefapp/inc/mnrpappserverback.h
locsrv_plat/map_and_navigation_api/tsrc/mapnavproviderrefapp/inc/mnrpappui.h
locsrv_plat/map_and_navigation_api/tsrc/mapnavproviderrefapp/inc/mnrpappuiback.h
locsrv_plat/map_and_navigation_api/tsrc/mapnavproviderrefapp/inc/mnrpappview.h
locsrv_plat/map_and_navigation_api/tsrc/mapnavproviderrefapp/inc/mnrpcoordconverter.h
locsrv_plat/map_and_navigation_api/tsrc/mapnavproviderrefapp/inc/mnrpdocument.h
locsrv_plat/map_and_navigation_api/tsrc/mapnavproviderrefapp/inc/mnrpdocumentback.h
locsrv_plat/map_and_navigation_api/tsrc/mapnavproviderrefapp/inc/mnrpengine.h
locsrv_plat/map_and_navigation_api/tsrc/mapnavproviderrefapp/inc/mnrpgeocodingservice.h
locsrv_plat/map_and_navigation_api/tsrc/mapnavproviderrefapp/inc/mnrpmapcontrol.h
locsrv_plat/map_and_navigation_api/tsrc/mapnavproviderrefapp/inc/mnrpmapimageservice.h
locsrv_plat/map_and_navigation_api/tsrc/mapnavproviderrefapp/inc/mnrpmapmodel.h
locsrv_plat/map_and_navigation_api/tsrc/mapnavproviderrefapp/inc/mnrpmapview.h
locsrv_plat/map_and_navigation_api/tsrc/mapnavproviderrefapp/inc/mnrpmapviewservice.h
locsrv_plat/map_and_navigation_api/tsrc/mapnavproviderrefapp/inc/mnrpnavicontrol.h
locsrv_plat/map_and_navigation_api/tsrc/mapnavproviderrefapp/inc/mnrpnavigationservice.h
locsrv_plat/map_and_navigation_api/tsrc/mapnavproviderrefapp/inc/mnrpnavimodel.h
locsrv_plat/map_and_navigation_api/tsrc/mapnavproviderrefapp/inc/mnrpnaviview.h
locsrv_plat/map_and_navigation_api/tsrc/mapnavproviderrefapp/inc/mnrppositionrequest.h
locsrv_plat/map_and_navigation_api/tsrc/mapnavproviderrefapp/inc/mnrputils.h
locsrv_plat/map_and_navigation_api/tsrc/mapnavproviderrefapp/sis/mnrefprovider_armv5.pkg
locsrv_plat/map_and_navigation_api/tsrc/mapnavproviderrefapp/sis/mnrefprovider_armv5.sis
locsrv_plat/map_and_navigation_api/tsrc/mapnavproviderrefapp/sis/mnrefprovider_bitmap_armv5.pkg
locsrv_plat/map_and_navigation_api/tsrc/mapnavproviderrefapp/sis/mnrefprovider_bitmap_armv5.sis
locsrv_plat/map_and_navigation_api/tsrc/mapnavproviderrefapp/sis/mnrefprovider_bitmap_armv5.sisx
locsrv_plat/map_and_navigation_api/tsrc/mapnavproviderrefapp/sis/rd-key.pem
locsrv_plat/map_and_navigation_api/tsrc/mapnavproviderrefapp/sis/rd.cer
locsrv_plat/map_and_navigation_api/tsrc/mapnavproviderrefapp/src/mnrefprovider.cpp
locsrv_plat/map_and_navigation_api/tsrc/mapnavproviderrefapp/src/mnrefproviderback.cpp
locsrv_plat/map_and_navigation_api/tsrc/mapnavproviderrefapp/src/mnrefproviderplugin.cpp
locsrv_plat/map_and_navigation_api/tsrc/mapnavproviderrefapp/src/mnrpappcontrol.cpp
locsrv_plat/map_and_navigation_api/tsrc/mapnavproviderrefapp/src/mnrpapplication.cpp
locsrv_plat/map_and_navigation_api/tsrc/mapnavproviderrefapp/src/mnrpapplicationback.cpp
locsrv_plat/map_and_navigation_api/tsrc/mapnavproviderrefapp/src/mnrpappserver.cpp
locsrv_plat/map_and_navigation_api/tsrc/mapnavproviderrefapp/src/mnrpappserverback.cpp
locsrv_plat/map_and_navigation_api/tsrc/mapnavproviderrefapp/src/mnrpappui.cpp
locsrv_plat/map_and_navigation_api/tsrc/mapnavproviderrefapp/src/mnrpappuiback.cpp
locsrv_plat/map_and_navigation_api/tsrc/mapnavproviderrefapp/src/mnrpappview.cpp
locsrv_plat/map_and_navigation_api/tsrc/mapnavproviderrefapp/src/mnrpcoordconverter.cpp
locsrv_plat/map_and_navigation_api/tsrc/mapnavproviderrefapp/src/mnrpdocument.cpp
locsrv_plat/map_and_navigation_api/tsrc/mapnavproviderrefapp/src/mnrpdocumentback.cpp
locsrv_plat/map_and_navigation_api/tsrc/mapnavproviderrefapp/src/mnrpengine.cpp
locsrv_plat/map_and_navigation_api/tsrc/mapnavproviderrefapp/src/mnrpgeocodingservice.cpp
locsrv_plat/map_and_navigation_api/tsrc/mapnavproviderrefapp/src/mnrpmapcontrol.cpp
locsrv_plat/map_and_navigation_api/tsrc/mapnavproviderrefapp/src/mnrpmapimageservice.cpp
locsrv_plat/map_and_navigation_api/tsrc/mapnavproviderrefapp/src/mnrpmapmodel.cpp
locsrv_plat/map_and_navigation_api/tsrc/mapnavproviderrefapp/src/mnrpmapview.cpp
locsrv_plat/map_and_navigation_api/tsrc/mapnavproviderrefapp/src/mnrpmapviewservice.cpp
locsrv_plat/map_and_navigation_api/tsrc/mapnavproviderrefapp/src/mnrpnavicontrol.cpp
locsrv_plat/map_and_navigation_api/tsrc/mapnavproviderrefapp/src/mnrpnavigationservice.cpp
locsrv_plat/map_and_navigation_api/tsrc/mapnavproviderrefapp/src/mnrpnavimodel.cpp
locsrv_plat/map_and_navigation_api/tsrc/mapnavproviderrefapp/src/mnrpnaviview.cpp
locsrv_plat/map_and_navigation_api/tsrc/mapnavproviderrefapp/src/mnrppositionrequest.cpp
locsrv_plat/map_and_navigation_api/tsrc/mapnavproviderrefapp/src/mnrputils.cpp
locsrv_plat/map_and_navigation_api/tsrc/src/testcmnmapview.cpp
locsrv_plat/map_and_navigation_api/tsrc/src/testcmnnavigator.cpp
locsrv_plat/map_and_navigation_api/tsrc/src/testmapandnavapi.cpp
locsrv_plat/map_and_navigation_api/tsrc/src/testmapandnavapiblocks.cpp
locsrv_plat/map_and_navigation_provider_api/group/bld.inf
locsrv_plat/map_and_navigation_provider_api/inc/mnappservices.hrh
locsrv_plat/map_and_navigation_provider_api/inc/mnappserviceuids.hrh
locsrv_plat/map_and_navigation_provider_api/inc/mngeocodingservicebase.h
locsrv_plat/map_and_navigation_provider_api/inc/mnmapimageservicebase.h
locsrv_plat/map_and_navigation_provider_api/inc/mnmapviewservicebase.h
locsrv_plat/map_and_navigation_provider_api/inc/mnnavigationservicebase.h
locsrv_plat/map_and_navigation_provider_api/inc/mnservicebase.h
locsrv_plat/map_and_navigation_provider_api/inc/mnserviceinfo.rh
locsrv_plat/map_and_navigation_provider_api/map_and_navigation_provider_api.metaxml
locsrv_plat/map_and_navigation_provider_discovery_api/group/bld.inf
locsrv_plat/map_and_navigation_provider_discovery_api/inc/mnprovider.h
locsrv_plat/map_and_navigation_provider_discovery_api/inc/mnproviderfinder.h
locsrv_plat/map_and_navigation_provider_discovery_api/map_and_navigation_provider_discovery_api.metaxml
locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/bmarm/testmnproviderdiscoveryu.def
locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/bwins/testmnproviderdiscoveryu.def
locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/conf/testmnproviderdiscovery.cfg
locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/data/armv5/urel/MnRefProvider.mbm
locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/data/armv5/urel/MnRefProvider.mif
locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/data/armv5/urel/MnRefProvider.rsc
locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/data/armv5/urel/MnRefProviderPlugin.dll
locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/data/armv5/urel/MnRefProviderPlugin.dll.map
locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/data/armv5/urel/MnRefProvider_reg.rsc
locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/data/armv5/urel/mnrefprovider.exe
locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/data/armv5/urel/mnrefprovider.exe.map
locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/data/armv5/urel/mnrefproviderback.exe
locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/data/armv5/urel/mnrefproviderback.exe.map
locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/data/armv5/urel/mnrefproviderback.rsc
locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/data/armv5/urel/mnrefproviderback_reg.rsc
locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/data/armv5/urel/mnrefproviderengine.dll
locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/data/armv5/urel/mnrefproviderengine.dll.map
locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/data/armv5/urel/mnrefproviderengine.rsc
locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/data/winscw/udeb/MnRefProviderPlugin.dll
locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/data/winscw/udeb/mnrefprovider.exe
locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/data/winscw/udeb/mnrefproviderback.exe
locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/data/winscw/udeb/mnrefproviderengine.dll
locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/eabi/testmnproviderdiscoveryu.def
locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/group/bld.inf
locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/group/map_and_navigation_provider_discovery_api_test.pkg
locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/group/testmnproviderdiscovery.mmp
locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/inc/testcmnprovider.h
locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/inc/testmnproviderdiscovery.h
locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/inc/testmnproviderfinder.h
locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/init/testframework.ini
locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/mapnavproviderrefapp/BWINS/mnrefproviderengine.50u.def
locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/mapnavproviderrefapp/BWINS/mnrefproviderengineu.def
locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/mapnavproviderrefapp/data/default_lm.bmp
locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/mapnavproviderrefapp/data/default_lm_mask_soft.bmp
locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/mapnavproviderrefapp/data/mnrefprovider.rss
locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/mapnavproviderrefapp/data/mnrefprovider_reg.rss
locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/mapnavproviderrefapp/data/mnrefproviderback.rss
locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/mapnavproviderrefapp/data/mnrefproviderback_reg.rss
locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/mapnavproviderrefapp/data/mnrefproviderengine.rss
locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/mapnavproviderrefapp/data/mnrefproviderplugin.rss
locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/mapnavproviderrefapp/eabi/mnrefproviderengine.50u.def
locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/mapnavproviderrefapp/eabi/mnrefproviderengineu.def
locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/mapnavproviderrefapp/group/bld.inf
locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/mapnavproviderrefapp/group/mnprovdiscrefengine.mmp
locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/mapnavproviderrefapp/group/mnprovdiscrefprovider.mmp
locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/mapnavproviderrefapp/group/mnprovdiscrefproviderback.mmp
locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/mapnavproviderrefapp/group/mnprovdiscrefproviderplugin.mmp
locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/mapnavproviderrefapp/inc/debug.h
locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/mapnavproviderrefapp/inc/mnrp.hrh
locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/mapnavproviderrefapp/inc/mnrpappcontrol.h
locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/mapnavproviderrefapp/inc/mnrpapplication.h
locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/mapnavproviderrefapp/inc/mnrpapplicationback.h
locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/mapnavproviderrefapp/inc/mnrpappserver.h
locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/mapnavproviderrefapp/inc/mnrpappserverback.h
locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/mapnavproviderrefapp/inc/mnrpappui.h
locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/mapnavproviderrefapp/inc/mnrpappuiback.h
locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/mapnavproviderrefapp/inc/mnrpappview.h
locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/mapnavproviderrefapp/inc/mnrpcoordconverter.h
locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/mapnavproviderrefapp/inc/mnrpdocument.h
locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/mapnavproviderrefapp/inc/mnrpdocumentback.h
locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/mapnavproviderrefapp/inc/mnrpengine.h
locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/mapnavproviderrefapp/inc/mnrpgeocodingservice.h
locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/mapnavproviderrefapp/inc/mnrpmapcontrol.h
locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/mapnavproviderrefapp/inc/mnrpmapimageservice.h
locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/mapnavproviderrefapp/inc/mnrpmapmodel.h
locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/mapnavproviderrefapp/inc/mnrpmapview.h
locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/mapnavproviderrefapp/inc/mnrpmapviewservice.h
locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/mapnavproviderrefapp/inc/mnrpnavicontrol.h
locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/mapnavproviderrefapp/inc/mnrpnavigationservice.h
locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/mapnavproviderrefapp/inc/mnrpnavimodel.h
locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/mapnavproviderrefapp/inc/mnrpnaviview.h
locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/mapnavproviderrefapp/inc/mnrppositionrequest.h
locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/mapnavproviderrefapp/inc/mnrputils.h
locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/mapnavproviderrefapp/sis/mnrefprovider_armv5.pkg
locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/mapnavproviderrefapp/sis/mnrefprovider_armv5.sis
locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/mapnavproviderrefapp/sis/mnrefprovider_bitmap_armv5.pkg
locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/mapnavproviderrefapp/sis/mnrefprovider_bitmap_armv5.sis
locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/mapnavproviderrefapp/sis/mnrefprovider_bitmap_armv5.sisx
locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/mapnavproviderrefapp/sis/rd-key.pem
locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/mapnavproviderrefapp/sis/rd.cer
locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/mapnavproviderrefapp/src/mnrefprovider.cpp
locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/mapnavproviderrefapp/src/mnrefproviderback.cpp
locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/mapnavproviderrefapp/src/mnrefproviderplugin.cpp
locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/mapnavproviderrefapp/src/mnrpappcontrol.cpp
locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/mapnavproviderrefapp/src/mnrpapplication.cpp
locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/mapnavproviderrefapp/src/mnrpapplicationback.cpp
locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/mapnavproviderrefapp/src/mnrpappserver.cpp
locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/mapnavproviderrefapp/src/mnrpappserverback.cpp
locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/mapnavproviderrefapp/src/mnrpappui.cpp
locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/mapnavproviderrefapp/src/mnrpappuiback.cpp
locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/mapnavproviderrefapp/src/mnrpappview.cpp
locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/mapnavproviderrefapp/src/mnrpcoordconverter.cpp
locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/mapnavproviderrefapp/src/mnrpdocument.cpp
locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/mapnavproviderrefapp/src/mnrpdocumentback.cpp
locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/mapnavproviderrefapp/src/mnrpengine.cpp
locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/mapnavproviderrefapp/src/mnrpgeocodingservice.cpp
locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/mapnavproviderrefapp/src/mnrpmapcontrol.cpp
locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/mapnavproviderrefapp/src/mnrpmapimageservice.cpp
locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/mapnavproviderrefapp/src/mnrpmapmodel.cpp
locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/mapnavproviderrefapp/src/mnrpmapview.cpp
locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/mapnavproviderrefapp/src/mnrpmapviewservice.cpp
locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/mapnavproviderrefapp/src/mnrpnavicontrol.cpp
locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/mapnavproviderrefapp/src/mnrpnavigationservice.cpp
locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/mapnavproviderrefapp/src/mnrpnavimodel.cpp
locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/mapnavproviderrefapp/src/mnrpnaviview.cpp
locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/mapnavproviderrefapp/src/mnrppositionrequest.cpp
locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/mapnavproviderrefapp/src/mnrputils.cpp
locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/src/testcmnprovider.cpp
locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/src/testmnproviderdiscovery.cpp
locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/src/testmnproviderdiscoveryblocks.cpp
locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/src/testmnproviderfinder.cpp
locsrv_plat/map_image_api/group/bld.inf
locsrv_plat/map_image_api/inc/mnmapimage.h
locsrv_plat/map_image_api/inc/mnmapimageparams.h
locsrv_plat/map_image_api/inc/mnmapimageparams.inl
locsrv_plat/map_image_api/map_image_api.metaxml
locsrv_plat/map_image_api/tsrc/bmarm/testmapimageu.def
locsrv_plat/map_image_api/tsrc/bwins/testmapimageu.def
locsrv_plat/map_image_api/tsrc/conf/testmapimage.cfg
locsrv_plat/map_image_api/tsrc/eabi/testmapimageu.def
locsrv_plat/map_image_api/tsrc/group/bld.inf
locsrv_plat/map_image_api/tsrc/group/map_image_api_test.pkg
locsrv_plat/map_image_api/tsrc/group/testmapimage.mmp
locsrv_plat/map_image_api/tsrc/inc/testmapimage.h
locsrv_plat/map_image_api/tsrc/inc/testmnmapimage.h
locsrv_plat/map_image_api/tsrc/inc/testmnmapimageparams.h
locsrv_plat/map_image_api/tsrc/init/testframework.ini
locsrv_plat/map_image_api/tsrc/src/testmapimage.cpp
locsrv_plat/map_image_api/tsrc/src/testmapimageBlocks.cpp
locsrv_plat/map_image_api/tsrc/src/testmnmapimage.cpp
locsrv_plat/map_image_api/tsrc/src/testmnmapimageparams.cpp
locsrv_plat/map_image_api/tsrc/testprovider/data/mntestprovider.rss
locsrv_plat/map_image_api/tsrc/testprovider/data/mntestprovider_reg.rss
locsrv_plat/map_image_api/tsrc/testprovider/data/mntestproviderplugin.rss
locsrv_plat/map_image_api/tsrc/testprovider/group/bld.inf
locsrv_plat/map_image_api/tsrc/testprovider/group/testprovider.mmp
locsrv_plat/map_image_api/tsrc/testprovider/group/testprovider.pkg
locsrv_plat/map_image_api/tsrc/testprovider/group/testproviderplugin.mmp
locsrv_plat/map_image_api/tsrc/testprovider/inc/debug.h
locsrv_plat/map_image_api/tsrc/testprovider/inc/testproviderapplication.h
locsrv_plat/map_image_api/tsrc/testprovider/inc/testproviderappserver.h
locsrv_plat/map_image_api/tsrc/testprovider/inc/testproviderappui.h
locsrv_plat/map_image_api/tsrc/testprovider/inc/testproviderappview.h
locsrv_plat/map_image_api/tsrc/testprovider/inc/testprovidercoordconverter.h
locsrv_plat/map_image_api/tsrc/testprovider/inc/testproviderdocument.h
locsrv_plat/map_image_api/tsrc/testprovider/inc/testproviderdump.h
locsrv_plat/map_image_api/tsrc/testprovider/inc/testprovidergeocodingservice.h
locsrv_plat/map_image_api/tsrc/testprovider/inc/testprovidermapimageservice.h
locsrv_plat/map_image_api/tsrc/testprovider/inc/testprovidermapview.h
locsrv_plat/map_image_api/tsrc/testprovider/inc/testprovidermapviewservice.h
locsrv_plat/map_image_api/tsrc/testprovider/inc/testprovidernavigationservice.h
locsrv_plat/map_image_api/tsrc/testprovider/inc/testprovidernaviview.h
locsrv_plat/map_image_api/tsrc/testprovider/rom/MnTestProvider.iby
locsrv_plat/map_image_api/tsrc/testprovider/sis/MnTestProvider.pkg
locsrv_plat/map_image_api/tsrc/testprovider/src/testprovider.cpp
locsrv_plat/map_image_api/tsrc/testprovider/src/testproviderapplication.cpp
locsrv_plat/map_image_api/tsrc/testprovider/src/testproviderappserver.cpp
locsrv_plat/map_image_api/tsrc/testprovider/src/testproviderappui.cpp
locsrv_plat/map_image_api/tsrc/testprovider/src/testproviderappview.cpp
locsrv_plat/map_image_api/tsrc/testprovider/src/testprovidercoordconverter.cpp
locsrv_plat/map_image_api/tsrc/testprovider/src/testproviderdocument.cpp
locsrv_plat/map_image_api/tsrc/testprovider/src/testproviderdump.cpp
locsrv_plat/map_image_api/tsrc/testprovider/src/testprovidergeocodingservice.cpp
locsrv_plat/map_image_api/tsrc/testprovider/src/testprovidermapimageservice.cpp
locsrv_plat/map_image_api/tsrc/testprovider/src/testprovidermapview.cpp
locsrv_plat/map_image_api/tsrc/testprovider/src/testprovidermapviewservice.cpp
locsrv_plat/map_image_api/tsrc/testprovider/src/testprovidernavigationservice.cpp
locsrv_plat/map_image_api/tsrc/testprovider/src/testprovidernaviview.cpp
locsrv_plat/map_image_api/tsrc/testprovider/src/testproviderplugin.cpp
locsrv_plat/map_image_conversion_plugin_api/group/bld.inf
locsrv_plat/map_image_conversion_plugin_api/inc/mncoordinateconverterbase.h
locsrv_plat/map_image_conversion_plugin_api/inc/mnpluginuids.hrh
locsrv_plat/map_image_conversion_plugin_api/map_image_conversion_plugin_api.metaxml
locsrv_plat/map_image_conversion_plugin_api/tsrc/bmarm/testmapimgconpluginapiu.def
locsrv_plat/map_image_conversion_plugin_api/tsrc/bwins/testmapimgconpluginapiu.def
locsrv_plat/map_image_conversion_plugin_api/tsrc/conf/testmapimgconpluginapi.cfg
locsrv_plat/map_image_conversion_plugin_api/tsrc/data/armv5/urel/MnRefProvider.mbm
locsrv_plat/map_image_conversion_plugin_api/tsrc/data/armv5/urel/MnRefProvider.mif
locsrv_plat/map_image_conversion_plugin_api/tsrc/data/armv5/urel/MnRefProvider.rsc
locsrv_plat/map_image_conversion_plugin_api/tsrc/data/armv5/urel/MnRefProviderPlugin.dll
locsrv_plat/map_image_conversion_plugin_api/tsrc/data/armv5/urel/MnRefProviderPlugin.dll.map
locsrv_plat/map_image_conversion_plugin_api/tsrc/data/armv5/urel/MnRefProvider_reg.rsc
locsrv_plat/map_image_conversion_plugin_api/tsrc/data/armv5/urel/mnrefprovider.exe
locsrv_plat/map_image_conversion_plugin_api/tsrc/data/armv5/urel/mnrefprovider.exe.map
locsrv_plat/map_image_conversion_plugin_api/tsrc/data/armv5/urel/mnrefproviderback.exe
locsrv_plat/map_image_conversion_plugin_api/tsrc/data/armv5/urel/mnrefproviderback.exe.map
locsrv_plat/map_image_conversion_plugin_api/tsrc/data/armv5/urel/mnrefproviderback.rsc
locsrv_plat/map_image_conversion_plugin_api/tsrc/data/armv5/urel/mnrefproviderback_reg.rsc
locsrv_plat/map_image_conversion_plugin_api/tsrc/data/armv5/urel/mnrefproviderengine.dll
locsrv_plat/map_image_conversion_plugin_api/tsrc/data/armv5/urel/mnrefproviderengine.dll.map
locsrv_plat/map_image_conversion_plugin_api/tsrc/data/armv5/urel/mnrefproviderengine.rsc
locsrv_plat/map_image_conversion_plugin_api/tsrc/data/winscw/udeb/MnRefProviderPlugin.dll
locsrv_plat/map_image_conversion_plugin_api/tsrc/data/winscw/udeb/mnrefprovider.exe
locsrv_plat/map_image_conversion_plugin_api/tsrc/data/winscw/udeb/mnrefproviderback.exe
locsrv_plat/map_image_conversion_plugin_api/tsrc/data/winscw/udeb/mnrefproviderengine.dll
locsrv_plat/map_image_conversion_plugin_api/tsrc/eabi/testmapimgconpluginapiu.def
locsrv_plat/map_image_conversion_plugin_api/tsrc/group/bld.inf
locsrv_plat/map_image_conversion_plugin_api/tsrc/group/map_image_conversion_plugin_api_test.pkg
locsrv_plat/map_image_conversion_plugin_api/tsrc/group/testmapimgconpluginapi.mmp
locsrv_plat/map_image_conversion_plugin_api/tsrc/inc/testmapimgconpluginapi.h
locsrv_plat/map_image_conversion_plugin_api/tsrc/inc/testprovidercoordconverter.h
locsrv_plat/map_image_conversion_plugin_api/tsrc/init/testframework.ini
locsrv_plat/map_image_conversion_plugin_api/tsrc/mapnavproviderrefapp/BWINS/mnrefproviderengine.50u.def
locsrv_plat/map_image_conversion_plugin_api/tsrc/mapnavproviderrefapp/BWINS/mnrefproviderengineu.def
locsrv_plat/map_image_conversion_plugin_api/tsrc/mapnavproviderrefapp/data/default_lm.bmp
locsrv_plat/map_image_conversion_plugin_api/tsrc/mapnavproviderrefapp/data/default_lm_mask_soft.bmp
locsrv_plat/map_image_conversion_plugin_api/tsrc/mapnavproviderrefapp/data/mnrefprovider.rss
locsrv_plat/map_image_conversion_plugin_api/tsrc/mapnavproviderrefapp/data/mnrefprovider_reg.rss
locsrv_plat/map_image_conversion_plugin_api/tsrc/mapnavproviderrefapp/data/mnrefproviderback.rss
locsrv_plat/map_image_conversion_plugin_api/tsrc/mapnavproviderrefapp/data/mnrefproviderback_reg.rss
locsrv_plat/map_image_conversion_plugin_api/tsrc/mapnavproviderrefapp/data/mnrefproviderengine.rss
locsrv_plat/map_image_conversion_plugin_api/tsrc/mapnavproviderrefapp/data/mnrefproviderplugin.rss
locsrv_plat/map_image_conversion_plugin_api/tsrc/mapnavproviderrefapp/eabi/mnrefproviderengine.50u.def
locsrv_plat/map_image_conversion_plugin_api/tsrc/mapnavproviderrefapp/eabi/mnrefproviderengineu.def
locsrv_plat/map_image_conversion_plugin_api/tsrc/mapnavproviderrefapp/group/bld.inf
locsrv_plat/map_image_conversion_plugin_api/tsrc/mapnavproviderrefapp/group/mnconvpluginrefengine.mmp
locsrv_plat/map_image_conversion_plugin_api/tsrc/mapnavproviderrefapp/group/mnconvpluginrefprovider.mmp
locsrv_plat/map_image_conversion_plugin_api/tsrc/mapnavproviderrefapp/group/mnconvpluginrefproviderback.mmp
locsrv_plat/map_image_conversion_plugin_api/tsrc/mapnavproviderrefapp/group/mnconvpluginrefproviderplugin.mmp
locsrv_plat/map_image_conversion_plugin_api/tsrc/mapnavproviderrefapp/inc/debug.h
locsrv_plat/map_image_conversion_plugin_api/tsrc/mapnavproviderrefapp/inc/mnrp.hrh
locsrv_plat/map_image_conversion_plugin_api/tsrc/mapnavproviderrefapp/inc/mnrpappcontrol.h
locsrv_plat/map_image_conversion_plugin_api/tsrc/mapnavproviderrefapp/inc/mnrpapplication.h
locsrv_plat/map_image_conversion_plugin_api/tsrc/mapnavproviderrefapp/inc/mnrpapplicationback.h
locsrv_plat/map_image_conversion_plugin_api/tsrc/mapnavproviderrefapp/inc/mnrpappserver.h
locsrv_plat/map_image_conversion_plugin_api/tsrc/mapnavproviderrefapp/inc/mnrpappserverback.h
locsrv_plat/map_image_conversion_plugin_api/tsrc/mapnavproviderrefapp/inc/mnrpappui.h
locsrv_plat/map_image_conversion_plugin_api/tsrc/mapnavproviderrefapp/inc/mnrpappuiback.h
locsrv_plat/map_image_conversion_plugin_api/tsrc/mapnavproviderrefapp/inc/mnrpappview.h
locsrv_plat/map_image_conversion_plugin_api/tsrc/mapnavproviderrefapp/inc/mnrpcoordconverter.h
locsrv_plat/map_image_conversion_plugin_api/tsrc/mapnavproviderrefapp/inc/mnrpdocument.h
locsrv_plat/map_image_conversion_plugin_api/tsrc/mapnavproviderrefapp/inc/mnrpdocumentback.h
locsrv_plat/map_image_conversion_plugin_api/tsrc/mapnavproviderrefapp/inc/mnrpengine.h
locsrv_plat/map_image_conversion_plugin_api/tsrc/mapnavproviderrefapp/inc/mnrpgeocodingservice.h
locsrv_plat/map_image_conversion_plugin_api/tsrc/mapnavproviderrefapp/inc/mnrpmapcontrol.h
locsrv_plat/map_image_conversion_plugin_api/tsrc/mapnavproviderrefapp/inc/mnrpmapimageservice.h
locsrv_plat/map_image_conversion_plugin_api/tsrc/mapnavproviderrefapp/inc/mnrpmapmodel.h
locsrv_plat/map_image_conversion_plugin_api/tsrc/mapnavproviderrefapp/inc/mnrpmapview.h
locsrv_plat/map_image_conversion_plugin_api/tsrc/mapnavproviderrefapp/inc/mnrpmapviewservice.h
locsrv_plat/map_image_conversion_plugin_api/tsrc/mapnavproviderrefapp/inc/mnrpnavicontrol.h
locsrv_plat/map_image_conversion_plugin_api/tsrc/mapnavproviderrefapp/inc/mnrpnavigationservice.h
locsrv_plat/map_image_conversion_plugin_api/tsrc/mapnavproviderrefapp/inc/mnrpnavimodel.h
locsrv_plat/map_image_conversion_plugin_api/tsrc/mapnavproviderrefapp/inc/mnrpnaviview.h
locsrv_plat/map_image_conversion_plugin_api/tsrc/mapnavproviderrefapp/inc/mnrppositionrequest.h
locsrv_plat/map_image_conversion_plugin_api/tsrc/mapnavproviderrefapp/inc/mnrputils.h
locsrv_plat/map_image_conversion_plugin_api/tsrc/mapnavproviderrefapp/sis/mnrefprovider_armv5.pkg
locsrv_plat/map_image_conversion_plugin_api/tsrc/mapnavproviderrefapp/sis/mnrefprovider_armv5.sis
locsrv_plat/map_image_conversion_plugin_api/tsrc/mapnavproviderrefapp/sis/mnrefprovider_bitmap_armv5.pkg
locsrv_plat/map_image_conversion_plugin_api/tsrc/mapnavproviderrefapp/sis/mnrefprovider_bitmap_armv5.sis
locsrv_plat/map_image_conversion_plugin_api/tsrc/mapnavproviderrefapp/sis/mnrefprovider_bitmap_armv5.sisx
locsrv_plat/map_image_conversion_plugin_api/tsrc/mapnavproviderrefapp/sis/rd-key.pem
locsrv_plat/map_image_conversion_plugin_api/tsrc/mapnavproviderrefapp/sis/rd.cer
locsrv_plat/map_image_conversion_plugin_api/tsrc/mapnavproviderrefapp/src/mnrefprovider.cpp
locsrv_plat/map_image_conversion_plugin_api/tsrc/mapnavproviderrefapp/src/mnrefproviderback.cpp
locsrv_plat/map_image_conversion_plugin_api/tsrc/mapnavproviderrefapp/src/mnrefproviderplugin.cpp
locsrv_plat/map_image_conversion_plugin_api/tsrc/mapnavproviderrefapp/src/mnrpappcontrol.cpp
locsrv_plat/map_image_conversion_plugin_api/tsrc/mapnavproviderrefapp/src/mnrpapplication.cpp
locsrv_plat/map_image_conversion_plugin_api/tsrc/mapnavproviderrefapp/src/mnrpapplicationback.cpp
locsrv_plat/map_image_conversion_plugin_api/tsrc/mapnavproviderrefapp/src/mnrpappserver.cpp
locsrv_plat/map_image_conversion_plugin_api/tsrc/mapnavproviderrefapp/src/mnrpappserverback.cpp
locsrv_plat/map_image_conversion_plugin_api/tsrc/mapnavproviderrefapp/src/mnrpappui.cpp
locsrv_plat/map_image_conversion_plugin_api/tsrc/mapnavproviderrefapp/src/mnrpappuiback.cpp
locsrv_plat/map_image_conversion_plugin_api/tsrc/mapnavproviderrefapp/src/mnrpappview.cpp
locsrv_plat/map_image_conversion_plugin_api/tsrc/mapnavproviderrefapp/src/mnrpcoordconverter.cpp
locsrv_plat/map_image_conversion_plugin_api/tsrc/mapnavproviderrefapp/src/mnrpdocument.cpp
locsrv_plat/map_image_conversion_plugin_api/tsrc/mapnavproviderrefapp/src/mnrpdocumentback.cpp
locsrv_plat/map_image_conversion_plugin_api/tsrc/mapnavproviderrefapp/src/mnrpengine.cpp
locsrv_plat/map_image_conversion_plugin_api/tsrc/mapnavproviderrefapp/src/mnrpgeocodingservice.cpp
locsrv_plat/map_image_conversion_plugin_api/tsrc/mapnavproviderrefapp/src/mnrpmapcontrol.cpp
locsrv_plat/map_image_conversion_plugin_api/tsrc/mapnavproviderrefapp/src/mnrpmapimageservice.cpp
locsrv_plat/map_image_conversion_plugin_api/tsrc/mapnavproviderrefapp/src/mnrpmapmodel.cpp
locsrv_plat/map_image_conversion_plugin_api/tsrc/mapnavproviderrefapp/src/mnrpmapview.cpp
locsrv_plat/map_image_conversion_plugin_api/tsrc/mapnavproviderrefapp/src/mnrpmapviewservice.cpp
locsrv_plat/map_image_conversion_plugin_api/tsrc/mapnavproviderrefapp/src/mnrpnavicontrol.cpp
locsrv_plat/map_image_conversion_plugin_api/tsrc/mapnavproviderrefapp/src/mnrpnavigationservice.cpp
locsrv_plat/map_image_conversion_plugin_api/tsrc/mapnavproviderrefapp/src/mnrpnavimodel.cpp
locsrv_plat/map_image_conversion_plugin_api/tsrc/mapnavproviderrefapp/src/mnrpnaviview.cpp
locsrv_plat/map_image_conversion_plugin_api/tsrc/mapnavproviderrefapp/src/mnrppositionrequest.cpp
locsrv_plat/map_image_conversion_plugin_api/tsrc/mapnavproviderrefapp/src/mnrputils.cpp
locsrv_plat/map_image_conversion_plugin_api/tsrc/src/testmapimgconpluginapi.cpp
locsrv_plat/map_image_conversion_plugin_api/tsrc/src/testmapimgconpluginapiBlocks.cpp
locsrv_plat/map_image_conversion_plugin_api/tsrc/src/testprovidercoordconverter.cpp
locsrv_plat/privacy_notifiers_secondary_display_api/group/bld.inf
locsrv_plat/privacy_notifiers_secondary_display_api/inc/locverifiercoverui.h
locsrv_plat/privacy_notifiers_secondary_display_api/privacy_notifiers_secondary_display_api.metaxml
locsrv_plat/psy_configuration_ui_plugin_api/group/bld.inf
locsrv_plat/psy_configuration_ui_plugin_api/inc/LocPsyConfigUi.rh
locsrv_plat/psy_configuration_ui_plugin_api/inc/LocPsyConfigUiUID.hrh
locsrv_plat/psy_configuration_ui_plugin_api/psy_configuration_ui_plugin_api.metaxml
locsrv_plat/query_and_notification_api/inc/EPos_CPosPrivacyNotifier.h
locsrv_plat/supl_query_secondary_display_api/group/bld.inf
locsrv_plat/supl_query_secondary_display_api/inc/epos_omasuplquerycoverui.h
locsrv_plat/supl_query_secondary_display_api/supl_query_secondary_display_api.metaxml
locsrv_plat/supl_settings_api/inc/epos_csuplsettingparams.h
locsrv_plat/supl_settings_api/inc/epos_csuplsettings.h
locsrv_plat/supl_settings_api/inc/epos_msuplsettingsobserver.h
locsrv_plat/supl_settings_api/tsrc/conf/settingsapi_test.cfg
locsrv_plat/supl_settings_api/tsrc/group/log.txt
locsrv_plat/supl_settings_api/tsrc/group/settingsapi.pkg
locsrv_plat/supl_settings_api/tsrc/inc/settingsapi.h
locsrv_plat/supl_settings_api/tsrc/src/settingsapi.cpp
locsrv_plat/supl_settings_api/tsrc/src/settingsapiblocks.cpp
locsrv_plat/supl_settings_notifier_secondary_display_api/group/bld.inf
locsrv_plat/supl_settings_notifier_secondary_display_api/inc/locsuplsettingscoverui.h
locsrv_plat/supl_settings_notifier_secondary_display_api/supl_settings_notifier_secondary_display_api.metaxml
locsrv_plat/supl_terminal_initiation_api/inc/epos_suplterminal.h
supl/locationomasuplprotocolhandler/asnconverterpluginapi/src/epos_comasuplinit.cpp
supl/locationomasuplprotocolhandler/asnconverterpluginapi/src/epos_comasupllocationidver2.cpp
supl/locationomasuplprotocolhandler/asnconverterpluginapi/src/epos_comasuplreport.cpp
supl/locationomasuplprotocolhandler/asnconverterpluginapi/src/epos_comasuplsessionid.cpp
supl/locationomasuplprotocolhandler/asnconverterpluginapi/src/epos_comasuplstartver2.cpp
supl/locationomasuplprotocolhandler/group/bld.inf
supl/locationomasuplprotocolhandler/protocolhandler/bwins/eposomasuplprotocolhandleru.def
supl/locationomasuplprotocolhandler/protocolhandler/eabi/eposomasuplprotocolhandleru.def
supl/locationomasuplprotocolhandler/protocolhandler/group/omasuplprotocolhandler.mmp
supl/locationomasuplprotocolhandler/protocolhandler/inc/epos_comasuplsettings.h
supl/locationomasuplprotocolhandler/protocolhandler/src/epos_comasuplinitilizerequestor.cpp
supl/locationomasuplprotocolhandler/protocolhandler/src/epos_comasuplprotocolmanager.cpp
supl/locationomasuplprotocolhandler/protocolhandler/src/epos_comasuplsettings.cpp
supl/locationomasuplprotocolhandler/protocolhandlerver1/eabi/eposomasuplprotocolhandler1u.def
supl/locationomasuplprotocolhandler/protocolhandlerver1/group/omasuplprotocolhandler1.mmp
supl/locationomasuplprotocolhandler/protocolhandlerver1/inc/epos_comasuplconnrequestor.h
supl/locationomasuplprotocolhandler/protocolhandlerver1/inc/epos_comasuplfallbackhandler.h
supl/locationomasuplprotocolhandler/protocolhandlerver1/inc/epos_comasuplprotocolmanager1.h
supl/locationomasuplprotocolhandler/protocolhandlerver1/inc/epos_comasuplsession.h
supl/locationomasuplprotocolhandler/protocolhandlerver1/src/epos_comasuplconnrequestor.cpp
supl/locationomasuplprotocolhandler/protocolhandlerver1/src/epos_comasuplendstate.cpp
supl/locationomasuplprotocolhandler/protocolhandlerver1/src/epos_comasupletel.cpp
supl/locationomasuplprotocolhandler/protocolhandlerver1/src/epos_comasuplfallbackhandler.cpp
supl/locationomasuplprotocolhandler/protocolhandlerver1/src/epos_comasuplinitstate.cpp
supl/locationomasuplprotocolhandler/protocolhandlerver1/src/epos_comasuplposinitstate.cpp
supl/locationomasuplprotocolhandler/protocolhandlerver1/src/epos_comasuplposrequestor.cpp
supl/locationomasuplprotocolhandler/protocolhandlerver1/src/epos_comasuplprotocolmanager1.cpp
supl/locationomasuplprotocolhandler/protocolhandlerver1/src/epos_comasuplsession.cpp
supl/locationomasuplprotocolhandler/protocolhandlerver1/src/epos_comasuplstate.cpp
supl/locationomasuplprotocolhandler/protocolhandlerver2/eabi/eposomasuplprotocolhandler2u.def
supl/locationomasuplprotocolhandler/protocolhandlerver2/group/omasuplprotocolhandler2.mmp
supl/locationomasuplprotocolhandler/protocolhandlerver2/inc/epos_comasuplconnrequestor.h
supl/locationomasuplprotocolhandler/protocolhandlerver2/inc/epos_comasuplfallbackhandler.h
supl/locationomasuplprotocolhandler/protocolhandlerver2/inc/epos_comasuplprotocolmanager2.h
supl/locationomasuplprotocolhandler/protocolhandlerver2/inc/epos_comasuplsession2.h
supl/locationomasuplprotocolhandler/protocolhandlerver2/inc/epos_comasuplsettings.h
supl/locationomasuplprotocolhandler/protocolhandlerver2/src/epos_comasuplconnrequestor.cpp
supl/locationomasuplprotocolhandler/protocolhandlerver2/src/epos_comasupletel.cpp
supl/locationomasuplprotocolhandler/protocolhandlerver2/src/epos_comasuplfallbackhandler.cpp
supl/locationomasuplprotocolhandler/protocolhandlerver2/src/epos_comasuplinitstate.cpp
supl/locationomasuplprotocolhandler/protocolhandlerver2/src/epos_comasuplposinitstate.cpp
supl/locationomasuplprotocolhandler/protocolhandlerver2/src/epos_comasuplposrequestor.cpp
supl/locationomasuplprotocolhandler/protocolhandlerver2/src/epos_comasuplprotocolmanager2.cpp
supl/locationomasuplprotocolhandler/protocolhandlerver2/src/epos_comasuplsession2.cpp
supl/locationomasuplprotocolhandler/protocolhandlerver2/src/epos_comasuplsettings.cpp
supl/locationomasuplprotocolhandler/protocolhandlerver2/src/epos_comasuplstartstate.cpp
supl/locationomasuplprotocolhandler/protocolhandlerver2/src/epos_comasuplstate.cpp
supl/locationomasuplprotocolhandler/protocolhandlerver2/src/epos_comasupltriggerstartstate.cpp
supl/locationomasuplprotocolhandler/provisioninghandler/src/epos_comasuplsettingsrepository.cpp
supl/locationomasuplprotocolhandler/rom/omasuplprotocolhandler.iby
supl/locationomasuplprotocolhandler/supllistener/src/epos_comasuplimsiobserver.cpp
supl/locationomasuplprotocolhandler/supllistener/src/epos_comasuplproductconfig.cpp
supl/locationomasuplprotocolhandler/syncmlprovhandler/src/epos_comasupldmrepository.cpp
supl/locationomasuplprotocolhandler/waplistener/src/epos_comasuplwaplistener.cpp
supl/locationsuplfw/conf/suplsettings.confml
supl/locationsuplfw/conf/suplsettings_102073D6.crml
supl/locationsuplfw/gateway/inc/epos_csuplnetinitiatedsession.h
supl/locationsuplfw/gateway/src/epos_csuplipcsession.cpp
supl/locationsuplfw/gateway/src/epos_csuplipcsubsession.cpp
supl/locationsuplfw/gateway/src/epos_csuplnetinitiatedsession.cpp
supl/locationsuplfw/gateway/src/epos_csuplserver.cpp
supl/locationsuplfw/protocolhandlerapi/group/epos_suplprotocolhandlerplugin.mmp
supl/locationsuplfw/protocolhandlerapi/src/epos_csuplconnection.cpp
supl/locationsuplfw/protocolhandlerapi/src/epos_suplkey.cpp
supl/locationsuplfw/settingsapi/bwins/epos_suplsettingsu.def
supl/locationsuplfw/settingsapi/eabi/epos_suplsettingsu.def
supl/locationsuplfw/settingsapi/group/bld.inf
supl/locationsuplfw/settingsapi/inc/epos_csuplsettingsengine.h
supl/locationsuplfw/settingsapi/inc/epos_csuplsettingsinternalcrkeys.h
supl/locationsuplfw/settingsapi/inc/epos_csuplsettingsnotifier.h
supl/locationsuplfw/settingsapi/src/epos_csettingsdatabasehandler.cpp
supl/locationsuplfw/settingsapi/src/epos_csuplsettingparams.cpp
supl/locationsuplfw/settingsapi/src/epos_csuplsettings.cpp
supl/locationsuplfw/settingsapi/src/epos_csuplsettingsengine.cpp
supl/locationsuplfw/settingsapi/src/epos_csuplsettingsnotifier.cpp
supl/locationsuplfw/terminalinitiationapi/bwins/epos_suplterminitiationu.def
supl/locationsuplfw/terminalinitiationapi/eabi/epos_suplterminitiationu.def
supl/locationsuplfw/terminalinitiationapi/src/epos_suplterminalapi.cpp
supl/locationsuplfw/utilities/src/epos_csupltrace.cpp
sysdef_1_5_1.dtd
--- a/group/bld.inf	Mon May 03 12:54:42 2010 +0300
+++ b/group/bld.inf	Fri May 14 16:17:02 2010 +0300
@@ -21,7 +21,6 @@
 
 #include "../genericpositioningplugins/group/bld.inf"
 #include "../landmarks/group/bld.inf"
-#include "../locationmapnavfw/group/bld.inf"
 #include "../locationsystemui/group/bld.inf"
 #include "../supl/group/bld.inf"
 #include "../locationtriggering/group/bld.inf"
--- a/landmarks/locationlandmarks/server/src/EPos_CPosLmLocalAccessSubsession.cpp	Mon May 03 12:54:42 2010 +0300
+++ b/landmarks/locationlandmarks/server/src/EPos_CPosLmLocalAccessSubsession.cpp	Fri May 14 16:17:02 2010 +0300
@@ -752,7 +752,8 @@
         TPtr name( lmBuf->Des() );
         readStream.ReadL( name, nameLen );
         
-        if ( aMessage.Int0() == EPosLmServerUpdateLandmarks ) 
+        CleanupStack::Pop( lmBuf );//ownership of lmBuf is transferred in the call to UpdateL/InsertL
+		if ( aMessage.Int0() == EPosLmServerUpdateLandmarks ) 
             {
 //coverity[freed_arg : FALSE]
             index.UpdateL( id, lmBuf );
@@ -762,7 +763,6 @@
             index.InsertL( id, lmBuf );
             }
 //coverity[pass_freed_arg : FALSE]
-        CleanupStack::Pop( lmBuf );
         }
     
     readStream.Close();
--- a/landmarks/locationlandmarks/server/src/EPos_CPosLmNameIndex.cpp	Mon May 03 12:54:42 2010 +0300
+++ b/landmarks/locationlandmarks/server/src/EPos_CPosLmNameIndex.cpp	Fri May 14 16:17:02 2010 +0300
@@ -329,6 +329,9 @@
                 // the original item has been changed
                 item->SetInvalid();
                 }
+			
+			CleanupStack::Pop( name );//ownership of name is transferred in the call to DoInsertL	
+				
             // add new item for this ID
             // here comparison must be done using collation
             CIndexItem* newItem = DoInsertL( id, name ); // takes onwership of name
@@ -336,7 +339,6 @@
             
             TLinearOrder<CIndexItem> order( CIndexItem::CompareById );
             iIdSortedArray.InsertInOrder( newItem, order );
-            CleanupStack::Pop( name );
             }
         else
             {
@@ -440,8 +442,8 @@
 void CPosLmNameIndex::InsertL( TPosLmItemId aLmid, const TDesC& aName )
     {
     HBufC* name = aName.AllocLC();
+    CleanupStack::Pop( name );
     InsertL( aLmid, name );
-    CleanupStack::Pop( name );
     }
 
 //--------------------------------------------------------------------
@@ -459,13 +461,15 @@
 //
 CPosLmNameIndex::CIndexItem* CPosLmNameIndex::DoInsertL( TPosLmItemId aLmid, HBufC* aName )
     {
+	CleanupStack::PushL( aName );//ownership of aName is transferred to this class
     if ( Find( aLmid ) >= 0 ) // finds valid item
         {
         User::Leave( KErrAlreadyExists ); // duplicate ID found
         }
     
     CIndexItem* landmark = new (ELeave) CIndexItem( aLmid, aName ); // takes ownership of aName
-    CleanupStack::PushL( landmark );
+    CleanupStack::Pop( aName );
+	CleanupStack::PushL( landmark );
     
     TLmIndexNameKey key;
     iArray->InsertIsqAllowDuplicatesL( landmark, key );
@@ -487,7 +491,11 @@
 //
 void CPosLmNameIndex::AppendL( TPosLmItemId aLmid, HBufC* aName )
     {
+	//Ownership of aName is transferred in this call
+	CleanupStack::PushL( aName );
     CIndexItem* landmark = new (ELeave) CIndexItem( aLmid, aName );
+    CleanupStack::Pop( aName );
+
     CleanupStack::PushL( landmark );
     AppendL( landmark );
     CleanupStack::Pop( landmark );
@@ -527,8 +535,8 @@
         {
         iDataSize -= entry->Size();
         ASSERT( iDataSize >= 0 );
-        delete entry;
         iArray->Delete( aIndex );
+		delete entry;
         }
     else
         {
@@ -542,10 +550,10 @@
 void CPosLmNameIndex::UpdateL( TPosLmItemId aId, const TDesC& aName )
     {
     HBufC* name = aName.AllocLC();
+	CleanupStack::Pop( name );//ownership of name is transferred in the call to UpdateL
 //coverity[freed_arg : FALSE]
     UpdateL( aId, name );
 //coverity[pass_freed_arg : FALSE]
-    CleanupStack::Pop( name );
     }
 
 //--------------------------------------------------------------------
@@ -640,8 +648,8 @@
     for ( TInt i = 0; i < count; i++ ) 
         {
         CIndexItem* item = CIndexItem::NewLC( aIn );
+		CleanupStack::Pop( item ); //Ownership of item is transferred in the AppendL call
         AppendL( item ); // array takes ownership
-        CleanupStack::Pop( item );
         }
     iStatus = KErrNone;
     }
@@ -844,8 +852,8 @@
         CIndexItem* item = iArray->At( i );
         if ( !item->IsValid() )
             {
-            delete item;
             iArray->Delete( i );
+			delete item;
             }
         }
     }
@@ -878,8 +886,8 @@
             }
         else if ( !item->IsValid() )
             {
-            delete item;
             iArray->Delete( i );
+			delete item;
             }
         }
     iInTransaction = EFalse;
@@ -899,8 +907,8 @@
         CIndexItem* item = iArray->At( i );
         if ( item->IsTemp() )
             {
-            delete item;
             iArray->Delete( i );
+			delete item;
             }
         else if ( !item->IsValid() )
             {
--- a/locationmapnavfw/aiwprovider/data/1020690C.rss	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,88 +0,0 @@
-/*
-* Copyright (c) 1020 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:  ECom resource definitions for Map and Navigation AIW Provider
-*
-*/
-
-
-
-#include <eikon.rh>
-#include <ecom/registryinfov2.rh>
-#include <AiwCommon.hrh>
-
-#include "mnaiwprovideruids.hrh"
-
-// ---------------------------------------------------------------------------
-//  r_mn_aiwprovider_plugin
-//  This resource is needed by CAiwServiceHandler/ECom for
-//  finding out what plugins exist
-// ---------------------------------------------------------------------------
-//
-RESOURCE REGISTRY_INFO r_mn_aiwprovider_plugin
-	{
-	resource_format_version = RESOURCE_FORMAT_VERSION_2;
-	dll_uid = KMnAiwProviderDllUid;
-	interfaces =
-		{
-		INTERFACE_INFO
-			{
-			// aiw service class (menu/base)
-			interface_uid = KAiwClassBase;
-
-			implementations =
-				{
-				  IMPLEMENTATION_INFO
-					{
-					// unique aiw service id that identifies the exact service
-					implementation_uid = KMnAiwProviderBaseImplUid;
-
-					version_no = 1;
-					display_name = "Map and Navigation AIW Provider";
-					default_data = "application/x-landmark";
-					opaque_data = KAiwCmdMnShowMapStr "||"
-					              KAiwCmdMnNavigateToStr "||"
-					              KAiwCmdMnAddrByCoordStr "||"
-					              KAiwCmdMnCoordByAddrStr "||"
-					              KAiwCmdMnSelectFromMapStr;
-                    rom_only = 0;
-					}
-				};
-			},
-
-		INTERFACE_INFO
-			{
-			// aiw service class (menu/base)
-			interface_uid = KAiwClassMenu;
-
-			implementations =
-				{
-				  IMPLEMENTATION_INFO
-					{
-					// unique aiw service id that identifies the exact service
-					implementation_uid = KMnAiwProviderMenuImplUid;
-
-					version_no = 1;
-					display_name = "Map and Navigation AIW Provider";
-					default_data = "application/x-landmark";
-					opaque_data = KAiwCmdMnShowMapStr "||"
-					              KAiwCmdMnNavigateToStr "||"
-					              KAiwCmdMnAddrByCoordStr "||"
-					              KAiwCmdMnCoordByAddrStr "||"
-					              KAiwCmdMnSelectFromMapStr;
-                    rom_only = 0;
-					}
-				};
-			}
-		};
-	}
--- a/locationmapnavfw/aiwprovider/data/mnaiwproviderres.rss	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,158 +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:  Resource definitions for Map and Navigation AIW Provider
-*
-*/
-
-
-#include <eikon.rh>
-#include <avkon.rsg>
-#include <avkon.rh>
-
-NAME MNAP
-RESOURCE RSS_SIGNATURE { }
-RESOURCE TBUF { buf=""; }
-
-#include "mnaiwmenus.hrh"
-#include <mnaiwprovider.loc>
-
-// ---------------------------------------------------------------------------
-// r_mn_aiwmenu_showonmap
-// Show on map AIW menu item
-// ---------------------------------------------------------------------------
-//
-RESOURCE MENU_PANE r_mn_aiwmenu_show_on_map
-	{
-	items =
-		{
-		MENU_ITEM 
-		    { 
-		    command = EMnAiwMenuCmdShowOnMap;
-		    txt = qtn_mnn_option_show_on_map; 
-		    }
-		};
-	}
-
-// ---------------------------------------------------------------------------
-// r_mn_aiwmenu_navigateto
-// Navigate To AIW menu item
-// ---------------------------------------------------------------------------
-//
-RESOURCE MENU_PANE r_mn_aiwmenu_navigate_to
-	{
-	items =
-		{
-		MENU_ITEM 
-		    { 
-		    command = EMnAiwMenuCmdNavigateTo;
-		    txt = qtn_mnn_option_navigate_to; 
-		    }
-		};
-	}
-
-// ---------------------------------------------------------------------------
-// r_mn_aiwmenu_selectfrommap
-// Select From Map AIW menu item
-// ---------------------------------------------------------------------------
-//
-RESOURCE MENU_PANE r_mn_aiwmenu_select_from_map
-	{
-	items =
-		{
-		MENU_ITEM 
-		    { 
-		    command = EMnAiwMenuCmdSelectFromMap;
-		    txt = qtn_mnn_option_select_from_map; 
-		    }
-		};
-	}
-
-// ---------------------------------------------------------------------------
-// r_mn_option_fetch_coordinates
-// Retrieve coordinates AIW menu item
-// ---------------------------------------------------------------------------
-//
-RESOURCE MENU_PANE r_mn_aiwmenu_fetch_coordinates
-    {
-	items =
-		{
-		MENU_ITEM 
-		    { 
-		    command = EMnAiwMenuCmdFetchCoordinates;
-            txt = qtn_mnn_option_fetch_coordinates;
-		    }
-		};
-    }
-
-// ---------------------------------------------------------------------------
-// r_mn_option_fetch_address
-// Retrieve address AIW menu item
-// ---------------------------------------------------------------------------
-//
-RESOURCE MENU_PANE r_mn_aiwmenu_fetch_address    
-    {
-	items =
-		{
-		MENU_ITEM 
-		    { 
-		    command = EMnAiwMenuCmdFetchAddress;
-            txt = qtn_mnn_option_fetch_address;
-		    }
-		};
-    }
-
-// ---------------------------------------------------------------------------
-// r_mn_error_no_provider
-// No provider was able to serve for selected service
-// ---------------------------------------------------------------------------
-//
-RESOURCE TBUF r_mn_error_no_provider
-    {
-    buf = qtn_mnn_error_no_provider;
-    }
-
-// ---------------------------------------------------------------------------
-// r_mn_error_service_unavailable
-// Service is not available or failed in selected provider
-// ---------------------------------------------------------------------------
-//
-RESOURCE TBUF r_mn_error_service_unavailable
-    {
-    buf = qtn_mnn_service_unavailable_error;
-    }
-
-// ---------------------------------------------------------------------------
-// r_mn_provider_list_query
-// Provider selection query dialog
-// ---------------------------------------------------------------------------
-//
-RESOURCE AVKON_LIST_QUERY r_mn_provider_list_query
-    {
-    flags = EGeneralQueryFlags;
-    softkeys = R_AVKON_SOFTKEYS_OK_CANCEL;
-    items =
-        {
-        AVKON_LIST_QUERY_DLG_LINE
-            {
-            control = AVKON_LIST_QUERY_CONTROL
-                {
-                listtype = EAknCtSinglePopupMenuListBox;
-                listbox = AVKON_LIST_QUERY_LIST
-                    {
-                    };
-                heading = qtn_mnn_select_provider_query;
-                };
-            }
-        };
-    }
--- a/locationmapnavfw/aiwprovider/group/bld.inf	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,28 +0,0 @@
-/*
-* Copyright (c) 2005-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:  Build information file for Map and Navigation Framework project
-*
-*/
-
-
-#include <platform_paths.hrh>
-
-PRJ_PLATFORMS
-DEFAULT
-
-PRJ_EXPORTS
-../../loc/mnaiwprovider.loc        MW_LAYER_LOC_EXPORT_PATH(mnaiwprovider.loc)
-
-PRJ_MMPFILES
-mnaiwprovider.mmp
--- a/locationmapnavfw/aiwprovider/group/mnaiwprovider.mmp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,70 +0,0 @@
-/*
-* Copyright (c) 2005-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:  Project definition file for Map and Navigation AIW Provider
-*
-*/
-
-
-#include <data_caging_paths.hrh>
-#include <platform_paths.hrh>
-
-TARGET          mnaiwprovider.dll
-TARGETTYPE      PLUGIN
-UID             0x10009D8D 0x1020690C
-
-VENDORID        VID_DEFAULT
-CAPABILITY      CAP_ECOM_PLUGIN
-
-USERINCLUDE     .
-USERINCLUDE     ../inc
-USERINCLUDE     ../../loc
-
-MW_LAYER_SYSTEMINCLUDE
-SYSTEMINCLUDE   ../../inc
-
-SOURCEPATH      ../src
-
-SOURCE          mnaiwprovider.cpp
-SOURCE          mnaiwcommandhandlerbase.cpp
-SOURCE          mnmapviewcmdhandlerbase.cpp
-SOURCE          mnshowonmaphandler.cpp
-SOURCE          mnselectfrommaphandler.cpp
-SOURCE          mnnavigatetohandler.cpp
-SOURCE          mngeocodingcmdhandlerbase.cpp
-SOURCE          mnfetchaddresshandler.cpp
-SOURCE          mnfetchcoordinateshandler.cpp
-
-START RESOURCE  ../data/1020690C.rss
-TARGET          mnaiwprovider.rsc
-TARGETPATH      ECOM_RESOURCE_DIR
-END
-
-START RESOURCE  ../data/mnaiwproviderres.rss
-HEADER
-TARGET          mnaiwproviderres.rsc
-TARGETPATH      RESOURCE_FILES_DIR
-LANGUAGE_IDS
-END
-
-LIBRARY         euser.lib bafl.lib
-LIBRARY         servicehandler.lib apparc.lib
-LIBRARY         avkon.lib eikcore.lib cone.lib aknnotify.lib
-LIBRARY         lbs.lib eposlandmarks.lib mnclientlib.lib
-
-DEBUGLIBRARY    flogger.lib
-
-SMPSAFE
-
-// END OF FILE
-
--- a/locationmapnavfw/aiwprovider/inc/mnaiwcommandhandlerbase.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,265 +0,0 @@
-/*
-* Copyright (c) 2005-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:  CMnAiwCommandHandlerBase class declaration
-*
-*/
-
-
-#ifndef MN_AIWCOMMANDHANDLERBASE_H
-#define MN_AIWCOMMANDHANDLERBASE_H
-
-#include <e32base.h>
-#include <AiwCommon.h>
-#include <AknServerApp.h>
-#include <EPos_Landmarks.h>
-#include "mnprovider.h"
-#include "mnaiwservices.h"
-
-class CMnAiwCommandHandlerBase;
-class CPosLandmark;
-
-/** \internal 
- *  Callback for clients of @ref CMnAiwCommandHandlerBase.
- *  Used by CMnAiwProvider to destroy asynchronous handlers.
- */
-class MMnAsyncAiwCmdHandlerCallback
-    {
-    public:
-        /** Called by CMnAiwCommandHandlerBase-derived class, 
-         *  to notify completion of AIW command async handling.
-         *  @param aHandler pointer to completed command's handler
-         *  @param aResult result of the command execution
-         */
-        virtual void HandleAsyncAiwCmdCompletedL( 
-            CMnAiwCommandHandlerBase* aHandler, 
-            TInt aResult ) = 0;
-    };
-
-/** \internal 
- *  Callback for clients of @ref CMnAiwCommandHandlerBase.
- *  Used by CMnAiwProvider to destroy handlers, when provider is shutdown.
- */
-class MMnProviderExitCallback
-    {
-    public:
-        /** Called by CMnAiwCommandHandlerBase-derived class, 
-         *  to notify provider's exit.
-         *  @param aHandler pointer to completed command's handler
-         */
-        virtual void HandleProviderExit( 
-            CMnAiwCommandHandlerBase* aHandler ) = 0;
-    };
-
-/** \internal 
- *  Base class for AIW command handlers 
- */
-class CMnAiwCommandHandlerBase : public CActive, public MAknServerAppExitObserver
-    {
-    public:
-        /** Holder for AIW parameters */
-        class TAiwParameters
-            {
-            public:
-                TAiwParameters();
-                TAiwParameters(
-                    const CAiwGenericParamList& aInParamList,
-                    CAiwGenericParamList& aOutParamList,
-                    const MAiwNotifyCallback* aCallback
-                    );
-                
-                const CAiwGenericParamList&     InList() const;
-                CAiwGenericParamList&           OutList();
-                const MAiwNotifyCallback*       Callback() const;
-                
-            protected:        
-                const CAiwGenericParamList*     iInParamList;
-                CAiwGenericParamList*           iOutParamList;
-                const MAiwNotifyCallback*       iCallback;
-            };
-    
-        enum TRunMode
-            {
-            ERunModeDefault,
-            ERunModeChained,
-            ERunModeStandalone
-            };
-    
-    public:
-        /** Returns information about what Provider Application's 
-         *  facilities are needed to execute a particular command
-         */
-        static void AppServiceAndFeatureNeeded(
-            TInt aAiwServiceCommand, 
-            CMnProvider::TService& aServiceNeeded,
-            TInt& aFeaturesNeeded );
-            
-        /** Returns default execution mode for a command.
-         *  @param aAiwServiceCommand Command ID */    
-        static TRunMode DefaultRunMode( TInt aAiwServiceCommand );
-
-        /** Creates new command handler.
-         *  @param aAiwServiceCommand Command ID
-         *  @param[in] aAiwParams Initial AIW parameters. Needed to detect requested
-         *                        execution mode.
-         *  @return New instance of command handler
-         *  @leave KErrNotSupported If given command is not supported
-         */
-        static CMnAiwCommandHandlerBase* CreateHandlerL( 
-            TInt aAiwServiceCommand, 
-            CMnProvider& aProvider,
-            TRunMode aRunMode );
-
-        /** Analyzes TMnAiwCommonOptionsParam ( if present ) to see 
-         *  whether chained execution is needed.
-         *  @param aDefaultMode default value to return if parameter is not found in the list.
-         *  @return Execution mode requested in AIW parameters as defined in
-         *          TMnAiwCommonOptionsParam::iRunChained is ETrue.
-         */
-        static TRunMode RequestedRunModeL( const TAiwParameters& aAiwParams );
-
-        /** Analyzes TMnAiwCommonOptionsParamExtended ( if present ) to see 
-         *  whether provider application is specified.
-         *  @param[out] aProviderId provider application UID, if specified.
-         *  @return ETrue if provider application UID is specified, otherwise EFalse.
-         */
-        static TBool IsProviderSpecifiedL( 
-            const CMnAiwCommandHandlerBase::TAiwParameters& aAiwParams,
-            TInt& aProviderId );
-
-        /** Analyzes TMnAiwCommonOptionsParamExtended ( if present ) to see 
-         *  whether error messages are disabled.
-         *  @return ETrue if error messages are disables, otherwise EFalse.
-         */
-        static TBool IsErrorMessageDisabledL( 
-            const CMnAiwCommandHandlerBase::TAiwParameters& aAiwParams );
-
-    public:
-
-        /** Destructor */
-        virtual ~CMnAiwCommandHandlerBase();
-
-        /** Executes this command synchronously.
-         *  If provider exits, it is reported via MMnProviderExitCallback */
-        void StartL();
-
-        /** Starts asynchronous processing of this command. 
-         *  Completion of a command is reported via MMnAsyncAiwCmdHandlerCallback 
-         *  @param[in] aCallback Object to notify, when request is completed */
-        void Start( MMnAsyncAiwCmdHandlerCallback& aCallback );
-        
-        /** AIW service command id implemented by the handler */
-        virtual TInt CommandId() = 0;
-
-        /** Returns whether this command is asynchronous
-         *  Async commands must be started by StartL, sync commands - by ExecuteL */
-        virtual TBool IsAsyncCommand() = 0;
-
-        /** Returns AIW command parameters */
-        TAiwParameters& AiwParameters();
-        
-        /** Returns execution mode of the command */
-        TRunMode RunMode();
-        
-        /** Sets parameters for this command. */
-        void SetParametersL( const TAiwParameters& aParams );
-        
-        /** Called by before setting new parameters. Not called for the first time
-         *  this command is executed. */
-        virtual void ResetParametersL() = 0;
-        
-        virtual void SetExitObserverL( MMnProviderExitCallback& aExitCallback );
-
-        /** Returns reference to provider used by this command handler */
-        CMnProvider& Provider();
-
-    protected:
-        /** C++ constructor 
-         *  @param aProvider Provider Application to use
-         *  @param aAiwParameters Parameters sent to AIW Provider class
-         *  @param aCallback Observer of this command's completion if command
-         *                   is asynchronously executed
-         */
-        CMnAiwCommandHandlerBase( CMnProvider& aProvider );
-    
-        /** Symbian constructor. Must be called by derived classes */
-        void ConstructL();
-        
-        /** Reports completion of the command, when executed asynchronously
-         *  It should be safe to delete this object after this method is called.
-         *  Used by derived classes */
-        void Done( TInt aResult );
-
-        /** Starts processing of input AIW parameters. Parameters found are reported
-         *  via HandleAiwParam... handlers.
-         */
-        void ProcessAiwParametersL();
-
-        /** Finds common options parameter in given parameter list */
-        static TBool FindCommonOptionsL( 
-            const TAiwParameters& aAiwParams, 
-            TMnAiwCommonOptionsParamExtended& aCommonOptions );
-
-        /** Finds i-th landmark data in input parameter list */
-        TBool FindLandmarkData( TInt aIndex, TAiwGenericParam& aParam );
-
-        /** Reads landmark data from given AIW parameter */
-        void ReadLandmarkDataL( const TAiwGenericParam& aParam, TPtrC8& aLandmarkPtr );
-
-        /** Reads landmark database URI from given AIW parameter */
-        void ReadDatabaseUriL( const TAiwGenericParam& aParam, TPtrC& aDbUri );
-
-        /** Reads landmark ID from given AIW parameter */
-        TPosLmItemId ReadLandmarkId( const TAiwGenericParam& aParam );
-
-        /** Reads landmark ID list from given AIW parameter */
-        void ReadLandmarkIdListL( 
-            const TAiwGenericParam& aParam,
-            const TPosLmItemId*& aListPtr,
-            TInt& aListSize );
-
-        /** Appends given landmark to AIW output parameters list */
-        void WriteLandmarkL( const CPosLandmark& aLandmark );
-        
-        /** Appends given landmark to AIW output parameters list */
-        void WriteLandmarkL( TPosLmItemId aLandmarkId, const TDesC& aDatabaseUri );
-        
-    protected: // Virtual callbacks for parameter list parsing
-    
-        /** Called when ProcessAiwParametersL finds unknown AIW parameter */
-        virtual void HandleAiwParamL( const TAiwGenericParam& aParam );        
-        /** Called by ProcessAiwParametersL to report found landmarks */
-        virtual void HandleAiwParamLandmarksL( RArray<TPtrC8>& aLandmarkDataList );
-        /** Called by ProcessAiwParametersL to report found linked landmarks */
-        virtual void HandleAiwParamLandmarksListL( const TDesC& aDbUri, RArray<TPosLmItemId>& aLmIds );
-        
-    public: // from CActive
-        virtual void RunL();
-        virtual TInt RunError( TInt aError );
-        virtual void DoCancel();
-
-	protected: // from MAknServerAppExitObserver
-        virtual void HandleServerAppExit( TInt aReason );
-        virtual void DoStartL() = 0;
-
-	protected:
-        TRunMode    						iRunMode;
-
-    private:
-        CMnProvider&                    	iProvider;
-        TAiwParameters                  	iAiwParameters;
-        MMnAsyncAiwCmdHandlerCallback*   	iCallback;
-        MMnProviderExitCallback* 	        iExitCallback;
-    };
-
-#endif // MN_AIWCOMMANDHANDLERBASE_H
--- a/locationmapnavfw/aiwprovider/inc/mnaiwdebug.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,85 +0,0 @@
-/*
-* Copyright (c) 2005-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:  Debug macros
-*
-*/
-
-
-#ifndef MN_DEBUG_H
-#define MN_DEBUG_H
-
-#ifdef _DEBUG
-
-#include <e32base.h>
-
-inline void Panic( TInt aReason )
-    {
-    _LIT( KPanicCategory, "MnAiwProviderDebug" );
-    User::Panic( KPanicCategory, aReason );
-    }
-
-#include <e32svr.h>
-#include <e32std.h>
-#include <f32file.h>
-#include <flogger.h>
-
-_LIT(KLogFile, "mnlog.txt");
-_LIT(KLogDirFullName, "c:\\logs\\");
-_LIT(KLogDir, "mn");
-
-inline void Prefix( TDes& aMessage )
-    {
-    RProcess process;
-    _LIT( KPrefix, "[MnAiwProvider/%ld]: ");
-    aMessage.Format( KPrefix, process.Id().Id() );
-    }
-
-inline void Log( TRefByValue<const TDesC> aFmt, ... )
-    {
-    VA_LIST list;
-    VA_START( list, aFmt );
-
-    HBufC* buf = HBufC::New(512);
-    if ( buf )
-    	{
-    	TPtr ptr( buf->Des() );
-	    Prefix( ptr );
-	    ptr.AppendFormatList( aFmt, list );
-	
-	    RDebug::RawPrint( ptr );
-	    RFileLogger::Write( KLogDir, KLogFile, EFileLoggingModeAppend, ptr );
-
-	    delete buf;
-    	}
-    }
-
-#define LOG( a )             { Log( _L( a ) ); }
-#define LOG1( a, b )         { Log( _L( a ), b ); }
-#define LOG2( a, b, c )      { Log( _L( a ), b, c ); }
-#define LOG3( a, b, c, d )   { Log( _L( a ), b, c, d ); }
-#define LOG4( a, b, c, d, e )   { Log( _L( a ), b, c, d, e ); }
-
-#else // _DEBUG
-
-// Release version - no logging
-#define LOG( a)
-#define LOG1( a, b )
-#define LOG2( a, b, c)
-#define LOG3( a, b, c, d)
-#define LOG4( a, b, c, d, e )
-
-#endif // _DEBUG
-
-#endif // MN_DEBUG_H
-
--- a/locationmapnavfw/aiwprovider/inc/mnaiwinternal.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-/*
-* Copyright (c) 2005-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:  Internal constants for Map and Navigation FW
-*
-*/
-
-
-#ifndef MN_AIWINTERNAL_H
-#define MN_AIWINTERNAL_H
-
-// Map and Navigation AIW Provider resource file
-_LIT( KAiwResourceFile, "\\resource\\mnaiwproviderres.rsc" );
-_LIT( KAiwResourceFileOld, "\\resource\\mnaiwprovider.rsc" );
-
-const TBool KShowOnMapChainedByDefault = ETrue;
-const TBool KSelectFromMapChainedByDefault = ETrue;
-const TBool KNavigateToChainedByDefault = EFalse;
-const TBool KFetchCoordinatesChainedByDefault = ETrue;
-const TBool KFetchAddressChainedByDefault = ETrue;
-
-#endif // MN_AIWINTERNAL_H
--- a/locationmapnavfw/aiwprovider/inc/mnaiwmenus.hrh	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,31 +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:  Aiw menu item IDs for Map and Navigation AIW Provider
-*
-*/
-
-
-enum
-	{
-	EMnAiwMenuCmdMap = 100,
-	EMnAiwMenuCmdShowOnMap,
-	EMnAiwMenuCmdSelectFromMap,
-
-	EMnAiwMenuCmdNavigation = 200,
-    EMnAiwMenuCmdNavigateTo,
-
-	EMnAiwMenuCmdGeocoding = 300,
-    EMnAiwMenuCmdFetchCoordinates,
-    EMnAiwMenuCmdFetchAddress
-	};
--- a/locationmapnavfw/aiwprovider/inc/mnaiwprovider.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,204 +0,0 @@
-/*
-* Copyright (c) 2005-2007 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:  Map and Navigation AIW Provider menu class
-*
-*/
-
-
-#ifndef MN_AIW_PROVIDER_H
-#define MN_AIW_PROVIDER_H
-
-#include <e32base.h>
-#include <AiwServiceIfMenu.h>
-#include "mnaiwcommandhandlerbase.h"
-
-/**
- * CMnAiwProvider implements CAiwServiceIfMenu interface to
- * allow Map and Navigation functionality to be called via AIW.
- */
-class CMnAiwProvider : 
-	public CAiwServiceIfMenu, 
-	public MMnAsyncAiwCmdHandlerCallback,
-	public MMnProviderExitCallback
-    {
-    public:
-        static CMnAiwProvider* NewL();
-        ~CMnAiwProvider();
-        
-    protected:
-        
-        /** Retrieves command id from client's parameters list */
-        TInt GetAiwServiceCommandIdL( const CAiwGenericParamList& aInParamList );
-
-        /** Verifies if there is at least one provider application for
-         *  requested command
-         *  @param aAiwCommandId AIW service command ID
-         *  @return ETrue if any provider is found for the command
-         */
-        TBool IsServiceAvailableL( TInt aAiwCommandId );
-        
-        /** Searches for already open handler for specified command, 
-         *  provider and execution mode. This function returns
-         *  pointer to command handler, which matches all given criteria.
-         *  @param aAiwCommandId Command ID criterion.
-         *  @param aProvider Provider criterion.
-         *  @param aRunMode Execution mode criterion.
-         */ 
-        CMnAiwCommandHandlerBase* FindWorkingHandler( 
-            TInt aAiwCommandId,
-            const CMnProvider& aProvider, 
-            CMnAiwCommandHandlerBase::TRunMode aRunMode );
-        
-        /** Deletes command handler from internal list 
-         *  @param[in] aHandler The handler to remove */
-        void CloseHandler( CMnAiwCommandHandlerBase* aHandler );
-
-        /** Updates internal list of known provider applications */
-        void UpdateProvidersListL();
-
-		/** Closes and removes all handlers working with 
-		 *  specified provider.
-		 *  @param aProvider Handlers using this provider will be closed. */
-		void CloseHandlers( const CMnProvider* aProvider );
-
-		/** Closes and removes all handlers. This method is used by destructor. */
-		void CloseAllHandlers();
-
-        /** Find suitable providers for a given command */
-        void GetSuitableProvidersL( 
-            TInt aAiwCommandId, 
-            RPointerArray<CMnProvider>& aProviders );
-
-        /** Finds amount of providers available for given command */
-        TInt NumSuitableProviders( TInt aAiwCommandId );
-
-        /** Returns preferred provider application for a given command
-         *  This may involve asking user via list query popup if several 
-         *  suitable providers found.
-         *  @leave KErrCancel if user cancels selection
-         *  @leave KErrNotFound if no providers available
-         */
-        CMnProvider& SelectProviderL( 
-            TInt aAiwCommandId,
-            CMnAiwCommandHandlerBase::TAiwParameters& aAiwParams );
-        
-        /** Pops up list query dialog for user to select preferred Provider Application */
-        void ExecuteSelectionDialogL( 
-            TInt& aIndex, 
-            RPointerArray<CMnProvider>& aProviders );
-
-        /** Verifies result of a command. Checks whether command may be completed. 
-         *  Pops up error note if error happened and restarts command if more than one
-         *  provider is available for this command
-         */
-        void ProcessAiwCommandResultL( 
-            TInt aAiwCommandId, 
-            CMnAiwCommandHandlerBase::TAiwParameters& aAiwParams,
-            TInt aResult, TBool& aStop );
-        
-        /** Executes synchronous command */
-        void ProcessSyncAiwCommandL(
-            TInt aCommandId, 
-            CMnAiwCommandHandlerBase::TAiwParameters& aAiwParams );
-            
-        /** Attempts to start execution of asynchronous command until success
-         *  or user refuses to continue
-         */
-        void StartAsyncAiwCommandL(
-            TInt aCommandId,    
-            CMnAiwCommandHandlerBase::TAiwParameters& aAiwParams );
-
-        /** Starts execution of asynchronous command */
-        CMnAiwCommandHandlerBase* DoStartAsyncAiwCommandL(
-            TInt aCommandId,    
-            CMnAiwCommandHandlerBase::TAiwParameters& aAiwParams,
-            TBool& aProviderFound );
-
-        /** Finds running handler, or creates new */
-        CMnAiwCommandHandlerBase* HandlerL(
-            TInt aCommandId,
-            CMnAiwCommandHandlerBase::TAiwParameters& aAiwParams );
-
-        /** Informs AIW observer about completion of async command */
-        void NotifyAiwObserver( 
-            TInt aCommandId,
-            CMnAiwCommandHandlerBase::TAiwParameters& aAiwParams, 
-            TInt aResult );
-
-        /** Shows error note with text specified by parameter */            
-        void ErrorNote( TInt aResourceId );
-        void DoErrorNoteL( TInt aResourceId );
-        
-    private:
-        /**
-        * C++ default constructor.
-        */
-        CMnAiwProvider();
-
-        /**
-        * By default Symbian OS constructor is private.
-        */
-        void ConstructL();
-        
-    public: // from CAiwServiceIfBase
-
-        void InitialiseL( 
-            MAiwNotifyCallback& aFrameworkCallback, 
-            const RCriteriaArray& aInterest );
-
-        void HandleServiceCmdL(
-            const TInt& aCmdId,
-            const CAiwGenericParamList& aInParamList,
-            CAiwGenericParamList& aOutParamList,
-            TUint aCmdOptions = 0,
-            const MAiwNotifyCallback* aCallback = NULL);
-
-    public: // from CAiwServiceIfMenu
-
-        void InitializeMenuPaneL(
-            CAiwMenuPane& aMenuPane,
-            TInt aIndex,
-            TInt aCascadeId,
-            const CAiwGenericParamList& aInParamList);
-
-        void HandleMenuCmdL(
-            TInt aMenuCmdId,
-            const CAiwGenericParamList& aInParamList,
-            CAiwGenericParamList& aOutParamList,
-            TUint aCmdOptions = 0,
-            const MAiwNotifyCallback* aCallback = NULL);
-            
-    public: // from MMnAsyncAiwCmdHandlerCallback
-    
-        void HandleAsyncAiwCmdCompletedL( CMnAiwCommandHandlerBase* aHandler, TInt aResult );
-
-    public: // from MMnChainedAiwCmdHandlerCallback
-    
-        void HandleProviderExit( CMnAiwCommandHandlerBase* aHandler );
-
-    private:
-        RPointerArray<CMnAiwCommandHandlerBase> iHandlers;
-        RPointerArray<CMnProvider>  			iMnProviders;
-        
-        CAiwGenericParamList*       			iEventList;
-        
-        // not-owned shortcut
-        CEikonEnv*                  			iEikon;
-        TInt                        			iResourceOffset;
-        TFileName                   			iResourceFilename;
-    };
-    
-
-#endif  // MN_AIW_PROVIDER_H
-
--- a/locationmapnavfw/aiwprovider/inc/mnaiwprovideruids.hrh	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
-/*
-* Copyright (c) 2005-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:  UIDs of Map and Navigation AIW Provider
-*
-*/
-
-
-#ifndef MN_AIW_PROVIDER_UIDS_HRH
-#define MN_AIW_PROVIDER_UIDS_HRH
-
-#define KMnAiwProviderDllUid    	0x1020690C
-#define KMnAiwProviderBaseImplUid   0x1020690D
-#define KMnAiwProviderMenuImplUid   0x1020690E
-
-#endif // MN_AIW_PROVIDER_UIDS_HRH
--- a/locationmapnavfw/aiwprovider/inc/mnfetchaddresshandler.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,51 +0,0 @@
-/*
-* Copyright (c) 2005-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:  CMnMapViewCmdHandlerBase class declaration
-*
-*/
-
-
-#ifndef MN_FETCHADDRESSHANDLER_H
-#define MN_FETCHADDRESSHANDLER_H
-
-#include "mngeocodingcmdhandlerbase.h"
-
-/** \internal
- *  Handler for KAiwCmdMnAddrByCoord command
- */
-class CMnFetchAddressHandler : public CMnGeocodingCmdHandlerBase
-    {
-    public:
-        static CMnFetchAddressHandler* NewL( 
-            CMnProvider& aProvider, 
-            TRunMode aRunMode );
-            
-    public: // from CMnAiwCommandHandlerBase
-        TInt CommandId() { return KAiwCmdMnAddrByCoord; };
-        TBool IsAsyncCommand() { return ETrue; };
-
-    protected:
-        CMnFetchAddressHandler( CMnProvider& aProvider );
-            
-        void ConstructL( TRunMode aRunMode );
-
-    protected: // from CMnAiwCommandHandlerBase
-        void DoStartL();
-
-    protected: // from CActive
-        void RunL();
-        void DoCancel();
-    };
-
-#endif // MN_FETCHADDRESSHANDLER_H
--- a/locationmapnavfw/aiwprovider/inc/mnfetchcoordinateshandler.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,57 +0,0 @@
-/*
-* Copyright (c) 2005-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:  CMnFetchCoordinatesHandler class declaration
-*
-*/
-
-
-#ifndef MN_FETCHCOORDINATESHANDLER_H
-#define MN_FETCHCOORDINATESHANDLER_H
-
-#include "mngeocodingcmdhandlerbase.h"
-
-/** \internal
- *  Handler fo KAiwCmdMnCoordByAddr AIW command
- */
-class CMnFetchCoordinatesHandler : public CMnGeocodingCmdHandlerBase
-    {
-    public:
-        static CMnFetchCoordinatesHandler* NewL( 
-            CMnProvider& aProvider, TRunMode aRunMode );
-
-    public: // from CMnAiwCommandHandlerBase
-        void Start();
-        TInt CommandId() { return KAiwCmdMnCoordByAddr; };
-        TBool IsAsyncCommand() { return ETrue; };
-
-    protected:
-        CMnFetchCoordinatesHandler( CMnProvider& aProvider );
-            
-        void ConstructL( TRunMode aRunMode );
-
-    protected: // from CActive
-        void RunL();
-        void DoCancel();
-
-    protected: // from CMnAiwCommandHandlerBase
-        void HandleAiwParamL( const TAiwGenericParam& aParam );
-        void HandleAiwParamLandmarksL( RArray<TPtrC8>& aLandmarkDataList );
-        void ResetParametersL();
-        void DoStartL();
-
-    protected:
-        TPtrC   iPlainAddress;
-    };
-
-#endif // MN_FETCHCOORDINATESHANDLER_H
--- a/locationmapnavfw/aiwprovider/inc/mngeocodingcmdhandlerbase.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,63 +0,0 @@
-/*
-* Copyright (c) 2005-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:  CMnGeocodingCmdHandlerBase class declaration
-*
-*/
-
-
-#ifndef MN_GEOCODINGCMDHANDLERBASE_H
-#define MN_GEOCODINGCMDHANDLERBASE_H
-
-#include "mnaiwcommandhandlerbase.h"
-
-class CMnGeocoder;
-
-/** \internal
- *  Base class for Geocoding-related AIW commands
- */
-class CMnGeocodingCmdHandlerBase : public CMnAiwCommandHandlerBase
-    {
-    public:
-        ~CMnGeocodingCmdHandlerBase();
-        
-    protected:
-        CMnGeocodingCmdHandlerBase( CMnProvider& aProvider );
-            
-        void ConstructL( TRunMode aRunMode );
-        
-        CMnGeocoder& Geocoder();
-
-        /** Reads contents of EGenericParamMnGeocodingOptions parameter */
-        void ReadGeocodingOptionsL( 
-            const TAiwGenericParam& aParam,
-            TMnAiwGeocodingOptionsParam& aGeoOptions );
-
-	public: // from CMnAiwCommandHandlerBase
-
-        void SetExitObserverL( MMnProviderExitCallback& aExitCallback );
-
-    protected: // from CMnAiwCommandHandlerBase
-    
-        void HandleAiwParamL( const TAiwGenericParam& aParam );
-        void HandleAiwParamLandmarksL( RArray<TPtrC8>& aLandmarkDataList );
-        void ResetParametersL();
-
-    protected:
-        TPtrC8          iLandmarkData;
-            
-    private:
-        CMnGeocoder*    iGeocoder;            
-    };
-
-#endif // MN_GEOCODINGCMDHANDLERBASE_H
--- a/locationmapnavfw/aiwprovider/inc/mnmapviewcmdhandlerbase.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,62 +0,0 @@
-/*
-* Copyright (c) 2005-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:  CMnMapViewCmdHandlerBase class declaration
-*
-*/
-
-
-#ifndef MN_MAPVIEWCMDHANDLERBASE_H
-#define MN_MAPVIEWCMDHANDLERBASE_H
-
-#include "mnaiwcommandhandlerbase.h"
-
-class CMnMapView;
-
-/** \internal
- *  Base class for MapView-related AIW commands
- */
-class CMnMapViewCmdHandlerBase : public CMnAiwCommandHandlerBase
-    {
-    public:
-        ~CMnMapViewCmdHandlerBase();
-        
-    protected:
-        CMnMapViewCmdHandlerBase( CMnProvider& aProvider );
-            
-        void ConstructL( TRunMode aRunMode );
-        
-        CMnMapView& MapView();
-
-        /** Reads contents of EGenericParamMnMapOptions parameter */
-        void ReadMapOptionsL( 
-            const TAiwGenericParam& aParam,
-            TMnAiwMapViewOptionsParam& aMapOptions );
-
-	public: // from CMnAiwCommandHandlerBase
-
-        void SetExitObserverL( MMnProviderExitCallback& aExitCallback );
-
-    protected: // from CMnAiwCommandHandlerBase
-    
-        void HandleAiwParamL( const TAiwGenericParam& aParam );
-        void HandleAiwParamLandmarksL( RArray<TPtrC8>& aLandmarkDataList );
-        void HandleAiwParamLandmarksListL( const TDesC& aDbUri, RArray<TPosLmItemId>& aLmIds );
-        void ResetParametersL();
-        
-    protected:
-        CMnMapView* iMapView;            
-    };
-    
-#endif //  MN_MAPVIEWCMDHANDLERBASE_H
-    
\ No newline at end of file
--- a/locationmapnavfw/aiwprovider/inc/mnnavigatetohandler.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,59 +0,0 @@
-/*
-* Copyright (c) 2005-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:  CMnNavigateToHandler class declaration
-*
-*/
-
-
-#ifndef MN_NAVIGATETOHANDLER_H
-#define MN_NAVIGATETOHANDLER_H
-
-#include "mnaiwcommandhandlerbase.h"
-
-class CMnNavigator;
-
-/** \internal
- *  Handler for KAiwCmdMnNavigateTo command 
- */
-class CMnNavigateToHandler : public CMnAiwCommandHandlerBase
-    {
-    public:
-        static CMnNavigateToHandler* NewL(
-            CMnProvider& aProvider,
-            TRunMode aRunMode );
-            
-        ~CMnNavigateToHandler();            
-        
-    public: // from CMnAiwCommandHandlerBase
-        TInt CommandId() { return KAiwCmdMnNavigateTo; };
-        TBool IsAsyncCommand() { return EFalse; };
-        
-        void SetExitObserverL( MMnProviderExitCallback& aExitCallback );
-
-    protected:
-        CMnNavigateToHandler( CMnProvider& aProvider );
-            
-        void ConstructL( TRunMode aRunMode );            
-
-    protected: // from CMnAiwCommandHandlerBase
-        void HandleAiwParamLandmarksL( RArray<TPtrC8>& aLandmarkDataList );
-        void ResetParametersL();
-        void DoStartL();
-
-    private:        
-        CMnNavigator*   iNavigator;
-        TPtrC8          iLandmarkData;
-    };
-
-#endif // MN_NAVIGATETOHANDLER_H
--- a/locationmapnavfw/aiwprovider/inc/mnselectfrommaphandler.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,55 +0,0 @@
-/*
-* Copyright (c) 2005-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:  CMnSelectFromMapHandler class declaration
-*
-*/
-
-
-#ifndef MN_SELECTFROMMAPHANDLER_H
-#define MN_SELECTFROMMAPHANDLER_H
-
-#include "mnmapviewcmdhandlerbase.h"
-
-/** \internal 
- *  Handler for KAiwCmdMnSelectFromMap command 
- */
-class CMnSelectFromMapHandler : public CMnMapViewCmdHandlerBase
-    {
-    public:
-        static CMnSelectFromMapHandler* NewL( 
-            CMnProvider& aProvider, 
-            TRunMode aRunMode );
-            
-    public: // from CMnAiwCommandHandlerBase
-        TInt CommandId() { return KAiwCmdMnSelectFromMap; };
-        TBool IsAsyncCommand() { return ETrue; };
-
-    protected:
-        CMnSelectFromMapHandler( CMnProvider& aProvider );
-            
-        void ConstructL( TRunMode aRunMode );
-        
-    protected: // from CActive
-        void RunL();
-        void DoCancel();
-
-    protected: // from CMnAiwCommandHandlerBase
-
-        /** Processes EGenericParamRequestText parameter */
-        void HandleAiwParamL( const TAiwGenericParam& aParam );
-
-        void DoStartL();
-    };
-
-#endif // MN_SELECTFROMMAPHANDLER_H
--- a/locationmapnavfw/aiwprovider/inc/mnshowonmaphandler.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +0,0 @@
-/*
-* Copyright (c) 2005-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:  CMnShowOnMapHandler class declaration
-*
-*/
-
-
-#ifndef MN_SHOWMAPHANDLER_H
-#define MN_SHOWMAPHANDLER_H
-
-#include "mnmapviewcmdhandlerbase.h"
-
-/** \internal
- *  Handler for KAiwCmdMnShowMap command 
- */
-class CMnShowOnMapHandler : public CMnMapViewCmdHandlerBase
-    {
-    public:
-        static CMnShowOnMapHandler* NewL(
-            CMnProvider& aProvider,
-            TRunMode aRunMode );
-        
-    public: // from CMnAiwCommandHandlerBase
-        TInt CommandId() { return KAiwCmdMnShowMap; };
-        TBool IsAsyncCommand() { return EFalse; };
-
-    protected:
-        CMnShowOnMapHandler( CMnProvider& aProvider );
-            
-        void ConstructL( TRunMode aRunMode );            
-
-    protected: // from CMnAiwCommandHandlerBase
-        void DoStartL();
-    };
-    
-#endif // MN_SHOWMAPHANDLER_H    
\ No newline at end of file
--- a/locationmapnavfw/aiwprovider/src/mnaiwcommandhandlerbase.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,690 +0,0 @@
-/*
-* Copyright (c) 2005-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:  CMnAiwCommandHandlerBase class implementation
-*
-*/
-
-
-#include <AiwCommon.h>
-#include <AiwCommon.hrh>
-#include <AiwGenericParam.h>
-#include <AiwGenericParam.hrh>
-
-#include <EPos_Landmarks.h>
-#include <EPos_CPosLandmark.h>
-#include <epos_poslandmarkserialization.h>
-
-#include <aknlistquerydialog.h>
-
-#include <mnprovider.h>
-#include <mnproviderfinder.h>
-#include <mnappservices.hrh>
-
-#include "mnaiwdebug.h"
-#include "mnaiwinternal.h"
-#include "mnaiwservices.h"
-
-#include "mnshowonmaphandler.h"
-#include "mnselectfrommaphandler.h"
-#include "mnnavigatetohandler.h"
-#include "mnfetchaddresshandler.h"
-#include "mnfetchcoordinateshandler.h"
-
-#include "mnaiwcommandhandlerbase.h"
-
-// ================= LOCAL FUNCTIONS =======================
-
-// ================= MEMBER FUNCTIONS =======================
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CMnAiwCommandHandlerBase::CMnAiwCommandHandlerBase( CMnProvider& aProvider )
-:   CActive( CActive::EPriorityStandard ),
-    iProvider( aProvider )
-    {
-    CActiveScheduler::Add( this );
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CMnAiwCommandHandlerBase::~CMnAiwCommandHandlerBase()
-    {
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnAiwCommandHandlerBase::ConstructL()
-    {
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnAiwCommandHandlerBase::AppServiceAndFeatureNeeded(
-    TInt aAiwServiceCommand, 
-    CMnProvider::TService& aServiceNeeded,
-    TInt& aFeaturesNeeded )
-    {
-    switch ( aAiwServiceCommand )
-        {
-        case KAiwCmdMnShowMap:
-            aServiceNeeded = CMnProvider::EServiceMapView;
-            aFeaturesNeeded = KMnSvcFeatureShowMap;
-            break;
-    
-        case KAiwCmdMnSelectFromMap:
-            aServiceNeeded = CMnProvider::EServiceMapView;
-            aFeaturesNeeded = KMnSvcFeatureSelectFromMap;
-            break;
-    
-        case KAiwCmdMnNavigateTo: 
-            aServiceNeeded = CMnProvider::EServiceNavigation;
-            aFeaturesNeeded = KMnSvcFeatureNavigateTo;
-            break;
-    
-        case KAiwCmdMnCoordByAddr: 
-            aServiceNeeded = CMnProvider::EServiceGeocoding;
-            aFeaturesNeeded = KMnSvcFeatureAddrToCoord;
-            break;
-    
-        case KAiwCmdMnAddrByCoord:         
-            aServiceNeeded = CMnProvider::EServiceGeocoding;
-            aFeaturesNeeded = KMnSvcFeatureCoordToAddr;
-            break;
-            
-        default:            
-            aServiceNeeded = CMnProvider::EServiceNone;
-            aFeaturesNeeded = 0;
-            break;
-        }
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CMnAiwCommandHandlerBase::TRunMode CMnAiwCommandHandlerBase::DefaultRunMode( 
-    TInt aAiwServiceCommand )
-    {
-    switch ( aAiwServiceCommand )
-        {
-        case KAiwCmdMnShowMap:
-            return KShowOnMapChainedByDefault ? ERunModeChained : ERunModeStandalone;
-    
-        case KAiwCmdMnSelectFromMap:
-            return KSelectFromMapChainedByDefault ? ERunModeChained : ERunModeStandalone;
-    
-        case KAiwCmdMnNavigateTo: 
-            return KNavigateToChainedByDefault ? ERunModeChained : ERunModeStandalone;
-    
-        case KAiwCmdMnCoordByAddr: 
-            return KFetchCoordinatesChainedByDefault ? ERunModeChained : ERunModeStandalone;
-    
-        case KAiwCmdMnAddrByCoord:         
-            return KFetchAddressChainedByDefault ? ERunModeChained : ERunModeStandalone;
-            
-        default:            
-            return ERunModeDefault;
-        }
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CMnAiwCommandHandlerBase* CMnAiwCommandHandlerBase::CreateHandlerL( 
-    TInt aAiwServiceCommand, 
-    CMnProvider& aProvider,
-    TRunMode aRunMode )
-    {
-    CMnAiwCommandHandlerBase* handler = NULL;
-    switch ( aAiwServiceCommand )
-        {
-        case KAiwCmdMnShowMap:
-            handler = CMnShowOnMapHandler::NewL( aProvider, aRunMode );
-            break;
-
-        case KAiwCmdMnNavigateTo:
-            handler = CMnNavigateToHandler::NewL( aProvider, aRunMode );
-            break;
-
-        case KAiwCmdMnSelectFromMap:
-            handler = CMnSelectFromMapHandler::NewL( aProvider, aRunMode );
-            break;
-
-        case KAiwCmdMnAddrByCoord:
-            handler = CMnFetchAddressHandler::NewL( aProvider, aRunMode );
-            break;
-
-        case KAiwCmdMnCoordByAddr:
-            handler = CMnFetchCoordinatesHandler::NewL( aProvider, aRunMode );
-            break;
-
-        default:
-            User::Leave( KErrNotSupported );
-            break;
-        }
-        
-    return handler;
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnAiwCommandHandlerBase::SetParametersL( const TAiwParameters& aAiwParameters )
-    {
-    __ASSERT_DEBUG( !IsActive(), Panic( KErrGeneral ) );
-    iAiwParameters = aAiwParameters;
-    ProcessAiwParametersL();
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnAiwCommandHandlerBase::ResetParametersL()
-    {
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnAiwCommandHandlerBase::StartL()
-    {
-    DoStartL();
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnAiwCommandHandlerBase::Start( MMnAsyncAiwCmdHandlerCallback& aCallback )
-    {
-    LOG("CMnAiwCommandHandlerBase::Start in");
-    
-    iCallback = &aCallback;
-    __ASSERT_DEBUG( iCallback, Panic( KErrGeneral ) );
-    
-    TInt err = KErrNone;
-    TRAP( err, DoStartL() );
-    if ( err )
-        {
-        Done( err );
-        }
-    else
-        {
-        SetActive();
-        }
-    
-    LOG("CMnAiwCommandHandlerBase::Start out");
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CMnAiwCommandHandlerBase::TAiwParameters& CMnAiwCommandHandlerBase::AiwParameters()
-    {
-    return iAiwParameters;
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CMnAiwCommandHandlerBase::TRunMode CMnAiwCommandHandlerBase::RunMode()
-	{
-	return iRunMode;
-	}
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnAiwCommandHandlerBase::SetExitObserverL( 
-	MMnProviderExitCallback& aExitCallback )
-	{
-	iExitCallback = &aExitCallback;
-	}
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CMnProvider& CMnAiwCommandHandlerBase::Provider()
-    {
-    return iProvider;
-    }
-
-// ================= INTERNAL FUNCTIONS =======================
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnAiwCommandHandlerBase::Done( TInt aResult )
-    {
-    TRAP_IGNORE( iCallback->HandleAsyncAiwCmdCompletedL( this, aResult ) );
-    } 
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnAiwCommandHandlerBase::ProcessAiwParametersL()
-    {
-    LOG("CMnAiwCommandHandlerBase::ProcessAiwParametersL in");
-
-    RArray<TPtrC8> lmBuffers;
-    CleanupClosePushL( lmBuffers );
-
-    TPtrC dbUri;
-    RArray<TPosLmItemId> lmIds;
-    CleanupClosePushL( lmIds );
-    
-    for ( TInt i = 0; i < AiwParameters().InList().Count(); i++ )
-        {
-        const TAiwGenericParam& param = AiwParameters().InList()[i];
-        switch ( param.SemanticId() )
-            {
-            case EGenericParamMnCommonOptions:
-                //LOG("CMnAiwCommandHandlerBase::ProcessAiwParametersL, CommonOptions");
-                // already handled
-                break;
-                
-            case EGenericParamLandmark:
-                //LOG("CMnAiwCommandHandlerBase::ProcessAiwParametersL, Landmark");
-                {
-                TPtrC8 lmData;
-                ReadLandmarkDataL( param, lmData );
-                lmBuffers.AppendL( lmData );
-                break;
-                }
-            case EGenericParamLandmarkDatabase:
-                //LOG("CMnAiwCommandHandlerBase::ProcessAiwParametersL, LandmarkDatabase");
-                {
-                if ( dbUri.Length() && lmIds.Count() )
-                    {
-                    HandleAiwParamLandmarksListL( dbUri, lmIds );
-                    dbUri.Set( NULL, 0 );
-                    lmIds.Reset();
-                    }
-                ReadDatabaseUriL( param, dbUri );
-                break;
-                }
-            case EGenericParamLandmarkId:
-                //LOG("CMnAiwCommandHandlerBase::ProcessAiwParametersL, LandmarkId");
-                {
-                if ( dbUri.Length() )
-                    {
-                    TPosLmItemId lmId = ReadLandmarkId( param );
-                    lmIds.AppendL( lmId );
-                    }
-                else
-                    {
-                    User::Leave( KErrArgument );
-                    }
-                break;
-                }
-            case EGenericParamLandmarkIdList:
-                //LOG("CMnAiwCommandHandlerBase::ProcessAiwParametersL, LandmarkIdList");
-                {
-                if ( dbUri.Length() )
-                    {
-                    TInt numLmIds = 0;
-                    const TPosLmItemId* lmIdList = NULL;
-                    ReadLandmarkIdListL( param, lmIdList, numLmIds );
-                    for ( TInt i = 0; i < numLmIds; i++ )
-                        {
-                        lmIds.AppendL( *(lmIdList + i) );
-                        }
-                    }
-                else
-                    {
-                    User::Leave( KErrArgument );
-                    }
-                break;
-                }
-            default:
-                HandleAiwParamL( param );                
-            }
-        }
-
-    if ( lmBuffers.Count() )
-        {
-        HandleAiwParamLandmarksL( lmBuffers );
-        }
-        
-    if ( dbUri.Length() && lmIds.Count() )
-        {
-        HandleAiwParamLandmarksListL( dbUri, lmIds );
-        }
-        
-    CleanupStack::PopAndDestroy( &lmIds );
-    CleanupStack::PopAndDestroy( &lmBuffers );
-    LOG("CMnAiwCommandHandlerBase::ProcessAiwParametersL out");
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CMnAiwCommandHandlerBase::TRunMode CMnAiwCommandHandlerBase::RequestedRunModeL( 
-    const CMnAiwCommandHandlerBase::TAiwParameters& aAiwParams )
-    {
-    TMnAiwCommonOptionsParamExtended commonOptionsExtended;
-
-    if ( FindCommonOptionsL( aAiwParams, commonOptionsExtended ) )
-        {
-        if ( commonOptionsExtended.iFieldsSet & EMnAiwCommonOptionsFieldRunChained )
-            {
-            return commonOptionsExtended.iRunChained ? ERunModeChained : ERunModeStandalone;
-            }
-        }
-    return ERunModeDefault;
-    }
-    
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-TBool CMnAiwCommandHandlerBase::IsProviderSpecifiedL( 
-    const CMnAiwCommandHandlerBase::TAiwParameters& aAiwParams,
-    TInt& aProviderId )
-    {
-    TMnAiwCommonOptionsParamExtended commonOptionsExtended;
-    if ( FindCommonOptionsL( aAiwParams, commonOptionsExtended ) )
-        {
-        if ( commonOptionsExtended.iFieldsSet & EMnAiwCommonOptionsFieldProviderId )
-            {
-            aProviderId = commonOptionsExtended.iProviderId;
-            return ETrue;
-            }
-        }
-    return EFalse;
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-TBool CMnAiwCommandHandlerBase::IsErrorMessageDisabledL( 
-    const CMnAiwCommandHandlerBase::TAiwParameters& aAiwParams )
-    {
-    TMnAiwCommonOptionsParamExtended commonOptionsExtended;
-    if ( FindCommonOptionsL( aAiwParams, commonOptionsExtended ) )
-        {
-        if ( commonOptionsExtended.iFieldsSet & EMnAiwCommonOptionsFieldMessagesDisabled )
-            {
-            return commonOptionsExtended.iMessagesDisabled;
-            }
-        }
-    return EFalse;
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-TBool CMnAiwCommandHandlerBase::FindCommonOptionsL( 
-    const TAiwParameters& aAiwParams,
-    TMnAiwCommonOptionsParamExtended& aCommonOptions )
-    {
-    TInt indexOptions = 0;
-    aAiwParams.InList().FindFirst( indexOptions, EGenericParamMnCommonOptions, EVariantTypeDesC8 );
-    if ( indexOptions != KErrNotFound )
-        {
-        const TAiwVariant& value = aAiwParams.InList()[indexOptions].Value();
-        TPtrC8 data( value.AsData() ); 
-        if ( data.Size() == sizeof( TMnAiwCommonOptionsParamExtended ) )
-            {
-            TPckg<TMnAiwCommonOptionsParamExtended> optionsPack( aCommonOptions );
-            optionsPack.Copy( data );
-            return ETrue;
-            }
-        else if ( data.Size() == sizeof( TMnAiwCommonOptionsParam ) )
-            {
-            TMnAiwCommonOptionsParam commonOptions;
-            TPckg<TMnAiwCommonOptionsParam> optionsPack( commonOptions );
-            optionsPack.Copy( data );
-            aCommonOptions.iFieldsSet = EMnAiwCommonOptionsFieldRunChained;
-            aCommonOptions.iRunChained = commonOptions.iRunChained;
-            return ETrue;
-            }
-        }
-    return EFalse;        
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnAiwCommandHandlerBase::ReadLandmarkDataL( const TAiwGenericParam& aParam, TPtrC8& aLandmarkPtr )
-    {
-    aLandmarkPtr.Set( aParam.Value().AsData() );
-    // verify it
-    CPosLandmark* lm = PosLandmarkSerialization::UnpackL( aLandmarkPtr );
-    delete lm;
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-TBool CMnAiwCommandHandlerBase::FindLandmarkData( TInt aIndex, TAiwGenericParam& aParam )
-    {
-    TInt found = -1;
-    for ( TInt i = 0; i < AiwParameters().InList().Count(); i++ )
-        {
-        const TAiwGenericParam& param = AiwParameters().InList()[i];
-        if ( param.SemanticId() == EGenericParamLandmark )
-            {
-            found++;
-            }
-        if ( found == aIndex )
-            {
-            aParam = param;
-            return ETrue;
-            }
-        }
-        
-    return EFalse;        
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnAiwCommandHandlerBase::ReadDatabaseUriL( const TAiwGenericParam& aParam, TPtrC& aDbUri )
-    {
-    aDbUri.Set( aParam.Value().AsDes() );
-    if ( !aDbUri.Length() )
-        {
-        User::Leave( KErrArgument );
-        }
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-TPosLmItemId CMnAiwCommandHandlerBase::ReadLandmarkId( const TAiwGenericParam& aParam )
-    {
-    return aParam.Value().AsTInt32();
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnAiwCommandHandlerBase::ReadLandmarkIdListL( 
-    const TAiwGenericParam& aParam,
-    const TPosLmItemId*& aListPtr,
-    TInt& aListSize )
-    {
-    TPtrC8 data( aParam.Value().AsData() );
-    
-    if ( data.Size() % sizeof( TPosLmItemId ) )
-        {
-        User::Leave( KErrArgument );
-        }
-    
-    aListPtr = reinterpret_cast<const TPosLmItemId*>( data.Ptr() );
-    aListSize = data.Size() / sizeof( TPosLmItemId );
-    }        
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnAiwCommandHandlerBase::WriteLandmarkL( const CPosLandmark& aLandmark )
-    {
-    HBufC8* lmBuf = PosLandmarkSerialization::PackL( aLandmark );
-    CleanupStack::PushL( lmBuf );
-
-    TAiwGenericParam param( EGenericParamLandmark, TAiwVariant( *lmBuf ) );
-    iAiwParameters.OutList().AppendL( param );
-
-    CleanupStack::PopAndDestroy( lmBuf );
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnAiwCommandHandlerBase::WriteLandmarkL( TPosLmItemId aLandmarkId, const TDesC& aDatabaseUri )
-    {
-    TAiwGenericParam lmId( EGenericParamLandmarkId, TAiwVariant( aLandmarkId ) );
-    TAiwGenericParam dbUri( EGenericParamLandmarkDatabase, TAiwVariant( aDatabaseUri ) );
-
-    iAiwParameters.OutList().AppendL( dbUri );
-    iAiwParameters.OutList().AppendL( lmId );
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnAiwCommandHandlerBase::HandleAiwParamL( const TAiwGenericParam& /*aParam*/ )
-    {
-    User::Leave( KErrArgument );
-    }
-    
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnAiwCommandHandlerBase::HandleAiwParamLandmarksL( RArray<TPtrC8>& /*aLandmarkDataList*/ )
-    {
-    User::Leave( KErrArgument );
-    }
-    
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnAiwCommandHandlerBase::HandleAiwParamLandmarksListL( 
-    const TDesC& /*aDbUri*/, 
-    RArray<TPosLmItemId>& /*aLmIds*/ )
-    {
-    User::Leave( KErrArgument );
-    }
-
-// -----------------------------------------------------------------------------
-//  From class CActive
-// -----------------------------------------------------------------------------
-//
-void CMnAiwCommandHandlerBase::RunL()
-    {
-#ifdef _DEBUG    
-    LOG("CMnAiwCommandHandlerBase::RunL in, panicking");
-    Panic( KErrGeneral );
-#endif    
-    }
-
-// -----------------------------------------------------------------------------
-//  From class CActive
-// -----------------------------------------------------------------------------
-//
-TInt CMnAiwCommandHandlerBase::RunError( TInt aError )
-    {
-    Done( aError );
-    return KErrNone;
-    }
-
-// -----------------------------------------------------------------------------
-//  From class CActive
-// -----------------------------------------------------------------------------
-//
-void CMnAiwCommandHandlerBase::DoCancel()
-    {
-    Done( KErrCancel );
-    }
-
-// -----------------------------------------------------------------------------
-// From MAknServerAppExitObserver
-// -----------------------------------------------------------------------------
-//
-void CMnAiwCommandHandlerBase::HandleServerAppExit( TInt aReason )
-	{
-    LOG1("CMnAiwCommandHandlerBase::HandleServerAppExit in, reason %d", aReason );
-	
-	if ( iRunMode == ERunModeChained )
-	    {
-	    // for standlone mode this event is ignored,
-	    // otherwise client will be shutdown whenever provider exits
-	    MAknServerAppExitObserver::HandleServerAppExit( aReason );
-	    }
-
-	if ( iExitCallback )
-		{
-		iExitCallback->HandleProviderExit( this );
-		}
-#ifdef _DEBUG
-	else
-		{
-		Panic( KErrGeneral );
-		}
-#endif		
-	    
-    LOG("CMnAiwCommandHandlerBase::HandleServerAppExit out");
-	}
-
-//===================== TAiwParameters ====================
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CMnAiwCommandHandlerBase::TAiwParameters::TAiwParameters()
-:   iInParamList( NULL ),    
-    iOutParamList( NULL ),
-    iCallback( NULL )
-    {
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CMnAiwCommandHandlerBase::TAiwParameters::TAiwParameters(
-    const CAiwGenericParamList& aInParamList,
-    CAiwGenericParamList& aOutParamList,
-    const MAiwNotifyCallback* aCallback )
-:   iInParamList( &aInParamList ),    
-    iOutParamList( &aOutParamList ),
-    iCallback( aCallback )
-    {
-    }
-    
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-const CAiwGenericParamList& CMnAiwCommandHandlerBase::TAiwParameters::InList() const
-    {
-    return *iInParamList;
-    }
-    
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CAiwGenericParamList& CMnAiwCommandHandlerBase::TAiwParameters::OutList()
-    {
-    return *iOutParamList;
-    }
-    
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-const MAiwNotifyCallback* CMnAiwCommandHandlerBase::TAiwParameters::Callback() const
-    {
-    return iCallback;
-    }
--- a/locationmapnavfw/aiwprovider/src/mnaiwprovider.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,883 +0,0 @@
-/*
-* Copyright (c) 2005-2007 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:  CMnAiwProvider class implementation
-*
-*/
-
-
-#include <badesca.h>
-
-#include <aknlistquerydialog.h>
-#include <AknGlobalNote.h>
-
-#include <AiwMenu.h>
-#include <AiwGenericParam.hrh>
-#include <AiwCommon.hrh>
-#include <aknenv.h>
-
-#include <ecom/implementationproxy.h>
-
-#include <mnaiwproviderres.rsg>
-#include "mnaiwprovideruids.hrh"
-
-#include <lbsposition.h>
-
-#include <mnprovider.h>
-#include <mnproviderfinder.h>
-#include <mnmapview.h>
-#include <mnnavigator.h>
-#include <mngeocoder.h>
-#include <mnutils.h>
-#include <mnappservices.hrh>
-
-#include "mnaiwdebug.h"
-#include "mnaiwinternal.h"
-
-#include "mnaiwservices.h"
-#include "mnaiwmenus.hrh"
-
-#include "mnaiwprovider.h"
-
-// =========================== LOCAL FUNCTIONS =================================
-
-// ---------------------------------------------------------------------------
-//  Cleanup item for RPointerArray<CMnProvider>
-// ---------------------------------------------------------------------------
-//
-void CleanupProvidersArray( TAny* aArray )
-    {
-    ( static_cast<RPointerArray<CMnProvider>*>( aArray ) )->ResetAndDestroy();
-    }
-
-// ---------------------------------------------------------------------------
-//  Identity relation for providers. Based on UID
-// ---------------------------------------------------------------------------
-//
-TBool ProvidersMatchByUid( const CMnProvider& aOne, const CMnProvider& aAnother )
-	{
-	return ( aOne.Uid().iUid == aAnother.Uid().iUid );
-	}
-
-// ========================== MEMBER FUNCTIONS =================================
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CMnAiwProvider* CMnAiwProvider::NewL()
-    {
-    LOG( "CMnAiwProvider::NewL in" );
-
-    CMnAiwProvider* self = new (ELeave) CMnAiwProvider();
-    CleanupStack::PushL(self);
-    self->ConstructL();
-    CleanupStack::Pop(self);
-
-    LOG( "CMnAiwProvider::NewL out" );
-    return self;
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CMnAiwProvider::CMnAiwProvider()
-    {
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CMnAiwProvider::~CMnAiwProvider()
-    {
-    LOG( "~CMnAiwProvider in" );
-
-    delete iEventList;
-
-    CloseAllHandlers();
-    iHandlers.Close();
-
-    if ( iEikon )
-        {
-        iEikon->DeleteResourceFile( iResourceOffset );
-        }
-    iMnProviders.ResetAndDestroy();
-
-    LOG( "~CMnAiwProvider out" );
-    }
-
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnAiwProvider::ConstructL()
-    {
-    LOG( "CMnAiwProvider::ConstructL in" );
-#ifdef _DEBUG
-    TTime start;
-    start.UniversalTime();
-#endif
-
-    iEikon = CEikonEnv::Static();
-
-    TRAPD( err, MnUtils::FindLocalizedResourceFileL( iEikon->FsSession(), KAiwResourceFile, iResourceFilename ) );
-    if ( err == KErrNotFound )
-        {
-        // try to find it with the name it had in 3.1
-        // this is needed for the case, when upgrade is installed on 3.1-based terminals
-        MnUtils::FindLocalizedResourceFileL( iEikon->FsSession(), KAiwResourceFileOld, iResourceFilename );
-        }
-    iResourceOffset = iEikon->AddResourceFileL( iResourceFilename );
-
-    iEventList = CAiwGenericParamList::NewL();
-
-#ifdef _DEBUG
-    TTime finish;
-    finish.UniversalTime();
-    TTimeIntervalMicroSeconds elapsed = finish.MicroSecondsFrom( start );
-    LOG1( "CMnAiwProvider::ConstructL out ( in %ld microseconds ) ", elapsed.Int64() );
-#endif
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-TInt CMnAiwProvider::GetAiwServiceCommandIdL( const CAiwGenericParamList& aInParamList )
-    {
-    TInt index = 0;
-    const TAiwGenericParam* param = aInParamList.FindFirst( index, EGenericParamServiceCommand );
-    if ( index < 0 )
-        {
-        LOG( "CMnAiwProvider::GetServiceCommandL: param not found" );
-        User::Leave( KErrArgument );
-        }
-
-    TInt32 num = 0;
-    const TAiwVariant& val = param->Value();
-    if ( !val.Get( num ) )
-        {
-        LOG( "CMnAiwProvider::GetServiceCommandL: param value not found" );
-        User::Leave( KErrArgument );
-        }
-    return num;
-    }
-
-// -----------------------------------------------------------------------------
-// From CAiwServiceIfBase
-// -----------------------------------------------------------------------------
-//
-void CMnAiwProvider::InitialiseL(
-    MAiwNotifyCallback& /*aFrameworkCallback*/,
-    const RCriteriaArray& /*aInterest*/ )
-    {
-    LOG("CMnAiwProvider::InitialiseL");
-    }
-
-// -----------------------------------------------------------------------------
-// From CAiwServiceIfBase
-// -----------------------------------------------------------------------------
-//
-void CMnAiwProvider::HandleServiceCmdL(
-    const TInt& aCmdId,
-    const CAiwGenericParamList& aInParamList,
-    CAiwGenericParamList& aOutParamList,
-    TUint aCmdOptions,
-    const MAiwNotifyCallback* aCallback)
-    {
-    LOG1("CMnAiwProvider::HandleServiceCmdL cmdId: %x", aCmdId);
-
-    if ( aCmdOptions & KAiwOptCancel )
-        {
-        // this is call to cancel async request,
-        // not supported yet - ignoring, but not starting new one.
-        LOG("CMnAiwProvider::HandleServiceCmdL attempt to cancel, exit");
-        return;
-        }
-
-    CMnAiwCommandHandlerBase::TAiwParameters
-        aiwParams( aInParamList, aOutParamList, aCallback );
-
-    switch ( aCmdId )
-        {
-        case KAiwCmdMnShowMap:
-        case KAiwCmdMnNavigateTo:
-            {
-            TInt err = KErrNone;
-            TBool stop = EFalse;
-            while ( !stop )
-                {
-                TRAP( err, ProcessSyncAiwCommandL( aCmdId, aiwParams ) );
-                ProcessAiwCommandResultL( aCmdId, aiwParams, err, stop );
-                }
-            User::LeaveIfError( err );
-            }
-            break;
-
-        case KAiwCmdMnSelectFromMap:
-        case KAiwCmdMnCoordByAddr:
-        case KAiwCmdMnAddrByCoord:
-            if ( !aCallback )
-                {
-                User::Leave( KErrArgument );
-                }
-            StartAsyncAiwCommandL( aCmdId, aiwParams );
-            break;
-
-        default:
-            User::Leave( KErrNotSupported );
-            break;
-        }
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnAiwProvider::ProcessSyncAiwCommandL(
-    TInt aCommandId,
-    CMnAiwCommandHandlerBase::TAiwParameters& aAiwParams )
-    {
-    LOG("CMnAiwProvider::ProcessSyncAiwCommandL in");
-
-	CMnAiwCommandHandlerBase* handler = HandlerL( aCommandId, aAiwParams );
-    handler->StartL();
-
-    LOG("CMnAiwProvider::ProcessSyncAiwCommandL out");
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnAiwProvider::StartAsyncAiwCommandL(
-    TInt aCommandId,
-    CMnAiwCommandHandlerBase::TAiwParameters& aAiwParams )
-    {
-    LOG("CMnAiwProvider::StartAsyncAiwCommandL in");
-
-    TBool stop = EFalse;
-    while ( !stop )
-        {
-        TInt err = KErrNone;
-        CMnAiwCommandHandlerBase* handler = NULL;
-        TRAP( err, handler = HandlerL( aCommandId, aAiwParams ) );
-
-        if ( !err )
-            {
-            handler->Start( *this );
-            break;
-            }
-        else
-            {
-            if ( handler )
-                {
-                CloseHandler( handler );
-                }
-
-            if ( err == KErrCancel )
-                {
-                // must stop if provider selection fails
-                stop = ETrue;
-                }
-            else
-                {
-                // this is error from command start
-                ProcessAiwCommandResultL( aCommandId, aAiwParams, err, stop );
-                }
-
-            if ( stop )
-                {
-                // couldn't start command
-                NotifyAiwObserver( aCommandId, aAiwParams, err );
-                }
-            }
-        }
-
-    LOG("CMnAiwProvider::StartAsyncAiwCommandL out");
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CMnAiwCommandHandlerBase* CMnAiwProvider::HandlerL(
-    TInt aCommandId,
-    CMnAiwCommandHandlerBase::TAiwParameters& aAiwParams )
-    {
-    LOG("CMnAiwProvider::HandlerL in");
-
-    CMnProvider& provider = SelectProviderL( aCommandId, aAiwParams );
-
-    CMnAiwCommandHandlerBase::TRunMode runMode =
-        CMnAiwCommandHandlerBase::RequestedRunModeL( aAiwParams );
-
-    if ( runMode == CMnAiwCommandHandlerBase::ERunModeDefault )
-        {
-        runMode = CMnAiwCommandHandlerBase::DefaultRunMode( aCommandId );
-        }
-
-    if ( runMode == CMnAiwCommandHandlerBase::ERunModeDefault )
-        {
-        User::Leave( KErrNotSupported );
-        }
-
-    CMnAiwCommandHandlerBase* handler = FindWorkingHandler( aCommandId, provider, runMode );
-
-    if ( !handler )
-        {
-        handler = CMnAiwCommandHandlerBase::CreateHandlerL( aCommandId, provider, runMode );
-        CleanupStack::PushL( handler );
-        handler->SetExitObserverL( *this );
-        iHandlers.AppendL( handler );
-        CleanupStack::Pop( handler );
-        }
-    else
-        {
-        LOG("CMnAiwProvider::HandlerL, working handler found, reusing");
-        handler->ResetParametersL();
-        }
-
-    handler->SetParametersL( aAiwParams );
-
-    LOG("CMnAiwProvider::HandlerL out");
-    return handler;
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnAiwProvider::HandleAsyncAiwCmdCompletedL(
-    CMnAiwCommandHandlerBase* aHandler,
-    TInt aResult )
-    {
-    LOG1("CMnAiwProvider::HandleAsyncAiwCmdCompletedL in, result %d", aResult );
-
-    TInt command = aHandler->CommandId();
-    CMnAiwCommandHandlerBase::TAiwParameters aiwParams = aHandler->AiwParameters();
-
-    CloseHandler( aHandler );
-
-    TBool stop = EFalse;
-    ProcessAiwCommandResultL( command, aiwParams, aResult, stop );
-
-    if ( stop )
-        {
-        NotifyAiwObserver( command, aiwParams, aResult );
-        }
-    else
-        {
-        StartAsyncAiwCommandL( command, aiwParams );
-        }
-
-    LOG("CMnAiwProvider::HandleAsyncAiwCmdCompletedL out");
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnAiwProvider::HandleProviderExit(
-    CMnAiwCommandHandlerBase* aHandler )
-    {
-    LOG("CMnAiwProvider::HandleProviderExit in" );
-
-	CloseHandler( aHandler );
-
-    LOG("CMnAiwProvider::HandleProviderExit out");
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnAiwProvider::NotifyAiwObserver(
-    TInt aCommandId,
-    CMnAiwCommandHandlerBase::TAiwParameters& aAiwParams,
-    TInt aResult )
-    {
-    LOG2("CMnAiwProvider::NotifyAiwObserver in, command 0x%X, result %d", aCommandId, aResult);
-    __ASSERT_DEBUG( aAiwParams.Callback(), Panic( KErrGeneral) );
-
-    MAiwNotifyCallback* callback = const_cast<MAiwNotifyCallback*>( aAiwParams.Callback() );
-
-    TInt err = KErrNone;
-    iEventList->Reset();
-    if ( aResult )
-        {
-        TAiwGenericParam error( EGenericParamError, TAiwVariant( aResult ) );
-        TRAP_IGNORE( iEventList->AppendL( error ) );
-
-        TRAP( err, callback->HandleNotifyL(
-            aCommandId, KAiwEventError, *iEventList, aAiwParams.InList() ) );
-        }
-    else
-        {
-        TRAP( err, callback->HandleNotifyL(
-            aCommandId, KAiwEventCompleted, *iEventList, aAiwParams.InList() ) );
-        }
-
-    LOG("CMnAiwProvider::NotifyAiwObserver out");
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnAiwProvider::CloseHandler( CMnAiwCommandHandlerBase* aHandler )
-    {
-    LOG("CMnAiwProvider::CloseHandler in");
-
-    if ( aHandler->IsActive() )
-    	{
-    	// make sure we are not panicked if async handler is closed while active.
-    	// at first, command is only cancelled. Cancel will call this method again,
-    	// then this object will be deleted.
-    	aHandler->Cancel();
-    	}
-
-	TInt index = iHandlers.Find( aHandler );
-	if ( index != KErrNotFound )
-	    {
-    	delete aHandler;
-    	iHandlers.Remove( index );
-	    }
-    LOG1("CMnAiwProvider::CloseHandler out, deleted handler %d", index);
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnAiwProvider::ProcessAiwCommandResultL( 
-    TInt aAiwCommandId, 
-    CMnAiwCommandHandlerBase::TAiwParameters& aAiwParams,
-    TInt aResult, 
-    TBool& aStop )
-    {
-    LOG1("CMnAiwProvider::ProcessAiwCommandResultL in, result %d", aResult);
-
-    TBool banMessages = EFalse;
-    if ( CMnAiwCommandHandlerBase::IsErrorMessageDisabledL( aAiwParams ) )
-        {
-        banMessages = ETrue;
-        }
-    
-    TInt unusedProviderId( 0 );
-    TInt messageId( 0 );
-    
-    if ( aResult == KErrNone || aResult == KErrCancel )
-        {
-        aStop = ETrue;
-        }
-    else if ( CMnAiwCommandHandlerBase::IsProviderSpecifiedL( aAiwParams, unusedProviderId ) ) 
-        {
-        aStop = ETrue;
-        messageId = R_MN_ERROR_SERVICE_UNAVAILABLE;
-        }
-    else if ( NumSuitableProviders( aAiwCommandId ) < 2 )
-        {
-        aStop = ETrue;
-        messageId = R_MN_ERROR_NO_PROVIDER;
-        }
-    else
-        {
-        aStop = EFalse;
-        messageId = R_MN_ERROR_SERVICE_UNAVAILABLE;
-        }
-    
-    if ( !banMessages && messageId )
-        {
-        ErrorNote( messageId );
-        }
-
-    LOG("CMnAiwProvider::ProcessAiwCommandResultL out");
-    }
-
-// -----------------------------------------------------------------------------
-// From CAiwServiceIfMenu
-// -----------------------------------------------------------------------------
-//
-void CMnAiwProvider::InitializeMenuPaneL(
-    CAiwMenuPane& aMenuPane,
-    TInt aIndex,
-    TInt /*aCascadeId*/,
-    const CAiwGenericParamList& aInParamList)
-    {
-    LOG( "CMnAiwProvider::InitializeMenuPaneL in" );
-
-    TInt svcCmdId = GetAiwServiceCommandIdL( aInParamList );
-    if ( !IsServiceAvailableL( svcCmdId ) )
-        {
-        LOG1( "CMnAiwProvider::InitializeMenuPaneL svc 0x%X is not available, out", svcCmdId );
-        return;
-        }
-
-    switch ( svcCmdId )
-        {
-        case KAiwCmdMnShowMap:
-            aMenuPane.AddMenuItemsL(
-                iResourceFilename,
-                R_MN_AIWMENU_SHOW_ON_MAP,
-                KAiwCmdMnShowMap,
-                aIndex);
-            break;
-
-        case KAiwCmdMnSelectFromMap:
-            aMenuPane.AddMenuItemsL(
-                iResourceFilename,
-                R_MN_AIWMENU_SELECT_FROM_MAP,
-                KAiwCmdMnSelectFromMap,
-                aIndex);
-            break;
-
-        case KAiwCmdMnNavigateTo:
-            aMenuPane.AddMenuItemsL(
-                iResourceFilename,
-                R_MN_AIWMENU_NAVIGATE_TO,
-                KAiwCmdMnNavigateTo,
-                aIndex);
-            break;
-
-        case KAiwCmdMnCoordByAddr:
-            aMenuPane.AddMenuItemsL(
-                iResourceFilename,
-                R_MN_AIWMENU_FETCH_COORDINATES,
-                KAiwCmdMnCoordByAddr,
-                aIndex);
-            break;
-
-        case KAiwCmdMnAddrByCoord:
-            aMenuPane.AddMenuItemsL(
-                iResourceFilename,
-                R_MN_AIWMENU_FETCH_ADDRESS,
-                KAiwCmdMnAddrByCoord,
-                aIndex);
-            break;
-        }
-    LOG( "CMnAiwProvider::InitializeMenuPaneL out" );
-    }
-
-
-// -----------------------------------------------------------------------------
-// From CAiwServiceIfMenu
-// -----------------------------------------------------------------------------
-//
-void CMnAiwProvider::HandleMenuCmdL(
-    TInt aMenuCmdId,
-    const CAiwGenericParamList& aInParamList,
-    CAiwGenericParamList& aOutParamList,
-    TUint aCmdOptions,
-    const MAiwNotifyCallback* aCallback)
-    {
-    LOG( "CMnAiwProvider::HandleMenuCmdL in" );
-
-    TInt svcCmdId = KAiwCmdNone;
-
-    switch ( aMenuCmdId )
-        {
-        case EMnAiwMenuCmdShowOnMap:
-            svcCmdId = KAiwCmdMnShowMap;
-            break;
-
-        case EMnAiwMenuCmdSelectFromMap:
-            svcCmdId = KAiwCmdMnSelectFromMap;
-            break;
-
-        case EMnAiwMenuCmdNavigateTo:
-            svcCmdId = KAiwCmdMnNavigateTo;
-            break;
-
-        case EMnAiwMenuCmdFetchAddress:
-            svcCmdId = KAiwCmdMnAddrByCoord;
-            break;
-
-        case EMnAiwMenuCmdFetchCoordinates:
-            svcCmdId = KAiwCmdMnCoordByAddr;
-            break;
-        }
-
-    HandleServiceCmdL( svcCmdId, aInParamList, aOutParamList, aCmdOptions, aCallback );
-
-    LOG( "CMnAiwProvider::HandleMenuCmdL out" );
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-TBool CMnAiwProvider::IsServiceAvailableL( TInt aAiwCommandId )
-    {
-    UpdateProvidersListL();
-    return NumSuitableProviders( aAiwCommandId ) > 0;
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnAiwProvider::UpdateProvidersListL()
-    {
-    // get new list of providers
-    RPointerArray<CMnProvider> providers;
-    CleanupStack::PushL( TCleanupItem( CleanupProvidersArray, &providers ) );
-    MnProviderFinder::FindProvidersL( providers );
-    
-    // merge new list with current list of providers
-    TIdentityRelation<CMnProvider> byUid( ProvidersMatchByUid );
-
-    // detect removed providers
-    for ( TInt i = iMnProviders.Count() - 1; i >= 0 ; i-- )
-        {
-        if ( providers.Find( iMnProviders[i], byUid ) == KErrNotFound )
-            {
-            LOG1("CMnAiwProvider::UpdateProvidersListL, provider 0x%X removed", 
-                iMnProviders[i]->Uid().iUid );
-            CloseHandlers( iMnProviders[i] );
-            delete iMnProviders[i];
-            iMnProviders.Remove( i );
-            }
-        }
-
-    // detect new providers
-    for ( TInt i = providers.Count() - 1; i >=0 ; i-- )
-		{
-		if ( iMnProviders.Find( providers[i], byUid ) == KErrNotFound )
-			{
-            LOG1("CMnAiwProvider::UpdateProvidersListL, new provider 0x%X added", 
-                providers[i]->Uid().iUid );
-			iMnProviders.AppendL( providers[i] );
-			providers.Remove( i ); // ownership is moved to iMnProviders
-			}
-		}
-
-	CleanupStack::PopAndDestroy( &providers );
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CMnAiwCommandHandlerBase* CMnAiwProvider::FindWorkingHandler(
-    TInt aAiwCommandId,
-    const CMnProvider& aProvider,
-    CMnAiwCommandHandlerBase::TRunMode aRunMode )
-    {
-    for ( TInt i = 0; i < iHandlers.Count(); i++ )
-        {
-        CMnAiwCommandHandlerBase* handler = iHandlers[i];
-        if ( handler->Provider().Uid() == aProvider.Uid() &&
-             handler->CommandId() == aAiwCommandId &&
-             handler->RunMode() == aRunMode &&
-             !handler->IsActive() ) // active async handler cannot be reused
-            {
-            return iHandlers[i];
-            }
-        }
-    return NULL;
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnAiwProvider::CloseHandlers( const CMnProvider* aProvider )
-	{
-	for ( TInt i = iHandlers.Count() - 1; i >= 0 ; i-- )
-		{
-		if ( ProvidersMatchByUid( iHandlers[i]->Provider(), *aProvider ) )
-			{
-			CloseHandler( iHandlers[i] ); // this will modify the handlers list
-			}
-		}
-	}
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnAiwProvider::CloseAllHandlers()
-	{
-	for ( TInt i = iHandlers.Count() - 1; i >= 0 ; i-- )
-		{
-		CloseHandler( iHandlers[i] ); // this will modify the handlers list
-		}
-	}
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnAiwProvider::GetSuitableProvidersL(
-    TInt aAiwCommandId,
-    RPointerArray<CMnProvider>& aProviders )
-    {
-    LOG1("CMnAiwProvider::GetSuitableProvidersL in, Cmd %x", aAiwCommandId);
-
-    CMnProvider::TService serviceNeeded = CMnProvider::EServiceNone;
-    TInt featuresNeeded = 0;
-
-    CMnAiwCommandHandlerBase::AppServiceAndFeatureNeeded(
-        aAiwCommandId, serviceNeeded, featuresNeeded );
-
-    for ( TInt i = 0; i < iMnProviders.Count(); i++ )
-        {
-        CMnProvider* provider = iMnProviders[i];
-
-        if ( ( provider->SupportedServices() & serviceNeeded ) &&
-             ( provider->SupportedFeatures( serviceNeeded ) & featuresNeeded ) )
-            {
-            LOG1("CMnAiwProvider::GetSuitableProvidersL using 0x%X", provider->Uid().iUid);
-            aProviders.AppendL( provider );
-            }
-        }
-    LOG("CMnAiwProvider::GetSuitableProvidersL out");
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-TInt CMnAiwProvider::NumSuitableProviders( TInt aAiwCommandId )
-    {
-    CMnProvider::TService serviceNeeded = CMnProvider::EServiceNone;
-    TInt featuresNeeded = 0;
-
-    CMnAiwCommandHandlerBase::AppServiceAndFeatureNeeded(
-        aAiwCommandId, serviceNeeded, featuresNeeded );
-
-    TInt count = 0;
-    for ( TInt i = 0; i < iMnProviders.Count(); i++ )
-        {
-        CMnProvider* provider = iMnProviders[i];
-
-        if ( ( provider->SupportedServices() & serviceNeeded ) &&
-             ( provider->SupportedFeatures( serviceNeeded ) & featuresNeeded ) )
-            {
-            count++;
-            }
-        }
-    return count;
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CMnProvider& CMnAiwProvider::SelectProviderL( 
-    TInt aAiwCommandId,
-    CMnAiwCommandHandlerBase::TAiwParameters& aAiwParams )
-    {
-    CMnProvider* provider = NULL;
-
-    RPointerArray<CMnProvider> mnProviders; // array does _not_ own items
-    CleanupClosePushL( mnProviders );
-
-    UpdateProvidersListL();
-    GetSuitableProvidersL( aAiwCommandId, mnProviders );
-    
-    TInt requestedProviderId( 0 );
-    if ( CMnAiwCommandHandlerBase::IsProviderSpecifiedL( aAiwParams, requestedProviderId ) )
-        {
-        for ( int i = 0; i < mnProviders.Count(); i++ )
-            {
-            if ( mnProviders[i]->Uid().iUid == requestedProviderId )
-                {
-                provider = mnProviders[i];
-                break;
-                }
-            }
-        
-        if ( !provider )
-            {
-            User::Leave( KErrArgument );
-            }
-        }
-    else if ( mnProviders.Count() > 1 )
-        {
-        TInt index = KErrNotFound;
-        ExecuteSelectionDialogL( index, mnProviders );
-            provider = mnProviders[index];
-        }
-    else if ( mnProviders.Count() == 1 )
-        {
-        provider = mnProviders[0];
-        }
-    else
-        {
-        User::Leave( KErrNotSupported );
-        }
-
-    CleanupStack::PopAndDestroy( &mnProviders );
-    LOG1("CMnAiwProvider::SelectProviderL, selected 0x%X", provider->Uid().iUid);
-    return *provider;
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnAiwProvider::ExecuteSelectionDialogL(
-    TInt& aIndex,
-    RPointerArray<CMnProvider>& aProviders )
-    {
-    CDesCArraySeg* textArray = new (ELeave) CDesCArraySeg( aProviders.Count() );
-    CleanupStack::PushL( textArray );
-
-    for ( TInt i = 0; i < aProviders.Count(); i++ )
-        {
-        TPtrC shortName;
-        aProviders[i]->GetShortName( shortName );
-        textArray->AppendL( shortName );
-        }
-
-    CAknListQueryDialog* dlg = new (ELeave) CAknListQueryDialog( &aIndex );
-    dlg->PrepareLC( R_MN_PROVIDER_LIST_QUERY );
-
-    dlg->SetItemTextArray( textArray );
-    dlg->SetOwnershipType( ELbmOwnsItemArray );
-
-    TInt result = dlg->RunLD();
-    CleanupStack::Pop( textArray );
-
-    if ( !result )
-        {
-        User::Leave( KErrCancel );
-        }
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnAiwProvider::ErrorNote( TInt aResourceId )
-    {
-    TRAP_IGNORE( DoErrorNoteL( aResourceId ) );
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnAiwProvider::DoErrorNoteL( TInt aResourceId )
-    {
-    HBufC* noteText = iEikon->AllocReadResourceLC( aResourceId );
-
-    CAknGlobalNote* note = CAknGlobalNote::NewLC();
-    note->ShowNoteL( EAknGlobalErrorNote, *noteText );
-    CleanupStack::PopAndDestroy( note );
-
-    CleanupStack::PopAndDestroy( noteText );
-    }
-
-// ======== GLOBAL FUNCTIONS ========
-
-// -----------------------------------------------------------------------------
-// Map the interface UIDs to implementation factory functions
-// -----------------------------------------------------------------------------
-//
-const TImplementationProxy ImplementationTable[] =
-    {
-    IMPLEMENTATION_PROXY_ENTRY( KMnAiwProviderBaseImplUid, CMnAiwProvider::NewL ),
-    IMPLEMENTATION_PROXY_ENTRY( KMnAiwProviderMenuImplUid, CMnAiwProvider::NewL )
-    };
-
-// -----------------------------------------------------------------------------
-// Exported proxy for instantiation method resolution
-// -----------------------------------------------------------------------------
-//
-EXPORT_C const TImplementationProxy* ImplementationGroupProxy( TInt& aTableCount )
-    {
-    aTableCount = ( sizeof ImplementationTable ) / sizeof( TImplementationProxy );
-    return ImplementationTable;
-    }
--- a/locationmapnavfw/aiwprovider/src/mnfetchaddresshandler.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,126 +0,0 @@
-/*
-* Copyright (c) 2005-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:  CMnFetchAddressHandler class implementation
-*
-*/
-
-
-#include <e32base.h>
-
-#include <AiwGenericParam.hrh>
-#include <AiwCommon.hrh>
-
-#include <EPos_CPosLandmark.h>
-#include <epos_poslandmarkserialization.h>
-
-#include <mngeocoder.h>
-
-#include "mnaiwdebug.h"
-#include "mnaiwinternal.h"
-#include "mnfetchaddresshandler.h"
-
-// ================= LOCAL FUNCTIONS =======================
-
-// ================= MEMBER FUNCTIONS =======================
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CMnFetchAddressHandler::CMnFetchAddressHandler( CMnProvider& aProvider )
-:   CMnGeocodingCmdHandlerBase( aProvider )
-    {
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CMnFetchAddressHandler* CMnFetchAddressHandler::NewL( 
-    CMnProvider& aProvider,
-    TRunMode aRunMode )
-    {
-    CMnFetchAddressHandler* self = 
-        new (ELeave) CMnFetchAddressHandler( aProvider );
-    CleanupStack::PushL( self );        
-    self->ConstructL( aRunMode );
-    CleanupStack::Pop( self );        
-    return self;
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnFetchAddressHandler::ConstructL( TRunMode aRunMode )
-    {
-    LOG("CMnFetchAddressHandler::ConstructL in");
-
-    CMnGeocodingCmdHandlerBase::ConstructL( aRunMode );
-
-    LOG("CMnFetchAddressHandler::ConstructL out");
-    }
-
-// ================= INTERNAL FUNCTIONS =======================
-
-// -----------------------------------------------------------------------------
-//  From class CMnAiwCommandHandlerBase
-// -----------------------------------------------------------------------------
-//
-void CMnFetchAddressHandler::DoStartL()
-    {
-    LOG("CMnFetchAddressHandler::DoStartL in");
-    
-    if ( iLandmarkData.Size() )
-        {
-        CPosLandmark* lm = PosLandmarkSerialization::UnpackL( iLandmarkData );
-        CleanupStack::PushL( lm );
-
-        Geocoder().FindAddressByCoordinateL( *lm, iStatus );
-        
-        CleanupStack::PopAndDestroy( lm );
-        }
-    else    
-        {
-        User::Leave( KErrArgument );
-        }
-
-    LOG("CMnFetchAddressHandler::DoStartL out");
-    }
-
-// -----------------------------------------------------------------------------
-//  From class CActive
-// -----------------------------------------------------------------------------
-//
-void CMnFetchAddressHandler::RunL()
-    {
-    LOG("CMnFetchAddressHandler::RunL in");
-    
-    TInt result = iStatus.Int();
-    if ( result == KErrNone )
-        {
-        CPosLandmark* lm = CPosLandmark::NewLC();
-        Geocoder().RetrieveGeocodingResultL( *lm );
-        WriteLandmarkL( *lm );
-        CleanupStack::PopAndDestroy( lm );
-        }
-    Done( result );
-    LOG("CMnFetchAddressHandler::RunL out");
-    }
-
-// -----------------------------------------------------------------------------
-//  From class CActive
-// -----------------------------------------------------------------------------
-//
-void CMnFetchAddressHandler::DoCancel()
-    {
-    Geocoder().Cancel();
-    }
--- a/locationmapnavfw/aiwprovider/src/mnfetchcoordinateshandler.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,170 +0,0 @@
-/*
-* Copyright (c) 2005-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:  CMnFetchCoordinatesHandler class implementation
-*
-*/
-
-
-#include <e32base.h>
-
-#include <AiwGenericParam.hrh>
-#include <AiwCommon.hrh>
-
-#include <EPos_CPosLandmark.h>
-#include <epos_poslandmarkserialization.h>
-
-#include <mngeocoder.h>
-
-#include "mnaiwdebug.h"
-#include "mnaiwinternal.h"
-#include "mnfetchcoordinateshandler.h"
-
-// ================= LOCAL FUNCTIONS =======================
-
-// ================= MEMBER FUNCTIONS =======================
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CMnFetchCoordinatesHandler::CMnFetchCoordinatesHandler( CMnProvider& aProvider )
-:   CMnGeocodingCmdHandlerBase( aProvider )
-    {
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CMnFetchCoordinatesHandler* CMnFetchCoordinatesHandler::NewL( 
-    CMnProvider& aProvider,
-    TRunMode aRunMode )
-    {
-    CMnFetchCoordinatesHandler* self = 
-        new (ELeave) CMnFetchCoordinatesHandler( aProvider );
-    CleanupStack::PushL( self );        
-    self->ConstructL( aRunMode );
-    CleanupStack::Pop( self );        
-    return self;
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnFetchCoordinatesHandler::ConstructL( TRunMode aRunMode )
-    {
-    LOG("CMnFetchCoordinatesHandler::ConstructL in");
-
-    CMnGeocodingCmdHandlerBase::ConstructL( aRunMode );
-
-    LOG("CMnFetchCoordinatesHandler::ConstructL out");
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnFetchCoordinatesHandler::DoStartL()
-    {
-    LOG("CMnFetchCoordinatesHandler::DoStartL in");
-    
-    if ( iLandmarkData.Size() )
-        {
-        CPosLandmark* lm = PosLandmarkSerialization::UnpackL( iLandmarkData );
-        CleanupStack::PushL( lm );
-
-        Geocoder().FindCoordinateByAddressL( *lm, iStatus );
-        
-        CleanupStack::PopAndDestroy( lm );
-        }
-    else if ( iPlainAddress.Length() )
-        {
-        Geocoder().FindCoordinateByAddressL( iPlainAddress, iStatus );
-        }
-    else
-        {
-        User::Leave( KErrArgument );
-        }
-    
-    LOG("CMnFetchCoordinatesHandler::DoStartL out");
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnFetchCoordinatesHandler::RunL()
-    {
-    LOG("CMnFetchCoordinatesHandler::RunL in");
-    
-    TInt result = iStatus.Int();
-    if ( result == KErrNone )
-        {
-        CPosLandmark* lm = CPosLandmark::NewLC();
-        Geocoder().RetrieveGeocodingResultL( *lm );
-        WriteLandmarkL( *lm );
-        CleanupStack::PopAndDestroy( lm );
-        }
-    Done( result );
-    LOG("CMnFetchCoordinatesHandler::RunL out");
-    }
-
-// -----------------------------------------------------------------------------
-//  From class CActive
-// -----------------------------------------------------------------------------
-//
-void CMnFetchCoordinatesHandler::DoCancel()
-    {
-    Geocoder().Cancel();
-    }
-
-// -----------------------------------------------------------------------------
-//  From class CMnAiwCommandHandlerBase
-// -----------------------------------------------------------------------------
-//
-void CMnFetchCoordinatesHandler::HandleAiwParamL( const TAiwGenericParam& aParam )
-    {
-    if ( aParam.SemanticId() == EGenericParamUnspecified &&
-         aParam.Value().TypeId() == EVariantTypeDesC )
-        {
-        LOG("CMnFetchCoordinatesHandler::HandleAiwParam, PlainString");
-        if ( !iPlainAddress.Length() && !iLandmarkData.Size() )
-            {
-            iPlainAddress.Set( aParam.Value().AsDes() );
-            }
-        }
-    else
-        {
-        CMnGeocodingCmdHandlerBase::HandleAiwParamL( aParam );
-        }
-    }
-
-// -----------------------------------------------------------------------------
-//  From class CMnAiwCommandHandlerBase
-// -----------------------------------------------------------------------------
-//
-void CMnFetchCoordinatesHandler::HandleAiwParamLandmarksL( RArray<TPtrC8>& aLandmarkDataList )
-    {
-    // ignore landmarks if plain address is already found
-    if ( !iPlainAddress.Length() )
-        {
-        CMnGeocodingCmdHandlerBase::HandleAiwParamLandmarksL( aLandmarkDataList );
-        }
-    }    
-
-// -----------------------------------------------------------------------------
-//  From class CMnAiwCommandHandlerBase
-// -----------------------------------------------------------------------------
-//
-void CMnFetchCoordinatesHandler::ResetParametersL()
-    {
-    iPlainAddress.Set( NULL, 0 );
-    CMnGeocodingCmdHandlerBase::ResetParametersL();
-    }
--- a/locationmapnavfw/aiwprovider/src/mngeocodingcmdhandlerbase.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,149 +0,0 @@
-/*
-* Copyright (c) 2005-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:  CMnGeocodingCmdHandlerBase class implementation
-*
-*/
-
-
-#include <AiwGenericParam.hrh>
-#include <AiwCommon.hrh>
-
-#include <mngeocoder.h>
-
-#include "mnaiwdebug.h"
-#include "mngeocodingcmdhandlerbase.h"
-
-// ================= LOCAL FUNCTIONS =======================
-
-// ================= MEMBER FUNCTIONS =======================
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CMnGeocodingCmdHandlerBase::CMnGeocodingCmdHandlerBase( CMnProvider& aProvider )
-:   CMnAiwCommandHandlerBase( aProvider )
-    {
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CMnGeocodingCmdHandlerBase::~CMnGeocodingCmdHandlerBase()
-    {
-    delete iGeocoder;
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnGeocodingCmdHandlerBase::SetExitObserverL( 
-	MMnProviderExitCallback& aExitCallback )
-	{
-	iGeocoder->SetExitObserverL( *this );
-	CMnAiwCommandHandlerBase::SetExitObserverL( aExitCallback );
-	}
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnGeocodingCmdHandlerBase::ConstructL( TRunMode aRunMode )
-    {
-    CMnAiwCommandHandlerBase::ConstructL();
-    
-    if ( aRunMode == ERunModeChained )
-        {
-        iGeocoder = CMnGeocoder::NewChainedL( Provider() );
-        }
-    else
-        {
-        iGeocoder = CMnGeocoder::NewL( Provider() );
-        }
-
-    iRunMode = aRunMode;
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnGeocodingCmdHandlerBase::ReadGeocodingOptionsL( 
-    const TAiwGenericParam& aParam,
-    TMnAiwGeocodingOptionsParam& aGeoOptions )
-    {
-    TPtrC8 data( aParam.Value().AsData() ); 
-    if ( data.Size() == sizeof( TMnAiwGeocodingOptionsParam ) )
-        {
-        TMnAiwGeocodingOptionsParam options;
-        TPckg<TMnAiwGeocodingOptionsParam> optionsPack( options );
-        optionsPack.Copy( data );
-        aGeoOptions = options;
-        }
-    else
-        {
-        User::Leave( KErrArgument );
-        }
-    }
-    
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CMnGeocoder& CMnGeocodingCmdHandlerBase::Geocoder()
-    {
-    return *iGeocoder;
-    }
-    
-// -----------------------------------------------------------------------------
-//  From class CMnAiwCommandHandlerBase
-// -----------------------------------------------------------------------------
-//
-void CMnGeocodingCmdHandlerBase::HandleAiwParamL( const TAiwGenericParam& aParam )
-    {
-    switch ( aParam.SemanticId() )
-        {
-        case EGenericParamMnGeocodingOptions:
-            //LOG("CMnGeocodingCmdHandlerBase::HandleAiwParam, GeocodingOptions");
-            {
-            TMnAiwGeocodingOptionsParam geoOptions;
-            ReadGeocodingOptionsL( aParam, geoOptions );
-            iGeocoder->SetOptions( ( CMnGeocoder::TOptions ) geoOptions.iOptions );
-            break;
-            }
-        default:
-            CMnAiwCommandHandlerBase::HandleAiwParamL( aParam );
-            break;
-        }
-    }
-    
-// -----------------------------------------------------------------------------
-//  From class CMnAiwCommandHandlerBase
-// -----------------------------------------------------------------------------
-//
-void CMnGeocodingCmdHandlerBase::HandleAiwParamLandmarksL( RArray<TPtrC8>& aLandmarkDataList )
-    {
-    // if already set or not single landmarks are given
-    if ( iLandmarkData.Size() || aLandmarkDataList.Count() != 1 )
-        {
-        User::Leave( KErrArgument );
-        }
-    iLandmarkData.Set( aLandmarkDataList[0] );
-    }    
-
-// -----------------------------------------------------------------------------
-//  From class CMnAiwCommandHandlerBase
-// -----------------------------------------------------------------------------
-//
-void CMnGeocodingCmdHandlerBase::ResetParametersL()
-    {
-    iGeocoder->SetOptions( CMnGeocoder::EOptionNone );
-    iLandmarkData.Set( NULL, 0 );
-    }
--- a/locationmapnavfw/aiwprovider/src/mnmapviewcmdhandlerbase.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,164 +0,0 @@
-/*
-* Copyright (c) 2005-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:  CMnMapViewCmdHandlerBase class implementation
-*
-*/
-
-
-#include <AiwGenericParam.hrh>
-#include <AiwCommon.hrh>
-
-#include <mnmapview.h>
-
-#include "mnaiwdebug.h"
-#include "mnmapviewcmdhandlerbase.h"
-
-// ================= LOCAL FUNCTIONS =======================
-
-// ================= MEMBER FUNCTIONS =======================
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CMnMapViewCmdHandlerBase::CMnMapViewCmdHandlerBase( CMnProvider& aProvider )
-:   CMnAiwCommandHandlerBase( aProvider )
-    {
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CMnMapViewCmdHandlerBase::~CMnMapViewCmdHandlerBase()
-    {
-    delete iMapView;
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnMapViewCmdHandlerBase::SetExitObserverL( MMnProviderExitCallback& aExitCallback )
-	{
-	iMapView->SetExitObserverL( *this );
-	CMnAiwCommandHandlerBase::SetExitObserverL( aExitCallback );
-	}
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnMapViewCmdHandlerBase::ConstructL( TRunMode aRunMode )
-    {
-    LOG("CMnMapViewCmdHandlerBase::ConstructL in");
-    CMnAiwCommandHandlerBase::ConstructL();
-    
-    if ( aRunMode == ERunModeChained )
-        {
-        iMapView = CMnMapView::NewChainedL( Provider() );
-        }
-    else
-        {
-        iMapView = CMnMapView::NewL( Provider() );
-        }
-
-    iRunMode = aRunMode;
-
-    LOG("CMnMapViewCmdHandlerBase::ConstructL out");
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnMapViewCmdHandlerBase::ReadMapOptionsL( 
-    const TAiwGenericParam& aParam,
-    TMnAiwMapViewOptionsParam& aMapOptions )
-    {
-    TPtrC8 data( aParam.Value().AsData() ); 
-    if ( data.Size() == sizeof( TMnAiwMapViewOptionsParam ) )
-        {
-        TMnAiwMapViewOptionsParam options;
-        TPckg<TMnAiwMapViewOptionsParam> optionsPack( options );
-        optionsPack.Copy( data );
-        aMapOptions = options;
-        }
-    else
-        {
-        User::Leave( KErrArgument );
-        }
-    }
-    
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CMnMapView& CMnMapViewCmdHandlerBase::MapView()
-    {
-    return *iMapView;
-    }
-    
-// -----------------------------------------------------------------------------
-//  From class CMnAiwCommandHandlerBase
-// -----------------------------------------------------------------------------
-//
-void CMnMapViewCmdHandlerBase::HandleAiwParamL( const TAiwGenericParam& aParam )
-    {
-    switch ( aParam.SemanticId() )
-        {
-        case EGenericParamMnMapViewOptions:
-            {
-            TMnAiwMapViewOptionsParam mapOptions;
-            ReadMapOptionsL( aParam, mapOptions );
-
-            iMapView->SetOptions( mapOptions.iOptions );
-            iMapView->SetMapAreaL( mapOptions.iCenterPoint, mapOptions.iRadius );
-            iMapView->SetCurrentLocationOption( 
-                ( CMnMapView::TCurrentLocationOption) mapOptions.iCurrentLocationOption );
-
-            break;
-            }
-        default:
-            CMnAiwCommandHandlerBase::HandleAiwParamL( aParam );
-            break;
-        }
-    }
-    
-// -----------------------------------------------------------------------------
-//  From class CMnAiwCommandHandlerBase
-// -----------------------------------------------------------------------------
-//
-void CMnMapViewCmdHandlerBase::HandleAiwParamLandmarksL( RArray<TPtrC8>& aLandmarkDataList )
-    {
-    iMapView->AddLandmarksToShowL( aLandmarkDataList );
-    }
-    
-// -----------------------------------------------------------------------------
-//  From class CMnAiwCommandHandlerBase
-// -----------------------------------------------------------------------------
-//
-void CMnMapViewCmdHandlerBase::HandleAiwParamLandmarksListL( 
-    const TDesC& aDbUri, 
-    RArray<TPosLmItemId>& aLmIds )
-    {
-    iMapView->AddLandmarksToShowL( aDbUri, aLmIds );
-    }
-
-// -----------------------------------------------------------------------------
-//  From class CMnAiwCommandHandlerBase
-// -----------------------------------------------------------------------------
-//
-void CMnMapViewCmdHandlerBase::ResetParametersL()
-    {
-    iMapView->ResetLandmarksToShow();
-    iMapView->ResetMapArea();
-    iMapView->SetUseDefaultRequestText();
-    iMapView->SetOptions( CMnMapView::EOptionNone );
-    iMapView->SetCurrentLocationOption( CMnMapView::ECurrentLocationDisabled );
-    }
--- a/locationmapnavfw/aiwprovider/src/mnnavigatetohandler.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,144 +0,0 @@
-/*
-* Copyright (c) 2005-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:  CMnNavigateToHandler class implementation
-*
-*/
-
-
-#include <AiwGenericParam.hrh>
-#include <AiwCommon.hrh>
-
-#include <EPos_CPosLandmark.h>
-#include <epos_poslandmarkserialization.h>
-
-#include <mnnavigator.h>
-
-#include "mnaiwdebug.h"
-#include "mnaiwinternal.h"
-#include "mnnavigatetohandler.h"
-
-// ================= LOCAL FUNCTIONS =======================
-
-// ================= MEMBER FUNCTIONS =======================
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CMnNavigateToHandler::CMnNavigateToHandler( CMnProvider& aProvider )
-:   CMnAiwCommandHandlerBase( aProvider )
-    {
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CMnNavigateToHandler::~CMnNavigateToHandler()
-    {
-    delete iNavigator;
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CMnNavigateToHandler* CMnNavigateToHandler::NewL(
-    CMnProvider& aProvider,
-    TRunMode aRunMode )
-    {
-    CMnNavigateToHandler* self = 
-        new (ELeave) CMnNavigateToHandler( aProvider );
-    CleanupStack::PushL( self );        
-    self->ConstructL( aRunMode );
-    CleanupStack::Pop( self );
-    return self;
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnNavigateToHandler::SetExitObserverL( 
-	MMnProviderExitCallback& aExitCallback )
-	{
-	iNavigator->SetExitObserverL( *this );
-	CMnAiwCommandHandlerBase::SetExitObserverL( aExitCallback );
-	}
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnNavigateToHandler::ConstructL( TRunMode aRunMode )
-    {
-    LOG("CMnNavigateToHandler::ConstructL in");
-
-    CMnAiwCommandHandlerBase::ConstructL();
-    
-    if ( aRunMode == ERunModeChained )
-        {
-        iNavigator = CMnNavigator::NewChainedL( Provider() );
-        }
-    else
-        {
-        iNavigator = CMnNavigator::NewL( Provider() );
-        }
-        
-    iRunMode = aRunMode;
-    
-    LOG("CMnNavigateToHandler::ConstructL out");
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnNavigateToHandler::DoStartL()
-    {
-    LOG("CMnNavigateToHandler::DoStartL in");
-    if ( iLandmarkData.Size() )
-        {
-        CPosLandmark* lm = PosLandmarkSerialization::UnpackL( iLandmarkData );
-        CleanupStack::PushL( lm );
-        
-        iNavigator->NavigateToL( *lm );
-        
-        CleanupStack::PopAndDestroy( lm );
-        }
-    else    
-        {
-        User::Leave( KErrArgument );
-        }
-        
-    LOG("CMnNavigateToHandler::DoStartL out");
-    }
-
-// -----------------------------------------------------------------------------
-//  From class CMnAiwCommandHandlerBase
-// -----------------------------------------------------------------------------
-//
-void CMnNavigateToHandler::HandleAiwParamLandmarksL( RArray<TPtrC8>& aLandmarkDataList )
-    {
-    __ASSERT_DEBUG( aLandmarkDataList.Count() > 0, Panic( KErrGeneral ) );
-    
-    // if already set or not single landmarks are given
-    if ( !iLandmarkData.Length() )
-        {
-        iLandmarkData.Set( aLandmarkDataList[0] );
-        }
-    }
-
-// -----------------------------------------------------------------------------
-//  From class CMnAiwCommandHandlerBase
-// -----------------------------------------------------------------------------
-//
-void CMnNavigateToHandler::ResetParametersL()
-    {
-    iLandmarkData.Set( NULL, 0 );
-    }
--- a/locationmapnavfw/aiwprovider/src/mnselectfrommaphandler.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,184 +0,0 @@
-/*
-* Copyright (c) 2005-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:  CMnSelectFromMapHandler class implementation
-*
-*/
-
-
-#include <e32base.h>
-
-#include <AiwGenericParam.hrh>
-#include <AiwCommon.hrh>
-
-#include <EPos_CPosLandmark.h>
-
-#include <mnmapview.h>
-
-#include "mnaiwdebug.h"
-#include "mnaiwinternal.h"
-#include "mnselectfrommaphandler.h"
-
-// ================= LOCAL FUNCTIONS =======================
-
-// ================= MEMBER FUNCTIONS =======================
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CMnSelectFromMapHandler::CMnSelectFromMapHandler( CMnProvider& aProvider )
-:   CMnMapViewCmdHandlerBase( aProvider )
-    {
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CMnSelectFromMapHandler* CMnSelectFromMapHandler::NewL( 
-    CMnProvider& aProvider,
-    TRunMode aRunMode )
-    {
-    CMnSelectFromMapHandler* self = 
-        new (ELeave) CMnSelectFromMapHandler( aProvider );
-    CleanupStack::PushL( self );        
-    self->ConstructL( aRunMode );
-    CleanupStack::Pop( self );        
-    return self;
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnSelectFromMapHandler::ConstructL( TRunMode aRunMode )
-    {
-    LOG("CMnSelectFromMapHandler::ConstructL in");
-
-    CMnMapViewCmdHandlerBase::ConstructL( aRunMode );
-
-    LOG("CMnSelectFromMapHandler::ConstructL out");
-    }
-
-// ================= INTERNAL FUNCTIONS =======================
-
-// -----------------------------------------------------------------------------
-//  From class CMnAiwCommandHandlerBase
-// -----------------------------------------------------------------------------
-//
-void CMnSelectFromMapHandler::DoStartL()
-    {
-    LOG("CMnSelectFromMapHandler::DoStartL in");
-    
-    MapView().SelectFromMapL( iStatus );
-    
-    LOG("CMnSelectFromMapHandler::DoStartL out");
-    }
-
-// -----------------------------------------------------------------------------
-//  From class CActive
-// -----------------------------------------------------------------------------
-//
-void CMnSelectFromMapHandler::RunL()
-    {
-    LOG("CMnSelectFromMapHandler::RunL in");
-    
-    TInt result = iStatus.Int();
-    if ( result == KErrNone )
-        {
-        // read selection result and put to AIW
-        switch ( MapView().SelectionResultType() )
-            {
-            case CMnMapView::ESelectionFreeLandmark:
-                LOG("CMnSelectFromMapHandler::RunL selected free");
-                {
-                CPosLandmark* lm = MapView().RetrieveSelectionResultL();
-                CleanupStack::PushL( lm );
-                WriteLandmarkL( *lm );
-                CleanupStack::PopAndDestroy( lm );
-                }
-                break;
-                
-            case CMnMapView::ESelectionLandmarkIndex:
-                LOG("CMnSelectFromMapHandler::RunL selected index");
-                {
-                TInt landmarkIndex( KErrNotFound );
-                MapView().RetrieveSelectionResultL( landmarkIndex );
-                LOG1("CMnSelectFromMapHandler::RunL selected index %d", landmarkIndex);
-
-                // find this landmark in input
-                TAiwGenericParam param;
-                if ( FindLandmarkData( landmarkIndex, param ) )
-                    {
-                    // give it back to client
-                    AiwParameters().OutList().AppendL( param );
-                    }
-                else    
-                    {
-                    result = KErrNotFound;
-                    }
-                }
-                break;
-                
-            case CMnMapView::ESelectionLinkedLandmark:
-                LOG("CMnSelectFromMapHandler::RunL selected linked");
-                {
-                TPosLmItemId lmId( KPosLmNullItemId );
-                HBufC* dbUri = NULL;
-                MapView().RetrieveSelectionResultL( lmId, dbUri );
-                CleanupStack::PushL( dbUri );
-                WriteLandmarkL( lmId, *dbUri );
-                CleanupStack::PopAndDestroy( dbUri );
-                }
-                break;
-                
-            default:
-                // Unknown result type
-                break;
-            }
-        }
-    Done( result );
-    LOG("CMnSelectFromMapHandler::RunL out");
-    }
-    
-// -----------------------------------------------------------------------------
-//  From class CActive
-// -----------------------------------------------------------------------------
-//
-void CMnSelectFromMapHandler::DoCancel()
-    {
-    MapView().Cancel();
-    }
-
-// -----------------------------------------------------------------------------
-//  From class CMnAiwCommandHandlerBase
-// -----------------------------------------------------------------------------
-//
-void CMnSelectFromMapHandler::HandleAiwParamL( const TAiwGenericParam& aParam )
-    {
-    switch ( aParam.SemanticId() )
-        {
-        case EGenericParamRequestText:
-            if ( aParam.Value().TypeId() == EVariantTypeDesC )
-                {
-                iMapView->SetCustomRequestTextL( aParam.Value().AsDes() );
-                }
-            else
-                {
-                User::Leave( KErrArgument );
-                }
-            break;
-
-        default:
-            CMnMapViewCmdHandlerBase::HandleAiwParamL( aParam );
-            break;
-        }
-    }
--- a/locationmapnavfw/aiwprovider/src/mnshowonmaphandler.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,77 +0,0 @@
-/*
-* Copyright (c) 2005-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:  CMnShowOnMapHandler class implementation
-*
-*/
-
-
-#include <AiwGenericParam.hrh>
-#include <AiwCommon.hrh>
-
-#include <mnmapview.h>
-#include <mnprovider.h>
-
-#include "mnaiwdebug.h"
-#include "mnaiwinternal.h"
-#include "mnshowonmaphandler.h"
-
-// ================= LOCAL FUNCTIONS =======================
-
-// ================= MEMBER FUNCTIONS =======================
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CMnShowOnMapHandler::CMnShowOnMapHandler( CMnProvider& aProvider )
-:   CMnMapViewCmdHandlerBase( aProvider  )
-    {
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CMnShowOnMapHandler* CMnShowOnMapHandler::NewL( 
-    CMnProvider& aProvider, TRunMode aRunMode )
-    {
-    CMnShowOnMapHandler* self = new (ELeave) CMnShowOnMapHandler( aProvider );
-    CleanupStack::PushL( self );        
-    self->ConstructL( aRunMode );
-    CleanupStack::Pop( self );
-    return self;
-    }
-
-
-// ================= INTERNAL FUNCTIONS =======================
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnShowOnMapHandler::ConstructL( TRunMode aRunMode )
-    {
-    LOG("CMnShowOnMapHandler::ConstructL in");
-
-    CMnMapViewCmdHandlerBase::ConstructL( aRunMode );
-    
-    LOG("CMnShowOnMapHandler::ConstructL out");
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnShowOnMapHandler::DoStartL()
-    {
-    LOG("CMnShowOnMapHandler::DoStartL in");
-    MapView().ShowMapL();
-    LOG("CMnShowOnMapHandler::DoStartL out");
-    }
Binary file locationmapnavfw/data/locationmnfwstub.sis has changed
--- a/locationmapnavfw/group/bld.inf	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-/*
-* Copyright (c) 2005-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:  Build information file for Map and Navigation Framework project
-*
-*/
-
-
-PRJ_PLATFORMS
-DEFAULT
-
-#include "../library/group/bld.inf"
-#include "../aiwprovider/group/bld.inf"
-
-PRJ_EXPORTS
-../data/locationmnfwstub.sis 				/epoc32/data/z/system/install/locationmnfwstub.sis
-
-../rom/locationmnfw.iby                     CORE_MW_LAYER_IBY_EXPORT_PATH(locationmnfw.iby)
-../rom/locationmnfw_resources.iby           LANGUAGE_MW_LAYER_IBY_EXPORT_PATH(locationmnfw_resources.iby)
-../rom/locationmnfwstub.iby                 CORE_MW_LAYER_IBY_EXPORT_PATH(locationmnfwstub.iby)
--- a/locationmapnavfw/install/locationmnfwstub.pkg	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,36 +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: Installation file for project locationmapnavfw
-;
-; Languages
-&EN
-
-; Header
-#{"LocationMapNavfw"}, (0x10206902), 1, 0, 0,TYPE=SA
-
-;Supports Series 60 v 3.0
-[0x101F7961], 0, 0, 0, {"Series60ProductID"}
-
-; Localised Vendor name
-%{"Nokia"}
-
-; Unique Vendor name
-:"Nokia"
-
-;Files
-""     -"z:\sys\bin\mnclientlib.dll"
-""     -"z:\sys\bin\mnservicelib.dll "
-
-""     -"z:\sys\bin\mnaiwprovider.dll "
-""     -"z:\resource\plugins\mnaiwprovider.rsc"
\ No newline at end of file
--- a/locationmapnavfw/install/locationmnfwupgrade.pkg	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,39 +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: Installation file for project locationmapnavfw used for upgrade
-;
-; Languages
-&EN
-
-; Header
-#{"LocationMapNavfw"}, (0x10206902), 1, 0, 0,TYPE=SA,RU
-
-;Supports Series 60 v 3.0
-[0x101F7961], 0, 0, 0, {"Series60ProductID"}
-
-; Localised Vendor name
-%{"Nokia"}
-
-; Unique Vendor name
-:"Nokia"
-
-;Files
-"\Epoc32\release\armv5\urel\mnclientlib.dll"     -"!:\sys\bin\mnclientlib.dll"
-"\Epoc32\release\armv5\urel\mnservicelib.dll"     -"!:\sys\bin\mnservicelib.dll "
-
-"\Epoc32\release\armv5\urel\mnaiwprovider.dll"     -"!:\sys\bin\mnaiwprovider.dll "
-"\Epoc32\data\z\resource\plugins\mnaiwprovider.rsc"     -"!:\resource\plugins\mnaiwprovider.rsc"
-
-
-; End of File
\ No newline at end of file
--- a/locationmapnavfw/library/BWINS/mnclientlibu.def	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,80 +0,0 @@
-EXPORTS              
-	??1CMnGeocoder@@UAE@XZ @ 1 NONAME ; CMnGeocoder::~CMnGeocoder(void)        
-	??1CMnMapView@@UAE@XZ @ 2 NONAME ; CMnMapView::~CMnMapView(void)        
-	??1CMnNavigator@@UAE@XZ @ 3 NONAME ; CMnNavigator::~CMnNavigator(void)        
-	??1CMnProvider@@UAE@XZ @ 4 NONAME ; CMnProvider::~CMnProvider(void)        
-	?AddLandmarksToShowL@CMnMapView@@QAEXAAV?$RArray@VTPtrC8@@@@@Z @ 5 NONAME ; void CMnMapView::AddLandmarksToShowL(class RArray<class TPtrC8> &)    
-	?AddLandmarksToShowL@CMnMapView@@QAEXAAV?$RPointerArray@VCPosLandmark@@@@@Z @ 6 NONAME ; void CMnMapView::AddLandmarksToShowL(class RPointerArray<class CPosLandmark> &)    
-	?AddLandmarksToShowL@CMnMapView@@QAEXABVTDesC16@@AAV?$RArray@K@@@Z @ 7 NONAME ; void CMnMapView::AddLandmarksToShowL(class TDesC16 const &, class RArray<unsigned long> &)
-	?Cancel@CMnGeocoder@@QAEXXZ @ 8 NONAME ; void CMnGeocoder::Cancel(void)       
-	?Cancel@CMnMapView@@QAEXXZ @ 9 NONAME ; void CMnMapView::Cancel(void)       
-	?CurrentLocationOption@CMnMapView@@QBE?AW4TCurrentLocationOption@1@XZ @ 10 NONAME ; enum CMnMapView::TCurrentLocationOption CMnMapView::CurrentLocationOption(void) const     
-	?FindAddressByCoordinateL@CMnGeocoder@@QAEXABVCPosLandmark@@AAVTRequestStatus@@@Z @ 11 NONAME ; void CMnGeocoder::FindAddressByCoordinateL(class CPosLandmark const &, class TRequestStatus &) 
-	?FindCoordinateByAddressL@CMnGeocoder@@QAEXABVCPosLandmark@@AAVTRequestStatus@@@Z @ 12 NONAME ; void CMnGeocoder::FindCoordinateByAddressL(class CPosLandmark const &, class TRequestStatus &) 
-	?FindCoordinateByAddressL@CMnGeocoder@@QAEXABVTDesC16@@AAVTRequestStatus@@@Z @ 13 NONAME ; void CMnGeocoder::FindCoordinateByAddressL(class TDesC16 const &, class TRequestStatus &) 
-	?FindProvidersL@MnProviderFinder@@SAXAAV?$RPointerArray@VCMnProvider@@@@@Z @ 14 NONAME ; void MnProviderFinder::FindProvidersL(class RPointerArray<class CMnProvider> &)    
-	?FindProvidersL@MnProviderFinder@@SAXAAV?$RPointerArray@VCMnProvider@@@@K@Z @ 15 NONAME ; void MnProviderFinder::FindProvidersL(class RPointerArray<class CMnProvider> &, unsigned long)  
-	?GetName@CMnProvider@@QBEXAAVTPtrC16@@@Z @ 16 NONAME ; void CMnProvider::GetName(class TPtrC16 &) const 
-	?GetShortName@CMnProvider@@QBEXAAVTPtrC16@@@Z @ 17 NONAME ; void CMnProvider::GetShortName(class TPtrC16 &) const 
-	?GetVendorName@CMnProvider@@QBEXAAVTPtrC16@@@Z @ 18 NONAME ; void CMnProvider::GetVendorName(class TPtrC16 &) const 
-	?NavigateToL@CMnNavigator@@QAEXABVCPosLandmark@@@Z @ 19 NONAME ; void CMnNavigator::NavigateToL(class CPosLandmark const &) 
-	?NewChainedL@CMnGeocoder@@SAPAV1@AAVCMnProvider@@@Z @ 20 NONAME ; class CMnGeocoder * CMnGeocoder::NewChainedL(class CMnProvider &)
-	?NewChainedL@CMnMapView@@SAPAV1@AAVCMnProvider@@@Z @ 21 NONAME ; class CMnMapView * CMnMapView::NewChainedL(class CMnProvider &)
-	?NewChainedL@CMnNavigator@@SAPAV1@AAVCMnProvider@@@Z @ 22 NONAME ; class CMnNavigator * CMnNavigator::NewChainedL(class CMnProvider &)
-	?NewL@CMnGeocoder@@SAPAV1@AAVCMnProvider@@@Z @ 23 NONAME ; class CMnGeocoder * CMnGeocoder::NewL(class CMnProvider &)
-	?NewL@CMnMapView@@SAPAV1@AAVCMnProvider@@@Z @ 24 NONAME ; class CMnMapView * CMnMapView::NewL(class CMnProvider &)
-	?NewL@CMnNavigator@@SAPAV1@AAVCMnProvider@@@Z @ 25 NONAME ; class CMnNavigator * CMnNavigator::NewL(class CMnProvider &)
-	?Options@CMnGeocoder@@QBEKXZ @ 26 NONAME ; unsigned long CMnGeocoder::Options(void) const  
-	?Options@CMnMapView@@QBEKXZ @ 27 NONAME ; unsigned long CMnMapView::Options(void) const  
-	?ResetLandmarksToShow@CMnMapView@@QAEXXZ @ 28 NONAME ; void CMnMapView::ResetLandmarksToShow(void)    
-	?ResetMapArea@CMnMapView@@QAEXXZ @ 29 NONAME ; void CMnMapView::ResetMapArea(void)    
-	?RetrieveGeocodingResultL@CMnGeocoder@@QAEXAAVCPosLandmark@@@Z @ 30 NONAME ; void CMnGeocoder::RetrieveGeocodingResultL(class CPosLandmark &)  
-	?RetrieveSelectionResultL@CMnMapView@@QAEPAVCPosLandmark@@XZ @ 31 NONAME ; class CPosLandmark * CMnMapView::RetrieveSelectionResultL(void)  
-	?RetrieveSelectionResultL@CMnMapView@@QAEXAAH@Z @ 32 NONAME ; void CMnMapView::RetrieveSelectionResultL(int &)     
-	?RetrieveSelectionResultL@CMnMapView@@QAEXAAKAAPAVHBufC16@@@Z @ 33 NONAME ; void CMnMapView::RetrieveSelectionResultL(unsigned long &, class HBufC16 * &)
-	?SelectFromMapL@CMnMapView@@QAEXAAVTRequestStatus@@@Z @ 34 NONAME ; void CMnMapView::SelectFromMapL(class TRequestStatus &)    
-	?SelectionResultType@CMnMapView@@QBE?AW4TSelectionResultType@1@XZ @ 35 NONAME ; enum CMnMapView::TSelectionResultType CMnMapView::SelectionResultType(void) const    
-	?ServiceUid@RMnGeocodingServiceClient@@EBE?AVTUid@@XZ @ 36 NONAME ; class TUid RMnGeocodingServiceClient::ServiceUid(void) const    
-	?SetCurrentLocationOption@CMnMapView@@QAEXW4TCurrentLocationOption@1@@Z @ 37 NONAME ; void CMnMapView::SetCurrentLocationOption(enum CMnMapView::TCurrentLocationOption)     
-	?SetCustomRequestTextL@CMnMapView@@QAEXABVTDesC16@@@Z @ 38 NONAME ; void CMnMapView::SetCustomRequestTextL(class TDesC16 const &)   
-	?SetMapAreaL@CMnMapView@@QAEXABVTCoordinate@@N@Z @ 39 NONAME ; void CMnMapView::SetMapAreaL(class TCoordinate const &, double)  
-	?SetOptions@CMnGeocoder@@QAEXK@Z @ 40 NONAME ; void CMnGeocoder::SetOptions(unsigned long)     
-	?SetOptions@CMnMapView@@QAEXK@Z @ 41 NONAME ; void CMnMapView::SetOptions(unsigned long)     
-	?SetUseDefaultRequestText@CMnMapView@@QAEXXZ @ 42 NONAME ; void CMnMapView::SetUseDefaultRequestText(void)      
-	?ShowCurrentLocationL@CMnMapView@@QAEXXZ @ 43 NONAME ; void CMnMapView::ShowCurrentLocationL(void)      
-	?ShowMapL@CMnMapView@@QAEXXZ @ 44 NONAME ; void CMnMapView::ShowMapL(void)      
-	?SupportedFeatures@CMnProvider@@UBEKW4TService@1@@Z @ 45 NONAME ; unsigned long CMnProvider::SupportedFeatures(enum CMnProvider::TService) const   
-	?SupportedServices@CMnProvider@@QBEKXZ @ 46 NONAME ; unsigned long CMnProvider::SupportedServices(void) const    
-	?Uid@CMnProvider@@QBE?AVTUid@@XZ @ 47 NONAME ; class TUid CMnProvider::Uid(void) const    
-	?Version@CMnProvider@@QBE?AVTVersion@@XZ @ 48 NONAME ; class TVersion CMnProvider::Version(void) const       
-	?FindLocalizedResourceFileL@MnUtils@@SAXAAVRFs@@ABVTDesC16@@AAV?$TBuf@$0BAA@@@@Z @ 49 NONAME ; void MnUtils::FindLocalizedResourceFileL(class RFs &, class TDesC16 const &, class TBuf<256> &)
-	?FindResourceFileL@MnUtils@@SAXAAVRFs@@ABVTDesC16@@AAV?$TBuf@$0BAA@@@@Z @ 50 NONAME ; void MnUtils::FindResourceFileL(class RFs &, class TDesC16 const &, class TBuf<256> &)
-	?SetExitObserverL@CMnGeocoder@@QAEXAAVMAknServerAppExitObserver@@@Z @ 51 NONAME ; void CMnGeocoder::SetExitObserverL(class MAknServerAppExitObserver &)       
-	?SetExitObserverL@CMnMapView@@QAEXAAVMAknServerAppExitObserver@@@Z @ 52 NONAME ; void CMnMapView::SetExitObserverL(class MAknServerAppExitObserver &)       
-	?SetExitObserverL@CMnNavigator@@QAEXAAVMAknServerAppExitObserver@@@Z @ 53 NONAME ; void CMnNavigator::SetExitObserverL(class MAknServerAppExitObserver &)       
-	?RemoveExitObserver@CMnGeocoder@@QAEXXZ @ 54 NONAME ; void CMnGeocoder::RemoveExitObserver(void)         
-	?RemoveExitObserver@CMnMapView@@QAEXXZ @ 55 NONAME ; void CMnMapView::RemoveExitObserver(void)         
-	?RemoveExitObserver@CMnNavigator@@QAEXXZ @ 56 NONAME ; void CMnNavigator::RemoveExitObserver(void)         
-	??0TMnMapImageParams@@QAE@XZ @ 57 NONAME ; TMnMapImageParams::TMnMapImageParams(void)
-	??1CMnMapImage@@UAE@XZ @ 58 NONAME ; CMnMapImage::~CMnMapImage(void)
-	?CancelRendering@CMnMapImage@@QAEXXZ @ 59 NONAME ; void CMnMapImage::CancelRendering(void)
-	?GetImageCoordinate@CMnMapImage@@QBEHABVTCoordinate@@AAVTPoint@@@Z @ 60 NONAME ; int CMnMapImage::GetImageCoordinate(class TCoordinate const &, class TPoint &) const
-	?GetWorldCoordinate@CMnMapImage@@QBEHABVTPoint@@AAVTCoordinate@@@Z @ 61 NONAME ; int CMnMapImage::GetWorldCoordinate(class TPoint const &, class TCoordinate &) const
-	?MapImageParams@CMnMapImage@@QAEAAVTMnMapImageParams@@XZ @ 62 NONAME ; class TMnMapImageParams & CMnMapImage::MapImageParams(void)
-	?MapImageParams@CMnMapImage@@QBEABVTMnMapImageParams@@XZ @ 63 NONAME ; class TMnMapImageParams const & CMnMapImage::MapImageParams(void) const
-	?NewL@CMnMapImage@@SAPAV1@AAVCMnProvider@@@Z @ 64 NONAME ; class CMnMapImage * CMnMapImage::NewL(class CMnProvider &)
-	?RenderL@CMnMapImage@@QAEXAAVCFbsBitmap@@AAVMMnMapImageRenderCallback@@@Z @ 65 NONAME ; void CMnMapImage::RenderL(class CFbsBitmap &, class MMnMapImageRenderCallback &)
-	?RenderL@CMnMapImage@@QAEXAAVCFbsBitmap@@AAVTRequestStatus@@@Z @ 66 NONAME ; void CMnMapImage::RenderL(class CFbsBitmap &, class TRequestStatus &)
-	?ServiceUid@RMnMapImageServiceClient@@EBE?AVTUid@@XZ @ 67 NONAME ; class TUid RMnMapImageServiceClient::ServiceUid(void) const
-	?SetMapImageParams@CMnMapImage@@QAEXAAVTMnMapImageParams@@@Z @ 68 NONAME ; void CMnMapImage::SetMapImageParams(class TMnMapImageParams &)
-	?SetShowOptions@CMnMapImage@@QAEXABK@Z @ 69 NONAME ; void CMnMapImage::SetShowOptions(unsigned long const &)
-	?SetTargetOrigin@CMnMapImage@@QAEXABVTPoint@@@Z @ 70 NONAME ; void CMnMapImage::SetTargetOrigin(class TPoint const &)
-	?ShowOptions@CMnMapImage@@QBEKXZ @ 71 NONAME ; unsigned long CMnMapImage::ShowOptions(void) const
-	?SupportedImageTypes@CMnMapImage@@QAEKXZ @ 72 NONAME ; unsigned long CMnMapImage::SupportedImageTypes(void)
-	?TargetOrigin@CMnMapImage@@QAE?AVTPoint@@XZ @ 73 NONAME ; class TPoint CMnMapImage::TargetOrigin(void)
-	?MapImageParams@CMnCoordinateConverterBase@@QBEABVTMnMapImageParams@@XZ @ 74 NONAME ; class TMnMapImageParams const & CMnCoordinateConverterBase::MapImageParams(void) const
-	??0CMnCoordinateConverterBase@@IAE@XZ @ 75 NONAME ; CMnCoordinateConverterBase::CMnCoordinateConverterBase(void)
-	??1CMnCoordinateConverterBase@@UAE@XZ @ 76 NONAME ; CMnCoordinateConverterBase::~CMnCoordinateConverterBase(void)
-	?RemoveExitObserver@CMnMapImage@@QAEXXZ @ 77 NONAME ; void CMnMapImage::RemoveExitObserver(void)
-	?SetExitObserverL@CMnMapImage@@QAEXAAVMAknServerAppExitObserver@@@Z @ 78 NONAME ; void CMnMapImage::SetExitObserverL(class MAknServerAppExitObserver &)
-
--- a/locationmapnavfw/library/BWINS/mnservicelibu.def	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,41 +0,0 @@
-EXPORTS
-	??0CMnGeocodingServiceBase@@IAE@XZ @ 1 NONAME ; CMnGeocodingServiceBase::CMnGeocodingServiceBase(void)
-	??0CMnMapViewServiceBase@@IAE@XZ @ 2 NONAME ; CMnMapViewServiceBase::CMnMapViewServiceBase(void)
-	??0CMnNavigationServiceBase@@IAE@XZ @ 3 NONAME ; CMnNavigationServiceBase::CMnNavigationServiceBase(void)
-	??1CMnGeocodingServiceBase@@MAE@XZ @ 4 NONAME ; CMnGeocodingServiceBase::~CMnGeocodingServiceBase(void)
-	??1CMnMapViewServiceBase@@MAE@XZ @ 5 NONAME ; CMnMapViewServiceBase::~CMnMapViewServiceBase(void)
-	??1CMnNavigationServiceBase@@MAE@XZ @ 6 NONAME ; CMnNavigationServiceBase::~CMnNavigationServiceBase(void)
-	?AreaRadius@CMnMapViewServiceBase@@QAENXZ @ 7 NONAME ; double CMnMapViewServiceBase::AreaRadius(void)
-	?BaseConstructL@CMnGeocodingServiceBase@@IAEXXZ @ 8 NONAME ; void CMnGeocodingServiceBase::BaseConstructL(void)
-	?BaseConstructL@CMnMapViewServiceBase@@IAEXXZ @ 9 NONAME ; void CMnMapViewServiceBase::BaseConstructL(void)
-	?BaseConstructL@CMnNavigationServiceBase@@IAEXXZ @ 10 NONAME ; void CMnNavigationServiceBase::BaseConstructL(void)
-	?CompleteGeocodingRequestL@CMnGeocodingServiceBase@@QAEXABVCPosLandmark@@@Z @ 11 NONAME ; void CMnGeocodingServiceBase::CompleteGeocodingRequestL(class CPosLandmark const &)
-	?CompleteRequest@CMnServiceBase@@QAEXH@Z @ 12 NONAME ; void CMnServiceBase::CompleteRequest(int)
-	?CompleteSelectionRequest@CMnMapViewServiceBase@@QAEXH@Z @ 13 NONAME ; void CMnMapViewServiceBase::CompleteSelectionRequest(int)
-	?CompleteSelectionRequest@CMnMapViewServiceBase@@QAEXKH@Z @ 14 NONAME ; void CMnMapViewServiceBase::CompleteSelectionRequest(unsigned long, int)
-	?CompleteSelectionRequestL@CMnMapViewServiceBase@@QAEXABVCPosLandmark@@@Z @ 15 NONAME ; void CMnMapViewServiceBase::CompleteSelectionRequestL(class CPosLandmark const &)
-	?CurrentLocationOption@CMnMapViewServiceBase@@QAE?AW4TCurrentLocationOption@CMnMapView@@XZ @ 16 NONAME ; enum CMnMapView::TCurrentLocationOption CMnMapViewServiceBase::CurrentLocationOption(void)
-	?GetAreaCentralPoint@CMnMapViewServiceBase@@QAEXAAVTCoordinate@@@Z @ 17 NONAME ; void CMnMapViewServiceBase::GetAreaCentralPoint(class TCoordinate &)
-	?IsAreaCentralPointSet@CMnMapViewServiceBase@@QAEHXZ @ 18 NONAME ; int CMnMapViewServiceBase::IsAreaCentralPointSet(void)
-	?LandmarksToShow@CMnMapViewServiceBase@@QAE?AV?$TArray@PB$$CBVCPosLandmark@@@@XZ @ 19 NONAME ; class TArray<class CPosLandmark const *> CMnMapViewServiceBase::LandmarksToShow(void)
-	?LandmarksToShowDatabases@CMnMapViewServiceBase@@QAE?AV?$TArray@PB$$CBVHBufC16@@@@XZ @ 20 NONAME ; class TArray<class HBufC16 const *> CMnMapViewServiceBase::LandmarksToShowDatabases(void)
-	?LinkedLandmarksToShow@CMnMapViewServiceBase@@QAE?AV?$TArray@K@@H@Z @ 21 NONAME ; class TArray<unsigned long> CMnMapViewServiceBase::LinkedLandmarksToShow(int)
-	?Options@CMnGeocodingServiceBase@@QBEKXZ @ 22 NONAME ; unsigned long CMnGeocodingServiceBase::Options(void) const
-	?Options@CMnMapViewServiceBase@@QAEKXZ @ 23 NONAME ; unsigned long CMnMapViewServiceBase::Options(void)
-	?SelectionRequestText@CMnMapViewServiceBase@@QAE?AVTPtrC16@@XZ @ 24 NONAME ; class TPtrC16 CMnMapViewServiceBase::SelectionRequestText(void)
-	?ServiceError@CMnServiceBase@@MAEXABVRMessage2@@H@Z @ 25 NONAME ; void CMnServiceBase::ServiceError(class RMessage2 const &, int)
-	?ServiceL@CMnGeocodingServiceBase@@MAEXABVRMessage2@@@Z @ 26 NONAME ; void CMnGeocodingServiceBase::ServiceL(class RMessage2 const &)
-	?ServiceL@CMnMapViewServiceBase@@MAEXABVRMessage2@@@Z @ 27 NONAME ; void CMnMapViewServiceBase::ServiceL(class RMessage2 const &)
-	?ServiceL@CMnNavigationServiceBase@@MAEXABVRMessage2@@@Z @ 28 NONAME ; void CMnNavigationServiceBase::ServiceL(class RMessage2 const &)
-	??0CMnMapImageServiceBase@@IAE@XZ @ 29 NONAME ; CMnMapImageServiceBase::CMnMapImageServiceBase(void)
-	??1CMnMapImageServiceBase@@MAE@XZ @ 30 NONAME ; CMnMapImageServiceBase::~CMnMapImageServiceBase(void)
-	?BaseConstructL@CMnMapImageServiceBase@@IAEXXZ @ 31 NONAME ; void CMnMapImageServiceBase::BaseConstructL(void)
-	?CompleteRendering@CMnMapImageServiceBase@@QAEXXZ @ 32 NONAME ; void CMnMapImageServiceBase::CompleteRendering(void)
-	?MapImageParams@CMnMapImageServiceBase@@QAEAAVTMnMapImageParams@@XZ @ 33 NONAME ; class TMnMapImageParams & CMnMapImageServiceBase::MapImageParams(void)
-	?MapImageParams@CMnMapImageServiceBase@@QBEABVTMnMapImageParams@@XZ @ 34 NONAME ; class TMnMapImageParams const & CMnMapImageServiceBase::MapImageParams(void) const
-	?ServiceL@CMnMapImageServiceBase@@MAEXABVRMessage2@@@Z @ 35 NONAME ; void CMnMapImageServiceBase::ServiceL(class RMessage2 const &)
-	?SetMapImageParams@CMnMapImageServiceBase@@QAEXABVTMnMapImageParams@@@Z @ 36 NONAME ; void CMnMapImageServiceBase::SetMapImageParams(class TMnMapImageParams const &)
-	?ShowOptions@CMnMapImageServiceBase@@QBEKXZ @ 37 NONAME ; unsigned long CMnMapImageServiceBase::ShowOptions(void) const
-	?TargetBitmap@CMnMapImageServiceBase@@QBEAAVCFbsBitmap@@XZ @ 38 NONAME ; class CFbsBitmap & CMnMapImageServiceBase::TargetBitmap(void) const
-	?TargetRect@CMnMapImageServiceBase@@QBE?AVTRect@@XZ @ 39 NONAME ; class TRect CMnMapImageServiceBase::TargetRect(void) const
-
--- a/locationmapnavfw/library/data/mnclientlib.rss	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,35 +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:  Resource definitions for Map and Navigation Library
-*
-*/
-
-
-#include <eikon.rh>
-
-NAME MNLB
-RESOURCE RSS_SIGNATURE { }
-RESOURCE TBUF { buf=""; }
-
-#include <mnclientlib.loc>
-
-// ---------------------------------------------------------------------------
-// r_mn_library_request_text
-// Select From Map request localized string
-// ---------------------------------------------------------------------------
-//
-RESOURCE LBUF r_mn_library_request_text
-    {
-    txt = qtn_mnn_select_from_map;
-    }
--- a/locationmapnavfw/library/eabi/mnclientlibu.def	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,105 +0,0 @@
-EXPORTS
-	_ZN10CMnMapView10SetOptionsEm @ 1 NONAME
-	_ZN10CMnMapView11NewChainedLER11CMnProvider @ 2 NONAME
-	_ZN10CMnMapView11SetMapAreaLERK11TCoordinated @ 3 NONAME
-	_ZN10CMnMapView12ResetMapAreaEv @ 4 NONAME
-	_ZN10CMnMapView14SelectFromMapLER14TRequestStatus @ 5 NONAME
-	_ZN10CMnMapView19AddLandmarksToShowLER13RPointerArrayI12CPosLandmarkE @ 6 NONAME
-	_ZN10CMnMapView19AddLandmarksToShowLER6RArrayI6TPtrC8E @ 7 NONAME
-	_ZN10CMnMapView19AddLandmarksToShowLERK7TDesC16R6RArrayImE @ 8 NONAME
-	_ZNK10CMnMapView19SelectionResultTypeEv @ 9 NONAME
-	_ZN10CMnMapView20ResetLandmarksToShowEv @ 10 NONAME
-	_ZN10CMnMapView20ShowCurrentLocationLEv @ 11 NONAME
-	_ZNK10CMnMapView21CurrentLocationOptionEv @ 12 NONAME
-	_ZN10CMnMapView21SetCustomRequestTextLERK7TDesC16 @ 13 NONAME
-	_ZN10CMnMapView24RetrieveSelectionResultLERi @ 14 NONAME
-	_ZN10CMnMapView24RetrieveSelectionResultLERmRP7HBufC16 @ 15 NONAME
-	_ZN10CMnMapView24RetrieveSelectionResultLEv @ 16 NONAME
-	_ZN10CMnMapView24SetCurrentLocationOptionENS_22TCurrentLocationOptionE @ 17 NONAME
-	_ZN10CMnMapView24SetUseDefaultRequestTextEv @ 18 NONAME
-	_ZN10CMnMapView4NewLER11CMnProvider @ 19 NONAME
-	_ZN10CMnMapView6CancelEv @ 20 NONAME
-	_ZNK10CMnMapView7OptionsEv @ 21 NONAME
-	_ZN10CMnMapView8ShowMapLEv @ 22 NONAME
-	_ZN10CMnMapViewD0Ev @ 23 NONAME
-	_ZN10CMnMapViewD1Ev @ 24 NONAME
-	_ZN10CMnMapViewD2Ev @ 25 NONAME
-	_ZN11CMnGeocoder10SetOptionsEm @ 26 NONAME
-	_ZN11CMnGeocoder11NewChainedLER11CMnProvider @ 27 NONAME
-	_ZN11CMnGeocoder24FindAddressByCoordinateLERK12CPosLandmarkR14TRequestStatus @ 28 NONAME
-	_ZN11CMnGeocoder24FindCoordinateByAddressLERK12CPosLandmarkR14TRequestStatus @ 29 NONAME
-	_ZN11CMnGeocoder24FindCoordinateByAddressLERK7TDesC16R14TRequestStatus @ 30 NONAME
-	_ZN11CMnGeocoder24RetrieveGeocodingResultLER12CPosLandmark @ 31 NONAME
-	_ZN11CMnGeocoder4NewLER11CMnProvider @ 32 NONAME
-	_ZN11CMnGeocoder6CancelEv @ 33 NONAME
-	_ZNK11CMnGeocoder7OptionsEv @ 34 NONAME
-	_ZN11CMnGeocoderD0Ev @ 35 NONAME
-	_ZN11CMnGeocoderD1Ev @ 36 NONAME
-	_ZN11CMnGeocoderD2Ev @ 37 NONAME
-	_ZN11CMnProviderD0Ev @ 38 NONAME
-	_ZN11CMnProviderD1Ev @ 39 NONAME
-	_ZN11CMnProviderD2Ev @ 40 NONAME
-	_ZN12CMnNavigator11NavigateToLERK12CPosLandmark @ 41 NONAME
-	_ZN12CMnNavigator11NewChainedLER11CMnProvider @ 42 NONAME
-	_ZN12CMnNavigator4NewLER11CMnProvider @ 43 NONAME
-	_ZN12CMnNavigatorD0Ev @ 44 NONAME
-	_ZN12CMnNavigatorD1Ev @ 45 NONAME
-	_ZN12CMnNavigatorD2Ev @ 46 NONAME
-	_ZN16MnProviderFinder14FindProvidersLER13RPointerArrayI11CMnProviderE @ 47 NONAME
-	_ZN16MnProviderFinder14FindProvidersLER13RPointerArrayI11CMnProviderEm @ 48 NONAME
-	_ZNK11CMnProvider12GetShortNameER7TPtrC16 @ 49 NONAME
-	_ZNK11CMnProvider13GetVendorNameER7TPtrC16 @ 50 NONAME
-	_ZNK11CMnProvider17SupportedFeaturesENS_8TServiceE @ 51 NONAME
-	_ZNK11CMnProvider17SupportedServicesEv @ 52 NONAME
-	_ZNK11CMnProvider3UidEv @ 53 NONAME
-	_ZNK11CMnProvider7GetNameER7TPtrC16 @ 54 NONAME
-	_ZNK11CMnProvider7VersionEv @ 55 NONAME
-	_ZNK25RMnGeocodingServiceClient10ServiceUidEv @ 56 NONAME
-	_ZTI10CMnMapView @ 57 NONAME ; #<TI>#
-	_ZTI11CMnGeocoder @ 58 NONAME ; #<TI>#
-	_ZTI11CMnProvider @ 59 NONAME ; #<TI>#
-	_ZTI12CMnNavigator @ 60 NONAME ; #<TI>#
-	_ZTV10CMnMapView @ 61 NONAME ; #<VT>#
-	_ZTV11CMnGeocoder @ 62 NONAME ; #<VT>#
-	_ZTV11CMnProvider @ 63 NONAME ; #<VT>#
-	_ZTV12CMnNavigator @ 64 NONAME ; #<VT>#
-	_ZN7MnUtils26FindLocalizedResourceFileLER3RFsRK7TDesC16R4TBufILi256EE @ 65 NONAME
-	_ZN7MnUtils17FindResourceFileLER3RFsRK7TDesC16R4TBufILi256EE @ 66 NONAME
-	_ZN10CMnMapView16SetExitObserverLER25MAknServerAppExitObserver @ 67 NONAME
-	_ZN10CMnMapView18RemoveExitObserverEv @ 68 NONAME
-	_ZN11CMnGeocoder16SetExitObserverLER25MAknServerAppExitObserver @ 69 NONAME
-	_ZN11CMnGeocoder18RemoveExitObserverEv @ 70 NONAME
-	_ZN12CMnNavigator16SetExitObserverLER25MAknServerAppExitObserver @ 71 NONAME
-	_ZN12CMnNavigator18RemoveExitObserverEv @ 72 NONAME
-	_ZN11CMnMapImage12TargetOriginEv @ 73 NONAME
-	_ZN11CMnMapImage14MapImageParamsEv @ 74 NONAME
-	_ZN11CMnMapImage14SetShowOptionsERKm @ 75 NONAME
-	_ZN11CMnMapImage15CancelRenderingEv @ 76 NONAME
-	_ZN11CMnMapImage15SetTargetOriginERK6TPoint @ 77 NONAME
-	_ZN11CMnMapImage17SetMapImageParamsER17TMnMapImageParams @ 78 NONAME
-	_ZN11CMnMapImage19SupportedImageTypesEv @ 79 NONAME
-	_ZN11CMnMapImage4NewLER11CMnProvider @ 80 NONAME
-	_ZN11CMnMapImage7RenderLER10CFbsBitmapR14TRequestStatus @ 81 NONAME
-	_ZN11CMnMapImage7RenderLER10CFbsBitmapR25MMnMapImageRenderCallback @ 82 NONAME
-	_ZN11CMnMapImageD0Ev @ 83 NONAME
-	_ZN11CMnMapImageD1Ev @ 84 NONAME
-	_ZN11CMnMapImageD2Ev @ 85 NONAME
-	_ZN17TMnMapImageParamsC1Ev @ 86 NONAME
-	_ZN17TMnMapImageParamsC2Ev @ 87 NONAME
-	_ZNK11CMnMapImage11ShowOptionsEv @ 88 NONAME
-	_ZNK11CMnMapImage14MapImageParamsEv @ 89 NONAME
-	_ZNK11CMnMapImage18GetImageCoordinateERK11TCoordinateR6TPoint @ 90 NONAME
-	_ZNK11CMnMapImage18GetWorldCoordinateERK6TPointR11TCoordinate @ 91 NONAME
-	_ZNK24RMnMapImageServiceClient10ServiceUidEv @ 92 NONAME
-	_ZTI11CMnMapImage @ 93 NONAME ; #<TI>#
-	_ZTV11CMnMapImage @ 94 NONAME ; #<VT>#
-	_ZN11CMnMapImage16SetExitObserverLER25MAknServerAppExitObserver @ 95 NONAME
-	_ZN11CMnMapImage18RemoveExitObserverEv @ 96 NONAME
-	_ZN26CMnCoordinateConverterBaseC2Ev @ 97 NONAME
-	_ZN26CMnCoordinateConverterBaseD0Ev @ 98 NONAME
-	_ZN26CMnCoordinateConverterBaseD1Ev @ 99 NONAME
-	_ZN26CMnCoordinateConverterBaseD2Ev @ 100 NONAME
-	_ZNK26CMnCoordinateConverterBase14MapImageParamsEv @ 101 NONAME
-	_ZTI26CMnCoordinateConverterBase @ 102 NONAME ; #<TI>#
-	_ZTV26CMnCoordinateConverterBase @ 103 NONAME ; #<VT>#
-
--- a/locationmapnavfw/library/eabi/mnservicelibu.def	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,61 +0,0 @@
-EXPORTS
-	_ZN14CMnServiceBase12ServiceErrorERK9RMessage2i @ 1 NONAME
-	_ZN14CMnServiceBase15CompleteRequestEi @ 2 NONAME
-	_ZN21CMnMapViewServiceBase10AreaRadiusEv @ 3 NONAME
-	_ZN21CMnMapViewServiceBase14BaseConstructLEv @ 4 NONAME
-	_ZN21CMnMapViewServiceBase15LandmarksToShowEv @ 5 NONAME
-	_ZN21CMnMapViewServiceBase19GetAreaCentralPointER11TCoordinate @ 6 NONAME
-	_ZN21CMnMapViewServiceBase20SelectionRequestTextEv @ 7 NONAME
-	_ZN21CMnMapViewServiceBase21CurrentLocationOptionEv @ 8 NONAME
-	_ZN21CMnMapViewServiceBase21IsAreaCentralPointSetEv @ 9 NONAME
-	_ZN21CMnMapViewServiceBase21LinkedLandmarksToShowEi @ 10 NONAME
-	_ZN21CMnMapViewServiceBase24CompleteSelectionRequestEi @ 11 NONAME
-	_ZN21CMnMapViewServiceBase24CompleteSelectionRequestEmi @ 12 NONAME
-	_ZN21CMnMapViewServiceBase24LandmarksToShowDatabasesEv @ 13 NONAME
-	_ZN21CMnMapViewServiceBase25CompleteSelectionRequestLERK12CPosLandmark @ 14 NONAME
-	_ZN21CMnMapViewServiceBase7OptionsEv @ 15 NONAME
-	_ZN21CMnMapViewServiceBase8ServiceLERK9RMessage2 @ 16 NONAME
-	_ZN21CMnMapViewServiceBaseC2Ev @ 17 NONAME
-	_ZN21CMnMapViewServiceBaseD0Ev @ 18 NONAME
-	_ZN21CMnMapViewServiceBaseD1Ev @ 19 NONAME
-	_ZN21CMnMapViewServiceBaseD2Ev @ 20 NONAME
-	_ZN23CMnGeocodingServiceBase14BaseConstructLEv @ 21 NONAME
-	_ZN23CMnGeocodingServiceBase25CompleteGeocodingRequestLERK12CPosLandmark @ 22 NONAME
-	_ZN23CMnGeocodingServiceBase8ServiceLERK9RMessage2 @ 23 NONAME
-	_ZN23CMnGeocodingServiceBaseC2Ev @ 24 NONAME
-	_ZN23CMnGeocodingServiceBaseD0Ev @ 25 NONAME
-	_ZN23CMnGeocodingServiceBaseD1Ev @ 26 NONAME
-	_ZN23CMnGeocodingServiceBaseD2Ev @ 27 NONAME
-	_ZN24CMnNavigationServiceBase14BaseConstructLEv @ 28 NONAME
-	_ZN24CMnNavigationServiceBase8ServiceLERK9RMessage2 @ 29 NONAME
-	_ZN24CMnNavigationServiceBaseC2Ev @ 30 NONAME
-	_ZN24CMnNavigationServiceBaseD0Ev @ 31 NONAME
-	_ZN24CMnNavigationServiceBaseD1Ev @ 32 NONAME
-	_ZN24CMnNavigationServiceBaseD2Ev @ 33 NONAME
-	_ZNK23CMnGeocodingServiceBase7OptionsEv @ 34 NONAME
-	_ZTI14CMnServiceBase @ 35 NONAME ; #<TI>#
-	_ZTI21CMnMapViewServiceBase @ 36 NONAME ; #<TI>#
-	_ZTI23CMnGeocodingServiceBase @ 37 NONAME ; #<TI>#
-	_ZTI24CMnNavigationServiceBase @ 38 NONAME ; #<TI>#
-	_ZTIN21CMnMapViewServiceBase20CLinkedLandmarksListE @ 39 NONAME ; #<TI>#
-	_ZTV14CMnServiceBase @ 40 NONAME ; #<VT>#
-	_ZTV21CMnMapViewServiceBase @ 41 NONAME ; #<VT>#
-	_ZTV23CMnGeocodingServiceBase @ 42 NONAME ; #<VT>#
-	_ZTV24CMnNavigationServiceBase @ 43 NONAME ; #<VT>#
-	_ZTVN21CMnMapViewServiceBase20CLinkedLandmarksListE @ 44 NONAME ; #<VT>#
-	_ZN22CMnMapImageServiceBase14BaseConstructLEv @ 45 NONAME
-	_ZN22CMnMapImageServiceBase14MapImageParamsEv @ 46 NONAME
-	_ZN22CMnMapImageServiceBase17CompleteRenderingEv @ 47 NONAME
-	_ZN22CMnMapImageServiceBase17SetMapImageParamsERK17TMnMapImageParams @ 48 NONAME
-	_ZN22CMnMapImageServiceBase8ServiceLERK9RMessage2 @ 49 NONAME
-	_ZN22CMnMapImageServiceBaseC2Ev @ 50 NONAME
-	_ZN22CMnMapImageServiceBaseD0Ev @ 51 NONAME
-	_ZN22CMnMapImageServiceBaseD1Ev @ 52 NONAME
-	_ZN22CMnMapImageServiceBaseD2Ev @ 53 NONAME
-	_ZNK22CMnMapImageServiceBase10TargetRectEv @ 54 NONAME
-	_ZNK22CMnMapImageServiceBase11ShowOptionsEv @ 55 NONAME
-	_ZNK22CMnMapImageServiceBase12TargetBitmapEv @ 56 NONAME
-	_ZNK22CMnMapImageServiceBase14MapImageParamsEv @ 57 NONAME
-	_ZTI22CMnMapImageServiceBase @ 58 NONAME ; #<TI>#
-	_ZTV22CMnMapImageServiceBase @ 59 NONAME ; #<VT>#
-
--- a/locationmapnavfw/library/group/bld.inf	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,36 +0,0 @@
-/*
-* Copyright (c) 2005-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:  Build information file for Map and Navigation Framework project
-*
-*/
-
-
-#include <platform_paths.hrh>
-
-PRJ_PLATFORMS
-DEFAULT
-
-PRJ_EXPORTS
-../../loc/mnclientlib.loc                   MW_LAYER_LOC_EXPORT_PATH(mnclientlib.loc)
-
-// SDK APIs
-
-// Domain APIs
-
-// Private APIs
-../inc/mnutils.h                            |../../inc/mnutils.h
-
-PRJ_MMPFILES
-mnclientlib.mmp
-mnservicelib.mmp
--- a/locationmapnavfw/library/group/mnclientlib.mmp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,73 +0,0 @@
-/*
-* Copyright (c) 2005-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:  Project definition file for client side of Library
-*
-*/
-
-
-#include <platform_paths.hrh>
-#include <data_caging_paths.hrh>
-
-TARGET          mnclientlib.dll
-TARGETTYPE      dll
-UID             0x1000008D 0x10206902
-
-VENDORID        VID_DEFAULT
-CAPABILITY      CAP_GENERAL_DLL
-
-SOURCEPATH      ../src
-
-SOURCE          mnmapview.cpp
-SOURCE          mnnavigator.cpp
-SOURCE          mngeocoder.cpp
-SOURCE          mnprovider.cpp
-SOURCE          mnproviderfinder.cpp
-SOURCE          mnproviderimpl.cpp
-
-SOURCE          mnserviceclientbase.cpp
-SOURCE          mnmapviewserviceclient.cpp
-SOURCE          mnnavigationserviceclient.cpp
-SOURCE          mngeocodingserviceclient.cpp
-
-SOURCE          mnmapimage.cpp
-SOURCE          mnmapimageparams.cpp
-SOURCE          mncoordinateconverterbase.cpp
-SOURCE          mnmapimageserviceclient.cpp
-
-SOURCE          mnactivecallback.cpp
-SOURCE          mnutils.cpp
-
-START RESOURCE  ../data/mnclientlib.rss
-TARGETPATH      RESOURCE_FILES_DIR
-HEADER
-LANGUAGE_IDS
-END
-
-USERINCLUDE     .
-USERINCLUDE     ../inc
-USERINCLUDE     ../../loc
-
-MW_LAYER_SYSTEMINCLUDE
-
-LIBRARY         lbs.lib eposlandmarks.lib
-LIBRARY         euser.lib apgrfx.lib avkon.lib apparc.lib eikcore.lib cone.lib
-LIBRARY         efsrv.lib estor.lib bafl.lib fbscli.lib ecom.lib
-LIBRARY         sisregistryclient.lib siscontroller.lib
-
-DEBUGLIBRARY    flogger.lib
-
-SMPSAFE
-
-// END OF FILE
-
--- a/locationmapnavfw/library/group/mnservicelib.mmp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,49 +0,0 @@
-/*
-* Copyright (c) 2005-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:  Project definition file for server side of Library
-*
-*/
-
-
-#include <platform_paths.hrh>
-
-TARGET          mnservicelib.dll
-TARGETTYPE      dll
-UID             0x1000008D 0x10206903
-
-VENDORID        VID_DEFAULT
-CAPABILITY      CAP_GENERAL_DLL
-
-SOURCEPATH      ../src
-
-SOURCE          mnservicebase.cpp
-SOURCE          mnmapviewservicebase.cpp
-SOURCE          mngeocodingservicebase.cpp
-SOURCE          mnnavigationservicebase.cpp
-SOURCE          mnmapimageservicebase.cpp
-
-USERINCLUDE     .
-USERINCLUDE     ../inc
-
-MW_LAYER_SYSTEMINCLUDE
-
-LIBRARY         lbs.lib eposlandmarks.lib mnclientlib.lib
-LIBRARY         euser.lib apparc.lib avkon.lib estor.lib fbscli.lib
-
-DEBUGLIBRARY    flogger.lib
-
-SMPSAFE
-
-// END OF FILE
-
--- a/locationmapnavfw/library/inc/mnactivecallback.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,56 +0,0 @@
-/*
-* Copyright (c) 2007 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:  CMnActiveCallback class
-*
-*/
-
-
-#ifndef MN_ACTIVECALLBACK_H_
-#define MN_ACTIVECALLBACK_H_
-
-#include <e32base.h>
-
-class CMnMapImage;
-class MMnMapImageRenderCallback;
-class RMnMapImageServiceClient;
-
-/** This is an active object, which calls MMnMapImageRenderCallback,
-    when its asyncronous request is completed. Used to wrap 
-    asynchronous CMnMapImage::RenderL. */
-NONSHARABLE_CLASS( CMnActiveCallback ): public CActive
-    {
-    public:
-        static CMnActiveCallback* NewL( 
-            CMnMapImage& aOwner,
-            RMnMapImageServiceClient& aSession );
-        
-        void StartL( CFbsBitmap& aBitmap, MMnMapImageRenderCallback& aCallback );
-        
-    protected: // From CActive
-        void RunL();
-        void DoCancel();
-        TInt RunError( TInt aError );    
-    
-    private:
-        CMnActiveCallback( 
-            CMnMapImage& aOwner,
-            RMnMapImageServiceClient& aSession );
-
-    private:
-        CMnMapImage& iOwner;
-        RMnMapImageServiceClient& iSession;
-        MMnMapImageRenderCallback* iCallback;
-    };
-
-#endif //MN_ACTIVECALLBACK_H_
\ No newline at end of file
--- a/locationmapnavfw/library/inc/mndebug.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,85 +0,0 @@
-/*
-* Copyright (c) 2005-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:  Debug macros
-*
-*/
-
-
-#ifndef MN_DEBUG_H
-#define MN_DEBUG_H
-
-#ifdef _DEBUG
-
-#include <e32base.h>
-
-inline void Panic( TInt aReason )
-    {
-    _LIT( KPanicCategory, "MnLibraryDebug" );
-    User::Panic( KPanicCategory, aReason );
-    }
-
-#include <e32svr.h>
-#include <e32std.h>
-#include <f32file.h>
-#include <flogger.h>
-
-_LIT(KLogFile, "mnlog.txt");
-_LIT(KLogDirFullName, "c:\\logs\\");
-_LIT(KLogDir, "mn");
-
-inline void Prefix( TDes& aMessage )
-    {
-    RProcess process;
-    _LIT( KPrefix, "[MnLibrary/%ld]: ");
-    aMessage.Format( KPrefix, process.Id().Id() );
-    }
-
-inline void Log( TRefByValue<const TDesC> aFmt, ... )
-    {
-    VA_LIST list;
-    VA_START( list, aFmt );
-
-    HBufC* buf = HBufC::New(512);
-    if ( buf )
-    	{
-    	TPtr ptr( buf->Des() );
-	    Prefix( ptr );
-	    ptr.AppendFormatList( aFmt, list );
-	
-	    RDebug::RawPrint( ptr );
-	    RFileLogger::Write( KLogDir, KLogFile, EFileLoggingModeAppend, ptr );
-
-	    delete buf;
-    	}
-    }
-
-#define LOG( a )             { Log( _L( a ) ); }
-#define LOG1( a, b )         { Log( _L( a ), b ); }
-#define LOG2( a, b, c )      { Log( _L( a ), b, c ); }
-#define LOG3( a, b, c, d )   { Log( _L( a ), b, c, d ); }
-#define LOG4( a, b, c, d, e )   { Log( _L( a ), b, c, d, e ); }
-
-#else // _DEBUG
-
-// Release version - no logging
-#define LOG( a)
-#define LOG1( a, b )
-#define LOG2( a, b, c)
-#define LOG3( a, b, c, d)
-#define LOG4( a, b, c, d, e )
-
-#endif // _DEBUG
-
-#endif // MN_DEBUG_H
-
--- a/locationmapnavfw/library/inc/mngeocodingserviceclient.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,76 +0,0 @@
-/*
-* Copyright (c) 2005-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:  RMnGeocodingServiceClient class
-*
-*/
-
-
-#ifndef MN_GEOCODINGSERVICECLIENT_H
-#define MN_GEOCODINGSERVICECLIENT_H
-
-#include "mninternal.h"
-#include "mngeocoder.h"
-#include "mnserviceclientbase.h"
-
-/** \internal 
- *  Client side of IPC with CMnGeocodingServiceBase.
- */
-NONSHARABLE_CLASS( RMnGeocodingServiceClient ): public RMnServiceClientBase
-    {      
-    public:
-        /** C++ constructor */
-        RMnGeocodingServiceClient();
-        ~RMnGeocodingServiceClient();
-
-        /** Issues async request for geocoding */
-        void AddressByCoordinateL(
-            const CPosLandmark& aCoordinateLanmdark,
-            CMnGeocoder::TOptions aOptions,
-            TRequestStatus& aStatus);
-        
-        /** Issues async request for reverse geocoding */
-        void CoordinateByAddressL(
-            const CPosLandmark& aAddressLanmdark,
-            CMnGeocoder::TOptions aOptions,
-            TRequestStatus& aStatus);
-
-        /** Issues async request for reverse geocoding 
-         *  with plain string address 
-         */
-        void CoordinateByAddressL(
-            const TDesC& aAddress,
-            CMnGeocoder::TOptions aOptions,
-            TRequestStatus& aStatus);
-
-        /** Client takes ownership of the returned pointer, 
-         *  if this method succeeds.
-         *  \leaves KErrNotFound if result is not available.
-         */
-        void GetLastResultL( CPosLandmark*& aResult, TMnGeocodingResultType& aResultType );
-
-    private : // from RApaAppServiceBase
-        IMPORT_C TUid ServiceUid() const;
-        
-    private:
-        TInt            iResultSize;
-        TPckg<TInt>     iResultSizePtr;
-        
-        HBufC8*         iLandmarkBuffer;    
-        HBufC*          iPlainAddress;
-        
-        CMnGeocoder::TOptions   iOptions;
-        TPtrC8                  iOptionsPtr;
-    };
-    
-#endif // MN_GEOCODINGSERVICECLIENT_H
--- a/locationmapnavfw/library/inc/mninternal.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,131 +0,0 @@
-/*
-* Copyright (c) 2005-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:  Internal constants for Map and Navigation FW
-*
-*/
-
-
-#ifndef MN_INTERNAL_H
-#define MN_INTERNAL_H
-
-#include <eikserverapp.h>
-#include <lbsposition.h>
-#include "mnmapview.h"
-#include "mnmapimage.h"
-
-// Map and Navigation Library resource file
-_LIT( KLibResourceFile, "\\resource\\mnclientlib.rsc" );
-
-// Internal panic category
-_LIT( KMnPanicInternal, "MnInternal" );
-
-// IPC constants
-enum TMnIpcCode
-    {
-    EMnIpcNone = -1,
-    EMnIpcStart = REikAppServiceBase::KServiceCmdBase,
-    EMnIpcCancel,
-
-    EMnIpcMapViewOffset = 1000,
-    EMnIpcShowMap,
-    EMnIpcShowCurrentLocation,
-    EMnIpcSelectFromMap,
-    EMnIpcGetSelectionResultLandmark,
-    EMnIpcGetSelectionResultDbUri,
-    EMnIpcAddLmIdsToShow,
-    EMnIpcAddLandmarksToShow,
-    EMnIpcResetLandmarksToShow,
-    EMnIpcInitRequestText,
-
-    EMnIpcNavigationOffset = 2000,
-    EMnIpcNavigateTo,
-
-    EMnIpcGeocodingOffset = 3000,
-    EMnIpcCoordToAddress,
-    EMnIpcAddressToCoord,
-    EMnIpcPlainAddressToCoord,
-    EMnIpcGetConversionResult,
-
-    EMnIpcRenderImage = 4000,
-    EMnIpcGetImageCoordinate,
-    EMnIpcGetWorldCoordinate
-    };
-
-enum TMnIpcParams
-    {
-    // common params
-    EMnIpcCancelRequestIdIndex = 0,
-
-    // mapview params
-    EMnIpcMapOptionsParamIndex = 0,
-    EMnIpcMapSelectionTextParamIndex = 1,
-    EMnIpcMapSelectionResultInfoParamIndex = 2,
-
-    EMnIpcMapDbUriParamIndex = 0,
-    EMnIpcMapLmIdsParamIndex = 1,
-
-    EMnIpcMapLandmarksParamIndex = 0,
-
-    EMnIpcMapSelResultBufferParamIndex = 0,
-
-    // navigation params
-    EMnIpcNaviLandmarkParamIndex = 0,
-
-    // geocoding params
-    EMnIpcGeoOptionsParamIndex = 0,
-    EMnIpcGeoResultSizeParamIndex = 1,
-    EMnIpcGeoLandmarkParamIndex = 2,
-    EMnIpcGeoPlainAddressParamIndex = 2,
-
-    EMnIpcGeoResultParamIndex = 0,
-    EMnIpcGeoResultTypeParamIndex = 1,
-
-    // mapimage params
-    EMnIpcImageParamsParamIndex = 0,
-    EMnIpcImageOptionsParamIndex = 1,
-    EMnIpcImageBitmapHandleParamIndex = 2,
-    };
-
-enum TMnMapSelectionResultType
-    {
-    EMnMapSelResultNone,
-    EMnMapSelResultLandmarkLink,
-    EMnMapSelResultLandmarkInstance
-    };
-
-enum TMnGeocodingResultType
-    {
-    EMnGeoResultNone,
-    EMnGeoResultCoordinates,
-    EMnGeoResultAddress
-    };
-
-class TMnMapOptions
-    {
-    public:
-        CMnMapView::TOptions                iOptions;
-        CMnMapView::TCurrentLocationOption  iCurrentLocationOption;
-
-        TCoordinate                         iCentralPoint;
-        TReal                               iRadius;
-    };
-
-class TMnMapImageOptions
-    {
-    public:
-        CMnMapImage::TShowOptions           iShowOptions;
-        TPoint                              iTargetOrigin;
-    };
-
-#endif // MN_INTERNAL_H
--- a/locationmapnavfw/library/inc/mninternal.inl	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +0,0 @@
-/*
-* Copyright (c) 2005-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:  Internal inline methods
-*
-*/
-
-
-// -----------------------------------------------------------------------------
-//  Used to panic server implementation
-// -----------------------------------------------------------------------------
-//
-inline void PanicServer( TInt aReason )
-    {
-    User::Panic( KMnPanicServerFault, aReason );
-    }
-
-// -----------------------------------------------------------------------------
-//  Used to panic client from server side
-// -----------------------------------------------------------------------------
-//
-inline void PanicClient( const RMessage2& aMessage, TInt aReason )
-    {
-    aMessage.Panic( KMnPanicClientFault, aReason );
-    }
-
-// -----------------------------------------------------------------------------
-//  Used for internal panic, debugging time only
-// -----------------------------------------------------------------------------
-//
-inline void PanicSelf( TInt aReason )
-    {
-    User::Panic( KMnPanicInternal, aReason );
-    }
--- a/locationmapnavfw/library/inc/mnmapimageserviceclient.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,52 +0,0 @@
-/*
-* Copyright (c) 2005-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:  RMnMapImageServiceClient class
-*
-*/
-
-
-#ifndef MN_MAPIMAGESERVICECLIENT_H
-#define MN_MAPIMAGESERVICECLIENT_H
-
-#include "mninternal.h"
-#include "mnmapimage.h"
-#include "mnserviceclientbase.h"
-
-/** @internal 
- *  Client side of IPC with CMnMapImageServiceBase.
- */
-NONSHARABLE_CLASS( RMnMapImageServiceClient ): public RMnServiceClientBase
-    {      
-    public:
-        /** C++ constructor */
-        RMnMapImageServiceClient();
-
-        /** Issues async request for rendering */
-        void Render(
-            CFbsBitmap& aBitmap,
-            TMnMapImageParams& aParams,
-            TMnMapImageOptions& aOptions,
-            TRequestStatus& aStatus);
-
-    private : // from RApaAppServiceBase
-        IMPORT_C TUid ServiceUid() const;
-        
-    private:
-        TPtr8                       iParamsDes;
-
-        TMnMapImageOptions          iOptions;
-        TPckgC<TMnMapImageOptions>  iOptionsPack;
-    };
-    
-#endif // MN_MAPIMAGESERVICECLIENT_H
--- a/locationmapnavfw/library/inc/mnmapselectionresultinfo.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,55 +0,0 @@
-/*
-* Copyright (c) 2005-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:  TMnMapSelectionResultInfo class
-*
-*/
-
-
-#ifndef MN_MAPSELECTIONRESULTINFO_H
-#define MN_MAPSELECTIONRESULTINFO_H
-
-#include <mnmapview.h>
-#include <EPos_Landmarks.h>
-
-class CPosLandmark;
-
-/** \internal 
- *  Contains information about result of CMnMapView::SelectFromMapL request 
- */
-class TMnMapSelectionResultInfo
-    {
-    public:
-        /** Default constructor */
-        inline TMnMapSelectionResultInfo();
-        /** Initializes for CMnMapView::ESelectionLandmarkIndex result */
-        inline TMnMapSelectionResultInfo( TInt aLandmarkIndex );
-        /** Initializes for CMnMapView::ESelectionFreeLandmark result */
-        inline TMnMapSelectionResultInfo( const TDesC8& aLandmarkBuffer );
-        /** Initializes for CMnMapView::ESelectionLinkedLandmark result */
-        inline TMnMapSelectionResultInfo( TPosLmItemId aLandmarkId, const TDesC& aDbUri );
-        
-        /** Type of result */
-        CMnMapView::TSelectionResultType    iType;
-        /** Index of landmark selected */
-        TInt                                iLandmarkIndex;
-        /** ID of landmark selected */
-        TPosLmItemId                        iLandmarkId;
-        /** Size of buffer required to receive landark from server */ 
-        TInt                                iLandmarkSize;
-        /** Size of buffer required to receive dafabase URI server */ 
-        TInt                                iDbUriSize;
-    };
-
-#endif // MN_MAPSELECTIONRESULTINFO_H
-
--- a/locationmapnavfw/library/inc/mnmapselectionresultinfo.inl	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,71 +0,0 @@
-/*
-* Copyright (c) 2005-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:  TMnMapSelectionResultInfo class implementation
-*
-*/
-
-
-#include "mnmapselectionresultinfo.h"
-
-// ======== LOCAL FUNCTIONS ========
-
-// ======== MEMBER FUNCTIONS ========
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-inline TMnMapSelectionResultInfo::TMnMapSelectionResultInfo()
-    {
-    iType = CMnMapView::ESelectionNone;
-    iLandmarkIndex = -1;
-    iLandmarkId = KPosLmNullItemId;
-    iLandmarkSize = 0;
-    iDbUriSize = 0;
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-inline TMnMapSelectionResultInfo::TMnMapSelectionResultInfo( TInt aLandmarkIndex )
-    {
-    iType = CMnMapView::ESelectionLandmarkIndex;
-    iLandmarkIndex = aLandmarkIndex;
-    iLandmarkId = KPosLmNullItemId;
-    iLandmarkSize = 0;
-    iDbUriSize = 0;
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-inline TMnMapSelectionResultInfo::TMnMapSelectionResultInfo( const TDesC8& aLandmarkBuffer )
-    {
-    iType = CMnMapView::ESelectionFreeLandmark;
-    iLandmarkIndex = -1;
-    iLandmarkId = KPosLmNullItemId;
-    iLandmarkSize = aLandmarkBuffer.Size();
-    iDbUriSize = 0;
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-inline TMnMapSelectionResultInfo::TMnMapSelectionResultInfo( TPosLmItemId aLandmarkId, const TDesC& aDbUri )
-    {
-    iType = CMnMapView::ESelectionLinkedLandmark;
-    iLandmarkIndex = -1;
-    iLandmarkId = aLandmarkId;
-    iLandmarkSize = 0;
-    iDbUriSize = aDbUri.Size();
-    }
--- a/locationmapnavfw/library/inc/mnmapviewserviceclient.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,78 +0,0 @@
-/*
-* Copyright (c) 2005-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:  RMnMapViewServiceClient class
-*
-*/
-
-
-#ifndef MN_MAPVIEWSERVICECLIENT_H
-#define MN_MAPVIEWSERVICECLIENT_H
-
-#include <AknServerApp.h>
-#include <EPos_Landmarks.h>
-
-#include "mnmapselectionresultinfo.h"
-#include "mnserviceclientbase.h"
-
-class CPosLandmark;
-
-/** \internal */
-NONSHARABLE_CLASS( RMnMapViewServiceClient ) : public RMnServiceClientBase
-    {        
-    public:
-        /** C++ constructor */
-        RMnMapViewServiceClient();
-        /** C++ destructor */
-        ~RMnMapViewServiceClient();
-        
-        void AddLandmarksToShowL( 
-            const TDesC& aDatabaseUri, RArray<TPosLmItemId>& aLandmarkIds );
-            
-        void AddLandmarksToShowL( RPointerArray<CPosLandmark>& aLandmarks );
-        void AddLandmarksToShowL( RArray<TPtrC8>& aPackedLandmarks );
-        
-        void ResetLandmarksToShow();
-        
-        void InitSelectionRequestTextL( HBufC*& aSelectionRequestText );
-        void SetSelectionRequestTextL( const TDesC& aSelectionRequestText );
-        void SetSelectionRequestText( HBufC*& aSelectionRequestText );
-        void ClearSelectionRequestText();
-     
-        void ShowMapL( TMnMapOptions aOptions );
-        
-        void ShowCurrentLocationL( TMnMapOptions aOptions );
-        
-        void SelectFromMap( TMnMapOptions aOptions, TRequestStatus& aStatus );
-        
-        CMnMapView::TSelectionResultType SelectionResultType();
-
-        CPosLandmark* GetSelectedLandmarkL();
-        void GetSelectedLandmarkL( TInt& aLandmarkIndex );
-        void GetSelectedLandmarkL( TPosLmItemId& aLandmarkId, HBufC*& aDbUri );
-
-    private: // from RApaAppServiceBase
-        TUid ServiceUid() const ;
-        
-    private:
-        TMnMapOptions               iOptions;
-        TPtrC8                      iOptionsPtr;
-        
-        HBufC*                      iSelectionRequestText;
-        TBool                       iSelectionRequestTextOwned;
-        
-        TMnMapSelectionResultInfo           iResultInfo;
-        TPckg<TMnMapSelectionResultInfo>    iResultInfoPtr;
-    };
-    
-#endif // MN_MAPVIEWSERVICECLIENT_H
--- a/locationmapnavfw/library/inc/mnnavigationserviceclient.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,43 +0,0 @@
-/*
-* Copyright (c) 2005-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:  RMnNavigationServiceClient class
-*
-*/
-
-
-#ifndef MN_NAVIGATIONSERVICECLIENT_H
-#define MN_NAVIGATIONSERVICECLIENT_H
-
-#include <AknServerApp.h>
-
-#include "mnserviceclientbase.h"
-
-class CPosLandmark;
-
-/** \internal */
-NONSHARABLE_CLASS( RMnNavigationServiceClient ) : public RMnServiceClientBase
-    {        
-    public:
-        /** C++ constructor */
-        RMnNavigationServiceClient();
-        /** C++ destructor */
-        ~RMnNavigationServiceClient();
-        
-        void NavigateToL( const CPosLandmark& aDestinationLanmdark );
-
-    private: // from RApaAppServiceBase
-        TUid ServiceUid() const;
-    };
-    
-#endif // MN_NAVIGATIONSERVICECLIENT_H
--- a/locationmapnavfw/library/inc/mnproviderimpl.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,119 +0,0 @@
-/*
-* Copyright (c) 2005-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:  CMnProviderImpl class
-*
-*/
-
-
-#ifndef MN_PROVIDER_IMPL_H
-#define MN_PROVIDER_IMPL_H
-
-#include <swi/sisregistrysession.h>
-#include "mnprovider.h"
-
-class RMnServiceClientBase;
-class RApaLsSession;
-   
-/*  @brief Implementation of CMnProvider.
- *  @internal
- */
-NONSHARABLE_CLASS( CMnProviderImpl ) : public CMnProvider
-    {
-    public :
-        ~CMnProviderImpl();
-        
-        static CMnProviderImpl* NewL( TUid aProvider );
-        static CMnProviderImpl* NewL( 
-            TUid aAppUid, 
-            RApaLsSession& aApaSession, 
-            Swi::RSisRegistrySession& aSisSession );
-        
-        /** This constructor reads all provider's info from 
-         *  AppArc and Swi */
-        void ConstructL( TUid aAppUid );
-        
-        /** Performance-aware constructor. Uses ready connections to 
-         *  AppArc and Swi */
-        void ConstructL(
-            TUid aAppUid, 
-            RApaLsSession& aApaSession, 
-            Swi::RSisRegistrySession& aSisSession );
-            
-        /** Returns trust info of provider's sis package */            
-        TBool IsTrusted();    
-
-    public : // From CMnProvider        
-
-        TUint32 SupportedFeatures( TService aService ) const;
-
-    protected :
-        CMnProviderImpl();
-        
-        /** Resembles MN_SERVICE_INFO resource structure */
-        struct TMnAppServiceInfo
-            {
-            /* Supported features of this service */
-            TInt32 iServiceFeatures;
-            };
-
-        /** Reads application info from AppArc */
-        void ReadAppArcInfoL( RApaLsSession& aApaSession );
-
-        /** Looks for MN_SERVICE_INFO struct in application's SERVICE_INFO opaque data. */
-        TBool ReadMnServiceInfoL(
-            RApaLsSession& aApaSession, 
-            TUid aServiceUid, 
-            TMnAppServiceInfo& aServiceInfo );
-
-        /** Checks service features */
-        void CheckServiceFeaturesL( 
-            RApaLsSession& aApaSession,
-            CMnProvider::TService aService, 
-            TUint32& aServiceFeatures );
-
-        /** Reads extended service info from SERVICE_INFO struct */
-        void ReadServiceFeaturesL( RApaLsSession& aApaSession );
-
-        /** Reads package info from Installation Registry 
-         *  and verifies trust level */
-        void ReadPackageInfoL( Swi::RSisRegistrySession& aSisSession );
-        
-        /** Verifies if converter plug-in exists for provider of MapImage service */
-        TBool IsConverterPluginFoundL();
-
-        /** \brief Sets Provider Application's name */
-        void SetNameL( const TDesC& aName );
-
-        /** \brief Sets Provider Application's short name */
-        void SetShortNameL( const TDesC& aShortName );
-
-        /** \brief Sets Provider Application's vendor name */
-        void SetVendorNameL( const TDesC& aVendorName );
-
-        /** \brief Sets Provider Application's version */
-        void SetVersion( TVersion aVersion );
-
-        /** \brief Sets Provider Application's supported services */
-        void SetSupportedServices( TServices aServices );
-        
-    protected :
-        TBool   iIsTrusted;
-        TUint32 iMapViewFeatures;
-        TUint32 iNavigationFeatures;
-        TUint32 iGeocodingFeatures;
-        TUint32 iMapImageFeatures;
-    };
-
-#endif // MN_PROVIDER_IMPL_H
-
--- a/locationmapnavfw/library/inc/mnserviceclientbase.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,53 +0,0 @@
-/*
-* Copyright (c) 2005-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:  RMnServiceClientBase class
-*
-*/
-
-
-#ifndef MN_SERVICECLIENTBASE_H
-#define MN_SERVICECLIENTBASE_H
-
-#include <AknServerApp.h>
-
-#include "mninternal.h"
-#include "mnappserviceuids.hrh"
-
-/** \internal
- *  Base class for service implementations
- */
-NONSHARABLE_CLASS( RMnServiceClientBase ) : public RAknAppServiceBase
-    {
-    public:
-
-        /** Connects to new application server */
-        void ConnectL( TUid aProviderUid );
-
-        /** Connects to new chained application server */
-        void ConnectChainedL( TUid aProviderUid );
-        
-        /** Cancels last async request */
-        void Cancel();
-
-        /** Closes parent session */
-        void Close();
-        
-    protected:
-        RMnServiceClientBase();
-                
-        TMnIpcCode      iLastRequest;
-    };
-  
-#endif // MN_SERVICECLIENTBASE_H
-
--- a/locationmapnavfw/library/inc/mnutils.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,54 +0,0 @@
-/*
-* Copyright (c) 2005-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:  Internal helpers for Map and Navigation FW
-*
-*/
-
-
-#ifndef MN_UTILS_H
-#define MN_UTILS_H
-
-/** \inernal 
- *  This class contains internal utils for the subsystem
- */
-class MnUtils
-    {
-    public:
-        /** Looks for localized version of specified resource file 
-         *  on all available drives
-         *  \param[in] aFsSession opened session with File Server
-         *  \param[in] aRscFile z: -based name of SC file
-         *  \param[out] aFileName filename of localized version of SC file
-         *                        or SC filename if not found
-         *  \leave KErrNotFound if file is not found on any drives
-         */
-        IMPORT_C static void FindLocalizedResourceFileL( 
-            RFs& aFsSession, 
-            const TDesC& aRscFile,
-            TFileName& aFileName );
-
-        /** Looks for specified resource file on all available drives
-         *  on all available drives
-         *  \param[in] aFsSession opened session with File Server
-         *  \param[in] aFilePathAndName path and name of resource file
-         *  \param[out] aFileName filename with drive set
-         *  \leave KErrNotFound if file is not found on any drives
-         */
-        IMPORT_C static void FindResourceFileL( 
-            RFs& aFsSession,
-            const TDesC& aFilePathAndName,
-            TFileName& aRscFile );
-    };
-    
-#endif // MN_UTILS_H
--- a/locationmapnavfw/library/src/mnactivecallback.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,85 +0,0 @@
-/*
-* Copyright (c) 2007 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:  CMnActiveCallback class implementation
-*
-*/
-
-
-#include <e32base.h>
-
-#include "mnmapimage.h"
-#include "mnmapimageserviceclient.h"
-#include "mnactivecallback.h"
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-CMnActiveCallback::CMnActiveCallback( 
-    CMnMapImage& aOwner, 
-    RMnMapImageServiceClient& aSession )
-  : CActive( CActive::EPriorityStandard ), 
-    iOwner( aOwner ), 
-    iSession( aSession )
-    {
-    CActiveScheduler::Add( this );
-    }
-    
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-CMnActiveCallback* CMnActiveCallback::NewL( 
-    CMnMapImage& aOwner,
-    RMnMapImageServiceClient& aSession )
-    {
-    CMnActiveCallback* self = new (ELeave) CMnActiveCallback( aOwner, aSession );
-    return self;
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-void CMnActiveCallback::StartL(
-    CFbsBitmap& aBitmap, 
-    MMnMapImageRenderCallback& aCallback )
-    {
-    ASSERT( !IsActive() );
-    iCallback = &aCallback;
-    iOwner.RenderL( aBitmap, iStatus );
-    SetActive();
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-void CMnActiveCallback::RunL()
-    {
-    ASSERT( iCallback );
-    iCallback->HandleRenderingCompletedL( iStatus.Int(), iOwner );
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-void CMnActiveCallback::DoCancel()
-    {
-    iSession.Cancel();
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-TInt CMnActiveCallback::RunError( TInt /*aError*/ )
-    {
-    return KErrNone;
-    }
--- a/locationmapnavfw/library/src/mncoordinateconverterbase.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,79 +0,0 @@
-/*
-* Copyright (c) 2007 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:  CMnCoordinateConverterBase class implementation
-*
-*/
-
-
-#include <e32base.h>
-#include <ecom/ecom.h>
-#include <mnpluginuids.hrh>
-#include "mncoordinateconverterbase.h"
-
-// ========================== LOCAL FUNCTIONS ================================
-
-// ========================== MEMBER FUNCTIONS ===============================
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-EXPORT_C CMnCoordinateConverterBase::CMnCoordinateConverterBase()
-    {
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-CMnCoordinateConverterBase* CMnCoordinateConverterBase::NewL( TUid aProviderUid )
-    {
-    TInt32 offset = static_cast<TInt32> _FOFF( CMnCoordinateConverterBase, iDtorIdKey );
-
-    const TInt KNumUidHexDigits = 8;
-    TBuf8<KNumUidHexDigits> uidText8;
-    
-    _LIT8( KUidHexText, "%08X" );
-    uidText8.Format( KUidHexText, aProviderUid.iUid );
-
-    TEComResolverParams resolverParams;
-    resolverParams.SetDataType( uidText8 );
-
-    TAny* ptr = REComSession::CreateImplementationL( 
-        TUid::Uid( KMnMapImageConverterIf ), offset, resolverParams );
-
-    return reinterpret_cast<CMnCoordinateConverterBase*>( ptr );
-    }
-    
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-EXPORT_C CMnCoordinateConverterBase::~CMnCoordinateConverterBase()
-    {
-    REComSession::DestroyedImplementation( iDtorIdKey );
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-EXPORT_C const TMnMapImageParams& CMnCoordinateConverterBase::MapImageParams() const
-    {
-    return iImageParams;
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-void CMnCoordinateConverterBase::SetMapImageParams( const TMnMapImageParams& aImageParams )
-    {
-    iImageParams = aImageParams;
-    }
--- a/locationmapnavfw/library/src/mngeocoder.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,268 +0,0 @@
-/*
-* Copyright (c) 2005-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:  CMnGeocoder class implementation
-*
-*/
-
-
-#include <e32base.h>
-#include <e32math.h>
-#include <AknServerApp.h>
-#include <apaserverapp.h>
-
-#include <lbsfields.h>
-#include <lbsfieldids.h>
-#include <lbsposition.h>
-
-#include <EPos_CPosLandmark.h>
-
-#include "mnprovider.h"
-#include "mngeocodingserviceclient.h"
-#include "mngeocoder.h"
-
-// ======== LOCAL FUNCTIONS ========
-
-// ---------------------------------------------------------------------------
-//  Copies address information (address and building position fields) from 
-//  source landmark to target.
-// ---------------------------------------------------------------------------
-//
-void CopyAddressL( CPosLandmark& aSrc, CPosLandmark& aTrg )
-    {
-    // clean address fields (CMnGeocoder says that "all <data> will be updated")
-    for ( TPositionFieldId fieldId = EPositionFieldAddressCapabilitiesBegin + 1;
-          fieldId < EPositionFieldNMEACapabilitiesBegin;
-          fieldId++ )
-        {
-        aTrg.RemovePositionField( fieldId );
-        }
-    
-    // copy fields
-    TPositionFieldId fieldId = aSrc.FirstPositionFieldId();
-    while ( fieldId != EPositionFieldNone )
-        {
-        if ( fieldId > EPositionFieldAddressCapabilitiesBegin &&
-             fieldId < EPositionFieldNMEACapabilitiesBegin)
-            {
-            TPtrC field;
-            if ( KErrNone == aSrc.GetPositionField( fieldId, field ) )
-                {
-                aTrg.SetPositionFieldL( fieldId, field );
-                }
-            }
-        fieldId = aSrc.NextPositionFieldId( fieldId );            
-        }
-    }
-
-// ---------------------------------------------------------------------------
-//  Copies coordinate information (locality and coverage) from 
-//  source landmark to target. If some fields are empty in source,
-//  they will also be emptied in result.
-// ---------------------------------------------------------------------------
-//
-void CopyCoordinatesL( CPosLandmark& aSrc, CPosLandmark& aTrg )
-    {
-    TLocality loc;
-    aSrc.GetPosition( loc );
-    aTrg.SetPositionL( loc );
-    
-    TRealX nan;
-    nan.SetNaN();
-    TReal32 coverage( nan );
-    
-    aSrc.GetCoverageRadius( coverage );
-    aTrg.SetCoverageRadius( coverage );
-    }
-
-// ======== MEMBER FUNCTIONS ========
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-CMnGeocoder::CMnGeocoder()
-    {
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-void CMnGeocoder::ConstructCommonL( CMnProvider& aProvider )
-    {
-    if ( !( aProvider.SupportedServices() & CMnProvider::EServiceGeocoding ) )
-        {
-        User::Leave( KErrNotSupported );
-        }
-
-    iSession = new (ELeave) RMnGeocodingServiceClient;
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-void CMnGeocoder::ConstructNewL( CMnProvider& aProvider )
-    {
-    ConstructCommonL( aProvider );
-    iSession->ConnectL( aProvider.Uid() );
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-void CMnGeocoder::ConstructChainedL( CMnProvider& aProvider )
-    {
-    ConstructCommonL( aProvider );
-    iSession->ConnectChainedL( aProvider.Uid() );
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-EXPORT_C CMnGeocoder* CMnGeocoder::NewL( CMnProvider& aProvider )
-    {
-    CMnGeocoder* self = new (ELeave) CMnGeocoder;
-    CleanupStack::PushL( self );
-    self->ConstructNewL( aProvider );
-    CleanupStack::Pop( self );
-    return self;
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-EXPORT_C CMnGeocoder* CMnGeocoder::NewChainedL( CMnProvider& aProvider )
-    {
-    CMnGeocoder* self = new (ELeave) CMnGeocoder;
-    CleanupStack::PushL( self );
-    self->ConstructChainedL( aProvider );
-    CleanupStack::Pop( self );
-    return self;
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-EXPORT_C CMnGeocoder::~CMnGeocoder()
-    {
-	delete iExitMonitor;
-
-    if ( iSession )
-        {
-        iSession->Close();
-        delete iSession;
-        }
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-EXPORT_C CMnGeocoder::TOptions CMnGeocoder::Options() const
-    {
-    return iOptions;
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-EXPORT_C void CMnGeocoder::SetOptions( TOptions aOptions )
-    {
-    iOptions = aOptions;
-    }
-        
-// ---------------------------------------------------------------------------
-//  1. Get result from session in form of landmark
-//  2. If last request was for address, copy all position fields from 
-//     result to target landmark
-//  3. If last request was for coordinate, copy position data.
-// ---------------------------------------------------------------------------
-//
-EXPORT_C void CMnGeocoder::RetrieveGeocodingResultL( CPosLandmark& aTargetLandmark )
-    {
-    CPosLandmark* lm = NULL;
-    TMnGeocodingResultType resultType; 
-    iSession->GetLastResultL( lm, resultType );
-    CleanupStack::PushL( lm );
-    
-    switch ( resultType )
-        {
-        case EMnGeoResultAddress:
-            CopyAddressL( *lm, aTargetLandmark );
-            break;
-        case EMnGeoResultCoordinates:
-            CopyCoordinatesL( *lm, aTargetLandmark );
-            break;
-        }
-    CleanupStack::PopAndDestroy( lm );
-    }
-        
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-EXPORT_C void CMnGeocoder::FindCoordinateByAddressL(
-    const CPosLandmark& aLandmark, 
-    TRequestStatus& aRequest)
-    {
-    iSession->CoordinateByAddressL( aLandmark, iOptions, aRequest );
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-EXPORT_C void CMnGeocoder::FindCoordinateByAddressL(
-    const TDesC& aAddress, 
-    TRequestStatus& aRequest)
-    {
-    iSession->CoordinateByAddressL( aAddress, iOptions, aRequest );
-    }
-            
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-EXPORT_C void CMnGeocoder::FindAddressByCoordinateL(
-    const CPosLandmark& aLandmark, 
-    TRequestStatus& aRequest)
-    {
-    iSession->AddressByCoordinateL( aLandmark, iOptions, aRequest );
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-EXPORT_C void CMnGeocoder::Cancel()
-    {
-    iSession->Cancel();
-    }
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-EXPORT_C void CMnGeocoder::SetExitObserverL( MAknServerAppExitObserver& aObserver )
-	{
-	if ( iExitMonitor )
-		{
-		User::Leave( KErrAlreadyExists );
-		}
-	else
-		{
-		iExitMonitor = CApaServerAppExitMonitor::NewL( 
-			*iSession, aObserver, CActive::EPriorityStandard );
-		}
-	}
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-EXPORT_C void CMnGeocoder::RemoveExitObserver()
-	{
-	delete iExitMonitor;
-	iExitMonitor = NULL;
-	}
--- a/locationmapnavfw/library/src/mngeocodingservicebase.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,207 +0,0 @@
-/*
-* Copyright (c) 2005-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:  CMnGeocodingServiceBase class implementation
-*
-*/
-
-
-#include <e32base.h>
-
-#include <EPos_CPosLandmark.h>
-#include <epos_poslandmarkserialization.h>
-
-#include "mndebug.h"
-#include "mnerrors.h"
-#include "mninternal.h"
-#include "mninternal.inl"
-
-#include "mngeocodingservicebase.h"
-
-// ======== MEMBER FUNCTIONS ========
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-EXPORT_C CMnGeocodingServiceBase::CMnGeocodingServiceBase()
-    {
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-EXPORT_C CMnGeocodingServiceBase::~CMnGeocodingServiceBase()
-    {
-    delete iResult;
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-EXPORT_C void CMnGeocodingServiceBase::BaseConstructL()
-    {
-    CMnServiceBase::BaseConstructL();
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-EXPORT_C CMnGeocoder::TOptions CMnGeocodingServiceBase::Options() const 
-    {
-    LOG("CMnGeocodingServiceBase::Options");
-    return iOptions;
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-EXPORT_C void CMnGeocodingServiceBase::CompleteGeocodingRequestL( 
-    const CPosLandmark& aLandmark )
-    {
-    LOG("CMnGeocodingServiceBase::CompleteGeocodingRequestL in");
-    switch ( CurrentAsyncRequest() )
-        {
-        case EMnIpcCoordToAddress:
-            iResultType = EMnGeoResultAddress;
-            break;
-            
-        case EMnIpcAddressToCoord:
-        case EMnIpcPlainAddressToCoord:
-            iResultType = EMnGeoResultCoordinates;
-            break;
-        
-        default:
-            PanicServer( KMnPanicAttemptToCompleteNoRequest );
-        }
-
-    delete iResult;
-    iResult = NULL;
-    iResult = PosLandmarkSerialization::PackL( aLandmark );
-    
-    TInt resultSize = iResult->Size();
-    TPckg<TInt> resultSizePack( resultSize );
-    TInt err = iMessage.Write( EMnIpcGeoResultSizeParamIndex, resultSizePack );
-    CompleteRequest( err );
-
-    LOG("CMnGeocodingServiceBase::CompleteGeocodingRequestL out");
-    }
-    
-// ---------------------------------------------------------------------------
-//  From class CAknAppServiceBase
-// ---------------------------------------------------------------------------
-//
-EXPORT_C void CMnGeocodingServiceBase::ServiceL( const RMessage2& aMessage )
-    {
-    LOG1("CMnGeocodingServiceBase::ServiceL in, function %d", aMessage.Function());
-    
-    switch ( aMessage.Function() )
-        {
-        case EMnIpcCoordToAddress:
-        case EMnIpcAddressToCoord:
-        case EMnIpcPlainAddressToCoord:
-            PrepareAsyncRequestL( aMessage );
-            StartAsyncRequestL( aMessage );
-            break;
-
-        case EMnIpcGetConversionResult:
-            HandleGetConversionResultL( aMessage );
-            break;
-            
-        case EMnIpcCancel:
-            HandleCancelRequestL( aMessage );
-            break;
-            
-        default:
-            CMnServiceBase::ServiceL( aMessage );
-        }
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-void CMnGeocodingServiceBase::StartAsyncRequestL( const RMessage2& aMessage )
-    {
-    LOG("CMnGeocodingServiceBase::StartAsyncRequestL in");
-
-    HBufC* addr = NULL;
-    CPosLandmark* lm = NULL;
-
-    UnpackOptionsL( aMessage );
-
-    switch ( CurrentAsyncRequest() )
-        {
-        case EMnIpcCoordToAddress:
-            lm = UnpackLandmarkLC( aMessage, EMnIpcGeoLandmarkParamIndex );
-            HandleFindAddressByCoordinateL( *lm );
-            CleanupStack::PopAndDestroy( lm );
-            break;
-            
-        case EMnIpcAddressToCoord:
-            lm = UnpackLandmarkLC( aMessage, EMnIpcGeoLandmarkParamIndex );
-            HandleFindCoordinateByAddressL( *lm );
-            CleanupStack::PopAndDestroy( lm );
-            break;
-
-        case EMnIpcPlainAddressToCoord:
-            addr = UnpackPlainAddressLC( aMessage );
-            HandleFindCoordinateByAddressL( addr->Des() );
-            CleanupStack::PopAndDestroy( addr );
-            break;
-
-        default:
-            User::Leave( KErrNotSupported );
-        }
-
-    LOG("CMnGeocodingServiceBase::StartAsyncRequestL out");
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-void CMnGeocodingServiceBase::UnpackOptionsL( const RMessage2& aMessage )
-    {
-    LOG("CMnGeocodingServiceBase::UnpackOptionsL");
-    
-    TPckg<CMnGeocoder::TOptions> optsPack( iOptions );
-    aMessage.ReadL( EMnIpcGeoOptionsParamIndex, optsPack );
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-HBufC* CMnGeocodingServiceBase::UnpackPlainAddressLC( const RMessage2& aMessage )
-    {
-    LOG("CMnGeocodingServiceBase::UnpackPlainAddressLC");
-    return CopyClientBufferLC( aMessage, EMnIpcGeoPlainAddressParamIndex );
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-void CMnGeocodingServiceBase::HandleGetConversionResultL( const RMessage2& aMessage )
-    {
-    LOG("CMnGeocodingServiceBase::HandleGetConversionResultL in");
-    
-    if ( !iResult )
-        {
-        User::Leave( KErrNotFound );
-        }
-    
-    aMessage.WriteL( EMnIpcGeoResultParamIndex, *iResult );
-    TPckg<TInt> typePack( iResultType );
-    aMessage.WriteL( EMnIpcGeoResultTypeParamIndex, typePack );
-    
-    Complete( aMessage, KErrNone );
-
-    LOG("CMnGeocodingServiceBase::HandleGetConversionResultL out");
-    }
--- a/locationmapnavfw/library/src/mngeocodingserviceclient.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,184 +0,0 @@
-/*
-* Copyright (c) 2005-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:  RMnGeocodingServiceClient class implementation
-*
-*/
-
-
-#include <e32base.h>
-
-#include <EPos_CPosLandmark.h>
-#include <epos_poslandmarkserialization.h>
-
-#include "mndebug.h"
-#include "mninternal.h"
-#include "mnappserviceuids.hrh"
-
-#include "mnprovider.h"
-#include "mngeocoder.h"
-#include "mngeocodingserviceclient.h"
-
-// ======== LOCAL FUNCTIONS ========
-
-// ======== MEMBER FUNCTIONS ========
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-RMnGeocodingServiceClient::RMnGeocodingServiceClient()
-  : iResultSizePtr( iResultSize ) 
-    {
-    iResultSize = 0;
-    iLandmarkBuffer = NULL;
-    iPlainAddress = NULL;
-    iLastRequest = EMnIpcNone;
-    }
-
-RMnGeocodingServiceClient::~RMnGeocodingServiceClient()
-    {
-    delete iLandmarkBuffer;
-    delete iPlainAddress;
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-void RMnGeocodingServiceClient::AddressByCoordinateL(
-    const CPosLandmark& aCoordinateLanmdark,
-    CMnGeocoder::TOptions aOptions,
-    TRequestStatus& aStatus)
-    {
-    LOG("RMnGeocodingServiceClient::AddressByCoordinateL");
-    TIpcArgs args;
-    
-    // options
-    iOptions = aOptions;
-    TPckg<CMnGeocoder::TOptions> optsPack( iOptions );
-    iOptionsPtr.Set( optsPack );
-    args.Set( EMnIpcGeoOptionsParamIndex, &iOptionsPtr );
-
-    // landmark
-    delete iLandmarkBuffer;
-    iLandmarkBuffer = NULL;
-    iLandmarkBuffer = PosLandmarkSerialization::PackL( aCoordinateLanmdark );
-    args.Set( EMnIpcGeoLandmarkParamIndex, iLandmarkBuffer );
-    
-    // size of result
-    args.Set( EMnIpcGeoResultSizeParamIndex, &iResultSizePtr );
-    
-    SendReceive( EMnIpcCoordToAddress, args, aStatus );
-    iLastRequest = EMnIpcCoordToAddress;
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-void RMnGeocodingServiceClient::CoordinateByAddressL(
-    const CPosLandmark& aAddressLanmdark,
-    CMnGeocoder::TOptions aOptions,
-    TRequestStatus& aStatus )
-    {
-    LOG("RMnGeocodingServiceClient::CoordinateByAddressL");
-    TIpcArgs args;
-    
-    // options
-    iOptions = aOptions;
-    TPckg<CMnGeocoder::TOptions> optsPack( iOptions );
-    iOptionsPtr.Set( optsPack );
-    args.Set( EMnIpcGeoOptionsParamIndex, &iOptionsPtr );
-
-    // landmark
-    delete iLandmarkBuffer;
-    iLandmarkBuffer = NULL;
-    iLandmarkBuffer = PosLandmarkSerialization::PackL( aAddressLanmdark );
-    args.Set( EMnIpcGeoLandmarkParamIndex, iLandmarkBuffer );
-    
-    // size of result
-    args.Set( EMnIpcGeoResultSizeParamIndex, &iResultSizePtr );
-    
-    SendReceive( EMnIpcAddressToCoord, args, aStatus );
-    iLastRequest = EMnIpcAddressToCoord;
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-void RMnGeocodingServiceClient::CoordinateByAddressL(
-    const TDesC& aAddress,
-    CMnGeocoder::TOptions aOptions,
-    TRequestStatus& aStatus )
-    {
-    LOG("RMnGeocodingServiceClient::CoordinateByAddressL");
-    TIpcArgs args;
-    
-    // options
-    iOptions = aOptions;
-    TPckg<CMnGeocoder::TOptions> optsPack( iOptions );
-    iOptionsPtr.Set( optsPack );
-    args.Set( EMnIpcGeoOptionsParamIndex, &iOptionsPtr );
-
-    // landmark
-    delete iPlainAddress;
-    iPlainAddress = NULL;
-    iPlainAddress = aAddress.AllocL();
-    args.Set( EMnIpcGeoPlainAddressParamIndex, iPlainAddress );
-    
-    // size of result
-    args.Set( EMnIpcGeoResultSizeParamIndex, &iResultSizePtr );
-    
-    SendReceive( EMnIpcPlainAddressToCoord, args, aStatus );
-    iLastRequest = EMnIpcPlainAddressToCoord;
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-void RMnGeocodingServiceClient::GetLastResultL( 
-    CPosLandmark*& aResult,
-    TMnGeocodingResultType& aResultType )
-    {
-    LOG("RMnGeocodingServiceClient::GetLastResultL in");
-    TIpcArgs args;
-    
-    if ( iResultSize <= 0 )
-        {
-        User::Leave( KErrNotFound );
-        }
-    
-    // receiving buffer
-    HBufC8* lmBuf = HBufC8::NewLC( iResultSize );
-    TPtr8 lmBufPtr( lmBuf->Des() );
-    args.Set( EMnIpcGeoResultParamIndex, &lmBufPtr );
-    
-    TPckg<TMnGeocodingResultType> resultTypePack( aResultType );
-    args.Set( EMnIpcGeoResultTypeParamIndex, &resultTypePack);
-    
-    TInt err = SendReceive( EMnIpcGetConversionResult, args );
-    User::LeaveIfError( err );
-    
-    CPosLandmark* lm = PosLandmarkSerialization::UnpackL( *lmBuf );
-    aResult = lm;
-    CleanupStack::PopAndDestroy( lmBuf );
-    LOG("RMnGeocodingServiceClient::GetLastResultL out");
-    }
-
-// ---------------------------------------------------------------------------
-// From class RApaAppServiceBase.
-// ---------------------------------------------------------------------------
-//
-EXPORT_C TUid RMnGeocodingServiceClient::ServiceUid() const
-    { 
-    LOG("RMnGeocodingServiceClient::ServiceUid");
-    return TUid::Uid( KMnAppGeocodingService ); 
-    }
--- a/locationmapnavfw/library/src/mnmapimage.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,282 +0,0 @@
-/*
-* Copyright (c) 2007 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:  CMnMapImage class implementation
-*
-*/
-
-
-#include <e32base.h>
-#include <e32math.h>
-#include <AknServerApp.h>
-#include <apaserverapp.h>
-#include <ecom/ecom.h>
-#include <fbs.h>
-
-#include "mnappservices.hrh"
-#include "mnerrors.h"
-#include "mninternal.h"
-#include "mnprovider.h"
-#include "mnmapimageserviceclient.h"
-#include "mncoordinateconverterbase.h"
-#include "mnmapimageparams.h"
-#include "mnactivecallback.h"
-#include "mnmapimage.h"
-
-// ============================== MEMBER FUNCTIONS ===========================
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-CMnMapImage::CMnMapImage()
-    {
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-EXPORT_C CMnMapImage* CMnMapImage::NewL( CMnProvider& aProvider )
-    {
-    CMnMapImage* self = new (ELeave) CMnMapImage;
-    CleanupStack::PushL( self );
-    self->ConstructL( aProvider );
-    CleanupStack::Pop( self );
-    return self;
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-void CMnMapImage::ConstructL( CMnProvider& aProvider )
-    {
-    if ( !( aProvider.SupportedServices() & CMnProvider::EServiceMapImage ) )
-        {
-        User::Leave( KErrNotSupported );
-        }
-
-    iProviderFeatures = aProvider.SupportedFeatures( CMnProvider::EServiceMapImage );
-    
-    iCoordConverter = CMnCoordinateConverterBase::NewL( aProvider.Uid() );    
-
-    iSession = new (ELeave) RMnMapImageServiceClient();
-    iSession->ConnectL( aProvider.Uid() );
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-EXPORT_C CMnMapImage::~CMnMapImage()
-    {
-    if ( iActiveCallback )
-        {
-        iActiveCallback->Cancel();
-        delete iActiveCallback;
-        }
-        
-    delete iExitMonitor;
-    
-    if ( iSession )
-        {
-        iSession->Close();
-        delete iSession;
-        }
-        
-    delete iCoordConverter;
-    REComSession::FinalClose();    
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-EXPORT_C TMnMapImageParams::TMapImageTypes CMnMapImage::SupportedImageTypes()
-    {
-    TMnMapImageParams::TMapImageTypes supportedTypes( TMnMapImageParams::ETypeUnspecified );
-
-    if ( iProviderFeatures & KMnSvcFeatureVectorMap )
-        {
-        supportedTypes |= TMnMapImageParams::ETypeVectorMap;
-        }
-    if ( iProviderFeatures & KMnSvcFeatureSatelliteImage )
-        {
-        supportedTypes |= TMnMapImageParams::ETypeSatelliteImage;
-        }
-    return supportedTypes;
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-EXPORT_C TMnMapImageParams& CMnMapImage::MapImageParams()
-    {
-    return iMapImageParams;
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-EXPORT_C const TMnMapImageParams& CMnMapImage::MapImageParams() const    
-    {
-    return iMapImageParams;
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-EXPORT_C void CMnMapImage::SetMapImageParams( TMnMapImageParams& aImageParams )
-    {
-    iMapImageParams = aImageParams;
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-EXPORT_C void CMnMapImage::SetTargetOrigin( const TPoint& aOrigin )
-    {
-    iTargetOrigin = aOrigin;
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-EXPORT_C TPoint CMnMapImage::TargetOrigin()
-    {
-    return iTargetOrigin;
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-EXPORT_C void CMnMapImage::SetShowOptions( const TShowOptions& aOptions )
-    {
-    iShowOptions = aOptions;
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-EXPORT_C CMnMapImage::TShowOptions CMnMapImage::ShowOptions() const
-    {
-    return iShowOptions;
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-EXPORT_C void CMnMapImage::RenderL( CFbsBitmap& aBitmap, TRequestStatus& aStatus )
-    {
-    if ( iTargetOrigin.iX < 0 || iTargetOrigin.iY < 0 )    
-         {
-         User::Leave( KErrArgument );
-         }
-        
-    if ( aBitmap.SizeInPixels().iWidth < 
-         iMapImageParams.Size().iWidth + iTargetOrigin.iX || 
-         aBitmap.SizeInPixels().iHeight < 
-         iMapImageParams.Size().iHeight + iTargetOrigin.iY )
-         {
-         User::Leave( KErrArgument );
-         }
-         
-    if ( iMapImageParams.ImageType() != TMnMapImageParams::ETypeUnspecified &&
-         !( iMapImageParams.ImageType() & SupportedImageTypes() )  )
-        {
-        User::Leave( KErrArgument );
-        }
-
-    TMnMapImageOptions options;
-    options.iShowOptions = iShowOptions;
-    options.iTargetOrigin = iTargetOrigin;
-    iSession->Render( aBitmap, iMapImageParams, options, aStatus );
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-EXPORT_C void CMnMapImage::RenderL( CFbsBitmap& aBitmap, MMnMapImageRenderCallback& aCallback )
-    {
-    if ( !iActiveCallback ) 
-        {
-        iActiveCallback = CMnActiveCallback::NewL( *this, *iSession );
-        }
-
-    if ( iActiveCallback->IsActive() )
-        {
-        User::Panic( KMnPanicClientFault, KMnPanicDuplicateRequest );
-        }
-
-    // iActiveCallback member always points to CMnActiveCallback object
-    CMnActiveCallback* activeCallback = reinterpret_cast<CMnActiveCallback*>( iActiveCallback );
-    activeCallback->StartL( aBitmap, aCallback );
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-EXPORT_C void CMnMapImage::CancelRendering()
-    {
-    if ( iActiveCallback && iActiveCallback->IsActive() )
-        {
-        iActiveCallback->Cancel();
-        }
-    else
-        {
-        iSession->Cancel();
-        }
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-EXPORT_C TInt CMnMapImage::GetImageCoordinate(
-    const TCoordinate& aWorldCoordinate,
-    TPoint& aImagePoint ) const
-    {
-    iCoordConverter->SetMapImageParams( iMapImageParams );
-    return iCoordConverter->GetImageCoordinate( aWorldCoordinate, aImagePoint );
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-EXPORT_C TInt CMnMapImage::GetWorldCoordinate(
-    const TPoint& aImagePoint,
-    TCoordinate& aWorldCoordinate ) const
-    {
-    iCoordConverter->SetMapImageParams( iMapImageParams );
-    return iCoordConverter->GetWorldCoordinate( aImagePoint, aWorldCoordinate );
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-EXPORT_C void CMnMapImage::SetExitObserverL( MAknServerAppExitObserver& aObserver )
-    {
-    if ( iExitMonitor )
-        {
-        User::Leave( KErrAlreadyExists );
-        }
-    else
-        {
-        iExitMonitor = CApaServerAppExitMonitor::NewL( 
-            *iSession, aObserver, CActive::EPriorityStandard );
-        }
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-EXPORT_C void CMnMapImage::RemoveExitObserver()
-    {
-    delete iExitMonitor;
-    iExitMonitor = NULL;
-    }
--- a/locationmapnavfw/library/src/mnmapimageparams.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,40 +0,0 @@
-/*
-* Copyright (c) 2005-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:  TMnMapImageParams class implementation
-*
-*/
-
-
-#include <e32base.h>
-#include <fbs.h>
-
-#include "mnmapimageparams.h"
-
-// ======== LOCAL FUNCTIONS ========
-
-// ======== MEMBER FUNCTIONS ========
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-EXPORT_C TMnMapImageParams::TMnMapImageParams() :
-    iAreaWidth( 0 ), 
-    iAreaHeight( 0 ), 
-    iSize( 0,0 ), 
-    iDirection( 0 ),
-    iImageType( ETypeUnspecified ),
-    iProjectionId( 0 )
-    {
-    memclr( &reserved, sizeof(reserved) );
-    }
--- a/locationmapnavfw/library/src/mnmapimageservicebase.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,250 +0,0 @@
-/*
-* Copyright (c) 2005-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:  CMnMapImageServiceBase class implementation
-*
-*/
-
-
-#include <e32base.h>
-#include <fbs.h>
-
-#include "mndebug.h"
-#include "mnerrors.h"
-#include "mninternal.h"
-#include "mninternal.inl"
-
-#include "mnmapimageservicebase.h"
-
-// ========================== MEMBER FUNCTIONS ===============================
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-EXPORT_C CMnMapImageServiceBase::CMnMapImageServiceBase()
-    {
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-EXPORT_C CMnMapImageServiceBase::~CMnMapImageServiceBase()
-    {
-    if ( iBitmap )
-        {
-        delete iBitmap;
-        }
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-EXPORT_C void CMnMapImageServiceBase::BaseConstructL()
-    {
-    CMnServiceBase::BaseConstructL();
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-EXPORT_C const TMnMapImageParams& CMnMapImageServiceBase::MapImageParams() const
-    {
-    return iMapImageParams;
-    }
-        
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-EXPORT_C TMnMapImageParams& CMnMapImageServiceBase::MapImageParams()
-    {
-    return iMapImageParams;
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-EXPORT_C void CMnMapImageServiceBase::SetMapImageParams( const TMnMapImageParams& aImageParams )
-    {
-    iMapImageParams = aImageParams;
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-EXPORT_C TRect CMnMapImageServiceBase::TargetRect() const
-    {
-    if ( iBitmap )
-        {
-        return TRect( iTargetOrigin, iBitmap->SizeInPixels() );
-        }
-    else
-        {
-        return TRect( 0, 0, 0, 0 );
-        }
-    }
-        
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-EXPORT_C CMnMapImage::TShowOptions CMnMapImageServiceBase::ShowOptions() const
-    {
-    return iShowOptions;
-    }
-        
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-EXPORT_C CFbsBitmap& CMnMapImageServiceBase::TargetBitmap() const
-    {
-    if ( !iBitmap )
-        {
-        PanicServer( KErrGeneral );
-        }
-    return *iBitmap;
-    }
-        
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-EXPORT_C void CMnMapImageServiceBase::CompleteRendering()
-    {
-    LOG("CMnMapImageServiceBase::CompleteRenderingL in");
-    if ( CurrentAsyncRequest() != EMnIpcRenderImage )
-        {
-        PanicServer( KMnPanicAttemptToCompleteNoRequest );
-        }
-        
-    if ( iMapImageParams.ImageType() == TMnMapImageParams::ETypeUnspecified ) 
-        {
-        PanicServer( KMnPanicInvalidResult );
-        }   
-
-    TPckg<TMnMapImageParams> paramsPack( iMapImageParams );
-    TInt err = iMessage.Write( EMnIpcImageParamsParamIndex, paramsPack );
-
-    CompleteRequest( err );
-    
-    delete iBitmap;
-    iBitmap = NULL;
-
-    LOG("CMnMapImageServiceBase::CompleteRenderingL out");
-    }
-    
-// ---------------------------------------------------------------------------
-//  From class CAknAppServiceBase
-// ---------------------------------------------------------------------------
-//
-EXPORT_C void CMnMapImageServiceBase::ServiceL( const RMessage2& aMessage )
-    {
-    //LOG1("CMnMapImageServiceBase::ServiceL in, function %d", aMessage.Function());
-    
-    switch ( aMessage.Function() )
-        {
-        case EMnIpcRenderImage:
-            PrepareAsyncRequestL( aMessage );
-            StartAsyncRequestL( aMessage );
-            break;
-
-        case EMnIpcCancel:
-            HandleCancelRequestL( aMessage );
-            break;
-            
-        default:
-            CMnServiceBase::ServiceL( aMessage );
-        }
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-void CMnMapImageServiceBase::StartAsyncRequestL( const RMessage2& aMessage )
-    {
-    LOG("CMnMapImageServiceBase::StartAsyncRequestL in");
-
-    switch ( CurrentAsyncRequest() )
-        {
-        case EMnIpcRenderImage:
-            UnpackImageParamsL( aMessage );
-            UnpackOptionsL( aMessage );
-            UnpackBitmapHandleL( aMessage );
-            HandleRenderingL();
-            break;
-            
-        default:
-            User::Leave( KErrNotSupported );
-        }
-
-    LOG("CMnMapImageServiceBase::StartAsyncRequestL out");
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-void CMnMapImageServiceBase::UnpackOptionsL( const RMessage2& aMessage )
-    {
-    LOG("CMnMapImageServiceBase::UnpackOptionsL");
-    
-    TMnMapImageOptions options;
-    TPckg<TMnMapImageOptions> optsPack( options );
-    aMessage.ReadL( EMnIpcImageOptionsParamIndex, optsPack );
-    
-    if ( options.iShowOptions & CMnMapImage::EShowOptionCurrentLocation )
-        {
-        // leaves with KErrPermissionDenied if client does not have Location capability
-        aMessage.HasCapabilityL( ECapabilityLocation );
-        }
-    
-    iShowOptions = options.iShowOptions;
-    iTargetOrigin = options.iTargetOrigin;
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-void CMnMapImageServiceBase::UnpackImageParamsL( const RMessage2& aMessage )
-    {
-    LOG("CMnMapImageServiceBase::UnpackImageParamsL");
-    
-    TPckg<TMnMapImageParams> paramsPack( iMapImageParams );
-    aMessage.ReadL( EMnIpcImageParamsParamIndex, paramsPack );
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-void CMnMapImageServiceBase::UnpackBitmapHandleL( const RMessage2& aMessage )
-    {
-    TInt bitmapHandle = aMessage.Int2(); // EMnIpcImageBitmapHandleParamIndex == 2
-    LOG1("CMnMapImageServiceBase::UnpackBitmapHandleL, handle %d", bitmapHandle);
-
-    ASSERT( !iBitmap );
-        
-    iBitmap = new (ELeave) CFbsBitmap;
-    User::LeaveIfError( iBitmap->Duplicate( bitmapHandle ) );
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-void CMnMapImageServiceBase::HandleCancelRequestL( const RMessage2& aMessage )
-    {
-    TInt request = CurrentAsyncRequest();
-    
-    CMnServiceBase::HandleCancelRequestL( aMessage );
-    
-    if ( request == EMnIpcRenderImage )
-        {
-        delete iBitmap;
-        iBitmap = NULL;
-        }
-    }
--- a/locationmapnavfw/library/src/mnmapimageserviceclient.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,79 +0,0 @@
-/*
-* Copyright (c) 2005-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:  RMnMapImageServiceClient class implementation
-*
-*/
-
-
-#include <e32base.h>
-#include <fbs.h>
-
-#include "mndebug.h"
-#include "mninternal.h"
-#include "mnappserviceuids.hrh"
-
-#include "mnprovider.h"
-#include "mnmapimage.h"
-#include "mnmapimageserviceclient.h"
-
-// ======== LOCAL FUNCTIONS ========
-
-// ======== MEMBER FUNCTIONS ========
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-RMnMapImageServiceClient::RMnMapImageServiceClient()
-  : iParamsDes( NULL, 0 ), iOptionsPack( iOptions )
-    {
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-void RMnMapImageServiceClient::Render( 
-    CFbsBitmap& aBitmap, 
-    TMnMapImageParams& aParams,
-    TMnMapImageOptions& aOptions,
-    TRequestStatus& aStatus)
-    {
-    LOG("RMnMapImageServiceClient::RenderL");
-    TIpcArgs args;
-
-    // bitmap handle
-    TInt handle = aBitmap.Handle();
-    args.Set( EMnIpcImageBitmapHandleParamIndex, handle );
-
-    // options
-    iOptions = aOptions;
-    args.Set( EMnIpcImageOptionsParamIndex, &iOptionsPack );
-
-    // params
-    TPckg<TMnMapImageParams> pack( aParams );
-    iParamsDes.Set( pack );
-    args.Set( EMnIpcImageParamsParamIndex, &iParamsDes );
-    
-    SendReceive( EMnIpcRenderImage, args, aStatus );
-    iLastRequest = EMnIpcRenderImage;
-    }
-    
-// ---------------------------------------------------------------------------
-// From class RApaAppServiceBase.
-// ---------------------------------------------------------------------------
-//
-EXPORT_C TUid RMnMapImageServiceClient::ServiceUid() const
-    { 
-    LOG("RMnMapImageServiceClient::ServiceUid");
-    return TUid::Uid( KMnAppMapImageService ); 
-    }
--- a/locationmapnavfw/library/src/mnmapview.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,391 +0,0 @@
-/*
-* Copyright (c) 2005-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:  CMnMapView class implementation
-*
-*/
-
-
-#include <e32base.h>
-#include <f32file.h>
-#include <e32math.h>
-#include <barsc2.h>
-#include <barsread2.h>
-#include <bautils.h>
-#include <eikenv.h>
-#include <AknServerApp.h>
-#include <apaserverapp.h>
-
-#include <lbsposition.h>
-
-#include <mnclientlib.rsg>
-
-#include "mnerrors.h"
-#include "mninternal.h"
-#include "mndebug.h"
-#include "mnutils.h"
-
-#include "mnprovider.h"
-#include "mnmapviewserviceclient.h"
-#include "mnmapview.h"
-
-// ======== LOCAL FUNCTIONS ========
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-
-// ======== MEMBER FUNCTIONS ========
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-CMnMapView::CMnMapView()
-    {
-    ResetMapArea();
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-EXPORT_C CMnMapView* CMnMapView::NewL( CMnProvider& aProvider )
-    {
-    CMnMapView* self = new (ELeave) CMnMapView();
-    CleanupStack::PushL( self );
-    self->ConstructNewL( aProvider );
-    CleanupStack::Pop( self );
-    return self;
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-EXPORT_C CMnMapView* CMnMapView::NewChainedL( CMnProvider& aProvider )
-    {
-    CMnMapView* self = new (ELeave) CMnMapView();
-    CleanupStack::PushL( self );
-    self->ConstructChainedL( aProvider );
-    CleanupStack::Pop( self );
-    return self;
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-void CMnMapView::ConstructCommonL( CMnProvider& aProvider )
-    {
-    if ( !( aProvider.SupportedServices() & CMnProvider::EServiceMapView ) )
-        {
-        User::Leave( KErrNotSupported );
-        }
-    
-    // default request text
-    RFs fs;
-    User::LeaveIfError( fs.Connect() );
-    CleanupClosePushL( fs );
-
-    iDefaultRequestText = LoadResourceTextL( fs, KLibResourceFile, R_MN_LIBRARY_REQUEST_TEXT );
-
-    CleanupStack::PopAndDestroy( &fs );
-    
-    // session with provider
-    iSession = new (ELeave) RMnMapViewServiceClient;
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-void CMnMapView::ConstructNewL( CMnProvider& aProvider )
-    {
-    ConstructCommonL( aProvider );
-    iSession->ConnectL( aProvider.Uid() );
-    PostConstructL();            
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-void CMnMapView::ConstructChainedL( CMnProvider& aProvider )
-    {
-    ConstructCommonL( aProvider );
-    iSession->ConnectChainedL( aProvider.Uid() );
-LOG("CMnMapView::ConstructChainedL, after connect chained");
-    PostConstructL();            
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-void CMnMapView::PostConstructL()
-    {
-    iSession->InitSelectionRequestTextL( iDefaultRequestText );            
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-EXPORT_C CMnMapView::~CMnMapView()
-    {
-    delete iDefaultRequestText;
-    delete iExitMonitor;
-    
-    if ( iSession )
-        {
-        iSession->Close();
-        delete iSession;
-        }
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-EXPORT_C void CMnMapView::ShowMapL()
-    {
-    TMnMapOptions options;
-    options.iOptions = iOptions;
-    options.iCurrentLocationOption = iCurrentLocationOption;
-    options.iCentralPoint = iCentralPoint;
-    options.iRadius = iRadius;
-
-    iSession->ShowMapL( options );
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-EXPORT_C void CMnMapView::ShowCurrentLocationL()
-    {
-    TMnMapOptions options;
-    options.iOptions = iOptions;
-    options.iCurrentLocationOption = iCurrentLocationOption;
-    options.iCentralPoint = iCentralPoint;
-    options.iRadius = iRadius;
-
-    iSession->ShowCurrentLocationL( options );
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-EXPORT_C void CMnMapView::SelectFromMapL( TRequestStatus& aStatus )
-    {
-    TMnMapOptions options;
-    options.iOptions = iOptions;
-    options.iCurrentLocationOption = iCurrentLocationOption;
-    options.iCentralPoint = iCentralPoint;
-    options.iRadius = iRadius;
-
-    iSession->SelectFromMap( options, aStatus );
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-EXPORT_C void CMnMapView::AddLandmarksToShowL(
-    const TDesC& aDatabaseUri,
-    RArray<TPosLmItemId>& aLandmarkIds)
-    {
-    iSession->AddLandmarksToShowL( aDatabaseUri, aLandmarkIds );
-    }
-    
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-EXPORT_C void CMnMapView::AddLandmarksToShowL( RPointerArray<CPosLandmark>& aLandmarks )
-    {
-    iSession->AddLandmarksToShowL( aLandmarks );
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-EXPORT_C void CMnMapView::AddLandmarksToShowL( RArray<TPtrC8>& aPackedLandmarks )
-    {
-    iSession->AddLandmarksToShowL( aPackedLandmarks );
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-EXPORT_C void CMnMapView::ResetLandmarksToShow()
-    {
-    iSession->ResetLandmarksToShow();
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-EXPORT_C void CMnMapView::SetMapAreaL(const TCoordinate& aCentralPoint, TReal aRadius)
-    {
-    iCentralPoint = aCentralPoint;
-    iRadius = aRadius;
-    }
-    
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-EXPORT_C void CMnMapView::ResetMapArea()
-    {
-    TCoordinate empty;
-    iCentralPoint = empty;
-    
-    TRealX nan;
-    nan.SetNaN();
-    iRadius = nan;
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-EXPORT_C void CMnMapView::SetCustomRequestTextL(const TDesC& aCustomText)
-    {
-    iSession->SetSelectionRequestTextL( aCustomText );
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-EXPORT_C void CMnMapView::SetUseDefaultRequestText()
-    {
-    iSession->SetSelectionRequestText( iDefaultRequestText );
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-EXPORT_C void CMnMapView::SetCurrentLocationOption(TCurrentLocationOption aCurrentLocationOption)
-    {
-    iCurrentLocationOption = aCurrentLocationOption;
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-EXPORT_C CMnMapView::TCurrentLocationOption CMnMapView::CurrentLocationOption() const
-    {
-    return iCurrentLocationOption;
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-EXPORT_C void CMnMapView::SetOptions(TOptions aOptions)
-    {
-    iOptions = aOptions;
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-EXPORT_C CMnMapView::TOptions CMnMapView::Options() const
-    {
-    return iOptions;
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-EXPORT_C CMnMapView::TSelectionResultType CMnMapView::SelectionResultType() const
-    {
-    return iSession->SelectionResultType();
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-EXPORT_C CPosLandmark* CMnMapView::RetrieveSelectionResultL()
-    {
-    return iSession->GetSelectedLandmarkL();
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-EXPORT_C void CMnMapView::RetrieveSelectionResultL( TInt& aLandmarkIndex )
-    {
-    iSession->GetSelectedLandmarkL( aLandmarkIndex );
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-EXPORT_C void CMnMapView::RetrieveSelectionResultL( 
-    TPosLmItemId& aLandmarkId,
-    HBufC*& aDatabaseUri )
-    {
-    iSession->GetSelectedLandmarkL( aLandmarkId, aDatabaseUri );
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-EXPORT_C void CMnMapView::Cancel()
-    {
-    iSession->Cancel();
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-EXPORT_C void CMnMapView::SetExitObserverL( MAknServerAppExitObserver& aObserver )
-	{
-	LOG("CMnMapView::SetExitObserverL in");	
-	if ( iExitMonitor )
-		{
-		User::Leave( KErrAlreadyExists );
-		}
-	else
-		{
-		iExitMonitor = CApaServerAppExitMonitor::NewL( 
-			*iSession, aObserver, CActive::EPriorityStandard );
-		}
-	LOG("CMnMapView::SetExitObserverL out");	
-	}
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-EXPORT_C void CMnMapView::RemoveExitObserver()
-	{
-	delete iExitMonitor;
-	iExitMonitor = NULL;
-	}
-
-// ======== INTERNAL FUNCTIONS ========
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-HBufC* CMnMapView::LoadResourceTextL( 
-    RFs& aFsSession, 
-    const TDesC& aRscFile, 
-    TInt aResourceId )
-    {
-    TFileName fileName;
-    MnUtils::FindLocalizedResourceFileL( aFsSession, aRscFile, fileName );
-
-    CResourceFile* resFile = CResourceFile::NewL( aFsSession, fileName, 0, 0 );
-    CleanupStack::PushL( resFile );
-    resFile->ConfirmSignatureL( 0 );
-    
-    RResourceReader reader;
-    reader.OpenL( resFile, aResourceId );
-    CleanupClosePushL( reader );
-    
-    HBufC* text = reader.ReadHBufC16L();
-    
-    CleanupStack::PopAndDestroy( &reader );
-    CleanupStack::PopAndDestroy( resFile );
-        
-    return text;        
-    }
--- a/locationmapnavfw/library/src/mnmapviewservicebase.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,588 +0,0 @@
-/*
-* Copyright (c) 2005-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:  CMnMapViewServiceBase class implementation
-*
-*/
-
-
-#include <e32base.h>
-#include <s32mem.h>
-#include <e32math.h>
-#include <lbsposition.h>
-
-#include <EPos_CPosLandmark.h>
-#include <epos_poslandmarkserialization.h>
-
-#include "mndebug.h"
-#include "mnerrors.h"
-#include "mninternal.h"
-#include "mninternal.inl"
-#include "mnmapselectionresultinfo.inl"
-
-#include "mnmapviewservicebase.h"
-
-// ======== LOCAL FUNCTIONS ========
-
-// ======== MEMBER FUNCTIONS ========
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-EXPORT_C CMnMapViewServiceBase::CMnMapViewServiceBase()
-    {
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-EXPORT_C CMnMapViewServiceBase::~CMnMapViewServiceBase()
-    {
-    LOG("~CMnMapViewServiceBase in");
-    ResetLandmarks();
-    iLandmarks.Close();
-    iLinkedLandmarksLists.Close();
-    iTempDatabaseList.Close();
-
-    CleanSelectionResult();
-    delete iSelectionRequestText;
-    LOG("~CMnMapViewServiceBase out");
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-EXPORT_C void CMnMapViewServiceBase::BaseConstructL()
-    {
-    LOG("CMnMapViewServiceBase::BaseConstructL");
-    CMnServiceBase::BaseConstructL();
-    iSelectionRequestText = HBufC::NewL( 0 );
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-EXPORT_C CMnMapView::TOptions CMnMapViewServiceBase::Options()
-    {
-    LOG("CMnMapViewServiceBase::Options");
-    return iOptions;
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-EXPORT_C CMnMapView::TCurrentLocationOption CMnMapViewServiceBase::CurrentLocationOption()
-    {
-    LOG("CMnMapViewServiceBase::CurrentLocationOption");
-    return iCurrentLocationOption;
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-EXPORT_C TArray<const CPosLandmark*> CMnMapViewServiceBase::LandmarksToShow()
-    {
-    LOG("CMnMapViewServiceBase::LandmarksToShow");
-    return iLandmarks.Array();
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-EXPORT_C TArray<TPosLmItemId> CMnMapViewServiceBase::LinkedLandmarksToShow( TInt aDbIndex )
-    {
-    LOG1("CMnMapViewServiceBase::LinkedLandmarksToShow, db index %d", aDbIndex);
-    if ( aDbIndex < 0 || aDbIndex >= iLinkedLandmarksLists.Count() )
-        {
-        PanicServer( KMnPanicArrayIndexOutOfBounds );
-        }
-    return iLinkedLandmarksLists[aDbIndex]->iLandmarkIds.Array();
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-EXPORT_C TArray<const HBufC*> CMnMapViewServiceBase::LandmarksToShowDatabases()
-    {
-    LOG("CMnMapViewServiceBase::LandmarksToShowDatabases");
-    if ( iTempDatabaseList.Count() != iLinkedLandmarksLists.Count() )
-        {
-        // update database list
-        iTempDatabaseList.Reset();    
-        for ( TInt i = 0; i < iLinkedLandmarksLists.Count(); i++ )
-            {
-            iTempDatabaseList.Append( iLinkedLandmarksLists[i]->iDatabaseUri );
-            }
-        }
-    return iTempDatabaseList.Array();
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-EXPORT_C TPtrC CMnMapViewServiceBase::SelectionRequestText()
-    {
-    LOG("CMnMapViewServiceBase::SelectionRequestText");
-    return iSelectionRequestText->Des();
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-EXPORT_C TBool CMnMapViewServiceBase::IsAreaCentralPointSet()
-    {
-    LOG("CMnMapViewServiceBase::IsAreaCentralPointSet");
-    return !( Math::IsNaN( iCentralPoint.Latitude() ) &&
-              Math::IsNaN( iCentralPoint.Longitude() ) );
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-EXPORT_C void CMnMapViewServiceBase::GetAreaCentralPoint( TCoordinate& aCentralPoint )
-    {
-    LOG("CMnMapViewServiceBase::GetAreaCentralPoint");
-    aCentralPoint = iCentralPoint;
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-EXPORT_C TReal CMnMapViewServiceBase::AreaRadius()
-    {
-    LOG("CMnMapViewServiceBase::AreaRadius");
-    return iRadius;
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-EXPORT_C void CMnMapViewServiceBase::CompleteSelectionRequestL( const CPosLandmark& aLandmark )
-    {
-    LOG("CMnMapViewServiceBase::CompleteSelectionRequestL(free) in");
-
-    if ( !IsAsyncRequestActive() )
-        {
-        PanicServer( KMnPanicAttemptToCompleteNoRequest );
-        }
-        
-    if ( iOptions & CMnMapView::EOptionRestrictSelection )
-        {
-        User::Leave( KErrArgument );
-        }
-
-    CleanSelectionResult();
-    
-    iResultLandmark = PosLandmarkSerialization::PackL( aLandmark );
-    
-    TMnMapSelectionResultInfo info( *iResultLandmark );
-    TPckgC<TMnMapSelectionResultInfo> resultInfoPack( info );
-
-    TInt err = iMessage.Write( EMnIpcMapSelectionResultInfoParamIndex, resultInfoPack );
-    
-    CompleteRequest( err );
-
-    LOG("CMnMapViewServiceBase::CompleteSelectionRequestL(free) out");
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-EXPORT_C void CMnMapViewServiceBase::CompleteSelectionRequest( TInt aLandmarkIndex )
-    {
-    LOG1("CMnMapViewServiceBase::CompleteSelectionRequest(index) in, index=%d", aLandmarkIndex);
-
-    if ( !IsAsyncRequestActive() )
-        {
-        PanicServer( KMnPanicAttemptToCompleteNoRequest );
-        }
-    
-    if ( aLandmarkIndex < 0 || aLandmarkIndex >= iLandmarks.Count() )
-        {
-        PanicServer( KMnPanicArrayIndexOutOfBounds );
-        }
-
-    CleanSelectionResult();
-    
-    TMnMapSelectionResultInfo info( aLandmarkIndex );
-    TPckgC<TMnMapSelectionResultInfo> resultInfoPack( info );
-
-    TInt err = iMessage.Write( EMnIpcMapSelectionResultInfoParamIndex, resultInfoPack );
-
-    CompleteRequest( err );
-
-    LOG("CMnMapViewServiceBase::CompleteSelectionRequest(index) out");
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-EXPORT_C void CMnMapViewServiceBase::CompleteSelectionRequest(
-    TPosLmItemId aLandmarkId, 
-    TInt aDbIndex)
-    {
-    LOG2("CMnMapViewServiceBase::CompleteSelectionRequest(id,db) in, dbIndex %d, lmId %d",
-        aDbIndex, aLandmarkId);
-
-    if ( !IsAsyncRequestActive() )
-        {
-        PanicServer( KMnPanicAttemptToCompleteNoRequest );
-        }
-
-    if ( aDbIndex < 0 || aDbIndex >= iLinkedLandmarksLists.Count() )
-        {
-        LOG1("CMnMapViewServiceBase::CompleteSelectionRequest(id,db) dbIndex invalid, max %d",
-            iLinkedLandmarksLists.Count());
-        PanicServer( KMnPanicArrayIndexOutOfBounds );
-        }
-        
-    if ( KErrNotFound == iLinkedLandmarksLists[aDbIndex]->iLandmarkIds.Find( aLandmarkId ) )
-        {
-        LOG("CMnMapViewServiceBase::CompleteSelectionRequest(id,db) lmId not found");
-        PanicServer( KMnPanicArrayIndexOutOfBounds );
-        }
-
-    CleanSelectionResult();
-    
-    TMnMapSelectionResultInfo info( 
-        aLandmarkId, 
-        *(iLinkedLandmarksLists[aDbIndex]->iDatabaseUri) );
-
-    TPckgC<TMnMapSelectionResultInfo> resultInfoPack( info );
-    TInt err = iMessage.Write( EMnIpcMapSelectionResultInfoParamIndex, resultInfoPack );
-
-    CompleteRequest( err );
-
-    LOG("CMnMapViewServiceBase::CompleteSelectionRequest(id,db) out");
-    }
-       
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-EXPORT_C void CMnMapViewServiceBase::ServiceL( const RMessage2& aMessage )
-    {
-    LOG1("CMnMapViewServiceBase::ServiceL in, function %d", aMessage.Function());
-    
-    switch ( aMessage.Function() )
-        {
-        case EMnIpcAddLmIdsToShow:
-            HandleAddLandmarkIdsToShowL( aMessage );
-            break;
-            
-        case EMnIpcAddLandmarksToShow:
-            HandleAddLandmarksToShowL( aMessage );
-            break;
-            
-        case EMnIpcResetLandmarksToShow: // blind request
-            ResetLandmarks();
-            break;
-            
-        case EMnIpcCancel:
-            HandleCancelRequestL( aMessage );
-            break;
-            
-        case EMnIpcShowMap:
-            UnpackOptionsL( aMessage );
-		    LOG("CMnMapViewServiceBase::ServiceL, calling HandleShowMapL");
-            HandleShowMapL();
-            Complete( aMessage, KErrNone );
-            break;
-            
-        case EMnIpcShowCurrentLocation:
-            UnpackOptionsL( aMessage );
-		    LOG("CMnMapViewServiceBase::ServiceL, calling HandleShowCurrentLocationL");
-            HandleShowCurrentLocationL();
-            Complete( aMessage, KErrNone );
-            break;
-
-        case EMnIpcInitRequestText:
-            UnpackSelectionRequestTextL( aMessage );
-            Complete( aMessage, KErrNone );
-            break;
-    
-        case EMnIpcSelectFromMap:
-            PrepareAsyncRequestL( aMessage );
-            UnpackOptionsL( aMessage );
-            UnpackSelectionRequestTextL( aMessage );
-            VerifySelectionRequestL();
-		    LOG("CMnMapViewServiceBase::ServiceL, calling HandleSelectFromMapL");
-            HandleSelectFromMapL();
-            break;
-            
-        case EMnIpcGetSelectionResultLandmark:
-            HandleGetSelectionResultLandmarkL( aMessage );
-            break;
-
-        case EMnIpcGetSelectionResultDbUri:
-            HandleGetSelectionResultDbUriL( aMessage );
-            break;
-
-        default:
-            CMnServiceBase::ServiceL( aMessage );
-        }
-}
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-void CMnMapViewServiceBase::CleanSelectionResult()
-    {
-    delete iResultLandmark;
-    iResultLandmark = NULL;
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-void CMnMapViewServiceBase::HandleAddLandmarkIdsToShowL( const RMessage2& aMessage )
-    {
-    LOG("CMnMapViewServiceBase::HandleAddLandmarkIdsToShowL in");
-
-    if ( IsAsyncRequestActive() )
-        {
-        User::Leave( KErrLocked );
-        }
-        
-    // Read client's data
-    HBufC* uri = CopyClientBufferLC( aMessage, EMnIpcMapDbUriParamIndex );
-    HBufC8* buf = CopyClientBuffer8LC( aMessage, EMnIpcMapLmIdsParamIndex );
-
-    if ( buf->Size() % ( sizeof( TPosLmItemId ) ) != 0 )
-        {
-        User::Leave( KErrArgument );
-        }
-
-    TInt lmCount = buf->Size() / ( sizeof( TPosLmItemId ) );
-    const TPosLmItemId* ids = reinterpret_cast<const TPosLmItemId*>( buf->Ptr() );
-
-    // Save data to internal structs
-    iTempDatabaseList.Reset();        
-    CLinkedLandmarksList* linked = NULL;
-
-    // check if this database is already listed
-    TInt dbIndex = FindDatabase( *uri );
-    if ( dbIndex == KErrNotFound )
-        {
-        linked = new (ELeave) CLinkedLandmarksList;
-        CleanupStack::PushL( linked );
-        linked->iDatabaseUri = uri;
-        iLinkedLandmarksLists.AppendL( linked );
-        CleanupStack::Pop( linked );
-        }
-    else
-        {
-        linked = iLinkedLandmarksLists[dbIndex];
-        }
-
-    for ( TInt i = 0; i < lmCount; i++ )
-        {
-        linked->iLandmarkIds.AppendL( ids[i] );
-        }
-
-    // Finalize
-    Complete( aMessage, KErrNone );
-
-    CleanupStack::PopAndDestroy( buf );
-    CleanupStack::Pop( uri );
-
-    LOG("CMnMapViewServiceBase::HandleAddLandmarkIdsToShowL out");
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-void CMnMapViewServiceBase::HandleAddLandmarksToShowL( const RMessage2& aMessage )
-    {
-    LOG("CMnMapViewServiceBase::HandleAddLandmarksToShowL in");
-
-    if ( IsAsyncRequestActive() )
-        {
-        User::Leave( KErrLocked );
-        }
-
-    HBufC8* buf = CopyClientBuffer8LC( aMessage, EMnIpcMapLandmarksParamIndex );
-    RDesReadStream readStream( *buf );
-
-    LOG1("CMnMapViewServiceBase::HandleAddLandmarksToShowL buffersize %d", buf->Size());
-    
-    TInt lmCount = readStream.ReadInt32L();
-    
-    LOG1("CMnMapViewServiceBase::HandleAddLandmarksToShowL lmCount %d", lmCount);
-
-    for ( TInt i = 0; i < lmCount; i++ )
-        {
-        TInt lmSize = readStream.ReadInt32L();
-        
-        HBufC8* lmBuf = HBufC8::NewLC( lmSize );
-        
-        TPtr8 lmData( lmBuf->Des() );
-        readStream.ReadL( lmData, lmSize );
-        
-        CPosLandmark* lm = PosLandmarkSerialization::UnpackL( *lmBuf );
-        CleanupStack::PushL( lm );
-
-        iLandmarks.AppendL( lm );
-
-        CleanupStack::Pop( lm );
-        CleanupStack::PopAndDestroy( lmBuf );
-        }
-    
-    readStream.Close();
-    CleanupStack::PopAndDestroy( buf );
-
-    Complete( aMessage, KErrNone );
-    LOG("CMnMapViewServiceBase::HandleAddLandmarksToShowL out");
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-void CMnMapViewServiceBase::HandleGetSelectionResultLandmarkL( const RMessage2& aMessage )
-    {
-    LOG("CMnMapViewServiceBase::HandleGetSelectionResultLandmarkL in");
-    
-    if ( iResultLandmark )
-        {
-        aMessage.WriteL( EMnIpcMapSelResultBufferParamIndex, *iResultLandmark );
-        Complete( aMessage, KErrNone );
-        }
-    else
-        {
-        User::Leave( KErrNotFound );
-        }
-
-    LOG("CMnMapViewServiceBase::HandleGetSelectionResultLandmarkL out");
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-void CMnMapViewServiceBase::HandleGetSelectionResultDbUriL( const RMessage2& aMessage )
-    {
-    LOG("CMnMapViewServiceBase::HandleGetSelectionResultDbUriL in");
-    
-    __ASSERT_DEBUG( 
-        iResultDbIndex >= 0 && iResultDbIndex < iLinkedLandmarksLists.Count() ,
-        Panic( KErrGeneral ) );
-    
-    if ( iResultDbIndex != KErrNotFound )
-        {
-        __ASSERT_DEBUG( 
-            iLinkedLandmarksLists[iResultDbIndex]->iDatabaseUri ,
-            Panic( KErrGeneral ) );
-
-        aMessage.WriteL( 
-            EMnIpcMapSelResultBufferParamIndex, 
-            *(iLinkedLandmarksLists[iResultDbIndex]->iDatabaseUri) );
-            
-        Complete( aMessage, KErrNone );
-        }
-    else
-        {
-        User::Leave( KErrNotFound );
-        }
-
-    LOG("CMnMapViewServiceBase::HandleGetSelectionResultDbUriL out");
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-void CMnMapViewServiceBase::ResetLandmarks()
-    {
-    if ( !IsAsyncRequestActive() )
-        {
-	    iLandmarks.ResetAndDestroy();
-	    iLinkedLandmarksLists.ResetAndDestroy();
-        }
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-TInt CMnMapViewServiceBase::FindDatabase( const TDesC& aUri )
-    {
-    for ( TInt i = 0; i < iLinkedLandmarksLists.Count(); i++ )
-        {
-        CLinkedLandmarksList* list = iLinkedLandmarksLists[i];
-        if ( list->iDatabaseUri->Compare( aUri ) == 0 )
-            {
-            return i;
-            }
-        }
-    return KErrNotFound;
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-void CMnMapViewServiceBase::UnpackOptionsL( const RMessage2& aMsg )
-    {
-    HBufC8* buf = CopyClientBuffer8LC( aMsg, EMnIpcMapOptionsParamIndex );
-    const TMnMapOptions& options = *( 
-        reinterpret_cast<const TMnMapOptions*>( buf->Ptr() ) );
-
-    iOptions = options.iOptions;
-    iCurrentLocationOption = options.iCurrentLocationOption;
-    iCentralPoint = options.iCentralPoint;
-    iRadius = options.iRadius;
-
-    CleanupStack::PopAndDestroy( buf );
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-void CMnMapViewServiceBase::UnpackSelectionRequestTextL( const RMessage2& aMsg )
-    {
-    HBufC* buf = CopyClientBufferLC( aMsg, EMnIpcMapSelectionTextParamIndex );
-    
-    delete iSelectionRequestText;
-    iSelectionRequestText = NULL;
-    iSelectionRequestText = buf;
-
-    CleanupStack::Pop( buf );
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-void CMnMapViewServiceBase::VerifySelectionRequestL()
-    {
-    if ( iOptions & CMnMapView::EOptionRestrictSelection )
-        {
-        // find out how many landmarks are given
-        TInt num = iLandmarks.Count();
-        for ( TInt i = 0; i < iLinkedLandmarksLists.Count(); i++ )
-            {
-            CLinkedLandmarksList* linked = iLinkedLandmarksLists[i];
-            num += linked->iLandmarkIds.Count();
-            }
-        LOG1("CMnMapViewServiceBase::VerifySelectionRequestL, restricted with %d landmarks", num);
-        if ( num < 1 )
-            {
-            User::Leave( KErrArgument );
-            }
-        }
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-CMnMapViewServiceBase::CLinkedLandmarksList::~CLinkedLandmarksList()
-    {
-    delete iDatabaseUri;
-    iLandmarkIds.Close();
-    }
-
-
--- a/locationmapnavfw/library/src/mnmapviewserviceclient.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,362 +0,0 @@
-/*
-* Copyright (c) 2005-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:  RMnMapViewServiceClient class implementation
-*
-*/
-
-
-#include <e32base.h>
-#include <s32mem.h>
-
-#include <lbsposition.h>
-
-#include <EPos_CPosLandmark.h>
-#include <epos_poslandmarkserialization.h>
-
-#include "mnerrors.h"
-#include "mndebug.h"
-#include "mninternal.h"
-#include "mninternal.inl"
-#include "mnmapselectionresultinfo.inl"
-
-#include "mnappserviceuids.hrh"
-#include "mnmapviewserviceclient.h"
-
-// ======== MEMBER FUNCTIONS ========
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-RMnMapViewServiceClient::RMnMapViewServiceClient()
-  : iSelectionRequestText( NULL ),
-    iSelectionRequestTextOwned( EFalse ),
-    iResultInfoPtr( iResultInfo )
-    {
-    Mem::FillZ( &iResultInfo, sizeof( TMnMapSelectionResultInfo ) );
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-RMnMapViewServiceClient::~RMnMapViewServiceClient()
-    {
-    ClearSelectionRequestText();
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-void RMnMapViewServiceClient::AddLandmarksToShowL(
-    const TDesC& aDatabaseUri,
-    RArray<TPosLmItemId>& aLandmarkIds)
-    {
-    TIpcArgs args;
-    
-    // db uri
-    args.Set( EMnIpcMapDbUriParamIndex, &aDatabaseUri );
-    
-    // landmark ids
-    TInt lmCount = aLandmarkIds.Count();
-    TPosLmItemId* ids = new (ELeave) TPosLmItemId[ lmCount ];
-    
-    for ( TUint32 i = 0; i < lmCount; i++ )
-        {
-        *(ids + i) = aLandmarkIds[i];
-        }
-        
-    TPtrC8 idsDes( reinterpret_cast<const TUint8*>( ids ), sizeof( TPosLmItemId ) * lmCount );
-    args.Set( EMnIpcMapLmIdsParamIndex, &idsDes );
-
-    TInt err = SendReceive( EMnIpcAddLmIdsToShow, args );
-    delete[] ids;
-    User::LeaveIfError( err );
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-void RMnMapViewServiceClient::AddLandmarksToShowL( RPointerArray<CPosLandmark>& aLandmarks )
-    {
-    LOG("RMnMapViewServiceClient::AddLandmarksToShowL in");
-
-    TIpcArgs args;
-
-    const TInt KGranularity = 1024;      // expand in chunks of 1K
-    CBufFlat* lmBuffer = CBufFlat::NewL( KGranularity );
-    CleanupStack::PushL( lmBuffer );
-
-    RBufWriteStream writeStream;
-    writeStream.Open( *lmBuffer );
-    CleanupClosePushL( writeStream );
-
-    writeStream.WriteInt32L( aLandmarks.Count() );
-
-    LOG1("RMnMapViewServiceClient::AddLandmarksToShowL count %d", aLandmarks.Count());
-
-    for ( TInt i = 0; i < aLandmarks.Count(); i++ )
-        {
-        HBufC8* lmBuf = PosLandmarkSerialization::PackL( *aLandmarks[i] );
-        CleanupStack::PushL( lmBuf );
-        
-        writeStream.WriteInt32L( lmBuf->Size() );
-        writeStream.WriteL( *lmBuf );
-
-        CleanupStack::PopAndDestroy( lmBuf );
-        }
-    writeStream.CommitL();
-    CleanupStack::PopAndDestroy( &writeStream );
-
-    LOG1("RMnMapViewServiceClient::AddLandmarksToShowL totalsize %d", lmBuffer->Size());
-
-    //lmBuffer->Compress();
-    TPtr8 lmBufferPtr( lmBuffer->Ptr( 0 ) );
-    User::LeaveIfError( 
-        SendReceive( EMnIpcAddLandmarksToShow, TIpcArgs( &lmBufferPtr ) ) );
-
-    CleanupStack::PopAndDestroy( lmBuffer );
-    LOG("RMnMapViewServiceClient::AddLandmarksToShowL out");
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-void RMnMapViewServiceClient::AddLandmarksToShowL( RArray<TPtrC8>& aPackedLandmarks )
-    {
-    LOG("RMnMapViewServiceClient::AddLandmarksToShowL (packed) in");
-    TIpcArgs args;
-
-    const TInt KGranularity = 1024;      // expand in chunks of 1K
-    CBufFlat* lmBuffer = CBufFlat::NewL( KGranularity );
-    CleanupStack::PushL( lmBuffer );
-
-    RBufWriteStream writeStream;
-    writeStream.Open( *lmBuffer );
-    CleanupClosePushL( writeStream );
-
-    writeStream.WriteInt32L( aPackedLandmarks.Count() );
-
-    LOG1("RMnMapViewServiceClient::AddLandmarksToShowL (packed) count %d", aPackedLandmarks.Count());
-
-    for ( TInt i = 0; i < aPackedLandmarks.Count(); i++ )
-        {
-        TPtrC8 data( aPackedLandmarks[i] );
-        
-        writeStream.WriteInt32L( data.Size() );
-        writeStream.WriteL( data );
-        }
-
-    writeStream.CommitL();
-    CleanupStack::PopAndDestroy( &writeStream );
-
-    LOG1("RMnMapViewServiceClient::AddLandmarksToShowL (packed) totalsize %d", lmBuffer->Size());
-
-    lmBuffer->Compress();
-    TPtr8 lmBufferPtr( lmBuffer->Ptr( 0 ) );
-    User::LeaveIfError( 
-        SendReceive( EMnIpcAddLandmarksToShow, TIpcArgs( &lmBufferPtr ) ) );
-
-    CleanupStack::PopAndDestroy( lmBuffer );
-    LOG("RMnMapViewServiceClient::AddLandmarksToShowL (packed) out");
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-void RMnMapViewServiceClient::ResetLandmarksToShow()
-    {
-    Send( EMnIpcResetLandmarksToShow );
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-void RMnMapViewServiceClient::SetSelectionRequestTextL(
-    const TDesC& aSelectionRequestText)
-    {
-    ClearSelectionRequestText();    
-    iSelectionRequestText = aSelectionRequestText.AllocL();
-    iSelectionRequestTextOwned = ETrue;
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-void RMnMapViewServiceClient::SetSelectionRequestText( HBufC*& aSelectionRequestText )
-    {
-    ClearSelectionRequestText();
-    iSelectionRequestText = aSelectionRequestText;
-    iSelectionRequestTextOwned = EFalse;
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-void RMnMapViewServiceClient::InitSelectionRequestTextL( HBufC*& aSelectionRequestText )
-    {
-    SetSelectionRequestText( aSelectionRequestText );
-
-    TIpcArgs args;
-    args.Set( EMnIpcMapSelectionTextParamIndex, iSelectionRequestText );
-    
-    TInt err = SendReceive( EMnIpcInitRequestText, args );
-    LOG1("RMnMapViewServiceClient::InitSelectionRequestTextL, sendreceive = %d", err);
-    User::LeaveIfError( err );
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-void RMnMapViewServiceClient::ClearSelectionRequestText()
-    {
-    if ( iSelectionRequestTextOwned )
-        {
-        delete iSelectionRequestText;
-        }
-    iSelectionRequestText = NULL;
-    iSelectionRequestTextOwned = ETrue;
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-void RMnMapViewServiceClient::ShowMapL( TMnMapOptions aOptions )
-    {
-    TIpcArgs args;
-    
-    TPckgC<TMnMapOptions> optsPack( aOptions );
-    args.Set( EMnIpcMapOptionsParamIndex, &optsPack );
-    
-    User::LeaveIfError( SendReceive( EMnIpcShowMap, args ) );
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-void RMnMapViewServiceClient::ShowCurrentLocationL( TMnMapOptions aOptions )
-    {
-    TIpcArgs args;
-    
-    TPckgC<TMnMapOptions> optsPack( aOptions );
-    args.Set( EMnIpcMapOptionsParamIndex, &optsPack );
-    
-    User::LeaveIfError( SendReceive( EMnIpcShowCurrentLocation, args ) );
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-void RMnMapViewServiceClient::SelectFromMap(
-    TMnMapOptions aOptions,
-    TRequestStatus& aStatus )
-    {
-    __ASSERT_DEBUG( iSelectionRequestText, PanicSelf( KErrGeneral ) );
-    
-    TIpcArgs args;
-    
-    // options
-    iOptions = aOptions;
-    TPckgC<TMnMapOptions> optsPack( iOptions );
-    iOptionsPtr.Set( optsPack );
-    args.Set( EMnIpcMapOptionsParamIndex, &iOptionsPtr );
-    
-    // selection text
-    args.Set( EMnIpcMapSelectionTextParamIndex, iSelectionRequestText );
-
-    // selection result info
-    args.Set( EMnIpcMapSelectionResultInfoParamIndex, &iResultInfoPtr );
-    
-    SendReceive( EMnIpcSelectFromMap, args, aStatus );
-    iLastRequest = EMnIpcSelectFromMap;
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-CMnMapView::TSelectionResultType RMnMapViewServiceClient::SelectionResultType()
-    {
-    return iResultInfo.iType;
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-CPosLandmark* RMnMapViewServiceClient::GetSelectedLandmarkL()
-    {
-    if ( iResultInfo.iType != CMnMapView::ESelectionFreeLandmark )
-        {
-        User::Leave( KErrNotFound );
-        }
-    
-    TIpcArgs args;
-
-    // landmark receiving buffer
-    HBufC8* lmBuf = HBufC8::NewLC( iResultInfo.iLandmarkSize );
-    TPtr8 lmBufPtr( lmBuf->Des() );
-
-    args.Set( EMnIpcMapSelResultBufferParamIndex, &lmBufPtr );
-    User::LeaveIfError( SendReceive( EMnIpcGetSelectionResultLandmark, args ) );
-
-    CPosLandmark* l = PosLandmarkSerialization::UnpackL( *lmBuf );
-    CleanupStack::PopAndDestroy( lmBuf );
-    return l;
-    }
-    
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-void RMnMapViewServiceClient::GetSelectedLandmarkL( TInt& aLandmarkIndex )
-    {
-    if ( iResultInfo.iType == CMnMapView::ESelectionLandmarkIndex )
-        {
-        aLandmarkIndex = iResultInfo.iLandmarkIndex;
-        }
-    else
-        {
-        User::Leave( KErrNotFound );
-        }
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-void RMnMapViewServiceClient::GetSelectedLandmarkL( TPosLmItemId& aLandmarkId, HBufC*& aDbUri )
-    {
-    if ( iResultInfo.iType != CMnMapView::ESelectionLinkedLandmark )
-        {
-        User::Leave( KErrNotFound );
-        }
-
-    aLandmarkId = iResultInfo.iLandmarkId;
-
-    TIpcArgs args;
-    
-    // database URI receiving buffer
-    HBufC* uriBuf = HBufC::NewLC( iResultInfo.iDbUriSize );
-    TPtr uriBufPtr( uriBuf->Des() );
-    args.Set( EMnIpcMapSelResultBufferParamIndex, &uriBufPtr );
-
-    User::LeaveIfError( SendReceive( EMnIpcGetSelectionResultDbUri, args ) );
-    
-    CleanupStack::Pop( uriBuf );
-    aDbUri = uriBuf;
-    }
-
-// ---------------------------------------------------------------------------
-// From class RApaAppServiceBase.
-// ---------------------------------------------------------------------------
-//
-TUid RMnMapViewServiceClient::ServiceUid() const
-    { 
-    return TUid::Uid(KMnAppMapViewService); 
-    }
--- a/locationmapnavfw/library/src/mnnavigationservicebase.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,77 +0,0 @@
-/*
-* Copyright (c) 2005-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:  CMnNavigationServiceBase class implementation
-*
-*/
-
-
-#include <e32base.h>
-
-#include <EPos_CPosLandmark.h>
-
-#include "mndebug.h"
-#include "mnerrors.h"
-#include "mninternal.h"
-#include "mninternal.inl"
-#include "mnnavigationservicebase.h"
-
-// ======== LOCAL FUNCTIONS ========
-
-// ======== MEMBER FUNCTIONS ========
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-EXPORT_C CMnNavigationServiceBase::CMnNavigationServiceBase()
-    {
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-EXPORT_C CMnNavigationServiceBase::~CMnNavigationServiceBase()
-    {
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-EXPORT_C void CMnNavigationServiceBase::BaseConstructL()
-    {
-    CMnServiceBase::BaseConstructL();
-    }
-
-// ---------------------------------------------------------------------------
-//  From class CAknAppServiceBase
-// ---------------------------------------------------------------------------
-//
-EXPORT_C void CMnNavigationServiceBase::ServiceL(const RMessage2& aMessage)
-    {
-    LOG1("CMnNavigationServiceBase::ServiceL in, function %d", aMessage.Function());
-    
-    switch ( aMessage.Function() )
-        {
-        case EMnIpcNavigateTo:
-            {
-            CPosLandmark* lm = UnpackLandmarkLC( aMessage, EMnIpcNaviLandmarkParamIndex );
-            HandleNavigateToL( *lm );
-            CleanupStack::PopAndDestroy( lm );
-            Complete( aMessage, KErrNone );
-            }
-            break;
-            
-        default:
-            CMnServiceBase::ServiceL( aMessage );
-        }
-    }
--- a/locationmapnavfw/library/src/mnnavigationserviceclient.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,74 +0,0 @@
-/*
-* Copyright (c) 2005-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:  RMnNavigationServiceClient class implementation
-*
-*/
-
-
-#include <e32base.h>
-
-#include <EPos_CPosLandmark.h>
-#include <epos_poslandmarkserialization.h>
-
-#include "mndebug.h"
-#include "mninternal.h"
-#include "mnerrors.h"
-
-#include "mnappserviceuids.hrh"
-#include "mnnavigationserviceclient.h"
-
-// ======== LOCAL FUNCTIONS ========
-
-// ======== MEMBER FUNCTIONS ========
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-RMnNavigationServiceClient::RMnNavigationServiceClient()
-    {
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-RMnNavigationServiceClient::~RMnNavigationServiceClient()
-    {
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-void RMnNavigationServiceClient::NavigateToL( const CPosLandmark& aDestinationLanmdark )
-    {
-    LOG("RMnNavigationServiceClient::NavigateToL");
-    TIpcArgs args;
-    
-    // landmark
-    HBufC8* lmBuf = PosLandmarkSerialization::PackL( aDestinationLanmdark ); 
-    CleanupStack::PushL( lmBuf );
-
-    args.Set( EMnIpcNaviLandmarkParamIndex, lmBuf );
-    
-    User::LeaveIfError( SendReceive( EMnIpcNavigateTo, args ) );
-    CleanupStack::PopAndDestroy( lmBuf );
-    }
-
-// ---------------------------------------------------------------------------
-// From class RApaAppServiceBase.
-// ---------------------------------------------------------------------------
-//
-TUid RMnNavigationServiceClient::ServiceUid() const
-    { 
-    return TUid::Uid(KMnAppNavigationService); 
-    }
--- a/locationmapnavfw/library/src/mnnavigator.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,173 +0,0 @@
-/*
-* Copyright (c) 2005-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:  CMnNavigator class implementation
-*
-*/
-
-
-#include <e32base.h>
-#include <e32math.h>
-#include <AknServerApp.h>
-#include <apaserverapp.h>
-
-#include <lbsfields.h>
-#include <lbsfieldids.h>
-#include <EPos_CPosLandmark.h>
-
-#include "mnprovider.h"
-#include "mnnavigationserviceclient.h"
-#include "mnnavigator.h"
-
-// ======== MEMBER FUNCTIONS ========
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-CMnNavigator::CMnNavigator()
-    {
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-EXPORT_C CMnNavigator* CMnNavigator::NewL( CMnProvider& aProvider )
-    {
-    CMnNavigator* self = new (ELeave) CMnNavigator;
-    CleanupStack::PushL( self );
-    self->ConstructNewL( aProvider );
-    CleanupStack::Pop( self );
-    return self;
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-EXPORT_C CMnNavigator* CMnNavigator::NewChainedL( CMnProvider& aProvider )
-    {
-    CMnNavigator* self = new (ELeave) CMnNavigator;
-    CleanupStack::PushL( self );
-    self->ConstructChainedL( aProvider );
-    CleanupStack::Pop( self );
-    return self;
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-void CMnNavigator::ConstructCommonL( CMnProvider& aProvider )
-    {
-    if ( !( aProvider.SupportedServices() & CMnProvider::EServiceNavigation ) )
-        {
-        User::Leave( KErrNotSupported );
-        }
-
-    iSession = new (ELeave) RMnNavigationServiceClient;
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-void CMnNavigator::ConstructNewL( CMnProvider& aProvider )
-    {
-    ConstructCommonL( aProvider );
-    iSession->ConnectL( aProvider.Uid() );
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-void CMnNavigator::ConstructChainedL( CMnProvider& aProvider )
-    {
-    ConstructCommonL( aProvider );
-    iSession->ConnectChainedL( aProvider.Uid() );
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-EXPORT_C CMnNavigator::~CMnNavigator()
-    {
-    delete iExitMonitor;
-    if ( iSession )
-        {
-        iSession->Close();
-        delete iSession;
-        }
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-EXPORT_C void CMnNavigator::NavigateToL(const CPosLandmark& aDestination)
-    {
-    // verify that destination landmark has coordinates
-    TLocality loc;
-    TBool valid = (KErrNone == aDestination.GetPosition( loc ) );
-    valid &= !Math::IsNaN( loc.Latitude() ) && !Math::IsNaN( loc.Longitude() );
-    
-    if ( !valid )
-        {
-        // verify that destination landmark has address info
-        TPositionFieldId fieldId = aDestination.FirstPositionFieldId();
-        while ( fieldId != EPositionFieldNone )
-            {
-            if ( fieldId > EPositionFieldAddressCapabilitiesBegin &&
-                 fieldId < EPositionFieldNMEACapabilitiesBegin)
-                {
-                TPtrC field;
-                aDestination.GetPositionField( fieldId, field );
-                if ( field.Length() )
-                    {
-                    valid = ETrue;
-                    break;
-                    }
-                }
-            fieldId = aDestination.NextPositionFieldId( fieldId );            
-            }
-        }
-        
-    if ( valid )
-        {
-        iSession->NavigateToL( aDestination );
-        }
-    else
-        {
-        User::Leave( KErrArgument );
-        }
-    }
-        
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-EXPORT_C void CMnNavigator::SetExitObserverL( MAknServerAppExitObserver& aObserver )
-	{
-	if ( iExitMonitor )
-		{
-		User::Leave( KErrAlreadyExists );
-		}
-	else
-		{
-		iExitMonitor = CApaServerAppExitMonitor::NewL( 
-			*iSession, aObserver, CActive::EPriorityStandard );
-		}
-	}
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-EXPORT_C void CMnNavigator::RemoveExitObserver()
-	{
-	delete iExitMonitor;
-	iExitMonitor = NULL;
-	}
--- a/locationmapnavfw/library/src/mnprovider.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,113 +0,0 @@
-/*
-* Copyright (c) 2005-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:  CMnProvider class implementation
-*
-*/
-
-
-#include <e32base.h>
-
-#include "mnprovider.h"
-#include "mnproviderimpl.h"
-
-// ======== LOCAL FUNCTIONS ========
-
-// ======== MEMBER FUNCTIONS ========
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-CMnProvider::CMnProvider()
-    {
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-CMnProvider::CMnProvider( CMnProvider& )
-    {
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-EXPORT_C CMnProvider::~CMnProvider()
-    {
-    }
-
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-EXPORT_C TUid CMnProvider::Uid() const
-    {
-    return iUid;
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-EXPORT_C TVersion CMnProvider::Version() const
-    {
-    return iVersion;
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-EXPORT_C void CMnProvider::GetName( TPtrC& aName ) const
-    {
-    if ( iName )
-        {
-        aName.Set( iName->Des() );
-        }
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-EXPORT_C void CMnProvider::GetShortName( TPtrC& aShortName ) const
-    {
-    if ( iShortName )
-        {
-        aShortName.Set( iShortName->Des() );
-        }
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-EXPORT_C void CMnProvider::GetVendorName( TPtrC& aVendorName ) const
-    {
-    if ( iVendorName )
-        {
-        aVendorName.Set( iVendorName->Des() );
-        }
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-EXPORT_C CMnProvider::TServices CMnProvider::SupportedServices() const
-    {
-    return iServices;
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-EXPORT_C TUint32 CMnProvider::SupportedFeatures( TService /*aService*/ ) const
-    {
-    return 0;
-    }
--- a/locationmapnavfw/library/src/mnproviderfinder.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,198 +0,0 @@
-/*
-* Copyright (c) 2005-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:  MnProviderFinder class implementation
-*
-*/
-
-
-#include <e32base.h>
-#include <apgcli.h>
-
-#include "mnappserviceuids.hrh"
-
-#include "mnproviderimpl.h"
-#include "mnproviderfinder.h"
-
-#include "mndebug.h"
-
-// ======== LOCAL FUNCTIONS ========
-
-// ---------------------------------------------------------------------------
-//  Cleanup item for RPointerArray<CMnProviderImpl>
-// ---------------------------------------------------------------------------
-//
-void CleanupPointerArray(TAny* aArray)
-    {
-    ( static_cast<RPointerArray<CMnProviderImpl>*>( aArray ) )->ResetAndDestroy();
-    }
-
-// ---------------------------------------------------------------------------
-//  Finds service UID for given CMnProvider::TService
-// ---------------------------------------------------------------------------
-//
-TUid ServiceUid( CMnProvider::TService aService )
-    {
-    switch ( aService )
-        {
-        case CMnProvider::EServiceMapView:
-            return TUid::Uid( KMnAppMapViewService );
-
-        case CMnProvider::EServiceNavigation:
-            return TUid::Uid( KMnAppNavigationService );
-
-        case CMnProvider::EServiceGeocoding:
-            return TUid::Uid( KMnAppGeocodingService );
-
-        case CMnProvider::EServiceMapImage:
-            return TUid::Uid( KMnAppMapImageService );
-
-        default:
-            return TUid::Uid( 0 );
-        }
-    }
-
-// ---------------------------------------------------------------------------
-//  Finds provider in given list by UID
-// ---------------------------------------------------------------------------
-//
-TInt FindProviderByUid( TUid aAppUid, RPointerArray<CMnProvider>& aProviders )
-    {
-    for (TInt i = 0; i < aProviders.Count(); i++)
-        {
-        if ( aProviders[i]->Uid().iUid == aAppUid.iUid )
-            return i;
-        }
-    return KErrNotFound;
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-void FindAllServiceProvidersL(
-    RPointerArray<CMnProvider>& aProviders,
-    CMnProvider::TServices aServices )
-    {
-    LOG("FindAllServiceProvidersL in");
-
-    RApaLsSession apa;
-    User::LeaveIfError( apa.Connect() );
-    CleanupClosePushL( apa );
-
-    Swi::RSisRegistrySession sis;
-    User::LeaveIfError( sis.Connect() );
-    CleanupClosePushL( sis );
-
-    const CMnProvider::TService KKnownServices[] =
-        {
-        CMnProvider::EServiceMapView,
-        CMnProvider::EServiceNavigation,
-        CMnProvider::EServiceGeocoding,
-        CMnProvider::EServiceMapImage
-        };
-    const TInt KNumKnownServices = sizeof( KKnownServices ) / sizeof ( CMnProvider::TService );
-
-    // find all providers for known services
-    for ( TInt i = 0; i < KNumKnownServices; i++ )
-        {
-        // but consider only required services
-        if ( aServices & KKnownServices[i] )
-            {
-            TInt err = apa.GetServerApps( ServiceUid( KKnownServices[i] ) );
-            while ( !err )
-                {
-                TApaAppInfo app;
-                err = apa.GetNextApp(app);
-                if ( !err )
-                    {
-                    // add this app to the list, if not added yet
-                    TInt index = FindProviderByUid( app.iUid, aProviders );
-                    if ( index == KErrNotFound )
-                        {
-                        // add new provider to the list
-                        LOG2("found new provider candidate uid{%08X}, name{%S}", 
-                            app.iUid.iUid, &app.iFullName);
-
-                        // find all data about this provider
-                        CMnProviderImpl* provider = NULL;
-                        TRAP( err, provider = CMnProviderImpl::NewL( app.iUid, apa, sis ) );
-                        if ( !err )
-                            {
-                            if ( provider->IsTrusted() )
-                                {
-                                CleanupStack::PushL( provider );
-                                aProviders.AppendL( provider );
-                                CleanupStack::Pop( provider );
-                                }
-                            else
-                                {
-                                delete provider;
-                                LOG1("untrusted provider uid{%X}", app.iUid.iUid);
-                                }
-                            }
-                        else
-                            {
-                            // skip provider if cannot be constructed
-                            LOG2("construction failed for uid{%X}, error %d", app.iUid.iUid, err);
-                            }
-                        }
-                    }
-                }
-            }
-        }
-
-    CleanupStack::PopAndDestroy( &sis );
-    CleanupStack::PopAndDestroy( &apa );
-
-    LOG("FindAllServiceProvidersL out");
-    }
-
-// ======== MEMBER FUNCTIONS ========
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-EXPORT_C void MnProviderFinder::FindProvidersL(
-    RPointerArray<CMnProvider>& aProviders)
-    {
-    CMnProvider::TServices allServices =
-        CMnProvider::EServiceMapView |
-        CMnProvider::EServiceNavigation |
-        CMnProvider::EServiceGeocoding |
-        CMnProvider::EServiceMapImage;
-
-    FindAllServiceProvidersL( aProviders, allServices );
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-EXPORT_C void MnProviderFinder::FindProvidersL(
-    RPointerArray<CMnProvider>& aProviders,
-    CMnProvider::TServices aRequiredServices)
-    {
-    FindAllServiceProvidersL( aProviders, aRequiredServices );
-
-    // verify that providers meet service support requirements
-    for ( TInt i = aProviders.Count() - 1; i >= 0; i-- )
-        {
-        CMnProvider* provider = aProviders[i];
-        
-        if ( ( provider->SupportedServices() & aRequiredServices ) != aRequiredServices )
-            {
-            aProviders.Remove( i );
-            delete provider;
-            }
-        }
-    }
-
--- a/locationmapnavfw/library/src/mnproviderimpl.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,402 +0,0 @@
-/*
-* Copyright (c) 2005-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:  CMnProviderImpl class implementation
-*
-*/
-
-
-#include <e32base.h>
-#include <ecom/ecom.h>
-#ifndef SYMBIAN_ENABLE_SPLIT_HEADERS
-#include <apaid.h>
-#else
-#include <apaid.h>
-#include <apaidpartner.h>
-#endif
-#include <apgcli.h>
-#include <swi/sisregistryentry.h>
-#include <swi/sistruststatus.h>
-#include <swi/sisregistrypackage.h>
-
-#include "mnserviceclientbase.h"
-#include "mnappserviceuids.hrh"
-
-#include "mnpluginuids.hrh"
-#include "mnproviderimpl.h"
-
-#include "mndebug.h"
-
-// ======== LOCAL FUNCTIONS ========
-
-extern TUid ServiceUid( CMnProvider::TService aService );
-
-// ---------------------------------------------------------------------------
-//  Cleanup item for RImplInfoPtrArray
-// ---------------------------------------------------------------------------
-//
-void CleanupImplementationsArray( TAny* aArray )
-    {
-    ( static_cast<RImplInfoPtrArray*>( aArray ) )->ResetAndDestroy();
-    }
-
-// ======== MEMBER FUNCTIONS ========
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-CMnProviderImpl::CMnProviderImpl()
-    {
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-CMnProviderImpl::~CMnProviderImpl()
-    {
-    delete iName;
-    delete iShortName;
-    delete iVendorName;
-    REComSession::FinalClose();    
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-CMnProviderImpl* CMnProviderImpl::NewL( TUid aProvider )
-    {
-    CMnProviderImpl* self = new(ELeave) CMnProviderImpl;
-    CleanupStack::PushL( self );
-    self->ConstructL( aProvider );
-    CleanupStack::Pop( self );
-    return self;
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-CMnProviderImpl* CMnProviderImpl::NewL(
-    TUid aAppUid, 
-    RApaLsSession& aApaSession, 
-    Swi::RSisRegistrySession& aSisSession )
-    {
-    CMnProviderImpl* self = new(ELeave) CMnProviderImpl;
-    CleanupStack::PushL( self );
-    self->ConstructL( aAppUid, aApaSession, aSisSession );
-    CleanupStack::Pop( self );
-    return self;
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-void CMnProviderImpl::ConstructL( TUid aProvider )
-    {
-    RApaLsSession apa;
-    User::LeaveIfError( apa.Connect() );
-    CleanupClosePushL( apa );
-
-    Swi::RSisRegistrySession sis;
-    User::LeaveIfError( sis.Connect() );
-    CleanupClosePushL( sis );
-
-    ConstructL( aProvider, apa, sis );
-    
-    CleanupStack::PopAndDestroy( &sis );
-    CleanupStack::PopAndDestroy( &apa );
-    }
-    
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-void CMnProviderImpl::ConstructL(
-    TUid aAppUid, 
-    RApaLsSession& aApaSession, 
-    Swi::RSisRegistrySession& aSisSession )
-    {
-    iUid = aAppUid;
-    ReadAppArcInfoL( aApaSession );
-    ReadServiceFeaturesL( aApaSession );
-    ReadPackageInfoL( aSisSession );
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-void CMnProviderImpl::ReadAppArcInfoL( RApaLsSession& aApa )
-    {
-    LOG("CMnProviderImpl::ReadAppArcInfoL");
-    
-    TApaAppInfo appInfo;
-    User::LeaveIfError( aApa.GetAppInfo( appInfo, iUid ) );
-    
-    SetNameL( appInfo.iCaption );
-    SetShortNameL( appInfo.iShortCaption );
-    
-    // get additional data from SERVICE_INFO structs
-    
-    const TInt KGranularity = 8;
-    CArrayFixFlat< TUid >* serviceUids = 
-        new (ELeave) CArrayFixFlat< TUid > ( KGranularity );
-    CleanupStack::PushL( serviceUids );
-        
-    aApa.GetAppServicesL( iUid, *serviceUids );
-    
-    for ( TInt s = 0; s < serviceUids->Count(); s++ )
-        {
-        switch ( (*serviceUids)[s].iUid )
-            {
-            case KMnAppMapViewService:
-                iServices |= EServiceMapView;
-                break;
-            case KMnAppNavigationService:
-                iServices |= EServiceNavigation;
-                break;
-            case KMnAppGeocodingService:
-                iServices |= EServiceGeocoding;
-                break;
-            case KMnAppMapImageService:
-                iServices |= EServiceMapImage;
-                break;
-            }
-        }
-
-    CleanupStack::PopAndDestroy( serviceUids );
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-TBool CMnProviderImpl::ReadMnServiceInfoL(
-    RApaLsSession& aApaSession, 
-    TUid aServiceUid, 
-    TMnAppServiceInfo& aServiceInfo)
-    {
-    LOG1("CMnProviderImpl::ReadMnServiceInfoL appSvcUid 0x%X", aServiceUid.iUid);
-
-    TBool found = EFalse;
-
-    CApaAppServiceInfoArray* infoArray = aApaSession.GetAppServiceOpaqueDataLC( iUid, aServiceUid );
-    if ( infoArray )
-        {
-        TArray< TApaAppServiceInfo > array = infoArray->Array();
-        for ( TInt i = 0; i < array.Count(); i++ )
-            {
-            TPtrC8 ptr = array[i].OpaqueData();
-            
-            if ( ptr.Size() == sizeof ( TMnAppServiceInfo ) )
-                {
-                memcpy(&aServiceInfo, ptr.Ptr(), sizeof ( TMnAppServiceInfo ) );
-                found = ETrue;
-                break;
-                }
-            }
-        }
-
-    CleanupStack::PopAndDestroy( infoArray );            
-    return found;
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-void CMnProviderImpl::CheckServiceFeaturesL( 
-    RApaLsSession& aApaSession,
-    CMnProvider::TService aService, 
-    TUint32& aServiceFeatures )
-    {
-    TMnAppServiceInfo info;
-    TBool found = ReadMnServiceInfoL( aApaSession, ServiceUid( aService ), info );
-    if ( found && info.iServiceFeatures )
-        {
-        aServiceFeatures = info.iServiceFeatures;
-        }
-    else
-        {
-        iServices &= ~aService;
-        }
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-void CMnProviderImpl::ReadServiceFeaturesL( RApaLsSession& aApaSession )
-    {
-    if ( iServices & EServiceMapView )
-        {
-        CheckServiceFeaturesL( aApaSession, EServiceMapView, iMapViewFeatures );
-        }
-
-    if ( iServices & EServiceNavigation )
-        {
-        CheckServiceFeaturesL( aApaSession, EServiceNavigation, iNavigationFeatures );
-        }
-
-    if ( iServices & EServiceGeocoding )
-        {
-        CheckServiceFeaturesL( aApaSession, EServiceGeocoding, iGeocodingFeatures );
-        }
-
-    if ( iServices & EServiceMapImage )
-        {
-        CheckServiceFeaturesL( aApaSession, EServiceMapImage, iMapImageFeatures );
-        if ( !IsConverterPluginFoundL() )
-            {
-            iServices &= ~EServiceMapImage;
-            iMapImageFeatures = 0;
-            }
-        }
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-#ifndef __WINS__
-
-void CMnProviderImpl::ReadPackageInfoL( Swi::RSisRegistrySession& aSisSession )
-    {
-    LOG("CMnProviderImpl::ReadPackageInfoL");
-
-    Swi::CSisRegistryPackage* package = aSisSession.SidToPackageL(iUid);
-    CleanupStack::PushL( package );
-    
-    Swi::RSisRegistryEntry entry;
-    User::LeaveIfError( entry.OpenL( aSisSession, *package ) );
-    CleanupClosePushL( entry );
-    
-    // FW wants to know trust level of Provider Applications
-    Swi::TSisTrustStatus trust = entry.TrustStatusL();
-    iIsTrusted = ( trust.ValidationStatus() >= Swi::EValidatedToAnchor );
-        
-    // other needed info
-    SetVersion( entry.VersionL() );
-    
-    HBufC* vendorName = entry.LocalizedVendorNameL();
-    CleanupStack::PushL( vendorName );
-    SetVendorNameL( vendorName->Des() );
-    CleanupStack::PopAndDestroy( vendorName );
-
-    CleanupStack::PopAndDestroy( &entry );
-    CleanupStack::PopAndDestroy( package );
-    }
-
-#else
-
-void CMnProviderImpl::ReadPackageInfoL( Swi::RSisRegistrySession& /*aSisSession */ )
-    {
-    LOG("CMnProviderImpl::ReadPackageInfoL");
-    iIsTrusted = ETrue;
-    }
-
-#endif
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-TBool CMnProviderImpl::IsTrusted()
-    {
-    return iIsTrusted;
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-TBool CMnProviderImpl::IsConverterPluginFoundL()
-    {
-    TUid converterIf = { KMnMapImageConverterIf };
-
-    const TInt KNumUidHexDigits = 8;
-    TBuf8<KNumUidHexDigits> uidText8;
-    
-    _LIT8( KUidHexText, "%08X" );
-    uidText8.Format( KUidHexText, iUid );
-
-    TEComResolverParams resolverParams;
-    resolverParams.SetDataType( uidText8 );
-
-    RImplInfoPtrArray implementations;
-    CleanupStack::PushL( TCleanupItem( CleanupImplementationsArray, &implementations ) );
-    
-    REComSession::ListImplementationsL( converterIf, resolverParams, implementations );
-    TBool found = ( implementations.Count() > 0 );
-    CleanupStack::PopAndDestroy(); // cleanup item    
-    return found;
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-void CMnProviderImpl::SetNameL( const TDesC& aName )
-    {
-    __ASSERT_DEBUG( !iName, Panic( KErrGeneral ) );
-    iName = aName.AllocL();
-    }
-    
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-void CMnProviderImpl::SetShortNameL( const TDesC& aShortName )
-    {
-    __ASSERT_DEBUG( !iShortName, Panic( KErrGeneral ) );
-    iShortName = aShortName.AllocL();
-    }
-    
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-void CMnProviderImpl::SetVendorNameL( const TDesC& aVendorName )
-    {
-    __ASSERT_DEBUG( !iVendorName, Panic( KErrGeneral ) );
-    iVendorName = aVendorName.AllocL();
-    }
-    
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-void CMnProviderImpl::SetVersion( TVersion aVersion )
-    {
-    iVersion = aVersion;
-    }
-    
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-void CMnProviderImpl::SetSupportedServices( TServices aServices )
-    {
-    iServices = aServices;
-    }
-    
-// ---------------------------------------------------------------------------
-// From class CMnProvider.
-// ---------------------------------------------------------------------------
-//
-TUint32 CMnProviderImpl::SupportedFeatures( TService aService ) const
-    {
-    switch ( aService )
-        {
-        case EServiceMapView:
-            return iMapViewFeatures;
-            
-        case EServiceNavigation:
-            return iNavigationFeatures;
-            
-        case EServiceGeocoding:
-            return iGeocodingFeatures;
-
-        case EServiceMapImage:
-            return iMapImageFeatures;
-
-        default:
-            return 0;
-        }
-    }
--- a/locationmapnavfw/library/src/mnservicebase.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,218 +0,0 @@
-/*
-* Copyright (c) 2005-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:  CMnServiceBase class implementation
-*
-*/
-
-
-#include <e32base.h>
-
-#include <EPos_CPosLandmark.h>
-#include <epos_poslandmarkserialization.h>
-
-#include "mndebug.h"
-#include "mnerrors.h"
-#include "mninternal.h"
-#include "mninternal.inl"
-
-#include "mnservicebase.h"
-
-// ======== LOCAL FUNCTIONS ========
-
-// ======== MEMBER FUNCTIONS ========
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-CMnServiceBase::CMnServiceBase()
-    {
-    iCurrentRequest = EMnIpcNone;
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-CMnServiceBase::~CMnServiceBase()
-    {
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-void CMnServiceBase::BaseConstructL()
-    {
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-EXPORT_C void CMnServiceBase::CompleteRequest( TInt aResult )
-    {
-    LOG1("CMnServiceBase::CompleteRequest, result %d", aResult);
-    if ( iCurrentRequest == EMnIpcNone )
-        {
-        PanicServer( KMnPanicAttemptToCompleteNoRequest );
-        }
-    else
-        {
-        Complete( iMessage, aResult );
-        iCurrentRequest = EMnIpcNone;
-        }
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-void CMnServiceBase::Complete( const RMessage2& aMsg, TInt aResult )
-    {
-    //LOG1("CMnServiceBase::Complete, result %d", aResult);
-    if ( !aMsg.IsNull() )
-        {
-        aMsg.Complete( aResult );
-        }
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-void CMnServiceBase::HandleCancelRequestL( const RMessage2& aMessage )
-    {
-    LOG("CMnServiceBase::HandleCancelRequestL in");
-    
-    if ( IsAsyncRequestActive() && aMessage.Int0() == CurrentAsyncRequest() )
-        {
-        DoCancel();
-        CompleteRequest( KErrCancel );
-        Complete( aMessage, KErrNone );
-        }
-    else
-        {
-        LOG("CMnServiceBase::HandleCancelRequestL leave, not found");
-        User::Leave( KErrNotFound );
-        }
-        
-    LOG("CMnServiceBase::HandleCancelRequestL out");
-    }
-
-// ---------------------------------------------------------
-// ---------------------------------------------------------
-//
-HBufC8* CMnServiceBase::CopyClientBuffer8LC(
-    const RMessage2& aMessage, 
-    const TInt aClientBufferParam )
-    {
-    // Create an empty server side buffer that will contain client data
-    TInt dataSize = aMessage.GetDesLengthL( aClientBufferParam );
-    HBufC8* buffer = HBufC8::NewLC( dataSize );
-
-    // Populate server side buffer with client data
-    TPtr8 ptrToBuf = buffer->Des();
-    aMessage.ReadL( aClientBufferParam, ptrToBuf );
-    return buffer;
-    }
-
-// ---------------------------------------------------------
-// ---------------------------------------------------------
-//
-HBufC* CMnServiceBase::CopyClientBufferLC(
-    const RMessage2& aMessage, 
-    const TInt aClientBufferParam)
-    {
-    // Create an empty server side buffer that will contain client data
-    TInt dataSize = aMessage.GetDesLengthL( aClientBufferParam );
-    HBufC* buffer = HBufC::NewLC( dataSize );
-
-    // Populate server side buffer with client data
-    TPtr ptrToBuf = buffer->Des();
-    aMessage.ReadL( aClientBufferParam, ptrToBuf );
-    return buffer;
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-CPosLandmark* CMnServiceBase::UnpackLandmarkLC( 
-    const RMessage2& aMessage,
-    TInt aParamIndex )
-    {
-    LOG("CMnServiceBase::UnpackLandmarkLC");
-    
-    HBufC8* lmBuf = CopyClientBuffer8LC( aMessage, aParamIndex );
-    
-    CPosLandmark* landmark = PosLandmarkSerialization::UnpackL( *lmBuf );
-    CleanupStack::PopAndDestroy( lmBuf );
-    CleanupStack::PushL( landmark );
-    return landmark;
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-TInt CMnServiceBase::CurrentAsyncRequest()
-    {
-    return iCurrentRequest;
-    }
-    
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-TBool CMnServiceBase::IsAsyncRequestActive()
-    {
-    return ( iCurrentRequest != EMnIpcNone );
-    }
-
-// ---------------------------------------------------------------------------
-//  Put new request ID to stack to guarantee that if starting of asynchronous
-//  request leaves, the iCurrentRequest will be reset.
-//  If starting goes well, the PostStartAsyncRequest will pop this cleanup
-//  from stack and "current request ID" will be kept until request is competed
-//  by service implmentation.
-// ---------------------------------------------------------------------------
-//
-void CMnServiceBase::PrepareAsyncRequestL( const RMessage2& aMessage )
-    {
-    LOG("CMnServiceBase::PrepareAsyncRequestL in");
-
-    if ( IsAsyncRequestActive() )
-        {
-        PanicClient( aMessage, KMnPanicDuplicateRequest );
-        User::Leave( KErrInUse );
-        }
-
-    iMessage = aMessage;
-    iCurrentRequest = aMessage.Function();
-
-    LOG("CMnServiceBase::PrepareAsyncRequestL out");
-    }
-
-// ---------------------------------------------------------------------------
-//  From class CApaAppServiceBase
-// ---------------------------------------------------------------------------
-//
-EXPORT_C void CMnServiceBase::ServiceError( const RMessage2 &aMessage, TInt aError )
-    {
-    LOG2("CMnServiceBase::ServiceError function %d, error %d",
-        aMessage.Function(), aError );
-    
-    if ( IsAsyncRequestActive() && 
-         aMessage.Handle() == iMessage.Handle() )
-        {
-        // starting this async request failed, rollback
-        LOG1("CMnServiceBase::ServiceError forgetting async request %d", iCurrentRequest );
-        iCurrentRequest = EMnIpcNone;
-        }
-
-    CAknAppServiceBase::ServiceError( aMessage, aError );
-    LOG("CMnServiceBase::ServiceError out");
-    }
--- a/locationmapnavfw/library/src/mnserviceclientbase.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,88 +0,0 @@
-/*
-* Copyright (c) 2005-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:  RMnServiceClientBase class implementation
-*
-*/
-
-
-#include <e32base.h>
-
-#include <EPos_CPosLandmark.h>
-#include <epos_poslandmarkserialization.h>
-
-#include "mndebug.h"
-#include "mnserviceclientbase.h"
-
-// ======== LOCAL FUNCTIONS ========
-
-// ======== MEMBER FUNCTIONS ========
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-RMnServiceClientBase::RMnServiceClientBase() :
-    iLastRequest( EMnIpcNone )
-    {
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-void RMnServiceClientBase::ConnectL( TUid aProviderUid )
-    {
-    LOG1("RMnServiceClientBase::ConnectL (provider 0x%X)", aProviderUid.iUid);
-    ConnectNewAppL( aProviderUid );
-#ifdef _DEBUG    
-    TPtrC serverName( ServerName() );
-    LOG1("RMnServiceClientBase::ConnectL connected to server '%S'", &serverName);
-#endif    
-    }
-    
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-void RMnServiceClientBase::ConnectChainedL( TUid aProviderUid )
-    {
-    LOG1("RMnServiceClientBase::ConnectChainedL (provider 0x%X)", aProviderUid.iUid);
-    ConnectChainedAppL( aProviderUid );
-#ifdef _DEBUG    
-    TPtrC serverName( ServerName() );
-    LOG1("RMnServiceClientBase::ConnectChainedL connected to server '%S'", &serverName);
-#endif    
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-void RMnServiceClientBase::Cancel()
-    {
-    LOG("RMnServiceClientBase::Cancel");
-    if ( Handle() && iLastRequest != EMnIpcNone )
-        {
-        TIpcArgs args;
-        args.Set( EMnIpcCancelRequestIdIndex, iLastRequest );
-        SendReceive( EMnIpcCancel, args );
-        }
-    iLastRequest = EMnIpcNone;
-    }
-    
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-void RMnServiceClientBase::Close()
-    {
-    LOG("RMnServiceClientBase::Close");
-    Cancel();
-    RAknAppServiceBase::Close();
-    }
--- a/locationmapnavfw/library/src/mnutils.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,114 +0,0 @@
-/*
-* Copyright (c) 2005-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:  MnUtils class implementation
-*
-*/
-
-
-#include <e32base.h>
-#include <f32file.h>
-#include <barsc2.h>
-#include <barsread2.h>
-#include <bautils.h>
-
-#include "mnutils.h"
-
-// ======== MEMBER FUNCTIONS ========
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-EXPORT_C void MnUtils::FindLocalizedResourceFileL(
-    RFs& aFsSession,
-    const TDesC& aRscFile,
-    TFileName& aFileName )
-    {
-    TFileName fileName( aRscFile );
-
-    TParse parse;
-    parse.Set( aRscFile, NULL, NULL );
-
-    // look on system and given drives first
-    BaflUtils::NearestLanguageFile( aFsSession, fileName );
-
-    const TInt KLangPartOfExtensionLen = 2;
-    TBool found = ( fileName.Right( KLangPartOfExtensionLen ) !=
-                    aRscFile.Right( KLangPartOfExtensionLen ) );
-
-    if ( !found )
-        {
-        // look on other drives
-        TDriveList drives;
-        aFsSession.DriveList( drives );
-
-        for ( TInt drive = EDriveA; drive <= EDriveZ; drive++ )
-            {
-            if ( drives[drive] && !( drives[drive] & KDriveAttRemote ) ) // avoid remote drives
-                {
-                TDriveInfo drvInfo;
-                TInt err = aFsSession.Drive( drvInfo, drive );
-
-                if ( !err && drvInfo.iType != EMediaNotPresent )
-                    {
-                    TChar drv;
-                    aFsSession.DriveToChar( drive, drv );
-    
-                    fileName.Zero();
-                    fileName.Append( drv );
-                    fileName.Append( KDriveDelimiter );
-                    fileName.Append( parse.Path() );
-                    fileName.Append( parse.NameAndExt() );
-    
-                    // look on c: and this drive
-                    BaflUtils::NearestLanguageFile( aFsSession, fileName );
-    
-                    const TInt KLangPartOfExtensionLen = 2;
-                    found = ( fileName.Right( KLangPartOfExtensionLen ) !=
-                              aRscFile.Right( KLangPartOfExtensionLen ) );
-                    if ( found ) break;
-                    }
-                }    
-            }
-        }
-
-    if ( !found )
-        {
-        // localized file not found, try using SC
-        FindResourceFileL( aFsSession, aRscFile, fileName );
-        }
-        
-    aFileName.Copy( fileName );        
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-EXPORT_C void MnUtils::FindResourceFileL(
-    RFs& aFsSession,
-    const TDesC& aFilePathAndName,
-    TFileName& aRscFile )
-    {
-    TParse parse;
-    parse.Set( aFilePathAndName, NULL, NULL );
-
-    TFindFile finder( aFsSession );
-    if ( finder.FindByDir( parse.NameAndExt(), parse.Path() ) == KErrNone )
-        {
-        aRscFile.Copy( finder.File() );
-        }
-    else
-        {
-        User::Leave( KErrNotFound );
-        }
-    }
--- a/locationmapnavfw/loc/mnaiwprovider.loc	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,74 +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:  Localization strings for Map and Navigation AIW Provider
-*
-*/
-
-
-// d:Menu item text for fetching coordinates by address information
-// d:from selected object
-// l:list_single_pane_t1_cp2
-// r:3.1
-//
-#define qtn_mnn_option_fetch_coordinates "Retrieve coordinates"
-
-// d:Menu item text for fetching address information by coordinates 
-// d:from selected object
-// l:list_single_pane_t1_cp2
-// r:3.1
-//
-#define qtn_mnn_option_fetch_address "Retrieve address"
-
-// d:Menu item text to launch navigation application with
-// d:destination at selected object containing coordinates or address
-// l:list_single_pane_t1_cp2
-// r:3.1
-//
-#define qtn_mnn_option_navigate_to "Navigate to"
-
-// d:Menu item text for starting map application and selecting
-// d:a location or landmark directly from map
-// l:list_single_pane_t1_cp2
-// r:3.1
-//
-#define qtn_mnn_option_select_from_map  "Select from map"
-
-// d:Menu item text for starting map application and showing map
-// d:with selected objects drawn
-// l:list_single_pane_t1_cp2
-// r:3.1
-//
-#define qtn_mnn_option_show_on_map  "Show on map"
-
-// d:Error message to show when Provider Application cannot serve
-// d:requested Map and Navigation AIW feature.
-// l:popup_note_window_1
-// r:3.1
-//
-#define qtn_mnn_error_no_provider   "Operation not possible. No suitable application installed."
-
-// d:Error message to show when service fails with 
-// d:selected Map and Navigation Provider Application.
-// l:popup_note_window_1
-// r:3.1
-//
-#define qtn_mnn_service_unavailable_error   "Service not available in provider application."
-
-// d:List query prompt text to show when AIW is used and there are 
-// d:several Map and Navigation Provider Applications available 
-// d:for selected menu option
-// l:popup_list_heading_pane_1
-// r:3.1
-//
-#define qtn_mnn_select_provider_query   "Select provider:"
--- a/locationmapnavfw/loc/mnclientlib.loc	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +0,0 @@
-/*
-* Copyright (c) 2005-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:  Localization strings for project Map and Navigation Library
-*
-*/
-
-
-// d:Title of selection from map request
-// l:title_pane_1
-// r:3.1
-//
-#define qtn_mnn_select_from_map "Select from map"
--- a/locationmapnavfw/rom/locationmnfw.iby	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,38 +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: Image description file for project locationmapnavfw
-*
-*/
-#ifndef __MapNavFramework_IBY__
-#define __MapNavFramework_IBY__
-
-#include <bldvariant.hrh>
-
-///////////////////////////////////
-// *** Map and Navigation FW *** //
-///////////////////////////////////
-
-// Library
-file=ABI_DIR\BUILD_DIR\mnclientlib.dll                   SHARED_LIB_DIR\mnclientlib.dll
-file=ABI_DIR\BUILD_DIR\mnservicelib.dll                 SHARED_LIB_DIR\mnservicelib.dll
-
-#ifdef __MAP_AND_NAVIGATION_AIW_PROVIDER
-
-// AIW Provider
-ECOM_PLUGIN(mnaiwprovider.dll, mnaiwprovider.rsc)
-
-#endif // __MAP_AND_NAVIGATION_AIW_PROVIDER
-
-#endif // __MapNavFramework_IBY__
-
--- a/locationmapnavfw/rom/locationmnfw_resources.iby	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,39 +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: Image description file for project locationmapnavfw
-*	             to include  resource files
-*
-*/
-#ifndef __MapNavFramework_Resources_IBY__
-#define __MapNavFramework_Resources_IBY__
-
-#include <bldvariant.hrh>
-
-///////////////////////////////////
-// *** Map and Navigation FW *** //
-///////////////////////////////////
-
-// Library
-data=DATAZ_\RESOURCE_FILES_DIR\mnclientlib.rsc  RESOURCE_FILES_DIR\mnclientlib.rsc
-
-#ifdef __MAP_AND_NAVIGATION_AIW_PROVIDER
-
-// AIW Provider
-data=DATAZ_\RESOURCE_FILES_DIR\mnaiwproviderres.rsc  RESOURCE_FILES_DIR\mnaiwproviderres.rsc
-
-#endif // __MAP_AND_NAVIGATION_AIW_PROVIDER
-
-#endif // __MapNavFramework_Resources_IBY__
-
-
--- a/locationmapnavfw/rom/locationmnfwstub.iby	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,31 +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: Image description file for project locationmapnavfw
-*              to include stub sis file
-*
-*/
-#ifndef __MapNavFrameworkStub_IBY__
-#define __MapNavFrameworkStub_IBY__
-
-#include <bldvariant.hrh>
-
-///////////////////////////////////
-// *** Map and Navigation FW *** //
-///////////////////////////////////
-
-// Stub
-data=ZSYSTEM\install\locationmnfwstub.sis               system\install\locationmnfwstub.sis
-
-#endif // __MapNavFrameworkStub_IBY__
-
Binary file locationsystemui/locationsysui/cenrep/keys_locbtnotifier.xls has changed
Binary file locationsystemui/locationsysui/cenrep/keys_loclocalvariation.xls has changed
Binary file locationsystemui/locationsysui/cenrep/keys_locnotprefplugin.xls has changed
Binary file locationsystemui/locationsysui/cenrep/keys_locsuplsettings.xls has changed
Binary file locationsystemui/locationsysui/conf/locbtnotifier.confml has changed
Binary file locationsystemui/locationsysui/conf/locbtnotifier_2001FCBB.crml has changed
Binary file locationsystemui/locationsysui/conf/locnotprefplugin.confml has changed
Binary file locationsystemui/locationsysui/conf/locnotprefplugin_10206910.crml has changed
Binary file locationsystemui/locationsysui/conf/locsuplsettings.confml has changed
Binary file locationsystemui/locationsysui/conf/locsuplsettings_1028190A.crml has changed
Binary file locationsystemui/locationsysui/data/locationsysuistub.sis has changed
--- a/locationsystemui/locationsysui/group/bld.inf	Mon May 03 12:54:42 2010 +0300
+++ b/locationsystemui/locationsysui/group/bld.inf	Fri May 14 16:17:02 2010 +0300
@@ -22,99 +22,17 @@
 
 PRJ_PLATFORMS
 DEFAULT
-//  Help exports
-#include "../help/group/bld.inf"
 
-PRJ_EXPORTS
-// Export Localization files
-../loc/location.loc             MW_LAYER_LOC_EXPORT_PATH(location.loc)
-../loc/locnotprefsettings.loc   MW_LAYER_LOC_EXPORT_PATH(locnotprefsettings.loc)
-../loc/locsuplsettings.loc      MW_LAYER_LOC_EXPORT_PATH(locsuplsettings.loc)
-../loc/locbtnotifier.loc        MW_LAYER_LOC_EXPORT_PATH(locbtnotifier.loc)
-// Export the satellite.loc file
-../loc/Satellite.loc                        MW_LAYER_LOC_EXPORT_PATH(Satellite.loc)
-
-// Export SIS File
-../data/locationsysuistub.sis  /epoc32/data/z/system/install/locationsysuistub.sis
-
-// Export IBY Files
-// Core IBY Files
-../rom/locationsysui.iby               CORE_MW_LAYER_IBY_EXPORT_PATH(locationsysui.iby)
-../rom/locgpsindicatorplugin.iby       CORE_MW_LAYER_IBY_EXPORT_PATH(locgpsindicatorplugin.iby)
-../rom/locnotprefplugin.iby            CORE_MW_LAYER_IBY_EXPORT_PATH(locnotprefplugin.iby)
-../rom/locpossettingsapp.iby           CORE_MW_LAYER_IBY_EXPORT_PATH(locpossettingsapp.iby)
-../rom/locpsysettings.iby              CORE_MW_LAYER_IBY_EXPORT_PATH(locpsysettings.iby)
-../rom/locsettingsuiservice.iby        CORE_MW_LAYER_IBY_EXPORT_PATH(locsettingsuiservice.iby)
-../rom/locsuplsettings.iby             CORE_MW_LAYER_IBY_EXPORT_PATH(locsuplsettings.iby)
-../rom/locverifierdlg.iby              CORE_MW_LAYER_IBY_EXPORT_PATH(locverifierdlg.iby)
-../rom/locbtnotifier.iby               CORE_MW_LAYER_IBY_EXPORT_PATH(locbtnotifier.iby)
-
-// Language IBY Files
-../rom/locationsysui_resources.iby             LANGUAGE_MW_LAYER_IBY_EXPORT_PATH(locationsysui_resources.iby)
-../rom/locgpsindicatorplugin_resources.iby     LANGUAGE_MW_LAYER_IBY_EXPORT_PATH(locgpsindicatorplugin_resources.iby)
-../rom/locnotprefplugin_resources.iby          LANGUAGE_MW_LAYER_IBY_EXPORT_PATH(locnotprefplugin_resources.iby)
-../rom/locpossettingsapp_resources.iby         LANGUAGE_MW_LAYER_IBY_EXPORT_PATH(locpossettingsapp_resources.iby)
-../rom/locpsysettings_resources.iby            LANGUAGE_MW_LAYER_IBY_EXPORT_PATH(locpsysettings_resources.iby)
-../rom/locsettingsuiservice_resources.iby      LANGUAGE_MW_LAYER_IBY_EXPORT_PATH(locsettingsuiservice_resources.iby)
-../rom/locsuplsettings_resources.iby           LANGUAGE_MW_LAYER_IBY_EXPORT_PATH(locsuplsettings_resources.iby)
-../rom/locverifierdlg_resources.iby            LANGUAGE_MW_LAYER_IBY_EXPORT_PATH(locverifierdlg_resources.iby)
-../rom/locbtnotifier_resources.iby             LANGUAGE_MW_LAYER_IBY_EXPORT_PATH(locbtnotifier_resources.iby)
-
-// Stub IBY Files
-../rom/locationsystemuistub.iby    CORE_MW_LAYER_IBY_EXPORT_PATH(locationsystemuistub.iby)
 
 // Export Configuration Markup language and Central Repository Mark up language files
 
-../conf/locnotprefplugin.confml        	MW_LAYER_CONFML(locnotprefplugin.confml)  
-../conf/locnotprefplugin_10206910.crml 	MW_LAYER_CRML(locnotprefplugin_10206910.crml)
-../conf/locsuplsettings.confml         	MW_LAYER_CONFML(locsuplsettings.confml)
-../conf/locsuplsettings_1028190A.crml  	MW_LAYER_CRML(locsuplsettings_1028190A.crml)
-../conf/locbtnotifier.confml           	MW_LAYER_CONFML(locbtnotifier.confml)
-../conf/locbtnotifier_2001FCBB.crml    	MW_LAYER_CRML(locbtnotifier_2001FCBB.crml)
 ../conf/loclocalvariation.confml       	MW_LAYER_CONFML(loclocalvariation.confml)
 ../conf/loclocalvariation_20022D83.crml MW_LAYER_CRML(loclocalvariation_20022D83.crml)
 
-PRJ_MMPFILES
-
-// Include Bld.infs
-
-// Location System UI View
-#include "../locsysuiview/group/bld.inf"
-
-// Location System UI Engine
-#include "../locsysuiengine/group/bld.inf"
-
-// Location Settings UI Service
-#include "../locsettingsuiservice/group/bld.inf"
-
-// Positioning Method Settings
-#include "../locpsysettings/group/bld.inf"
-
-// SUPL Settings 
-#include "../locsuplsettingsui/group/bld.inf"
+PRJ_EXPORTS
+// Query and Notification
+#include "../queryandnotification/group/bld.inf" 
 
-// Location Notation Preferences Settings UI
-#include "../locnotprefplugin/group/bld.inf"
 
-// Location Utils
-#include "../locutils/group/bld.inf"
-
-// Verifier
-#include "../locverifier/group/bld.inf"
-
-//GPS indicator
-#include "../locgpsindicatorplugin/group/bld.inf"
-
-// Positioning Settings Application
-#include "../locpossettingsapp/group/bld.inf"
-
-// Location BT Notifiers
-#include "../locbtnotifier/group/bld.inf"
-
-//Satellite Info
-#include "../locblidsatelliteinfo/group/bld.inf"
-
-// Query and Notification
-#include "../queryandnotification/group/bld.inf"
 PRJ_TESTMMPFILES
 //  End of File  
--- a/locationsystemui/locationsysui/install/locationsysui.pkg	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,78 +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: Package file for Location System Ui
-;
-;
-; Installation file for Location Centre Application, Client, Server and Utils
-;
-;Languages
-&EN
-;
-; UID is the app's UID
-;
-#{"Location System UI"},(0x10281861),1,0,0,TYPE=SA, RU
-;Series 60 v3.0
-[0x101f7961], 0, 0, 0, {"Series60ProductID"}
-;
-; Localised Vendor name
-%{"Nokia"}
-
-; Unique Vendor name
-:"Nokia"
-
-
-; Location System UI View
-"\epoc32\release\armv5\urel\locsysuiview.dll"               - "!:\sys\bin\locsysuiview.dll"
-"\epoc32\data\z\resource\plugins\locsysuiview.rsc"          - "!:\resource\plugins\locsysuiview.rsc"
-"\epoc32\data\z\resource\locsysuiviewrsc.rsc"               - "!:\resource\locsysuiviewrsc.rsc"
-"\epoc32\data\z\resource\apps\locsysuiview.mif"             - "!:\resource\apps\locsysuiview.mif"
-
-; Location System UI Engine
-"\epoc32\release\armv5\urel\locsysuiengine.dll"             - "!:\sys\bin\locsysuiengine.dll"
-
-; Positioning Settings UI
-"\epoc32\release\armv5\urel\locpsysettingsui.dll"           - "!:\sys\bin\locpsysettingsui.dll"
-"\epoc32\data\z\resource\plugins\locpsysettingsui.rsc"      - "!:\resource\plugins\locpsysettingsui.rsc"
-"\epoc32\data\z\resource\locpsysettingsuiview.rsc"          - "!:\resource\locpsysettingsuiview.rsc"
-"\epoc32\data\z\resource\apps\locpsysettings.mif"           - "!:\resource\apps\locpsysettings.mif"
-"\epoc32\release\armv5\urel\locpsysettingseng.dll"          - "!:\sys\bin\locpsysettingseng.dll"
-
-; SUPL settings UI
-"\epoc32\release\armv5\urel\locsuplsettings.dll"            - "!:\sys\bin\locsuplsettings.dll"
-"\epoc32\data\z\resource\plugins\locsuplsettings.rsc"       - "!:\resource\plugins\locsuplsettings.rsc"
-"\epoc32\data\z\resource\locsuplsettingsui.rsc"             - "!:\resource\locsuplsettingsui.rsc"
-
-; Notation preferences UI
-"\epoc32\release\armv5\urel\locnotprefplugin.dll"           - "!:\sys\bin\locnotprefplugin.dll"
-"\epoc32\data\z\resource\plugins\locnotprefplugin.rsc"      - "!:\resource\plugins\locnotprefplugin.rsc"
-"\epoc32\data\z\resource\locnotprefpluginview.rsc"          - "!:\resource\locnotprefpluginview.rsc"
-
-; Location Settings UI server
-"\epoc32\release\armv5\urel\locsettingsuiserver.exe"                - "!:\sys\bin\locsettingsuiserver.exe"
-"\epoc32\data\z\resource\apps\locsettingsuiserver_aif.mif"         	- "!:\resource\apps\locsettingsuiserver_aif.mif"
-"\epoc32\data\z\resource\apps\locsettingsuiserver.rsc"              - "!:\resource\apps\locsettingsuiserver.rsc"
-"\epoc32\data\Z\private\10003a3f\apps\locsettingsuiserver_reg.rsc"  - "!:\private\10003a3f\import\apps\locsettingsuiserver_reg.rsc"
-
-; Location Settings UI client
-"\epoc32\release\armv5\urel\locsettingsuiclient.dll"        - "!:\sys\bin\locsettingsuiclient.dll"
-
-; Verfier dialogs
-"\epoc32\release\armv5\urel\locnotifierwrapper.dll"         - "!:\sys\bin\locnotifierwrapper.dll"
-"\epoc32\data\z\resource\plugins\locnotifierwrapper.rsc"    - "!:\resource\plugins\locnotifierwrapper.rsc"
-
-"\epoc32\release\armv5\urel\locutils.dll"                   - "!:\sys\bin\locutils.dll"
-"\epoc32\data\z\resource\locutils.rsc"                      - "!:\resource\locutils.rsc"
-
-"\epoc32\release\armv5\urel\locverifierdlg.dll"             - "!:\sys\bin\locverifierdlg.dll"
-"\epoc32\data\z\resource\locverifierdlg.rsc"                - "!:\resource\locverifierdlg.rsc"
--- a/locationsystemui/locationsysui/install/locationsysuistub.pkg	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,83 +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: Package file for Location System Ui Stub
-;
-;
-; Installation file for Location Centre Application, Client, Server and Utils
-;
-;Languages
-&EN
-;
-; UID is the app's UID
-;
-#{"Location System UI"},(0x10281861),1,0,0,TYPE=SA
-;
-; Localised Vendor name
-%{"Nokia"}
-
-; Unique Vendor name
-:"Nokia"
-
-;Supports Series 60 v 3.0
-;This line indicates that this installation is for the Series 60 platform v0.9
-;This line must appear _exactly_ as shown below in the sis file
-;If this line is missing or incorrect, the sis file will not be able
-;to be installed on Series 60 v3.0 platforms
-;(0x101F7961), 0, 0, 0, {"Series60ProductID"}
-;
-
-; Location System UI View
-""-"Z:\sys\bin\locsysuiview.dll"
-""-"Z:\resource\locsysuiviewrsc.rsc"
-""-"Z:\resource\plugins\locsysuiview.rsc"
-""-"Z:\resource\apps\locsysuiview.mif"
-
-; Location System UI Engine
-""-"Z:\sys\bin\locsysuiengine.dll"
-
-; Positioning Settings UI
-""-"Z:\sys\bin\locpsysettingsui.dll"
-""-"Z:\resource\locpsysettingsuiview.rsc"
-""-"Z:\resource\plugins\locpsysettingsui.rsc"
-""-"Z:\resource\apps\locpsysettings.mif"
-""-"Z:\sys\bin\locpsysettingseng.dll"
-
-; SUPL settings UI
-""-"Z:\sys\bin\locsuplsettings.dll"
-""-"Z:\resource\locsuplsettingsui.rsc"
-""-"Z:\resource\plugins\locsuplsettings.rsc"
-
-; Notation preferences UI
-""-"Z:\sys\bin\locnotprefplugin.dll"
-""-"Z:\resource\locnotprefpluginview.rsc"
-""-"Z:\resource\plugins\locnotprefplugin.rsc"
-
-; Location Settings UI server
-""-"Z:\sys\bin\locsettingsuiserver.exe"
-""-"Z:\resource\apps\locsettingsuiserver_aif.mif"
-""-"Z:\resource\apps\locsettingsuiserver.rsc"
-""-"Z:\private\10003a3f\import\apps\locsettingsuiserver_reg.rsc"
-
-; Location Settings UI client
-""-"Z:\sys\bin\locsettingsuiclient.dll"
-
-; Verfier dialogs
-""-"Z:\sys\bin\locnotifierwrapper.dll"
-""-"Z:\resource\plugins\locnotifierwrapper.rsc"
-
-""-"Z:\sys\bin\locutils.dll"
-""-"Z:\resource\locutils.rsc"
-
-""-"Z:\sys\bin\locverifierdlg.dll"
-""-"Z:\resource\locverifierdlg.rsc"
--- a/locationsystemui/locationsysui/loc/Satellite.loc	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,209 +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:  Logical Strings definition for BLID Satellite Info
-*
-*/
-
-
-#include <bldvariant.hrh>
-
-/**
- *  Default (implementation English) Resource localisation file.
- */
-
-// LOCALISATION STRINGS
-
-//d:Heading pane for satellite 
-//d:data pop-up window
-//l:heading_pane_t1
-//
-#define qtn_blid_note_sat_heading		"Satellite signals:"
-
-//d:Text to be displayed in satellite info list box
-//d:when satellite data is unavailable
-//l:main_list_empty_pane/opt1
-//w:
-//r:3.0
-//
-#define qtn_blid_note_no_satellite_data		"No satellite data available"
-
-//d:Text when GPS is not connected
-//l:popup_note_window
-//w:
-//r:3.0
-//
-#define qtn_blid_note_no_gps		"Connect GPS"
-
-//d:Text for satellite id for both
-//d:signal strength and graphical views
-//l:compass_pane_t4/opt2
-//w:
-//r:3.2
-//
-#define qtn_blid_satellite_id		"%N"
-
-//d:Command text to change view in the satellite dialog
-//l:control_pane_t1/opt7
-//w:
-//r:3.2
-//
-#define qtn_blid_sat_change_view	"Change"
-
-//d:Point of the Navigation
-//d:character(North)
-//l:compass_pane_t4/opt2
-//r: 3.2
-//
-#define qtn_blid_sat_symbol_north				"N"
-
-//d:Point of the Navigation
-//d:character(South)
-//l:compass_pane_t4/opt2
-//r: 3.2
-//
-#define qtn_blid_sat_symbol_south				"S"
-
-//d:Point of the Navigation
-//d:character(West)
-//l:compass_pane_t4/opt2
-//r: 3.2
-//
-#define qtn_blid_sat_symbol_west				"W"
-
-//d:Point of the Navigation
-//d:character(East)
-//l:compass_pane_t4/opt2
-//r: 3.2
-//
-#define qtn_blid_sat_symbol_east				"E"
-
-
-//d:Heading pane for satellite signal strength view
-//d:data pop-up window
-//l:heading_pane_t1
-//r: 3.2
-//
-#define qtn_blid_sat_heading_signals		"Signal strengths:"
-
-//d:Heading pane for satellite graphical view
-//d:data pop-up window
-//l:heading_pane_t1
-//r: 3.2
-//
-#define qtn_blid_sat_heading_graphic		"Satellite display:"
-
-//d:Heading pane for compass view
-//d:data pop-up window
-//l:heading_pane_t1
-//r: 3.2
-//
-#define qtn_blid_sat_heading_compass		"Compass view:"
-
-//d:Point of the Compass
-//d:character(West)
-//l:blid_firmament_pane_t1/opt1
-//r: 3.2
-//
-#define qtn_blid_sat_compass_west				"W"
-
-//d:Point of the Compass
-//d:character(East)
-//l:blid_firmament_pane_t2/opt1
-//r: 3.2
-//
-#define qtn_blid_sat_compass_east				"E"
-
-//d:Point of the Compass
-//d:character(North)
-//l:blid_firmament_pane_t3/opt1
-//r: 3.2
-//
-#define qtn_blid_sat_compass_north			"N"
-
-//d:Point of the Compass
-//d:character(South)
-//l:blid_firmament_pane_t4/opt1
-//r: 3.2
-//
-#define qtn_blid_sat_compass_south			"S"
-
-//d:Altitude String in Compass View
-//d:data pop-up window
-//l:popup_blid_sat_info2_window_t5
-//r: 3.2
-//
-#define qtn_blid_sat_compass_altitude		"Altitude:"
-
-//d:Speed String in Compass View
-//d:data pop-up window
-//l:popup_blid_sat_info2_window_t7
-//r: 3.2
-//
-#define qtn_blid_sat_compass_speed			"Speed:"
-
-//d:Direction String in Compass View
-//d:data pop-up window
-//l:popup_blid_sat_info2_window_t9
-//r: 3.2
-//
-#define qtn_blid_sat_compass_direction	"Direction:"
-
-//d:Metric Format for Speed in Compass View
-//d:Format(Metric)
-//l:popup_blid_sat_info2_window_t8
-//r: 3.2
-//
-#define qtn_blid_sat_compass_speed_kmph				"%0U km/h"
-
-//d:Imperial Format for Speed in Compass View
-//d:Format(Imperial)
-//l:popup_blid_sat_info2_window_t8
-//r: 3.2
-//
-#define qtn_blid_sat_compass_speed_mph			"%0U mph"
-
-//d:Metric Format for length in Compass View
-//d:Format(Metric)
-//popup_blid_sat_info2_window_t6
-//r: 3.2
-//
-#define qtn_blid_sat_compass_altitude_meter				"%0N m"
-
-//d:Imperial Format for length in Compass View
-//d:Format(Imperial)
-//l:popup_blid_sat_info2_window_t6
-//r: 3.2
-//
-#define qtn_blid_sat_compass_altitude_feet			"%0N ft"
-
-//d:Degree Format in Compass View
-//d:Format(Degree)
-//l:popup_blid_sat_info2_window_t10
-//r: 3.2
-//
-#define qtn_blid_sat_degree							"%0N°"
-
-//d:Type of Fix in Compass View
-//d:2D String
-//l:popup_blid_sat_info2_window_t11
-//r: 3.2
-//
-#define qtn_blid_sat_compass_2d							"2D"
-
-//d:Type of Fix in Compass View
-//d:3D String
-//l:popup_blid_sat_info2_window_t11
-//r: 3.2
-//
-#define qtn_blid_sat_compass_3d							"3D"
--- a/locationsystemui/locationsysui/loc/location.loc	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,276 +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 Location subsystem.
-*     A .loc file is the one and only place where the logical strings
-*     to be localised are defined. 
-*  -------------------------------------------------------------------
-*
-*/
-
-
-/**
- *  Default (implementation English) Resource localisation file.
- */
-
-//  LOCALISATION STRINGS  
-
-//d:Location application name
-//d:in the App Shell grid
-//l: cell_app_pane_t1
-//r:3.0
-//
-#define qtn_location_grid          		"Location"
-
-//d:Location application name
-//d:in the App Shell list
-//l: list_single_large_graphic_pane_t1
-//r:3.0
-//
-#define qtn_location_list          		"Location"
-
-//d:Title pane text for application's
-//d:positioning methods view
-//l:title_pane_t2/opt9
-//r:3.0
-//
-#define qtn_loc_psy_title 			"Positioning Methods"
-
-//d:Indicates empty positioning methods list
-//l:main_list_empty_pane
-//r:3.0
-//
-#define qtn_loc_no_psys 			"(No methods available for positioning)"
-
-//d:Options menu item for enabling a Positioning method
-//l:list_single_pane_t1_cp2
-//r:3.0
-//
-#define qtn_loc_opt_enable_psy 		"Enable"
-
-
-//d:Options menu item for for disabling a Positioning method
-//l:list_single_pane_t1_cp2
-//r:3.0
-//
-#define qtn_loc_opt_disable_psy 		"Disable"
-
-
-//d:Options menu item to configure a Positioning method
-//l:list_single_pane_t1_cp2
-//r:3.0
-//
-#define qtn_loc_opt_method_settings 		"Method settings"
-
-//d:Heading text of a location request
-//d:in a list query
-//l:heading_pane_t1
-//r:3.0
-//
-#define qtn_loc_request             		"Location request:"
-
-//d:Left softkey for accepting a
-//d:location request
-//l:control_pane_t1/opt7
-//r:3.0
-//
-#define qtn_loc_request_accept      		"Accept"
-
-//d:Right softkey for rejecting a
-//d:location request
-//l:control_pane_t1/opt7
-//r:3.0
-//
-#define qtn_loc_request_reject      		"Reject"
-
-//d:Unknown requester in list query dialog
-//l:list_single_pane_t1_cp2
-//r:3.0
-//
-#define qtn_loc_requester_unknown       	"Unknown requester"
-
-//d:Error text shown when request was rejected due to
-//d:a conflict despite of user's "accept" decision.
-//l:popup_note_window
-//r:3.0
-//
-#define qtn_loc_notification_failure_rejected      	 "Unable to accept the request"
-
-//d:Error text shown when request was accepted due to
-//d:a conflict despite of user's "reject" decision.
-//l:popup_note_window
-//r:3.0
-//
-#define qtn_loc_notification_failure_accepted       "Unable to reject the request"
-
-//d:Heading text for location notification
-//l:heading_pane_t1
-//r:3.0
-//
-#define qtn_loc_notification            		"Location notification:"
-
-//d:Location notification explanation text
-//l: loc_type_pane
-//r:3.0
-//
-#define qtn_loc_notification_accepted       	"The network sent your location to:"
-
-//d:Location request explanation text if
-//d:the default network policy is accept
-//l:loc_type_pane
-//r:3.0
-//
-#define qtn_loc_request_default_accept  	"By default the network will accept this request on your behalf. Requesters:"
-
-//d:Location request explanation text if
-//d:the default network policy is reject
-//l:loc_type_pane
-//r:3.0
-//
-#define qtn_loc_request_default_reject      	"By default the network will reject this request on your behalf. Requesters:"
-
-//d:Location request explanation text if
-//d:the default network policy is not specified
-//l:loc_type_pane
-//r:3.0
-//
-#define qtn_loc_request_default_none        	"Your location was requested by:"
-
-//d:Notification explanation text when network
-//d:made "accept" decision due to timeout
-//l:loc_type_pane
-//r:3.0
-//
-#define qtn_loc_notification_accepted_timeout       "The network accepted this request on your behalf. Your location was sent to:"
-
-//d:Notification explanation text when network
-//d:made "reject" decision due to timeout
-//l:loc_type_pane
-//r:3.0
-//
-#define qtn_loc_notification_rejected_timeout       "The network rejected this request. Your location was not sent to:"
-
-//d:Title for the Location System UI Plugin
-//d:Long string
-//l:title_pane_t2/opt9
-//r:3.1
-//
-#define qtn_loc_pos_settings_title		"Positioning settings"
-
-//d:Caption for the Location System UI Plugin
-//d:Long string
-//l:list_single_large_graphic_pane_t1 
-//r:3.1
-//
-#define qtn_set_folder_positioning		"Positioning"
-
-//d:Caption for Positioning Method Settings
-//d:List box text in Location System UI plugin view.
-//l:list_setting_pane_t1
-//r:3.1
-//
-#define qtn_loc_settings_psys 		"Positioning Methods"
-
-//d:Prompt text for warning the User when he tries to disable
-//d:a PSY that is currently being used
-//l:popup_note_window
-//r:3.2
-//
-#define qtn_loc_query_psy_used "Positioning method is being used. Disable anyway?"
-
-// d:Postioning Settings Application Name
-// d:List box text for Positioning Settings Application used in Location Centre
-// l:list_single_large_graphic_pane_t1_cp2
-// r:5.0
-//
-#define qtn_loc_app_settings      "Positioning settings"
-
-// d: Heading pane text for stylus activated popup.
-// l: heading_sub_pane_t1
-// w:
-// r:5.0
-//
-#define qtn_loc_stylus_title_gps    "GPS"
-
-// d: Single line GPS status text shown on the stylus popup.
-// l: list_single_touch_info_pane_t1
-// w:
-// r:5.0
-//
-#define qtn_loc_stylus_gps_info           "GPS is active"
-
-// d: Link text shown on the stylus popup
-// l: list_single_touch_info_pane_t2/opt1
-// w:
-// r:5.0
-//
-#define qtn_loc_stylus_gps_link          "More Info"
-
-// d: Multiline text, when the link is clicked, shown as info note.
-// l: list_single_touch_info_pane_t1
-// w:
-// r:5.0
-//
-#define qtn_loc_stylus_gps_details       "GPS is a satellite based positioning system, which works best outdoors and away closed areas."
-
-// d: Verification text in popup quesry for the periodic request
-// l: loc_type_pane
-// w:
-// r:9.2b
-//
-#define qtn_loc_request_default          	"Your location will be requested periodically. Do you want to allow?"
-
-// d: Verification text in message quesry for the periodic request - time interval in minutes
-// l: popup_info_list_pane_t1
-// w:
-// r:9.2b
-//
-#define qtn_loc_notification_minutes         	"Your location was sent to %0U. This activity will continue for next %1U minutes"
-
-// d: Verification text in message quesry for the periodic request - time interval in hours
-// l: popup_info_list_pane_t1
-// w:
-// r:9.2b
-//
-#define qtn_loc_notification_hours         	"Your location was sent to %0U. This activity will continue for next %1U hours"
-
-// d: Verification text in message quesry for the periodic request - time interval in hour
-// l: popup_info_list_pane_t1
-// w:
-// r:9.2b
-//
-#define qtn_loc_notification_onehour        	"Your location was sent to %U. This activity will continue for next 1 hour"
-
-// d: Verification text in message quesry for the periodic request - time interval in days
-// l: popup_info_list_pane_t1
-// w:
-// r:9.2b
-//
-#define qtn_loc_notification_days          	"Your location was sent to %0U. This activity will continue for next %1U days"
-
-// d: Verification text in message quesry for the periodic request - time interval in day
-// l: popup_info_list_pane_t1
-// w:
-// r:9.2b
-//
-#define qtn_loc_notification_oneday        	"Your location was sent to %U. This activity will continue for next 1 day"
-
-// d: Link text shown on the message query for viewing the request/Session details
-// l: popup_info_list_pane_t1
-// w:
-// r:9.2b
-//
-#define qtn_loc_notification_service_link     	"Service details"
-
-// End of file
--- a/locationsystemui/locationsysui/loc/locbtnotifier.loc	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,63 +0,0 @@
-/*
-* Copyright (c) 2008 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:  Localization strings for project locbtnotifier
-*
-*/
-
-
-// Localization Strings for Bluetooth Notifiers
-
-//d: GPS antenna connected dialog text
-//l: popup_note_window
-//w: 
-//r: 5.1
-//
-#define qtn_loc_psy_ext_antenna_connected "GPS antenna connected"
-
-//d: GPS antenna disconnected dialog text
-//l: popup_note_window
-//w: 
-//r: 5.1
-//
-#define qtn_loc_psy_ext_antenna_disconnected "GPS antenna disconnected"
-
-//d: GPS charger connected dialog text
-//l: popup_note_window
-//w: 
-//r: 5.1
-//
-#define qtn_loc_psy_ext_power_connected "GPS charger connected"
-
-//d: GPS charger disconnected dialog text
-//l: popup_note_window
-//w: 
-//r: 5.1
-//
-#define qtn_loc_psy_ext_power_disconnected "GPS charger disconnected"
-
-//d: GPS battery low dialog text
-//l: popup_note_window
-//w: 
-//r: 5.1
-//
-#define qtn_loc_psy_battery_low "GPS battery low"
-
-//d: GPS battery full dialog text
-//l: popup_note_window
-//w: 
-//r: 5.1
-//
-#define qtn_loc_psy_battery_full "GPS battery full"
-
-// End of File
--- a/locationsystemui/locationsysui/loc/locnotprefsettings.loc	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,96 +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:  Localization file Location Notation Preferences Plugin
-*
-*/
-
-
-/**
- *  Default (implementation English) Resource localisation file.
- */
-
-//  LOCALISATION STRINGS  
-
-//d: Caption text for Location Notation preferences settings
-//d: List box text in Location System UI plugin view.
-//l: list_setting_pane_t1
-//r: 3.2
-//
-#define qtn_loc_settings_notations "Notation preferences"
-
-//d: Title pane text for Location Notation preferences settings
-//l: title_pane_t2/opt9
-//r: 3.2
-//
-#define qtn_loc_title_notations "Notation preferences"
-
-//d: List box text for System of Measurements
-//d: Title text for Radio button settings page
-//l: list_setting_pane_t1
-//r: 3.2
-//
-#define qtn_loc_notation_measures "System of measures"
-
-//d: List box text for Co-ordinate display format
-//d: Title text for Radio button settings page
-//l: list_setting_pane_t1
-//r: 3.2
-//
-#define qtn_loc_notation_coordinate_format "Coordinate format"
-
-//d: Settings value for System of measures
-//d: Indicates usage of Metric system of measurement for all location applications
-//l: list_set_graphic_pane_t1
-//r: 3.2
-//
-#define qtn_loc_metric_system "Metric"
-
-//d: Settings value for System of measures
-//d: Indicates usage of Imperial system of measurement for all location applications
-//l: list_set_graphic_pane_t1
-//r: 3.2
-//
-#define qtn_loc_imperial_system "Imperial"
-
-//d: Settings value for Co-ordinate display format
-//d: Indicates usage of Degrees, minutes, seconds and decimal seconds
-//d: Please note that the degree symbol °, minutes symbol' and 
-//d: seconds symbol " must NOT be localised. The dot can be localised.
-//d: Please note that the order of the characters must NOT be changed.
-//l: list_set_graphic_pane_t1
-//r: 3.2
-//
-#define qtn_loc_format_decimal_seconds "DDD° MM' SS.SS\""
-
-//d: Settings value for Co-ordinate display format
-//d: Indicates usage of Degrees, minutes and decimal minutes
-//d: Please note that the degree symbol ° and minutes symbol'must NOT be localised. 
-//d: The dot can be localised.
-//d: Please note that the order of the characters must NOT be changed.
-//l: list_set_graphic_pane_t1
-//r: 3.2
-//
-#define qtn_loc_format_decimal_minutes "DDD° MM.MMMM'"
-
-//d: Settings value for Co-ordinate display format
-//d: Indicates usage of Degrees and decimal degrees
-//d: Please note that the degree symbol ° must NOT be localised. 
-//d: The dot can be localised.
-//d: Please note that the order of the characters must NOT be changed.
-//l: list_set_graphic_pane_t1
-//r: 3.2
-//
-#define qtn_loc_format_decimal_degrees "DDD.DDDDD°"
-
-// End of file
--- a/locationsystemui/locationsysui/loc/locsuplsettings.loc	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,383 +0,0 @@
-/*
-* Copyright (c) 2005-2008 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:  Localization strings for Location SUPL Settings
-*
-*/
-
-
-/**
- *  Default (implementation English) Resource localisation file.
- */
-
-//  LOCALISATION STRINGS  
-
-//d: Caption text for SUPL settings
-//d: List box text in Location System UI plugin view.
-//l: list_setting_pane_t1
-//r: 3.1
-//
-#define qtn_loc_settings_supl 				"Positioning server"
-
-//d: Title pane text for application's
-//d: supl settings view
-//l: title_pane_t2/opt9
-//r: 3.1
-//
-#define qtn_loc_supl_title  				"Positioning server"
-
-//d: Prompt text for configuring SUPL settings
-//d: in a confirmation query
-//l: popup_note_window
-//r: 3.2
-//
-#define qtn_loc_supl_iap_query "Network positioning server requires an access point. Define now?"
-
-//d: Settings Item for SUPL usage
-//d: This value denotes that SUPL would be used automatically and the User would not be prompted
-//d: with any confirmation queries.
-//l: list_set_graphic_pane_t1
-//r: 3.2
-//
-#define qtn_loc_supl_automatic 				"Automatic"
-
-//d: Settings Item for SUPL usage
-//d: This value denotes that SUPL would be used automatically when the user is in his
-//d: home network. When the user is roaming he would be prompted with a query for using SUPL.
-//l: list_set_graphic_pane_t1
-//r: 3.2
-//
-#define qtn_loc_supl_home_automatic 			"Automatic in home network"
-
-//d: Settings Item for SUPL usage
-//d: This value denotes that the user would always be prompted before using SUPL.
-//l: list_set_graphic_pane_t1
-//r: 3.2
-//
-#define qtn_loc_supl_ask 				"Always ask"
-
-//d: Settings Item for SUPL usage
-//d: This value denotes that SUPL would not be used at all.
-//l: list_set_graphic_pane_t1
-//r: 3.2
-//
-#define qtn_loc_supl_disabled 				"Disabled"
-
-//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.
-//d: This string is defined as a part of Networking UI Specification.
-//l: popup_note_window
-//r: 5.0
-//
-#define qtn_netw_info_no_iap_defined 			"No access points defined. Define one via Connection settings."
-
-// ----------------------
-// Since S60 9.1TB
-// ----------------------
-
-//d: List item in the server view 
-//l: list_setting_pane_t1
-//r: 9.1tb
-//
-#define qtn_loc_supl_server_use	             "Positioning server use"
-
-//d: Title text in the main setting pane
-//d: Used in the radio button selection dialog
-//l: main_pane_set_t1
-//r: 9.1tb
-//
-#define qtn_loc_supl_lbl_server_use         "Positioning server use"
-
-//d: List item in the server view
-//l: list_setting_pane_t1
-//r: 9.1tb
-//
-#define qtn_loc_supl_server_detail			"Server detail"
-
-//d: Item in the options menu to open the server detail view
-//l: list_single_pane_t1_cp2
-//r: 9.1tb
-//
-#define qtn_loc_supl_options_open			"Open"
-
-//d: Title text for server detail
-//l: title_pane_t2/opt9
-//r: 9.1tb
-//
-#define qtn_loc_server_detail_title			"Server detail"
-
-//d: Item in the options menu to enable a server
-//l: list_single_pane_t1_cp2
-//r: 9.1tb
-//
-#define qtn_loc_detail_options_enable			"Enable"
-
-//d: Item in the options menu to disable a server
-//l: list_single_pane_t1_cp2
-//r: 9.1tb
-//
-#define qtn_loc_detail_options_disable			"Disable"
-
-//d: Item in the options menu to delete a server
-//l: list_single_pane_t1_cp2
-//r: 9.1tb
-//
-#define qtn_loc_detail_options_delete			"Delete"
-
-//d: Item in the options menu to create a new server
-//l: list_single_pane_t1_cp2
-//r: 9.1tb
-//
-#define qtn_loc_detail_options_newserver 		"New server"
-
-//d: Item in the options menu to prioritize the server addresses
-//l: list_single_pane_t1_cp2
-//r: 9.1tb
-//
-#define qtn_loc_detail_options_prioritize 		"Prioritize"
-
-//d: Confirmation query  is displayed to the user before deleting the selected servers from the list
-//l: popup_note_window/opt1
-//r: 9.1tb
-//
-#define qtn_loc_detail_conf_delete_servers		"Delete %N servers"
-
-//d: Server editor form field heading for server address
-//l: list_double_pane_t1
-//r: 9.1tb
-//
-#define qtn_loc_server_address_name			"Server address*"
-
-//d: Server editor form field heading for access point
-//l: list_double_pane_t1
-//r: 9.1tb
-//
-#define qtn_loc_server_iap				"Access point"
-
-//d: Server editor form field heading for usage in home network
-//l: list_double_pane_t1
-//r: 9.1tb
-//
-#define qtn_loc_server_usage				"Usage in home network only"
-
-//d: Value in the "usage in home network" form field
-//l: list_double_pane_t2
-//r: 9.1tb
-//
-#define qtn_loc_server_usage_yes			"Yes"
-
-//d: Value in the "usage in home network" form field
-//l: list_double_pane_t2
-//r: 9.1tb
-//
-#define qtn_loc_server_usage_no				"No"
-
-//d: Item in the options menu to edit  the server
-//l: list_single_pane_t1_cp2
-//r: 9.1tb
-//
-#define qtn_loc_server_options_edit			"Edit"
-
-//d: Confirmation query  is displayed to the user before deleting the server
-//l: popup_note_window/opt1
-//r: 9.1tb
-//
-#define qtn_loc_detail_conf_delete_server		"Delete server"
-
-//d: Title text for server editor
-//l: title_pane_t2/opt9
-//r: 9.1tb
-//
-#define qtn_loc_server_editor_title			"New server"
-
-//d: Item in the options menu to change the setting of the focussed item
-//l: list_single_pane_t1_cp2
-//r: 9.1tb
-//
-#define qtn_loc_server_options_change			"Change"
-
-//d: Item in the options menu to define the Access Point . Only visible whene the focus is on the Access point
-//l: list_single_pane_t1_cp2
-//r: 9.1tb
-//
-#define qtn_loc_server_options_define			"Define"
-
-//d: MSK in the server editor to define the Access Point
-//l: control_pane_t3/opt7
-//r: 9.1tb
-//
-#define qtn_msk_define					"Define"
-
-//d: Value in the "Access point" form field
-//l: list_double_pane_t2
-//r: 9.1tb
-//
-#define qtn_loc_server_none				"None"
-
-//d: If the user presses the SK2 “Done” without the value in the mandatory field, this information note is displayed
-//l: popup_note_window/opt2
-//r: 9.1tb
-//
-#define qtn_loc_server_info_note			"Enter the server address"
-
-//d: If the user presses the SK2 “Done” with server address which is already exists, this information note is displayed to rename the server address
-//l: popup_note_window/opt2
-//r: 9.1tb
-//
-#define qtn_loc_server_rename_info_note		"Server address already exists. Please enter new server address"
-
-//d: List item in the server view for displaying number of services
-//l: list_setting_pane_t1
-//r: 9.2tb
-//
-#define qtn_loc_supl_multiple_services			"%N Active services"
-
-//d: List item in the server view for displaying 1 active services
-//l: list_setting_pane_t1
-//r: 9.2tb
-//
-#define qtn_loc_supl_single_service			"1 Active service"
-
-//d: List item in the server view for displaying no services
-//l: list_setting_pane_t1
-//r: 9.2tb
-//
-#define qtn_loc_supl_no_service				"No active services"
-
-//d: Title text for Active Services View
-//l: title_pane_t2/opt9
-//r: 9.2tb
-//
-#define qtn_loc_supl_services_title			"Active services"
-
-//d: Text to diplay for the unknown requester in Services view.
-//l: list_single_graphic_pane_t1
-//r: 9.2tb
-//
-#define qtn_loc_supl_unknown_service			"Unknown requester"
-
-//d: Item in the options menu to clear active session
-//l: list_single_pane_t1_cp2
-//r: 9.2tb
-//
-#define qtn_loc_supl_options_terminate           	"Terminate service"
-
-//d: Item in the options menu to clear active sessions
-//l: list_single_pane_t1_cp2
-//r: 9.2tb
-//
-#define qtn_loc_supl_options_terminate_multiple   	"Terminate services"
-
-//d: Confirmation query is displayed to the user before deleting the sessions
-//l: popup_note_window/opt1
-//r: 9.2tb
-//
-#define qtn_loc_supl_query_terminate_all		"Terminate all active services ?"
-
-//d: Confirmation query is displayed to the user before deleting the session
-//l: popup_note_window/opt1
-//r: 9.2tb
-//
-#define qtn_loc_supl_query_terminate			"Terminate \n %U?"
-
-//d: Confirmation query is displayed to the user before deleting the sessions
-//l: popup_note_window/opt1
-//r: 9.2tb
-//
-#define qtn_loc_supl_query_terminate_multiple		"Terminate %N services?"
-
-//d: Title text for Unnamed Session
-//l: title_pane_t2/opt9
-//r: 9.2tb
-//
-#define qtn_loc_services_title_unknown			"Unknown requester"
-
-// d: Label for Notification Status in Session editor
-// l: list_double_pane_t1
-// r: 9.2tb 
-//
-#define qtn_loc_supl_trigger_dialog 			"Trigger notification dialog"
-
-//d: Trigger notification status item in the session view
-//l: list_double_pane_t2
-//r: 9.2tb
-//
-#define qtn_loc_supl_trigger_dialog_on			"On"
-
-//d: Trigger notification status item in the session view
-//l: list_double_pane_t2
-//r: 9.2tb
-//
-#define qtn_loc_supl_trigger_dialog_off			"Off"
-
-// d: Label for Session type in Session editor
-// l: list_double_pane_t1
-// r: 9.2tb 
-//
-#define qtn_loc_supl_trigger_type 			"Type"
-
-//d: Trigger type item in the session view
-//l: list_double_pane_t2
-//r: 9.2tb
-//
-#define qtn_loc_supl_peridic_trigger			"Periodic"
-
-// d: Label for Session's Outstanding triggers in Session editor
-// l: list_double_pane_t1
-// r: 9.2tb 
-//
-#define qtn_loc_supl_trigger_outstanding 		"Number of outstanding triggers"
-
-// d: Label for Session period in Session editor
-// l: list_double_pane_t1
-// r: 9.2tb 
-//
-#define qtn_loc_supl_trigger_time_period 		"Time period"
-
-//d: Item in the session view to display the time in minutes unit(singular)
-//l: list_double_pane_t2
-//r: 9.2tb
-//
-#define qtn_loc_supl_trigger_time_minutes		"%U minutes"
-
-//d: Item in the session view to display the time in hours unit(singular)
-//l: list_double_pane_t2
-//r: 9.2tb
-//
-#define qtn_loc_supl_trigger_time_onehour		"1 hour"
-
-//d: Item in the session view to display the time in hours unit(plural)
-//l: list_double_pane_t2
-//r: 9.2tb
-//
-#define qtn_loc_supl_trigger_time_hours			"%U hours"
-
-//d: Item in the session view to display the time in days unit(singular)
-//l: list_double_pane_t2
-//r: 9.2tb
-//
-#define qtn_loc_supl_trigger_time_oneday		"1 day"
-
-//d: Item in the session view to display the time in days unit(plural)
-//l: list_double_pane_t2
-//r: 9.2tb
-//
-#define qtn_loc_supl_trigger_time_days			"%U days"
-
-// d: Label for Session interval in Session editor
-// l: list_double_pane_t1
-// r: 9.2tb 
-//
-#define qtn_loc_supl_trigger_interval 			"Time interval"
-
-// End of file
--- a/locationsystemui/locationsysui/locblidsatelliteinfo/bwins/SatInfoStubu.def	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-EXPORTS
-	??1CSatelliteInfoUI@@UAE@XZ @ 1 NONAME ; CSatelliteInfoUI::~CSatelliteInfoUI(void)
-	?ExecuteLD@CSatelliteInfoUI@@QAEHABVTDesC16@@@Z @ 2 NONAME ; int CSatelliteInfoUI::ExecuteLD(class TDesC16 const &)
-	?HandleForegroundEventL@CSatelliteInfoUI@@QAEXH@Z @ 3 NONAME ; void CSatelliteInfoUI::HandleForegroundEventL(int)
-	?NewL@CSatelliteInfoUI@@SAPAV1@XZ @ 4 NONAME ; class CSatelliteInfoUI * CSatelliteInfoUI::NewL(void)
-	?SetLaunchView@CSatelliteInfoUI@@QAEXW4TSatelliteView@1@@Z @ 5 NONAME ; void CSatelliteInfoUI::SetLaunchView(enum CSatelliteInfoUI::TSatelliteView)
-
--- a/locationsystemui/locationsysui/locblidsatelliteinfo/bwins/SatInfou.def	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-EXPORTS
-	??1CSatelliteInfoUI@@UAE@XZ @ 1 NONAME ; CSatelliteInfoUI::~CSatelliteInfoUI(void)
-	?ExecuteLD@CSatelliteInfoUI@@QAEHABVTDesC16@@@Z @ 2 NONAME ; int CSatelliteInfoUI::ExecuteLD(class TDesC16 const &)
-	?HandleForegroundEventL@CSatelliteInfoUI@@QAEXH@Z @ 3 NONAME ; void CSatelliteInfoUI::HandleForegroundEventL(int)
-	?NewL@CSatelliteInfoUI@@SAPAV1@XZ @ 4 NONAME ; class CSatelliteInfoUI * CSatelliteInfoUI::NewL(void)
-	?SetLaunchView@CSatelliteInfoUI@@QAEXW4TSatelliteView@1@@Z @ 5 NONAME ; void CSatelliteInfoUI::SetLaunchView(enum CSatelliteInfoUI::TSatelliteView)
-
--- a/locationsystemui/locationsysui/locblidsatelliteinfo/data/SatInfo.rss	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,410 +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:  Contains all the resources for the SatelliteData.
-*
-*/
-
-
-//  RESOURCE IDENTIFIER
-NAME    SDSS // 4 letter ID
-
-//  INCLUDES
-#include <avkon.rh>
-#include <avkon.mbg>
-#include <avkon.rsg>
-#include <eikon.rh>
-#include <bldvariant.hrh>
-#include <avkon.loc>
-#include <sc/Satellite.loc>
-#include "satellite.hrh"
-
-//  RESOURCE DEFINITIONS 
-
-// ---------------------------------------------------------
-// Standard resource signature
-// ---------------------------------------------------------
-//
-RESOURCE RSS_SIGNATURE { }
-
-//----------------------------------------------------
-//   
-//    r_blid_note_sat_heading
-//    Satellite heading
-//
-//----------------------------------------------------
-//
-RESOURCE TBUF r_blid_note_sat_heading
-    {
-    buf = qtn_blid_note_sat_heading;
-    }
-
-//----------------------------------------------------
-//   
-//    r_satellite_wait_note
-//    Fetching satellite information note
-//
-//----------------------------------------------------
-//
-RESOURCE DIALOG r_satellite_wait_note
-	{	
-	flags = EAknWaitNoteFlags | EEikDialogFlagWait;
-    buttons = R_AVKON_SOFTKEYS_CANCEL;
-    items =
-        {
-        DLG_LINE
-            {
-            type = EAknCtNote;
-            id = EGeneralNote;
-            control= AVKON_NOTE 
-                { 
-                layout = EWaitLayout;
-                singular_label = qtn_gen_note_fetching;
-                animation = R_QGN_GRAF_WAIT_BAR_ANIM;
-                };
-            }
-        };
-	}
-
-//-------------------------------------------------------
-//   
-//    SATELLITEEMPTYSTRUCT
-//    Empty structure for r_satellite_dialog
-//
-//-------------------------------------------------------
-//
-STRUCT SATELLITEEMPTYSTRUCT
-	{
-	}
-	
-
-RESOURCE CBA r_satellite_dialog_cba
-	{ 
-	buttons = 
-		{ 
-		CBA_BUTTON 
-			{
-			id = ESatelliteChangeView; 
-			txt = qtn_blid_sat_change_view;
-			}, 
-		CBA_BUTTON 
-			{ 
-			id = EEikCommandTypeExitOrBack;
-			txt = text_softkey_close;
-			},
-		CBA_BUTTON 
-			{ 
-			id = ESatelliteChangeView; 
-			txt = qtn_blid_sat_change_view;
-			}
-		}; 
-	} 
-
-//----------------------------------------------------
-//   
-//    r_satellite_dialog
-//    Custom dialog to display satellite view
-//
-//----------------------------------------------------
-//
-RESOURCE DIALOG r_satellite_dialog
-  {
-  flags = EEikDialogFlagNoDrag | EEikDialogFlagButtonsRight | EEikDialogFlagNoTitleBar |
-		   EEikDialogFlagCbaButtons | EEikDialogFlagWait | 
-		   EEikDialogFlagFillScreen;
-  buttons = r_satellite_dialog_cba;
-  items =
-      {
-	  DLG_LINE
-	      {
-		  type = ESatelliteControl;
-		  id = ESatelliteControl;
-		  control = SATELLITEEMPTYSTRUCT;
-		  }
-      };
-  }
-
-
-//----------------------------------------------------
-//   
-//    r_connect_bluetooth_gps
-//    Satellite heading
-//
-//----------------------------------------------------
-//
-RESOURCE TBUF r_connect_bluetooth_gps
-    {
-    buf = qtn_connect_bluetooth_gps;
-    }
-
-//----------------------------------------------------
-//   
-//    r_blid_note_no_satellite_data
-//    Satellite heading
-//
-//----------------------------------------------------
-//
-RESOURCE TBUF r_blid_note_no_satellite_data
-    {
-    buf = qtn_blid_note_no_satellite_data;
-    }
-
-//----------------------------------------------------
-//   
-//    r_blid_note_no_gps
-//    Satellite heading
-//
-//----------------------------------------------------
-//
-RESOURCE TBUF r_blid_note_no_gps
-    {
-    buf = qtn_blid_note_no_gps;
-    }
-
-//----------------------------------------------------
-//   
-//    r_blid_satellite_id
-//    Satellite numbers in signal strength view
-//
-//----------------------------------------------------
-//
-RESOURCE TBUF r_blid_satellite_id
-    {
-    buf = qtn_blid_satellite_id;
-    }
-
-//----------------------------------------------------
-//   
-//    r_blid_sat_symbol_north
-//    Cardinal point N
-//
-//----------------------------------------------------
-//
-RESOURCE TBUF r_blid_sat_symbol_north
-    {
-    buf = qtn_blid_sat_symbol_north;
-    }
-
-//----------------------------------------------------
-//   
-//    r_blid_sat_symbol_south
-//    Cardinal point S
-//
-//----------------------------------------------------
-//
-RESOURCE TBUF r_blid_sat_symbol_south
-    {
-    buf = qtn_blid_sat_symbol_south;
-    }
-
-//----------------------------------------------------
-//   
-//    r_blid_sat_symbol_west
-//    Cardinal point W
-//
-//----------------------------------------------------
-//
-RESOURCE TBUF r_blid_sat_symbol_west
-    {
-    buf = qtn_blid_sat_symbol_west;
-    }
-
-//----------------------------------------------------
-//   
-//    r_blid_sat_symbol_east
-//    Cardinal point E
-//
-//----------------------------------------------------
-//
-RESOURCE TBUF r_blid_sat_symbol_east
-    {
-    buf = qtn_blid_sat_symbol_east;
-    }
-
-//----------------------------------------------------
-//   
-//    r_blid_sat_heading_signals
-//    Heading pane for satellite signal strength view
-//
-//----------------------------------------------------
-//
-RESOURCE TBUF r_blid_sat_heading_signals
-    {
-    buf = qtn_blid_sat_heading_signals;
-    }
-    
-//----------------------------------------------------
-//   
-//    r_blid_sat_heading_graphic
-//    Heading pane text for satellite graphical view
-//
-//----------------------------------------------------
-//
-RESOURCE TBUF r_blid_sat_heading_graphic
-    {
-    buf = qtn_blid_sat_heading_graphic;
-    }
-
-//----------------------------------------------------  
-// r_blid_sat_heading_compass
-// Heading pane text for satellite graphical view
-//----------------------------------------------------
-//
-RESOURCE TBUF r_blid_sat_heading_compass
-    {
-    buf = qtn_blid_sat_heading_compass;
-    }
-
-//----------------------------------------------------
-//    r_blid_sat_compass_north
-//    Cardinal point N
-//----------------------------------------------------
-//
-RESOURCE TBUF r_blid_sat_compass_north
-    {
-    buf = qtn_blid_sat_compass_north;
-    }
-
-//----------------------------------------------------
-//    r_blid_sat_compass_south
-//    Cardinal point S
-//----------------------------------------------------
-//
-RESOURCE TBUF r_blid_sat_compass_south
-    {
-    buf = qtn_blid_sat_compass_south;
-    }
-
-//----------------------------------------------------
-//    r_blid_sat_compass_west
-//    Cardinal point W
-//----------------------------------------------------
-//
-RESOURCE TBUF r_blid_sat_compass_west
-    {
-    buf = qtn_blid_sat_compass_west;
-    }
-
-//----------------------------------------------------
-//    r_blid_sat_compass_east
-//    Cardinal point E
-//----------------------------------------------------
-//
-RESOURCE TBUF r_blid_sat_compass_east
-    {
-    buf = qtn_blid_sat_compass_east;
-    }
-
-//----------------------------------------------------  
-// r_blid_sat_compass_altitude
-// Altitude String
-//----------------------------------------------------
-//
-RESOURCE TBUF r_blid_sat_compass_altitude
-    {
-    buf = qtn_blid_sat_compass_altitude;
-    }
-
-//----------------------------------------------------  
-// r_blid_sat_compass_speed
-// Speed String
-//----------------------------------------------------
-//
-RESOURCE TBUF r_blid_sat_compass_speed
-    {
-    buf = qtn_blid_sat_compass_speed;
-    }
-
-//----------------------------------------------------  
-// r_blid_sat_compass_direction
-// Direction String
-//----------------------------------------------------
-//
-RESOURCE TBUF r_blid_sat_compass_direction
-    {
-    buf = qtn_blid_sat_compass_direction;
-    }    
-
-//----------------------------------------------------  
-// r_blid_sat_metric_speed
-// Metric Speed Format String
-//----------------------------------------------------
-//
-RESOURCE TBUF r_blid_sat_metric_speed
-    {
-    buf = qtn_blid_sat_compass_speed_kmph;
-    } 
-
-//----------------------------------------------------  
-// r_blid_sat_imperial_speed
-// Imperial Speed Format String
-//----------------------------------------------------
-//
-RESOURCE TBUF r_blid_sat_imperial_speed
-    {
-    buf = qtn_blid_sat_compass_speed_mph;
-    } 
-
-//----------------------------------------------------  
-// r_blid_sat_metric_meter
-// Metric Meter Format String
-//----------------------------------------------------
-//
-RESOURCE TBUF r_blid_sat_metric_meter
-    {
-    buf = qtn_blid_sat_compass_altitude_meter;
-    } 
-
-//----------------------------------------------------  
-// r_blid_sat_imperial_foot
-// Imperial Foot Format String
-//----------------------------------------------------
-//
-RESOURCE TBUF r_blid_sat_imperial_foot
-    {
-    buf = qtn_blid_sat_compass_altitude_feet;
-    } 
-
-//----------------------------------------------------  
-// r_blid_sat_degree
-// Degree Format String
-//----------------------------------------------------
-//
-RESOURCE TBUF r_blid_sat_degree
-    {
-    buf = qtn_blid_sat_degree;
-    } 
-
-//----------------------------------------------------  
-// r_blid_sat_compass_2d
-// 2D Type of Fix
-//----------------------------------------------------
-//
-RESOURCE TBUF r_blid_sat_compass_2d
-    {
-    buf = qtn_blid_sat_compass_2d;
-    } 
-
-//----------------------------------------------------  
-// r_blid_sat_compass_3d
-// 3D Type of Fix
-//----------------------------------------------------
-//
-RESOURCE TBUF r_blid_sat_compass_3d
-    {
-    buf = qtn_blid_sat_compass_3d;
-    } 
-
-// End of File
-
-
--- a/locationsystemui/locationsysui/locblidsatelliteinfo/eabi/SatInfoStubu.def	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
-EXPORTS
-	_ZN16CSatelliteInfoUI22HandleForegroundEventLEi @ 1 NONAME
-	_ZN16CSatelliteInfoUI4NewLEv @ 2 NONAME
-	_ZN16CSatelliteInfoUI9ExecuteLDERK7TDesC16 @ 3 NONAME
-	_ZN16CSatelliteInfoUID0Ev @ 4 NONAME
-	_ZN16CSatelliteInfoUID1Ev @ 5 NONAME
-	_ZN16CSatelliteInfoUID2Ev @ 6 NONAME
-	_ZTI16CSatelliteInfoUI @ 7 NONAME ; #<TI>#
-	_ZTV16CSatelliteInfoUI @ 8 NONAME ; #<VT>#
-	_ZN16CSatelliteInfoUI13SetLaunchViewENS_14TSatelliteViewE @ 9 NONAME
-
--- a/locationsystemui/locationsysui/locblidsatelliteinfo/eabi/SatInfou.def	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +0,0 @@
-EXPORTS
-	_ZN16CSatelliteInfoUI22HandleForegroundEventLEi @ 1 NONAME
-	_ZN16CSatelliteInfoUI4NewLEv @ 2 NONAME
-	_ZN16CSatelliteInfoUI9ExecuteLDERK7TDesC16 @ 3 NONAME
-	_ZN16CSatelliteInfoUID0Ev @ 4 NONAME
-	_ZN16CSatelliteInfoUID1Ev @ 5 NONAME
-	_ZN16CSatelliteInfoUID2Ev @ 6 NONAME
-	_ZTI10CSatellite @ 7 NONAME ABSENT ; #<TI>#
-	_ZTI13CSatelliteEng @ 8 NONAME ABSENT ; #<TI>#
-	_ZTI16CSatelliteDialog @ 9 NONAME ABSENT ; #<TI>#
-	_ZTI16CSatelliteInfoUI @ 10 NONAME ; #<TI>#
-	_ZTI17CSatelliteLBModel @ 11 NONAME ABSENT ; #<TI>#
-	_ZTI17CSatelliteListBox @ 12 NONAME ABSENT ; #<TI>#
-	_ZTI20CSatelliteItemDrawer @ 13 NONAME ABSENT ; #<TI>#
-	_ZTV10CSatellite @ 14 NONAME ABSENT ; #<VT>#
-	_ZTV13CSatelliteEng @ 15 NONAME ABSENT ; #<VT>#
-	_ZTV16CSatelliteDialog @ 16 NONAME ABSENT ; #<VT>#
-	_ZTV16CSatelliteInfoUI @ 17 NONAME ; #<VT>#
-	_ZTV17CSatelliteLBModel @ 18 NONAME ABSENT ; #<VT>#
-	_ZTV17CSatelliteListBox @ 19 NONAME ABSENT ; #<VT>#
-	_ZTV20CSatelliteItemDrawer @ 20 NONAME ABSENT ; #<VT>#
-	_ZN16CSatelliteInfoUI13SetLaunchViewENS_14TSatelliteViewE @ 21 NONAME
-
--- a/locationsystemui/locationsysui/locblidsatelliteinfo/group/Satellite.mmp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,90 +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: Project definition file for BLID Satellite Info
-*
-*/
-
-
-
-// INCLUDES
-#include <platform_paths.hrh>
-#include "../inc/SatInfoUID.h"
-#include "data_caging_paths.hrh"
-
-VENDORID	VID_DEFAULT
-
-// Target information
-TARGET  SatInfo.dll
-TARGETTYPE  dll
-UID  KEPOCStaticDllUid2 KSatInfoUID3
-
-CAPABILITY CAP_GENERAL_DLL
-
-// Project source directory
-SOURCEPATH ../src
-
-// Source files
-SOURCE DllMain.cpp
-SOURCE Debug.cpp
-SOURCE CSatelliteInfoUI.cpp
-SOURCE CSatellite.cpp
-SOURCE satellitecontrol.cpp
-SOURCE CSatelliteDialog.cpp
-SOURCE CSatelliteEng.cpp
-SOURCE csatellitemeasurementsetting.cpp
-
-
-START RESOURCE ../data/SatInfo.rss
-HEADER
-TARGETPATH  RESOURCE_FILES_DIR
-LANGUAGE_IDS
-END
-
-// Userincludes
-USERINCLUDE . ../inc ../src 
-
-// Dependencies to system components
-MW_LAYER_SYSTEMINCLUDE
-SYSTEMINCLUDE   /epoc32/include/libc
-
-// Other build related files
-//DOCUMENT ../group/Satellite.loc
-
-LIBRARY EUSER.LIB
-LIBRARY LBS.LIB
-LIBRARY commonengine.lib
-LIBRARY eikcoctl.lib
-LIBRARY eikctl.lib
-LIBRARY cone.lib
-LIBRARY bafl.lib
-LIBRARY efsrv.lib 
-LIBRARY flogger.lib
-LIBRARY gdi.lib
-LIBRARY AknLayout2Scalable.lib
-LIBRARY CdlEngine.lib
-LIBRARY avkon.lib
-LIBRARY AknSkins.lib
-LIBRARY eikdlg.lib
-LIBRARY eikcore.lib
-LIBRARY AknIcon.lib
-LIBRARY fbscli.lib
-LIBRARY estlib.lib
-LIBRARY aknlayout2.lib
-LIBRARY platformenv.lib
-LIBRARY centralrepository.lib
-
-#ifdef RD_TACTILE_FEEDBACK
-LIBRARY touchfeedback.lib
-#endif //RD_TACTILE_FEEDBACK
-
--- a/locationsystemui/locationsysui/locblidsatelliteinfo/group/SatelliteStub.mmp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,61 +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: Project definition file for BLID Satellite Info
-*
-*/
-
-
-
-// INCLUDES
-#include <platform_paths.hrh>
-#include "../inc/SatInfoUID.h"
-#include "data_caging_paths.hrh"
-
-
-VENDORID	VID_DEFAULT
-
-// Target information
-TARGET  SatInfoStub.dll
-TARGETTYPE  dll
-UID  KEPOCStaticDllUid2 KSatInfoUID3
-
-CAPABILITY CAP_GENERAL_DLL
-
-// Project source directory
-SOURCEPATH ../stub
-
-// Source files
-SOURCE CSatelliteInfoUI.cpp
-
-SOURCEPATH ../group
-
-//HEADER
-TARGETPATH  RESOURCE_FILES_DIR
-//END
-
-// Language
-LANG            SC
-
-// Dependencies to system components
-MW_LAYER_SYSTEMINCLUDE
-
-LIBRARY EUSER.LIB
-LIBRARY commonengine.lib
-LIBRARY eikcoctl.lib avkon.lib
-LIBRARY cone.lib
-LIBRARY bafl.lib
-LIBRARY efsrv.lib 
-LIBRARY flogger.lib
-LIBRARY gdi.lib
-LIBRARY CdlEngine.lib
--- a/locationsystemui/locationsysui/locblidsatelliteinfo/group/bld.inf	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,36 +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: Build information file for BLID Satellite Info
-*
-*/
-
-#include <platform_paths.hrh>
-
-PRJ_PLATFORMS
-WINSCW ARMV5
-
-PRJ_EXPORTS
-
-PRJ_MMPFILES
-Satellite.mmp
-SatelliteStub.mmp
-
-PRJ_TESTMMPFILES
-
-PRJ_EXTENSIONS
-START EXTENSION s60/mifconv
-OPTION TARGETFILE satellite.mif
-OPTION HEADERFILE satellite.mbg
-OPTION SOURCES -c8,8 qgn_prop_blid_active -c8,8 qgn_prop_blid_bg -c8,8 qgn_prop_blid_inactive -c8,8 qgn_prop_blid_sat_firma -c8,8 qgn_prop_blid_sat_firma_active -c8,8 qgn_prop_blid_sat_firma_inact -c8,8 qgn_prop_blid_sat_firma_moon -c8,8 qgn_prop_blid_sat_firma_sun -c8,8 qgn_graf_blid -c8,8 qgn_graf_blid_ringfix
-END
--- a/locationsystemui/locationsysui/locblidsatelliteinfo/group/satellite_icons_dc.mk	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,63 +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: Icon make file for BLID Satellite Info
-#
-
-ifeq (WINS,$(findstring WINS, $(PLATFORM)))
-ZDIR=\epoc32\release\$(PLATFORM)\$(CFG)\Z
-else
-ZDIR=\epoc32\data\z
-endif
-
-TARGETDIR=$(ZDIR)\resource\apps
-HEADERDIR=\epoc32\include
-ICONTARGETFILENAME=$(TARGETDIR)\satellite.mif
-HEADERFILENAME=$(HEADERDIR)\satellite.mbg
-
-do_nothing :
-	@rem do_nothing
-
-MAKMAKE : do_nothing
-
-BLD : do_nothing
-
-CLEAN : do_nothing
-
-LIB : do_nothing
-
-CLEANLIB : do_nothing
-
-RESOURCE :
-	mifconv $(ICONTARGETFILENAME) /h$(HEADERFILENAME) \
-		/c8,8 qgn_prop_blid_active \
-		/c8,8 qgn_prop_blid_bg \
-		/c8,8 qgn_prop_blid_inactive \
-		/c8,8 qgn_prop_blid_sat_firma \
-		/c8,8 qgn_prop_blid_sat_firma_active \
-		/c8,8 qgn_prop_blid_sat_firma_inact \
-		/c8,8 qgn_prop_blid_sat_firma_moon \
-		/c8,8 qgn_prop_blid_sat_firma_sun \
-		/c8,8 qgn_graf_blid \
-		/c8,8 qgn_graf_blid_ringfix
-				
-FREEZE : do_nothing
-
-SAVESPACE : do_nothing
-
-RELEASABLES :
-	@echo $(HEADERFILENAME)&& \
-	@echo $(ICONTARGETFILENAME)
-
-FINAL : do_nothing
-
--- a/locationsystemui/locationsysui/locblidsatelliteinfo/inc/CSatellite.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,131 +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: 
-*     Implements interface for Satellite.
-*
-*/
-
-
-#ifndef __SATELLITE_H__
-#define __SATELLITE_H__
-
-//  INCLUDES
-#include <e32base.h>
-#include <eikenv.h>
-#include "MEngObserver.h"
-#include "SatInfoConsts.h"
-
-// FORWARD DECLARATION
-class MSatelliteEng;
-class CSatelliteDialog;
-class CAknWaitDialog;
-
-// CLASS DECLARATION
-/**
- *  Implements 
- */
-NONSHARABLE_CLASS( CSatellite ) : public CBase, public MEngObserver
-    {
-    public:
-        /**
-         * Two-phased constructor.
-         *
-         * @return CSatellite object.
-         */
-        static CSatellite* NewL();
-
-        /**
-         * Destructor.
-         */
-        ~CSatellite();
-
-    private:
-        /**
-         * By default Symbian 2nd phase constructor is private.
-         */
-        void ConstructL();
-
-        /**
-         * C++ default constructor.
-         */
-        CSatellite();
-
-    public: // from MEngObserver
-        void NotifyL(TInt aError);
-        void NotifyError( TInt aErrorCode );        
-
-    public: // new functions
-        /**
-         * Display satellite's information
-         * @param aNameOfRule
-         * @return TInt variable
-         */
-        TInt ExecuteL( const TDesC& aNameOfRule );
-
-        /**
-         * Dialog switched to foreground
-         * @param aForeground ETrue to switch to the foreground. 
-         * EFalse to switch from the foreground.
-         */
-        void HandleForegroundEventL(TBool aForeground);
-        
-        /**
-        * Function used to set the default launch view
-        * @param aView EGraphicalView if graphical view and ESignalStrengthView
-        * for signal strength view
-        */
-        void SetLaunchView(TSatDialogView aView);
-
-    private: // new functions
-        /**
-         * Open resource file
-         */
-        void OpenResourceFileL();
-
-        /**
-         * Close resource file
-         */
-        void CloseResourceFile();
-
-        /** 
-         * Find resource file
-         */
-        void FindResourceFileL();
-        
-    private:    // data
-        /// Own:
-        CEikonEnv* iEnv;
-
-        /// Own: Resource file name and path
-        TFileName iResourceFileName;
-
-        /// Own:
-        TInt iResourceOffset;
-
-        /// Own: 
-        MSatelliteEng* iEngine;
-
-        /// Own:
-        CSatelliteDialog* iDialog;
-
-        ///Own: A pointer to CAknWaitDialog
-		CAknWaitDialog* iWaitDialog;	
-		
-		///Own: Launch view of the dialog
-		TSatDialogView iLaunchView;	
-    };
-
-#endif // __SATELLITE_H__
-
-// End of File
--- a/locationsystemui/locationsysui/locblidsatelliteinfo/inc/CSatelliteDialog.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,111 +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: 
-*     Implements interface for SatelliteData.
-*
-*/
-
-
-#ifndef __SATELLITE_DIALOG_H__
-#define __SATELLITE_DIALOG_H__
-
-//  INCLUDES
-#include <AknDialog.h>
-#include <AknQueryDialog.h>
-#include <coecntrl.h>
-#include <e32base.h>
-#include <s32std.h>
-#include <aknlistquerydialog.h>
-#include <aknlists.h>
-#include "SatInfoConsts.h"
-
-// FORWARD DECLARATION
-class CEikonEnv;
-class CEikFormattedCellListBox;
-class MSatelliteEng;
-class CAknPopupList;
-class CEikListBox;
-class CAknListQueryDialog;
-class CSatelliteListBox;
-class CAknsFrameBackgroundControlContext;
-class CSatelliteControl;
-
-// CLASS DECLARATION
-/**
- *  Implements satellite's dialog
- */
-NONSHARABLE_CLASS( CSatelliteDialog ) : public CAknDialog
-    {
-    public:
-        /**
-         * Two-phased constructor.
-         *
-         * @return CSatelliteDialog object.
-         */
-        static CSatelliteDialog* NewL( MSatelliteEng& aEngine );
-
-        /**
-         * Destructor.
-         */
-        ~CSatelliteDialog();
-
-    private:
-        /**
-         * By default Symbian 2nd phase constructor is private.
-         */
-        void ConstructL( );
-
-        /**
-         * C++ default constructor.
-         */
-        CSatelliteDialog(MSatelliteEng& aEngine);
-        
-        void SetSizeAndPosition(const TSize& aSize);
-        
-    protected:
-    	SEikControlInfo CreateCustomControlL(TInt aControlType);	    
-	    TTypeUid::Ptr MopSupplyObject(TTypeUid aId);
-	    void SizeChanged();
-	    TBool OkToExitL(TInt aButtonId);
-
-    public: // from CAknDialog
-        TKeyResponse OfferKeyEventL( const TKeyEvent& aKeyEvent,
-                                     TEventCode aType);
-
-    public: // new functions
-        /**
-         * Update dialog
-         */
-        void UpdateL();
-        
-        /**
-        * Set the launch view of the dialog
-        */        
-        void SetLaunchView(TSatDialogView aView);
-        
-    private: // data
-    
-        //Reference to the engine
-        MSatelliteEng& iEngine;
-        
-        //Own: Object to draw the fame and its background
-        CAknsFrameBackgroundControlContext* iBgContext;
-        
-        //Own: Satellite control responsible for all the drawing in the dialog
-        CSatelliteControl* iSatelliteControl;        
-    };
-
-#endif // __SATELLITE_DIALOG_H__
-
-// End of File
--- a/locationsystemui/locationsysui/locblidsatelliteinfo/inc/CSatelliteEng.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,161 +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 is a header file for engine class of Location satellite info
-*
-*/
-
-
-#ifndef __SATELLITEENG_H__
-#define __SATELLITEENG_H__
-
-//  INCLUDES
-#include <e32base.h>
-#include <s32std.h>
-#include <lbs.h>
-#include <lbssatellite.h>
-#include "MSatelliteEng.h"
-#include "msatellitemeasurementsettingobserver.h"
-
-
-// FORWARD DECLARATION
-class CEikonEnv;
-class CSatelliteMeasurementSetting;
-// CLASS DECLARATION
-/**
- *
- */
-NONSHARABLE_CLASS( CSatelliteEng ) : public CActive, public MSatelliteEng,
-									public MSatelliteMeasurementSettingObserver
-    {
-    public:
-        /**
-         * Two-phased constructor.
-         *
-         * @return CSatelliteEng object.
-         */
-        static CSatelliteEng* NewL();
-
-        /**
-         * Destructor.
-         */
-        ~CSatelliteEng();
-
-    private:
-        /**
-         * By default Symbian 2nd phase constructor is private.
-         */
-        void ConstructL();
-
-        /**
-         * C++ default constructor.
-         */
-        CSatelliteEng();
-
-    public: // from CActive
-        void RunL();
-        void DoCancel();
-        TInt RunError(TInt aError);        
-
-    private: //from MSatelliteEng
-        void SetObserver(MEngObserver& aObserver);
-        void RequestSatelliteDataL( const TDesC& aNameOfRule );
-        TInt GetSatelliteData(TUint aIndex, 
-                              TSatelliteData& aSatelliteData) const;
-		
-		void GetPosition(TPosition& aPosition);
-        void GetCourse(TCourse& aCourse);
-        TLocSystemofMeasurementValues SysOfMeasurementL();
-        TInt NumberOfSatellitesUsed();
-        TInt NumberOfSatellites();
-        void StopRequesting();
-        void StartRequestingL();
-        void SortVisibleSatellitesDataL();
-        void UpdateIntervalL();
-        void ClearSatelliteData();
-        TBool IsSatelliteDataAvailable();
-        void ObjectElevationAzimuth(TInt aIndex, TReal& aAzimuth, TReal& aElevation );
-        void SortSatelliteDataL();
-        void GetSunAzimuthElevation(TReal& aAzimuth, TReal& aElevation );
-        void GetMoonAzimuthElevation(TReal& aAzimuth, TReal& aElevation );
-        void Julian(TReal& aJulianDay,
-        			TReal& aJulianCentury, 
-        			TInt aDay,
-        			TInt aMonth,
-        			TInt aYear,
-        			TReal universalTime);
-        void TrueLongToRaDeltadec(TReal& aRa,TReal& aDd,TReal aTrueLongitude);
-        TReal Kepler(TReal aE, TReal aM);
-        void LocationCoordinates(TReal& aAzimuth, 
-								 TReal& aElevation, 
-								 TReal aTau,
-								 TReal aDd, 
-								 TReal aLatitude);
-		TReal SideRealTime(TReal aJulianDay, 
-						   TReal aJulianCentury,
-						   TReal aLongitude,
-						   TReal aRa);		
-        
-    private: //from MSatelliteMeasurementSettingObserver
-		void HandleSysMeasureValueL();
-
-    private:    // data
-        /// Own: iServer
-        RPositionServer iServer;
-
-        /// Own: RPositioner
-        RPositioner iPositioner;
-
-        /// Own: TPositionSatelliteInfo
-        TPositionSatelliteInfo iSatelliteInfo;
-        
-        /// Own: CSatelliteMeasurementSetting
-        CSatelliteMeasurementSetting* iMeasurementSetting;
-        
-        /// Ref: Refrence to the observer for position notification
-        MEngObserver* iObserver;
-
-        /// Own: Start and stop requesting
-        TBool iRequesting;
-
-        /// Number of modules
-        TUint iNumberOfModules;
-
-        /// used modules index
-        TInt iModuleIndex;
-
-        /// used as an sorted index array to the satellite info data
-        TFixedArray<TUint8, KPositionMaxSatellitesInView> iSortIndices;
-        
-        // Own: Array to sort the satellite data in increasing order of 
-        // the signal strengths
-        RArray<TSatelliteData> iSortedSatData;
-        
-        // Keplers constant for sun and moon position calculations
-        struct TKeplers
-        	{
-        	struct params
-        		{
-        		TReal iA0;
-        		TReal iA1;
-        		};
-        	params iM;
-        	params iW;
-        	params iE;
-        	};
-        TKeplers iKeplers[2];
-    };
-
-#endif // __SATELLITEENG_H__
-
-// End of File
--- a/locationsystemui/locationsysui/locblidsatelliteinfo/inc/Debug.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,34 +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:  Debug contains debug macros.
-*
-*/
-
-
-#ifndef DEBUG_H
-#define DEBUG_H
-// INCLUDES
-#include <e32std.h>
-
-#ifdef _DEBUG
-// MACROS
-#define DEBUG(TEXT) Debug( _L(#TEXT) );
-#define DEBUG1(TEXT, ARG1) Debug( _L(#TEXT), (ARG1) );
-#define DEBUG2(TEXT, ARG1, ARG2) Debug( _L(#TEXT), (ARG1), (ARG2) );
-#define DEBUG3(TEXT, ARG1, ARG2, ARG3) Debug( _L(#TEXT), (ARG1), (ARG2), (ARG3) );
-
-void Debug( TRefByValue<const TDesC> aText, ...);
-#endif
-
-#endif /* DEBUG_H */
--- a/locationsystemui/locationsysui/locblidsatelliteinfo/inc/DllMain.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,45 +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:  Dll entry point
-*
-*/
-
-
-#ifndef __SATELLITE_DLLMAIN_H__
-#define __SATELLITE_DLLMAIN_H__
-
-//  INCLUDES
-#include <e32std.h>
-
-// DATA TYPES
-/// Satellite panic codes.
-enum TSatellitePanicCode
-    {
-    EModelTypeNotSupported= 0
-    };
-
-// FUNCTION PROTOTYPES
-/**
- * Stop the program execution with module specific text and error code.
- * Call if an unrecoverable error occurs in this module's code.
- *
- * @param aCode     error code
- *
- * @see TSatellitePanicCode
- */
-void SatellitePanic(TInt aCode);
-
-#endif // __SATELLITE_DLLMAIN_H__
-
-// End of File
--- a/locationsystemui/locationsysui/locblidsatelliteinfo/inc/MEngObserver.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,45 +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:  Provides an observer interface to satellite engine.
-*
-*/
-
-
-
-#ifndef __MENGOBSERVER_H__
-#define __MENGOBSERVER_H__
-
-// CLASS DECLARATIONS
-/**
-* Provides API only for SatInfo dll.
-*/
-class MEngObserver
-    {
-    public: // New functions
-        /**
-         * Notifies the engine observer about occured event.
-         * Engine observer has to update its data when this function is called.
-         */
-        virtual void NotifyL(TInt aError) = 0;
-
-        /**
-         * Called if occured event causes a leave in previous NotifyL method.
-         * @param aErrorCode Occured general errorcode.
-         */
-        virtual void NotifyError( TInt aErrorCode ) = 0;
-    };
-
-#endif      // __MENGOBSERVER_H__
-
-// End of File
--- a/locationsystemui/locationsysui/locblidsatelliteinfo/inc/MSatelliteEng.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,133 +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: Interface class for defining the engine.
-*
-*/
-
-
-
-#ifndef __MSATELLITEENG_H__
-#define __MSATELLITEENG_H__
-
-// INCLUDES
-#include <lbspositioninfo.h>
-#include <lbs.h>
-#include <locnotprefplugindomaincrkeys.h>
-
-// FORWARD DECLARATIONS
-class MEngObserver;
-class TSatelliteData;
-// CLASS DECLARATION
-
-/**
-* Interface class to implement all the functionality required 
-* by the satellite engine
-*/
-class MSatelliteEng
-    {
-    public:  // Constructors and destructor
-        /**
-         * Destructor.
-         */
-        virtual ~MSatelliteEng(){};
-
-    public: // New functions
-        /**
-         * Sets satellite observer
-		 *
-         * @param aObserver A reference to observer
-         */
-        virtual void SetObserver(MEngObserver& aObserver) = 0;
-
-        /**
-         * Request satelite data
-         * @param aSrvName
-         */
-        virtual void RequestSatelliteDataL( const TDesC& aSrvName ) = 0;
-
-        /**
-         * Get satellite data 
-         * @param aIndex
-         * @param aSatelliteData
-         * @return error code
-         */
-        virtual TInt GetSatelliteData( TUint aIndex, 
-                      TSatelliteData& aSatelliteData ) const = 0;
-
-        /**
-         * Get Position Info
-         * @param aPosition
-         */
-        virtual void GetPosition(TPosition& aPosition) = 0;
-        
-        /**
-         * Get Course Info
-         * @param aCourse
-         */
-        virtual void GetCourse(TCourse& aCourse) = 0;
-        
-        /**
-         * Get Course Info
-         * @param aCourse
-         */
-        virtual TLocSystemofMeasurementValues SysOfMeasurementL() = 0;
-
-        /**
-         * Get number of satellites
-         * @return number of satellites
-         */
-        virtual TInt NumberOfSatellites() = 0;
-
-        /**
-         * Get number of satellites used
-         * @return number of satellites used
-         */
-        virtual TInt NumberOfSatellitesUsed() = 0;
-
-        /**
-         * Stop requesting
-         */
-        virtual void StopRequesting() = 0;
-
-        /**
-         * Start requesting
-         */
-        virtual void StartRequestingL() = 0;
-        
-        /**
-         * Clears the satellite data
-         *
-         */
-        virtual void ClearSatelliteData() = 0;
-        
-        /**
-         * Check if any satelllite data is available
-         *
-         */
-        virtual TBool IsSatelliteDataAvailable() = 0;        
-        
-        /**
-         * Function to obtain the Azimuth and elevation of sun
-         */
-        virtual void GetSunAzimuthElevation(TReal& aAzimuth, TReal& aElevation ) = 0;
-        
-        /**
-         * Function to obtain the Azimuth and elevation of moon
-         */
-        virtual void GetMoonAzimuthElevation(TReal& aAzimuth, TReal& aElevation ) = 0;
-    };
-
-#endif      // __MSATELLITEENG_H__
-
-// End of File
--- a/locationsystemui/locationsysui/locblidsatelliteinfo/inc/SatInfoConsts.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,69 +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:  Contains common constants
-*
-*/
-
-
-#ifndef __SATELLITECONSTS_H__
-#define __SATELLITECONSTS_H__
-
-
-const TInt KSatInfoBufferSize( 50 );
-
-_LIT( KSatInfoRscFileName, "SatInfo.rsc" );
-//needed to get full screen dialog
-const TInt KInitialSatellites(5);
-
-const TInt KBlidMaxSatelliteSignalStrength( 40 );
-
-const TInt KBlidMinSatelliteSignalStrength( 5 );
-
-// Interval timeout to recive satellite data 
-const TInt KSatelliteIntervalTime( 3000000 ); //3 seconds
-
-const TInt KSatelliteTimeOut(4000000); // 4 seconds
-
-const TInt KRightAngle(90); // 90 degree right angle
-
-// trailing backslash has been added to it:
-_LIT( KSatTmp_RESOURCE_FILES_DIR, "\\resource\\" );
-
-const TInt KMaxSatellites(32);
-
-enum TSatDialogView
-	{
-	EGraphicalView,
-	ESignalStrengthView,
-	ECompassView
-	};
-
-// Path to find the mbm file
-_LIT( KBlidSatSystemIconPath, ":\\resource\\apps\\satellite.mif" );
-
-//distance converters
-const TReal KMetreToFoot( 3.280839895013123 );
-const TReal KKilometreToMiles( 0.6213711922373338 );
-
-//Speed Format
-_LIT( KSpeedFormat,"%.1f" );
-const TReal KSpeedConvertion( 3.6 ); // m/s => km/h
-const TInt KDecimals3( 3 );
-
-// Fix Type
-const TInt K2dFix( 3 );
-
-#endif // __SATELLITECONSTS_H__
-
-// End of File
--- a/locationsystemui/locationsysui/locblidsatelliteinfo/inc/SatInfoUID.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,35 +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:  Common header for Satellite info UIDs.
-*
-*/
-
-
-#ifndef __SATINFOUID_H__
-#define __SATINFOUID_H__
-
-//  MACROS
-
-/// Satellite info UI UID3
-#define KSatInfoUID3 0x101F85A1
-
-//
-// Common system UIDs
-//
-#define KEPOCStaticDllUid2 0x1000008D
-
-#endif // __SATINFOUID_H__
-
-// End of File
-
--- a/locationsystemui/locationsysui/locblidsatelliteinfo/inc/csatellitemeasurementsetting.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,115 +0,0 @@
-/*
-* Copyright (c) 2008 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:  Adapter for System of Measurement.
-*
-*/
-
-
-#ifndef CSATELLITEMEASUREMENTSETTING_H
-#define CSATELLITEMEASUREMENTSETTING_H
-
-//  System Includes
-#include <e32base.h>
-#include <locnotprefplugindomaincrkeys.h>
-
-// Forward Declarations
-class MSatelliteMeasurementSettingObserver;
-class CRepository;
-
-// Constant Declarations
-
-// Class Definition
-/**
- * Adapter for System of Measurement.
- */
-NONSHARABLE_CLASS( CSatelliteMeasurementSetting ) : public CActive
-	{
-	public:
-		/**
-     * Creates new System of Measurement Adapter
-     *
-     * @param  aAdapterObsrv             			Observer to the System of Measurement Adapter
- 		 * @return CSatelliteMeasurementSetting*	Pointer to the CSatelliteMeasurementSetting
-     */                                                 
-    static CSatelliteMeasurementSetting* NewL( 
-                        MSatelliteMeasurementSettingObserver&	aAdapterObsrv );
-
-
-		/**
-     * Creates new System of Measurement Adapter
-     * Leaves the object on the Clean up stack         
-     *
-     * @param  aAdapterObsrv			            Observer to the System of Measurement Adapter
- 		 * @return CSatelliteMeasurementSetting*	Pointer to the CSatelliteMeasurementSetting
-     */                                                 
-    static CSatelliteMeasurementSetting* NewLC( 
-                        MSatelliteMeasurementSettingObserver&	aAdapterObsrv );	
-
- 
-		/**
-		 * Destructor
-		 */
-		~CSatelliteMeasurementSetting ();
-
-		/**
-		 * Returns the current value of the System of measurements settings
-		 *
-		 * @return TLocSystemofMeasurementValues  Current value of the System of measurements settings
-		 */
-		TLocSystemofMeasurementValues SysofMeasurementL();
-        
-  protected:
-    /**
-     * Inherited from CActive
-     */
-    void RunL();
-    
-    /**
-     * Inherited from CActive
-     */
-    void DoCancel();
-                		
-	private:
-		/**
- 		 * Constructor
-		 */
-		CSatelliteMeasurementSetting( MSatelliteMeasurementSettingObserver&	aAdapterObsrv );
-
-		/**
-		 * Second Phase Constructor
-		 */
-		void ConstructL();
-	
-		/**
-		 * Start notification from the Central repository server for any changes in the
-		 * System of measurements key value
-		 */
-		void StartNotification();
-				
-	private:
-	    /**
-	     * Reference to the Settings observer
-	     */
-		MSatelliteMeasurementSettingObserver&     iObserver;
-	
-		/**
-		 * Reference to the Central repository object
-		 *
-		 * Owns
-		 */
-		CRepository*                    iRepository; 		
-	};			
-
-
-#endif //CSATELLITEMEASUREMENTSETTING_H
\ No newline at end of file
--- a/locationsystemui/locationsysui/locblidsatelliteinfo/inc/msatellitemeasurementsettingobserver.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,43 +0,0 @@
-/*
-* Copyright (c) 2008 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:  Observer for the change in System of Measurement
-*
-*/
-
-
-
-#ifndef __MSATELLITEMEASUREMENTSETTINGSOBSERVER_H__
-#define __MSATELLITEMEASUREMENTSETTINGSOBSERVER_H__
-
-// CLASS DECLARATION
-
-/**
-*  Observer for the change in System of Measurement.
-*
-*/
-class MSatelliteMeasurementSettingObserver
-    {
-    public: // New functions
-
-        /**
-         * Notification function for change in System of Measurement
-         *
-         * @return None 
-         */
-        virtual void HandleSysMeasureValueL( ) = 0;
-    };
-
-#endif      // __MSATELLITEMEASUREMENTSETTINGSOBSERVER_H__
-
-// End of File
--- a/locationsystemui/locationsysui/locblidsatelliteinfo/inc/satellite.hrh	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,31 +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:  Contains declarations for constants of location.
-*                This file can be included in C++ or resource file.
-*
-*/
-
-
-#ifndef SATELLITE_HRH
-#define SATELLITE_HRH
-
-#include <avkon.hrh>
-
-enum SatelliteDialogIds
-	{
-	ESatelliteControl = (KAknCtLastControlId + 100),
-	ESatelliteChangeView
-	};
-
-#endif //SATELLITE_HRH
--- a/locationsystemui/locationsysui/locblidsatelliteinfo/inc/satellitecontrol.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,211 +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: 
-*     Implements the control for responsible for all drawings
-*     in the satellite dialog
-*
-*/
-
-
-#ifndef __SATELLITE_CONTROL_H__
-#define __SATELLITE_CONTROL_H__
-
-// INCLUDE FILES
-#include <AknLayoutDef.h>
-#include <AknUtils.h>
-#include "SatInfoConsts.h"
-#include "MSatelliteEng.h"
-
-// FORWARD DECLARATION
-class CAknsFrameBackgroundControlContext;
-
-// CLASS DECLARATION
-NONSHARABLE_CLASS( CSatelliteControl ) : public CCoeControl
-	{
-	public:
-		/**
-        * Constructor.
-        */
-        static CSatelliteControl* NewL( MSatelliteEng& aEngine );
-        
-    public: 
-        // Destructor
-        ~CSatelliteControl();
-                
-    private:
-        void ConstructL(  );
-        // Default Constructor
-        CSatelliteControl(MSatelliteEng& aEngine);
-    
-    
-    public: 
-    	void ConstructFromResourceL(TResourceReader& aReader);
-		TSize MinimumSize();
-		TCoeInputCapabilities InputCapabilities() const;
-		TAknWindowLineLayout WindowLayout() const;
-		TRect CalculateDialogRect() const;
-		void Layout();
-		void ChangeView();
-		void SetLaunchView(TSatDialogView aView);	
-		
-
-        #ifdef RD_SCALABLE_UI_V2
-        //Implementated for stylus pop-up menu implementation
-        void HandlePointerEventL(const TPointerEvent& aPointerEvent);
-        #endif // RD_SCALABLE_UI_V2
-        
-    protected: // from CCoeControl
-        /**
-        * Count component controls.
-        * @return Number of component controls.
-        */
-        TInt CountComponentControls() const;
-
-        /**
-        * Get a component control by index.
-        * @param aIndex Index of component control to be returned.
-        * @return Component control or NULL.
-        */
-        CCoeControl* ComponentControl( TInt aIndex ) const;
-
-        /**
-        * Handle focus change.
-        * @param aDrawNow EDrawNow if draw the control now else ENoDrawNow
-        */
-        void FocusChanged( TDrawNow aDrawNow );
-
-        /*
-        * @see CCoeControl
-        */
-        
-        TTypeUid::Ptr MopSupplyObject( TTypeUid aId );
-
-	protected:  // from CCoeControl
-
-        /**
-        * Handle size change, lay out components.
-        */
-        void SizeChanged();
-		void Draw(const TRect& aRect) const;
-		
-	private: //new function
-		TSize DialogSize() const;
-		TRect DialogRect() const;
-		void DrawHeadingL() const;
-		void DrawSignalStrengthViewL() const;
-		void DrawGraphicalViewL() const;
-		void DrawEmptyDialogL() const;
-		void PrepareGraphicalViewIcons();		
-		void PrepareSignalStrengthViewIcons();
-		void PrepareSignalStrengthViewRectsAndIcons();
-		void PrepareGraphicalViewRectsAndIcons();
-		TRect CalculateCelestialBodyRectL(const TReal aAzimuth, const TReal aElevation, const TSize aIconSize) const;
-		TInt TRealToTInt( const TReal aSrc, TInt& aResult ) const;
-		
-		// New functions added for Compass View
-		void DrawCompassViewL() const;
-		void PrepareCompassViewIcons();
-		void PrepareCompassViewRectsAndIcons();
-	
-	private: //data
-    	CAknsFrameBackgroundControlContext* iEditorContext;
-    	TInt iCurrentSatelliteView;
-    	MSatelliteEng& iEngine;
-    	
-    	
-    	//Heading text;
-    	HBufC* iSatelliteSignalHeading;
-    	HBufC* iSatelliteGrapgicHeading;
-    	HBufC* iNoSatelliteData;
-    	HBufC* iCompassViewHeading;
-
-    	TInt iNumberOfRows;
-    	TInt iNumberOfColumns;
-    	    	
-    	// Private data for Signal Strength view    	
-    	RArray<TRect> iSignalBarRects;
-    	RArray<TAknLayoutText> iSatelliteNumberLayouts;
-    	CFbsBitmap* iSatActiveBmp;
-    	CFbsBitmap* iSatActiveBmpMask;
-    	CFbsBitmap* iSatInActiveBmp;
-    	CFbsBitmap* iSatInActiveBmpMask;
-    	CFbsBitmap* iSatFrame;
-    	CFbsBitmap* iSatFrameMask;
-    	
-    	// Private Data for Graphical view
-    	TRect iSatelliteRect;
-    	TRect iSunMoonRect;    	
-    	TRect iFirmamentRect;    	
-    	TAknLayoutText iCardinalNLayout;
-		TAknLayoutText iCardinalSLayout;
-		TAknLayoutText iCardinalWLayout;
-		TAknLayoutText iCardinalELayout;
-		TRect iSatelliteNoRect;
-    	CFbsBitmap* iFirmamentBmp;
-    	CFbsBitmap* iFirmamentBmpMask;
-    	CFbsBitmap* iFirmaActiveBmp;
-    	CFbsBitmap* iFirmaActiveBmpMask;
-    	CFbsBitmap* iFirmaInActiveBmp;
-    	CFbsBitmap* iFirmaInActiveBmpMask;
-		CFbsBitmap* iMoonBmp;
-    	CFbsBitmap* iMoonBmpMask;
-    	CFbsBitmap* iSunBmp;
-    	CFbsBitmap* iSunBmpMask;
-    	HBufC* iNorth;
-    	HBufC* iSouth;
-    	HBufC* iWest;
-    	HBufC* iEast;    	
-    	
-    	// Private Data for Compass view
-    	TRect iFirmamentCompassRect;
-    	TRect iTypeRect;  
-    	TAknLayoutText iCardinalCompassNLayout;
-		TAknLayoutText iCardinalCompassSLayout;
-		TAknLayoutText iCardinalCompassWLayout;
-		TAknLayoutText iCardinalCompassELayout;
-		TAknLayoutText iLatitudeWindowLayout;
-		TAknLayoutText iLongitudeWindowLayout;
-		TAknLayoutText iAltitudeWindowHeadingLayout;
-		TAknLayoutText iSpeedWindowHeadingLayout;
-		TAknLayoutText iDirectionWindowHeadingLayout;
-		TAknLayoutText iAltitudeWindowValueLayout;
-		TAknLayoutText iSpeedWindowValueLayout;
-		TAknLayoutText iDirectionWindowValueLayout;
-		TAknLayoutText iFixTypeLayout;
-    	CFbsBitmap* iFirmamentCompassBmp;
-    	CFbsBitmap* iFirmamentCompassBmpMask;		
-		CFbsBitmap* iFixBmp;
-    	CFbsBitmap* iFixBmpMask;
-    	HBufC* iAltitudeWindowHeading;
-    	HBufC* iSpeedWindowHeading;
-    	HBufC* iDirectionWindowHeading;
-    	HBufC* iSpeedFormatKmph;
-    	HBufC* iSpeedFormatMph;
-    	HBufC* iAltitudeFormatM;
-    	HBufC* iAltitudeFormatFt;
-    	HBufC* iDirectionFormat;
-    	HBufC* iCompassNorth;
-    	HBufC* iCompassSouth;
-    	HBufC* iCompassWest;
-    	HBufC* iCompassEast; 
-    	HBufC* i2DString;
-    	HBufC* i3DString; 
-    	
-	};
-
-#endif // __SATELLITE_CONTROL_H__
-
-
-
-
--- a/locationsystemui/locationsysui/locblidsatelliteinfo/src/CSatellite.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,205 +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:  Implements interface for CSatellite
-*
-*/
-
-
-// INCLUDE FILES
-#include <bautils.h>
-#include <AknWaitDialog.h>
-#include <data_caging_path_literals.hrh>
-#include <SatInfo.rsg>
-#include "SatInfoConsts.h"
-#include "CSatelliteEng.h"
-#include "CSatelliteDialog.h"
-#include "Debug.h"
-#include "CSatellite.h"
-
-// ============================ MEMBER FUNCTIONS ==============================
-// ----------------------------------------------------------------------------
-// CSatellite::NewL
-// Two-phased constructor.
-// ----------------------------------------------------------------------------
-//
-CSatellite* CSatellite::NewL()
-    {
-    CSatellite* self = new( ELeave ) CSatellite;
-    CleanupStack::PushL( self );
-    self->ConstructL();
-    CleanupStack::Pop(); // self
-    return self;
-    }
-
-// ---------------------------------------------------------
-// CSatellite::ConstructL
-// ---------------------------------------------------------
-//
-void CSatellite::ConstructL()
-    {
-    iEnv = CEikonEnv::Static();
-    OpenResourceFileL();    
-    iEngine = CSatelliteEng::NewL();  
-    }
-
-// ----------------------------------------------------------------------------
-// CSatellite::CSatellite
-// C++ default constructor can NOT contain any code, that
-// might leave.
-// ----------------------------------------------------------------------------
-//
-CSatellite::CSatellite()
-    {
-    iLaunchView = ESignalStrengthView;
-    }
-
-// ---------------------------------------------------------
-// CSatellite::~CSatellite
-// ---------------------------------------------------------
-//
-CSatellite::~CSatellite()
-    {
-    CloseResourceFile();    
-    delete iEngine;
-    delete iWaitDialog;    
-    }
-
-// ---------------------------------------------------------
-// CSatellite::NotifyL
-// ---------------------------------------------------------
-//
-void CSatellite::NotifyL(TInt /*aError*/)
-    {
-    if ( iWaitDialog ) 
-		{
-	    iWaitDialog->ProcessFinishedL();        
-	    iWaitDialog = NULL;
-	    }
-	else if(iDialog)
-		{
-		iDialog->UpdateL();
-		}	
-    }
-
-
-// ---------------------------------------------------------
-// CSatellite::NotifyError
-// ---------------------------------------------------------
-//               
-void CSatellite::NotifyError( TInt /*aErrorCode*/ )
-    {
-    if ( iWaitDialog )
-        {
-        delete iWaitDialog;
-        iWaitDialog = NULL;
-        }
-    }
-
-// ---------------------------------------------------------
-// CSatellite::ExecuteL
-// ---------------------------------------------------------
-//               
-TInt CSatellite::ExecuteL( const TDesC& aNameOfRule )
-    {
-    TInt ret(0);
-    
-    iEngine->SetObserver( *this );
-    iEngine->RequestSatelliteDataL( aNameOfRule );    
-
-    iWaitDialog = new (ELeave) CAknWaitDialog( NULL, ETrue );
-    if ( iWaitDialog->ExecuteLD( R_SATELLITE_WAIT_NOTE ) )
-        {
-        iWaitDialog = NULL;
-        iDialog = CSatelliteDialog::NewL( *iEngine );
-        iDialog->SetLaunchView(iLaunchView);
-        ret = iDialog->ExecuteLD(R_SATELLITE_DIALOG);        
-        }
-    else
-        {        
-        delete iDialog;     
-        iDialog = NULL;
-        }
-    iWaitDialog = NULL;
-    return ret;
-    }
-
-// ----------------------------------------------------------------------------
-// CSatellite::HandleForegroundEventL
-// ----------------------------------------------------------------------------
-//
-void CSatellite::HandleForegroundEventL(TBool aForeground)
-    {
-    if ( aForeground )
-        {
-        iEngine->StartRequestingL();
-        }
-    else
-        {
-        iEngine->StopRequesting();
-        }
-    }
-
-
-// ----------------------------------------------------------------------------
-// CSatellite::OpenResourceFile
-// ----------------------------------------------------------------------------
-//
-void CSatellite::OpenResourceFileL()
-    {
-    FindResourceFileL();
-
-    BaflUtils::NearestLanguageFile( iEnv->FsSession(), iResourceFileName );
-    iResourceOffset = iEnv->AddResourceFileL( iResourceFileName );
-    }
-
-// ----------------------------------------------------------------------------
-// CSatellite::CloseResourceFile
-// ----------------------------------------------------------------------------
-//
-void CSatellite::CloseResourceFile()
-    {
-    iEnv->DeleteResourceFile( iResourceOffset );
-    }
-
-// ----------------------------------------------------------------------------
-// CSatellite::FindResourceFileL
-// ----------------------------------------------------------------------------
-//
-void CSatellite::FindResourceFileL()
-    {
-    // Path and file name:
-    TFileName file;
-    file.Append( KSatTmp_RESOURCE_FILES_DIR ); // always safe
-    file.Append( KSatInfoRscFileName ); // always safe   
-    
-    // Drive:
-    TFileName drive;
-    Dll::FileName( drive );
-
-    // Add drive to path & file name:
-    TParse parse;
-    User::LeaveIfError( parse.Set( file, &drive, NULL ) );
-    iResourceFileName = parse.FullName();
-    }
-
-// ----------------------------------------------------------------------------
-// CSatellite::SetLaunchView
-// ----------------------------------------------------------------------------
-//
-void CSatellite::SetLaunchView(TSatDialogView aView)
-	{
-	iLaunchView = aView;	
-	}
-
-// End of File
--- a/locationsystemui/locationsysui/locblidsatelliteinfo/src/CSatelliteDialog.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,246 +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: BLID Satellite Info dialog definition
-*
-*/
-
-
-// INCLUDE FILES
-#include <aknlists.h>
-#include <aknPopup.h>
-#include <AknQueryDialog.h>
-#include <SatInfo.rsg>
-#include <avkon.rsg>
-#include <aknlayoutscalable_apps.cdl.h> // For LAF
-#include <lbssatellite.h>
-#include <aknborders.h>
-#include <AknsFrameBackgroundControlContext.h>
-#include <aknappui.h>
-#include <skinlayout.cdl.h>
-using namespace SkinLayout;
-
-#include "Debug.h"
-#include "MSatelliteEng.h"
-#include "CSatelliteDialog.h"
-#include "satellite.hrh"
-#include "satellitecontrol.h"
-
-// ============================ MEMBER FUNCTIONS ==============================
-// ----------------------------------------------------------------------------
-// CSatelliteDialog::NewL
-// Two-phased constructor.
-// ----------------------------------------------------------------------------
-//
-CSatelliteDialog* CSatelliteDialog::NewL( MSatelliteEng& aEngine )
-    {
-    CSatelliteDialog* self = new( ELeave ) CSatelliteDialog(aEngine);
-    CleanupStack::PushL( self );
-    self->ConstructL( );
-    CleanupStack::Pop(); // self
-    return self;
-    }
-
-
-// ----------------------------------------------------------------------------
-// CSatelliteDialog::CSatelliteDialog
-// C++ default constructor can NOT contain any code, that
-// might leave.
-// ----------------------------------------------------------------------------
-//
-CSatelliteDialog::CSatelliteDialog(MSatelliteEng& aEngine): iEngine(aEngine) 
-    {
-    }
-
-// ---------------------------------------------------------
-// CSatelliteDialog::~CSatelliteDialog
-// ---------------------------------------------------------
-//
-CSatelliteDialog::~CSatelliteDialog()
-    {
-    delete iBgContext;    
-    }
-
-// ---------------------------------------------------------
-// CSatelliteDialog::ConstructL
-// ---------------------------------------------------------
-//
-void CSatelliteDialog::ConstructL( )
-    {
-    TRect windowRect = Rect();
-
-	TAknLayoutRect topLeft;
-    topLeft.LayoutRect(windowRect, Popup_windows_skin_placing__frame_general__Line_2());
-	
-	//Determine the outer and inner rects of the dialog for drawing the frames.
-	TAknLayoutRect bottomRight;
-	bottomRight.LayoutRect(windowRect, ELayoutEmpty, 169, ELayoutEmpty, ELayoutEmpty, 2, 7,7);
-    bottomRight.LayoutRect(windowRect, Popup_windows_skin_placing__frame_general__Line_5());
-        
-    TRect outerRect = TRect(topLeft.Rect().iTl, bottomRight.Rect().iBr);
-	TRect innerRect = TRect(topLeft.Rect().iBr, bottomRight.Rect().iTl);
-	
-	//Background context responsible for drawing the frame and the
-	//background of the frame
-    iBgContext = CAknsFrameBackgroundControlContext::NewL(
-			            KAknsIIDQsnFrPopup, outerRect, innerRect, ETrue );
-	
-	//Create satellite control responsible for all the drawing on the dialog.
-	iSatelliteControl = CSatelliteControl::NewL(iEngine);
-    }
-
-// ---------------------------------------------------------
-// CSatelliteDialog::SetLaunchView
-// ---------------------------------------------------------
-//
-void CSatelliteDialog::SetLaunchView(TSatDialogView aView)
-	{
-	//Satellite controls is responsible for the initial launch 
-	//view of the dialog. Pass the initial launch view of the dialog
-	//to the control
-	iSatelliteControl->SetLaunchView(aView);
-	}
-
-// ---------------------------------------------------------
-// CSatelliteDialog::OkToExitL
-// ---------------------------------------------------------
-//
-TBool CSatelliteDialog::OkToExitL(TInt aButtonId)
-	{
-	if(aButtonId == ESatelliteChangeView)
-		{
-		// Change view soft key pressed.Notify the control to change 
-		// the view and draw.
-		iSatelliteControl->ChangeView();		
-		DrawNow();
-		return EFalse;
-		}
-	else
-		{
-		return CAknDialog::OkToExitL(aButtonId);
-		}
-	}
-
-// ----------------------------------------------------------------------------
-// CSatelliteDialog::CreateCustomControlL()
-// ----------------------------------------------------------------------------
-//
-SEikControlInfo CSatelliteDialog::CreateCustomControlL(TInt aControlType)
-    {
-    // This function is invoked by the dialog frame work when if 
-    // finds an unknow id in the dialog resouce.This function is
-    // expected to return the control which is reponsible for all
-    // the drawings that will happen in the dialog.
-    SEikControlInfo controlInfo;
-    controlInfo.iControl = NULL;
-    controlInfo.iTrailerTextId = 0;
-    controlInfo.iFlags = 0;
-    
-    switch(aControlType)
-        {
-        case ESatelliteControl:
-        	// This dialog takes ownerwhip of the control and
-        	// wil also delete the control once the dialog is
-        	// destroyed.
-            controlInfo.iControl = iSatelliteControl;
-            break;
-            
-        default:
-            break;
-        }
-    return controlInfo;
-    }
-
-
-// ----------------------------------------------------------------------------
-// CSatelliteDialog::SetSizeAndPosition
-// ----------------------------------------------------------------------------
-//
-void CSatelliteDialog::SetSizeAndPosition(const TSize& /*aSize*/)
-    {
-    TRect rect = iSatelliteControl->CalculateDialogRect();
-    SetRect( rect );
-    }
-
-// ----------------------------------------------------------------------------
-// CSatelliteDialog::SizeChanged()
-// ----------------------------------------------------------------------------
-//
-void CSatelliteDialog::SizeChanged()
-	{
-	CAknDialog::SizeChanged();
-	TRect windowRect = Rect();
-
-	TAknLayoutRect topLeft;
-    topLeft.LayoutRect(windowRect, Popup_windows_skin_placing__frame_general__Line_2());
-
-	TAknLayoutRect bottomRight;
-    bottomRight.LayoutRect(windowRect, Popup_windows_skin_placing__frame_general__Line_5());
-
-	TRect outerRect = TRect(topLeft.Rect().iTl, bottomRight.Rect().iBr);
-	TRect innerRect = TRect(topLeft.Rect().iBr, bottomRight.Rect().iTl);
-
-	iBgContext->SetFrameRects( outerRect, innerRect );
-	iBgContext->SetParentPos( PositionRelativeToScreen() );
-	TRAP_IGNORE(UpdateL());
-	}
-
-// ----------------------------------------------------------------------------
-// CSatelliteDialog::SupplyMopObject()
-// ----------------------------------------------------------------------------
-//
-TTypeUid::Ptr CSatelliteDialog::MopSupplyObject(TTypeUid aId)
-	{	
-    return MAknsControlContext::SupplyMopObject(aId, iBgContext );
-	}
-
-// ----------------------------------------------------------------------------
-// CSatelliteDialog::UpdateL
-// ----------------------------------------------------------------------------
-//
-void CSatelliteDialog::UpdateL()
-    {    
-    CEikButtonGroupContainer& buttonContainer = ButtonGroupContainer();
-    
-    // Dim the "ChangeView" command when satellite data is not 
-    // available
-    if(!iEngine.IsSatelliteDataAvailable())
-    	{
-		buttonContainer.SetCommandSetL(R_AVKON_SOFTKEYS_CLOSE);
-		buttonContainer.DrawNow();
-    	}
-    else
-    	{
-    	buttonContainer.SetCommandSetL(R_SATELLITE_DIALOG_CBA);
-    	buttonContainer.DrawNow();
-    	}
-    DrawNow();
-    }
-
-// ----------------------------------------------------------------------------
-// CSatelliteDialog::OfferKeyEventL
-// ----------------------------------------------------------------------------
-//
-TKeyResponse CSatelliteDialog::OfferKeyEventL( const TKeyEvent& aKeyEvent,
-                                     TEventCode aType)
-    {
-    if ( aType == EEventKey && aKeyEvent.iCode == EKeyEnter ||
-         aType == EEventKey && aKeyEvent.iScanCode == EStdKeyEnter  )
-		{
-        iSatelliteControl->ChangeView();
-        DrawNow();
-		return EKeyWasConsumed;
-		}
-    return CAknDialog::OfferKeyEventL( aKeyEvent, aType );
-    }
-// End of File
--- a/locationsystemui/locationsysui/locblidsatelliteinfo/src/CSatelliteEng.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,579 +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 defines the engine class for Location satellite info
-*
-*/
-
-
-// INCLUDE FILES
-#include <eikenv.h>
-#include <e32math.h>
-#include <e32cmn.h>
-#include <libc/math.h>
-#include "SatInfoConsts.h"
-#include "CSatelliteEng.h"
-#include "MEngObserver.h"
-#include "csatellitemeasurementsetting.h"
-#include "Debug.h"
-
-// ============================ FUNCTIONS DECLARATION =========================
-TInt SortCriteria(const TSatelliteData& aCurrent, const TSatelliteData& aNext);
-
-
-// ============================ MEMBER FUNCTIONS ==============================
-// ----------------------------------------------------------------------------
-// CSatelliteEng::NewL
-// Two-phased constructor.
-// ----------------------------------------------------------------------------
-//
-CSatelliteEng* CSatelliteEng::NewL()
-    {
-    CSatelliteEng* self = new( ELeave ) CSatelliteEng;
-    CleanupStack::PushL( self );
-    self->ConstructL();
-    CleanupStack::Pop(); // self
-    return self;
-    }
-
-// ---------------------------------------------------------
-// CSatelliteEng::ConstructL
-// ---------------------------------------------------------
-//
-void CSatelliteEng::ConstructL()
-    {
-    User::LeaveIfError( iServer.Connect() );
-    User::LeaveIfError(iPositioner.Open( iServer ));
-
-	// System of Measurements
-	iMeasurementSetting = CSatelliteMeasurementSetting::NewL(*this);
-	
-    // Keplers parameters    
-    // Define parameters for the Sun
-    iKeplers[0].iM.iA0=356.0470;
-    iKeplers[0].iM.iA1=0.9856002585;
-    iKeplers[0].iW.iA0=282.9404;
-    iKeplers[0].iW.iA1=4.70935e-005;
-    iKeplers[0].iE.iA0=0.016709;
-    iKeplers[0].iE.iA1=-1.151e-009;
-
-    //Define parameters for the Moon
-    iKeplers[1].iM.iA0=115.3654;
-    iKeplers[1].iM.iA1=13.0649929509;
-    iKeplers[1].iW.iA0=318.0634;
-    iKeplers[1].iW.iA1=0.1643573223;
-    iKeplers[1].iE.iA0=0.0549;
-    iKeplers[1].iE.iA1=0.0;    
-    }
-
-// ----------------------------------------------------------------------------
-// CSatelliteEng::CSatelliteEng
-// C++ default constructor can NOT contain any code, that
-// might leave.
-// ----------------------------------------------------------------------------
-//
-CSatelliteEng::CSatelliteEng() : CActive(EPriorityStandard), iRequesting( EFalse )
-    {
-    CActiveScheduler::Add( this );
-    }
-
-// ---------------------------------------------------------
-// CSatelliteEng::~CSatelliteEng
-// ---------------------------------------------------------
-//
-CSatelliteEng::~CSatelliteEng()
-    {
-    Cancel();
-    iPositioner.Close();
-    iServer.Close();
-    iSortedSatData.Reset();
-    delete iMeasurementSetting;
-    }
-
-// ---------------------------------------------------------
-// CSatelliteEng::RunL  
-// ---------------------------------------------------------
-//
-void CSatelliteEng::RunL()
-    {
-    TInt status = iStatus.Int();
-    
-    /// Check if we have satellite data
-    if(!(status == KErrNone ||
-         status == KPositionPartialUpdate) )
-	    {	    
-	    ClearSatelliteData();
-		}	
-    SortSatelliteDataL();
-    
-    if ( iObserver )
-        {
-        iObserver->NotifyL( iStatus.Int() );
-        } 
-    #ifdef _DEBUG
-    DEBUG1( "CSatelliteEng::RunL(): Error = %d", iStatus.Int() );
-    #endif
-    
-    if ( iRequesting && !IsActive())
-        {
-        iPositioner.NotifyPositionUpdate( iSatelliteInfo, iStatus);
-        SetActive();        
-        }
-	}
-
-// ---------------------------------------------------------
-// CSatelliteEng::DoCancel
-// ---------------------------------------------------------
-//
-void CSatelliteEng::DoCancel()
-    {
-    iPositioner.CancelRequest( EPositionerNotifyPositionUpdate );    
-    }
-
-// ---------------------------------------------------------
-// CSatelliteEng::RunError
-// ---------------------------------------------------------
-//
-TInt CSatelliteEng::RunError(TInt aError)
-    {    
-    if ( iObserver && (aError == KErrCancel) )
-        {
-        iObserver->NotifyError( aError );
-        return KErrNone;
-        }
-    return aError;
-    }
-// ---------------------------------------------------------
-// CSatelliteEng::SetObserver
-// ---------------------------------------------------------
-//
-void CSatelliteEng::SetObserver(MEngObserver& aObserver)
-    {
-    iObserver = &aObserver;
-    }
-
-// ----------------------------------------------------------------------------
-// CSatelliteEng::RequestSatelliteDataL
-// ----------------------------------------------------------------------------
-//
-void CSatelliteEng::RequestSatelliteDataL( const TDesC& aNameOfRule )
-    {    
-    UpdateIntervalL();
-    
-    User::LeaveIfError(iPositioner.SetRequestor(CRequestor::ERequestorService,
-                                                CRequestor::EFormatApplication,
-                                                aNameOfRule ));
-
-    iPositioner.NotifyPositionUpdate( iSatelliteInfo, iStatus);        
-    SetActive();    
-    iRequesting = ETrue;    
-    }
-
-// ----------------------------------------------------------------------------
-// CSatelliteEng::GetSatelliteData
-// ----------------------------------------------------------------------------
-//
-TInt CSatelliteEng::GetSatelliteData( TUint aIndex, 
-                                      TSatelliteData& aSatelliteData) const
-    {
-    if( aIndex >= iSortedSatData.Count() )
-    	{
-    	return KErrNotFound;
-    	}    
-    aSatelliteData = iSortedSatData[aIndex];
-    return KErrNone;
-    }
-
-// ----------------------------------------------------------------------------
-// CSatelliteEng::GetPosition
-// ----------------------------------------------------------------------------
-//
-void CSatelliteEng::GetPosition(TPosition& aPosition)
-	{
-	iSatelliteInfo.GetPosition(aPosition);
-	}
-
-// ----------------------------------------------------------------------------
-// CSatelliteEng::GetCourse
-// ----------------------------------------------------------------------------
-//
-void CSatelliteEng::GetCourse(TCourse& aCourse)
-	{
-	iSatelliteInfo.GetCourse(aCourse);
-	}
-
-// ----------------------------------------------------------------------------
-// CSatelliteEng::SortSatelliteDataL
-// ----------------------------------------------------------------------------
-//
-void CSatelliteEng::SortSatelliteDataL()
-	{
-	TSatelliteData tempSatelliteData;
-	TLinearOrder<TSatelliteData> order(SortCriteria);
-	iSortedSatData.Reset();
-	TInt satellitesInView = iSatelliteInfo.NumSatellitesInView();
-	for(TInt i = 0;i < satellitesInView ;i++ )
-		{
-		User::LeaveIfError(iSatelliteInfo.GetSatelliteData(i,tempSatelliteData));
-		if(tempSatelliteData.SignalStrength() <= KBlidMinSatelliteSignalStrength)
-        	{
-        	continue;
-        	}        
-    	iSortedSatData.InsertInOrderAllowRepeats(tempSatelliteData, order);                
-		}
-	}
-
-// ----------------------------------------------------------------------------
-// CSatelliteEng::ObjectElevationAzimuth
-// ----------------------------------------------------------------------------
-//
-void CSatelliteEng::ObjectElevationAzimuth(TInt aIndex, TReal& aAzimuth, TReal& aElevation )
-	{	
-	TTime time = iSatelliteInfo.SatelliteTime();	
-	TDateTime dateTime = time.DateTime();
-	TReal hours = dateTime.Hour();
-	TReal minutes = dateTime.Minute();
-	TReal seconds = dateTime.Second();
-	TInt day = dateTime.Day() + 1;
-	TInt month = dateTime.Month() + 1;
-	TInt year = dateTime.Year();
-	TReal julianDay, julianCentury;
-	
-	//Universal time is the number of hours from the begining of the day	
-	TReal universalTime = hours + minutes/60.0 + seconds/(60.0*60.0);
-	Julian(julianDay, julianCentury, day, month, year, universalTime);
-	
-	//This algorithm uses a starting point for the Julian day count that is 1.5 days earlier.
-	TReal JD_Mod = julianDay - 2451545.0 + 1.5;
-	
-	//Mean anomaly, in degrees
-	TReal m=iKeplers[aIndex].iM.iA0 + iKeplers[aIndex].iM.iA1 * (JD_Mod);
-	//Argument of perihelion, in degrees
-    TReal w=iKeplers[aIndex].iW.iA0 + iKeplers[aIndex].iW.iA1 * (JD_Mod);
-    //eccentricity
-    TReal e=iKeplers[aIndex].iE.iA0 + iKeplers[aIndex].iE.iA1 * (JD_Mod);
-    
-    // Calculate true anomaly    
-    TReal E = Kepler(e, m*KPi/180);
-    
-    TReal tmp, sinE, cosE;
-    Math::Sqrt(tmp, 1 - e * e);
-    Math::Sin(sinE, E);
-    Math::Cos(cosE, E);
-    
-    TReal v;
-    v = atan2(tmp * sinE, cosE - e); //In radians
-        
-    TReal truelongitude = v + (KPi/180) * w; // in radians
-    TReal ra, dd;    
-    TrueLongToRaDeltadec(ra, dd, truelongitude);
-    ra = ra * 360/24; //In degrees
-    dd = dd * 180/KPi; // In degrees
-    
-    TPosition position;
-    TLocality locality;    
-    
-    iSatelliteInfo.GetPosition(position);        
-    
-    TReal tau = SideRealTime(julianDay, julianCentury, position.Longitude(), ra);
-    
-    LocationCoordinates(aAzimuth, aElevation, tau, dd, position.Latitude());
-	}
-
-// ----------------------------------------------------------------------------
-// CSatelliteEng::SideRealTime
-// ----------------------------------------------------------------------------
-//
-TReal CSatelliteEng::SideRealTime(TReal aJulianDay, 
-								  TReal aJulianCentury,
-								  TReal aLongitude,
-								  TReal aRa)
-	{
-	TReal theta0 = 280.46061837 + 
-				   360.98564736629 * (aJulianDay-2451545.0) + 
-				   0.000387933*aJulianCentury*aJulianCentury - 
-				   aJulianCentury*aJulianCentury*aJulianCentury/38710000;
-    TReal rem;
-	Math::Mod(rem, theta0, 360);
-	theta0 = rem;
-	TReal theta = theta0 + aLongitude;
-	return (theta - aRa);
-	}
-
-// ----------------------------------------------------------------------------
-// CSatelliteEng::LocationCoordinates
-// ----------------------------------------------------------------------------
-//
-void CSatelliteEng::LocationCoordinates(TReal& aAzimuth, 
-										TReal& aElevation, 
-										TReal aTau,
-										TReal aDd, 
-										TReal aLatitude)
-	{
-	//Convert latitude from degrees to radians	
-	TReal sinValue;
-	Math::Sin(sinValue, aLatitude * KPi/180);
-	TReal sinValue2;
-	Math::Sin(sinValue2, aDd * KPi/180);
-	
-	TReal cosValue;
-	Math::Cos(cosValue, aLatitude * KPi/180);
-	TReal cosValue2;
-	Math::Cos(cosValue2, aDd * KPi/180);
-	TReal cosValue3;
-	Math::Cos(cosValue3, aTau * KPi/180);
-	
-	TReal sinh = sinValue * sinValue2 + cosValue * cosValue2 * cosValue3;
-	
-	TReal asinValue;
-	Math::ASin(asinValue, sinh);
-	aElevation = (180/KPi) * asinValue;
-	
-	Math::Sin(sinValue, aTau * KPi / 180);
-	TReal a1 = -sinValue;
-	
-	TReal tanValue;
-	Math::Tan(tanValue, aDd * KPi / 180);
-	TReal a2 = cosValue * tanValue - sinValue * cosValue3;
-	
-	TReal atanvalue;	
-	atanvalue = atan2(a1, a2);
-	aAzimuth = (180/KPi) * atanvalue;
-	
-	if(aAzimuth < 0)
-		{
-		aAzimuth += 360;
-		}
-	}
-
-// ----------------------------------------------------------------------------
-// CSatelliteEng::Julian
-// ----------------------------------------------------------------------------
-//
-void CSatelliteEng::Julian(TReal& aJulianDay,
-						   TReal& aJulianCentury,
-						   TInt aDay,
-						   TInt aMonth,
-						   TInt aYear,						   
-						   TReal aUniversalTime)
-	{
-	if(aMonth <= 2)
-		{
-		aMonth += 12;
-		--aYear;
-		}
-	TInt tmp;
-	tmp = 365.25 * aYear;
-	TReal temp = tmp;
-	
-	tmp = 30.6001 * (aMonth+1);
-	TReal temp2 = tmp;
-	
-	aJulianDay = temp + temp2 - 15.0 + 1720996.5 + aDay + aUniversalTime/24;
-	aJulianCentury = (aJulianDay - 	2451545.0)/36525.0;
-	}
-
-// ----------------------------------------------------------------------------
-// CSatelliteEng::Kepler
-// ----------------------------------------------------------------------------
-//
-TReal CSatelliteEng::Kepler(TReal aE, TReal aM)
-	{
-	//Solving Kepler's equation by the Newton-Raphson iteration
-    //Note aE, aM in radians
-    TReal sinm, cosm;
-    TReal E = aE;
-    Math::Sin(sinm, aM);
-    Math::Cos(cosm, aM);
-    TReal EO = aM + aE * sinm * (1 - aE * cosm);
-    
-    while(1)
-    	{
-    	TReal sineo, coseo;
-    	Math::Sin(sineo, EO);
-    	Math::Cos(coseo, EO);
-    	E = EO - (EO - aE * sineo - aM) / (1-aE * coseo);
-    	
-    	if( Abs(E - EO) < (1e-6) )
-    		{
-    		break;
-    		}
-    	EO = E;
-    	}
-    return E;
-	}
-
-// ----------------------------------------------------------------------------
-// CSatelliteEng::TrueLongToRaDeltadec
-// ----------------------------------------------------------------------------
-//
-void CSatelliteEng::TrueLongToRaDeltadec(TReal& aRa,TReal& aDd,TReal aTrueLongitude)
-	{
-	//This function converts True Longitude (in radians) to Right Ascension (in hours) and
-    //Delta declination (in radians)
-    TReal X;
-    Math::Cos(X, aTrueLongitude);
-    
-    TReal sintl;
-    Math::Sin(sintl, aTrueLongitude);
-    
-    TReal cosvalue;
-    Math::Cos(cosvalue, 23.43999 * KPi/180);
-    TReal Y = cosvalue * sintl;
-    
-    TReal sinvalue;
-    Math::Sin(sinvalue, 23.43999 * KPi/180);
-    TReal Z = sinvalue * sintl;
-    
-    TReal R;
-    Math::Sqrt(R, 1-Z*Z);
-    
-    Math::ATan(aDd, Z/R);
-    
-    TReal tanValue;
-    Math::ATan(tanValue, Y/(X+R) );
-    aRa = (24/KPi)*tanValue;
-	}
-
-// ----------------------------------------------------------------------------
-// CSatelliteEng::GetSunAzimuthElevation
-// ----------------------------------------------------------------------------
-//
-void CSatelliteEng::GetSunAzimuthElevation(TReal& aAzimuth, TReal& aElevation )
-	{	
-	ObjectElevationAzimuth(0, aAzimuth, aElevation );	
-	}
-
-// ----------------------------------------------------------------------------
-// CSatelliteEng::GetMoonAzimuthElevation
-// ----------------------------------------------------------------------------
-//	
-void CSatelliteEng::GetMoonAzimuthElevation(TReal& aAzimuth, TReal& aElevation )
-	{
-	ObjectElevationAzimuth(1, aAzimuth, aElevation );
-	}
-	
-// ----------------------------------------------------------------------------
-// CSatelliteEng::NumberOfSatellites
-// ----------------------------------------------------------------------------
-//
-TInt CSatelliteEng::NumberOfSatellites()
-    {
-	return iSortedSatData.Count();	
-    }
-
-// ----------------------------------------------------------------------------
-// CSatelliteEng::NumberOfSatellites
-// ----------------------------------------------------------------------------
-//
-TInt CSatelliteEng::NumberOfSatellitesUsed()
-    {
-	return iSatelliteInfo.NumSatellitesUsed();	
-    }
-
-// ----------------------------------------------------------------------------
-// CSatelliteEng::StopRequesting
-// ----------------------------------------------------------------------------
-//
-void CSatelliteEng::StopRequesting()
-    {
-    iRequesting = EFalse;
-    }
-
-// ----------------------------------------------------------------------------
-// CSatelliteEng::StartRequestingL
-// ----------------------------------------------------------------------------
-//
-void CSatelliteEng::StartRequestingL()
-    {
-    if ( !IsActive() )
-        {
-        iPositioner.NotifyPositionUpdate( iSatelliteInfo, iStatus );        
-        SetActive();
-        }
-    iRequesting = ETrue;    
-    }
-
-// ----------------------------------------------------------------------------
-// CSatelliteEng::UpdateIntervalL
-// ----------------------------------------------------------------------------
-//
-void CSatelliteEng::UpdateIntervalL( )
-    {
-    TPositionUpdateOptions updateOptions;
-    updateOptions.SetUpdateInterval(TTimeIntervalMicroSeconds(KSatelliteIntervalTime));
-    updateOptions.SetAcceptPartialUpdates( ETrue );
-    updateOptions.SetUpdateTimeOut(TTimeIntervalMicroSeconds(KSatelliteTimeOut));
-    User::LeaveIfError( iPositioner.SetUpdateOptions(updateOptions) );
-    }
-
-// ----------------------------------------------------------------------------
-// CSatelliteEng::ClearSatelliteData
-// ----------------------------------------------------------------------------
-//
-void CSatelliteEng::ClearSatelliteData()
-	{
-	iSatelliteInfo.ClearSatellitesInView();	
-	}
-
-// ----------------------------------------------------------------------------
-// CSatelliteEng::IsSatelliteDataAvailable
-// ----------------------------------------------------------------------------
-//	
-TBool CSatelliteEng::IsSatelliteDataAvailable()
-	{	
-	TInt count = iSortedSatData.Count();
-	if(count == 0)
-		{
-		return EFalse;
-		}
-    return ETrue;
-	}
-
-// ----------------------------------------------------------------------------
-// CSatelliteEng::SysOfMeasurementL
-// ----------------------------------------------------------------------------
-//	
-TLocSystemofMeasurementValues CSatelliteEng::SysOfMeasurementL()
-	{
-	return iMeasurementSetting->SysofMeasurementL( );
-	}
-
-// ----------------------------------------------------------------------------
-// CSatelliteEng::HandleSysMeasureValueL
-// ----------------------------------------------------------------------------
-//	
-void CSatelliteEng::HandleSysMeasureValueL()
-	{
-	iObserver->NotifyL( KErrNone );
-	}
-
-// ----------------------------------------------------------------------------
-// SortCriteria
-// ----------------------------------------------------------------------------
-//	
-TInt SortCriteria(const TSatelliteData& aFirst, const TSatelliteData& aNext)
-	{
-	if(aFirst.SignalStrength() > aNext.SignalStrength())
-		{
-		return 1;
-		}
-	else if(aFirst.SignalStrength() < aNext.SignalStrength())
-		{
-		return -1;
-		}
-	return 0;
-	}
-	
-
-// End of File
--- a/locationsystemui/locationsysui/locblidsatelliteinfo/src/CSatelliteInfoUI.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,168 +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:  Implements interface for CSatelliteInfoUI
-*
-*/
-
-
-// INCLUDE FILES
-#include <AknPanic.h>
-#include "CSatelliteInfoUI.h"
-#include "CSatellite.h"
-#include "SatInfoConsts.h"
-#include "Debug.h"
-
-#include <locationvariationdomaincrkeys.h>
-#include <centralrepository.h>
-// Panic for set launch view panic
-_LIT(KSatellitePanic, "BLID Satellite");
-
-// ============================ MEMBER FUNCTIONS ==============================
-// ----------------------------------------------------------------------------
-// CSatelliteInfoUI::NewL
-// Two-phased constructor.
-// ----------------------------------------------------------------------------
-//
-EXPORT_C CSatelliteInfoUI* CSatelliteInfoUI::NewL()
-    {
-    CSatelliteInfoUI* self = new( ELeave ) CSatelliteInfoUI;
-    CleanupStack::PushL( self );
-    self->ConstructL();
-    CleanupStack::Pop(); // self
-    return self;
-    }
-
-// ---------------------------------------------------------
-// CSatelliteInfoUI::ConstructL
-// ---------------------------------------------------------
-//
-void CSatelliteInfoUI::ConstructL()
-    {    
-    iSatellite = CSatellite::NewL();
-    }
-
-// ----------------------------------------------------------------------------
-// CSatelliteInfoUI::CSatelliteInfoUI
-// C++ default constructor can NOT contain any code, that
-// might leave.
-// ----------------------------------------------------------------------------
-//
-CSatelliteInfoUI::CSatelliteInfoUI()
-    {
-    }
-
-// ---------------------------------------------------------
-// CSatelliteInfoUI::~CSatelliteInfoUI
-// ---------------------------------------------------------
-//
-EXPORT_C CSatelliteInfoUI::~CSatelliteInfoUI()
-    {
-    if ( iDestroyedPtr ) 
-        {
-        *iDestroyedPtr = ETrue;
-        }
-    delete iSatellite;
-    }
-
-// ---------------------------------------------------------
-// CSatelliteInfoUI::ExecuteLD
-// ---------------------------------------------------------
-//                       
-EXPORT_C TInt CSatelliteInfoUI::ExecuteLD( const TDesC& aNameOfRule )
-    {
-    if(aNameOfRule.Compare(KNullDesC) == 0 || aNameOfRule.Length() > 255 || aNameOfRule.Length() == 0)
-    	{
-    	delete this;
-    	User::Leave(KErrArgument);
-    	}
-    
-    TBool thisDestroyed = EFalse;
-    iDestroyedPtr = &thisDestroyed;
-    
-    CleanupStack::PushL( this );
-
-    TInt ret ( iSatellite->ExecuteL( aNameOfRule ) );
-
-    if ( thisDestroyed )
-        {
-        // this object has been deleted already
-        CleanupStack::Pop( this );
-        }
-    else
-        {
-        CleanupStack::PopAndDestroy(this); //this
-        }
-    return ret;
-    }
-
-// ----------------------------------------------------------------------------
-// CSatelliteInfoUI::HandleForegroundEventL
-// ----------------------------------------------------------------------------
-//
-EXPORT_C void CSatelliteInfoUI::HandleForegroundEventL(TBool aForeground)
-    {
-    if ( iSatellite )
-        {
-        iSatellite->HandleForegroundEventL( aForeground );
-        }
-    }
-
-// ----------------------------------------------------------------------------
-// CSatelliteInfoUI::SetLaunchView
-// ----------------------------------------------------------------------------
-//
-EXPORT_C void CSatelliteInfoUI::SetLaunchView(TSatelliteView aLaunchView)
-	{
-	switch(aLaunchView)
-	    {
-	    case ESatelliteFirmamentView:
-	        {
-		    iSatellite->SetLaunchView(EGraphicalView);
-	        break;
-	        }	    
-	    case ESatelliteSignalStrengthView:
-	        {
-		    iSatellite->SetLaunchView(ESignalStrengthView);
-	        break;
-	        }
-	    case ESatelliteCompassView:
-	        {
-                TInt error = KErrNone;
-                TInt returnCode = KErrNone;
-                TInt settingsValue = 0;
-		        CRepository* repository = NULL;
-	            TRAP(error, repository = CRepository::NewL( TUid::Uid( KCRUidLocLocalVariation) ));
-	            TRAP(error, CleanupStack::PushL( repository ); returnCode = repository->Get( KLocHideCoordinates,settingsValue );CleanupStack::PopAndDestroy( repository ) );
-	            if(returnCode != KErrNone)
-	                {
-	                return;
-	                }
-         
-	            if ( ELocCoordinatesHidden == settingsValue)
-	            {
-		             iSatellite->SetLaunchView(EGraphicalView);
-		             break;	
-	            }
-		    iSatellite->SetLaunchView(ECompassView);
-	        break;
-	        }
-	    default:
-	        {
-		    User::Panic(KSatellitePanic, EAknPanicOutOfRange);
-	        break;
-	        }
-	    }
-	}
-
-// End of File
--- a/locationsystemui/locationsysui/locblidsatelliteinfo/src/Debug.cpp	Mon May 03 12:54:42 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:  Contains debugging functions
-*
-*/
-
-
-
-// INCLUDE FILES
-#include "Debug.h"
-#include <flogger.h>
-#include <e32svr.h>
-
-// CONSTANTS
-#ifdef _DEBUG
-/// Folder where the log resides
-_LIT( KLogFolder, "BLID" );
-
-/// The name of the log file
-_LIT( KLogFileName, "BLID" );
-
-/// The format in which the time is formatted in log
-_LIT( KLogTimeFormat, "%02d.%02d:%02d:%06d ");
-
-/// The length of the string produced by KLocLogTimeFormat
-const TInt KLogTimeFormatLength = 16;
-
-/// How many characters a log line can contain
-const TInt KLogLineLength = 256;
-#endif
-// ========================== OTHER EXPORTED FUNCTIONS =========================
-
-#ifdef _DEBUG
-// -----------------------------------------------------------------------------
-// Debug
-// Generates a log file if c:\logs\BLID\ folder exists
-// -----------------------------------------------------------------------------
-//
-void Debug( TRefByValue<const TDesC> aText, ... )
-    {    
-    RDebug::Print(aText);
-
-    VA_LIST args;
-    VA_START( args, aText );
-
-    TBuf<KLogLineLength> buf;
-    buf.FormatList( aText, args );
-
-    RFileLogger logger;
-    TInt ret=logger.Connect();
-    if (ret==KErrNone)
-        {
-        logger.SetDateAndTime( EFalse,EFalse );
-        logger.CreateLog( KLogFolder, KLogFileName, EFileLoggingModeAppend );
-        TBuf<KLogTimeFormatLength> timeStamp;
-        TTime now;
-        now.HomeTime();
-        TDateTime dateTime;
-        dateTime = now.DateTime();
-        timeStamp.Format( KLogTimeFormat,
-            dateTime.Hour(), dateTime.Minute(),
-            dateTime.Second(), dateTime.MicroSecond() );
-        buf.Insert( 0, timeStamp );
-
-        logger.Write(buf);
-        }
-
-    logger.Close();
-
-    VA_END( args );    
-    }
-#endif
-
-//  End of File
--- a/locationsystemui/locationsysui/locblidsatelliteinfo/src/DllMain.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +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:  Dll entry point
-*
-*/
-
-
-// INCLUDE FILES
-#include "DllMain.h"
-
-// ================= MEMBER FUNCTIONS =======================
-// ----------------------------------------------------------------------------
-// SatelliteDataPanic
-// ----------------------------------------------------------------------------
-//
-void SatellitePanic( TInt aCode ) // panic code
-    {
-    _LIT( KPanicText, "SatelliteData" );
-    User::Panic( KPanicText, aCode );
-    }
-
-// End of File
--- a/locationsystemui/locationsysui/locblidsatelliteinfo/src/csatellitemeasurementsetting.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,167 +0,0 @@
-/*
-* Copyright (c) 2008 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:  Adapter for System of Measurement.
-*
-*/
-
-
-// System Include
-#include <centralrepository.h>
-
-// INCLUDE FILES
-#include "csatellitemeasurementsetting.h"
-#include "msatellitemeasurementsettingobserver.h"
-
-// CONSTANTS
-
-
-// ============================ MEMBER FUNCTIONS ==============================
-
-// ---------------------------------------------------------------------------
-// CSatelliteMeasurementSetting::CSatelliteMeasurementSetting
-// Overloaded Constructor
-//
-// ---------------------------------------------------------------------------
-//	
-CSatelliteMeasurementSetting::CSatelliteMeasurementSetting(  
-                                MSatelliteMeasurementSettingObserver&	aAdapterObsrv )
-	:CActive(EPriorityStandard),
-	iObserver(aAdapterObsrv)
-	{
-	}
-
-// ---------------------------------------------------------------------------
-// CSatelliteMeasurementSetting::~CSatelliteMeasurementSetting
-// Destructor
-//
-// ---------------------------------------------------------------------------
-//
-CSatelliteMeasurementSetting::~CSatelliteMeasurementSetting()
-	{
-	Cancel();
-	delete iRepository;
-	}
-	
-// ---------------------------------------------------------------------------
-// CSatelliteMeasurementSetting* CSatelliteMeasurementSetting::NewL
-// Creates new System of Measurement Adapter
-// ---------------------------------------------------------------------------
-//    
-CSatelliteMeasurementSetting* CSatelliteMeasurementSetting::NewL( 
-                            MSatelliteMeasurementSettingObserver&	aAdapterObsrv )
-	{	
-    CSatelliteMeasurementSetting* self = 
-                        CSatelliteMeasurementSetting::NewLC( aAdapterObsrv );
-	CleanupStack::Pop(self);
-	return self;
-	}
-
-// ---------------------------------------------------------------------------
-// CSatelliteMeasurementSetting* CSatelliteMeasurementSetting::NewLC
-// Creates new System of Measurement Adapter. Leaves the object on the clean-up
-// stack
-// ---------------------------------------------------------------------------
-// 
-CSatelliteMeasurementSetting* CSatelliteMeasurementSetting::NewLC( 
-                            MSatelliteMeasurementSettingObserver&	aAdapterObsrv )
-	{	
-    CSatelliteMeasurementSetting* self = 
-                        new(ELeave) CSatelliteMeasurementSetting( aAdapterObsrv );
-	CleanupStack::PushL(self);
-	self->ConstructL();
-	return self;
-	}
-	
-// ---------------------------------------------------------------------------
-// void CSatelliteMeasurementSetting::ConstructL
-// Second Phase Constructor
-//
-// ---------------------------------------------------------------------------
-//
-void CSatelliteMeasurementSetting::ConstructL()
-	{
-	CActiveScheduler::Add( this );
-	
-	// Create the Central repository object for manipulating Avkon Central
-	// repository for System of measurements settings
-	iRepository = CRepository::NewL(TUid::Uid( KCRUidLocNotationPref ));
-	
-	StartNotification();	
-	}
-
-// ---------------------------------------------------------------------------
-// TReal32 CSatelliteMeasurementSetting::SysofMeasurementL
-// Returns the current value of the System of measurements settings
-//
-// @return TLocSystemofMeasurementValues  Current value of the 
-// 																				System of measurements settings
-// ---------------------------------------------------------------------------
-//
-TLocSystemofMeasurementValues CSatelliteMeasurementSetting::SysofMeasurementL()
-    {
-    
-    TInt settingsValue = 0;
-    User::LeaveIfError( iRepository->Get( KLocSystemofMeasurements,
-                                          settingsValue ));  
-    return ( static_cast<TLocSystemofMeasurementValues>( settingsValue ));
-    }
-
-	    
-// --------------------------------------------------------------------------
-// void CSatelliteMeasurementSetting::RunL
-// Inherited from CActive
-//
-// ---------------------------------------------------------------------------
-//
-void CSatelliteMeasurementSetting::RunL()
-    {
-    // Issue Notification
-    iObserver.HandleSysMeasureValueL();
-    
-    // Schedule for listening to change events again
-    StartNotification();
-    }
-
-// --------------------------------------------------------------------------
-// void CSatelliteMeasurementSetting::DoCancel
-// Inherited from CActive
-//
-// ---------------------------------------------------------------------------
-//
-void CSatelliteMeasurementSetting::DoCancel()
-    {
-    // Cancel the outstanding CR notification request
-    iRepository->NotifyCancel( KLocSystemofMeasurements );
-    }
-    
-// --------------------------------------------------------------------------
-// void CSatelliteMeasurementSetting::StartNotification
-// Start notification from the Central repository server for any changes in the
-// System of measurements key value
-//
-// ---------------------------------------------------------------------------
-//
-void CSatelliteMeasurementSetting::StartNotification()
-    {
-    if( !IsActive())
-        {
-        iStatus = KRequestPending;
-        // Request for notification
-        iRepository->NotifyRequest( KLocSystemofMeasurements, iStatus);
-        SetActive();          
-        }  
-    }
-	
-// End of File
-
--- a/locationsystemui/locationsysui/locblidsatelliteinfo/src/satellitecontrol.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1447 +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: 
-*     Implements the control for responsible for all drawings
-*     in the satellite dialog
-*
-*/
-
-
-// INCLUDE FILES
-#include <skinlayout.cdl.h>
-#include <AknsSkinInstance.h>
-#include <AknsUtils.h>
-#include <AknsDrawUtils.h>
-#include <StringLoader.h>
-#include <AknsFrameBackgroundControlContext.h>
-#include <aknlayoutscalable_avkon.cdl.h>
-#include <aknViewAppUi.h>
-#include <aknlayoutscalable_apps.cdl.h>
-#include <SatInfo.rsg>
-#include <AknBidiTextUtils.h>
-#include <lbssatellite.h>
-#include <satellite.mbg>
-#include <eikapp.h>
-#include <AknLayout2Def.h>
-#include <layoutmetadata.cdl.h>
-//===HEADER FILE INCLUDED FOR HACK=======
-#include <AknLayoutFont.h>
-#include <aknlocationed.h>
-// header file added for multiple drive support.
-#include <pathinfo.h>
-
-#ifdef RD_TACTILE_FEEDBACK
-#include <touchfeedback.h>
-#endif //RD_TACTILE_FEEDBACK
-
-#include "satellitecontrol.h"
-
-#include  <centralrepository.h>
-#include <locationvariationdomaincrkeys.h>
-// ================= MEMBER FUNCTIONS =======================
-
-// ---------------------------------------------------------
-// CSatelliteControl::CSatelliteControl
-// ---------------------------------------------------------
-//
-CSatelliteControl::CSatelliteControl(MSatelliteEng& aEngine): iEngine(aEngine)               
-    {
-    //By defaul start with signal strength view
-    iCurrentSatelliteView = ESignalStrengthView;
-    iSatelliteSignalHeading = NULL;
-    iSatelliteGrapgicHeading = NULL;
-    }
-
-// ---------------------------------------------------------
-// CSatelliteControl::~CSatelliteControl
-// ---------------------------------------------------------
-//
-CSatelliteControl::~CSatelliteControl()
-    {    
-    AknsUtils::DeregisterControlPosition(this);
-    delete iEditorContext;
-    delete iSatelliteSignalHeading;
-    delete iSatelliteGrapgicHeading;
-    delete iCompassViewHeading;
-    delete iNoSatelliteData;
-    delete iSatActiveBmp;
-    delete iSatActiveBmpMask;
-    delete iSatInActiveBmp;
-    delete iSatInActiveBmpMask;
-    delete iSatFrame;
-    delete iSatFrameMask;
-    delete iFirmamentBmp;
-    delete iFirmamentBmpMask;
-    delete iFirmaActiveBmp;
-    delete iFirmaActiveBmpMask;
-    delete iFirmaInActiveBmp;
-    delete iFirmaInActiveBmpMask;
-    delete iSunBmp;
-    delete iSunBmpMask;
-    delete iMoonBmp;
-    delete iMoonBmpMask;
-    delete iFirmamentCompassBmp;
-    delete iFirmamentCompassBmpMask;
-    delete iFixBmp;
-    delete iFixBmpMask;
-	delete iAltitudeWindowHeading;
-	delete iSpeedWindowHeading;
-	delete iDirectionWindowHeading;
-	delete iSpeedFormatKmph;
-	delete iSpeedFormatMph;
-	delete iAltitudeFormatM;
-	delete iAltitudeFormatFt;
-	delete iDirectionFormat;
-    delete iCompassNorth;
-    delete iCompassSouth;
-    delete iCompassWest;
-	delete iCompassEast;
-    delete iNorth;
-    delete iSouth;
-    delete iWest;
-	delete iEast;
-	delete i2DString;
-	delete i3DString;
-    iSignalBarRects.Reset();
-    iSatelliteNumberLayouts.Reset();
-    }
-
-// ---------------------------------------------------------
-// CSatelliteControl::NewL
-// ---------------------------------------------------------
-//
-CSatelliteControl* CSatelliteControl::NewL(MSatelliteEng& aEngine)
-    {
-    CSatelliteControl* self =
-        new(ELeave) CSatelliteControl(aEngine);
-    CleanupStack::PushL( self );
-    self->ConstructL();
-    CleanupStack::Pop();    // self    
-    return self;
-    }
-
-// ---------------------------------------------------------
-// CSatelliteControl::CountComponentControls
-// ---------------------------------------------------------
-//
-TInt CSatelliteControl::CountComponentControls() const
-    {
-    //No additional controls. All the drawing is done
-    //by one control. Helps reduce flickering
-    return 0;
-    }
-
-// ---------------------------------------------------------
-// CSatelliteControl::ComponentControl
-// ---------------------------------------------------------
-//
-CCoeControl* CSatelliteControl::ComponentControl( TInt /*aIndex*/ ) const
-    {
-    return NULL;
-    }
-
-// ---------------------------------------------------------
-// CSatelliteControl::FocusChanged
-// ---------------------------------------------------------
-//
-void CSatelliteControl::FocusChanged( TDrawNow /*aDrawNow*/ )
-    {
-    //No implemenation here for focus change
-    }
-
-// ---------------------------------------------------------
-// CSatelliteControl::MinimumSize
-// ---------------------------------------------------------
-//
-TSize CSatelliteControl::MinimumSize()
-    {    
-	TRect rect = CalculateDialogRect();
-    TSize size = rect.Size();
-    return size;
-    }
-
-// ---------------------------------------------------------
-// CSatelliteControl::DialogRect
-// ---------------------------------------------------------
-//
-TRect CSatelliteControl::DialogRect() const
-    {    
-    return CalculateDialogRect();
-    }
-
-// ---------------------------------------------------------
-// CSatelliteControl::DialogSize
-// ---------------------------------------------------------
-//
-TSize CSatelliteControl::DialogSize() const
-    {
-	TRect rect = CalculateDialogRect();
-	return (TSize(rect.Size()));
-    }
-
-// ---------------------------------------------------------
-// CSatelliteControl::WindowLayout
-// ---------------------------------------------------------
-//
-TAknWindowLineLayout CSatelliteControl::WindowLayout() const
-    {
-    //Get the dialogs layout and return it.
-    AknLayoutUtils::TAknCbaLocation cbaLocation( AknLayoutUtils::CbaLocation() );
-    TInt variety(0);
-    
-    //Varient for LAF changes based on the location of the softkeys
-    if(Layout_Meta_Data::IsLandscapeOrientation())		
-        {
-        if ( cbaLocation == AknLayoutUtils::EAknCbaLocationRight )
-    		{
-    		variety = 1;
-    		}
-    	else if ( cbaLocation == AknLayoutUtils::EAknCbaLocationLeft )
-    		{
-    		variety = 2;
-    		}
-        }
-    else
-        {
-        variety = 0;
-        }        
-	
-	//Return the layout line of the dialog from LAF
-    return AknLayoutScalable_Apps::popup_blid_sat_info2_window(variety).LayoutLine();
-    }
-
-// ----------------------------------------------------------------------------
-// CSatelliteControl::CalculateDialogRect
-// Calculates rectangle according to current LAF information.
-// ----------------------------------------------------------------------------
-//
-TRect CSatelliteControl::CalculateDialogRect() const
-    {
-    TRect mainPaneRect;
-    TRect screenRect;
-    TInt variety(0);
-    TAknLayoutRect mainPane;
-    
-    AknLayoutUtils::TAknCbaLocation cbaLocation( AknLayoutUtils::CbaLocation() );
-    if( Layout_Meta_Data::IsLandscapeOrientation() )	 	
-        {
-        if ( cbaLocation == AknLayoutUtils::EAknCbaLocationRight )
-    		{
-    		screenRect = iAvkonAppUi->ApplicationRect();
-    		variety = 1;
-    		mainPane.LayoutRect( screenRect, AknLayoutScalable_Apps::main_pane( 13 ) );           
-		mainPaneRect = mainPane.Rect();
-    		}
-    	else if ( cbaLocation == AknLayoutUtils::EAknCbaLocationLeft )
-    		{
-    		variety = 2;
-    		mainPaneRect = iAvkonAppUi->ClientRect();
-    		}
-    	else if ( cbaLocation == AknLayoutUtils::EAknCbaLocationBottom )
-    		{
-	        variety = 0;
-	    	AknLayoutUtils::LayoutMetricsRect( AknLayoutUtils::EMainPane, mainPaneRect );
-    		}    		
-        }
-    else
-        {
-        variety = 0;
-        AknLayoutUtils::LayoutMetricsRect( AknLayoutUtils::EMainPane, mainPaneRect );
-        }    
-    
-    TAknLayoutRect mainSatPane;
-    mainSatPane.LayoutRect( mainPaneRect, AknLayoutScalable_Apps::popup_blid_sat_info2_window( variety ) );
-      
-    return mainSatPane.Rect();
-    
-    }
-// ---------------------------------------------------------
-// CBlidManualWayPointCtrl::Layout
-// ---------------------------------------------------------
-//
-void CSatelliteControl::Layout()
-    {
-    SizeChanged();
-    }
-
-// ---------------------------------------------------------
-// CBlidManualWayPointCtrl::ChangeView
-// ---------------------------------------------------------
-//
-void CSatelliteControl::ChangeView()
-	{
-    // Change the view variable and update the rects
-	switch ( iCurrentSatelliteView )
-	    {
-	    case ESignalStrengthView:
-	        {
-	        iCurrentSatelliteView = EGraphicalView;
-	        break;
-	        }	    
-	    case EGraphicalView:
-	        {
-	        TInt settingsValue = 0;
-            CRepository* repository = CRepository::NewL( TUid::Uid( KCRUidLocLocalVariation) );
-            CleanupStack::PushL( repository );
-            User::LeaveIfError( repository->Get( KLocHideCoordinates,
-                                                      settingsValue ));  
-            CleanupStack::PopAndDestroy( repository );
-            
-            if ( ELocCoordinatesHidden == settingsValue)
-            {
-            	 iCurrentSatelliteView = ESignalStrengthView;
-            }
-            else
-           {
-           		iCurrentSatelliteView = ECompassView;
-           }
-	        break;
-	        }
-	    case ECompassView:
-	        {
-	        iCurrentSatelliteView = ESignalStrengthView;
-	        break;
-	        }
-	    default:
-	        {
-	        break;
-	        }
-	    }	
-	}
-
-// ---------------------------------------------------------
-// CSatelliteControl::SetLaunchView
-// ---------------------------------------------------------
-//
-void CSatelliteControl::SetLaunchView(TSatDialogView aView)
-	{
-	iCurrentSatelliteView = aView;
-	}
-
-// ---------------------------------------------------------
-// CSatelliteControl::PrepareGraphicalViewIcons
-// ---------------------------------------------------------
-//
-void CSatelliteControl::PrepareGraphicalViewIcons()
-	{
-	AknIconUtils::SetSize(iFirmamentBmp, iFirmamentRect.Size());
-	AknIconUtils::SetSize(iFirmamentBmpMask, iFirmamentRect.Size());
-	
-	AknIconUtils::SetSize(iFirmaActiveBmp, iSatelliteRect.Size());
-	AknIconUtils::SetSize(iFirmaActiveBmpMask, iSatelliteRect.Size());
-	AknIconUtils::SetSize(iFirmaInActiveBmp, iSatelliteRect.Size());
-	AknIconUtils::SetSize(iFirmaInActiveBmpMask, iSatelliteRect.Size());	
-	
-	AknIconUtils::SetSize(iMoonBmp, iSunMoonRect.Size());
-	AknIconUtils::SetSize(iMoonBmpMask, iSunMoonRect.Size());
-	AknIconUtils::SetSize(iSunBmp, iSunMoonRect.Size());
-	AknIconUtils::SetSize(iSunBmpMask, iSunMoonRect.Size());
-	}
-
-// ---------------------------------------------------------
-// CSatelliteControl::PrepareSignalStrengthViewIcons
-// ---------------------------------------------------------
-//
-void CSatelliteControl::PrepareSignalStrengthViewIcons()
-	{	
-    if(!iSignalBarRects.Count())
-    	{
-    	return;
-    	}
-    	    
-	TRect rect = iSignalBarRects[1];
-	AknIconUtils::SetSize(iSatFrame, rect.Size());
-	AknIconUtils::SetSize(iSatFrameMask, rect.Size());
-	}
-
-// ---------------------------------------------------------
-// CSatelliteDialog::PrepareCompassViewIcons
-// ---------------------------------------------------------
-//    
-void CSatelliteControl::PrepareCompassViewIcons()
-    {  	
-	AknIconUtils::SetSize(iFirmamentCompassBmp, iFirmamentCompassRect.Size());
-	AknIconUtils::SetSize(iFirmamentCompassBmpMask, iFirmamentCompassRect.Size());
-	
-	AknIconUtils::SetSize(iFixBmp, iTypeRect.Size());
-	AknIconUtils::SetSize(iFixBmpMask, iTypeRect.Size());
-    }
-
-// ---------------------------------------------------------
-// CSatelliteControl::PrepareSignalStrengthViewRectsAndIcons
-// ---------------------------------------------------------
-//
-void CSatelliteControl::PrepareSignalStrengthViewRectsAndIcons()
-	{
-	iSignalBarRects.Reset();
-    iSatelliteNumberLayouts.Reset();
-	TAknLayoutScalableParameterLimits paramLimits;
-	paramLimits = AknLayoutScalable_Apps::cell_popup_blid_pane_ParamLimits();
-	
-	TInt numberOfRows = paramLimits.LastRow() - paramLimits.FirstRow();	
-	TInt numberOfColumns = paramLimits.LastColumn() - paramLimits.FirstColumn();
-	
-	TAknLayoutRect layoutWindow;
-    layoutWindow.LayoutRect(Rect(), AknLayoutScalable_Apps::grid_popup_blid_pane().LayoutLine());	
-    TRect gridRect = layoutWindow.Rect();
-	
-	iNumberOfRows = paramLimits.LastRow() - paramLimits.FirstRow() + 1;
-	iNumberOfColumns = paramLimits.LastColumn() - paramLimits.FirstColumn() + 1;
-	
-	for(TInt row = paramLimits.FirstRow() ; row <= paramLimits.LastRow(); ++row)
-		{
-		for(TInt column = paramLimits.FirstColumn() ; column <= paramLimits.LastColumn(); ++column)
-			{
-			// First get and save the rects of the signal bars
-			layoutWindow.LayoutRect(gridRect, AknLayoutScalable_Apps::cell_popup_blid_pane(column, row).LayoutLine());
-			TRect cellRect = layoutWindow.Rect();
-			
-			layoutWindow.LayoutRect(cellRect, AknLayoutScalable_Apps::cell_popup_blid_pane_g1().LayoutLine());
-			TRect barRect = layoutWindow.Rect();
-			iSignalBarRects.Append(barRect);
-			
-			// Save the layouts of the satellite numbers
-			TAknLayoutText satNumberLayout;
-			satNumberLayout.LayoutText(cellRect, AknLayoutScalable_Apps::cell_popup_blid_pane_t1().LayoutLine());			
-			iSatelliteNumberLayouts.Append(satNumberLayout);
-			}
-		}
-	PrepareSignalStrengthViewIcons();
-	}
-
-// ---------------------------------------------------------
-// CSatelliteControl::PrepareGraphicalViewRectsAndIcons
-// ---------------------------------------------------------
-//
-void CSatelliteControl::PrepareGraphicalViewRectsAndIcons()
-	{
-	TAknLayoutRect layoutWindow;
-    layoutWindow.LayoutRect(Rect(), 
-    						AknLayoutScalable_Apps::blid_firmament_pane().LayoutLine());
-	    						
-	// Rect to draw the firmament
-    iFirmamentRect = layoutWindow.Rect();
-    
-    layoutWindow.LayoutRect(iFirmamentRect,
-    						AknLayoutScalable_Apps::aid_firma_cardinal().LayoutLine());
-        
-    //Layout to draw the cardinal point W
-    iCardinalWLayout.LayoutText(iFirmamentRect, 
-    					  		AknLayoutScalable_Apps::blid_firmament_pane_t1().LayoutLine());    
-    
-    //Layout to draw the cardinal point E
-    iCardinalELayout.LayoutText(iFirmamentRect, 
-    					  		AknLayoutScalable_Apps::blid_firmament_pane_t2().LayoutLine());
-
-	//Layout to draw the cardinal point N
-	iCardinalNLayout.LayoutText(iFirmamentRect, 
-    					  		AknLayoutScalable_Apps::blid_firmament_pane_t3().LayoutLine());
-
-	//Layout to draw the cardinal point S		
-	iCardinalSLayout.LayoutText(iFirmamentRect, 
-    					  		AknLayoutScalable_Apps::blid_firmament_pane_t4().LayoutLine());
-
-	layoutWindow.LayoutRect(iFirmamentRect, 
-    						AknLayoutScalable_Apps::blid_sat_info_pane().LayoutLine());
-    
-    // Parent rect to get the rects of satellites, sun and moon
-    TRect parentRect = layoutWindow.Rect();
-    
-    layoutWindow.LayoutRect(parentRect,
-    						AknLayoutScalable_Apps::blid_sat_info_pane_g1().LayoutLine());
-    
-    iSatelliteRect = layoutWindow.Rect();
-    
-    layoutWindow.LayoutRect(parentRect, 
-    						AknLayoutScalable_Apps::blid_sat_info_pane_g2().LayoutLine());
-	
-	iSunMoonRect = layoutWindow.Rect();	
-	PrepareGraphicalViewIcons();
-	}
-
-// ---------------------------------------------------------
-// CSatelliteDialog::PrepareCompassViewRectsAndIcons
-// ---------------------------------------------------------
-//    
-void CSatelliteControl::PrepareCompassViewRectsAndIcons()
-    {
-
-	TAknLayoutRect layoutWindow;
-	TRect parenRect = Rect();
-	
-    layoutWindow.LayoutRect(parenRect, 
-    						AknLayoutScalable_Apps::blid_firmament_pane(1).LayoutLine());
-	    						
-	// Rect to draw the firmament
-    iFirmamentCompassRect = layoutWindow.Rect();
-    
-    layoutWindow.LayoutRect(iFirmamentCompassRect,
-    						AknLayoutScalable_Apps::aid_firma_cardinal(1).LayoutLine());
-        
-    //Layout to draw the cardinal point W
-    iCardinalCompassWLayout.LayoutText(iFirmamentCompassRect, 
-    					  		AknLayoutScalable_Apps::blid_firmament_pane_t1(1).LayoutLine());    
-    
-    //Layout to draw the cardinal point E
-    iCardinalCompassELayout.LayoutText(iFirmamentCompassRect, 
-    					  		AknLayoutScalable_Apps::blid_firmament_pane_t2(1).LayoutLine());
-
-	//Layout to draw the cardinal point N
-	iCardinalCompassNLayout.LayoutText(iFirmamentCompassRect, 
-    					  		AknLayoutScalable_Apps::blid_firmament_pane_t3(1).LayoutLine());
-
-	//Layout to draw the cardinal point S		
-	iCardinalCompassSLayout.LayoutText(iFirmamentCompassRect, 
-    					  		AknLayoutScalable_Apps::blid_firmament_pane_t4(1).LayoutLine());
-
-	// Rect to draw the Type
-    layoutWindow.LayoutRect(parenRect, 
-    						AknLayoutScalable_Apps::popup_blid_sat_info2_window_g1(0).LayoutLine());
-	    			
-	// Rect to draw the Fix Type graphic			
-    iTypeRect = layoutWindow.Rect();
-    
-	// Rect to draw the Fix Type Text - 2D/3D
-    iFixTypeLayout.LayoutText(parenRect, 
-    					  		AknLayoutScalable_Apps::popup_blid_sat_info2_window_t11(0).LayoutLine());
-    
-	// Rect to draw the Latitude
-    iLatitudeWindowLayout.LayoutText(parenRect, 
-    						AknLayoutScalable_Apps::popup_blid_sat_info2_window_t3(0).LayoutLine());
-
-	// Rect to draw the Longitude
-    iLongitudeWindowLayout.LayoutText(parenRect, 
-    						AknLayoutScalable_Apps::popup_blid_sat_info2_window_t4(0).LayoutLine());
-
-	// Rect to draw the Heading. Altitude.
-    iAltitudeWindowHeadingLayout.LayoutText(parenRect, 
-    						AknLayoutScalable_Apps::popup_blid_sat_info2_window_t5(0).LayoutLine());
-
-	// Rect to draw the Value. Altitude.
-    iAltitudeWindowValueLayout.LayoutText(parenRect, 
-    						AknLayoutScalable_Apps::popup_blid_sat_info2_window_t6(0).LayoutLine());
-
-	// Rect to draw the Heading. Speed.
-    iSpeedWindowHeadingLayout.LayoutText(parenRect, 
-    						AknLayoutScalable_Apps::popup_blid_sat_info2_window_t7(0).LayoutLine());
-
-	// Rect to draw the Value. Speed.
-    iSpeedWindowValueLayout.LayoutText(parenRect, 
-    						AknLayoutScalable_Apps::popup_blid_sat_info2_window_t8(0).LayoutLine());
-
-	// Rect to draw the Heading. Direction.
-    iDirectionWindowHeadingLayout.LayoutText(parenRect, 
-    						AknLayoutScalable_Apps::popup_blid_sat_info2_window_t9(0).LayoutLine());
-
-	// Rect to draw the Value. Direction.
-    iDirectionWindowValueLayout.LayoutText(parenRect, 
-    						AknLayoutScalable_Apps::popup_blid_sat_info2_window_t10(0).LayoutLine());
- 
-    PrepareCompassViewIcons();    
-    }
-    
-// ---------------------------------------------------------
-// CSatelliteControl::ConstructL
-// ---------------------------------------------------------
-//
-void CSatelliteControl::ConstructL( )
-	{    
-    iSatelliteSignalHeading = iEikonEnv->AllocReadResourceL( R_BLID_SAT_HEADING_SIGNALS );
-    iSatelliteGrapgicHeading = iEikonEnv->AllocReadResourceL( R_BLID_SAT_HEADING_GRAPHIC );
-	iCompassViewHeading = iEikonEnv->AllocReadResourceL( R_BLID_SAT_HEADING_COMPASS );
-	
-	iNoSatelliteData = iEikonEnv->AllocReadResourceL( R_BLID_NOTE_NO_SATELLITE_DATA );
-
-	// Altitude,Speed and Direction Strings for Compass View
-    iAltitudeWindowHeading = iEikonEnv->AllocReadResourceL( R_BLID_SAT_COMPASS_ALTITUDE );
-    iSpeedWindowHeading = iEikonEnv->AllocReadResourceL( R_BLID_SAT_COMPASS_SPEED );
-	iDirectionWindowHeading = iEikonEnv->AllocReadResourceL( R_BLID_SAT_COMPASS_DIRECTION );
-
-    iSpeedFormatKmph = iEikonEnv->AllocReadResourceL( R_BLID_SAT_METRIC_SPEED );
-    iSpeedFormatMph = iEikonEnv->AllocReadResourceL( R_BLID_SAT_IMPERIAL_SPEED );
-    iAltitudeFormatM = iEikonEnv->AllocReadResourceL( R_BLID_SAT_METRIC_METER );
-    iAltitudeFormatFt = iEikonEnv->AllocReadResourceL( R_BLID_SAT_IMPERIAL_FOOT );
-    iDirectionFormat = iEikonEnv->AllocReadResourceL( R_BLID_SAT_DEGREE );
-
-
-	MAknsSkinInstance* skin = AknsUtils::SkinInstance();
-		
-	/* Icons for signal strength view */
-	// Code added foe multiple drive support.
-	TBuf<KMaxFileName> iconFileName;
-	iconFileName.Zero();
-	iconFileName.Append( PathInfo::RomRootPath()[0]);
-	iconFileName.Append(KBlidSatSystemIconPath);
-	
-	// Satellite Active signal bar
-	AknsUtils::CreateIconL( skin,
-                            KAknsIIDQgnPropBlidActive,		                    
-		                    iSatActiveBmp,
-		                    iSatActiveBmpMask,
-		                    iconFileName,
-		                    EMbmSatelliteQgn_prop_blid_active,
-		                    EMbmSatelliteQgn_prop_blid_active_mask );
-	
-	// Satellite In-Active signal bar
-	AknsUtils::CreateIconL( skin,
-                            KAknsIIDQgnPropBlidInactive,		                    
-		                    iSatInActiveBmp,
-		                    iSatInActiveBmpMask,
-		                    iconFileName,
-		                    EMbmSatelliteQgn_prop_blid_inactive,
-		                    EMbmSatelliteQgn_prop_blid_inactive_mask );
-	
-	// Satellite Frame bar
-	AknsUtils::CreateIconL( skin,
-                            KAknsIIDQgnPropBlidBg,		                    
-		                    iSatFrame,
-		                    iSatFrameMask,
-		                    iconFileName,
-		                    EMbmSatelliteQgn_prop_blid_bg,
-		                    EMbmSatelliteQgn_prop_blid_bg_mask );
-
-	/* Icons for firmament view */
-	
-	// Icon for the firmament
-	AknsUtils::CreateIconL( skin,
-                            KAknsIIDQgnIndiBlidSatFirmaCenter,		                    
-		                    iFirmamentBmp,
-		                    iFirmamentBmpMask,
-		                    iconFileName,
-		                    EMbmSatelliteQgn_prop_blid_sat_firma,
-		                    EMbmSatelliteQgn_prop_blid_sat_firma_mask );
-	
-	// Icon for active satellite
-	AknsUtils::CreateIconL( skin,
-                            KAknsIIDQgnIndiBlidSatFirmaActive,		                    
-		                    iFirmaActiveBmp,
-		                    iFirmaActiveBmpMask,
-		                    iconFileName,
-		                    EMbmSatelliteQgn_prop_blid_sat_firma_active,
-		                    EMbmSatelliteQgn_prop_blid_sat_firma_active_mask );
-	
-	// Icon for In-Active satellite
-	AknsUtils::CreateIconL( skin,
-                            KAknsIIDQgnIndiBlidSatFirmaInact,		                    
-		                    iFirmaInActiveBmp,
-		                    iFirmaInActiveBmpMask,
-		                    iconFileName,
-		                    EMbmSatelliteQgn_prop_blid_sat_firma_inact,
-		                    EMbmSatelliteQgn_prop_blid_sat_firma_inact_mask );
-	
-	// Icon for the sun
-	AknsUtils::CreateIconL( skin,
-                            KAknsIIDQgnIndiBlidSatFirmaSun,		                    
-		                    iSunBmp,
-		                    iSunBmpMask,
-		                    iconFileName,
-		                    EMbmSatelliteQgn_prop_blid_sat_firma_sun,
-		                    EMbmSatelliteQgn_prop_blid_sat_firma_sun_mask );
-	
-	// Icon for the moon
-	AknsUtils::CreateIconL( skin,
-                            KAknsIIDQgnIndiBlidSatFirmaMoon,		                    
-		                    iMoonBmp,
-		                    iMoonBmpMask,
-		                    iconFileName,
-		                    EMbmSatelliteQgn_prop_blid_sat_firma_moon,
-		                    EMbmSatelliteQgn_prop_blid_sat_firma_moon_mask );
-	
-	/* Icons for Compass view */
-	
-	// Icon for the firmament
-	AknsUtils::CreateIconL( skin,
-                            KAknsIIDQgnGrafBlid,		                    
-		                    iFirmamentCompassBmp,
-		                    iFirmamentCompassBmpMask,
-		                    iconFileName,
-		                    EMbmSatelliteQgn_graf_blid,
-		                    EMbmSatelliteQgn_graf_blid_mask );
-		                    
-	// Icon for the Type of Fix
-	AknsUtils::CreateIconL( skin,
-                            KAknsIIDQgnGrafBlidRingfix,		                    
-		                    iFixBmp,
-		                    iFixBmpMask,
-		                    iconFileName,
-		                    EMbmSatelliteQgn_graf_blid_ringfix,
-		                    EMbmSatelliteQgn_graf_blid_ringfix_mask );
-
-	//Type of Fix to be display on the Fix Ring
-	i2DString = StringLoader::LoadL( R_BLID_SAT_COMPASS_2D, iEikonEnv );
-    i3DString = StringLoader::LoadL( R_BLID_SAT_COMPASS_3D, iEikonEnv );
-
-	//Cardinal points text to be display on the Compass firmament
-	iCompassNorth = StringLoader::LoadL( R_BLID_SAT_COMPASS_NORTH, iEikonEnv );
-    iCompassSouth = StringLoader::LoadL( R_BLID_SAT_COMPASS_SOUTH, iEikonEnv );
-    iCompassWest = StringLoader::LoadL( R_BLID_SAT_COMPASS_WEST, iEikonEnv );
-    iCompassEast = StringLoader::LoadL( R_BLID_SAT_COMPASS_EAST, iEikonEnv );
-
-	//Cardinal points text to be display on the Graphic firmament
-	iNorth = StringLoader::LoadL( R_BLID_SAT_SYMBOL_NORTH, iEikonEnv );
-    iSouth = StringLoader::LoadL( R_BLID_SAT_SYMBOL_SOUTH, iEikonEnv );
-    iWest = StringLoader::LoadL( R_BLID_SAT_SYMBOL_WEST, iEikonEnv );
-    iEast = StringLoader::LoadL( R_BLID_SAT_SYMBOL_EAST, iEikonEnv );
-    }
-
-// ---------------------------------------------------------
-// CSatelliteControl::ConstructFromResourceL
-// ---------------------------------------------------------
-//
-void CSatelliteControl::ConstructFromResourceL(TResourceReader& /*aReader*/)
-    {
-    MAknsSkinInstance* skin = AknsUtils::SkinInstance();
-    MAknsControlContext* cc = AknsDrawUtils::ControlContext( this );
-	iEditorContext = CAknsFrameBackgroundControlContext::NewL(
-        KAknsIIDQsnFrInput, TRect(0,0,1,1), TRect(0,0,1,1), EFalse );
-    ActivateL();
-    }
-
-// ---------------------------------------------------------
-// CSatelliteControl::SizeChanged
-// ---------------------------------------------------------
-//
-void CSatelliteControl::SizeChanged()
-    {    
-    AknsUtils::RegisterControlPosition(this);
-    TAknLayoutRect topLeft;
-    TAknLayoutRect bottomRight;
-    
-    topLeft.LayoutRect(Rect(), SkinLayout::Input_field_skin_placing__general__Line_2());                
-    bottomRight.LayoutRect(TRect(Rect().iBr, Rect().iBr), SkinLayout::Input_field_skin_placing__general__Line_5());
-
-    TRect outerRect = TRect(topLeft.Rect().iTl, bottomRight.Rect().iBr);
-    TRect innerRect = TRect(topLeft.Rect().iBr, bottomRight.Rect().iTl);
-
-    iEditorContext->SetFrameRects( outerRect, innerRect );
-    // Chain with the background (since the frame doesn't occupy the entire
-    // layout and it may even be transparent)
-    iEditorContext->SetParentContext( AknsDrawUtils::ControlContextOfParent( this ) );        
-    PrepareSignalStrengthViewRectsAndIcons();
-    PrepareGraphicalViewRectsAndIcons();
-    PrepareCompassViewRectsAndIcons();
-    DrawNow();
-    }
-
-// ---------------------------------------------------------
-// CSatelliteControl::MopSupplyObject
-// ---------------------------------------------------------
-//
-TTypeUid::Ptr CSatelliteControl::MopSupplyObject( TTypeUid aId )
-    {
-    CCoeControl::MopSupplyObject( aId );
-    return MAknsControlContext::SupplyMopObject( aId,  iEditorContext );
-    }
-
-// ---------------------------------------------------------
-// CSatelliteControl::Draw
-// ---------------------------------------------------------
-//
-void CSatelliteControl::Draw(const TRect& /*aRect*/) const
-    {
-    CWindowGc& gc=SystemGc();
-    TRect rect(Rect());
-    MAknsSkinInstance* skin = AknsUtils::SkinInstance();
-    MAknsControlContext* cc = AknsDrawUtils::ControlContext( this );
-    AknsDrawUtils::Background( skin, cc, this, gc, rect, KAknsDrawParamNoClearUnderImage);
-    
-    //First draw the heading
-    TRAP_IGNORE(DrawHeadingL());
-    
-    if(!iEngine.IsSatelliteDataAvailable())
-    	{
-    	//Draw the empty string "No satellite data" string in the dialog
-    	TRAP_IGNORE(DrawEmptyDialogL());
-    	return;
-    	}
-    
-	switch ( iCurrentSatelliteView )
-	    {
-	    case ESignalStrengthView:
-	        {
-    		//Draw the signal strength view
-    		TRAP_IGNORE(DrawSignalStrengthViewL());
-	        break;
-	        }	    
-	    case EGraphicalView:
-	        {
-    	    //Draw the graphical view
-    	    TRAP_IGNORE(DrawGraphicalViewL());
-	        break;
-	        }
-	    case ECompassView:
-	        {
-    		//Draw the compass view
-    		TRAP_IGNORE(DrawCompassViewL());
-	        break;
-	        }
-	    default:
-	        {
-	        break;
-	        }
-	    }
-    }
-    
-// ---------------------------------------------------------
-// CSatelliteControl::DrawHeadingL
-// ---------------------------------------------------------
-//
-void CSatelliteControl::DrawHeadingL() const
-	{
-	//Get the rect for the heading frame from LAF
-	TAknLayoutRect layoutWindow;
-	layoutWindow.LayoutRect(Rect(), AknLayoutScalable_Apps::heading_pane_cp05(2).LayoutLine());	
-	TRect headingFrameRect = layoutWindow.Rect();
-	
-	//Get the rect for the heading text. Parent of the heading text rect
-	//is the rect of the heading frame
-	TAknLayoutText headingTextLayout;
-	headingTextLayout.LayoutText(headingFrameRect, AknLayoutScalable_Avkon::heading_pane_t1(0).LayoutLine());
-		
-	CWindowGc& gc=SystemGc();
-		
-	MAknsSkinInstance* skin = AknsUtils::SkinInstance();
-	MAknsControlContext* cc = AknsDrawUtils::ControlContext( this ); // get parent's cc
-
-    TRgb rgb;
-    AknsUtils::GetCachedColor( skin,
-                               rgb,
-                               KAknsIIDQsnTextColors,
-                               EAknsCIQsnTextColorsCG1 );
-    gc.SetPenStyle( CGraphicsContext::ESolidPen );                               
-    gc.SetPenColor( rgb ); 
-        
-    //Skin the heading frame
-	AknsDrawUtils::DrawFrame(skin, 
-							 gc, 
-							 headingFrameRect, 
-							 headingTextLayout.TextRect(), 
-                             KAknsIIDQsnFrPopupHeading,
-                             KAknsIIDQsnFrPopupHeadingCenter);
-    
-	switch ( iCurrentSatelliteView )
-	    {
-	    case ESignalStrengthView:
-	        {
-    	    headingTextLayout.DrawText( gc, 
-    	                                iSatelliteSignalHeading->Des(),
-    	                                ETrue,
-    	                                rgb );
-	        break;
-	        }	    
-	    case EGraphicalView:
-	        {
-    	    headingTextLayout.DrawText( gc, 
-    	                                iSatelliteGrapgicHeading->Des(),
-    	                                ETrue,
-    	                                rgb );
-	        break;
-	        }
-	    case ECompassView:
-	        {
-    	    headingTextLayout.DrawText( gc, 
-    	                                iCompassViewHeading->Des(),
-    	                                ETrue,
-    	                                rgb );
-	        break;
-	        }
-	    default:
-	        {
-	        break;
-	        }
-	    }
-	}
-
-// ---------------------------------------------------------
-// CSatelliteControl::DrawEmptyDialogL
-// ---------------------------------------------------------
-//
-void CSatelliteControl::DrawEmptyDialogL() const
-	{
-	TAknLayoutText textRect1;
-
-	textRect1.LayoutText(Rect(), 
-    					 AknLayoutScalable_Apps::popup_blid_sat_info2_window_t1());
-	
-	
-	TAknLayoutText textRect2;
-
-	textRect2.LayoutText(Rect(), 
-    					 AknLayoutScalable_Apps::popup_blid_sat_info2_window_t2());   					 
-
-    
-	CArrayFix<TInt>* wrapWidthArray =
-        new( ELeave ) CArrayFixFlat<TInt>(10);
-
-    CleanupStack::PushL( wrapWidthArray );
-    
-    TInt lineLength1 = textRect1.TextRect().Width();
-    TInt lineLength2 = textRect2.TextRect().Width();
-
-    wrapWidthArray->AppendL(lineLength1);
-    wrapWidthArray->AppendL(lineLength2);
-    
-    TPtrC text = *iNoSatelliteData;
-    TBuf<200> buffer;
-    
-    const CFont *font = textRect1.Font();
-    AknBidiTextUtils::ConvertToVisualAndWrapToStringL(text,
-												      *wrapWidthArray,
-												      *font,
-												      buffer,
-												      ETrue );
-
-    CleanupStack::PopAndDestroy(); // wrapWidthArray
-    
-    TPtrC line1= buffer;
-    TPtrC line2= buffer;
-    TInt off = line1.Locate('\n');
-    if (off>=0)
-	    {
-	    line1.Set(line2.Left(off));
-	    line2.Set(line2.Mid(off+1));
-	    }
-    else
-	    {
-	    line2.Set(_L(""));
-	    }
-
-    TInt off2 = line2.Locate('\n');
-    if (off2>=0)
-	    {
-	    line2.Set(line2.Left(off2));
-	    }
-    
-    CWindowGc& gc=SystemGc();
-    gc.UseFont(font);
-        
-    const CAknLayoutFont* layoutFont = CAknLayoutFont::AsCAknLayoutFontOrNull( font );
-    TInt textPaneHeight;
-    TInt textPaneAscent;
-    if ( layoutFont ) 
-    	{
-    	textPaneHeight = layoutFont->TextPaneHeight();     
-    	textPaneAscent = layoutFont->TextPaneTopToBaseline();
-    	}
-    else 
-    	{
-    	textPaneHeight = font->HeightInPixels();         
-    	textPaneAscent = font->AscentInPixels(); 
-    	}
-    //draw text    
-    TInt extraVerticalSpace=(textRect1.TextRect().Height()-textPaneHeight);
-    TInt baseLineOffset=extraVerticalSpace/2+textPaneAscent;
-    gc.DrawText( line1, 
-                 textRect1.TextRect(), 
-                 baseLineOffset,
-                 CGraphicsContext::ECenter  );
-                  
-    if(line2.Length())
-    	{
-    	gc.DrawText( line2, 
-	                 textRect2.TextRect(), 
-	                 baseLineOffset,
-	                 CGraphicsContext::ECenter );
-    	}    
-    }
-
-// ---------------------------------------------------------
-// CSatelliteControl::DrawGraphicalViewL
-// ---------------------------------------------------------
-//
-void CSatelliteControl::DrawGraphicalViewL() const
-	{
-	CWindowGc& gc=SystemGc();
-	TSatelliteData satelliteData;
-	for(TInt i = 0 ; i < iEngine.NumberOfSatellites(); ++i)
-		{
-		iEngine.GetSatelliteData(i, satelliteData);
-		TInt signalstrength = satelliteData.SignalStrength();
-		}	
-		
-	// Drawing the firmament
-	gc.BitBltMasked(iFirmamentRect.iTl,
-					iFirmamentBmp,
-					iFirmamentBmp->SizeInPixels(),
-					iFirmamentBmpMask,
-					ETrue);	
-	
-	MAknsSkinInstance* skin = AknsUtils::SkinInstance();
-	TRgb rgb;
-    AknsUtils::GetCachedColor( skin,
-                               rgb,
-                               KAknsIIDQsnTextColors,
-                               EAknsCIQsnTextColorsCG1 );
-    gc.SetPenStyle( CGraphicsContext::ESolidPen );                               
-    gc.SetPenColor( rgb );
-	// Draw the cardinal points
-	iCardinalNLayout.DrawText(gc, iNorth->Des(), ETrue, rgb );
-	iCardinalSLayout.DrawText(gc, iSouth->Des(), ETrue, rgb );
-	iCardinalWLayout.DrawText(gc, iWest->Des(), ETrue, rgb );
-	iCardinalELayout.DrawText(gc, iEast->Des(), ETrue, rgb );
-					
-	//Draw the moon
-    TReal moonAzmiuth, moonElevation;			
-	iEngine.GetMoonAzimuthElevation(moonAzmiuth, moonElevation);
-	TRect moonRect = CalculateCelestialBodyRectL(moonAzmiuth, moonElevation, iSunMoonRect.Size());
-	gc.BitBltMasked(moonRect.iTl,
-					iMoonBmp,
-					iMoonBmp->SizeInPixels(),
-					iMoonBmpMask,
-					ETrue);
-
-	// Draw the sun
-	TReal sunAzmiuth, sunElevation;
-	iEngine.GetSunAzimuthElevation(sunAzmiuth, sunElevation);
-	TRect sunRect = CalculateCelestialBodyRectL(sunAzmiuth, sunElevation, iSunMoonRect.Size());
-	
-	gc.BitBltMasked(sunRect.iTl,
-					iSunBmp,
-					iSunBmp->SizeInPixels(),
-					iSunBmpMask,
-					ETrue);
-	
-	//Draw all the available satellites
-	for(TInt i = 0;i<iEngine.NumberOfSatellites();++i)
-		{
-		TSatelliteData satData;
-
-		if(iEngine.GetSatelliteData(i, satData) != KErrNotFound)
-			{
-			TRect rect;
-			TInt satId = satData.SatelliteId();	
-			rect = CalculateCelestialBodyRectL(satData.Azimuth(), satData.Elevation(), iSatelliteRect.Size());			
-			if(satData.IsUsed())
-				{
-				gc.BitBltMasked(rect.iTl,
-								iFirmaActiveBmp,
-								iFirmaActiveBmp->SizeInPixels(),
-								iFirmaActiveBmpMask,
-								ETrue);
-				}
-			else
-				{
-				gc.BitBltMasked(rect.iTl,
-								iFirmaInActiveBmp,
-								iFirmaInActiveBmp->SizeInPixels(),
-								iFirmaInActiveBmpMask,
-								ETrue);
-				}
-			TAknLayoutText textLayout;
-			textLayout.LayoutText(rect, 
-    							  AknLayoutScalable_Apps::blid_sat_info_pane_t1().LayoutLine());
-			    							  
-			HBufC* satNumber = StringLoader::LoadL( R_BLID_SATELLITE_ID, satData.SatelliteId() );
-			HBufC* visualBuffer = HBufC::NewL( satNumber->Size() + KAknBidiExtraSpacePerLine );
-		    TPtr visualPtr( visualBuffer->Des() );
-		    visualPtr.Zero();
-		    TPtr ptr(satNumber->Des());
-		    AknTextUtils::LanguageSpecificNumberConversion( ptr );
-		    //This portion of code is commented now.We have to check it for language
-		    //Like Farsi,Urdu and then it will be removed or uncomented.
-		    /*AknBidiTextUtils::ConvertToVisualAndClip( satNumber->Des(),
-		                                              visualPtr,
-		                                              *textLayout.Font(),
-		                                              textLayout.TextRect().Size().iWidth,
-		                                              textLayout.TextRect().Size().iWidth );
-			textLayout.DrawText(gc, visualPtr);*/
-						
-			const CFont* fontUsed = iCardinalNLayout.Font();
-			const CAknLayoutFont* layoutFont = CAknLayoutFont::AsCAknLayoutFontOrNull( fontUsed );
-		    TInt textPaneHeight;
-		    TInt textPaneAscent;
-		    if ( layoutFont )
-		    	{
-		    	textPaneHeight = layoutFont->TextPaneHeight();     
-		    	textPaneAscent = layoutFont->TextPaneTopToBaseline();
-		    	}
-		    else 
-		    	{
-		    	textPaneHeight = fontUsed->HeightInPixels();         
-		    	textPaneAscent = fontUsed->AscentInPixels(); 
-		    	}
-		    //draw text    
-		    TInt extraVerticalSpace=(rect.Height()-textPaneHeight);
-		    TInt baseLineOffset=extraVerticalSpace/2+textPaneAscent;
-		    CGraphicsContext::TTextAlign context;    
-    		context = textLayout.Align();   
-    		gc.UseFont(fontUsed);
-    		//gc.SetBrushStyle(CGraphicsContext::ESolidBrush);
-    
-		    // Set the rgb color to black
-		    rgb.SetBlue(0);
-		    rgb.SetGreen(0);
-		    rgb.SetRed(0);
-		    gc.SetPenColor(rgb);
-		        		
-		    gc.DrawText( satNumber->Des(), 
-		                 rect, 
-		                 baseLineOffset,
-		                 context );
-
-			delete satNumber;
-			delete visualBuffer;
-			}
-		}	
-	}
-
-// ---------------------------------------------------------
-// CSatelliteControl::CalculateCelestialBodyRectL
-// ---------------------------------------------------------
-//
-TRect CSatelliteControl::CalculateCelestialBodyRectL(const TReal aAzimuth, 
-													 const TReal aElevation,
-													 const TSize aIconSize) const
-	{
-	TPoint point;	
-    TReal cosElevation;
-    TReal sinAzimuth;
-    TReal cosAzimuth;
-    TInt pointX(0);
-    TInt pointY(0);
-    TPoint center = iFirmamentRect.Center();
-    
-    User::LeaveIfError(
-	        Math::Cos( cosElevation, KDegToRad * (aElevation) ));
-	        
-	User::LeaveIfError(
-	        Math::Sin( sinAzimuth, KDegToRad * (aAzimuth)));
-
-	User::LeaveIfError(
-	        Math::Cos( cosAzimuth, KDegToRad * (aAzimuth)));	        
-
-	User::LeaveIfError( 
-        		TRealToTInt((iFirmamentRect.Height()/2) * cosElevation * sinAzimuth, pointX));
-        
-    User::LeaveIfError( 
-      			TRealToTInt((iFirmamentRect.Height()/2) * cosElevation * cosAzimuth, pointY) );
-    
-    point = TPoint( (center.iX + pointX ) , (center.iY -  pointY ));        
-        
-    TPoint boxCenterPoint;    
-    TInt half;
-    
-    TRealToTInt(aIconSize.iWidth/2, half);
-    boxCenterPoint.iX = point.iX - half;
-    TRealToTInt(aIconSize.iHeight/2, half);
-    boxCenterPoint.iY = point.iY - half;
-    TRect returnRect(boxCenterPoint, aIconSize);
-    
-    return returnRect;
-	}
-
-// ---------------------------------------------------------
-// CSatelliteControl::TRealToTInt
-// Rounds the supplied real number into the nearest integer
-// ---------------------------------------------------------
-//
-TInt CSatelliteControl::TRealToTInt( const TReal aSrc, TInt& aResult ) const
-    {
-    TReal resultTReal(0);    
-    TInt error(0);
-
-    error = Math::Round( resultTReal, aSrc, 0 );
-    if ( error != KErrNone )
-    	{
-        aResult = 0;
-        return error;
-        }
-
-    TInt32 resultTInt(0);
-    error = Math::Int( resultTInt, resultTReal );  
-    if ( error != KErrNone )
-        {        
-        aResult = 0;
-        return error;
-        }    
-    aResult = resultTInt;
-    return error;
-    }
-
-// ---------------------------------------------------------
-// CSatelliteControl::DrawSignalStrengthViewL
-// ---------------------------------------------------------
-//
-void CSatelliteControl::DrawSignalStrengthViewL() const
-	{
-	CWindowGc& gc=SystemGc();
-	TInt numberofsatellites = iEngine.NumberOfSatellites();
-    
-	for(TInt i = 0 ; i < numberofsatellites; ++i)
-		{
-		TSatelliteData satData;
-
-		if(iEngine.GetSatelliteData(i, satData) != KErrNotFound)			
-			{
-			TInt satelliteId = satData.SatelliteId();
-			TInt signalStrength = satData.SignalStrength();
-			if( (satelliteId > KMaxSatellites) || (signalStrength == 0) )
-				{
-				continue;
-				}
-			TRect rect = iSignalBarRects[satelliteId-1];			
-			CFbsBitmap* bitmap;
-			CFbsBitmap* bitmapMask;			
-			TInt barHeight = rect.Height() * signalStrength / KBlidMaxSatelliteSignalStrength;
-			if(barHeight < rect.Height())
-				{
-				TInt tmp = rect.Height() - barHeight;
-				rect.iTl.iY += tmp;
-				}
-						
-			if(satData.IsUsed())
-				{
-				bitmap = iSatActiveBmp;
-				bitmapMask = iSatActiveBmpMask;
-				}
-			else
-				{
-				bitmap = iSatInActiveBmp;
-				bitmapMask = iSatInActiveBmpMask;
-				}
-			
-			AknIconUtils::SetSize(bitmap,
-								  rect.Size());
-            
-            AknIconUtils::SetSize(bitmap,
-								  rect.Size());
-			
-			
-			gc.BitBltMasked(rect.iTl,
-							bitmap,
-							bitmap->SizeInPixels(),
-							bitmapMask,
-							ETrue);
-							
-			rect = iSignalBarRects[satelliteId-1];
-			gc.BitBltMasked(rect.iTl,
-							iSatFrame,
-							iSatFrame->SizeInPixels(),
-							iSatFrameMask,
-							ETrue);
-			}	
-		}
-	MAknsSkinInstance* skin = AknsUtils::SkinInstance();
-	TRgb rgb;
-    AknsUtils::GetCachedColor( skin,
-                               rgb,
-                               KAknsIIDQsnTextColors,
-                               EAknsCIQsnTextColorsCG1 );
-    gc.SetPenStyle( CGraphicsContext::ESolidPen );                               
-    gc.SetPenColor( rgb );
-			
-    for(TInt i = 1; i <= KMaxSatellites; ++i)
-    	{
-    	TSatelliteData satelliteData;
-    	iEngine.GetSatelliteData(i, satelliteData);
-    	    	
-    	HBufC* satNumber = StringLoader::LoadL( R_BLID_SATELLITE_ID, 
-    											i );
-												
-    	
-    	HBufC* visualBuffer = HBufC::NewL( satNumber->Size() + 
-                                 	   	   KAknBidiExtraSpacePerLine );
-	    TPtr visualPtr( visualBuffer->Des() );
-	    visualPtr.Zero();
-	    AknBidiTextUtils::ConvertToVisualAndClip( satNumber->Des(),
-	                                              visualPtr,
-	                                              *iSatelliteNumberLayouts[i-1].Font(),
-	                                              iSatelliteNumberLayouts[i-1].TextRect().Size().iWidth,
-	                                              iSatelliteNumberLayouts[i-1].TextRect().Size().iWidth );
-		gc.SetPenStyle(CGraphicsContext::ESolidPen);		
-	    iSatelliteNumberLayouts[i-1].DrawText(gc, visualPtr, ETrue, rgb );
-	    delete visualBuffer;
-    	delete satNumber;
-    	}
-	}
-
-// ---------------------------------------------------------
-// CSatelliteDialog::DrawCompassViewL
-// ---------------------------------------------------------
-//
-void CSatelliteControl::DrawCompassViewL() const
-    {    
-    CWindowGc& gc=SystemGc();
-    
-	// Drawing the firmament
-	gc.BitBltMasked( iFirmamentCompassRect.iTl,
-					 iFirmamentCompassBmp,
-					 iFirmamentCompassBmp->SizeInPixels(),
-					 iFirmamentCompassBmpMask,
-					 ETrue );	
-
-	// Drawing the Fix Ring
-	gc.BitBltMasked( iTypeRect.iTl,
-					 iFixBmp,
-					 iFixBmp->SizeInPixels(),
-					 iFixBmpMask,
-					 ETrue );
-	
-	MAknsSkinInstance* skin = AknsUtils::SkinInstance();
-	TRgb rgb;
-    AknsUtils::GetCachedColor( skin,
-                               rgb,
-                               KAknsIIDQsnTextColors,
-                               EAknsCIQsnTextColorsCG1 );
-    gc.SetPenStyle( CGraphicsContext::ESolidPen );                               
-    gc.SetPenColor( rgb );
-	// Draw the cardinal points
-	iCardinalCompassNLayout.DrawText( gc, iCompassNorth->Des(), ETrue, rgb );
-	iCardinalCompassSLayout.DrawText( gc, iCompassSouth->Des(), ETrue, rgb );
-	iCardinalCompassWLayout.DrawText( gc, iCompassWest->Des(), ETrue, rgb );
-	iCardinalCompassELayout.DrawText( gc, iCompassEast->Des(), ETrue, rgb );
-    
-	// Drawing the Fix Type
-	if( iEngine.NumberOfSatellitesUsed() <= K2dFix )
-		{
-		iFixTypeLayout.DrawText( gc, i2DString->Des(), ETrue, rgb );
-		}
-	else
-		{
-		iFixTypeLayout.DrawText( gc, i3DString->Des(), ETrue, rgb );
-		}
-					
-    TPosition pos;
-    TCourse course;
-    iEngine.GetPosition( pos );
-    iEngine.GetCourse( course );   
-    TBuf<KSatInfoBufferSize> tempString;
-    TBuf<KSatInfoBufferSize> speedString;
-  	HBufC* formatter = NULL;     
-  	
-  	// Display Latitude
-  	if ( !Math::IsNaN( pos.Latitude() ) )
-  		{
-	    TRAP_IGNORE( formatter = 
-	                       CAknLocationEditor::DisplayableLocationL( pos,CAknLocationEditor::ELatitudeOnly ) );
-	    if( formatter )  
-	        {
-	        tempString.Copy( formatter->Des() );             
-	        delete formatter;
-	        }
-		iLatitudeWindowLayout.DrawText( gc, tempString, ETrue, rgb );
-  		}
-
-  	// Display Longitude
-  	if ( !Math::IsNaN( pos.Longitude() ) )
-  		{
-	    TRAP_IGNORE( formatter = 
-	                       CAknLocationEditor::DisplayableLocationL( pos,CAknLocationEditor::ELongitudeOnly ) );
-	    if( formatter )  
-	        {
-	        tempString.Copy( formatter->Des() );             
-	        delete formatter;
-	        }
-		iLongitudeWindowLayout.DrawText( gc, tempString, ETrue, rgb );
-  		}
-
-  	// Display Altitude
-    TReal altitude = pos.Altitude();
-		iAltitudeWindowHeadingLayout.DrawText( gc, iAltitudeWindowHeading->Des(), ETrue, rgb );
-    TInt result(0);
-  	if ( !Math::IsNaN( altitude ) && TRealToTInt( altitude , result ) == KErrNone )
-  		{
-        if ( iEngine.SysOfMeasurementL() == ELocMetric )
-            {
-            StringLoader::Format( tempString, *iAltitudeFormatM, 
-                                  0, result );
-            }
-        else
-        	{
-        	TInt imperialAlt( 0 );
-        	if ( TRealToTInt( ( altitude*KMetreToFoot ) , imperialAlt ) == KErrNone )
-	        	{
-	            StringLoader::Format( tempString, *iAltitudeFormatFt, 
-	                                  0, imperialAlt );
-	        	}
-        	}
-		iAltitudeWindowValueLayout.DrawText( gc, tempString, ETrue, rgb );
-  		}
-    
-  	// Display Speed
-    TReal speed = course.Speed();
-    iSpeedWindowHeadingLayout.DrawText( gc, iSpeedWindowHeading->Des(), ETrue, rgb );
-  	if ( !Math::IsNaN( speed ) )
-  		{
-        Math::Round( speed, speed, KDecimals3 );
-        TReal speedInKmph = speed * KSpeedConvertion;
-        
-        if ( iEngine.SysOfMeasurementL() == ELocMetric )
-            {
-            speedString.Format( KSpeedFormat, speedInKmph );
-            formatter = iSpeedFormatKmph;
-            }
-        else
-        	{
-            speedInKmph *= KKilometreToMiles;
-            speedString.Format( KSpeedFormat, speedInKmph );
-            formatter = iSpeedFormatMph;   
-        	}
-		StringLoader::Format( tempString, *formatter, 0, speedString );
-		iSpeedWindowValueLayout.DrawText( gc, tempString, ETrue, rgb );
-  		}
-    
- 	// Display Direction
-    TReal heading = course.Heading();
-    iDirectionWindowHeadingLayout.DrawText( gc, iDirectionWindowHeading->Des(), ETrue, rgb );
-    if ( !Math::IsNaN( heading ) )
-        {
-				StringLoader::Format( tempString, *iDirectionFormat, 0, heading );  
-				iDirectionWindowValueLayout.DrawText( gc, tempString, ETrue, rgb );
-        }   
-    
-    }
-    
-// ---------------------------------------------------------
-// CSatelliteControl::InputCapabilities
-// ---------------------------------------------------------
-//
-TCoeInputCapabilities CSatelliteControl::InputCapabilities() const
-	{
-	TCoeInputCapabilities inputCapabilities(TCoeInputCapabilities::ENone);	
-	return inputCapabilities;
-	}
-
-#ifdef RD_SCALABLE_UI_V2
-// ---------------------------------------------------------
-// CSatelliteDialog::HandlePointerEventL
-// ---------------------------------------------------------
-//    
-void CSatelliteControl::HandlePointerEventL(const TPointerEvent& aPointerEvent)
-    {
-    CCoeControl::HandlePointerEventL(aPointerEvent);
-    if ( AknLayoutUtils::PenEnabled() )
-        {
-    	// Display the context specific menu on double tapping on the fields.
-    	if(aPointerEvent.iType == TPointerEvent::EButton1Down && 
-    	   iEngine.IsSatelliteDataAvailable() )
-    		{
-#ifdef RD_TACTILE_FEEDBACK
-            MTouchFeedback* feedback = MTouchFeedback::Instance();
-            if (feedback)
-                {
-                feedback->InstantFeedback(ETouchFeedbackBasic);
-                }
-#endif //RD_TACTILE_FEEDBACK
-    		// Change view soft key pressed.Notify the control to change 
-    		// the view and draw.
-    		ChangeView();		
-    		DrawNow();
-    		}	
-        }
-    }
-#endif // RD_SCALABLE_UI_V2
-// End of file
-
-    
--- a/locationsystemui/locationsysui/locblidsatelliteinfo/stub/CSatelliteInfoUI.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,93 +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:  Implements interface for CSatelliteInfoUI Stub
-*
-*/
-
-
-// INCLUDE FILES
-#include <CSatelliteInfoUI.h>
-
-
-// ============================ MEMBER FUNCTIONS ==============================
-// ----------------------------------------------------------------------------
-// CSatelliteInfoUI::NewL
-// Two-phased constructor.
-// ----------------------------------------------------------------------------
-//
-EXPORT_C CSatelliteInfoUI* CSatelliteInfoUI::NewL()
-    {
-    CSatelliteInfoUI* self = new( ELeave ) CSatelliteInfoUI;
-    CleanupStack::PushL( self );
-    self->ConstructL();
-    CleanupStack::Pop(); // self
-    return self;
-    }
-
-// ---------------------------------------------------------
-// CSatelliteInfoUI::ConstructL
-// ---------------------------------------------------------
-//
-void CSatelliteInfoUI::ConstructL()
-    {    
-    
-    }
-
-// ----------------------------------------------------------------------------
-// CSatelliteInfoUI::CSatelliteInfoUI
-// C++ default constructor can NOT contain any code, that
-// might leave.
-// ----------------------------------------------------------------------------
-//
-CSatelliteInfoUI::CSatelliteInfoUI()
-    {
-    }
-
-// ---------------------------------------------------------
-// CSatelliteInfoUI::~CSatelliteInfoUI
-// ---------------------------------------------------------
-//
-EXPORT_C CSatelliteInfoUI::~CSatelliteInfoUI()
-    {
-    
-    }
-
-// ---------------------------------------------------------
-// CSatelliteInfoUI::ExecuteLD
-// ---------------------------------------------------------
-//                       
-EXPORT_C TInt CSatelliteInfoUI::ExecuteLD( const TDesC& /*aNameOfRule*/ )
-    {
-    User::Leave(KErrNotSupported);
-    return 0;
-    }
-
-// ----------------------------------------------------------------------------
-// CSatelliteInfoUI::HandleForegroundEventL
-// ----------------------------------------------------------------------------
-//
-EXPORT_C void CSatelliteInfoUI::HandleForegroundEventL(TBool /*aForeground*/)
-    {
-    User::Leave(KErrNotSupported);
-    }
-
-// ----------------------------------------------------------------------------
-// CSatelliteInfoUI::SetLaunchView
-// ----------------------------------------------------------------------------
-//
-EXPORT_C void CSatelliteInfoUI::SetLaunchView(TSatelliteView /*aLaunchView*/)
-	{
-	
-	}
-// End of File
--- a/locationsystemui/locationsysui/locbtnotifier/data/locbtgpspsypscontextstate.rul	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,104 +0,0 @@
-<!-- Defines a rule which causes appropriate note to be displayed on change of BtGpsPsy PS keys -->
-<script xmlns="http://www.nokia.com/ns/cep/script/1.0/"
-        xmlns:cep="http://www.nokia.com/ns/cep/1.0/">
-    <if>
-        <equals>
-            <contextRef source='Location' type='BtGpsPsy.Status'/>
-            <string>EBatteryStateNA</string>
-        </equals>
-        <actions>
-            <!-- No information Note shown when : 'Battery State NA' -->
-            <showNote BatteryState='EBatteryStateNA' />
-        </actions>
-    </if>
-    <elseIf>
-        <equals>
-            <contextRef source='Location' type='BtGpsPsy.Status'/>
-            <string>EBatteryStateNormal</string>
-        </equals>
-        <actions>
-            <!-- No information Note shown when : 'Battery State Normal' -->
-            <showNote BatteryState='EBatteryStateNormal' />
-        </actions>
-    </elseIf>
-    <elseIf>
-        <equals>
-            <contextRef source='Location' type='BtGpsPsy.Status'/>
-            <string>EBatteryStateLow</string>
-        </equals>
-        <actions>
-            <!-- show information note : 'Battery Low' -->
-            <showNote BatteryState='EBatteryStateLow' />
-        </actions>
-    </elseIf>
-    <elseIf>
-        <equals>
-            <contextRef source='Location' type='BtGpsPsy.Status'/>
-            <string>EBatteryStateFull</string>
-        </equals>
-        <actions>
-            <!-- show information note : 'Battery Full' -->
-            <showNote BatteryState='EBatteryStateFull' />
-        </actions>
-    </elseIf>
-    <elseIf>
-        <equals>
-            <contextRef source='Location' type='BtGpsPsy.Status'/>
-            <string>EExtAntennaNA</string>
-        </equals>
-        <actions>
-            <!-- No information Note shown when : 'Antenna State NA' -->
-            <showNote AntennaState='EExtAntennaNA' />
-        </actions>
-    </elseIf>
-    <elseIf>
-        <equals>
-            <contextRef source='Location' type='BtGpsPsy.Status'/>
-            <string>EExtAntennaOff</string>
-        </equals>
-        <actions>
-            <!-- show information note : 'Antenna Disconnected' -->
-            <showNote AntennaState='EExtAntennaOff' />
-        </actions>
-    </elseIf>
-    <elseIf>
-        <equals>
-            <contextRef source='Location' type='BtGpsPsy.Status'/>
-            <string>EExtAntennaOn</string>
-        </equals>
-        <actions>
-            <!-- show information note : 'Antenna Connected' -->
-            <showNote AntennaState='EExtAntennaOn' />
-        </actions>
-    </elseIf>
-    <elseIf>
-        <equals>
-            <contextRef source='Location' type='BtGpsPsy.Status'/>
-            <string>EExtPowerNA</string>
-        </equals>
-        <actions>
-            <!-- No information Note shown when : 'Power State NA' -->
-            <showNote PowerState='EExtPowerNA' />
-        </actions>
-    </elseIf>
-    <elseIf>
-        <equals>
-            <contextRef source='Location' type='BtGpsPsy.Status'/>
-            <string>EExtPowerOff</string>
-        </equals>
-        <actions>
-            <!-- show information note : 'Charger Disconnected' -->
-            <showNote PowerState='EExtPowerOff' />
-        </actions>
-    </elseIf>
-    <elseIf>
-        <equals>
-            <contextRef source='Location' type='BtGpsPsy.Status'/>
-            <string>EExtPowerOn</string>
-        </equals>
-        <actions>
-            <!-- show information note : 'Charger Connected' -->
-            <showNote PowerState='EExtPowerOn' />
-        </actions>
-    </elseIf>
-</script>
--- a/locationsystemui/locationsysui/locbtnotifier/data/locbtgpspsypscontextstate.xml	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,34 +0,0 @@
-<ContextSourceSettings>
-
-		<!--BTGpsPsy PS Keys   -->
-		<!--PubSub Uid of BT GPS PSY Events - KPsUidBluetoothGpsPsy = { 0x101FE999 }  -->
-		<!--BTGpsPsy PS Key - KBluetoothGpsPsyBatteryState = 0x03  -->
-    <PSContextSourcePlugIn mapper="int" category="0x101FE999" key="0x03" 
-    	capability="ReadDeviceData" 
-    	source="Location" type="BtGpsPsy.Status" passthrough="false">
-        <IntMapping psvalue="-1" contextvalue="EBatteryStateNA"/>
-		    <IntMapping psvalue="0" contextvalue="EBatteryStateNormal"/>
-		    <IntMapping psvalue="1" contextvalue="EBatteryStateLow"/>
-		    <IntMapping psvalue="2" contextvalue="EBatteryStateFull"/>
-    </PSContextSourcePlugIn>  
-    
-    <!--BTGpsPsy PS Key - KBluetoothGpsPsyExtAntennaState = 0x04  -->
-    <PSContextSourcePlugIn mapper="int" category="0x101FE999" key="0x04" 
-    	capability="ReadDeviceData" 
-    	source="Location" type="BtGpsPsy.Status" passthrough="false">
-        <IntMapping psvalue="-1" contextvalue="EExtAntennaNA"/>
-		    <IntMapping psvalue="0" contextvalue="EExtAntennaOff"/>
-		    <IntMapping psvalue="1" contextvalue="EExtAntennaOn"/>
-    </PSContextSourcePlugIn>  
-    
-    <!--BTGpsPsy PS Key - KBluetoothGpsPsyExtPowerState = 0x05  -->
-    <PSContextSourcePlugIn mapper="int" category="0x101FE999" key="0x05" 
-    	capability="ReadDeviceData" 
-    	source="Location" type="BtGpsPsy.Status" passthrough="false">   	
-        <IntMapping psvalue="-1" contextvalue="EExtPowerNA"/>
-		    <IntMapping psvalue="0" contextvalue="EExtPowerOff"/>
-		    <IntMapping psvalue="1" contextvalue="EExtPowerOn"/>
-    </PSContextSourcePlugIn>    
-        
-</ContextSourceSettings>
-
--- a/locationsystemui/locationsysui/locbtnotifier/data/locbtnotifier.rss	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,50 +0,0 @@
-/*
-* Copyright (c) 2008 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:  Resource definitions for project locbtnotifier
-*
-*/
-
-
-
-
-#include <ecom/registryinfo.rh>
-#include <cfactionpluginconst.hrh>
-
-#include "locbtnotifierpluginconstants.hrh"
-
-RESOURCE REGISTRY_INFO theInfo
-	{
-	// UID for the DLL
-	dll_uid = KLocBtNotifierPlugInDllUid;
-	// Declare array of interface info
-	interfaces = 
-		{
-		INTERFACE_INFO
-			{
-			// UID of interface that is implemented
-			interface_uid = KActionPluginInterfaceUid;
-			implementations = 
-				{
-				IMPLEMENTATION_INFO
-					{
-					implementation_uid = KLocBtNotifierPlugInImplementationUid;
-					version_no         = 1;
-					display_name       = "LocBtNotifier";
-					default_data       = "";
-					opaque_data        = "";
-					}
-				};
-			}
-		};
-	}
--- a/locationsystemui/locationsysui/locbtnotifier/data/locbtnotifierresources.rss	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,69 +0,0 @@
-/*
-* Copyright (c) 2008 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:  Resource definitions for project locbtnotifier
-*
-*/
-
-
-//  RESOURCE IDENTIFIER
-NAME BTPS
-
-//  INCLUDES
-#include <uikon.rh>
-#include <badef.rh>
-#include <locbtnotifier.loc>
-
-//  RESOURCE SIGNATURE
-
-RESOURCE RSS_SIGNATURE { }
-
-//  RESOURCE DEFINITIONS 
-
-// Text to be displayed when the Ext Antenna is connected to BT GPS device
-RESOURCE LBUF R_EXT_ANTENNA_CONNECTED    
-    { 
-	  txt = qtn_loc_psy_ext_antenna_connected; 
-	  }
-
-// Text to be displayed when the Ext Antenna is disconnected from BT GPS device	
-RESOURCE LBUF R_EXT_ANTENNA_DISCONNECTED 
-    { 
-    txt = qtn_loc_psy_ext_antenna_disconnected; 
-    }
-
-// Text to be displayed when charger is connected to BT GPS device    
-RESOURCE LBUF R_EXT_POWER_CONNECTED      
-    { 
-    txt = qtn_loc_psy_ext_power_connected; 
-    }
-
-// Text to be displayed when charger is disconnected from BT GPS device    
-RESOURCE LBUF R_EXT_POWER_DISCONNECTED   
-    { 
-    txt = qtn_loc_psy_ext_power_disconnected; 
-    }
-    
-// Text to be displayed when BT GPS Device battery is low
-RESOURCE LBUF R_BATTERY_LOW              
-    { 
-    txt = qtn_loc_psy_battery_low; 
-    }
-    
-// Text to be displayed when BT GPS Device battery is full    
-RESOURCE LBUF R_BATTERY_FULL             
-    { 
-    txt = qtn_loc_psy_battery_full; 
-    }
-
-// End of File
--- a/locationsystemui/locationsysui/locbtnotifier/group/bld.inf	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,35 +0,0 @@
-/*
-* Copyright (c) 2008 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 for project locbtnotifier
-*
-*/
-
-
-#include <platform_paths.hrh>
-
-PRJ_PLATFORMS
-
-DEFAULT
-
-PRJ_EXPORTS
-
-../data/locbtgpspsypscontextstate.xml  /epoc32/RELEASE/winscw/UDEB/Z/private/10282BC4/Settings/10282C74/locbtgpspsypscontextstate.xml
-../data/locbtgpspsypscontextstate.xml  /epoc32/data/Z/private/10282BC4/Settings/10282C74/locbtgpspsypscontextstate.xml
-
-../data/locbtgpspsypscontextstate.rul  /epoc32/RELEASE/winscw/UDEB/Z/private/10282BC4/Rules/locbtgpspsypscontextstate.rul
-../data/locbtgpspsypscontextstate.rul   /epoc32/data/Z/private/10282BC4/Rules/locbtgpspsypscontextstate.rul
-
-PRJ_MMPFILES
-
-locbtnotifier.mmp
--- a/locationsystemui/locationsysui/locbtnotifier/group/locbtnotifier.mmp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,75 +0,0 @@
-/*
-* Copyright (c) 2008 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 definition file for project locbtnotifier
-*
-*/
-
-
-
-#include <platform_paths.hrh>
-#include <data_caging_paths.hrh>
-#include "../inc/locbtnotifierpluginconstants.hrh"
-#include "../inc/locbtnotifierdebugconfig.hrh"
-
-TARGET                  locbtnotifier.dll
-TARGETTYPE              PLUGIN
-UID                     0x10009D8D KLocBtNotifierPlugInDllUid
-
-CAPABILITY              CAP_ECOM_PLUGIN
-VENDORID                VID_DEFAULT
-
-SOURCEPATH              ../src
-SOURCE                  locbtnotifier.cpp
-SOURCE                  locbtnotifierplugin.cpp
-SOURCE                  locbtnotifierconstantsmanager.cpp
-
-#ifdef LOG_ENABLED_LOCBTNOTIFIER
-SOURCE                  locbtnotifierdebug.cpp
-#endif
-
-
-
-USERINCLUDE             .
-USERINCLUDE             ../inc
-
-
-MW_LAYER_SYSTEMINCLUDE
-
-SOURCEPATH      ../data
-START RESOURCE	locbtnotifier.rss
-TARGET 			locbtnotifier.rsc
-TARGETPATH 		ECOM_RESOURCE_DIR
-END
-
-SOURCEPATH      ../data
-START RESOURCE	locbtnotifierresources.rss
-HEADER
-TARGETPATH      APP_RESOURCE_DIR
-LANGUAGE_IDS
-END
-
-LIBRARY         euser.lib
-LIBRARY         bafl.lib
-LIBRARY		    cfservices.lib
-LIBRARY         cfactivatorengine.lib
-LIBRARY		    centralrepository.lib
-LIBRARY         eiksrv.lib
-LIBRARY         aknnotify.lib
-LIBRARY         efsrv.lib
-
-#ifdef LOG_ENABLED_LOCBTNOTIFIER
-LIBRARY         flogger.lib
-#endif
-
-
--- a/locationsystemui/locationsysui/locbtnotifier/inc/locbtnotifierconstantsmanager.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,164 +0,0 @@
-/*
-* Copyright (c) 2008 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 Manager class for the BtGpsPsy string constants
-*
-*/
-
-
-
-#ifndef C_LOCBTNOTIFIERCONSTANTSMANAGER_H
-#define C_LOCBTNOTIFIERCONSTANTSMANAGER_H
-
-
-#include <e32base.h>
-#include <f32file.h>
-
-
-/**
-*  Forward Declarations
-*/
-class RResourceFile;
-
-
-/**
- * Manager class for the BtGpsPsy string constants
- * This class reads all the pre-defined constants
- * from resource file on construction
- * 
- *  
- *  @since S60 5.1
- */
-NONSHARABLE_CLASS ( CLocBtNotifierConstantsManager ): public CBase
-    {
-
-    public:
-        
-        /** 
-        * Constructor
-        */
-        static CLocBtNotifierConstantsManager* NewL();
-        
-        
-        /**
-        * Destructor.
-        */
-        virtual ~CLocBtNotifierConstantsManager();
-
-    private:
-    
-        /**
-        * Second Phase of construction
-        */
-        void ConstructL();
-        
-        /**
-        * Private Constructor
-        */
-        CLocBtNotifierConstantsManager();
-        
-        /**
-        * Get localisable resource name
-        * This function leaves if no localisable resource is found
-        * @param   aFs File Session handle
-        * @return  Resource filename
-        */
-        TFileName* GetLocalisableResourceNameL( RFs& aFs );
-        
-        /**
-        * Get text from resource file
-        * @param aResourceFile  A handle to the localisation resource file
-        * @param aId            Resource id as mentioned in rss file
-        * @return               Text associated with the resource id mentioned
-        */
-        HBufC* GetTextL( RResourceFile& aResourceFile, TInt aId );
-        
-    public:
-    
-        /**
-        * Returns the Battery Low Dialog text
-        * @return BatteryLowDialogText
-        */
-        TPtr GetBatteryLowDialogText();
-        
-        /**
-        * Returns the Battery Full Dialog text
-        * @return BatteryFullDialogText
-        */
-        TPtr GetBatteryFullDialogText();
-        
-        /**
-        * Returns the Ext. Antenna Connected Dialog text
-        * @return ExtAntennaConnectedDialogText
-        */
-        TPtr GetExtAntennaConnectedDialogText();
-        
-        /**
-        * Returns the Ext. Antenna Disconnected Dialog text
-        * @return ExtAntennaDisconnectedDialogText
-        */
-        TPtr GetExtAntennaDisconnectedDialogText();
-        
-        /**
-        * Returns the Ext. Power Connected Dialog text
-        * @return ExtPowerConnectedDialogText
-        */
-        TPtr GetExtPowerConnectedDialogText();
-        
-        /**
-        * Returns the Ext. Power Disconnected Dialog text
-        * @return ExtPowerDisconnectedDialogText
-        */
-        TPtr GetExtPowerDisconnectedDialogText();
-        
-        
-        
-    private:
-    
-        /**
-        * Text for battery low dialog
-        */
-        HBufC*   iBatteryLowDialogText;
-		
-		/**
-		* Text for battery full dialog
-		*/
-		HBufC*   iBatteryFullDialogText;
-		
-		/**
-		* Text for ext. antenna connected dialog
-		*/
-		HBufC*   iExtAntennaConnectedDialogText;
-		
-		/**
-		* Text for ext. antenna disconnected dialog 
-		*/    
-		HBufC*   iExtAntennaDisconnectedDialogText;
-		
-		/**
-		* Text for ext. power connected dialog
-		*/
-		HBufC*   iExtPowerConnectedDialogText;
-		
-		/**
-		* Text for ext. power disconnected dialog
-		*/
-		HBufC*   iExtPowerDisconnectedDialogText;
-
-
-
-    };
-
-
-
-#endif // C_LOCBTNOTIFIERCONSTANTSMANAGER_H
--- a/locationsystemui/locationsysui/locbtnotifier/inc/locbtnotifierdebug.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,68 +0,0 @@
-/*
-* Copyright (c) 2008 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 debug macros for locbtnotifier
-*
-*/
-
-
-#ifndef LOCBTNOTIFIERDEBUG_H
-#define LOCBTNOTIFIERDEBUG_H
-
-// INCLUDES
-#include <e32std.h>
-#include "locbtnotifierdebugconfig.hrh"
-
-
-
-// Macros
-
-#define DEBUGLOCBTNOTIFIER(TEXT) 			 { \
-									  		 _LIT( KText, #TEXT ); \
-									   		 DebugLocBtNotifier(KText); \
-									 		 }
-									 
-#define LOGLOCBTNOTIFIER(TEXT, ARG1) 		 { \
-									         _LIT( KText, #TEXT ); \
-									         DebugLocBtNotifier( KText, (ARG1) ); \
-									         }
-
-
-/**
-* Logs messages into the c:\logs\locbtnotifier\locbtnotifier.txt file
-* provided the folder c:\logs\locbtnotifier\ exists.
-*/
-void DebugLocBtNotifier( TRefByValue<const TDesC> aText, ... );
-
-
-/**
-* Logging is enabled only when LOG_ENABLED_LOCBTNOTIFIER is defined
-*/
-#ifdef LOG_ENABLED_LOCBTNOTIFIER
-
-#define LOCBTNOTIFIERDEBUG(TEXT)                     DEBUGLOCBTNOTIFIER(TEXT)
-#define LOCBTNOTIFIERDEBUG1(TEXT, ARG1)              LOGLOCBTNOTIFIER(TEXT, ARG1)
-
-#else
-
-#define LOCBTNOTIFIERDEBUG(TEXT) 
-#define LOCBTNOTIFIERDEBUG1(TEXT, ARG1) 
-
-#endif
-
-
-#endif      // LOCBTNOTIFIERDEBUG_H
-
-
-
-// End of file
\ No newline at end of file
--- a/locationsystemui/locationsysui/locbtnotifier/inc/locbtnotifierdebugconfig.hrh	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-/*
-* Copyright (c) 2008 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 time Debug configuration file for project locbtnotifier
-*
-*/
-
-
-
-
-#ifndef LOCBTNOTIFIERDEBUGCONFIG_HRH
-#define LOCBTNOTIFIERDEBUGCONFIG_HRH
-
-// Flag if defined enables logging of locbtnotifier
-#define LOG_ENABLED_LOCBTNOTIFIER
-
-#endif // LOCBTNOTIFIERDEBUGCONFIG_HRH
--- a/locationsystemui/locationsysui/locbtnotifier/inc/locbtnotifierplugin.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,298 +0,0 @@
-/*
-* Copyright (c) 2008 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:  CLocBtNotifierPlugIn class declaration
-*
-*/
-
-
-
-#ifndef C_LOCBTNOTIFIERPLUGIN_H
-#define C_LOCBTNOTIFIERPLUGIN_H
-
-
-#include <e32base.h> 
-#include <cfactionplugin.h>
-
-
-#include "locbtnotifierconstantsmanager.h"
-
-/**
-* Forward Declarations
-*/
-class CAknGlobalNote;
-class CLocBtNotifierPlugIn;
-
-
-
-/**
- *  LocBtNotifier action plugin.
- *  Implementation of the Context Framework Action Plugin.
- *  Specifies the action for a change in the BtGpsPsy PS keys.
- *  ShowMsg Action shows appropriate note on change of BtGpsPsy PS Keys
- *
- *  @lib 
- *  @since S60 5.1
- */
-NONSHARABLE_CLASS ( CLocBtNotifierPlugIn ) : public CCFActionPlugIn			
-    {
-
-    public:
-        
-        /**
-        * Enumeration used to determine Battery Key State
-        */
-        enum TBtGpsPsyBatteryKeyState
-	        {
-	        /**
-	        * Indicates the battery state when the plugin is loaded
-	        */
-	        EBatteryStateUnInitialized 		= -3,
-	        /**
-	        * Indicates the battery state when plugin is initialized after 
-	        * the first call from the Context Framework Source plugin
-	        */
-	        EBatteryStateInitialized,
-	        /**
-	        * Indicates that the BT GPS device battery state is not applicable
-	        */
-	        EBatteryStateNotApplicable,
-	        /**
-	        * Indicates that BT GPS Device battery state is normal
-	        */
-	        EBatteryStateNormal,
-	        /**
-	        * Indicates that BT GPS Device battery state is low
-	        */ 
-	        EBatteryStateLow,
-	        /**
-	        * Indicates that BT GPS Device battery state is full
-	        */
-	        EBatteryStateFull 
-	        };
-        
-        /**
-        * Enumeration used to determine Antenna Key State
-        */
-        enum TBtGpsPsyAntennaKeyState
-            {
-            /**
-	        * Indicates the ext Antenna state when the plugin is loaded
-	        */
-        	EAntennaStateUnInitialized		= -3,
-        	/**
-	        * Indicates Antenna state when the plugin is initialized 
-	        * after the first call from the Context Framework Source plugin
-	        */
-        	EAntennaStateInitialized,
-        	/**
-        	* Indicates that the Ext Antenna State is not applicable
-        	*/
-        	EAntennaStateNotApplicable,
-        	/**
-        	* Indicates that the Ext Antenna is disconnected from the
-        	* BT GPS Device
-        	*/
-        	EExtAntennaOff,
-        	/**
-        	* Indicates that the Ext Antenna is connected to the
-        	* BT GPS Device
-        	*/
-        	EExtAntennaOn 
-        	};
-        
-        /**
-        * Enumeration used to determine Power Key State
-        */
-        enum TBtGpsPsyPowerKeyState
-        	{
-        	/**
-	        * Indicates the ext Power state when the plugin is loaded
-	        */
-        	EPowerStateUnInitialized		= -3,
-        	/**
-	        * Indicates Power state when the plugin is initialized 
-	        * after the first call from the Context Framework Source plugin
-	        */
-        	EPowerStateInitialized,
-        	/**
-        	* Indicates that the Ext Power State is not applicable
-        	*/
-        	EPowerStateNotApplicable,
-        	/**
-        	* Indicates that the Charger is disconnected from the
-        	* BT GPS Device
-        	*/
-        	EExtPowerOff,
-        	/**
-        	* Indicates that the Charger is connected to the
-        	* BT GPS Device
-        	*/
-        	EExtPowerOn
-        	};
-        
-        /** 
-        * Constructor
-        */
-        static CLocBtNotifierPlugIn* NewL();
-        
-        /**
-        * Destructor.
-        */
-        ~CLocBtNotifierPlugIn();
-
-    private:
-    
-        /** 
-        * from base class CCFActionPlugIn
-        */
-        void InitializeL();
-        
-        /** 
-        * from base class CCFActionPlugIn
-        */
-        TExecutionTime ExecuteL( CCFActionIndication* aActionIndication );
-        
-        /** 
-        * from base class CCFActionPlugIn
-        */
-        void GetActionsL( CDesCArray& aActionList ) const;
-        
-        /** 
-        * from base class CCFActionPlugIn
-        */
-        const TSecurityPolicy& SecurityPolicy() const;
-        
-   
-    private:
-        
-        /**
-        * Private Constructor
-        */
-        CLocBtNotifierPlugIn();
-        
-          		
-    	/**
-    	* Checks if there is change in Battery key state with respect to the  
-    	* previous notification and proceeds to show appropriate note
-    	* @param aValue - value of the action parameter
-    	*/
-    	void HandleBatteryKeyStateL( TDesC& aValue );
-    		
-    	/**
-    	* Checks the Cen Rep key settings before displaying the note for
-    	* any Battery key change
-    	* @param aState - enum value based on the PS key that has changed
-    	*/
-    	void ShowBatteryNoteL( TBtGpsPsyBatteryKeyState aState );
-    		
-    	/**
-    	* Verifies if the battery note can be shown 
-    	* @param aState - enum value based on the PS key that has changed
-    	* @return ETrue if note can be displayed  or
-    	*         EFalse if note should not be displayed
-    	*/
-    	TBool IsBatteryNoteShownL( TBtGpsPsyBatteryKeyState aState );
-    		
-    	/**
-    	* Checks if there is change in Antenna key state with respect to the  
-    	* previous notification and proceeds to show appropriate note
-    	* @param aValue - value of the action parameter
-    	*/
-    	void HandleAntennaKeyStateL( TDesC& aValue );
-    		
-    	/**
-    	* Checks the Cen Rep key settings before displaying the note for
-    	* any Antenna key change
-    	* @param aState - enum value based on the PS key that has changed
-    	*/
-    	void ShowAntennaNoteL( TBtGpsPsyAntennaKeyState aState );
-    		
-    	/**
-    	* Verifies if the Antenna note can be shown 
-    	* @param aState - enum value based on the PS key that has changed
-    	* @return ETrue if note can be displayed  or
-    	*         EFalse if note should not be displayed
-    	*/
-    	TBool IsAntennaNoteShownL( TBtGpsPsyAntennaKeyState aState );
-    		
-    	/**
-    	* Checks if there is change in Power key state with respect to the  
-    	* previous notification and proceeds to show appropriate note
-    	* @param aValue - value of the action parameter
-    	*/
-    	void HandlePowerKeyStateL( TDesC& aValue );
-    		
-    	/**
-    	* Checks the Cen Rep key settings before displaying the note for
-    	* any Power key change
-    	* @param aState - enum value based on the PS key that has changed
-    	*/
-    	void ShowPowerNoteL( TBtGpsPsyPowerKeyState aState );
-    		
-    	/**
-    	* Verifies if the Power note can be shown 
-    	* @param aState - enum value based on the PS key that has changed
-    	* @return ETrue if note can be displayed  or
-    	*         EFalse if note should not be displayed
-    	*/
-    	TBool IsPowerNoteShownL( TBtGpsPsyPowerKeyState aState );
-    		
-    	/**
-    	* Verifies if the dialog can be shown depending on the CenRep key value
-    	* @param in - aKey - CenRep Key whose value needs to be checked
-    	* @param out - aShown - Contains value of the key either 0 or 1
-    	*/
-    	void IsDialogShownL( TUint32 aKey, TBool& aShown );
-    		
-    	    		
-    		
-    private: 
-    
-        /**
-        * Own : Avkon Global Note
-        */
-        CAknGlobalNote* iGlobalNote;
-        
-        /**
-        * Own : CLocBtNotifierConstantsManager handler
-        */
-        CLocBtNotifierConstantsManager* iConstantsManager;
-        
-        /**
-        * Stores the previous BluetoothGpsPsyBatteryState 
-        */
-        TBtGpsPsyBatteryKeyState iBatteryStatus;
-        
-        /**
-        * Stores the previous BluetoothGpsPsyExtAntennaState 
-        */
-        TBtGpsPsyAntennaKeyState iAntennaStatus;
-        
-        /**
-        * Stores the previous BluetoothGpsPsyExtPowerState 
-        */
-        TBtGpsPsyPowerKeyState iPowerStatus;
-        
-        /**
-        * Pointer to the text to be displayed in the information note
-        */
-        TPtr16 iInfoText;
-        
-            
-    };
-
-
-
-
-#endif // C_LOCBTNOTIFIERPLUGIN_H
--- a/locationsystemui/locationsysui/locbtnotifier/inc/locbtnotifierpluginconstants.hrh	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,28 +0,0 @@
-/*
-* Copyright (c) 2008 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:  UID constants header for project locbtnotifier
-*
-*/
-
-
-
-
-#ifndef LOCBTNOTIFIERPLUGINCONSTANTS_HRH
-#define LOCBTNOTIFIERPLUGINCONSTANTS_HRH
-
-
-#define KLocBtNotifierPlugInDllUid 0x2001FCBB
-#define KLocBtNotifierPlugInImplementationUid 0x2001FCBB
-
-#endif // LOCBTNOTIFIERPLUGINCONSTANTS_HRH
--- a/locationsystemui/locationsysui/locbtnotifier/inc/locbtnotifierprivatecrkeys.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,79 +0,0 @@
-/*
-* Copyright (c) 2008 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:  BtGpsPsy Central Repository keys for locbtnotifier dialog settings
-*
-*/
-
-
-#ifndef LOCBTNOTIFIERCRKEYS_H
-#define LOCBTNOTIFIERCRKEYS_H
-
-/**
-* BT GPS PSY Setting Storage CenRep UID
-*/
-const TUid KCRUidLocBtGpsPsy = { 0x2001FCBB };
-
-
-/**
-* "External antenna connected" dialog setting key
-*
-* 0 = Off
-* 1 = On
-*/
-const TUint32 KBluetoothGpsPsyExtAntennaConnectedDialog = 0x10000001;
-	
-/**
-* "External antenna disconnected" dialog setting key
-*
-* 0 = Off
-* 1 = On
-*/
-const TUint32 KBluetoothGpsPsyExtAntennaDisconnectedDialog = 0x10000002;
-
-/**
-* "Charger connected" dialog setting key
-*
-* 0 = Off
-* 1 = On
-*/
-const TUint32 KBluetoothGpsPsyExtPowerConnectedDialog = 0x10000003;
-	
-/**
-* "Charger disconnected" dialog setting key
-*
-* 0 = Off
-* 1 = On
-*/
-const TUint32 KBluetoothGpsPsyExtPowerDisconnectedDialog = 0x10000004;
-	
-/**
-* "Battery low" dialog setting key
-*
-* 0 = Off
-* 1 = On
-*/
-const TUint32 KBluetoothGpsPsyBatteryLowDialog = 0x10000005;
-
-/**
-* "Battery full" dialog setting key
-*
-* 0 = Off
-* 1 = On
-*/
-const TUint32 KBluetoothGpsPsyBatteryFullDialog = 0x10000006;
-	
-
-#endif      // LOCBTNOTIFIERCRKEYS_H
-
-// End of file
\ No newline at end of file
--- a/locationsystemui/locationsysui/locbtnotifier/src/locbtnotifier.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,50 +0,0 @@
-/*
-* Copyright (c) 2008 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:  BtGpsPsy notifier action plugin entry point
-*
-*/
-
-
-// System includes
-#include <e32std.h>
-#include <ecom/implementationproxy.h>
-
-
-// User includes
-#include "locbtnotifierplugin.h"
-#include "locbtnotifierpluginconstants.hrh"
-
-
-
-// ---------------------------------------------------------------------------
-// Provides a key value pair table, this is used to identify
-// the correct construction function for the requested interface.
-// ---------------------------------------------------------------------------
-//
-const TImplementationProxy ImplementationTable[] =
-	{
-	IMPLEMENTATION_PROXY_ENTRY(
-	    KLocBtNotifierPlugInImplementationUid,
-	    CLocBtNotifierPlugIn::NewL )
-	};
-
-// ---------------------------------------------------------------------------
-// Function used to return an instance of the proxy table.
-// ---------------------------------------------------------------------------
-//
-EXPORT_C const TImplementationProxy* ImplementationGroupProxy(TInt& aTableCount)
-	{
-	aTableCount = sizeof(ImplementationTable) / sizeof(TImplementationProxy);
-	return ImplementationTable;
-	}
\ No newline at end of file
--- a/locationsystemui/locationsysui/locbtnotifier/src/locbtnotifierconstantsmanager.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,230 +0,0 @@
-/*
-* Copyright (c) 2008 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 Manager class for the BtGpsPsy string constants
-*
-*/
-
-
-
-// System Includes
-#include <e32std.h>
-#include <bautils.h>
-#include <barsc.h>
-#include <centralrepository.h>
-
-
-// User Includes
-#include "locbtnotifierconstantsmanager.h"
-#include "locbtnotifierprivatecrkeys.h"
-
-// Resource Definitions
-#include <locbtnotifierresources.rsg>
-
-// CONSTANTS
-
-// Resource File Name
-_LIT(KResourceFileName, "\\resource\\apps\\locbtnotifierresources.*");
-			
-
-
-// ======== MEMBER FUNCTIONS ========
-
-// ---------------------------------------------------------------------------
-// CLocBtNotifierConstantsManager::NewL
-// Two Phased constructor 
-// ---------------------------------------------------------------------------
-//
-CLocBtNotifierConstantsManager* CLocBtNotifierConstantsManager::NewL()
-    {
-    CLocBtNotifierConstantsManager* self = new( ELeave ) CLocBtNotifierConstantsManager;
-    CleanupStack::PushL( self );
-    self->ConstructL();    
-    CleanupStack::Pop( self );
-    return self;
-    }
-
-
-// -----------------------------------------------------------------------------
-// CLocBtNotifierConstantsManager::~CLocBtNotifierConstantsManager
-// Destructor
-// -----------------------------------------------------------------------------
-CLocBtNotifierConstantsManager::~CLocBtNotifierConstantsManager()
-    {
-    delete iBatteryLowDialogText;
-	delete iBatteryFullDialogText;
-    delete iExtAntennaConnectedDialogText;
-    delete iExtAntennaDisconnectedDialogText;
-    delete iExtPowerConnectedDialogText;
-    delete iExtPowerDisconnectedDialogText;
-    }
-    
-// -----------------------------------------------------------------------------
-// CLocBtNotifierConstantsManager::ConstructL
-// -----------------------------------------------------------------------------
-void CLocBtNotifierConstantsManager::ConstructL()
-    {
-    //File session for resource file
-    RFs fileSession;
-
-    //Open file session
-    User::LeaveIfError( fileSession.Connect() );
-    CleanupClosePushL( fileSession );
-
-    TFileName* localisedRscName = GetLocalisableResourceNameL( fileSession );
-    CleanupStack::PushL( localisedRscName );
-
-	//Construct RResourceFile
-	RResourceFile localisationResourceFile;
-    localisationResourceFile.OpenL( fileSession, *localisedRscName );
-    CleanupClosePushL( localisationResourceFile );
-
-    //Check the signature
-    localisationResourceFile.ConfirmSignatureL( 0 );
-    
-    //Read constants from resource file
-    iBatteryLowDialogText = GetTextL( localisationResourceFile, R_BATTERY_LOW );
-		
-    iBatteryFullDialogText = GetTextL( localisationResourceFile, R_BATTERY_FULL );
-		
-    iExtAntennaConnectedDialogText = GetTextL( localisationResourceFile, 
-                                              R_EXT_ANTENNA_CONNECTED );
-		
-    iExtAntennaDisconnectedDialogText = GetTextL( localisationResourceFile, 
-                                                 R_EXT_ANTENNA_DISCONNECTED );
-		
-    iExtPowerConnectedDialogText = GetTextL( localisationResourceFile, 
-                                            R_EXT_POWER_CONNECTED );
-		
-    iExtPowerDisconnectedDialogText = GetTextL( localisationResourceFile,
-                                               R_EXT_POWER_DISCONNECTED );
-        
-        
-    CleanupStack::PopAndDestroy( 3,&fileSession );
-    }
-    
-// ---------------------------------------------------------------------------
-// CLocBtNotifierConstantsManager::CLocBtNotifierConstantsManager
-// Private Constructor
-// ---------------------------------------------------------------------------
-//
- CLocBtNotifierConstantsManager::CLocBtNotifierConstantsManager()
-    {
-    
-    }
-    
-// -----------------------------------------------------------------------------
-// CLocBtNotifierConstantsManager::GetLocalisableResourceNameL
-// -----------------------------------------------------------------------------
-TFileName* CLocBtNotifierConstantsManager::GetLocalisableResourceNameL( RFs& aFs )
-    {
-	TFileName* fileName = new ( ELeave ) TFileName;
-	CleanupStack::PushL( fileName );
-	
-	TFindFile findFile( aFs );
-	CDir* dir;
-	User::LeaveIfError( findFile.FindWildByDir( KResourceFileName, KNullDesC(),dir ) );
-	CleanupStack::PushL( dir );
-	  
-	TParse fileNameParser;
-	fileNameParser.Set( findFile.File(), NULL, NULL );
-	
-	fileName->Copy( fileNameParser.DriveAndPath() );
-	fileName->Append( ( *dir )[0].iName );
-	CleanupStack::PopAndDestroy( dir );
-	
-	BaflUtils::NearestLanguageFile( aFs, *fileName );
-	
-	CleanupStack::Pop( fileName );
-	return fileName;
-    }
-    
-// -----------------------------------------------------------------------------
-// CLocBtNotifierConstantsManager::GetTextL
-// -----------------------------------------------------------------------------
-HBufC* CLocBtNotifierConstantsManager::GetTextL( RResourceFile& aResourceFile, 
-                                                TInt aId )
-    {
-    // Read from resource file
-    HBufC8* buffer = aResourceFile.AllocReadLC( aId );
-    HBufC* retBuf;
-    
-    //Resource parser
-    TResourceReader resourceReader;
-    resourceReader.SetBuffer( buffer );
-    
-    retBuf = resourceReader.ReadHBufCL();
-    User::LeaveIfNull( retBuf );
-    
-    CleanupStack::PopAndDestroy( buffer );
-    
-    return retBuf;
-    }
-
-
-// -----------------------------------------------------------------------------
-// CLocBtNotifierConstantsManager::GetBatteryLowDialogText
-// -----------------------------------------------------------------------------
-TPtr CLocBtNotifierConstantsManager::GetBatteryLowDialogText()
-    {
-	return iBatteryLowDialogText->Des();
-    }
-    
-
-// -----------------------------------------------------------------------------
-// CLocBtNotifierConstantsManager::GetBatteryFullDialogText
-// -----------------------------------------------------------------------------
-TPtr CLocBtNotifierConstantsManager::GetBatteryFullDialogText()
-    {
-	return iBatteryFullDialogText->Des();
-    }
-
-    
-// -----------------------------------------------------------------------------
-// CLocBtNotifierConstantsManager::GetExtAntennaConnectedDialogText
-// -----------------------------------------------------------------------------
-TPtr CLocBtNotifierConstantsManager::GetExtAntennaConnectedDialogText()
-    {
-	return iExtAntennaConnectedDialogText->Des();
-    }
-    
-
-// -----------------------------------------------------------------------------
-// CLocBtNotifierConstantsManager::GetExtAntennaDisconnectedDialogText
-// -----------------------------------------------------------------------------
-TPtr CLocBtNotifierConstantsManager::GetExtAntennaDisconnectedDialogText()
-    {
-	return iExtAntennaDisconnectedDialogText->Des();
-    }
-    
-
-// -----------------------------------------------------------------------------
-// CLocBtNotifierConstantsManager::GetExtPowerConnectedDialogText
-// -----------------------------------------------------------------------------
-TPtr CLocBtNotifierConstantsManager::GetExtPowerConnectedDialogText()
-    {
-	return iExtPowerConnectedDialogText->Des();
-    }
-    
-
-// -----------------------------------------------------------------------------
-// CLocBtNotifierConstantsManager::GetExtPowerDisconnectedDialogText
-// -----------------------------------------------------------------------------
-TPtr CLocBtNotifierConstantsManager::GetExtPowerDisconnectedDialogText()
-    {
-	return iExtPowerDisconnectedDialogText->Des();
-    }
-    
-
- 
-
--- a/locationsystemui/locationsysui/locbtnotifier/src/locbtnotifierdebug.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,86 +0,0 @@
-/*
-* Copyright (c) 2008 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 debugging functions for locbtnotifer
-*
-*/
-
-
-
-// INCLUDE FILES
-#include "locbtnotifierdebug.h"
-#include <flogger.h>
-#include <e32svr.h>
-// CONSTANTS
-
-/// Folder where the log resides
-_LIT( KLogFolder, "LocBtNotifier" );
-
-/// The name of the log file
-_LIT( KLogFileName, "LocBtNotifier" );
-
-/// The format in which the time is formatted in log
-_LIT( KLogTimeFormat, "%02d.%02d:%02d:%06d ");
-
-/// The length of the string produced by KLocLogTimeFormat
-const TInt KLogTimeFormatLength = 16;
-
-/// How many characters a log line can contain
-const TInt KLogLineLength = 256;
-
-// ========================== OTHER EXPORTED FUNCTIONS =========================
-
-
-// -----------------------------------------------------------------------------
-// DebugLocBtNotifier
-// Generates a log file if c:\logs\locbtnotifier\ folder exists
-// -----------------------------------------------------------------------------
-//
- void DebugLocBtNotifier( TRefByValue<const TDesC> aText, ... )
-    {    
-    VA_LIST args;
-    VA_START( args, aText );
-    
-    TBuf<KLogLineLength> buf;
-    buf.FormatList( aText, args );
-
-    #ifdef _DEBUG
-    RDebug::Print(buf);
-    #endif
-
-    RFileLogger logger;
-    
-    TInt ret=logger.Connect();
-    if (ret==KErrNone)
-        {
-        logger.SetDateAndTime( EFalse,EFalse );
-        logger.CreateLog( KLogFolder, KLogFileName, EFileLoggingModeAppend );       
-        TBuf<KLogTimeFormatLength> timeStamp;
-        TTime now;
-        now.HomeTime();
-        TDateTime dateTime;
-        dateTime = now.DateTime();
-        timeStamp.Format( KLogTimeFormat, 
-            dateTime.Hour(), dateTime.Minute(),
-            dateTime.Second(), dateTime.MicroSecond() );
-        buf.Insert( 0, timeStamp );
-
-        logger.Write(buf);
-        }
-
-    logger.Close();
-
-    VA_END( args );
-    }
-
-//  End of File  
--- a/locationsystemui/locationsysui/locbtnotifier/src/locbtnotifierplugin.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,792 +0,0 @@
-/*
-* Copyright (c) 2008 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:  CLocBtNotifierPlugIn class implementation
-*
-*/
-
-
-// System Includes
-#include <cfactionindication.h>
-#include <centralrepository.h>
-#include <AknGlobalNote.h>
-
-
-// User Includes
-#include "locbtnotifierplugin.h"
-#include "locbtnotifierconstantsmanager.h"
-#include "locbtnotifierprivatecrkeys.h"
-#include "locbtnotifierdebug.h"
-
-// CONSTANTS
-
-// Security Policy
-_LIT_SECURITY_POLICY_PASS( KSecurityPolicy );
-
-// LocBtNotifier action
-_LIT( KLocBtNotifierAction, "showNote" );
-
-// LocBtNotifier action parameters
-_LIT( KPsBatteryKeyState, "BatteryState" );
-_LIT( KPsAntennaKeyState, "AntennaState" );
-_LIT( KPsPowerKeyState,   "PowerState" );
-
-// BtGpsPsy Battery key state values
-_LIT( KBatteryStateNormal, "EBatteryStateNormal" );
-_LIT( KBatteryStateNA,     "EBatteryStateNA" );
-_LIT( KBatteryStateLow,    "EBatteryStateLow" );
-_LIT( KBatteryStateFull,   "EBatteryStateFull" );
-
-// BtGpsPsy Antenna key state values
-_LIT( KExtAntennaNA,  "EExtAntennaNA" );
-_LIT( KExtAntennaOff, "EExtAntennaOff" );
-_LIT( KExtAntennaOn,  "EExtAntennaOn" );
-
-// BtGpsPsy Power key state values
-_LIT( KExtPowerNA,  "EExtPowerNA" );
-_LIT( KExtPowerOff, "EExtPowerOff" );
-_LIT( KExtPowerOn,  "EExtPowerOn" );
-
-// Max length of the text to be displayed in the Information Note
-const TInt KMaxInfoTextLength = 256;
-
-// Logging constants
-_LIT(KLogFile, "locbtnotifier.txt");
-
-_LIT(KLogDir, "locbtnotifier");
-
-
-
-
-// ======== MEMBER FUNCTIONS ========
-
-
-
-// ---------------------------------------------------------------------------
-// CLocBtNotifierPlugIn::CLocBtNotifierPlugIn
-// ---------------------------------------------------------------------------
-//
- CLocBtNotifierPlugIn::CLocBtNotifierPlugIn(): 
- iBatteryStatus( CLocBtNotifierPlugIn::EBatteryStateUnInitialized ),
- iAntennaStatus( CLocBtNotifierPlugIn::EAntennaStateUnInitialized ),
- iPowerStatus( CLocBtNotifierPlugIn::EPowerStateUnInitialized ),
- iInfoText ( NULL , 0 )
-    {
-    
-    }
-
-// ---------------------------------------------------------------------------
-// CLocBtNotifierPlugIn::NewL
-// Two Phased constructor 
-// ---------------------------------------------------------------------------
-//
-CLocBtNotifierPlugIn* CLocBtNotifierPlugIn::NewL()
-    {
-    LOCBTNOTIFIERDEBUG( "CLocBtNotifierPlugIn::NewL : IN" );
-   
-    CLocBtNotifierPlugIn* self = new( ELeave ) CLocBtNotifierPlugIn;
-    
-    
-    LOCBTNOTIFIERDEBUG( "CLocBtNotifierPlugIn::NewL : OUT" );
-    
-    return self;
-    }
-
-
-
-// ---------------------------------------------------------------------------
-// CLocBtNotifierPlugIn::~CLocBtNotifierPlugIn
-// Destructor
-// ---------------------------------------------------------------------------
-//
-CLocBtNotifierPlugIn::~CLocBtNotifierPlugIn()
-    {
-    LOCBTNOTIFIERDEBUG( "CLocBtNotifierPlugIn::~CLocBtNotifierPlugIn : IN" );
-    
-    delete iGlobalNote;
-    delete iConstantsManager;
-   
-    LOCBTNOTIFIERDEBUG( "CLocBtNotifierPlugIn::~CLocBtNotifierPlugIn : OUT" );
-    }
-
-
-// ---------------------------------------------------------------------------
-// From class CCFActionPlugIn
-// CLocBtNotifierPlugIn::InitializeL
-// ---------------------------------------------------------------------------
-//
-void CLocBtNotifierPlugIn::InitializeL()
-    {
-    LOCBTNOTIFIERDEBUG( "CLocBtNotifierPlugIn::InitializeL : IN" );
-    
-    iGlobalNote = CAknGlobalNote::NewL();
-    iConstantsManager = CLocBtNotifierConstantsManager::NewL();
- 
-    LOCBTNOTIFIERDEBUG( "CLocBtNotifierPlugIn::InitializeL : OUT" );
-    }
-
-// ---------------------------------------------------------------------------
-// From class CCFActionPlugIn
-// CLocBtNotifierPlugIn::ExecuteL
-// ---------------------------------------------------------------------------
-//
-CCFActionPlugIn::TExecutionTime CLocBtNotifierPlugIn::ExecuteL(
-                                CCFActionIndication* aActionIndication )
-    {
-    LOCBTNOTIFIERDEBUG( "CLocBtNotifierPlugIn::ExecuteL : IN" );
-    
-    CCFActionPlugIn::TExecutionTime time = CCFActionPlugIn::ENone;
-    
-    // Parse PS key settings
-    const RKeyValueArray& parameters = aActionIndication->Parameters();
-    
-    // Get the key and value of the action parameters
-    TPtrC key( KNullDesC );
-    TPtrC value( KNullDesC );
-    
-    key.Set( parameters[0]->Key() );
-    value.Set( parameters[0]->Value() );
-    
-    // Check key value of the action parameter
-    if( !( key.CompareF( KPsBatteryKeyState ) ) )
-        {
-        // Handle the Battery Key State change events
-        HandleBatteryKeyStateL( value );
-        }	
-    
-    else if( !( key.CompareF ( KPsAntennaKeyState ) ) )
-        {
-        // Handle the Antenna key State change events
-        HandleAntennaKeyStateL( value );
-        }
-        
-    else if( !( key.CompareF ( KPsPowerKeyState ) ) )
-        {
-        // Handle the Power key State change events
-        HandlePowerKeyStateL( value );
-        }
-       
-    LOCBTNOTIFIERDEBUG( "CLocBtNotifierPlugIn::ExecuteL : OUT" );   
-    
-    return time;
-    }
-    
-// ---------------------------------------------------------------------------
-// From class CCFActionPlugIn
-// CLocBtNotifierPlugIn::GetActionsL
-// ---------------------------------------------------------------------------
-//
-void CLocBtNotifierPlugIn::GetActionsL( CDesCArray& aActionList ) const
-    {
-    LOCBTNOTIFIERDEBUG( "CLocBtNotifierPlugIn::GetActionsL : IN" );
-    
-    aActionList.AppendL( KLocBtNotifierAction );
-    
-    LOCBTNOTIFIERDEBUG( "CLocBtNotifierPlugIn::GetActionsL : OUT" );
-    }
-    
-// ---------------------------------------------------------------------------
-// From class CCFActionPlugIn
-// CLocBtNotifierPlugIn::SecurityPolicy
-// ---------------------------------------------------------------------------
-//
-const TSecurityPolicy& CLocBtNotifierPlugIn::SecurityPolicy() const
-    {
-    return KSecurityPolicy;
-    }
-    
-// ---------------------------------------------------------------------------
-// CLocBtNotifierPlugIn::HandleBatteryKeyState
-// ---------------------------------------------------------------------------
-//
-void CLocBtNotifierPlugIn::HandleBatteryKeyStateL( TDesC& aValue )
-    {
-    LOCBTNOTIFIERDEBUG( "CLocBtNotifierPlugIn::HandleBatteryKeyState : IN" );
-    
-    // Current Battery State
-    CLocBtNotifierPlugIn::TBtGpsPsyBatteryKeyState batteryState = 
-                          CLocBtNotifierPlugIn::EBatteryStateUnInitialized ;
-    
-        
-    // Get the current PS key state value
-    if( !( aValue.CompareF( KBatteryStateNA ) ) )
-        {    
-        batteryState = CLocBtNotifierPlugIn::EBatteryStateNotApplicable;
-        }
-    else if( !( aValue.CompareF( KBatteryStateNormal ) ) )
-        {
-        batteryState = CLocBtNotifierPlugIn::EBatteryStateNormal;
-        }
-    else if( !( aValue.CompareF( KBatteryStateLow ) ) )
-        {
-    	batteryState = CLocBtNotifierPlugIn::EBatteryStateLow;
-        }
-    else if( !( aValue.CompareF( KBatteryStateFull ) ) )
-        {
-        batteryState = CLocBtNotifierPlugIn::EBatteryStateFull;
-        }
-    else
-    	{
-    	// Invalid
-    	return;
-    	}
-    
-    LOCBTNOTIFIERDEBUG1( "Battery State (%d)",  batteryState );
-       
-    
-    if( iBatteryStatus == CLocBtNotifierPlugIn::EBatteryStateUnInitialized )
-        {
-        // Initializing the previous battery Status for the first callback   
-        // from context framework
-        iBatteryStatus = CLocBtNotifierPlugIn::EBatteryStateInitialized;
-        
-        LOCBTNOTIFIERDEBUG1( "Previous Battery State (%d)",  iBatteryStatus );
-       
-        return;
-        }
-    else if ( iBatteryStatus == CLocBtNotifierPlugIn::EBatteryStateInitialized 
-              && batteryState != CLocBtNotifierPlugIn::EBatteryStateNotApplicable )
-    	{
-    	// Initializing the previous battery status to current value of PS key
-        // after pairing of BT GPS device happens
-    	iBatteryStatus = batteryState;
-    	
-      LOCBTNOTIFIERDEBUG1( "Previous Battery State (%d)",  iBatteryStatus );
-       
-    	return;
-    	}   
-     
-     
-    LOCBTNOTIFIERDEBUG1( "Previous Battery State (%d)",  iBatteryStatus );
-                
-    //Check that there is a change in the Battery State before displaying the note
-    if( iBatteryStatus != batteryState )
-        {
-       
-        LOCBTNOTIFIERDEBUG1( "Previous Battery State (%d)",  iBatteryStatus );
-            
-       
-        LOCBTNOTIFIERDEBUG1( "Battery State (%d)",  batteryState );
-               
-    	switch( batteryState )
-    	    {
-    	    case CLocBtNotifierPlugIn::EBatteryStateNotApplicable :
-    	         {
-    	         // No note shown
-    	         break;
-    	         }
-    	         
-    	    case CLocBtNotifierPlugIn::EBatteryStateNormal :
-    	         {
-    	         // No note shown
-    	         iBatteryStatus = batteryState;
-    	         break;
-    	         }
-    	         
-    	    case CLocBtNotifierPlugIn::EBatteryStateLow :
-    	         {
-    	         iBatteryStatus = batteryState;
-    	         ShowBatteryNoteL( batteryState );
-    	         break;
-    	         }
-    	         
-    	    case CLocBtNotifierPlugIn::EBatteryStateFull :
-    	         {
-    	         iBatteryStatus = batteryState;
-    	         ShowBatteryNoteL( batteryState );
-    	         break;
-    	         }
-    	         
-    	    default :
-    	         {
-    	         break;
-    	         }
-    	    }
-    	    
-    	
-    	
-        }
-      
-    LOCBTNOTIFIERDEBUG1( "Previous Battery State (%d)",  iBatteryStatus );
-             
-    LOCBTNOTIFIERDEBUG( "CLocBtNotifierPlugIn::HandleBatteryKeyState : OUT" );
-    }
-    
-    
-// ---------------------------------------------------------------------------
-// CLocBtNotifierPlugIn::ShowBatteryNoteL
-// ---------------------------------------------------------------------------
-//
-void CLocBtNotifierPlugIn::ShowBatteryNoteL( TBtGpsPsyBatteryKeyState aState )
-    {
-    LOCBTNOTIFIERDEBUG( "CLocBtNotifierPlugIn::ShowBatteryNoteL : IN" );
-	
-	// Check if the note can be shown
-	if( !( IsBatteryNoteShownL( aState ) ) )
-	    {
-	    return;
-	    }
-	    
-	switch( aState )
-        {
-        case CLocBtNotifierPlugIn::EBatteryStateLow : 
-        	 {
-        	 iInfoText.Set( iConstantsManager->GetBatteryLowDialogText() );
-        	 break;            
-        	 }
-             
-        case CLocBtNotifierPlugIn::EBatteryStateFull : 
-             {
-             iInfoText.Set( iConstantsManager->GetBatteryFullDialogText() );
-             break;	
-             }
-             
-        default :
-             {
-             break;
-             } 
-        }
-    
-    iGlobalNote->ShowNoteL( EAknGlobalInformationNote, iInfoText );    
-    
-    LOCBTNOTIFIERDEBUG( "CLocBtNotifierPlugIn::ShowBatteryNoteL : OUT" );
-    }
-    
-    
-// ---------------------------------------------------------------------------
-// CLocBtNotifierPlugIn::IsBatteryNoteShown
-// ---------------------------------------------------------------------------
-//
-TBool CLocBtNotifierPlugIn::IsBatteryNoteShownL( TBtGpsPsyBatteryKeyState aState )
-    {
-    
-    LOCBTNOTIFIERDEBUG( "CLocBtNotifierPlugIn::IsBatteryNoteShown : IN" );
-	
-	TBool shown = EFalse;
-	
-	switch( aState )
-	    {
-	    case CLocBtNotifierPlugIn::EBatteryStateLow :
-	         {
-	         IsDialogShownL( KBluetoothGpsPsyBatteryLowDialog, shown );
-             break;	
-             }
-             
-        case CLocBtNotifierPlugIn::EBatteryStateFull :
-             {
-             IsDialogShownL( KBluetoothGpsPsyBatteryFullDialog, shown );
-             break;	
-             }
-             
-        default :
-             {
-             break;
-             }
-	         
-	    }
-    LOCBTNOTIFIERDEBUG( "CLocBtNotifierPlugIn::IsBatteryNoteShown : OUT" );
-	
-	return shown;
-    }
-  
-    
-// ---------------------------------------------------------------------------
-// CLocBtNotifierPlugIn::HandleAntennaKeyState
-// ---------------------------------------------------------------------------
-//
-void CLocBtNotifierPlugIn::HandleAntennaKeyStateL( TDesC& aValue )
-    {
-   LOCBTNOTIFIERDEBUG( "CLocBtNotifierPlugIn::HandleAntennaKeyState : IN" );
-    
-    // Current Antenna State
-    CLocBtNotifierPlugIn::TBtGpsPsyAntennaKeyState antennaState = 
-                          CLocBtNotifierPlugIn::EAntennaStateUnInitialized ;
-                          
-        
-    // Get the current PS key state value
-    if( !( aValue.CompareF( KExtAntennaNA ) ) )
-        {
-    	antennaState = CLocBtNotifierPlugIn::EAntennaStateNotApplicable;
-        }
-    else if( !( aValue.CompareF( KExtAntennaOff ) ) )
-        {
-    	antennaState = CLocBtNotifierPlugIn::EExtAntennaOff;
-        }
-    else if( !( aValue.CompareF( KExtAntennaOn ) ) )
-        {
-        antennaState = CLocBtNotifierPlugIn::EExtAntennaOn ;
-        }
-     else
-    	{
-    	// Invalid
-    	return;
-    	}
-    
-   LOCBTNOTIFIERDEBUG1( " Antenna State (%d)",  antennaState );
-    
-    if( iAntennaStatus == CLocBtNotifierPlugIn::EAntennaStateUnInitialized )
-        {
-        // Initializing the previous Antenna Status for the first callback   
-        // from context framework
-        iAntennaStatus = CLocBtNotifierPlugIn::EAntennaStateInitialized;
-        
-        LOCBTNOTIFIERDEBUG1( "Previous Antenna State (%d)",  iAntennaStatus );
-
-        return;
-        }
-    else if ( iAntennaStatus == CLocBtNotifierPlugIn::EAntennaStateInitialized
-              && antennaState != CLocBtNotifierPlugIn::EAntennaStateNotApplicable )
-    	{
-    	// Initializing the previous Antenna status to current value of PS key
-        // after pairing of BT GPS device happens
-    	iAntennaStatus = antennaState;
-    	
-    	LOCBTNOTIFIERDEBUG1( "Previous Antenna State (%d)",  iAntennaStatus );
-        
-    	return;
-    	}   
-            
-    	LOCBTNOTIFIERDEBUG1( "Previous Antenna State (%d)",  iAntennaStatus );
-         
-    //Check that there is a change in the Antenna State before displaying the note
-    if( iAntennaStatus != antennaState )
-        {
-        
-        LOCBTNOTIFIERDEBUG1( "Previous Antenna State (%d)",  iAntennaStatus );
- 
-        
-        LOCBTNOTIFIERDEBUG1( " Antenna State (%d)",  antennaState );
-         
-    	switch( antennaState )
-    	    {
-    	    case CLocBtNotifierPlugIn::EAntennaStateNotApplicable :
-    	         {
-    	         // No note shown
-    	         break;
-    	         }
-    	         
-    	    case CLocBtNotifierPlugIn::EExtAntennaOff :
-    	         {
-    	         iAntennaStatus = antennaState;
-    	         ShowAntennaNoteL( antennaState );
-    	         break;
-    	         }
-    	         
-    	    case CLocBtNotifierPlugIn::EExtAntennaOn :
-    	         {
-    	         iAntennaStatus = antennaState;
-    	         ShowAntennaNoteL( antennaState );
-    	         break;
-    	         }
-    	         
-    	    default :
-    	         {
-    	         break;
-    	         }
-    	    }
-    	    
-    	
-        }
-        
-    	LOCBTNOTIFIERDEBUG1( "Previous Antenna State (%d)",  iAntennaStatus );
-        
-    LOCBTNOTIFIERDEBUG( "CLocBtNotifierPlugIn::HandleAntennaKeyState : OUT" );
-    }
-
-  
-// ---------------------------------------------------------------------------
-// CLocBtNotifierPlugIn::ShowAntennaNoteL
-// ---------------------------------------------------------------------------
-//
-void CLocBtNotifierPlugIn::ShowAntennaNoteL( TBtGpsPsyAntennaKeyState aState )
-    {
-    LOCBTNOTIFIERDEBUG( "CLocBtNotifierPlugIn::ShowAntennaNoteL : IN" );
-	
-	// Check if the note can be shown
-	if( !( IsAntennaNoteShownL( aState ) ) )
-	    {
-		return;
-	    }
-	    
-	switch( aState )
-        {
-        case CLocBtNotifierPlugIn::EExtAntennaOff : 
-        	 {
-        	 iInfoText.Set( iConstantsManager->GetExtAntennaDisconnectedDialogText() );
-        	 break;            
-        	 }
-             
-        case CLocBtNotifierPlugIn::EExtAntennaOn : 
-             {
-             iInfoText.Set( iConstantsManager->GetExtAntennaConnectedDialogText() );
-             break;	
-             }
-             
-        default :
-             {
-             break;
-             } 
-        }
-    
-    iGlobalNote->ShowNoteL( EAknGlobalInformationNote, iInfoText );    
-    
-    LOCBTNOTIFIERDEBUG( "CLocBtNotifierPlugIn::ShowAntennaNoteL : OUT" );
-    } 
-
-    
-    
-// ---------------------------------------------------------------------------
-// CLocBtNotifierPlugIn::IsAntennaNoteShown
-// ---------------------------------------------------------------------------
-//
-TBool CLocBtNotifierPlugIn::IsAntennaNoteShownL( TBtGpsPsyAntennaKeyState aState )
-    {
-    LOCBTNOTIFIERDEBUG( "CLocBtNotifierPlugIn::IsAntennaNoteShown : IN" );
-	
-	TBool shown = EFalse;
-	
-	switch( aState )
-	    {
-	    case CLocBtNotifierPlugIn::EExtAntennaOff :
-	         {
-             IsDialogShownL( KBluetoothGpsPsyExtAntennaDisconnectedDialog, shown );
-             break;	
-             }
-             
-        case CLocBtNotifierPlugIn::EExtAntennaOn :
-             {
-             IsDialogShownL( KBluetoothGpsPsyExtAntennaConnectedDialog, shown );
-             break;	
-             }
-             
-        default :
-             {
-             break;
-             }
-	         
-	    }
-    
- LOCBTNOTIFIERDEBUG( "CLocBtNotifierPlugIn::IsAntennaNoteShown : OUT" );
-	
-	return shown;
-    }
-
-
-// ---------------------------------------------------------------------------
-// CLocBtNotifierPlugIn::HandlePowerKeyState
-// ---------------------------------------------------------------------------
-//
-void CLocBtNotifierPlugIn::HandlePowerKeyStateL( TDesC& aValue )
-    {
-  LOCBTNOTIFIERDEBUG( "CLocBtNotifierPlugIn::HandlePowerKeyState : IN" );
-    
-    // Current Power State
-    CLocBtNotifierPlugIn::TBtGpsPsyPowerKeyState powerState = 
-                          CLocBtNotifierPlugIn::EPowerStateUnInitialized ;
-                          
-        
-    // Get the current PS key state value
-    if( !( aValue.CompareF( KExtPowerNA ) ) )
-        {
-    	powerState = CLocBtNotifierPlugIn::EPowerStateNotApplicable;
-        }
-    else if( !( aValue.CompareF( KExtPowerOff ) ) )
-        {
-    	powerState = CLocBtNotifierPlugIn::EExtPowerOff;
-        }
-    else if( !( aValue.CompareF( KExtPowerOn ) ) )
-        {
-        powerState = CLocBtNotifierPlugIn::EExtPowerOn;
-        }
-    else
-    	{
-    	// Invalid
-    	return;
-    	}
-    
-   LOCBTNOTIFIERDEBUG1( "Power State (%d)",  powerState );
- 
-    if( iPowerStatus == CLocBtNotifierPlugIn::EPowerStateUnInitialized )
-        {
-        // Initializing the previous Power Status for the first callback   
-        // from context framework
-        iPowerStatus = CLocBtNotifierPlugIn::EPowerStateInitialized;
-        
-        	LOCBTNOTIFIERDEBUG1( "Previous Power State (%d)",  iPowerStatus );
-
-        return;
-        }
-    else if ( iPowerStatus == CLocBtNotifierPlugIn::EPowerStateInitialized
-              && powerState != CLocBtNotifierPlugIn::EPowerStateNotApplicable )
-    	{
-    	// Initializing the previous Power status to current value of PS key
-        // after pairing of BT GPS device happens
-    	iPowerStatus = powerState;
-    	
-      LOCBTNOTIFIERDEBUG1( "Previous Power State (%d)",  iPowerStatus );
-
-    	return;
-    	}   
-    	
-    	LOCBTNOTIFIERDEBUG1( "Previous Power State (%d)",  iPowerStatus );
-             
-    //Check that there is a change in the Power State before displaying the note
-    if( iPowerStatus != powerState )
-        {
-        
-        LOCBTNOTIFIERDEBUG1( "Previous Power State (%d)",  iPowerStatus );
- 
-        LOCBTNOTIFIERDEBUG1( " Power State (%d)",  powerState );
-       
-    	switch( powerState )
-    	    {
-    	    case CLocBtNotifierPlugIn::EPowerStateNotApplicable :
-    	         {
-    	         // No note shown
-    	         break;
-    	         }
-    	         
-    	    case CLocBtNotifierPlugIn::EExtPowerOff :
-    	         {
-    	         iPowerStatus = powerState;
-    	         ShowPowerNoteL( powerState );
-    	         break;
-    	         }
-    	         
-    	    case EExtPowerOn :
-    	         {
-    	         iPowerStatus = powerState;
-    	         ShowPowerNoteL( powerState );
-    	         break;
-    	         }
-    	         
-    	    default :
-    	         {
-    	         break;
-    	         }
-    	    }
-    	    
-    	
-        }
-      	
-      	LOCBTNOTIFIERDEBUG1( "Previous Power State (%d)",  iPowerStatus );
-         
-    LOCBTNOTIFIERDEBUG( "CLocBtNotifierPlugIn::HandlePowerKeyState : OUT" );
-    }
-
-  
-// ---------------------------------------------------------------------------
-// CLocBtNotifierPlugIn::ShowPowerNoteL
-// ---------------------------------------------------------------------------
-//
-void CLocBtNotifierPlugIn::ShowPowerNoteL( TBtGpsPsyPowerKeyState aState )
-    {
-    LOCBTNOTIFIERDEBUG( "CLocBtNotifierPlugIn::ShowPowerNoteL : IN" );
-	
-	// Check if the note can be shown
-	if( !( IsPowerNoteShownL( aState ) ) )
-	    {
-		return;
-	    }
-	    
-	switch( aState )
-        {
-        case CLocBtNotifierPlugIn::EExtPowerOff : 
-        	 {
-        	 iInfoText.Set( iConstantsManager->GetExtPowerDisconnectedDialogText() );
-        	 break;            
-        	 }
-             
-        case CLocBtNotifierPlugIn::EExtPowerOn : 
-             {
-             iInfoText.Set( iConstantsManager->GetExtPowerConnectedDialogText() );
-             break;	
-             }
-             
-        default :
-             {
-             break;
-             } 
-        }
-    
-    iGlobalNote->ShowNoteL( EAknGlobalInformationNote, iInfoText );    
-        
-    LOCBTNOTIFIERDEBUG( "CLocBtNotifierPlugIn::ShowPowerNoteL : OUT" );
-    } 
-
-    
-    
-// ---------------------------------------------------------------------------
-// CLocBtNotifierPlugIn::IsPowerNoteShown
-// ---------------------------------------------------------------------------
-//
-TBool CLocBtNotifierPlugIn::IsPowerNoteShownL( TBtGpsPsyPowerKeyState aState )
-    {
-    LOCBTNOTIFIERDEBUG( "CLocBtNotifierPlugIn::IsPowerNoteShown : IN" );
-	
-	TBool shown = EFalse;
-	
-	switch( aState )
-	    {
-	    case CLocBtNotifierPlugIn::EExtPowerOff :
-	         {
-	         IsDialogShownL( KBluetoothGpsPsyExtPowerDisconnectedDialog, shown );
-           break;	
-             }
-             
-        case CLocBtNotifierPlugIn::EExtPowerOn :
-             {
-             IsDialogShownL( KBluetoothGpsPsyExtPowerConnectedDialog, shown  );
-             break;	
-             }
-             
-        default :
-             {
-             break;
-             }
-	         
-	    }
-	    
-    LOCBTNOTIFIERDEBUG( "CLocBtNotifierPlugIn::IsPowerNoteShown : OUT" );
-	
-	return shown;
-    }
-    
-        
-// ---------------------------------------------------------------------------
-// CLocBtNotifierPlugIn::IsDialogShown
-// ---------------------------------------------------------------------------
-// 
-void CLocBtNotifierPlugIn::IsDialogShownL( TUint32 aKey , TBool& aShown )
-    {
-    LOCBTNOTIFIERDEBUG( "CLocBtNotifierPlugIn::IsDialogShown : IN" );
-    
-    // CRepository instance for accessing the BtGpsPsy settings
-    CRepository* cenRep = CRepository::NewL( KCRUidLocBtGpsPsy );
-    
-        
-    // Get the value of the specified Cen Rep key
-    TInt err = cenRep->Get( aKey, aShown );
-    
-    if( err != KErrNone )
-    // Failed to Get value of cenrep key,return error
-        {
-        User::Leave( err );
-        }
-    
-    delete cenRep;
-    
-    LOCBTNOTIFIERDEBUG( "CLocBtNotifierPlugIn::IsDialogShown : OUT" );
-    }
-
-
--- a/locationsystemui/locationsysui/locgpsindicatorplugin/data/10275097.rss	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,56 +0,0 @@
-/*
-* Copyright (c) 1027 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 to launch GPS indicator plugin
-*
-*/
-
-
-#include <ecom/registryinfo.rh>
-#include "locgpsindicatorpluginuids.h"
-/**
-* How to use the resource definition:
-*
-* IMPLEMENTATION_INFO
-*   {
-*   implementation_uid  = <Your implementation UID here>;
-*   version_no          = 1;
-*   display_name        = "<Your plugin name here>";
-*   default_data        = "";
-*   opaque_data         = "";
-*   }
-*/
-RESOURCE REGISTRY_INFO theInfo
-    {
-    dll_uid =  KLocGpsIndicatorDllUID;
-    interfaces =
-        {
-        INTERFACE_INFO
-            {
-            interface_uid = KLocIndicatorIterfaceUID;
-            implementations =
-                {
-                IMPLEMENTATION_INFO
-                    {
-                    implementation_uid =  KLocGpsIndicatorDllUID;
-                    version_no = 1;
-                    display_name = "";
-                    default_data = "Default";
-                    opaque_data = "";
-                    }
-                };
-            }
-        };
-    }
-
-// End of file
--- a/locationsystemui/locationsysui/locgpsindicatorplugin/data/locgpsindicatorplugin.rss	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,90 +0,0 @@
-/*
-* Copyright (c) 2007 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:  Resource definitions for GPS indicator plugin
-*
-*/
-
-//  RESOURCE IDENTIFIER
-NAME LGPS
-
-#include <eikon.rh>
-#include <avkon.rsg> 
-#include <avkon.rh>
-#include <avkon.hrh>
-#include <location.loc>
-
-
-RESOURCE RSS_SIGNATURE { }
-
-
-// Stylus popup title
-RESOURCE TBUF r_loc_stylus_title_gps
-{
-buf = qtn_loc_stylus_title_gps;
-}
-
-// Stylus information text
-RESOURCE TBUF r_loc_stylus_gps_info
-{
-buf = qtn_loc_stylus_gps_info;
-}
-
-// Stylus link text
-RESOURCE TBUF r_loc_stylus_more_info
-{
-buf = qtn_loc_stylus_gps_link;
-}
-
-// Stylus link detail text
-RESOURCE TBUF r_loc_stylus_gps_details
-{
-buf = qtn_loc_stylus_gps_details;
-}
-
-//-----------------------------------------------------
-//    Dialog to display Delivery Status data.
-//-----------------------------------------------------
-RESOURCE DIALOG r_locgpsindicator_message_query
-{
-flags = EGeneralQueryFlags | EEikDialogFlagNoBorder | EEikDialogFlagNoShadow;
-buttons = R_AVKON_SOFTKEYS_OK_EMPTY__OK;
-items=
-    {
-    DLG_LINE 
-        {
-        type = EAknCtPopupHeadingPane;
-        id = EAknMessageQueryHeaderId;
-        control = AVKON_HEADING
-            {
-            };
-        },
-    DLG_LINE
-        {
-        type = EAknCtMessageQuery;
-        id = EAknMessageQueryContentId;
-        control = AVKON_MESSAGE_QUERY
-            {
-            };
-        }
-    };
-}
-
-
-
-
-
-
-
-
-
--- a/locationsystemui/locationsysui/locgpsindicatorplugin/group/bld.inf	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-/*
-* Copyright (c) 2007 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 a 
-*        GPS Indicator Plugin.
-*
-*
-*/
-
-
-//
-// Platforms
-//
-PRJ_PLATFORMS
-DEFAULT
-
-//
-// GPS Indicator Plugin
-//
-PRJ_MMPFILES
-locgpsindicatorplugin.mmp
-// End of file
\ No newline at end of file
--- a/locationsystemui/locationsysui/locgpsindicatorplugin/group/locgpsindicatorplugin.mmp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,73 +0,0 @@
-/*
-* Copyright (c) 2007 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 definition file for Location GPS indicator
-*
-*/
-
-
-#include <data_caging_paths.hrh>
-#include <platform_paths.hrh>
-#include "../inc/locgpsindicatorpluginuids.h"
-
-// Build target
-TARGET          locgpsindicatorplugin.dll
-TARGETTYPE      PLUGIN
-UID             KLocPluginUID  KLocGpsIndicatorDllUID
-
-CAPABILITY CAP_ECOM_PLUGIN
-VENDORID        VID_DEFAULT
-
-
-// Source files location
-SOURCEPATH      ../src
-SOURCE          locgpsindicatorplugin.cpp
-SOURCE          locgpsindicatorpluginimptable.cpp
-
-
-// Resources
-START RESOURCE  ../data/10275097.rss
-TARGET			locgpsindicatorplugin.rsc
-TARGETPATH      ECOM_RESOURCE_DIR
-END
-
-START RESOURCE  ../data/locgpsindicatorplugin.rss
-TARGETPATH RESOURCE_FILES_DIR
-HEADER
-LANGUAGE_IDS
-END
-
-
-// Include paths
-USERINCLUDE     ../data
-USERINCLUDE     ../inc
-USERINCLUDE     ../group
-USERINCLUDE     ../../inc
-USERINCLUDE     ../../group
-
-APP_LAYER_SYSTEMINCLUDE
-SYSTEMINCLUDE   /epoc32/include/ecom // ecom
-                
-// Dependencies to system components
-LIBRARY     eikcore.lib
-LIBRARY     cone.lib
-LIBRARY     euser.lib
-LIBRARY     ecom.lib
-LIBRARY     avkon.lib
-LIBRARY     commonengine.lib        // stringloader
-LIBRARY     bafl.lib                // baflutils
-LIBRARY     efsrv.lib               // TParsePtrC
-LIBRARY		PlatformEnv.lib			// PathInfo
-
-// End of File
-
--- a/locationsystemui/locationsysui/locgpsindicatorplugin/inc/locgpsindicatorplugin.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,90 +0,0 @@
-/*
-* Copyright (c) 2007 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 class declaration for GPS indicator plugin.
-*
-*/
-
-
-
-#ifndef C_CLOCGPSINDICATORPLUGIN_H
-#define C_CLOCGPSINDICATORPLUGIN_H
-
-//  INCLUDES
-#include <AknIndicatorPlugin.h> // CAknIndicatorPlugin
-#include <AknPreviewPopUpController.h> // Controlling the preview pop-up component
-#include <eikcmobs.h>
-#include <ConeResLoader.h>
-
-/**
-*  GPS indicator plugin implementation
-*  This class handles the tap event generated by tapping on the GPS icon.
-*
-*  @lib locgpsindicatorplugin
-*  @since 5.0
-*/
-class CLocGpsIndicatorPlugin : public CAknIndicatorPlugin,
-							   public MAknPreviewPopUpObserver,
-                               public MEikCommandObserver
-                                         
-    {
-    public:
-        /**
-        * Two-phased constructor.
-        */
-        static CLocGpsIndicatorPlugin* NewL();
-
-        /**
-        * Destructor.
-        */
-        ~CLocGpsIndicatorPlugin();
-
-    private: // From CAknIndicatorPlugin
-        
-        /**
-         * @see CAknIndicatorPlugin
-         */
-        void HandleIndicatorTapL( const TInt aUid );
-
-    public: // From MEikCommandObserver
-    
-        /**
-         * @see MEikCommandObserver
-         */
-    	void ProcessCommandL( TInt aCommandId );
-    	
-	public: // From MAknPreviewPopUpObserver
-   
-        /**
-         * @see MAknPreviewPopUpObserver
-         */
-        void HandlePreviewPopUpEventL(
-            CAknPreviewPopUpController* aController,
-            TPreviewPopUpEvent aEvent );    	
-
-    private:
-
-        /**
-        * C++ default constructor.
-        */
-        CLocGpsIndicatorPlugin();
-
-        /**
-        * By default Symbian 2nd phase constructor is private.
-        */
-        void ConstructL();
-    };
-
-#endif      // C_LOCGPSINDICATORPLUGIN_H
-
-// End of File
--- a/locationsystemui/locationsysui/locgpsindicatorplugin/inc/locgpsindicatorpluginuids.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +0,0 @@
-/*
-* Copyright (c) 2007 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:  GPS indicator plugin uids
-*
-*/
-
-
-#ifndef LOCGPSINDICATORPLUGINUIDS_H
-#define LOCGPSINDICATORPLUGINUIDS_H
-
-/// Plugin UID
-#define KLocPluginUID        0x10009D8D
-
-/// GPS indicator plugin dll uid
-#define KLocGpsIndicatorDllUID           0x10275097
-
-//Indicator interface UID
-#define KLocIndicatorIterfaceUID     0x10275092
-
-#endif // LOCGPSINDICATORPLUGINUIDS_H
-
-// End of File
--- a/locationsystemui/locationsysui/locgpsindicatorplugin/src/locgpsindicatorplugin.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,91 +0,0 @@
-/*
-* Copyright (c) 2007 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:  GPS indicator plugin implementation
-*
-*/
-
-
-// USER INCLUDES
-#include "locgpsindicatorplugin.h"
-#include "locgpsindicatorpluginuids.h"
-
-// ======== MEMBER FUNCTIONS ========
-
-// ---------------------------------------------------------------------------
-// CLocGpsIndicatorPlugin::CLocGpsIndicatorPlugin
-// ---------------------------------------------------------------------------
-//
-CLocGpsIndicatorPlugin::CLocGpsIndicatorPlugin()
-    {
-    }
-
-// ---------------------------------------------------------------------------
-// CLocGpsIndicatorPlugin::ConstructL
-// Symbian 2nd phase constructor can leave.
-// ---------------------------------------------------------------------------
-//
-void CLocGpsIndicatorPlugin::ConstructL()
-    {
-    }
-
-// -----------------------------------------------------------------------------
-// CLocGpsIndicatorPlugin::NewL
-// Two-phased constructor.
-// -----------------------------------------------------------------------------
-//
-CLocGpsIndicatorPlugin* CLocGpsIndicatorPlugin::NewL()
-    {
-    CLocGpsIndicatorPlugin* self = 
-        new( ELeave ) CLocGpsIndicatorPlugin;
-    CleanupStack::PushL( self );
-    self->ConstructL();
-    CleanupStack::Pop( self );
-    return self;
-    }
-
-
-// -----------------------------------------------------------------------------
-// Destructor
-// -----------------------------------------------------------------------------
-//
-CLocGpsIndicatorPlugin::~CLocGpsIndicatorPlugin()
-    {
-    }
-
-
-// ---------------------------------------------------------------------------
-// CLocGpsIndicatorPlugin::HandleIndicatorTapL
-// ---------------------------------------------------------------------------
-//
-void CLocGpsIndicatorPlugin::HandleIndicatorTapL( const TInt /*aUid*/ )
-    {
-    }
-
-// ---------------------------------------------------------------------------
-// CLocGpsIndicatorPlugin::ProcessCommandL
-// ---------------------------------------------------------------------------
-//
-void CLocGpsIndicatorPlugin::ProcessCommandL( TInt /* aCommandId */)
-    {
-    }
-// ---------------------------------------------------------------------------
-// CLocGpsIndicatorPlugin::HandlePreviewPopUpEventL
-// ---------------------------------------------------------------------------
-//
-void CLocGpsIndicatorPlugin::HandlePreviewPopUpEventL( CAknPreviewPopUpController* /*aController*/,
-            										   TPreviewPopUpEvent /*aEvent*/ )
-    {
-    }
-    
-//  End of File
--- a/locationsystemui/locationsysui/locgpsindicatorplugin/src/locgpsindicatorpluginimptable.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,38 +0,0 @@
-/*
-* Copyright (c) 2007 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:  ECom proxy implementation
-*
-*/
-
-#include <implementationproxy.h>
-#include "locgpsindicatorplugin.h"
-#include "locgpsindicatorpluginuids.h"
-
-// Define the interface UIDs
-// Map the interface implementation UIDs to implementation factory functions
-const TImplementationProxy ImplementationTable[] =
-    {
-    IMPLEMENTATION_PROXY_ENTRY(  KLocGpsIndicatorDllUID, 
-                                CLocGpsIndicatorPlugin::NewL )
-	};
-	
-// Exported proxy for instantiation method resolution.
-EXPORT_C const TImplementationProxy* ImplementationGroupProxy
-        (TInt& aTableCount)
-    {
-    aTableCount = sizeof(ImplementationTable) / sizeof(ImplementationTable[0]);
-    return ImplementationTable;
-    }
-    
-// End of file
--- a/locationsystemui/locationsysui/locnotprefplugin/data/1020690F.rss	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,56 +0,0 @@
-/*
-* Copyright (c) 1020 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:  ECOM plugin resource file for Notational Preferences Plugin.
-*
-*/
-
-#include <ecom/registryinfo.rh>
-#include "locnotprefpluginuid.hrh"
-
-#define PLUGINDISPLAYNAME "Notation Preferences"
-/**
-* How to use the resource definition:
-*
-* IMPLEMENTATION_INFO
-*   {
-*   implementation_uid  = <Your implementation UID here>;
-*   version_no          = 1;
-*   display_name        = "<Your plugin name here>";
-*   default_data        = "";
-*   opaque_data         = "";
-*   }
-*/
-RESOURCE REGISTRY_INFO theInfo
-    {
-    dll_uid     = 0x1020690F;
-    interfaces  = 
-        {
-        INTERFACE_INFO
-            {
-            interface_uid   = 0x10275061;
-            implementations = 
-                {
-                IMPLEMENTATION_INFO
-                    {
-                    implementation_uid  = 0x1020690F;
-                    version_no          = 1;
-                    display_name        = PLUGINDISPLAYNAME;
-                    default_data        = "";
-                    opaque_data         = "";                   
-                    }
-                };
-            }
-        };
-    }
-
--- a/locationsystemui/locationsysui/locnotprefplugin/data/backup_registration.xml	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-<?xml version="1.0" standalone="yes"?>
-<backup_registration version="1.0">
-    <proxy_data_manager sid = "0x10202BE9" />
-    <restore requires_reboot = "no"/>
-</backup_registration>
--- a/locationsystemui/locationsysui/locnotprefplugin/data/locnotprefpluginview.rss	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,288 +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:  Contains all the resource definitions for the Location Notation
-*                Preferences plug-in
-*
-*/
-
-
-//  RESOURCE IDENTIFIER
-
-NAME    LNPR // 4 Letter Identifier
-
-//  SYSTEM INCLUDES
-#include <data_caging_paths_strings.hrh>
-#include <bldvariant.hrh>
-#include <avkon.rh>
-#include <avkon.rsg>
-#include <avkon.mbg>
-#include <EIKCORE.rsg>
-#include <eikon.rh>
-#include <eikon.rsg>
-#include <avkon.loc>
-
-// USER INCLUDES
-#include <location.loc>
-#include <locnotprefsettings.loc>
-#include "locnotprefplugin.hrh"
-
-//  RESOURCE DEFINITIONS 
-    
-RESOURCE RSS_SIGNATURE 
-    {
-    }
-
-//------------------------------------------------------------------------------
-//   
-// r_locnotprefplugin_view
-// Location Notation Preferences plug-in view
-//
-//------------------------------------------------------------------------------
-//
-RESOURCE AVKON_VIEW r_locnotprefplugin_view
-    {
-    menubar = r_locnotprefplugin_menubar_view;
-    cba = r_locnotprefplugin_cba;    
-    }
-
-//------------------------------------------------------------------------------
-//   
-// r_locnotprefplugin_cba
-// CBA for Location Notation preferences plug-in
-//
-//-------------------------------------------------------------------------------
-//   
-RESOURCE CBA r_locnotprefplugin_cba
-    {
-    flags = 0;
-    buttons = 
-        {
-        CBA_BUTTON 
-            {
-            id = EAknSoftkeyOptions; 
-            txt = text_softkey_option;
-            },
-        CBA_BUTTON 
-            {
-            id = EAknSoftkeyBack; 
-            txt = text_softkey_back;
-            },
-        CBA_BUTTON
-            {
-            id = ELocNotPrefMSKChange; 
-            txt = qtn_msk_change;
-            }
-        };
-    }
-
-//------------------------------------------------------------------------------
-//   
-// r_locnotprefplugin_menubar_view
-//
-// Menu bar for Location Notation preferences plug-in view.
-//
-//------------------------------------------------------------------------------
-//
-RESOURCE MENU_BAR r_locnotprefplugin_menubar_view
-    {
-    titles=
-        {
-        MENU_TITLE 
-            { 
-            menu_pane = r_locnotprefplugin_menu; txt=""; 
-            }
-        };
-    }
-
-//------------------------------------------------------------------------------
-//   
-// r_locnotprefplugin_menu
-//
-// Menu Items for Location Notation preferences plug-in view.
-//
-//------------------------------------------------------------------------------
-//
-RESOURCE MENU_PANE r_locnotprefplugin_menu
-    {
-    items=
-        {
-        MENU_ITEM 
-            { 
-            command = ELocNotPrefChange; 
-            txt = qtn_options_change; 
-            flags = EEikMenuItemAction;
-            },
-        MENU_ITEM 
-            { 
-            command = EAknCmdHelp; 
-            txt = qtn_options_help; 
-            },
-        MENU_ITEM 
-            {
-            // Exit option should use 'EEikCmdExit' instead of 'EEAknCmdExit'
-            // This is to ensure that the Exit command is not handled by the 
-            // ProcessCommandL of CAknView and is transferred to 
-            // CAknViewAppUi::HandleCommandL. This behaviour is necessary 
-            // for proper handling of the Exit command from an App Server's 
-            // perspective.
-            command = EEikCmdExit;  
-            txt = qtn_options_exit; 
-            }
-        };
-    }
-    
-//------------------------------------------------------------------------------
-// r_loc_settings_notations
-// 
-// Caption text for Location Notation preferences settings
-//------------------------------------------------------------------------------
-//
-RESOURCE TBUF r_loc_settings_notations
-    {
-    buf = qtn_loc_settings_notations;
-    }
-       
-//------------------------------------------------------------------------------
-// r_loc_title_notations
-// 
-// Title text for Location Notation preferences settings
-//------------------------------------------------------------------------------
-//
-RESOURCE TBUF r_loc_title_notations
-    {
-    buf = qtn_loc_title_notations;
-    }
-    
-//------------------------------------------------------------------------------
-// r_loc_notation_measures
-// 
-// List box text for System of Measurements
-//------------------------------------------------------------------------------
-//
-RESOURCE TBUF r_loc_notation_measures
-    {
-    buf = qtn_loc_notation_measures;
-    }
-
-//------------------------------------------------------------------------------
-// r_loc_notation_coordinate_format
-// 
-// List box text for Co-ordinate display format
-//------------------------------------------------------------------------------
-//
-RESOURCE TBUF r_loc_notation_coordinate_format
-    {
-    buf = qtn_loc_notation_coordinate_format;
-    }
-
-//------------------------------------------------------------------------------
-// r_loc_metric_system
-// 
-// Settings value for System of measures. Indicates usage of Metric system of 
-// measurement for all location applications
-//------------------------------------------------------------------------------
-//
-RESOURCE TBUF r_loc_metric_system
-    {
-    buf = qtn_loc_metric_system;
-    }
-
-//------------------------------------------------------------------------------
-// r_loc_imperial_system
-// 
-// Settings value for System of measures. Indicates usage of Imperial system of 
-// measurement for all location applications
-//------------------------------------------------------------------------------
-//
-RESOURCE TBUF r_loc_imperial_system
-    {
-    buf = qtn_loc_imperial_system;
-    }
-
-//------------------------------------------------------------------------------
-// r_loc_format_decimal_seconds
-// 
-// Settings value for Co-ordinate display format. Indicates usage of Degrees, 
-// minutes, seconds and decimal seconds
-//------------------------------------------------------------------------------
-//
-RESOURCE TBUF r_loc_format_decimal_seconds
-    {
-    buf = qtn_loc_format_decimal_seconds;
-    }
-
-//------------------------------------------------------------------------------
-// r_loc_format_decimal_minutes
-// 
-// Settings value for Co-ordinate display format. Indicates usage of Degrees, 
-// minutes and decimal minutes
-//------------------------------------------------------------------------------
-//
-RESOURCE TBUF r_loc_format_decimal_minutes
-    {
-    buf = qtn_loc_format_decimal_minutes;
-    }
-
-//------------------------------------------------------------------------------
-// r_loc_format_decimal_degrees
-// 
-// Settings value for Co-ordinate display format. Indicates usage of Degrees  
-// and decimal degrees
-//------------------------------------------------------------------------------
-//
-RESOURCE TBUF r_loc_format_decimal_degrees
-    {
-    buf = qtn_loc_format_decimal_degrees;
-    }
-    
-//------------------------------------------------------------------------------
-// r_loc_sysofmeas_settings
-//
-// Settings page for manipulating System of measurement settings
-//------------------------------------------------------------------------------
-//
-RESOURCE AVKON_SETTING_PAGE r_loc_sysofmeas_settings
-    { 
-    label = qtn_loc_notation_measures;
-    softkey_resource = R_AVKON_SOFTKEYS_OK_CANCEL__OK;
-    type = EAknSetListBox;
-    editor_resource_id = r_loc_not_settings_listbox;
-    }      
-
-//------------------------------------------------------------------------------
-// r_loc_coorddisplay_settings
-//
-// Settings page for manipulating Co-ordinate display format settings
-//------------------------------------------------------------------------------
-//
-RESOURCE AVKON_SETTING_PAGE r_loc_coorddisplay_settings
-    { 
-    label = qtn_loc_notation_coordinate_format;
-    softkey_resource = R_AVKON_SOFTKEYS_CANCEL;
-    type = EAknSetListBox;
-    editor_resource_id = r_loc_not_settings_listbox;
-    } 
-     
-//------------------------------------------------------------------------------
-//   
-//    r_blid_settings_listbox 
-//    Set Settings text
-//
-//------------------------------------------------------------------------------
-//
-RESOURCE LISTBOX r_loc_not_settings_listbox 
-    {
-    flags = EEikListBoxMultipleSelection;
-    }   
-// End of File
--- a/locationsystemui/locationsysui/locnotprefplugin/group/bld.inf	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,36 +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:  This file provides the information required for building 
-*                Location Notation Preferences plug-in.
-*
-*/
-
-
-// To get the MW_LAYER_PLATFORM_EXPORT_PATH macro definitions
-#include <platform_paths.hrh>
-
-PRJ_PLATFORMS
-DEFAULT
-
-PRJ_EXPORTS
-../data/backup_registration.xml     /epoc32/RELEASE/winscw/udeb/z/private/10281861/backup_registration.xml
-../data/backup_registration.xml     /epoc32/data/z/private/10281861/backup_registration.xml
-
-PRJ_MMPFILES
-locnotprefplugin.mmp    
-
-
-PRJ_TESTMMPFILES
-
-//  End of File  
--- a/locationsystemui/locationsysui/locnotprefplugin/group/locnotprefplugin.mmp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,77 +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:  Project definition file for Location Notation Preferences plug-in.
-*
-*/
-
-
-#include <platform_paths.hrh> // For the MW_LAYER_SYSTEMINCLUDE
-#include <data_caging_paths.hrh>
-#include "../inc/locnotprefpluginuid.hrh"    // For UID3
-
-CAPABILITY          CAP_ECOM_PLUGIN
-TARGET              locnotprefplugin.dll
-TARGETTYPE          PLUGIN
-UID                 0x10009D8D KLocNotPrefPluginUID3
-VENDORID            VID_DEFAULT
-
-SOURCEPATH          ../src
-SOURCE              locnotprefplugin.cpp
-SOURCE              locnotprefpluginimptable.cpp
-SOURCE              locnotprefplugincontainer.cpp
-SOURCE              locnotprefpluginview.cpp
-SOURCE              locnotprefpluginengine.cpp
-SOURCE              locnotprefsomadapter.cpp
-SOURCE              locnotprefcorddisadapter.cpp
-
-
-USERINCLUDE         ../inc
-USERINCLUDE         ../data
-USERINCLUDE         ../../inc
-USERINCLUDE         ../../../inc
-USERINCLUDE         ../../../../inc
-
-// System Include
-APP_LAYER_SYSTEMINCLUDE
-
-SOURCEPATH          ../data
-
-//ECOM resource definition
-START RESOURCE      1020690F.rss
-TARGET              locnotprefplugin.rsc
-END // ECOM resource definition
-
-//View resources
-START RESOURCE      locnotprefpluginview.rss
-HEADER
-TARGETPATH          RESOURCE_FILES_DIR
-LANGUAGE_IDS
-END // View Resources
-
-LIBRARY             euser.lib
-LIBRARY             ecom.lib
-LIBRARY             efsrv.lib
-LIBRARY             avkon.lib
-LIBRARY             bafl.lib 
-LIBRARY             cone.lib 
-LIBRARY             eikcoctl.lib 
-LIBRARY             eikcore.lib 
-LIBRARY             commonengine.lib        // RConeResourceLoader
-LIBRARY             egul.lib                // CGulIcon
-LIBRARY             aknskins.lib            // AknsUtils.h
-LIBRARY             centralrepository.lib   // CRepository
-LIBRARY             featmgr.lib             // Feature manager API
-LIBRARY             hlplch.lib              // Help File
-
-// End of File
--- a/locationsystemui/locationsysui/locnotprefplugin/inc/locnotprefadapterobserver.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +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:  Observer to the Location Notation Preferences settings' adapters
-*
-*/
-
-#ifndef M_LOCNOTPREFADAPTEROBSERVER_H_
-#define M_LOCNOTPREFADAPTEROBSERVER_H_
-
-//  System Includes
-#include <e32base.h>
-
-// User Includes
-
-// Forward Declarations
-
-// Constant Declarations
-// Class Definition
-
-/**
- * Observer to the Location notation preferences settings' adapter. This class
- * provides notification about the changes to the Central-repository values of
- * Location notation preferences settings.
- */
-class MLocNotPrefAdapterObserver
-    {
-    public:
-        /**
-         * Creates new Location Notation Preferences plug-in view.
-         */                                                 
-        virtual void HandleSettingsChangeL() = 0;
-
-    };          
-
-#endif // M_LOCNOTPREFADAPTEROBSERVER_H_
-
--- a/locationsystemui/locationsysui/locnotprefplugin/inc/locnotprefcorddisadapter.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,171 +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:  Location Notation Preferences Plugin Co-ordinate display adapter
-*
-*/
-
-#ifndef C_LOCNOTPREFCOORDINATEDISPLAYADAPTER_H_
-#define C_LOCNOTPREFCOORDINATEDISPLAYADAPTER_H_
-
-//  System Includes
-#include <e32base.h>
-
-// User Includes
-
-// Forward Declarations
-class MLocNotPrefAdapterObserver;
-class CRepository;
-
-// Constant Declarations
-
-// Class Definition
-
-/**
- * Adapter to the Co-ordinate Display settings storage
- */
-class CLocNotPrefCoordinateDisplayAdapter : public CActive
-    {
-    public:
-        /**
-         * Enumeration for the positon of the Co-ordinate display values in display order
-         */         
-        enum TCordDisSetListPosition
-            {
-            /**
-             * Enumeration to denote Location information is to be displayed 
-             * at postion 0
-             */
-            EPosDMSS = 0x00000000,
-            
-            /**
-             * Enumeration to denote Location information is to be displayed
-             * at postion 1
-             */             
-            EPosDMM,
-            
-            /**
-             * Enumeration to denote Location information is to be displayed
-             * at postion 2
-             */ 
-            EPosDD             
-            };            
-    public:
-        /**
-         * Creates new Co-ordinate display adapter
-         *
-         * @param  aAdapterObsrv                        Observer to the Settings adapter
-         * @return CLocNotPrefCoordinateDisplayAdapter& Reference to the application view
-         */                                                 
-        static CLocNotPrefCoordinateDisplayAdapter* NewL( 
-                            MLocNotPrefAdapterObserver& aAdapterObsrv );
-
-
-        /**
-         * Creates new Co-ordinate display adapter
-         * Leaves the object on the Clean up stack         
-         *
-         * @param  aAdapterObsrv                        Observer to the Settings adapter
-         * @return CLocNotPrefCoordinateDisplayAdapter& Reference to the application view
-         */                                                 
-        static CLocNotPrefCoordinateDisplayAdapter* NewLC( 
-                            MLocNotPrefAdapterObserver& aAdapterObsrv );    
-
-        
-        /**
-         * Destructor
-         */
-        ~CLocNotPrefCoordinateDisplayAdapter ();
-        
-        /**
-         * Returns the position of the Co-ordinate display format settings value.
-         *
-         * @return TCordDisSetListPosition Current postion of the Co-ordinate display
-         *                                 settings value.
-         */
-        TCordDisSetListPosition GetCurrentDisplayFormatL();
-        
-        /**
-         * Sets the value of the Co-ordinate display format settings based on the 
-         * display position.
-         *
-         * @param aSettingsPos  Position of the new Co-ordinate display settings value.
-         */
-        void SetCurrentDisplayFormatL( TCordDisSetListPosition aSettingsPos );
-
-    protected:
-        /**
-         * Inherited from CActive
-         */
-        void RunL();
-        
-        /**
-         * Inherited from CActive
-         */
-        void DoCancel();
-                    
-    private:
-        /**
-         * Constructor
-         */
-        CLocNotPrefCoordinateDisplayAdapter( MLocNotPrefAdapterObserver&    aAdapterObsrv );
-
-        /**
-         * Second Phase Constructor
-         */
-        void ConstructL();
-        
-        /**
-         * Start notification from the Central repository server for any changes in the
-         * Co-ordinate display format key value
-         */
-        void StartNotification();
-        
-    private:
-        /**
-         * Enumeration for Co-ordinate display values
-         */
-        enum TCoordinateDisplayValue
-            {
-            /**
-             * Enumeration to denote Location information is to be displayed in
-             * Degrees and Decimal Degrees
-             */ 
-            EDD = 0x00000000,
-            /**
-             * Enumeration to denote Location information is to be displayed in
-             * Degrees, Minutes and Decimal Minutes
-             */             
-            EDMM,
-            /**
-             * Enumeration to denote Location information is to be displayed in
-             * Degrees, Minutes, Seconds and Decimal Seconds
-             */             
-            EDMSS
-            };
-                
-        /**
-         * Reference to the Adapter observer
-         */
-        MLocNotPrefAdapterObserver&     iObserver;
-        
-        /**
-         * Reference to the Central repository object
-         *
-         * Owns
-         */
-        CRepository*                    iRepository; 
-    };          
-
-#endif // C_LOCNOTPREFCOORDINATEDISPLAYADAPTER_H_
-
--- a/locationsystemui/locationsysui/locnotprefplugin/inc/locnotprefengobserver.h	Mon May 03 12:54:42 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:  Location Notation Preferences Plugin Engine Observer
-*
-*/
-
-
-#ifndef M_LOCNOTPREFENGOBSERVER_H_
-#define M_LOCNOTPREFENGOBSERVER_H_
-
-// Class Declaration
-/**
- * Observer to the Location Notation Preferences plug-in.
- */
- 
-class MLocNotPrefEngObserver
-    {
-    public:
-        /**
-         * Notifies a change in the Location notation preferences settings values
-         */
-        virtual void HandleSettingsChangeEventL() = 0;
-           
-    };
-    
-#endif // M_LOCNOTPREFENGOBSERVER_H_
-
--- a/locationsystemui/locationsysui/locnotprefplugin/inc/locnotprefplugin.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,150 +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:  Location Notation Preferences Plugin View's container
-*
-*/
-
-#ifndef C_LOCNOTPREFPLUGIN_H_
-#define C_LOCNOTPREFPLUGIN_H_
-
-// System Includes
-#include <ConeResLoader.h>
-
-// User Includes
-#include "locsettingsui.h"
-
-// Classes referenced
-class MLocSettingsUiObserver;
-class CAknViewAppUi;
-class CLocNotPrefPluginView;
-
-// Constant Definition
-/**
- * 
- *  Location Notation Preferences plug-in RSC file name
- */
-_LIT( KLocNotPrefUiResFileName, "locnotprefpluginview.rsc" );
-
-// Class Definition
-
-/**
- *  CLocNotPrefPlugin
- *
- * Location Notation Preferences plug-in.
- */
-class CLocNotPrefPlugin : public CLocSettingsUi
-    {
-    
-    public: // Constructors and destructor
-        
-        /**
-         * Symbian OS two-phased constructor
-         *
-         * @param aParam Generic parameter structure to the Settings UI plug-in
-         * @return 
-         */
-        static CLocNotPrefPlugin* NewL( TAny* aParam );
-    
-        /**
-         * Destructor.
-         */
-        ~CLocNotPrefPlugin();
- 
-        /**
-         * Inherited from CSettingsUi
-         * Launches the Settings UI
-         *
-         * @param aUiLaunchParams   Flags that define specific configuration of
-         *                          if the Settings UI, that the user of the API
-         *                          wants to launch. If more than one functionality
-         *                          is requested then the various combinations
-         *                          are to be ORed. The interpretation of these
-         *                          flag values is a part of the understanding
-         *                          between the API user and the Settings UI
-         */
-        void LaunchL( TInt      aUiLaunchParams );
-
-        /**
-         * Inherited from CSettingsUi
-         * Closes the running Settings UI prematurely.
-         */
-        void Close();
-
-        /**
-         * Inherited from CSettingsUi
-         * Method for getting caption of this plugin. This should be the 
-         * localized name of the settings view to be shown in parent view.
-         *
-         * @param aCaption pointer to Caption variable
-         */
-        void GetCaptionL( TDes& aCaption ) const;
-
-        /**
-         * Inherited from CSettingsUi
-         * Returns the priority of the UI module.
-         * 
-         * @return Priority of the Settings UI
-         */
-        TInt GetPriority();
-         
-    private:
-        /**
-         * C++ default constructor.
-         */
-        CLocNotPrefPlugin( MLocSettingsUiObserver&      aSettingsUiObserver,
-                           CAknViewAppUi&               aAppUi );
-
-        /**
-         * Second phase constructor.
-         */
-        void ConstructL();
-
-        /**
-         * Opens the nearest localized resourcefile using aResourceLoader. 
-         * aResourceLoader should be opened only once before closing it. 
-         * Otherwise it will raise a panic. Therefore it is better to have 
-         * multiple resource loaders.
-         * 
-         * @param aResourceFileName Drive and name of resource file in format 
-         *                          <path>:<rsc_file_name>
-         * @param aResourceLoader Resource loader for the resource. The loader 
-         *                        must not be opened allready or it will raise 
-         *                        a panic. It is caller's responsibility to 
-         *                        close the resource loader after using the 
-         *                        resource.
-         */
-        void OpenLocalizedResourceFileL( const TDesC&               aResourceFileName, 
-                                               RConeResourceLoader& aResourceLoader );
-                                                       
-  
-    private:
-        /**
-         * Resource Loader handle for handling Location Notation preferences settings' 
-         * specific resources
-         */
-        RConeResourceLoader             iResourceLoader;
-            
-        /**
-         * Location Notation preferences view
-         * Owns
-         */
-        CLocNotPrefPluginView*      iView;
-        
-        /**
-         * Location Notation preferences view Id
-         */
-        TUid                        iViewId;
-    };
-
-#endif // C_LOCNOTPREFPLUGIN_H_
--- a/locationsystemui/locationsysui/locnotprefplugin/inc/locnotprefplugin.hrh	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,35 +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:  Contains declarations for constants of SUPL Settings UI.
-*                This file can be included in C++ or resource file.
-*
-*/
-
-
-#ifndef _LOCNOTPREFPLUGIN_HRH_
-#define _LOCNOTPREFPLUGIN_HRH_
-
-/**
- * Enumeration of Command Ids for Location Notation Preferences plug-in
- */
-enum TLocNotPrefCommandIds
-    {
-    ELocNotPrefChange = 0x6000,
-    ELocNotPrefMSKChange,
-    ELocCmdNone
-    };
-
-#endif      // _LOCNOTPREFPLUGIN_HRH_
-
-// End of File
--- a/locationsystemui/locationsysui/locnotprefplugin/inc/locnotprefplugincmdhdlr.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,61 +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:  Interface class that provides the command handling functionality.
-*                The class implementing it should be prepared to handle all commands
-*                except those internal to the calling UI
-*
-*/
-
-
-#ifndef M_LOCNOTPREFPLUGINCMDHDLR_H_
-#define M_LOCNOTPREFPLUGINCMDHDLR_H_
-
-// System Include 
-#include <e32base.h>
-
-// Class Definition
-
-/**
- *  Interface class that provides the command handling functionality.
- */
-class MLocNotPrefPluginCmdHdlr
-    {
-    public:
-        /**
-         * Enumeration for Command Handler commands
-         */
-         enum TLocNotPrefPluginCmd
-            {
-            /**
-             * List box item selection
-             */
-            EListBoxItemSelected,
-            
-            /**
-             * Screen size changed
-             */
-            EScreenSizeChanged
-            };
-    public:
-        /**
-         * Command handling function
-         *
-         * @param aCommand Command that needs to be handled
-         */
-         virtual void HandleCmdL( TLocNotPrefPluginCmd aCommand )   = 0;
-         
-    };
-
-#endif // M_LOCNOTPREFPLUGINCMDHDLR_H_
-
--- a/locationsystemui/locationsysui/locnotprefplugin/inc/locnotprefplugincontainer.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,184 +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:  Location Notation Preferences Plugin View's container
-*
-*/
-
-#ifndef C_LOCNOTPREFPLUGINCONTAINER_H_
-#define C_LOCNOTPREFPLUGINCONTAINER_H_
-
-// System Includes 
-#include <e32base.h>
-#include <coecntrl.h>
-#include <eiklbo.h>
-
-// Forward Declarations
-class MDesCArray;
-class MLocNotPrefPluginCmdHdlr;
-class CAknSettingStyleListBox;
-
-// Class Definition
-
-/**
- * Container for the CLocNotPrefPluginView.
- */
-class CLocNotPrefPluginContainer : public CCoeControl,
-                                   public MEikListBoxObserver
-    {
-    public:
-        /**
-         * Static Two phase contructor that instantiates the CLocNotPrefPluginContainer
-         * 
-         * @param aRect                         Client rectangle
-         * @param aListBoxModel                 Model for the container's list box
-         * @param aCmdHandler                   List box command handler
-         * @return CLocNotPrefPluginContainer*  Reference to the object created
-         */
-        static CLocNotPrefPluginContainer* NewL( 
-                                const TRect&                    aRect,
-                                      MDesCArray&               aListBoxModel,
-                                      MLocNotPrefPluginCmdHdlr& aCmdHandler );
-
-        /**
-         * Static Two phase contructor that instantiates the CLocNotPrefPluginContainer
-         * Leaves the object on the Cleanup stack
-         * 
-         * @param aRect                         Client rectangle
-         * @param aListBoxModel                 Model for the container's list box
-         * @param aCmdHandler                   List box command handler     
-         * @return CLocNotPrefPluginContainer*  Reference to the object created
-         */
-        static CLocNotPrefPluginContainer* NewLC(
-                                const TRect&                    aRect,
-                                      MDesCArray&               aListBoxModel,
-                                      MLocNotPrefPluginCmdHdlr& aCmdHandler );
-        /**
-         * Destructor
-         */
-        ~CLocNotPrefPluginContainer();
-         
-        /**
-         * Returns the currentlt focussed element.
-         *
-         * @return TInt Index of the item selected
-         */
-        TInt GetFocussedItem();
-        
-        /**
-         * Inherited from CCoeControl
-         */
-        void HandleResourceChange(TInt aType);
-
-        /**
-         * From CoeControl
-         */
-        TInt CountComponentControls() const;
-
-        /**
-         * From CCoeControl
-         */
-        CCoeControl* ComponentControl(TInt aIndex) const;
-
-        /**
-         * Inherited from CCoeControl
-         */
-        TKeyResponse OfferKeyEventL( const TKeyEvent& aKeyEvent,
-                                           TEventCode aType );
-         
-        /**
-         * Inherited from MEikListBoxObserver
-         */
-        void HandleListBoxEventL( CEikListBox*      aListBox, 
-                                  TListBoxEvent     aEventType );        
-     
-        /**
-         * Returns the help context
-         *
-         * @param aContext  The help context that has to be determined
-         */
-        void GetHelpContext( TCoeHelpContext& aContext ) const;
-        
-        /**
-         * Handles the pointer events
-         */
-        void HandlePointerEventL( const TPointerEvent &aPointerEvent );
-             
-    protected:
-        /**
-         * Handles Focus Change to list 
-         */
-        void FocusChanged(TDrawNow aDrawNow);
-         
-        /**
-         * From CoeControl,SizeChanged.
-         */
-        void SizeChanged();
-
-    private:
-        /**
-         * Overloaded Constructor
-         */
-        CLocNotPrefPluginContainer( MDesCArray&               aListBoxModel,
-                                    MLocNotPrefPluginCmdHdlr& aCmdHandler );
-
-        /**
-         * Second phase of the two phase Construction process
-         */
-        void ConstructL( const TRect& aRect );
-           
-        /** 
-         * Creates the List box and the Listbox model. Associates the 
-         * list box model wit the list box
-         *         
-         */
-        void CreateListboxL();
-                      
-        /**
-         * Sets the Title text
-         * @param aResourceText Resource to create title
-         */
-        void MakeTitleL( TInt aResourceText );
-              
-         /**
-          * Returns the Appui's status pane
-          * @return CEikStatusPane* Statuspane pointer
-          */
-         CEikStatusPane* StatusPane();
-     
-    private:
-        /**
-         * Reference to the List box model
-         */
-        MDesCArray&                 iListBoxModel;
-          
-        /**
-         * Reference to the List box command handler
-         */
-        MLocNotPrefPluginCmdHdlr&   iCmdHandler;
-        
-        /**
-         * Settings list box for SUPL settings
-         * Owns
-         */
-        CAknSettingStyleListBox*        iListBox;
-        
-        /**
-         * Help context
-         */
-        TCoeContextName                 iContextName;
-        
-  };
-
-#endif // C_LOCNOTPREFPLUGINCONTAINER_H_
-
--- a/locationsystemui/locationsysui/locnotprefplugin/inc/locnotprefpluginengine.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,216 +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:  Location Notation Preferences Plugin Engine
-*
-*/
-
-#ifndef C_LOCNOTPREFPLUGINENGINE_H_
-#define C_LOCNOTPREFPLUGINENGINE_H_
-
-//  System Includes
-#include <e32base.h>
-#include <bamdesca.h>  // MDesCArray
-
-// User Includes
-#include "locnotprefadapterobserver.h"
-
-// Forward Declarations
-class MLocNotPrefEngObserver;
-class CLocNotPrefCoordinateDisplayAdapter;
-class CLocNotPrefSystemofMeasAdapter;
-
-// Constant Declarations
-
-// Class Definition
-
-/**
- * Engine for Location Notation Preferences Plugin.
- *
- * The class for interacting accessing and modifying Notation preferences settings. The 
- * class interfaces with the corresponding Central repositories for Measurement and 
- * co-ordinate settings and also listens for changes to the Cen-rep keys.
- * Further, its also doubles up as a model for the Location notation preferences 
- * list-box
- */
-class CLocNotPrefPluginEngine : public CBase,
-                                public MDesCArray,
-                                public MLocNotPrefAdapterObserver
-    {
-    public:
-        /**
-         * Enumeration for the Settings list
-         */
-        enum TSettingsList
-            {
-            /**
-             * System of Measurement
-             */
-            ESystemofMeasurement,
-            
-            /**
-             * Co-ordinate display format
-             */
-            ECoordinateDisplayFormat      
-            };
-            
-    public:
-        /**
-         * Creates new Location Notation Preferences plug-in engine instance.
-         *
-         * @param  aEngineObserver           Observer to the Notation preferences engine
-         * @return CLocNotPrefPluginEngine* Reference to the application view
-         */                                                 
-        static CLocNotPrefPluginEngine* NewL( MLocNotPrefEngObserver& aEngineObserver );
-
-        /**
-         * Creates new Location Notation Preferences plug-in engine instance.
-         * Leaves the object on the Clean-up stack.
-         *
-         * @param  aEngineObserver           Observer to the Notation preferences engine
-         * @return CLocNotPrefPluginEngine* Reference to the application view
-         */                                                 
-        static CLocNotPrefPluginEngine* NewLC( MLocNotPrefEngObserver& aEngineObserver );
-        
-        /**
-         * Destructor
-         */
-        ~CLocNotPrefPluginEngine();
-        
-    public:
-        /**
-         * Inherited from MDesCArray
-         */
-        TInt MdcaCount() const;
-
-        /**
-         * Inherited from MDesCArray
-         */
-        TPtrC16 MdcaPoint( TInt aIndex ) const;
-
-        /**
-         * Inherited from MLocNotPrefAdapterObserver
-         */     
-        void HandleSettingsChangeL();
-        
-    public:
-        /**
-         * Closes the running Settings UI prematurely. This would result in dismissing
-         * any active dialogs currently running
-         */
-        void Close();
-            
-        /**
-         * Change System of Measurement settings
-         */
-        void ChangeSysofMeasSettingsL();
-        
-        /**
-         * Toggle System of Measurement settings
-         */
-        void ToggleSysofMeasSettingsL();
-        
-        /**
-         * Change Co-ordinate display format settings
-         */
-        void ChangeCoordinateDisplaySettingsL();
-                
-    private:
-        /**
-         * Constructor
-         */
-        CLocNotPrefPluginEngine(  MLocNotPrefEngObserver& aEngineObserver );
-
-        /**
-         * Second Phase Constructor
-         */
-        void ConstructL();
-        
-    private:
-        
-        /**
-         * Reference to the Engine observer
-         */
-        MLocNotPrefEngObserver&                 iObserver;
-        
-        /**
-         * Co-ordinate display format settings handle
-         * Owns
-         */ 
-        CLocNotPrefCoordinateDisplayAdapter*    iCordDisplaySettings;
-        
-        /**
-         * System of measurements settings handle
-         * Owns
-         */ 
-        CLocNotPrefSystemofMeasAdapter*         iSysofMeasSettings;
-        
-        /**
-         * System of measurement heading
-         * Owns
-         */
-        HBufC16*                                iSysofMeasTitle;
-        
-        /**
-         * Co-ordinate display format heading
-         * Owns
-         */
-        HBufC16*                                iCoordDispTitle;
-        
-        /**
-         * Imperial settings text
-         * Owns
-         */
-        HBufC16*                                iImperialSettings;
-        
-        /**
-         * Metric settings text
-         * Owns
-         */
-        HBufC16*                                iMetricSettings; 
-        
-         /**
-         * Degrees resolution settings text
-         * Owns
-         */
-        HBufC16*                                iDegreesSettings;
-        
-        /**
-         * Minutes resolution settings text
-         * Owns
-         */
-        HBufC16*                                iMinutesSettings;
-        
-        /**
-         * Seconds resolution settings text
-         * Owns
-         */
-        HBufC16*                                iSecondsSettings;
-        
-        /**
-         * Temporary Buffer for returning values to the Accessor 
-         * functions.
-         * Owns
-         */
-        HBufC16*                                iConversionBuffer;
-        
-        /**
-         * Boolean value to denote whether any settings dialog is currently
-         * outstanding
-         */
-        TBool                                   iSettingsDialogOutstanding;                
-                    
-    };          
-
-#endif // C_LOCNOTPREFPLUGINENGINE_H_
-
--- a/locationsystemui/locationsysui/locnotprefplugin/inc/locnotprefpluginuid.hrh	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +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:  Contains the UID3 value to be used for the Location Notation 
-*                Preferences plug-in. This value is expected to have two specific
-*                functions
-*                1. UID3 for the locnotprefplugindll.dll ECOM DLL
-                 2. Implementation UID for the ECOM plugin to LocSysUiEngine
-*
-*/
-
-
-#ifndef _LOCNOTPREFPLUGINUID_HRH_
-#define _LOCNOTPREFPLUGINUID_HRH_
-
-// Location System UI View UID3
-#define KLocNotPrefPluginUID3          0x1020690F
-
-#endif      // _LOCNOTPREFPLUGINUID_HRH_
-
-// End of File
-
-
--- a/locationsystemui/locationsysui/locnotprefplugin/inc/locnotprefpluginview.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,200 +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:  Location Notation Preferences Plugin view
-*
-*/
-
-#ifndef C_LOCNOTPREFPLUGINVIEW_H_
-#define C_LOCNOTPREFPLUGINVIEW_H_
-
-//  System Includes
-#include <data_caging_path_literals.hrh>
-#include <e32base.h>
-#include <aknview.h>
-#include <aknViewAppUi.h>
-#include <ConeResLoader.h>
-
-// User Includes
-#include "locnotprefpluginuid.hrh"
-#include "locnotprefplugincmdhdlr.h"
-#include "locnotprefengobserver.h"
-
-// Forward Declarations
-class CLocNotPrefPluginContainer;
-class MLocNotPrefPluginCmdHdlr;
-class MLocSettingsUiObserver;
-class CLocNotPrefPluginEngine;
-class CTextResolver;
-    
-// Constant Declarations
-const TUid KLocNotPrefViewPluginUid = { KLocNotPrefPluginUID3 };
-_LIT( KLocNotPrefViewResFileName, "locnotprefpluginview.rsc" );
-
-// Class Definition
-
-/**
- * Location Notation Preferences Plugin view class. 
- */
-class CLocNotPrefPluginView : public CAknView,
-                              public MLocNotPrefPluginCmdHdlr,
-                              public MLocNotPrefEngObserver
-    {
-    public:
-        /**
-         * Creates new Location Notation Preferences plug-in view.
-         *
-         * @param  aSettingsObsrv           Observer to the Settings UI
-         * @return CLocNotPrefPluginView&   Reference to the application view
-         */                                                 
-        static CLocNotPrefPluginView* NewL( MLocSettingsUiObserver& aSettingsObsrv );
-
-        /**
-         * Creates new Location Notation Preferences plug-in view. 
-         * Leaves the object on the Clean up stack
-         *
-         * @param  aSettingsObsrv           Observer to the Settings UI         
-         * @return CLocNotPrefPluginView&   Reference to the application view
-         */                                                 
-        static CLocNotPrefPluginView* NewLC( MLocSettingsUiObserver& aSettingsObsrv );
-        
-        /**
-         * Destructor
-         */
-        ~CLocNotPrefPluginView ();
-
-        /**
-         * Close the Notation preferences Settings
-         */
-        void CloseSettings();
-        
-        /**
-         * From CAknView. 
-         */
-        void DoActivateL( const TVwsViewId& aPrevViewId,
-                                TUid        aCustomMessageId,
-                          const TDesC8&     aCustomMessage );
-        
-        /**
-         * From CAknView. 
-         */
-        void DoDeactivate();
- 
-        /**
-         * From CAknView. Returns the View Id. Should be chosen to reflect 
-         * the Implementation UID of the Plugin
-         */
-        TUid Id() const;
-
-        /**
-         * From CAknView. 
-         */
-        void HandleCommandL(TInt aCommand);
-        
-       /**
-        * From MEikMenuObserver
-        */
-        void DynInitMenuPaneL( TInt aResourceId, CEikMenuPane* aMenuPane );        
-        
-    public:
-        /**
-         * Inherited from MLocNotPrefPluginCmdHdlr
-         * Handles commands from the container
-         *
-         * @param  aCommand Command ID
-         */
-        void HandleCmdL( TLocNotPrefPluginCmd aCommand );
-
-    public:
-        /**
-         * Inherited from MLocNotPrefEngObserver
-         */
-        void HandleSettingsChangeEventL();
-                
-    private:
-        /**
-         * Constructor
-         */
-        CLocNotPrefPluginView( MLocSettingsUiObserver& aSettingsObsrv );
-
-        /**
-         * Second Phase Constructor
-         */
-        void ConstructL();
-    
-        /**
-         * Shows or dims help option, depending wheather help feature
-         * is supported or not.
-         * @param aMenuPane
-         */
-        void HandleHelpFeature( CEikMenuPane& aMenuPane ) const;
-            
-        /**
-         * Handle Settings Change Event
-         * 
-         * @param aCmd Settings change command
-         */
-        void SettingsChangeL( TInt aCmd );
-        
-        /**
-         * Opens the nearest localized resourcefile using aResourceLoader. 
-         * aResourceLoader should be opened only once before closing it. 
-         * Otherwise it will raise a panic. Therefore it is better to have 
-         * multiple resource loaders.
-         * 
-         * @param aResourceFileName Drive and name of resource file in format 
-         *                          <path>:<rsc_file_name>
-         * @param aResourceLoader Resource loader for the resource. The loader 
-         *                        must not be opened allready or it will raise 
-         *                        a panic. It is caller's responsibility to 
-         *                        close the resource loader after using the 
-         *                        resource.
-         */
-        void OpenLocalizedResourceFileL( const TDesC&                aResourceFileName, 
-                                               RConeResourceLoader&  aResourceLoader );
-        
-    private:        
-        /**
-         * Reference to the Settings UI Observer. Used to notify the dismissal of the 
-         * plug-in
-         */
-        MLocSettingsUiObserver&         iSettingsObserver;
-        
-        /**
-         * Resource loader handle
-         * Owns
-         */
-        RConeResourceLoader             iResourceLoader;
-        
-        /**
-         * Location notation preferences Container
-         * Owns
-         */
-        CLocNotPrefPluginContainer*     iContainer;
-        
-        /**
-         * Location noation preferences engine
-         * Owns
-         */
-        CLocNotPrefPluginEngine*        iEngine;
-        
-        /**
-         * Standard Text resolver for converting Error codes to 
-         * standard texts
-         * Owns
-         */
-        CTextResolver*                  iTextResolver;        
-    };          
-
-#endif // C_LOCNOTPREFPLUGINVIEW_H_
-
--- a/locationsystemui/locationsysui/locnotprefplugin/inc/locnotprefsomadapter.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,130 +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:  Location Notation Preferences Plugin System of measurement
-*                display adapter
-*
-*/
-
-#ifndef C_LOCNOTPREFSYSTEMOFMEASADAPTER_H_
-#define C_LOCNOTPREFSYSTEMOFMEASADAPTER_H_
-
-//  System Includes
-#include <e32base.h>
-
-// User Includes
-#include "locnotprefplugindomaincrkeys.h"
-
-// Forward Declarations
-class MLocNotPrefAdapterObserver;
-class CRepository;
-
-// Constant Declarations
-
-// Class Definition
-
-/**
- * Adapter to the System of Measurement settings storage
- */
-class CLocNotPrefSystemofMeasAdapter : public CActive
-    {
-    public:
-        /**
-         * Creates new System of Measurement adapter
-         *
-         * @param  aAdapterObsrv                        Observer to the Settings adapter
-         * @return CLocNotPrefSystemofMeasAdapter&  Reference to the application view
-         */                                                 
-        static CLocNotPrefSystemofMeasAdapter* NewL( 
-                            MLocNotPrefAdapterObserver& aAdapterObsrv );
-
-
-        /**
-         * Creates new System of Measurement adapter
-         * Leaves the object on the Clean up stack         
-         *
-         * @param  aAdapterObsrv                        Observer to the Settings adapter
-         * @return CLocNotPrefSystemofMeasAdapter&  Reference to the application view
-         */                                                 
-        static CLocNotPrefSystemofMeasAdapter* NewLC( 
-                            MLocNotPrefAdapterObserver& aAdapterObsrv );    
-
-        
-        /**
-         * Destructor
-         */
-        ~CLocNotPrefSystemofMeasAdapter ();
-
-        /**
-         * Returns the current value of the System of measurements settings
-         *
-         * @return TLocSystemofMeasurementValues  Current value of the System of measurements settings
-         */
-        TLocSystemofMeasurementValues GetCurrentSysofMeasL();
-        
-        /**
-         * Sets the value of the System of measurements settings
-         *
-         * @param aSettingsValue  New value of the System of measurements settings
-         */
-        void SetCurrentSysofMeasL( TLocSystemofMeasurementValues aSettingsValue );
-        
-        /**
-         * Toggles the settings value
-         */
-        void ToggleSysofMeasSettingsL();
-        
-    protected:
-        /**
-         * Inherited from CActive
-         */
-        void RunL();
-        
-        /**
-         * Inherited from CActive
-         */
-        void DoCancel();
-                        
-    private:
-        /**
-         * Constructor
-         */
-        CLocNotPrefSystemofMeasAdapter( MLocNotPrefAdapterObserver& aAdapterObsrv );
-
-        /**
-         * Second Phase Constructor
-         */
-        void ConstructL();
-    
-        /**
-         * Start notification from the Central repository server for any changes in the
-         * System of measurements key value
-         */
-        void StartNotification();
-                
-    private:
-        /**
-         * Reference to the Adapter observer
-         */
-        MLocNotPrefAdapterObserver&     iObserver;
-
-        /**
-         * Reference to the Central repository object
-         *
-         * Owns
-         */
-        CRepository*                    iRepository;        
-        
-    };          
-
-#endif // C_LOCNOTPREFSYSTEMOFMEASADAPTER_H_
\ No newline at end of file
--- a/locationsystemui/locationsysui/locnotprefplugin/src/locnotprefcorddisadapter.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,235 +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:  Location Notation Preferences Plugin Co-ordinate display adapter
-*
-*/
-
-
-// System Include
-#include <centralrepository.h>
-
-// User Include
-#include "locnotprefcorddisadapter.h"
-#include "locnotprefadapterobserver.h"
-
-// Constant Definition
-const TUint KAvkonCRUID = 0x101F876E;
-const TUint KLocCoordinateDisplayUID = 0x00000009;
-
-// ========================= MEMBER FUNCTIONS ================================
-
-
-// ---------------------------------------------------------------------------
-// CLocNotPrefCoordinateDisplayAdapter::CLocNotPrefCoordinateDisplayAdapter
-// Overloaded Constructor
-//
-// ---------------------------------------------------------------------------
-//  
-CLocNotPrefCoordinateDisplayAdapter::CLocNotPrefCoordinateDisplayAdapter(  
-                                MLocNotPrefAdapterObserver& aAdapterObsrv )
-    :CActive(EPriorityStandard),
-    iObserver(aAdapterObsrv)
-    {
-    }
-
-// ---------------------------------------------------------------------------
-// CLocNotPrefCoordinateDisplayAdapter::~CLocNotPrefCoordinateDisplayAdapter
-// Destructor
-//
-// ---------------------------------------------------------------------------
-//
-CLocNotPrefCoordinateDisplayAdapter::~CLocNotPrefCoordinateDisplayAdapter()
-    {
-    Cancel();
-    
-    delete iRepository;
-    }
-    
-// ---------------------------------------------------------------------------
-// CLocNotPrefCoordinateDisplayAdapter* CLocNotPrefCoordinateDisplayAdapter::NewL
-// Creates new Co-ordinate display adapter
-//
-// @param  aAdapterObsrv                        Observer to the Settings adapter
-// @return CLocNotPrefCoordinateDisplayAdapter& Reference to the application view
-// ---------------------------------------------------------------------------
-//    
-CLocNotPrefCoordinateDisplayAdapter* CLocNotPrefCoordinateDisplayAdapter::NewL( 
-                            MLocNotPrefAdapterObserver& aAdapterObsrv )
-    {   
-    CLocNotPrefCoordinateDisplayAdapter* self = 
-                        CLocNotPrefCoordinateDisplayAdapter::NewLC( aAdapterObsrv );
-    CleanupStack::Pop(self);
-    return self;
-    }
-
-// ---------------------------------------------------------------------------
-// CLocNotPrefCoordinateDisplayAdapter* CLocNotPrefCoordinateDisplayAdapter::NewLC
-// Creates new Co-ordinate display adapter. Leaves the object on the clean-up
-// stack
-//
-// @param  aAdapterObsrv                        Observer to the Settings adapter
-// @return CLocNotPrefCoordinateDisplayAdapter& Reference to the application view
-// ---------------------------------------------------------------------------
-// 
-CLocNotPrefCoordinateDisplayAdapter* CLocNotPrefCoordinateDisplayAdapter::NewLC( 
-                            MLocNotPrefAdapterObserver& aAdapterObsrv )
-    {   
-    CLocNotPrefCoordinateDisplayAdapter* self = 
-                        new(ELeave) CLocNotPrefCoordinateDisplayAdapter( aAdapterObsrv );
-    CleanupStack::PushL(self);
-    self->ConstructL();
-    return self;
-    }
-    
-// ---------------------------------------------------------------------------
-// void CLocNotPrefCoordinateDisplayAdapter::ConstructL
-// Second Phase Constructor
-//
-// ---------------------------------------------------------------------------
-//
-void CLocNotPrefCoordinateDisplayAdapter::ConstructL()
-    {
-    CActiveScheduler::Add( this );
-    
-    // Create the Central repository object for manipulating Avkon Central
-    // repository for Co-ordinate display settings
-    iRepository = CRepository::NewL(TUid::Uid( KAvkonCRUID));
-    
-    StartNotification();
-    }
-    
-// ---------------------------------------------------------------------------
-// CLocNotPrefCoordinateDisplayAdapter::TCordDisSetListPosition 
-//                CLocNotPrefCoordinateDisplayAdapter::GetCurrentDisplayFormatL
-// Returns the position of the Co-ordinate display format settings value.
-//
-// @return TCordDisSetListPosition Current postion of the Co-ordinate display
-//                                 settings value.
-// ---------------------------------------------------------------------------
-//
-CLocNotPrefCoordinateDisplayAdapter::TCordDisSetListPosition 
-                CLocNotPrefCoordinateDisplayAdapter::GetCurrentDisplayFormatL()
-    {
-    
-    TInt settingsValue = EDMSS;
-    User::LeaveIfError( iRepository->Get( KLocCoordinateDisplayUID,
-                                          settingsValue ));
-    
-    TCordDisSetListPosition setPos = EPosDMSS;
-    switch( settingsValue )
-        {
-        case EDD:
-            {
-            setPos = EPosDD;
-            break;
-            }
-        case EDMM:
-            {
-            setPos = EPosDMM;
-            break;
-            }
-        case EDMSS:           
-        default:
-            {
-             // Incase there was no valid settings value present then we 
-             // set the default value. Hence, nothing to do
-            break;
-            }                        
-        }
-    return setPos;
-    }
-
-// --------------------------------------------------------------------------
-// void CLocNotPrefCoordinateDisplayAdapter::SetCurrentDisplayFormatL
-// Sets the value of the Co-ordinate display format settings based on the
-// display position.
-//
-// @param aSettingsPos  Position of the new Co-ordinate display settings value
-// ---------------------------------------------------------------------------
-//
-void CLocNotPrefCoordinateDisplayAdapter::SetCurrentDisplayFormatL( 
-     CLocNotPrefCoordinateDisplayAdapter::TCordDisSetListPosition aSettingsValue )
-    {
-    
-    TCoordinateDisplayValue setValue = EDMSS;
-    switch( aSettingsValue )
-        {
-        case EPosDD:
-            {
-            setValue = EDD;
-            break;
-            }
-        case EPosDMM:
-            {
-            setValue = EDMM;
-            break;
-            }
-        case EPosDMSS:           
-        default:
-            {
-             // Incase there was no valid settings value present then we 
-             // set the default value. Hence, nothing to do
-            break;
-            }                        
-        }
-    User::LeaveIfError( iRepository->Set( KLocCoordinateDisplayUID,
-                                          setValue ));
-    }
-    
-// --------------------------------------------------------------------------
-// void CLocNotPrefCoordinateDisplayAdapter::RunL
-// Inherited from CActive
-//
-// ---------------------------------------------------------------------------
-//
-void CLocNotPrefCoordinateDisplayAdapter::RunL()
-    {
-    // Issue Notification
-    iObserver.HandleSettingsChangeL();
-    
-    // Schedule for listening to change events again
-    StartNotification();
-    }
-
-// --------------------------------------------------------------------------
-// void CLocNotPrefCoordinateDisplayAdapter::DoCancel
-// Inherited from CActive
-//
-// ---------------------------------------------------------------------------
-//
-void CLocNotPrefCoordinateDisplayAdapter::DoCancel()
-    {
-    // Cancel the outstanding CR notification request
-    if( iRepository )
-        {
-        iRepository->NotifyCancel( KLocCoordinateDisplayUID );        
-        }
-    }
-    
-// --------------------------------------------------------------------------
-// void CLocNotPrefCoordinateDisplayAdapter::StartNotification
-// Start notification from the Central repository server for any changes in the
-// Co-ordinate display format key value
-//
-// ---------------------------------------------------------------------------
-//
-void CLocNotPrefCoordinateDisplayAdapter::StartNotification()
-    {
-    if( !IsActive())
-        {
-        // Request for notification
-        iRepository->NotifyRequest( KLocCoordinateDisplayUID, iStatus);
-        SetActive();          
-        }  
-    }
--- a/locationsystemui/locationsysui/locnotprefplugin/src/locnotprefplugin.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,227 +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:  Location Notation Preferences Plugin View's container
-*
-*/
-
-
-// System Include
-#include <aknViewAppUi.h>
-#include <StringLoader.h>           // For String Loader
-#include <locnotprefpluginview.rsg>
-#include <barsread.h>               // For TResourceReader
-#include <bautils.h>
-
-// User Includes
-#include "locnotprefplugin.h"
-#include "locsettingsuiobserver.h"
-#include "locsettingsuiparams.h"
-#include "locnotprefpluginview.h"
-
-// Constant Definition
-/**
- * Position of Notation Preferences plug-in the Postioning View.
- * As defined by the Location System UI UI specification, the Location
- *  notation preferences plug-in should be inserted at the fourth level
- */
-const TInt KNotPrefPluginPriority = 0x00000004;
-
-// ---------------------------------------------------------------------------
-// CLocNotPrefPlugin::CLocNotPrefPlugin
-// C++ default constructor.
-// ---------------------------------------------------------------------------
-CLocNotPrefPlugin::CLocNotPrefPlugin( MLocSettingsUiObserver&   aSettingsUiObserver,
-                                      CAknViewAppUi&            aAppUi )
-    :CLocSettingsUi( aSettingsUiObserver, aAppUi ),
-    iResourceLoader( *CCoeEnv::Static())
-    {
-    }
-
-// ---------------------------------------------------------------------------
-// CLocNotPrefPlugin::~CLocNotPrefPlugin
-// Destructor.
-// ---------------------------------------------------------------------------  
-CLocNotPrefPlugin::~CLocNotPrefPlugin() 
-    {
-    iResourceLoader.Close();
-    }
-
-// ---------------------------------------------------------------------------
-// CLocNotPrefPlugin* CLocNotPrefPlugin::NewL
-// Symbian OS two-phased constructor
-// 
-// @return CLocNotPrefPlugin* Reference to the Settings UI object
-// ---------------------------------------------------------------------------  
-CLocNotPrefPlugin* CLocNotPrefPlugin::NewL( TAny* aParam )
-    {
-    CLocSettingsUiParams*   param = reinterpret_cast<CLocSettingsUiParams *>( aParam );
-    MLocSettingsUiObserver& observer = param->SettingsUiObserver();
-    CAknViewAppUi&          appUi = param->AppUi();
-    CLocNotPrefPlugin* self = new (ELeave )CLocNotPrefPlugin( observer,
-                                                              appUi );
-    CleanupStack::PushL( self );
-    self->ConstructL();
-    CleanupStack::Pop( self );
-    return self; 
-    }
-
-// ---------------------------------------------------------------------------
-// void CLocNotPrefPlugin::ConstructL
-// Second phase constructor.
-// ---------------------------------------------------------------------------  
-void CLocNotPrefPlugin::ConstructL()
-    {
-    // Open the Resource file for the plugin. The resource file is not 
-    // explicity opened by system. Hence, the opening and closind if tied
-    // down to the time when the DLL is active
-    OpenLocalizedResourceFileL( KLocNotPrefUiResFileName, 
-                                iResourceLoader );
-                                    
-    // Creating an Application view
-    iView = CLocNotPrefPluginView::NewL( iSettingsUiObserver );
-    
-    // Transferring the view's control to AppUi
-    iAppUi.AddViewL( iView );
-    
-    // Obtaining the View Id for reference
-    iViewId = iView->Id();
-    }
-
-// ---------------------------------------------------------------------------
-// void CLocNotPrefPlugin::LaunchL
-// Inherited from CSettingsUi
-// Launches the Settings UI
-//
-// @param aUiLaunchParams   Flags for Launch options
-// ---------------------------------------------------------------------------  
-void CLocNotPrefPlugin::LaunchL( TInt       /* aUiLaunchParams */)
-    {
-    // Activate self
-    iAppUi.ActivateLocalViewL( iViewId );
-    }
-
-// ---------------------------------------------------------------------------
-// void CLocNotPrefPlugin::Close
-// Inherited from CSettingsUi
-// Closes the running Settings UI
-// ---------------------------------------------------------------------------  
-void CLocNotPrefPlugin::Close()
-    {
-    iView->CloseSettings();
-    }
-
-// ---------------------------------------------------------------------------
-// void CLocNotPrefPlugin::GetCaptionL
-// Inherited from CSettingsUi
-// Method for getting caption of this plugin. This should be the 
-// localized name of the settings view to be shown in parent view.
-//
-// @param aCaption pointer to Caption variable
-// ---------------------------------------------------------------------------
-void CLocNotPrefPlugin::GetCaptionL( TDes& aCaption ) const
-    {
-    // Load the Notation preferences setting caption from the resource file 
-    // and hand it back to the callee. It is assuemed here that the calling function has 
-    // allocated enough memory for the aCaption string. If not the fucntion
-    // would leave
-    HBufC* caption = StringLoader::LoadL( R_LOC_SETTINGS_NOTATIONS );
-    
-    if( aCaption.MaxLength() < caption->Length())
-        {
-        User::Leave( KErrNoMemory );
-        }
-    aCaption.Copy( *caption );
-    delete caption; 
-    }
-
-// ---------------------------------------------------------------------------
-// TInt CLocNotPrefPlugin::GetPriority
-// Inherited from CSettingsUi
-// Returns the priority of the UI module. 
-// 
-// @return Priority of the Settings UI
-// ---------------------------------------------------------------------------
-TInt CLocNotPrefPlugin::GetPriority()
-    {
-    return KNotPrefPluginPriority;
-    }
-
-// ---------------------------------------------------------------------------
-// void CLocNotPrefPlugin::OpenLocalizedResourceFileL
-// Opens the nearest localized resourcefile using aResourceLoader. 
-// aResourceLoader should be opened only once before closing it. 
-// Otherwise it will raise a panic. Therefore it is better to have 
-// multiple resource loaders.
-// 
-// @param aResourceFileName Drive and name of resource file in format 
-//                          <path>:<rsc_file_name>
-// @param aResourceLoader Resource loader for the resource. The loader 
-//                        must not be opened allready or it will raise 
-//                        a panic. It is caller's responsibility to 
-//                        close the resource loader after using the 
-//                        resource.
-// ---------------------------------------------------------------------------  
-//
-void CLocNotPrefPlugin::OpenLocalizedResourceFileL( 
-                                const TDesC&               aResourceFileName, 
-                                      RConeResourceLoader& aResourceLoader )
-    {
-    RFs fsSession;
-    User::LeaveIfError( fsSession.Connect());
-    
-    // Add the RFs session to the CleanupStack
-    CleanupClosePushL( fsSession );
-    
-    TFileName* tmpName = new( ELeave ) TFileName;
-    CleanupStack::PushL( tmpName );
-    
-    // Append the Resource Files Directory
-    tmpName->Append( KDC_RESOURCE_FILES_DIR );
-    
-    // Append the Ressource File Name
-    tmpName->Append( aResourceFileName );
-    
-    
-    // Obtain the drive where the DLL is installed
-    TFileName* dllDrive = new ( ELeave ) TFileName;
-    CleanupStack::PushL( dllDrive );
-    Dll::FileName( *dllDrive );
-    
-    // Obtain the Complete path for the Resource File
-    TParse parse;
-    User::LeaveIfError( parse.Set( *dllDrive, NULL, NULL ));
-    User::LeaveIfError( parse.Set( parse.Drive(), tmpName, NULL ));
-    TFileName* fileName = new ( ELeave ) TFileName;
-    CleanupStack::PushL( fileName );
-    fileName->Append( parse.FullName());
-    
-    // Get language of resource file
-    BaflUtils::NearestLanguageFile( fsSession, *fileName );
-        
-    // Open resource file    
-    aResourceLoader.OpenL( *fileName );
-    
-    // Pop all the fields
-    CleanupStack::PopAndDestroy( fileName );
-    CleanupStack::PopAndDestroy( dllDrive );
-    CleanupStack::PopAndDestroy( tmpName );
-   
-    CleanupStack::Pop(); // fsSession
-               
-    //If leave occurs before this, close is called automatically when the thread exits.
-    fsSession.Close();
-   
-    }
-
-
--- a/locationsystemui/locationsysui/locnotprefplugin/src/locnotprefplugincontainer.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,346 +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:  Location Notation Preferences Plugin View's container
-*
-*/
-
-
-// System Includes
-#include <eikspane.h>       // Status pane
-#include <akntitle.h>       // CAknTitlePane
-#include <StringLoader.h>   // String Loader
-#include <locnotprefpluginview.rsg>
-#include <aknlists.h>       // Settings Style list box
-#include <csxhelp/locnota.hlp.hrh>
-#include <eiklbv.h>
-
-// User Includes
-#include "locnotprefplugincontainer.h"
-#include "locnotprefpluginview.h"
-#include "locnotprefplugin.hrh"
-#include "locnotprefpluginuid.hrh"
-
-// Constant defintions
-const TInt KNoofComponentControls = 1;
-
-
-// ========================= MEMBER FUNCTIONS ================================
-
-// ---------------------------------------------------------------------------
-// CLocNotPrefPluginContainer::CLocNotPrefPluginContainer
-// Overloaded Constructor
-//
-// ---------------------------------------------------------------------------
-//  
-CLocNotPrefPluginContainer::CLocNotPrefPluginContainer( 
-                                    MDesCArray&               aListBoxModel,
-                                    MLocNotPrefPluginCmdHdlr& aCmdHandler)
-    :iListBoxModel( aListBoxModel ),
-    iCmdHandler( aCmdHandler )
-    {
-    }
-    
-// ---------------------------------------------------------------------------
-// CLocNotPrefPluginContainer::~CLocNotPrefPluginContainer
-// Destructor
-//
-// ---------------------------------------------------------------------------
-//
-CLocNotPrefPluginContainer::~CLocNotPrefPluginContainer()
-    {
-    // Delete the List box model only after deleting the list box
-    delete iListBox;    
-    }
-    
-// ---------------------------------------------------------------------------
-// CLocNotPrefPluginContainer* CLocNotPrefPluginContainer::NewL
-// Static Two phase contructor that instantiates the CLocNotPrefPluginContainer
-//
-// @param aRect                         Client rectangle
-// @param aListBoxModel                 Model for the container's list box
-// @param aCmdHandler                   List box command handler 
-// @return CLocNotPrefPluginContainer*  Reference to the object created
-// --------------------------------------------------------------------------- 
-//   
-CLocNotPrefPluginContainer* CLocNotPrefPluginContainer::NewL( 
-                    const TRect&                    aRect,
-                          MDesCArray&               aListBoxModel,
-                          MLocNotPrefPluginCmdHdlr& aCmdHandler )
-    {   
-    CLocNotPrefPluginContainer* self = 
-                    NewLC( aRect, aListBoxModel, aCmdHandler );
-    CleanupStack::Pop( self );
-    return self;
-    }
-
-// ---------------------------------------------------------------------------
-// CLocNotPrefPluginContainer* CLocNotPrefPluginContainer::NewLC
-// Static Two phase contructor that instantiates the CLocNotPrefPluginContainer
-//
-// @param aRect                         Client rectangle
-// @param aListBoxModel                 Model for the container's list box
-// @param aCmdHandler                   List box command handler 
-// @return CLocNotPrefPluginContainer*  Reference to the object created
-// --------------------------------------------------------------------------- 
-//  
-CLocNotPrefPluginContainer* CLocNotPrefPluginContainer::NewLC(
-                    const TRect&                    aRect,
-                          MDesCArray&               aListBoxModel,
-                          MLocNotPrefPluginCmdHdlr& aCmdHandler  )
-    {   
-    CLocNotPrefPluginContainer* self = 
-            new(ELeave) CLocNotPrefPluginContainer( aListBoxModel, aCmdHandler );
-    CleanupStack::PushL( self );
-    self->ConstructL( aRect );
-    return self;
-    }
-
-// --------------------------------------------------------------------------- 
-// void CLocNotPrefPluginContainer::ConstructL
-// Second phase of the two phase Construction process
-//
-// @param aRect              Client rectangle
-// ---------------------------------------------------------------------------
-//
-void CLocNotPrefPluginContainer::ConstructL( const TRect&   aRect )
-    {
-    //Make this control a window-owning control
-    CreateWindowL(); 
-    
-    // Create a New Title for the View
-    MakeTitleL( R_LOC_TITLE_NOTATIONS );
-    
-    CreateListboxL();
-    
-    // Get the Help context
-    iContextName = KLOC_HLP_NOTATIONS();
-        
-    SetRect( aRect );
-    ActivateL();
-    }
- 
-// ---------------------------------------------------------------------------
-// CLocNotPrefPluginContainer::GetFocussedItem
-// Returns the currentlt focussed element.
-//
- // @return TInt Index of the item selected
-// ---------------------------------------------------------------------------
-//
-TInt CLocNotPrefPluginContainer::GetFocussedItem()
-    {
-    return iListBox->CurrentItemIndex();
-    }
-        
-// ---------------------------------------------------------------------------
-// void CLocNotPrefPluginContainer::HandleResourceChange
-//
-// ---------------------------------------------------------------------------
-//  
-void CLocNotPrefPluginContainer::HandleResourceChange(TInt aType)
-    {
-    // Pass the event to the base class
-    CCoeControl::HandleResourceChange(aType);
-    switch( aType )
-        {
-        // Dynamic Layout switch
-        case KEikDynamicLayoutVariantSwitch:
-            {
-            // Handle the screen change event
-            // Trap and Ignore the error
-            TRAP_IGNORE(
-                iCmdHandler.HandleCmdL( MLocNotPrefPluginCmdHdlr::EScreenSizeChanged ));
-            break;
-            }
-        default:
-            {
-            break;
-            }
-        }
-    }
-
-// ---------------------------------------------------------------------------
-// TInt CLocNotPrefPluginContainer::CountComponentControls
-//
-// ---------------------------------------------------------------------------
-//
-TInt CLocNotPrefPluginContainer::CountComponentControls() const
-    {
-    return KNoofComponentControls;
-    }
-
-// ---------------------------------------------------------------------------
-// CCoeControl* CLocNotPrefPluginContainer::ComponentControl
-//
-// ---------------------------------------------------------------------------
-//
-CCoeControl* CLocNotPrefPluginContainer::ComponentControl(TInt /*aIndex*/) const
-    {
-    return iListBox;    
-    }
-
-// ---------------------------------------------------------------------------
-// void CLocNotPrefPluginContainer::OfferKeyEventL
-//
-// ---------------------------------------------------------------------------  
-//
-TKeyResponse CLocNotPrefPluginContainer::OfferKeyEventL( const TKeyEvent& aKeyEvent,
-                                                               TEventCode aType )
-    {
-    switch ( aKeyEvent.iCode )
-        {
-        case EKeyLeftArrow:
-        case EKeyRightArrow:
-            {
-            // Listbox takes all event even if it doesn't use them
-            return EKeyWasNotConsumed;  
-            }
-        default:
-            {
-            break;  
-            }
-        }
-    // now it's iListBox's job to process the key event
-    return iListBox->OfferKeyEventL( aKeyEvent, aType ); 
-    }
-        
-// ---------------------------------------------------------------------------
-// void CLocNotPrefPluginContainer::HandleListBoxEventL
-//
-// ---------------------------------------------------------------------------
-//
-void CLocNotPrefPluginContainer::HandleListBoxEventL( 
-                                        CEikListBox*                      /* aListBox */, 
-                                        MEikListBoxObserver::TListBoxEvent aEventType )
-    {
-    switch (aEventType)
-        {
-        // List box Item Selection
-        case EEventEnterKeyPressed:
-        case EEventItemSingleClicked:
-            {
-            // Settings element has been selected. Command has to be issued to
-            // change the settings configuration
-            iCmdHandler.HandleCmdL( MLocNotPrefPluginCmdHdlr::EListBoxItemSelected );
-            break;  
-            }
-        default:
-           break;
-        }
-    }
-    
-// -----------------------------------------------------------------------------
-// CLocNotPrefPluginContainer::GetHelpContext
-//
-// -----------------------------------------------------------------------------
-//
-void CLocNotPrefPluginContainer::GetHelpContext( TCoeHelpContext& aContext ) const
-    {
-    aContext.iContext = iContextName;
-    aContext.iMajor = TUid::Uid( KLocNotPrefPluginUID3 );
-    }
-
-// -----------------------------------------------------------------------------
-// void CLocNotPrefPluginContainer::HandlePointerEventL
-//
-// -----------------------------------------------------------------------------
-//
-void CLocNotPrefPluginContainer::HandlePointerEventL(const TPointerEvent &aPointerEvent)
-    {
-    // Check if touch is enabled or not
-    if( !AknLayoutUtils::PenEnabled() || !iListBox )
-        {
-        return;
-        }
-    iListBox->HandlePointerEventL( aPointerEvent ); 
-   }
-   	
-// ---------------------------------------------------------------------------
-// void CLocNotPrefPluginContainer::FocusChanged
-//
-// ---------------------------------------------------------------------------
-//
-void CLocNotPrefPluginContainer::FocusChanged(TDrawNow aDrawNow)
-    {
-    CCoeControl::FocusChanged( aDrawNow );
-    // The focus event has to be explicitly handed over to all the compound
-    // controls since CCoeControl does not do that implicitly
-    iListBox->SetFocus( IsFocused(), aDrawNow );
-    }
-        
-// ---------------------------------------------------------------------------
-// CLocNotPrefPluginContainer::SizeChanged
-// 
-// ---------------------------------------------------------------------------
-//
-void CLocNotPrefPluginContainer::SizeChanged()
-    {
-    iListBox->SetRect( Rect()); 
-    }
-    
-// ---------------------------------------------------------------------------
-// void CLocNotPrefPluginContainer::CreateListboxL
-// Creates the List box and the Listbox model. Associates the list box model 
-// with the list box
-//
-// ---------------------------------------------------------------------------  
-//
-void CLocNotPrefPluginContainer::CreateListboxL()
-    {
-    
-    // Create the List box
-    iListBox = new ( ELeave ) CAknSettingStyleListBox;
-    iListBox->ConstructL( this, EAknListBoxSelectionList );
-    iListBox->SetContainerWindowL( *this ); 
-    iListBox->SetListBoxObserver( this );
-    iListBox->CreateScrollBarFrameL(ETrue);
-    iListBox->ScrollBarFrame()->SetScrollBarVisibilityL( CEikScrollBarFrame::EOff,
-                                                         CEikScrollBarFrame::EAuto ); 
-                                                         
-    // The ownership of the list box model is retained with the Container.
-    // This is because the model contains the additional functionality of
-    // changing the settings values in addition to retreiving it.                                                        
-    iListBox->Model()->SetItemTextArray( &iListBoxModel );  
-    iListBox->Model()->SetOwnershipType( ELbmDoesNotOwnItemArray );                                 
-    iListBox->ActivateL();
-    }
-    
-// ---------------------------------------------------------------------------
-// void CLocNotPrefPluginContainer::MakeTitleL
-// Sets the Title text
-//
-// @param aResourceText Resource to create title
-// ---------------------------------------------------------------------------
-//
-void CLocNotPrefPluginContainer::MakeTitleL( TInt aResourceText )
-    {
-    // Obtain the title from the Status Pane
-    CAknTitlePane* title = static_cast<CAknTitlePane*>( StatusPane()->
-        ControlL( TUid::Uid( EEikStatusPaneUidTitle )));
-       
-    // Set the Title's buffer    
-    HBufC* buf = StringLoader::LoadL( aResourceText );
-    title->SetText( buf ); // Takes ownership of buf
-    }
-
-// ---------------------------------------------------------------------------
-// void CLocNotPrefPluginContainer::StatusPane
-// Returns the Appui's status pane
-//
-// @return CEikStatusPane* Statuspane pointer
-// ---------------------------------------------------------------------------
-//
-CEikStatusPane* CLocNotPrefPluginContainer::StatusPane()
-    {
-    return iEikonEnv->AppUiFactory()->StatusPane(); 
-    }
--- a/locationsystemui/locationsysui/locnotprefplugin/src/locnotprefpluginengine.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,426 +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:  Location Notation Preferences Plugin Engine
-*
-*/
-
-
-// System Include
-#include <e32keys.h>        // Tab Keys
-#include <StringLoader.h>   // String Loader
-#include <locnotprefpluginview.rsg>
-#include <aknradiobuttonsettingpage.h>
-
-// User Include
-#include "locnotprefpluginengine.h"
-#include "locnotprefengobserver.h"
-#include "locnotprefcorddisadapter.h"
-#include "locnotprefsomadapter.h"
-
-// Constant Defintions
-const TInt KNumberofSettingsItems = 2;
-const TInt KMaxConversionBufferLength = 0x200;
-const TInt KNoofSysofMeas = 2;
-const TInt KNoofCordDisplayFormats = 3;
-
-// ========================= MEMBER FUNCTIONS ================================
-
-
-// ---------------------------------------------------------------------------
-// CLocNotPrefPluginEngine::CLocNotPrefPluginEngine
-// Overloaded Constructor
-//
-// ---------------------------------------------------------------------------
-//  
-CLocNotPrefPluginEngine::CLocNotPrefPluginEngine(  
-                                MLocNotPrefEngObserver& aEngineObserver )
-    :iObserver(aEngineObserver),
-    iSettingsDialogOutstanding( EFalse )
-    {
-    }
-
-// ---------------------------------------------------------------------------
-// CLocNotPrefPluginEngine::~CLocNotPrefPluginEngine
-// Destructor
-//
-// ---------------------------------------------------------------------------
-//
-CLocNotPrefPluginEngine::~CLocNotPrefPluginEngine()
-    {
-    // Delete the list box strings
-    delete iSysofMeasTitle;
-    
-    delete iCoordDispTitle;
-    
-    delete iImperialSettings;
-    
-    delete iMetricSettings;
-    
-    delete iDegreesSettings;
-    
-    delete iMinutesSettings;
-    
-    delete iSecondsSettings;
-    
-    delete iConversionBuffer;
-        
-    // Delete the Co-ordinate display settings handle
-    delete iCordDisplaySettings;
-
-    // Delete the System of Measurements settings handle    
-    delete iSysofMeasSettings;
-    }
-    
-// ---------------------------------------------------------------------------
-// CLocNotPrefPluginEngine* CLocNotPrefPluginEngine::NewL
-// Creates new Location Notation Preferences plug-in engine instance.
-//
-// @param  aEngineObserver           Observer to the Notation preferences engine
-// @return CLocNotPrefPluginEngine* Reference to the application view
-// ---------------------------------------------------------------------------
-//    
-CLocNotPrefPluginEngine* CLocNotPrefPluginEngine::NewL( 
-                            MLocNotPrefEngObserver& aEngineObserver )
-    {   
-    CLocNotPrefPluginEngine* self = 
-                        CLocNotPrefPluginEngine::NewLC( aEngineObserver );
-    CleanupStack::Pop(self);
-    return self;
-    }
-
-// ---------------------------------------------------------------------------
-// CLocNotPrefPluginEngine* CLocNotPrefPluginEngine::NewLC
-// Creates new Location Notation Preferences plug-in engine instance. Leaves
-// the object on the Cleanup stack
-//
-// @param  aEngineObserver           Observer to the Notation preferences engine
-// @return CLocNotPrefPluginEngine* Reference to the application view
-// ---------------------------------------------------------------------------
-// 
-CLocNotPrefPluginEngine* CLocNotPrefPluginEngine::NewLC( 
-                            MLocNotPrefEngObserver& aEngineObserver )
-    {   
-    CLocNotPrefPluginEngine* self = 
-                        new(ELeave) CLocNotPrefPluginEngine( aEngineObserver );
-    CleanupStack::PushL(self);
-    self->ConstructL();
-    return self;
-    }
-    
-// ---------------------------------------------------------------------------
-// void CLocNotPrefPluginEngine::ConstructL
-// Second Phase Constructor
-//
-// ---------------------------------------------------------------------------
-//
-void CLocNotPrefPluginEngine::ConstructL()
-    {
-    // Create Co-ordinate display settings handle
-    iCordDisplaySettings = CLocNotPrefCoordinateDisplayAdapter::NewL( *this );
-    
-    iSysofMeasSettings = CLocNotPrefSystemofMeasAdapter::NewL( *this );
-    
-    // Load the list box strings
-    // Allocate and set the System of measurement heading
-    iSysofMeasTitle = StringLoader::LoadL( R_LOC_NOTATION_MEASURES );
-    
-    // Allocate and set the server ip address title field
-    iCoordDispTitle = StringLoader::LoadL( R_LOC_NOTATION_COORDINATE_FORMAT );
-
-    // Allocate and set the Imperial settings text
-    iImperialSettings = StringLoader::LoadL( R_LOC_IMPERIAL_SYSTEM );
-    
-    // Allocate and set the Metric settings text
-    iMetricSettings = StringLoader::LoadL( R_LOC_METRIC_SYSTEM );
-    
-    // Allocate and set the Degrees resolution settings text
-    iDegreesSettings = StringLoader::LoadL( R_LOC_FORMAT_DECIMAL_DEGREES );
-    
-    // Allocate and set the Minutes resolution settings text
-    iMinutesSettings = StringLoader::LoadL( R_LOC_FORMAT_DECIMAL_MINUTES );
-    
-    // Allocate and set the Seconds resolution settings text
-    iSecondsSettings = StringLoader::LoadL( R_LOC_FORMAT_DECIMAL_SECONDS );
-    
-    // Allocate the Conversion Buffer
-    iConversionBuffer = HBufC16::NewL( KMaxConversionBufferLength );        
-    }
-    
-// ---------------------------------------------------------------------------
-// TInt CLocNotPrefPluginEngine::MdcaCount
-// Inherited from MDesCArray
-//
-// ---------------------------------------------------------------------------
-//
-TInt CLocNotPrefPluginEngine::MdcaCount() const
-    {
-    return KNumberofSettingsItems;
-    }
-
-// ---------------------------------------------------------------------------
-// TInt CLocNotPrefPluginEngine::MdcaPoint
-// Inherited from MDesCArray
-//
-// ---------------------------------------------------------------------------
-//
-TPtrC16 CLocNotPrefPluginEngine::MdcaPoint( TInt aIndex ) const
-    {
-    // Zero the internal buffer
-    TPtr16 ptr( iConversionBuffer->Des());
-    ptr.Zero();
-    
-    // Format "\t%S\t\t%S"
-    
-    // Append the first tab
-    ptr.Append( EKeyTab );
-            
-    switch( aIndex )
-        {
-        case ESystemofMeasurement:
-            {
-            // Append the Title text
-            ptr.Append( iSysofMeasTitle->Des());
-            
-            // Append the second tab
-            ptr.Append( EKeyTab ); 
-                            
-            // Append the third tab
-            ptr.Append( EKeyTab );
-            
-            // Obtain the current value of system of measurement and append
-            // to the buffer
-            TLocSystemofMeasurementValues currentSettings = ELocMetric;
-            TRAPD( error, currentSettings = iSysofMeasSettings->GetCurrentSysofMeasL());
-            if( KErrNone == error )
-                {
-                if( ELocMetric == currentSettings )
-                    {
-                    ptr.Append( iMetricSettings->Des());
-                    }
-                else if ( ELocImperial == currentSettings )
-                    {
-                    ptr.Append( iImperialSettings->Des());
-                    }
-                }
-            
-            break;    
-            }
-        case ECoordinateDisplayFormat:
-            {
-            // Append the Title text
-            ptr.Append( iCoordDispTitle->Des());
-            
-            // Append the second tab
-            ptr.Append( EKeyTab ); 
-            
-            // Append the third tab
-            ptr.Append( EKeyTab );
-            
-            // Obtain the current value of co-ordinate display format and append
-            // to the buffer
-            CLocNotPrefCoordinateDisplayAdapter::TCordDisSetListPosition currentSettings = 
-                    CLocNotPrefCoordinateDisplayAdapter::EPosDMSS;
-            TRAPD( error, currentSettings = iCordDisplaySettings->GetCurrentDisplayFormatL());
-            if( KErrNone == error )
-                {
-                if( CLocNotPrefCoordinateDisplayAdapter::EPosDD == currentSettings )
-                    {
-                    ptr.Append( iDegreesSettings->Des());
-                    }
-                else if ( CLocNotPrefCoordinateDisplayAdapter::EPosDMM == currentSettings )
-                    {
-                    ptr.Append( iMinutesSettings->Des());
-                    }
-                else if ( CLocNotPrefCoordinateDisplayAdapter::EPosDMSS == currentSettings )
-                    {
-                    ptr.Append( iSecondsSettings->Des());
-                    }
-                }           
-            break;    
-            }
-        default:
-            {
-            // Append the second tab
-            ptr.Append( EKeyTab );          
-            // Append the third tab
-            ptr.Append( EKeyTab );
-            break;    
-            }
-        }  
-    return iConversionBuffer->Des();
-    }
- 
-// ---------------------------------------------------------------------------
-// void CLocNotPrefPluginEngine::HandleSettingsChangeL
-// Inherited from MLocNotPrefAdapterObserver
-//
-// ---------------------------------------------------------------------------
-//   
-void CLocNotPrefPluginEngine::HandleSettingsChangeL()
-    {
-    iObserver.HandleSettingsChangeEventL();
-    }
- 
-// ---------------------------------------------------------------------------
-// void CLocNotPrefPluginEngine::Close
-// Closes the running Settings UI prematurely. This would result in dismissing
-// any active dialogs currently running
-//
-// ---------------------------------------------------------------------------
-//
-void CLocNotPrefPluginEngine::Close()
-    {
-    // If any of the dialogs are active then issue a cancel event on the 
-    // dialogs
-    if( iSettingsDialogOutstanding )
-        {
-        TKeyEvent   keyEvent;
-        keyEvent.iCode          = EKeyCBA2;
-        keyEvent.iScanCode      = EStdKeyDevice1;         
-        keyEvent.iModifiers     = EAllModifiers;
-        keyEvent.iRepeats       = 0;
-        CCoeEnv* cCoeEnv = CCoeEnv::Static();
-        
-        // Simulate a Cancel event on the running dialogs. The Simulated event
-        // is for the Left Soft Key.
-        // Ignore the error incase of a leave
-        
-        TRAP_IGNORE( cCoeEnv->SimulateKeyEventL( keyEvent, EEventKey ));
-        }
-    iSettingsDialogOutstanding = EFalse;                
-    }
-            
-// ---------------------------------------------------------------------------
-// void CLocNotPrefPluginEngine::ChangeSysofMeasSettingsL
-// Change System of Measurement settings
-// 
-// ---------------------------------------------------------------------------
-// 
-void CLocNotPrefPluginEngine::ChangeSysofMeasSettingsL()
-    {
-    if( iSettingsDialogOutstanding )
-        {
-        User::Leave( KErrInUse );
-        }
-    // Allocate the descriptor array for Text settings for System
-    // of measurement
-    CDesCArrayFlat* items = new( ELeave ) CDesCArrayFlat( KNoofSysofMeas );
-    CleanupStack::PushL( items );
-
-    // Append the radio-button list items
-    items->AppendL( iMetricSettings->Des());
-    items->AppendL( iImperialSettings->Des());
-     
-    // Obtain the current value for current system of measurement
-    // This would be used for setting the default value for 
-    // the text settings page               
-
-    // The settings value start from 1 whereas the list box items
-    // start from 0. Hence, subtract 1 from the current settings
-    // value
-    TInt currentSettings = iSysofMeasSettings->GetCurrentSysofMeasL() - 1;
-        
-    CAknRadioButtonSettingPage* dlg = 
-                        new ( ELeave )CAknRadioButtonSettingPage( R_LOC_SYSOFMEAS_SETTINGS,
-                                                                  currentSettings, 
-                                                                  items );
-    // Settings Outstanding flag is marked True to enable dismissal incase
-    // of a Cancel event                                                                  
-    iSettingsDialogOutstanding = ETrue;                                                                  
-    if ( dlg->ExecuteLD( CAknSettingPage::EUpdateWhenChanged ))
-        {
-        // The settings value start from 1 whereas the list box items
-        // start from 0. Hence, add 1 from the current settings
-        // value
-        TLocSystemofMeasurementValues newValue = 
-                    static_cast<TLocSystemofMeasurementValues>( currentSettings + 1 );
-        iSysofMeasSettings->SetCurrentSysofMeasL( newValue );
-        } 
-    iSettingsDialogOutstanding = EFalse;           
-    // Free the items resource
-    CleanupStack::PopAndDestroy( items );
-     
-    }
-
-// ---------------------------------------------------------------------------
-// void CLocNotPrefPluginEngine::ToggleSysofMeasSettingsL
-// Toggle System of Measurement settings
-// 
-// ---------------------------------------------------------------------------
-//
-void CLocNotPrefPluginEngine::ToggleSysofMeasSettingsL()
-    {      
-    if( iSettingsDialogOutstanding )
-        {
-        User::Leave( KErrInUse );
-        }    
-    iSysofMeasSettings->ToggleSysofMeasSettingsL();
-    }
-
-// ---------------------------------------------------------------------------
-// void CLocNotPrefPluginEngine::ToggleSysofMeasSettingsL
-// Change Co-ordinate display format settings
-// 
-// ---------------------------------------------------------------------------
-//
-void CLocNotPrefPluginEngine::ChangeCoordinateDisplaySettingsL()
-    {
-    if( iSettingsDialogOutstanding )
-        {
-        User::Leave( KErrInUse );
-        }
-            
-    // Allocate the descriptor array for Text settings for Co-ordinate display
-    // formats
-    CDesCArrayFlat* items = new( ELeave ) CDesCArrayFlat( KNoofCordDisplayFormats );
-    CleanupStack::PushL( items );
-
-    // Append the radio-button list items
-    items->AppendL( iSecondsSettings->Des());    
-    items->AppendL( iMinutesSettings->Des());
-    items->AppendL( iDegreesSettings->Des());
-     
-    // Obtain the current value for current system of measurement
-    // This would be used for setting the default value for 
-    // the text settings page               
-
-    TInt currentSettings = iCordDisplaySettings->GetCurrentDisplayFormatL();
-        
-    CAknRadioButtonSettingPage* dlg = 
-                        new ( ELeave )CAknRadioButtonSettingPage( R_LOC_COORDDISPLAY_SETTINGS,
-                                                                  currentSettings, 
-                                                                  items );
-                                                                           
-    // Settings Outstanding flag is marked True to enable dismissal incase
-    // of a Cancel event                                                                  
-    iSettingsDialogOutstanding = ETrue;
-
-    if ( dlg->ExecuteLD( CAknSettingPage::EUpdateWhenAccepted ))
-        {
-        // The settings value start from 1 whereas the list box items
-        // start from 0. Hence, add 1 from the current settings
-        // value
-        CLocNotPrefCoordinateDisplayAdapter::
-            TCordDisSetListPosition newValue = static_cast<
-                CLocNotPrefCoordinateDisplayAdapter::TCordDisSetListPosition>( 
-                                                                    currentSettings );
-                                                                    
-        iCordDisplaySettings->SetCurrentDisplayFormatL( newValue );
-        }
-
-    iSettingsDialogOutstanding = EFalse;
-              
-    // Free the items resource
-    CleanupStack::PopAndDestroy( items );    
-    }
--- a/locationsystemui/locationsysui/locnotprefplugin/src/locnotprefpluginimptable.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,45 +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:  ECOM proxy table for this plugin
-*
-*/
-
-
-// System includes
-#include <e32std.h>
-#include <ecom/implementationproxy.h>
-
-// User includes
-#include "locnotprefplugin.h"
-#include "locnotprefpluginuid.hrh"
-
-// Constants
-const TImplementationProxy KLocNotPrefPluginImplementationTable[] = 
-    {
-    IMPLEMENTATION_PROXY_ENTRY( KLocNotPrefPluginUID3,  CLocNotPrefPlugin::NewL )
-    };
-
-
-// ---------------------------------------------------------------------------
-// ImplementationGroupProxy
-// Gate/factory function
-//
-// ---------------------------------------------------------------------------
-//
-EXPORT_C const TImplementationProxy* ImplementationGroupProxy(TInt& aTableCount)
-    {
-    aTableCount = sizeof(KLocNotPrefPluginImplementationTable) 
-        / sizeof(TImplementationProxy);
-    return KLocNotPrefPluginImplementationTable;
-    }
--- a/locationsystemui/locationsysui/locnotprefplugin/src/locnotprefpluginview.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,449 +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:  Location Notation Preferences Plugin view
-*
-*/
-
-
-// System Include
-#include <barsread.h>               // For TResourceReader
-#include <bautils.h>    
-#include <StringLoader.h>
-#include <aknViewAppUi.h>
-#include <locnotprefpluginview.rsg>
-#include <avkon.rsg>
-#include <aknnotewrappers.h>        // Error Notes
-#include <textresolver.h>           // Text Resolver
-#include <hlplch.h>                 // Help
-#include <featmgr.h>                // FeatureManager
-
-// User Include
-#include "locsettingsuiobserver.h"
-#include "locnotprefpluginview.h"
-#include "locnotprefplugincontainer.h"
-#include "locsettingsui.h"
-#include "locnotprefplugincmdhdlr.h"
-#include "locnotprefpluginengine.h"
-#include "locnotprefplugin.hrh"
-
-
-// ========================= MEMBER FUNCTIONS ================================
-
-
-// ---------------------------------------------------------------------------
-// CLocNotPrefPluginView::CLocNotPrefPluginView
-// Overloaded Constructor
-//
-// ---------------------------------------------------------------------------
-//  
-CLocNotPrefPluginView::CLocNotPrefPluginView( 
-                            MLocSettingsUiObserver& aSettingsObsrv )
-    :iSettingsObserver(aSettingsObsrv),
-    iResourceLoader( *CCoeEnv::Static())
-    {
-    }
-
-// ---------------------------------------------------------------------------
-// CLocNotPrefPluginView::~CLocNotPrefPluginView
-// Destructor
-//
-// ---------------------------------------------------------------------------
-//
-CLocNotPrefPluginView::~CLocNotPrefPluginView()
-    {
-    // Delete the engine
-    delete iEngine;
-    
-    // Delete the Error handling utilities
-    delete iTextResolver;
-        
-    // Close the resource loader
-    iResourceLoader.Close();
-    
-    FeatureManager::UnInitializeLib();  
-    }
-    
-// ---------------------------------------------------------------------------
-// CLocNotPrefPluginView* CLocNotPrefPluginView::NewL
-// Creates new Location notation preferences view.
-//
-// @param aSettingsObsrv            Pointer to the Command Handler
-// @return CLocNotPrefPluginView*   Reference to the application view
-// ---------------------------------------------------------------------------
-//   
-CLocNotPrefPluginView* CLocNotPrefPluginView::NewL( 
-                            MLocSettingsUiObserver& aSettingsObsrv )
-    {   
-    CLocNotPrefPluginView* self = 
-                        CLocNotPrefPluginView::NewLC( aSettingsObsrv );
-    CleanupStack::Pop(self);
-    return self;
-    }
-
-// ---------------------------------------------------------------------------
-// CLocNotPrefPluginView* CLocNotPrefPluginView::NewLC
-// Creates new Location notation preferences view.
-//
-// @param aSettingsObsrv            Pointer to the Command Handler
-// @return CLocNotPrefPluginView*   Reference to the application view
-// ---------------------------------------------------------------------------
-//  
-CLocNotPrefPluginView* CLocNotPrefPluginView::NewLC( 
-                            MLocSettingsUiObserver& aSettingsObsrv )
-    {   
-    CLocNotPrefPluginView* self = 
-                        new(ELeave) CLocNotPrefPluginView( aSettingsObsrv );
-    CleanupStack::PushL(self);
-    self->ConstructL();
-    return self;
-    }
-    
-// ---------------------------------------------------------------------------
-// void CLocNotPrefPluginView::ConstructL
-// Second Phase Constructor
-//
-// ---------------------------------------------------------------------------
-//
-void CLocNotPrefPluginView::ConstructL()
-    {
-    // Feature manager required for Help feature check
-    FeatureManager::InitializeLibL();
-        
-    // Open the Resource File
-    OpenLocalizedResourceFileL( KLocNotPrefViewResFileName, iResourceLoader );
-    
-    // Call AknView's BaseConstrutL
-    BaseConstructL( R_LOCNOTPREFPLUGIN_VIEW );
-    
-    // Create the Location notation preferences engine instance
-    iEngine = CLocNotPrefPluginEngine::NewL( *this );
-     
-    iTextResolver = CTextResolver::NewL(*( CCoeEnv::Static()));  
-    }
-
-// ---------------------------------------------------------------------------
-// void CLocNotPrefPluginView::CloseSettings
-// Close the Notation preferences Settings
-//
-// ---------------------------------------------------------------------------
-//
-void CLocNotPrefPluginView::CloseSettings()
-    {
-    // Stop displaying the menu bar, if its currently being displayed
-    StopDisplayingMenuBar();
-    
-    // Close all the active dialogs
-    iEngine->Close();
-    }
-        
-// ---------------------------------------------------------------------------
-// void CLocNotPrefPluginView::DoActivateL
-// 
-// ---------------------------------------------------------------------------
-//
-void CLocNotPrefPluginView::DoActivateL( const TVwsViewId&  /* PrevViewId*/,
-                                               TUid         /* aCustomMessageId*/,
-                                         const TDesC8&      /* aCustomMessage */)
-    {
-    // Destroy the existing container if it exists
-    if( iContainer )
-        {
-        AppUi()->RemoveFromViewStack( *this, iContainer );
-        delete iContainer;
-        iContainer=NULL;
-        }                       
-    
-    // Create new Container 
-    iContainer = CLocNotPrefPluginContainer::NewL( ClientRect(),
-                                                   *iEngine,
-                                                   *this );
-    iContainer->SetMopParent( this );
-    AppUi()->AddToViewStackL( *this, iContainer );
-    
-    }
-
-// ---------------------------------------------------------------------------
-// void CLocationSystemUiView::DoDeactivate
-//
-// ---------------------------------------------------------------------------
-//      
-void CLocNotPrefPluginView::DoDeactivate()
-    {
-    // Destroy Container
-    if ( iContainer )
-        {
-        AppUi()->RemoveFromViewStack( *this, iContainer );
-        delete iContainer;
-        iContainer = NULL;
-        }
-    }
-
-// ---------------------------------------------------------------------------
-// TUid CLocNotPrefPluginView::Id
-// Returns the View Id. Should be chosen to reflect the Implementation UID 
-// of the Plugin
-//
-// @return TUid The View Id
-// ---------------------------------------------------------------------------
-//  
-TUid CLocNotPrefPluginView::Id() const
-    {
-    return TUid::Uid( KLocNotPrefPluginUID3);
-    }
-
-// ---------------------------------------------------------------------------
-// void CLocNotPrefPluginView::HandleCommandL
-//
-// ---------------------------------------------------------------------------
-//  
-void CLocNotPrefPluginView::HandleCommandL(TInt aCommand)   
-    {
-    switch( aCommand )
-        {
-        case ELocNotPrefChange:
-        case ELocNotPrefMSKChange:
-            {
-            // Settings Change command
-            TRAPD( error, SettingsChangeL( aCommand ));
-            if( error )
-                {
-                // Show Error Note
-                TPtrC buffer = iTextResolver->ResolveErrorString( error );
-                CAknErrorNote* errorNote = new ( ELeave )CAknErrorNote;
-                TRAP_IGNORE( errorNote->ExecuteLD( buffer ));
-                }
-            break;
-            }
-        case EAknCmdHelp:
-            {
-            HlpLauncher::LaunchHelpApplicationL( iCoeEnv->WsSession(),
-                                                 AppUi()->AppHelpContextL());
-            break;  
-            }           
-        // Handle any plug-in specific internal commands here
-        case EAknSoftkeyBack:
-            {
-            // The UI is intended to be closed. Pass the event 
-            // to the observer
-            iSettingsObserver.SettingClosed( KErrNone );
-            break;
-            }
-        default:
-            {
-            // Un-handled commands are to be passed to the 
-            // App UI
-            AppUi()->HandleCommandL( aCommand );
-            break;  
-            }
-        }
-    }
-    
-// -----------------------------------------------------------------------------
-// CLocNotPrefPluginView::DynInitMenuPaneL
-// -----------------------------------------------------------------------------
-//
-void CLocNotPrefPluginView::DynInitMenuPaneL( TInt          aResourceId, 
-                                              CEikMenuPane* aMenuPane )
-    {
-    if ( aResourceId == R_LOCNOTPREFPLUGIN_MENU )
-        {
-        User::LeaveIfNull( aMenuPane );
-        //Handle Help Fature
-        HandleHelpFeature( *aMenuPane );
-        //Context sensitive menu items
-        }
-    }   
-
-// ---------------------------------------------------------------------------
-// void CLocNotPrefPlugin::HandleCommandL
-// Inherited from MLocNotPrefPluginCmdHdlr
-// Handles Selection events from the container
-// 
-// @param  aCommand Command ID
-// ---------------------------------------------------------------------------
-//
-void CLocNotPrefPluginView::HandleCmdL( TLocNotPrefPluginCmd aCommand )
-    {
-    switch( aCommand )
-        {
-        // Handle any plug-in specific internal commands here
-        case EListBoxItemSelected:
-            {
-            TRAPD( error, SettingsChangeL( ELocNotPrefMSKChange ));
-            if( error )
-                {
-                // Show Error Note
-                TPtrC buffer = iTextResolver->ResolveErrorString( error );
-                CAknErrorNote* errorNote = new ( ELeave )CAknErrorNote;
-                TRAP_IGNORE( errorNote->ExecuteLD( buffer ));
-                }           
-            break;
-            }
-        case EScreenSizeChanged:
-            {
-            if( iContainer )
-                {
-                iContainer->SetRect( ClientRect());     
-                }
-            break;
-            }
-        default:
-            {
-            break;  
-            }
-        }
-    }
-
-// ---------------------------------------------------------------------------
-// Inherited from MLocNotPrefEngObserver
-// ---------------------------------------------------------------------------
-//
-void CLocNotPrefPluginView::HandleSettingsChangeEventL()
-    {
-    // Observer callback notifies that one/more of the settings values have
-    // changed. Hence, need to refresh the container to show the latest
-    // values
-    if( iContainer )
-        {
-        iContainer->DrawDeferred();
-        }
-    }
-    
-// -----------------------------------------------------------------------------
-// CLocNotPrefPluginView::HandleHelpFeature
-// -----------------------------------------------------------------------------
-//
-void CLocNotPrefPluginView::HandleHelpFeature( CEikMenuPane& aMenuPane ) const
-    {
-    if ( FeatureManager::FeatureSupported( KFeatureIdHelp ))
-        {
-        aMenuPane.SetItemDimmed( EAknCmdHelp, EFalse );
-        }
-    else
-        {
-        aMenuPane.SetItemDimmed( EAknCmdHelp, ETrue );
-        }
-    }
-    
-// ---------------------------------------------------------------------------
-// Handle Settings Change Event
-// 
-// @param aCmd Settings change command
-// ---------------------------------------------------------------------------
-//
-void CLocNotPrefPluginView::SettingsChangeL( TInt aCmd )
-    {
-    if( !iContainer )
-        {
-        // No container available. Nothing to do in this case. Hence, returning
-        return;
-        }
-    CLocNotPrefPluginEngine::TSettingsList currentElement;
-    currentElement = static_cast<CLocNotPrefPluginEngine::TSettingsList>
-                        ( iContainer->GetFocussedItem());
-    
-    // Switch based on the currently focussed element
-    switch( currentElement )
-        {
-        case CLocNotPrefPluginEngine::ESystemofMeasurement:
-            {
-            // Different handling needed for Touch handling and Item selection
-            // using the OK key.
-            // Incase the User has selected the item using the OK key then 
-            // normal handling required
-            // Incase the User has selected the item using touch selection
-            // then the system of measurement needs to be toggled
-            if( ELocNotPrefChange == aCmd )
-                {
-                iEngine->ChangeSysofMeasSettingsL();
-                }
-            else
-                {
-                iEngine->ToggleSysofMeasSettingsL();
-                }              
-            break;
-            }
-        case CLocNotPrefPluginEngine::ECoordinateDisplayFormat:
-            {
-            // Change Co-ordinate display format settings
-            iEngine->ChangeCoordinateDisplaySettingsL();
-            break;
-            }
-        default:
-            {
-            // Element not found
-            User::Leave( KErrNotFound );
-            }
-        }
-    }
-                    
-// ---------------------------------------------------------------------------
-// void CLocNotPrefPluginView::OpenLocalizedResourceFileL
-// Opens the nearest localized resourcefile using aResourceLoader. 
-// aResourceLoader should be opened only once before closing it. 
-// Otherwise it will raise a panic. Therefore it is better to have 
-// multiple resource loaders.
-// 
-// @param aResourceFileName Drive and name of resource file in format 
-//                          <path>:<rsc_file_name>
-// @param aResourceLoader Resource loader for the resource. The loader 
-//                        must not be opened allready or it will raise 
-//                        a panic. It is caller's responsibility to 
-//                        close the resource loader after using the 
-//                        resource.
-// ---------------------------------------------------------------------------
-//  
-void CLocNotPrefPluginView::OpenLocalizedResourceFileL( 
-                            const TDesC&               aResourceFileName, 
-                                  RConeResourceLoader& aResourceLoader )
-    {
-    RFs fsSession;
-    User::LeaveIfError( fsSession.Connect());
-    
-    TFileName* tmpName = new(ELeave) TFileName;
-    CleanupStack::PushL( tmpName );
-    
-    // Append the Resource Files Directory
-    tmpName->Append( KDC_RESOURCE_FILES_DIR );
-    
-    // Append the Ressource File Name
-    tmpName->Append( aResourceFileName );
-    
-    // Obtain the drive where the DLL is installed
-    TFileName* dllDrive = new (ELeave) TFileName;
-    CleanupStack::PushL( dllDrive );
-    Dll::FileName( *dllDrive );
-    
-    // Obtain the Complete path for the Resource File
-    TParse parse;
-    User::LeaveIfError( parse.Set( *dllDrive, NULL, NULL ) );
-    User::LeaveIfError( parse.Set( parse.Drive(), tmpName, NULL ) );
-    TFileName* fileName = new(ELeave) TFileName;
-    CleanupStack::PushL( fileName );
-    fileName->Append( parse.FullName());
-    
-    // Get language of resource file
-    BaflUtils::NearestLanguageFile( fsSession, *fileName );
-    
-    // Open resource file    
-    aResourceLoader.OpenL( *fileName );
-    
-    // Pop all the fields
-    CleanupStack::PopAndDestroy( fileName );
-    CleanupStack::PopAndDestroy( dllDrive );
-    CleanupStack::PopAndDestroy( tmpName );
-    
-    //If leave occurs before this, close is called automatically when the thread exits.
-    fsSession.Close();
-    }
--- a/locationsystemui/locationsysui/locnotprefplugin/src/locnotprefsomadapter.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,210 +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:  Location Notation Preferences Plugin Systen of Measurement adapter
-*
-*/
-
-
-// System Include
-#include <centralrepository.h>
-
-// User Include
-#include "locnotprefsomadapter.h"
-#include "locnotprefadapterobserver.h"
-
-
-// ========================= MEMBER FUNCTIONS ================================
-
-
-// ---------------------------------------------------------------------------
-// CLocNotPrefSystemofMeasAdapter::CLocNotPrefSystemofMeasAdapter
-// Overloaded Constructor
-//
-// ---------------------------------------------------------------------------
-//  
-CLocNotPrefSystemofMeasAdapter::CLocNotPrefSystemofMeasAdapter(  
-                                MLocNotPrefAdapterObserver& aAdapterObsrv )
-    :CActive(EPriorityStandard),
-    iObserver(aAdapterObsrv)
-    {
-    }
-
-// ---------------------------------------------------------------------------
-// CLocNotPrefSystemofMeasAdapter::~CLocNotPrefSystemofMeasAdapter
-// Destructor
-//
-// ---------------------------------------------------------------------------
-//
-CLocNotPrefSystemofMeasAdapter::~CLocNotPrefSystemofMeasAdapter()
-    {
-    Cancel();
-    
-    delete iRepository; 
-    }
-    
-// ---------------------------------------------------------------------------
-// CLocNotPrefSystemofMeasAdapter* CLocNotPrefSystemofMeasAdapter::NewL
-// Creates new Systen of Measurement adapter
-//
-// @param  aAdapterObsrv                        Observer to the Settings adapter
-// @return CLocNotPrefSystemofMeasAdapter&  Reference to the application view
-// ---------------------------------------------------------------------------
-//    
-CLocNotPrefSystemofMeasAdapter* CLocNotPrefSystemofMeasAdapter::NewL( 
-                            MLocNotPrefAdapterObserver& aAdapterObsrv )
-    {   
-    CLocNotPrefSystemofMeasAdapter* self = 
-                        CLocNotPrefSystemofMeasAdapter::NewLC( aAdapterObsrv );
-    CleanupStack::Pop(self);
-    return self;
-    }
-
-// ---------------------------------------------------------------------------
-// CLocNotPrefSystemofMeasAdapter* CLocNotPrefSystemofMeasAdapter::NewLC
-// Creates new Systen of Measurement adapter. Leaves the object on the clean-up
-// stack
-//
-// @param  aAdapterObsrv                        Observer to the Settings adapter
-// @return CLocNotPrefSystemofMeasAdapter&  Reference to the application view
-// ---------------------------------------------------------------------------
-// 
-CLocNotPrefSystemofMeasAdapter* CLocNotPrefSystemofMeasAdapter::NewLC( 
-                            MLocNotPrefAdapterObserver& aAdapterObsrv )
-    {   
-    CLocNotPrefSystemofMeasAdapter* self = 
-                        new(ELeave) CLocNotPrefSystemofMeasAdapter( aAdapterObsrv );
-    CleanupStack::PushL(self);
-    self->ConstructL();
-    return self;
-    }
-    
-// ---------------------------------------------------------------------------
-// void CLocNotPrefSystemofMeasAdapter::ConstructL
-// Second Phase Constructor
-//
-// ---------------------------------------------------------------------------
-//
-void CLocNotPrefSystemofMeasAdapter::ConstructL()
-    {
-    CActiveScheduler::Add( this );
-    
-    // Create the Central repository object for manipulating Avkon Central
-    // repository for System of measurements settings
-    iRepository = CRepository::NewL(TUid::Uid( KCRUidLocNotationPref ));
-    
-    StartNotification();    
-    }
-
-// ---------------------------------------------------------------------------
-// TLocSystemofMeasurementValues CLocNotPrefSystemofMeasAdapter::GetCurrentSysofMeasL
-// Returns the current value of the System of measurements settings
-//
-// @return TLocSystemofMeasurementValues  Current value of the System of 
-//                                        measurements settings
-// ---------------------------------------------------------------------------
-//
-TLocSystemofMeasurementValues CLocNotPrefSystemofMeasAdapter::GetCurrentSysofMeasL()
-    {
-    
-    TInt settingsValue = 0;
-    User::LeaveIfError( iRepository->Get( KLocSystemofMeasurements,
-                                          settingsValue ));  
-    return ( static_cast<TLocSystemofMeasurementValues>( settingsValue ));
-    }
-
-// --------------------------------------------------------------------------
-// void CLocNotPrefSystemofMeasAdapter::SetCurrentSysofMeasL
-// Sets the value of the System of measurements settings
-//
-// @param aSettingsValue  New value of the System of measurements settings
-// ---------------------------------------------------------------------------
-//
-void CLocNotPrefSystemofMeasAdapter::SetCurrentSysofMeasL( 
-                            TLocSystemofMeasurementValues aSettingsValue )
-    {
-    User::LeaveIfError( iRepository->Set( KLocSystemofMeasurements,
-                                          aSettingsValue ));
-    }
- 
-// --------------------------------------------------------------------------
-// void CLocNotPrefSystemofMeasAdapter::ToggleSysofMeasSettingsL
-// Toggles the settings value
-// 
-// ---------------------------------------------------------------------------
-//
-void CLocNotPrefSystemofMeasAdapter::ToggleSysofMeasSettingsL()
-    {
-    TInt currentSettings = 0;
-    TLocSystemofMeasurementValues newSettings = ELocMetric;
-    
-    // Obtain the current settings value and if its ELocMetric
-    // then set ELocImperial else set ELocMetric
-    User::LeaveIfError( iRepository->Get( KLocSystemofMeasurements,
-                                          currentSettings ));
-    
-    if( ELocMetric == currentSettings )
-        {
-        newSettings = ELocImperial;
-        }
-    User::LeaveIfError( iRepository->Set( KLocSystemofMeasurements,
-                                          newSettings ));
-    }
-            
-// --------------------------------------------------------------------------
-// void CLocNotPrefSystemofMeasAdapter::RunL
-// Inherited from CActive
-//
-// ---------------------------------------------------------------------------
-//
-void CLocNotPrefSystemofMeasAdapter::RunL()
-    {
-    // Issue Notification
-    iObserver.HandleSettingsChangeL();
-    
-    // Schedule for listening to change events again
-    StartNotification();
-    }
-
-// --------------------------------------------------------------------------
-// void CLocNotPrefSystemofMeasAdapter::DoCancel
-// Inherited from CActive
-//
-// ---------------------------------------------------------------------------
-//
-void CLocNotPrefSystemofMeasAdapter::DoCancel()
-    {
-    // Cancel the outstanding CR notification request
-    if( iRepository )
-        {
-        iRepository->NotifyCancel( KLocSystemofMeasurements );        
-        }
-    }
-    
-// --------------------------------------------------------------------------
-// void CLocNotPrefSystemofMeasAdapter::StartNotification
-// Start notification from the Central repository server for any changes in the
-// System of measurements key value
-//
-// ---------------------------------------------------------------------------
-//
-void CLocNotPrefSystemofMeasAdapter::StartNotification()
-    {
-    if( !IsActive())
-        {
-        iStatus = KRequestPending;
-        // Request for notification
-        iRepository->NotifyRequest( KLocSystemofMeasurements, iStatus);
-        SetActive();          
-        }  
-    }
--- a/locationsystemui/locationsysui/locpossettingsapp/data/locpossettingsapp.rss	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,65 +0,0 @@
-/*
-* Copyright (c) 2006-2007 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:  Resource file for Positioning Settings Application for Location Centre
-*
-*/
-
-
-
-NAME PSAP
-
-#include <eikon.rh>
-#include <appinfo.rh>
-#include <avkon.rsg>
-#include <avkon.rh>
-#include <avkon.mbg>
-#include <bldvariant.hrh>
-#include <avkon.hrh>
-#include <data_caging_paths_strings.hrh>
-
-#include <location.loc>
-
-//  CONSTANTS  
-
-#define KLocIconFileMif APP_BITMAP_DIR"\\locpossettingsapp_aif.mif"
-
-RESOURCE RSS_SIGNATURE
-    { 
-    }
-    
-RESOURCE TBUF 
-    { 
-    buf="locposapp"; 
-    }
-
-RESOURCE EIK_APP_INFO
-    {    
-    }
-    
-// ---------------------------------------------------------------------------
-// r_t_locposapp_localisable_app_info
-// Localizable Application Information structure.
-// ---------------------------------------------------------------------------
-//
-RESOURCE LOCALISABLE_APP_INFO r_t_locposapp_localisable_app_info
-    {
-    short_caption = qtn_loc_app_settings;	
-    	
-    caption_and_icon = CAPTION_AND_ICON_INFO
-	    {
-		caption = qtn_loc_app_settings;
-		number_of_icons = 1; 
-		icon_file = KLocIconFileMif; 
-		};
-    }
--- a/locationsystemui/locationsysui/locpossettingsapp/data/locpossettingsapp_reg.rss	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,39 +0,0 @@
-/*
-* Copyright (c) 2006-2007 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:  Resource file for Positioning Settings Application for Location Centre
-*
-*/
-
-
-// SYSTEM INCLUDES
-#include <appinfo.rh>
-#include <locpossettingsapp.rsg>
-#include <data_caging_paths_strings.hrh>
-
-UID2 KUidAppRegistrationResourceFile
-UID3 0x1028313B
-
-// ---------------------------------------------------------------------------
-// APP_REGISTRATION_INFO
-// Application registration information for Positioning Settings Application
-// ---------------------------------------------------------------------------
-//
-RESOURCE APP_REGISTRATION_INFO
-    {
-    app_file = "locpossettingsapp";
-    hidden = KAppIsHidden;
-    embeddability = KAppEmbeddable;    
-    localisable_resource_file = APP_RESOURCE_DIR"\\locpossettingsapp";
-    localisable_resource_id = R_T_LOCPOSAPP_LOCALISABLE_APP_INFO;
-    }
--- a/locationsystemui/locationsysui/locpossettingsapp/data/locpossettingsapp_reg.xml	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<location_centre_registration>
-  <service uuid="1028313B">
-    <feature>Settings</feature>
-    <runmode default="child"/>
-    <application>
-      <native sid="[1028313B]"/>
-    </application>
-  </service>
-</location_centre_registration>
\ No newline at end of file
--- a/locationsystemui/locationsysui/locpossettingsapp/group/bld.inf	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,39 +0,0 @@
-/*
-* Copyright (c) 2007 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 for project Positioning Settings 
-*                Application
-*
-*/
-
-PRJ_PLATFORMS
-DEFAULT
-
-PRJ_EXPORTS
-../data/locpossettingsapp_reg.xml    /epoc32/data/z/private/10283138/import/locpossettingsapp_reg.xml
-../data/locpossettingsapp_reg.xml    /epoc32/release/winscw/udeb/z/private/10283138/import/locpossettingsapp_reg.xml
-
-PRJ_MMPFILES
-// Positioning Settings Application Project defintion file.
-locpossettingsapp.mmp
-
-PRJ_TESTMMPFILES
-
-PRJ_TESTMMPFILES
-
-PRJ_EXTENSIONS
-START EXTENSION s60/mifconv
-OPTION TARGETFILE locpossettingsapp_aif.mif
-OPTION SOURCES -c8 qgn_prop_set_gene_loc.svg
-END
-	
\ No newline at end of file
--- a/locationsystemui/locationsysui/locpossettingsapp/group/locpossettingsapp.mmp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,64 +0,0 @@
-/*
-* Copyright (c) 2006-2007 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:  mmp for Positioning Settings for Location Center
-*
-*/
-
-
-#include <data_caging_paths.hrh>
-
-#include <platform_paths.hrh> // For the MW_LAYER_SYSTEMINCLUDE
-#include "./../inc/locpossettingsuid.hrh" // UID of Positioning Settings Application 
-
-
-TARGET                  locpossettingsapp.exe
-TARGETTYPE              exe
-UID                     KAppUid2 KCLocPosSettingsAppUid3
-
-//CAPABILITY              CAP_APPLICATION TrustedUI
-CAPABILITY				CAP_APPLICATION NetworkControl
-VENDORID                VID_DEFAULT
-
-SOURCEPATH              ../src
-SOURCE                  locpossettingsapp.cpp
-SOURCE                  locpossettingsappdocument.cpp
-SOURCE                  locpossettingsappui.cpp
-
-START RESOURCE          ../data/locpossettingsapp.rss
-HEADER
-TARGETPATH              APP_RESOURCE_DIR
-LANGUAGE_IDS
-END
-
-USERINCLUDE             .
-USERINCLUDE             ../src
-USERINCLUDE             ../data
-USERINCLUDE             ../inc
-USERINCLUDE             ../../inc
-USERINCLUDE             ../../../inc
-USERINCLUDE             ../../../../inc
-
-MW_LAYER_SYSTEMINCLUDE
-
-LIBRARY                 euser.lib
-LIBRARY                 apparc.lib
-LIBRARY                 cone.lib
-LIBRARY                 eikcore.lib
-LIBRARY                 avkon.lib
-LIBRARY                 locsysuiview.lib
-
-START RESOURCE          ../data/locpossettingsapp_reg.rss
-DEPENDS locpossettingsapp.rsg
-	TARGETPATH          /private/10003a3f/apps
-END
--- a/locationsystemui/locationsysui/locpossettingsapp/inc/locpossettingsapp.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,48 +0,0 @@
-/*
-* Copyright (c) 2006-2007 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:  Application to launch Positioning Settings for Location Centre
-*
-*/
-
-
-#ifndef C_LOCPOSSETTINGSAPP_H
-#define C_LOCPOSSETTINGSAPP_H
-
-// System Includes
-#include <aknapp.h>
-
-/**
- *  Application class
- *  Application class creates document class object and return application UID
- *
- *  @lib locpossettingsapp.exe
- *  @since S60 v 5.0
- */
- class CLocPosSettingsApp : public CAknApplication
-    {
- private:
-    /**
-    * From CApaApplication, returns application's UID (KCLocPosSettingsAppUid3).
-    * @return The value of KCLocPosSettingsAppUid3.
-    */
-    TUid AppDllUid() const;
-        
-    /**
-    * From CApaApplication, creates CLocPosSettingsAppDocument object.
-    * @return A pointer to the created document object.
-    */
-    CApaDocument* CreateDocumentL();
-    };
-
-#endif // C_LOCPOSSETTINGSAPP_H
--- a/locationsystemui/locationsysui/locpossettingsapp/inc/locpossettingsappdocument.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,67 +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:  Application to launch Positioning Settings for Location Center
-*
-*/
-
-
-#ifndef C_LOCPOSSETTINGSAPPDOCUMENT_H
-#define C_LOCPOSSETTINGSAPPDOCUMENT_H
-
-// System Includes
-#include <AknDoc.h>
-
-// Forward Declarations
-class  CEikAppUi;
-
-/**
- *  Positioning Settings Application Document Class
- *
- *  @lib locpossettingsapp.exe
- *  @since S60 v 5.0
- */
-class CLocPosSettingsAppDocument : public CAknDocument
-    {
-public:
-    /**
-     * Two-phased constructor.
-     * @param CEikApplication& EikApplication reference
-     * @return pointer to CLocPosSettingsAppDocument
-     */
-    static CLocPosSettingsAppDocument* NewL(CEikApplication& aApp);
-    
-   /**
-    * Destructor.
-    */
-    virtual ~CLocPosSettingsAppDocument();
-
-private:
-	/**
-	 * Overloaded C++ constructor
-	 */
-    CLocPosSettingsAppDocument(CEikApplication& aApp);
-
-	/**
-	 * Second phase of the two phase constuctor
-	 */
-    void ConstructL();
-
-private: // Inherited from Base classes
-   /**
-    * From CEikDocument, create CLocPosSettingsAppUi "App UI" object.
-    */
-    CEikAppUi* CreateAppUiL();
-  };
-
-#endif // C_LOCPOSSETTINGSAPPDOCUMENT_H
--- a/locationsystemui/locationsysui/locpossettingsapp/inc/locpossettingsappui.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,60 +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:  Application to launch Positioning Settings for Location Centre
-*
-*/
-
-
-#ifndef C_LOCPOSSETTINGSAPPUI_H
-#define C_LOCPOSSETTINGSAPPUI_H
-
-// System Includes
-#include <eikapp.h>
-#include <eikdoc.h>
-#include <e32std.h>
-#include <coeccntx.h>
-#include <aknappui.h>
-
-// User Includes
-#include "locsysuiview.h"
-
-/**
- *  Application UI class
- *  Provides support for the following features:
- *  - EIKON control architecture
- *
- *  @lib locpossettingsapp.exe
- *  @since S60 v 5.0
- */
-class CLosPosSettingsAppUi : public CAknViewAppUi
-    {
-public:   
-    /**
-     * Second phase of the two phase constructor.
-     */       
-    void ConstructL();
-        
-    /**
-     * Destructor.
-     */
-    virtual ~CLosPosSettingsAppUi();
-    
-public: // Inherited from Base classes    
-    /**
-     * Inherited from CAknViewAppUi
-     */
-    void HandleCommandL(TInt aCommand); 
-    };
-
-#endif // C_LOCPOSSETTINGSAPPUI_H
--- a/locationsystemui/locationsysui/locpossettingsapp/inc/locpossettingsuid.hrh	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-/*
-* Copyright (c) 2006-2007 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:  Application to launch Positioning Settings for Location Centre
-*
-*/
-
-
-#ifndef LOCPOSSETTINGSUID_H
-#define LOCPOSSETTINGSUID_H
-
-
-/** UID2 of the application */
-#define KAppUid2 0x100039CE
-
-/** UID3 of the application  */
-#define KCLocPosSettingsAppUid3 0x1028313B
-
-#endif // LOCPOSSETTINGSUID_H
--- a/locationsystemui/locationsysui/locpossettingsapp/src/locpossettingsapp.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,67 +0,0 @@
-/*
-* Copyright (c) 2006-2007 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:  Application to launch Positioning Settings for Location Centre
-*
-*/
-
-
-// System Includes
-#include <eikstart.h>
-
-// User Includes
-#include "locpossettingsapp.h"
-#include "locpossettingsappdocument.h"
-#include "locpossettingsuid.hrh"
-
-// ======== Member functions for class  CLocPosSettingsApp ===================
-
-// ---------------------------------------------------------------------------
-// TUid CLocPosSettingsApp::AppDllUid
-// ---------------------------------------------------------------------------
-//
-TUid CLocPosSettingsApp::AppDllUid() const
-    {
-    return TUid::Uid( KCLocPosSettingsAppUid3 );
-    }
-
-// ---------------------------------------------------------------------------
-// CApaDocument* CLocPosSettingsApp::CreateDocumentL
-// ---------------------------------------------------------------------------
-//
-CApaDocument* CLocPosSettingsApp::CreateDocumentL()
-    {
-    return CLocPosSettingsAppDocument::NewL( *this );
-    }
-    
-// =========================Global Functions =================================
-
-// ---------------------------------------------------------------------------
-// CApaApplication* NewApplication
-// ---------------------------------------------------------------------------
-//
-LOCAL_C CApaApplication* NewApplication()
-    {
-    return new CLocPosSettingsApp ;
-    }
-
-
-// ---------------------------------------------------------------------------
-// TInt E32Main
-// ---------------------------------------------------------------------------
-//
-GLDEF_C TInt E32Main()
-    {
-    return EikStart::RunApplication( NewApplication );
-    }
-
--- a/locationsystemui/locationsysui/locpossettingsapp/src/locpossettingsappdocument.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,77 +0,0 @@
-/*
-* Copyright (c) 2006-2007 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:  Application to launch Positioning Settings for Location Centre
-*
-*/
-
-
-// User Includes
-#include "locpossettingsappdocument.h"
-#include "locpossettingsappui.h"
-
-
-// ======== Member functions for class  CLocPosSettingsAppDocument ===========
-
-// ---------------------------------------------------------------------------
-// CLocPosSettingsAppDocument::NewL()
-// ---------------------------------------------------------------------------
-//
-CLocPosSettingsAppDocument* CLocPosSettingsAppDocument::NewL(
-        CEikApplication& aApp)     
-    {
-    CLocPosSettingsAppDocument* self = new (ELeave) CLocPosSettingsAppDocument( aApp );
-    CleanupStack::PushL( self );
-    self->ConstructL();
-    CleanupStack::Pop( self );
-    return self;
-    }
-
-// ---------------------------------------------------------------------------
-// CLocPosSettingsAppDocument::~CLocPosSettingsAppDocument()
-// ---------------------------------------------------------------------------
-//
-CLocPosSettingsAppDocument::~CLocPosSettingsAppDocument()
-    {
-    // No Implementation  
-    }
-
-
-// ---------------------------------------------------------------------------
-// CLocPosSettingsAppDocument::CLocPosSettingsAppDocument()
-// Constructs.
-// ---------------------------------------------------------------------------
-//
-CLocPosSettingsAppDocument::CLocPosSettingsAppDocument( CEikApplication& aApp )
-    :CAknDocument( aApp )    
-    {
-    }
-
-// ---------------------------------------------------------------------------
-// CLocPosSettingsAppDocument::ConstructL()
-// ---------------------------------------------------------------------------
-//
-void CLocPosSettingsAppDocument::ConstructL()
-    {
-    // No Implementation
-    }
-
-// ----------------------------------------------------
-// CLocPosSettingsAppDocument::CreateAppUiL()
-// ----------------------------------------------------
-//
-CEikAppUi* CLocPosSettingsAppDocument::CreateAppUiL()
-    {
-    return new ( ELeave ) CLosPosSettingsAppUi;
-    }
-
--- a/locationsystemui/locationsysui/locpossettingsapp/src/locpossettingsappui.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,91 +0,0 @@
-/*
-* Copyright (c) 2006-2007 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:  Application to launch Positioning Settings for Location Centre
-*
-*/
-
-
-// System Includes
-#include <avkon.hrh>
-#include <eikserverapp.h>
-
-// User Includes
-#include "locpossettingsappui.h"
-
-// ======== Member functions for class CLosPosSettingsAppUi ==================
-
-
-// ---------------------------------------------------------------------------
-// void CLosPosSettingsAppUi::ConstructL
-// ---------------------------------------------------------------------------
-//
-void CLosPosSettingsAppUi::ConstructL()
-    {
-    BaseConstructL(  EAknEnableSkin | EAknEnableMSK | EAknSingleClickCompatible);
-    
-    // Create the Postioning Settings View
-    CLocSysUiView* view = CLocSysUiView::NewL();
-    view->LaunchedfromPosSettingsApp();
-    CleanupStack::PushL( view );
-    AddViewL( view ); // transfer ownership to CAknViewAppUi
-    CleanupStack::Pop( view );
-    SetDefaultViewL( *view );
-    }
-
-
-// ---------------------------------------------------------------------------
-// CLosPosSettingsAppUi::~CLosPosSettingsAppUi
-// ---------------------------------------------------------------------------
-//
-CLosPosSettingsAppUi::~CLosPosSettingsAppUi()
-    {
-    }
-
-// ---------------------------------------------------------------------------
-// void CLosPosSettingsAppUi::HandleCommandL
-// ---------------------------------------------------------------------------
-//   
-void CLosPosSettingsAppUi::HandleCommandL( TInt aCommand )
-    {
-    switch ( aCommand )
-        {		
-        case EAknSoftkeyExit: 
-        	{
-        	// The User has pressed the Back key from the Application or the
-        	// Exit key using the Right soft key. In this case the parent
-        	// application need not exit. Hence, the application can exit
-        	// with EEikCmdExit itself
-        	Exit();
-        	break;
-        	} 
-        case EEikCmdExit:
-            {
-            // The User has exited the application using the Exit option from
-            //.Options menu.  But, thats possible only if we exit the application
-            // with EAknCmdExit.
-            // A bit of convoluted logic but needed because we are using the
-            // same components for the Settings UI Server as well as LC.
-            
-           	CEikAppServer* server = iEikonEnv->AppServer();
-			if ( server )
-				{
-				server->NotifyServerExit(EAknCmdExit);
-				}			
-            Exit();
-            break;
-            }
-        default:
-            break;
-        }
-    }
--- a/locationsystemui/locationsysui/locpsysettings/group/bld.inf	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,37 +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 provides the information required for building
-*				 Location System UI
-*                  
-*
-*/
-
-
-PRJ_PLATFORMS
-DEFAULT
-
-PRJ_EXPORTS
-
-PRJ_MMPFILES
-// Include Bld.infs
-
-// Positioning Method Settings Engine
-#include "../locpsysettingseng/group/bld.inf"
-
-// Positioning Method Settings UI
-#include "../locpsysettingsui/group/bld.inf"
-
-PRJ_TESTMMPFILES
-
-//  End of File  
--- a/locationsystemui/locationsysui/locpsysettings/locpsysettingseng/BWINS/locpsysettingsengu.def	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-EXPORTS
-	??1CLocPsyEng@@UAE@XZ @ 1 NONAME ; CLocPsyEng::~CLocPsyEng(void)
-	?CreateModelL@CLocPsyEng@@QAEXW4TLocModelType@@@Z @ 2 NONAME ; void CLocPsyEng::CreateModelL(enum TLocModelType)
-	?Debug@@YAXV?$TRefByValue@$$CBVTDesC16@@@@ZZ @ 3 NONAME ; void Debug(class TRefByValue<class TDesC16 const >, ...)
-	?NewL@CLocPsyEng@@SAPAV1@XZ @ 4 NONAME ; class CLocPsyEng * CLocPsyEng::NewL(void)
-	?PsyId@CLocPsyInfo@@QBE?AVTUid@@XZ @ 5 NONAME ; class TUid CLocPsyInfo::PsyId(void) const
-	?PsyName@CLocPsyInfo@@QBEABVTDesC16@@XZ @ 6 NONAME ; class TDesC16 const & CLocPsyInfo::PsyName(void) const
-	?RemoveModel@CLocPsyEng@@QAEXW4TLocModelType@@@Z @ 7 NONAME ; void CLocPsyEng::RemoveModel(enum TLocModelType)
-	?SettingsModel@CLocPsyEng@@QAEPAVMLocPsySettings@@XZ @ 8 NONAME ; class MLocPsySettings * CLocPsyEng::SettingsModel(void)
-
--- a/locationsystemui/locationsysui/locpsysettings/locpsysettingseng/eabi/locpsysettingsengu.def	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-EXPORTS
-	_Z5Debug11TRefByValueIK7TDesC16Ez @ 1 NONAME
-	_ZN10CLocPsyEng11RemoveModelE13TLocModelType @ 2 NONAME
-	_ZN10CLocPsyEng12CreateModelLE13TLocModelType @ 3 NONAME
-	_ZN10CLocPsyEng13SettingsModelEv @ 4 NONAME
-	_ZN10CLocPsyEng4NewLEv @ 5 NONAME
-	_ZN10CLocPsyEngD0Ev @ 6 NONAME
-	_ZN10CLocPsyEngD1Ev @ 7 NONAME
-	_ZN10CLocPsyEngD2Ev @ 8 NONAME
-	_ZNK11CLocPsyInfo5PsyIdEv @ 9 NONAME
-	_ZNK11CLocPsyInfo7PsyNameEv @ 10 NONAME
-	_ZTI10CLocPsyEng @ 11 NONAME ; #<TI>#
-	_ZTI11CLocPsyInfo @ 12 NONAME ; #<TI>#
-	_ZTI15CLocPsySettings @ 13 NONAME ; #<TI>#
-	_ZTI32CLocPsyConfigUiServiceClientImpl @ 14 NONAME ; #<TI>#
-	_ZTV10CLocPsyEng @ 15 NONAME ; #<VT>#
-	_ZTV11CLocPsyInfo @ 16 NONAME ; #<VT>#
-	_ZTV15CLocPsySettings @ 17 NONAME ; #<VT>#
-	_ZTV32CLocPsyConfigUiServiceClientImpl @ 18 NONAME ; #<VT>#
-
--- a/locationsystemui/locationsysui/locpsysettings/locpsysettingseng/group/bld.inf	Mon May 03 12:54:42 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: Build information file for Location Positioning Settings Engine
-*
-*
-*/
-
-
-PRJ_PLATFORMS
-DEFAULT
-
-PRJ_EXPORTS
-../inc/locpsyeng.h					 |../../../../inc/locpsyeng.h
-../inc/locpsyengobserver.h    		 |../../../../inc/locpsyengobserver.h
-../inc/locpsyengdebug.h		    	 |../../../../inc/locpsyengdebug.h
-../inc/locpsyengdebugconfig.hrh      |../../../../inc/locpsyengdebugconfig.hrh
-../inc/locpsyinfo.h                  |../../../../inc/locpsyinfo.h
-../inc/locpsysettings.h				 |../../../../inc/locpsysettings.h
-../inc/locpsysettingsengconsts.h     |../../../../inc/locpsysettingsengconsts.h
-../inc/locpsysettingsinterface.h     |../../../../inc/locpsysettingsinterface.h
-../inc/locpsyconfigclientimpl.h      |../../../../inc/locpsyconfigclientimpl.h
-../inc/locpsyconfigclientwrapper.h   |../../../../inc/locpsyconfigclientwrapper.h
-
-PRJ_MMPFILES
-locpsysettingseng.mmp
-
-//  End of File
--- a/locationsystemui/locationsysui/locpsysettings/locpsysettingseng/group/locpsysettingseng.mmp	Mon May 03 12:54:42 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: Project definition file for Location Positioning Settings Engine
-*
-*/
-
-
-
-// INCLUDES
-#include "../inc/locpsyengdebugconfig.hrh"
-#include "../inc/locpsysenguid.hrh"
-#include <platform_paths.hrh> // For the MW_LAYER_SYSTEMINCLUDE
-
-// Target information
-TARGET  				locpsysettingseng.dll
-TARGETTYPE  			dll
-UID  					0x0 LOCPSYSETTINGSENG_UID3
-
-VENDORID 				VID_DEFAULT
-CAPABILITY 				CAP_GENERAL_DLL
-
-SOURCEPATH 				../src
-SOURCE 				    locpsyeng.cpp
-SOURCE	 				locpsyinfo.cpp
-SOURCE 					locpsysettings.cpp
-SOURCE  				locpsyconfigclientwrapper.cpp
-SOURCE  				locpsyconfigclientimpl.cpp
-
-#ifdef LOC_ENABLE_DEBUG_PRINT
-SOURCE                  locpsysettingsengdebug.cpp
-#else
-SOURCE                  locpsysettingsengdebugdummy.cpp
-#endif
-
-// System Include
-MW_LAYER_SYSTEMINCLUDE
-
-USERINCLUDE 			.
-USERINCLUDE 			../inc
-
-LIBRARY 				euser.lib
-LIBRARY 				eposmodset.lib
-LIBRARY 				lbs.lib
-LIBRARY 				apgrfx.lib
-LIBRARY 				bafl.lib
-LIBRARY 				apparc.lib
-LIBRARY 				eikcore.lib
-LIBRARY 				avkon.lib
-
-#ifdef LOC_ENABLE_DEBUG_PRINT
-LIBRARY 				flogger.lib
-#endif
--- a/locationsystemui/locationsysui/locpsysettings/locpsysettingseng/inc/locpsyconfigclientimpl.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,96 +0,0 @@
-/*
-* Copyright (c) 2002-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:  Provides Location PSY configuration UI class.
-*
-*/
-
-
-#ifndef CLOCPSYCONFIGCLIENTIMPL_H_
-#define CLOCPSYCONFIGCLIENTIMPL_H_
-
-#include <AknLaunchAppService.h>
-#include <AknServerApp.h>
-
-#include "locpsyconfigclientwrapper.h"
-
-/**
-* This class provides the implementation to launch the PSY COnfiguration UI as
-* an embedded application. It uses the Symbian & Series60 AppArc Framework to
-* launch the application.
-*/
-class CLocPsyConfigUiServiceClientImpl : public CLocPsyConfigUiServiceClient
-	{
-	public:
-	    /**
-	     * C++ Overloaded Constuctor
-	     *
-	     * @param aReg      Configuration UI registration information
-	     * @param aObserver Observer to notify the termination of the
-	     *                  config UI service
-	     */
-	    CLocPsyConfigUiServiceClientImpl( CLocPsyConfigUiReg&        aReg, 
-	                                      MAknServerAppExitObserver& aObserver );
-	    
-	    /**
-	     * Destructor
-	     */
-		~CLocPsyConfigUiServiceClientImpl();
-		
-		/**
-		 * Create the Application launcher
-		 */
-		void StartServerL();
-		
-		/**
-		 * Close the application launcher
-		 *
-		 * @param reason Reason for closing the application
-		 */
-		void CloseServer( TInt reason );
-		
-		/**
-		 * Accessor function for the PSY ID
-		 * 
-		 * @return TInt     PSY ID
-		 */
-		TInt PsyId();
-		
-		/**
-		 * Accessor function for the Application UID
-		 *
-		 * @return TUid     Application UID
-		 */
-		TUid AppUid();
-		
-	private:
-	    /**
-	     * Application launher
-	     * Owns
-	     */
-		CAknLaunchAppService*           iLaunchAppService;
-		
-		/**
-		 * Observer to notify the exit of the application
-		 * Reference
-		 */
-		MAknServerAppExitObserver*      iObserver;
-		
-		/**
-		 * Configuration UI registration information
-		 * Reference
-		 */
-		CLocPsyConfigUiReg&             iAppRegInfo;
-	};
-
-#endif // CLOCPSYCONFIGCLIENTIMPL_H_
--- a/locationsystemui/locationsysui/locpsysettings/locpsysettingseng/inc/locpsyconfigclientwrapper.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,109 +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: 
- *         psy configuration ui server app wrapper implementation.
- *
-*/
-
-#ifndef LOCPSYCONFIGCLIENTWRAPPER_H_
-#define LOCPSYCONFIGCLIENTWRAPPER_H_
-
-#include <AknServerApp.h>
-
-/**
- * This class provides the place holder for the structural information of the
- * of the Configuration UI application.
- */
-class CLocPsyConfigUiReg : public CBase
-	{
-	public:
-	    /**
-	     * Two phase constructor
-	     *
-	     * @param  aApp                  Application UID
-	     * @param  aResource             Resource ID
-	     * @return CLocPsyConfigUiReg*   Reference to the object created
-	     */
-		static CLocPsyConfigUiReg* NewL(       TUid     aApp,
-		                                 const TDesC8&  aResource );
-		                                 
-        /**
-         * Accessor function for the PSY UID
-         * 
-         * @return TInt     PSY UID
-         */ 		                                 
-		TInt RegId();
-		
-		/**
-		 * Accessor function for the Application UID
-		 *
-		 * @return TUid     Application UID
-		 */
-		TUid AppUid();
-
-	private:
-	    /**
-	     * C++ Default Constructor
-	     */
-		CLocPsyConfigUiReg();
-		
-		/**
-		 * Second phase constructor
-	     * @param  aApp                  Application UID
-	     * @param  aResource             Resource ID		 
-		 */
-		void ConstructL(       TUid    aApp,
-		                 const TDesC8& aResource );
-
-	private:
-	    /**
-	     * Application UID
-	     */
-		TUid iAppUid;
-		
-		/**
-		 * PSY UID
-		 */
-		TInt iRegId;
-	};
-
-/**
- * This class provides the discovery mechanism to discover the PSY
- * Configuration UI corresponding to the registration information
- */
-class CLocPsyConfigUiServiceClient : public CBase
-	{
-	public:
-	    /**
-	     * Two phase constructor
-	     *
-	     * @param  aReg                             Application registration info
-	     * @param  aObserver                        Observer to notify the termination
-	     *                                          of the application
-	     * @return CLocPsyConfigUiServiceClient*    Reference to the object created
-	     */
-		static CLocPsyConfigUiServiceClient* NewLC(
-			                              CLocPsyConfigUiReg&        aReg, 
-			                              MAknServerAppExitObserver& aObserver );
-	public:
-	    /**
-	     * Static Discovery mechanism
-	     * 
-	     * @param  TInt                 PSY UID
-	     * @return CLocPsyConfigUiReg*  Registration Info
-	     */
-		static CLocPsyConfigUiReg* DiscoverLC( const TInt PsyUid );
-	};
-
-#endif // LOCPSYCONFIGCLIENTWRAPPER_H_
--- a/locationsystemui/locationsysui/locpsysettings/locpsysettingseng/inc/locpsyeng.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,97 +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 header file for engine class of Location position settings
-*
-*/
-
-
-#ifndef CLOCPSYENG_H_
-#define CLOCPSYENG_H_
-
-//  INCLUDES
-#include <e32base.h>
-
-// FORWARD DECLARATION
-
-class CLocPsySettings;
-class MLocPsySettings;
-
-/**
-* Enumerations for model creation
-*/
-enum TLocModelType
-    {
-    ELocPsySettings, 
-    };
-
-// CLASS DECLARATION
-/**
- *  Implements entry point class to LocEng.dll
- *
- *  @lib locpsysettingseng.dll
- *  @since 3.1
- */
-class CLocPsyEng : public CBase
-    {
-    private:
-       /**
-        * C++ default constructor.
-        */
-        CLocPsyEng();
-        
-    public:
-       /**
-        * Two-phased constructor.
-        *
-        * @return CLocPsyEng object.
-        */
-        IMPORT_C static CLocPsyEng* NewL();
-        
-       /**
-        * Destructor.
-        */
-        IMPORT_C virtual ~CLocPsyEng();
-    
-    public: 
-       /**
-        * Settings model getter.
-        * Model is NOT created if it does not exist.
-        * Ownership not transferred.
-        * @return pointer to the settings model
-        */
-        IMPORT_C MLocPsySettings* SettingsModel();
-        /**
-        * Model creator.
-        * This method creates and initializes models.
-        * Model creation method is used if no separate 
-        * handle to model needed. 
-        * @param aModel model identificator.
-        */
-        IMPORT_C void CreateModelL( TLocModelType aModel );
-
-        /**
-        * Engine can contain multiple models.
-        * With help of this function certain model can be deleted.
-        * @param aModelType Model type to be deleted
-        */
-        IMPORT_C void RemoveModel(TLocModelType aModelType );
-                       
-    private:    // data
-        // OWn: Settings model
-        CLocPsySettings* iSettings; 
-    };
-
-#endif // CLOCPSYENG_H_
-
-// End of File
--- a/locationsystemui/locationsysui/locpsysettings/locpsysettingseng/inc/locpsyengdebug.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,70 +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 debug macros.
-*
-*/
-
-
-#ifndef LOCPSYENGDEBUG_H 
-#define LOCPSYENGDEBUG_H
-
-// INCLUDES
-#include <e32std.h>
-#include "locpsyengdebugconfig.hrh"
-
-// MACROS
-
-/**
-* Contains debug macros. By using component specific debug macros unnecessary 
-* calls to LocUtils.dll can be avoided.
-*/
-
-#ifdef LOC_ENABLE_DEBUG_PRINT
-#define LOCENGDEBUG(TEXT) DEBUG(TEXT);
-#define LOCENGDEBUG1(TEXT, ARG1) LOC(TEXT, ARG1);
-#define LOCENGDEBUG2(TEXT, ARG1, ARG2) LOC2(TEXT, ARG1, ARG2);
-#define LOCENGDEBUG3(TEXT, ARG1, ARG2, ARG3) LOC3(TEXT, ARG1, ARG2, ARG3);
-
-// MACROS
-#define DEBUG(TEXT) 				 { \
-									  _LIT( KText, #TEXT ); \
-									  Debug(KText); \
-									 }
-									 
-#define LOC(TEXT, ARG1) 			 { \
-									  _LIT( KText, #TEXT ); \
-									  Debug( KText, (ARG1) ); \
-									 }
-									 
-#define LOC2(TEXT, ARG1, ARG2) 		 { \
-									  _LIT( KText, #TEXT );\
-									  Debug( KText, (ARG1), (ARG2) );\
-									 }
-									 
-#define LOC3(TEXT, ARG1, ARG2, ARG3) { \
-									  _LIT( KText, #TEXT );  \
-									  Debug( KText, (ARG1), (ARG2), (ARG3) ); \
-									 }
-
-
-#else
-#define LOCENGDEBUG(TEXT);
-#define LOCENGDEBUG1(TEXT, ARG1);
-#define LOCENGDEBUG2(TEXT, ARG1, ARG2);
-#define LOCENGDEBUG3(TEXT, ARG1, ARG2, ARG3);
-#endif
-
-IMPORT_C void Debug( TRefByValue<const TDesC> aText, ...);
-
-#endif // LOCPSYENGDEBUG_H
--- a/locationsystemui/locationsysui/locpsysettings/locpsysettingseng/inc/locpsyengdebugconfig.hrh	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +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:  Build time debug configuration 
-*
-*/
-
-
-#ifndef LOCPSYENGDEBUGCONFIG_HRH_
-#define LOCPSYENGDEBUGCONFIG_HRH_
-
-//  INCLUDES
-
-// Flags for development:
-
-
-// Defined LOC_ENABLE_DEBUG_PRINT flag enables debug prints to a file.
-//#define LOC_ENABLE_DEBUG_PRINT
-
-#endif // LOCPSYENGDEBUGCONFIG_HRH_
-
-// End of File
--- a/locationsystemui/locationsysui/locpsysettings/locpsysettingseng/inc/locpsyengobserver.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,49 +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:  Provides an observer interface to location application engine.
-*
-*/
-
-
-
-#ifndef MLOCPSYENGOBSERVER_H_
-#define MLOCPSYENGOBSERVER_H_
-
-// CLASS DECLARATIONS
-/**
-*  Engine provides this API only for location application.
-*  Via this interface engine observers are notified about a new event. 
-*
-*  @lib locpsysettingseng.lib
-*  @since 3.1
-*/
-class MLocPsyEngObserver
-    {
-    public: // New functions
-        /**
-        * Notifies the engine observer about occured event.
-        * Engine observer has to update its data when this function is called.
-        */
-        virtual void NotifyL() = 0;
-
-        /**
-        * Called if occured event causes a leave in previous NotifyL method.
-        * @param aErrorCode Occured general errorcode.
-        */
-        virtual void NotifyError( TInt aErrorCode ) = 0;
-    };
-
-#endif      // MLOCPSYENGOBSERVER_H_
-            
-// End of File
--- a/locationsystemui/locationsysui/locpsysettings/locpsysettingseng/inc/locpsyinfo.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,82 +0,0 @@
-/*
-* Copyright (c) 2002,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:  Location Psy info class.
-*
-*/
-
-
-
-#ifndef CLOCPSYINFO_H__
-#define CLOCPSYINFO_H__
-
-//  INCLUDES
-#include <e32std.h>
-#include <lbscommon.h>
-
-// CLASS DECLARATION
-
-/**
-* Location Psy info class.
-* A data container class which holds information about psy name and id.
-*/
-class CLocPsyInfo: public CBase
-    {
-    public: // interface
-        /**
-        * Returns the Location Psy id of this PSY module.
-        */
-        IMPORT_C TPositionModuleId PsyId() const;
-
-        /**
-         * Returns the name of psy module.
-         */
-        IMPORT_C const TDesC& PsyName() const;
-        
-        /**
-        * C++ default constructor.
-        */
-        CLocPsyInfo();
-
-        /**
-        * Destructor.
-        */        
-        virtual ~CLocPsyInfo();
-	
-	public: // Non-exported functions
-		/**
-		 * Set the PsyId
-		 */
-		void SetPsyId(const TPositionModuleId& aPsyId);
-
-		/**
-		 * Set the Psy Name
-		 */
-		void SetPsyNameL(const TDesC& aBuf);
-        
-    private:  // Unimplemented functions
-        /// Private, unimplemented copy constructor
-        CLocPsyInfo(const CLocPsyInfo&);
-        /// Private, unimplemented assignment operator
-        CLocPsyInfo& operator=(const CLocPsyInfo&);
-
-    public: // data members
-        // Own: unique psy id
-        TPositionModuleId iPsyId;
-        // Own: PSY name
-        HBufC* iPsyName;        
-    };
-
-#endif      // CLOCPSYINFO_H__
-            
-// End of File
--- a/locationsystemui/locationsysui/locpsysettings/locpsysettingseng/inc/locpsysenguid.hrh	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +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:  Contains the UID3 value to be used for the Positioning Method Settings UI
-*				 Engine
-*
-*/
-
-#ifndef LOCPSYUIENGUID_HRH_
-#define LOCPSYUIENGUID_HRH_
-
-// Positioning Method Settings Engine UID 3
-#define LOCPSYSETTINGSENG_UID3          0x101F84EF
-
-#endif      // LOCPSYUIENGUID_HRH_
-
-// End of File
-
-
--- a/locationsystemui/locationsysui/locpsysettings/locpsysettingseng/inc/locpsysettings.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,176 +0,0 @@
-/*
-* Copyright (c) 2002,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:  Implementes settings extension API
-*
-*/
-
-
-
-#ifndef CLOCPSYSETTINGS_H__
-#define CLOCPSYSETTINGS_H__
-
-//  INCLUDES
-#include <e32base.h>
-#include <lbs/epos_mposmodulesobserver.h> 
-#include <lbs/epos_cposmoduleidlist.h>
-
-#include "locpsyinfo.h"
-#include "locpsysettingsinterface.h"
-
-/// FORWARD DECLARATION
-class CPosModules;
-class CPosModuleIdList;
-class MLocPsyEngObserver;
-class CLocPsyConfigUiServiceClientImpl;
-
-// CLASS DECLARATION
-
-/**
-*  An location engine API for location application.
-*  Provides access to location settings.
-*  @lib loceng.lib
-*  @since 2.1
-*/
-class CLocPsySettings : public CBase, 
-                        public MLocPsySettings, 
-						public MPosModulesObserver
-    {
-    private:
-        /**
-        * C++ default constructor.
-        */
-        CLocPsySettings();
-        
-    public:
-        /**
-        * Two-phased constructor.
-        */
-        static CLocPsySettings* NewL();
-
-        /**
-        * Destructor.
-        */
-        virtual ~CLocPsySettings();
-
-    private:
-        /**
-        * By default Symbian 2nd phase constructor is private.
-        */
-        void ConstructL();
-
-    public:
-        /**
-         * Accessor function for obtaining the number of PSYs
-         * 
-         * @return TInt Number of PSYs
-         */    
-        inline TInt PSYCount();
-        
-        /**
-         * Accessor function for obtaining the PSY information
-         * 
-         * @return CLocPsyInfo* PSY information
-         */         
-        CLocPsyInfo* GetPsyL( TInt aIndex );
-        
-        /**
-         * Enable a particular PSY
-         * 
-         * @param TInt Index of the PSY
-         */          
-		void EnablePsyL( TInt aIndex );
-		
-        /**
-         * Disable a particular PSY
-         * 
-         * @param TInt Index of the PSY
-         */ 		
-		void DisablePsyL( TInt aIndex );
-		
-        /**
-         * Launch the configuration UI for a particular PSY
-         * 
-         * @param TInt Index of the PSY
-         */ 		
-		void ConfigurePsyL( TInt                        aIndex,
-		                    MAknServerAppExitObserver&  aObserver );
-		    
-        /**
-         * Accessor function to determine whether the PSY is enabled
-         * 
-         * @param  TInt     Index of the PSY
-         * @return TBool    Boolean value to indicate whether the PSY 
-         *                  has been enabled / disabled
-         */ 		                    
-		TBool IsPsyEnabled( TInt aIndex );
-	
-        /**
-         * Accessor function to determine whether the PSY is configurable
-         * 
-         * @param  TInt     Index of the PSY
-         * @return TBool    Boolean value to indicate whether the PSY 
-         *                  can be configured
-         */		
-		TBool IsPsyConfigurable( TInt aIndex );
-		
-        /**
-         * Close the launched configuration
-         *
-         */ 		
-		void ClosePsyConfigurationApp();
-	
-        /**
-         * Accessor function for setting the PSY Settings UI Engine 
-         * Observer
-         * 
-         * @param aObserver Observer to the PSY Settings UI Engine
-         */ 		
-        void SetObserver(MLocPsyEngObserver& aObserver);
-        
-        /**
-         * Accessor function for removing the PSY Settings UI Engine 
-         * Observer
-         *
-         */        
-        void RemoveModelObserver();
-
-    public:
-        /**
-         * MPosModulesObserver
-         */
-        virtual void HandleSettingsChangeL(TPosModulesEvent aEvent);
-		
-    private:
-        /// Own: Pointer to modules db
-        CPosModules* iModuleDb;
-        /// Own: Pointer to modules id list
-        CPosModuleIdList* iPsyList;
-        /// Own: psy info
-        CLocPsyInfo* iPsy;
-        /// Ref: Observer interface to location application engine
-        MLocPsyEngObserver* iObserver;
-        /// Own: Handle to the PSY configuration UI application. 
-        ///      Used to close the configuration application if the PSY in uninstalled.
-        CLocPsyConfigUiServiceClientImpl* iServClient;
-    };
-
-TInt CLocPsySettings::PSYCount()
-    {
-    return iPsyList->Count();
-    }
-
-
-#endif      // __CLOCPSYSETTINGS_H__   
-            
-// End of File
--- a/locationsystemui/locationsysui/locpsysettings/locpsysettingseng/inc/locpsysettingsengconsts.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,31 +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: 
-*     Contains common constants
-*
-*/
-
-
-#ifndef LOCPSYSETTINGSENGCONSTS_H_
-#define LOCPSYSETTINGSENGCONSTS_H_
-
-// CONSTANTS
-
-// maximum PSY name length
-// however, use safe descriptor manamegent methods
-const TInt KLocPsyMaxLen = 100;
-
-#endif // LOCPSYSETTINGSENGCONSTS_H_
-
-// End of File
--- a/locationsystemui/locationsysui/locpsysettings/locpsysettingseng/inc/locpsysettingsinterface.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,132 +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:  Location settings can be modified 
-*                and read with help of this API.
-*
-*/
-
-
-
-#ifndef MLOCPSYSETTINGS_H_
-#define MLOCPSYSETTINGS_H_
-
-// INCLUDES
-#include <lbscommon.h> // TPositionModuleId
-
-// FORWARD DECLARATIONS
-class MLocPsyEngObserver;
-class CLocPsyInfo;
-class MAknServerAppExitObserver;
-
-// CLASS DECLARATION
-
-/**
-*  This location application engine API is only used by location application.
-*  Location settings can be modified and read with help of this API.
-*
-*  @lib locpsysettingseng.lib
-*  @since 3.1
-*/
-class MLocPsySettings
-    {
-    public:  // Constructors and destructor
-        
-        /**
-        * Destructor.
-        */
-        virtual ~MLocPsySettings(){};
-
-    public: // New functions
-        /**
-        * Lists all PSYs
-        * @since 3.1
-        * @return number of PSYs
-        */
-        virtual TInt PSYCount() = 0;  
-
-        /**
-        * Get psy information
-        * @since 3.1
-        * @param aIndex 
-        * @return psy information
-        */
-        virtual CLocPsyInfo* GetPsyL(TInt aIndex ) = 0;  
-        
-        /**
-        * Enable psy
-        * @since 3.1
-        * @param psy
-        * @return nothing. Leaves on Error.
-        */
-        virtual void EnablePsyL( TInt aIndex ) = 0;
-
-        /**
-        * Disable psy
-        * @since 3.1
-        * @param psy
-        * @return nothing. Leaves on Error.
-        */
-        virtual void DisablePsyL( TInt aIndex ) = 0;
-
-
-        /**
-        * Start psy configuration UI
-        * @since 3.1
-        * @param aIndex 
-        * @return none
-        */
-		virtual void ConfigurePsyL(TInt aIndex, 
-								   MAknServerAppExitObserver& aObserver ) = 0;
-		
-        /**
-        * Close psy configuration UI
-        * @since 3.1
-        * @param none 
-        * @return none
-        */
-		virtual void ClosePsyConfigurationApp() = 0;
-
-        /**
-        * Get psy information
-        * @since 3.1
-        * @param aIndex 
-        * @return psy information
-        */
-        virtual TBool IsPsyConfigurable( TInt aIndex ) = 0;
-        
-        /**
-        * Get psy information
-        * @since 3.1
-        * @param aIndex 
-        * @return psy information
-        */
-        virtual TBool IsPsyEnabled( TInt aIndex ) = 0;
-
-        /**
-        * Sets settings observer
-        * @since 3.1
-        * @param aObserver A reference to observer
-        */
-        virtual void SetObserver(MLocPsyEngObserver& aObserver) = 0;
-
-        /**
-        * Removes settings observer        
-        * @since 3.1
-        */        
-        virtual void RemoveModelObserver() = 0;
-    };
-
-#endif      // MLOCPSYSETTINGS_H_ 
-            
-// End of File
--- a/locationsystemui/locationsysui/locpsysettings/locpsysettingseng/src/locpsyconfigclientimpl.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,98 +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:  PSY configuration UI application launching implementation.
-*
-*/
-
-
-// System Include
-#include <eikserverapp.h>
-
-// User Include
-#include "locpsyconfigclientwrapper.h"
-#include "locpsyconfigclientimpl.h"
-
-// -----------------------------------------------------------------------------
-// CLocPsyConfigUiServiceClientImpl::CLocPsyConfigUiServiceClientImpl
-// -----------------------------------------------------------------------------
-//
-CLocPsyConfigUiServiceClientImpl::CLocPsyConfigUiServiceClientImpl(
-                                                          CLocPsyConfigUiReg&        aRegInfo, 
-														  MAknServerAppExitObserver& aObserver )
-	:iObserver(&aObserver),iAppRegInfo(aRegInfo)
-	{
-	}
-
-// -----------------------------------------------------------------------------
-// CLocPsyConfigUiServiceClientImpl::~CLocPsyConfigUiServiceClientImpl
-// -----------------------------------------------------------------------------
-//
-CLocPsyConfigUiServiceClientImpl::~CLocPsyConfigUiServiceClientImpl()
-	{
-	if(iLaunchAppService)
-		{
-		delete iLaunchAppService;
-		}
-	}
-
-// -----------------------------------------------------------------------------
-// CLocPsyConfigUiServiceClient* CLocPsyConfigUiServiceClient::NewLC
-// -----------------------------------------------------------------------------
-//
-CLocPsyConfigUiServiceClient* CLocPsyConfigUiServiceClient::NewLC(
-	                                                      CLocPsyConfigUiReg&        aReg, 
-	                                                      MAknServerAppExitObserver& aObserver )
-	{
-	CLocPsyConfigUiServiceClientImpl* self = 
-						new(ELeave) CLocPsyConfigUiServiceClientImpl( aReg, aObserver );
-	CleanupStack::PushL(self);
-	// No second phase construction
-	return self;
-	}
-
-// -----------------------------------------------------------------------------
-// CLocPsyConfigUiServiceClientImpl::StartServerL
-// -----------------------------------------------------------------------------
-//
-void CLocPsyConfigUiServiceClientImpl::StartServerL()
-	{
-	iLaunchAppService = CAknLaunchAppService::NewL( iAppRegInfo.AppUid(), iObserver, NULL );
-	}
-
-// -----------------------------------------------------------------------------
-// CLocPsyConfigUiServiceClientImpl::AppUid
-// -----------------------------------------------------------------------------
-//
-TInt CLocPsyConfigUiServiceClientImpl::PsyId()
-	{
-	return iAppRegInfo.RegId();
-	}
-
-// -----------------------------------------------------------------------------
-// CLocPsyConfigUiServiceClient::AppUid
-// -----------------------------------------------------------------------------
-//	
-TUid CLocPsyConfigUiServiceClientImpl::AppUid()
-	{
-	return iAppRegInfo.AppUid();
-	}
-
-// -----------------------------------------------------------------------------
-// CLocPsyConfigUiServiceClientImpl::CloseServe
-// -----------------------------------------------------------------------------
-//	
-void CLocPsyConfigUiServiceClientImpl::CloseServer( TInt reason )
-	{
-	iObserver->HandleServerAppExit(reason);
-	}
--- a/locationsystemui/locationsysui/locpsysettings/locpsysettingseng/src/locpsyconfigclientwrapper.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,138 +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:  PSY Configuration UI launching helper class implementations.
- *
-*/
-
- 
-// System Include
-#include <apgcli.h>
-#ifndef SYMBIAN_ENABLE_SPLIT_HEADERS
-#include <apaid.h>
-#else
-#include <apaid.h>
-#include <apaidpartner.h>
-#endif
-#include <barsread2.h>
-#include <LocPsyConfigUiUID.hrh>
-
-// User Include
-#include "locpsyconfigclientwrapper.h"
-
-// -----------------------------------------------------------------------------
-// CLocPsyConfigUiReg::CLocPsyConfigUiReg
-// -----------------------------------------------------------------------------
-//
-CLocPsyConfigUiReg::CLocPsyConfigUiReg()
-{
-}
-
-// -----------------------------------------------------------------------------
-// CLocPsyConfigUiReg::NewL
-// -----------------------------------------------------------------------------
-//
-CLocPsyConfigUiReg* CLocPsyConfigUiReg::NewL( TUid aApp, const TDesC8& aResource )
-	{
-	CLocPsyConfigUiReg* reg = new(ELeave) CLocPsyConfigUiReg;
-	CleanupStack::PushL(reg);
-	reg->ConstructL( aApp, aResource );
-	CleanupStack::Pop(reg);
-	return reg;
-	}
-
-// -----------------------------------------------------------------------------
-// CLocPsyConfigUiReg::ConstructL
-// -----------------------------------------------------------------------------
-//	
-void CLocPsyConfigUiReg::ConstructL( TUid aApp, const TDesC8& aResource )
-	{
-	iAppUid = aApp;
-	RResourceReader r;
-	r.OpenLC(aResource);
-	iRegId = r.ReadInt32L();					// read psy_uid
-	CleanupStack::PopAndDestroy(&r);
-	}
-
-// -----------------------------------------------------------------------------
-// CLocPsyConfigUiReg::AppUid
-// -----------------------------------------------------------------------------
-//
-TUid CLocPsyConfigUiReg::AppUid()
-	{
-	return iAppUid;
-	}
-
-// -----------------------------------------------------------------------------
-// CLocPsyConfigUiReg::RegId
-// -----------------------------------------------------------------------------
-//	
-TInt CLocPsyConfigUiReg::RegId()
-	{
-	return iRegId;
-	}
-
-// -----------------------------------------------------------------------------
-// CLocPsyConfigUiServiceClient::DiscoverLC
-// -----------------------------------------------------------------------------
-//	
-CLocPsyConfigUiReg* CLocPsyConfigUiServiceClient::DiscoverLC( const TInt PsyUid )
-	{
-	// Get all of the implementations of the transform service
-	CLocPsyConfigUiReg* regInfo = NULL;
-	TInt error;
-	RApaLsSession ls;
-	User::LeaveIfError(ls.Connect());
-	CleanupClosePushL(ls);
-	CApaAppServiceInfoArray* services = NULL;
-	do
-		{
-		// If Error is EAppListInvalid then try again till you get the list.
-		// The services structure
-		TRAP(error, 
-				services = ls.GetServiceImplementationsLC(
-									TUid::Uid(KLocPsyConfigServiceUid));
-				CleanupStack::Pop(services););
-		} while (error == RApaLsSession::EAppListInvalid);
-	CleanupStack::PushL(services);
-	
-	// If there was an error then leave
-	User::LeaveIfError(error);
-
-	TArray< TApaAppServiceInfo > ServInfoArray = services->Array();
-	for (TInt i=0; i<ServInfoArray.Count() ; i++)
-		{
-		// This is under TRAP so that corrupt resources don't crash the 
-		// discovery procedure.
-		// The TRAP's return code is ignored intentionally
-		const TApaAppServiceInfo& appInfo = ServInfoArray[i];
-		TRAP(error, regInfo = 
-			CLocPsyConfigUiReg::NewL(appInfo.Uid(), appInfo.OpaqueData()););
-		if(	error == KErrNone && regInfo->RegId() == PsyUid )
-			{
-			// Found the correct PSY module so just break out of the loop
-			// and return the regInfo from outside the loop.
-			break;
-			}
-		else
-			{
-			delete regInfo;
-			regInfo = NULL;
-			}
-		}
-	
-	CleanupStack::PopAndDestroy(services);
-	CleanupStack::PopAndDestroy() ;// ls
-	CleanupStack::PushL(regInfo);
-	return regInfo;
-	}
--- a/locationsystemui/locationsysui/locpsysettings/locpsysettingseng/src/locpsyeng.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,134 +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: 
-*     Implements interface for Loc event
-*
-*/
-
-
-// INCLUDE FILES
-#include "locpsyeng.h"
-#include "locpsysettings.h"
-#include "locpsyengdebug.h"
-
-// CONSTANTS
-/// Unnamed namespace for local definitions
-#ifdef _DEBUG
-
-_LIT( KLocPanicText, "CLocPsyEng" );
-// LOCAL CONSTANTS AND MACROS
-enum TPanicCode
-    {
-    KLocErrModelTypeNotSupported = -70
-    };
-// ==================== LOCAL FUNCTIONS ====================
-
-void Panic(TPanicCode aReason)
-    {
-    User::Panic( KLocPanicText, aReason );
-    }
-#endif
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// CLocPsyEng::NewL
-// Two-phased constructor.
-// -----------------------------------------------------------------------------
-//
-EXPORT_C CLocPsyEng* CLocPsyEng::NewL()
-    {
-    CLocPsyEng* self = new (ELeave) CLocPsyEng();
-    // Nothing to do for the second stage construction.
-    return self;
-    }
-
-// -----------------------------------------------------------------------------
-// CLocPsyEng::CLocPsyEng
-// C++ default constructor can NOT contain any code, that
-// might leave.
-// -----------------------------------------------------------------------------
-//
-CLocPsyEng::CLocPsyEng() 
-    {
-    }
-
-// Destructor
-
-EXPORT_C CLocPsyEng::~CLocPsyEng()
-    {    
-    delete iSettings;
-    }
-
-// -----------------------------------------------------------------------------
-// CLocPsyEng::SettingsModel
-// Settings model getter.
-// -----------------------------------------------------------------------------
-//
-EXPORT_C MLocPsySettings* CLocPsyEng::SettingsModel()
-    {
-    return iSettings;
-    }
-
-// -----------------------------------------------------------------------------
-// CLocPsyEng::CreateModelL() 
-// Creates a given model type.
-// -----------------------------------------------------------------------------
-//
-EXPORT_C void CLocPsyEng::CreateModelL( TLocModelType aModel )
-    {
-    switch( aModel )
-        {
-        case ELocPsySettings:
-            {
-            if ( !iSettings )
-                {
-                iSettings = CLocPsySettings::NewL();
-                }
-            break;
-            }            
-        default:
-            {
-            // Not supported model type
-            __ASSERT_DEBUG(EFalse, Panic(KLocErrModelTypeNotSupported));
-            break;
-            }            
-        }
-    }
-
-// -----------------------------------------------------------------------------
-// CLocPsyEng::RemoveModel
-// Removes a given model type.
-// -----------------------------------------------------------------------------
-//
-EXPORT_C void CLocPsyEng::RemoveModel( TLocModelType aModelType )
-    {
-    switch ( aModelType )
-        {
-        case ELocPsySettings:
-            {
-            delete iSettings;
-            iSettings = NULL;
-            break;
-            }           
-        default:
-            {
-            // Not supported model type
-            __ASSERT_DEBUG(EFalse, Panic(KLocErrModelTypeNotSupported));
-            }
-            break;
-        }
-    }
-
-// End of File
--- a/locationsystemui/locationsysui/locpsysettings/locpsysettingseng/src/locpsyinfo.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,79 +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:  Location Psy info class.
-*
-*/
-
-
-
-// INCLUDE FILES
-#include    "locpsyinfo.h"
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// CLocPsyInfo::PsyId
-// -----------------------------------------------------------------------------
-//
-EXPORT_C TPositionModuleId CLocPsyInfo::PsyId() const 
-    { 
-    return iPsyId; 
-    }
-
-// -----------------------------------------------------------------------------
-// CLocPsyInfo::PsyName
-// -----------------------------------------------------------------------------
-//
-EXPORT_C const TDesC& CLocPsyInfo::PsyName() const 
-    { 
-    return *iPsyName; 
-    }
-
-// -----------------------------------------------------------------------------
-// CLocPsyInfo::SetPsyId
-// -----------------------------------------------------------------------------
-//
-void CLocPsyInfo::SetPsyId(const TPositionModuleId& aPsyId)
-	{
-	iPsyId = aPsyId;
-	}
-
-// -----------------------------------------------------------------------------
-// CLocPsyInfo::SetPsyNameL
-// -----------------------------------------------------------------------------
-//	
-void CLocPsyInfo::SetPsyNameL(const TDesC& aBuf)
-	{
-	delete iPsyName;
-    iPsyName = NULL;
-    iPsyName = aBuf.AllocL();
-	}
-
-// -----------------------------------------------------------------------------
-// CLocPsyInfo::CLocPsyInfo
-// -----------------------------------------------------------------------------
-//	
-CLocPsyInfo::CLocPsyInfo()
-    {    
-    }
-
-// -----------------------------------------------------------------------------
-// CLocPsyInfo::~CLocPsyInfo
-// -----------------------------------------------------------------------------
-//
-CLocPsyInfo::~CLocPsyInfo()
-    {
-    delete iPsyName;
-    }
-//  End of File  
--- a/locationsystemui/locationsysui/locpsysettings/locpsysettingseng/src/locpsysettings.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,271 +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:  Implementes settings extension API
-*
-*/
-
-
-// System Include
-#include <lbs/epos_cposmodules.h>
-#include <lbs/epos_cposmoduleidlist.h>
-#include <lbs/epos_cposmoduleupdate.h> // CPosModuleUpdate
-#include <lbs/epos_mposmodulesobserver.h> 
-
-// User Include
-#include "locpsysettings.h"
-#include "locpsyengdebug.h"
-#include "locpsyengobserver.h"
-#include "locpsyinfo.h" 
-#include "locpsysettingsengconsts.h"
-#include "locpsyconfigclientimpl.h"
-#include "locpsyconfigclientwrapper.h"
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// Factory function
-CLocPsySettings* CLocPsySettings::NewL()
-    {
-    CLocPsySettings* self = new( ELeave ) CLocPsySettings();
-    CleanupStack::PushL( self );
-    self->ConstructL();
-    CleanupStack::Pop(self);
-    return self;
-    }
-
-// -----------------------------------------------------------------------------
-// CLocPsySettings::CLocPsySettings
-// C++ default constructor can NOT contain any code, that
-// might leave.
-// -----------------------------------------------------------------------------
-//
-CLocPsySettings::CLocPsySettings()
-    {
-    }
-
-// -----------------------------------------------------------------------------
-// CLocPsySettings::ConstructL
-// Symbian 2nd phase constructor can leave.
-// -----------------------------------------------------------------------------
-//
-void CLocPsySettings::ConstructL()
-    {
-    iModuleDb = CPosModules::OpenL();
-    iPsyList = iModuleDb->ModuleIdListL();
-    iPsy = new (ELeave) CLocPsyInfo();
-
-    iModuleDb->SetObserverL( *this );
-    }
-
-// Destructor
-
-CLocPsySettings::~CLocPsySettings()
-    {
-    if ( iModuleDb )
-    	{
-    	iModuleDb->RemoveObserver();
-    	delete iModuleDb;
-    	}
-
-    delete iPsyList;
-    delete iPsy;
-    delete iServClient;
-    }
-
-// -----------------------------------------------------------------------------
-// CLocPsySettings::GetPsyL
-// -----------------------------------------------------------------------------
-//
-CLocPsyInfo* CLocPsySettings::GetPsyL( TInt aIndex )
-    {
-    TPositionModuleInfo moduleInfo;
-    // Sanity check of input parameter
-    if ( aIndex < 0 || aIndex >= iPsyList->Count())
-    	{
-    	// Invalid index values so Leave indicating bad argument
-    	User::Leave(KErrArgument);
-    	}
-    TPositionModuleId moduleId = iPsyList->At( aIndex );
-    iModuleDb->GetModuleInfoL( moduleId, moduleInfo);
-    iPsy->SetPsyId( moduleId );
-    TBuf<KLocPsyMaxLen>* buf=new (ELeave) TBuf<KLocPsyMaxLen>;
-    moduleInfo.GetModuleName( *buf );
-    CleanupStack::PushL( buf );
-    iPsy->SetPsyNameL( *buf );
-    CleanupStack::PopAndDestroy(buf);
-    return iPsy;
-    }
-
-// -----------------------------------------------------------------------------
-// CLocPsySettings::HandleSettingsChangeL
-// -----------------------------------------------------------------------------
-//
-void CLocPsySettings::HandleSettingsChangeL(TPosModulesEvent aEvent)
-    {
-	LOCENGDEBUG("CLocPsySettings::HandleSettingsChangeL called");
-    CPosModuleIdList* temp = iModuleDb->ModuleIdListL();
-    delete iPsyList;
-
-    iPsyList = temp;
-	LOCENGDEBUG3("CLocPsySettings::HandleSettingsChangeL event=%d psy=%d no of PSYs=%d",
-				aEvent.iType, aEvent.iModuleId, iPsyList->Count());
-				
-    if( aEvent.iType == EPosModulesEventModuleRemoved && iServClient &&
-    	aEvent.iModuleId == TUid::Uid(iServClient->PsyId()) )
-    	{
-		LOCENGDEBUG("Observer: PSY that is being configured is uninstalled");
-    	iServClient->CloseServer(KErrAbort);
-    	}
-    if(iObserver)
-    	{
-    	iObserver->NotifyL();
-    	}
-    }
-
-// -----------------------------------------------------------------------------
-// CLocPsySettings::EnablePsyL
-// -----------------------------------------------------------------------------
-//
-void CLocPsySettings::EnablePsyL( TInt aIndex )
-    {
-    CLocPsyInfo* psyInfo = GetPsyL(aIndex);
-    CPosModuleUpdate* posModuleUpdate = CPosModuleUpdate::NewLC();   
-    posModuleUpdate->SetUpdateAvailability( ETrue );
-    iModuleDb->UpdateModuleL( psyInfo->PsyId(), *posModuleUpdate );
-	LOCENGDEBUG2("CLocPsySettings::EnablePsyL: PSY %d index %d",
-				psyInfo->PsyId(), aIndex);
-    CleanupStack::PopAndDestroy(posModuleUpdate);
-    }
-
-// -----------------------------------------------------------------------------
-// CLocPsySettings::DisablePsyL
-// -----------------------------------------------------------------------------
-//
-void CLocPsySettings::DisablePsyL( TInt aIndex )
-    {
-    CLocPsyInfo* psyInfo = GetPsyL(aIndex);
-    CPosModuleUpdate* posModuleUpdate = CPosModuleUpdate::NewLC();   
-    posModuleUpdate->SetUpdateAvailability( EFalse );
-    iModuleDb->UpdateModuleL( psyInfo->PsyId(), *posModuleUpdate );
-	LOCENGDEBUG2("CLocPsySettings::DisablePsyL: PSY %d index %d",
-				psyInfo->PsyId(), aIndex);
-    CleanupStack::PopAndDestroy(posModuleUpdate);
-    }
-
-// -----------------------------------------------------------------------------
-// CLocPsySettings::ConfigurePsyL
-// -----------------------------------------------------------------------------
-//
-void CLocPsySettings::ConfigurePsyL(TInt aIndex, 
-									MAknServerAppExitObserver& aObserver)
-	{
-	CLocPsyConfigUiReg* reg = NULL;
-	TRAPD(error, GetPsyL( aIndex );
-    		reg = CLocPsyConfigUiServiceClientImpl::DiscoverLC(
-    							iPsy->PsyId().iUid);
-    		CleanupStack::Pop(reg););
-	// If GetModuleInfoL is not supported it returns KErrNotSupported
-	// If DiscoverLC fails it returns KErrNotFound or KErrNoMemory
-	if ( error == KErrNone && reg )
-		{
-		CleanupStack::PushL( reg );
-		LOCENGDEBUG2("CLocPsySettings::ConfigurePsyL: PSY %d index %d",
-					iPsy->PsyId(), aIndex);
-		iServClient = static_cast<CLocPsyConfigUiServiceClientImpl*>
-		 		(CLocPsyConfigUiServiceClientImpl::NewLC(*reg, aObserver));
-		CleanupStack::Pop(iServClient);		 		
-		iServClient->StartServerL();
-		CleanupStack::PopAndDestroy( reg );
-		}
-	}
-
-// -----------------------------------------------------------------------------
-// CLocPsySettings::ClosePsyConfigurationApp
-// -----------------------------------------------------------------------------
-//
-void CLocPsySettings::ClosePsyConfigurationApp()
-	{
-	delete iServClient;
-	iServClient = NULL;
-	}
-	
-// -----------------------------------------------------------------------------
-// CLocSettings::IsPsyEnabled
-// -----------------------------------------------------------------------------
-//
-TBool CLocPsySettings::IsPsyEnabled( TInt aIndex )
-	{
-    TPositionModuleInfo moduleInfo;
-    // Sanity check of input parameter
-    if (aIndex < 0 || aIndex >= iPsyList->Count() )
-    	{
-    	// Invalid index values so just return False
-    	return EFalse;
-    	}
-    TPositionModuleId moduleId = iPsyList->At( aIndex );
-    TRAPD(error, iModuleDb->GetModuleInfoL( moduleId, moduleInfo););
-    // If GetModuleInfoL returns KErrNotSupported we return EFalse
-    if(error == KErrNone ) 
-    	{
-    	return moduleInfo.IsAvailable();
-    	}
-    else
-    	{
-    	return EFalse;	
-    	}
-	}
-
-
-// -----------------------------------------------------------------------------
-// CLocSettings::IsPsyConfigurable
-// -----------------------------------------------------------------------------
-//
-TBool CLocPsySettings::IsPsyConfigurable( TInt aIndex )
-	{
-	CLocPsyConfigUiReg* reg = NULL;
-    TRAPD(error, GetPsyL( aIndex );
-    		reg = CLocPsyConfigUiServiceClientImpl::DiscoverLC(
-    							iPsy->PsyId().iUid);
-    		CleanupStack::Pop(reg););	
-	// If GetModuleInfoL is not supported it returns KErrNotSupported
-	// If DiscoverLC fails it returns KErrNotFound or KErrNoMemory
-	if (error == KErrNone && reg )
-		{
-		delete reg;
-		return ETrue;
-		}
-	else
-		{
-		return EFalse;
-		}
-	}
-
-// -----------------------------------------------------------------------------
-// CLocSettings::SetObserver
-// -----------------------------------------------------------------------------
-//
-void CLocPsySettings::SetObserver( MLocPsyEngObserver& aObserver )
-    {
-    iObserver = &aObserver;
-    }
-
-// -----------------------------------------------------------------------------
-// CLocSettings::RemoveModelObserver
-// -----------------------------------------------------------------------------
-//
-void CLocPsySettings::RemoveModelObserver()
-    {
-    iObserver = NULL;
-    }
-
-//  End of File  
--- a/locationsystemui/locationsysui/locpsysettings/locpsysettingseng/src/locpsysettingsengdebug.cpp	Mon May 03 12:54:42 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 debugging functions
-*
-*/
-
-
-
-// INCLUDE FILES
-#include "locpsyengdebug.h"
-#include <flogger.h>
-#include <e32svr.h>
-// CONSTANTS
-
-/// Folder where the log resides
-_LIT( KLocLogFolder, "LocationSysUI" );
-
-/// The name of the log file
-_LIT( KLocLogFileName, "LocationsysUI" );
-
-/// The format in which the time is formatted in log
-_LIT( KLocLogTimeFormat, "%02d.%02d:%02d:%06d ");
-
-/// The length of the string produced by KLocLogTimeFormat
-const TInt KLocLogTimeFormatLength = 16;
-
-/// How many characters a log line can contain
-const TInt KLocLogLineLength = 256;
-
-// ========================== OTHER EXPORTED FUNCTIONS =========================
-
-
-// -----------------------------------------------------------------------------
-// Debug
-// Generates a log file if c:\logs\locationsysui\ folder exists
-// -----------------------------------------------------------------------------
-//
-EXPORT_C void Debug( TRefByValue<const TDesC> aText, ... )
-    {    
-    VA_LIST args;
-    VA_START( args, aText );
-    
-    TBuf<KLocLogLineLength> buf;
-    buf.FormatList( aText, args );
-
-    #ifdef _DEBUG
-    RDebug::Print(buf);
-    #endif
-
-    RFileLogger logger;
-    
-    TInt ret=logger.Connect();
-    if (ret==KErrNone)
-        {
-        logger.SetDateAndTime( EFalse,EFalse );
-        logger.CreateLog( KLocLogFolder, KLocLogFileName, EFileLoggingModeAppend );       
-        TBuf<KLocLogTimeFormatLength> timeStamp;
-        TTime now;
-        now.HomeTime();
-        TDateTime dateTime;
-        dateTime = now.DateTime();
-        timeStamp.Format( KLocLogTimeFormat, 
-            dateTime.Hour(), dateTime.Minute(),
-            dateTime.Second(), dateTime.MicroSecond() );
-        buf.Insert( 0, timeStamp );
-
-        logger.Write(buf);
-        }
-
-    logger.Close();
-
-    VA_END( args );
-    }
-
-//  End of File  
--- a/locationsystemui/locationsysui/locpsysettings/locpsysettingseng/src/locpsysettingsengdebugdummy.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,31 +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 dummy implementation for debugging function
-*
-*/
-
-
-#include "locpsyengdebug.h"
-
-// ========================== OTHER EXPORTED FUNCTIONS =========================
-
-// -----------------------------------------------------------------------------
-// Debug
-// -----------------------------------------------------------------------------
-//
-EXPORT_C void Debug( TRefByValue<const TDesC> /*aText*/, ... )
-  {
-  }
-
-//  End of File  
--- a/locationsystemui/locationsysui/locpsysettings/locpsysettingsui/data/10275062.rss	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,58 +0,0 @@
-/*
-* Copyright (c) 1027 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:  ECOM plugin resource file for Positioning Method Settings UI
-*				  plugin.
-*
-*
-*/
-
-#include <ecom/registryinfo.rh>
-#include "locpsysettingsuiuid.hrh"
-
-#define PLUGINDISPLAYNAME "POSTIONINGMETHODS"
-/**
-* How to use the resource definition:
-*
-* IMPLEMENTATION_INFO
-*	{
-*	implementation_uid  = <Your implementation UID here>;
-*	version_no          = 1;
-*	display_name        = "<Your plugin name here>";
-*	default_data        = "";
-*	opaque_data         = "";
-*	}
-*/
-RESOURCE REGISTRY_INFO theInfo
-	{
-	dll_uid     = LOCPSYSETTINGSUI_UID3;
-	interfaces  = 
-		{
-		INTERFACE_INFO
-			{
-			interface_uid   = 0x10275061; // Don't Change
-			implementations = 
-				{
-				IMPLEMENTATION_INFO
-					{
-					implementation_uid  = LOCPSYSETTINGSUI_UID3;
-					version_no          = 1;
-					display_name        = PLUGINDISPLAYNAME;
-					default_data        = "";
-					opaque_data         = "";					
-					}
-				};
-			}
-		};
-	}
-
--- a/locationsystemui/locationsysui/locpsysettings/locpsysettingsui/data/locpsysettingsuiview.rss	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,329 +0,0 @@
-/*
-* Copyright (c) 2002,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:  Contains all the resource definitions for the Positioning
-*		     Method Settings UI
-*
-*/
-
-
-//  RESOURCE IDENTIFIER
-
-NAME    LPSY // 4 Letter Identifier
-
-//  INCLUDES
-
-#include    <data_caging_paths_strings.hrh>
-#include    <bldvariant.hrh>
-#include    <avkon.rh>
-#include    <avkon.rsg>
-#include    <avkon.mbg>
-#include    <EIKCORE.rsg>
-#include    <eikon.rh>
-#include    <eikon.rsg>
-#include    <avkon.loc>
-#include 		<location.loc>
-#include 	"locpsysettingsui.hrh"
-
-//  RESOURCE DEFINITIONS 
-
-RESOURCE RSS_SIGNATURE 
-	{
-	}
-	
-//----------------------------------------------------
-// r_possettingsui_caption
-// 
-// Caption for Positioning Method Settings
-//----------------------------------------------------
-//
-RESOURCE TBUF r_possettingsui_caption
-    {
-    buf = qtn_loc_settings_psys;
-    }
-    
-
-//------------------------------------------------------------------------------
-//   
-//    LOCATION_INTARRAY
-//    Items array
-//
-//------------------------------------------------------------------------------
-//
-STRUCT LOCATION_INTARRAY
-    {
-    LONG items[];
-    }
-
-
-//------------------------------------------------------------------------------
-//   
-//    r_location_hotkeys
-//    Hot keys.
-//
-//------------------------------------------------------------------------------
-//
-RESOURCE HOTKEYS r_location_hotkeys
-    {
-    control=
-        {
-        // None
-        };
-    }
-
-
-//------------------------------------------------------------------------------
-//   
-//    r_location_home_view
-//    Home view
-//
-//------------------------------------------------------------------------------
-//
-RESOURCE AVKON_VIEW r_location_home_view
-    {    
-    menubar=r_location_menubar_home_view;
-    cba=r_location_options_selection_back;
-    }
-    
-//----------------------------------------------------
-//   
-//    r_location_options_selection_back
-//    CBA for PSY Settings UI view.
-//
-//----------------------------------------------------
-//   
-RESOURCE CBA r_location_options_selection_back
-    {
-    flags = 0;
-    buttons = 
-        {
-        CBA_BUTTON 
-            {
-            id = EAknSoftkeyOptions; 
-            txt = text_softkey_option;
-            },
-        CBA_BUTTON 
-            {
-            id = EAknSoftkeyBack; 
-            txt = text_softkey_back;
-            },
-        CBA_BUTTON
-            {
-            id = EAknSoftkeyContextOptions; 
-            txt = text_softkey_option;
-            }
-        };
-    }
-    
-//----------------------------------------------------
-//   
-//    r_location_options_empty_back
-//    CBA for PSY Settings UI view.
-//
-//----------------------------------------------------
-//
-RESOURCE CBA r_location_options_empty_back
-    {
-    flags = 0;
-    buttons = 
-        {
-        CBA_BUTTON 
-            {
-            id = EAknSoftkeyOptions; 
-            txt = text_softkey_option;
-            },
-        CBA_BUTTON 
-            {
-            id = EAknSoftkeyBack; 
-            txt = text_softkey_back;
-            },
-        CBA_BUTTON
-            {
-            id = ELocCmdNone;
-            }
-        };
-    }
-
-//------------------------------------------------------------------------------
-//   
-//    r_location_menubar_home_view
-//    Menu bar of home view
-//
-//------------------------------------------------------------------------------
-//
-RESOURCE MENU_BAR r_location_menubar_home_view
-    {
-    titles=
-        {
-        MENU_TITLE { menu_pane=r_location_app_menu; txt=""; },
-        MENU_TITLE { menu_pane=r_location_home_view_menu; txt=""; }
-        };
-    }
-
-//------------------------------------------------------------------------------
-//   
-//    r_location_context_menubar
-//    Context specific menu bar inhome view
-//
-//------------------------------------------------------------------------------
-//
-RESOURCE MENU_BAR r_location_context_menubar_home_view
-    {
-    titles =
-        {
-        MENU_TITLE { menu_pane=r_location_home_view_menu; txt=""; }
-        };
-    }
-
-//------------------------------------------------------------------------------
-//   
-//    r_location_home_view_menu
-//    Home view menu
-//
-//------------------------------------------------------------------------------
-//
-RESOURCE MENU_PANE r_location_home_view_menu
-    {
-    items=
-        {
-        MENU_ITEM { command=ELocCmdEnablePsy; txt = qtn_loc_opt_enable_psy;flags = EEikMenuItemAction; },
-        MENU_ITEM { command=ELocCmdDisablePsy; txt = qtn_loc_opt_disable_psy;flags = EEikMenuItemAction; },
-        MENU_ITEM { command=ELocCmdConfigurePsy; txt = qtn_loc_opt_method_settings;flags = EEikMenuItemAction; }
-        };
-    }
-
-//------------------------------------------------------------------------------
-//   
-//    r_loc_psy_methods_list_empty
-//    Empty positioning methods listbox text
-//
-//------------------------------------------------------------------------------
-//
-RESOURCE TBUF r_loc_psy_methods_list_empty
-    {
-    buf=qtn_loc_no_psys;
-    }
-
-//------------------------------------------------------------------------------
-//   
-//    r_location_app_menu
-//    Location application menu
-//
-//------------------------------------------------------------------------------
-//
-RESOURCE MENU_PANE r_location_app_menu
-    {
-    items=
-        {
-        MENU_ITEM 
-            {            
-            command = EAknCmdHelp;
-            txt = qtn_options_help; 
-            },
-        MENU_ITEM 
-           { 
-           // Exit option should use 'EEikCmdExit' instead of 'EEAknCmdExit'
-           // This is to ensure that the Exit command is not handled by the 
-           // ProcessCommandL of CAknView and is transferred to 
-           // CAknViewAppUi::HandleCommandL. This behaviour is necessary 
-           // for proper handling of the Exit command from an App Server's 
-           // perspective.
-           command = EEikCmdExit; 
-           txt = qtn_options_exit;
-           }
-        };
-    }
-    
-//------------------------------------------------------------------------------
-//   
-//    r_loc_main_title
-//    Title for application's main view (Positioning methods view)
-//
-//------------------------------------------------------------------------------
-//
-RESOURCE TBUF r_loc_main_title
-    {
-    buf = qtn_loc_psy_title;
-    }
-
-//------------------------------------------------------------------------------
-//   
-//    r_location_psy_listbox
-//    Listbox resource for application's main view (Positioning methods view)
-//
-//------------------------------------------------------------------------------
-//
-RESOURCE LISTBOX r_location_psy_listbox
-	{
-    flags = EAknListBoxSelectionList;
-	}
-
-//----------------------------------------------------
-//   
-//    r_psyquery_softkeys_yes_yes_no
-//    CBA for PSY Settings confirmation query.
-//
-//----------------------------------------------------
-//   
-RESOURCE CBA r_psyquery_softkeys_yes_yes_no
-    {
-    flags = 0;
-    buttons = 
-        {
-        CBA_BUTTON 
-            {
-            id = EAknSoftkeyYes; 
-            txt = text_softkey_yes;
-            },
-        CBA_BUTTON
-            {
-            id = EAknSoftkeyNo; 
-            txt = text_softkey_no;
-            },
-       CBA_BUTTON 
-            {
-            id = EAknSoftkeyYes; 
-            txt = text_softkey_yes;
-            }
-        };
-    }
-
-//----------------------------------------------------
-//   
-//    r_psydisable_config_query
-//    Confirmation Query prompt for PSY disabling
-//
-//----------------------------------------------------
-//
-RESOURCE DIALOG r_psydisable_config_query
-	{
-	flags = EAknGeneralQueryFlags;
-	buttons = r_psyquery_softkeys_yes_yes_no;
-	items =
-		{
-		DLG_LINE
-			{
-			type = EAknCtQuery;
-			id = EGeneralQuery;
-			control = AVKON_CONFIRMATION_QUERY
-				{
-				layout = EConfirmationQueryLayout;
-				label = qtn_loc_query_psy_used;
-				};
-			}
-		};
-	}
-	
-// End of File
-
-
--- a/locationsystemui/locationsysui/locpsysettings/locpsysettingsui/group/bld.inf	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,37 +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 provides the information required for building 
-*                Example Plugin.
-*                
-*
-*/
-
-
-PRJ_PLATFORMS
-DEFAULT
-
-PRJ_EXPORTS
-
-PRJ_MMPFILES
-locpsysettingsui.mmp   
-
-PRJ_TESTMMPFILES
-
-PRJ_EXTENSIONS
-START EXTENSION s60/mifconv
-OPTION TARGETFILE locpsysettings.mif
-OPTION HEADERFILE locpsysettings.mbg
-OPTION SOURCES -c8,8 qgn_prop_psln_active.svg
-END
-//  End of File  
--- a/locationsystemui/locationsysui/locpsysettings/locpsysettingsui/group/locpsysettingsui.mmp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,80 +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 is project specification file for Positioning Method
-*				  Settings UI pluging to the Loc Sys UI Engine
-*
-*/
-
-#include <data_caging_paths.hrh>
-#include <bldvariant.hrh>
-#include "../inc/locpsysettingsuiuid.hrh"
-#include <platform_paths.hrh> // For the MW_LAYER_SYSTEMINCLUDE
-
-CAPABILITY    		CAP_ECOM_PLUGIN
-TARGET        		locpsysettingsui.dll
-TARGETTYPE    		PLUGIN
-UID           		0x10009D8D LOCPSYSETTINGSUI_UID3
-VENDORID      		VID_DEFAULT
-
-SOURCEPATH          ../src
-SOURCE        		locpsysettingsui.cpp 
-SOURCE        		locpsysettingsuiimptable.cpp 
-SOURCE				locpsylbmodel.cpp
-SOURCE				locpsysettingsview.cpp
-SOURCE				locpsysettingscontainer.cpp
-
-// System Include
-APP_LAYER_SYSTEMINCLUDE
-
-USERINCLUDE         ../inc
-USERINCLUDE         ../data
-USERINCLUDE         ../../../inc
-USERINCLUDE	    ../../../../inc
-USERINCLUDE         ../../../../../inc
-
-SOURCEPATH          ../data
-
-//ECOM resource definition
-START RESOURCE      10275062.rss // UPDATE THIS
-TARGET              locpsysettingsui.rsc // UPDATE THIS
-END // ECOM resource definition
-
-//View resources
-START RESOURCE      locpsysettingsuiview.rss
-HEADER
-TARGETPATH          RESOURCE_FILES_DIR
-LANGUAGE_IDS
-END // AppsPlugin resources
-
-LIBRARY             euser.lib
-LIBRARY             ecom.lib
-LIBRARY             efsrv.lib
-LIBRARY             avkon.lib
-LIBRARY             bafl.lib 
-LIBRARY             cone.lib 
-LIBRARY             eikcoctl.lib 
-LIBRARY             eikcore.lib 
-LIBRARY				apparc.lib
-LIBRARY				aknicon.lib
-LIBRARY				eikctl.lib
-LIBRARY 			apgrfx.lib
-LIBRARY             commonengine.lib 	// For RConeResourceLoader
-LIBRARY             egul.lib 		 	// CGulIcon
-LIBRARY             aknskins.lib 	 	// AknsUtils.h
-LIBRARY 			featmgr.lib 		// Feature manager API
-LIBRARY 			locpsysettingseng.lib
-LIBRARY 			hlplch.lib
-LIBRARY             lbs.lib             // Location Acquistion API
-
-// End of File
--- a/locationsystemui/locationsysui/locpsysettings/locpsysettingsui/inc/locpsyappdebug.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +0,0 @@
-/*
-* Copyright (c) 2002,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:  LocAppDebug contains debug macros.
-*
-*/
-
-
-#ifndef LOCPSYAPPDEBUG_H 
-#define LOCPSYAPPDEBUG_H
-
-// SYSTEM INCLUDES
-#include <e32std.h>
-
-// USER INCLUDES
-#include "locpsyengdebug.h"
-
-// MACROS
-
-/**
-* By using component specific debug macros unnecessary 
-* calls to LocUtils.dll can be avoided.
-*/
-
-#ifdef LOC_ENABLE_DEBUG_PRINT
-#define LOCAPPDEBUG(TEXT) DEBUG(TEXT)
-#define LOCAPPDEBUG1(TEXT, ARG1) LOC(TEXT, ARG1)
-#define LOCAPPDEBUG2(TEXT, ARG1, ARG2) LOC2(TEXT, ARG1, ARG2)
-#define LOCAPPDEBUG3(TEXT, ARG1, ARG2, ARG3) LOC3(TEXT, ARG1, ARG2, ARG3)
-#else
-#define LOCAPPDEBUG(TEXT)
-#define LOCAPPDEBUG1(TEXT, ARG1)
-#define LOCAPPDEBUG2(TEXT, ARG1, ARG2)
-#define LOCAPPDEBUG3(TEXT, ARG1, ARG2, ARG3)
-#endif
-
-#endif // LOCPSYAPPDEBUG_H
--- a/locationsystemui/locationsysui/locpsysettings/locpsysettingsui/inc/locpsycommandhandler.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,43 +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:  Interface class that provides the command handling functionality.
-*				 The class implementing it should be prepared to handle all commands
-*				 except those internal to the calling UI
-*
-*/
-
-
-#ifndef MLOCPSYCOMMANDHANDLER_H_
-#define MLOCPSYCOMMANDHANDLER_H_
-
-// System Include 
-#include <e32base.h>
-
-// Class Definition
-/**
- *	Interface class that provides the command handling functionality.
- */
-class MLocPsyCommandHandler
-	{
-	public:
-		/**
-		 * Command handlikng function
-		 *
-		 * @param aCommand Command that needs to be handled
-		 */
-		 virtual void HandleCommandL( TInt aCommand )	= 0;
-	};
-
-#endif //MLOCPSYCOMMANDHANDLER_H_
-
--- a/locationsystemui/locationsysui/locpsysettings/locpsysettingsui/inc/locpsykeyprocessor.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,49 +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:  Interface which allows subscribers to consume key event or 
-*               pass the event to other view class.
-*       
-*
-*/
-
-
-#ifndef MLOCPSYKEYPROCESSOR_H
-#define MLOCPSYKEYPROCESSOR_H
-
-// INCLUDES
-#include <w32std.h>
-
-// CLASS DECLARATION
-
-/**
-*	An interface a CCoeControl class can implement to forward the keyevents
-*   before the actual control gets the key events. This is useful in
-*   situations where the control consumes keys which you need.
-*/
-class MLocPsyKeyProcessor
-    {
-    public:
-     /**
-     * process the keyevent befor it reaches the control
-     * @param aKeyEvent the event fired
-     * @param aType the type of event
-     * @return ETrue if key event was consumed, otherwise EFalse
-     */
-    virtual TBool ProcessKeyEventL( const TKeyEvent& aKeyEvent,
-                                    TEventCode aType ) = 0;
-    };
-
-#endif // MLOCPSYKEYPROCESSOR_H
-
-// End of File
--- a/locationsystemui/locationsysui/locpsysettings/locpsysettingsui/inc/locpsylbmodel.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,82 +0,0 @@
-/*
-* Copyright (c) 2002,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:  Provides Location request detail view listbox model.
-*
-*/
-
-#ifndef CLOCPSYLBMODEL_H
-#define CLOCPSYLBMODEL_H
-
-// INCLUDES
-#include <e32base.h>        // CBase
-#include <bamdesca.h>       // MDesCArray
-
-// FORWARD DECLARATIONS
-class MLocPsySettings;
-
-// CLASS DECLARATION
-
-/**
-*  CLocPsyLBModel  
-*  
-*/
-class CLocPsyLBModel : public CBase, public MDesCArray
-    {
-    private:
-        /**
-        * C++ constructor.
-        * @param aListBox where the model is used, not own
-        * @param aEntry pointer to log entry instance, not own
-        * @param aCLocRequestorUtilsBase requestor utility
-        */
-        CLocPsyLBModel( MLocPsySettings* aPsySettingModel );
-        
-    public: 
-        /**
-        * Destructor
-        */
-        virtual ~CLocPsyLBModel();
-          
-        /**
-        * Two-phased constructor
-        * @param aPsySettingsModel, provides data about the Psy modules
-        */
-        static CLocPsyLBModel* NewLC( MLocPsySettings* aPsySettingModel );
-
-        /**
-        * Two-phased constructor
-        * @param aPsySettingsModel, provides data about the Psy modules
-        */
-        static CLocPsyLBModel* NewL( MLocPsySettings* aPsySettingModel );
-
-    private: 
-        /**
-        * Symbian default constructor.
-        */
-        void ConstructL();
-
-    private: // From MDesCArray
-        TInt    MdcaCount() const;
-        TPtrC16 MdcaPoint( TInt aIndex ) const;
-
-    private: //data
-        // Ref: instance pointer
-        MLocPsySettings*            iPsySettingsModel;
-        /// Own: conversion buffer
-        HBufC*                      iBuffer;
-    };
-
-#endif // CLOCPSYLBMODEL_H
-
-// End of File
--- a/locationsystemui/locationsysui/locpsysettings/locpsysettingsui/inc/locpsysettingscontainer.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,235 +0,0 @@
-/*
-* Copyright (c) 2002,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:  Positioning Method Settings UI main view's container class 
-*                definition.
-*
-*/
-
-
-
-#ifndef CLOCPSYSETTINGSCONTAINER_H_
-#define CLOCPSYSETTINGSCONTAINER_H_
-
-// INCLUDES
-#include <coecntrl.h>
-#include <eiklbo.h>
-
-// FORWARD DECLARATIONS
-class CAknSingleGraphicStyleListBox;
-class CAknIconArray;
-class CEikColumnListBox;
-class CEikListBox;
-class CEikStatusPane;
-
-class CLocPsySettingsView;
-class MLocPsyKeyProcessor;
-class MLocPsySettings;
-
-// CLASS DECLARATION
-
-/**
-*  CLocPsySettingsContainer  container control class.
-*  
-*/
-class CLocPsySettingsContainer : public CCoeControl,
-                                 public MEikListBoxObserver
-    {
-    private:
-        /**
-        * C++ default constructor.
-        */        
-        CLocPsySettingsContainer( MLocPsyKeyProcessor* aKeyProcessor, 
-                                  CLocPsySettingsView* aView );
-
-    public:
-        /**
-        * Destructor.
-        */
-        virtual ~CLocPsySettingsContainer();
-
-        /**
-        * Two-phased constructor
-        *
-        * @param 	aMainView 				A pointer to MainView
-        * @param 	aAppUi 					A pointer to Location AppUi.
-        * @param 	aRect 					A rectangle for drawing.
-        * @return 	CLocPsySettingsContainer*		The newly created object.
-        */
-        static CLocPsySettingsContainer* NewL( 
-                				  MLocPsyKeyProcessor* 	aKeyProcessor,
-                				  MObjectProvider* 		aParent,
-                				  CLocPsySettingsView* 	aView,
-                				  MLocPsySettings* 		aSettingsModel,
-        					const TRect& 			    aRect );
-        /**
-        * Inherited From CCoeControl
-        */
-        TKeyResponse OfferKeyEventL( const TKeyEvent& 	aKeyEvent,
-                                     	   TEventCode 	aType );
-                                     	   
-        /**
-        * Inherited from CCoeControl. Handles resource changes
-        *
-        * @param Row index
-        */  	
-        void HandleResourceChange( TInt aType );
-
-        /**
-        * Inherited from CCoeControl. Handles list box events
-        *
-        * @param aListBox    Listbox on which the event was generated
-        * @param aEventType  Type of event that was generated
-        */ 
-        void HandleListBoxEventL( CEikListBox*      aListBox, 
-        					      TListBoxEvent     aEventType );
-        /**
-        * Returns the help context
-        *
-        * @param aContext	The help context that has to be determined
-        */
-        void GetHelpContext( TCoeHelpContext& aContext ) const;    
-
-        /**
-        * Returns selected row in main view
-        *
-        * @return Row index
-        */
-        TInt SelectedRow() const;
-
-        /**
-        * Sets selected row in main view
-        *
-        * @param Row index
-        */       
-        void SetSelectedRow( TInt aIndex ) const;
-
-        /**
-        * Handle the mark commands for the Markable ListBox
-        *
-        * @param Markable Commands EAknCmdMark and EAknCmdUnmark
-        */       
-        void HandleMarkCommandL( TInt aCommand );
-
-        /**
-        * Updates the List box
-        */
-        void UpdateL();
-
-	protected:
-		/**
-		* Inherited from CCoeControl
-		* Handles Focus Change to list 
-		*/
-		void FocusChanged( TDrawNow aDrawNow );
-
-	private:
-        /**
-        * By default Symbian 2nd phase constructor is private.        
-        * @param aRect Frame rectangle for container.
-        */
-        void ConstructL( MLocPsySettings* aSettingsModel, const TRect& aRect );
-
-        /**
-        * From CoeControl,SizeChanged.
-        */
-        void SizeChanged();
-
-        /**
-        * From CoeControl,CountComponentControls.
-        */
-        TInt CountComponentControls() const;
-
-        /**
-        * From CCoeControl,ComponentControl.
-        */
-        CCoeControl* ComponentControl( TInt aIndex ) const;
-
-        /**
-        *  Append icon to icon array. CAknIconArray owns icons so it is 
-        *  easier to it leave safely.
-        *  @param aIcons icon array
-        *  @param aIconFileWithPath icon file name with path
-        *  @param aSkinID skin id of the icon
-        *  @param aIconGraphicsIndex picture index
-        *  @param aIconGraphicsMaskIndex mask index
-        */
-        void AddIconL(       CAknIconArray* aIcons,
-                       const TDesC&         aIconFileWithPath,
-                             TAknsItemID    aSkinID,
-                             TInt           aIconGraphicsIndex,
-                             TInt           aIconGraphicsMaskIndex );
-                       
-        /**
-        * Gets location icon file path and name. Ownership is transferred,
-        * item is left in the cleanup stack.
-        * @return full path and name, ownership is transferred
-        */        
-        TFileName* LocIconFileNameLC() const;
-
-        /**
-        * Gets avkon icon file path and name. Ownership is transferred,
-        * item is left in the cleanup stack.
-        * @return full path and name, ownership is transferred
-        */        
-        TFileName* AvkonIconFileNameLC() const;        
-                   
-        /**
-        * Make title
-        * @param aResourceText resource to create title
-        */
-        void MakeTitleL( TInt aResourceText );
-
-        /**
-        * Make title
-        * @param aListbox listbox reference
-        * @param aResourceText resourse id
-        */
-        void MakeEmptyTextListBoxL( CEikListBox& aListBox, TInt aResourceText );
-
-        /**
-        * Appui's status pane getter
-        * @return Statuspane pointer
-        */
-        CEikStatusPane* StatusPane();
-
-        /**
-        * Creates List box.
-        */
-        void CreateListboxL( MLocPsySettings* aSettingsModel );
-
-        /**
-        * Update icons
-        */
-        void UpdateIconsL();
-
-    private: //data
-        
-        // help context
-        TCoeContextName 					iContextName;
-        
-        // Key Processor to route the keys before it is processed by the control
-        // not own
-        MLocPsyKeyProcessor* 				iKeyProcessor;
-        
-        /// Own: List box.
-        CAknSingleGraphicStyleListBox* 		iListBox;
-        
-        // The parent View
-        // Not Owned
-        CLocPsySettingsView* 				iParentView;
-    };
-
-#endif
-
-// End of File CLOCPSYSETTINGSCONTAINER_H_
--- a/locationsystemui/locationsysui/locpsysettings/locpsysettingsui/inc/locpsysettingsui.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,161 +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:  Postioning Method Settings UI plugin to the Location System
-*				  UI engine
-*
-*/
-
-
-#ifndef C_LOCPSYSETTINGSUI_H_
-#define C_LOCPSYSETTINGSUI_H_
-
-// User Includes
-#include "locsettingsui.h"
-#include "locpsycommandhandler.h"
-
-// System Includes
-#include <ConeResLoader.h>
-#include <data_caging_path_literals.hrh>
-
-// Forward Declarations
-class MLocSettingsUiObserver;
-class CAknViewAppUi;
-class CLocPsySettingsView;
-
-// Global constants
-
-/**
- * Position Method Settings RSC file name
- */
-_LIT( KPosSettingsUiResFileName, "locpsysettingsuiview.rsc" );
-
-/**
- * Position Method Settings UI plugin
- *
- * The Positioning Method Settings UI is implemented as an ECom plug-in
- * that plugs into the Location System UI Engine ECom interface. It 
- * implements the settings view and functionalities for configuring PSYs.
- * It also provides a plug-in interface for sub-settings UIs (like PSY 
- * specific Configuration UIs) to get included into the settings hierarchy. 
- * It uses the Location framework for retrieving the location settings. 
- */
-class CLocPsySettingsUi : public CLocSettingsUi,
-						  public MLocPsyCommandHandler
-    { 
-    public:
-        /**
-         * Symbian OS two-phased constructor
-         * @return 
-         */
-        static CLocPsySettingsUi* NewL( TAny* aParams );
- 
-        /**
-         * Destructor.
-         */
-        virtual ~CLocPsySettingsUi();
-        
-    public:
-        /**
-         * Inherited from CLocSettingsUi
-         * Launches the Settings UI
-         *
-         * @param aUiLaunchParams	Flags that define specific configuration of
-         *                          if the Settings UI, that the user of the API
-         *                          wants to launch.
-         */
-        void LaunchL( TInt		aUiLaunchParams );
-
-        /**
-         * Inherited from CLocSettingsUi
-         * Closes the running Settings UI prematurely.
-         *
-         */
-        void Close();
-
-        /**
-         * Inherited from CLocSettingsUi
-         * Method for getting caption of this plugin. This should be the 
-         * localized name of the settings view to be shown in parent view.
-         *
-         * @param aCaption pointer to Caption variable
-         */
-        void GetCaptionL( TDes& aCaption ) const;
-
-        /**
-         * Inherited from CLocSettingsUi
-         * Returns the priority of the UI module. 
-         * 
-         * 
-         * @return Priority of the Settings UI
-         */
-        TInt GetPriority();
-
-        /**
-         * Inherited from MLocPsyCommandHandler
-         * Handles commands from the views
-         *
-         * @param  aCommand Command ID
-         */
-        void HandleCommandL( TInt aCommand );
-
-    private:
-        /**
-         * C++ default constructor.
-         */
-        CLocPsySettingsUi( MLocSettingsUiObserver&	aSettingsUiObserver,
-        	 		 	   CAknViewAppUi&			aAppUi );  
-        	 		 	    
-        /**
-         * Second phase constructor.
-         */
-        void ConstructL();
-
-        	
-        /**
-         * Opens the nearest localized resourcefile using aResourceLoader. 
-         * aResourceLoader should be opened only once before closing it. 
-         * Otherwise it will raise a panic. Therefore it is better to have 
-         * multiple resource loaders.
-         * 
-         * @param aResourceFileName Drive and name of resource file in format 
-         *                          <path>:<rsc_file_name>
-         * @param aResourceLoader Resource loader for the resource. The loader 
-         *                        must not be opened allready or it will raise 
-         *                        a panic. It is caller's responsibility to 
-         *                        close the resource loader after using the 
-         *                        resource.
-        */
-        void OpenLocalizedResourceFileL( const TDesC& 				aResourceFileName, 
-        								       RConeResourceLoader& aResourceLoader );
-  
-    private:
-    	/**
-	     * View of the View that was active before this view was launched
-	     */
-    	RConeResourceLoader 			iResourceLoader;
-    	
-    	/** 
-    	 * Reference to the Position Method Settings View
-    	 * Owns
-    	 */
-    	CLocPsySettingsView*			iView;
-    	
-    	/**
-    	 * View Id for Position Method Settings View
-    	 */
-    	TUid							iViewId;
-    	
-    };
-
-#endif // C_LOCPSYSETTINGSUI_H_
--- a/locationsystemui/locationsysui/locpsysettings/locpsysettingsui/inc/locpsysettingsui.hrh	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,45 +0,0 @@
-/*
-* Copyright (c) 2002,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:  Contains declarations for constants of location.
-*                This file can be included in C++ or resource file.
-*
-*/
-
-#ifndef LOCPSYSETTINGSUI_HRH
-#define LOCPSYSETTINGSUI_HRH
-
-#include <AvkonIcons.hrh>
-
-// avkon bitmap file location and name
-#define loc_avkon_mbm_file_location          AVKON_ICON_FILE
-
-// Enumeration for command Ids
-
-enum TLocationCommandIds
-    {
-	ELocCmdEnablePsy = 0x06000,
-	ELocCmdDisablePsy,
-	ELocCmdConfigurePsy,
-    ELocCmdNone
-    };
-
-// Enumeration for tab view Ids.
-enum TLocationViewIds
-    {
-    ELocationMainView = 6  // last item
-    };
-
-#endif      // LOCPSYSETTINGSUI_HRH
-
-// End of File
--- a/locationsystemui/locationsysui/locpsysettings/locpsysettingsui/inc/locpsysettingsuiconsts.h	Mon May 03 12:54:42 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: 
-*     Contains common constants
-*
-*/
-
-
-#ifndef LOCPSYSETTINGSUICONSTS_H_
-#define LOCPSYSETTINGSUICONSTS_H_
-
-// User Include
-#include "locpsysettingsengconsts.h"
-
-/**
- * Length of the tab character
- */
-const TInt KTabLength = 1;
-
-/**
- * Icon file name
- */
-_LIT( KPosMethodSettingsIconFileName, "locpsysettings.mif" );
-
-#endif // LOCPSYSETTINGSUICONSTS_H_
-
-// End of File
--- a/locationsystemui/locationsysui/locpsysettings/locpsysettingsui/inc/locpsysettingsuiuid.hrh	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +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:  Contains the UID3 value to be used for the Positioning Method Settings UI
-*				 The value is expected to have three specific functions
-*				 1. UID3 for the PosMethodSettingsUi.dll ECOM DLL
-*				 2. Implementation UID for the ECOM plugin to LocSysUiEngine
-*				 3. View ID for LocSysMainView
-*
-*/
-
-#ifndef LOCPSYSETTINGSUIEXAMPLEPLUGIN_HRH_
-#define LOCPSYSETTINGSUIEXAMPLEPLUGIN_HRH_
-
-// Location System UI View UID3
-#define LOCPSYSETTINGSUI_UID3          0x10275062
-
-#endif      // LOCPSYSETTINGSUIEXAMPLEPLUGIN_HRH_
-
-// End of File
-
-
--- a/locationsystemui/locationsysui/locpsysettings/locpsysettingsui/inc/locpsysettingsview.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,201 +0,0 @@
-/*
-* Copyright (c) 2002,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:  View declaration for Position method settings UI
-*
-*/
-
-#ifndef CLOCPSYSETTINGSVIEW_H
-#define CLOCPSYSETTINGSVIEW_H
-
-// System Include
-#include <aknview.h>
-#include <AknServerApp.h>
-#include  <bldvariant.hrh>
-
-// User Include
-#include "locpsyengobserver.h"
-#include "locpsykeyprocessor.h"
-#include <lbs.h>                        // Location Acquisition API
-// CONSTANTS
-
-// FORWARD DECLARATIONS
-class CLocPsySettingsContainer;
-class CLocPsyEng;
-class CEikMenuPane;
-class MLocPsyCommandHandler;
-class CAknQueryDialog;
-	
-// CLASS DECLARATION
-
-/**
-*  CLocPsySettingsView view class.
-* 
-*/
-class CLocPsySettingsView : public CAknView, 
-				 		    public MLocPsyEngObserver, 
-				 		    public MLocPsyKeyProcessor,
-				 		    public MAknServerAppExitObserver
-    {
-    private:
-        /**
-        * C++ constructor
-        * @param aKeyProcessor processes key events, ownership not transferred
-        */
-        CLocPsySettingsView( MLocPsyCommandHandler& 	aCommandHandler );
-    public:
-        /**
-        * Destructor.
-        */
-        virtual ~CLocPsySettingsView();
-
-        /**
-        * C++ default constructor.
-        * @param aKeyProcessor processes key events, ownership not transferred
-        * @return created object
-        */
-        static CLocPsySettingsView* NewLC( MLocPsyCommandHandler& 	aCommandHandler );
-
-        /**
-        * C++ default constructor.
-        * @param aKeyProcessor processes key events, ownership not transferred
-        * @return created object
-        */
-        static CLocPsySettingsView* NewL( MLocPsyCommandHandler& 	aCommandHandler );
-
-        /**
-        * Handles the Screen Size update
-        */
-        void HandleScreenSizeChange();
-
-    public:
-        /**
-        * From CAknView
-        */
-        TUid Id() const;
-
-        /**
-        * From CAknView
-        */
-        void HandleCommandL(TInt aCommand);
-
-        /**
-        * From CAknView
-        */
-        void ProcessCommandL( TInt aCommand );
-
-    public:
-        /**
-        * From MEikMenuObserver
-        */
-        void DynInitMenuPaneL( TInt aResourceId, CEikMenuPane* aMenuPane );
-        
-    public:
-        /**
-        * From MLocPsyEngObserver
-        */
-        void NotifyL();
-        
-		/**
-        * From MLocPsyEngObserver
-        */
-        void NotifyError( TInt aErrorCode );
-
-    public:
-		/**
-        * From MLocPsyKeyProcessor
-        */
-		TBool ProcessKeyEventL( const TKeyEvent& aKeyEvent, TEventCode aType );
-			
-    public:
-		/**
-        * From MAknServerAppExitObserver
-        */
-		virtual void HandleServerAppExit(TInt aReason);
-        
-    private:
-        /**
-        * By default Symbian 2nd phase constructor is private.
-        */
-        void ConstructL();
-
-    private: 
-    	/**
-        * From CAknView
-        */
-        void DoActivateL( const TVwsViewId& aPrevViewId,
-                                TUid        aCustomMessageId,
-                          const TDesC8&     aCustomMessage );
-            
-        /**
-        * From CAknView
-        */
-        void DoDeactivate();
-        
-        /**
-        * Launch the popup.
-        *
-        * @param aResourceId Resource ID.
-        */
-        void DoLaunchPopupL( TInt aResourceId );
-        
-        /**
-        * Uses LocAppUI::ActivateLocalViewL.
-        * @param aViewId
-        * @param aCustomMessageId
-        * @param aCustomMessage
-        */
-        void ActivateLocalViewL(       TUid     aViewId, 
-                                       TUid     aCustomMessageId,
-                                 const TDesC8&  aCustomMessage );
-
-        /**
-        * Uses LocAppUI::ActivateLocalViewL.
-        * @param aViewId
-        * @param aCustomMessageId
-        * @param aCustomMessage
-        */
-        void ActivateLocalViewL( TUid aViewId );
-
-        /**
-        * Shows or dims help option, depending wheather help feature
-        * is supported or not.
-        * @param aMenuPane
-        */
-        void HandleHelpFeature( CEikMenuPane& aMenuPane ) const;
-
-    private:
-        /**
-         * Owns
-         */
-    	CLocPsyEng*		   				iLocationEngine;
-    	
-    	MLocPsyCommandHandler& 		    iCommandHandler; 
-        CLocPsySettingsContainer* 	    iContainer;  
-        CEikMenuBar* 					iPopup;   
-      
-		/**
-		 * Handle to the RPostionServer
-		 */
-		RPositionServer 				iPositionServer;    		
-		
-		/**
-		 * Reference to the confirmation query for disabling the
-		 * PSYs
-		 */
-		 CAknQueryDialog*				iConfirmationQuery;      
-    };
-
-#endif // CLOCPSYSETTINGSVIEW_H
-
-// End of File
--- a/locationsystemui/locationsysui/locpsysettings/locpsysettingsui/src/locpsylbmodel.cpp	Mon May 03 12:54:42 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:  Provides Location request view listbox model.
-*
-*/
-
-
-
-// INCLUDE FILES
-#include <locpsysettingsuiview.rsg>
-#include <avkon.rsg>
-#include <eikenv.h>
-
-#include "locpsylbmodel.h"
-#include "locpsyappdebug.h"
-#include "locpsysettingsuiconsts.h"
-#include "locpsysettings.h"
-#include "locpsyinfo.h"
-
-enum
-	{
-	EPsyDisabledIconIndex = '1',
-	EPsyEnabledIconIndex = '0'
-	};
-
-		
-// ================= MEMBER FUNCTIONS =======================
-
-// ---------------------------------------------------------
-// CLocPsyLBModel::CLocPsyLBModel
-// Constructor
-// ---------------------------------------------------------
-CLocPsyLBModel::CLocPsyLBModel( MLocPsySettings*    aPsySettingsModel )
-    :iPsySettingsModel( aPsySettingsModel )
-    {
-    }
-
-// ---------------------------------------------------------
-// CLocPsyLBModel::~CLocPsyLBModel
-// Destructor
-// ---------------------------------------------------------
-CLocPsyLBModel::~CLocPsyLBModel()
-    {
-    delete iBuffer;
-    }
-    
-// ---------------------------------------------------------
-// CLocPsyLBModel* CLocPsyLBModel::NewL
-// Static two phase Constructor
-// ---------------------------------------------------------
-CLocPsyLBModel* CLocPsyLBModel::NewL( MLocPsySettings*      aPsySettingsModel )
-    {
-    CLocPsyLBModel* lbmodel = CLocPsyLBModel::NewLC( aPsySettingsModel );
-    CleanupStack::Pop( lbmodel );
-    return lbmodel;
-    }
-
-// ---------------------------------------------------------
-// CLocPsyLBModel* CLocPsyLBModel::NewLC
-// Static two phase Constructor
-// ---------------------------------------------------------
-CLocPsyLBModel* CLocPsyLBModel::NewLC( MLocPsySettings*     aPsySettingsModel )
-    {
-    CLocPsyLBModel* lbmodel = new (ELeave) CLocPsyLBModel( aPsySettingsModel );
-    CleanupStack::PushL( lbmodel );
-    lbmodel->ConstructL();
-    return lbmodel;
-    }
-
-// ---------------------------------------------------------
-// CLocPsyLBModel::ConstructL
-// Symbian two phased constructor
-// ---------------------------------------------------------
-void CLocPsyLBModel::ConstructL()
-    {
-    iBuffer = HBufC::NewL( KLocPsyMaxLen + KTabLength + KTabLength ); // Icon Id + Tab Key
-    }
-
-// ---------------------------------------------------------
-// TInt CLocPsyLBModel::MdcaCount
-// ---------------------------------------------------------
-TInt CLocPsyLBModel::MdcaCount() const
-    {
-    LOCAPPDEBUG1("CLocSettingsLBModel::MdcaCount number of PSYs=%d",
-                 iPsySettingsModel->PSYCount());
-    return iPsySettingsModel->PSYCount();
-    }
-
-// ---------------------------------------------------------
-// TPtrC16 CLocPsyLBModel::MdcaPoint
-// ---------------------------------------------------------
-TPtrC16 CLocPsyLBModel::MdcaPoint( TInt aIndex ) const
-    {
-    TPtr ptr( iBuffer->Des() );
-    ptr.Zero();
-    if( iPsySettingsModel->IsPsyEnabled( aIndex ) )
-    	{
-    	ptr.Append( EPsyEnabledIconIndex );
-    	}
-    else
-    	{
-    	ptr.Append( EPsyDisabledIconIndex );
-    	}
-    	
-    ptr.Append( EKeyTab );
-    // Add the icon index here
-    if ( iPsySettingsModel->PSYCount() > 0 )
-        {
-        // volatile --> stack instead of register to be leave-safe
-        CLocPsyInfo* psyInfo = NULL; 
-        TRAPD(err, psyInfo = iPsySettingsModel->GetPsyL( aIndex ));
-        if ( err != KErrNone)
-            {
-            LOCAPPDEBUG2("CLocSettingsLBModel::MdcaPoint index=%d err=%d",
-                aIndex, err );
-            ptr.Zero();
-
-            CEikonEnv::Static()->NotifyIdleErrorWhileRedrawing(err);
-
-            return NULL;
-            }
-        else
-            {
-            ptr.Append( psyInfo->PsyName() );
-            }
-        }
-    return *iBuffer;
-    }
-
-// End of File  
--- a/locationsystemui/locationsysui/locpsysettings/locpsysettingsui/src/locpsysettingscontainer.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,494 +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:  Provides Postioning Method Settings view's container class methods.
-*
-*/
-
-
-// System Includes
-
-#include <eikapp.h>				// CEikApplication		
-#include <aknlists.h>   		// CAknSingleLargeStyleListBox
-#include <AknIconArray.h>		// Icon Array
-#include <eikclbd.h>			// Column Listbox
-#include <StringLoader.h> 		// StringLoader
-#include <barsread.h>   		// TResourceReader
-#include <akntitle.h>   		// CAknTitlePane
-#include <featmgr.h> 			// FeatureManager
-#include <AknsConstants.h> 		// Skin Ids
-#include <gulicon.h>			// Gul Icon
-#include <avkon.hrh> 
-#include <data_caging_path_literals.hrh>
-#include <locpsysettingsuiview.rsg>
-#include <avkon.mbg>
-#include <locpsysettings.mbg>
-#include <eikenv.h>
-#include <csxhelp/locpsys.hlp.hrh>
-// User Includes
-#include "locpsysettingscontainer.h"
-#include "locpsysettingsview.h"
-#include "locpsysettingsui.hrh"
-#include "locpsysettingsuiuid.hrh"
-#include "locpsyappdebug.h"
-#include "locpsyeng.h"
-#include "locpsysettingsinterface.h"
-#include "locpsylbmodel.h"
-#include "locpsykeyprocessor.h"
-#include "locpsysettingsuiconsts.h"
-#include <bldvariant.hrh> 
-#include <AknDef.h>
-
-// CONSTANTS
-const TInt KViewListboxGranularity = 2;
-const TInt KMinSelectedItemNumber = 0;
-
-#ifdef _DEBUG
-
-_LIT( KPosMethodSettingsContainerPanicMsg, "CLocPsySettingsContainer");
-enum TPanicCode
-    {
-    KLocErrHelpContext
-    };
-
-// ==================== LOCAL FUNCTIONS ====================
-
-void Panic(TPanicCode aReason)
-    {
-    User::Panic( KPosMethodSettingsContainerPanicMsg, aReason );
-    }
-    
-#endif
-
-
-// ================= MEMBER FUNCTIONS =======================
-
-// -----------------------------------------------------------------------------
-// CLocPsySettingsContainer* CLocPsySettingsContainer::NewL
-// Two-phased constructor
-// -----------------------------------------------------------------------------
-CLocPsySettingsContainer* CLocPsySettingsContainer::NewL( 
-										MLocPsyKeyProcessor* 	aKeyProcessor, 
-										MObjectProvider* 	    aParent,
-										CLocPsySettingsView* 	aView,
-										MLocPsySettings* 	    aSettingsModel,
-										const TRect& 		    aRect )
-    {
-    CLocPsySettingsContainer* view = 
-        new (ELeave) CLocPsySettingsContainer( aKeyProcessor, aView );
-    CleanupStack::PushL( view );
-    view->SetMopParent( aParent );
-    view->ConstructL( aSettingsModel, aRect );
-    CleanupStack::Pop( view );
-    return view;
-    }
-
-// -----------------------------------------------------------------------------
-// CLocPsySettingsContainer::CLocPsySettingsContainer
-// C++ Constrcutor
-// -----------------------------------------------------------------------------
-CLocPsySettingsContainer::CLocPsySettingsContainer( MLocPsyKeyProcessor* 	aKeyProcessor,
-													CLocPsySettingsView* 	aView ) 
-	: iKeyProcessor(aKeyProcessor),
-	  iParentView(aView)
-    {
- 
- 	
-     __ASSERT_DEBUG( KLOC_HLP_PSYS().Length() <= iContextName.MaxLength(),
-                    Panic( KLocErrHelpContext ) );
-    iContextName = KLOC_HLP_PSYS();
-    }
-
-// -----------------------------------------------------------------------------
-// CLocPsySettingsContainer::ConstructL(const TRect& aRect)
-// Symbian 2nd phase constructor can leave.
-// -----------------------------------------------------------------------------
-void CLocPsySettingsContainer::ConstructL( MLocPsySettings* aSettingsModel, 
-									       const TRect&     aRect )
-    {
-    CreateWindowL();
-    CreateListboxL( aSettingsModel );
-    MakeTitleL( R_LOC_MAIN_TITLE );
-    SetRect( aRect );
-    ActivateL();
-    }
-
-// -----------------------------------------------------------------------------
-// CLocPsySettingsContainer::~CLocPsySettingsContainer
-// Destructor
-// -----------------------------------------------------------------------------
-CLocPsySettingsContainer::~CLocPsySettingsContainer()
-    {    
-    delete iListBox;
-    }
-    
-// -----------------------------------------------------------------------------
-// CLocPsySettingsContainer::OfferKeyEventL
-// -----------------------------------------------------------------------------
-TKeyResponse CLocPsySettingsContainer::OfferKeyEventL(
-    const TKeyEvent& aKeyEvent,
-    TEventCode aType )
-    {
-    if ( iKeyProcessor->ProcessKeyEventL( aKeyEvent, aType ) == EKeyWasConsumed )
-    	{
-    	return EKeyWasConsumed;
-    	}
-    	
-    TInt count = CountComponentControls();
-    for ( TInt i( 0 ) ; i < count; i++ )
-        {
-        if( ComponentControl(i)->OfferKeyEventL( aKeyEvent, aType ) ==
-            EKeyWasConsumed )
-            {
-            return EKeyWasConsumed;
-            }
-        }
-    return EKeyWasNotConsumed;
-    }
-
-// -----------------------------------------------------------------------------
-// CLocPsySettingsContainer::HandleResourceChange
-// -----------------------------------------------------------------------------
-void CLocPsySettingsContainer::HandleResourceChange(TInt aType)
-    {
-    CCoeControl::HandleResourceChange(aType);
-    switch( aType )
-    	{
-    	case KAknsMessageSkinChange:
-        	{
-        	TRAPD( error, UpdateIconsL() );
-        	if ( error != KErrNone )
-            	{
-            	iEikonEnv->HandleError( error );
-            	}                 
-        	DrawDeferred();
-        	   	
-        	break;
-        	}
-    	case KEikDynamicLayoutVariantSwitch:
-    		{
-			iParentView->HandleScreenSizeChange();
-			DrawDeferred();
-			break;
-    		}
-    	default:
-    		{
-    		break;
-    		}
-    	}
-    }
-
-// ---------------------------------------------------------------------------
-// void CLocPsySettingsContainer::HandleListBoxEventL
-//
-// ---------------------------------------------------------------------------
-//
-void CLocPsySettingsContainer::HandleListBoxEventL( CEikListBox*  /* aListBox */, 
-		 						   					TListBoxEvent aEventType )
-	{
-	switch (aEventType)
-        {
-        // List box Item Selection
-        case EEventEnterKeyPressed:
-        case EEventItemSingleClicked:
-            {
-            // PSY has been selected. The event has to be propagated to the 
-            // command handler to pop-up the Context Specific menu
-            
-            // Set the Key event to represent EKeyOK            
-            TKeyEvent   keyevent;
-            keyevent.iCode = EKeyOK;
-            
-            // Set the Key event to Event Key
-            TEventCode  keyCode( EEventKey );
-            
-            iKeyProcessor->ProcessKeyEventL( keyevent, keyCode );
-            break;	
-            }
-        default:
-           break;
-        }
-	}
-// -----------------------------------------------------------------------------
-// CLocPsySettingsContainer::GetHelpContext
-// -----------------------------------------------------------------------------
-void CLocPsySettingsContainer::GetHelpContext( TCoeHelpContext& aContext ) const
-    {
-    aContext.iContext = iContextName;
-    aContext.iMajor = TUid::Uid( LOCPSYSETTINGSUI_UID3 );
-    }
-   
-// -----------------------------------------------------------------------------
-// CLocPsySettingsContainer::SelectedRow
-// -----------------------------------------------------------------------------
-TInt CLocPsySettingsContainer::SelectedRow() const
-    {
-    return iListBox->CurrentItemIndex();
-    }
-
-// -----------------------------------------------------------------------------
-// CLocPsySettingsContainer::SetSelectedRow
-// -----------------------------------------------------------------------------
-void CLocPsySettingsContainer::SetSelectedRow( TInt aIndex ) const
-    {
-    iListBox->SetCurrentItemIndex( aIndex );
-    }
-
-// -----------------------------------------------------------------------------
-// CLocPsySettingsContainer::HandleMarkCommandL
-// -----------------------------------------------------------------------------
-void CLocPsySettingsContainer::HandleMarkCommandL( TInt aCommand )
-	{
-	AknSelectionService::HandleMarkableListProcessCommandL( aCommand, iListBox ); 
-	} 
-
-// -----------------------------------------------------------------------------
-// CLocPsySettingsContainer::UpdateL
-// -----------------------------------------------------------------------------
-void CLocPsySettingsContainer::UpdateL()
-    {   
-    iListBox->HandleItemAdditionL();
-    iListBox->HandleItemRemovalL();
-   
-    TInt currentItem = iListBox->CurrentItemIndex();   
-    MDesCArray* array = iListBox->Model()->ItemTextArray();
-    if( KErrNotFound == currentItem || currentItem >= array->MdcaCount() )
-        {
-        TInt newSelected = array->MdcaCount() - 1;
-        if( newSelected >= KMinSelectedItemNumber )
-            {
-            iListBox->SetCurrentItemIndex( newSelected );
-            }
-        }
-
-    DrawDeferred();
-    }
-  
-// -----------------------------------------------------------------------------
-// CLocPsySettingsContainer::FocusChanged
-// -----------------------------------------------------------------------------   
-void CLocPsySettingsContainer::FocusChanged( TDrawNow aDrawNow )
-	{
-	if( iListBox )
-		{
-		iListBox->SetFocus( IsFocused(), aDrawNow );				
-		}
-	}
-
-
-// -----------------------------------------------------------------------------
-// CLocPsySettingsContainer::SizeChanged
-// Called by framework when the view size is changed
-// -----------------------------------------------------------------------------
-void CLocPsySettingsContainer::SizeChanged()
-    {
-    iListBox->SetRect( Rect());
-    }
-
-// -----------------------------------------------------------------------------
-// CLocPsySettingsContainer::CountComponentControls
-// -----------------------------------------------------------------------------
-TInt CLocPsySettingsContainer::CountComponentControls() const
-    {
-    return 1; // return nbr of controls inside this container
-    }
-
-// -----------------------------------------------------------------------------
-// CLocPsySettingsContainer::ComponentControl
-// -----------------------------------------------------------------------------
-CCoeControl* CLocPsySettingsContainer::ComponentControl( TInt /*aIndex*/ ) const
-    {    
-    return iListBox;
-    }
- 	
-// -----------------------------------------------------------------------------
-// CLocPsySettingsContainer::AddIconL
-// -----------------------------------------------------------------------------
-void CLocPsySettingsContainer::AddIconL( CAknIconArray*  aIcons,
-                                         const TDesC&    aIconFileWithPath,
-                                         TAknsItemID     aSkinID,
-                                         TInt            aIconGraphicsIndex,
-                                         TInt            aIconGraphicsMaskIndex )
-    {
-    MAknsSkinInstance* skin = AknsUtils::SkinInstance();
-
-    CFbsBitmap* bitmap = NULL;
-    CFbsBitmap* bitmapMask = NULL;
-    AknsUtils::CreateIconL( skin, aSkinID, bitmap, bitmapMask,
-                            aIconFileWithPath, aIconGraphicsIndex,
-                            aIconGraphicsMaskIndex );
-    CleanupStack::PushL( bitmap );
-    CleanupStack::PushL( bitmapMask );
-    
-    CGulIcon* icon = CGulIcon::NewL( bitmap, bitmapMask );
-    
-    // Remove the Bitmap and the Bitmap Icon from the Clean up stack since 
-    // the ownership is taken over by the icon
-    CleanupStack::Pop( bitmapMask );
-    CleanupStack::Pop( bitmap ); 
-    
-    CleanupStack::PushL( icon );
-    aIcons->AppendL( icon );
-    CleanupStack::Pop( icon ); // icon
-    }
-  
-
-// -----------------------------------------------------------------------------
-// CLocPsySettingsContainer::LocIconFileNameLC
-// -----------------------------------------------------------------------------
-TFileName* CLocPsySettingsContainer::LocIconFileNameLC() const
-    {
-    TFileName* fileName = new(ELeave) TFileName;
-    CleanupStack::PushL( fileName );
-    
-	TFileName* tmpName = new(ELeave) TFileName;
-    CleanupStack::PushL( tmpName );
-	
-    tmpName->Append( KDC_BITMAP_DIR );
-    tmpName->Append( KPosMethodSettingsIconFileName );
-
-    // Obtain the drive where the DLL is installed
-    TFileName* dllDrive = new (ELeave) TFileName;
-    CleanupStack::PushL( dllDrive );
-    Dll::FileName( *dllDrive );
-    
-    TParse parse;
-    User::LeaveIfError( parse.Set( *dllDrive, NULL, NULL ) );
-    User::LeaveIfError( parse.Set( parse.Drive(), tmpName, NULL ) );
-    
-	fileName->Copy(parse.FullName());
-
-    CleanupStack::PopAndDestroy( dllDrive );
-    CleanupStack::PopAndDestroy( tmpName );
-
-    return fileName;
-    }
-
-// -----------------------------------------------------------------------------
-// CLocPsySettingsContainer::AvkonIconFileNameLC
-// -----------------------------------------------------------------------------
-TFileName* CLocPsySettingsContainer::AvkonIconFileNameLC() const
-    {
-    TFileName* fileName = new(ELeave) TFileName;
-	CleanupStack::PushL( fileName );
-    *fileName = AknIconUtils::AvkonIconFileName();
-    return fileName;
-    }
-
-//  Makes the title of the view
-// -----------------------------------------------------------------------------
-// CLocPsySettingsContainer::MakeTitleL
-// -----------------------------------------------------------------------------
-void CLocPsySettingsContainer::MakeTitleL( TInt aResourceText )
-    {
-    // title pane is owned by the framework
-    CAknTitlePane* title = static_cast<CAknTitlePane*>( StatusPane()->
-        ControlL( TUid::Uid( EEikStatusPaneUidTitle ) ) );
-    HBufC* buf = StringLoader::LoadL( aResourceText );
-    title->SetText( buf ); // Takes ownership of buf
-    }
-
-// -----------------------------------------------------------------------------
-// CLocBaseContainer::MakeEmptyTextListBoxL
-// -----------------------------------------------------------------------------
-void CLocPsySettingsContainer::MakeEmptyTextListBoxL( CEikListBox&  aListBox,
-                                                      TInt          aResourceText )
-    {
-    HBufC* textFromResourceFile;
-    textFromResourceFile = iCoeEnv->AllocReadResourceLC( aResourceText );
-    // Set text for empty list
-    aListBox.View()->SetListEmptyTextL( *textFromResourceFile );
-    CleanupStack::PopAndDestroy( textFromResourceFile );
-    }
-
-// -----------------------------------------------------------------------------
-// CLocBaseContainer::StatusPane
-// -----------------------------------------------------------------------------
-CEikStatusPane* CLocPsySettingsContainer::StatusPane()
-    {
-    return iEikonEnv->AppUiFactory()->StatusPane();
-    }
-  
-// -----------------------------------------------------------------------------
-// CLocPsySettingsContainer::CreateListboxL
-// 
-// -----------------------------------------------------------------------------
-void CLocPsySettingsContainer::CreateListboxL(MLocPsySettings* aSettingsModel)
-    {
-    delete iListBox;
-    iListBox = NULL;    
-
-    iListBox = new(ELeave) CAknSingleGraphicStyleListBox();
-    iListBox->SetContainerWindowL( *this );
-    iListBox->SetListBoxObserver( this );
-    
-	TResourceReader reader;
-    iEikonEnv->CreateResourceReaderLC( reader, R_LOCATION_PSY_LISTBOX );
-    iListBox->ConstructFromResourceL( reader );
-    CleanupStack::PopAndDestroy(); //reader
-    
-    UpdateIconsL();
-
-    CLocPsyLBModel* lbmodel = CLocPsyLBModel::NewL( aSettingsModel );
-	iListBox->Model()->SetItemTextArray( lbmodel );
-	iListBox->Model()->SetOwnershipType( ELbmOwnsItemArray );
-	
-	MakeEmptyTextListBoxL( *iListBox, R_LOC_PSY_METHODS_LIST_EMPTY );
-	
-    // Make scroll arrows
-    iListBox->CreateScrollBarFrameL( ETrue );
-    iListBox->ScrollBarFrame()->SetScrollBarVisibilityL( CEikScrollBarFrame::EOff,
-                                                         CEikScrollBarFrame::EAuto );
-    iListBox->ActivateL();
-    }
-
-
-// -----------------------------------------------------------------------------
-// CLocPsySettingsContainer::UpdateIconsL
-// -----------------------------------------------------------------------------
-void CLocPsySettingsContainer::UpdateIconsL()
-    {
-    CAknIconArray* icons = new( ELeave ) CAknIconArray( KViewListboxGranularity );
-    CleanupStack::PushL( icons );
-
-	TFileName *locIconFile = LocIconFileNameLC();
-
-    AddIconL( icons, 
-    		  *locIconFile,
-    		  KAknsIIDQgnPropPslnActive, 
-    		  EMbmLocpsysettingsQgn_prop_psln_active , 
-    		  EMbmLocpsysettingsQgn_prop_psln_active_mask );
-
-    CleanupStack::PopAndDestroy(locIconFile);
-
-    TFileName* aknIconFile = AvkonIconFileNameLC();
-
-    AddIconL( icons,
-    		  *aknIconFile,
-    		  KAknsIIDQgnPropEmpty, 
-    		  EMbmAvkonQgn_prop_empty , 
-    		  EMbmAvkonQgn_prop_empty_mask );
-
-    CleanupStack::PopAndDestroy(aknIconFile);
-
-    //get old icons and delete those
-    CAknIconArray* Oldicons = static_cast<CAknIconArray*>(
-        iListBox->ItemDrawer()->ColumnData()->IconArray() );    
-    delete Oldicons;
-
-    //set new icons to array
-    iListBox->ItemDrawer()->ColumnData()->SetIconArray( icons );  
-    CleanupStack::Pop(icons);
-    }
-
-// End of File
--- a/locationsystemui/locationsysui/locpsysettings/locpsysettingsui/src/locpsysettingsui.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,244 +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:  Postioning Method Settings UI plugin to the Location System
-*				  UI engine
-*
-*/
-
-
-// System Include
-#include <aknViewAppUi.h>
-#include <barsread.h> 		// For TResourceReader
-#include <bautils.h>
-#include <StringLoader.h>
-#include <locpsysettingsuiview.rsg>
-#include  <eikmenub.h>						// Menu Bar
-
-
-// User Includes
-#include "locpsysettingsui.h"
-#include "locsettingsuiobserver.h"
-#include "locsettingsuiparams.h"
-#include "locpsysettingsview.h"
-
-
-// ---------------------------------------------------------------------------
-// CLocPsySettingsUi::CLocPsySettingsUi
-// C++ default constructor.
-// ---------------------------------------------------------------------------
-CLocPsySettingsUi::CLocPsySettingsUi( MLocSettingsUiObserver&	aSettingsUiObserver,
-					 		 	 	  CAknViewAppUi&			aAppUi )
-	:CLocSettingsUi( aSettingsUiObserver, aAppUi ),
-	iResourceLoader( *CCoeEnv::Static())
-	{
-	}
-
-// ---------------------------------------------------------------------------
-// CLocPsySettingsUi::~CLocPsySettingsUi
-// Destructor.
-// ---------------------------------------------------------------------------	
-CLocPsySettingsUi::~CLocPsySettingsUi()	
-	{
-	// Close the Resource loader
-	iResourceLoader.Close();   
-	}
-
-// ---------------------------------------------------------------------------
-// CLocPsySettingsUi* CLocPsySettingsUi::NewL
-// Symbian OS two-phased constructor
-// 
-// @return CLocPsySettingsUi* Reference to the Settings UI object
-// ---------------------------------------------------------------------------	
-CLocPsySettingsUi* CLocPsySettingsUi::NewL( TAny* aParams )
-	{
-	CLocSettingsUiParams* 	param = reinterpret_cast<CLocSettingsUiParams *>(aParams);
-	MLocSettingsUiObserver& observer = param->SettingsUiObserver();
-	CAknViewAppUi& 		 appUi = param->AppUi();
-	CLocPsySettingsUi* self = new ( ELeave )CLocPsySettingsUi( observer,
-										  		   			   appUi );
-	CleanupStack::PushL( self );
-	self->ConstructL();
-	CleanupStack::Pop( self );
-	return self; 
-	}
-
-// ---------------------------------------------------------------------------
-// void CLocPsySettingsUi::ConstructL
-// Second phase constructor.
-// ---------------------------------------------------------------------------	
-void CLocPsySettingsUi::ConstructL()
-	{
-    
-	// Open the Resource file for the plugin
-	OpenLocalizedResourceFileL( KPosSettingsUiResFileName, 
-							    iResourceLoader );
-							    
-	// Create the Position Method Settings UI View
-	iView = CLocPsySettingsView::NewL( *this );
-	
-	// Transferring the view's control to AppUi
-	iAppUi.AddViewL( iView );
-	
-	// Obtaining the View Id for reference
-	iViewId = iView->Id();
-
-	}
-
-// ---------------------------------------------------------------------------
-// void CLocPsySettingsUi::LaunchL
-// Inherited from CLocSettingsUi
-// Launches the Settings UI
-//
-// @param aUiLaunchParams	Flags that define specific configuration of
-//							if the Settings UI, that the user of the API
-//							wants to launch.
-// ---------------------------------------------------------------------------	
-void CLocPsySettingsUi::LaunchL( TInt		/* aUiLaunchParams */)
-	{        
-	// Activate self
-	iAppUi.ActivateLocalViewL( iViewId );
-	}
-
-// ---------------------------------------------------------------------------
-// void CLocPsySettingsUi::Close
-// Inherited from CLocSettingsUi
-// Closes the running Settings UI prematurely.
-// ---------------------------------------------------------------------------	
-void CLocPsySettingsUi::Close()
-	{
-	// Close the Menubar if it's being displayed
-	iView->StopDisplayingMenuBar();
-	}
-
-// ---------------------------------------------------------------------------
-// void CLocPsySettingsUi::GetCaptionL
-// Inherited from CLocSettingsUi
-// Method for getting caption of this plugin. This should be the 
-// localized name of the settings view to be shown in parent view.
-//
-// @param aCaption pointer to Caption variable
-// ---------------------------------------------------------------------------
-void CLocPsySettingsUi::GetCaptionL( TDes& aCaption ) const
-	{
-	HBufC* caption = StringLoader::LoadL( R_POSSETTINGSUI_CAPTION );
-    aCaption.Copy( *caption );
-    delete caption;
-	}
-
-// ---------------------------------------------------------------------------
-// TInt CLocPsySettingsUi::GetPriority
-// Inherited from CLocSettingsUi
-// Returns the priority of the UI module. 
-// 
-// @return Priority of the Settings UI
-// ---------------------------------------------------------------------------
-TInt CLocPsySettingsUi::GetPriority()
-	{
-	// As defined by the Location System UI UI specification, the PSY settings
-	// plug-in should be inserted at the first level
-	const TInt KPsyPluginPriority = 0x00000001;
-	return KPsyPluginPriority;
-	}
-
-// ---------------------------------------------------------------------------
-// void CLocPsySettingsUi::HandleCommandL
-// Inherited from MCommandHandler
-// Handles commands from the views
-// 
-// @param  aCommand Command ID
-// ---------------------------------------------------------------------------
-void CLocPsySettingsUi::HandleCommandL( TInt aCommand )
-	{
-	switch ( aCommand )
-		{
-		// Handle any plug-in specific internal commands here
-		case EAknSoftkeyBack:
-			{
-			// The UI is intended to be closed. Pass the event 
-			// to the observer
-			iSettingsUiObserver.SettingClosed( KErrNone );
-			break;
-			}
-		default:
-			{
-			// Un-handled commands are to be passed to the 
-			// App UI
-			iAppUi.HandleCommandL( aCommand );
-			break;	
-			}
-		}
-	}
-
-// ---------------------------------------------------------------------------
-// void CLocPsySettingsUi::OpenLocalizedResourceFileL
-// Opens the nearest localized resourcefile using aResourceLoader. 
-// aResourceLoader should be opened only once before closing it. 
-// Otherwise it will raise a panic. Therefore it is better to have 
-// multiple resource loaders.
-// 
-// @param aResourceFileName Drive and name of resource file in format 
-//                          <path>:<rsc_file_name>
-// @param aResourceLoader Resource loader for the resource. The loader 
-//                        must not be opened allready or it will raise 
-//                        a panic. It is caller's responsibility to 
-//                        close the resource loader after using the 
-//                        resource.
-// ---------------------------------------------------------------------------	
-void CLocPsySettingsUi::OpenLocalizedResourceFileL( const TDesC& 			   aResourceFileName, 
-   													      RConeResourceLoader& aResourceLoader )
-    {
-    RFs fsSession;
-    User::LeaveIfError( fsSession.Connect());
-    
-    // Add the RFs session to the CleanupStack
-    CleanupClosePushL( fsSession );
-    
-	TFileName* tmpName = new(ELeave) TFileName;
-    CleanupStack::PushL( tmpName );
-    
-    // Append the Resource Files Directory
-    tmpName->Append( KDC_RESOURCE_FILES_DIR );
-    
-    // Append the Ressource File Name
-    tmpName->Append( aResourceFileName );
-    
-    
-    // Obtain the drive where the DLL is installed
-    TFileName* dllDrive = new (ELeave) TFileName;
-    CleanupStack::PushL( dllDrive );
-    Dll::FileName( *dllDrive );
-    
-    // Obtain the Complete path for the Resource File
-    TParse parse;
-	User::LeaveIfError( parse.Set( *dllDrive, NULL, NULL ) );
-    User::LeaveIfError( parse.Set( parse.Drive(), tmpName, NULL ) );
-	TFileName* fileName = new(ELeave) TFileName;
-	CleanupStack::PushL( fileName );
-	fileName->Append( parse.FullName());
-    
-    // Get language of resource file
-    BaflUtils::NearestLanguageFile( fsSession, *fileName );
-        
-    // Open resource file    
-    aResourceLoader.OpenL( *fileName );
-    
-    // Pop all the fields
-    CleanupStack::PopAndDestroy( fileName );
-    CleanupStack::PopAndDestroy( dllDrive );
-    CleanupStack::PopAndDestroy( tmpName );
-    
-    //If leave occurs before this, close is called automatically
-    // from by the CleanupStack  
-    CleanupStack::PopAndDestroy(); // fsSession
-    }
--- a/locationsystemui/locationsysui/locpsysettings/locpsysettingsui/src/locpsysettingsuiimptable.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,45 +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:  ECOM proxy table for this plugin
-*
-*/
-
-
-// System includes
-#include <e32std.h>
-#include <ecom/implementationproxy.h>
-
-// User includes
-#include "locpsysettingsui.h"
-#include "locpsysettingsuiuid.hrh"
-
-// Constants
-const TImplementationProxy KPosMethodSettingsUiImpTable[] = 
-	{
-	IMPLEMENTATION_PROXY_ENTRY( LOCPSYSETTINGSUI_UID3,	CLocPsySettingsUi::NewL )
-	};
-
-
-// ---------------------------------------------------------------------------
-// ImplementationGroupProxy
-// Gate/factory function
-//
-// ---------------------------------------------------------------------------
-//
-EXPORT_C const TImplementationProxy* ImplementationGroupProxy(TInt& aTableCount)
-	{
-	aTableCount = sizeof( KPosMethodSettingsUiImpTable ) 
-        / sizeof( TImplementationProxy );
-	return KPosMethodSettingsUiImpTable;
-	}
--- a/locationsystemui/locationsysui/locpsysettings/locpsysettingsui/src/locpsysettingsview.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,518 +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:  Postioning Method Settings view class methods.
-*
-*/
-
-
-// System Include
-#include  <aknViewAppUi.h>					// AknViewAppUi
-#include  <featmgr.h> 						// FeatureManager
-#include  <eikmenup.h>						// Menu pane
-#include  <eikmenub.h>						// Menu Bar
-#include  <locpsysettingsuiview.rsg>		// Resource File
-#include  <avkon.rsg>
-#include  <avkon.hrh>
-#include  <hlplch.h>						// Help
-#include <AknQueryDialog.h>             // For Confirmation query
-
-// User Includes
-#include  "locpsysettingsview.h"
-#include  "locpsysettingscontainer.h" 
-#include  "locpsysettingsui.hrh"
-#include  "locpsyappdebug.h"
-#include  "locpsyeng.h"
-#include  "locpsyinfo.h"
-#include  "locpsysettings.h"
-#include  "locpsyconfigclientimpl.h"
-#include  "locpsycommandhandler.h"
-#include  "locpsysettingsuiuid.hrh"
-
-// ================= MEMBER FUNCTIONS =======================
-
-// -----------------------------------------------------------------------------
-// CLocPsySettingsView::CLocPsySettingsView
-// C++ default constructor can NOT contain any code, that
-// might leave.
-// -----------------------------------------------------------------------------
-CLocPsySettingsView::CLocPsySettingsView( MLocPsyCommandHandler& 	aCommandHandler ):
-    iCommandHandler( aCommandHandler )
-    {
-    }
-
-// -----------------------------------------------------------------------------
-// CLocPsySettingsView::~CLocPsySettingsView
-// -----------------------------------------------------------------------------
-CLocPsySettingsView::~CLocPsySettingsView()
-    {
-    if ( iContainer )
-        {
-        AppUi()->RemoveFromViewStack( *this, iContainer );
-        }
-
-    delete iContainer;
-    
-    FeatureManager::UnInitializeLib();
-    
-    // Delete the Postioning Method Settings Engine
-	delete iLocationEngine;
-	
-    // Close the Handle to the RPostionServer
-    iPositionServer.Close();
-    }
-    
-// -----------------------------------------------------------------------------
-// CLocPsySettingsView::NewLC
-// Two-phased constructor.
-// -----------------------------------------------------------------------------
-CLocPsySettingsView* CLocPsySettingsView::NewL( MLocPsyCommandHandler& 	aCommandHandler )
-    {
-    CLocPsySettingsView* self = CLocPsySettingsView::NewLC( aCommandHandler );
-    CleanupStack::Pop(self);
-    return self;
-    }
-
-// -----------------------------------------------------------------------------
-// CLocPsySettingsView::NewLC
-// Two-phased constructor.
-// -----------------------------------------------------------------------------
-CLocPsySettingsView* CLocPsySettingsView::NewLC( MLocPsyCommandHandler& aCommandHandler )
-    {
-    CLocPsySettingsView* self = new (ELeave) CLocPsySettingsView( aCommandHandler );
-    CleanupStack::PushL( self );
-    self->ConstructL();
-    return self;
-    }
-
-// -----------------------------------------------------------------------------
-// CLocPsySettingsView::ConstructL
-// Symbian 2nd phase constructor can leave.
-// -----------------------------------------------------------------------------
-void CLocPsySettingsView::ConstructL()
-    {
-    FeatureManager::InitializeLibL();
-    BaseConstructL( R_LOCATION_HOME_VIEW );
-    
-    // Create the Postioning Method Settings Engine
-	iLocationEngine = CLocPsyEng::NewL();
-	
-    // Open a handle to the RPostionServer. This is required to determine
-    // whether a PSY is currently enabled or disabled
-    User::LeaveIfError( iPositionServer.Connect());
-	
-    }
-
-// -----------------------------------------------------------------------------
-// TUid CLocPsySettingsView::Id
-// -----------------------------------------------------------------------------
-TUid CLocPsySettingsView::Id() const
-    {
-    return TUid::Uid( LOCPSYSETTINGSUI_UID3 );
-    }
-
-// -----------------------------------------------------------------------------
-// CLocPsySettingsView::HandleCommandL
-// -----------------------------------------------------------------------------
-void CLocPsySettingsView::HandleCommandL(TInt aCommand)
-    {
-    MLocPsySettings* psySettings = iLocationEngine->SettingsModel();
-        
-    TInt listIndex = iContainer->SelectedRow();
-    
-    switch ( aCommand )
-        {
-        case ELocCmdEnablePsy:
-			{
-			TRAPD( err, psySettings->EnablePsyL( listIndex ));
-        	if ( err == KErrNone )
-        		{
-				iContainer->HandleMarkCommandL( EAknCmdMark );
-        		}
-			break;
-			}
-        case ELocCmdDisablePsy:
-			{
-			
-            TBool popUpConfirmation = EFalse;
-            
-            // Obtain the PSY specific information
-            CLocPsyInfo* info = NULL;
-            TRAPD( error, info = psySettings->GetPsyL( listIndex ));
-            if( error )
-                {
-                // Unable to obtain PSY info. Don't continue with the operation
-                break;
-                }
-            
-            // Obtain the module status
-            TPositionModuleStatus moduleStatus;
-            error = iPositionServer.GetModuleStatus( moduleStatus,
-                                                     info->PsyId());
-             if( error )
-                {
-                // Unable to obtain module status. Don't continue with the operation
-                break;
-                }                                               
-
-            // Set the  popUpConfirmation flag if the PSY is being used
-            if( TPositionModuleStatus::EDeviceActive == moduleStatus.DeviceStatus() ||
-                TPositionModuleStatus::EDeviceReady == moduleStatus.DeviceStatus() ||
-                TPositionModuleStatus::EDeviceInitialising == moduleStatus.DeviceStatus() || 
-                TPositionModuleStatus::EDeviceStandBy == moduleStatus.DeviceStatus())
-                {
-                popUpConfirmation = ETrue;
-                }
-                
-            
-            if( popUpConfirmation )
-                {
-                // The user should not be allowed to disable a PSY that is currently
-                //being used. Hence, a confirmation dialog is popped up
-                iConfirmationQuery = CAknQueryDialog::NewL();
-            	TBool result = 
-            	    iConfirmationQuery->ExecuteLD( R_PSYDISABLE_CONFIG_QUERY );
-                iConfirmationQuery = NULL;            	    
-                if( !result )
-                    {
-                    break;
-                    } 
-                }      
-            
-			TRAPD( err, psySettings->DisablePsyL( listIndex ));
-        	if ( err == KErrNone )
-        		{
-				iContainer->HandleMarkCommandL( EAknCmdUnmark );
-        		}
-			break;
-			}
-        case ELocCmdConfigurePsy:
-        	{
-			psySettings->ConfigurePsyL( listIndex, *this );
-        	break;
-        	}
-        case EAknCmdHelp:
-        	{
-           	HlpLauncher::LaunchHelpApplicationL( CEikonEnv::Static()->WsSession(),
-           										   AppUi()->AppHelpContextL());
-        	break;	
-        	}
-        case EAknSoftkeyBack:
-        	{
-        	iCommandHandler.HandleCommandL( EAknSoftkeyBack );
-        	break;
-        	}
-        case EAknSoftkeyExit:
-            {
-            AppUi()->HandleCommandL( EEikCmdExit );
-            break;
-            } 
-        case ELocCmdNone:
-        	{
-        	break;
-        	}
-        default: // EAknCmdHelp or other cmd
-            {
-            AppUi()->HandleCommandL( aCommand );
-            break;
-            }
-        }
-    }
-
-// -----------------------------------------------------------------------------
-// CLocPsySettingsView::ProcessCommandL
-// -----------------------------------------------------------------------------
-void CLocPsySettingsView::ProcessCommandL( TInt aCommand )
-    {
-    MenuBar()->SetContextMenuTitleResourceId(R_LOCATION_CONTEXT_MENUBAR_HOME_VIEW);
-    // Close popup menu if open
-    MenuBar()->StopDisplayingMenuBar();
-    // Call base class
-    CAknView::ProcessCommandL( aCommand );
-    }
-
-// -----------------------------------------------------------------------------
-// CLocPsySettingsView::DynInitMenuPaneL
-// -----------------------------------------------------------------------------
-void CLocPsySettingsView::DynInitMenuPaneL( TInt          aResourceId, 
-                                            CEikMenuPane* aMenuPane )
-    {
-    if ( aResourceId == R_LOCATION_APP_MENU )
-        {
-        User::LeaveIfNull( aMenuPane );
-        //Handle Help Fature
-        HandleHelpFeature( *aMenuPane );
-        //Context sensitive menu items
-        }
-    else if ( aResourceId == R_LOCATION_HOME_VIEW_MENU )
-    	{
-        MLocPsySettings* psySettings = iLocationEngine->SettingsModel();
-        
-        TInt listIndex = iContainer->SelectedRow();
-        if( listIndex >= 0 )
-        	{
-        	TBool isPsyEnabled = psySettings->IsPsyEnabled( listIndex ); 
-
-        	//Enable is present only if the current selected PSY is disabled.
-        	aMenuPane->SetItemDimmed( ELocCmdEnablePsy,isPsyEnabled );
-
-        	//Disable is present only if the current selected PSY is enabled
-        	aMenuPane->SetItemDimmed( ELocCmdDisablePsy,!isPsyEnabled );
-        
-        	// Method setting is present only if the current selected PSY 
-        	//is configurable.
-			aMenuPane->SetItemDimmed( ELocCmdConfigurePsy, 
-								      !psySettings->IsPsyConfigurable( listIndex ));
-        	}
-        else   
-        	{
-
-        	//Disable the menu items when there are no PSYS installed
-        	aMenuPane->SetItemDimmed( ELocCmdEnablePsy, ETrue );
-        	aMenuPane->SetItemDimmed( ELocCmdDisablePsy, ETrue );
-			aMenuPane->SetItemDimmed( ELocCmdConfigurePsy, ETrue );
-        	}
-        }
-    }
-
-// -----------------------------------------------------------------------------
-// CLocPsySettingsView::NotifyL
-// -----------------------------------------------------------------------------
-void CLocPsySettingsView::NotifyL()
-    {
-    MLocPsySettings* psySettings = iLocationEngine->SettingsModel();
-    // Disable the Middle soft Key if there are no PSYs
-    if( psySettings && !psySettings->PSYCount())
-        {
-        Cba()->SetCommandSetL( R_LOCATION_OPTIONS_EMPTY_BACK );
-        }
-    else
-        {
-        MenuBar()->SetContextMenuTitleResourceId(R_LOCATION_CONTEXT_MENUBAR_HOME_VIEW);	
-        Cba()->SetCommandSetL( R_LOCATION_OPTIONS_SELECTION_BACK );   
-        } 
-     
-    // If the confirmation query is currently being displayed then check whether 
-    // its valid to continue to display the query. If not then dismiss the 
-    // query    
-    if( iConfirmationQuery )
-        {
-        if( !iContainer )
-            {
-            // The is no container. There is nothing to update. Just return
-            return;
-            }
-        TInt listIndex = iContainer->SelectedRow();
-                  
-        // Obtain the PSY specific information
-        CLocPsyInfo* info = NULL;
-        TRAPD( error, info = psySettings->GetPsyL( listIndex ));
-        if( !error )
-            {
-            // Obtain the module status
-            TPositionModuleStatus moduleStatus;
-            error = iPositionServer.GetModuleStatus( moduleStatus,
-                                                     info->PsyId());
-             if( !error )
-                {
-                if( TPositionModuleStatus::EDeviceDisabled == moduleStatus.DeviceStatus() ||
-                    TPositionModuleStatus::EDeviceInactive == moduleStatus.DeviceStatus())
-                    {
-                    // If the PSY for which the confirmation query is being displayed 
-                    // is currently disabled then the query needs to be dismissed
-                    delete iConfirmationQuery;
-                    iConfirmationQuery = NULL;
-                    }
-                }                                               
-
-            
-            }    
-        }
-    	
-    // Settings view implements the MLocEngObserver observer interface
-    // which contains this leavable method.
-    if ( iContainer )
-        {
-    	LOCAPPDEBUG("CLocPsySettingsView::NotifyL() container update called");
-        iContainer->UpdateL();
-        }
-    }
-
-// -----------------------------------------------------------------------------
-//  CLocPsySettingsView::NotifyError
-// -----------------------------------------------------------------------------
-void CLocPsySettingsView::NotifyError( TInt aErrorCode )
-    {
-    LOCAPPDEBUG("CLocPsySettingsView::NotifyError() called");
-    if ( aErrorCode != KErrNone )
-        {
-        CCoeEnv::Static()->HandleError( aErrorCode );
-        }
-    }
-
-
-// -----------------------------------------------------------------------------
-//  CLocPsySettingsView::ProcessKeyEventL
-// -----------------------------------------------------------------------------
-TBool CLocPsySettingsView::ProcessKeyEventL( const TKeyEvent& aKeyEvent, 
-									  TEventCode aType )
-	{
-    MLocPsySettings* psySettings = iLocationEngine->SettingsModel();
-	if( psySettings && !psySettings->PSYCount())
-		{
-		return EKeyWasNotConsumed;
-	  }
-	TInt listIndex = iContainer->SelectedRow();   
-
-	// Popup the Menu when OK Selection key is pressed
-    if ( aType == EEventKey && aKeyEvent.iCode == EKeyOK )
-    	{
-        //Check if the current positioning method is configurable or not
-        //If yes then launch the context specific value 
-        //else toggle status of the current positioning method (changes for single click)
-        if(!psySettings->IsPsyConfigurable( listIndex ))
-            {
-            if(!psySettings->IsPsyEnabled( listIndex ))
-                {
-                //Enable
-               HandleCommandL(ELocCmdEnablePsy);
-                }
-            else
-                {
-                //disable
-                HandleCommandL(ELocCmdDisablePsy);
-                }
-            }
-        else
-            {
-            MenuBar()->TryDisplayContextMenuBarL();
-            }
-    	return EKeyWasConsumed;
-    	}
-    return EKeyWasNotConsumed;
-	}
-
-// -----------------------------------------------------------------------------
-//  CLocPsySettingsView::HandleServerAppExit
-// -----------------------------------------------------------------------------
-void CLocPsySettingsView::HandleServerAppExit(TInt /*aReason*/)
-	{
-    MLocPsySettings* psySettings = iLocationEngine->SettingsModel();
-
-	/* Once the application exits the application handle in the Engine has to 
-	 * be closed. Also this callback is triggered when the PSY configuration UI 
-	 * is running but it has to be closed for some reason. For example, if 
-	 * the PSY for which the configuration UI is running, is uninstalled then
-	 * the configuration application has to be closed.
-	 */
-    psySettings->ClosePsyConfigurationApp();
-	}
-
-// -----------------------------------------------------------------------------
-// CLocPsySettingsView::HandleScreenSizeChange
-// -----------------------------------------------------------------------------
-//
-void CLocPsySettingsView::HandleScreenSizeChange() 
-	{
-	if( iContainer )
-		{
-		iContainer->SetRect( ClientRect());		
-		}
-	}
-            	
-// -----------------------------------------------------------------------------
-// CLocPsySettingsView::DoActivateL
-// -----------------------------------------------------------------------------
-void CLocPsySettingsView::DoActivateL(
-   const TVwsViewId& /*aPrevViewId*/,TUid /*aCustomMessageId*/,
-   const TDesC8& /*aCustomMessage*/ )
-    {
-    LOCAPPDEBUG("CLocPsySettingsView::DoActivateL() called");
-    if ( !iContainer )
-        {
-    	iLocationEngine->CreateModelL( ELocPsySettings );
-    	MLocPsySettings* psySettings = iLocationEngine->SettingsModel();
-    	psySettings->SetObserver(*this);
-        iContainer = CLocPsySettingsContainer::NewL( this,
-        						 					 this, 
-        						 					 this, 
-        						 					 psySettings, 
-        						 					 ClientRect());
-        AppUi()->AddToStackL( *this, iContainer );
-        } 
-        
-	MLocPsySettings* psySettings = iLocationEngine->SettingsModel();
-    // Disable the Middle soft Key if there are no PSYs
-    if( psySettings && !psySettings->PSYCount())
-        {
-        Cba()->SetCommandSetL( R_LOCATION_OPTIONS_EMPTY_BACK );
-        }
-    else
-        {
-        MenuBar()->SetContextMenuTitleResourceId(R_LOCATION_CONTEXT_MENUBAR_HOME_VIEW );
-        Cba()->SetCommandSetL( R_LOCATION_OPTIONS_SELECTION_BACK );   
-        } 
-   }
-
-// -----------------------------------------------------------------------------
-// CLocPsySettingsView::DoDeactivate
-// -----------------------------------------------------------------------------
-void CLocPsySettingsView::DoDeactivate()
-	{
-    iLocationEngine->SettingsModel()->RemoveModelObserver();
-    iLocationEngine->RemoveModel( ELocPsySettings );
-    if ( iContainer )
-    	{
-        AppUi()->RemoveFromViewStack( *this, iContainer );
-        }
-    delete iContainer;
-    iContainer = NULL;
-    }
-
-// -----------------------------------------------------------------------------
-// CLocPsySettingsView::ActivateLocalViewL
-// -----------------------------------------------------------------------------
-void CLocPsySettingsView::ActivateLocalViewL( TUid aViewId,
-    TUid aCustomMessageId, const TDesC8& aCustomMessage )
-    {
-    CAknViewAppUi* appui = AppUi();
-    appui->ActivateLocalViewL(aViewId, aCustomMessageId, aCustomMessage);
-    }
-
-// -----------------------------------------------------------------------------
-// CLocPsySettingsView::ActivateLocalViewL
-// -----------------------------------------------------------------------------
-void CLocPsySettingsView::ActivateLocalViewL( TUid aViewId )
-    {
-    TBuf8<1> customMessage;
-    customMessage.Zero();
-    // Custom message Id value contains view id of caller
-    ActivateLocalViewL( aViewId, Id(), customMessage );
-    }
-
-
-
-// -----------------------------------------------------------------------------
-// CLocPsySettingsView::HandleHelpFeature
-// -----------------------------------------------------------------------------
-void CLocPsySettingsView::HandleHelpFeature( CEikMenuPane& aMenuPane ) const
-    {
-    if ( FeatureManager::FeatureSupported( KFeatureIdHelp ))
-        {
-        aMenuPane.SetItemDimmed( EAknCmdHelp, EFalse );
-        }
-    else
-        {
-        aMenuPane.SetItemDimmed( EAknCmdHelp, ETrue );
-        }
-    }
--- a/locationsystemui/locationsysui/locsettingsuiservice/group/bld.inf	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,37 +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 provides the information required for building
-*				 Location System UI Service Client library and Server
-*                  
-*
-*/
-
-
-PRJ_PLATFORMS
-DEFAULT
-
-PRJ_EXPORTS
-
-PRJ_MMPFILES
-// Include bld.inf files
-
-// Location Settings UI Service Client Library
-#include "../locsettingsuiclient/group/bld.inf"
-
-// Location Settings UI Service Server
-#include "../locsettingsuiserver/group/bld.inf"
-
-PRJ_TESTMMPFILES
-
-//  End of File  
--- a/locationsystemui/locationsysui/locsettingsuiservice/locsettingsuiclient/BWINS/locsettingsuiclientu.def	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-EXPORTS
-	?CancelLaunchedSettingsUi@CLocSettingsUiClient@@QAEHXZ @ 1 NONAME ; int CLocSettingsUiClient::CancelLaunchedSettingsUi(void)
-	?LaunchSettingsUiAsEmbeddedAppL@CLocSettingsUiClient@@QAEXVTUid@@HAAVTRequestStatus@@@Z @ 2 NONAME ; void CLocSettingsUiClient::LaunchSettingsUiAsEmbeddedAppL(class TUid, int, class TRequestStatus &)
-	?LaunchSettingsUiL@CLocSettingsUiClient@@QAEXVTUid@@HAAVTRequestStatus@@@Z @ 3 NONAME ; void CLocSettingsUiClient::LaunchSettingsUiL(class TUid, int, class TRequestStatus &)
-	?NewL@CLocSettingsUiClient@@SAPAV1@XZ @ 4 NONAME ; class CLocSettingsUiClient * CLocSettingsUiClient::NewL(void)
-	?NewLC@CLocSettingsUiClient@@SAPAV1@XZ @ 5 NONAME ; class CLocSettingsUiClient * CLocSettingsUiClient::NewLC(void)
-	?ClosePosSettings@CLocSettingsUiClient@@QAEHXZ @ 6 NONAME ; int CLocSettingsUiClient::ClosePosSettings(void)
-	?LaunchPosSettingsAsEmbeddedAppL@CLocSettingsUiClient@@QAEXAAVTRequestStatus@@@Z @ 7 NONAME ; void CLocSettingsUiClient::LaunchPosSettingsAsEmbeddedAppL(class TRequestStatus &)
-	?LaunchPosSettingsL@CLocSettingsUiClient@@QAEXAAVTRequestStatus@@@Z @ 8 NONAME ; void CLocSettingsUiClient::LaunchPosSettingsL(class TRequestStatus &)
-	?LaunchSettingsUiAsEmbeddedAppL@CLocSettingsUiClient@@QAEXVTUid@@ABVTDesC16@@AAVTRequestStatus@@@Z @ 9 NONAME ; void CLocSettingsUiClient::LaunchSettingsUiAsEmbeddedAppL(class TUid, class TDesC16 const &, class TRequestStatus &)
-	?LaunchSettingsUiL@CLocSettingsUiClient@@QAEXVTUid@@ABVTDesC16@@AAVTRequestStatus@@@Z @ 10 NONAME ; void CLocSettingsUiClient::LaunchSettingsUiL(class TUid, class TDesC16 const &, class TRequestStatus &)
-
--- a/locationsystemui/locationsysui/locsettingsuiservice/locsettingsuiclient/eabi/locsettingsuiclientu.def	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-EXPORTS
-	_ZN20CLocSettingsUiClient17LaunchSettingsUiLE4TUidiR14TRequestStatus @ 1 NONAME
-	_ZN20CLocSettingsUiClient24CancelLaunchedSettingsUiEv @ 2 NONAME
-	_ZN20CLocSettingsUiClient30LaunchSettingsUiAsEmbeddedAppLE4TUidiR14TRequestStatus @ 3 NONAME
-	_ZN20CLocSettingsUiClient4NewLEv @ 4 NONAME
-	_ZN20CLocSettingsUiClient5NewLCEv @ 5 NONAME
-	_ZTI20CLocSettingsUiClient @ 6 NONAME ; #<TI>#
-	_ZTV20CLocSettingsUiClient @ 7 NONAME ; #<VT>#
-	_ZN20CLocSettingsUiClient16ClosePosSettingsEv @ 8 NONAME
-	_ZN20CLocSettingsUiClient18LaunchPosSettingsLER14TRequestStatus @ 9 NONAME
-	_ZN20CLocSettingsUiClient31LaunchPosSettingsAsEmbeddedAppLER14TRequestStatus @ 10 NONAME
-	_ZN20CLocSettingsUiClient17LaunchSettingsUiLE4TUidRK7TDesC16R14TRequestStatus @ 11 NONAME
-	_ZN20CLocSettingsUiClient30LaunchSettingsUiAsEmbeddedAppLE4TUidRK7TDesC16R14TRequestStatus @ 12 NONAME
-
--- a/locationsystemui/locationsysui/locsettingsuiservice/locsettingsuiclient/group/bld.inf	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +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:  Build information file for project Location Settings UI Service
-*                Client
-*
-*/
-
-
-// To get the MW_LAYER_PLATFORM_EXPORT_PATH macro definitions
-#include <platform_paths.hrh>
-
-PRJ_PLATFORMS
-DEFAULT
-
-PRJ_EXPORTS
-
-PRJ_MMPFILES
-locsettingsuiclient.mmp
-
-PRJ_TESTMMPFILES
-
-PRJ_TESTEXPORTS
--- a/locationsystemui/locationsysui/locsettingsuiservice/locsettingsuiclient/group/locsettingsuiclient.mmp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +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:  Project definition file for project Location Settings UI 
-*                Service Client
-*
-*/
-
-
-#include <data_caging_paths.hrh>
-#include "../inc/locsettingsuiclientuid.hrh"
-#include <platform_paths.hrh> // For the MW_LAYER_SYSTEMINCLUDE
-
-TARGET                  locsettingsuiclient.dll
-TARGETTYPE              dll
-UID                     0x0 LOCSETTINGSUICLIENT_UID
-
-CAPABILITY              CAP_GENERAL_DLL
-VENDORID                VID_DEFAULT
-
-SOURCEPATH              ../src
-SOURCE                  locsettingsuiclient.cpp
-SOURCE                  loclaunchuiao.cpp
-SOURCE                  locsettingsuiservice.cpp
-
-// System Include
-MW_LAYER_SYSTEMINCLUDE
-
-USERINCLUDE             ../inc
-USERINCLUDE				../../../../inc
-USERINCLUDE             ../../../../../inc
-
-LIBRARY                 euser.lib
-LIBRARY                 apparc.lib
-LIBRARY                 cone.lib
-LIBRARY                 eikcore.lib
-LIBRARY                 avkon.lib 
\ No newline at end of file
--- a/locationsystemui/locationsysui/locsettingsuiservice/locsettingsuiclient/inc/loclaunchuiao.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,111 +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:  Active Object to monitor the UI Server launch requests
-*
-*/
-
-
-#ifndef C_LOCLAUNCHUIAO_H
-#define C_LOCLAUNCHUIAO_H
-
-// System Includes
-#include <e32base.h>
-
-// Forward Declarations
-class MLocLaunchUiObserver;
-
-/**
- *  Active Object to monitor the UI Server launch requests
- *
- *  This class is a helper class. The status variable of this active obect is 
- *  used to provide the asynchronous Send Receive server calls. The IPC message
- *  completes on this active object. 
- *
- *  @lib locsettingsuiclient.lib
- *  @since S60 v3.1
- */
-NONSHARABLE_CLASS( CLocLaunchUiAO ): public CActive
-    {
-public:
-    /**
-     * Two Phase constructor 
-     * 
-     * @since S60 v3.1
-     * @param aObserver Observer to the Launch UI Active Object
-     * @return The reference of the newly allocated CLocLaunchUiAO 
-     *         object
-     */
-    static CLocLaunchUiAO* NewL( MLocLaunchUiObserver&    aObserver );
-
-    /**
-     * Two Phase constructor. Leaves the allocated object on the Clean-up
-     * stack 
-     * 
-     * @since S60 v3.1
-     * @param aObserver Observer to the Launch UI Active Object
-     * @return The reference of the newly allocated CLocLaunchUiAO 
-     *         object
-     */
-    static CLocLaunchUiAO* NewLC( MLocLaunchUiObserver&    aObserver );
-
-    /**
-     * C++ Destructor
-     * 
-     * @since S60 v3.1
-     */
-    virtual ~CLocLaunchUiAO();
-
-    /**
-     * Informs the active object that there is an outstanding request.
-     * The function leaves with error KErrInUse
-     *
-     * @since S60 v3.1
-     */
-    void    SetRequestOutStandingL();
-    
-    /**
-     * Returns a reference to the active objects Status variable
-     *
-     * @since S60 v3.1
-     * @return TRequestStatus&  Reference to the Status variable
-     */
-    TRequestStatus&     GetStatusVariable();
-    
-protected:
-    
-    /**
-     * Inherited from CActive
-     */
-    void RunL();
-    
-    /**
-     * Inherited from CActive
-     */
-    void DoCancel();
-
-private:
-    /**
-     * C++ Default Constructor
-     */
-    CLocLaunchUiAO( MLocLaunchUiObserver&    aObserver );
-
-private:
-    /**
-     * Reference to the Observer
-     */ 
-     MLocLaunchUiObserver&    iObserver ;
-     
-    };
-
-#endif //  C_LOCLAUNCHUIAO_H
--- a/locationsystemui/locationsysui/locsettingsuiservice/locsettingsuiclient/inc/loclaunchuiobserver.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,53 +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:  Observer to notify the completion of launching a UI.
-*
-*/
-
-
-#ifndef M_LOCLAUNCHUIOBSERVER_H
-#define M_LOCLAUNCHUIOBSERVER_H
-
-// System Includes
-#include <e32base.h>
-
-/**
- *  Observer to the Launch UI Active Object
- *
- *  The observer is used to notify the completion of a Lauch call. The 
- *  call back from the observer in addition to notifying the completion of
- *  the launch call also returns back an error code which denotes the success
- *  of the launch operation
- *
- *  @lib locsettingsuiclient.lib
- *  @since S60 v3.1
- */
-class MLocLaunchUiObserver
-    {
-
-public:
-    /**
-     * Call back function to notify the success state of the Launch function
-     * function call
-     *
-     * @since S60 v3.1
-     * @param aError Error code to denote the success/failure of the Launch 
-     *               operation
-     */
-    virtual void LaunchUiComplete( TInt    aError ) = 0;
-
-    };
-
-
-#endif // M_LOCLAUNCHUIOBSERVER_H
--- a/locationsystemui/locationsysui/locsettingsuiservice/locsettingsuiclient/inc/locsettingsuiclientuid.hrh	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +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:  UID for Location Settings UI Service Client
-*
-*/
-
-
-#ifndef LOCSETTINGSUICLIENTUID_HRH
-#define LOCSETTINGSUICLIENTUID_HRH
-
-/**
- * UID for Location Settings UI Client
- */
-#define LOCSETTINGSUICLIENT_UID             0x10281860
-
-#endif // LOCSETTINGSUICLIENTUID_HRH
--- a/locationsystemui/locationsysui/locsettingsuiservice/locsettingsuiclient/inc/locsettingsuiservice.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,263 +0,0 @@
-/*
-* Copyright (c) 2005-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:  Client side resource handle to the UI Server
-*
-*/
-
-
-#ifndef R_LOCSETTINGSUISERVICE_H
-#define R_LOCSETTINGSUISERVICE_H
-
-// System Includes
-#include <e32base.h>
-#include <AknServerApp.h>
-
-// User Includes
-#include "loclaunchuiobserver.h"
-
-// Forward Declaration
-class CLocLaunchUiAO;
-
-/**
- *  Client Side handle to the Settings UI server
- *
- *  @lib locsettingsuiclient.lib
- *  @since S60 v3.1
- */
-NONSHARABLE_CLASS( RLocSettingsUiService ): public RAknAppServiceBase,
-                                            public MLocLaunchUiObserver,
-                                            public MAknServerAppExitObserver
-    {
-public:
-    /**
-     * C++ Default Constructor
-     */
-    RLocSettingsUiService();
-    
-    /**
-     * C++ Destructor
-     * 
-     * @since S60 v3.1
-     */
-    virtual ~RLocSettingsUiService();
-
-    /**
-     * Launch a Settings UI in an ui app server. 
-     * The API is used to launch a settings UI. There can be only one 
-     * outstanding Launch request at any instant of time. This is an 
-     * asynchronous function. If a session is already running then the
-     * function leaves with KErrInUse.
-     *
-     * @since S60 v3.1
-     * @param aImplementationUid The ECOM Implementation UID of the 
-     *                           settings UI ECOM plug-in that has to be 
-     *                           launched.
-     * @param aParams            Opaque parameters that is handed over to
-     *                           the Settings UI.
-     * @param aStatus            Request status. On completion contains: 
-     *                           KErrNone, if successful, otherwise one of
-     *                           the other system-wide error codes.
-     *
-     */
-    void LaunchSettingsUiL( TUid            aImplementationUid, 
-                            TInt            aParams,
-                            TRequestStatus& aStatus );
-
-    /**
-     * Launch a Settings UI as an embedded application.
-     * The API is used to launch a settings UI as an embedded application.
-     *
-     * @since S60 v3.1
-     * @param aImplementationUid The ECOM Implementation UID of the 
-     *                           settings UI ECOM plug-in that has to be 
-     *                           launched.
-     * @param aParams            Opaque parameters that is handed over to
-     *                           the Settings UI. 
-     * @param aStatus            Request status. On completion contains: 
-     *                           KErrNone, if successful, otherwise one of
-     *                           the other system-wide error codes.
-     *
-     */
-    void LaunchSettingsUiAsEmbeddedAppL( 
-                                TUid            aImplementationUid, 
-                                TInt            aParams,
-                                TRequestStatus& aStatus );    
-
-    /**
-     * Launch a Settings UI in an ui app server. 
-     * The API is used to launch a settings UI. There can be only one 
-     * outstanding Launch request at any instant of time. This is an 
-     * asynchronous function. If a session is already running then the
-     * function leaves with KErrInUse.
-     *
-     * @since S60 v9.2
-     * @param aImplementationUid The ECOM Implementation UID of the 
-     *                           settings UI ECOM plug-in that has to be 
-     *                           launched.
-     * @param aStringParams      Opaque parameters that is handed over to
-     *                           the Settings UI.
-     * @param aStatus            Request status. On completion contains: 
-     *                           KErrNone, if successful, otherwise one of
-     *                           the other system-wide error codes.
-     *
-     */
-    void LaunchSettingsUiL( TUid            aImplementationUid, 
-                            const TDesC&            aStringParams,
-                            TRequestStatus& aStatus );
-
-    /**
-     * Launch a Settings UI as an embedded application.
-     * The API is used to launch a settings UI as an embedded application.
-     *
-     * @since S60 v9.2
-     * @param aImplementationUid The ECOM Implementation UID of the 
-     *                           settings UI ECOM plug-in that has to be 
-     *                           launched.
-     * @param aStringParams      Opaque parameters that is handed over to
-     *                           the Settings UI.
-     * @param aStatus            Request status. On completion contains: 
-     *                           KErrNone, if successful, otherwise one of
-     *                           the other system-wide error codes.
-     *
-     */
-    void LaunchSettingsUiAsEmbeddedAppL( 
-                                TUid            aImplementationUid, 
-                                const TDesC&            aStringParams,
-                                TRequestStatus& aStatus );    
-    
-    /**
-     * Cancels an already launched settings UI.
-     *
-     * @since S60 v3.1
-     * @return a Symbian OS Error Code in case a settings UI was not launched.
-     * Returns KErrNone if successful. 
-     */
-    TInt CancelLaunchedSettingsUi();
-    
-    /**
-     * Launch Positioning Settings UI in an ui app server.
-     * The API is used to launch Positioning Settings UI. There can be only 
-     * one outstanding Launch request at any instant of time. This is an 
-     * asynchronous function. If a session is already running then the 
-     * function leaves with KErrInUse.
-     *
-     * @since S60 v3.2
-     * @param aStatus            Request status. On completion contains: 
-     *                           KErrNone, if successful, otherwise one of
-     *                           the other system-wide error codes.     
-     *
-     */
-    void LaunchPosSettingsL( TRequestStatus& aStatus );
-    
-    /**
-     * Launch Positioning Settings UI as an embedded application.
-     * There can be only one outstanding Launch request at any instant of
-     * time. This is an asynchronous function. If a session is already 
-     * running then the function leaves with KErrInUse.
-     *
-     * @since S60 v3.2
-     * @param aStatus            Request status. On completion contains: 
-     *                           KErrNone, if successful, otherwise one of
-     *                           the other system-wide error codes.     
-     *
-     */    
-    void LaunchPosSettingsAsEmbeddedAppL(  TRequestStatus& aStatus );
- 
-    /**
-     * Closes an already launched Positioning Settings UI.
-     *
-     * @since S60 v3.2
-     * @return Symbian OS Error Code in case Positioning settings UI
-     *         was not launched.
-     * Returns KErrNone if successful. 
-     */   
-    TInt ClosePosSettings();
-        
-    /**
-     * Sets the Launch Active object which is used to initiate Asynchronous 
-     * calls to the UI server
-     */
-    void SetLaunchAO( CLocLaunchUiAO*&      aLaunchAO );
-    
-public: // From MLocLaunchUiObserver
-
-    void LaunchUiComplete( TInt    aError );
-    
-public: // From RAknAppServiceBase
-    TUid ServiceUid() const;
- 
-public:
-
-    /**
-     * From base class MAknServerAppExitObserver
-     * Handles the Server Exit Event.
-     * @param aReason the command Id or error code which caused the server 
-     * to close.
-     */
-    virtual void HandleServerAppExit(TInt aReason);
-    
-private:
-    /**
-     * Connects to a non embedded server instance. The function tries to 
-     * create a new server instance if the server is not already running
-     */ 
-    void    ConnectServerL();
-    
-    /**
-     * Starts a new server instance
-     *
-     * @return  KErrNone, If the server is successfully launched
-     *          System wide error codes incase the Start fails
-     */
-    TInt    StartServer();
-       
-private:
-    /**
-     * Enumeration type defining the type of launch request outstanding
-     */
-     enum   TLaunchRequestType
-        {
-        ELaunchNone,
-        ELaunchNormal,
-        ELaunchEmbedded
-        };
-        
-private:
-
-    /**
-     * Active object used to provide asynshronous Send Receive Api calls
-     * Owns
-     */
-    CLocLaunchUiAO*         iLaunchAO;
-    
-    /**
-     * Reference to the Status variable of the object on which the Launch
-     * request was issued
-     */
-     TRequestStatus*        iRequestStatus;
-    
-    /**
-     * Current Launch status of the Serive provider
-     */
-     TLaunchRequestType     iLaunchType;
-     
-    /**
-     * Monitor the life of the server application.
-     * Wait for Server Exit Event.
-     * Owns
-     */
-     CApaServerAppExitMonitor* iSrvMonitor;
-    };
-
-#endif // R_LOCSETTINGSUISERVICE_H
--- a/locationsystemui/locationsysui/locsettingsuiservice/locsettingsuiclient/src/loclaunchuiao.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,115 +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:  Active Object to monitor the UI Server launch requests
-*
-*/
-
-
-// User Include
-#include "loclaunchuiao.h"
-#include "loclaunchuiobserver.h"
-
-// ======== MEMBER FUNCTIONS ========
-
-// ---------------------------------------------------------------------------
-// C++ Default Constructor
-// ---------------------------------------------------------------------------
-//
-CLocLaunchUiAO::CLocLaunchUiAO( MLocLaunchUiObserver&    aObserver )
-    : CActive( EPriorityStandard ),
-    iObserver( aObserver )
-    {
-    // Add the Active object to the Active scheduler queue
-    CActiveScheduler::Add( this );    
-    }
-
-// ---------------------------------------------------------------------------
-// Two Phase constructor 
-// ---------------------------------------------------------------------------
-//
-CLocLaunchUiAO* CLocLaunchUiAO::NewL( MLocLaunchUiObserver&    aObserver )
-    {
-    CLocLaunchUiAO* self = CLocLaunchUiAO::NewLC( aObserver );
-    CleanupStack::Pop( self );
-    return self;
-    }
-
-
-// ---------------------------------------------------------------------------
-// Two Phase constructor. Leaves the allocated object on the Clean-up stack 
-// ---------------------------------------------------------------------------
-//
-CLocLaunchUiAO* CLocLaunchUiAO::NewLC( MLocLaunchUiObserver&    aObserver )
-    {
-    CLocLaunchUiAO* self = new( ELeave ) CLocLaunchUiAO( aObserver );
-    CleanupStack::PushL( self );
-    return self;
-    }
-
-
-// ---------------------------------------------------------------------------
-// C++ Destructor
-// ---------------------------------------------------------------------------
-//
-CLocLaunchUiAO::~CLocLaunchUiAO()
-    {
-    // Cancel any outstanding request
-    Cancel();
-    }
-    
-// ---------------------------------------------------------------------------
-// Informs the active object that there is an outstanding request.
-// ---------------------------------------------------------------------------
-//    
-void    CLocLaunchUiAO::SetRequestOutStandingL()
-    {
-    // Check if there is any request outstanding for there can be only one 
-    // request outstanding on the active object at any instant of time
-    if( IsActive())
-        {
-        User::Leave( KErrInUse );
-        }
-    iStatus = KRequestPending;
-    SetActive();
-    }
-
-// ---------------------------------------------------------------------------
-// Returns a reference to the active objects Status variable
-// ---------------------------------------------------------------------------
-// 
-TRequestStatus&     CLocLaunchUiAO::GetStatusVariable()
-    {
-    return iStatus;
-    }
-
-// ---------------------------------------------------------------------------
-// CActive RunL
-// ---------------------------------------------------------------------------
-//
-void CLocLaunchUiAO::RunL()
-    {
-    // Issue a callback only when the active object has not been cancelled
-    if( KErrCancel != iStatus.Int())
-        {
-        iObserver.LaunchUiComplete( iStatus.Int());
-        }
-    }
-    
-// ---------------------------------------------------------------------------
-// CActive DoCancel
-// ---------------------------------------------------------------------------
-//
-void CLocLaunchUiAO::DoCancel()
-    {
-    }
--- a/locationsystemui/locationsysui/locsettingsuiservice/locsettingsuiclient/src/locsettingsuiclient.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,220 +0,0 @@
-/*
-* Copyright (c) 2005-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:  Client Side handle for using the Location System UI services
-*
-*/
-
-
-// System Includes
-#include <aknenv.h>
-
-// User Includes
-#include "locsettingsuiclient.h"
-#include "loclaunchuiao.h"
-#include "locsettingsuiservice.h"
-
-// ======== MEMBER FUNCTIONS ========
-
-// ---------------------------------------------------------------------------
-// C++ Default Constructor
-// ---------------------------------------------------------------------------
-//
-CLocSettingsUiClient::CLocSettingsUiClient()
-    {
-    }
-
-
-// ---------------------------------------------------------------------------
-// Second phase of the two phase constructor
-// ---------------------------------------------------------------------------
-//
-void CLocSettingsUiClient::ConstructL()
-    {
-    // Obtain the UI Environment. If the Client Library is constructed from
-    // a non-UI application then the value of the UI Env should be NULL
-    iCEikonEnv = CEikonEnv::Static();
-    
-    // Create the Client side handle.
-    iLocService = new ( ELeave ) RLocSettingsUiService;
-        
-    // Create the Active object that would be used by the client handle
-    // sending asynchronous requests
-    iLaunchUiAO = CLocLaunchUiAO::NewL( *iLocService );
-    
-    // Set the Client Handles AO. The ownership is mainted with this class
-    // since the Client side handle is an RClass and should preferably not
-    // have any objects allocated on the heap
-    iLocService->SetLaunchAO( iLaunchUiAO );
-    
-    }
-
-
-// ---------------------------------------------------------------------------
-// Two Phase constructor 
-// ---------------------------------------------------------------------------
-//
-EXPORT_C CLocSettingsUiClient* CLocSettingsUiClient::NewL()
-    {
-    CLocSettingsUiClient* self = CLocSettingsUiClient::NewLC();
-    CleanupStack::Pop( self );
-    return self;
-    }
-
-
-// ---------------------------------------------------------------------------
-// Two Phase constructor. Leaves the allocated object on the Clean-up stack 
-// ---------------------------------------------------------------------------
-//
-EXPORT_C CLocSettingsUiClient* CLocSettingsUiClient::NewLC()
-    {
-    CLocSettingsUiClient* self = new( ELeave ) CLocSettingsUiClient;
-    CleanupStack::PushL( self );
-    self->ConstructL();
-    return self;
-    }
-
-
-// ---------------------------------------------------------------------------
-// C++ Destructor
-// ---------------------------------------------------------------------------
-//
-CLocSettingsUiClient::~CLocSettingsUiClient()
-    {
-    
-    // Delete the Client side handle
-    delete iLocService;
-    
-    // Delete the Active Object
-    delete iLaunchUiAO;    
-    }
-
-// ---------------------------------------------------------------------------
-// Launch a Settings UI in an ui app server
-// ---------------------------------------------------------------------------
-//
-EXPORT_C void CLocSettingsUiClient::LaunchSettingsUiL(
-                                            TUid            aImplementationUid,
-                                            TInt            aParams,
-                                            TRequestStatus& aStatus )
-    {
-    // Call the Client Handle's Launch function
-    iLocService->LaunchSettingsUiL( aImplementationUid,
-                                    aParams,
-                                    aStatus );
-    }
-    
-// ---------------------------------------------------------------------------
-// Launch a Settings UI as an embedded application
-// ---------------------------------------------------------------------------
-//
-EXPORT_C void CLocSettingsUiClient::LaunchSettingsUiAsEmbeddedAppL(
-                                            TUid            aImplementationUid,
-                                            TInt            aParams,
-                                            TRequestStatus& aStatus )
-    {
-    // Only an UI application can make a Launch as embedded call
-    if( NULL == iCEikonEnv )
-        {
-        User::Leave( KErrNotSupported );
-        }
-    // Call the Client Handle's Launch function     
-    iLocService->LaunchSettingsUiAsEmbeddedAppL( aImplementationUid,
-                                                 aParams,
-                                                 aStatus );    
-    }
-
-// ---------------------------------------------------------------------------
-// Launch a Settings UI in an ui app server
-// ---------------------------------------------------------------------------
-//
-EXPORT_C void CLocSettingsUiClient::LaunchSettingsUiL(
-                                            TUid            aImplementationUid,
-                                            const TDesC&            aStringParams,
-                                            TRequestStatus& aStatus )
-    {
-    // Call the Client Handle's Launch function
-    iLocService->LaunchSettingsUiL( aImplementationUid,
-                                    aStringParams,
-                                    aStatus );
-    }
-    
-// ---------------------------------------------------------------------------
-// Launch a Settings UI as an embedded application
-// ---------------------------------------------------------------------------
-//
-EXPORT_C void CLocSettingsUiClient::LaunchSettingsUiAsEmbeddedAppL(
-                                            TUid            aImplementationUid,
-                                            const TDesC&            aStringParams,
-                                            TRequestStatus& aStatus )
-    {
-    // Only an UI application can make a Launch as embedded call
-    if( NULL == iCEikonEnv )
-        {
-        User::Leave( KErrNotSupported );
-        }
-    // Call the Client Handle's Launch function     
-    iLocService->LaunchSettingsUiAsEmbeddedAppL( aImplementationUid,
-                                                 aStringParams,
-                                                 aStatus );    
-    }
-    
-// ---------------------------------------------------------------------------
-// Cancels an already launched settings UI.
-// ---------------------------------------------------------------------------
-//    
-EXPORT_C TInt CLocSettingsUiClient::CancelLaunchedSettingsUi()
-    {
-    return iLocService->CancelLaunchedSettingsUi();
-    }
-    
-// ---------------------------------------------------------------------------
-// Launch Positioning Settings UI in an ui app server
-// ---------------------------------------------------------------------------
-//
-EXPORT_C void CLocSettingsUiClient::LaunchPosSettingsL(
-                                            TRequestStatus& aStatus )
-    {
-    // Only FrameWorks  can make a Launch as non-embedded call
-    if( iCEikonEnv )
-        {
-        User::Leave( KErrNotSupported );
-        }
-    // Call the Client Handle's Launch function        
-    iLocService->LaunchPosSettingsL( aStatus );
-    }
-    
-// ---------------------------------------------------------------------------
-// Launch Positioning Settings UI as an embedded application
-// ---------------------------------------------------------------------------
-//
-EXPORT_C void CLocSettingsUiClient::LaunchPosSettingsAsEmbeddedAppL(
-                                                TRequestStatus& aStatus )
-    {
-    // Only an UI application can make a Launch as embedded call
-    if( NULL == iCEikonEnv )
-        {
-        User::Leave( KErrNotSupported );
-        }
-    // Call the Client Handle's Launch function        
-    iLocService->LaunchPosSettingsAsEmbeddedAppL( aStatus );
-    }
-    
-// ---------------------------------------------------------------------------
-// Closes an already launched Positioning Settings UI.
-// ---------------------------------------------------------------------------
-//    
-EXPORT_C TInt CLocSettingsUiClient::ClosePosSettings()
-    {
-    return iLocService->ClosePosSettings();
-    }    
--- a/locationsystemui/locationsysui/locsettingsuiservice/locsettingsuiclient/src/locsettingsuiservice.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,572 +0,0 @@
-/*
-* Copyright (c) 2005-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:  Client side resource handle to the UI Server
-*
-*/
-
-
-// System Includes
-#include <avkon.hrh>
-
-// User Includes
-#include "locsettingsuiservice.h"
-#include "loclaunchuiao.h"
-#include "locsettingsuiserverinterface.h"
-
-// Constant Declarations
-const TInt KNumofConnectAttempts = 200;
-    
-// ======== MEMBER FUNCTIONS ========
-
-// ---------------------------------------------------------------------------
-// C++ Default Constructor
-// ---------------------------------------------------------------------------
-//
-RLocSettingsUiService::RLocSettingsUiService()
-    :iLaunchAO( NULL ),
-    iRequestStatus( NULL ),
-    iLaunchType( ELaunchNone ),
-    iSrvMonitor( NULL )
-    {
-    }
-
-// ---------------------------------------------------------------------------
-// C++ Destructor
-// ---------------------------------------------------------------------------
-//
-RLocSettingsUiService::~RLocSettingsUiService()
-    {
-    if( ELaunchNone != iLaunchType )
-        {
-        CancelLaunchedSettingsUi();
-        }   
-    }
-
-// ---------------------------------------------------------------------------
-// Launch a Settings UI in an ui app server
-// ---------------------------------------------------------------------------
-//
-void RLocSettingsUiService::LaunchSettingsUiL(
-                                    TUid            aImplementationUid,
-                                    TInt            aParams,
-                                    TRequestStatus& aStatus )
-    {
-    
-    // Check the presence of the Active Object
-    if( NULL == iLaunchAO )
-        {
-        User::Leave( KErrNotFound );
-        }
-        
-    // Check if there is any outstanding requests
-    if( ELaunchNone != iLaunchType )
-        {
-        User::Leave( KErrInUse );
-        }
-    
-    // Create the Server Session
-    ConnectServerL();
-    
-    // Store the aStatus variable. This would be used to notify the caller
-    // on completeion of the launch message
-    iRequestStatus = &aStatus;  
-    *iRequestStatus = KRequestPending;
-    
-    // Set request outstanding on the Active object
-    iLaunchAO->SetRequestOutStandingL();
-        
-    // Compose the Message and Issue a Launch call to the server
-    TRequestStatus&     status = iLaunchAO->GetStatusVariable();
-    
-    // Set the Launch Type and the Service state
-    iLaunchType = ELaunchNormal;
-                      
-    TIpcArgs args( aImplementationUid.iUid, aParams );
-    
-	SendReceive( ELaunchSettings, args, status );
-    
-    iSrvMonitor = NULL;
-    }
-    
-// ---------------------------------------------------------------------------
-// Launch a Settings UI as an embedded application
-// ---------------------------------------------------------------------------
-//
-void RLocSettingsUiService::LaunchSettingsUiAsEmbeddedAppL(
-                                            TUid            aImplementationUid,
-                                            TInt            aParams,
-                                            TRequestStatus& aStatus )
-    {
-    
-    // Check the presence of the Active Object
-    if( NULL == iLaunchAO )
-        {
-        User::Leave( KErrNotFound );
-        }
-        
-    // Check if there is any outstanding requests
-    if( ELaunchNone != iLaunchType )
-        {
-        User::Leave( KErrInUse );
-        }
-    
-    // Create the Server Session
-    ConnectChainedAppL( TUid::Uid( KLocSettingsUiServerUid ));
-    
-    // Store the aStatus variable. This would be used to notfy the caller
-    // on completeion of the launch message
-    iRequestStatus = &aStatus;  
-    *iRequestStatus = KRequestPending;
-    
-    // Set request outstanding on the Active object
-    iLaunchAO->SetRequestOutStandingL();
-        
-    // Compose the Message and Issue a Launch call to the server
-    TRequestStatus&     status = iLaunchAO->GetStatusVariable();
-    
-    // Set the Launch Request Type and the Service state
-    iLaunchType = ELaunchEmbedded;  
-                      
-    TIpcArgs args( aImplementationUid.iUid, aParams );
-	SendReceive( ELaunchSettings, args, status );
-
-    iSrvMonitor = CApaServerAppExitMonitor::NewL(*this, 
-                                                 *this,
-                                                 CActive::EPriorityStandard);
-    }
-
-// ---------------------------------------------------------------------------
-// Launch a Settings UI in an ui app server
-// ---------------------------------------------------------------------------
-//
-void RLocSettingsUiService::LaunchSettingsUiL(
-                                    TUid            aImplementationUid,
-                                    const TDesC&            aParamsString,
-                                    TRequestStatus& aStatus )
-    {
-    
-    // Check the presence of the Active Object
-    if( NULL == iLaunchAO )
-        {
-        User::Leave( KErrNotFound );
-        }
-        
-    // Check if there is any outstanding requests
-    if( ELaunchNone != iLaunchType )
-        {
-        User::Leave( KErrInUse );
-        }
-    
-    // Create the Server Session
-    ConnectServerL();
-    
-    // Store the aStatus variable. This would be used to notify the caller
-    // on completeion of the launch message
-    iRequestStatus = &aStatus;  
-    *iRequestStatus = KRequestPending;
-    
-    // Set request outstanding on the Active object
-    iLaunchAO->SetRequestOutStandingL();
-        
-    // Compose the Message and Issue a Launch call to the server
-    TRequestStatus&     status = iLaunchAO->GetStatusVariable();
-    
-    // Set the Launch Type and the Service state
-    iLaunchType = ELaunchNormal;
-                      
-    TIpcArgs args( aImplementationUid.iUid, aParamsString.Length(), &aParamsString );
-    
-	SendReceive( ELaunchSettingsWithString, args, status );
-    
-    iSrvMonitor = NULL;
-    }
-    
-// ---------------------------------------------------------------------------
-// Launch a Settings UI as an embedded application
-// ---------------------------------------------------------------------------
-//
-void RLocSettingsUiService::LaunchSettingsUiAsEmbeddedAppL(
-                                            TUid            aImplementationUid,
-                                            const TDesC&            aParamsString,
-                                            TRequestStatus& aStatus )
-    {
-    
-    // Check the presence of the Active Object
-    if( NULL == iLaunchAO )
-        {
-        User::Leave( KErrNotFound );
-        }
-        
-    // Check if there is any outstanding requests
-    if( ELaunchNone != iLaunchType )
-        {
-        User::Leave( KErrInUse );
-        }
-    
-    // Create the Server Session
-    ConnectChainedAppL( TUid::Uid( KLocSettingsUiServerUid ));
-    
-    // Store the aStatus variable. This would be used to notfy the caller
-    // on completeion of the launch message
-    iRequestStatus = &aStatus;  
-    *iRequestStatus = KRequestPending;
-    
-    // Set request outstanding on the Active object
-    iLaunchAO->SetRequestOutStandingL();
-        
-    // Compose the Message and Issue a Launch call to the server
-    TRequestStatus&     status = iLaunchAO->GetStatusVariable();
-    
-    // Set the Launch Request Type and the Service state
-    iLaunchType = ELaunchEmbedded;  
-                      
-    TIpcArgs args( aImplementationUid.iUid, aParamsString.Length(), &aParamsString );
-    
-	SendReceive( ELaunchSettingsWithString, args, status );
-
-    iSrvMonitor = CApaServerAppExitMonitor::NewL(*this, 
-                                                 *this,
-                                                 CActive::EPriorityStandard);
-    }
-    
-// ---------------------------------------------------------------------------
-// Cancels a Launched request
-// ---------------------------------------------------------------------------
-//    
-TInt RLocSettingsUiService::CancelLaunchedSettingsUi()
-    {
-    // If no request is outstanding then this operation is not supported 
-    // in this context
-    if( ELaunchNone == iLaunchType )
-        {
-        return KErrNotSupported;
-        }
-    
-    // Issue a Cancel message
-    TInt error = SendReceive( ECancelSettings );
-    
-    if ( error )
-        {
-        return error;
-        }
-        
-    // Cancel the Active objects Request
-    iLaunchAO->Cancel();
-
-    // Delete the Server Exit monitor object before closing the 
-    // server session.
-    delete iSrvMonitor;
-    iSrvMonitor = NULL;        
-
-    // Delete the Server session
-    RAknAppServiceBase::Close();
-    
-    // Set the Launch type so that next launchs will succeed
-    iLaunchType = ELaunchNone;
-    
-    // Sets the Launch 
-    // Complete the request with KErrCancel
-    TRequestStatus*     status = iRequestStatus;
-    User::RequestComplete( status, KErrCancel );
-    
-    return KErrNone;
-    }
-
-// ---------------------------------------------------------------------------
-// Launch Positioning Settings UI in an ui app server
-// ---------------------------------------------------------------------------
-//
-void RLocSettingsUiService::LaunchPosSettingsL(
-                                            TRequestStatus& aStatus )
-    {
-    // Check the presence of the Active Object
-    if( NULL == iLaunchAO )
-        {
-        User::Leave( KErrNotFound );
-        }
-        
-    // Check if there is any outstanding requests
-    if( ELaunchNone != iLaunchType )
-        {
-        User::Leave( KErrInUse );
-        }
-    
-    // Create the Server Session
-    ConnectServerL();
-    
-    // Store the aStatus variable. This would be used to notify the caller
-    // on completeion of the launch message
-    iRequestStatus = &aStatus;  
-    *iRequestStatus = KRequestPending;
-    
-    // Set request outstanding on the Active object
-    iLaunchAO->SetRequestOutStandingL();
-        
-    // Compose the Message and Issue a Launch call to the server
-    TRequestStatus&     status = iLaunchAO->GetStatusVariable();
-    
-    // Set the Launch Type and the Service state
-    iLaunchType = ELaunchNormal;
-    
-	SendReceive( ELaunchPosSettings, status );
-    
-    iSrvMonitor = NULL;
-    }
-    
-// ---------------------------------------------------------------------------
-// Launch Positioning Settings UI as an embesdded application
-// ---------------------------------------------------------------------------
-//
-void RLocSettingsUiService::LaunchPosSettingsAsEmbeddedAppL(
-                                                TRequestStatus& aStatus )
-    {
-    // Check the presence of the Active Object
-    if( NULL == iLaunchAO )
-        {
-        User::Leave( KErrNotFound );
-        }
-        
-    // Check if there is any outstanding requests
-    if( ELaunchNone != iLaunchType )
-        {
-        User::Leave( KErrInUse );
-        }
-    
-    // Create the Server Session
-    ConnectChainedAppL( TUid::Uid( KLocSettingsUiServerUid ));
-    
-    // Store the aStatus variable. This would be used to notfy the caller
-    // on completeion of the launch message
-    iRequestStatus = &aStatus;  
-    *iRequestStatus = KRequestPending;
-    
-    // Set request outstanding on the Active object
-    iLaunchAO->SetRequestOutStandingL();
-        
-    // Compose the Message and Issue a Launch call to the server
-    TRequestStatus&     status = iLaunchAO->GetStatusVariable();
-    
-    // Set the Launch Request Type and the Service state
-    iLaunchType = ELaunchEmbedded;  
-
-	SendReceive( ELaunchPosSettings, status );
-
-    iSrvMonitor = CApaServerAppExitMonitor::NewL(*this, 
-                                                 *this,
-                                                 CActive::EPriorityStandard);
-    }
-    
-// ---------------------------------------------------------------------------
-// Closes an already launched Positioning Settings UI.
-// ---------------------------------------------------------------------------
-//    
-TInt RLocSettingsUiService::ClosePosSettings()
-    {
-    // If no request is outstanding then this operation is not supported 
-    // in this context
-    if( ELaunchNone == iLaunchType )
-        {
-        return KErrNotSupported;
-        }
-    
-    // Issue a Cancel message
-    TInt error = SendReceive( ECancelPosSettings );
-    
-    if ( error )
-        {
-        return error;
-        }
-        
-    // Cancel the Active objects Request
-    iLaunchAO->Cancel();
-
-    // Delete the Server Exit monitor object before closing the 
-    // server session.
-    delete iSrvMonitor;
-    iSrvMonitor = NULL;        
-
-    // Delete the Server session
-    RAknAppServiceBase::Close();
-    
-    // Set the Launch type so that next launchs will succeed
-    iLaunchType = ELaunchNone;
-    
-    // Sets the Launch 
-    // Complete the request with KErrCancel
-    TRequestStatus*     status = iRequestStatus;
-    User::RequestComplete( status, KErrCancel );
-    
-    return KErrNone;
-
-    }    
-    
-// ---------------------------------------------------------------------------
-// Sets the Active Object used for issuing asynshronous requests
-// ---------------------------------------------------------------------------
-//
-void RLocSettingsUiService::SetLaunchAO( CLocLaunchUiAO*&      aLaunchAO )
-    {
-    iLaunchAO = aLaunchAO; 
-    }
-
-// ---------------------------------------------------------------------------
-// Inherited from MLocLaunchUiObserver
-// ---------------------------------------------------------------------------
-//
-void RLocSettingsUiService::LaunchUiComplete( TInt    aError )
-    {
-    // When the server exits due to Exit Command it responds with
-    // EEikCmdExit. In this case the actual Error Code is KErrNone.
-    // This is needed when we have the  following scenario,
-    // 1. If the user does a back from the plugin UI instead of exit,
-    //    then the client library will have to delete the Server Monitor
-    //    object.
-    // 2. If the user does a Exit then the scenario will be handled in
-    //    HandleServerAppExit.
-    if ( EEikCmdExit != aError )
-        {
-        delete iSrvMonitor;
-        iSrvMonitor = NULL;
-
-        // Delete the Server session
-        Close();
-        }
-    else
-        {
-        // In case the Error value is EEikCmdExit, change it to KErrNone.
-        // The session and the Server Monitor object will be taken care of
-        // by the HandleServerAppExit() which gets triggered by the Server
-        // Exit.
-        aError = KErrNone;
-        }
-
-    iLaunchType = ELaunchNone;
-    TRequestStatus* status = iRequestStatus;
-    User::RequestComplete( status, aError );
-    }
-
-// ---------------------------------------------------------------------------
-// Returns the Service UID of requested service
-// ---------------------------------------------------------------------------
-//
-TUid RLocSettingsUiService::ServiceUid() const
-    {
-    return TUid::Uid( KLocSettingsUiServiceId );    
-    }
-
-// ---------------------------------------------------------------------------
-// Receive event about server Exit. Triggered only for Embedded Launch case.
-// ---------------------------------------------------------------------------
-//
-void RLocSettingsUiService::HandleServerAppExit(TInt aReason)
-    {
-    // Delete the Server monitor object.
-    delete iSrvMonitor;
-    iSrvMonitor = NULL;
-    // Delete the Server session
-    Close();
-    if ( EEikCmdExit == aReason )
-        {
-        // The base class implementation is a Series60 behaviour. Hence
-        // it works only if the Command ID is EAknCmdExit. Whereas from the
-        // Server side we exit only for EEikCmdExit. Hence this fix is
-        // needed for the correct Exit behaviour for Embedded Launch scenario.
-        aReason = EAknCmdExit;
-        }
-    // Base call the AvKon Implementation.
-    MAknServerAppExitObserver::HandleServerAppExit(aReason);
-    }
-
-
-// ---------------------------------------------------------------------------
-// Connects to a non embedded server instance.
-// ---------------------------------------------------------------------------
-//
-void RLocSettingsUiService::ConnectServerL()
-    {
-    TInt retry = KNumofConnectAttempts;
-    TInt err = KErrNone;
-
-    for (;;) // Forever
-    	{
-    	TUid    serviceuid = TUid::Uid( KLocSettingsUiServiceId );
-    	TVersion*    version = reinterpret_cast< TVersion* >( &serviceuid );
-    	err = CreateSession( KLocSettingsUiServerName, 
-    	                     *version,
-    	                     KDefaultMessageSlots );
-    	if ( err != KErrNotFound && err != KErrServerTerminated )
-    		{
-    		break;
-    		}
-
-    	if ( --retry == 0 )
-    		{
-    		break;
-    		}
-
-    	err = StartServer();
-
-    	if ( err != KErrAlreadyExists && err != KErrNone)
-    		{
-    		break;
-    		}
-    	}
-    if( KErrNone != err )
-        {
-        User::Leave( err );
-        }
-    }
- 
-// ---------------------------------------------------------------------------
-// Starts a new server instance
-// ---------------------------------------------------------------------------
-//   
-TInt RLocSettingsUiService::StartServer()
-    {
-    const TUidType serverUid(KNullUid, KNullUid, TUid::Uid( KLocSettingsUiServerUid ));
-
-    // Simultaneous launching of two such processes should be detected 
-    // when the second one attempts to create the server object, 
-    // failing with KErrAlreadyExists.
-    //
-    RProcess server;
-    TInt ret = server.Create( KLocSettingsUiServerExe, KNullDesC, serverUid );
-
-    if (ret != KErrNone)
-        {
-        return ret;
-        }
-
-    TRequestStatus died;
-    server.Rendezvous( died );
-
-    if ( died != KRequestPending )
-        {
-        // logon failed - server is not yet running, so cannot have terminated
-        User::WaitForRequest( died );           // eat signal
-        server.Kill( 0 );                       // abort startup
-        }
-    else
-        {
-        server.Resume();
-        User::WaitForRequest( died );           // wait for start or death
-        }
-
-    // we can't use the 'exit reason' if the server panicked as this
-    // is the panic 'reason' and may be '0' which cannot be distinguished
-    // from KErrNone
-    ret = ( server.ExitType() == EExitPanic ) ? KErrGeneral : died.Int();
-    server.Close();
-    return ret;
-    }
--- a/locationsystemui/locationsysui/locsettingsuiservice/locsettingsuiserver/data/locsettingsuiserver.rss	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,81 +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:  Resource definition for Location Settings UI Server
-*
-*/
-
-
-NAME LSRV
-
-#include <eikon.rh>
-#include <avkon.hrh>
-#include <avkon.rh>
-#include <appinfo.rh>
-#include <data_caging_paths_strings.hrh>
-
-#include <location.loc>
-
-RESOURCE RSS_SIGNATURE {}
-RESOURCE TBUF { buf=""; }
-
-// ---------------------------------------------------------------------------
-// R_LOCSETTINGSUISRV_APP_INFO
-// the Application Info resource structure
-// ---------------------------------------------------------------------------
-//
-RESOURCE EIK_APP_INFO
-    {
-    status_pane = r_locsettingsuisrv_status_pane;
-    }
-
-RESOURCE STATUS_PANE_APP_MODEL r_locsettingsuisrv_status_pane
-    {
-    panes =
-        {
-        SPANE_PANE
-            {
-            id = EEikStatusPaneUidTitle;
-            type = EAknCtTitlePane;
-            resource = r_locsettingsuisrv_title_pane;
-            }
-        };
-    
-}
-
-RESOURCE TITLE_PANE r_locsettingsuisrv_title_pane
-    {
-    txt = qtn_location_list;
-    }
-
-RESOURCE LOCALISABLE_APP_INFO r_locsettingsuisrv_app_info
-    {
-    short_caption = qtn_location_grid;
-    caption_and_icon =
-        {
-        CAPTION_AND_ICON_INFO
-            {
-            caption = qtn_location_list;
-#ifdef __SCALABLE_ICONS
-            number_of_icons = 1;
-            icon_file = APP_BITMAP_DIR"\\locsettingsuiserver_aif.mif";
-#else
-            number_of_icons = 2;
-            icon_file = APP_BITMAP_DIR"\\locsettingsuiserver_aif.mbm";
-#endif
-            }
-        };			
-    }
-
-
-//End of file
--- a/locationsystemui/locationsysui/locsettingsuiservice/locsettingsuiserver/data/locsettingsuiserver_reg.rss	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,37 +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:  Resource definition for Location Settings UI Server 
-*                application registration.
-*
-*/
-
-
-#include <appinfo.rh>
-#include <locsettingsuiserver.rsg>
-#include <data_caging_paths_strings.hrh>
-#include "locsettingsuisrvuid.hrh"
-
-UID2 KUidAppRegistrationResourceFile
-UID3 LOCSETTINGSUISERVER_UID3  // Application's UID
-
-RESOURCE APP_REGISTRATION_INFO
-    {
-    app_file = "locsettingsuiserver";
-    hidden = KAppIsHidden;
-    localisable_resource_file=APP_RESOURCE_DIR"\\locsettingsuiserver";
-    localisable_resource_id=R_LOCSETTINGSUISRV_APP_INFO;
-    }
-
-
-// End of file
--- a/locationsystemui/locationsysui/locsettingsuiservice/locsettingsuiserver/group/bld.inf	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,37 +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:  Build information file for project Location Settings 
-*                UI Service Server
-*
-*/
-
-
-PRJ_PLATFORMS
-DEFAULT
-
-PRJ_EXPORTS
-../inc/locsettingsuiserverinterface.h |../../../../inc/locsettingsuiserverinterface.h
-
-PRJ_MMPFILES
-locsettingsuiserver.mmp
-
-PRJ_TESTMMPFILES
-
-PRJ_TESTEXPORTS
-
-PRJ_EXTENSIONS
-START EXTENSION s60/mifconv
-OPTION TARGETFILE locsettingsuiserver_aif.mif
-OPTION SOURCES -c8,8 qgn_menu_loc.svg
-END
--- a/locationsystemui/locationsysui/locsettingsuiservice/locsettingsuiserver/group/locsettingsuiserver.mmp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,71 +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:  Project definition file for project Location Settings
-*                UI Service Server
-*
-*/
-
-
-#include <data_caging_paths.hrh>
-#include "../inc/locsettingsuisrvuid.hrh"
-#include <platform_paths.hrh> // For the MW_LAYER_SYSTEMINCLUDE
-TARGET                  locsettingsuiserver.exe
-TARGETTYPE              exe
-UID                     0x0 LOCSETTINGSUISERVER_UID3
-
-CAPABILITY              CAP_APPLICATION NetworkControl ProtServ
-VENDORID                VID_DEFAULT
-
-SOURCEPATH              ../src
-SOURCE                  locsettingsuisrvapplication.cpp
-SOURCE                  locsettingsuisrvdocument.cpp
-SOURCE                  locsettingsuisrvappui.cpp
-SOURCE                  locsettingsuiappserver.cpp
-SOURCE                  locsettingsuiservice.cpp
-SOURCE                  locsettingsuilaunchmgr.cpp
-SOURCE                  locsettingsuisrvshutdowntimer.cpp
-SOURCE                  locsettingsuilaunchao.cpp
-SOURCE                  locsettingsuiinfo.cpp
-
-USERINCLUDE             ../inc
-USERINCLUDE             ../../../inc
-USERINCLUDE				../../../../inc
-USERINCLUDE             ../../../../../inc
-
-// System Include
-MW_LAYER_SYSTEMINCLUDE
-
-SOURCEPATH              ../data
-START RESOURCE          locsettingsuiserver.rss
-HEADER
-TARGETPATH              APP_RESOURCE_DIR
-LANGUAGE_IDS
-END
-
-LIBRARY                 euser.lib
-LIBRARY                 locsysuiengine.lib
-LIBRARY                 eikcore.lib
-LIBRARY                 apparc.lib
-LIBRARY                 avkon.lib
-LIBRARY                 cone.lib
-LIBRARY                 apgrfx.lib
-LIBRARY                 ws32.lib
-LIBRARY                 eikcoctl.lib
-
-START RESOURCE          locsettingsuiserver_reg.rss
-DEPENDS locsettingsuiserver.rsg
-TARGETPATH              /private/10003a3f/apps
-END
-
-//End of file
--- a/locationsystemui/locationsysui/locsettingsuiservice/locsettingsuiserver/inc/locsettingsuiappserver.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,97 +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:  The declaration for AppServer class of Location Settings UI 
-*                Server
-*
-*/
-
-
-#ifndef C_LOCSETTINGSUIAPPSERVER_H
-#define C_LOCSETTINGSUIAPPSERVER_H
-
-#include <AknServerApp.h>
-
-//Forward declarations
-class CApaAppServiceBase;
-class CLocSettingsUISrvShutdown;
-class CLocSettingsUILaunchMgr;
-class CEikonEnv;
-
-/**
- *  The server class is responsible for creating session objects.
- *  
- *  This server class overrides the CreateServiceL method to create
- *  instances of the CLocSettingsUIService object. The base class invokes 
- *  the CreateServiceL method on receiving a request for session creation.
- *
- *  @lib 
- *  @since S60 v3.1
- */
-NONSHARABLE_CLASS(CLocSettingsUIAppServer) : public CAknAppServer
-    {
-public:
-    /**
-     * Constructor
-     */
-    CLocSettingsUIAppServer();
-
-    /**
-     * Destructor
-     */
-    virtual ~CLocSettingsUIAppServer();
-
-    /**
-     * Symbian 2nd Phase Constructor.
-     * Overriding the base class call to pass the Server Name.
-     */
-    virtual void ConstructL(const TDesC& aFixedServerName);
-
-public:
-    /**
-     * Cancels the Shutdown Timer.
-     */
-    void CancelShutdownTimer();
-    
-protected: 
-    /**
-     * From Base class CApaAppServer
-     * Creates CLocSettingsUIService session object.The base class invokes
-     * the CreateServiceL method on receiving a request for session creation.
-     *
-     * @param aServiceType The Service UID for this service
-     * @return A pointer to the CLocSettingsUIService session object.
-     */
-	virtual CApaAppServiceBase* CreateServiceL(TUid aServiceType) const;
-
-    /**
-     * From Base class CApaAppServer
-     * Allows the server to handle the case when all client sessions
-     * have closed.The default behaviour is to close the server immediately.
-     * The Location Settings UI Server behaviour is to wait for new
-     * connections for 10 seconds and then shutdown in case no new
-     * client connection is established. Hence this method is overriden
-     * to provide for this behaviour of the server.
-     *
-     * @return A pointer to the CLocSettingsUIService session object.
-     */
-	virtual void HandleAllClientsClosed();
-
-private:
-    /**
-     * The Shutdown Timer Object.
-     */
-    CLocSettingsUISrvShutdown* iShutdownTimer;
-    };
-
-#endif // C_LOCSETTINGSUISERVER_H
--- a/locationsystemui/locationsysui/locsettingsuiservice/locsettingsuiserver/inc/locsettingsuiinfo.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,161 +0,0 @@
-/*
-* Copyright (c) 2005-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:  The declaration for Settings UI Info class of Location
-*                Settings UI Server
-*
-*/
-
-
-#ifndef C_LOCSETTINGSUIINFO_H
-#define C_LOCSETTINGSUIINFO_H
-
-#include <e32cmn.h>
-#include <e32std.h>
-
-//Forward declarations
-class CSession2;
-
-/**
- *  The Info class which contains all information pertaining to
- *  the settings UI launch request.
- *
- *  @lib
- *  @since S60 v3.1
- */
-NONSHARABLE_CLASS(CLocSettingsUIInfo) : public CBase
-    {
-public:
-    /**
-     * Symbian 2 Phase Constructor
-     *
-     * @since S60 v3.1
-     * @param The request IPC Message sent by the client.
-     * @param The Launch parameters with which the UI should be launched
-     * @return A pointer to the created CLocSettingsUIInfo object
-     */
-    static CLocSettingsUIInfo* NewL( const RMessage2&   aMessage );
-
-    /**
-     * Symbian 2 Phase Constructor
-     *
-     * @since S60 v3.1
-     * @param The request IPC Message sent by the client.
-     * @param The Launch parameters with which the UI should be launched
-     * @return A pointer to the created CLocSettingsUIInfo object
-     */
-    static CLocSettingsUIInfo* NewLC( const RMessage2&  aMessage );
-
-    /**
-     * Destructor
-     */
-    virtual ~CLocSettingsUIInfo();
-
-public:
-    /**
-     * Complete the Launch request with the Error Code
-     *
-     * @since S60 v3.1
-     * @param aErrorCode The error code returned from the completion of the
-     * launch request.
-     * @return Pointer to the session object.
-     */
-    void Complete(TInt aErrorCode);
-     
-public: //Accessor methods
-
-    /**
-     * Retrieve the IPC message
-     * @return RMessage2&    The IPC message contained in the Info structure
-     *
-     */
-    RMessage2&   IPCMessage();
-    
-    /**
-     * Retrieve the offset of the TSglQueLink member.
-     * This offset value is needed by the TSglQue to maintain and
-     * manipulate the Linked List.
-     *
-     * @since S60 v3.1
-     * @return Offset value of iNext member in this class.
-     */
-    static TInt QueLinkOffset();
-    
-    /**
-     * Retrieve the session object through which this Request was sent.
-     *
-     * @since S60 v3.1
-     * @return Pointer to the session object.
-     */
-    CSession2* Session() const;
-
-    /**
-     * Retrieve the Settings UI UID for which launch 
-     * is requested.
-     *
-     * @since S60 v3.1
-     * @return The UID value for the requested Settings UI.
-     */
-    TUid SettingsUID() const;
-
-    /**
-     * Retrieve the Settings UI Launch Parameters.
-     *
-     * @since S60 v9.2
-     * @return The Int Launch parameters for the Settings UI
-     */
-    TInt SettingsUIIntParams();
-
-    /**
-     * Retrieve the Settings UI Launch String Parameters.
-     *
-     * @since S60 v9.2
-     * @return The String Launch parameters for the Settings UI
-     */
-    TPtrC SettingsUIStringParamsL();
-
-private:
-    /**
-     * Constructor
-     */
-    CLocSettingsUIInfo(const RMessage2 &aMessage );
-
-    /**
-     * Symbian 2nd Phase Constructor
-     * Leaves in case of Error.
-     *
-     * @since S60 v3.1
-     * @return None
-     */
-    void ConstructL();
-
-private: // data
-
-    /**
-     * The data member contains the RMessage2 IPC message that was received
-     * from the Client
-     */
-    RMessage2   iReqMsg;  
-
-    /**
-     * The Settings UI launch string parameters.
-     */
-    HBufC* iParamsString;
-
-    /**
-     * The Single Queue Link Object.
-     */
-    TSglQueLink iNext;
-    };
-
-#endif // C_LOCSETTINGSUIINFO_H
--- a/locationsystemui/locationsysui/locsettingsuiservice/locsettingsuiserver/inc/locsettingsuilaunchao.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,228 +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:  The declaration for Settings Launch AO class of Location
-*                Settings UI Server
-*
-*/
-
-
-#ifndef C_LOCSETTINGSUILAUNCHAO_H
-#define C_LOCSETTINGSUILAUNCHAO_H
-
-#include <e32base.h>
-#include <e32std.h> //For TSglQue
-
-#include "locsettingsuiinfo.h"
-#include "locationui.h"
-
-//Forward Declaration
-class CLocSysUiEngine;
-class CEikonEnv;
-class CActiveSchedulerWait;
-/**
- *  The Settings UI Launch class.
- *
- *  This class interacts with the LocationSysUi engine interface
- *  to execute the requested settings UI.
- *  It maintains a queue of all the requests and schedules them
- *  to execute in a serialized manner.
- *
- *  @lib
- *  @since S60 v3.1
- */
-class CLocSettingsUISrvLaunchAO : public CActive,
-                                  public MLocationUIObserver
-    {
-public:
-    /**
-     * Symbian 2 Phase Constructor
-     *
-     * @since S60 v3.1
-     * @return A pointer to the created CLocSettingsUISrvLaunchAO object
-     */
-    static CLocSettingsUISrvLaunchAO* NewL();
-
-    /**
-     * Symbian 2 Phase Constructor
-     *
-     * @since S60 v3.1
-     * @return A pointer to the created CLocSettingsUISrvLaunchAO object
-     */
-    static CLocSettingsUISrvLaunchAO* NewLC();
-
-    /**
-     * Destructor
-     */
-    virtual ~CLocSettingsUISrvLaunchAO();
-
-public:
-    /**
-     * Enqueue the Settings UI launch request.
-     *
-     * @since S60 v3.1
-     * @param aReqInfo Pointer to the Settings UI Request Info class which
-     * contains all the information needed to launch the settings UI.
-     * @return None
-     */
-    void EnqueueRequest( CLocSettingsUIInfo* aReqInfo );
-
-    /**
-     * Cancel the launched Settings UI.
-     * Checks if the UI to be cancelled is in the queue. If so the item
-     * is removed from the queue. Otherwise if the setitngs UI is currently
-     * running then it is cancelled and then removed.
-     *
-     * @since S60 v3.1
-     * @param aSession The pointer to the session from which the settings UI
-     * launch was requested.
-     * @return None
-     */
-    void CancelRequest( const CSession2* aSession );
-
-    /**
-     * Returns whether the server is running in embedded application server
-     * mode or not.
-     *
-     * @since S60 v3.1
-     * @return ETrue if running in embedded application server mode. EFalse
-     * otherwise.
-     */
-    TBool IsSrvRunningAsEmbeddedApp() const;
-
-    /**
-     * From Base class MLocationUIObserver
-     * Notifies the termination of the Settings UI
-     *
-     * @param aErrorCode The termination reason. KErrNone for normal 
-     *					 terminations. In case of error or pre-mature
-     *					 aborting System wide Error codes.
-     */
-    virtual void LocationUIDismissed( TInt aErrorCode );
-
-protected: // Functions from base classes
-    /**
-     * From Base class CActive 
-     * Handles asynchronous request completion.
-     */
-    virtual void RunL();
-
-    /**
-     * From Base class CActive 
-     * Cancels any outstanding request.
-     */
-    virtual void DoCancel();
-
-    /**
-     * From Base class CActive 
-     * Handles a leave in RunL.
-     *
-     * @param aError The RunL leave code.
-     * @return Always KErrNone, because all errors are handled
-     */
-    virtual TInt RunError(TInt aError);
-
-private:
-    /**
-     * Constructor
-     */
-    CLocSettingsUISrvLaunchAO();
-
-    /**
-     * Symbian 2nd Phase Constructor
-     * Leaves in case of Error.
-     *
-     * @since S60 v3.1
-     * @return None
-     */
-    void ConstructL();
-
-private: // Helper methods
-    /**
-     * Complete the specified request.
-     * Deques the request from the queue and also updates the request count.
-     *
-     * @since S60 v3.1
-     * @param aReq pointer to the request to be completed and dequeued.
-     * @param aErrorCode the error code to be returned to the client that
-     * originated the request.
-     * @return None
-     */
-    void CompleteRequest( CLocSettingsUIInfo* aReq, TInt aErrorCode );
-    
-    /**
-     * Sends the Applicaiton Server UI to Background and hides it from
-     * the FSW as well.
-     *
-     * @since S60 v3.1
-     * @return None
-     */
-    void SendAppToBackground();
-
-    /**
-     * Brings the Application Server UI to Foreground and enables it in
-     * the FSW as well.
-     *
-     * @since S60 v3.1
-     * @return None
-     */
-    void BringAppToForeground();
-    
-    /**
-     * Since this Active Object is a dummy object we have to reschedule
-     * it to run when ever needed. This method does that functionality.
-     * mode or not.
-     *
-     * @since S60 v3.1
-     * @return None
-     */
-    void ScheduleAORun();
-
-private: // data
-
-    /**
-     * This data member maintains a list of all the Launch Requests.
-     */
-    TSglQue<CLocSettingsUIInfo> iRequestQue;
-
-    /**
-     * The Engine Interface for launching Settings UI.
-     * Does not own. Just for reference.
-     * Will be created in this class and then ownership will be transferred
-     * to the Document class.
-     */
-    CLocSysUiEngine* iEngine;
-
-    /**
-     * Reference to the Eikon Environment.
-     * It is accessed multiple times. Hence Stored here to prevent
-     * unnecessary access each time to the TLS.
-     */
-    CEikonEnv* iEikEnv;
-    
-    /**
-     * Determines whether this server is running as an embedded application
-     * server.
-     */
-    TBool iIsSrvRunningAsEmbeddedApp;
-    
-    /**
-     * Reference to the Location UI that is currently outstanding.
-     * At any instant of time there can be only one request outstanding.
-     * Incase, there are no requests outstanding then the value is set to
-     * NULL.
-     */
-    MLocationUI*        iLocationUI;
-    };
-
-#endif // C_LOCSETTINGSUILAUNCHAO_H
--- a/locationsystemui/locationsysui/locsettingsuiservice/locsettingsuiserver/inc/locsettingsuilaunchmgr.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,103 +0,0 @@
-/*
-* Copyright (c) 2005-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:  The declaration for Settings Launch Manager class of Location
-*                Settings UI Server
-*
-*/
-
-
-#ifndef C_LOCSETTINGSUILAUNCHMGR_H
-#define C_LOCSETTINGSUILAUNCHMGR_H
-
-#include<coemain.h>
-
-//Forward declarations
-class CLocSettingsUISrvLaunchAO;
-
-/**
- *  The Settings UI Launch Management class.
- *  This class is a Singleton. Session objects enqueue the requests
- *  to CLocSettingsUILaunchAO object through this Singleton.
- *
- *  @lib
- *  @since S60 v3.1
- */
-class CLocSettingsUILaunchMgr : public CCoeStatic
-    {
-public:
-    /**
-     * Factory Method to create the Singleton.
-     *
-     * @since S60 v3.1
-     * @return A pointer to the created CLocSettingsUILaunchMgr object
-     */
-    static CLocSettingsUILaunchMgr* InstanceL();
-
-public:
-    /**
-     * Enqueue the Settings UI launch request.
-     *
-     * @since S60 v3.1
-     * @param aMessage The Request IPC message from the Client.
-     */
-    void EnqueueRequestL( const RMessage2& aMessage );
-
-    /**
-     * Cancel the launched Settings UI request.
-     *
-     * @since S60 v3.1
-     * @param aSession Pointer to the session that launched the settings UI
-     * to be cancelled.
-     */
-    void CancelRequest( const CSession2* aSession );
-
-    /**
-     * Close the currently running Settings UI.
-     * Needed when the Settings UI issues a EEikCmdExit which needs to be
-     * handled in the Server App UI
-     *
-     * @since S60 v3.1
-     * @param aErrorCode The error code to send to the Client
-     */
-    void CloseRunningSettingsUi(TInt aErrorCode);
-
-private:
-    /**
-     * Constructor
-     */
-    CLocSettingsUILaunchMgr();
-
-    /**
-     * Destructor
-     */
-    virtual ~CLocSettingsUILaunchMgr();
-
-    /**
-     * Symbian 2nd Phase Constructor
-     * Leaves in case of Error.
-     *
-     * @since S60 v3.1
-     * @return None
-     */
-    void ConstructL();
-
-private: // data
-    /**
-     * The Active Object which launches the Setitngs UI and monitors the
-     * actions.
-     */
-    CLocSettingsUISrvLaunchAO* iLauncher;
-    };
-
-#endif // C_LOCSETTINGSUILAUNCHMGR_H
--- a/locationsystemui/locationsysui/locsettingsuiservice/locsettingsuiserver/inc/locsettingsuiserverinterface.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,85 +0,0 @@
-/*
-* Copyright (c) 2005-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:  Interface header for the Location Settings Ui server
-*
-*/
-
-
-#ifndef R_LOCSETTINGSUISERVERINTERFACE_H
-#define R_LOCSETTINGSUISERVERINTERFACE_H
-
-/**
- * Server Name
- */
- _LIT( KLocSettingsUiServerName, "!LocSettingsUiServer" );
-
-/**
- * Server exe
- */
- _LIT( KLocSettingsUiServerExe, "locsettingsuiserver" );
- 
-/** 
- * Server UID
- */
- const TInt  KLocSettingsUiServerUid    = 0x10281861;
- 
-/**
- * Service UID
- */
- const TInt  KLocSettingsUiServiceId    = 0x10281862;
- 
-/**
- * Message Types
- */
- enum TLocSettingsUiMsgType
-    {
-    // Using a random value. Just to avoid clashing with the Server message
-    // types
-    ELaunchSettings = 0x1000,
-    ELaunchSettingsWithString,
-    ECancelSettings,
-    ELaunchPosSettings,
-    ECancelPosSettings    
-    };
-  
-/**
- * parameter Slots in a IPC message
- */
- enum TLocSettingsUiSrvParams
-    {
-    KSettingsUID = 0,
-    KSettingsUIParam
-    };
-
-/**
- * Number of Message slots
- */ 
- const TInt KDefaultMessageSlots = 4;
-
-/**
- * Location UI Server Panic Text
- */
- _LIT( KLocSettingsUIPanicTxt, "Location Settings UI Server" );
-
-/** 
- * Server Panic Codes
- */
- enum TLocSetitngsUiPanicCodes
-    {
-    ELocSettingsUiSrvInvalidArguments = 1,
-    ELocSettingsUiSrvUnknownMessage,
-    ELocSettingsUiSrvBadDescriptor
-    };
- 
-#endif // R_LOCSETTINGSUISERVERINTERFACE_H
--- a/locationsystemui/locationsysui/locsettingsuiservice/locsettingsuiserver/inc/locsettingsuiservice.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,121 +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:  The declaration for Service class of Location Settings UI 
-*                Server
-*
-*/
-
-
-#ifndef C_LOCSETTINGSUISERVICE_H
-#define C_LOCSETTINGSUISERVICE_H
-
-#include <AknServerApp.h>
-
-/**
- *  The service class for Location Settings UI Application Server.
- *
- *  The Service class receives requests from the clients. It
- *  processes these requests to provide the Settings UI Launch
- *  service.
- *
- *  @lib 
- *  @since S60 v3.1
- */
-NONSHARABLE_CLASS(CLocSettingsUIService) : public CAknAppServiceBase
-    {
-public:
-    /**
-     * Constructor
-     */
-    CLocSettingsUIService();
-
-    /**
-     * Destructor
-     */
-    virtual ~CLocSettingsUIService();
-
-public:
-    /**
-     * Override of CAknAppServiceBase
-     * This function must base-call CAknAppServiceBase::CreateL()
-     *
-     * @param None.
-     * @return None.
-     */
-    void CreateL();
-    
-    /**
-     * Override of CAknAppServiceBase
-     * This function must base-call CAknAppServiceBase::ServiceL()
-     *
-     * @param aMessage The client message
-     * @return None.
-     */
-    void ServiceL(const RMessage2& aMessage);
-
-    /**
-     * Override of CAknAppServiceBase
-     * This function must base-call CAknAppServiceBase::ServiceError()
-     *
-     * @param aMessage The client message.
-     * @param aError The error code to which occured during message servicing
-     * @return None.
-     */
-    void ServiceError(const RMessage2& aMessage,TInt aError);
-
-    /**
-     * Override of CApaAppServiceBase
-     * This method is called for every request.
-     * This method checks whether the client has the neccessary
-     * permission to execute this request.
-     *
-     * @param aMessage The client message.
-     * @param aAction The Action to be taken if the security check fails.
-     * This is typically a value from TFailureAction.
-     * @param aMissing A reference to the list of security attributes missing
-     * from the checked process.  The policy server initialises this
-     * object to zero (that is a sid of 0, a vid of 0, and no capabilities).
-     * If derived implementations wish to take advantage of a list of
-     * missing attributes in their implementation of CustomFailureActionL(),
-     * then they should set those missing attributes here in
-     * CustomSecurityCheckL().
-     * @return A value from CPolicyServer::TCustomResult.
-     */
-	
-	CPolicyServer::TCustomResult SecurityCheckL(const RMessage2& aMessage,
-	                                            TInt& aAction,
-	                                            TSecurityInfo& aMissing);
-    
-private: // Helper methods
-    /**
-     * This is a helper method to determine whether the passed parameters are
-     * valid or not.
-     *
-     * @param aSettingsUid The UID value for the settings UI.
-     * @param aParams The opaque paramters that are passed from the client
-     * to the Settings UI.
-     * @return Etrue if the parameters valid. EFalse otherwise.
-     */
-    TBool IsLaunchParamsValid(      TInt aSettingsUid,
-                              const TInt aParams);
-
-private: // data
-    /**
-     * Boolean to indicate whether a Settings UI has been launched from this
-     * session object or not.
-     */
-    TBool iSettingsUILaunched;
-    };
-
-#endif // C_LOCSETTINGSUISERVICE_H
--- a/locationsystemui/locationsysui/locsettingsuiservice/locsettingsuiserver/inc/locsettingsuisrvapplication.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,76 +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:  The declaration for application class of Location Settings UI
-*                Server
-*
-*/
-
-
-#ifndef C_LOCSETTINGSUISRVAPP_H
-#define C_LOCSETTINGSUISRVAPP_H
-
-#include <aknapp.h>
-
-//Forward declarations
-class CApaAppServer;
-class CApaDocument;
-
-/**
- *  The Application class for the Location Settings UI Application Server.
- *  It is responsible for creating an instance of the Server class.
- *
- *  @lib
- *  @since S60 v3.1
- */
-NONSHARABLE_CLASS(CLocSettingsUISrvApp) : public CAknApplication
-    {
-public:
-    /**
-     * From Base class CApaApplication
-     * Creates an instance of the server class CLocSettingsUIAppServer
-     * @param aAppServer The server pointer to be set to the allocated
-     * server object.
-     * @return None
-     */
-    virtual void NewAppServerL(CApaAppServer*& aAppServer);
-    
-    /**
-     * Destructor
-     */
-    virtual ~CLocSettingsUISrvApp();
-
-protected:
-    /**
-     * From Base class CApaApplication
-     * Creates CLocSettingsUISrvDocument document object.
-     * @return A pointer to the created document object.
-     */
-    virtual CApaDocument* CreateDocumentL();
-    
-    /**
-     * From Base class CApaApplication
-     * returns application's UID (KUidlocation).
-     * @return The value of KUidlocation.
-     */
-    virtual TUid AppDllUid() const;
-    
-private: // member data
-    /** Own:
-     * When the Server is not running in embedded mode,
-     * the framework doesn't instantiate the server class.
-     */
-    CApaAppServer* iAppServer;
-    };
-
-#endif // C_LOCSETTINGSUISRVAPPLICATION_H
--- a/locationsystemui/locationsysui/locsettingsuiservice/locsettingsuiserver/inc/locsettingsuisrvappui.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,73 +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:  The declaration for AppUi class of Settings UI Server
-*
-*/
-
-
-#ifndef C_LOCSETTINGSUISRVAPPUI_H
-#define C_LOCSETTINGSUISRVAPPUI_H
-
-#include <aknViewAppUi.h>
-
-/**
- *  The AppUi class for the Location Settings UI Application Server.
- *
- *  @lib 
- *  @since S60 v3.1
- */
-NONSHARABLE_CLASS(CLocSettingsUISrvAppUi) : public CAknViewAppUi
-    {
-public:
-    /**
-     * Destructor
-     */
-    virtual ~CLocSettingsUISrvAppUi();
-
-    /**
-     * Constructor
-     */
-    CLocSettingsUISrvAppUi();
-
-    /**
-     * Symbian 2nd Phase Constructor
-     * Leaves in case of Error. Will be called by Framework.
-     * Hence there is no 2 Phase Constructor. Also the ConstructL
-     * has to be kept public.
-     *
-     * @since S60 v3.1
-     * @return None
-     */
-    void ConstructL();
-    
-    /**
-     * Exposes the Full Screen application setting
-     */
-    void SetFullScreenState( TBool aFullScreenState );
-    
-protected:
-
-    /**
-     * from base class CEikAppUi
-     * Overriding the base class implementation to implement Exit
-     * functionality.
-     *
-     * @since S60 v3.1
-     * @param aCommand the Command Id of the command to be executed.
-     * @returns None
-     */
-    virtual void HandleCommandL(TInt aCommand);
-    };
-
-#endif // C_LOCSETTINGSUISRVAPPUI_H
--- a/locationsystemui/locationsysui/locsettingsuiservice/locsettingsuiserver/inc/locsettingsuisrvdocument.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,95 +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:  The declaration for document class of Settings UI Server
-*
-*/
-
-
-#ifndef C_LOCSETTINGSUIDOC_H
-#define C_LOCSETTINGSUIDOC_H
-
-#include <AknDoc.h>
-#include <eikapp.h>
-
-//Forward declarations
-class CEikAppUi;
-class CLocSysUiEngine;
-
-
-/**
- *  The Document class for Location Settings UI Application Server
- *
- *  @lib 
- *  @since S60 v3.1
- */
-NONSHARABLE_CLASS(CLocSettingsUISrvDoc) : public CAknDocument
-    {
-public:
-    /**
-     * Constructor
-     *
-     * @since S60 v3.1
-     * @param aApp Reference to the CEikApplication object that is creating
-     * this document class instance.
-     * @return None
-     */
-    CLocSettingsUISrvDoc(CEikApplication &aApp);
-
-    /**
-     * Destructor
-     */
-    virtual ~CLocSettingsUISrvDoc();
-    
-    /**
-     * Set the Engine Instance
-     * Once set the ownership is transferred to the AppUi.
-     *
-     * @since S60 v3.1
-     * @param Pointer to the instance of the Engine.
-     * @return None
-     */
-    void SetEngineInstance(CLocSysUiEngine* aEngine);
-    
-    /**
-     * Accessor method to get the Engine Instance
-     * 
-     *
-     * @since S60 v3.1
-     * @return Pointer to the Engine Instance.
-     */
-    CLocSysUiEngine* Engine();
-    
-protected:
-    /**
-     * method to create AppUi object.
-     * The AppUi object returned is partially constructed. The Framework
-     * will call the ConstructL on AppUi object.
-     *
-     * @since S60 v3.1
-     * @param None
-     * @return An Instance of the AppUi class.
-     */
-    CEikAppUi* CreateAppUiL();
-
-private: // data
-    /**
-     * The Engine instance created by the CLocSettingsUISrvLaunchAO.
-     * It is stored in the Document class since the destruction of the 
-     * Engine needs to be delayed.
-     * Owns
-     */
-    CLocSysUiEngine* iEngine;
-    };
-
-#endif // C_LOCSETTINGSUIDOC_H
--- a/locationsystemui/locationsysui/locsettingsuiservice/locsettingsuiserver/inc/locsettingsuisrvshutdowntimer.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,106 +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:  The declaration for Shutdown Timer class of Location Settings
-*                UI Server
-*
-*/
-
-
-#ifndef C_LOCSETTINGSUISRVSHUTDOWN_H
-#define C_LOCSETTINGSUISRVSHUTDOWN_H
-
-
-#include <e32std.h>
-#include <e32base.h>
-
-/**
- *  The Server Shutdown Timer class.
- *
- *  This class provides the timer functionality to shutdown the 
- *  Location Settings UI Server.
- *
- *  @lib 
- *  @since S60 v3.1
- */
-NONSHARABLE_CLASS(CLocSettingsUISrvShutdown) : public CActive
-    {
-public:
-    /**
-     * Symbian 2 Phase Constructor
-     *
-     * @since S60 v3.1
-     * @return A pointer to the created CLocSettingsUISrvShutdown
-     * object
-     */
-    static CLocSettingsUISrvShutdown* NewL();
-
-    /**
-     * Destructor
-     */
-    virtual ~CLocSettingsUISrvShutdown();
-
-public:
-    /**
-     * Starts the Shutdown Timer.
-     * Since it uses an Asynchronous Timer the callback will be
-     * received in the RunL.
-     *
-     * @since S60 v3.1
-     */
-    void Start();
-    
-protected: // Functions from base class CActive
-
-   /**
-    * From CActive Handles asynchronous request completion.
-    */
-    void RunL();
-
-   /**
-    * From CActive Cancels any outstanding request.
-    */
-    void DoCancel();
-
-   /**
-    * From CActive Handles a leave in RunL.
-	*
-    * @param aError The RunL leave code.
-    * @return Always KErrNone, because all errors are handled
-    */
-    TInt RunError(TInt aError);
-
-private:
-    /**
-     * Constructor
-     */
-    CLocSettingsUISrvShutdown();
-
-    /**
-     * Symbian 2nd Phase Constructor
-     * Leaves in case of Error.
-     *
-     * @since S60 v3.1
-     * @return None
-     */
-    void ConstructL();
-
-
-private: // data
-    /**
-     * The Timer object
-     */
-    RTimer iTimer;
-    };
-
-#endif // C_LOCSETTINGSUISRVSHUTDOWN_H
--- a/locationsystemui/locationsysui/locsettingsuiservice/locsettingsuiserver/inc/locsettingsuisrvuid.hrh	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +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:  Contains the UID3 value to be used for the Location Settings UI
-*                Server
-*
-*/
-
-#ifndef LOCSETTINGSUISRVUID_HRH
-#define LOCSETTINGSUISRVUID_HRH
-
-// Location Settings UI Server UID3
-#define LOCSETTINGSUISERVER_UID3          0x10281861
-
-// Location Settings UI Server Service UID
-#define LOCSETTINGSUISERVICEUID          	0x10281862
-
-#endif      // LOCSETTINGSUISRVUID_HRH
-
-// End of File
-
-
--- a/locationsystemui/locationsysui/locsettingsuiservice/locsettingsuiserver/src/locsettingsuiappserver.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,118 +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:  The implementation for AppServer class of Location Settings 
-*                UI Server
-*
-*/
-
-
-#include <apaserverapp.h>
-#include <eikappui.h>
-#include <aknViewAppUi.h>
-#include <eikenv.h>
-#include <aknappui.h>
-#include <apgwgnam.h>
-
-#include "locsettingsuiappserver.h"
-#include "locsettingsuiserverinterface.h"
-#include "locsettingsuilaunchmgr.h"
-#include "locsettingsuiservice.h"
-#include "locsettingsuisrvshutdowntimer.h"
-#include "locsettingsuisrvappui.h"
-
-// ======== MEMBER FUNCTIONS ========
-
-// ---------------------------------------------------------------------------
-// CLocSettingsUIAppServer::CLocSettingsUIAppServer()
-// ---------------------------------------------------------------------------
-//
-CLocSettingsUIAppServer::CLocSettingsUIAppServer()
-    {
-    }
-
-
-// ---------------------------------------------------------------------------
-// CLocSettingsUIAppServer::ConstructL()
-// ---------------------------------------------------------------------------
-//
-void CLocSettingsUIAppServer::ConstructL(const TDesC& aFixedServerName)
-    {
-    iShutdownTimer = CLocSettingsUISrvShutdown::NewL();
-    // Base Call and pass the Server Name to be used.
-    // Will be called by Framework. Not needed here.
-    CAknAppServer::ConstructL(aFixedServerName);
-    }
-
-
-// ---------------------------------------------------------------------------
-// CLocSettingsUIAppServer::CLocSettingsUIAppServer()
-// ---------------------------------------------------------------------------
-//
-CLocSettingsUIAppServer::~CLocSettingsUIAppServer()
-    {
-    delete iShutdownTimer;
-    }
-
-
-// ---------------------------------------------------------------------------
-// CLocSettingsUIAppServer::CancelShutdownTimer()
-// ---------------------------------------------------------------------------
-//
-void CLocSettingsUIAppServer::CancelShutdownTimer()
-    {
-    iShutdownTimer->Cancel();
-    }
-
-
-// ---------------------------------------------------------------------------
-// CLocSettingsUIAppServer::CreateServiceL
-// ---------------------------------------------------------------------------
-//
-CApaAppServiceBase* CLocSettingsUIAppServer::CreateServiceL(
-    TUid aServiceType) const
-    {
-    if (KLocSettingsUiServiceId == aServiceType.iUid)
-        {
-        return new(ELeave) CLocSettingsUIService;
-        }
-        
-    return CAknAppServer::CreateServiceL(aServiceType);
-    }
-
-
-// ---------------------------------------------------------------------------
-// CLocSettingsUIAppServer::HandleAllClientsClosed()
-// ---------------------------------------------------------------------------
-//
-void CLocSettingsUIAppServer::HandleAllClientsClosed()
-    {
-    // The default behaviour is to close server immediately.
-    // This is what we want when the server is running as Embedded Application.
-    // But when the server is processing Framework request, we need to run
-    // a shutdown timer. When the Timer expires, the server is closed.
-    // In case a new request comes in before the timer expires, the timer is
-    // cancelled.
-    if ( CEikonEnv::Static()->StartedAsServerApp() )
-        {
-        // If running as embedded application server then stop immediately.
-        CActiveScheduler::Stop();
-        }
-    else
-        {
-        iShutdownTimer->Start();
-        }
-    }
-
-
-// End of file
--- a/locationsystemui/locationsysui/locsettingsuiservice/locsettingsuiserver/src/locsettingsuiinfo.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,179 +0,0 @@
-/*
-* Copyright (c) 2005-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:  The implementation of Info class of Location Settings UI 
-*                Server
-*
-*/
-
-
-#include <e32base.h>
-
-#include "locsettingsuiinfo.h"
-#include "locsettingsuiserverinterface.h"
-
-// ======== MEMBER FUNCTIONS ========
-
-// ---------------------------------------------------------------------------
-// CLocSettingsUIInfo::NewL()
-// ---------------------------------------------------------------------------
-//
-CLocSettingsUIInfo* CLocSettingsUIInfo::NewL(
-    const RMessage2&    aMessage )
-    {
-    CLocSettingsUIInfo* self = NewLC( aMessage );
-    CleanupStack::Pop( self );
-    return self;    
-    }
-
-
-// ---------------------------------------------------------------------------
-// CLocSettingsUIInfo::NewLC()
-// ---------------------------------------------------------------------------
-//
-CLocSettingsUIInfo* CLocSettingsUIInfo::NewLC(
-    const RMessage2&    aMessage )
-    {
-    CLocSettingsUIInfo* self = new( ELeave ) CLocSettingsUIInfo( aMessage );
-    CleanupStack::PushL(self);
-    self->ConstructL();
-    return self;    
-    }
-
-
-// ---------------------------------------------------------------------------
-// CLocSettingsUIInfo::~CLocSettingsUIInfo()
-// ---------------------------------------------------------------------------
-//
-CLocSettingsUIInfo::~CLocSettingsUIInfo()
-    {
-    delete iParamsString;
-    }
-
-
-// ---------------------------------------------------------------------------
-// CLocSettingsUIInfo::Complete(TInt aErrorCode)
-// ---------------------------------------------------------------------------
-//
-void CLocSettingsUIInfo::Complete( TInt aErrorCode )
-    {
-    if (!iReqMsg.IsNull())
-        {
-        iReqMsg.Complete(aErrorCode);
-        }
-    }
-
-// ---------------------------------------------------------------------------
-// RMessage2&   CLocSettingsUIInfo::IPCMessage()
-// ---------------------------------------------------------------------------
-//
-RMessage2&   CLocSettingsUIInfo::IPCMessage()
-    {
-    return iReqMsg;
-    }
-    
-// ---------------------------------------------------------------------------
-// CLocSettingsUIInfo::QueLinkOffset()
-// ---------------------------------------------------------------------------
-//
-TInt CLocSettingsUIInfo::QueLinkOffset()
-    {
-    return _FOFF(CLocSettingsUIInfo, iNext);
-    }
-
-
-// ---------------------------------------------------------------------------
-// CLocSettingsUIInfo::Session()
-// Accessor Method
-// ---------------------------------------------------------------------------
-//
-CSession2* CLocSettingsUIInfo::Session() const
-    {
-    return iReqMsg.Session();
-    }
-
-
-// ---------------------------------------------------------------------------
-// CLocSettingsUIInfo::SettingsUID()
-// Accessor Method
-// ---------------------------------------------------------------------------
-//
-TUid CLocSettingsUIInfo::SettingsUID() const
-    {
-    return TUid::Uid(iReqMsg.Int0());
-    }
-
-
-// ---------------------------------------------------------------------------
-// CLocSettingsUIInfo::SettingsUIIntParams()
-// Accessor Method
-// ---------------------------------------------------------------------------
-//
-TInt CLocSettingsUIInfo::SettingsUIIntParams()
-    {
-    if( IPCMessage().Function() == ELaunchSettings )
-        return iReqMsg.Int1();
-    else
-        return 0;
-    }
-
-
-// ---------------------------------------------------------------------------
-// CLocSettingsUIInfo::SettingsUIStringParamsL()
-// Accessor Method
-// ---------------------------------------------------------------------------
-//
-TPtrC CLocSettingsUIInfo::SettingsUIStringParamsL()
-    {
-    if( IPCMessage().Function() == ELaunchSettingsWithString &&
-            0 != iReqMsg.Ptr1(), NULL != iReqMsg.Ptr2() )
-        {
-        delete iParamsString;
-        iParamsString = NULL;
-        
-        TInt length = iReqMsg.Int1();
-        iParamsString = HBufC::NewL(length);
-        TPtr ptr = iParamsString->Des();
-        iReqMsg.ReadL(2, ptr);
-        return *iParamsString;
-        }
-    else
-        return KNullDesC();
-    }
-
-
-// ---------------------------------------------------------------------------
-// CLocSettingsUIInfo::CLocSettingsUIInfo(const RMessage2 &aMessage)
-// ---------------------------------------------------------------------------
-//
-CLocSettingsUIInfo::CLocSettingsUIInfo(
-    const RMessage2&    aMessage )
-    {
-    // From now on both of these are owned by this class.
-    iReqMsg = aMessage;
-    }
-    
-
-// ---------------------------------------------------------------------------
-// CLocSettingsUIInfo::ConstructL()
-// ---------------------------------------------------------------------------
-//
-void CLocSettingsUIInfo::ConstructL()
-    {
-    // Left empty intentionally.
-    }
-
-
-// End of file
-    
-
--- a/locationsystemui/locationsysui/locsettingsuiservice/locsettingsuiserver/src/locsettingsuilaunchao.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,506 +0,0 @@
-/*
-* Copyright (c) 2005-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:  The implementation of Launch Active Object class of Location 
-*                Settings UI Server
-*
-*/
-
-
-#include <aknViewAppUi.h>
-
-#include "locsettingsuilaunchao.h"
-#include "locsysuiengine.h"
-#include "locsettingsuisrvappui.h"
-#include "locsettingsuisrvdocument.h"
-#include "locationui.h"
-#include "locsettingsuiserverinterface.h"
-
-// ======== MEMBER FUNCTIONS ========
-
-// ---------------------------------------------------------------------------
-// CLocSettingsUISrvLaunchAO::NewL()
-// ---------------------------------------------------------------------------
-//
-CLocSettingsUISrvLaunchAO* CLocSettingsUISrvLaunchAO::NewL()
-    {
-    CLocSettingsUISrvLaunchAO* self = NewLC();
-    CleanupStack::Pop(self);
-    return self;    
-    }
-
-
-// ---------------------------------------------------------------------------
-// CLocSettingsUISrvLaunchAO::NewLC()
-// ---------------------------------------------------------------------------
-//
-CLocSettingsUISrvLaunchAO* CLocSettingsUISrvLaunchAO::NewLC()
-    {
-    CLocSettingsUISrvLaunchAO* self = new(ELeave) CLocSettingsUISrvLaunchAO;
-    CleanupStack::PushL(self);
-    self->ConstructL();
-    return self;    
-    }
-
-
-// ---------------------------------------------------------------------------
-// CLocSettingsUISrvLaunchAO::~CLocSettingsUISrvLaunchAO()
-// ---------------------------------------------------------------------------
-//
-CLocSettingsUISrvLaunchAO::~CLocSettingsUISrvLaunchAO()
-    {
-    // Deque request queue and send KErrServerTerminated Message for every
-    // request.
-    TSglQueIter<CLocSettingsUIInfo> iter(iRequestQue);
-    CLocSettingsUIInfo* tmp = iter++;
-    while( tmp )
-        {
-        // Complete each message with KErrServerTerminated
-        // deque and delete them.
-        CompleteRequest(tmp, KErrServerTerminated);
-        tmp = iter++;
-        }
-    // The Engine reference will be deleted in the document class destructor
-    // and should not be deleted here.
-    }
-
-
-// ---------------------------------------------------------------------------
-// CLocSettingsUISrvLaunchAO::EnqueueRequest( CLocSettingsUIInfo& aReqInfo )
-// ---------------------------------------------------------------------------
-//
-void CLocSettingsUISrvLaunchAO::EnqueueRequest( CLocSettingsUIInfo* aReqInfo )
-    {
-    // Enque the request and set the active object to active state if
-    // it is already not active.
-    TBool listWasEmpty = iRequestQue.IsEmpty();
-    iRequestQue.AddLast(*aReqInfo);
-    // If this is the first request in the queue then trigger the Active Object
-    // to Run. This is the only scenario where we want to trigger the 
-    // Active Object from this method. In all other cases we will trigger the
-    // Run from the Cancel method or the SettingsClosed method.
-    if ( listWasEmpty && !IsActive() )
-        {
-        ScheduleAORun();
-        // Bring the Application UI to foreground.
-        BringAppToForeground();
-        }
-    }
-
-
-// ---------------------------------------------------------------------------
-// CLocSettingsUISrvLaunchAO::CancelRequest( const CSession2* aSession )
-// ---------------------------------------------------------------------------
-//
-void CLocSettingsUISrvLaunchAO::CancelRequest( const CSession2* aSession )
-    {
-    // Sanity Check the Request Queue
-    if (iRequestQue.IsEmpty())
-        {
-        // Nothing to do if the request queue is empty.
-        return;
-        }
-    // There are 2 cases here
-    // 1. The Settings UI is currently running. In this case this Active 
-    //    Object's cancel needs to be called and then the request needs
-    //    to be dequeued in RunL when KErrCancel is obtained.
-    // 2. The Settings UI is enqueued in the Request Queue. Here the 
-    //    request needs to be dequeued and just responded with KErrCancel.
-    CLocSettingsUIInfo* req = iRequestQue.First();
-    if (req->Session() == aSession)
-        {
-        // Found the Settings UI and it is currently running.
-        // Call Cancel. The request will be dequeued once the Cancel
-        // Synchronous call is completed.
-        // The RunL is usaually completed by the time the cancel comes. So the
-        // Active Object is not necessarily Active. hence the call to Cancel
-        // will fail. Instead we can directly call the DoCancel here.
-        DoCancel();
-        // In case there are more requests in the queue set this Active Object
-        // to active state so that the next request will be processed.
-        if (!iRequestQue.IsEmpty())
-            {
-            ScheduleAORun();
-            }
-        else
-            {
-            // Since there are no more requests to process let us go into
-            // background. We won't wait till the client sessions are closed
-            // because sometimes the client might have a UI response mechanism
-            // or might even keep the session object till the end.
-            SendAppToBackground();
-            }
-        }
-    else
-        {
-        // Search the whole Queue.
-        TSglQueIter<CLocSettingsUIInfo> iter(iRequestQue);
-        CLocSettingsUIInfo* tmp = iter++;
-        while( tmp )
-            {
-            if (tmp->Session() == aSession)
-                {
-                // Found the Settings UI. Complete the message with
-                // KErrCancel and deque this from the Queue.
-                CompleteRequest(tmp, KErrCancel);
-                break;
-                }
-            tmp = iter++;
-            }
-        }
-    return;
-    }
-
-
-// ---------------------------------------------------------------------------
-// CLocSettingsUISrvLaunchAO::IsSrvRunningAsEmbeddedApp()
-// ---------------------------------------------------------------------------
-//
-TBool CLocSettingsUISrvLaunchAO::IsSrvRunningAsEmbeddedApp() const
-    {
-    return iIsSrvRunningAsEmbeddedApp;
-    }
-
-
-// ---------------------------------------------------------------------------
-// From Base class MLocationUIObserver
-// CLocSettingsUISrvLaunchAO::LocationUIDismissed(TInt aErrorCode)
-// ---------------------------------------------------------------------------
-//
-void CLocSettingsUISrvLaunchAO::LocationUIDismissed( TInt aErrorCode )
-    {
-    CLocSettingsUIInfo* req = iRequestQue.First();
-    CompleteRequest(req, aErrorCode);
-    
-    // The request has been completed. Hence, assign it to NULL
-    iLocationUI = NULL;
-    
-    //Check if more requests are queued.
-    if ( !iRequestQue.IsEmpty() )
-        {
-        // Set this Active Object to Active State, so that the next request
-        // will be processed in the RunL.
-        ScheduleAORun();
-        }
-    else
-        {
-        // Since there are no more requests to process let us go into
-        // background. We won't wait till the client sessions are closed
-        // because sometimes the client might have a UI response mechanism
-        // or might even keep the session object till the end.
-        SendAppToBackground();
-        }
-    }
-
-
-// ---------------------------------------------------------------------------
-// From Base class CActive
-// CLocSettingsUISrvLaunchAO::RunL()
-// 
-// Once the first request gets queued we get to this RunL execution.
-// ---------------------------------------------------------------------------
-//
-void CLocSettingsUISrvLaunchAO::RunL()
-    {
-    if ( !iEngine )
-        {
-        // The Engine is created here and then ownership is passed to the
-        // Document class. There are 2 reasons for this,
-        // 1. The Engine needs to be created late because it takes a AppUi
-        //    parameter. Hence it has to be delayed till the AppUi is
-        //    created. Also this class needs to add itself as the Observer
-        //    for the Engine. hence this place is logically correct to
-        //    create the Engine class.
-        //
-        // 2. The Engine class destruction needs to be delayed till the AppUi
-        //    is destructed since the CAknViewAppUi calls view deactivate at
-        //    that stage. When the CLocSysUiEngine is deleted then it frees all
-        //    the ECOM implementation as well. So for view based plugins the
-        //    AppUi deactivate after Engine destruction will cause a 
-        //    KERN-EXEC 3. Hence we delay the destruction to the Document class
-        //    destructor.
-        // But still we maintain a local reference in this Launch class so that
-        // we don't need to access the document class everytime which result
-        // in a call to CEikonEnv::Static().
-        CLocSettingsUISrvAppUi* appUi = 
-                        static_cast<CLocSettingsUISrvAppUi*>
-                        (iEikEnv->EikAppUi());
-        
-        CLocSettingsUISrvDoc* doc =                         
-                    static_cast<CLocSettingsUISrvDoc*>
-                    (const_cast<CEikDocument*>(appUi->Document()));
-        
-        iEngine = CLocSysUiEngine::NewL(*appUi);
-        // HandOver the Engine Ownership to the Document class.
-        doc->SetEngineInstance(iEngine);
-        }
-
-    // Sanity check that there is atleast one request.
-    if ( !iRequestQue.IsEmpty() )
-        {
-        CLocSettingsUIInfo* req = iRequestQue.First();
-        
-        // Create the Location UI corresponding to the Location Request
-        switch( req->IPCMessage().Function())
-            {
-            case ELaunchSettingsWithString:
-                {
-                TRAPD(error, iLocationUI = iEngine->CreateLocationSubSettingsUIL(req->SettingsUID()););
-                // TRAP and check whether the error is KErrAlreadyExists.
-                // In this case we don't need to leave. For all other
-                // error cases we leave here which will reuslt in the RunError
-                // getting executed with the error code.
-                if ( error != KErrNone && error != KErrAlreadyExists )
-                    {
-                    User::Leave(error);
-                    }
-                    
-                // Set Full Screen App
-                CLocSettingsUISrvAppUi* appUi = static_cast<CLocSettingsUISrvAppUi *>( iEikEnv->AppUi());
-                appUi->SetFullScreenState( ETrue );
-                
-                // Launch the Location UI
-                iLocationUI->LaunchLocationUIL( req->SettingsUIStringParamsL(),
-                                                this );             
-                break;
-                }
-            case ELaunchSettings:
-                {
-                TRAPD(error, iLocationUI = iEngine->CreateLocationSubSettingsUIL(req->SettingsUID()););
-                // TRAP and check whether the error is KErrAlreadyExists.
-                // In this case we don't need to leave. For all other
-                // error cases we leave here which will reuslt in the RunError
-                // getting executed with the error code.
-                if ( error != KErrNone && error != KErrAlreadyExists )
-                    {
-                    User::Leave(error);
-                    }
-                    
-                // Set Full Screen App
-                CLocSettingsUISrvAppUi* appUi = static_cast<CLocSettingsUISrvAppUi *>( iEikEnv->AppUi());
-                appUi->SetFullScreenState( ETrue );
-                
-                // Launch the Location UI
-                iLocationUI->LaunchLocationUIL( req->SettingsUIIntParams(),
-                                                this );                
-                break;
-                }
-            case ELaunchPosSettings:
-                {
-                  TRAPD(error, iLocationUI = iEngine->CreatePositioningSettingsUIL(););
-                // TRAP and check whether the error is KErrAlreadyExists.
-                // In this case we don't need to leave. For all other
-                // error cases we leave here which will reuslt in the RunError
-                // getting executed with the error code.
-                if ( error != KErrNone )
-                    {
-                    User::Leave(error);
-                    }
-                    
-                // Set Full Screen App
-                CLocSettingsUISrvAppUi* appUi = static_cast<CLocSettingsUISrvAppUi *>( iEikEnv->AppUi());
-                appUi->SetFullScreenState( ETrue );
-                                    
-                // Launch the Location UI
-                iLocationUI->LaunchLocationUIL( 0, this );
-                break;               
-                }
-            default:
-                {
-                User::Leave( KErrNotSupported );
-                break;
-                }
-            }
-        }
-    }
-
-
-// ---------------------------------------------------------------------------
-// From Base class CActive
-// CLocSettingsUISrvLaunchAO::DoCancel()
-// 
-// Once the first request gets queued we get to this RunL execution.
-// ---------------------------------------------------------------------------
-//
-void CLocSettingsUISrvLaunchAO::DoCancel()
-    {
-    // Set Full Screen App
-    CLocSettingsUISrvAppUi* appUi = static_cast<CLocSettingsUISrvAppUi *>( iEikEnv->AppUi());
-    appUi->SetFullScreenState( EFalse );
-                    
-        
-    // Call the LocSysUiEngine Interface to Cancel the launched Settings UI
-    CLocSettingsUIInfo* req = iRequestQue.First();
-    // The Location UI Close is a synchronous call.
-    iLocationUI->Close();
-    
-    // The UI request has been cancelled. Hence, setting the value to NULL
-    iLocationUI = NULL;
-        
-    // Deque the request and respond with the Error Code KErrCancel.
-    CompleteRequest(req, KErrCancel);
-    }
-
-
-// ---------------------------------------------------------------------------
-// From Base class CActive
-// CLocSettingsUISrvLaunchAO::RunError(TInt aError)
-// ---------------------------------------------------------------------------
-//
-TInt CLocSettingsUISrvLaunchAO::RunError(TInt aError)
-    {
-    // Set Full Screen App
-    CLocSettingsUISrvAppUi* appUi = static_cast<CLocSettingsUISrvAppUi *>( iEikEnv->AppUi());
-    appUi->SetFullScreenState( EFalse );                   
-                        
-    // No specific error scenario seen as of now. So doing the logical thing.
-    // Just complete the current reuqest with the returned error code.
-    CLocSettingsUIInfo* req = iRequestQue.First();
-    CompleteRequest(req, aError);
-    //Check if more requests are queued.
-    if (!iRequestQue.IsEmpty())
-        {
-        // Set this Active Object to Active State, so that the next request
-        // will be processed in the RunL.
-        ScheduleAORun();
-        }
-    else
-        {
-        // Since there are no more requests to process let us go into
-        // background. We won't wait till the client sessions are closed
-        // because sometimes the client might have a UI response mechanism
-        // or might even keep the session object till the end.
-        SendAppToBackground();
-        }
-    return KErrNone;
-    }    
-    
-// ---------------------------------------------------------------------------
-// CLocSettingsUISrvLaunchAO::CLocSettingsUISrvLaunchAO()
-// ---------------------------------------------------------------------------
-//
-CLocSettingsUISrvLaunchAO::CLocSettingsUISrvLaunchAO()
-    :CActive(EPriorityUserInput),
-     iRequestQue(CLocSettingsUIInfo::QueLinkOffset())
-    {
-    iEikEnv = CEikonEnv::Static();
-    iIsSrvRunningAsEmbeddedApp = iEikEnv->StartedAsServerApp();
-    }
-
-
-// ---------------------------------------------------------------------------
-// CLocSettingsUISrvLaunchAO::ConstructL()
-// ---------------------------------------------------------------------------
-//
-void CLocSettingsUISrvLaunchAO::ConstructL()
-    {
-    CActiveScheduler::Add(this);
-    }
-
-
-// ======== HELPER MEMBER FUNCTIONS ========
-
-// ---------------------------------------------------------------------------
-// CLocSettingsUISrvLaunchAO::CompleteRequest( CLocSettingsUIInfo* aReq,
-//                                             TInt aErrorCode )
-// ---------------------------------------------------------------------------
-//
-void CLocSettingsUISrvLaunchAO::CompleteRequest( 
-    CLocSettingsUIInfo* aReq,
-    TInt aErrorCode )
-    {
-    // Set Full Screen App
-    CLocSettingsUISrvAppUi* appUi = static_cast<CLocSettingsUISrvAppUi *>( iEikEnv->AppUi());
-    appUi->SetFullScreenState( EFalse );
-        
-    // The UI request is completed. Hence, setting the value to NULL
-    iLocationUI = NULL;
-    
-    // Sanity check the request queue.
-    if ( !iRequestQue.IsEmpty() )
-        {
-        // If queue is not empty then the aReq is valid 
-        // otherwise it is invalid
-        aReq->Complete(aErrorCode);
-        iRequestQue.Remove(*aReq);
-        delete aReq;
-        }
-    }
-
-
-// ---------------------------------------------------------------------------
-// CLocSettingsUISrvLaunchAO::SendAppToBackground()
-// This is specifically needed when Location Server is running as standalone
-// and not embedded
-// ---------------------------------------------------------------------------
-//
-void CLocSettingsUISrvLaunchAO::SendAppToBackground()
-    {
-    if ( !IsSrvRunningAsEmbeddedApp() )
-        {
-        // Do this only if the server is running as standalone server.
-        // In case of embedded server application, it will be closed 
-        // immediately. Hence there is no need to take it to background.
-        CAknAppUi* appUi = static_cast<CAknAppUi*>(iEikEnv->EikAppUi());
-        // The last view cannot be destroyed till the server shutsdown.
-        // Hence do a Hide from FSW here and move into background.
-        // Once the shutdown timer is completed, the view will be destroyed.
-        appUi->HideApplicationFromFSW(ETrue);
-        if ( appUi->IsForeground() )
-            {
-            TApaTask task(iEikEnv->WsSession());
-            task.SetWgId(iEikEnv->RootWin().Identifier());
-            task.SendToBackground();
-            }
-        }
-    }
-
-
-// ---------------------------------------------------------------------------
-// CLocSettingsUISrvLaunchAO::BringAppToForeground()
-// This is specifically needed when Location Server is running as standalone
-// and not embedded
-// ---------------------------------------------------------------------------
-//
-void CLocSettingsUISrvLaunchAO::BringAppToForeground()
-    {
-    if ( !IsSrvRunningAsEmbeddedApp() )
-        {
-        // Do this only if the server is running as standalone server.
-        // In case of embedded server application, it will be closed 
-        // immediately. Hence there is no need to bring it to foreground.
-        CAknAppUi* appUi = static_cast<CAknAppUi*>(iEikEnv->EikAppUi());
-        appUi->HideApplicationFromFSW(EFalse);
-        TApaTask task(iEikEnv->WsSession());
-        task.SetWgId(iEikEnv->RootWin().Identifier());
-        task.BringToForeground();
-        }
-    }
-
-
-// ---------------------------------------------------------------------------
-// CLocSettingsUISrvLaunchAO::ScheduleAORun()
-// ---------------------------------------------------------------------------
-//
-void CLocSettingsUISrvLaunchAO::ScheduleAORun()
-    {
-    SetActive();
-    TRequestStatus* status = &iStatus;
-    // This is a dummy AO to drive the UI launch requests. hence it is okay to
-    // complete the request with KErrNone since all we want is to get the RunL
-    // called by the Active Scheduler.
-    User::RequestComplete(status, KErrNone);
-    }
-    
-    
-// End of file
--- a/locationsystemui/locationsysui/locsettingsuiservice/locsettingsuiserver/src/locsettingsuilaunchmgr.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,112 +0,0 @@
-/*
-* Copyright (c) 2005-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:  The implementation of Launch Manager class of Location 
-*                Settings UI Server
-*
-*/
-
-
-#include "locsettingsuilaunchmgr.h"
-#include "locsettingsuilaunchao.h"
-
-const TUid KSettingsUiMgrUid = TUid::Uid(0x101F84EF);
-
-// ======== MEMBER FUNCTIONS ========
-
-// ---------------------------------------------------------------------------
-// CLocSettingsUILaunchMgr::Instance()
-// ---------------------------------------------------------------------------
-//
-CLocSettingsUILaunchMgr* CLocSettingsUILaunchMgr::InstanceL()
-    {
-    CLocSettingsUILaunchMgr* self = static_cast<CLocSettingsUILaunchMgr*>
-                                        (CCoeEnv::Static(KSettingsUiMgrUid));
-    if (!self)
-        {
-        self = new (ELeave) CLocSettingsUILaunchMgr;
-        
-        CleanupStack::PushL( self );
-        self->ConstructL();
-        CleanupStack::Pop( self );
-        }
-    return self;
-    }
-    
-
-// ---------------------------------------------------------------------------
-// CLocSettingsUILaunchMgr::EnqueueRequestL( const RMessage2& aMessage )
-// ---------------------------------------------------------------------------
-//
-void CLocSettingsUILaunchMgr::EnqueueRequestL( 
-    const RMessage2& aMessage )
-    {
-    // Ownership of aMessage and aParam transferred to CLocSettingsUIInfo 
-    // class.
-    CLocSettingsUIInfo* reqInfo = CLocSettingsUIInfo::NewL(aMessage);
-    // Passing the Ownership of the reqInfo to the CLocSettingsUISrvLaunchAO
-    iLauncher->EnqueueRequest(reqInfo);
-    }
-
-
-// ---------------------------------------------------------------------------
-// CLocSettingsUILaunchMgr::CancelRequest( const CSession2* aSession )
-// ---------------------------------------------------------------------------
-//
-void CLocSettingsUILaunchMgr::CancelRequest( const CSession2* aSession )
-    {
-    iLauncher->CancelRequest(aSession);    
-    }
-
-
-// ---------------------------------------------------------------------------
-// CLocSettingsUILaunchMgr::CloseRunningSettingsUi(TInt aErrorCode)
-// ---------------------------------------------------------------------------
-//
-void CLocSettingsUILaunchMgr::CloseRunningSettingsUi(TInt aErrorCode)
-    {
-    iLauncher->LocationUIDismissed(aErrorCode);
-    }
-
-
-// ---------------------------------------------------------------------------
-// CLocSettingsUILaunchMgr::CLocSettingsUILaunchMgr()
-// ---------------------------------------------------------------------------
-//
-CLocSettingsUILaunchMgr::CLocSettingsUILaunchMgr()
-    :CCoeStatic(KSettingsUiMgrUid)
-    {
-    }
-
-
-// ---------------------------------------------------------------------------
-// CLocSettingsUILaunchMgr::~CLocSettingsUILaunchMgr()
-// ---------------------------------------------------------------------------
-//
-CLocSettingsUILaunchMgr::~CLocSettingsUILaunchMgr()
-    {
-    delete iLauncher;
-    }
-
-
-// ---------------------------------------------------------------------------
-// CLocSettingsUILaunchMgr::ConstructL()
-// ---------------------------------------------------------------------------
-//
-void CLocSettingsUILaunchMgr::ConstructL()
-    {
-    iLauncher = CLocSettingsUISrvLaunchAO::NewL();
-    }
-
-
-// End of file
--- a/locationsystemui/locationsysui/locsettingsuiservice/locsettingsuiserver/src/locsettingsuiservice.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,206 +0,0 @@
-/*
-* Copyright (c) 2005-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:  The implementation of Service class of Location Settings UI 
-*                Server
-*
-*/
-
-
-#include <e32capability.h>
-
-#include "locsettingsuiservice.h"
-#include "locsettingsuiappserver.h"
-#include "locsettingsuiserverinterface.h"
-#include "locsettingsuilaunchmgr.h"
-
-// ======== MEMBER FUNCTIONS ========
-
-// ---------------------------------------------------------------------------
-// CLocSettingsUIService::CLocSettingsUIService()
-// ---------------------------------------------------------------------------
-//
-CLocSettingsUIService::CLocSettingsUIService()
-    {
-    iSettingsUILaunched = EFalse;
-    }
-    
-    
-// ---------------------------------------------------------------------------
-// CLocSettingsUIService::~CLocSettingsUIService()
-// ---------------------------------------------------------------------------
-//
-CLocSettingsUIService::~CLocSettingsUIService()
-    {
-    }
-
-
-// ---------------------------------------------------------------------------
-// CLocSettingsUIService::CreateL()
-// ---------------------------------------------------------------------------
-//
-void CLocSettingsUIService::CreateL()
-    {
-    // This method is called when a new session object is created.
-    // Base-call first.
-    CAknAppServiceBase::CreateL();
-    // There are 3 scenarios to consider here
-    //
-    // 1. If the server is running as embedded application:
-    //      In this case there is no shutdown timer running. So the call
-    //      to the parent class to cancel shutdown timer will be just 
-    //      ignored.
-    // 2. If the server is running as a UI Server and numsession=0:
-    //      In this case a shutdown timer is running. Hence cancel needs to 
-    //      be called. 
-    // 3. If the server is running as a UI Server and numsession > 0:
-    //      In this case there is no shutdown timer running but calling
-    //      timer cancel doesn't do any harm.
-    // Ideally in case 1 and 3 we should not call shutdown timer cancel but
-    // the num session is maintained by the base class (private member) and
-    // we see that calling cancel in all situation works. Hence the 
-    // solution is to just call shutdown timer cancel here.
-    static_cast<CLocSettingsUIAppServer*>
-        (const_cast<CServer2*>(Server()))->CancelShutdownTimer();
-    }
-
-
-// ---------------------------------------------------------------------------
-// CLocSettingsUIService::ServiceL()
-// ---------------------------------------------------------------------------
-//
-void CLocSettingsUIService::ServiceL(const RMessage2& aMessage)
-    {
-    CLocSettingsUILaunchMgr* settingsMgr = CLocSettingsUILaunchMgr::InstanceL();
-    switch(aMessage.Function())
-        {
-        case ELaunchSettingsWithString:
-            {
-            TInt implUid = aMessage.Int0();
-            
-            // The ownership of the aMessage is transferred to the
-            // Launch Manager.    
-            settingsMgr->EnqueueRequestL(aMessage);
-            iSettingsUILaunched = ETrue;
-            break;
-            }
-        case ELaunchSettings:
-            {
-            TInt implUid = aMessage.Int0();
-            TInt settingsUIParam = aMessage.Int1();
-            if (!IsLaunchParamsValid(implUid, settingsUIParam))
-                {
-                aMessage.Panic(KLocSettingsUIPanicTxt,
-                    ELocSettingsUiSrvInvalidArguments);
-                break;
-                }
-            
-            // The ownership of the aMessage is transferred to the
-            // Launch Manager.    
-            settingsMgr->EnqueueRequestL(aMessage);
-            iSettingsUILaunched = ETrue;
-            break;
-            }
-        case ELaunchPosSettings:          
-            {
-            // The request needs to the queued to the Settings Manager.
-            // The corresponding UI would be launched immediately incase there
-            // is no outstanding UI. If not, the request would get queued.
-            settingsMgr->EnqueueRequestL(aMessage);
-            iSettingsUILaunched = ETrue;
-            break;
-            }            
-        case ECancelSettings:
-        case ECancelPosSettings:        
-            {
-            if(!iSettingsUILaunched)
-                {
-                // Here in case of cancel without any UI Launch is
-                // taken as a error case.
-                aMessage.Complete(KErrNotSupported);
-                return;
-                }
-            settingsMgr->CancelRequest(this);
-            // This cancel message is responded with KErrNone. The 
-            // request message is completed in the LaunchAO with KErrCancel.
-            aMessage.Complete(KErrNone);
-            iSettingsUILaunched = EFalse;
-            break;
-            }
-        default:
-            {
-            CAknAppServiceBase::ServiceL(aMessage);
-            break;         
-            }
-        }
-    return;
-    }
-
-
-// ---------------------------------------------------------------------------
-// CLocSettingsUIService::ServiceError
-// ---------------------------------------------------------------------------
-//
-void CLocSettingsUIService::ServiceError(const RMessage2& aMessage,TInt aError)
-    {
-    // Will be called if the ServiceL leaves with any Error.
-    // Based on the Error type the Message needs to be completed with error
-    // or the server has to panic the client.
-    // Call the base class method
-    return CAknAppServiceBase::ServiceError(aMessage, aError);
-    }
-
-
-// ---------------------------------------------------------------------------
-// CLocSettingsUIService::SecurityCheckL
-// aMissing parameter is needed only when implementing custom security check 
-// failure action. Since we use the default action, we don't need this param.
-// ---------------------------------------------------------------------------
-//
-CPolicyServer::TCustomResult CLocSettingsUIService::SecurityCheckL(
-    const RMessage2& aMessage,
-	TInt& aAction,
-	TSecurityInfo& /*aMissing*/)
-    {
-    // In case the secuirty check fails we choose to fail the client
-    // request with KErrPermissionDenied rather than panic the client.
-    aAction = CPolicyServer::EFailClient;
-    
-    if ( aMessage.HasCapability(ECapabilityLocation) )
-        {
-        // Accept this request since the client has Location capability.
-        return CPolicyServer::EPass;
-        }
-    // The client does not have Location capability. So fail this request.
-    return CPolicyServer::EFail;
-    }
-    
-    
-// ---------------------------------------------------------------------------
-// CLocSettingsUIService::ServiceError
-// ---------------------------------------------------------------------------
-//
-TBool CLocSettingsUIService::IsLaunchParamsValid(
-          TInt aSettingsUid,
-    const TInt /*aParams*/ )
-    {
-    // Check if the SettingsUid is Zero
-    if( 0 == aSettingsUid )
-        {
-        return EFalse;
-        }
-    return ETrue;
-    }
-
-
-// End of file
--- a/locationsystemui/locationsysui/locsettingsuiservice/locsettingsuiserver/src/locsettingsuisrvapplication.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,119 +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:  Implementation for application class of Location Settings UI
-*                Server
-*
-*/
-
-
-#include <eikstart.h>
-#include <eikenv.h>
-
-#include "locsettingsuisrvapplication.h"
-#include "locsettingsuisrvuid.hrh"
-#include "locsettingsuisrvdocument.h"
-#include "locsettingsuiappserver.h"
-#include "locsettingsuiserverinterface.h"
-
-// ======== MEMBER FUNCTIONS ========
-
-// ---------------------------------------------------------------------------
-// CLocSettingsUISrvApp::NewAppServerL
-// ---------------------------------------------------------------------------
-//
-void CLocSettingsUISrvApp::NewAppServerL( CApaAppServer*& aAppServer )
-	{
-    aAppServer = new (ELeave) CLocSettingsUIAppServer();
-    if ( !CEikonEnv::Static()->StartedAsServerApp() )
-        {
-        // In case we are running as server process for
-        // framework UI requests, we need to destroy the Server object.
-        // Hence store the created server object in this Application class
-        // and delete in destructor.
-        iAppServer = aAppServer;
-        }
-	}
-	
-
-// ---------------------------------------------------------------------------
-// virtual Destructor
-// ---------------------------------------------------------------------------
-//
-CLocSettingsUISrvApp::~CLocSettingsUISrvApp()
-    {
-    // if the server is running in embedded mode iAppServer is NULL, but
-    // won't create any problem.
-    delete iAppServer;
-    }
-
-
-// ---------------------------------------------------------------------------
-// CLocSettingsUISrvApp::CreateDocumentL
-// ---------------------------------------------------------------------------
-//
-CApaDocument* CLocSettingsUISrvApp::CreateDocumentL()
-    {
-	return new (ELeave) CLocSettingsUISrvDoc(*this);
-    }
-
-
-// ---------------------------------------------------------------------------
-// CLocSettingsUISrvApp::AppDllUid
-// ---------------------------------------------------------------------------
-//
-TUid CLocSettingsUISrvApp::AppDllUid() const
-    {
-    return TUid::Uid(LOCSETTINGSUISERVER_UID3);
-    }
-
-
-// ======== GLOBAL FUNCTIONS ========
-
-// ---------------------------------------------------------------------------
-// Constructs and returns an application object.
-// ---------------------------------------------------------------------------
-//
-EXPORT_C CApaApplication* NewApplication()
-    {
-    CLocSettingsUISrvApp *app = new CLocSettingsUISrvApp;
-    
-    if ( (!CEikonEnv::Static()->StartedAsServerApp()) && 
-         (app != NULL) )
-        {
-        // If the appliciation is not invoked with the Server differentiator
-        // parameter then the NewAppserverL and the ConstructL need to be
-        // called from here.
-        // Ignore error cases. The server object is owned by the Application
-        // class. Hence it will be destructoed in the Application class
-        // destructor.
-        CApaAppServer* appServer = NULL;
-        TRAP_IGNORE(app->NewAppServerL(appServer);
-                    appServer->ConstructL(KLocSettingsUiServerName()););
-        }
-
-    return app;
-    }
-
-
-// ---------------------------------------------------------------------------
-// Main function of the application executable.
-// ---------------------------------------------------------------------------
-//
-GLDEF_C TInt E32Main()
-    {
-    return EikStart::RunApplication( NewApplication );
-    }
-
-
-//End of file
--- a/locationsystemui/locationsysui/locsettingsuiservice/locsettingsuiserver/src/locsettingsuisrvappui.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,151 +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:  The implementation for AppUi class of Settings UI Server
-*
-*/
-
-
-#include <w32std.h>
-#include <apgwgnam.h>
-#include <akntitle.h>
-#include <eikdoc.h>
-#include <eikapp.h>
-#include <bldvariant.hrh>
-
-#include "locsettingsuisrvappui.h"
-#include "locsettingsuilaunchmgr.h"
-
-const TInt KWsArrayGranularity = 4;
-
-// ======== MEMBER FUNCTIONS ========
-
-// ---------------------------------------------------------------------------
-// CLocSettingsUISrvAppUi::CLocSettingsUISrvAppUi()
-// ---------------------------------------------------------------------------
-//
-CLocSettingsUISrvAppUi::CLocSettingsUISrvAppUi()
-    {
-    }
-
-
-// ---------------------------------------------------------------------------
-// CLocSettingsUISrvAppUi::CLocSettingsUISrvAppUi()
-// ---------------------------------------------------------------------------
-//
-CLocSettingsUISrvAppUi::~CLocSettingsUISrvAppUi()
-    {
-    }
-
-
-// ---------------------------------------------------------------------------
-// CLocSettingsUISrvAppUi::CLocSettingsUISrvAppUi()
-// ---------------------------------------------------------------------------
-//
-void CLocSettingsUISrvAppUi::ConstructL()
-    {
-    BaseConstructL( EAknEnableSkin | EAknEnableMSK | EAknSingleClickCompatible);
-
-    // The Caption text for Location Settings UI Server should be that of the
-    // application which is currently in the background. Hence, loop through
-    // all the background applications and obtain the Caption from the 
-    // application at the top of the stack
-    RWsSession& wsSession=iEikonEnv->WsSession();
-    TInt count=wsSession.NumWindowGroups( 0 );
-
-    RArray<RWsSession::TWindowGroupChainInfo>* allWgIds = new (ELeave)
-                        RArray<RWsSession::TWindowGroupChainInfo>( KWsArrayGranularity );
-    
-    CleanupDeletePushL( allWgIds );
-    CleanupClosePushL( *allWgIds );
-    
-    User::LeaveIfError( wsSession.WindowGroupList( 0, allWgIds) );
-    
-    count = allWgIds->Count();
-    for (TInt index=0; index<count; index++)
-        {
-        RWsSession::TWindowGroupChainInfo& info = (*allWgIds)[index];
-        if ( info.iParentId <= 0 )
-            {
-            CApaWindowGroupName* windowName = 
-                    CApaWindowGroupName::NewLC(wsSession, info.iId);
-                    
-            if ( !windowName->Hidden() && 
-                 Document()->Application()->AppDllUid() != windowName->AppUid())
-                    {
-                    // Got the first non-hidden app. 
-                    // This should be the background application.
-                    
-                    CAknTitlePane* title = static_cast<CAknTitlePane*>( 
-                    StatusPane()->ControlL( TUid::Uid( EEikStatusPaneUidTitle )));
-    
-                    HBufC* buf = HBufC::NewL(windowName->Caption().Length());
-                    buf->Des().Copy(windowName->Caption());
-                    title->SetText( buf ); // Takes ownership of buf
-                    CleanupStack::PopAndDestroy( windowName );
-                    break;
-                    }
-            CleanupStack::PopAndDestroy( windowName );
-            }
-        }
-    CleanupStack::PopAndDestroy( 2, allWgIds ); // destroy allwgIds
-    }
-
-// ---------------------------------------------------------------------------
-// CLocSettingsUISrvAppUi::SetFullScreenState( TBool aFullScreenState )
-// ---------------------------------------------------------------------------
-//
-void CLocSettingsUISrvAppUi::SetFullScreenState( TBool aFullScreenState )
-    {
-    SetFullScreenApp( aFullScreenState );
-    }
-    
-// ---------------------------------------------------------------------------
-// CLocSettingsUISrvAppUi::HandleCommandL(TInt aCommand)
-// ---------------------------------------------------------------------------
-//
-void CLocSettingsUISrvAppUi::HandleCommandL(TInt aCommand)
-    {
-    switch(aCommand)
-        {
-        case EEikCmdExit:
-        case EAknSoftkeyExit:
-            {
-            CLocSettingsUILaunchMgr* launchMgr = 
-                                        CLocSettingsUILaunchMgr::InstanceL();
-            if ( iEikonEnv->StartedAsServerApp() )
-                {
-                // In case of Embedded Application indicate that
-                // server application is going to close after the
-                // request is completed.
-                launchMgr->CloseRunningSettingsUi(EEikCmdExit);
-                // If it is an Embedded App then close the Server 
-                // Application.
-                Exit();
-                }
-            else
-                {
-                // In case of Normal launch behave as if the User
-                // pressed back soft key and not exit.
-                // So we will continue with the next request.
-                launchMgr->CloseRunningSettingsUi(KErrNone);
-                }
-            break;
-            }
-        default:
-            CEikAppUi::HandleCommandL(aCommand);
-        }
-    }
-
-
-//End of file
--- a/locationsystemui/locationsysui/locsettingsuiservice/locsettingsuiserver/src/locsettingsuisrvdocument.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,76 +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:  Implementation for document class of Settings UI Server
-*
-*/
-
-
-#include <eikappui.h>
-
-#include "locsettingsuisrvdocument.h"
-#include "locsettingsuisrvappui.h"
-#include "locsysuiengine.h"
-
-// ======== MEMBER FUNCTIONS ========
-
-// ---------------------------------------------------------------------------
-// CLocSettingsUISrvDoc::CLocSettingsUISrvDoc
-// ---------------------------------------------------------------------------
-//
-CLocSettingsUISrvDoc::CLocSettingsUISrvDoc(CEikApplication &aApp)
-    :CAknDocument(aApp)
-    {
-    }
-
-
-// ---------------------------------------------------------------------------
-// CLocSettingsUISrvDoc::CLocSettingsUISrvDoc
-// ---------------------------------------------------------------------------
-//
-CLocSettingsUISrvDoc::~CLocSettingsUISrvDoc()
-    {
-    delete iEngine;
-    }
-
-
-// ---------------------------------------------------------------------------
-// CLocSettingsUISrvDoc::SetEngineInstance(CLocSysUiEngine* aEngine)
-// ---------------------------------------------------------------------------
-//
-void CLocSettingsUISrvDoc::SetEngineInstance(CLocSysUiEngine* aEngine)
-    {
-    iEngine = aEngine;
-    }
-
-
-// ---------------------------------------------------------------------------
-// CLocSettingsUISrvDoc::Engine()
-// ---------------------------------------------------------------------------
-//
-CLocSysUiEngine* CLocSettingsUISrvDoc::Engine()
-    {
-    return iEngine;
-    }
-
-
-// ---------------------------------------------------------------------------
-// CLocSettingsUISrvDoc::CreateAppUiL
-// ---------------------------------------------------------------------------
-//
-CEikAppUi* CLocSettingsUISrvDoc::CreateAppUiL()
-    {
-    return new(ELeave) CLocSettingsUISrvAppUi;
-    }
-
-//End of file
--- a/locationsystemui/locationsysui/locsettingsuiservice/locsettingsuiserver/src/locsettingsuisrvshutdowntimer.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,130 +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:  The implementation of Shutdown Timer class of Location 
-*                Settings UI Server
-*
-*/
-
-
-#include <eikenv.h>
-
-#include "locsettingsuisrvshutdowntimer.h"
-
-//Local constants
-// Shutdown Time 10 seconds expressed in micro seconds
-const TInt KShutdownTime = 10000000;
-
-// ======== MEMBER FUNCTIONS ========
-
-// ---------------------------------------------------------------------------
-// CLocSettingsUISrvShutdown::NewL()
-// ---------------------------------------------------------------------------
-//
-CLocSettingsUISrvShutdown* CLocSettingsUISrvShutdown::NewL()
-    {
-    CLocSettingsUISrvShutdown* self = 
-            new(ELeave) CLocSettingsUISrvShutdown();
-    CleanupStack::PushL(self);
-    self->ConstructL();
-    CleanupStack::Pop(self);
-    return self;
-    }
-
-   
-// ---------------------------------------------------------------------------
-// CLocSettingsUISrvShutdown::~CLocSettingsUISrvShutdown()
-// ---------------------------------------------------------------------------
-//
-CLocSettingsUISrvShutdown::~CLocSettingsUISrvShutdown()
-    {
-    iTimer.Cancel();
-    iTimer.Close();
-    }
-
-
-// ---------------------------------------------------------------------------
-// CLocSettingsUISrvShutdown::Start()
-// ---------------------------------------------------------------------------
-//
-void CLocSettingsUISrvShutdown::Start()
-    {
-    // Just to be safe, Cancel the Timer if it is running currently.
-    iTimer.Cancel();
-    iStatus = KRequestPending;
-    iTimer.After(iStatus, KShutdownTime);
-    SetActive();
-    }
-
-
-// ---------------------------------------------------------------------------
-// CLocSettingsUISrvShutdown::RunL()
-// ---------------------------------------------------------------------------
-//
-void CLocSettingsUISrvShutdown::RunL()
-    {
-    // The server object will be deleted by the Application class which 
-    // creates and owns the object
-    // Shutting down the server by stopping the Active Scheduler loop.
-    // Since currently there are no sessions, we don't need to explicitly
-    // close sesisons.
-    // Also since no requests are currently being executed, we don't need to
-    // worry about another Active Scheduler loop running.
-    CActiveScheduler::Stop();
-    }
-
-
-// ---------------------------------------------------------------------------
-// CLocSettingsUISrvShutdown::DoCancel()
-// ---------------------------------------------------------------------------
-//
-void CLocSettingsUISrvShutdown::DoCancel()
-    {
-    iTimer.Cancel();
-    }
-
-
-// ---------------------------------------------------------------------------
-// CLocSettingsUISrvShutdown::RunError(TInt aError)
-// ---------------------------------------------------------------------------
-//
-TInt CLocSettingsUISrvShutdown::RunError(TInt /*aError*/)
-    {
-    // See if any error handling needed here.
-    return KErrNone;
-    }
-
-
-// ---------------------------------------------------------------------------
-// CLocSettingsUISrvShutdown::CLocSettingsUISrvShutdown()
-// ---------------------------------------------------------------------------
-//
-CLocSettingsUISrvShutdown::CLocSettingsUISrvShutdown()
-    :CActive(EPriorityStandard)
-    {
-    }
-
-
-// ---------------------------------------------------------------------------
-// CLocSettingsUISrvShutdown::ConstructL()
-// ---------------------------------------------------------------------------
-//
-void CLocSettingsUISrvShutdown::ConstructL()
-    {
-    CActiveScheduler::Add(this);
-    TInt errorCode = iTimer.CreateLocal();
-    User::LeaveIfError(errorCode);
-    }
-
-
-// End of file
--- a/locationsystemui/locationsysui/locsuplsettingsui/data/10275091.rss	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,57 +0,0 @@
-/*
-* Copyright (c) 1027 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:  ECOM plugin resource file for SUPL Settings UI.
-*
-*
-*/
-
-#include <ecom/registryinfo.rh>
-#include "locsuplsettingsuid.hrh"
-
-#define PLUGINDISPLAYNAME "SUPL Settings"
-/**
-* How to use the resource definition:
-*
-* IMPLEMENTATION_INFO
-*	{
-*	implementation_uid  = <Your implementation UID here>;
-*	version_no          = 1;
-*	display_name        = "<Your plugin name here>";
-*	default_data        = "";
-*	opaque_data         = "";
-*	}
-*/
-RESOURCE REGISTRY_INFO theInfo
-	{
-	dll_uid     = KLOCSUPLSETTINGSUIUID3;
-	interfaces  = 
-		{
-		INTERFACE_INFO
-			{
-			interface_uid   = 0x10275061; // Don't Change
-			implementations = 
-				{
-				IMPLEMENTATION_INFO
-					{
-					implementation_uid  = KLOCSUPLSETTINGSUIUID3;
-					version_no          = 1;
-					display_name        = PLUGINDISPLAYNAME;
-					default_data        = "";
-					opaque_data         = "";					
-					}
-				};
-			}
-		};
-	}
-
--- a/locationsystemui/locationsysui/locsuplsettingsui/data/locsuplservereditor.rss	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,392 +0,0 @@
-/*
-* Copyright (c) 2008 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 all the resource definitions for SUPL Settings UI.
-*
-*/
-
-
-/*
-#include <data_caging_paths_strings.hrh>
-#include <bldvariant.hrh>
-#include <eikcore.rsg>
-#include <eikon.rh>
-#include <eikon.rsg>
-#include <avkon.rh>
-#include <avkon.rsg>
-#include <avkon.mbg>
-#include <avkon.loc>
-#include <avkon.hrh>
-
-#include <locsuplsettings.loc>
-*/
-// -----------------------------------------------------------------------------
-//   r_suplserver_editor_menu_bar
-//   Define the menu bar of the edit dialog
-// -----------------------------------------------------------------------------
-//
-RESOURCE MENU_BAR r_suplserver_editor_menu_bar
-    {
-    titles 	=
-        {
-        MENU_TITLE	{	menu_pane = r_suplserver_editor_menu_pane; txt=""; }
-        };
-    }
-         
-//------------------------------------------------------------------------------   
-// r_suplserver_editor_menu_pane
-// Menu Items for SUPL Server Editor view
-//------------------------------------------------------------------------------
-//
-RESOURCE MENU_PANE r_suplserver_editor_menu_pane
-    {
-    items	=
-        {
-        MENU_ITEM	
-        	{	
-        	command = ELocServerEditorDelete; 	txt = qtn_loc_detail_options_delete; 	flags = EEikMenuItemSpecific;
-        	},
-        MENU_ITEM	
-        	{	
-        	command = ELocServerEditorDisable; 	txt = qtn_loc_detail_options_disable; flags = EEikMenuItemSpecific;
-        	},
-        MENU_ITEM	
-        	{	
-        	command = ELocServerEditorEnable; 	txt = qtn_loc_detail_options_enable; 	flags = EEikMenuItemSpecific;
-        	},
-        MENU_ITEM	
-        	{	
-        	command = ELocServerEditorDefine; 	txt = qtn_loc_server_options_define;
-        	},
-        MENU_ITEM	
-        	{	
-        	command = ELocServerEditorChange; 	txt = qtn_loc_server_options_change; 	flags = EEikMenuItemAction;
-        	},
-        MENU_ITEM	
-        	{	
-        	command = ELocServerEditorRemove; 	txt = qtn_loc_detail_options_delete; 	flags = EEikMenuItemSpecific;
-        	},
-        MENU_ITEM	
-        	{ 	
-        	command = EAknCmdHelp; 				txt = qtn_options_help;
-        	},
-        // Exit option should use 'EEikCmdExit' instead of 'EEAknCmdExit'
-        // This is to ensure that the Exit command is not handled by the 
-        // ProcessCommandL of CAknView and is transferred to 
-        // CAknViewAppUi::HandleCommandL. This behaviour is necessary 
-        // for proper handling of the Exit command from an App Server's 
-        // perspective.        
-        MENU_ITEM 	
-        	{	
-        	command = EEikCmdExit;  			txt = qtn_options_exit;
-        	}
-        };
-    }
-
-//----------------------------------------------------
-// RESOURCE DIALOG r_suplserver_editor_form_dialog
-// Form dialog to create an event
-//----------------------------------------------------
-//
-RESOURCE DIALOG r_suplserver_editor_form_dialog
-	{
-    flags 	= 	EEikDialogFlagNoDrag | EEikDialogFlagFillAppClientRect |
-            	EEikDialogFlagNoTitleBar | EEikDialogFlagButtonsRight |
-            	EEikDialogFlagCbaButtons | EEikDialogFlagNoBorder |
-            	EEikDialogFlagWait;
-    buttons = 	r_suplserver_editor_options_edit_back;
-    form 	= 	r_suplserver_editor_form;
-	}
-
-//----------------------------------------------------  
-// RESOURCE CBA r_suplserver_editor_options_nomsk_back
-// CBA for SUPL Settings UI view.
-//----------------------------------------------------
-//   
-RESOURCE CBA r_suplserver_editor_options_nomsk_back
-    {
-    flags 	= 0;
-    buttons = 
-        {
-        CBA_BUTTON 
-            {
-            id 	= EAknSoftkeyOptions; 
-            txt = text_softkey_option;
-            },
-        CBA_BUTTON 
-            {
-            id 	= EAknSoftkeyBack; 
-            txt = text_softkey_back;
-            },
-        CBA_BUTTON
-            {
-            id 	= ELocServerEditorNoCmd; 
-            txt = "";
-            }
-        };
-    }
-
-//----------------------------------------------------  
-// RESOURCE CBA r_suplserver_editor_options_edit_back
-// CBA for SUPL Settings UI view.
-//----------------------------------------------------
-//   
-RESOURCE CBA r_suplserver_editor_options_edit_back
-    {
-    flags 	= 0;
-    buttons = 
-        {
-        CBA_BUTTON 
-            {
-            id 	= EAknSoftkeyOptions; 
-            txt = text_softkey_option;
-            },
-        CBA_BUTTON 
-            {
-            id 	= EAknSoftkeyBack; 
-            txt = text_softkey_back;
-            },
-        CBA_BUTTON
-            {
-            id 	= EAknFormCmdEdit; 
-            txt = qtn_msk_edit;
-            }
-        };
-    }
-
-//----------------------------------------------------
-// RESOURCE DIALOG r_suplserver_editor_form
-// Form to create/view a slp entry
-//----------------------------------------------------
-//
-RESOURCE FORM r_suplserver_editor_form
-    {
-    flags 	=  EEikFormUseDoubleSpacedFormat;
-    items 	=
-        {
-        DLG_LINE
-            {
-            type		=	EEikCtEdwin;
-            prompt		=	qtn_loc_server_address_name;
-            id			=	ELocSuplServerIdServerAddr;
-            itemflags 	= 	EEikDlgItemTakesEnterKey | EEikDlgItemOfferAllHotKeys;
-            control		=	EDWIN 
-                {
-                flags 		= 	EEikEdwinJustAutoCurEnd | EEikEdwinResizable | EEikEdwinNoLineOrParaBreaks  ;
-                width		=	16; 
-                maxlength	=	255;
-                lines		=	10;
-                };
-            },
-     	DLG_LINE
-            {
-            type		=	EEikCtEdwin;
-            prompt		=	qtn_loc_server_iap;
-            id			=	ELocSuplServerIdAccessPoint;
-            itemflags 	= 	EEikDlgItemTakesEnterKey | EEikDlgItemOfferAllHotKeys | EEikDlgItemAsLabel;
-            control		=	EDWIN 
-                {       
-                flags 		= 	EEikEdwinResizable | EEikEdwinReadOnly | EEikEdwinAvkonDisableCursor | EEikEdwinNoAutoSelection ;
-                maxlength	=	0;
-                lines		=	1;
-                max_view_height_in_lines	=	8;                
-                };
-            },                
-        DLG_LINE
-            {
-            type = EEikCtEdwin;
-            prompt = qtn_loc_server_usage;
-            id = ELocSuplServerIdUsageInHomeNw;
-            itemflags = EEikDlgItemTakesEnterKey;
-            control = EDWIN
-                {
-                flags = EEikEdwinNoHorizScrolling | EEikEdwinResizable |
-                EEikEdwinNoAutoSelection | EEikEdwinReadOnly|
-                EEikEdwinAvkonDisableCursor|EEikEdwinAvkonNotEditable |EEikEdwinDisplayOnly;
-                //         maxlength = ECalenAbsoluteMaxTextEditorLength;
-                default_case = EAknEditorTextCase;
-                allowed_case_modes = EAknEditorAllCaseModes;
-                numeric_keymap = EAknEditorStandardNumberModeKeymap;
-                special_character_table = R_AVKON_SPECIAL_CHARACTER_TABLE_DIALOG;
-                avkon_flags = EAknEditorFlagUseSCTNumericCharmap |
-                EAknEditorFlagDefault |
-                EAknEditorFlagEnablePictographInput;
-                // let Avkon decide which is maximum number of lines
-                // It's based on layout.
-                max_view_height_in_lines = 0;
-                };
-            }
-   		};
-	}
-    
-//----------------------------------------------------
-// RESOURCE ARRAY r_suplserver_editor_usageinhomenw_array
-// array for usage in homw nw pop-up dialog
-//----------------------------------------------------
-//
-RESOURCE ARRAY r_suplserver_editor_usageinhomenw_array
-    {
-    items 	=
-        {
-        LBUF{ txt = qtn_loc_server_usage_yes; },
-        LBUF{ txt = qtn_loc_server_usage_no; 	}                  
-        };
-    }
-         	          
-//----------------------------------------------------  
-// RESOURCE CBA r_suplserver_editor_options_nomsk_done
-// CBA for SUPL Editor UI view.
-//----------------------------------------------------
-//   
-RESOURCE CBA r_suplserver_editor_options_nomsk_done
-    {
-    flags 	= 0;
-    buttons = 
-        {
-        CBA_BUTTON 
-            {
-            id 	= EAknSoftkeyOptions; 
-            txt = text_softkey_option;
-            },
-        CBA_BUTTON 
-            {
-            id = EAknSoftkeyDone; 
-            txt = text_softkey_done;
-            },
-        CBA_BUTTON
-            {
-            id 	= ELocServerEditorNoCmd; 
-            txt = "";
-            }
-        };
-    }
-
-//----------------------------------------------------  
-// RESOURCE CBA r_suplserver_editor_options_define_back
-// CBA for SUPL Editor UI view.
-//----------------------------------------------------
-//   
-RESOURCE CBA r_suplserver_editor_options_define_done
-    {
-    flags 	= 0;
-    buttons = 
-        {
-        CBA_BUTTON 
-            {
-            id 	= EAknSoftkeyOptions; 
-            txt = text_softkey_option;
-            },
-        CBA_BUTTON 
-            {
-            id 	= EAknSoftkeyDone; 
-            txt = text_softkey_done;
-            },
-        CBA_BUTTON
-            {
-            id 	= ELocServerEditorMSKDefine; 
-            txt = qtn_msk_define;
-            }
-        };
-    }
-
-//----------------------------------------------------  
-// RESOURCE CBA r_suplserver_editor_options_change_done
-// CBA for SUPL Editor UI view.
-//----------------------------------------------------
-//   
-RESOURCE CBA r_suplserver_editor_options_change_done
-    {
-    flags 	= 0;
-    buttons = 
-        {
-        CBA_BUTTON 
-            {
-            id 	= EAknSoftkeyOptions; 
-            txt = text_softkey_option;
-            },
-        CBA_BUTTON 
-            {
-            id 	= EAknSoftkeyDone; 
-            txt = text_softkey_done;
-            },
-        CBA_BUTTON
-            {
-            id 	= ELocServerEditorMSKChange; 
-            txt = qtn_msk_change;
-            }
-        };
-    }
-
-//------------------------------------------------------------------------------  
-// r_loc_server_info_note
-// info note to add server name
-//------------------------------------------------------------------------------
-//
-RESOURCE TBUF r_loc_server_info_note
-    {
-    buf		= qtn_loc_server_info_note;
-    }  
-
-//------------------------------------------------------------------------------  
-// r_loc_server_editor_title
-// title text for editor
-//------------------------------------------------------------------------------
-//
-RESOURCE TBUF r_loc_server_editor_title
-    {
-    buf		= qtn_loc_server_editor_title;
-    }  
-
-//------------------------------------------------------------------------------  
-// r_loc_server_none
-// Value in the "Access point" form field
-//------------------------------------------------------------------------------
-//
-RESOURCE TBUF r_loc_server_none
-    {
-    buf		= qtn_loc_server_none;
-    }  
-
-//------------------------------------------------------------------------------  
-// r_loc_server_none
-// info note to add new server address after duplicate server address entered
-//------------------------------------------------------------------------------
-//
-RESOURCE TBUF r_loc_server_already_exist_info_note
-    {
-    buf		= qtn_loc_server_rename_info_note;
-    }  
-
-// ---------------------------------------------------------
-//
-//    r_loc_server_usageinhomenetwork_yes
-//    Define "Yes" to "Usage in home network:" line of Editor Form
-//
-// ---------------------------------------------------------
-//
-RESOURCE TBUF r_loc_server_usageinhomenetwork_yes
-    {
-    buf = qtn_loc_server_usage_yes;
-    }
-// ---------------------------------------------------------
-//
-//    r_loc_server_usageinhomenetwork_no
-//    Define "No" to "Usage in home network:" line of Editor Form
-//
-// ---------------------------------------------------------
-//
-RESOURCE TBUF r_loc_server_usageinhomenetwork_no
-    {
-    buf = qtn_loc_server_usage_no;
-    }
-// End of File
--- a/locationsystemui/locationsysui/locsuplsettingsui/data/locsuplsessioneditor.rss	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,310 +0,0 @@
-/*
-* Copyright (c) 2008 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 all the resource definitions for Active 
-* SUPL sessions editor.
-*
-*/
-
-
-// -----------------------------------------------------------------------------
-//   r_suplsession_editor_menu_bar
-//   Define the menu bar of the edit dialog
-// -----------------------------------------------------------------------------
-//
-RESOURCE MENU_BAR r_suplsession_editor_menu_bar
-    {
-    titles 	=
-        {
-        MENU_TITLE	{	menu_pane = r_suplsession_editor_menu_pane; txt=""; }
-        };
-    }
-         
-//------------------------------------------------------------------------------   
-// r_suplsession_editor_menu_pane
-// Menu Items for SUPL Session Editor view
-//------------------------------------------------------------------------------
-//
-RESOURCE MENU_PANE r_suplsession_editor_menu_pane
-    {
-    items	=
-        {
-        MENU_ITEM	
-        	{	
-        	command = ELocSessionEditorChange; 	txt = qtn_options_change; 	flags = EEikMenuItemAction;
-        	},
-        MENU_ITEM	
-        	{	
-        	command = ELocSessionEditorTerminate; 	txt = qtn_loc_supl_options_terminate; flags = EEikMenuItemSpecific;	
-        	},
-        MENU_ITEM	
-        	{ 	
-        	command = EAknCmdHelp; 				txt = qtn_options_help; 
-        	},
-        // Exit option should use 'EEikCmdExit' instead of 'EEAknCmdExit'
-        // This is to ensure that the Exit command is not handled by the 
-        // ProcessCommandL of CAknView and is transferred to 
-        // CAknViewAppUi::HandleCommandL. This behaviour is necessary 
-        // for proper handling of the Exit command from an App Server's 
-        // perspective.        
-        MENU_ITEM 	
-        	{	
-        	command = EEikCmdExit;  			txt = qtn_options_exit;
-        	}
-        };
-    }
-
-//----------------------------------------------------
-// RESOURCE DIALOG r_suplsession_editor_form_dialog
-// Form dialog to display the details of Active session
-//----------------------------------------------------
-//
-RESOURCE DIALOG r_suplsession_editor_form_dialog
-	{
-    flags 	= 	EEikDialogFlagNoDrag | EEikDialogFlagFillAppClientRect |
-            	EEikDialogFlagNoTitleBar | EEikDialogFlagButtonsRight |
-            	EEikDialogFlagCbaButtons | EEikDialogFlagNoBorder |
-            	EEikDialogFlagWait;
-    buttons = 	r_suplsession_editor_options_nomsk_back;
-    form 	= 	r_suplsession_editor_form;
-	}
-
-//----------------------------------------------------  
-// RESOURCE CBA r_suplsession_editor_options_nomsk_back
-// CBA for SUPL Active sessions editor.
-//----------------------------------------------------
-//   
-RESOURCE CBA r_suplsession_editor_options_nomsk_back
-    {
-    flags 	= 0;
-    buttons = 
-        {
-        CBA_BUTTON 
-            {
-            id 	= EAknSoftkeyOptions; 
-            txt = text_softkey_option;
-            },
-        CBA_BUTTON 
-            {
-            id 	= EAknSoftkeyBack; 
-            txt = text_softkey_back;
-            },
-        CBA_BUTTON
-            {
-            id 	= ELocSessionEditorNoCmd; 
-            txt = "";
-            }
-        };
-    }
-
-//----------------------------------------------------  
-// RESOURCE CBA r_suplsession_editor_options_change_back
-// CBA for SUPL Active sessions editor.
-//----------------------------------------------------
-//   
-RESOURCE CBA r_suplsession_editor_options_change_back
-    {
-    flags 	= 0;
-    buttons = 
-        {
-        CBA_BUTTON 
-            {
-            id 	= EAknSoftkeyOptions; 
-            txt = text_softkey_option;
-            },
-        CBA_BUTTON 
-            {
-            id 	= EAknSoftkeyBack; 
-            txt = text_softkey_back;
-            },
-        CBA_BUTTON
-            {
-            id 	= EAknSoftkeyChange; 
-            txt = qtn_msk_change;
-            }
-        };
-    }
-
-//----------------------------------------------------
-// RESOURCE DIALOG r_suplsession_editor_form
-// Form to view an Active session details
-//----------------------------------------------------
-//
-RESOURCE FORM r_suplsession_editor_form
-    {
-    flags 	=  EEikFormUseDoubleSpacedFormat;
-    items 	=
-        {                
-     	DLG_LINE
-            {
-            type		=	EAknCtPopupFieldText;
-            prompt		=	qtn_loc_supl_trigger_dialog;
-            id			=	ELocSuplSessionNotificationStatus;
-            itemflags 	= 	EEikDlgItemTakesEnterKey | EEikDlgItemOfferAllHotKeys | EEikDlgItemAsLabel;
-           	control 	= 	POPUP_FIELD_TEXT
-               	{
-               	popupfield 	= POPUP_FIELD
-                   	{
-                   	width 	= 50;
-                   	};
-               	textarray 	= r_suplsession_editor_notification_status;
-               	active 		= 0;
-               	};
-            },      
-     	DLG_LINE
-            {
-            type		=	EAknCtPopupFieldText;
-            prompt		=	qtn_loc_supl_trigger_type;
-            id			=	ELocSuplSessionType;
-            itemflags 	= 	EEikDlgItemTakesEnterKey | EEikDlgItemOfferAllHotKeys | EEikDlgItemAsLabel;
-           	control 	= 	POPUP_FIELD_TEXT
-               	{
-               	popupfield 	= POPUP_FIELD
-                   	{
-                   	width 	= 50;
-                   	};
-               	textarray 	= r_suplsession_editor_session_type;
-               	active 		= 0;
-               	};
-            },
-     	DLG_LINE
-            {
-            type		=	EAknCtIntegerEdwin;
-            prompt		=	qtn_loc_supl_trigger_outstanding;
-            id			=	ELocSuplSessionOutstandingTrigger;
-            itemflags 	= 	EEikDlgItemTakesEnterKey | EEikDlgItemOfferAllHotKeys | EEikDlgItemAsLabel;
-            control		=	AVKON_INTEGER_EDWIN 
-                {       
-                min		=	0;
-                max		=	144000;         
-                };
-            },
-        DLG_LINE
-            {
-            type		=	EEikCtEdwin;
-            prompt		=	qtn_loc_supl_trigger_time_period;
-            id			=	ELocSuplSessionTimePeriod;
-            itemflags 	= 	EEikDlgItemTakesEnterKey | EEikDlgItemOfferAllHotKeys;
-            control		=	EDWIN 
-                {
-                flags 		= 	EEikEdwinJustAutoCurEnd | EEikEdwinReadOnly | EEikEdwinResizable | EEikEdwinNoLineOrParaBreaks  ;
-                width		=	16; 
-                maxlength	=	255;
-                lines		=	1;
-                };
-            },
-     	DLG_LINE
-            {
-            type		=	EEikCtEdwin;
-            prompt		=	qtn_loc_supl_trigger_interval;
-            id			=	ELocSuplSessionTriggerInterval;
-            itemflags 	= 	EEikDlgItemTakesEnterKey | EEikDlgItemOfferAllHotKeys | EEikDlgItemAsLabel;
-            control		=	EDWIN 
-                {       
-                flags 		= 	EEikEdwinResizable | EEikEdwinReadOnly | EEikEdwinAvkonDisableCursor | EEikEdwinNoAutoSelection ;
-                maxlength	=	0;
-                lines		=	1;
-                max_view_height_in_lines	=	8;                
-                };
-            }
-   		};
-	}
-    
-//----------------------------------------------------
-// RESOURCE ARRAY r_suplsession_editor_notification_status
-// array for notification status
-//----------------------------------------------------
-//
-RESOURCE ARRAY r_suplsession_editor_notification_status
-    {
-    items 	=
-        {
-        LBUF{ txt = qtn_loc_supl_trigger_dialog_on; },
-        LBUF{ txt = qtn_loc_supl_trigger_dialog_off; }                  
-        };
-    }
-    
-//----------------------------------------------------
-// RESOURCE ARRAY r_suplsession_editor_session_type
-// array for session type
-//----------------------------------------------------
-//
-RESOURCE ARRAY r_suplsession_editor_session_type
-    {
-    items 	=
-        {
-        LBUF{ txt = qtn_loc_supl_peridic_trigger; }                 
-        };
-    }
-
-//------------------------------------------------------------------------------  
-// r_loc_supl_trigger_time_minutes
-// Session viewer unit string - minutes
-//------------------------------------------------------------------------------
-//
-RESOURCE TBUF r_loc_supl_trigger_time_minutes
-    {
-    buf		= qtn_loc_supl_trigger_time_minutes;
-    }  
-
-//------------------------------------------------------------------------------  
-// r_loc_supl_trigger_time_onehour
-// Session viewer unit string - one hour
-//------------------------------------------------------------------------------
-//
-RESOURCE TBUF r_loc_supl_trigger_time_onehour
-    {
-    buf		= qtn_loc_supl_trigger_time_onehour;
-    }  
-
-//------------------------------------------------------------------------------  
-// r_loc_supl_trigger_time_hours
-// Session viewer unit string - hours
-//------------------------------------------------------------------------------
-//
-RESOURCE TBUF r_loc_supl_trigger_time_hours
-    {
-    buf		= qtn_loc_supl_trigger_time_hours;
-    }  
-
-//------------------------------------------------------------------------------  
-// r_loc_supl_trigger_time_oneday
-// Session viewer unit string - one day
-//------------------------------------------------------------------------------
-//
-RESOURCE TBUF r_loc_supl_trigger_time_oneday
-    {
-    buf		= qtn_loc_supl_trigger_time_oneday;
-    }  
-
-//------------------------------------------------------------------------------  
-// r_loc_supl_trigger_time_days
-// Session viewer unit string - days
-//------------------------------------------------------------------------------
-//
-RESOURCE TBUF r_loc_supl_trigger_time_days
-    {
-    buf		= qtn_loc_supl_trigger_time_days;
-    }  
-
-//------------------------------------------------------------------------------  
-// r_loc_services_title_unknown
-// Title text for unnamed session in Viewer
-//------------------------------------------------------------------------------
-//
-RESOURCE TBUF r_loc_services_title_unknown
-    {
-    buf		= qtn_loc_services_title_unknown;
-    }   
-
-// End of File
--- a/locationsystemui/locationsysui/locsuplsettingsui/data/locsuplsettingsui.rss	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,924 +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:  Contains all the resource definitions for SUPL Settings UI.
-*
-*/
-
-
-//  RESOURCE IDENTIFIER
-
-NAME    SEST // 4 Letter Identifier
-
-//  INCLUDES
-
-#include <data_caging_paths_strings.hrh>
-#include <bldvariant.hrh>
-#include <EIKCORE.rsg>
-#include <eikon.rh>
-#include <eikon.rsg>
-#include <avkon.rh>
-#include <avkon.rsg>
-#include <avkon.mbg>
-#include <avkon.loc>
-#include <avkon.hrh>
-
-#include "locsuplsettings.hrh"
-#include <locsuplsettings.loc>
-
-
-//  RESOURCE DEFINITIONS 
-	
-RESOURCE RSS_SIGNATURE 
-	{
-	}
-
-//----------------------------------------------------
-// r_loc_supl_iap_query
-// Confirmation Query prompt text for SUPL Settings
-//----------------------------------------------------
-//
-RESOURCE TBUF r_loc_supl_iap_query
-    {
-    buf = qtn_loc_supl_iap_query;
-    }
-    
-//----------------------------------------------------
-// r_suplsettings_caption
-// Caption for SUPL Settings UI
-//----------------------------------------------------
-//
-RESOURCE TBUF r_suplsettings_caption
-    {
-    buf = qtn_loc_settings_supl;
-    }
-    
-//------------------------------------------------------------------------------
-// r_suplsettings_view
-// SUPL Settings Configuration view
-//------------------------------------------------------------------------------
-//
-RESOURCE AVKON_VIEW r_suplsettings_view
-    {    
-    menubar = r_suplsettings_menubar_view;  
-    cba 	= r_suplsettings_options_change_back;  
-    }
-    
-//----------------------------------------------------  
-// r_suplsettings_options_change_back
-// CBA for SUPL Settings UI view.
-//----------------------------------------------------
-//   
-RESOURCE CBA r_suplsettings_options_change_back
-    {
-    flags 	= 0;
-    buttons = 
-        {
-        CBA_BUTTON 
-            {
-            id 	= EAknSoftkeyOptions; 
-            txt = text_softkey_option;
-            },
-        CBA_BUTTON 
-            {
-            id 	= EAknSoftkeyBack; 
-            txt = text_softkey_back;
-            },
-        CBA_BUTTON
-            {
-            id 	= ELocSuplMSKChange; 
-            txt = qtn_msk_change;
-            }
-        };
-    }
-
-//----------------------------------------------------  
-// r_suplsettings_options_open_back
-// CBA for SUPL Settings UI view.
-//----------------------------------------------------
-//   
-RESOURCE CBA r_suplsettings_options_open_back
-    {
-    flags 	= 0;
-    buttons = 
-        {
-        CBA_BUTTON 
-            {
-            id 	= EAknSoftkeyOptions; 
-            txt = text_softkey_option;
-            },
-        CBA_BUTTON 
-            {
-            id 	= EAknSoftkeyBack; 
-            txt = text_softkey_back;
-            },
-        CBA_BUTTON
-            {
-            id 	= ELocSuplMSKOpen; 
-            txt = qtn_msk_open;
-            }
-        };
-    }
-
-//----------------------------------------------------  
-// r_suplsettings_options_nomsk_back
-// CBA for SUPL Settings UI view.
-//----------------------------------------------------
-//   
-RESOURCE CBA r_suplsettings_options_nomsk_back
-    {
-    flags 	= 0;
-    buttons = 
-        {
-        CBA_BUTTON 
-            {
-            id 	= EAknSoftkeyOptions; 
-            txt = text_softkey_option;
-            },
-        CBA_BUTTON 
-            {
-            id 	= EAknSoftkeyBack; 
-            txt = text_softkey_back;
-            },
-        CBA_BUTTON
-            {
-            id 	= ELocSuplMSKNo; 
-            txt = "";
-            }
-        };
-    }
-
-//------------------------------------------------------------------------------  
-// r_suplsettings_menubar_view
-// Menu bar for SUPL Settings Configuration view
-//------------------------------------------------------------------------------
-//
-RESOURCE MENU_BAR r_suplsettings_menubar_view
-    {
-    titles	=
-        {
-        MENU_TITLE 
-            { 
-            menu_pane = r_suplsettings_menu; txt=""; 
-            }
-        };
-    }
-
-//------------------------------------------------------------------------------   
-// r_suplsettings_menu
-// Menu Items for SUPL Settings Configuration view
-//------------------------------------------------------------------------------
-//
-RESOURCE MENU_PANE r_suplsettings_menu
-    {
-    items		=
-        {
-        MENU_ITEM 
-            { 
-            command = ELocSuplChange; 
-            txt 	= qtn_loc_server_options_change; 
-            flags = EEikMenuItemAction;
-            },
-        MENU_ITEM
-            {
-            command = ELocSuplClearSession;
-            txt     = qtn_loc_supl_options_terminate; 
-            flags = EEikMenuItemSpecific;
-            },
-        MENU_ITEM
-            {
-            command = ELocSuplClearSessions;
-            txt     = qtn_loc_supl_options_terminate_multiple; 
-            flags = EEikMenuItemSpecific;
-            },
-        MENU_ITEM 
-            { 
-            command = EAknCmdHelp; 
-            txt 	= qtn_options_help; 
-            },
-        MENU_ITEM 
-            {
-            // Exit option should use 'EEikCmdExit' instead of 'EEAknCmdExit'
-            // This is to ensure that the Exit command is not handled by the 
-            // ProcessCommandL of CAknView and is transferred to 
-            // CAknViewAppUi::HandleCommandL. This behaviour is necessary 
-            // for proper handling of the Exit command from an App Server's 
-            // perspective.
-            command = EEikCmdExit;  
-            txt 	= qtn_options_exit; 
-            }
-        };
-    }
-
-//------------------------------------------------------------------------------
-// r_suplview_title
-// Title for SUPL Settings Configuration view
-//------------------------------------------------------------------------------
-//
-RESOURCE TBUF r_suplview_title
-    {
-    buf = qtn_loc_supl_title;
-    }
-    
-//------------------------------------------------------------------------------  
-// r_loc_supl_use
-// List settings item description for SUPL settings usage.
-//------------------------------------------------------------------------------
-//
-RESOURCE TBUF r_loc_supl_use
-    {
-    buf = qtn_loc_supl_server_use;
-    }
-    
-//------------------------------------------------------------------------------   
-// r_loc_supl_server_detail
-// List settings item caption for multiple SUPL servers
-//------------------------------------------------------------------------------
-//
-RESOURCE TBUF r_loc_supl_server_detail
-    {
-    buf = qtn_loc_supl_server_detail;
-    }   
-    
-//------------------------------------------------------------------------------   
-// r_loc_supl_no_service
-// List settings item caption for SUPL active sessions count, if count is 0
-//------------------------------------------------------------------------------
-//
-RESOURCE TBUF r_loc_supl_no_service
-    {
-    buf = qtn_loc_supl_no_service;
-    } 
-    
-//------------------------------------------------------------------------------   
-// r_loc_supl_single_service
-// List settings item caption for SUPL active sessions count, if count is 1
-//------------------------------------------------------------------------------
-//
-RESOURCE TBUF r_loc_supl_single_service
-    {
-    buf = qtn_loc_supl_single_service;
-    } 
-    
-//------------------------------------------------------------------------------   
-// r_loc_supl_multiple_services
-// List settings item caption for SUPL active sessions count
-//------------------------------------------------------------------------------
-//
-RESOURCE TBUF r_loc_supl_multiple_services
-    {
-    buf = qtn_loc_supl_multiple_services;
-    } 
-
-//------------------------------------------------------------------------------
-// r_loc_supl_usage_settings
-// Settings page for manipulating SUPL settings usage.
-//------------------------------------------------------------------------------
-//
-RESOURCE AVKON_SETTING_PAGE r_loc_suplusage_settings
-    { 
-    label 				= 	qtn_loc_supl_lbl_server_use;
-    softkey_resource 	= 	R_AVKON_SOFTKEYS_CANCEL;
-    type 				= 	EAknSetListBox;
-    editor_resource_id 	= 	r_loc_suplusage_settings_listbox;
-    }
-
-//------------------------------------------------------------------------------
-// r_loc_suplusage_settings_listbox 
-// Set Settings text
-//------------------------------------------------------------------------------
-//
-RESOURCE LISTBOX r_loc_suplusage_settings_listbox 
-    {
-    flags	= EEikListBoxMultipleSelection;
-    }
-    
-//------------------------------------------------------------------------------ 
-// r_loc_supl_automatic
-// Settings Item for SUPL usage
-// This value denotes that SUPL would be used automatically when the user is in his
-// home network. When the user is roaming he would be prompted with a query for
-// using SUPL.
-//------------------------------------------------------------------------------
-//
-RESOURCE TBUF r_loc_supl_automatic
-    {
-    buf = qtn_loc_supl_automatic;
-    }
-
-//------------------------------------------------------------------------------ 
-// r_loc_supl_automatic
-// Settings Item for SUPL usage
-// This value denotes that SUPL would be used automatically when the user is in his
-// home network. When the user is roaming he would be prompted with a query for
-// using SUPL.
-//------------------------------------------------------------------------------
-//
-RESOURCE TBUF r_loc_supl_home_automatic
-    {
-    buf = qtn_loc_supl_home_automatic;
-    }
-    
-//------------------------------------------------------------------------------
-// r_loc_supl_ask
-// Settings Item for SUPL usage
-// This value denotes that the user would always be prompted before using SUPL.
-//------------------------------------------------------------------------------
-//
-RESOURCE TBUF r_loc_supl_ask
-    {
-    buf = qtn_loc_supl_ask;
-    }  
-
-//------------------------------------------------------------------------------  
-// r_loc_supl_disabled
-// Settings Item for SUPL usage
-// This value denotes that SUPL would not be used at all.
-//------------------------------------------------------------------------------
-//
-RESOURCE TBUF r_loc_supl_disabled
-    {
-    buf = qtn_loc_supl_disabled;
-    }
-
-//------------------------------------------------------------------------------   
-// r_loc_supl_server_detail_title
-// Title text for multiple SUPL servers view
-//------------------------------------------------------------------------------
-//
-RESOURCE TBUF r_loc_supl_server_detail_title
-    {
-    buf = qtn_loc_server_detail_title;
-    }   
-
-//------------------------------------------------------------------------------   
-// r_loc_supl_services_title
-// Title text for SUPL active sessions view
-//------------------------------------------------------------------------------
-//
-RESOURCE TBUF r_loc_supl_services_title
-    {
-    buf = qtn_loc_supl_services_title;
-    }   
-
-//------------------------------------------------------------------------------   
-// r_loc_supl_unknown_service
-// Text to display for the service with no name
-//------------------------------------------------------------------------------
-//
-RESOURCE TBUF r_loc_supl_unknown_service
-    {
-    buf = qtn_loc_supl_unknown_service;
-    }  
-    
-//------------------------------------------------------------------------------  
-// r_loc_server_address_name
-// Heading for server address Supl server editor form field
-//------------------------------------------------------------------------------
-//
-RESOURCE TBUF r_loc_server_address_name
-    {
-    buf = qtn_loc_server_address_name;
-    } 
-      
-//------------------------------------------------------------------------------   
-// r_loc_server_iap
-// Heading for access point Supl server editor form field 
-//------------------------------------------------------------------------------
-//
-RESOURCE TBUF r_loc_server_iap
-    {
-    buf = qtn_loc_server_iap;
-    }   
-
-//------------------------------------------------------------------------------  
-// r_loc_no_ap_defined
-// No IAP defined text
-//------------------------------------------------------------------------------
-//
-RESOURCE TBUF r_loc_no_ap_defined
-    {
-    buf		= qtn_netw_info_no_iap_defined;
-    }  
-
-//------------------------------------------------------------------------------  
-// r_general_note
-// Note to be displayed when no IAPs are defined
-//------------------------------------------------------------------------------
-//    
-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;
-                };
-            }
-        };
-    }
-                     
-//------------------------------------------------------------------------------
-// r_suplsettings_server_view
-// SUPL Settings Server view
-//------------------------------------------------------------------------------
-//
-RESOURCE AVKON_VIEW r_suplsettings_server_view
-    {    
-    menubar = r_suplsettings_server_menubar_view;  
-    cba 	= r_suplsettings_options_contextoptions_back;  
-    }
-
-//------------------------------------------------------------------------------
-// r_suplsettings_session_view
-// SUPL Settings Session view
-//------------------------------------------------------------------------------
-//
-RESOURCE AVKON_VIEW r_suplsettings_session_view
-    {    
-    menubar = r_suplsettings_session_menubar_view;  
-    cba 	= r_suplsettings_options_contextoptions_back;  
-    }
-    
-//----------------------------------------------------  
-// r_suplsettings_options_contextoptions_back
-// CBA for SUPL Settings Server List view.
-//----------------------------------------------------
-//   
-RESOURCE CBA r_suplsettings_options_contextoptions_back
-    {
-    flags 	= 0;
-    buttons = 
-        {
-        CBA_BUTTON 
-            {
-            id 	= 	EAknSoftkeyOptions; 
-            txt = 	text_softkey_option;
-            },
-        CBA_BUTTON 
-            {
-            id 	= 	EAknSoftkeyBack; 
-            txt = 	text_softkey_back;
-            },
-        CBA_BUTTON 
-            {
-            id	=	EAknSoftkeyContextOptions; 
-            txt = 	text_softkey_option;
-            }
-        };
-    }
-
-//----------------------------------------------------  
-// r_suplsettings_session_options_back_open
-// CBA for SUPL Session List view.
-//----------------------------------------------------
-//   
-RESOURCE CBA r_suplsettings_session_options_back_open
-    {
-    flags 	= 0;
-    buttons = 
-        {
-        CBA_BUTTON 
-            {
-            id 	= 	EAknSoftkeyOptions; 
-            txt = 	text_softkey_option;
-            },
-        CBA_BUTTON 
-            {
-            id 	= 	EAknSoftkeyBack; 
-            txt = 	text_softkey_back;
-            },
-        CBA_BUTTON 
-            {
-            id	=	EAknSoftkeyOpen; 
-            txt = 	text_softkey_open;
-            }
-        };
-    }
-
-//----------------------------------------------------  
-// r_suplsettings_server_options_back
-// CBA for SUPL Settings Server List view.
-//----------------------------------------------------
-//   
-RESOURCE CBA r_suplsettings_server_options_back
-    {
-    flags 	= 0;
-    buttons = 
-        {
-        CBA_BUTTON 
-            {
-            id 	= 	EAknSoftkeyOptions; 
-            txt = 	text_softkey_option;
-            },
-        CBA_BUTTON 
-            {
-            id 	= 	EAknSoftkeyBack; 
-            txt = 	text_softkey_back;
-            },
-        CBA_BUTTON
-            {
-            id 	= 	ELocSuplServerMSKNoCmd; 
-            txt = 	"";
-            }
-        };
-    }
-    
-//----------------------------------------------------  
-// r_suplsettings_session_options_back
-// CBA for SUPL Session view.
-//----------------------------------------------------
-//   
-RESOURCE CBA r_suplsettings_session_options_back
-    {
-    flags 	= 0;
-    buttons = 
-        {
-        CBA_BUTTON 
-            {
-            id 	= 	EAknSoftkeyOptions; 
-            txt = 	text_softkey_option;
-            },
-        CBA_BUTTON 
-            {
-            id 	= 	EAknSoftkeyBack; 
-            txt = 	text_softkey_back;
-            },
-        CBA_BUTTON
-            {
-            id 	= 	ELocSuplSessionMSKNoCmd; 
-            txt = 	"";
-            }
-        };
-    }
-    
-//----------------------------------------------------  
-// r_suplsettings_server_ok_cancel
-// CBA for SUPL Settings Server List view.
-//----------------------------------------------------
-//   
-RESOURCE CBA r_suplsettings_server_ok_cancel
-    {
-    flags 	= 0;
-    buttons = 
-        {
-        CBA_BUTTON 
-            {
-            id 	= 	EAknSoftkeyOk; 
-            txt = 	text_softkey_ok;
-            },
-        CBA_BUTTON 
-            {
-            id 	= 	EAknSoftkeyCancel; 
-            txt = 	text_softkey_cancel;
-            },
-        CBA_BUTTON
-            {
-            id 	= 	ELocSuplServerMSKNoCmd; 
-            txt = 	"";
-            }
-        };
-    }
-    
-//------------------------------------------------------------------------------  
-// r_suplsettings_server_menubar_view
-// Menu bar for SUPL Settings Server List view
-//------------------------------------------------------------------------------
-//
-RESOURCE MENU_BAR r_suplsettings_server_menubar_view
-    {
-    titles	=
-        {
-        MENU_TITLE 
-            { 
-            menu_pane = r_suplsettings_server_main_menu; txt=""; 
-            },
-        MENU_TITLE 
-            { 
-            menu_pane = R_AVKON_MENUPANE_MARKABLE_LIST; 
-            },
-        MENU_TITLE 
-            { 
-            menu_pane = r_suplsettings_server_menu; txt=""; 
-            }
-        };
-    }
- 
- //------------------------------------------------------------------------------  
-// r_suplsettings_session_menubar_view
-// Menu bar for SUPL Settings Server List view
-//------------------------------------------------------------------------------
-//
-RESOURCE MENU_BAR r_suplsettings_session_menubar_view
-    {
-    titles	=
-        {
-        MENU_TITLE 
-            { 
-            menu_pane = r_suplsettings_server_main_menu; txt=""; 
-            },
-        MENU_TITLE 
-            { 
-            menu_pane = R_AVKON_MENUPANE_MARKABLE_LIST; 
-            },
-        MENU_TITLE 
-            { 
-            menu_pane = r_suplsettings_session_menu; txt=""; 
-            }
-        };
-    }   
-
-//------------------------------------------------------------------------------   
-// r_suplsettings_server_menu1
-// Menu Items for SUPL Settings Server List View
-//------------------------------------------------------------------------------
-//
-RESOURCE MENU_PANE r_suplsettings_server_menu
-    {
-    items	=
-        {
-        MENU_ITEM 
-            { 
-            command = ELocSuplServerEnable; 
-            txt 	= qtn_loc_detail_options_enable;
-            flags = EEikMenuItemSpecific;
-            },
-        MENU_ITEM 
-            { 
-            command = ELocSuplServerDisable; 
-            txt 	= qtn_loc_detail_options_disable;
-            flags = EEikMenuItemSpecific;
-            },
-        MENU_ITEM 
-            { 
-            command = ELocSuplServerOpen; 
-            txt 	= qtn_loc_supl_options_open;
-            flags = EEikMenuItemAction;
-            },
-        MENU_ITEM 
-            { 
-            command = ELocSuplServerNew; 
-            txt 	= qtn_loc_detail_options_newserver; 
-            },
-        MENU_ITEM 
-            { 
-            command = ELocSuplServerDelete; 
-            txt 	= qtn_loc_detail_options_delete; 
-            flags = EEikMenuItemSpecific;
-            },
-        MENU_ITEM 
-            { 
-            command = ELocSuplServerPrioritize; 
-            txt 	= qtn_loc_detail_options_prioritize;
-            flags = EEikMenuItemSpecific;
-            }
-        };
-    }
-    
- //------------------------------------------------------------------------------   
-// r_suplsettings_session_menu1
-// Menu Items for SUPL Session List View
-//------------------------------------------------------------------------------
-//
-RESOURCE MENU_PANE r_suplsettings_session_menu
-    {
-    items	=
-        {
-
-        MENU_ITEM 
-            { 
-            command = ELocSuplSessionTerminate; 
-            txt 	= qtn_loc_supl_options_terminate; 
-            flags = EEikMenuItemSpecific;
-            },
-        MENU_ITEM 
-            { 
-            command = ELocSuplSessionsTerminate; 
-            txt 	= qtn_loc_supl_options_terminate_multiple; 
-            flags = EEikMenuItemSpecific;
-            }
-        };
-    }
-            
-//------------------------------------------------------------------------------   
-// r_suplsettings_server_menu2
-// Menu Items for SUPL Settings Server List View
-//------------------------------------------------------------------------------
-//
-RESOURCE MENU_PANE r_suplsettings_server_main_menu
-    {
-    items	=
-        {
-        MENU_ITEM 
-            { 
-            command = EAknCmdHelp; 
-            txt 	= qtn_options_help; 
-            },
-        MENU_ITEM 
-            {
-            // Exit option should use 'EEikCmdExit' instead of 'EEAknCmdExit'
-            // This is to ensure that the Exit command is not handled by the 
-            // ProcessCommandL of CAknView and is transferred to 
-            // CAknViewAppUi::HandleCommandL. This behaviour is necessary 
-            // for proper handling of the Exit command from an App Server's 
-            // perspective.
-            command = EEikCmdExit;  
-            txt 	= qtn_options_exit; 
-            }
-        };
-    }
-
-//----------------------------------------------------
-//   
-// r_suplsettings_server_contextmenubar
-// Context Menu Bar for SUPL Settings Server List View
-//
-//----------------------------------------------------
-//
-RESOURCE MENU_BAR r_suplsettings_server_contextmenubar
-    {
-    titles	=
-        {
-        MENU_TITLE { menu_pane=R_AVKON_MENUPANE_MARKABLE_LIST; txt=""; },
-		MENU_TITLE { menu_pane = r_suplsettings_server_contextmenu; txt=" "; }
-        };
-    }
-    
-//----------------------------------------------------
-//   
-// r_suplsettings_server_contextmenu
-// Context Menu Items for SUPL Settings Server List View
-//
-//----------------------------------------------------
-//
-RESOURCE MENU_PANE r_suplsettings_server_contextmenu
-    {
-    items	=
-        {
-		MENU_ITEM 	
-			{ 	
-			command = 	ELocSuplServerMSKEnable; 
-			txt		=	qtn_loc_detail_options_enable;
-			},
-		MENU_ITEM 	
-			{ 	
-			command = 	ELocSuplServerMSKDisable; 
-			txt		=	qtn_loc_detail_options_disable;
-			},
-			
-		MENU_ITEM
-		    {
-			command = ELocSuplServerDelete;
-			txt = qtn_loc_detail_options_delete;
-		    },
-			
-     MENU_ITEM
-            {
-            command = ELocSuplServerNew;
-            txt = qtn_loc_detail_options_newserver;
-            }
-        };
-    }
-
-//----------------------------------------------------
-//   
-// r_suplsettings_session_contextmenubar
-// Context Menu Bar for SUPL Settings Session List View
-//
-//----------------------------------------------------
-//
-RESOURCE MENU_BAR r_suplsettings_session_contextmenubar
-    {
-    titles	=
-        {
-		MENU_TITLE { menu_pane = r_suplsettings_session_contextmenu; txt=" "; },
-        MENU_TITLE { menu_pane = R_AVKON_MENUPANE_MARKABLE_LIST; txt=" "; }
-        };
-    }
-    
-//----------------------------------------------------
-//   
-// r_suplsettings_session_contextmenu
-// Context Menu Items for SUPL Settings Session List View
-//
-//----------------------------------------------------
-//
-RESOURCE MENU_PANE r_suplsettings_session_contextmenu
-    {
-    items	=
-        {
-        MENU_ITEM 
-            { 
-            command = ELocSuplSessionMSKTerminate; 
-            txt 	= qtn_loc_supl_options_terminate; 
-            flags = EEikMenuItemSpecific;
-            },
-        MENU_ITEM 
-            { 
-            command = ELocSuplSessionsMSKTerminate; 
-            txt 	= qtn_loc_supl_options_terminate_multiple; 
-            flags = EEikMenuItemSpecific;
-            }
-        };
-    }
-
-//------------------------------------------------------------------------------  
-// r_loc_detail_conf_delete_servers
-// Confirmation for delete text
-//------------------------------------------------------------------------------
-//
-RESOURCE TBUF r_loc_detail_conf_delete_server
-    {
-    buf		= qtn_loc_detail_conf_delete_server;
-    }  
-
-//------------------------------------------------------------------------------  
-// r_loc_detail_conf_delete_servers
-// Confirmation for delete text
-//------------------------------------------------------------------------------
-//
-RESOURCE TBUF r_loc_detail_conf_delete_servers
-    {
-    buf		= qtn_loc_detail_conf_delete_servers;
-    }  
-
-
-//----------------------------------------------------
-//  r_loc_supl_delete_query
-//  Confirmation Query for delete
-//----------------------------------------------------
-//
-RESOURCE DIALOG r_loc_supl_delete_query
-	{
-	flags 	= EGeneralQueryFlags;
-	buttons = R_AVKON_SOFTKEYS_YES_NO;
-	items 	= 
-		{
-		DLG_LINE
-			{
-			type 	= EAknCtQuery;
-			id 		= EGeneralQuery;
-			control = AVKON_CONFIRMATION_QUERY
-				{
-				layout = EConfirmationQueryLayout;
-				};
-			}
-		};
-	}
-
-//------------------------------------------------------------------------------  
-// r_loc_supl_query_terminate_all
-// Confirmation for deleting all the sessions(Clear sessions)
-//------------------------------------------------------------------------------
-//
-RESOURCE TBUF r_loc_supl_query_terminate_all
-    {
-    buf		= qtn_loc_supl_query_terminate_all;
-    }  
-
-//------------------------------------------------------------------------------  
-// r_loc_supl_query_terminate
-// Confirmation for deletint a session
-//------------------------------------------------------------------------------
-//
-RESOURCE TBUF r_loc_supl_query_terminate
-    {
-    buf		= qtn_loc_supl_query_terminate;
-    }   
-
-//------------------------------------------------------------------------------  
-// r_loc_supl_query_terminate_multiple
-// Confirmation for deleting multiple sessions in view
-//------------------------------------------------------------------------------
-//
-RESOURCE TBUF r_loc_supl_query_terminate_multiple
-    {
-    buf		= qtn_loc_supl_query_terminate_multiple;
-    }   
-
-// ---------------------------------------------------------
-//  Additional resource files
-// ---------------------------------------------------------
-//
-#include "locsuplservereditor.rss"  
-#include "locsuplsessioneditor.rss"  
--- a/locationsystemui/locationsysui/locsuplsettingsui/group/bld.inf	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,42 +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 provides the information required for building the
-*				 SUPL settings UI
-*                
-*
-*/
-
-
-// To get the MW_LAYER_PLATFORM_EXPORT_PATH macro definitions
-#include <platform_paths.hrh>
-
-PRJ_PLATFORMS
-DEFAULT
-
-PRJ_EXPORTS
-
-PRJ_MMPFILES
-locsuplsettings.mmp    
-
-
-PRJ_TESTMMPFILES
-
-PRJ_EXTENSIONS
-START EXTENSION s60/mifconv
-OPTION TARGETFILE locsuplsettings.mif
-OPTION HEADERFILE locsuplsettings.mbg
-OPTION SOURCES -c8,8 qgn_loc_server_disabled.svg
-END
-
-//  End of File  
--- a/locationsystemui/locationsysui/locsuplsettingsui/group/locsuplsettings.mmp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,98 +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:  This is project specification file for SUPL Settings UI
-*
-*/
-
-#include <data_caging_paths.hrh>
-#include "../inc/locsuplsettingsuid.hrh"    // For UID3
-#include <platform_paths.hrh> // For the MW_LAYER_SYSTEMINCLUDE
-
-CAPABILITY          CAP_ECOM_PLUGIN ReadUserData WriteUserData
-TARGET              locsuplsettings.dll
-TARGETTYPE          PLUGIN
-UID                 0x10009D8D KLOCSUPLSETTINGSUIUID3
-VENDORID            VID_DEFAULT
-
-USERINCLUDE         ../inc
-USERINCLUDE         ../data
-USERINCLUDE	    ../../../inc
-USERINCLUDE         ../../../../inc
-USERINCLUDE	    ../../loc
-
-
-// System Include
-APP_LAYER_SYSTEMINCLUDE
-
-SOURCEPATH          ../src
-SOURCE              locsuplsettings.cpp
-SOURCE              locsuplsettingsimptable.cpp
-SOURCE              locsuplsettingsview.cpp
-SOURCE              locsuplsettingscontainer.cpp
-SOURCE              locsuplsettingslbmodel.cpp
-SOURCE              locsuplsettingsuiengine.cpp
-SOURCE	            locsuplsettingsadapter.cpp
-SOURCE	            locsuplserverview.cpp
-SOURCE	            locsuplservercontainer.cpp
-SOURCE	            locsuplserverlbmodel.cpp
-SOURCE	            locsuplservereditor.cpp
-SOURCE	            locsuplsessioneditor.cpp
-SOURCE	            locsupldebug.cpp
-SOURCE	            locsuplsessionview.cpp
-SOURCE              locsuplsessioncontainer.cpp
-SOURCE              locsuplsessionlbmodel.cpp
-
-
-SOURCEPATH          ../data
-//ECOM resource definition
-START RESOURCE      10275091.rss
-TARGET              locsuplsettings.rsc
-END // ECOM resource definition
-
-//View resources
-START RESOURCE      locsuplsettingsui.rss
-HEADER
-TARGETPATH          RESOURCE_FILES_DIR
-LANGUAGE_IDS
-END // AppsPlugin resources
-
-LIBRARY             euser.lib
-LIBRARY             ecom.lib
-LIBRARY             efsrv.lib
-LIBRARY             avkon.lib
-LIBRARY             bafl.lib 
-LIBRARY             cone.lib 
-LIBRARY             eikcoctl.lib 
-LIBRARY             eikctl.lib 
-LIBRARY             eikcore.lib 
-LIBRARY             commonengine.lib        // For RConeResourceLoader
-LIBRARY             egul.lib     		    // CGulIcon
-LIBRARY		    	aknicon.lib 
-LIBRARY             aknskins.lib   		    // AknsUtils.h
-LIBRARY             aknskinsrv.lib   		// AknsUtils.h
-LIBRARY             aknswallpaperutils.lib  // AknsUtils.h
-LIBRARY 	    	hlplch.lib
-LIBRARY             insock.lib
-LIBRARY             commdb.lib  
-LIBRARY             centralrepository.lib   // For Central repository key
-LIBRARY             CommonUI.lib            // For the Standard Error notes
-LIBRARY		    	AGENTDIALOG.lib
-LIBRARY 	    	featmgr.lib 		    // Feature manager API
-LIBRARY		    	epos_suplsettings.lib	// SUPL Settings API
-LIBRARY             eikdlg.lib
-LIBRARY             aknnotify.lib           // AknGlobalConfirmation Query
-LIBRARY 	    	cmmanager.lib			// For Connection Settings API
-LIBRARY		    	flogger.lib
-
-// End of File
--- a/locationsystemui/locationsysui/locsuplsettingsui/inc/locsupldebug.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,45 +0,0 @@
-/*
-* Copyright (c) 2008 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:  Utility class for Debug traces
-*
-*/
-
-
-#ifndef LOCSUPL_DEBUG_H
-#define LOCSUPL_DEBUG_H
-
-// INCLUDES
-#include <e32std.h>
-#include "locsupldebugconfig.h"
-
-// MACROS
-#ifdef _LOCSUPLDEBUG
-
-#define DEBUG( TEXT) Debug( _L( #TEXT ));
-#define DEBUG1( TEXT, ARG1 ) Debug( _L( #TEXT ), ( ARG1 ));
-#define DEBUG2( TEXT, ARG1, ARG2 ) Debug( _L( #TEXT ), ( ARG1 ), ( ARG2 ));
-#define DEBUG3( TEXT, ARG1, ARG2, ARG3 ) Debug( _L( #TEXT ), ( ARG1 ), ( ARG2 ), ( ARG3 ));
-
-void Debug( TRefByValue<const TDesC> aText, ...);
-
-#else
-
-#define DEBUG( TEXT ) ;
-#define DEBUG1( TEXT, ARG1 ) ;
-#define DEBUG2( TEXT, ARG1, ARG2 ) ;
-#define DEBUG3( TEXT, ARG1, ARG2, ARG3 ) ;
-
-#endif // _LOCSUPLDEBUG
-
-#endif // LOCSUPL_DEBUG_H
--- a/locationsystemui/locationsysui/locsuplsettingsui/inc/locsupldebugconfig.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +0,0 @@
-/*
-* Copyright (c) 2008 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:  config flag for Debug traces
-*
-*/
-
-
-#ifndef LOCSUPL_DEBUGCONFIG_H
-#define LOCSUPL_DEBUGCONFIG_H
-
-// Turn this flag on/off as needed
-//#define _LOCSUPLDEBUG
-
-#endif // LOCSUPL_DEBUGCONFIG_H
--- a/locationsystemui/locationsysui/locsuplsettingsui/inc/locsuplservercontainer.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,272 +0,0 @@
-/*
-* Copyright (c) 2008 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:  SUPL server UI View's container
-*
-*/
-
-
-#ifndef C_LOCSUPLSERVERCONTAINER_H_
-#define C_LOCSUPLSERVERCONTAINER_H_
-
-// System Includes 
-#include <e32base.h>
-#include <coecntrl.h>
-#include <eiklbo.h>
-
-    
-// Forward Declarations
-class CLocSUPLServerLBModel;
-class CLocSUPLSettingsUiEngine;
-class CAknSingleNumberStyleListBox;
-class CAknIconArray;
-class CLocSUPLServerView;
-
-// Class Declarations
-/**
- * Container for the SUPL server UI View.
- * 
- * Contains the Listbox control that is used to configure various SUPL settings 
- * options
- *
- * @lib locsuplsettings.lib
- * @since S60 v3.1 
- */
-class CLocSUPLServerContainer : public CCoeControl,
-                                public MEikListBoxObserver
-	{
-	public:
-		/**
- 		 * Static Two phase contructor that instantiates the CLocSUPLServerContainer
-		 * 
-		 * @param aRect				            Client rectangle
-         * @param aEngine                       Reference to the SUPL Settings
-         *                                      engine 		 
-         * @param CLocSUPLServerView            Pointer to the current view
-		 * @return CLocSUPLServerContainer*	Reference to the object created
-		 */
-		static CLocSUPLServerContainer* NewL( 
-                    		const TRect&               	aRect,
-                          	CLocSUPLSettingsUiEngine&	aEngine,
-                          	CLocSUPLServerView* 		aView );
-
-		/**
-		 * Static Two phase contructor that instantiates the CLocSUPLServerContainer
-		 * Leaves the object on the Cleanup stack
-		 * 
-		 * @param aRect				            Client rectangle
-         * @param aEngine                       Reference to the SUPL Settings
-         *                                      engine 		 
-         * @param CLocSUPLServerView            Pointer to the current view
-		 * @return CLocSUPLServerContainer*	Reference to the object created
-		 */
-		static CLocSUPLServerContainer* NewLC( 
-                    		const TRect&               	aRect,
-                          	CLocSUPLSettingsUiEngine&	aEngine,
-                          	CLocSUPLServerView* 		aView );
-
-		/**
-		 * Destructor
-		 */
-		~CLocSUPLServerContainer();
-    
-		/**
-		 * Inherited from CCoeControl
-		 */
-		void HandleResourceChange( TInt aType );
-
-        /**
-         * Returns the help context
-         *
-         * @param aContext	The help context that has to be determined
-         */
-        void GetHelpContext( TCoeHelpContext& aContext ) const; 
-        
-        /**
-         * From CoeControl
-         */
-        TInt CountComponentControls() const;
-
-        /**
-         * From CCoeControl
-         */
-        CCoeControl* ComponentControl( TInt aIndex ) const;
-        
-        /**
-         * Inherited from CCoeControl
-         */
-        TKeyResponse OfferKeyEventL( const TKeyEvent& aKeyEvent,
-        						           TEventCode aType );
-		 		 		 
-		/**
-         * Inherited from MEikListBoxObserver
-         */
-        void HandleListBoxEventL( CEikListBox*      aListBox, 
-        					      TListBoxEvent     aEventType );
-	 
-        /**
-         * Inherited from CCoeControl
-         */
-        void HandlePointerEventL(const TPointerEvent& aPointerEvent);
-	public: // New functions
-		
-        /**
-         * Refreshes the screen so that the list box reflects the latest contents
-         */
-         void UpdateScreenL();
-         
-        /**
-         * Return reference to listbox
-         * @return CEikListBox reference
-         */
-        CEikListBox& ListBoxL();
-        
-        /**
-		 * Returns the Selected element. The list box model defines the
-		 * enumeration that would determine the current element that has been
-		 * selected
-		 *
-		 * @return TInt Index of the item selected
-		 */
-		TInt SelectedItemIndex();
-		 
-        /**
-         * Return current selected server id
-         */
-		TInt64 CurrentSlpId();
-        					      
-        /**
-         * Return current selected/marked server count
-         */
-		TInt SelectedCount();
-
-        /**
-         * Return total no of servers in the view
-         */		
-		TInt ServerCount();
-        					      
-        /**
-         * Returns the slp ids array
-         */		
-		RArray<TInt64>& SlpIds();
-		
-		/**
-         * Sets the current selected item
-         */	
-		void SetSelectedIndex();
-		
-		/**
-         * Shows context specific options menu
-         */	
-		void ShowContextMenuL();
-
-	protected:
-		/**
-		 * Handles Focus Change to list 
-		 */
-		void FocusChanged( TDrawNow aDrawNow );
-		 
-		/**
-         * From CoeControl,SizeChanged.
-         */
-        void SizeChanged();
-
-	private:
-		/**
-		 * Overloaded Constructor
-		 */
-		CLocSUPLServerContainer( CLocSUPLServerView* aView );
-		
-		/**
-		 * Second phase of the two phase Construction process
-		 */
-		void ConstructL( const TRect&                        aRect ,
-		                       CLocSUPLSettingsUiEngine&     aEngine );
-          
-        /**
-         * Sets the Title text
-         * @param aResourceText Resource to create title
-         */
-        void MakeTitleL( TInt aResourceText );
-          
-		/**
-         * Returns the Appui's status pane
-         * @return CEikStatusPane* Statuspane pointer
-         */
-		CEikStatusPane* StatusPane();
-
-        /** 
-         * Creates the List box and the Listbox model. Associates the 
-         * list box model wit the list box
-         *
-         * @param aEngine    Reference to the SUPL Settings engine          
-         */
-        void CreateListboxL( CLocSUPLSettingsUiEngine&     aEngine );
-        
-        /**
-         * Append icon to icon array. CAknIconArray owns icons so it is 
-         * easier to it leave safely.
-         * @param aIcons icon array
-         * @param aIconFileWithPath icon file name with path
-         * @param aSkinID skin id of the icon
-         * @param aIconGraphicsIndex picture index
-         * @param aIconGraphicsMaskIndex mask index
-         */
-        void AddIconL( CAknIconArray&       aIcons,
-                       const TDesC&         aIconFileWithPath,
-                       TAknsItemID          aSkinID,
-                       TInt                 aIconGraphicsIndex,
-                       TInt                 aIconGraphicsMaskIndex );
-	
-		/**
-         * Returns the Applications Icon File name with path
-         */
-		TFileName* IconFileNameLC() const;
-		
-   private:
-    
-        /**
-         * Reference to the Current View
-         */
-        CLocSUPLServerView*					iView;
-        
-        /**
-         * Help context
-         */
-        TCoeContextName 					iContextName;
-        
-        /**
-         * Settings list box for SUPL settings
-         * Owns
-         */
-        CAknSingleNumberStyleListBox*   	iListBox;
-        
-        /**
-         * List Box model
-         */
-        CLocSUPLServerLBModel*        		iListBoxModel;
-        
-        /**
-         * Boolean flag to denote whether the pen down occured
-         */
-        TBool								iTouchFlag;  
-        
-         /**
-         * Selected item index value used to set new focus
-         * after delete operation.
-         */
-       	TInt 								iSelectedIndex;
-	};
-
-#endif // C_LOCSUPLSERVERCONTAINER_H_
-
--- a/locationsystemui/locationsysui/locsuplsettingsui/inc/locsuplservereditor.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,288 +0,0 @@
-/*
-* Copyright (c) 2008 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:  supl server editor
-*
-*/
-
-
-#ifndef __LOCSUPLSERVER_EDITOR_H__
-#define __LOCSUPLSERVER_EDITOR_H__
-
-
-#include <AknForm.h>
-#include <ConeResLoader.h>
-
-const TInt KMaxUsageTextSize = 5;
-_LIT(KNoUsageInHomeNetork, "No");
-
-class CAknTitlePane;
-class CLocSUPLSettingsUiEngine;
-
-class MSuplServerEditorObserver
-	{
-public:
-	
-	virtual void UpdateIapL( const TDesC& aIapName ) = 0;
-	};
-
-
-
-/**
-*  A dialog that makes it possible to edit certain fields of a supl server.
-*/
-class CLocSUPLServerEditor : 
-    public CAknForm, public MSuplServerEditorObserver
-    {
-    public: // Constructors and destructor
-
-        /**
- 		* Static Two phase contructor that instantiates the CLocSUPLServerEditor
-		* 
-        */
-        static CLocSUPLServerEditor* NewL( 
-        					TBool aIsEditable,
-                            CLocSUPLSettingsUiEngine&       aEngine,
-        					TInt64 aSlpId
-		);
-
-        /**
- 		* Static Two phase contructor that instantiates the CLocSUPLServerEditor
-		* 
-        */
-        static CLocSUPLServerEditor* NewLC( 
-        					TBool aIsEditable,
-                            CLocSUPLSettingsUiEngine&       aEngine,
-        					TInt64 aSlpId
-		);
-
-        /**
-        * Destructor.
-        */
-        ~CLocSUPLServerEditor();
-
-    public: // From CAknDialog
-
-        /**
-        * DynInitMenuPaneL initializes the menu pane before it is displayed.
-        *
-        * @param aResourceId a resource ID indetifying the menu bar containing
-        * the menu pane to be initialized.
-        * @param aMenuPane the menu pane to initialize.
-        */
-        void DynInitMenuPaneL(TInt aResourceId, CEikMenuPane* aMenuPane);
-
-        /**
-        * Processes user commands.
-        *
-        * @param aCommandId id of the command to respond to
-        */
-        void ProcessCommandL(TInt aCommandId);
-        
-        /**
-         * 
-         * 
-         */
-        void HandleDialogPageEventL( TInt aEventID );
-        /*
-         * Executes the Dialog
-         */
-        TInt ExecuteLD();
-	
-	public: // from MSuplServerEditorObserver
-	
-	    /*
-         * Changes IAP value in AP field
-         */
-		void UpdateIapL( const TDesC& aIapName );
-
-	
-    protected: // From CAknForm
-
-     /**
-       * Inherited from CCoeControl
-       */				    
-        
-		TKeyResponse OfferKeyEventL( const TKeyEvent& aKeyEvent,
-		                                             TEventCode aType );
-		                                             
-        /**
-        * Handles a dialog button press for the specified dialog button.
-        *
-        * @param aButtonId
-        * @return ETrue if OK to exit, EFalse to keep the dialog active
-        */
-        TBool OkToExitL(TInt aButtonId);
-
-        /**
-        * SaveFormDataL deals with the occasion of a change from
-        * edit->view mode and the user wishes to save the changes.
-        *
-        * @return ETrue if the editable state can be left, EFalse otherwise
-        */
-        TBool SaveFormDataL();
-        
-    private: // From CEikDialog
-
-        /**
-        * PreLayoutDynInitL initialises the dialog's controls before the dialog
-        * is sized and layed out.
-        */
-        void PreLayoutDynInitL();
-
-        /**
-        * PostLayoutDynInitL initialises the dialog's controls after the dialog
-        * has been sized but before it has been activated.
-        */
-        void PostLayoutDynInitL();
-
-        /**
-        * Selects desired line on startup
-        */
-        void SetInitialCurrentLine();
-
-       
-        /** Handles layout switch */
-        void HandleResourceChange( TInt aType );
-
-		void HandleControlStateChangeL( TInt aControlId );
- 
-		void LineChangedL(TInt aControlId );
-		
- 	private:
-
-        enum TErrorInForm
-            {
-            ENoErrors
-            };
-
-        /** Constructor
-         *
-         */
-        CLocSUPLServerEditor( 
-        					TBool aIsEditable,
-                            CLocSUPLSettingsUiEngine&       aEngine,
-        					TInt64 aSlpId
-		);
-
-        void ConstructL();
-
-	private: // new functions
-        /**
-         * Change title pane text
-         */
-		void ChangeTitlePaneTextL( TDesC& aText );
-		
-        /**
-         * Load intial data values
-         */
-        void LoadFormValuesFromDataL();
-
-		/*
-		 * It checks if server details are empty in editor.
-		 * 
-		 * @ret true if event is empty else false.
-		 */
-		TBool IsEmptyServerL();
-
-		/*
-		 * it toggles value of popup field
-		 */        
-		void TogglePopupFieldControlL( TInt aControlId );
-		
-		/*
-		 * toggles the txt
-		 */
-		void SetUsageinHomeNetwork( TBool aOnOff );
-
-		/*
-		 * it changes the MSK caption 
-		 */        
-		void HandleMSKCaptionL();
-
-		/*
-		 * Confirmation query note for delete operation
-		 */        
-		TInt DeleteConfirmationQueryL();
-
-		/*
-		 * Shows Validation Info note for server address entry 
-		 */        
-		void ShowServerValidationInfoNoteL( TInt aResourceId );
-		
-		/*
-		 * Sets the cursor position to end at server address field in editor
-		 */        
-		void SetCursorToEndL();
-		
-
-    private: // Data
-
-        //! The title pane that is dynamically updated
-        CAknTitlePane* 				iTitlePane;
-
-        //! The original title that the title pane displayed before modified
-        HBufC* 						iOriginalTitle;
-
-       	/*
-         * Mode in which editor is opened. It can be either view or edit mode.
-         */   
-       	TBool                    	iIsEditMode;
-      
-       	/*
-         * Mode in which editor is opened. It can be either view or edit mode.
-         */      
-      	TBool 						iIsNewServer;
-      	
-	   	/*
-	     *  help context object
-   	     */
-       	TCoeHelpContext         	iHelpContext;  
-
-		/*
-		 * Reference to the SUPL Settings engine
-		 */
-	    CLocSUPLSettingsUiEngine&	iEngine;	
-	    
-	    /**
-         * SUPL Servers SLP ID to get and set the server attributes.
-         * Owns.
-         */
-        TInt64						iSlpId;
-        
-	    /**
-         * SUPL Server Address 
-         * Owns.
-         */
-	    HBufC* 						iServerAddress;
-	    
-	    /**
-         * SUPL Server Access point
-         * Owns.
-         */
-	    HBufC* 						iIap;
-	    
-	    /**
-         * SUPL Server usage in home network
-         * Owns.
-         */
-	    TBool 						iUsageInHomeNw;
-	    
-	    /**
-	    	* It determines if form is modified by user
-	    	*/	    
-	    TBool							iIsModified;
-    };
-
-#endif // __LOCSUPLSERVER_EDITOR_H__
-
--- a/locationsystemui/locationsysui/locsuplsettingsui/inc/locsuplserverlbmodel.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,162 +0,0 @@
-/*
-* Copyright (c) 2008 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:  List box model for the SUPL server UI
-*
-*/
-
-#ifndef C_LOCSUPLSERVERLBMODEL_H_
-#define C_LOCSUPLSERVERLBMODEL_H_
-
-// System Include
-#include <e32base.h>
-#include <bamdesca.h>  // MDesCArray
-
-// Forward Declaration
-class CLocSUPLSettingsUiEngine;
-class CServerParams;
-
-// Class Declaration
-/**
- * Model for the SUPL Settings UI container. 
- *
- * The model interacts with the SUPL Settings Engine inorder to obtain the latest
- * SUPL UI Settings values
- *
- * @lib locsuplsettings.lib
- * @since S60 v3.1
- */
-class CLocSUPLServerLBModel : public CBase,
-						      public MDesCArray
-	{
-	public:
-        /**
-        * Enumerations for List box Entries
-        */
-        enum	TSUPLSettingsItemId        
-            {
-            ESUPLSettingsServerAddress = 0
-            };
-            	
-	public:
-        /**
-         * Two-phased constructor
-         *
-         * @param  aEngine                      Reference the SUPL Settings Engine
-         * @return CLocSUPLServerLBModel*     Reference to the object created
-         */
-        static CLocSUPLServerLBModel* NewL( 
-                        CLocSUPLSettingsUiEngine&     aEngine );
-
-        /**
-         * Two-phased constructor
-         *
-         * @param  aEngine                      Reference the SUPL Settings Engine         
-         * @return CLocSUPLServerLBModel*     Reference to the object created
-         */
-        static CLocSUPLServerLBModel* NewLC( 
-                        CLocSUPLSettingsUiEngine&     aEngine );
-        
-        /**
-         * Destructor.
-         */
-        virtual ~CLocSUPLServerLBModel();
-    
-    public: // New functions
-    
-        /**
-         * Returns the slp id array to get server attributes
-         */
-   		RArray<TInt64>& SlpIds();		        
-		
-        /**
-         * Refresh the slp id array list from the supl settings
-         */
-		void UpdateSlpIdsL();
-		
-    protected:
-        /**
-         * Inherited from MDesCArray
-         */
-        TInt MdcaCount() const;
-
-        /**
-         * Inherited from MDesCArray
-         */
-        TPtrC16 MdcaPoint( TInt aIndex ) const;
-        				
-    private:
-        /**
-         * C++ constructor.
-         */
-        CLocSUPLServerLBModel( CLocSUPLSettingsUiEngine&     aEngine );
-        
-        /**
-         * Second Phase constructor
-         */
-        void ConstructL();
-        
-        /**
-         * Appends the server address to the end of the buffer passed.
-         * 
-         * @param aPtr Buffer to which server attributes will be
-         *             appended.
-         * @param aIndex index to get server entry 
-         */
-		void AppendSuplServerDetail( TDes& aPtr, TInt aIndex ) const;
-		
-    private:
-        /**
-         * Format conversion buffer
-         * Owns
-         */
-        HBufC16*                    	iBuffer;
-        
-        /**
-         * Reference the SUPL Settings Engine
-         */   
-        CLocSUPLSettingsUiEngine&   	iEngine;
-        
-        /** 
-         * Boolean value to indicate whethere SUPL settings usage
-         * is present.
-         */
-        TBool                       	iSuplUsagePresent;
-                
-        /**
-         * Boolean value to indicate whether SUPL address field
-         * is present.
-         */
-        TBool                       	iServerAddressPresent;     
-
-        /**
-         * SUPL Servers SlpId
-         * Owns.
-         */
-        RArray< TInt64 > 				iSlpIdList;
-        
-        /**
-         * SUPL Server Addresses 
-         * Owns.
-         */
-        RPointerArray< HBufC >			iSlpAddressList;
-        
-        /**
-         * SUPL Servers with its attributes.
-         * Owns.
-         */
-        RArray< TBool>					iEnableFlagList;
-	};
-
-#endif // C_LOCSUPLSERVERLBMODEL_H_
-
--- a/locationsystemui/locationsysui/locsuplsettingsui/inc/locsuplserverview.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,229 +0,0 @@
-/*
-* Copyright (c) 2008 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:  SUPL server UI view
-*
-*/
-
-#ifndef C_LOCSUPLSERVERVIEW_H_
-#define C_LOCSUPLSERVERVIEW_H_
-
-//  System Includes
-#include <data_caging_path_literals.hrh>
-#include <e32base.h>
-#include <aknview.h>
-#include <ConeResLoader.h>
-
-// User Includes
-#include "locsuplsettingsuid.hrh"
-#include "locsuplsettingseventhandler.h"
-
-// Forward Declarations
-class CLocSUPLServerContainer;
-class MLocSUPLSettingsEventHandler;
-class CLocSUPLSettingsUiEngine;
-class CLocSUPLServerEditor;
-
-// Constant Declarations
-const TUid KLocSUPLServerUiViewId = { KLOCSUPLSERVERUIUID3 };
-
-// Class Declaration
-
-/**
- * SUPL server UI View. 
- */
-class CLocSUPLServerView : public CAknView
-	{
-    public:
-        /**
-         * Creates new SUPL server UI View.
-         *
-         * @param aEngine                   Reference to the SUPL Settings
-         *                                  engine
-         * @param aEventHandler			    Reference to the Event Handler
-         * @return CLocSUPLServerView*	Reference to the application view
-         */                                                 
-        static CLocSUPLServerView* NewL( 
-                            CLocSUPLSettingsUiEngine&       aEngine,
-        					MLocSUPLSettingsEventHandler&	aEventHandler );
-
-		/**
-         * Creates new SUPL Settings UI View. Leaves the object on the 
-         * Clean up stack
-         *
-         * @param aEngine                   Reference to the SUPL Settings
-         *                                  engine          
-         * @param aEventHandler			    Pointer to the Event Handler
-		 * @return CLocSUPLServerView*	Reference to the application view
-         */                                                 
-        static CLocSUPLServerView* NewLC( 
-                            CLocSUPLSettingsUiEngine&       aEngine,
-         					MLocSUPLSettingsEventHandler&	aEventHandler );
-        
-		/**
-		 * Destructor
-		 */
-		~CLocSUPLServerView ();
-		
-        /**
-         * Handles the Screen Size update
-         */
-        void HandleScreenSizeChange();
-        
-        /**
-         * Updates the View
-         */
-        void UpdateView();
-		
-        /**
-		 * Returns the Selected element. The list box model defines the
-		 * enumeration that would determine the current element that has been
-		 * selected
-		 *
-		 * @return TInt Index of the item selected
-		 */
-		TInt SelectedItemIndex();
-		         
-		/**
-         * From CAknView. 
-         */
-		void DoActivateL( const TVwsViewId& aPrevViewId,
-		 						 TUid		 aCustomMessageId,
-						   const TDesC8&	 aCustomMessage);
-		
-		/**
-         * From CAknView. 
-         */
-        void DoDeactivate();
- 
- 		/**
-         * From CAknView. Returns the View Id. Should be chosen to reflect 
-		 * the Implementation UID of the Plugin
-         */
-        TUid Id() const;
-
-        /**
-         * From CAknView. 
-         */
-        void HandleCommandL( TInt aCommand );
-        
-       /**
-        * From MEikMenuObserver
-        */
-        void DynInitMenuPaneL( TInt aResourceId, CEikMenuPane* aMenuPane );
-                
-	private:
-		/**
- 		 * C++ Overloaded Constructor
-		 */
-		CLocSUPLServerView( CLocSUPLSettingsUiEngine&     aEngine,
-		 					MLocSUPLSettingsEventHandler& aEventHandler );
-
-		/**
-		 * Second Phase Constructor
-		 */
-		void ConstructL();
-
-        /**
-        * Shows or dims help option, depending wheather help feature
-        * is supported or not.
-        * @param aMenuPane
-        */
-        void HandleHelpFeature( CEikMenuPane& aMenuPane ) const;		
-		
-		/**
-		 * Second Phase Constructor
-		 */
-		TInt DeletionConfirmationQueryL( const TInt aAmount );
-		
-		/**
-		 * Deletes the selected server/s
-		 */
-		void DeleteServerL();
-		
-		/**
-		 * Sets the selected server/s as disable
-		 */
-		void DisableServerL();
-		
-		/**
-		 * Sets the selected server/s as enable
-		 */
-		void EnableServerL();
-
-		/**
-		 * Sets MSK Button Group
-		 */		
-		void ChangeMSKL();
-		
-		/**
-		 * Gets the ids for selected items
-		 */		
-		void GetSelectedItemIdsL(
-		    RArray<TInt64>& aSelectedItems,
-		    const CArrayFix<TInt>& aSelectedIndexes ) const;
-		
-		/**
-		 * Gets the count for disabled servers
-		 */		
-		TInt SelectedDisabledServerCountL();
-		
-	private:		
-		/**
-		 * Reference to the event Handler for handling UI events
-		 */
-		MLocSUPLSettingsEventHandler&	iEventHandler;
-	
-	    /**
-	     * Reference to the SUPL Settings engine
-	     */
-	    CLocSUPLSettingsUiEngine&     	iEngine;	
-
-		/**
-		 * Container Object
-		 * Owns
-		 */
-		CLocSUPLServerContainer*		iContainer;
-		
-		/**
-         * Container Object used while prioritizing the servers
-         * TC Id: ou1cimx1#219289
-         * Owns
-         */		
-	      CLocSUPLServerContainer*        iNewContainer;
-		/**
-		 * Boolean value to indicate that the SUPL settings UI is
-		 * started from the settings UI server.
-		 */
-		TBool                         	iStartedFromServer;
-		
-		/**
-		 * Boolean value to start the prioritize operation
-		 */		
-		TBool							iStartedPrioritize;
-		
-		/**
-		 * Value to store the selected server index 
-		 * for prioritize operation
-		 */				
-		TInt 							iSelectedIndex;
-		
-		/**
-		 * Value to store the selected server's slpId 
-		 * for prioritize operation
-		 */				
-		TInt64							iSelectedSlpId;
-	};			
-
-#endif // C_LOCSUPLSERVERVIEW_H_
-
--- a/locationsystemui/locationsysui/locsuplsettingsui/inc/locsuplsessioncontainer.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,278 +0,0 @@
-/*
-* Copyright (c) 2008 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:  SUPL session UI View's container
-*
-*/
-
-
-#ifndef C_LOCSUPLSESSIONCONTAINER_H
-#define C_LOCSUPLSESSIONCONTAINER_H
-
-// System Includes 
-#include <e32base.h>
-#include <coecntrl.h>
-#include <eiklbo.h>
-
-    
-// Forward Declarations
-class CLocSUPLSessionLBModel;
-class CLocSUPLSettingsUiEngine;
-class CAknSingleGraphicStyleListBox;
-class CAknIconArray;
-class CLocSUPLSessionView;
-
-// Class Declarations
-/**
- * Container for the SUPL session UI View.
- * 
- * Contains the Listbox control that is used to display the Active SUPL sessions
- *
- * @lib locsuplsettings.lib
- * @since S60 v3.1 
- */
-class CLocSUPLSessionContainer : public CCoeControl,
-                                public MEikListBoxObserver
-	{
-	public:
-		/**
- 		 * Static Two phase constructor that instantiates the CLocSUPLSessionContainer
-		 * 
-		 * @param aRect				            Client rectangle
-         * @param aEngine                       Reference to the SUPL Settings
-         *                                      engine 		 
-         * @param CLocSUPLSessionView            Pointer to the current view
-		 * @return CLocSUPLSessionContainer*	Reference to the object created
-		 */
-		static CLocSUPLSessionContainer* NewL( 
-                    		const TRect&               	aRect,
-                          	CLocSUPLSettingsUiEngine&	aEngine,
-                          	CLocSUPLSessionView* 		aView );
-
-		/**
-		 * Static Two phase constructor that instantiates the CLocSUPLSessionContainer
-		 * Leaves the object on the Cleanup stack
-		 * 
-		 * @param aRect				            Client rectangle
-         * @param aEngine                       Reference to the SUPL Settings
-         *                                      engine 		 
-         * @param CLocSUPLSessionView            Pointer to the current view
-		 * @return CLocSUPLSessionContainer*	Reference to the object created
-		 */
-		static CLocSUPLSessionContainer* NewLC( 
-                    		const TRect&               	aRect,
-                          	CLocSUPLSettingsUiEngine&	aEngine,
-                          	CLocSUPLSessionView* 		aView );
-
-		/**
-		 * Destructor
-		 */
-		~CLocSUPLSessionContainer();
-    
-		/**
-		 * Inherited from CCoeControl
-		 */
-		void HandleResourceChange( TInt aType );
-
-        /**
-         * Returns the help context
-         *
-         * @param aContext	The help context that has to be determined
-         */
-        void GetHelpContext( TCoeHelpContext& aContext ) const; 
-        
-        /**
-         * From CoeControl
-         */
-        TInt CountComponentControls() const;
-
-        /**
-         * From CCoeControl
-         */
-        CCoeControl* ComponentControl( TInt aIndex ) const;
-        
-        /**
-         * Inherited from CCoeControl
-         */
-        TKeyResponse OfferKeyEventL( const TKeyEvent& aKeyEvent,
-        						           TEventCode aType );
-		 		 		 
-		/**
-         * Inherited from MEikListBoxObserver
-         */
-        void HandleListBoxEventL( CEikListBox*      aListBox, 
-        					      TListBoxEvent     aEventType );
-	
-	public: // New functions
-		
-        /**
-         * Refreshes the screen so that the list box reflects the latest contents
-         */
-         void UpdateScreenL();
-         
-        /**
-         * Return reference to listbox
-         * @return CEikListBox reference
-         */
-        CEikListBox& ListBoxL();
-        
-        /**
-		 * Returns the Selected element. The list box model defines the
-		 * enumeration that would determine the current element that has been
-		 * selected
-		 *
-		 * @return TInt Index of the item selected
-		 */
-		TInt SelectedItemIndex();
-		 
-        /**
-         * Return current selected server id
-         */
-		TInt64 CurrentSessionId();
-        					      
-        /**
-         * Return current selected/marked server count
-         */
-		TInt SelectedCount();
-
-        /**
-         * Return total no of sessions in the view
-         */		
-		TInt SessionCount();
-        					      
-        /**
-         * Returns the session ids array
-         */		
-		RArray<TInt64>& SessionIds();
-		
-		 /**
-      * Sets the current selected item
-      */	
-		void SetSelectedIndex();
-		
-		 /**
-      * Shows context specific options menu
-      */	
-		void ShowContextMenuL();
-
-     /**
-      * Return the session name identified by session id
-      */		
-		TPtrC CurrentSessionName();
-		
-		/**
-		 * Sets focus to the specific item in Active services view
-		 * @param aIndex	index of item to be focussed
-		 */
-    void FocusToSessionDetailL( TInt aIndex );
-
-	protected:
-		/**
-		 * Handles Focus Change to list 
-		 */
-		void FocusChanged( TDrawNow aDrawNow );
-		 
-		/**
-         * From CoeControl,SizeChanged.
-         */
-        void SizeChanged();
-
-	private:
-		/**
-		 * Overloaded Constructor
-		 */
-		CLocSUPLSessionContainer( CLocSUPLSessionView* aView );
-		
-		/**
-		 * Second phase of the two phase Construction process
-		 */
-		void ConstructL( const TRect&                        aRect ,
-		                       CLocSUPLSettingsUiEngine&     aEngine );
-          
-        /**
-         * Sets the Title text
-         * @param aResourceText Resource to create title
-         */
-        void MakeTitleL( TInt aResourceText );
-          
-		/**
-         * Returns the Appui's status pane
-         * @return CEikStatusPane* Statuspane pointer
-         */
-		CEikStatusPane* StatusPane();
-
-        /** 
-         * Creates the List box and the Listbox model. Associates the 
-         * list box model wit the list box
-         *
-         * @param aEngine    Reference to the SUPL Settings engine          
-         */
-        void CreateListboxL( CLocSUPLSettingsUiEngine&     aEngine );
-        
-        /**
-         * Append icon to icon array. CAknIconArray owns icons so it is 
-         * easier to it leave safely.
-         * @param aIcons icon array
-         * @param aIconFileWithPath icon file name with path
-         * @param aSkinID skin id of the icon
-         * @param aIconGraphicsIndex picture index
-         * @param aIconGraphicsMaskIndex mask index
-         */
-        void AddIconL( CAknIconArray&       aIcons,
-                       const TDesC&         aIconFileWithPath,
-                       TAknsItemID          aSkinID,
-                       TInt                 aIconGraphicsIndex,
-                       TInt                 aIconGraphicsMaskIndex );
-	
-		/**
-         * Returns the Applications Icon File name with path
-         */
-		TFileName* IconFileNameLC() const;
-		
-   private:
-    
-        /**
-         * Reference to the Current View
-         */
-        CLocSUPLSessionView*					iView;
-        
-        /**
-         * Help context
-         */
-        TCoeContextName 					iContextName;
-        
-        /**
-         * Single Graphic Listbox to display the active sessions
-         * Owns
-         */
-        CAknSingleGraphicStyleListBox*   	iListBox;
-      //  CAknSingleNumberStyleListBox*       iListBox;
-        /**
-         * List Box model
-         */
-        CLocSUPLSessionLBModel*        		iListBoxModel;
-        
-        /**
-         * Boolean flag to denote whether the pen down occured
-         */
-        TBool								iTouchFlag;  
-        
-         /**
-         * Selected item index value used to set new focus
-         * after delete operation.
-         */
-       	TInt 								iSelectedIndex;
-	};
-
-#endif // C_LOCSUPLSESSIONCONTAINER_H
-
--- a/locationsystemui/locationsysui/locsuplsettingsui/inc/locsuplsessioneditor.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,209 +0,0 @@
-/*
-* Copyright (c) 2008 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:  supl session editor
-*
-*/
-
-
-#ifndef __LOCSUPLSESSION_EDITOR_H__
-#define __LOCSUPLSESSION_EDITOR_H__
-
-
-#include <AknForm.h>
-#include <ConeResLoader.h>
-
-#include "locsuplsettingssessionobserver.h"
-
-class CAknTitlePane;
-class CLocSUPLSettingsUiEngine;
-
-/**
-*  A dialog that makes it possible to edit certain fields of a supl session.
-*/
-class CLocSUPLSessionEditor : 
-    public CAknForm, public MLocSUPLSettingsSessionObserver
-    {
-    public: // Constructors and destructor
-
-        /**
- 		* Static Two phase constructor that instantiates the CLocSUPLSessionEditor
-		* 
-        */
-        static CLocSUPLSessionEditor* NewL( 
-                            CLocSUPLSettingsUiEngine&       aEngine,
-        					TInt64 aSessionId
-		);
-
-        /**
- 		* Static Two phase constructor that instantiates the CLocSUPLSessionEditor
-		* 
-        */
-        static CLocSUPLSessionEditor* NewLC( 
-                            CLocSUPLSettingsUiEngine&       aEngine,
-        					TInt64 aSessionId
-		);
-
-        /**
-        * Destructor.
-        */
-        ~CLocSUPLSessionEditor();
-
-    public: // From CAknDialog
-
-        /**
-        * DynInitMenuPaneL initializes the menu pane before it is displayed.
-        *
-        * @param aResourceId a resource ID indetifying the menu bar containing
-        * the menu pane to be initialized.
-        * @param aMenuPane the menu pane to initialize.
-        */
-        void DynInitMenuPaneL(TInt aResourceId, CEikMenuPane* aMenuPane);
-
-        /**
-        * Processes user commands.
-        *
-        * @param aCommandId id of the command to respond to
-        */
-        void ProcessCommandL(TInt aCommandId);
-
-        /*
-         * Executes the Dialog
-         */
-        TInt ExecuteLD();
-	
-	public: // from MLocSUPLSettingsSessionObserver
-	
-        /*
-         * Calls function to load the values into the editor fields
-         */
-		void UpdateSessionL( TUpdateType aType );
-		
-        /*
-         * Returns the session id
-         */
-		TInt64 SessionId( );
-
-	
-    protected: // From CAknForm
-
-		TKeyResponse OfferKeyEventL( const TKeyEvent& aKeyEvent,
-		                                             TEventCode aType );
-		                                             
-        /**
-        * Handles a dialog button press for the specified dialog button.
-        *
-        * @param aButtonId
-        * @return ETrue if OK to exit, EFalse to keep the dialog active
-        */
-        TBool OkToExitL(TInt aButtonId);
-
-        /**
-        * SaveFormDataL deals with the occasion of a change from
-        * edit->view mode and the user wishes to save the changes.
-        *
-        * @return ETrue if the editable state can be left, EFalse otherwise
-        */
-        //TBool SaveFormDataL();
-        
-    private: // From CEikDialog
-
-        /**
-        * PreLayoutDynInitL initialises the dialog's controls before the dialog
-        * is sized and layed out.
-        */
-        void PreLayoutDynInitL();
-
-        /**
-        * PostLayoutDynInitL initialises the dialog's controls after the dialog
-        * has been sized but before it has been activated.
-        */
-        void PostLayoutDynInitL();
-
-        /**
-        * Gets the Time String from Time(in seconds)
-        */
-		void GetTimeStringL(HBufC*& aTimeString, TUint aSeconds);
- 
-		void LineChangedL(TInt aControlId );
-		
- 	private:
-
-        /** Constructor
-         *
-         */
-        CLocSUPLSessionEditor( 
-                            CLocSUPLSettingsUiEngine&       aEngine,
-        					TInt64 aSessionId
-		);
-
-        void ConstructL();
-
-	private: // new functions
-        /**
-         * Change title pane text
-         */
-		void ChangeTitlePaneTextL( TDesC& aText );
-		
-        /**
-         * Load intial data values
-         */
-        void LoadFormValuesFromDataL();
-
-		/*
-		 * it toggles value of popup field
-		 */        
-		void TogglePopupFieldControlL( TInt aControlId );
-
-		/*
-		 * it changes the MSK caption 
-		 */        
-		void HandleMSKCaptionL();
-
-		/*
-		 * Confirmation query note for delete operation
-		 */        
-		TInt DeleteConfirmationQueryL();
-
-    private: // Data
-
-        //! The title pane that is dynamically updated
-        CAknTitlePane* 				iTitlePane;
-
-        //! The original title that the title pane displayed before modified
-        HBufC* 						iOriginalTitle;
-      	
-	   	/*
-	     *  help context object
-   	     */
-       	TCoeHelpContext         	iHelpContext;  
-
-		/*
-		 * Reference to the SUPL Settings engine
-		 */
-	    CLocSUPLSettingsUiEngine&	iEngine;	
-	    
-	    /**
-         * SUPL Session unique Id.
-         */
-        TInt64						iSessionId;
-
-		/*
-		 * Reference to the SUPL Settings engine
-		 * Own:
-		 */
-	    HBufC*	iSessionName;
-    };
-
-#endif // __LOCSUPLSESSION_EDITOR_H__
-
--- a/locationsystemui/locationsysui/locsuplsettingsui/inc/locsuplsessionlbmodel.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,168 +0,0 @@
-/*
-* Copyright (c) 2008 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:  List box model for the SUPL session UI
-*
-*/
-
-#ifndef C_LOCSUPLSESSIONLBMODEL_H_
-#define C_LOCSUPLSESSIONLBMODEL_H_
-
-// System Include
-#include <e32base.h>
-#include <bamdesca.h>  // MDesCArray
-
-// Forward Declaration
-class CLocSUPLSettingsUiEngine;
-class CTriggerParams;
-
-// Class Declaration
-/**
- * Model for the SUPL Sessions UI container. 
- *
- * The model interacts with the SUPL Settings Engine inorder to obtain the latest
- * SUPL UI session array
- *
- * @lib locsuplsettings.lib
- * @since S60 v3.1
- */
-class CLocSUPLSessionLBModel : public CBase,
-						      public MDesCArray
-	{
-	public:
-        /**
-         * Two-phased constructor
-         *
-         * @param  aEngine                      Reference the SUPL Settings Engine
-         * @return CLocSUPLSessionLBModel*     Reference to the object created
-         */
-        static CLocSUPLSessionLBModel* NewL( 
-                        CLocSUPLSettingsUiEngine&     aEngine );
-
-        /**
-         * Two-phased constructor
-         *
-         * @param  aEngine                      Reference the SUPL Settings Engine         
-         * @return CLocSUPLSessionLBModel*     Reference to the object created
-         */
-        static CLocSUPLSessionLBModel* NewLC( 
-                        CLocSUPLSettingsUiEngine&     aEngine );
-        
-        /**
-         * Destructor.
-         */
-        virtual ~CLocSUPLSessionLBModel();
-    
-    public: // New functions
-    
-        /**
-         * Returns the session id array to get session attributes
-         */
-   		RArray<TInt64>& SessionIds();		        
-		
-        /**
-         * Refresh the session id array list from the supl settings
-         */
-		void UpdateSessionIdsL();
-
-        /**
-         * Return the session name identified by session id
-         */		
-		TPtrC SessionName( TInt aIndex );
-		
-    protected:
-        /**
-         * Inherited from MDesCArray
-         */
-        TInt MdcaCount() const;
-
-        /**
-         * Inherited from MDesCArray
-         */
-        TPtrC16 MdcaPoint( TInt aIndex ) const;
-        				
-    private:
-        /**
-         * C++ constructor.
-         */
-        CLocSUPLSessionLBModel( CLocSUPLSettingsUiEngine&     aEngine );
-        
-        /**
-         * Second Phase constructor
-         */
-        void ConstructL();
-        
-        /**
-         * Appends the session name and type to the buffer passed.
-         * 
-         * @param aPtr Buffer to which session name and type will be
-         *             appended.
-         * @param aIndex index to get session entry 
-         */
-		void AppendSuplSessionDetail( TDes& aPtr, TInt aIndex ) const;
-		
-    private:
-        /**
-        * Enumerations for Supl sessions type
-        */
-        enum	TSUPLSessionType       
-            {
-        /**
-         * Supl session is of Terminal Initiaon Type
-         */
-            ESUPLSessionTIType = 0,
-        /**
-         * Supl session is of Network Initiaon Type
-         */
-            ESUPLSessionNIType
-            };
-
-    private:
-        /**
-         * Format conversion buffer
-         * Owns
-         */
-        HBufC16*                    	iBuffer;
-        
-        /**
-         * Reference the SUPL Settings Engine
-         */   
-        CLocSUPLSettingsUiEngine&   	iEngine;
-
-        /**
-         * SUPL Sessions Id
-         * Owns.
-         */
-        RArray< TInt64 > 				iSessionIdList;
-        
-        /**
-         * SUPL Sessions Name
-         * Owns.
-         */
-        RPointerArray< HBufC >			iSessionNameList;
-        
-        /**
-         * SUPL Sessions Type.
-         * Owns.
-         */
-        RArray< TSUPLSessionType >					iSessionTypeList;
-        
-        /**
-         * Unnamed session SUPL Sessions Name
-         * Owns.
-         */
-        HBufC*			iUnnamedSuplActiveSessions;
-	};
-
-#endif // C_LOCSUPLSESSIONLBMODEL_H_
-
--- a/locationsystemui/locationsysui/locsuplsettingsui/inc/locsuplsessionview.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,185 +0,0 @@
-/*
-* Copyright (c) 2008 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:  SUPL session UI view
-*
-*/
-
-#ifndef C_LOCSUPLSESSIONVIEW_H
-#define C_LOCSUPLSESSIONVIEW_H
-
-//  System Includes
-#include <data_caging_path_literals.hrh>
-#include <e32base.h>
-#include <aknview.h>
-#include <ConeResLoader.h>
-
-// User Includes
-#include "locsuplsettingsuid.hrh"
-#include "locsuplsettingseventhandler.h"
-
-// Forward Declarations
-class CLocSUPLSessionContainer;
-class MLocSUPLSettingsEventHandler;
-class CLocSUPLSettingsUiEngine;
-
-// Constant Declarations
-const TUid KLocSUPLSessionUiViewId = { KLOCSUPLSESSIONUIUID3 };
-
-// Class Declaration
-
-/**
- * SUPL server UI View. 
- */
-class CLocSUPLSessionView : public CAknView
-	{
-    public:
-        /**
-         * Creates new SUPL server UI View.
-         *
-         * @param aEngine                   Reference to the SUPL Settings
-         *                                  engine
-         * @param aEventHandler			    Reference to the Event Handler
-         * @return CLocSUPLSessionView*	Reference to the application view
-         */                                                 
-        static CLocSUPLSessionView* NewL( 
-                            CLocSUPLSettingsUiEngine&       aEngine,
-        					MLocSUPLSettingsEventHandler&	aEventHandler );
-
-		/**
-         * Creates new SUPL Settings UI View. Leaves the object on the 
-         * Clean up stack
-         *
-         * @param aEngine                   Reference to the SUPL Settings
-         *                                  engine          
-         * @param aEventHandler			    Pointer to the Event Handler
-		 * @return CLocSUPLSessionView*	Reference to the application view
-         */                                                 
-        static CLocSUPLSessionView* NewLC( 
-                            CLocSUPLSettingsUiEngine&       aEngine,
-         					MLocSUPLSettingsEventHandler&	aEventHandler );
-        
-		/**
-		 * Destructor
-		 */
-		~CLocSUPLSessionView ();
-		
-        /**
-         * Handles the Screen Size update
-         */
-        void HandleScreenSizeChange();
-        
-        /**
-         * Updates the View
-         */
-        void UpdateView();
-		
-        /**
-		 * Returns the Selected element. The list box model defines the
-		 * enumeration that would determine the current element that has been
-		 * selected
-		 *
-		 * @return TInt Index of the item selected
-		 */
-		TInt SelectedItemIndex();
-		         
-		/**
-         * From CAknView. 
-         */
-		void DoActivateL( const TVwsViewId& aPrevViewId,
-		 						 TUid		 aCustomMessageId,
-						   const TDesC8&	 aCustomMessage);
-		
-		/**
-         * From CAknView. 
-         */
-        void DoDeactivate();
- 
- 		/**
-         * From CAknView. Returns the View Id. Should be chosen to reflect 
-		 * the Implementation UID of the Plugin
-         */
-        TUid Id() const;
-
-        /**
-         * From CAknView. 
-         */
-        void HandleCommandL( TInt aCommand );
-        
-       /**
-        * From MEikMenuObserver
-        */
-        void DynInitMenuPaneL( TInt aResourceId, CEikMenuPane* aMenuPane );
-       
-       /**
-         * Sets MSK Button Group
-         */	
-         void ChangeMSKL();
-                
-	private:
-		/**
- 		 * C++ Overloaded Constructor
-		 */
-		CLocSUPLSessionView( CLocSUPLSettingsUiEngine&     aEngine,
-		 					MLocSUPLSettingsEventHandler& aEventHandler );
-
-		/**
-		 * Second Phase Constructor
-		 */
-		void ConstructL();
-
-        /**
-        * Shows or dims help option, depending wheather help feature
-        * is supported or not.
-        * @param aMenuPane
-        */
-        void HandleHelpFeature( CEikMenuPane& aMenuPane ) const;		
-		
-		/**
-		 * Confirmation query to delete
-		 */
-		TInt DeletionConfirmationQueryL( const TInt aAmount );
-		
-		/**
-		 * Deletes the selected server/s
-		 */
-		void DeleteSessionL();
-
-		
-		/**
-		 * Gets the ids for selected items
-		 */		
-		void GetSelectedItemIdsL(
-		    RArray<TInt64>& aSelectedItems,
-		    const CArrayFix<TInt>& aSelectedIndexes ) const;
-		
-	private:		
-		/**
-		 * Reference to the event Handler for handling UI events
-		 */
-		MLocSUPLSettingsEventHandler&	iEventHandler;
-	
-	    /**
-	     * Reference to the SUPL Settings engine
-	     */
-	    CLocSUPLSettingsUiEngine&     	iEngine;	
-
-		/**
-		 * Container Object
-		 * Owns
-		 */
-		CLocSUPLSessionContainer*		iContainer;
-	};			
-
-#endif // C_LOCSUPLSESSIONVIEW_H
-
--- a/locationsystemui/locationsysui/locsuplsettingsui/inc/locsuplsettings.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,296 +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:  SUPL Settings UI implementation.
-*
-*/
-
-
-#ifndef CLOCSUPLSETTINGS_H_
-#define CLOCSUPLSETTINGS_H_
-
-// User Includes
-#include "locsettingsui.h"
-#include "locsuplsettingsuiengobserver.h"
-#include "locsuplsettingseventhandler.h"
-
-// System Includes
-#include <ConeResLoader.h>
-#include <data_caging_path_literals.hrh>
-
-
-// Forward Declarations
-class CAknQueryDialog;
-class MLocSettingsUiObserver;
-class CLocSUPLSettingsView;
-class CLocSUPLServerView;
-class CLocSUPLSessionView;
-class CLocSUPLSettingsUiEngine;
-
-// Global constants
-
-/**
- * SUPL Settings RSC file name
- */
-_LIT( KSUPLUiResFileName, "locsuplsettingsui.rsc" );
-
-class CLocSUPLAO : public CActive
-    {               
-    public:
-        static CLocSUPLAO* NewL(
-                MLocSettingsUiObserver&     aSettingsUiObserver,
-                CLocSUPLSettingsUiEngine&   aSettingsEngine,
-                TInt                        aLaunchParams  );
-        
-        virtual ~CLocSUPLAO();
-        
-        void CompleteRequest();
-
-    private:
-        CLocSUPLAO( MLocSettingsUiObserver&     aSettingsUiObserver,
-                    CLocSUPLSettingsUiEngine&   aSettingsEngine,
-                    TInt                        aLaunchParams );
-        
-        void RunL();
-        
-        void DoCancel();
-        
-        
-        
-    private:
-        MLocSettingsUiObserver&         iSettingsUiObserver;
-        CLocSUPLSettingsUiEngine&       iSettingsEngine;
-        TInt                            iLaunchParams;  
-    };
-
-/**
- * CLocSUPLSettings
- *
- * ECom Plugin implementation for SUPL Settings UI. The Settings UI provides 
- * two major functionalities i.e., Launching a Settings UI plug-in and 
- * cancelling the existing launched UI.
- * The Launch request depending on the parameters is expected to pop up a 
- * query dialog to request the user whether he intends to configure SUPL
- * settings currently. The default behaviour should be to pop up the configuration
- * dialog for SUPL settings.
- */
-class CLocSUPLSettings : public CLocSettingsUi,
-                         public MLocSUPLSettingsUiEngObserver,
-                         public MLocSUPLSettingsEventHandler
-    {
-    
-    public:
-        
-        /**
-         * Symbian OS two-phased constructor
-         * @return 
-         */
-        static CLocSUPLSettings* NewL( TAny* aParam );
-    
-        /**
-         * Destructor.
-         */
-        ~CLocSUPLSettings();
-
-    public: // Inherited from CLocSettingsUi
-         
-    	/**
-    	 * Inherited from CLocSettingsUi
-		 * Launches the Settings UI
-		 *
-		 * @param aUiLaunchParams	Flags that define specific configuration of
-         *                          if the Settings UI, that the user of the API
-         *                          wants to launch. If more than one functionality
-         *                          is requested then the various combinations
-         *                          are to be ORed.
-		 */
-		 void LaunchL( TInt		aUiLaunchParams );
-         
-        /**
-         * Inherited from CLocSettingsUi
-         * Launches the Settings UI
-         *
-         * @param aUiLaunchParams   Flags that define specific configuration of
-         *                          if the Settings UI, that the user of the API
-         *                          wants to launch. If more than one functionality
-         *                          is requested then the various combinations
-         *                          are to be ORed.
-         */
-         void LaunchL( const TDesC&       aUiLaunchParams );
-
-		/**
-		 * Inherited from CLocSettingsUi
-		 * Closes the running Settings UI prematurely.
-		 */
-		 void Close();
-
-		/**
-		 * Inherited from CLocSettingsUi
-         * Method for getting caption of this plugin. This should be the 
-         * localized name of the settings view to be shown in parent view.
-         *
-         * @param aCaption pointer to Caption variable
-         */
-         void GetCaptionL( TDes& aCaption ) const;
-
-		/**
-		 * Inherited from CLocSettingsUi
-         * Returns the priority of the UI module. 
-         * 
-         * @return Priority of the Settings UI
-         */
-         TInt GetPriority();
-
-		/**
-		 * Inherited from CLocSettingsUi
-		 * Accessor Function for determine whether the UI presence 
-		 * should be shown to the user or should be hidden
-		 *
-		 * @return ETrue  If the presence of the UI be shown to the usr
-				   EFalse If the UI should funtion as a non visible UI
-		 */
-		 TBool	IsVisible();
-	
-	public: // Inherited from MLocSUPLSettingsUiEngObserver
-		
-		/**
-		 * Inherited from MLocSUPLSettingsUiEngObserver
-		 */
-		void HandleSettingsEventL( TSettingsEventType    aEvent );
-	
-	public: // Inherited from MLocSUPLSettingsEventHandler
-		
-		/**
-		 * Inherited from MLocSUPLSettingsEventHandler
-		 */
-		void HandleScreenSizeChange();
-		 
-		/**
-         * Inherited from MLocSUPLSettingsEventHandler
-         * Handles commands from the views
-         *
-         * @param  aCommand Command ID
-         */
-        void HandleCommandL( TInt aCommand );
-    
-	private:
-	    enum TLaunchParamType
-	        {
-	        ELaunchParamInt = 0,
-	        ELaunchParamString
-	        };
-        
-    private:
-        /**
-         * C++ default constructor.
-         */
-        CLocSUPLSettings( MLocSettingsUiObserver&		aSettingsUiObserver,
-					 	   CAknViewAppUi&				aAppUi );
-
-        /**
-         * Second phase constructor.
-         */
-        void ConstructL();
-  
-        /**
-         * Launches the SUPL UI
-         */
-        void LaunchSUPLUiL();
-        
-        /**
-         * Opens the nearest localized resourcefile using aResourceLoader. 
-         * aResourceLoader should be opened only once before closing it. 
-         * Otherwise it will raise a panic. Therefore it is better to have 
-         * multiple resource loaders.
-         * 
-         * @param aResourceFileName Drive and name of resource file in format 
-         *                          <path>:<rsc_file_name>
-         * @param aResourceLoader Resource loader for the resource. The loader 
-         *                        must not be opened allready or it will raise 
-         *                        a panic. It is caller's responsibility to 
-         *                        close the resource loader after using the 
-         *                        resource.
-         */
-        void OpenLocalizedResourceFileL( const TDesC& 				aResourceFileName, 
-        								       RConeResourceLoader& aResourceLoader );
-          								       
-    private:
-	    /**
-	     * Resource Loader handle for handling SUPL Settings UI specific resources
-	     */
-    	RConeResourceLoader 			iResourceLoader;
-              								       
-    	/** 
-    	 * Reference to the SUPL Settings View
-    	 * Owns
-    	 */
-    	CLocSUPLSettingsView*			iSettingsView;
-    	
-    	/**
-    	 * View Id for SUPL Settings UI View
-    	 */
-    	TUid							iSettingsViewId;              								       
-
-    	/** 
-    	 * Reference to the SUPL Server View
-    	 * Owns
-    	 */
-    	CLocSUPLServerView*				iServerView;
-    	
-    	/**
-    	 * View Id for SUPL Server UI View
-    	 */
-    	TUid							iServerViewId;              								       
-
-        /**
-         * Settings UI Engine
-         * Owns
-         */
-         CLocSUPLSettingsUiEngine*      iSettingsEngine;
-         
-         /** 
-    	 * Reference to the SUPL Session View
-    	 * Owns
-    	 */
-         CLocSUPLSessionView*           iSessionView;
-         
-    	/**
-    	 * View Id for SUPL Session UI View
-    	 */
-    	TUid							iSessionViewId;   
-         								       
-        /**
-         * Denotes whether a Launch request is outstanding. 
-         * Necessary to handle the closing of the configuration dialog ( if it
-         * exists ) gracefully. If the dialog is currenlty being shown to
-         * the user and we get a Cancel request, then we shouldnot complete
-         * the request with KErrAbort. This is done to ensure that we complete
-         * the request only if a Launch call is outstanding
-         */
-         TBool                          iLaunchOutStanding;
-        
-        /**
-         * Launch Paramters
-         */
-         TInt                           iLaunchParams;    
-         
-        /**
-         * Launch Param Type
-         */
-         TLaunchParamType               iLaunchParamType;
-         
-         CLocSUPLAO*                    iLaunchAO;
-    };
-
-#endif // CLOCSUPLSETTINGS_H_
-
--- a/locationsystemui/locationsysui/locsuplsettingsui/inc/locsuplsettings.hrh	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,97 +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:  Contains declarations for constants of SUPL Settings UI.
-*                This file can be included in C++ or resource file.
-*
-*/
-
-#ifndef LOCSUPLSETTINGSUI_HRH
-#define LOCSUPLSETTINGSUI_HRH
-
-// Enumeration for command Ids
-
-enum TLocSuplCommandIds
-    {
-	ELocSuplChange = 0x05000,
-	ELocSuplClearSession, 
-	ELocSuplClearSessions, 
-	ELocSuplOpen,
-	ELocSuplMSKChange,
-	ELocSuplMSKOpen,
-	ELocSuplMSKNo,
-    ELocSuplOpenChange,
-
-	//SuplServer Command Ids
-	ELocSuplServerOpen,
-	ELocSuplServerEnable,
-	ELocSuplServerDisable,
-	ELocSuplServerNew,
-	ELocSuplServerDelete,
-	ELocSuplServerPrioritize,
-	ELocSuplServerMSKOpen, 
-	ELocSuplServerMSKEnable,
-	ELocSuplServerMSKDisable,
-	ELocSuplServerMSKNoCmd,
-
-	//Supl Server Editor CommandIds
-	ELocServerEditorEdit,	
-	ELocServerEditorDelete,	
-	ELocServerEditorDisable,	
-	ELocServerEditorEnable,			
-	ELocServerEditorDefine,
-	ELocServerEditorChange,
-	ELocServerEditorRemove,	
-	ELocServerEditorMSKDefine,
-	ELocServerEditorMSKChange,
-	ELocServerEditorNoCmd,
-	
-	//Supl Session Command Ids
-	ELocSuplSessionOpen,
-	ELocSuplSessionTerminate,
-	ELocSuplSessionsTerminate,
-	ELocSuplSessionMSKTerminate,
-	ELocSuplSessionsMSKTerminate,
-	ELocSuplSessionMSKNoCmd,
-
-	//Supl Session Editor CommandIds
-	ELocSessionEditorChange,
-	ELocSessionEditorTerminate,
-	ELocSessionEditorNoCmd
-    };
-    
-/**
- * Enumeration for Editor controls
- */
-enum TLocSuplServerEditorFormControls
-    {
-    ELocSuplServerIdServerAddr = 0x6000,
-    ELocSuplServerIdAccessPoint,
-    ELocSuplServerIdUsageInHomeNw    
-    };
-    
-/**
- * Enumeration for Session Editor controls
- */
-enum TLocSuplSessionEditorFormControls
-    {
-    ELocSuplSessionNotificationStatus = 0x7000,
-    ELocSuplSessionType,
-    ELocSuplSessionOutstandingTrigger,
-    ELocSuplSessionTimePeriod,
-    ELocSuplSessionTriggerInterval
-    };
-
-#endif      // LOCSUPLSETTINGSUI_HRH
-
-// End of File
--- a/locationsystemui/locationsysui/locsuplsettingsui/inc/locsuplsettingsadapter.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,522 +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:  Adapter to the SUPL Settings API
-*
-*/
-
-
-#ifndef CLOCSUPLSETTINGSADAPTER_H_
-#define CLOCSUPLSETTINGSADAPTER_H_
-
-// System Includes
-#include <e32base.h>
-#include <epos_csuplsettingparams.h>		// class CServerParams
-#include <epos_csuplsettings.h>				// class CSuplSettings
-#include <epos_msuplsettingsobserver.h>
-
-// User Includes
-#include "epos_msuplsettingsobserver.h"
-#include "epos_msuplsessionobserver.h"
-
-// Forward Declarations
-class MLocSUPLSettingsAdapterObserver;
-class MLocSUPLSettingsSessionObserver;
-
-// Class Declaration
-
-/**
- * Adapter class for the SUPL settings API. Handles all the interfacing
- * functionality to the SUPL Settings API. It also observes for the Settings
- * changes communicated through the MSuplSettingsObserver
- */
-class CLocSUPLSettingsAdapter : public CActive,
-                         		public MSuplSettingsObserver,
-                         		public MSuplSessionObserver
-    {
-    public:
-        /**
-         * SUPL Usage enumerations which display the order of display
-         * in the User interface
-         */
-         enum TLocSuplUsage
-            {
-            ELocSuplAutomatic = 0,
-            ELocSuplAutomaticatHome,
-            ELocSuplAlwaysAsk,
-            ELocSuplDisable
-            };               
-    public:
-        /**
- 		 * Static Two phase contructor that instantiates the CLocSUPLSettingsAdapter
-		 * 
-		 * @param aObserver				    Observer to the SUPL settings adapter
-		 * @return CLocSUPLSettingsAdapter*	Reference to the object created
-		 */
-        static CLocSUPLSettingsAdapter* NewL(
-                            MLocSUPLSettingsAdapterObserver&    aObserver );
-
-        /**
-         * Destructor
-         */
-        virtual ~CLocSUPLSettingsAdapter();
-
-    private:
-        /**
-         * Private Constructor
-         */
-        CLocSUPLSettingsAdapter( MLocSUPLSettingsAdapterObserver&    aObserver );
-
-        /**
-         * Second phase of the two phase constructor
-         */
-        void ConstructL();
-				
-    public:
-        /**
-         * Initializes the SUPL Settings API. This is an asynchronus call, the call
-         * back for which is given through the observer
-         */
-        void Initialize();
-        
-        /**
-         * Cancels the Initialization
-         */
-        void CancelInitialize();
-        
-        /**
-         * Sets the SUPL Settings usage.
-         *
-         * @param   aIndex   Index of the SUPL settings usage item.
-         */        
-        void SetSuplUsageL( const TLocSuplUsage    aIndex );
-
-        /**
-         * Obtains the SUPL Settings usage.
-         *
-         *  @param   aSuplUsage     SUPL settings usage string.
-         */  
-        void GetSuplUsageL( TDes&    aSuplUsage );
-        
-        /**
-         * Obtains the SUPL usage
-         * 
-         * @return The SUPL usage
-         */
-        TInt GetSuplUsage();
-        
-        /**
-         * Obtains the Supl Settings usage index
-         * 
-         * @return TLocSuplUsage SUPL settings usage index 
-         */
-        TLocSuplUsage GetSuplUsageIndex();
-        
-
-        /***************************************************************************
-	     * 
-	     * @since S60 9.1TB 
-	     * 
-         ***************************************************************************/
-
-        /**
-	     * Adds the new server into settings. 
-	     * After adding server entry, the server identity generated will be retuned with aSlpId..  
-	     * 
-	     * @since S60 9.1TB 
-	     *
-	     * @param [IN] aServerAddress Server address in string format 
-	     * @param [IN] aIapName The Internet Access Point Name refers to the access point which is 
-	     * used to access the HSLP over the internet.  This can have maximum size of 100 characters.
-	     * @param [IN] aUsageInHomeNw Inidcates whether server can be used in the home network or not 
-     	 */
-		void AddNewServerL( 
-                const TDesC& aServerAddress,
-                const TDesC& aIapName,
-                const TBool aUsageInHomeNw
-        );
-
-	    /**
-	     * Deletes server entry from SUPL settings storage.  
-	     *
-	     * @since S60 9.1TB 
-	     *
-	     * @param [IN] aSlpId Server identity for which the entery needs to be deleted from the SUPL settings storage 
-	     *
-	     */
-	    void RemoveServerL(
-	    		const TInt64 aSlpId
-	    );
-
-	    /**
-	     * This synchronous method is used to retrieve properties of all servers from SUPL settings storage.  
-	     * This method retrieves all properties for each server.
-	     *
-	     * @since S60 9.1TB 
-	     *
-	     * @param [OUT] aParamValues Array of retrieved server entries 
-	     * @ref CServerParams class
-	     *
-	     */
-	    void GetAllSlpL(
-	            RPointerArray<CServerParams>& aParamValues
-	    ) const;
-
-	    /**
-	     * This method is used to retrieve all properties of server from SUPL settings storage
-	     * based on SLP identification.  
-	     *
-	     * @since S60 9.1TB 
-	     *
-	     * @param [IN] aSlpId SLP ID for which the parameters needs to be changed 
-	     * @param [OUT] aParamValues Parameter for which the value needs to be changed  
-	     * @ref CServerParams class
-	     */
-	    void GetSlpInfoFromIdL(
-	            const TInt64 aSlpId, 
-	            CServerParams *aParamValues
-	    ) const;
-
-	    /**
-	     * Sets the priority of the server to the specified priority.  
-	     *
-	     * @since S60 9.1TB 
-	     *
-	     * @param [IN] aSlpId Server identity for which the priority needs to be changed 
-         * @param [IN] aPriority Number of positions to move 
-         * @param [IN] aDirection Whether to increase or decrease priority. 
-	     *
-	     */
-	    void ChangePriorityL(
-	            TInt64 aSlpId, 
-		        TInt aPriority,
-		        TBool aDirection
-	    );
-
-	    /**
-	     * Sets the server address parameter in server settings 
-	     *
-	     * @since S60 9.1TB 
-	     *
-	     * @param [IN] aSlpId SLP ID for which the parameter needs to be changed 
-	     * @param [IN] aServerAddres SUPL Server address 
-	     *
-	     */
-	    void SetServerAddressL( 
-	            const TInt64 aSlpId, 
-	            const TDesC& aServerAddress
-	    );
-
-	    /**
-	     * Obtains the server address parameter from server settings.  Client
-	     * has to allocate memory for server address parameter.
-	     *
-	     * @since S60 9.1TB 
-	     *
-	     * @param [IN] aSlpId SLP ID of server for which the server address needs to be retrieved 
-	     * @param [OUT] aServerAddres SUPL Server address 
-	     * 
-	     */
-	    void GetServerAddressL( 
-	            TInt64 aSlpId, 
-	            TDes& aServerAddress
-	    ) const;
-
-	    /**
-	     * Sets the IAP Name in server parameters. IAP name refers to 
-	     * the access point which is used to access the HSLP over the internet. 
-	     *
-	     * @since S60 9.1TB 
-	     *
-	     * @param [IN] aSlpId SLP ID for which the parameter needs to be changed 
-	     * @param [IN] aIapName The Internet Access Point Name refers to the access point which is 
-	     * used to access the HSLP over the internet.  This can have maximum size of 100 characters. 
-	     * 
-	     */
-	    void SetIapNameL( 
-	            const TInt64 aSlpId, 
-	            const TDesC& aIapName
-	    );
-
-	    /**
-	     * Obtains the IAP Name in server parameters. IAP name refers to 
-	     * the access point which is used to access the HSLP over the internet. It is client's
-	     * responsibility to allocate memory for IAP name before invoking this method.
-	     *
-	     * @since S60 9.1TB 
-	     *
-	     * @param [IN] aSlpId SLP ID for which the parameter needs to be retrieved 
-	     * @param [OUT] aIapName The Internet Access Point Name refers to the access point which is 
-	     * used to access the HSLP over the internet.  This can have maximum size of 100 characters. 
-	     * 
-	     */
-	    void GetIapNameL( 
-	            const TInt64 aSlpId, 
-	            TDes& aIapName
-	    ) const;
-
-
-	    /**
-	     * Sets the parameter which indicates whether server
-	     * can be used for SUPL session or not. 
-	     *
-	     * @since S60 9.1TB 
-	     *
-	     * @param [IN] aSlpId SLP ID for which the parameter needs to be changed 
-	     * @param [IN] aEnable Flag to indicate whether server can be enabled or not 
-	     * 
-	     */
-	    void SetServerEnabledFlagL(
-	            const TInt64 aSlpId, 
-	            const TBool aEnable 
-	    );
-
-	    /**
-	     * Obtains the parameter which indicates whether server
-	     * can be used for SUPL session or not. 
-	     *
-	     * @since S60 9.1TB 
-	     *
-	     * @param [IN] aSlpId SLP ID for which the parameter needs to be retrieved 
-	     * @param [OUT] aEnable Flag to indicate whether server can be enabled or not 
-	     * 
-	     */
-	    void GetServerEnabledFlagL(
-	            const TInt64 aSlpId, 
-	            TBool& aEnable 
-	    ) const;
-
-	    /**
-	     * Sets the parameter which indicates whether server
-	     * can be used out side home network or not. 
-	     *
-	     * @since S60 9.1TB 
-	     *
-	     * @param [IN] aSlpId SLP ID for which the parameter needs to be changed 
-	     * @param [IN] aHomeNwFlag Flag to indicate whether server can be used outside home network or not 
-	     * 
-	     */
-	    void SetUsageInHomwNwFlagL(
-	            const TInt64 aSlpId, 
-	            const TBool aHomeNwFlag 
-	    );
-
-	    /**
-	     * Obtains the parameter which indicates whether server
-	     * can be used out side home network or not. 
-	     *
-	     * @since S60 9.1TB 
-	     *
-	     * @param [IN] aSlpId SLP ID for which the parameter needs to be retrieved 
-	     * @param [OUT] aHomeNwFlag Flag to indicate whether server can be used outside home network or not 
-	     * 
-	     */
-	    void GetUsageInHomwNwFlagL(
-	            const TInt64 aSlpId, 
-	            TBool& aHomeNwFlag 
-	    ) const;
-
-	    /**
-	     * This method is used to change parameter which indicates whether server
-	     * details are editable or not. 
-	     *
-	     * @since S60 9.1TB 
-	     *
-	     * @param [IN] aSlpId SLP ID for which the parameter needs to be retrieved 
-	     * @param [IN] aEditFlag Flag to indicate whether server details are editable or not 
-	     */ 
-	    void SetEditableFlagL( 
-	            const TInt64 aSlpId, 
-	            const TBool aEditFlag 
-	    ) const;
-
-	    /**
-	     * This method is used to retrieve parameter which indicates whether server
-	     * details are editable or not. 
-	     *
-	     * @since S60 9.1TB 
-	     *
-	     * @param [IN] aSlpId SLP ID for which the parameter needs to be retrieved 
-	     * @param [OUT] aEditFlag Flag to indicate whether server details are editable or not 
-	     */ 
-	    void GetEditableFlagL( 
-	            const TInt64 aSlpId, 
-	            TBool& aEditFlag 
-	    ) const;
-
-	    /**
-	     * Obtains the number of server entries present in SUPL settings. 
-	     *
-	     * @since S60 9.1TB 
-	     *
-	     * @param [OUT] aCount Number of SLP entries 
-	     *
-	     */
-	    void SlpCountL(
-	            TInt& aCount 
-	    );
-	    
-	     /**
-	     * Obtains the count of active SUPL sessions 
-	     *
-	     * @since S60 9.1TB 
-	     *
-	     * @param [OUT] aActiveSessionsCount Count of active SUPL sessions 
-	     *
-	     */
-	    void GetActiveSessionsCountL( TInt& aActiveSessionsCount );
-	    
-	     /**
-	     * This method is used to retrieve properties of all triggers from SUPL settings storage.  
-	     * This method retrieves all properties for each trigger.
-	     *
-	     * @since S60 9.1TB 
-	     *
-	     * @param [OUT] aParamValues Array of retrieved trigger entries 
-	     * @ref CTriggerParams class
-	     *
-	     */
-	    void GetTriggerParamsL( RPointerArray<CTriggerParams>& aParamValues ) const;
-	    
-	     /**
-	     * This method is used to retrieve properties of all triggers from SUPL settings storage.  
-	     * This method retrieves all properties for required trigger.
-	     *
-	     * @since S60 9.2TB 
-	     *
-	     * @param [IN] aSessionId Sessiond Id 
-	     * @param [OUT] aTrigger Array of retrieved trigger entries 
-	     * @ref CTriggerParams class
-	     *
-	     */
-	    void GetTriggerParamsL( TInt64 aSessionId, CTriggerParams*& aTrigger ) const;
-	    
-	     /**
-	     * Changes the notification status for a trigger session based on session id
-	     *
-	     * @since S60 9.1TB 
-	     *
-	     * @param [IN] aSessionId Id of session for which the notification status has to be changed
-	     *
-	     */
-	    void ChangeNotificationStatusL( TInt64 aSessionId, TBool aTriggerNotificationStatus ) const;
-	    
-	     /**
-	     * Deletes a trigger session based on session id
-	     *
-	     * @since S60 9.1TB 
-	     *
-	     * @param [IN] aSessionId Id of session that needs to be deleted 
-	     *
-	     */
-	    void RemoveTriggerSessionL( TInt64 aSessionId ) const;
-	   
-	   /**
-	     * Set the Observer for the specific Session
-	     * 
-	     */  
-	    void SetSessionObserver( MLocSUPLSettingsSessionObserver* aObserver );
-	   
-	   /**
-	     * Remove the Session observer
-	     * 
-	     */  
-	    void RemoveSessionObserver( );
-
-
-    public: // Accessor functions for SUPL settings usage strings
-        const TDesC& Automatic();
-        
-        const TDesC& AutomaticAtHome();
-        
-        const TDesC& AlwaysAsk();
-        
-        const TDesC& Disable();
-              	
-	public:
-	
-	    /** 
-	     * Inherited from MSuplSettingsObserver
-	     */	
-        void HandleSuplSettingsChangeL(
-                TSuplSettingsEventType aEvent,
-                TInt aSlpId                        
-        );
-        
-        
-	    /** 
-	     * Inherited from MSuplSessionObserver
-	     */	
-		void HandleSuplSessionChangeL( 
-                TSuplSessionEventType aEvent,
-                TInt64 aSessionId                         
-        		);		
-	protected:
-	    /** 
-	     * Inherited from CActive
-	     */
-		void RunL();
-		
-		/**
-		 * Inherited from CActive
-		 */
-		void DoCancel();
-		
-    private:
-        /**
-         * Observer for the SUPL Settings UI Adapter
-         * Reference
-         */
-        MLocSUPLSettingsAdapterObserver&    iObserver;
-        
-        /**
-         * SUPL Settings UI
-         * Owns
-         */
-        CSuplSettings*                      iSUPLSettings;
-        
-        /**
-         * SUPL settings usage is automatic
-         * Owns
-         */
-        HBufC*                              iAutomatic;
-        
-        /**
-         * SUPL settings usage is automatic in home network
-         * Owns
-         */
-        HBufC*                              iAutomaticatHome;
-        
-        /**
-         * SUPL settings usage needs a user confirmation
-         * Owns
-         */
-        HBufC*                              iAsk;
-        
-        /**
-         * SUPL is disabled.
-         * Owns.
-         */
-        HBufC*                              iDisable;
-        
-        /**
-         * Observer for the specific SUPL session.
-         * Does not own.
-         */
-		MLocSUPLSettingsSessionObserver* iSessionObserver;
-        
-    };
-
-#endif      // CLOCSUPLSETTINGSADAPTER_H_
-
-// End of File
--- a/locationsystemui/locationsysui/locsuplsettingsui/inc/locsuplsettingsadapterobserver.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,55 +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:  Observer for the SUPL Settings adapter
-*
-*/
-
-
-#ifndef MLOCSUPLSETTINGSADAPTEROBSERVER_H_
-#define MLOCSUPLSETTINGSADAPTEROBSERVER_H_
-
-// Class Declaration
-
-/**
- * Observer for the SUPL Settings Adapter. The observer provides callbacks for
- * any changes in the SUPL Settings UI
- *
- * @lib locsuplsettings.lib
- * @since S60 v3.1 
- */
-class MLocSUPLSettingsAdapterObserver
-    {
-    public:
-        /** 
-         * Enumeration for events from the SUPL Settings UI
-         */
-        enum TLocSUPLSettingsEvent
-        	{
-        	ESUPLSettingsIntialized,
-        	ESUPLSettingsInitalizeError,
-        	ESUPLSettingsChanged
-        	};
-        	
-        /**
-         * Called when a change has been detected in the SUPL Settings.
-         *
-         * @param aEvent Information about the SUPL Settings event.
-         */
-        virtual void HandleSuplSettingsChangeL( TLocSUPLSettingsEvent aEvent ) = 0;
-
-    };
-
-#endif      // MLOCSUPLSETTINGSADAPTEROBSERVER_H_  
-            
-// End of File
--- a/locationsystemui/locationsysui/locsuplsettingsui/inc/locsuplsettingscontainer.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,218 +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:  SUPL Settings UI View's container
-*
-*/
-
-
-#ifndef C_LOCSUPLSETTINGSCONTAINER_H_
-#define C_LOCSUPLSETTINGSCONTAINER_H_
-
-// System Includes 
-#include <e32base.h>
-#include <coecntrl.h>
-#include <eiklbo.h>
-
-    
-// Forward Declarations
-class CLocSUPLSettingsView;
-class CAknSettingStyleListBox;
-class CLocSUPLSettingsLBModel;
-class CLocSUPLSettingsUiEngine;
-
-// Class Declarations
-/**
- * Container for the SUPL Settings UI View.
- * 
- * Contains the Listbox control that is used to configure various SUPL settings 
- * options
- *
- * @lib locsuplsettings.lib
- * @since S60 v3.1 
- */
-class CLocSUPLSettingsContainer : public CCoeControl,
-                                  public MEikListBoxObserver
-	{
-	public:
-		/**
- 		 * Static Two phase contructor that instantiates the CLocSUPLSettingsContainer
-		 * 
-		 * @param aRect				            Client rectangle
-         * @param aEngine                       Reference to the SUPL Settings
-         *                                      engine 		 
-         * @param aSettingsView                 Reference to the container's view
-		 * @return CLocSUPLSettingsContainer*	Reference to the object created
-		 */
-		static CLocSUPLSettingsContainer* NewL( 
-		                        const TRect& 	                    aRect,
-		                              CLocSUPLSettingsUiEngine&     aEngine,
-		                              CLocSUPLSettingsView&         aSettingsView );
-
-		/**
-		 * Static Two phase contructor that instantiates the CLocSUPLSettingsContainer
-		 * Leaves the object on the Cleanup stack
-		 * 
-		 * @param aRect				            Client rectangle
-         * @param aEngine                       Reference to the SUPL Settings
-         *                                      engine 		 
-         * @param aSettingsView                 Reference to the container's view		 
-		 * @return CLocSUPLSettingsContainer*	Reference to the object created
-		 */
-		static CLocSUPLSettingsContainer* NewLC( 
-		                        const TRect&                        aRect,
-		                              CLocSUPLSettingsUiEngine&     aEngine,
-		                              CLocSUPLSettingsView&         aSettingsView );
-
-		/**
-		 * Destructor
-		 */
-		~CLocSUPLSettingsContainer();
-    
-        /**
-         * Refreshes the screen so that the list box reflects the latest contents
-         */
-         void UpdateScreen();
-         
-        /**
-		 * Returns the Selected element. The list box model defines the
-		 * enumeration that would determine the current element that has been
-		 * selected
-		 *
-		 * @return TInt Index of the item selected
-		 */
-		TInt SelectedItemIndex();
-		 
- 		/**
-		 * Sets focus to server detail or Active services item
-		 * @param aIndex	Helps to know if server or session item has to be focussed
-		 */
-      	void FocusToItemL( TInt aIndex );
-        
-        /**
-         * Returns the Active session count.
-         *
-         * @return TInt  SUPL Active sessions count.
-         */
-        TInt ActiveSessionCount( ) const;
-
-	protected:
-	
-		/**
-		 * Inherited from CCoeControl
-		 */
-		void HandleResourceChange(TInt aType);
-
-        /**
-         * Returns the help context
-         *
-         * @param aContext	The help context that has to be determined
-         */
-        void GetHelpContext( TCoeHelpContext& aContext ) const; 
-        
-        /**
-         * From CoeControl
-         */
-        TInt CountComponentControls() const;
-
-        /**
-         * From CCoeControl
-         */
-        CCoeControl* ComponentControl(TInt aIndex) const;
-        
-        /**
-         * Inherited from CCoeControl
-         */
-        TKeyResponse OfferKeyEventL( const TKeyEvent& aKeyEvent,
-        						           TEventCode aType );
-        		 
-		/**
-         * Inherited from MEikListBoxObserver
-         */
-        void HandleListBoxEventL( CEikListBox*      aListBox, 
-        					      TListBoxEvent     aEventType );
-        					      
-	protected:
-		/**
-		 * Handles Focus Change to list 
-		 */
-		void FocusChanged(TDrawNow aDrawNow);
-		 
-		/**
-         * From CoeControl,SizeChanged.
-         */
-        void SizeChanged();
-
-	private:
-		/**
-		 * Overloaded Constructor
-		 */
-		CLocSUPLSettingsContainer( CLocSUPLSettingsView&         aSettingsView );
-		
-		/**
-		 * Second phase of the two phase Construction process
-		 */
-		void ConstructL( const TRect&                        aRect ,
-		                       CLocSUPLSettingsUiEngine&     aEngine );
-          
-        /**
-         * Sets the Title text
-         * @param aResourceText Resource to create title
-         */
-        void MakeTitleL( TInt aResourceText );
-          
-		/**
-         * Returns the Appui's status pane
-         * @return CEikStatusPane* Statuspane pointer
-         */
-		CEikStatusPane* StatusPane();
-
-        /** 
-         * Creates the List box and the Listbox model. Associates the 
-         * list box model wit the list box
-         *
-         * @param aEngine    Reference to the SUPL Settings engine          
-         */
-        void CreateListboxL( CLocSUPLSettingsUiEngine&     aEngine );
-        
-    private:
-    
-        /**
-         * Reference to the Container's view
-         */
-        CLocSUPLSettingsView&           iSettingsView;
-        
-        /**
-         * Help context
-         */
-        TCoeContextName 				iContextName;
-        
-        /**
-         * Settings list box for SUPL settings
-         * Owns
-         */
-        CAknSettingStyleListBox*        iListBox;
-        
-        /**
-         * List Box model
-         */
-        CLocSUPLSettingsLBModel*        iListBoxModel;
-        
-        /**
-         * Boolean flag to denote whether the pen down occured
-         */
-        TBool							iTouchFlag;            
-	};
-
-#endif // C_LOCSUPLSETTINGSCONTAINER_H_
-
--- a/locationsystemui/locationsysui/locsuplsettingsui/inc/locsuplsettingseventhandler.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,54 +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:  Handles Events from the container 
-*
-*/
-
-
-#ifndef M_LOCSUPLSETTINGSEVENTHANDLER_H_
-#define M_LOCSUPLSETTINGSEVENTHANDLER_H_
-
-// System Include
-#include <e32base.h>
-
-/**
- * Handles events from the Location System UI Container
- *
- * @lib locsuplsettings.lib
- * @since S60 v3.1
- */
-class MLocSUPLSettingsEventHandler
-	{
-    public:
-        enum TSuplDialogEvent
-            {
-            ELaunchViewComplete
-            };
-    public:	 	 
-     	/**
-    	 * Handles the Screen Size update
-    	 * @since S60 v3.1
-    	 */
-    	virtual void HandleScreenSizeChange() 	= 0;
-    	 
-    	/**
-		 * Command handlikng function
-		 *
-		 * @param aCommand Command that needs to be handled
-		 */
-		virtual void HandleCommandL( TInt aCommand )	= 0;
-	};
-
-#endif // M_LOCSUPLSETTINGSEVENTHANDLER_H_
-
--- a/locationsystemui/locationsysui/locsuplsettingsui/inc/locsuplsettingslbmodel.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,194 +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:  List box model for the SUPL Settings UI
-*
-*/
-
-#ifndef C_LOCSUPLSETTINGSLBMODEL_H_
-#define C_LOCSUPLSETTINGSLBMODEL_H_
-
-// System Include
-#include <e32base.h>
-#include <bamdesca.h>  // MDesCArray
-
-// Forward Declaration
-class CLocSUPLSettingsUiEngine;
-
-
-// Class Declaration
-/**
- * Model for the SUPL Settings UI container. 
- *
- * The model interacts with the SUPL Settings Engine inorder to obtain the latest
- * SUPL UI Settings values
- *
- * @lib locsuplsettings.lib
- * @since S60 v3.1
- */
-class CLocSUPLSettingsLBModel : public CBase,
-						        public MDesCArray
-	{
-	public:
-        /**
-        * Enumerations for List box Entries
-        */
-        enum	TSUPLSettingsItemId        
-            {
-            ESUPLSettingsUsage = 0,
-            ESUPLSettingsServersDetail,
-            ESUPLSettingsActiveSessions
-            };
-            	
-	public:
-        /**
-         * Two-phased constructor
-         *
-         * @param  aEngine                      Reference the SUPL Settings Engine
-         * @return CLocSUPLSettingsLBModel*     Reference to the object created
-         */
-        static CLocSUPLSettingsLBModel* NewL( 
-                        CLocSUPLSettingsUiEngine&     aEngine );
-
-        /**
-         * Two-phased constructor
-         *
-         * @param  aEngine                      Reference the SUPL Settings Engine         
-         * @return CLocSUPLSettingsLBModel*     Reference to the object created
-         */
-        static CLocSUPLSettingsLBModel* NewLC( 
-                        CLocSUPLSettingsUiEngine&     aEngine );
-        
-        /**
-         * Destructor.
-         */
-        virtual ~CLocSUPLSettingsLBModel();
-        
-        
-        /**
-         * Resolves the list box index to the SUPL settings item.
-         *
-         * @param  aListboxIndex        List box item index.
-         * @return TSUPLSettingsItemId  SUPL settings item id.
-         */
-        TSUPLSettingsItemId ResolveSettingsItem( TInt aListboxIndex ) const;
-        
-        /**
-         * Returns the Active session count.
-         *
-         * @return TInt  SUPL Active sessions count.
-         */
-        TInt ActiveSessionCount( ) const;
-                
-    protected:
-        /**
-         * Inherited from MDesCArray
-         */
-        TInt MdcaCount() const;
-
-        /**
-         * Inherited from MDesCArray
-         */
-        TPtrC16 MdcaPoint( TInt aIndex ) const;
-        				
-    private:
-        /**
-         * C++ constructor.
-         */
-        CLocSUPLSettingsLBModel( CLocSUPLSettingsUiEngine&     aEngine );
-        
-        /**
-         * Second Phase constructor
-         */
-        void ConstructL();
-        
-        /**
-         * Packs the SUPL settings usage to the end of the buffer passed.
-         *
-         * @param aPtr Buffer to which the Supl settings usage point needs to be 
-         *            appended.         
-         */
-        void AppendSuplUsage( TDes16& aPtr ) const;
-
-        /**
-         * Packs the Server Address to the end of the buffer passed.
-         * 
-         * @param aPtr Buffer to which the Access point needs to be 
-         *             appended.
-         */
-        void AppendSuplServerDetail( TDes16& aPtr ) const;  
-     
-        /**
-         * Packs the SUPL access points count to the end of the buffer passed.
-         * 
-         * @param aPtr Buffer to which the SUPL access points count needs to be 
-         *             appended.
-         */    
-        void AppendSuplActiveSessionsDetailL( TDes16& aPtr ) const;
-                 
-    private:
-        /**
-         * Format conversion buffer
-         * Owns
-         */
-        HBufC16*                    iBuffer;
-        
-        /**
-         * Title Text Buffer for Server Detail Heading
-         * Owns
-         */
-        HBufC16*                    iServerDetailTitle;
-        
-        /**
-         * Title text for SUPL usage.
-         * Owns.
-         */
-        HBufC16*                    iSuplUsageTitle;
-        
-        /**
-         * SUPL Active Sessions count.
-         */
-        mutable TInt iSessionCount;
-         
-        /**
-         * Default Server Address 
-         * Owns
-         */
-        HBufC16*                    iSuplServerDetail;
-        
-        /**
-         * Default SUPL usage.
-         * Owns.
-         */
-        HBufC16*                    iDefaultSuplUsage;
-
-        /**
-         * Reference the SUPL Settings Engine
-         */   
-        CLocSUPLSettingsUiEngine&   iEngine;
-        
-        /** 
-         * Boolean value to indicate whethere SUPL settings usage
-         * is present.
-         */
-        TBool                       iSuplUsagePresent;
-                
-        /**
-         * Boolean value to indicate whether SUPL address field
-         * is present.
-         */
-        TBool                       iServerAddressPresent;               
-	};
-
-#endif // C_LOCSUPLSETTINGSLBMODEL_H_
-
--- a/locationsystemui/locationsysui/locsuplsettingsui/inc/locsuplsettingsprivatecrkeys.h	Mon May 03 12:54:42 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:  Defining local variation for SUPL Settings UI
-*
-*
-*/
-
-
-#ifndef LOCSUPLSETTINGSPRIVATECRKEYS_H
-#define LOCSUPLSETTINGSPRIVATECRKEYS_H
-
-// UID value for the Central Repository Key used for local variationing in 
-// SUPL Settings UI
-const TInt KCRUidLocSuplSettingsUi = 0x1028190A;
-
-// Central repository Key identifer value
-const TInt KLocSuplSettingsLVFlags = 0x00000001;
-
-// Enumeration values that the Central repository key KLocSuplSettingsLVFlags 
-// can take
-enum TSuplSettingsLVValue
-	{
-	ESuplHslpAddressAbsent 	= 0x00000000,
-	ESuplHslpAddressPresent = 0x00000001
-	};
-
-#endif      // LOCSUPLSETTINGSPRIVATECRKEYS_H
\ No newline at end of file
--- a/locationsystemui/locationsysui/locsuplsettingsui/inc/locsuplsettingssessionobserver.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,65 +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:  Observer for the SUPL Session
-*
-*/
-
-
-#ifndef MLOCSUPLSETTINGSSESSIONOBSERVER_H_
-#define MLOCSUPLSETTINGSSESSIONOBSERVER_H_
-
-// Class Declaration
-
-/**
- * Observer for the SUPL Session. The observer provides callbacks for
- * any changes in the SUPL session
- *
- * @lib locsuplsettings.lib
- * @since S60 v3.1 
- */
-class MLocSUPLSettingsSessionObserver
-    {
-    public:
-        /**
-         * Update type for the Session
-         */
-        enum TUpdateType
-        {
-        // Enum for Session modification.
-        ESessionModified = 0,
-        // Enum for Session deletion.
-        ESessionDeleted
-        };
-    
-    public:
-        	
-        /**
-         * Called when a change has been detected in the SUPL Session 
-         * identified by the session id provided by SessionIdL.
-         * @param aType Type of Updation
-         *
-         */
-        virtual void UpdateSessionL( TUpdateType aType ) = 0;
-        
-        /**
-         * Called when a change has been detected in the SUPL Session.
-         *
-         */
-        virtual TInt64 SessionId( ) = 0;
-
-    };
-
-#endif      // MLOCSUPLSETTINGSSESSIONOBSERVER_H_  
-            
-// End of File
--- a/locationsystemui/locationsysui/locsuplsettingsui/inc/locsuplsettingsuid.hrh	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +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:  Contains the UID3 value to be used for the SUPL Settings UI. 
-*                The value is expected to have two specific functions
-*				 1. UID3 for the locsuplsettings.dll ECOM DLL
-*				 2. Implementation UID for the ECOM plugin to LocSysUiEngine
-*
-*/
-
-#ifndef _LOCSUPLSETTINGSUID_HRH_
-#define _LOCSUPLSETTINGSUID_HRH_
-
-// SUPL Settinhs UI UID3
-#define KLOCSUPLSETTINGSUIUID3          0x10275091
-#define KLOCSUPLSERVERUIUID3		0x10275092
-#define KLOCSUPLSESSIONUIUID3		0x10275093
-
-#endif      // _LOCSUPLSETTINGSUID_HRH_
-
-// End of File
-
-
--- a/locationsystemui/locationsysui/locsuplsettingsui/inc/locsuplsettingsuiengine.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,457 +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:  SUPL Settings UI Engine. The engine is resposible for handling
-*                all the UI components required for SUPL Settings UI. In addition
-*                to this it also is responsible for interacting with the SUPL
-*                Settings API
-*
-*/
-
-
-#ifndef C_LOCSUPLSETTINGSUIENGINE_H_
-#define C_LOCSUPLSETTINGSUIENGINE_H_
-
-// System Includes
-#include <e32base.h>
-#include <agentdialog.h>    // for RGenConAgentDialogServer
-
-// User Includes
-#include "locsuplsettingsadapterobserver.h"
-
-// Forward Declaration
-class CLocSUPLSettingsAdapter;
-class MLocSUPLSettingsUiEngObserver;
-class CTextResolver;
-class CAknGlobalConfirmationQuery;
-class CServerParams;
-class CTriggerParams;
-class CLocSUPLServerEditor;
-class MSuplServerEditorObserver;
-class MLocSUPLSettingsSessionObserver;
-
-// Class Declaration
-/**
- * Engine for SUPL Settings UI
- *
- * Engine class for SUPL Settings UI. It is responsible for interacting with the 
- * SUPL Settings API. Further, it handles all commands for SUPL settings UI. The
- * Engine launches all the dialogs associated with configuring the SUPL Settings.
- * It further observers the SUPL Settings UI for any changes to the Settings
- * values.
- */
-class CLocSUPLSettingsUiEngine : public CActive, 
-                                 public MLocSUPLSettingsAdapterObserver
-    {
-    public:
-        /**
-         * Two-phased constructor
-         *
-         * @param  aObserver                 Referenece to the Engine observer
-         * @return CLocSUPLSettingsUiEngine* Reference to the object created
-         */
-        static CLocSUPLSettingsUiEngine* NewL( 
-                            MLocSUPLSettingsUiEngObserver&      aObserver );
-                            
-        /**
-         * Two-phased constructor. Leaves the object on the Cleanup stack
-         *
-         * @param  aObserver                 Reference to the Engine observer
-         * @return CLocSUPLSettingsUiEngine* Reference to the object created
-         */
-        static CLocSUPLSettingsUiEngine* NewLC( 
-                            MLocSUPLSettingsUiEngObserver&      aObserver );
-         
-        /**
-         * Initializes the Settings Engine. This is an asynchronous call the 
-         * completion of which is communicated through the observer
-         * 
-         */
-        void Initalize();
-                         
-        /**
-         * Destructor.
-         */
-        virtual ~CLocSUPLSettingsUiEngine();
-       
-        /** 
-         * Launches the confirmation query to select IAP
-		 *
-		 */
-		void SelectConnectionL();
-        
-		/**
-		 * Launches the Access Point Configurator dialog
-		 *
-		 */
-		void LaunchApConfiguratorL( TInt64 aSlpId, 
-				MSuplServerEditorObserver* aEditorObserver );
-		
-        /** 
-         * Opens the exisitng server with its attributes
-		 *
-		 */
-		void EditServerL( TBool iIsEditable, TInt64 aSlpId );
-
-        /** 
-         * returns exisitng server entries count
-		 *
-		 */
-		TInt SlpCount();
-
-		/**
-		 * Launches the SUPL Usage configurator
-		 */
-		void LaunchSuplUsageConfiguratorL();
-		
-        /**
-		 * Closes the running Settings UI prematurely.
-		 */
-		void Close();
-		
-        /**
-         * Obtains the SUPL Settings usage.
-         *
-         * @return TPtr16     SUPL settings usage.
-         */  
-        TPtr16 GetSuplUsageL();
-        
-        /**
-         * Obtains the SUPL usage
-         *
-         * @return The SUPL Usage value
-         */
-        TInt   GetSuplUsage();			
-		 
-        /**
-		 * Creates a new server entry in Supl Settings.
-		 */
-		void CLocSUPLSettingsUiEngine::AddNewServerL( 
-		        const TDesC& aServerAddress,
-		        const TDesC& aIapName,
-		        const TBool aUsageInHomeNw
-		);
-
-	    /**
-	     * Deletes server entry from SUPL settings storage.  
-	     */
-	    void RemoveServerL(
-	    		const TInt64 aSlpId
-	    );
-
-	    /**
-	     * Sets the priority of the server to the specified priority.  
-	     */
-		void ChangePriorityL(
-		        TInt64 aSlpId, 
-		        TInt aPriority,
-		        TBool aDirection
-		);
-
-	    /**
-	     * Gets properties of all servers from SUPL settings storage.  
-	     * This method retrieves all properties for each server.
-	     */
-		void GetAllSlpL(
-		        RPointerArray<CServerParams>& aParamValues
-		) const;
-	
-	    /**
-	     * Gets all properties of server from SUPL settings storage
-	     * based on SLP identification.  
-	     */
-		void GetSlpInfoFromIdL(
-	            const TInt64 aSlpId, 
-	            CServerParams *aParamValues
-		) const;
-
-	    /**
-	     * Sets the server address parameter in server settings 
-	     */
-	    void SetServerAddressL( 
-	            const TInt64 aSlpId, 
-	            const TDesC& aServerAddress
-	    );
-	    
-	    /**
-	     * Obtains the server address parameter from server settings.  Client
-	     * has to allocate memory for server address parameter.
-	     */
-	    void GetServerAddressL( 
-	            TInt64 aSlpId, 
-	            TDes& aServerAddress
-	    ) const;
-
-	    /**
-	     * Sets the IAP Name in server parameters. IAP name refers to 
-	     * the access point which is used to access the HSLP over the internet. 
-	     */
-	    void SetIapNameL( 
-	            const TInt64 aSlpId, 
-	            const TDesC& aIapName
-	    );
-
-	    /**
-	     * Sets the parameter which indicates whether server
-	     * can be used for SUPL session or not. 
-	     */
-	    void SetServerEnabledFlagL(
-	            const TInt64 aSlpId, 
-	            const TBool aEnable 
-	    ) const;
-
-	    /**
-	     * Obtains the parameter which indicates whether server
-	     * can be used for SUPL session or not. 
-	     */
-	    void GetServerEnabledFlagL(
-	            const TInt64 aSlpId, 
-	            TBool& aEnable 
-	    ) const;
-
-	    /**
-	     * Sets the parameter which indicates whether server
-	     * can be used out side home network or not. 
-	     */
-	    void SetUsageInHomwNwFlagL(
-	            const TInt64 aSlpId, 
-	            const TBool aHomeNwFlag 
-	    );
-
-		
-	    /**
-	     * Sets the parameter which indicates whether server
-	     * details are editable or not. 
-	     */ 
-		void SetEditableFlagL( 
-	            const TInt64 aSlpId, 
-	            const TBool aEditFlag 
-	    ) const;
-
-	    /**
-	     * Gets the parameter which indicates whether server
-	     * details are editable or not. 
-	     */ 
-	    void GetEditableFlagL( 
-	            const TInt64 aSlpId, 
-	            TBool& aEditFlag 
-	    ) const;
-	    
-	    /**
-	     * Obtains the count of active Supl sessions
-	     * 
-	     */  
-	    void GetActiveSessionsCountL( TInt& aAccessPointCount );
-	    
-	    /**
-	     * Gets properties of all triggers from SUPL settings storage.  
-	     * This method retrieves all properties for each trigger.
-	     */
-		void GetTriggerParamsL(
-		        RPointerArray<CTriggerParams>& aParamValues
-		) const;
-	    
-	    /**
-	     * Gets properties of all triggers from SUPL settings storage.  
-	     * This method retrieves all properties for each trigger based on session id.
-	     */
-		void GetTriggerParamsL(  TInt64 aSessionId, 
-		        CTriggerParams*& aTrigger
-		) const;
-	   
-	   /**
-	     * Open the Active Session for the specified session id.
-	     * 
-	     */  
-	    void OpenSessionL( TInt64 aSessionId );
-		
-	   /**
-	     * Deletes a trigger session based on session id
-	     * 
-	     */  
-	    void RemoveTriggerSessionL( TInt64 aSessionId ) const;
-	   
-	   /**
-	     * Deletes a trigger sessions based on session ids
-	     * 
-	     */  
-	    void RemoveTriggerSessionsL( RArray< TInt64 >& aSessionIdList ) const;
-	   
-	   /**
-	     * Deletes all the trigger sessions
-	     * 
-	     */  
-	    void RemoveAllTriggerSessionsL( ) const;
-	   
-	   /**
-	     * Changes the notification status of an active session based on session id
-	     * 
-	     */  
-	    void ChangeNotificationStatusL( TInt64 aSessionId, TBool aTriggerNotificationStatus ) const;
-	   
-	   /**
-	     * Set the Observer for the specific Session
-	     * 
-	     */  
-	    void SetSessionObserver( MLocSUPLSettingsSessionObserver* aObserver ) const;
-	   
-	   /**
-	     * Remove the Session observer
-	     * 
-	     */  
-	    void RemoveSessionObserver( ) const;
-	    
-	public:     		
-		/**
-		 * Inherited from MLocSUPLSettingsAdapterObserver
-		 */
-		void HandleSuplSettingsChangeL( TLocSUPLSettingsEvent aEvent );
-				 
-    protected:
-        /**
-         * Inherited from CActive
-         */
-        void RunL();
-        
-        /**
-         * Inherited from CActive
-         */
-        void DoCancel();
-             
-    private:
-        /**
-         * C++ constructor.
-         */
-        CLocSUPLSettingsUiEngine( MLocSUPLSettingsUiEngObserver&  aObserver );
-        
-        /**
-         * Second Phase constructor
-         */
-        void ConstructL();
-         
-        /**
-         * Obtains the index UID corresponding to the Access point name
-         *
-         * @param   aIAPName     Access point name
-         * @return  TUint       UID corresponding to the AP Name. Zero if 
-         *                      the name does not exist
-         */
-        TUint ConvertIAPNameToIdL( const TDesC&      aIAPName );
-       
-        /**
-         * Displays an Error note
-         *
-         * @param aError Error ID
-         */
-        void DisplayErrorL( TInt aError );
-        
-        /**
-         * Displays an Info note
-         *
-         * @param None
-         */
-        TInt ShowNoteL();                               
-        
-    private:
-        /**
-         * Reference to the Engine Observer
-         */
-        MLocSUPLSettingsUiEngObserver&	iObserver;
-        
-        /**
-         * SUPL Settings API Adapter
-         * Owns
-         */
-        CLocSUPLSettingsAdapter*       	iSUPLSettingsAdapter;
-        
-        /**
-         * Flag to denote whether any dialog is currently active
-         * Used in the Cancel method. If there are any requests 
-         * outstanding then they have to be cancelled
-         */
-        TBool                   		iDialogActive;
-                        
-        /**
-         * Temporary Buffer for returning values to the Accessor 
-         * functions. The accessor expects a 16 bit variant of the descriptor
-         * Owns
-         */
-        HBufC16*                		iConversionBuffer;
-        
-        /**
-         * Pointer to the Conversion Buffer
-         */
-        TPtr16                  		iConversionBufferPtr;
-        
-        /**
-         * Temporary Buffer to hand over to the UI components and
-         * access data from the Settinga API
-         * Owns
-         */
-        HBufC*                  		iSettingsBuffer;
-        
-        /**
-         * Pointer to the Settings Buffer
-         */
-        TPtr                    		iSettingsBufferPtr;
-        
-        /**
-         * Standard Text resolver for converting Error codes to 
-         * standard texts
-         */
-        CTextResolver*          		iTextResolver;
-
-        
-        /**
-         * Selected IAP ID
-         */
-        TUint32                     	iSelectedIap;
-        
-        /**
-         * Launch Paramters
-         */
-        TInt                        	iLaunchParams;
-        
-        /**
-         * Akn Global confirmation query
-         * Owns
-         */
-        CAknGlobalConfirmationQuery*    iConfirmQuery;
-
-        /**
-         * Flag to denote whether access point selection requested or not
-         */
-        TBool                   		iRequestIapSelect;
-
-        /**
-         * SUPL Servers SLP ID to get and set the server attributes.
-         * Owns.
-         */
-        TInt64							iCurrentSlpId;
-                        
-        /**
-         * Supl Server Editor 
-         * Owns
-         */
-        CLocSUPLServerEditor*			iEditorDlg;
-
-        /**
-         * Editor Observer
-         * Owns
-         */
-        MSuplServerEditorObserver*		iEditorObserver;
-        
-    };
-    
-#endif // C_LOCSUPLSETTINGSUIENGINE_H_
-
--- a/locationsystemui/locationsysui/locsuplsettingsui/inc/locsuplsettingsuiengobserver.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,57 +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:  Observer to the SUPL Settings UI Engine observer
-*
-*/
-
-
-#ifndef M_LOCSUPLSETTINGSUIENGOBSERVER_H_
-#define M_LOCSUPLSETTINGSUIENGOBSERVER_H_
-
-// User Includes
-#include "locsuplsettingsadapterobserver.h"
-
-// Class Declaration
-/**
- * Observer to the SUPL Settings UI Engine
- */
- 
-class MLocSUPLSettingsUiEngObserver
-    {
-    public:
-        /**
-         * Enumeration defining all the event types from the SUPL Settings
-         * Engine
-         */
-        enum TSettingsEventType
-            {
-            EEngineInitialized = MLocSUPLSettingsAdapterObserver::ESUPLSettingsIntialized,
-            EEngineInitializeFailed,            
-            ESUPLSettingsChange,
-            EIAPSelectionComplete,
-            EIAPSelectionCancelled,
-            EExitEvent
-            };
-    public:
-        /**
-         * Handles any event from the SUPL Settings Engine
-         *
-         * @param aEvent Event from the SUPL Settings Engine
-         */
-        virtual void HandleSettingsEventL( TSettingsEventType    aEvent ) = 0;
-           
-    };
-    
-#endif
-
--- a/locationsystemui/locationsysui/locsuplsettingsui/inc/locsuplsettingsview.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,198 +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:  SUPL Settings UI view
-*
-*/
-
-#ifndef C_LOCSUPLSETTINGSVIEW_H_
-#define C_LOCSUPLSETTINGSVIEW_H_
-
-//  System Includes
-#include <data_caging_path_literals.hrh>
-#include <e32base.h>
-#include <aknview.h>
-#include <ConeResLoader.h>
-
-// User Includes
-#include "locsuplsettingsuid.hrh"
-#include "locsuplsettingseventhandler.h"
-
-// Forward Declarations
-class CLocSUPLSettingsContainer;
-class MLocSUPLSettingsEventHandler;
-class CLocSUPLSettingsUiEngine;
-
-
-// Constant Declarations
-const TUid KLocSUPLSettingsUiViewId = { KLOCSUPLSETTINGSUIUID3 };
-_LIT( KLocSUPLSettingsUiResFileName, "locsuplsettingsui.rsc" );
-
-// Class Declaration
-
-/**
- * SUPL Settings UI View. 
- * This class also handles all View specific events for SUPL settings
- */
-class CLocSUPLSettingsView : public CAknView
-	{
-    public:
-        /**
-         * Creates new SUPL Settings UI View.
-         *
-         * @param aEngine                   Reference to the SUPL Settings
-         *                                  engine
-         * @param aEventHandler			    Reference to the Event Handler
-         * @return CLocSUPLSettingsView*	Reference to the application view
-         */                                                 
-        static CLocSUPLSettingsView* NewL( 
-                            CLocSUPLSettingsUiEngine&       aEngine,
-        					MLocSUPLSettingsEventHandler&	aEventHandler );
-
-		/**
-         * Creates new SUPL Settings UI View. Leaves the object on the 
-         * Clean up stack
-         *
-         * @param aEngine                   Reference to the SUPL Settings
-         *                                  engine          
-         * @param aEventHandler			    Pointer to the Event Handler
-		 * @return CLocSUPLSettingsView*	Reference to the application view
-         */                                                 
-        static CLocSUPLSettingsView* NewLC( 
-                            CLocSUPLSettingsUiEngine&       aEngine,
-         					MLocSUPLSettingsEventHandler&	aEventHandler );
-        
-		/**
-		 * Destructor
-		 */
-		~CLocSUPLSettingsView ();
-		
-        /**
-         * Handles the Screen Size update
-         */
-        void HandleScreenSizeChange();
-        
-        /**
-         * Updates the View
-         */
-        void UpdateView();
-        
-        /**
-         * Indicates that the SUPL settings view is started from the Location
-         * settings UI server
-         */
-        void StartedFromAppServer();
-            
-        /**
-		 * Returns the Selected element. The list box model defines the
-		 * enumeration that would determine the current element that has been
-		 * selected
-		 *
-		 * @return TInt Index of the item selected
-		 */
-		TInt SelectedItemIndex();
-		         
-		/**
-         * From CAknView. 
-         */
-		void DoActivateL( const TVwsViewId& aPrevViewId,
-		 						 TUid		 aCustomMessageId,
-						   const TDesC8&	 aCustomMessage);
-		
-		/**
-         * From CAknView. 
-         */
-        void DoDeactivate();
- 
- 		/**
-         * From CAknView. Returns the View Id. Should be chosen to reflect 
-		 * the Implementation UID of the Plugin
-         */
-        TUid Id() const;
-
-        /**
-         * From CAknView. 
-         */
-        void HandleCommandL(TInt aCommand);
-        
-       /**
-        * From MEikMenuObserver
-        */
-        void DynInitMenuPaneL( TInt aResourceId, CEikMenuPane* aMenuPane );
-                	
-        /**
-         * Resets the Setting View Configuration
-         */
-        void Reset();	
-		
-		/**
-		 * Confirmation query to delete
-		 */
-		TInt DeletionConfirmationQueryL( );
-    
-	private:
-		/**
- 		 * C++ Overloaded Constructor
-		 */
-		CLocSUPLSettingsView( CLocSUPLSettingsUiEngine&     aEngine,
-		 					  MLocSUPLSettingsEventHandler&	aEventHandler );
-
-		/**
-		 * Second Phase Constructor
-		 */
-		void ConstructL();
-
-       /**
-        * Shows or dims help option, depending wheather help feature
-        * is supported or not.
-        * @param aMenuPane
-        */
-        void HandleHelpFeature( CEikMenuPane& aMenuPane ) const;		
-		
-       /**
-        * Changes the command button groups for the view
-        */
-		void ChangeMSKL();
-			
-	private:		
-		/**
-		 * Reference to the event Handler for handling UI events
-		 */
-		MLocSUPLSettingsEventHandler&		iEventHandler;
-	
-	    /**
-	     * Reference to the SUPL Settings engine
-	     */
-	    CLocSUPLSettingsUiEngine&           iEngine;	
-		/**
-		 * Container Object
-		 * Owns
-		 */
-		CLocSUPLSettingsContainer*			iContainer;
-		
-		/**
-		 * Boolean value to indicate that the SUPL settings UI is
-		 * started from the settings UI server.
-		 */
-		TBool                               iStartedFromServer;
-
-		/**
-		 * Integer value to indicate whether the SUPL server view
-                 * or session view was launched
-		 */
-		TInt                               iViewLaunched;
-		
-	};			
-
-#endif // C_LOCSUPLSETTINGSVIEW_H_
-
--- a/locationsystemui/locationsysui/locsuplsettingsui/src/locsupldebug.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,65 +0,0 @@
-/*
-* Copyright (c) 2008 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:  Utility class for Debug traces
-*
-*/
-
-
-// INCLUDE FILES
-#include "locsupldebug.h"
-#include <flogger.h>
-#include <e32svr.h>
-
-// ========================== EXPORTED FUNCTIONS =========================
-
-#ifdef _LOCSUPLDEBUG
-
-/// Folder where the log resides
-_LIT( KLogFolder, "epos" );
-
-/// The name of the log file
-_LIT( KLogFileName, "mslp.txt" );
-
-/// How many characters a log line can contain
-const TInt KLogLineLength = 256;
-
-// -----------------------------------------------------------------------------
-//  void Debug( TRefByValue<const TDesC> aText, ... )
-// -----------------------------------------------------------------------------
-//
-void Debug( TRefByValue<const TDesC> aText, ... )
-    {
-    RDebug::Print(aText);
-
-    VA_LIST args;
-    VA_START( args, aText );
-
-    TBuf<KLogLineLength> buf;
-    buf.FormatList( aText, args );
-    RFileLogger logger;
-    TInt ret=logger.Connect();
-    if (ret==KErrNone)
-        {
-        logger.SetDateAndTime( EFalse,EFalse );
-        logger.CreateLog( KLogFolder, KLogFileName, EFileLoggingModeAppend );
-        logger.Write(buf);
-        }
-    logger.Close();
-
-    VA_END( args );
-    }
-
-#endif
-
-//  End of file
--- a/locationsystemui/locationsysui/locsuplsettingsui/src/locsuplservercontainer.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,656 +0,0 @@
-/*
-* Copyright (c) 2008 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:  SUPL server UI View's container
-*
-*/
-
-
-// System Includes
-#include <eikspane.h> 						// Status pane
-#include <akntitle.h>   					// CAknTitlePane
-#include <aknlists.h>
-#include <StringLoader.h>
-#include <locsuplsettingsui.rsg>
-#include <csxhelp/locsupl.hlp.hrh>          // Help File
-#include <aknview.h>
-#include <eikmenub.h>
-#include <gulicon.h>
-#include <AknIconUtils.h>
-#include <AknIconArray.h>
-#include <eikclbd.h>
-#include <avkon.mbg>						// for select server (mark) icon
-#include <avkon.rsg>
-#include <eiklbx.h>
-#include <ErrorUI.h>
-#include <AknsUtils.h> 
-#include <aknapp.h>
-#include <locsuplsettings.mbg>				// for server disable icon
-
-// User Includes
-#include "locsuplsettings.hrh"
-#include "locsuplsettingsuid.hrh"
-#include "locsuplservercontainer.h"
-#include "locsuplserverview.h"
-#include "locsuplserverlbmodel.h"
-#include "locsuplsettingsuiengine.h"
-#include "locsuplsettingseventhandler.h"
-#include "locsupldebug.h"
-
-// CONSTANT DEFINITIONS
-const TInt KIconArrayGranularity = 2; // The number of default icons
-_LIT( KLocSuplSettingsIconFileName, "locsuplsettings.mif" );
-
-
-// ========================= MEMBER FUNCTIONS ================================
-
-// ---------------------------------------------------------------------------
-// CLocSUPLServerContainer::CLocSUPLServerContainer
-// Overloaded Constructor
-//
-// ---------------------------------------------------------------------------
-//	
-CLocSUPLServerContainer::CLocSUPLServerContainer( CLocSUPLServerView* aView )
-    : iView( aView )
-	{
-	}
-	
-// ---------------------------------------------------------------------------
-// CLocSUPLServerContainer::~CLocSUPLServerContainer
-// Destructor
-//
-// ---------------------------------------------------------------------------	
-//
-CLocSUPLServerContainer::~CLocSUPLServerContainer()
-	{
-	DEBUG( + CLocSUPLServerContainer::~CLocSUPLServerContainer );	
-	// Delete the List box model only after deleting the list box
-	delete iListBox;
-	iListBox = NULL;
-	
-	delete iListBoxModel;
-	iListBoxModel = NULL;
-	DEBUG( - CLocSUPLServerContainer::~CLocSUPLServerContainer );	
-	}
-	
-// ---------------------------------------------------------------------------
-// CLocSUPLServerContainer* CLocSUPLServerContainer::NewL
-// Static Two phase contructor that instantiates the CLocSUPLServerContainer
-//
-// @param aRect							Client rectangle
-// @param aEngine                       Reference to the SUPL Settings
-//                                      engine 
-// @param aEventHandler                 Reference to the parent view
-// @return CLocSUPLServerContainer*	Reference to the object created
-// ---------------------------------------------------------------------------    
-//
-CLocSUPLServerContainer* CLocSUPLServerContainer::NewL( 
-                    		const TRect&               	aRect,
-                          	CLocSUPLSettingsUiEngine&	aEngine,
-                          	CLocSUPLServerView* 		aView )
-	{	
-	DEBUG( + CLocSUPLServerContainer::NewL );	
-    CLocSUPLServerContainer* self = NewLC( aRect, 
-                                           aEngine,
-                                           aView );
-	CleanupStack::Pop( self );
-	DEBUG( - CLocSUPLServerContainer::NewL );	
-	return self;
-	}
-
-// ---------------------------------------------------------------------------
-// CLocSUPLServerContainer* CLocSUPLServerContainer::NewLC
-// Static Two phase contructor that instantiates the CLocSUPLServerContainer
-//
-// @param aRect							Client rectangle
-// @param aEngine                       Reference to the SUPL Settings
-//                                      engine 
-// @param aEventHandler                 Reference to the parent view
-// @return CLocSUPLServerContainer*	Reference to the object created
-// ---------------------------------------------------------------------------  
-//  
-CLocSUPLServerContainer* CLocSUPLServerContainer::NewLC( 
-                    		const TRect&               	aRect,
-                          	CLocSUPLSettingsUiEngine&	aEngine,
-                          	CLocSUPLServerView* 		aView )
-	{	
-    CLocSUPLServerContainer* self = new ( ELeave ) CLocSUPLServerContainer(
-                                                        aView );
-	CleanupStack::PushL( self );
-	self->ConstructL( aRect, aEngine );
-	return self;
-	}
-
-// --------------------------------------------------------------------------- 
-// void CLocSUPLServerContainer::ConstructL
-// Second phase of the two phase Construction process
-//
-// @param aRect				 Client rectangle
-// @param aEngine            Reference to the SUPL Settings engine
-// ---------------------------------------------------------------------------
-//
-void CLocSUPLServerContainer::ConstructL( 
-                                    const TRect& 	aRect ,
-                                    CLocSUPLSettingsUiEngine&     aEngine )
-	{
-	DEBUG( + CLocSUPLServerContainer::ConstructL );	
-	//Make this control a window-owning control
-	CreateWindowL(); 
-	
-	// Create a New Title for the View
-	MakeTitleL( R_LOC_SUPL_SERVER_DETAIL_TITLE );
-	
-	CreateListboxL( aEngine );
-	
-	// Get the Help context
-	iContextName = KLOC_HLP_SUPL();
-	
-    SetRect( aRect );
-    ActivateL();
-	DEBUG( - CLocSUPLServerContainer::ConstructL );	
-	}	
-
-// ---------------------------------------------------------------------------
-// void CLocSUPLServerContainer::UpdateScreenL
-// Refreshes the screen so that the list box reflects the latest contents
-// ---------------------------------------------------------------------------
-//
-void CLocSUPLServerContainer::UpdateScreenL()
-    {
-	DEBUG( + CLocSUPLServerContainer::UpdateScreenL );	
-	
-	TInt oldCount 	= SlpIds().Count();	
-	TInt64 slpId;
-	if( iSelectedIndex != KErrNotFound && SlpIds().Count() > iSelectedIndex )
-		{
-		slpId = SlpIds()[ iSelectedIndex ];		
-		}
-	
-	if ( iListBoxModel )
-		{
-		iListBoxModel->UpdateSlpIdsL();
-		}    
-		
-    TInt newCount 	= SlpIds().Count();
-    
-    if ( iListBox )
-        {
-    	// Update Listbox items
-        if( newCount <= 0 || newCount == oldCount )
-        	{
-         	TRAP_IGNORE( iListBox->HandleItemAdditionL() );
-	    	TRAP_IGNORE( iListBox->HandleItemRemovalL() );       	
-        	}
-        else if( newCount > oldCount )
-        	{
-        	// notify the listbox for item addition 
-        	TRAP_IGNORE( iListBox->HandleItemAdditionL() );
-
-        	// set focus to newly added item
-			TInt index = iListBox->CurrentItemIndex();	
-			if( index == 0 && newCount == 1 )
-				{
-				iListBox->SetCurrentItemIndex( 0 );	
-				}
-			else
-				{
-				iListBox->SetCurrentItemIndex( newCount - 1 );	
-				}
-        	}
-        else if( newCount < oldCount )
-        	{
-        	// notify the listbox for item deletion 
-	    	TRAP_IGNORE( iListBox->HandleItemRemovalL() );
-			
-        	// set focus at last selected item or index			
-			if( iSelectedIndex > newCount-1 )
-				{
-				iListBox->SetCurrentItemIndex( newCount - 1 );
-				}
-			else
-				{
-				TInt newIndex = SlpIds().Find( slpId );
-				if( newIndex != KErrNotFound )
-					{
-					iListBox->SetCurrentItemIndex( newIndex );
-					}
-				else
-					{
-					iListBox->SetCurrentItemIndex( iSelectedIndex );				
-					}				
-				}
-        	}
-        }
-    DrawDeferred();
-	DEBUG( - CLocSUPLServerContainer::UpdateScreenL );	
-    }
-
-// ---------------------------------------------------------------------------
-// void CLocSUPLServerContainer::HandleResourceChange
-//
-// ---------------------------------------------------------------------------	
-void CLocSUPLServerContainer::HandleResourceChange(TInt aType)
-	{
-	DEBUG( + CLocSUPLServerContainer::HandleResourceChange );	
-	// Pass the event to the base class
-	CCoeControl::HandleResourceChange(aType);
-    switch( aType )
-    	{
-    	// Dynamic Layout switch
-    	case KEikDynamicLayoutVariantSwitch:
-    		{
-    		SetRect( iView->ClientRect() );
-			break;
-    		}
-    	default:
-    		{
-    		break;
-    		}
-    	}
-	DEBUG( - CLocSUPLServerContainer::HandleResourceChange );	
-	}
-
-// -----------------------------------------------------------------------------
-// CLocSUPLServerContainer::GetHelpContext
-//
-// -----------------------------------------------------------------------------
-//
-void CLocSUPLServerContainer::GetHelpContext( TCoeHelpContext& aContext ) const
-    {
-	DEBUG( + CLocSUPLServerContainer::GetHelpContext );	
-    aContext.iContext = iContextName;
-    aContext.iMajor = TUid::Uid( KLOCSUPLSETTINGSUIUID3 );
-	DEBUG( - CLocSUPLServerContainer::GetHelpContext );	
-    }
-    
-// ---------------------------------------------------------------------------
-// TInt CLocSUPLServerContainer::CountComponentControls
-//
-// ---------------------------------------------------------------------------
-TInt CLocSUPLServerContainer::CountComponentControls() const
-	{
-	return 1;
-	}
-
-// ---------------------------------------------------------------------------
-// CCoeControl* CLocSUPLServerContainer::ComponentControl
-//
-// ---------------------------------------------------------------------------
-CCoeControl* CLocSUPLServerContainer::ComponentControl( TInt /*aIndex*/ ) const
-	{
-	return iListBox;	
-	}
-
-// ---------------------------------------------------------------------------
-// void CLocSUPLServerContainer::OfferKeyEventL
-//
-// ---------------------------------------------------------------------------	
-//
-TKeyResponse CLocSUPLServerContainer::OfferKeyEventL( const TKeyEvent& aKeyEvent,
-										   					  TEventCode aType )
-	{
-    if ( ( aType == EEventKey || aType == EEventKeyUp) )
-        {
-        if( aKeyEvent.iCode == EKeyBackspace )
-            {
-            iView->HandleCommandL( ELocSuplServerDelete );            
-            return EKeyWasConsumed;
-            }    
-        }
-    // now it's iListBox's job to process the key event
-    return iListBox->OfferKeyEventL( aKeyEvent, aType ); 
-	}
-	    
-// ---------------------------------------------------------------------------
-// void CLocSUPLServerContainer::HandleListBoxEventL
-//
-// ---------------------------------------------------------------------------
-//
-void CLocSUPLServerContainer::HandleListBoxEventL( CEikListBox*  /* aListBox */, 
-		 						   					 TListBoxEvent aEventType )
-	{
-	DEBUG( + CLocSUPLServerContainer::HandleListBoxEventL );	
-	switch ( aEventType )
-        {
-        // List box Item Selection
-        case EEventEnterKeyPressed:
-        case EEventItemSingleClicked:
-            {
-            if(iListBox->SelectionIndexes()->Count() > 0)
-                {
-                ShowContextMenuL();
-                }
-            else
-                {
-                iView->HandleCommandL(ELocSuplServerOpen);
-                }
-			break;	
-			}
-        default:
-           break;
-        }
-	DEBUG( - CLocSUPLServerContainer::HandleListBoxEventL );	
-	}
-	         		 	
-// ---------------------------------------------------------------------------
-// void CLocSUPLServerContainer::FocusChanged
-//
-// ---------------------------------------------------------------------------
-//
-void CLocSUPLServerContainer::FocusChanged( TDrawNow aDrawNow )
-	{
-	CCoeControl::FocusChanged( aDrawNow );
-	// The focus event has to be explicitly handed over to all the compound
-	// controls since CCoeControl does not do that implicitly
-	if ( iListBox )
-		{
-		iListBox->SetFocus( IsFocused(), aDrawNow );				
-		}
-	}
-		
-// ---------------------------------------------------------------------------
-// CLocSUPLServerContainer::SizeChanged
-// 
-// ---------------------------------------------------------------------------
-//
-void CLocSUPLServerContainer::SizeChanged()
-	{
-	if ( iListBox )
-		{
-		iListBox->SetRect( Rect() );
-		}
-	}
-	
-// ---------------------------------------------------------------------------
-// void CLocSUPLServerContainer::MakeTitleL
-// Sets the Title text
-//
-// @param aResourceText Resource to create title
-// ---------------------------------------------------------------------------
-//
-void CLocSUPLServerContainer::MakeTitleL( TInt aResourceText )
-	{
-	DEBUG( + CLocSUPLServerContainer::MakeTitleL );	
-	// Obtain the title from the Status Pane
-	CAknTitlePane* title = static_cast < CAknTitlePane* >( StatusPane()->
-        ControlL( TUid::Uid( EEikStatusPaneUidTitle ) ) );
-       
-    // Set the Title's buffer    
-    HBufC* buf = StringLoader::LoadL( aResourceText );
-    title->SetText( buf ); // Takes ownership of buf
-	DEBUG( - CLocSUPLServerContainer::MakeTitleL );	
-	}
-
-// ---------------------------------------------------------------------------
-// void CLocSUPLServerContainer::StatusPane
-// Returns the Appui's status pane
-//
-// @return CEikStatusPane* Statuspane pointer
-// ---------------------------------------------------------------------------
-//
-CEikStatusPane* CLocSUPLServerContainer::StatusPane()
-	{
-	return iEikonEnv->AppUiFactory()->StatusPane();	
-	}
-
-// ---------------------------------------------------------------------------
-// void CLocSUPLServerContainer::CreateListboxL
-// Creates the List box and the Listbox model. Associates the list box model 
-// with the list box
-//
-// @param aEngine                       Reference to the SUPL Settings
-//                                      engine 
-// ---------------------------------------------------------------------------	
-//
-void CLocSUPLServerContainer::CreateListboxL( 
-                                    CLocSUPLSettingsUiEngine&     aEngine )
-	{
-	DEBUG( + CLocSUPLServerContainer::CreateListboxL );	
-	// Create the Listbox model
-    iListBoxModel = CLocSUPLServerLBModel::NewL( aEngine );
-	
-	// CAknSingleNumberStyleListBox "2\tTextLabel\t0\t1"
-	
-    iListBox = new ( ELeave ) CAknSingleNumberStyleListBox;
-	iListBox->ConstructL( 
-						this, 
-						#ifdef RD_SCALABLE_UI_V2
-						EAknListBoxStylusMarkableList
-						#else
-						EAknListBoxMarkableList
-						#endif //RD_SCALABLE_UI_V2
-						);
-    // Set the container control.
-	iListBox->SetContainerWindowL( *this );
-    // Add scrollbars to listbox
-	iListBox->CreateScrollBarFrameL( ETrue );
-	iListBox->ScrollBarFrame()->SetScrollBarVisibilityL( CEikScrollBarFrame::EOff,
-														 CEikScrollBarFrame::EAuto );
-    // Icon array, needed only if listbox style is single number with graphic.
-    CAknIconArray* icons = new( ELeave ) CAknIconArray( KIconArrayGranularity );
-    CleanupStack::PushL( icons );
-
-    TFileName avkonIconFile = AknIconUtils::AvkonIconFileName();
-	
-    TRAP_IGNORE( AddIconL(   *icons, 
-                avkonIconFile,
-                KAknsIIDQgnIndiMarkedAdd, 
-                EMbmAvkonQgn_indi_marked_add, 
-                EMbmAvkonQgn_indi_marked_add_mask ) );
- 	
-	TFileName *iconFile = IconFileNameLC();
-    
-    TRAP_IGNORE( AddIconL(   *icons, 
-                *iconFile,
-                KAknsIIDQgnPropRadiobuttOff, 
-                EMbmLocsuplsettingsQgn_loc_server_disabled, 
-                EMbmLocsuplsettingsQgn_loc_server_disabled_mask ) );
- 	
- 	CleanupStack::PopAndDestroy( iconFile );
-	
-    iListBox->ItemDrawer()->ColumnData()->SetIconArray( icons );
-    CleanupStack::Pop( icons );        
-    
-    // Set the model & observer
-    iListBox->SetListBoxObserver( this  );
-
-    iListBox->Model()->SetItemTextArray( iListBoxModel );
-    iListBox->Model()->SetOwnershipType( ELbmDoesNotOwnItemArray );									
-    iListBox->ActivateL();   
-	DEBUG( - CLocSUPLServerContainer::CreateListboxL );	
-	}
-
-// -----------------------------------------------------------------------------
-// CLocSUPLServerContainer::AddIconL
-// -----------------------------------------------------------------------------
-void CLocSUPLServerContainer::AddIconL( CAknIconArray&  aIcons,
-                                           const TDesC&    aIconFileWithPath,
-                                           TAknsItemID     aSkinID,
-                                           TInt            aIconGraphicsIndex,
-                                           TInt            aIconGraphicsMaskIndex )
-    {
-	DEBUG( + CLocSUPLServerContainer::AddIconL );	
-    MAknsSkinInstance* skin = AknsUtils::SkinInstance();
-  
-    CFbsBitmap* bitmap = NULL;
-    CFbsBitmap* bitmapMask = NULL;
-    
-    TRAPD( err, AknsUtils::CreateIconL( skin,
-                            aSkinID,
-                            bitmap,
-                            bitmapMask,
-                            aIconFileWithPath,
-                            aIconGraphicsIndex,
-                            aIconGraphicsMaskIndex ) );
-
-    if(err != KErrNone)
-        {
-        TRAP( err, AknIconUtils::CreateIconL( bitmap,
-                                bitmapMask,
-                                aIconFileWithPath,
-                                aIconGraphicsIndex,
-                                aIconGraphicsMaskIndex ) );
-        }
-    User::LeaveIfError( err );
-    
-    CleanupStack::PushL( bitmap );
-    CleanupStack::PushL( bitmapMask );
-    
-    CGulIcon* icon = CGulIcon::NewL( bitmap, bitmapMask );
-    
-    // Remove the Bitmap and the Bitmap Icon from the Clean up stack since 
-    // the ownership is taken over by the icon
-    CleanupStack::Pop( bitmapMask );
-    CleanupStack::Pop( bitmap ); 
-    
-    CleanupStack::PushL( icon );
-    aIcons.AppendL( icon );
-    CleanupStack::Pop( icon ); // icon
-	DEBUG( - CLocSUPLServerContainer::AddIconL );	
-    }
-
-// -----------------------------------------------------------------------------
-// CLocSUPLServerContainer::IconFileNameLC
-// -----------------------------------------------------------------------------
-TFileName* CLocSUPLServerContainer::IconFileNameLC() const
-    {
-    TFileName* fileName = new(ELeave) TFileName;
-    CleanupStack::PushL( fileName );
-    
-	TFileName* tmpName = new(ELeave) TFileName;
-    CleanupStack::PushL( tmpName );
-	
-    tmpName->Append( KDC_BITMAP_DIR );
-    tmpName->Append( KLocSuplSettingsIconFileName );
-
-    CEikAppUi *appUi = ( CEikAppUi *)( CEikonEnv::Static()->AppUi());
-    TFileName appDrive = appUi->Application()->AppFullName();
-    
-    TParse parse;
-    User::LeaveIfError( parse.Set( appDrive, NULL, NULL ) );
-    User::LeaveIfError( parse.Set( parse.Drive(), tmpName, NULL ) );
-    
-	fileName->Copy(parse.FullName());
-
-    CleanupStack::PopAndDestroy( tmpName );
-
-    return fileName;
-    }    
-  
-// ----------------------------------------------------------------------------
-// CLocSUPLServerContainer::ListBoxL()
-// ----------------------------------------------------------------------------
-//
-CEikListBox& CLocSUPLServerContainer::ListBoxL()
-    {
-    User::LeaveIfNull( iListBox );
-    return *iListBox;
-    }
-
-// -----------------------------------------------------------------------------
-// TInt CLocSUPLServerContainer::SelectedItemIndex
-// Returns the Selected element. The list box model defines the enumeration that
-// would determine the current element that has been selected
-//
-// @return TInt Index of the item selected
-// -----------------------------------------------------------------------------
-//
-TInt CLocSUPLServerContainer::SelectedItemIndex()
-    {
-    return iListBox->CurrentItemIndex();
-    }
-			       
-// ----------------------------------------------------------------------------
-// CLocSUPLServerContainer::CurrentSlpId()
-// ----------------------------------------------------------------------------
-//
-TInt64 CLocSUPLServerContainer::CurrentSlpId()
-	{
-	if( SelectedItemIndex() != KErrNotFound && SelectedItemIndex() < ServerCount() )
-		return iListBoxModel->SlpIds()[ SelectedItemIndex() ];
-	else
-		return KErrNotFound;
-	}
-
-// ----------------------------------------------------------------------------
-// CLocSUPLServerContainer::SelectedCount()
-// ----------------------------------------------------------------------------
-//
-TInt CLocSUPLServerContainer::SelectedCount()
-	{
-	return iListBox->SelectionIndexes()->Count();
-	}
-
-// ----------------------------------------------------------------------------
-// CLocSUPLServerContainer::SelectedCount()
-// ----------------------------------------------------------------------------
-//
-TInt CLocSUPLServerContainer::ServerCount()
-	{
-	return iListBox->Model()->NumberOfItems();
-	}
-
-// ---------------------------------------------------------------------------
-// CLocSUPLServerContainer::SlpIds()
-// returns server id array
-//
-// ---------------------------------------------------------------------------
-//  
-RArray<TInt64>& CLocSUPLServerContainer::SlpIds()
-	{
-	return iListBoxModel->SlpIds();
-	}
-
-// ---------------------------------------------------------------------------
-// CLocSUPLServerContainer::SetIndex()
-// sets the current selected item
-//
-// ---------------------------------------------------------------------------
-//  
-void CLocSUPLServerContainer::SetSelectedIndex()
-	{
-	iSelectedIndex = SelectedItemIndex();
-	}
-
-// -----------------------------------------------------------------------------
-// CLocSUPLServerContainer::ShowContextMenuL
-// -----------------------------------------------------------------------------
-//
-void CLocSUPLServerContainer::ShowContextMenuL()
-    {
-	DEBUG( + CLocSUPLServerContainer::ShowContextMenuL );	
-	
-	// Switch to Context specific options menu,
-	// Show it and switch back to main options menu.
-	CEikMenuBar* menuBar = iView->MenuBar();
-	// TRAP displaying of menu bar.
-	// If it fails, the correct resource is set back before leave.
-	TRAPD( err, menuBar->TryDisplayContextMenuBarL() );
-	User::LeaveIfError( err );
-	
-	DEBUG( - CLocSUPLServerContainer::ShowContextMenuL );	
-    }
-// -----------------------------------------------------------------------------
-// CLocSUPLServerContainer::HandlePointerEventL
-// -----------------------------------------------------------------------------
-//
-void CLocSUPLServerContainer::HandlePointerEventL(const TPointerEvent& aPointerEvent)
-    {
-    CCoeControl::HandlePointerEventL( aPointerEvent ); 
-    if(aPointerEvent.iType == TPointerEvent::EButton1Down && iListBox->Model()->NumberOfItems() == 0)
-        {
-        ShowContextMenuL();
-        }
-    }
-
-// End of file
--- a/locationsystemui/locationsysui/locsuplsettingsui/src/locsuplservereditor.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1207 +0,0 @@
-/*
-* Copyright (c) 2008 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:  Implements the CLocSUPLServerEditor class
-*
-*/
-
-
-
-#include <aknappui.h>
-#include <AknIconArray.h>       // Icon Array
-#include <aknlocationed.h>
-#include <aknlistquerydialog.h>
-#include <AknPopupFieldText.h> 
-#include <aknnotewrappers.h>
-#include <AknsUtils.h>
-#include <AknsSkinInstance.h>
-#include <aknselectionlist.h>
-#include <akntitle.h>       	// CAknTitlePane
-#include <AknWaitDialog.h> 
-#include <aknuniteditor.h> 
-#include <avkon.rsg>
-#include <avkon.hrh>
-#include <e32math.h>
-#include <eikapp.h>
-#include <eikaufty.h>
-#include <eikcapc.h>
-#include <eikedwin.h>
-#include <eikenv.h>
-#include <eikmenup.h>
-#include <eikmenub.h>
-#include <eikserverapp.h>
-#include <eikspane.h>       	// Status pane
-#include <barsread.h>           // For TResourceReader
-#include <bautils.h> 
-#include <data_caging_path_literals.hrh>
-#include <gulicon.h>            // Gul Icon
-#include <StringLoader.h>
-#include <hlplch.h> 
-
-#include <epos_csuplsettingsconstants.h>
-#include <epos_csuplsettingparams.h>
-
-#include <locsuplsettingsui.rsg>
-#include "locsuplsettings.hrh"
-#include "locsuplservereditor.h"
-#include "locsuplsettingsuiengine.h"
-#include "locsupldebug.h"
-
-// ============================ LOCAL FUNCTIONS ===============================
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// CLocSUPLServerEditor::CLocSUPLServerEditor()
-// -----------------------------------------------------------------------------
-//
-CLocSUPLServerEditor::CLocSUPLServerEditor( 
-        					TBool aIsEditable,
-                            CLocSUPLSettingsUiEngine&       aEngine,
-        					TInt64 aSlpId
-		):iIsEditMode( aIsEditable ), iEngine( aEngine ), iSlpId( aSlpId )
-    {
-    if( aIsEditable )
-    	{
-    	iIsNewServer = ETrue;
-    	iSlpId = NULL;
-    	}    	
-    }
-
-// -----------------------------------------------------------------------------
-// CLocSUPLServerEditor::ConstructL()
-// -----------------------------------------------------------------------------
-//
-void CLocSUPLServerEditor::ConstructL()
-    {
-	DEBUG( + CLocSUPLServerEditor::ConstructL );
-    CAknForm::ConstructL( R_SUPLSERVER_EDITOR_MENU_BAR );
-
-    // Save original title
-    CEikStatusPane* statusPane = iAvkonAppUi->StatusPane();
-    iTitlePane = ( CAknTitlePane* ) statusPane->ControlL(
-        TUid::Uid( EEikStatusPaneUidTitle ) );
-    iOriginalTitle = iTitlePane->Text()->AllocL();
-    
-    // Allocate memory for Server address buffer & Access point buffer
-	iServerAddress = HBufC16::NewL( KMaxHSLPAddrLen ); 
-	iIap = HBufC16::NewL( KMaxIAPLen );   
-	
-	DEBUG( - CLocSUPLServerEditor::ConstructL );
-    }
-
-// -----------------------------------------------------------------------------
-// CLocSUPLServerEditor::NewL()
-// -----------------------------------------------------------------------------
-//
-CLocSUPLServerEditor* CLocSUPLServerEditor::NewL( 
-        					TBool aIsEditable,
-                            CLocSUPLSettingsUiEngine&       aEngine,
-        					TInt64 aSlpId
-		)
-	{	
-    CLocSUPLServerEditor* self = NewLC( aIsEditable, aEngine, aSlpId );
-	CleanupStack::Pop( self );
-	return self;
-	}
-
-// -----------------------------------------------------------------------------
-// CLocSUPLServerEditor::NewLC()
-// -----------------------------------------------------------------------------
-//
-CLocSUPLServerEditor* CLocSUPLServerEditor::NewLC( 
-        					TBool aIsEditable,
-                            CLocSUPLSettingsUiEngine&       aEngine,
-        					TInt64 aSlpId
-		)
-    {
-    CLocSUPLServerEditor* self = new ( ELeave ) 
-    			CLocSUPLServerEditor( aIsEditable, aEngine, aSlpId );
-    CleanupStack::PushL( self );
-    self->ConstructL();
-    return self;
-    }
-
-// -----------------------------------------------------------------------------
-// CLocSUPLServerEditor::~CLocSUPLServerEditor()
-// -----------------------------------------------------------------------------
-//
-CLocSUPLServerEditor::~CLocSUPLServerEditor()
-    {
-	DEBUG( + CLocSUPLServerEditor::~CLocSUPLServerEditor );
-    // Restore title pane. Ownership of iTitlePane transferred.
-    if ( iTitlePane && iOriginalTitle )
-        {
-        iTitlePane->SetText( iOriginalTitle );
-        }
-	delete iServerAddress;	
-	iServerAddress = NULL;
-	
-	delete iIap;
-	iIap = NULL;
-	DEBUG( - CLocSUPLServerEditor::~CLocSUPLServerEditor );	
-    }
-
-// -----------------------------------------------------------------------------
-// CLocSUPLServerEditor::DynInitMenuPaneL()
-// -----------------------------------------------------------------------------
-//
-void CLocSUPLServerEditor::DynInitMenuPaneL(
-    TInt aResourceId,
-    CEikMenuPane* aMenuPane )
-    {
-	DEBUG( + CLocSUPLServerEditor::DynInitMenuPaneL );
-    CAknForm::DynInitMenuPaneL( aResourceId, aMenuPane );
-
-    if ( aResourceId == R_AVKON_FORM_MENUPANE )
-        {
-        // We do not want to allow the user to modify our Form therefore
-        // Disable the Label, Add, Delete, and Save Field
-        aMenuPane->SetItemDimmed( EAknFormCmdLabel, ETrue );
-        aMenuPane->SetItemDimmed( EAknFormCmdAdd, 	ETrue );
-		aMenuPane->SetItemDimmed( EAknFormCmdDelete,ETrue );
-        aMenuPane->SetItemDimmed( EAknFormCmdSave, 	ETrue );
-		
-        if( IsEditable() )
-	        {
-        	aMenuPane->SetItemDimmed( EAknFormCmdEdit, 			ETrue );
-        	aMenuPane->SetItemDimmed( ELocServerEditorDisable, 	ETrue );
-        	aMenuPane->SetItemDimmed( ELocServerEditorEnable, 	ETrue );	        
-       		aMenuPane->SetItemDimmed( ELocServerEditorDelete, 	ETrue );		       			    	
-        				
-			switch( IdOfFocusControl() )
-				{
-				case ELocSuplServerIdServerAddr:
-					{
-					aMenuPane->SetItemDimmed( ELocServerEditorDefine, 	ETrue );
-		       		aMenuPane->SetItemDimmed( ELocServerEditorChange, 	ETrue );   
-					break;
-					}
-				case ELocSuplServerIdAccessPoint:
-					{
-			       	TInt isIapChanged = EFalse;
-			        CEikEdwin* apSelector = 
-			        			static_cast < CEikEdwin* > ( ControlOrNull( IdOfFocusControl() ) );           
-			        if( apSelector )
-			            {  
-			            if( iIap->Length() > 0 ) 
-			            	isIapChanged = ETrue;
-			            } 
-			            
-			       	if( isIapChanged )
-			       		{
-			       		aMenuPane->SetItemDimmed( ELocServerEditorDefine, 	ETrue );
-			       		}
-			       	else
-			       		{
-			       		aMenuPane->SetItemDimmed( ELocServerEditorChange, 	ETrue );		       		
-			       		}				
-					break;
-					}
-				case ELocSuplServerIdUsageInHomeNw:
-					{
-					aMenuPane->SetItemDimmed( ELocServerEditorDefine, 		ETrue );
-					
-		        	TBool editableFlag = ETrue;
-		        	if( iSlpId )
-		        		TRAP_IGNORE( iEngine.GetEditableFlagL( iSlpId, editableFlag ) );        				        	
-		        	if( editableFlag == EFalse )					
-						aMenuPane->SetItemDimmed( ELocServerEditorChange, 	ETrue );
-		        	
-					break;
-					}
-				default:
-					break;
-				}			
-	        }
-	    else
-	    	{
-			TBool enabledFlag;    
-			TRAP_IGNORE( iEngine.GetServerEnabledFlagL( iSlpId, enabledFlag ) );
-			
-			if( enabledFlag )
-				aMenuPane->SetItemDimmed( ELocServerEditorEnable, ETrue );
-			else
-				aMenuPane->SetItemDimmed( ELocServerEditorDisable, ETrue );
-			
-			
-        	TBool editableFlag = ETrue;
-        	if( iSlpId )
-        		TRAP_IGNORE( iEngine.GetEditableFlagL( iSlpId, editableFlag ) );        				        	
-        	if( editableFlag == EFalse )					
-        		{
-				switch( IdOfFocusControl() )
-					{
-					case ELocSuplServerIdServerAddr:
-					case ELocSuplServerIdUsageInHomeNw:
-						{
-						aMenuPane->SetItemDimmed( EAknFormCmdEdit, 	ETrue );
-						break;					
-						}
-					default:
-						break;
-					}        		
-        		}
-
-			aMenuPane->SetItemDimmed( ELocServerEditorDefine, 	ETrue );
-       		aMenuPane->SetItemDimmed( ELocServerEditorChange, 	ETrue );		       			    	
-       		aMenuPane->SetItemDimmed( ELocServerEditorRemove, 	ETrue );		       			    	
-	    	}	        
-        }
-	DEBUG( - CLocSUPLServerEditor::DynInitMenuPaneL );
-    }
-
-// -----------------------------------------------------------------------------
-// CLocSUPLServerEditor::ProcessCommandL()
-// -----------------------------------------------------------------------------
-//
-void CLocSUPLServerEditor::ProcessCommandL( TInt aCommandId )
-	{
-	DEBUG1( + CLocSUPLServerEditor::ProcessCommandL aCommandId=%d, aCommandId );
-	CAknForm::ProcessCommandL( aCommandId );
-
-    switch (aCommandId)
-        {
-        case EAknFormCmdEdit:
-            {
-            iIsEditMode = ETrue;
-            SetCursorToEndL();
-            HandleMSKCaptionL();
-            break;
-            }
-        case ELocServerEditorDelete:
-        case ELocServerEditorRemove:
-            {
-            if (DeleteConfirmationQueryL())
-                {
-                TRAP_IGNORE( iEngine.RemoveServerL( iSlpId ) );
-                // Return back to server view
-                TryExitL(EAknSoftkeyBack);
-                }
-            break;
-            }
-        case ELocServerEditorDisable:
-            {
-            TRAP_IGNORE( iEngine.SetServerEnabledFlagL( iSlpId, EFalse ) );
-            break;
-            }
-        case ELocServerEditorEnable:
-            {
-            TRAP_IGNORE( iEngine.SetServerEnabledFlagL( iSlpId, ETrue ) );
-            break;
-            }
-        case ELocServerEditorDefine:
-            {
-            TRAP_IGNORE( iEngine.LaunchApConfiguratorL( iSlpId, this ) );
-            break;
-            }
-        case ELocServerEditorChange:
-        case ELocServerEditorMSKChange:
-            {
-            CEikEdwin* usageInHomeNWPopupFieldText = (CEikEdwin*) Control(
-                    ELocSuplServerIdUsageInHomeNw);
-            if (IdOfFocusControl() == ELocSuplServerIdAccessPoint)
-                {
-                TRAP_IGNORE( iEngine.LaunchApConfiguratorL( iSlpId, this ) );
-                }
-            else
-                {
-                if (iIsNewServer)
-                    {
-                    TBuf<KMaxUsageTextSize> des;
-                    usageInHomeNWPopupFieldText->GetText(des);
-                    if (!des.Compare(KNoUsageInHomeNetork))
-                        {
-                        SetUsageinHomeNetwork(ETrue);
-                        }
-                    else
-                        {
-                        SetUsageinHomeNetwork(EFalse);
-                        }
-                    }
-                else
-                    {
-                    TBool editableFlag;
-                    TRAP_IGNORE( iEngine.GetEditableFlagL( iSlpId, editableFlag ) );
-                    if (editableFlag)
-                        {
-                        TBuf<KMaxUsageTextSize> des;
-                        usageInHomeNWPopupFieldText->GetText(des);
-                        if (!des.Compare(KNoUsageInHomeNetork))
-                            {
-                            SetUsageinHomeNetwork(ETrue);
-                            }
-                        else
-                            {
-                            SetUsageinHomeNetwork(EFalse);
-                            }
-                        }
-                    }
-                }
-            break;
-            }
-        case EAknCmdHelp:
-            {
-            HlpLauncher::LaunchHelpApplicationL(iCoeEnv->WsSession(),
-                    iAvkonAppUi->AppHelpContextL());
-            break;
-            }
-        case EEikCmdExit:
-            {
-            // The Exit is handled by the Application UI
-            TryExitL(EEikCmdExit);
-            break;
-            }
-        default:
-            break;
-        }DEBUG( - CLocSUPLServerEditor::ProcessCommandL );
-    }
-
-// ---------------------------------------------------------------------------
-// Derived from CEikDialog
-// ---------------------------------------------------------------------------
-
-// -----------------------------------------------------------------------------
-// CLocSUPLServerEditor::OfferKeyEventL
-// Receives and handles key events
-// -----------------------------------------------------------------------------
-//
-TKeyResponse CLocSUPLServerEditor::OfferKeyEventL( const TKeyEvent& aKeyEvent,
-                                             TEventCode aType )
-    {
-	DEBUG( CLocSUPLServerEditor::OfferKeyEventL );
-	if ( aType == EEventKey )
-		{
-		if( aKeyEvent.iCode == EKeyBackspace && IsEditable() == EFalse )		
-            {
-        	ProcessCommandL( ELocServerEditorDelete );            	
-        	return EKeyWasConsumed;
-            }      
-             
-        if( !iIsNewServer && IsEditable() )
-        	{
-        	// check if current opened server is editable
-        	// if its not editable then return with no action on it.			
-        	TBool editableFlag = ETrue;
-        	if( iSlpId )
-        		TRAP_IGNORE( iEngine.GetEditableFlagL( iSlpId, editableFlag ) );        		
-        	
-        	if( editableFlag == EFalse )
-        		{
-				if( ( aKeyEvent.iScanCode != EStdKeyUpArrow || aKeyEvent.iScanCode != EStdKeyDownArrow ) 
-					== EFalse )       		
-					{
-					switch( IdOfFocusControl() )
-						{
-						case ELocSuplServerIdServerAddr:						
-						case ELocSuplServerIdUsageInHomeNw:
-							{
-							return EKeyWasConsumed;
-							}						
-						default:
-							break;
-						}
-					}
-        		}
-        	}
-
-		if ( aKeyEvent.iCode == EKeyEnter || aKeyEvent.iScanCode == EStdKeyEnter ) 
-			{
-		    if ( !( IsEditable() && IdOfFocusControl() == ELocSuplServerIdServerAddr ) )
-		    	{
-				TKeyEvent enterKeyEvent( aKeyEvent );
-				enterKeyEvent.iCode = EKeyOK;
-				CEikButtonGroupContainer* cba = CEikButtonGroupContainer::Current();
-				return cba->OfferKeyEventL( enterKeyEvent, aType );	    	
-		    	}
-			}         
-		}
-    TKeyResponse response= CAknForm::OfferKeyEventL( aKeyEvent, aType );    
-    return response;   
-    }
-    
-// ---------------------------------------------------------------------------
-// CLocSUPLServerEditor ::OkToExitL()
-// ---------------------------------------------------------------------------
-//
-TBool CLocSUPLServerEditor::OkToExitL( TInt aButtonId )
-    {
-	DEBUG1( + CLocSUPLServerEditor::OkToExitL aButtonId=%d, aButtonId );
-    TBool retVal = ETrue;
-    	
-    switch( aButtonId )
-        {
-        case EAknFormCmdEdit: // when MSK is pressed
-            {
-            //Handle MSK operation based on focused line.            
-		    if( IsEditable() == EFalse )
-			    {
-            	ProcessCommandL( EAknFormCmdEdit ); 
-            	HandleMSKCaptionL();				
-				}				
-            //dont close editor            
-            retVal = EFalse;
-            break;
-            }
-        case ELocServerEditorNoCmd:
-        	{
-            //dont close editor            
-            retVal = EFalse;
-        	break;
-        	}
-        case ELocServerEditorMSKDefine:
-        	{
-        	TRAP_IGNORE( iEngine.LaunchApConfiguratorL( iSlpId, this ) );
-            //dont close editor            
-            retVal = EFalse;
-        	break;
-        	}
-        case ELocServerEditorMSKChange:
-        	{
-        	ProcessCommandL( ELocServerEditorMSKChange );
-            //dont close editor            
-            retVal = EFalse;
-        	break;
-        	}
-        case EAknSoftkeyOptions: //when LSK is pressed
-            {
-            //display menu specific to editor
-            DisplayMenuL();
-            //don't close editor
-            retVal = EFalse;
-            break;
-            }            
-        case EAknSoftkeyBack: 
-        	{
-        	break;
-        	}
-        case EAknSoftkeyDone: // when RSK is pressed in edit mode
-            {
-			if( SaveFormDataL() )
-				{
-            	if( iIsNewServer ) 
-            		{
-            		TRAPD( err, iEngine.AddNewServerL(
-            								iServerAddress->Des(),
-            								iIap->Des(),
-            								iUsageInHomeNw ) );
-            		if( err == KErrNone )
-            			{
-            			iIsNewServer = EFalse;	
-            			}
-            		else if( err == KErrAlreadyExists ) 
-            			{
-            			ShowServerValidationInfoNoteL( R_LOC_SERVER_ALREADY_EXIST_INFO_NOTE );
-						iIsEditMode = ETrue;
-					    SetEditableL( iIsEditMode );
-					    SetInitialCurrentLine();	            			
-						SetCursorToEndL();
-			            //dont close editor            
-			            retVal = EFalse;	            		
-            			}
-            		else if( err == KErrArgument )
-	            		{
-	            		ShowServerValidationInfoNoteL( R_LOC_SERVER_INFO_NOTE );
-						iIsEditMode = ETrue;
-			    		SetEditableL( iIsEditMode );					
-						SetInitialCurrentLine();								
-						SetCursorToEndL();
-	            		//dont close editor            
-	            		retVal = EFalse;	
-	            		}
-            		}
-            	else
-            		{ // save the existing slp entry info
-            		if( iSlpId )
-            			{
-            			TRAPD( err, iEngine.SetServerAddressL( 
-            							iSlpId, iServerAddress->Des() ) );
-            			if( err == KErrNone )
-            				{
-            				if( iIap->Length() > 0 )
-		           				iEngine.SetIapNameL( iSlpId, iIap->Des() );	            			
-	            			iEngine.SetUsageInHomwNwFlagL( iSlpId, iUsageInHomeNw );  
-	            			          				
-		 					iIsEditMode = EFalse;
-						    SetEditableL( iIsEditMode );						    
-           					}
-            			else if( err == KErrAlreadyExists )
-            				{
-	            			ShowServerValidationInfoNoteL( R_LOC_SERVER_ALREADY_EXIST_INFO_NOTE );
-							iIsEditMode = ETrue;
-						    SetEditableL( iIsEditMode );
-						    SetInitialCurrentLine();	            			
-							SetCursorToEndL();
-            				}
-            			else if( err == KErrArgument )
-            			    {
-            			    ShowServerValidationInfoNoteL( R_LOC_SERVER_INFO_NOTE );
-            			    iIsEditMode = ETrue;
-            			    SetEditableL( iIsEditMode );                    
-            			    SetInitialCurrentLine();                                
-            			    SetCursorToEndL();
-            			    //dont close editor            
-            			    retVal = EFalse;    
-            			    }
-            			}
-	            	HandleMSKCaptionL();
-		            //dont close editor            
-		            retVal = EFalse;	            		
-            		}
-				}
-			else
-				{
-				//if control's state is changed and manadatory contain is not added then show the popup message
-				if( iIsModified )
-				    {
-				    ShowServerValidationInfoNoteL( R_LOC_SERVER_INFO_NOTE );
-				    iIsEditMode = ETrue;
-                    SetEditableL( iIsEditMode );                    
-                    SetInitialCurrentLine();                                
-                    SetCursorToEndL();
-                    //dont close editor            
-                    retVal = EFalse;       
-				    }
-				else
-				    {
-				    retVal = ETrue;
-				    }			         						
-				}				
-			break;
-            }
-        default: // close editor in all other cases
-            {
-            break;
-            }
-        }
-	DEBUG1( - CLocSUPLServerEditor::OkToExitL retVal=%d, retVal );
-    return retVal;
-    }
-    
-// -----------------------------------------------------------------------------
-// CLocSUPLServerEditor::SaveFormDataL()
-// Deals with the occasion of a change from edit->view mode and the user wishes 
-// to save the changes.
-// -----------------------------------------------------------------------------
-//
-TBool CLocSUPLServerEditor::SaveFormDataL()
-    {
-	DEBUG( + CLocSUPLServerEditor::SaveFormDataL );
-    TBool retVal = EFalse;
-    
-    //Retrieve server address text 
-    CEikEdwin* serverAddress = 
-    		static_cast < CEikEdwin* > ( ControlOrNull( ELocSuplServerIdServerAddr ) );            
-    if( serverAddress )
-        {                       
-        HBufC* address = serverAddress->GetTextInHBufL();
-        if( address )
-            {            
-            iServerAddress->Des().Copy( address->Des() );
-            }
-        else
-        	iServerAddress->Des().Copy( KNullDesC );
-        delete address;
-        }
-
-    //Retrieve Access Point 
-    CEikEdwin* accessPoint = 
-    		static_cast < CEikEdwin* > ( ControlOrNull( ELocSuplServerIdAccessPoint ) );            
-    if( accessPoint )
-        {                       
-        HBufC* apText = accessPoint->GetTextInHBufL();
-        if( apText )
-            {
-            iIap->Des().Copy( apText->Des() );
-            }
-        delete apText;
-
-        HBufC* apString = StringLoader::LoadL( R_LOC_SERVER_NONE ); 
-        if( apString->Compare( iIap->Des() ) == 0 ) 
-        	{
-        	iIap->Des().Copy( KNullDesC );
-        	}
-        delete apString;
-        }
-
-    //Retrieve Usage In Home Nw Field value
-    CEikEdwin* usageInHomeNWPopupFieldText = (CEikEdwin*) Control(
-            ELocSuplServerIdUsageInHomeNw);
-    if (usageInHomeNWPopupFieldText)
-        {
-        TBuf<KMaxUsageTextSize> des;
-        usageInHomeNWPopupFieldText->GetText(des);
-        if (!des.Compare(KNoUsageInHomeNetork))
-            {
-            iUsageInHomeNw = ETrue;
-            }
-        else
-            {
-            iUsageInHomeNw = EFalse;
-            }
-        }
-
-    if( iServerAddress->Length() > 0 )
-    	{
-    	retVal = ETrue;
-    	}       	       	    
-    	
-	DEBUG( - CLocSUPLServerEditor::SaveFormDataL );
-    return retVal;
-    }
-
-// -----------------------------------------------------------------------------
-// LocSUPLServerEditor::PreLayoutDynInitL()
-// Initialises the dialog's controls before the dialog is sized and layed out.
-// -----------------------------------------------------------------------------
-//
-void CLocSUPLServerEditor::PreLayoutDynInitL()
-    {    
-	DEBUG( + CLocSUPLServerEditor::PreLayoutDynInitL );
-    CAknForm::PreLayoutDynInitL();
-    
-	DEBUG( - CLocSUPLServerEditor::PreLayoutDynInitL );
-    }
-
-// -----------------------------------------------------------------------------
-// CLocSUPLServerEditor::PostLayoutDynInitL
-// Initialises the dialog's controls after the dialog
-// has been sized but before it has been activated.
-// -----------------------------------------------------------------------------
-//
-void CLocSUPLServerEditor::PostLayoutDynInitL()
-    {
-	DEBUG( + CLocSUPLServerEditor::PostLayoutDynInitL );
-    CAknForm::PostLayoutDynInitL();
-    SetEditableL( iIsEditMode );
-    LoadFormValuesFromDataL();    
-
-    CEikButtonGroupContainer* cba = CEikButtonGroupContainer::Current();
-    CleanupStack::PushL( cba );
-    if( IsEditable() )
-    	{
-		cba->SetCommandSetL( R_SUPLSERVER_EDITOR_OPTIONS_NOMSK_DONE );
-    	}
-    else
-    	{
-    	TBool editableFlag = ETrue;   	
-    	if( iSlpId )
-    		TRAP_IGNORE( iEngine.GetEditableFlagL( iSlpId, editableFlag ) );        		    		
-    	    	
-       	if( editableFlag )
-       	    cba->SetCommandSetL( R_SUPLSERVER_EDITOR_OPTIONS_EDIT_BACK );
-       	else
-       		cba->SetCommandSetL( R_SUPLSERVER_EDITOR_OPTIONS_NOMSK_BACK );	
-    	}
-	CleanupStack::Pop( cba );			    	
-	
-	DEBUG( - CLocSUPLServerEditor::PostLayoutDynInitL );
-    }
-    
-// -----------------------------------------------------------------------------
-// CLocSUPLServerEditor::LineChangedL()
-// -----------------------------------------------------------------------------
-//
-void CLocSUPLServerEditor::LineChangedL(TInt /*aControlId*/)
-    {
-    HandleMSKCaptionL(); 
-    }
-
-// -----------------------------------------------------------------------------
-// CLocSUPLServerEditor::SetInitialCurrentLine()
-// Selects desired line on startup
-// -----------------------------------------------------------------------------
-//
-void CLocSUPLServerEditor::SetInitialCurrentLine()
-    {
-    CAknForm::SetInitialCurrentLine();
-
-	// set focus to server address field
-	if ( ControlOrNull( ELocSuplServerIdServerAddr ) )
-		{
-		TRAP_IGNORE( TryChangeFocusToL( ELocSuplServerIdServerAddr ) );
-		}
-    }
-
-// -----------------------------------------------------------------------------
-// CLocSUPLServerEditor::HandleResourceChange()
-// Handles layout switch
-// -----------------------------------------------------------------------------
-//
-void CLocSUPLServerEditor::HandleResourceChange( TInt aType )
-	{
-	if ( aType == KEikDynamicLayoutVariantSwitch )
-		{
-		CAknForm::HandleResourceChange( aType );
-		}
-	}
-
-// -----------------------------------------------------------------------------
-// CLocSUPLServerEditor::ExecuteLD
-// Executes the Dialog
-// -----------------------------------------------------------------------------
-//
-TInt CLocSUPLServerEditor::ExecuteLD()
-    {    
-	return CAknForm::ExecuteLD( R_SUPLSERVER_EDITOR_FORM_DIALOG );    	
-    }
-
-// -----------------------------------------------------------------------------
-// CLocSUPLServerEditor::HandleControlStateChangeL
-// -----------------------------------------------------------------------------
-//
-void CLocSUPLServerEditor::HandleControlStateChangeL( TInt aControlId )
-    {
-	DEBUG( + CLocSUPLServerEditor::HandleControlStateChangeL );
-	iIsModified = ETrue;
-	switch( aControlId )
-	    {
-	    case ELocSuplServerIdServerAddr:
-	        {            
-	        //Retrieve server address text 
-	        CEikEdwin* serverAddress = 
-	        		static_cast < CEikEdwin* > ( ControlOrNull( ELocSuplServerIdServerAddr ) );            
-	        if( serverAddress )
-	            {                       
-	            HBufC* address = serverAddress->GetTextInHBufL();
-	            if( address )
-	                {
-	                CleanupStack::PushL( address );	      
-			        // update the title pane caption
-	            	ChangeTitlePaneTextL( *address ); 
-	                CleanupStack::PopAndDestroy( address );
-	                }
-	            else
-	            	{
-			        // update the title pane caption
-			        TBuf<1> nullDes;
-			        nullDes.Copy( KNullDesC );
-		        	ChangeTitlePaneTextL( nullDes ); 
-	            	}
-	            }              
-	        break;
-	        } 
-	    default:
-	    	break;	        
-	    }        
-	DEBUG( - CLocSUPLServerEditor::HandleControlStateChangeL );
-    }
-
-// ---------------------------------------------------------------------------
-// CLocSUPLServerEditor ::LoadFormValuesFromDataL()
-// Called when the form is  executed and when the user chooses to discard changes
-// in QuerySaveChangesL (via  DoNotSaveFormDataL).
-// ---------------------------------------------------------------------------
-// 
-void CLocSUPLServerEditor::LoadFormValuesFromDataL()
-    {
-	DEBUG( + CLocSUPLServerEditor::LoadFormValuesFromDataL );
-   	if( IsEditable() && iIsNewServer ) //if create new server
-       	{
-       	CEikEdwin* apSelector = 
-        			static_cast < CEikEdwin* > ( ControlOrNull( ELocSuplServerIdAccessPoint ) );           
-       	if( apSelector )
-            {   
-            HBufC* apString = StringLoader::LoadL( R_LOC_SERVER_NONE );   
-            apSelector->SetTextL( apString );
-            delete apString;
-            }
-        apSelector->DrawNow();
-
-        CEikEdwin* usageInHNWPopupFieldText = (CEikEdwin*) Control(
-                ELocSuplServerIdUsageInHomeNw);
-        if (usageInHNWPopupFieldText)
-            {
-            HBufC* usageString = StringLoader::LoadL(
-                    R_LOC_SERVER_USAGEINHOMENETWORK_YES);
-            usageInHNWPopupFieldText->SetTextL(usageString);
-            delete usageString;
-            }
-        usageInHNWPopupFieldText->DrawNow();
-
-        // update the title pane caption
-       	HBufC* serverTitle = StringLoader::LoadL( R_LOC_SERVER_EDITOR_TITLE ); 
-       	if( serverTitle )
-            {
-        	ChangeTitlePaneTextL( *serverTitle ); 
-            }        
-       	delete serverTitle;
-       	serverTitle=NULL;
-       	}
-     else
-     	{     	
-	   	CServerParams *params = CServerParams::NewL();
-	    TRAP_IGNORE( iEngine.GetSlpInfoFromIdL( iSlpId, params ) );
-	    
-	    HBufC* hslpAddr = HBufC::NewL( KMaxHSLPAddrLen );    
-	    HBufC* iapName 	= HBufC::NewL( KMaxIAPLen );
-	    TInt64 slpId;
-	    TBool enabledFlag, simChangeFlag, usageInHomeNwFlag, editFlag;    
-	    
-	    TInt errParams = params->Get(
-	    							slpId, 
-	    							hslpAddr->Des(), 
-	    							iapName->Des(), 
-	    							enabledFlag, 
-	    							simChangeFlag, 
-	    							usageInHomeNwFlag, 
-	    							editFlag
-	    						);
-	    if ( errParams != KErrNone )
-	        {
-	        // Error has occured 
-	        }  
-     	
-        CEikEdwin* serverAddress = 
-        			static_cast < CEikEdwin* > ( ControlOrNull( ELocSuplServerIdServerAddr ) );           
-        if( serverAddress )
-            {   
-            serverAddress->SetTextL( hslpAddr );
-            if( editFlag == EFalse )
-            	serverAddress->SetReadOnly( ETrue );
-        	serverAddress->DrawDeferred();
-        	iServerAddress->Des().Copy( hslpAddr->Des() );
-            } 
-
-        CEikEdwin* apSelector = 
-        			static_cast < CEikEdwin* > ( ControlOrNull( ELocSuplServerIdAccessPoint ) );           
-        if( apSelector )
-            {   
-            if( iapName->Length() > 0 )
-            	{
-            	apSelector->SetTextL( iapName );
-            	}
-            else
-            	{
-	            HBufC* apString = StringLoader::LoadL( R_LOC_SERVER_NONE ); 
-	            apSelector->SetTextL( apString );
-            	delete apString;
-            	}
-            	            
-        	apSelector->DrawNow();
-        	iIap->Des().Copy( iapName->Des() );
-            } 
-
-        CEikEdwin* usageInHNWPopupFieldText = (CEikEdwin*) Control(
-                ELocSuplServerIdUsageInHomeNw);
-        if (usageInHNWPopupFieldText)
-            {
-            if (usageInHomeNwFlag)
-                SetUsageinHomeNetwork(EFalse);
-            else
-                SetUsageinHomeNetwork(ETrue);
-
-            UpdatePageL(ETrue);
-            iUsageInHomeNw = usageInHomeNwFlag;
-            }            
-            
-	    delete iapName;
-	    delete hslpAddr;	    
-	    delete params;
-
-        // update the title pane caption
-        ChangeTitlePaneTextL( *iServerAddress ); 
-            
-     	}
-	DEBUG( - CLocSUPLServerEditor::LoadFormValuesFromDataL );
-    }
-    
-// ---------------------------------------------------------------------------
-// CLocSUPLServerEditor::ChangeTitlePaneTextL()
-// Set the Title Text
-// ---------------------------------------------------------------------------
-//
-void CLocSUPLServerEditor::ChangeTitlePaneTextL( TDesC& aText )
-    {
-	DEBUG( + CLocSUPLServerEditor::ChangeTitlePaneTextL );
-    // Obtain the title from the Status Pane
-    CAknTitlePane* title = static_cast < CAknTitlePane* >( iEikonEnv->AppUiFactory()->
-    	StatusPane()->ControlL( TUid::Uid( EEikStatusPaneUidTitle ) ) );
-       
-    // Set the Title's buffer    
-    HBufC* buf = aText.AllocL();
-    title->SetText( buf ); // Takes ownership of buf
-    title->DrawNow();
-	DEBUG( - CLocSUPLServerEditor::ChangeTitlePaneTextL );
-    }     
-
-// ---------------------------------------------------------------------------
-// CLocSUPLServerEditor::TogglePopupFieldControlL()
-// it toggles  value of popupfield control
-// This method is no longer in use since TB 9.2
-// ---------------------------------------------------------------------------
-//
-void CLocSUPLServerEditor::TogglePopupFieldControlL( TInt aControlId )
-    {
-	DEBUG( + CLocSUPLServerEditor::TogglePopupFieldControlL );
-    CAknPopupFieldText* popupFieldText =
-                    		( CAknPopupFieldText* ) Control( aControlId );
-                    		
-	if( popupFieldText )
-		{          
-		if( popupFieldText->CurrentValueIndex() == 0 )
-		  	popupFieldText->SetCurrentValueIndex( 1 );
-		else
-		  	popupFieldText->SetCurrentValueIndex( 0 );    
-
-		UpdatePageL( ETrue );
-		}
-	DEBUG( - CLocSUPLServerEditor::TogglePopupFieldControlL );
-    }
- 
-// -----------------------------------------------------------------------------
-// CLocSUPLServerEditor::HandleMSKCaptionL()
-// It changes caption of MSK key
-// -----------------------------------------------------------------------------
-//
-void CLocSUPLServerEditor::HandleMSKCaptionL()
-    {
-	DEBUG( + CLocSUPLServerEditor::HandleMSKCaptionL );
-    CEikButtonGroupContainer* cba = CEikButtonGroupContainer::Current();
-    CleanupStack::PushL( cba );
-    //attribute specific cba
-    if( IsEditable() )
-	    {
-		switch ( IdOfFocusControl() )
-	       	{
-	       	case ELocSuplServerIdServerAddr:
-	       		{
-	       		cba->SetCommandSetL( R_SUPLSERVER_EDITOR_OPTIONS_NOMSK_DONE );
-	       		break;
-	       		}
-	       	case ELocSuplServerIdAccessPoint:
-		       	{
-		       	TInt isIapChanged = EFalse;
-		        CEikEdwin* apSelector = 
-		        			static_cast < CEikEdwin* > ( ControlOrNull( IdOfFocusControl() ) );           
-		        if( apSelector && iIap )
-		            {   
-		            if( iIap->Length() > 0 )
-	            		isIapChanged = ETrue;
-		            } 
-		       	if( isIapChanged )
-		       		{
-		       		cba->SetCommandSetL( R_SUPLSERVER_EDITOR_OPTIONS_CHANGE_DONE );
-		       		}
-		       	else
-		       		{
-		       		cba->SetCommandSetL( R_SUPLSERVER_EDITOR_OPTIONS_DEFINE_DONE );		       		
-		       		}
-		       	break;	
-		       	}
-	       	case ELocSuplServerIdUsageInHomeNw:
-		       	{
-   	        	TBool editableFlag = ETrue;
-	        	if( iSlpId )
-	        		{
-	        		TRAP_IGNORE( iEngine.GetEditableFlagL( iSlpId, editableFlag ) );        		
-	        		}
-		       	if( editableFlag )
-	       			cba->SetCommandSetL( R_SUPLSERVER_EDITOR_OPTIONS_CHANGE_DONE );
-		       	else
-	       			cba->SetCommandSetL( R_SUPLSERVER_EDITOR_OPTIONS_NOMSK_DONE );		       	
-	       		break;
-		       	}
-		 	default:
-			 	break;	
-	       	}	    	
-	    }
-	else
-		{		
-    	TBool editableFlag = ETrue;
-    	TBool changeMSK = ETrue;    	
-    	
-    	if( iSlpId )
-    		TRAP_IGNORE( iEngine.GetEditableFlagL( iSlpId, editableFlag ) );        		    		
-    	    	
-       	if( editableFlag == EFalse && ( IdOfFocusControl() == ELocSuplServerIdServerAddr || 
-       									IdOfFocusControl() == ELocSuplServerIdUsageInHomeNw ) )
-			changeMSK = EFalse;       			
-
-       	if( changeMSK )
-       	    cba->SetCommandSetL( R_SUPLSERVER_EDITOR_OPTIONS_EDIT_BACK );
-       	else
-       		cba->SetCommandSetL( R_SUPLSERVER_EDITOR_OPTIONS_NOMSK_BACK );
-		}
-    cba->DrawDeferred();    
-    CleanupStack::Pop( cba );    
-	DEBUG( - CLocSUPLServerEditor::HandleMSKCaptionL );
-    }
-
-// -----------------------------------------------------------------------------
-// CLocSUPLServerEditor::UpdateIapL()
-// It changes IAP value in AP field
-// -----------------------------------------------------------------------------
-//
-void CLocSUPLServerEditor::UpdateIapL( const TDesC& aIapName )
-	{
-	DEBUG( + CLocSUPLServerEditor::UpdateIapL );
-	if( aIapName.Length() > 0 )
-		{
-		iIap->Des().Copy( aIapName );	
-	    CEikEdwin* apSelector = 
-	    			static_cast < CEikEdwin* > ( ControlOrNull( ELocSuplServerIdAccessPoint ) );           
-	    if( apSelector )
-	        {   
-	        apSelector->SetTextL( iIap );
-	        } 	
-	    apSelector->DrawNow();
-	    HandleMSKCaptionL();
-        if (iIsNewServer)
-          {
-          iIsModified = ETrue;
-          }
-		}
-	DEBUG( - CLocSUPLServerEditor::UpdateIapL  );
-	}
-
-// -----------------------------------------------------------------------------
-// CLocSUPLServerEditor::DeleteConfirmationQueryL
-// Pops the delete confirmation query note
-// ----------------------------------------------------------------------------
-//
-TInt CLocSUPLServerEditor::DeleteConfirmationQueryL()
-    {    
-    HBufC* noteText = NULL;    
-    noteText = StringLoader::LoadL( R_LOC_DETAIL_CONF_DELETE_SERVER );
-    CAknQueryDialog* query = new( ELeave ) CAknQueryDialog( *noteText );    
-    TInt ret = query->ExecuteLD( R_LOC_SUPL_DELETE_QUERY );
-    delete noteText; //noteText    
-    noteText = NULL;
-    return ret;
-    }
-
-// -----------------------------------------------------------------------------
-// CLocSUPLServerEditor::ShowServerValidationInfoNoteL
-// Shows Validation Info note for server address entry
-// ----------------------------------------------------------------------------
-//
-void CLocSUPLServerEditor::ShowServerValidationInfoNoteL( TInt aResourceId )
-	{
-	// Show the information note to add server address before closing
-    HBufC* noteText = StringLoader::LoadL( aResourceId );
-    CAknInformationNote* dialog = 
-        new( ELeave ) CAknInformationNote( R_AKN_INFORMATION_NOTE_WAIT );
-    dialog->ExecuteLD( *noteText );
-    delete noteText; //noteText    
-    noteText = NULL;
-	}
-
-// ----------------------------------------------------------------------------------
-// CLocSUPLServerEditor::SetCursorToEndL
-// Moves the cursor position at end if focus is on server address field in edit mode
-// ----------------------------------------------------------------------------------
-//
-void CLocSUPLServerEditor::SetCursorToEndL()
-	{	
-	if ( IdOfFocusControl() == ELocSuplServerIdServerAddr )
-		{
-        CEikEdwin* serverAddress = 
-        			static_cast < CEikEdwin* > ( ControlOrNull( ELocSuplServerIdServerAddr ) );           
-        if( serverAddress )
-            {   
-            HBufC* address = serverAddress->GetTextInHBufL();
-            if( address )
-            	{
-	            serverAddress->SetCursorPosL( address->Length(), EFalse );         
-	        	serverAddress->DrawDeferred();              	
-            	}
-        	delete address;     			
-   			}
-		}
-	}
-// ----------------------------------------------------------------------------------
-// CLocSUPLServerEditor::HandleDialogPageEventL
-// ----------------------------------------------------------------------------------
-//
-void CLocSUPLServerEditor::HandleDialogPageEventL(TInt aEventID)
-    {
-    DEBUG( +CLocSUPLServerEditor::HandleDialogPageEventL );
-
-    CAknForm::HandleDialogPageEventL(aEventID);
-    CEikEdwin* iapEditor = static_cast<CEikEdwin*> (ControlOrNull(
-            ELocSuplServerIdAccessPoint));
-    CEikEdwin* usageInHomeNWPopupFieldText = (CEikEdwin*) Control(
-            ELocSuplServerIdUsageInHomeNw);
-    TInt focusControl(IdOfFocusControl());
-
-    if (!IsEditable())
-        {
-        if (focusControl == ELocSuplServerIdUsageInHomeNw
-                || ELocSuplServerIdServerAddr || ELocSuplServerIdAccessPoint)
-            {
-            ProcessCommandL(EAknFormCmdEdit);
-            }
-        }
-    else if (aEventID == MEikDialogPageObserver::EDialogPageTapped)
-        {
-        if (focusControl == ELocSuplServerIdUsageInHomeNw)
-            {
-            if (usageInHomeNWPopupFieldText)
-                {
-                TBuf<KMaxUsageTextSize> des;
-                usageInHomeNWPopupFieldText->GetText(des);
-                if (!des.Compare(KNoUsageInHomeNetork))
-                    {
-                    SetUsageinHomeNetwork(ETrue);
-                    }
-                else
-                    {
-                    SetUsageinHomeNetwork(EFalse);
-                    }
-                if (iIsNewServer)
-                    {
-                    iIsModified = ETrue;
-                    }
-                }
-            return;
-            }
-        if (focusControl == ELocSuplServerIdAccessPoint)
-            {
-            if (iapEditor)
-                {
-                //Launch IAP Dialog
-                TRAP_IGNORE( iEngine.LaunchApConfiguratorL( iSlpId, this ) );
-                }
-            }
-        }DEBUG( -CLocSUPLServerEditor::HandleDialogPageEventL );
-    }
-
-// -----------------------------------------------------------------------------
-// CLocSUPLServerEditor::SetUsageinHomeNetwork
-// Set usage in network field on or off
-// -----------------------------------------------------------------------------
-//
-void CLocSUPLServerEditor::SetUsageinHomeNetwork(TBool aOnOff)
-    {
-    HBufC* string;
-    CEikEdwin* usageInHomeNWPopupFieldText = (CEikEdwin*) Control(
-            ELocSuplServerIdUsageInHomeNw);
-    if (aOnOff)
-        {
-        // load string 'ON'
-        string = StringLoader::LoadLC(R_LOC_SERVER_USAGEINHOMENETWORK_YES,
-                iCoeEnv);
-        }
-    else
-        {
-        // load string 'OFF'
-        string = StringLoader::LoadLC(R_LOC_SERVER_USAGEINHOMENETWORK_NO,
-                iCoeEnv);
-        }
-    // set Usage in Network field string as 'ON'/'OFF'
-    usageInHomeNWPopupFieldText->SetTextL(string);
-    CleanupStack::PopAndDestroy(string);
-    }
-
-// End of file
--- a/locationsystemui/locationsysui/locsuplsettingsui/src/locsuplserverlbmodel.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,266 +0,0 @@
-/*
-* Copyright (c) 2008 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:  List box for the SUPL server UI
-*
-*/
-
-
-// System Includes
-#include <e32keys.h>
-#include <locsuplsettingsui.rsg>
-#include <StringLoader.h>
-#include <epos_csuplsettings.h>
-#include <epos_csuplsettingparams.h>
-#include <epos_csuplsettingsconstants.h>
-
-// User Include
-#include "locsuplserverlbmodel.h"
-#include "locsuplsettingsuiengine.h"
-#include "locsupldebug.h"
-		  					   	  
-// Constants
-
-const TInt KMaxConversionBufferLength 	= 0x200;
-const TInt KServerEntryGranularity		= 10;
-
-
-// ========================= MEMBER FUNCTIONS ================================
-
-// ---------------------------------------------------------------------------
-// CLocSUPLServerLBModel::CLocSUPLServerLBModel
-// Default Constructor
-//
-// ---------------------------------------------------------------------------
-//
-CLocSUPLServerLBModel::CLocSUPLServerLBModel( 
-                            CLocSUPLSettingsUiEngine&     aEngine )
-    	:	iEngine( aEngine ), 
-    		iSlpIdList( KServerEntryGranularity )
-	{		
-	}
-
-// ---------------------------------------------------------------------------
-// CLocSUPLServerLBModel::~CLocSUPLServerLBModel
-// Destructor
-//
-// ---------------------------------------------------------------------------
-//
-CLocSUPLServerLBModel::~CLocSUPLServerLBModel()
-	{
-	DEBUG( + CLocSUPLServerLBModel::~CLocSUPLServerLBModel );
-	
-	iEnableFlagList.Close();
-	iSlpAddressList.ResetAndDestroy();
-	iSlpAddressList.Close();
-	iSlpIdList.Close();
-			
-	// Delete the Buffers
-	delete iBuffer;
-	iBuffer = NULL;		
-	DEBUG( - CLocSUPLServerLBModel::~CLocSUPLServerLBModel );
-	}
-	
-// ---------------------------------------------------------------------------
-// CLocSUPLServerLBModel* CLocSUPLServerLBModel::NewL
-// Two-phased constructor
-// 
-// @param  aEngine                  Reference the SUPL Settings Engine 
-// @return CLocSUPLServerLBModel*	Reference to the object created
-//
-// ---------------------------------------------------------------------------
-//
-CLocSUPLServerLBModel* CLocSUPLServerLBModel::NewL( 
-                                    CLocSUPLSettingsUiEngine&     aEngine )
-	{
-	DEBUG( + CLocSUPLServerLBModel::NewL );
-	CLocSUPLServerLBModel* self = CLocSUPLServerLBModel::NewLC( aEngine );
-	CleanupStack::Pop( self );
-	DEBUG( - CLocSUPLServerLBModel::NewL );
-	return self;
-	}
-
-// ---------------------------------------------------------------------------
-// CLocSUPLServerLBModel* CLocSUPLServerLBModel::NewLC
-// Two-phased constructor
-// 
-// @param  aEngine                  Reference the SUPL Settings Engine 
-// @return CLocSUPLServerLBModel*	Reference to the object created
-//
-// ---------------------------------------------------------------------------
-//
-CLocSUPLServerLBModel* CLocSUPLServerLBModel::NewLC( 
-                                    CLocSUPLSettingsUiEngine&     aEngine )
-	{
-	CLocSUPLServerLBModel* self = 
-	                new ( ELeave ) CLocSUPLServerLBModel( aEngine );
-	CleanupStack::PushL( self );
-	self->ConstructL();
-	return self;
-	}
-		
-// ---------------------------------------------------------------------------
-// void CLocSUPLServerLBModel::ConstructL
-// Second Phase of the two phase constructor.
-// 
-// ---------------------------------------------------------------------------
-//
-void CLocSUPLServerLBModel::ConstructL()
-	{
-	DEBUG( + CLocSUPLServerLBModel::ConstructL );
-    // Allocate the Conversion Buffer
-	iBuffer = HBufC16::NewL( KMaxConversionBufferLength ); 	   
-	
-	UpdateSlpIdsL();
-	DEBUG( - CLocSUPLServerLBModel::ConstructL );
-	}
-
-// ---------------------------------------------------------------------------
-// TInt CLocSUPLServerLBModel::MdcaCount() const
-// Inherited from MDesCArray. Returns the total number of items in the 
-// Settings description array
-//
-// @return TInt The total number of elements in the Settings Description array
-// ---------------------------------------------------------------------------
-//
-TInt CLocSUPLServerLBModel::MdcaCount() const
-	{
-	DEBUG1( CLocSUPLServerLBModel::MdcaCount= %d, iSlpIdList.Count() );
-	return iSlpIdList.Count();
-	}
-
-// ---------------------------------------------------------------------------
-// TPtrC16 CLocSUPLServerLBModel::MdcaPoint() const
-// Inherited from MDesCArray. Returns the list box entry corresponding to the 
-// index value
-//
-// @param  aIndex The index whose list box entry needs to be retrieved
-// @return TPtr16 The list box description 
-// ---------------------------------------------------------------------------
-//
-TPtrC16 CLocSUPLServerLBModel::MdcaPoint( TInt aIndex ) const
-	{	
-	DEBUG1( + CLocSUPLServerLBModel::MdcaPoint =%d, aIndex );
-	
-	// Zero the internal buffer
-	TPtr16 ptr( iBuffer->Des() );
-	ptr.Zero();
-	
-	AppendSuplServerDetail( ptr, aIndex );
-
-	DEBUG( - CLocSUPLServerLBModel::MdcaPoint );
-	return iBuffer->Des();
-	}
-	
-// ---------------------------------------------------------------------------
-// CLocSUPLServerLBModel::AppendSuplServerDetail()
-// Packs the server address to the end of the buffer passed.
-//
-// @param  aPtr Buffer to which the server address needs to be appended.
-// ---------------------------------------------------------------------------
-//	
-void CLocSUPLServerLBModel::AppendSuplServerDetail( TDes& aPtr, TInt aIndex ) const
-    {
-	DEBUG( + CLocSUPLServerLBModel::AppendSuplServerDetail );    
-
-	// CAknSingleNumberStyleListBox 	"2\tTextLabel\t0\t1"
-	
-	_LIT(KItemString, "%d\t%S\t\t" );
-	_LIT(KItemString2, "%d\t%S\t%d\t" );
-
-   	RBuf hslpAddr;
-   	TRAP_IGNORE( hslpAddr.CreateL( *iSlpAddressList[ aIndex ] ) );
-
-	if( iEnableFlagList[ aIndex ] )
-		{
-		// Format the string
-		aPtr.Format( KItemString, aIndex+1, &hslpAddr );			
-		} 
-	else
-		{
-		// Format the string
-		aPtr.Format( KItemString2, aIndex+1, &hslpAddr, ETrue );					
-		}	
-	hslpAddr.Close();   		
-	
-	DEBUG( - CLocSUPLServerLBModel::AppendSuplServerDetail );    
-    }
-
-// ---------------------------------------------------------------------------
-// CLocSUPLServerLBModel::UpdateSlpIdsL()
-// Packs the server ids to id array
-//
-// ---------------------------------------------------------------------------
-//	    
-void CLocSUPLServerLBModel::UpdateSlpIdsL()
-	{
-	DEBUG( + CLocSUPLServerLBModel::CollectSlpIdsL );
-
-	iSlpIdList.Reset();
-	iSlpAddressList.ResetAndDestroy();
-	iEnableFlagList.Reset();
-
-	if( iEngine.SlpCount() > 0 )
-		{
-		RPointerArray< CServerParams > 	serverList;
-		
-		// Get all server entries
-		iEngine.GetAllSlpL( serverList );		
-		
-		for( TInt i = 0; i < serverList.Count() ; i++ )
-			{
-		    TInt64 slpId;
-		    HBufC* hslpAddr = HBufC::NewL( KMaxHSLPAddrLen );    
-		    HBufC* iapName 	= HBufC::NewL( KMaxIAPLen );
-		    TBool enabledFlag, simChangeFlag, usageInHomeNwFlag, editFlag;    
-		    		    
-		    TInt errParams = serverList[i]->Get(
-		    							slpId, 
-		    							hslpAddr->Des(), 
-		    							iapName->Des(), 
-		    							enabledFlag, 
-		    							simChangeFlag, 
-		    							usageInHomeNwFlag, 
-		    							editFlag
-		    						);
-		    if ( errParams != KErrNone )
-		        {
-		        // Error has occured 
-		        }  
-			
-			iSlpIdList.Append( slpId );
-			iSlpAddressList.Append( hslpAddr->AllocL() );
-			iEnableFlagList.Append( enabledFlag );
-			
-			delete hslpAddr;
-			delete iapName;
-			}
-		serverList.ResetAndDestroy();
-		serverList.Close();		
-		}	
-	DEBUG( - CLocSUPLServerLBModel::CollectSlpIdsL );
-	}        
-    
-// ---------------------------------------------------------------------------
-// CLocSUPLServerLBModel::SlpIds()
-// returns server id array
-//
-// ---------------------------------------------------------------------------
-//  
-RArray<TInt64>& CLocSUPLServerLBModel::SlpIds()
-	{
-	DEBUG( CLocSUPLServerLBModel::SlpIds );
-	return iSlpIdList;	
-	}
-
-// End of file
--- a/locationsystemui/locationsysui/locsuplsettingsui/src/locsuplserverview.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,766 +0,0 @@
-/*
-* Copyright (c) 2008 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:  Source file for SUPL server UI view
-*
-*/
-
-
-// System Include
-#include <barsread.h> 		                // For TResourceReader
-#include <bautils.h>
-#include <StringLoader.h>
-#include <aknViewAppUi.h>
-#include <avkon.rsg>
-#include <hlplch.h>			                // Help
-#include <featmgr.h> 						// FeatureManager
-#include <eikmenup.h>						// Menu pane
-#include <eikmenub.h>						// Menu Bar
-#include <AknUtils.h>
-#include <AknQueryDialog.h> 
-
-#include <locsuplsettingsui.rsg>
-
-// User Include
-#include "locsuplsettings.hrh"
-#include "locsuplserverview.h"
-#include "locsuplservercontainer.h"
-#include "locsettingsui.h"
-#include "locsuplsettingsuiengine.h"
-#include "locsupldebug.h"
-#include "locsuplsettingsview.h"
-
-
-// ========================= MEMBER FUNCTIONS ================================
-
-
-// ---------------------------------------------------------------------------
-// CLocSUPLServerView::CLocSUPLServerView
-// Overloaded Constructor
-//
-// ---------------------------------------------------------------------------
-//	
-CLocSUPLServerView::CLocSUPLServerView( 
-                              CLocSUPLSettingsUiEngine&     aEngine,
-		 					  MLocSUPLSettingsEventHandler&	aEventHandler )
-	:iEventHandler( aEventHandler ),
-	iEngine( aEngine )
-	{
-	}
-
-// ---------------------------------------------------------------------------
-// CLocSUPLServerView::~CLocSUPLServerView
-// Destructor
-//
-// ---------------------------------------------------------------------------
-//
-CLocSUPLServerView::~CLocSUPLServerView()
-	{
-	DEBUG( + CLocSUPLServerView::~CLocSUPLServerView );	
-	
-	// deleting the new contaier used to while prioritizing the servers
-    if ( iNewContainer )
-         {
-         AppUi()->RemoveFromViewStack( *this, iNewContainer );
-         delete iNewContainer;
-         iNewContainer = NULL;
-         }
-    
-    if ( iContainer )
-        {
-        AppUi()->RemoveFromViewStack( *this, iContainer );
-        }
-    delete iContainer;
-    iContainer = NULL;
-	DEBUG( - CLocSUPLServerView::~CLocSUPLServerView );	
-	}
-	
-// ---------------------------------------------------------------------------
-// CLocSUPLServerView* CLocSUPLServerView::NewL
-// Creates new Location Sys Ui plugin.
-//
-// @param aEngine               Reference to the SUPL Settings
-//                              engine          
-// @param aEventHandler		    Pointer to the Event Handler
-// @return CAknViewAppUi&		Reference to the application view
-// ---------------------------------------------------------------------------
-//    
-CLocSUPLServerView* CLocSUPLServerView::NewL( 
-                              CLocSUPLSettingsUiEngine&     aEngine,
-		 					  MLocSUPLSettingsEventHandler&	aEventHandler )
-	{	
-	DEBUG( + CLocSUPLServerView::NewL );	
-    CLocSUPLServerView* self = NewLC( aEngine, aEventHandler );
-	CleanupStack::Pop( self );
-	DEBUG( - CLocSUPLServerView::NewL );	
-	return self;
-	}
-
-// ---------------------------------------------------------------------------
-// CLocSUPLServerView* CLocSUPLServerView::NewLC
-// Creates new Location Sys Ui plugin.
-//
-// @param aEngine               Reference to the SUPL Settings
-//                              engine          
-// @param aEventHandler		    Pointer to the Event Handler
-// @return CAknViewAppUi&		Reference to the application view
-// ---------------------------------------------------------------------------
-//    
-CLocSUPLServerView* CLocSUPLServerView::NewLC( 
-                              CLocSUPLSettingsUiEngine&     aEngine,
-		 					  MLocSUPLSettingsEventHandler&	aEventHandler )
-	{	
-    CLocSUPLServerView* self = 
-                new( ELeave ) CLocSUPLServerView( aEngine,                          
-    										        aEventHandler );
-	CleanupStack::PushL(self);
-	self->ConstructL();
-	return self;
-	}
-	
-// ---------------------------------------------------------------------------
-// void CLocSUPLServerView::ConstructL
-// Second Phase Constructor
-//
-// ---------------------------------------------------------------------------
-//
-void CLocSUPLServerView::ConstructL()
-	{   	
-	// Call AknView's BaseConstrutL
-	BaseConstructL( R_SUPLSETTINGS_SERVER_VIEW );	 
-	}
-
-// -----------------------------------------------------------------------------
-// CLocSUPLServerView::HandleScreenSizeChange
-// -----------------------------------------------------------------------------
-//
-void CLocSUPLServerView::HandleScreenSizeChange() 
-	{
-	if( iContainer )
-		{
-		iContainer->SetRect( ClientRect());		
-		}
-	}
-
-// -----------------------------------------------------------------------------
-// CLocSUPLServerView::UpdateView
-// -----------------------------------------------------------------------------
-//	
-void CLocSUPLServerView::UpdateView()
-    {
-	DEBUG( + CLocSUPLServerView::UpdateView );	
-    if( iContainer )
-		{
-		TRAP_IGNORE( iContainer->UpdateScreenL() );	
-		}	
-	TRAP_IGNORE( ChangeMSKL() );		
-	DEBUG( - CLocSUPLServerView::UpdateView );	
-    }
-
-// -----------------------------------------------------------------------------
-// TInt CLocSUPLServerView::SelectedItemIndex
-// Returns the Selected element. The list box model defines the enumeration that
-// would determine the current element that has been selected
-//
-// @return TInt Index of the item selected
-// -----------------------------------------------------------------------------
-//
-TInt CLocSUPLServerView::SelectedItemIndex()
-    {
-    if (iNewContainer)
-        {
-        return iNewContainer->SelectedItemIndex();
-        }
-    else if( iContainer )
-        {
-        return iContainer->SelectedItemIndex();
-        }
-    else
-        {
-        return KErrNotFound;
-        }
-    }    
-    
-// ---------------------------------------------------------------------------
-// void CLocSUPLServerView::DoActivateL
-// 
-// ---------------------------------------------------------------------------	
-//
-void CLocSUPLServerView::DoActivateL( const TVwsViewId& 	/* PrevViewId*/,
-											   TUid		   	/* aCustomMessageId*/,
-						  				 const TDesC8&		/* aCustomMessage */)
-	{
-	DEBUG( + CLocSUPLServerView::DoActivateL );	
-	// Destroy the existing container
-	if( iContainer )
-        {
-        AppUi()->RemoveFromViewStack( *this, iContainer );
-        delete iContainer;
-        iContainer=NULL;
-        }						
-    
-    // Create new Container	
-	iContainer = CLocSUPLServerContainer::NewL( ClientRect(), 
-	                                              iEngine,
-	                                              this );
-	iContainer->SetMopParent( this );
-	AppUi()->AddToViewStackL( *this, iContainer );
-	MenuBar()->SetContextMenuTitleResourceId( R_SUPLSETTINGS_SERVER_CONTEXTMENUBAR );
-	ChangeMSKL();
-	DEBUG( - CLocSUPLServerView::DoActivateL );	
-	}
-
-// ---------------------------------------------------------------------------
-// void CLocationSystemUiView::DoDeactivate
-//
-// ---------------------------------------------------------------------------
-//		
-void CLocSUPLServerView::DoDeactivate()
-	{
-	DEBUG( + CLocSUPLServerView::DoDeactivate );	
-	// Destroy Container
-	if ( iContainer )
-        {
-        AppUi()->RemoveFromViewStack( *this, iContainer );
-        delete iContainer;
-        iContainer = NULL;
-        }
-	DEBUG( - CLocSUPLServerView::DoDeactivate );	
-	}
-
-// ---------------------------------------------------------------------------
-// TUid CLocSUPLServerView::Id
-// Returns the View Id. Should be chosen to reflect the Implementation UID 
-// of the Plugin
-//
-// @return TUid The View Id
-// ---------------------------------------------------------------------------
-//	
-TUid CLocSUPLServerView::Id() const
-	{
-	return KLocSUPLServerUiViewId;
-	}
-
-// ---------------------------------------------------------------------------
-// void CLocSUPLServerView::HandleCommandL
-//
-// ---------------------------------------------------------------------------
-//	
-void CLocSUPLServerView::HandleCommandL( TInt aCommand )	
-	{
-	DEBUG( + CLocSUPLServerView::HandleCommandL );	
-	switch ( aCommand )
-        {
-        // Handle all the internal view specific commands here
-        case ELocSuplServerOpen:
-        case ELocSuplServerMSKOpen:
-            {
-            iEngine.EditServerL( EFalse, iContainer->CurrentSlpId() );
-            break;    
-            } 
-        case ELocSuplServerEnable:
-        case ELocSuplServerMSKEnable:
-        	{
-        	EnableServerL();
-        	break;
-        	}
-        case ELocSuplServerDisable:
-        case ELocSuplServerMSKDisable:
-        	{
-        	DisableServerL();
-        	break;
-        	}
-        case ELocSuplServerNew:
-        	{
-            iEngine.EditServerL( ETrue, NULL );
-            break;    
-        	}
-        case ELocSuplServerDelete:
-        	{
-        	iContainer->SetSelectedIndex();
-        	DeleteServerL();
-        	break;
-        	}
-        case ELocSuplServerPrioritize:
-        	{
-        	/** iNewContainer is constructed while prioritizing the servers.
-        	 * Since the focus cannot be disabled once it is enabled dynamically, thus 
-        	 * prioritizing happens in the new container and the original container is updated.
-        	 * The iNewContainer is deleted once prioritizing is over. (TC Id: ou1cimx1#219289)
-        	**/
-        	if(iNewContainer)
-        	    {
-                delete iNewContainer;
-                iNewContainer = NULL;
-        	    }
-        	iStartedPrioritize = ETrue;
-        	iSelectedIndex = SelectedItemIndex();
-        	
-        	iNewContainer = CLocSUPLServerContainer::NewL(ClientRect(), iEngine, this);
-            iNewContainer->SetMopParent( this );
-            AppUi()->AddToViewStackL( *this, iNewContainer );
-            MenuBar()->SetContextMenuTitleResourceId( R_SUPLSETTINGS_SERVER_CONTEXTMENUBAR );         
-            iSelectedSlpId = iContainer->CurrentSlpId();
-
-        	ChangeMSKL();
-        	HandleCommandL( EAknCmdMark );
-        	break;
-        	}
-        case EAknSoftkeyOk:
-        	{
-        	TInt currentIndex = SelectedItemIndex();        	
-        	if ( currentIndex == iSelectedIndex )
-        		{
-	        	HandleCommandL( EAknUnmarkAll );
-	        	UpdateView(); 
-        	  // deleting the new contaier used to while prioritizing the servers
-	            if ( iNewContainer )
-	                {
-	                AppUi()->RemoveFromViewStack( *this, iNewContainer );
-	                delete iNewContainer;
-	                iNewContainer = NULL;
-	                }
-        		}
-        	else
-        		{
-        		TBool isIncrease;
-        		TInt  val;
-        		if( currentIndex > iSelectedIndex )
-        			{
-        			isIncrease = EFalse;
-        			val = currentIndex - iSelectedIndex;
-        			}
-        		else
-        			{
-        			isIncrease = ETrue;
-        			val = iSelectedIndex - currentIndex;        		
-        			}
-	        	iEngine.ChangePriorityL( 
-	        				iSelectedSlpId, 
-	        				val,
-	        				isIncrease );  
-        	  // deleting the new contaier used to while prioritizing the servers
-	            if ( iNewContainer )
-	                {
-	                AppUi()->RemoveFromViewStack( *this, iNewContainer );
-	                delete iNewContainer;
-	                iNewContainer = NULL;
-	                }
-        		}
-        	break;
-        	}
-        case EAknSoftkeyCancel:
-        	{
-        	ChangeMSKL();
-        	HandleCommandL( EAknUnmarkAll );
-       	   // deleting the new contaier used to while prioritizing the servers
-            if ( iNewContainer )
-                {
-                AppUi()->RemoveFromViewStack( *this, iNewContainer );
-                delete iNewContainer;
-                iNewContainer = NULL;
-                }
-        	break;
-        	}
-        case EAknCmdMark:
-        case EAknCmdUnmark:
-        case EAknMarkAll:
-        case EAknUnmarkAll:
-	       	{
-	       	// if new container is contructed to prioritize the servers, then mark the item in the new container
-	       	if(iNewContainer)
-	       	    {
-                //Setting the current item in the new container as same as in the original container.
-                iNewContainer->ListBoxL().SetCurrentItemIndexAndDraw(iContainer->SelectedItemIndex());	       	
-                AknSelectionService::HandleMarkableListProcessCommandL(
-	                        aCommand, &( iNewContainer->ListBoxL() ) );   
-	       	    }
-	       	else
-	       	    {
-                AknSelectionService::HandleMarkableListProcessCommandL(
-						aCommand, &( iContainer->ListBoxL() ) );    
-	       	    }
-	       	break;
-	       	}
-       case EAknCmdHelp:
-        	{
-           	HlpLauncher::LaunchHelpApplicationL( iCoeEnv->WsSession(),
-           										 AppUi()->AppHelpContextL() );
-        	break;	
-        	}
-        case EAknCmdExit:
-        case EEikCmdExit:
-            {
-            // The Exit command has to be transferred back to the application
-            iEventHandler.HandleCommandL( EEikCmdExit );
-            break;    
-            }
-        case EAknSoftkeyBack:
-            {
-            // Launch the Settings View
-            TRAP_IGNORE( AppUi()->ActivateLocalViewL ( KLocSUPLSettingsUiViewId ) );
-            break;    
-            }
-        case ELocSuplServerMSKNoCmd:
-        	{
-        	// No operation will happen
-        	break;
-        	}
-        default:
-    	    {
-    	    // View Switiching, View closure and other external
-    	    // view related and AppUi related commands
-    	    iEventHandler.HandleCommandL( aCommand );
-            break;	
-    	    }
-        }
-	DEBUG( - CLocSUPLServerView::HandleCommandL );	
-	}
-
-// -----------------------------------------------------------------------------
-// CLocSUPLServerView::DynInitMenuPaneL
-// -----------------------------------------------------------------------------
-void CLocSUPLServerView::DynInitMenuPaneL( TInt          aResourceId, 
-                                             CEikMenuPane* aMenuPane )
-    {
-	DEBUG( + CLocSUPLServerView::DynInitMenuPaneL );	
-    AknSelectionService::HandleMarkableListDynInitMenuPane( 
-    								aResourceId, 
-                                    aMenuPane, 
-                                    &( iContainer->ListBoxL() ) );
-    switch( aResourceId )
-        {                               
-        case R_SUPLSETTINGS_SERVER_MAIN_MENU: 
-            { 
-	        User::LeaveIfNull( aMenuPane );
-	        //Handle Help Fature
-	        HandleHelpFeature( *aMenuPane );
-	        break;
-        	}
-        case R_SUPLSETTINGS_SERVER_MENU: 
-            {             
-	        User::LeaveIfNull( aMenuPane );	     
-        	if( iContainer->ServerCount() <= 0 )
-        		{	           
-			    aMenuPane->SetItemDimmed( 
-			    					ELocSuplServerOpen, 		ETrue );
-			    aMenuPane->SetItemDimmed( 
-			    					ELocSuplServerEnable, 		ETrue );
-			    aMenuPane->SetItemDimmed( 
-			    					ELocSuplServerDisable, 		ETrue );
-			    aMenuPane->SetItemDimmed( 
-			    					ELocSuplServerDelete, 		ETrue );
-			    aMenuPane->SetItemDimmed( 
-			    					ELocSuplServerPrioritize, 	ETrue );
-        		}
-        	else
-        		{
-        		if ( iContainer->SelectedCount() > 1 )
-        			{
-			    	aMenuPane->SetItemDimmed( 
-			    					ELocSuplServerOpen, 		ETrue );
-			    	aMenuPane->SetItemDimmed( 
-			    					ELocSuplServerPrioritize, 	ETrue );  
-			    	
-			    	TInt disableCount = SelectedDisabledServerCountL();
-			    	if( disableCount == iContainer->SelectedCount() )
-			    		{
-			    		aMenuPane->SetItemDimmed( 
-			    					ELocSuplServerDisable, 		ETrue );
-			    		}
-			    	else if (disableCount == 0 )
-			    		{
-			    		aMenuPane->SetItemDimmed( 
-			    					ELocSuplServerEnable, 		ETrue );
-			    		}		    	      			
-        			}      		
-        		else
-        			{
-    				TBool enabledFlag;    
-        			iEngine.GetServerEnabledFlagL( 
-        							iContainer->CurrentSlpId(), enabledFlag );
-        							
-        			if( enabledFlag )
-        				aMenuPane->SetItemDimmed( 
-        							ELocSuplServerEnable, 		ETrue );
-        			else
-        				aMenuPane->SetItemDimmed( 
-        							ELocSuplServerDisable,		ETrue );        			
-        			}
-
-    			if( iContainer->ServerCount() == 1 )				
-			    	aMenuPane->SetItemDimmed( 
-			    					ELocSuplServerPrioritize, 	ETrue );        			
-        		}        		      		
-	        break;
-        	}
-    	case R_SUPLSETTINGS_SERVER_CONTEXTMENU:
-        	{
-        	if( iContainer->ServerCount() <= 0 )
-        		{
-		        aMenuPane->SetItemDimmed( 
-		        					ELocSuplServerMSKEnable, 	ETrue );
-		        aMenuPane->SetItemDimmed( 
-		        					ELocSuplServerMSKDisable,	ETrue );        		
-		        aMenuPane->SetItemDimmed( 
-		        					ELocSuplServerDelete,		ETrue );        		
-        		}
-        	else 
-        		{
-                aMenuPane->SetItemDimmed(ELocSuplServerNew, ETrue);
-        		if ( iContainer->SelectedCount() > 0 )
-        			{
-			    	TInt disableCount = SelectedDisabledServerCountL();
-			    	if( disableCount == iContainer->SelectedCount() )
-			    		{
-			    		aMenuPane->SetItemDimmed( 
-			    					ELocSuplServerMSKDisable,	ETrue );
-			    		}
-			    	else if (disableCount == 0 )
-			    		{
-			    		aMenuPane->SetItemDimmed( 
-			    					ELocSuplServerMSKEnable,	ETrue );
-			    		}		    	      			
-        			}      	
-        		else
-        			{
-        			TBool enabledFlag;
-        			iEngine.GetServerEnabledFlagL( iContainer->CurrentSlpId(), enabledFlag );
-        			if( enabledFlag )
-        				aMenuPane->SetItemDimmed( 
-        							ELocSuplServerMSKEnable, 	ETrue );
-        			else
-        				aMenuPane->SetItemDimmed( 
-        							ELocSuplServerMSKDisable, 	ETrue );
-        			}
-        		}
-        	break;
-        	}
-        default:
-    		{
-    		break;
-    		}
-        }
-	DEBUG( - CLocSUPLServerView::DynInitMenuPaneL );	
-    }
-    
-// -----------------------------------------------------------------------------
-// CLocSUPLServerView::HandleHelpFeature
-// -----------------------------------------------------------------------------
-void CLocSUPLServerView::HandleHelpFeature( CEikMenuPane& aMenuPane ) const
-    {
-	DEBUG( + CLocSUPLServerView::HandleHelpFeature );	
-    if ( FeatureManager::FeatureSupported( KFeatureIdHelp ) )
-        {
-        aMenuPane.SetItemDimmed( EAknCmdHelp, EFalse );
-        }
-    else
-        {
-        aMenuPane.SetItemDimmed( EAknCmdHelp, ETrue );
-        }
-	DEBUG( - CLocSUPLServerView::HandleHelpFeature );	
-    }
-
-// -----------------------------------------------------------------------------
-// CLocSUPLServerView::DeletionConfirmationQueryL
-// ----------------------------------------------------------------------------
-//
-TInt CLocSUPLServerView::DeletionConfirmationQueryL( const TInt aAmount )
-    {    
-    HBufC* noteText = NULL;    
-    if ( aAmount > 1 )
-        {
-        noteText = StringLoader::LoadL( R_LOC_DETAIL_CONF_DELETE_SERVERS, aAmount, iEikonEnv );
-        }
-    else
-        {
-        noteText = StringLoader::LoadL( R_LOC_DETAIL_CONF_DELETE_SERVER, iEikonEnv );
-        }
-    CAknQueryDialog* query = new( ELeave ) CAknQueryDialog( *noteText );    
-    TInt ret = query->ExecuteLD( R_LOC_SUPL_DELETE_QUERY );
-    delete noteText; //noteText    
-    noteText = NULL;
-    return ret;
-    }
-
-// -----------------------------------------------------------------------------
-// CLocSUPLServerView::DeleteServerL
-// ----------------------------------------------------------------------------
-//
-void CLocSUPLServerView::DeleteServerL()
-	{
-	DEBUG( + CLocSUPLServerView::DeleteServerL );	
-	TInt selCount 	= iContainer->SelectedCount();
-	TInt severCount = iContainer->ServerCount();
-	if( DeletionConfirmationQueryL( selCount ) )
-		{
-		if ( selCount < 1 && severCount > 0 )
-			{
-			TRAP_IGNORE( iEngine.RemoveServerL( iContainer->CurrentSlpId() ) );
-			}
-		else
-			{
-		    const CArrayFix<TInt>* markedIndexes = NULL;
-		    markedIndexes = iContainer->ListBoxL().SelectionIndexes();
-				
-			RArray<TInt64> markedItemIds;					
-			GetSelectedItemIdsL( markedItemIds, *markedIndexes );
-			
-			for( TInt ctr = 0; ctr < selCount; ctr++ )
-				{
-				TRAP_IGNORE( iEngine.RemoveServerL( markedItemIds[ ctr ] ) );
-				}			
-			markedItemIds.Close();			
-			}
-		}
-	DEBUG( - CLocSUPLServerView::DeleteServerL );	
-	}
-
-// -----------------------------------------------------------------------------
-// CLocSUPLServerView::DisableServerL
-// ----------------------------------------------------------------------------
-//
-void CLocSUPLServerView::DisableServerL()
-	{
-	DEBUG( + CLocSUPLServerView::DisableServerL );	
-	TInt selCount 	= iContainer->SelectedCount();
-	TInt severCount = iContainer->ServerCount();
-	
-	if ( selCount < 1 && severCount > 0 )
-		{
-		iEngine.SetServerEnabledFlagL( iContainer->CurrentSlpId(), EFalse );
-		}
-	else
-		{
-	    const CArrayFix<TInt>* markedIndexes = NULL;
-	    markedIndexes = iContainer->ListBoxL().SelectionIndexes();
-			
-		RArray<TInt64> markedItemIds;					
-		GetSelectedItemIdsL( markedItemIds, *markedIndexes );
-		
-		for( TInt ctr = 0; ctr < selCount; ctr++ )
-			{
-			iEngine.SetServerEnabledFlagL( markedItemIds[ ctr ], EFalse );
-			}			
-		markedItemIds.Close();
-		}
-	DEBUG( - CLocSUPLServerView::DisableServerL );	
-	}
-
-// -----------------------------------------------------------------------------
-// CLocSUPLServerView::EnableServerL
-// ----------------------------------------------------------------------------
-//
-void CLocSUPLServerView::EnableServerL()
-	{
-	DEBUG( + CLocSUPLServerView::EnableServerL );	
-	TInt selCount 	= iContainer->SelectedCount();
-	TInt severCount = iContainer->ServerCount();
-	
-	if ( selCount < 1 && severCount > 0 )
-		{
-		iEngine.SetServerEnabledFlagL( iContainer->CurrentSlpId(), ETrue );
-		}
-	else
-		{
-	    const CArrayFix<TInt>* markedIndexes = NULL;
-	    markedIndexes = iContainer->ListBoxL().SelectionIndexes();
-			
-		RArray<TInt64> markedItemIds;					
-		GetSelectedItemIdsL( markedItemIds, *markedIndexes );
-		
-		for( TInt ctr = 0; ctr < selCount; ctr++ )
-			{
-			iEngine.SetServerEnabledFlagL( markedItemIds[ ctr ], ETrue );
-			}			
-		markedItemIds.Close();
-		}
-	DEBUG( - CLocSUPLServerView::EnableServerL );	
-	}
-
-// -----------------------------------------------------------------------------
-// CLocSUPLServerView::ChangeMSKL
-// -----------------------------------------------------------------------------
-//
-void CLocSUPLServerView::ChangeMSKL() 
-	{
-	DEBUG( + CLocSUPLServerView::ChangeMSKL );	
-	// Listbox takes all event even if it doesn't use them
-	if( !Cba() )
-	    {
-	   	return;
-	    }
-	if( iEngine.SlpCount() <= 0 )
-		{
-		TRAP_IGNORE( 
-			Cba()->SetCommandSetL ( R_SUPLSETTINGS_SERVER_OPTIONS_BACK ) ); 
-		}
-	else if( iStartedPrioritize )
-		{
-	   iNewContainer->ListBoxL().DisableSingleClick(ETrue); 
-		iStartedPrioritize = EFalse;
-		TRAP_IGNORE( 
-			Cba()->SetCommandSetL ( R_SUPLSETTINGS_SERVER_OK_CANCEL ) ); 		
-		}
-	else
-		{
-		TRAP_IGNORE( 
-			Cba()->SetCommandSetL ( R_SUPLSETTINGS_OPTIONS_CONTEXTOPTIONS_BACK ) ); 		
-		}
-
-	Cba()->DrawDeferred();  	
-	DEBUG( - CLocSUPLServerView::ChangeMSKL );	
-	}
-
-// -----------------------------------------------------------------------------
-// CLocSUPLServerView::GetSelectedItemIdsL
-// -----------------------------------------------------------------------------
-//
-void CLocSUPLServerView::GetSelectedItemIdsL(
-    RArray<TInt64>& aSelectedItems,
-    const CArrayFix<TInt>& aSelectedIndexes ) const
-    {
-    aSelectedItems.Reset();
-    TInt itemCount = iContainer->ServerCount();
-    TInt selectionCount = aSelectedIndexes.Count();
-    for ( TInt i( 0 ); i < selectionCount; ++i )
-        {
-        TInt index = aSelectedIndexes[i];
-        User::LeaveIfError( aSelectedItems.Append( iContainer->SlpIds()[index] ) );
-        }
-    }
-
-// -----------------------------------------------------------------------------
-// CLocSUPLServerView::SelectedDisabledServerCountL
-// -----------------------------------------------------------------------------
-//
-TInt CLocSUPLServerView::SelectedDisabledServerCountL()
-	{
-    const CArrayFix<TInt>* markedIndexes = NULL;
-    markedIndexes = iContainer->ListBoxL().SelectionIndexes();
-		
-	RArray<TInt64> markedItemIds;					
-	GetSelectedItemIdsL( markedItemIds, *markedIndexes );
-	
-	TInt disabledServerCount( 0 );
-	for( TInt i( 0 ); i < markedItemIds.Count(); ++i )	
-		{
-		TBool enabledFlag;    
-		iEngine.GetServerEnabledFlagL( markedItemIds[i], enabledFlag );
-		if( !enabledFlag )
-			disabledServerCount++;		
-		}
-	return disabledServerCount;
-	}
-	
-// End of file
--- a/locationsystemui/locationsysui/locsuplsettingsui/src/locsuplsessioncontainer.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,712 +0,0 @@
-/*
-* Copyright (c) 2008 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:  SUPL session UI View's container
-*
-*/
-
-
-// System Includes
-#include <eikspane.h> 						// Status pane
-#include <akntitle.h>   					// CAknTitlePane
-#include <aknlists.h>
-#include <StringLoader.h>
-#include <locsuplsettingsui.rsg>
-#include <csxhelp/locsupl.hlp.hrh>          // Help File
-#include <aknview.h>
-#include <eikmenub.h>
-#include <gulicon.h>
-#include <AknIconUtils.h>
-#include <AknIconArray.h>
-#include <eikclbd.h>
-#include <avkon.mbg>						// for select session (mark) icon
-#include <avkon.rsg>
-#include <eiklbx.h>
-#include <ErrorUI.h>
-#include <AknsUtils.h> 
-#include <aknapp.h>
-#include <locsuplsettings.mbg>				// for session NI/TI icon
-
-// User Includes
-#include "locsuplsettings.hrh"
-#include "locsuplsettingsuid.hrh"
-#include "locsuplsessioncontainer.h"
-#include "locsuplsessionview.h"
-#include "locsuplsessionlbmodel.h"
-#include "locsuplsettingsuiengine.h"
-#include "locsuplsettingseventhandler.h"
-#include "locsupldebug.h"
-
-// CONSTANT DEFINITIONS
-const TInt KIconArrayGranularity = 2; // The number of default icons
-_LIT( KLocSuplSettingsIconFileName, "locsuplsettings.mif" );
-
-
-// ========================= MEMBER FUNCTIONS ================================
-
-// ---------------------------------------------------------------------------
-// CLocSUPLSessionContainer::CLocSUPLSessionContainer
-// Overloaded Constructor
-//
-// ---------------------------------------------------------------------------
-//	
-CLocSUPLSessionContainer::CLocSUPLSessionContainer( CLocSUPLSessionView* aView )
-    : iView( aView )
-	{
-	}
-	
-// ---------------------------------------------------------------------------
-// CLocSUPLSessionContainer::~CLocSUPLSessionContainer
-// Destructor
-//
-// ---------------------------------------------------------------------------	
-//
-CLocSUPLSessionContainer::~CLocSUPLSessionContainer()
-	{
-	DEBUG( + CLocSUPLSessionContainer::~CLocSUPLSessionContainer );	
-	// Delete the List box model only after deleting the list box
-	delete iListBox;
-	iListBox = NULL;
-	
-	delete iListBoxModel;
-	iListBoxModel = NULL;
-	DEBUG( - CLocSUPLSessionContainer::~CLocSUPLSessionContainer );	
-	}
-	
-// ---------------------------------------------------------------------------
-// CLocSUPLSessionContainer* CLocSUPLSessionContainer::NewL
-// Static Two phase constructor that instantiates the CLocSUPLSessionContainer
-//
-// @param aRect							Client rectangle
-// @param aEngine                       Reference to the SUPL Settings
-//                                      engine 
-// @param aEventHandler                 Reference to the parent view
-// @return CLocSUPLSessionContainer*	Reference to the object created
-// ---------------------------------------------------------------------------    
-//
-CLocSUPLSessionContainer* CLocSUPLSessionContainer::NewL( 
-                    		const TRect&               	aRect,
-                          	CLocSUPLSettingsUiEngine&	aEngine,
-                          	CLocSUPLSessionView* 		aView )
-	{	
-	DEBUG( + CLocSUPLSessionContainer::NewL );	
-    CLocSUPLSessionContainer* self = NewLC( aRect, 
-                                           aEngine,
-                                           aView );
-	CleanupStack::Pop( self );
-	DEBUG( - CLocSUPLSessionContainer::NewL );	
-	return self;
-	}
-
-// ---------------------------------------------------------------------------
-// CLocSUPLSessionContainer* CLocSUPLSessionContainer::NewLC
-// Static Two phase contructor that instantiates the CLocSUPLSessionContainer
-//
-// @param aRect							Client rectangle
-// @param aEngine                       Reference to the SUPL Settings
-//                                      engine 
-// @param aEventHandler                 Reference to the parent view
-// @return CLocSUPLSessionContainer*	Reference to the object created
-// ---------------------------------------------------------------------------  
-//  
-CLocSUPLSessionContainer* CLocSUPLSessionContainer::NewLC( 
-                    		const TRect&               	aRect,
-                          	CLocSUPLSettingsUiEngine&	aEngine,
-                          	CLocSUPLSessionView* 		aView )
-	{	
-    CLocSUPLSessionContainer* self = new ( ELeave ) CLocSUPLSessionContainer(
-                                                        aView );
-	CleanupStack::PushL( self );
-	self->ConstructL( aRect, aEngine );
-	return self;
-	}
-
-// --------------------------------------------------------------------------- 
-// void CLocSUPLSessionContainer::ConstructL
-// Second phase of the two phase Construction process
-//
-// @param aRect				 Client rectangle
-// @param aEngine            Reference to the SUPL Settings engine
-// ---------------------------------------------------------------------------
-//
-void CLocSUPLSessionContainer::ConstructL( 
-                                    const TRect& 	aRect ,
-                                    CLocSUPLSettingsUiEngine&     aEngine )
-	{
-	DEBUG( + CLocSUPLSessionContainer::ConstructL );	
-	//Make this control a window-owning control
-	CreateWindowL(); 
-	
-	// Create a New Title for the View
-	MakeTitleL( R_LOC_SUPL_SERVICES_TITLE );
-	
-	CreateListboxL( aEngine );
-	
-	// Get the Help context
-	iContextName = KLOC_HLP_SUPL();
-	
-    SetRect( aRect );
-    ActivateL();
-	DEBUG( - CLocSUPLSessionContainer::ConstructL );	
-	}	
-
-// ---------------------------------------------------------------------------
-// void CLocSUPLSessionContainer::UpdateScreenL
-// Refreshes the screen so that the list box reflects the latest contents
-// ---------------------------------------------------------------------------
-//
-void CLocSUPLSessionContainer::UpdateScreenL()
-    {
-	DEBUG( + CLocSUPLSessionContainer::UpdateScreenL );	
-	
-	TInt oldCount 	= SessionIds().Count();	
-	TInt64 sessionId;
-	if( iSelectedIndex != KErrNotFound && SessionIds().Count() > iSelectedIndex )
-		{
-		sessionId = SessionIds()[ iSelectedIndex ];		
-		}
-	
-	if ( iListBoxModel )
-		{
-		iListBoxModel->UpdateSessionIdsL();
-		}    
-		
-    TInt newCount 	= SessionIds().Count();
-    
-    if ( iListBox )
-        {
-    	// Update Listbox items
-        if( newCount <= 0 || newCount == oldCount )
-        	{
-         	TRAP_IGNORE( iListBox->HandleItemAdditionL() );
-	    	TRAP_IGNORE( iListBox->HandleItemRemovalL() );       	
-        	}
-        else if( newCount > oldCount )
-        	{
-        	// notify the listbox for item addition 
-        	TRAP_IGNORE( iListBox->HandleItemAdditionL() );
-
-        	// set focus to newly added item
-			TInt index = iListBox->CurrentItemIndex();	
-			if( index == 0 && newCount == 1 )
-				{
-				iListBox->SetCurrentItemIndex( 0 );	
-				}
-			else
-				{
-				iListBox->SetCurrentItemIndex( newCount - 1 );	
-				}
-        	}
-        else if( newCount < oldCount )
-        	{
-        	// notify the listbox for item deletion 
-	    	TRAP_IGNORE( iListBox->HandleItemRemovalL() );
-			
-        	// set focus at last selected item or index			
-			if( iSelectedIndex > newCount-1 )
-				{
-				iListBox->SetCurrentItemIndex( newCount - 1 );
-				}
-			else
-				{
-				TInt newIndex = SessionIds().Find( sessionId );
-				if( newIndex != KErrNotFound )
-					{
-					iListBox->SetCurrentItemIndex( newIndex );
-					}
-				else
-					{
-					iListBox->SetCurrentItemIndex( iSelectedIndex );				
-					}				
-				}
-        	}
-        }        
-    DrawDeferred();
-	DEBUG( - CLocSUPLSessionContainer::UpdateScreenL );	
-    }
-
-// ---------------------------------------------------------------------------
-// void CLocSUPLSessionContainer::HandleResourceChange
-//
-// ---------------------------------------------------------------------------	
-void CLocSUPLSessionContainer::HandleResourceChange(TInt aType)
-	{
-	DEBUG( + CLocSUPLSessionContainer::HandleResourceChange );	
-	// Pass the event to the base class
-	CCoeControl::HandleResourceChange(aType);
-    switch( aType )
-    	{
-    	// Dynamic Layout switch
-    	case KEikDynamicLayoutVariantSwitch:
-    		{
-    		SetRect( iView->ClientRect() );
-			break;
-    		}
-    	default:
-    		{
-    		break;
-    		}
-    	}
-	DEBUG( - CLocSUPLSessionContainer::HandleResourceChange );	
-	}
-
-// -----------------------------------------------------------------------------
-// CLocSUPLSessionContainer::GetHelpContext
-//
-// -----------------------------------------------------------------------------
-//
-void CLocSUPLSessionContainer::GetHelpContext( TCoeHelpContext& aContext ) const
-    {
-	DEBUG( + CLocSUPLSessionContainer::GetHelpContext );	
-    aContext.iContext = iContextName;
-    aContext.iMajor = TUid::Uid( KLOCSUPLSETTINGSUIUID3 );
-	DEBUG( - CLocSUPLSessionContainer::GetHelpContext );	
-    }
-    
-// ---------------------------------------------------------------------------
-// TInt CLocSUPLSessionContainer::CountComponentControls
-//
-// ---------------------------------------------------------------------------
-TInt CLocSUPLSessionContainer::CountComponentControls() const
-	{
-	return 1;
-	}
-
-// ---------------------------------------------------------------------------
-// CCoeControl* CLocSUPLSessionContainer::ComponentControl
-//
-// ---------------------------------------------------------------------------
-CCoeControl* CLocSUPLSessionContainer::ComponentControl( TInt /*aIndex*/ ) const
-	{
-	return iListBox;	
-	}
-
-// ---------------------------------------------------------------------------
-// void CLocSUPLSessionContainer::OfferKeyEventL
-//
-// ---------------------------------------------------------------------------	
-//
-TKeyResponse CLocSUPLSessionContainer::OfferKeyEventL( const TKeyEvent& aKeyEvent,
-										   					  TEventCode aType )
-	{
-	TKeyResponse keyresponse = EKeyWasNotConsumed;
-	
-    // Now handle the Key Event based on the Key type
-    switch ( aKeyEvent.iScanCode )
-        {            
-        case EStdKeyUpArrow:
-        case EStdKeyDownArrow:
-            {
-            keyresponse = iListBox->OfferKeyEventL( aKeyEvent, aType );
-            iView->ChangeMSKL();
-            return keyresponse;         
-            }
-        case EStdKeyBackspace:
-        case EStdKeyDelete:
-            {
-            if(aType == EEventKey )
-                {
-                keyresponse = iListBox->OfferKeyEventL( aKeyEvent, aType );
-                iView->HandleCommandL( ELocSuplSessionTerminate ); 
-                }
-            return keyresponse;               
-            }
-        case EStdKeyHash:
-            {
-            TBool shiftKeyPressed = ( aKeyEvent.iModifiers & EModifierShift );
-            keyresponse = iListBox->OfferKeyEventL( aKeyEvent, aType );
-            if( aType == EEventKeyUp && ( EKeyWasConsumed == keyresponse || !shiftKeyPressed ) )
-                iView->ChangeMSKL();
-            return keyresponse;    
-            }
-        default:
-            {
-            break;  
-            }
-        }
-
-    // now it's iListBox's job to process the key event
-    return iListBox->OfferKeyEventL( aKeyEvent, aType ); 
-	}
-	    
-// ---------------------------------------------------------------------------
-// void CLocSUPLSessionContainer::HandleListBoxEventL
-//
-// ---------------------------------------------------------------------------
-//
-void CLocSUPLSessionContainer::HandleListBoxEventL( CEikListBox*  /* aListBox */, 
-		 						   					 TListBoxEvent aEventType )
-	{
-	DEBUG( + CLocSUPLSessionContainer::HandleListBoxEventL );	
-	switch ( aEventType )
-        {
-        case EEventItemClicked:
-            {
-            // The item is just selected here. Change the MSK to reflect
-            // the Correct MSK value
-            iView->ChangeMSKL();
-            break;    
-            }
-        // List box Item Selection
-        case EEventEnterKeyPressed:
-        case EEventItemSingleClicked:
-            {
-            if( SelectedCount() )
-                {
-                //display menu specific to editor
-                ShowContextMenuL();
-                }
-            else
-                {
-                iView->HandleCommandL( ELocSuplSessionOpen );   
-                }
-            break;	
-            }
-        default:
-           break;
-        }
-	DEBUG( - CLocSUPLSessionContainer::HandleListBoxEventL );	
-	}
-	         		 	
-// ---------------------------------------------------------------------------
-// void CLocSUPLSessionContainer::FocusChanged
-//
-// ---------------------------------------------------------------------------
-//
-void CLocSUPLSessionContainer::FocusChanged( TDrawNow aDrawNow )
-	{
-	CCoeControl::FocusChanged( aDrawNow );
-	// The focus event has to be explicitly handed over to all the compound
-	// controls since CCoeControl does not do that implicitly
-	if ( iListBox )
-		{
-		iListBox->SetFocus( IsFocused(), aDrawNow );				
-		}
-	}
-		
-// ---------------------------------------------------------------------------
-// CLocSUPLSessionContainer::SizeChanged
-// 
-// ---------------------------------------------------------------------------
-//
-void CLocSUPLSessionContainer::SizeChanged()
-	{
-	if ( iListBox )
-		{
-		iListBox->SetRect( Rect() );
-		}
-	}
-	
-// ---------------------------------------------------------------------------
-// void CLocSUPLSessionContainer::MakeTitleL
-// Sets the Title text
-//
-// @param aResourceText Resource to create title
-// ---------------------------------------------------------------------------
-//
-void CLocSUPLSessionContainer::MakeTitleL( TInt aResourceText )
-	{
-	DEBUG( + CLocSUPLSessionContainer::MakeTitleL );	
-	// Obtain the title from the Status Pane
-	CAknTitlePane* title = static_cast < CAknTitlePane* >( StatusPane()->
-        ControlL( TUid::Uid( EEikStatusPaneUidTitle ) ) );
-       
-    // Set the Title's buffer    
-    HBufC* buf = StringLoader::LoadL( aResourceText );
-    title->SetText( buf ); // Takes ownership of buf
-	DEBUG( - CLocSUPLSessionContainer::MakeTitleL );	
-	}
-
-// ---------------------------------------------------------------------------
-// void CLocSUPLSessionContainer::StatusPane
-// Returns the Appui's status pane
-//
-// @return CEikStatusPane* Statuspane pointer
-// ---------------------------------------------------------------------------
-//
-CEikStatusPane* CLocSUPLSessionContainer::StatusPane()
-	{
-	return iEikonEnv->AppUiFactory()->StatusPane();	
-	}
-
-// ---------------------------------------------------------------------------
-// void CLocSUPLSessionContainer::CreateListboxL
-// Creates the List box and the Listbox model. Associates the list box model 
-// with the list box
-//
-// @param aEngine                       Reference to the SUPL Settings
-//                                      engine 
-// ---------------------------------------------------------------------------	
-//
-void CLocSUPLSessionContainer::CreateListboxL( 
-                                    CLocSUPLSettingsUiEngine&     aEngine )
-	{
-	DEBUG( + CLocSUPLSessionContainer::CreateListboxL );	
-	// Create the Listbox model
-    iListBoxModel = CLocSUPLSessionLBModel::NewL( aEngine );
-	
-	// CAknSingleGraphicStyleListBox	"0\tTextLabel\t1\t2"
-	
-    iListBox = new ( ELeave ) CAknSingleGraphicStyleListBox;
-	iListBox->ConstructL( 
-						this, 
-						#ifdef RD_SCALABLE_UI_V2
-						EAknListBoxStylusMarkableList
-						#else
-						EAknListBoxMarkableList
-						#endif //RD_SCALABLE_UI_V2
-						);
-    // Set the container control.
-	iListBox->SetContainerWindowL( *this );
-    // Add scrollbars to listbox
-	iListBox->CreateScrollBarFrameL( ETrue );
-	iListBox->ScrollBarFrame()->SetScrollBarVisibilityL( CEikScrollBarFrame::EOff,
-														 CEikScrollBarFrame::EAuto );
-    // Icon array, needed only if listbox style is single number with graphic.
-    CAknIconArray* icons = new( ELeave ) CAknIconArray( KIconArrayGranularity );
-    CleanupStack::PushL( icons );
-
-    TFileName avkonIconFile = AknIconUtils::AvkonIconFileName();
-	
-    TRAP_IGNORE( AddIconL(   *icons, 
-                avkonIconFile,
-                KAknsIIDQgnIndiMarkedAdd, 
-                EMbmAvkonQgn_indi_marked_add, 
-                EMbmAvkonQgn_indi_marked_add_mask ) );
- 	
-	TFileName *iconFile = IconFileNameLC();
-    
-    TRAP_IGNORE( AddIconL(   *icons, 
-                *iconFile,
-                KAknsIIDQgnPropRadiobuttOff, 
-                EMbmLocsuplsettingsQgn_loc_server_disabled, 
-                EMbmLocsuplsettingsQgn_loc_server_disabled_mask ) );
-    
-    TRAP_IGNORE( AddIconL(   *icons, 
-                *iconFile,
-                KAknsIIDQgnPropRadiobuttOff, 
-                EMbmLocsuplsettingsQgn_loc_server_disabled, 
-                EMbmLocsuplsettingsQgn_loc_server_disabled_mask ) );
- 	
- 	CleanupStack::PopAndDestroy( iconFile );
-	
-    iListBox->ItemDrawer()->ColumnData()->SetIconArray( icons );
-    CleanupStack::Pop( icons );        
-    
-    // Set the model & observer
-    iListBox->SetListBoxObserver( this  );
-
-    iListBox->Model()->SetItemTextArray( iListBoxModel );
-    iListBox->Model()->SetOwnershipType( ELbmDoesNotOwnItemArray );									
-    iListBox->ActivateL();   
-	DEBUG( - CLocSUPLSessionContainer::CreateListboxL );	
-	}
-
-// -----------------------------------------------------------------------------
-// CLocSUPLSessionContainer::AddIconL
-// -----------------------------------------------------------------------------
-void CLocSUPLSessionContainer::AddIconL( CAknIconArray&  aIcons,
-                                           const TDesC&    aIconFileWithPath,
-                                           TAknsItemID     aSkinID,
-                                           TInt            aIconGraphicsIndex,
-                                           TInt            aIconGraphicsMaskIndex )
-    {
-	DEBUG( + CLocSUPLSessionContainer::AddIconL );	
-    MAknsSkinInstance* skin = AknsUtils::SkinInstance();
-  
-    CFbsBitmap* bitmap = NULL;
-    CFbsBitmap* bitmapMask = NULL;
-    
-    TRAPD( err, AknsUtils::CreateIconL( skin,
-                            aSkinID,
-                            bitmap,
-                            bitmapMask,
-                            aIconFileWithPath,
-                            aIconGraphicsIndex,
-                            aIconGraphicsMaskIndex ) );
-
-    if(err != KErrNone)
-        {
-        TRAP( err, AknIconUtils::CreateIconL( bitmap,
-                                bitmapMask,
-                                aIconFileWithPath,
-                                aIconGraphicsIndex,
-                                aIconGraphicsMaskIndex ) );
-        }
-    User::LeaveIfError( err );
-    
-    CleanupStack::PushL( bitmap );
-    CleanupStack::PushL( bitmapMask );
-    
-    CGulIcon* icon = CGulIcon::NewL( bitmap, bitmapMask );
-    
-    // Remove the Bitmap and the Bitmap Icon from the Clean up stack since 
-    // the ownership is taken over by the icon
-    CleanupStack::Pop( bitmapMask );
-    CleanupStack::Pop( bitmap ); 
-    
-    CleanupStack::PushL( icon );
-    aIcons.AppendL( icon );
-    CleanupStack::Pop( icon ); // icon
-	DEBUG( - CLocSUPLSessionContainer::AddIconL );	
-    }
-
-// -----------------------------------------------------------------------------
-// CLocSUPLSessionContainer::IconFileNameLC
-// -----------------------------------------------------------------------------
-TFileName* CLocSUPLSessionContainer::IconFileNameLC() const
-    {
-    TFileName* fileName = new(ELeave) TFileName;
-    CleanupStack::PushL( fileName );
-    
-	TFileName* tmpName = new(ELeave) TFileName;
-    CleanupStack::PushL( tmpName );
-	
-    tmpName->Append( KDC_BITMAP_DIR );
-    tmpName->Append( KLocSuplSettingsIconFileName );
-
-    CEikAppUi *appUi = ( CEikAppUi *)( CEikonEnv::Static()->AppUi());
-    TFileName appDrive = appUi->Application()->AppFullName();
-    
-    TParse parse;
-    User::LeaveIfError( parse.Set( appDrive, NULL, NULL ) );
-    User::LeaveIfError( parse.Set( parse.Drive(), tmpName, NULL ) );
-    
-	fileName->Copy(parse.FullName());
-
-    CleanupStack::PopAndDestroy( tmpName );
-
-    return fileName;
-    }    
-  
-// ----------------------------------------------------------------------------
-// CLocSUPLSessionContainer::ListBoxL()
-// ----------------------------------------------------------------------------
-//
-CEikListBox& CLocSUPLSessionContainer::ListBoxL()
-    {
-    User::LeaveIfNull( iListBox );
-    return *iListBox;
-    }
-
-// -----------------------------------------------------------------------------
-// TInt CLocSUPLSessionContainer::SelectedItemIndex
-// Returns the Selected element. The list box model defines the enumeration that
-// would determine the current element that has been selected
-//
-// @return TInt Index of the item selected
-// -----------------------------------------------------------------------------
-//
-TInt CLocSUPLSessionContainer::SelectedItemIndex()
-    {
-    return iListBox->CurrentItemIndex();
-    }
-    
-// ---------------------------------------------------------------------------
-// void CLocSUPLSessionContainer::FocusToSessionDetailL
-// Focus move to server detail setting item
-//
-// ---------------------------------------------------------------------------
-//
-void CLocSUPLSessionContainer::FocusToSessionDetailL( TInt aIndex )
-	{
-		iListBox->SetCurrentItemIndex( aIndex );
-	}
-				       
-// ----------------------------------------------------------------------------
-// CLocSUPLSessionContainer::CurrentSessionId()
-// ----------------------------------------------------------------------------
-//
-TInt64 CLocSUPLSessionContainer::CurrentSessionId()
-	{
-	if( SelectedItemIndex() != KErrNotFound && SelectedItemIndex() < SessionCount() )
-		return iListBoxModel->SessionIds()[ SelectedItemIndex() ];
-	else
-		return KErrNotFound;
-	}
-
-// ----------------------------------------------------------------------------
-// CLocSUPLSessionContainer::SelectedCount()
-// ----------------------------------------------------------------------------
-//
-TInt CLocSUPLSessionContainer::SelectedCount()
-	{
-	return iListBox->SelectionIndexes()->Count();
-	}
-
-// ----------------------------------------------------------------------------
-// CLocSUPLSessionContainer::SessionCount()
-// ----------------------------------------------------------------------------
-//
-TInt CLocSUPLSessionContainer::SessionCount()
-	{
-	return iListBox->Model()->NumberOfItems();
-	}
-
-// ---------------------------------------------------------------------------
-// CLocSUPLSessionContainer::SessionIds()
-// returns server id array
-//
-// ---------------------------------------------------------------------------
-//  
-RArray<TInt64>& CLocSUPLSessionContainer::SessionIds()
-	{
-	return iListBoxModel->SessionIds();
-	}
-
-// ---------------------------------------------------------------------------
-// CLocSUPLSessionContainer::SetIndex()
-// sets the current selected item
-//
-// ---------------------------------------------------------------------------
-//  
-void CLocSUPLSessionContainer::SetSelectedIndex()
-	{
-	iSelectedIndex = SelectedItemIndex();
-	}
-
-// ---------------------------------------------------------------------------
-// CLocSUPLSessionContainer::CurrentSessionName()
-// Get the currently focused session name
-//
-// ---------------------------------------------------------------------------
-//  
-TPtrC CLocSUPLSessionContainer::CurrentSessionName()
-	{
-	if( SelectedCount() == 1 )
-		return iListBoxModel->SessionName( iListBox->SelectionIndexes()->At(0) );
-	else
-		return iListBoxModel->SessionName( SelectedItemIndex() );
-	}
-
-// -----------------------------------------------------------------------------
-// CLocSUPLSessionContainer::ShowContextMenuL
-// Shows context specific options menu
-// -----------------------------------------------------------------------------
-//
-void CLocSUPLSessionContainer::ShowContextMenuL()
-    {
-	DEBUG( + CLocSUPLSessionContainer::ShowContextMenuL );	
-	
-	// Switch to Context specific options menu,
-	// Show it and switch back to main options menu.
-	CEikMenuBar* menuBar = iView->MenuBar();
-	// TRAP displaying of menu bar.
-	// If it fails, the correct resource is set back before leave.
-	TRAPD( err, menuBar->TryDisplayContextMenuBarL() );
-	User::LeaveIfError( err );
-	
-	DEBUG( - CLocSUPLSessionContainer::ShowContextMenuL );	
-    }
-
-// End of file
--- a/locationsystemui/locationsysui/locsuplsettingsui/src/locsuplsessioneditor.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,660 +0,0 @@
-/*
-* Copyright (c) 2008 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:  Implements the CLocSUPLSessionEditor class
-*
-*/
-
-
-
-#include <aknappui.h>
-#include <AknIconArray.h>       // Icon Array
-#include <AknsUtils.h>
-#include <AknsSkinInstance.h>
-#include <akntitle.h>       	// CAknTitlePane
-#include <avkon.rsg>
-#include <avkon.hrh>
-#include <e32math.h>
-#include <eikapp.h>
-#include <eikaufty.h>
-#include <eikcapc.h>
-#include <eikedwin.h>
-#include <eikenv.h>
-#include <eikmenup.h>
-#include <eikmenub.h>
-#include <eikspane.h>       	// Status pane
-#include <barsread.h>           // For TResourceReader
-#include <bautils.h> 
-#include <AknQueryDialog.h>
-#include <data_caging_path_literals.hrh>
-#include <gulicon.h>            // Gul Icon
-#include <StringLoader.h>
-#include <hlplch.h>
-
-#include <epos_csuplsettingsconstants.h>
-#include <epos_csuplsettingparams.h>
-
-#include <locsuplsettingsui.rsg>
-#include "locsuplsettings.hrh"
-#include "locsuplsessioneditor.h"
-#include "locsuplsettingsuiengine.h"
-#include "locsupldebug.h"
-
-// Constants
-const TInt KMinToSecs = 60;
-const TInt KHrToSecs  = 3600;
-const TInt KdayToSecs = 86400;
-const TInt KRealWidth = 50;
-
-// ============================ LOCAL FUNCTIONS ===============================
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// CLocSUPLSessionEditor::CLocSUPLSessionEditor
-// -----------------------------------------------------------------------------
-//
-CLocSUPLSessionEditor::CLocSUPLSessionEditor( 
-                            CLocSUPLSettingsUiEngine&       aEngine,
-        					TInt64 aSessionId
-		):iEngine( aEngine ), iSessionId( aSessionId )
-    {  	
-    }
-
-// -----------------------------------------------------------------------------
-// CLocSUPLSessionEditor::ConstructL
-// -----------------------------------------------------------------------------
-//
-void CLocSUPLSessionEditor::ConstructL()
-    {
-	DEBUG( + CLocSUPLSessionEditor::ConstructL );
-    CAknForm::ConstructL( R_SUPLSESSION_EDITOR_MENU_BAR );
-
-    // Save original title
-    CEikStatusPane* statusPane = iAvkonAppUi->StatusPane();
-    iTitlePane = ( CAknTitlePane* ) statusPane->ControlL(
-        TUid::Uid( EEikStatusPaneUidTitle ) );
-    iOriginalTitle = iTitlePane->Text()->AllocL();
-
-    iSessionName = HBufC::NewL( KMaxTriggerSessionNameLen ); 
-    
-    // Set Session Observer
-    iEngine.SetSessionObserver( this );
-	
-	DEBUG( - CLocSUPLSessionEditor::ConstructL );
-    }
-
-// -----------------------------------------------------------------------------
-// CLocSUPLSessionEditor::NewL
-// -----------------------------------------------------------------------------
-//
-CLocSUPLSessionEditor* CLocSUPLSessionEditor::NewL( 
-                            CLocSUPLSettingsUiEngine&       aEngine,
-        					TInt64 aSessionId
-		)
-	{	
-    CLocSUPLSessionEditor* self = NewLC( aEngine, aSessionId );
-	CleanupStack::Pop( self );
-	return self;
-	}
-
-// -----------------------------------------------------------------------------
-// CLocSUPLSessionEditor::NewLC
-// -----------------------------------------------------------------------------
-//
-CLocSUPLSessionEditor* CLocSUPLSessionEditor::NewLC( 
-                            CLocSUPLSettingsUiEngine&       aEngine,
-        					TInt64 aSessionId
-		)
-    {
-    CLocSUPLSessionEditor* self = new ( ELeave ) 
-    			CLocSUPLSessionEditor( aEngine, aSessionId );
-    CleanupStack::PushL( self );
-    self->ConstructL();
-    return self;
-    }
-
-// -----------------------------------------------------------------------------
-// CLocSUPLSessionEditor::~CLocSUPLSessionEditor
-// -----------------------------------------------------------------------------
-//
-CLocSUPLSessionEditor::~CLocSUPLSessionEditor()
-    {
-	DEBUG( + CLocSUPLSessionEditor::~CLocSUPLSessionEditor );
-	
-	// Delete Buffer
-	delete iSessionName;
-
-	// Remove the Observer set
-	iEngine.RemoveSessionObserver();
-	
-    // Restore title pane. Ownership of iTitlePane transferred.
-    if ( iTitlePane && iOriginalTitle )
-        {
-        iTitlePane->SetText( iOriginalTitle );
-        }
-	
-	DEBUG( - CLocSUPLSessionEditor::~CLocSUPLSessionEditor );	
-    }
-
-// -----------------------------------------------------------------------------
-// CLocSUPLSessionEditor::DynInitMenuPaneL
-// -----------------------------------------------------------------------------
-//
-void CLocSUPLSessionEditor::DynInitMenuPaneL(
-    TInt aResourceId,
-    CEikMenuPane* aMenuPane )
-    {
-	DEBUG( + CLocSUPLSessionEditor::DynInitMenuPaneL );
-    CAknForm::DynInitMenuPaneL( aResourceId, aMenuPane );
-
-    if ( aResourceId == R_AVKON_FORM_MENUPANE )
-        {
-        // We do not want to allow the user to modify our Form therefore
-        // Disable the Label, Add, Delete, and Save Field
-        aMenuPane->SetItemDimmed( EAknFormCmdLabel, ETrue );
-        aMenuPane->SetItemDimmed( EAknFormCmdAdd, 	ETrue );
-		aMenuPane->SetItemDimmed( EAknFormCmdDelete,ETrue );
-        aMenuPane->SetItemDimmed( EAknFormCmdSave, 	ETrue );
-        aMenuPane->SetItemDimmed( EAknFormCmdEdit, 	ETrue );
-		
-    	aMenuPane->SetItemDimmed( ELocSessionEditorTerminate, 	EFalse );	 	       			    	
-        				
-		switch( IdOfFocusControl() )
-			{
-			case ELocSuplSessionNotificationStatus:
-				{
-				aMenuPane->SetItemDimmed( ELocSessionEditorChange, 	EFalse );
-				break;
-				}
-			case ELocSuplSessionType:
-			case ELocSuplSessionTimePeriod:
-			case ELocSuplSessionTriggerInterval:
-			case ELocSuplSessionOutstandingTrigger:
-			default:
-				{
-				aMenuPane->SetItemDimmed( ELocSessionEditorChange, 	ETrue );
-				break;
-				}
-			}			     
-        }
-	DEBUG( - CLocSUPLSessionEditor::DynInitMenuPaneL );
-    }
-
-// -----------------------------------------------------------------------------
-// CLocSUPLSessionEditor::ProcessCommandL
-// -----------------------------------------------------------------------------
-//
-void CLocSUPLSessionEditor::ProcessCommandL( TInt aCommandId )
-	{
-	DEBUG1( + CLocSUPLSessionEditor::ProcessCommandL aCommandId=%d, aCommandId );
-	CAknForm::ProcessCommandL( aCommandId );
-
-	switch ( aCommandId )
-       	{
-       	case ELocSessionEditorChange:
-       		{
-       		TBool status = ETrue;
-            CAknPopupFieldText* notificationStatus =
-                            (CAknPopupFieldText*)Control( ELocSuplSessionNotificationStatus );
-            if(notificationStatus)
-                {          
-                if( notificationStatus->CurrentValueIndex() == 0 )
-                    {
-                    status = EFalse;
-                    }
-                }
-                  
-       	    iEngine.ChangeNotificationStatusL( iSessionId, status );					
-       		break;
-       		}
-       	case ELocSessionEditorTerminate:
-       		{
-       		if( DeleteConfirmationQueryL() )
-       			{
-       			iEngine.RemoveTriggerSessionL( iSessionId );
-        		   // Return back to Session view
-	       		   TryExitL( EAknSoftkeyBack );
-      			}       			
-       		break;
-       		}
-       	case EAknCmdHelp:
-       		{
-          HlpLauncher::LaunchHelpApplicationL( iCoeEnv->WsSession(),
-                                              iAvkonAppUi->AppHelpContextL() );			
-       		break;
-       		}
-       	case EEikCmdExit:
-       		{
-       		// The Exit is handled by the Application UI
-       		TryExitL( EEikCmdExit );
-       		break;
-       		}
-		default:
-			break;
-       	}
-	DEBUG( - CLocSUPLSessionEditor::ProcessCommandL );
-	}
-	
-// -----------------------------------------------------------------------------
-// CLocSUPLSessionEditor::OfferKeyEventL
-// -----------------------------------------------------------------------------
-//
-TKeyResponse CLocSUPLSessionEditor::OfferKeyEventL( const TKeyEvent& aKeyEvent,
-                                             TEventCode aType )
-    {
-	DEBUG( CLocSUPLSessionEditor::OfferKeyEventL );
-	if ( aType == EEventKey )
-		{
-		if( aKeyEvent.iCode == EKeyBackspace )		
-            {
-        	ProcessCommandL( ELocSessionEditorTerminate );            	
-        	return EKeyWasConsumed;
-            }      
-
-		if ( aKeyEvent.iCode == EKeyEnter || aKeyEvent.iScanCode == EStdKeyEnter ) 
-			{
-		    if ( IdOfFocusControl() == ELocSuplSessionNotificationStatus )
-		    	{
-				ProcessCommandL( ELocSessionEditorChange );  	
-        	    return EKeyWasConsumed;  	
-		    	}
-			}         
-		}
-		
-    return CAknForm::OfferKeyEventL( aKeyEvent, aType );    
-    }
-    
-// ---------------------------------------------------------------------------
-// CLocSUPLSessionEditor ::OkToExitL()
-// ---------------------------------------------------------------------------
-//
-TBool CLocSUPLSessionEditor::OkToExitL( TInt aButtonId )
-    {
-	DEBUG1( + CLocSUPLSessionEditor::OkToExitL aButtonId=%d, aButtonId );
-    TBool retVal = EFalse;
-    	
-    switch( aButtonId )
-        {
-        case EAknSoftkeyChange:
-        	{
-        	ProcessCommandL( ELocSessionEditorChange );
-        	break;
-        	}
-        case EAknSoftkeyOptions: //when LSK is pressed
-            {
-            //display menu specific to editor
-            DisplayMenuL();
-            break;
-            }            
-        case EAknSoftkeyBack: 
-        case EEikCmdExit: 
-            {
-            //close editor            
-            retVal = ETrue;
-            break;
-            }
-        case ELocServerEditorNoCmd:
-        default: // close editor in all other cases
-            {
-            break;
-            }
-        }
-	DEBUG1( - CLocSUPLSessionEditor::OkToExitL retVal=%d, retVal );
-    return retVal;
-    }
-    
-// ---------------------------------------------------------------------------
-// CLocSUPLSessionEditor ::PreLayoutDynInitL()
-// ---------------------------------------------------------------------------
-//
-void CLocSUPLSessionEditor::PreLayoutDynInitL()
-    {    
-	DEBUG( + CLocSUPLSessionEditor::PreLayoutDynInitL );
-    CAknForm::PreLayoutDynInitL();
-    
-    //Load the values into the editor fields  
-    LoadFormValuesFromDataL();
-    
-	DEBUG( - CLocSUPLSessionEditor::PreLayoutDynInitL );
-    }
-
-// ---------------------------------------------------------------------------
-// CLocSUPLSessionEditor ::PostLayoutDynInitL()
-// ---------------------------------------------------------------------------
-//
-void CLocSUPLSessionEditor::PostLayoutDynInitL()
-    {
-	DEBUG( + CLocSUPLSessionEditor::PostLayoutDynInitL );
-    CAknForm::PostLayoutDynInitL();   
-
-    HandleMSKCaptionL();			    	
-	
-	DEBUG( - CLocSUPLSessionEditor::PostLayoutDynInitL );
-    }
-    
-// ---------------------------------------------------------------------------
-// CLocSUPLSessionEditor ::LineChangedL()
-// ---------------------------------------------------------------------------
-//
-void CLocSUPLSessionEditor::LineChangedL(TInt /*aControlId*/)
-    {
-    HandleMSKCaptionL(); 
-    }
-
-// -----------------------------------------------------------------------------
-// CLocSUPLSessionEditor::ExecuteLD
-// -----------------------------------------------------------------------------
-//
-TInt CLocSUPLSessionEditor::ExecuteLD()
-    {    
-	return CAknForm::ExecuteLD( R_SUPLSESSION_EDITOR_FORM_DIALOG );    	
-    }
-
-// ---------------------------------------------------------------------------
-// CLocSUPLSessionEditor ::LoadFormValuesFromDataL()
-// Called when the form is executed and when the user chooses to discard changes
-// in QuerySaveChangesL (via  DoNotSaveFormDataL).
-// ---------------------------------------------------------------------------
-// 
-void CLocSUPLSessionEditor::LoadFormValuesFromDataL()
-    {
-	DEBUG( + CLocSUPLSessionEditor::LoadFormValuesFromDataL );  
-   	
-    TUint64 outstandingTriggers = 0;
-    TUint64 timeInterval = 0;
-    TUint64 timePeriod = 0;
-    TBool notificationPresent = EFalse;
-    TBool triggerNotificationStatus = EFalse; 
-    CTriggerParams::TTriggerType triggerType; 
-    CTriggerParams::TRequestType requestType;
-   	
-    iSessionName->Des().Zero();
-    
-   	CTriggerParams *triggerParams = CTriggerParams::NewL();
-   	CleanupStack::PushL( triggerParams );
-   	
-   	TInt err = KErrNone;
-   	TRAP( err, iEngine.GetTriggerParamsL( iSessionId, triggerParams ) );
-	    		    
-    if( !err )
-        {
-        triggerParams->Get(
-		    							iSessionId, 
-		    							iSessionName->Des(), 
-		    							notificationPresent, 
-		    							triggerNotificationStatus, 
-		    							triggerType,
-		    							requestType, 
-		    							outstandingTriggers, 
-		    							timeInterval);
-    
-        timePeriod = timeInterval * outstandingTriggers;
-        }
-    							
-   	CleanupStack::PopAndDestroy( triggerParams );
-   	
-    // update the title pane caption
-    if( !iSessionName->Length() )
-        {
-        HBufC* unknownString = StringLoader::LoadLC( R_LOC_SERVICES_TITLE_UNKNOWN ); 
-        iSessionName->Des().Copy( *unknownString );
-        CleanupStack::PopAndDestroy( unknownString );
-        }
-
-    ChangeTitlePaneTextL( *iSessionName ); 
-
-    // Update the Editor Fields
-    CAknPopupFieldText* notificationStatusPopupFieldText = 
-    			( CAknPopupFieldText* ) Control( ELocSuplSessionNotificationStatus );
-    if( notificationStatusPopupFieldText )
-        {  
-        if( triggerNotificationStatus  )
-        	notificationStatusPopupFieldText->SetCurrentValueIndex( 0 );                  	
-        else
-        	notificationStatusPopupFieldText->SetCurrentValueIndex( 1 );    
-        } 
-
-    CAknPopupFieldText* typePopupFieldText = 
-    			( CAknPopupFieldText* ) Control( ELocSuplSessionType );
-    if( typePopupFieldText )
-        {  
-        typePopupFieldText->SetCurrentValueIndex( 0 );          
-        }   
-
-    CAknIntegerEdwin* outstandingTriggersEdwin = 
-    			static_cast < CAknIntegerEdwin* > ( ControlOrNull( ELocSuplSessionOutstandingTrigger ) );           
-    if( outstandingTriggersEdwin )
-        { 
-        outstandingTriggersEdwin->SetValueL( outstandingTriggers );
-    	
-    	outstandingTriggersEdwin->DrawNow();
-        } 
-   	
-   	// Calculate the Time period
-	HBufC* periodString = NULL;
-	HBufC* intervalString = NULL;
-	GetTimeStringL( intervalString, timeInterval );
-	GetTimeStringL( periodString, timePeriod );
-	CleanupStack::PushL( periodString );
-	CleanupStack::PushL( intervalString );
-
-    CEikEdwin* timePeriodEdwin = 
-    			static_cast < CEikEdwin* > ( ControlOrNull( ELocSuplSessionTimePeriod ) );           
-    if( timePeriodEdwin )
-        { 
-        timePeriodEdwin->SetTextL( periodString );
-    	
-    	timePeriodEdwin->DrawNow();
-        }     
-
-    CEikEdwin* timeIntervalEdwin = 
-    			static_cast < CEikEdwin* > ( ControlOrNull( ELocSuplSessionTriggerInterval ) );           
-    if( timeIntervalEdwin )
-        { 
-        timeIntervalEdwin->SetTextL( intervalString );
-    	
-    	timeIntervalEdwin->DrawNow();
-        }                                 	
-        
-	CleanupStack::PopAndDestroy( );	//	intervalString
-	CleanupStack::PopAndDestroy( );	//	periodString
-		
-	TBool menuShowing = MenuShowing();
-	if( menuShowing )
-	    HideMenu();
-	
-    UpdatePageL( ETrue );
-    
-    if( menuShowing )
-        DisplayMenuL();
-	DEBUG( - CLocSUPLSessionEditor::LoadFormValuesFromDataL );
-    }
-    
-// ---------------------------------------------------------------------------
-// CLocSUPLSessionEditor::ChangeTitlePaneTextL()
-// Set the Title Text
-// ---------------------------------------------------------------------------
-//
-void CLocSUPLSessionEditor::ChangeTitlePaneTextL( TDesC& aText )
-    {
-	DEBUG( + CLocSUPLSessionEditor::ChangeTitlePaneTextL );
-    // Obtain the title from the Status Pane
-    CAknTitlePane* title = static_cast < CAknTitlePane* >( iEikonEnv->AppUiFactory()->
-    	StatusPane()->ControlL( TUid::Uid( EEikStatusPaneUidTitle ) ) );
-       
-    // Set the Title's buffer    
-    HBufC* buf = aText.AllocL();
-    title->SetText( buf ); // Takes ownership of buf
-    title->DrawNow();
-	DEBUG( - CLocSUPLSessionEditor::ChangeTitlePaneTextL );
-    }     
-
-// ---------------------------------------------------------------------------
-// CLocSUPLSessionEditor::TogglePopupFieldControlL()
-// it toggles  value of popupfield control
-// ---------------------------------------------------------------------------
-//
-void CLocSUPLSessionEditor::TogglePopupFieldControlL( TInt aControlId )
-    {
-	DEBUG( + CLocSUPLSessionEditor::TogglePopupFieldControlL );
-    CAknPopupFieldText* popupFieldText =
-                    		( CAknPopupFieldText* ) Control( aControlId );
-                    		
-	if( popupFieldText )
-		{          
-		if( popupFieldText->CurrentValueIndex() == 0 )
-		  	popupFieldText->SetCurrentValueIndex( 1 );
-		else
-		  	popupFieldText->SetCurrentValueIndex( 0 );    
-
-		UpdatePageL( ETrue );
-		}
-	DEBUG( - CLocSUPLSessionEditor::TogglePopupFieldControlL );
-    }
- 
-// -----------------------------------------------------------------------------
-// CLocSUPLSessionEditor::HandleMSKCaptionL()
-// It changes caption of MSK key
-// -----------------------------------------------------------------------------
-//
-void CLocSUPLSessionEditor::HandleMSKCaptionL()
-    {
-	DEBUG( + CLocSUPLSessionEditor::HandleMSKCaptionL );
-    CEikButtonGroupContainer* cba = CEikButtonGroupContainer::Current();
-    CleanupStack::PushL( cba );
-    
-    //attribute specific cba
-	switch ( IdOfFocusControl() )
-       	{
-		case ELocSuplSessionNotificationStatus:
-			{
-       		cba->SetCommandSetL( R_SUPLSESSION_EDITOR_OPTIONS_CHANGE_BACK );
-			break;
-			}
-		case ELocSuplSessionType:
-		case ELocSuplSessionTimePeriod:
-		case ELocSuplSessionTriggerInterval:
-		case ELocSuplSessionOutstandingTrigger:
-			{
-       		cba->SetCommandSetL( R_SUPLSESSION_EDITOR_OPTIONS_NOMSK_BACK );
-			break;
-			}
-		default:
-			{
-       		cba->SetCommandSetL( R_SUPLSESSION_EDITOR_OPTIONS_CHANGE_BACK );
-			break;
-			}
-       	}	    	
-    cba->DrawDeferred();    
-    CleanupStack::Pop( cba );    
-	DEBUG( - CLocSUPLSessionEditor::HandleMSKCaptionL );
-    }
-
-// -----------------------------------------------------------------------------
-// CLocSUPLSessionEditor::DeleteConfirmationQueryL
-// ----------------------------------------------------------------------------
-//
-TInt CLocSUPLSessionEditor::DeleteConfirmationQueryL()
-    {    
-    HBufC* noteText = NULL;    
-    noteText = StringLoader::LoadLC( R_LOC_SUPL_QUERY_TERMINATE, *iSessionName, iEikonEnv );
-    CAknQueryDialog* query = new( ELeave ) CAknQueryDialog( *noteText );    
-    TInt ret = query->ExecuteLD( R_LOC_SUPL_DELETE_QUERY );
-    CleanupStack::PopAndDestroy( noteText );   
-    return ret;
-    }
-	
-// -----------------------------------------------------------------------------
-// CLocSUPLSessionEditor::UpdateSessionL
-// Calls function to load the values into the editor fields  
-// ----------------------------------------------------------------------------
-//
-void CLocSUPLSessionEditor::UpdateSessionL( TUpdateType aType )
-    {   	
-    if( ESessionDeleted == aType )
-        {
-        TryExitL( EAknSoftkeyBack );
-        }
-    else
-        {
-        LoadFormValuesFromDataL();
-        }
-	}
-	
-// -----------------------------------------------------------------------------
-// CLocSUPLSessionEditor::SessionId
-// Returns the session id
-// ----------------------------------------------------------------------------
-//
-TInt64 CLocSUPLSessionEditor::SessionId()
-    {  
-	return iSessionId;
-	}
-	
-// -----------------------------------------------------------------------------
-// CLocSUPLSessionEditor::GetTimeStringL
-// -----------------------------------------------------------------------------
-//
-void CLocSUPLSessionEditor::GetTimeStringL(HBufC*& aTimeString, TUint aSeconds)
-    {  
-    TBuf<KRealWidth> tempString;
-
-	if( !aSeconds )
-		{
-        tempString.Num(aSeconds);
-		AknTextUtils::LanguageSpecificNumberConversion(tempString);
-        aTimeString = StringLoader::LoadL( R_LOC_SUPL_TRIGGER_TIME_MINUTES, tempString ); 
-        return;
-		}
-		
-	TReal hrs = TReal(aSeconds)/KHrToSecs;
-    TReal approxValue;
-    TRealFormat fmt(KDefaultRealWidth, 2);
-	if( hrs < 1 )
-		{
-	    TReal mins = TReal(aSeconds)/KMinToSecs;
-		Math::Round( approxValue, mins, 2 );
-        tempString.Num(approxValue, fmt);
-		AknTextUtils::LanguageSpecificNumberConversion(tempString);
-        aTimeString = StringLoader::LoadL( R_LOC_SUPL_TRIGGER_TIME_MINUTES, tempString ); 
-		}
-	else if( hrs == 1 )
-		{
-        aTimeString = StringLoader::LoadL( R_LOC_SUPL_TRIGGER_TIME_ONEHOUR ); 
-		}
-	else
-		{
-	    TReal days = TReal(aSeconds)/KdayToSecs;
-    	if( days < 1 )
-    		{
-    		Math::Round( approxValue, hrs, 2 );
-        	tempString.Num(approxValue, fmt);
-			AknTextUtils::LanguageSpecificNumberConversion(tempString);
-            aTimeString = StringLoader::LoadL( R_LOC_SUPL_TRIGGER_TIME_HOURS, tempString ); 
-    		}
-    	else if( days == 1 )
-    		{
-            aTimeString = StringLoader::LoadL( R_LOC_SUPL_TRIGGER_TIME_ONEDAY ); 
-    		}
-    	else
-    		{
-    		Math::Round( approxValue, days, 2 );
-        	tempString.Num(approxValue, fmt);
-            AknTextUtils::LanguageSpecificNumberConversion(tempString);
-			aTimeString = StringLoader::LoadL( R_LOC_SUPL_TRIGGER_TIME_DAYS, tempString ); 
-    		}
-		}
-	}
-
-// End of file
--- a/locationsystemui/locationsysui/locsuplsettingsui/src/locsuplsessionlbmodel.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,310 +0,0 @@
-/*
-* Copyright (c) 2008 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:  List box for the SUPL session UI
-*
-*/
-
-
-// System Includes
-#include <e32keys.h>
-#include <locsuplsettingsui.rsg>
-#include <StringLoader.h>
-#include <epos_csuplsettings.h>
-#include <epos_csuplsettingparams.h>
-#include <epos_csuplsettingsconstants.h>
-
-// User Include
-#include "locsuplsessionlbmodel.h"
-#include "locsuplsettingsuiengine.h"
-#include "locsupldebug.h"
-		  					   	  
-// Constants
-
-const TInt KMaxConversionBufferLength 	= 0x200;
-const TInt KSessionEntryGranularity		= 10;
-
-
-// ========================= MEMBER FUNCTIONS ================================
-
-// ---------------------------------------------------------------------------
-// CLocSUPLSessionLBModel::CLocSUPLSessionLBModel
-// Default Constructor
-//
-// ---------------------------------------------------------------------------
-//
-CLocSUPLSessionLBModel::CLocSUPLSessionLBModel( 
-                            CLocSUPLSettingsUiEngine&     aEngine )
-    	:	iEngine( aEngine ), 
-    		iSessionIdList( KSessionEntryGranularity ), 
-    		iSessionTypeList( KSessionEntryGranularity )
-	{		
-	}
-
-// ---------------------------------------------------------------------------
-// CLocSUPLSessionLBModel::~CLocSUPLSessionLBModel
-// Destructor
-//
-// ---------------------------------------------------------------------------
-//
-CLocSUPLSessionLBModel::~CLocSUPLSessionLBModel()
-	{
-	DEBUG( + CLocSUPLSessionLBModel::~CLocSUPLSessionLBModel );
-	
-	iSessionNameList.ResetAndDestroy();
-	iSessionNameList.Close();
-	iSessionIdList.Close();
-	iSessionTypeList.Close();
-	
-	delete iUnnamedSuplActiveSessions;
-        iUnnamedSuplActiveSessions = NULL;
-			
-	// Delete the Buffers
-	delete iBuffer;
-	iBuffer = NULL;		
-	DEBUG( - CLocSUPLSessionLBModel::~CLocSUPLSessionLBModel );
-	}
-	
-// ---------------------------------------------------------------------------
-// CLocSUPLSessionLBModel* CLocSUPLSessionLBModel::NewL
-// Two-phased constructor
-// 
-// @param  aEngine                  Reference the SUPL Settings Engine 
-// @return CLocSUPLSessionLBModel*	Reference to the object created
-//
-// ---------------------------------------------------------------------------
-//
-CLocSUPLSessionLBModel* CLocSUPLSessionLBModel::NewL( 
-                                    CLocSUPLSettingsUiEngine&     aEngine )
-	{
-	DEBUG( + CLocSUPLSessionLBModel::NewL );
-	CLocSUPLSessionLBModel* self = CLocSUPLSessionLBModel::NewLC( aEngine );
-	CleanupStack::Pop( self );
-	DEBUG( - CLocSUPLSessionLBModel::NewL );
-	return self;
-	}
-
-// ---------------------------------------------------------------------------
-// CLocSUPLSessionLBModel* CLocSUPLSessionLBModel::NewLC
-// Two-phased constructor
-// 
-// @param  aEngine                  Reference the SUPL Settings Engine 
-// @return CLocSUPLSessionLBModel*	Reference to the object created
-//
-// ---------------------------------------------------------------------------
-//
-CLocSUPLSessionLBModel* CLocSUPLSessionLBModel::NewLC( 
-                                    CLocSUPLSettingsUiEngine&     aEngine )
-	{
-	CLocSUPLSessionLBModel* self = 
-	                new ( ELeave ) CLocSUPLSessionLBModel( aEngine );
-	CleanupStack::PushL( self );
-	self->ConstructL();
-	return self;
-	}
-		
-// ---------------------------------------------------------------------------
-// void CLocSUPLSessionLBModel::ConstructL
-// Second Phase of the two phase constructor.
-// 
-// ---------------------------------------------------------------------------
-//
-void CLocSUPLSessionLBModel::ConstructL()
-	{
-	DEBUG( + CLocSUPLSessionLBModel::ConstructL );
-    // Allocate the Conversion Buffer
-	iBuffer = HBufC16::NewL( KMaxConversionBufferLength ); 	   
-	
-	iUnnamedSuplActiveSessions = StringLoader::LoadL( R_LOC_SUPL_UNKNOWN_SERVICE );
-	
-	UpdateSessionIdsL();
-	DEBUG( - CLocSUPLSessionLBModel::ConstructL );
-	}
-
-// ---------------------------------------------------------------------------
-// TInt CLocSUPLSessionLBModel::MdcaCount() const
-// Inherited from MDesCArray. Returns the total number of items in the 
-// Settings description array
-//
-// @return TInt The total number of elements in the Settings Description array
-// ---------------------------------------------------------------------------
-//
-TInt CLocSUPLSessionLBModel::MdcaCount() const
-	{
-	DEBUG1( CLocSUPLSessionLBModel::MdcaCount= %d, iSessionIdList.Count() );
-	return iSessionIdList.Count();
-	}
-
-// ---------------------------------------------------------------------------
-// TPtrC16 CLocSUPLSessionLBModel::MdcaPoint() const
-// Inherited from MDesCArray. Returns the list box entry corresponding to the 
-// index value
-//
-// @param  aIndex The index whose list box entry needs to be retrieved
-// @return TPtr16 The list box description 
-// ---------------------------------------------------------------------------
-//
-TPtrC16 CLocSUPLSessionLBModel::MdcaPoint( TInt aIndex ) const
-	{	
-	DEBUG1( + CLocSUPLSessionLBModel::MdcaPoint =%d, aIndex );
-	
-	// Zero the internal buffer
-	TPtr16 ptr( iBuffer->Des() );
-	ptr.Zero();
-	
-	AppendSuplSessionDetail( ptr, aIndex );
-
-	DEBUG( - CLocSUPLSessionLBModel::MdcaPoint );
-	return iBuffer->Des();
-	}
-	
-// ---------------------------------------------------------------------------
-// CLocSUPLSessionLBModel::AppendSuplSessionDetail()
-// Packs the session name and type to the buffer passed.
-//
-// @param  aPtr Buffer to which session name and type will be appended.
-// ---------------------------------------------------------------------------
-//	
-void CLocSUPLSessionLBModel::AppendSuplSessionDetail( TDes& aPtr, TInt aIndex ) const
-    {
-	DEBUG( + CLocSUPLSessionLBModel::AppendSuplSessionDetail );    
-	
-	_LIT(KItemString, "%d\t%S\t\t" );
-
-  RBuf sessionName;
-	if( iSessionNameList[aIndex]->Length() )
-		{
-   		TRAP_IGNORE( sessionName.CreateL( *iSessionNameList[ aIndex ] ) );
-		}
-	else
-		{
-   		TRAP_IGNORE( sessionName.CreateL( *iUnnamedSuplActiveSessions ) );
-		}
-
-	if( iSessionTypeList[ aIndex ] )
-		{
-		// Format the string
-		aPtr.Format( KItemString, 1, &sessionName );			
-		} 
-	else
-		{
-		// Format the string
-		aPtr.Format( KItemString, 2, &sessionName );					
-		}	
-	sessionName.Close();   		
-
-	DEBUG( - CLocSUPLSessionLBModel::AppendSuplSessionDetail );    
-    }
-
-// ---------------------------------------------------------------------------
-// CLocSUPLSessionLBModel::UpdateSessionIdsL()
-// Packs the server ids to id array
-//
-// ---------------------------------------------------------------------------
-//	    
-void CLocSUPLSessionLBModel::UpdateSessionIdsL()
-	{
-	DEBUG( + CLocSUPLSessionLBModel::UpdateSessionIdsL );
-
-	iSessionIdList.Reset();
-	iSessionNameList.ResetAndDestroy();
-	iSessionTypeList.Reset();
-
-	RPointerArray< CTriggerParams > sessionList;
-		
-	// Get all session entries
-	iEngine.GetTriggerParamsL( sessionList );		
-		
-	for( TInt i = 0; i < sessionList.Count() ; i++ )
-		{
-	    TInt64 sessionId;
-	    TUint64 outstandingTrigger;
-	    TUint64 interval;
-	    HBufC* sessionName = HBufC::NewL( KMaxTriggerSessionNameLen ); 
-	    CleanupStack::PushL( sessionName );
-	    TBool notificationPresent;
-	    TBool triggerNotificationStatus;  
-	    CTriggerParams::TTriggerType triggerType; 
-	    CTriggerParams::TRequestType requestType;
- 
-		    		    
-	    TInt errParams = sessionList[i]->Get(
-	    							sessionId, 
-	    							sessionName->Des(), 
-	    							notificationPresent, 
-	    							triggerNotificationStatus, 
-	    							triggerType,
-	    							requestType, 
-	    							outstandingTrigger, 
-	    							interval);
-		    		
-	    if ( errParams != KErrNone )
-	        {
-	        // Error has occured 
-	        }  
-			
-		iSessionIdList.Append( sessionId );
-		iSessionNameList.Append( sessionName->AllocL() );
-		switch( triggerType )
-			{
-			case CTriggerParams::EPeriodic:
-				iSessionTypeList.Append( ESUPLSessionTIType );
-				break;
-			case CTriggerParams::EAreaEvent:
-				iSessionTypeList.Append( ESUPLSessionNIType );
-				break;
-			case CTriggerParams::EUnknown:
-			default:
-				iSessionTypeList.Append( ESUPLSessionTIType );
-				break;
-			}
-			
-		  CleanupStack::PopAndDestroy( sessionName );
-		}
-	sessionList.ResetAndDestroy();
-	sessionList.Close();		
-	
-	DEBUG( - CLocSUPLSessionLBModel::UpdateSessionIdsL );
-	}        
-    
-// ---------------------------------------------------------------------------
-// CLocSUPLSessionLBModel::SlpIds()
-// returns server id array
-//
-// ---------------------------------------------------------------------------
-//  
-RArray<TInt64>& CLocSUPLSessionLBModel::SessionIds()
-	{
-	DEBUG( CLocSUPLSessionLBModel::SessionIds );
-	return iSessionIdList;	
-	}
-
-// ---------------------------------------------------------------------------
-// CLocSUPLSessionLBModel::CurrentSessionName()
-// Get the currently focused session name
-//
-// ---------------------------------------------------------------------------
-//  
-TPtrC CLocSUPLSessionLBModel::SessionName(TInt aIndex)
-	{
-	if( iSessionNameList[aIndex]->Length() )
-		{
-		return iSessionNameList[aIndex]->Des();
-		}
-	else
-		{
-		return *iUnnamedSuplActiveSessions;
-		}
-	}
-
-// End of file
--- a/locationsystemui/locationsysui/locsuplsettingsui/src/locsuplsessionview.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,554 +0,0 @@
-/*
-* Copyright (c) 2008 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:  Source file for SUPL session UI view
-*
-*/
-
-
-// System Include
-#include <barsread.h> 		                // For TResourceReader
-#include <bautils.h>
-#include <StringLoader.h>
-#include <aknViewAppUi.h>
-#include <avkon.rsg>
-#include <hlplch.h>			                // Help
-#include <featmgr.h> 						// FeatureManager
-#include <eikmenup.h>						// Menu pane
-#include <eikmenub.h>						// Menu Bar
-#include <AknUtils.h>
-#include <AknQueryDialog.h> 
-
-#include <locsuplsettingsui.rsg>
-
-// User Include
-#include "locsuplsettings.hrh"
-#include "locsuplsessionview.h"
-#include "locsuplsessioncontainer.h"
-#include "locsettingsui.h"
-#include "locsuplsettingsuiengine.h"
-#include "locsupldebug.h"
-#include "locsuplsettingsview.h"
-
-
-// ========================= MEMBER FUNCTIONS ================================
-
-
-// ---------------------------------------------------------------------------
-// CLocSUPLSessionView::CLocSUPLSessionView
-// Overloaded Constructor
-//
-// ---------------------------------------------------------------------------
-//	
-CLocSUPLSessionView::CLocSUPLSessionView( 
-                              CLocSUPLSettingsUiEngine&     aEngine,
-		 					  MLocSUPLSettingsEventHandler&	aEventHandler )
-	:iEventHandler( aEventHandler ),
-	iEngine( aEngine )
-	{
-	}
-
-// ---------------------------------------------------------------------------
-// CLocSUPLSessionView::~CLocSUPLSessionView
-// Destructor
-//
-// ---------------------------------------------------------------------------
-//
-CLocSUPLSessionView::~CLocSUPLSessionView()
-	{
-	DEBUG( + CLocSUPLSessionView::~CLocSUPLSessionView );	
-    if ( iContainer )
-        {
-        AppUi()->RemoveFromViewStack( *this, iContainer );
-        }
-    delete iContainer;
-    iContainer = NULL;
-	DEBUG( - CLocSUPLSessionView::~CLocSUPLSessionView );	
-	}
-	
-// ---------------------------------------------------------------------------
-// CLocSUPLSessionView* CLocSUPLSessionView::NewL
-// Creates new Location Sys Ui plugin.
-//
-// @param aEngine               Reference to the SUPL Settings
-//                              engine          
-// @param aEventHandler		    Pointer to the Event Handler
-// @return CAknViewAppUi&		Reference to the application view
-// ---------------------------------------------------------------------------
-//    
-CLocSUPLSessionView* CLocSUPLSessionView::NewL( 
-                              CLocSUPLSettingsUiEngine&     aEngine,
-		 					  MLocSUPLSettingsEventHandler&	aEventHandler )
-	{	
-	DEBUG( + CLocSUPLSessionView::NewL );	
-    CLocSUPLSessionView* self = NewLC( aEngine, aEventHandler );
-	CleanupStack::Pop( self );
-	DEBUG( - CLocSUPLSessionView::NewL );	
-	return self;
-	}
-
-// ---------------------------------------------------------------------------
-// CLocSUPLSessionView* CLocSUPLSessionView::NewLC
-// Creates new Location Sys Ui plugin.
-//
-// @param aEngine               Reference to the SUPL Settings
-//                              engine          
-// @param aEventHandler		    Pointer to the Event Handler
-// @return CAknViewAppUi&		Reference to the application view
-// ---------------------------------------------------------------------------
-//    
-CLocSUPLSessionView* CLocSUPLSessionView::NewLC( 
-                              CLocSUPLSettingsUiEngine&     aEngine,
-		 					  MLocSUPLSettingsEventHandler&	aEventHandler )
-	{	
-    CLocSUPLSessionView* self = 
-                new( ELeave ) CLocSUPLSessionView( aEngine,                          
-    										        aEventHandler );
-	CleanupStack::PushL(self);
-	self->ConstructL();
-	return self;
-	}
-	
-// ---------------------------------------------------------------------------
-// void CLocSUPLSessionView::ConstructL
-// Second Phase Constructor
-//
-// ---------------------------------------------------------------------------
-//
-void CLocSUPLSessionView::ConstructL()
-	{   	
-	// Call AknView's BaseConstrutL
-	BaseConstructL( R_SUPLSETTINGS_SESSION_VIEW );	 
-	
-	// Needed for the Session editor Launch
-	ConstructMenuAndCbaEarlyL();
-	}
-
-// -----------------------------------------------------------------------------
-// CLocSUPLSessionView::HandleScreenSizeChange
-// -----------------------------------------------------------------------------
-//
-void CLocSUPLSessionView::HandleScreenSizeChange() 
-	{
-	if( iContainer )
-		{
-		iContainer->SetRect( ClientRect());		
-		}
-	}
-
-// -----------------------------------------------------------------------------
-// CLocSUPLSessionView::UpdateView
-// -----------------------------------------------------------------------------
-//	
-void CLocSUPLSessionView::UpdateView()
-    {
-	DEBUG( + CLocSUPLSessionView::UpdateView );	
-    if( iContainer )
-		{
-		TRAP_IGNORE( iContainer->UpdateScreenL() );	
-		}	
-	TRAP_IGNORE( ChangeMSKL() );		
-	DEBUG( - CLocSUPLSessionView::UpdateView );	
-    }
-
-// -----------------------------------------------------------------------------
-// TInt CLocSUPLSessionView::SelectedItemIndex
-// Returns the Selected element. The list box model defines the enumeration that
-// would determine the current element that has been selected
-//
-// @return TInt Index of the item selected
-// -----------------------------------------------------------------------------
-//
-TInt CLocSUPLSessionView::SelectedItemIndex()
-    {
-    if( iContainer )
-        {
-        return iContainer->SelectedItemIndex();
-        }
-    else
-        {
-        return KErrNotFound;
-        }
-    }    
-    
-// ---------------------------------------------------------------------------
-// void CLocSUPLSessionView::DoActivateL
-// 
-// ---------------------------------------------------------------------------	
-//
-void CLocSUPLSessionView::DoActivateL( const TVwsViewId& 	/* PrevViewId*/,
-											   TUid		   	/* aCustomMessageId*/,
-						  				 const TDesC8&		 aCustomMessage )
-	{
-	DEBUG( + CLocSUPLSessionView::DoActivateL );	
-
-    // Destroy the existing container
-    if( iContainer )
-        {
-        AppUi()->RemoveFromViewStack( *this, iContainer );
-        delete iContainer;
-        iContainer=NULL;
-        }						
-
-    // Create new Container	
-    iContainer = CLocSUPLSessionContainer::NewL( ClientRect(), 
-                                                  iEngine,
-                                                  this );
-    iContainer->SetMopParent( this );
-    AppUi()->AddToViewStackL( *this, iContainer );
-    MenuBar()->SetContextMenuTitleResourceId( R_SUPLSETTINGS_SESSION_CONTEXTMENUBAR );
-    ChangeMSKL();
-	iEventHandler.HandleCommandL( MLocSUPLSettingsEventHandler::ELaunchViewComplete );	
-	DEBUG( - CLocSUPLSessionView::DoActivateL );	
-	}
-
-// ---------------------------------------------------------------------------
-// void CLocationSystemUiView::DoDeactivate
-//
-// ---------------------------------------------------------------------------
-//		
-void CLocSUPLSessionView::DoDeactivate()
-	{
-	DEBUG( + CLocSUPLSessionView::DoDeactivate );	
-	// Destroy Container
-	if ( iContainer )
-        {
-        AppUi()->RemoveFromViewStack( *this, iContainer );
-        delete iContainer;
-        iContainer = NULL;
-        }
-	DEBUG( - CLocSUPLSessionView::DoDeactivate );	
-	}
-
-// ---------------------------------------------------------------------------
-// TUid CLocSUPLSessionView::Id
-// Returns the View Id. Should be chosen to reflect the Implementation UID 
-// of the Plugin
-//
-// @return TUid The View Id
-// ---------------------------------------------------------------------------
-//	
-TUid CLocSUPLSessionView::Id() const
-	{
-	return KLocSUPLSessionUiViewId;
-	}
-
-// ---------------------------------------------------------------------------
-// void CLocSUPLSessionView::HandleCommandL
-//
-// ---------------------------------------------------------------------------
-//	
-void CLocSUPLSessionView::HandleCommandL( TInt aCommand )	
-	{
-	DEBUG( + CLocSUPLSessionView::HandleCommandL );	
-	switch ( aCommand )
-        {
-        // Handle all the internal view specific commands here
-        case ELocSuplSessionOpen:
-        case EAknSoftkeyOpen:
-            {
-            TInt itemIndex = iContainer->SelectedItemIndex();	
-            iEngine.OpenSessionL( iContainer->CurrentSessionId() );
-            TInt accessPointCount;
-            TRAP_IGNORE( iEngine.GetActiveSessionsCountL( accessPointCount ) );
-            if( accessPointCount == 0 )
-            {
-             // Launch the Settings View
-              TRAP_IGNORE( AppUi()->ActivateLocalViewL ( KLocSUPLSettingsUiViewId ) );
-            }
-            else
-            TRAP_IGNORE( iContainer->FocusToSessionDetailL( itemIndex ) );
-            break;    
-            } 
-        case ELocSuplSessionTerminate:
-        case ELocSuplSessionsTerminate:
-        case ELocSuplSessionMSKTerminate:
-        case ELocSuplSessionsMSKTerminate:
-        	{
-        	iContainer->SetSelectedIndex();
-        	DeleteSessionL();
-        	TInt accessPointCount;
-          TRAP_IGNORE( iEngine.GetActiveSessionsCountL( accessPointCount ) );
-          if( accessPointCount == 0 )
-          {
-             // Launch the Settings View
-             TRAP_IGNORE( AppUi()->ActivateLocalViewL ( KLocSUPLSettingsUiViewId ) );
-          }
-        	break;
-        	}
-        case EAknCmdMark:
-        case EAknCmdUnmark:
-        case EAknMarkAll:
-        case EAknUnmarkAll:
-	       	{
-			AknSelectionService::HandleMarkableListProcessCommandL(
-						aCommand, &( iContainer->ListBoxL() ) );    
-	        ChangeMSKL();
-	       	break;
-	       	}
-       case EAknCmdHelp:
-        	{
-           	HlpLauncher::LaunchHelpApplicationL( iCoeEnv->WsSession(),
-           										 AppUi()->AppHelpContextL() );
-        	break;	
-        	}
-        case EAknCmdExit:
-        case EEikCmdExit:
-            {
-            // The Exit command has to be transferred back to the application
-            iEventHandler.HandleCommandL( EEikCmdExit );
-            break;    
-            }
-        case EAknSoftkeyBack:
-            {
-            // Launch the Settings View
-            TRAP_IGNORE( AppUi()->ActivateLocalViewL ( KLocSUPLSettingsUiViewId ) );
-            break;    
-            }
-        case ELocSuplSessionMSKNoCmd:
-        	{
-        	// No operation will happen
-        	break;
-        	}
-        default:
-    	    {
-    	    // View Switiching, View closure and other external
-    	    // view related and AppUi related commands
-    	    iEventHandler.HandleCommandL( aCommand );
-            break;	
-    	    }
-        }
-	DEBUG( - CLocSUPLSessionView::HandleCommandL );	
-	}
-
-// -----------------------------------------------------------------------------
-// CLocSUPLSessionView::DynInitMenuPaneL
-// -----------------------------------------------------------------------------
-void CLocSUPLSessionView::DynInitMenuPaneL( TInt          aResourceId, 
-                                             CEikMenuPane* aMenuPane )
-    {
-	DEBUG( + CLocSUPLSessionView::DynInitMenuPaneL );	
-    AknSelectionService::HandleMarkableListDynInitMenuPane( 
-    								aResourceId, 
-                                    aMenuPane, 
-                                    &( iContainer->ListBoxL() ) );
-    switch( aResourceId )
-        {                               
-        case R_SUPLSETTINGS_SERVER_MAIN_MENU: 
-            { 
-	        User::LeaveIfNull( aMenuPane );
-	        //Handle Help Fature
-	        HandleHelpFeature( *aMenuPane );
-	        break;
-        	}
-        case R_SUPLSETTINGS_SESSION_MENU: 
-            {             
-	        User::LeaveIfNull( aMenuPane );	     
-        	if( iContainer->SessionCount() <= 0 )
-        		{	           
-			   // aMenuPane->SetItemDimmed( 
-			   // 					ELocSuplSessionOpen, 		ETrue );
-			    aMenuPane->SetItemDimmed( 
-			    					ELocSuplSessionTerminate, 	ETrue );
-        		}
-        	else
-        		{
-        		if ( iContainer->SelectedCount() )
-        			{
-			  //  	aMenuPane->SetItemDimmed( 
-			   // 					ELocSuplSessionOpen, 		ETrue );
-					if( iContainer->SelectedCount() > 1 )
-						{
-						aMenuPane->SetItemDimmed( 
-				    					ELocSuplSessionTerminate, 	ETrue );  	  
-						aMenuPane->SetItemDimmed( 
-				    					ELocSuplSessionsTerminate, 	EFalse ); 	    	      			
-        				}
-					else
-						{
-						aMenuPane->SetItemDimmed( 
-				    					ELocSuplSessionTerminate, 	EFalse );  	  
-						aMenuPane->SetItemDimmed( 
-				    					ELocSuplSessionsTerminate, 	ETrue );  
-						}
-					}      		
-        		else
-        			{
-			    //	aMenuPane->SetItemDimmed( 
-			    	//				ELocSuplSessionOpen, 		EFalse );  
-					aMenuPane->SetItemDimmed( 
-			    					ELocSuplSessionTerminate, 	EFalse );  	  
-					aMenuPane->SetItemDimmed( 
-			    					ELocSuplSessionsTerminate, 	ETrue );  	      			
-        			}   		
-        		}        		      		
-	        break;
-        	}
-    	case R_SUPLSETTINGS_SESSION_CONTEXTMENU:
-        	{
-        	if( iContainer->SelectedCount() == 1 )
-        		{
-				aMenuPane->SetItemDimmed( 
-		    					ELocSuplSessionMSKTerminate, 	EFalse );  	  
-				aMenuPane->SetItemDimmed( 
-		    					ELocSuplSessionsMSKTerminate, 	ETrue );  
-        		}
-        	else
-        	    {
-				aMenuPane->SetItemDimmed( 
-		    					ELocSuplSessionMSKTerminate, 	EFalse );  	  
-				aMenuPane->SetItemDimmed( 
-		    					ELocSuplSessionsMSKTerminate, 	ETrue );  
-        	    }
-        	break;
-        	}
-        default:
-    		{
-    		break;
-    		}
-        }
-	DEBUG( - CLocSUPLSessionView::DynInitMenuPaneL );	
-    }
-    
-// -----------------------------------------------------------------------------
-// CLocSUPLSessionView::HandleHelpFeature
-// -----------------------------------------------------------------------------
-void CLocSUPLSessionView::HandleHelpFeature( CEikMenuPane& aMenuPane ) const
-    {
-	DEBUG( + CLocSUPLSessionView::HandleHelpFeature );	
-    if ( FeatureManager::FeatureSupported( KFeatureIdHelp ) )
-        {
-        aMenuPane.SetItemDimmed( EAknCmdHelp, EFalse );
-        }
-    else
-        {
-        aMenuPane.SetItemDimmed( EAknCmdHelp, ETrue );
-        }
-	DEBUG( - CLocSUPLSessionView::HandleHelpFeature );	
-    }
-
-// -----------------------------------------------------------------------------
-// CLocSUPLSessionView::DeletionConfirmationQueryL
-// ----------------------------------------------------------------------------
-//
-TInt CLocSUPLSessionView::DeletionConfirmationQueryL( const TInt aAmount )
-    {    
-    HBufC* noteText = NULL;    
-    if ( aAmount > 1 )
-        {
-        noteText = StringLoader::LoadL( R_LOC_SUPL_QUERY_TERMINATE_MULTIPLE, aAmount, iEikonEnv );
-        }
-    else
-        {
-        noteText = StringLoader::LoadL( R_LOC_SUPL_QUERY_TERMINATE, iContainer->CurrentSessionName(), iEikonEnv );
-        }
-    CAknQueryDialog* query = new( ELeave ) CAknQueryDialog( *noteText );    
-    TInt ret = query->ExecuteLD( R_LOC_SUPL_DELETE_QUERY );
-    delete noteText; //noteText    
-    noteText = NULL;
-    return ret;
-    }
-
-// -----------------------------------------------------------------------------
-// CLocSUPLSessionView::DeleteSessionL
-// ----------------------------------------------------------------------------
-//
-void CLocSUPLSessionView::DeleteSessionL()
-	{
-	DEBUG( + CLocSUPLSessionView::DeleteSessionL );	
-	TInt selCount 	= iContainer->SelectedCount();
-	TInt sessionCount = iContainer->SessionCount();
-	if( !sessionCount )
-		return;
-		
-	if( selCount )
-		{
-		if( DeletionConfirmationQueryL( selCount ) )
-			{
-		    const CArrayFix<TInt>* markedIndexes = NULL;
-		    markedIndexes = iContainer->ListBoxL().SelectionIndexes();
-				
-			RArray<TInt64> markedItemIds;					
-			GetSelectedItemIdsL( markedItemIds, *markedIndexes );
-		
-			TRAP_IGNORE( iEngine.RemoveTriggerSessionsL( markedItemIds ) );		
-					
-			markedItemIds.Close();	
-			}
-		}
-	else
-		{
-		if( DeletionConfirmationQueryL( 1 ) )
-			{
-			TRAP_IGNORE( iEngine.RemoveTriggerSessionL( iContainer->CurrentSessionId() ) );
-			}		
-
-		}
-	DEBUG( - CLocSUPLSessionView::DeleteSessionL );	
-	}
-
-// -----------------------------------------------------------------------------
-// CLocSUPLSessionView::GetSelectedItemIdsL
-// -----------------------------------------------------------------------------
-//
-void CLocSUPLSessionView::GetSelectedItemIdsL(
-    RArray<TInt64>& aSelectedItems,
-    const CArrayFix<TInt>& aSelectedIndexes ) const
-    {
-    aSelectedItems.Reset();
-    TInt itemCount = iContainer->SessionCount();
-    TInt selectionCount = aSelectedIndexes.Count();
-    for ( TInt i( 0 ); i < selectionCount; ++i )
-        {
-        TInt index = aSelectedIndexes[i];
-        User::LeaveIfError( aSelectedItems.Append( iContainer->SessionIds()[index] ) );
-        }
-    }
-
-// -----------------------------------------------------------------------------
-// CLocSUPLSessionView::ChangeMSKL
-// -----------------------------------------------------------------------------
-//
-void CLocSUPLSessionView::ChangeMSKL() 
-	{
-	DEBUG( + CLocSUPLSessionView::ChangeMSKL );	
-	// Listbox takes all event even if it doesn't use them	
-	if( !Cba() || !iContainer )
-	    {
-	   	return;
-	    }
-	if( iContainer->SelectedCount() )
-		{
-		TRAP_IGNORE( 
-			Cba()->SetCommandSetL ( R_SUPLSETTINGS_OPTIONS_CONTEXTOPTIONS_BACK ) ); 	
-		}
-	else
-		{
-		if( iContainer->SessionCount() )
-		    {
-    		TRAP_IGNORE( 
-    			Cba()->SetCommandSetL ( R_SUPLSETTINGS_SESSION_OPTIONS_BACK_OPEN ) ); 	
-		    }	
-		else
-		    {
-    		TRAP_IGNORE( 
-    			Cba()->SetCommandSetL ( R_SUPLSETTINGS_SESSION_OPTIONS_BACK ) ); 
-		    }
-		}
-
-	Cba()->DrawDeferred();  	
-	DEBUG( - CLocSUPLSessionView::ChangeMSKL );	
-	}
-	
-
-// End of file
--- a/locationsystemui/locationsysui/locsuplsettingsui/src/locsuplsettings.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,641 +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:  SUPL Settings UI implementation.
-*
-*/
-
-
-// System Include
-#include <aknViewAppUi.h>
-#include <barsread.h> 		        // For TResourceReader
-#include <bautils.h>    
-#include <AknQueryDialog.h>         // For list query dialog
-#include <StringLoader.h>
-#include <locsuplsettingsui.rsg>
-#include <featmgr.h> 						// FeatureManager
-
-// User Includes
-#include "locsuplsettings.hrh"
-#include "locsuplsettings.h"
-#include "locsettingsuiobserver.h"
-#include "locsuplsettingsview.h"
-#include "locsuplsettingsuiengine.h"
-#include "locsuplsettingslbmodel.h"
-#include "locsettingsuiclient.h"   // For the Launch parameter values
-
-#include "locsuplserverview.h"
-#include "locsuplserverlbmodel.h"
-#include "locsuplsessionview.h"
-#include "locsuplsessionlbmodel.h"
-#include "locsupldebug.h"
-
-
-CLocSUPLAO* CLocSUPLAO::NewL( 
-        MLocSettingsUiObserver&     aSettingsUiObserver,
-        CLocSUPLSettingsUiEngine&   aSettingsEngine,
-        TInt                        aLaunchParams  )
-    {
-    CLocSUPLAO* self = new (ELeave) CLocSUPLAO( aSettingsUiObserver,
-                                                aSettingsEngine,
-                                                aLaunchParams );
-    return self;
-    }
-
-CLocSUPLAO::~CLocSUPLAO()
-    {
-    DoCancel();
-    }
-
-CLocSUPLAO::CLocSUPLAO( MLocSettingsUiObserver&     aSettingsUiObserver,
-                        CLocSUPLSettingsUiEngine&   aSettingsEngine,
-                        TInt                        aLaunchParams  )
-: CActive( EPriorityStandard ),
- iSettingsUiObserver( aSettingsUiObserver ),
- iSettingsEngine( aSettingsEngine ),
- iLaunchParams( aLaunchParams )
-    {
-    CActiveScheduler::Add(this);
-    }
-        
-void CLocSUPLAO::RunL()
-    {
-    iSettingsEngine.OpenSessionL( iLaunchParams );
-    iSettingsUiObserver.SettingClosed( KErrNone );
-    }
-        
-void CLocSUPLAO::DoCancel()
-    {
-    }
-
-void CLocSUPLAO::CompleteRequest()
-    {
-    if( !IsActive())
-        {
-        TRequestStatus* status = &iStatus;
-        User::RequestComplete( status, KErrNone );
-        SetActive();
-        }
-    }
-// ---------------------------------------------------------------------------
-// CLocSUPLSettings::CLocSUPLSettings
-// C++ default constructor.
-// ---------------------------------------------------------------------------
-//
-CLocSUPLSettings::CLocSUPLSettings( MLocSettingsUiObserver&	aSettingsUiObserver,
-					   		    	CAknViewAppUi&			aAppUi )
-	: CLocSettingsUi( aSettingsUiObserver, aAppUi ),
-	iResourceLoader( *CCoeEnv::Static() ),
-	iLaunchOutStanding( EFalse )
-	{
-	}
-
-// ---------------------------------------------------------------------------
-// CLocSUPLSettings::~CLocSUPLSettings
-// Destructor.
-// ---------------------------------------------------------------------------	
-//
-CLocSUPLSettings::~CLocSUPLSettings()	
-	{
-	DEBUG( + CLocSUPLSettings::~CLocSUPLSettings );
-	
-	delete iLaunchAO;
-	iLaunchAO = NULL;
-	
-	delete iSettingsEngine;
-	iSettingsEngine = NULL;
-	
-	// Close the Resource loader
-	iResourceLoader.Close();
-
-    FeatureManager::UnInitializeLib();  		
-	DEBUG( - CLocSUPLSettings::~CLocSUPLSettings );
-	}
-
-// ---------------------------------------------------------------------------
-// CLocSUPLSettings* CLocSUPLSettings::NewL
-// Symbian OS two-phased constructor
-// 
-// @return CLocSUPLSettings* Reference to the Settings UI object
-// ---------------------------------------------------------------------------	
-//
-CLocSUPLSettings* CLocSUPLSettings::NewL( TAny* aParam )
-	{
-	DEBUG( + CLocSUPLSettings::NewL );
-	CLocSettingsUiParams* 	param = 
-	                reinterpret_cast<CLocSettingsUiParams *>( aParam );
-	MLocSettingsUiObserver& observer = param->SettingsUiObserver();
-	CAknViewAppUi& 		 appUi = param->AppUi();
-	CLocSUPLSettings* self = new ( ELeave )CLocSUPLSettings( observer,
-													         appUi );
-	CleanupStack::PushL( self );
-	self->ConstructL();
-	CleanupStack::Pop( self );
-	DEBUG( - CLocSUPLSettings::NewL );
-	return self; 
-	}
-
-// ---------------------------------------------------------------------------
-// void CLocSUPLSettings::ConstructL
-// Second phase constructor.
-// ---------------------------------------------------------------------------	
-//
-void CLocSUPLSettings::ConstructL()
-	{
-	DEBUG( + CLocSUPLSettings::ConstructL );
-	// Feature manager required for SUPL Feature flag checking and 
-	// Help feature check
-    FeatureManager::InitializeLibL();
-
- 	// Feature flag check provided for Product profile bits specific variation
- 	// If the SUPL feature flag is not defined then the SUPL Settings UI
- 	// would not be supported
- 	if ( !FeatureManager::FeatureSupported( KFeatureIdSuplFramework ) )
-        {
-        User::Leave( KErrNotSupported );
-        }
-       
-	// Open the Resource file for the plugin. The resource file is not 
-	// explicity opened by system. Hence, the opening and closind if tied
-	// down to the time when the DLL is active
-	OpenLocalizedResourceFileL( KSUPLUiResFileName, 
-							    iResourceLoader );
-	
-	// Create the SUPL Settings UI Engine
-	iSettingsEngine = CLocSUPLSettingsUiEngine::NewL( *this );
-	
-    // Create the SUPL Settings UI View
-	iSettingsView = CLocSUPLSettingsView::NewL( *iSettingsEngine,
-	                                    *this );
-	// Transferring the view's control to AppUi. The settings Ui no longer
-	// has any control to the view handle
-	iAppUi.AddViewL( iSettingsView );
-	
-	// Obtaining the View Id for reference
-	iSettingsViewId = iSettingsView->Id();
-							    
-    // Create the SUPL Settings UI View
-	iServerView = CLocSUPLServerView::NewL( *iSettingsEngine,
-	                                    *this );
-	
-	
-	// Transferring the view's control to AppUi. The settings Ui no longer
-	// has any control to the view handle
-	iAppUi.AddViewL( iServerView );
-	
-	// Obtaining the View Id for reference
-	iServerViewId = iServerView->Id();
-	
-	// Create the SUPL Session UI View
-	iSessionView = CLocSUPLSessionView::NewL( *iSettingsEngine,
-	                                    *this );
-	
-	
-	// Transferring the view's control to AppUi. The sessions Ui no longer
-	// has any control to the view handle
-	iAppUi.AddViewL( iSessionView );
-	
-	// Obtaining the View Id for reference
-	iSessionViewId = iSessionView->Id();
-	
-	DEBUG( - CLocSUPLSettings::ConstructL );
-	}
-
-// ---------------------------------------------------------------------------
-// void CLocSUPLSettings::LaunchL
-// Inherited from CSettingsUi
-// Launches the Settings UI
-//
-// @param aUiLaunchParams	Flags that define specific configuration of
-//							if the Settings UI, that the user of the API
-//							wants to launch. If more than one functionality
-//                          is requested then the various combinations
-//                          are to be ORed.
-// ---------------------------------------------------------------------------	
-//
-void CLocSUPLSettings::LaunchL( TInt		aUiLaunchParams )
-	{
-	DEBUG( + CLocSUPLSettings::LaunchL );
-	// If there is any outstanding request on this UI then leave immediately
-	if( iLaunchOutStanding )
-	    {
-	    User::Leave( KErrInUse );
-	    }
-    
-    iLaunchOutStanding = ETrue;
-    
-    // Set the Param type
-    iLaunchParamType = ELaunchParamInt;
-    
-    iLaunchParams = aUiLaunchParams;
-    
-    // Initalize the Engine. Only after the initialization is complete can we 
-    // modify the Setting contents. Hence, the actual launching would be 
-    // deferred to the initialization period.
-    iSettingsEngine->Initalize();
-	DEBUG( - CLocSUPLSettings::LaunchL );
-	}
-
-// ---------------------------------------------------------------------------
-// void CLocSUPLSettings::LaunchL
-// Inherited from CSettingsUi
-// Launches the Settings UI
-//
-// @param aUiLaunchParams   Flags that define specific configuration of
-//                          if the Settings UI, that the user of the API
-//                          wants to launch. If more than one functionality
-//                          is requested then the various combinations
-//                          are to be ORed.
-// ---------------------------------------------------------------------------  
-//
-void CLocSUPLSettings::LaunchL( const TDesC&      aUiLaunchParams )
-    {
-    DEBUG( + CLocSUPLSettings::LaunchL );
-    // If there is any outstanding request on this UI then leave immediately
-    if( iLaunchOutStanding )
-        {
-        User::Leave( KErrInUse );
-        }
-    
-    iLaunchOutStanding = ETrue;
-    
-    // Set the Param type
-    iLaunchParamType = ELaunchParamString;
-    
-    // Read the Param from the Descriptor
-    // Currently this reads the SUPL triggering Session id.
-    TLex16 input( aUiLaunchParams );
-    User::LeaveIfError( input.Val(iLaunchParams) );
-    
-    // Initalize the Engine. Only after the initialization is complete can we 
-    // modify the Setting contents. Hence, the actual launching would be 
-    // deferred to the initialization period.
-    iSettingsEngine->Initalize();
-    DEBUG( - CLocSUPLSettings::LaunchL );
-    }
-
-// ---------------------------------------------------------------------------
-// void CLocSUPLSettings::Close
-// Inherited from CSettingsUi
-// Closes the running Settings UI prematurely. The UI can be closed 
-// permanently or could be temporarily suspended and relaunched. Incase of 
-// tenporary suspension it is left to the implementation to decide to
-// either store its current state or discard the same
-//
-// @param aResume  Boolean variable to indicate whether the UI is being 
-//				   temporarily suspended or completely shut down. In case
-// 				   it is temporarily suspended then its the UIs responsibility
-//				   to store its internal state
-// ---------------------------------------------------------------------------	
-//
-void CLocSUPLSettings::Close()
-	{
-	DEBUG( + CLocSUPLSettings::Close );
-    // Reset the flag for an outstanding launch request 
-	iLaunchOutStanding = EFalse;
-	
-	// Reset the settings View
-	iSettingsView->Reset();
-	
-	// Hand over the close event to the Engine
-	iSettingsEngine->Close();
-	DEBUG( - CLocSUPLSettings::Close );
-	}
-
-// ---------------------------------------------------------------------------
-// void CLocSUPLSettings::GetCaptionL
-// Inherited from CSettingsUi
-// Method for getting caption of this plugin. This should be the 
-// localized name of the settings view to be shown in parent view.
-//
-// @param aCaption pointer to Caption variable
-// ---------------------------------------------------------------------------
-//
-void CLocSUPLSettings::GetCaptionL( TDes& aCaption ) const
-	{
-	// Load the SUPL setting caption from the resource file and hand it back
-	// to the callee. It is assuemed here that the calling function has 
-	// allocated enough memory for the aCaption string. If not the fucntion
-	// would leave
-	HBufC* caption = StringLoader::LoadL( R_SUPLSETTINGS_CAPTION );
-    aCaption.Copy( *caption );
-    delete caption;
-	}
-
-// ---------------------------------------------------------------------------
-// TInt CLocSUPLSettings::GetPriority
-// Inherited from CSettingsUi
-// Returns the priority of the UI module. 
-// 
-// @return Priority of the Settings UI
-// ---------------------------------------------------------------------------
-//
-TInt CLocSUPLSettings::GetPriority()
-	{
-	// As defined by the Location System UI UI specification, the SUPL settings
-	// plug-in should be inserted at the second level
-	const TInt KSUPLPluginPriority = 0x00000002;
-	return KSUPLPluginPriority;
-	}
-
-// ---------------------------------------------------------------------------
-// TBool CLocSUPLSettings::IsVisible
-// Inherited from CSettingsUi
-// Accessor Function for determine whether the UI presence 
-// should be shown to the user or should be hidden
-//
-// @return ETrue  If the presence of the UI be shown to the usr
-//	   EFalse If the UI should funtion as a non visible UI
-// ---------------------------------------------------------------------------
-//
-TBool CLocSUPLSettings::IsVisible()
-	{
-	return ETrue;	
-	}
-
-// ---------------------------------------------------------------------------
-// void CLocSUPLSettings::HandleSettingsEventL
-// ---------------------------------------------------------------------------
-//
-void CLocSUPLSettings::HandleSettingsEventL( TSettingsEventType    aEvent )
-    {
-	DEBUG1( + CLocSUPLSettings::HandleSettingsEventL aEvent=%d, aEvent );
-    switch( aEvent )
-        {
-        case EExitEvent:            
-            {
-            // Reset the flag for an outstanding launch request 
-	        iLaunchOutStanding = EFalse;
-	        
-	        iAppUi.HandleCommandL( EEikCmdExit );
-            break;    
-            }
-        case EEngineInitialized:
-        case EEngineInitializeFailed:
-            {
-            // Launch the SUPL UI
-            TRAPD( error, LaunchSUPLUiL() );
-            if( error && iLaunchOutStanding )
-                {
-                iLaunchOutStanding = EFalse;
-                // The UI is intended to be closed. Pass the event 
-		    	// to the observer
-			    iSettingsUiObserver.SettingClosed( error );               
-                }
-            break;    
-            }
-        case ESUPLSettingsChange:
-            {
-            // There is a change in Settings. Update the views
-            iSettingsView->UpdateView();
-            iServerView->UpdateView();
-            iSessionView->UpdateView();
-            break;    
-            }
-        case EIAPSelectionComplete:
-            {
-            if( iLaunchOutStanding )
-                {
-                iLaunchOutStanding = EFalse;
-                // The UI is intended to be closed. Pass the event 
-		    	// to the observer
-			    iSettingsUiObserver.SettingClosed( KErrNone );
-                }
-            break;
-            }
-        case EIAPSelectionCancelled:
-            {
-            if( iLaunchOutStanding )
-                {
-                iLaunchOutStanding = EFalse;
-                // The UI is intended to be closed. Pass the event 
-		    	// to the observer
-			    iSettingsUiObserver.SettingClosed( KErrAbort );
-                }    
-            break;
-            }
-        default:
-            {
-            break;    
-            }
-        }       
-	DEBUG( - CLocSUPLSettings::HandleSettingsEventL );
-    }
-
-// ---------------------------------------------------------------------------
-// void CLocSUPLSettings::HandleScreenSizeChange
-// Inherited from MLocSUPLSettingsEventHandler
-// 
-// ---------------------------------------------------------------------------
-//
-void CLocSUPLSettings::HandleScreenSizeChange()
-    {
-    iSettingsView->HandleScreenSizeChange();
-    }
-    
-// ---------------------------------------------------------------------------
-// void CLocSUPLSettings::HandleCommandL
-// Inherited from MLocSUPLSettingsEventHandler
-// Handles commands from the views
-// 
-// @param  aCommand Command ID
-// ---------------------------------------------------------------------------
-//
-void CLocSUPLSettings::HandleCommandL( TInt aCommand )
-	{
-	DEBUG1( + CLocSUPLSettings::HandleCommandL aCommand=%d, aCommand );
-	switch ( aCommand )
-		{		
-
-		case MLocSUPLSettingsEventHandler::ELaunchViewComplete:
-		    {
-		    if ( iLaunchParamType == ELaunchParamString )
-		        {
-	            delete iLaunchAO;
-	            iLaunchAO = NULL;
-	            
-	            iLaunchAO = CLocSUPLAO::NewL( iSettingsUiObserver,
-	                                          *iSettingsEngine,                                          
-	                                          iLaunchParams );
-	                        
-	            iLaunchAO->CompleteRequest();		        
-		        }
-		    break;
-		    }
-		// Handle any plug-in specific internal commands here
-		case EAknSoftkeyBack:
-			{			
-			// Reset the flag for an outstanding launch request 
-	        iLaunchOutStanding = EFalse;
-	    
-			// The UI is intended to be closed. Pass the event 
-			// to the observer
-			iSettingsUiObserver.SettingClosed( KErrNone );		
-			break;
-			}
-		case EAknCmdExit:
-		case EEikCmdExit:
-		    {		    
-		    // Reset the flag for an outstanding launch request 
-	        iLaunchOutStanding = EFalse;
-	        
-	        iAppUi.HandleCommandL( aCommand );
-	        break;  
-		    }
-		default:
-			{
-			// Un-handled commands are to be passed to the 
-			// App UI
-			iAppUi.HandleCommandL( aCommand );
-			break;	
-			}
-		}		
-	DEBUG( - CLocSUPLSettings::HandleSettingsEventL );
-	}
-	
-// ---------------------------------------------------------------------------
-// void CLocSUPLSettings::LaunchSUPLUiL
-// Launches the SUPL UI
-//
-// ---------------------------------------------------------------------------	
-//
-void CLocSUPLSettings::LaunchSUPLUiL()
-    {
-	DEBUG( + CLocSUPLSettings::LaunchSUPLUiL );
-    // Launch the UI
-    // The Launch paramters should be of type TLocSUPLSettingsParams
-	// This is an internal agreement between the Settings Ui plug-in and the 
-	// user of the plug-in. If the paramter is of any other type, then the 
-	// behaviour is undefined for the pluging will still take it as 
-	// TLocSUPLSettingsParams type
-	
-	// Additionaly the Launch param can be a String type, which currently
-	// holds the session id.
-	// If String paramater contains any other info, then it Leaves with
-	// KErrNotSupported. This is basically used for Launching the SUPL
-	// Triggering Session details. 
-	
-	switch( iLaunchParamType )
-	    {
-	    case ELaunchParamInt:
-	        {
-	        // If the User has requested for the default behaviour, the SUPL Settings
-	        // default view is popped up.       
-	        if( ELocSUPLDefault == iLaunchParams )
-	            {
-	            // Activate the actual SUPL configuration view
-	            iAppUi.ActivateLocalViewL( iSettingsViewId );
-	            }
-	        else if ( ELocSuplSettingsPage == iLaunchParams )
-	            {
-	            iSettingsView->StartedFromAppServer();
-	            // Activate the actual SUPL configuration view
-	            iAppUi.ActivateLocalViewL( iSettingsViewId );               
-	            }
-	        else if( ELocSUPLIAPSelection == iLaunchParams )
-	            {    
-	            // Check if the User intended to Launch IAP Selection 
-	            iSettingsEngine->SelectConnectionL();
-	            }
-	        else
-	            {
-	            // The falg was not supported
-	            User::Leave( KErrNotSupported );   
-	            }  
-	        break;
-	        }
-        case ELaunchParamString:
-            {
-			// For the Title pane to be visible in View Architecture, we need
-			// to activate atleast one view which sets iIsReadyToDraw flag.
-			// So we activate the Session view.
-			iAppUi.ActivateLocalViewL( iSessionViewId );    
-            break;
-            }
-	    }        
- 	DEBUG( - CLocSUPLSettings::LaunchSUPLUiL );
-   }
-        	
-// ---------------------------------------------------------------------------
-// void CLocSUPLSettings::OpenLocalizedResourceFileL
-// Opens the nearest localized resourcefile using aResourceLoader. 
-// aResourceLoader should be opened only once before closing it. 
-// Otherwise it will raise a panic. Therefore it is better to have 
-// multiple resource loaders.
-// 
-// @param aResourceFileName Drive and name of resource file in format 
-//                          <path>:<rsc_file_name>
-// @param aResourceLoader Resource loader for the resource. The loader 
-//                        must not be opened allready or it will raise 
-//                        a panic. It is caller's responsibility to 
-//                        close the resource loader after using the 
-//                        resource.
-// ---------------------------------------------------------------------------	
-//
-void CLocSUPLSettings::OpenLocalizedResourceFileL( 
-                                		const TDesC&    		aResourceFileName, 
-   									  	RConeResourceLoader& 	aResourceLoader )
-    {
-	DEBUG( + CLocSUPLSettings::OpenLocalizedResourceFileL );
-    RFs fsSession;
-    User::LeaveIfError( fsSession.Connect());
-    
-    // Add the RFs session to the CleanupStack
-    CleanupClosePushL( fsSession );
-    
-	TFileName* tmpName = new( ELeave ) TFileName;
-    CleanupStack::PushL( tmpName );
-    
-    // Append the Resource Files Directory
-    tmpName->Append( KDC_RESOURCE_FILES_DIR );
-    
-    // Append the Ressource File Name
-    tmpName->Append( aResourceFileName );
-    
-    
-    // Obtain the drive where the DLL is installed
-    TFileName* dllDrive = new ( ELeave ) TFileName;
-    CleanupStack::PushL( dllDrive );
-    Dll::FileName( *dllDrive );
-    
-    // Obtain the Complete path for the Resource File
-    TParse parse;
-	User::LeaveIfError( parse.Set( *dllDrive, NULL, NULL ) );
-    User::LeaveIfError( parse.Set( parse.Drive(), tmpName, NULL ) );
-	TFileName* fileName = new ( ELeave ) TFileName;
-	CleanupStack::PushL( fileName );
-	fileName->Append( parse.FullName() );
-    
-    // Get language of resource file
-    BaflUtils::NearestLanguageFile( fsSession, *fileName );
-        
-    // Open resource file    
-    TRAPD( error , aResourceLoader.OpenL( *fileName ) );
-    if( KErrNone != error ) 
-        {
-        User::Leave( error );
-        }
-    
-    // Pop all the fields
-    CleanupStack::PopAndDestroy( fileName );
-    CleanupStack::PopAndDestroy( dllDrive );
-    CleanupStack::PopAndDestroy( tmpName );
-   
-    CleanupStack::Pop(); // fsSession
-               
-    //If leave occurs before this, close is called automatically when the thread exits.
-    fsSession.Close();
-	DEBUG( - CLocSUPLSettings::OpenLocalizedResourceFileL );   
-    }
-
-// End of File
--- a/locationsystemui/locationsysui/locsuplsettingsui/src/locsuplsettingsadapter.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,781 +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:  Adapter to the SUPL Settings API
-*
-*/
-
-
-// System Includes
-#include <epos_csuplsettings.h>
-#include <locsuplsettingsui.rsg>
-#include <StringLoader.h>
-
-// User Includes
-#include "locsuplsettingsadapter.h"
-#include "locsuplsettingsadapterobserver.h"
-#include "locsuplsettingssessionobserver.h"
-#include "locsupldebug.h"
-
-
-
-// ---------------------------------------------------------------------------
-// Private Constructor
-// ---------------------------------------------------------------------------
-//
-CLocSUPLSettingsAdapter::CLocSUPLSettingsAdapter( 
-                            MLocSUPLSettingsAdapterObserver&    aObserver )
-		:CActive( EPriorityStandard ),
-		iObserver( aObserver )
-    {
-    }
- 
-// ---------------------------------------------------------------------------
-// Destructor
-// ---------------------------------------------------------------------------
-//    
-CLocSUPLSettingsAdapter::~CLocSUPLSettingsAdapter()
-    {
-	DEBUG( + CLocSUPLSettingsAdapter::~CLocSUPLSettingsAdapter );	
-    Cancel();
-    
-    if( iSUPLSettings )
-        {
-        iSUPLSettings->RemoveObserver();
-        iSUPLSettings->RemoveSessionObserver();
-        }
-        
-    delete iSUPLSettings;
-    iSUPLSettings = NULL;
-    
-    delete iAutomatic;
-    iAutomatic = NULL;
-    
-    delete iAutomaticatHome;
-    iAutomaticatHome = NULL;
-    
-    delete iAsk;
-    iAsk = NULL;
-    
-    delete iDisable;
-    iDisable = NULL;
-	DEBUG( - CLocSUPLSettingsAdapter::~CLocSUPLSettingsAdapter );	
-    } 
-
-// ---------------------------------------------------------------------------
-// CLocSUPLSettingsAdapter* CLocSUPLSettingsAdapter::NewL
-// Static Two phase contructor that instantiates the CLocSUPLSettingsAdapter
-// 
-// @param aObserver				    Observer to the SUPL settings adapter
-// @return CLocSUPLSettingsAdapter*	Reference to the object created
-// ---------------------------------------------------------------------------
-//    
-CLocSUPLSettingsAdapter* CLocSUPLSettingsAdapter::NewL(
-                            MLocSUPLSettingsAdapterObserver&    aObserver )
-    {
-	DEBUG( + CLocSUPLSettingsAdapter::NewL );	
-    CLocSUPLSettingsAdapter* self = 
-                new ( ELeave ) CLocSUPLSettingsAdapter( aObserver );
-    CleanupStack::PushL( self );
-    self->ConstructL();
-    CleanupStack::Pop( self );
-	DEBUG( - CLocSUPLSettingsAdapter::NewL );	
-    return self;
-    }
-
-// ---------------------------------------------------------------------------
-// void CLocSUPLSettingsAdapter::ConstructL
-// Second phase of the two phase constructor
-// ---------------------------------------------------------------------------
-// 
-void CLocSUPLSettingsAdapter::ConstructL()
-    {
-	DEBUG( + CLocSUPLSettingsAdapter::ConstructL );	
-    // Create the SUPL Settings
-    iSUPLSettings = CSuplSettings::NewL();
-    
-    // Set the Observer for SUPL Settings
-    iSUPLSettings->SetObserverL( *this );
-    
-    // Set the Observer for SUPL Sessions
-    iSUPLSettings->SetSessionObserverL( *this );
-    
-    // Load the SUPL settings usage strings
-    iAutomatic 			= StringLoader::LoadL( R_LOC_SUPL_AUTOMATIC );
-    iAutomaticatHome 	= StringLoader::LoadL( R_LOC_SUPL_HOME_AUTOMATIC );
-    iAsk 				= StringLoader::LoadL( R_LOC_SUPL_ASK );
-    iDisable 			= StringLoader::LoadL( R_LOC_SUPL_DISABLED );
-    
-    CActiveScheduler::Add( this );
-	DEBUG( - CLocSUPLSettingsAdapter::ConstructL );	
-    }           
-
-// ---------------------------------------------------------------------------
-// void CLocSUPLSettingsAdapter::Initialize
-// Initializes the SUPL Settings API. This is an asynchronus call, the call
-// back for which is given through the observer
-// ---------------------------------------------------------------------------
-//
-void CLocSUPLSettingsAdapter::Initialize()
-    {
-	DEBUG( + CLocSUPLSettingsAdapter::Initialize );	
-    if( !IsActive())
-        {
-        iSUPLSettings->Initialize( iStatus );
-        SetActive();
-        }
-	DEBUG( - CLocSUPLSettingsAdapter::Initialize );	
-    }
-
-// ---------------------------------------------------------------------------
-// void CLocSUPLSettingsAdapter::CancelInitialize
-// Cancels the Initialization
-// ---------------------------------------------------------------------------
-//
-void CLocSUPLSettingsAdapter::CancelInitialize()
-    {
-    Cancel();
-    }
-    
-// ---------------------------------------------------------------------------
-// void CLocSUPLSettingsAdapter::SetSuplUsageL
-// ---------------------------------------------------------------------------
-//       
-void CLocSUPLSettingsAdapter::SetSuplUsageL( 
-            const CLocSUPLSettingsAdapter::TLocSuplUsage    aIndex )
-    {
-	DEBUG( + CLocSUPLSettingsAdapter::SetSuplUsageL );	
-    CSuplSettings::TSuplSettingsUsage value = CSuplSettings::ESuplUsageAlwaysAsk;
-    switch ( aIndex )
-        {
-        case ELocSuplAutomatic:
-            {
-            value = CSuplSettings::ESuplUsageAutomatic;
-            break;
-            }
-        case ELocSuplAutomaticatHome:
-            {
-            value = CSuplSettings::ESuplUsageHomeAutomatic;
-            break;
-            }
-        case ELocSuplAlwaysAsk:
-            {
-            value = CSuplSettings::ESuplUsageAlwaysAsk;
-            break;
-            }
-        case ELocSuplDisable:
-            {
-            value = CSuplSettings::ESuplUsageDisabled;
-            break;
-            }
-        default:
-            {
-            User::Leave( KErrNotFound );
-            break;    
-            }
-        }
-
-    // Write back to the SUPL settings API
-    TInt ret = iSUPLSettings->SetSuplUsage( value );            
-            
-    // If the Set failed, then Leave with the corresponding Error code
-    if( ret )
-        {
-        User::Leave ( ret );
-        }
-	DEBUG( - CLocSUPLSettingsAdapter::SetSuplUsageL );	
-    }
-
-// ---------------------------------------------------------------------------
-// void CLocSUPLSettingsAdapter::GetSuplUsageL
-// ---------------------------------------------------------------------------
-//  
-void CLocSUPLSettingsAdapter::GetSuplUsageL( TDes&    aSuplUsage )
-    {
-	DEBUG( + CLocSUPLSettingsAdapter::GetSuplUsageL );	
-    CSuplSettings::TSuplSettingsUsage value = CSuplSettings::ESuplUsageAlwaysAsk;
-    User::LeaveIfError( iSUPLSettings->GetSuplUsage( value ));
-
-    switch ( value )
-        {
-        case CSuplSettings::ESuplUsageAutomatic:
-            {
-            if ( aSuplUsage.MaxLength() < iAutomatic->Des().Length())
-                {
-                User::Leave( KErrNoMemory );
-                }
-            aSuplUsage.Copy( *iAutomatic );
-            break;
-            }
-        case CSuplSettings::ESuplUsageHomeAutomatic:
-            {
-            if ( aSuplUsage.MaxLength() < iAutomaticatHome->Des().Length())
-                {
-                User::Leave( KErrNoMemory );
-                }
-            aSuplUsage.Copy( *iAutomaticatHome );          
-            break;
-            }
-        case CSuplSettings::ESuplUsageAlwaysAsk:
-            {
-            if ( aSuplUsage.MaxLength() < iAsk->Des().Length())
-                {
-                User::Leave( KErrNoMemory );
-                }            
-            aSuplUsage.Copy( *iAsk );
-            break;
-            }
-        case CSuplSettings::ESuplUsageDisabled:
-            {
-            if ( aSuplUsage.MaxLength() < iDisable->Des().Length())
-                {
-                User::Leave( KErrNoMemory );
-                }
-            aSuplUsage.Copy( *iDisable );
-            break;
-            }
-        default:
-            {
-            User::Leave( KErrNotSupported );
-            break;
-            }
-        }
-	DEBUG( - CLocSUPLSettingsAdapter::GetSuplUsageL );	
-    }
-
-// ---------------------------------------------------------------------------
-// TLocSuplUsage CLocSUPLSettingsAdapter::GetSuplUsage
-// ---------------------------------------------------------------------------
-// 
-TInt CLocSUPLSettingsAdapter::GetSuplUsage()
-    {
-	DEBUG( + CLocSUPLSettingsAdapter::GetSuplUsage TInt );	
-    CSuplSettings::TSuplSettingsUsage value = CSuplSettings::ESuplUsageAlwaysAsk;
-    TInt error = iSUPLSettings->GetSuplUsage( value );
-    if ( error )
-        {
-        // If there is an error then return the default value
-        return CSuplSettings::ESuplUsageAlwaysAsk;
-        }
-	DEBUG( - CLocSUPLSettingsAdapter::GetSuplUsage TInt );	
-    return value;
-    }
-
-// ---------------------------------------------------------------------------
-// TLocSuplUsage CLocSUPLSettingsAdapter::GetSuplUsageIndex
-// ---------------------------------------------------------------------------
-// 
-CLocSUPLSettingsAdapter::TLocSuplUsage CLocSUPLSettingsAdapter::GetSuplUsageIndex()
-    {    
-	DEBUG( + CLocSUPLSettingsAdapter::GetSuplUsageIndex );	
-    TLocSuplUsage index = ELocSuplAutomatic;
-    CSuplSettings::TSuplSettingsUsage value = CSuplSettings::ESuplUsageAlwaysAsk;
-    if ( iSUPLSettings->GetSuplUsage( value ))
-        {
-        // If there is an error then return the default value.
-        return index;
-        }
-        
-    switch ( value )
-        {
-        case CSuplSettings::ESuplUsageAutomatic:
-            {
-            index = ELocSuplAutomatic;
-            break;
-            }
-        case CSuplSettings::ESuplUsageHomeAutomatic:
-            {
-            index = ELocSuplAutomaticatHome;         
-            break;
-            }
-        case CSuplSettings::ESuplUsageAlwaysAsk:
-            {
-            index = ELocSuplAlwaysAsk;
-            break;
-            }
-        case CSuplSettings::ESuplUsageDisabled:
-            {
-            index = ELocSuplDisable;
-            break;
-            }
-        default:
-            {
-            break;
-            }
-        }
-    return index;   
-    }
-    
-// ---------------------------------------------------------------------------
-// const TDesC& CLocSUPLSettingsAdapter::Automatic
-// ---------------------------------------------------------------------------
-// 
-const TDesC& CLocSUPLSettingsAdapter::Automatic()
-    {
-    return *iAutomatic;
-    }
-
-// ---------------------------------------------------------------------------
-// const TDesC& CLocSUPLSettingsAdapter::AutomaticAtHome
-// ---------------------------------------------------------------------------
-//
-const TDesC& CLocSUPLSettingsAdapter::AutomaticAtHome()
-    {
-    return *iAutomaticatHome;  
-    }
-
-// ---------------------------------------------------------------------------
-// const TDesC& CLocSUPLSettingsAdapter::AlwaysAsk
-// ---------------------------------------------------------------------------
-//
-const TDesC& CLocSUPLSettingsAdapter::AlwaysAsk()
-    {
-    return *iAsk;   
-    }
-
-// ---------------------------------------------------------------------------
-// const TDesC& CLocSUPLSettingsAdapter::Disable
-// ---------------------------------------------------------------------------
-//
-const TDesC& CLocSUPLSettingsAdapter::Disable()
-    {
-    return *iDisable; 
-    }
-                   
-// ---------------------------------------------------------------------------
-// void CLocSUPLSettingsAdapter::HandleSuplSettingsChangeL
-// Handle the Settings UI changes
-// ---------------------------------------------------------------------------
-//     
-void CLocSUPLSettingsAdapter::HandleSuplSettingsChangeL( 
-                TSuplSettingsEventType /*aEvent*/,
-                TInt /*aSlpId*/                         
-        		)
-    {
-	DEBUG( + CLocSUPLSettingsAdapter::HandleSuplSettingsChangeL );	
-    iObserver.HandleSuplSettingsChangeL( 
-                    MLocSUPLSettingsAdapterObserver::ESUPLSettingsChanged );
-	DEBUG( - CLocSUPLSettingsAdapter::HandleSuplSettingsChangeL );	
-    }
-
-// ---------------------------------------------------------------------------
-// void CLocSUPLSettingsAdapter::HandleSuplSessionChangeL
-// Handle the Supl Session changes
-// ---------------------------------------------------------------------------
-//     
-void CLocSUPLSettingsAdapter::HandleSuplSessionChangeL( 
-                TSuplSessionEventType aEvent,
-                TInt64 aSessionId                        
-        		)
-    {
-	DEBUG( + CLocSUPLSettingsAdapter::HandleSuplSessionChangeL );	
-	if( iSessionObserver && iSessionObserver->SessionId() == aSessionId )
-		{
-		MLocSUPLSettingsSessionObserver::TUpdateType updateType = 
-                            MLocSUPLSettingsSessionObserver::ESessionModified;
-							
-		if( MSuplSessionObserver::ESuplSessionDBDeleteEvent == aEvent )
-		    updateType = MLocSUPLSettingsSessionObserver::ESessionDeleted;
-
-		iSessionObserver->UpdateSessionL( updateType );
-		}
-		
-    iObserver.HandleSuplSettingsChangeL( 
-                    MLocSUPLSettingsAdapterObserver::ESUPLSettingsChanged );
-	DEBUG( - CLocSUPLSettingsAdapter::HandleSuplSessionChangeL );	
-    }
-
-// ---------------------------------------------------------------------------
-// void CLocSUPLSettingsAdapter::RunL
-// Inherited from CActive
-// ---------------------------------------------------------------------------
-// 
-void CLocSUPLSettingsAdapter::RunL()
-    {
-	DEBUG( + CLocSUPLSettingsAdapter::RunL );	
-    // If the SUPL settings API has been successfull initalized then a success
-    // call back needs to be issued. In all other cases, other than a KErrCancel
-    // it is assumed that the initailization has failed.
-    if( iStatus.Int() == KErrNone )
-        {        
-        iObserver.HandleSuplSettingsChangeL( 
-                    MLocSUPLSettingsAdapterObserver::ESUPLSettingsIntialized );
-        }
-    else if( iStatus.Int() != KErrCancel )
-        {
-        iObserver.HandleSuplSettingsChangeL( 
-                    MLocSUPLSettingsAdapterObserver::ESUPLSettingsInitalizeError );    
-        }
-	DEBUG( - CLocSUPLSettingsAdapter::RunL );	
-    }
-
-// ---------------------------------------------------------------------------
-// void CLocSUPLSettingsAdapter::DoCancel
-// Inherited from CActive
-// ---------------------------------------------------------------------------
-//     
-void CLocSUPLSettingsAdapter::DoCancel()
-    {
-    iSUPLSettings->CancelInitialize();
-    }
-
-
-//***************************************************************************
-//  
-//  @since S60 9.1TB 
-// 
-// ***************************************************************************
-
-// ---------------------------------------------------------------------------
-// void CLocSUPLSettingsAdapter::AddNewServerL
-// ---------------------------------------------------------------------------
-// 
-void CLocSUPLSettingsAdapter::AddNewServerL( 
-        const TDesC& aServerAddress,
-        const TDesC& aIapName,
-        const TBool aUsageInHomeNw
-		)
-	{
-	DEBUG( + CLocSUPLSettingsAdapter::AddNewServerL );	
-	CServerParams* serverParam = CServerParams::NewL();
-	CleanupStack::PushL( serverParam );
-	User::LeaveIfError(serverParam->Set( 
-						aServerAddress, 
-						aIapName, 
-						ETrue, 
-						EFalse, // default value
-						aUsageInHomeNw, 
-						ETrue ));
-	
-	TInt64 slpId;	
-	User::LeaveIfError( iSUPLSettings->AddNewServer( serverParam, slpId ) );							
-	CleanupStack::PopAndDestroy();
-	DEBUG( - CLocSUPLSettingsAdapter::AddNewServerL );	
-	}
-	
-// ---------------------------------------------------------------------------
-// void CLocSUPLSettingsAdapter::RemoveServerL
-// ---------------------------------------------------------------------------
-// 
-void CLocSUPLSettingsAdapter::RemoveServerL(
-		const TInt64 aSlpId
-		)
-	{
-	DEBUG( + CLocSUPLSettingsAdapter::RemoveServerL );	
-	User::LeaveIfError( iSUPLSettings->RemoveServer( aSlpId ) );
-	DEBUG( - CLocSUPLSettingsAdapter::RemoveServerL );	
-	}
-
-// ---------------------------------------------------------------------------
-// void CLocSUPLSettingsAdapter::GetAllSlpL
-// ---------------------------------------------------------------------------
-// 
-void CLocSUPLSettingsAdapter::GetAllSlpL(
-        RPointerArray<CServerParams>& aParamValues
-		) const
-	{
-	DEBUG( + CLocSUPLSettingsAdapter::GetAllSlpL );	
-	User::LeaveIfError( iSUPLSettings->GetAllSlp( aParamValues ) );
-	DEBUG( - CLocSUPLSettingsAdapter::GetAllSlpL );	
-	}
-
-// ---------------------------------------------------------------------------
-// void CLocSUPLSettingsAdapter::GetSlpInfoFromIdL
-// ---------------------------------------------------------------------------
-// 
-void CLocSUPLSettingsAdapter::GetSlpInfoFromIdL(
-	            const TInt64 aSlpId, 
-	            CServerParams *aParamValues
-	    ) const
-	{
-	DEBUG( + CLocSUPLSettingsAdapter::GetSlpInfoFromIdL );	
-	User::LeaveIfError( iSUPLSettings->GetSlpInfoFromId( aSlpId, aParamValues ) );	
-	DEBUG( - CLocSUPLSettingsAdapter::GetSlpInfoFromIdL );	
-	}
-
-// ---------------------------------------------------------------------------
-// void CLocSUPLSettingsAdapter::ChangePriorityL
-// ---------------------------------------------------------------------------
-// 
-void CLocSUPLSettingsAdapter::ChangePriorityL(
-        TInt64 aSlpId, 
-        TInt aPriority,
-        TBool aDirection
-		)
-	{
-	DEBUG( + CLocSUPLSettingsAdapter::ChangePriorityL );	
-	User::LeaveIfError( 
-		iSUPLSettings->ChangePriority( aSlpId, aPriority, aDirection ) );		
-	DEBUG( - CLocSUPLSettingsAdapter::ChangePriorityL );	
-	}
-
-// ---------------------------------------------------------------------------
-// void CLocSUPLSettingsAdapter::SetServerAddressL
-// ---------------------------------------------------------------------------
-// 
-void CLocSUPLSettingsAdapter::SetServerAddressL( 
-        const TInt64 aSlpId, 
-        const TDesC& aServerAddress
-		)
-	{
-	DEBUG( + CLocSUPLSettingsAdapter::SetServerAddressL );	
-	User::LeaveIfError( iSUPLSettings->SetServerAddress( aSlpId, aServerAddress ) );	
-	DEBUG( - CLocSUPLSettingsAdapter::SetServerAddressL );	
-	}
-
-// ---------------------------------------------------------------------------
-// void CLocSUPLSettingsAdapter::GetServerAddressL
-// ---------------------------------------------------------------------------
-// 
-void CLocSUPLSettingsAdapter::GetServerAddressL( 
-        TInt64 aSlpId, 
-        TDes& aServerAddress
-		) const
-	{
-	DEBUG( + CLocSUPLSettingsAdapter::GetServerAddressL );	
-	User::LeaveIfError( iSUPLSettings->GetServerAddress( aSlpId, aServerAddress ) );	
-	DEBUG( - CLocSUPLSettingsAdapter::GetServerAddressL );	
-	}
-
-// ---------------------------------------------------------------------------
-// void CLocSUPLSettingsAdapter::SetIapNameL
-// ---------------------------------------------------------------------------
-// 
-void CLocSUPLSettingsAdapter::SetIapNameL( 
-        const TInt64 aSlpId, 
-        const TDesC& aIapName
-		)
-	{
-	DEBUG( + CLocSUPLSettingsAdapter::SetIapNameL );	
-	User::LeaveIfError( iSUPLSettings->SetIapName( aSlpId, aIapName ) );	
-	DEBUG( - CLocSUPLSettingsAdapter::SetIapNameL );	
-	}
-
-// ---------------------------------------------------------------------------
-// void CLocSUPLSettingsAdapter::GetIapNameL
-// ---------------------------------------------------------------------------
-// 
-void CLocSUPLSettingsAdapter::GetIapNameL( 
-        const TInt64 aSlpId, 
-        TDes& aIapName
-		) const
-	{
-	DEBUG( + CLocSUPLSettingsAdapter::GetIapNameL );	
-	User::LeaveIfError( iSUPLSettings->GetIapName( aSlpId, aIapName ) );	
-	DEBUG( - CLocSUPLSettingsAdapter::GetIapNameL );	
-	}
-
-// ---------------------------------------------------------------------------
-// void CLocSUPLSettingsAdapter::SetServerEnabledFlagL
-// ---------------------------------------------------------------------------
-// 
-void CLocSUPLSettingsAdapter::SetServerEnabledFlagL(
-        const TInt64 aSlpId, 
-        const TBool aEnable 
-		)
-	{
-	DEBUG( + CLocSUPLSettingsAdapter::SetServerEnabledFlagL );	
-	User::LeaveIfError( iSUPLSettings->SetServerEnabledFlag( aSlpId, aEnable ) );	
-	DEBUG( - CLocSUPLSettingsAdapter::SetServerEnabledFlagL );	
-	}
-
-// ---------------------------------------------------------------------------
-// void CLocSUPLSettingsAdapter::GetServerEnabledFlagL
-// ---------------------------------------------------------------------------
-// 
-void CLocSUPLSettingsAdapter::GetServerEnabledFlagL(
-        const TInt64 aSlpId, 
-        TBool& aEnable 
-		) const
-	{
-	DEBUG( + CLocSUPLSettingsAdapter::GetServerEnabledFlagL );	
-	User::LeaveIfError( iSUPLSettings->GetServerEnabledFlag( aSlpId, aEnable ) );	
-	DEBUG( - CLocSUPLSettingsAdapter::GetServerEnabledFlagL );	
-	}
-
-// ---------------------------------------------------------------------------
-// void CLocSUPLSettingsAdapter::SetUsageInHomwNwFlagL
-// ---------------------------------------------------------------------------
-// 
-void CLocSUPLSettingsAdapter::SetUsageInHomwNwFlagL(
-        const TInt64 aSlpId, 
-        const TBool aHomeNwFlag 
-		)
-	{
-	DEBUG( + CLocSUPLSettingsAdapter::SetUsageInHomwNwFlagL );	
-	User::LeaveIfError( iSUPLSettings->SetUsageInHomwNwFlag( aSlpId, aHomeNwFlag ) );	
-	DEBUG( - CLocSUPLSettingsAdapter::SetUsageInHomwNwFlagL );	
-	}
-
-// ---------------------------------------------------------------------------
-// void CLocSUPLSettingsAdapter::GetUsageInHomwNwFlagL
-// ---------------------------------------------------------------------------
-// 
-void CLocSUPLSettingsAdapter::GetUsageInHomwNwFlagL(
-        const TInt64 aSlpId, 
-        TBool& aHomeNwFlag 
-		) const
-	{
-	DEBUG( + CLocSUPLSettingsAdapter::SetUsageInHomwNwFlagL );	
-	User::LeaveIfError( iSUPLSettings->GetUsageInHomwNwFlag( aSlpId, aHomeNwFlag ) );	
-	DEBUG( - CLocSUPLSettingsAdapter::GetServerEnabledFlagL );	
-	}
-
-// ---------------------------------------------------------------------------
-// void CLocSUPLSettingsAdapter::SetEditableFlagL
-// ---------------------------------------------------------------------------
-// 
-void CLocSUPLSettingsAdapter::SetEditableFlagL( 
-	            const TInt64 aSlpId, 
-	            const TBool aEditFlag 
-	    ) const
-	{
-	DEBUG( + CLocSUPLSettingsAdapter::SetEditableFlagL );	
-	User::LeaveIfError( iSUPLSettings->SetEditableFlag( aSlpId, aEditFlag ) );
-	DEBUG( - CLocSUPLSettingsAdapter::SetEditableFlagL );	
-	}
-
-// ---------------------------------------------------------------------------
-// void CLocSUPLSettingsAdapter::GetEditableFlagL
-// ---------------------------------------------------------------------------
-// 
-void CLocSUPLSettingsAdapter::GetEditableFlagL(
-	            const TInt64 aSlpId, 
-	            TBool& aEditFlag 
-	    ) const
-	{
-	DEBUG( + CLocSUPLSettingsAdapter::GetEditableFlagL );	
-	User::LeaveIfError( iSUPLSettings->GetEditableFlag( aSlpId, aEditFlag ) );	
-	DEBUG( - CLocSUPLSettingsAdapter::GetEditableFlagL );	
-	}
-
-// ---------------------------------------------------------------------------
-// void CLocSUPLSettingsAdapter::SlpCountL
-// ---------------------------------------------------------------------------
-// 
-void CLocSUPLSettingsAdapter::SlpCountL(
-        TInt& aCount 
-		)
-	{
-	DEBUG( + CLocSUPLSettingsAdapter::SlpCountL );	
-	User::LeaveIfError( iSUPLSettings->SlpCount( aCount ) );	
-	DEBUG( - CLocSUPLSettingsAdapter::SlpCountL );	
-	}
-
-// ---------------------------------------------------------------------------
-// void CLocSUPLSettingsAdapter::GetActiveSessionsCountL
-// ---------------------------------------------------------------------------
-//
-void CLocSUPLSettingsAdapter::GetActiveSessionsCountL( TInt& aActiveSessionsCount )
-    {
-    DEBUG( + CLocSUPLSettingsAdapter::GetActiveSessionsCountL );
-    RPointerArray< CTriggerParams > aParamValues;
-    TInt ret = iSUPLSettings->GetTriggerParams( aParamValues );
-    if( ret == KErrNotFound )
-        {
-        aParamValues.ResetAndDestroy();
-        aParamValues.Close(); 
-        aActiveSessionsCount = 0;
-        }
-    else if ( ret == KErrNone )
-        {
-        TInt activeSessionsCount = aParamValues.Count(); 
-        aParamValues.ResetAndDestroy();
-        aParamValues.Close();   
-        aActiveSessionsCount = activeSessionsCount;
-        }
-    else
-        {
-        aParamValues.ResetAndDestroy();
-        aParamValues.Close();
-        //Leave with error
-        User::Leave( ret );
-        }
-        DEBUG( - CLocSUPLSettingsAdapter::GetActiveSessionsCountL );   
-    }
- 
-// ---------------------------------------------------------------------------
-// void CLocSUPLSettingsAdapter::GetTriggerParamsL
-// ---------------------------------------------------------------------------
-//
-void CLocSUPLSettingsAdapter::GetTriggerParamsL( RPointerArray<CTriggerParams>& aParamValues ) const
-    {
-    DEBUG( + CLocSUPLSettingsAdapter::GetTriggerParamsL );
-    TInt ret = iSUPLSettings->GetTriggerParams( aParamValues );
-    if(( ret != KErrNotFound ) && ( ret != KErrNone ))
-        {
-         User::Leave( ret );   
-        }
-    DEBUG( - CLocSUPLSettingsAdapter::GetTriggerParamsL );  
-    }
- 
-// ---------------------------------------------------------------------------
-// void CLocSUPLSettingsAdapter::GetTriggerParamsL
-// ---------------------------------------------------------------------------
-//
-void CLocSUPLSettingsAdapter::GetTriggerParamsL( TInt64 aSessionId, CTriggerParams*& aTrigger ) const
-    {
-    DEBUG( + CLocSUPLSettingsAdapter::GetTriggerParamsL );
-    TInt ret = iSUPLSettings->GetTriggerParams( aSessionId, aTrigger );
-    if( !ret )
-        {
-         User::Leave( ret );   
-        }
-    DEBUG( - CLocSUPLSettingsAdapter::GetTriggerParamsL );  
-    }
- 
-// ---------------------------------------------------------------------------
-// void CLocSUPLSettingsAdapter::ChangeNotificationStatusL
-// ---------------------------------------------------------------------------
-//
-void CLocSUPLSettingsAdapter::ChangeNotificationStatusL( TInt64 aSessionId, TBool aTriggerNotificationStatus ) const
-    {
-    DEBUG( + CLocSUPLSettingsAdapter::ChangeNotificationStatusL );
-    TInt ret = iSUPLSettings->SetNotificationStatus( aSessionId, aTriggerNotificationStatus );
-    if(( ret != KErrNotFound ) && ( ret != KErrNone ))
-        {
-         User::Leave( ret );   
-        }
-    DEBUG( - CLocSUPLSettingsAdapter::ChangeNotificationStatusL );  
-    }
-    
-// ---------------------------------------------------------------------------
-// void CLocSUPLSettingsAdapter::RemoveTriggerSessionL
-// ---------------------------------------------------------------------------
-//
-void CLocSUPLSettingsAdapter::RemoveTriggerSessionL( TInt64 aSessionId ) const
-    {
-    DEBUG( + CLocSUPLSettingsAdapter::RemoveTriggerSessionL );
-    iSUPLSettings->CancelTriggerSession( aSessionId );
-    DEBUG( - CLocSUPLSettingsAdapter::RemoveTriggerSessionL );  
-    }
-	
-// ---------------------------------------------------------------------------
-// void CLocSUPLSettingsAdapter::SetSessionObserver
-// ---------------------------------------------------------------------------
-// 
-void CLocSUPLSettingsAdapter::SetSessionObserver( MLocSUPLSettingsSessionObserver* aObserver )
-	{
-	iSessionObserver = aObserver;
-	}
-	
-// ---------------------------------------------------------------------------
-// void CLocSUPLSettingsAdapter::RemoveSessionObserver
-// ---------------------------------------------------------------------------
-// 
-void CLocSUPLSettingsAdapter::RemoveSessionObserver( )
-	{
-	iSessionObserver = NULL;
-	}
-    
-// End of file
--- a/locationsystemui/locationsysui/locsuplsettingsui/src/locsuplsettingscontainer.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,433 +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:  SUPL Settings UI View's container
-*
-*/
-
-
-// System Includes
-#include <eikspane.h> 		// Status pane
-#include <akntitle.h>   	// CAknTitlePane
-#include <aknlists.h>
-#include <StringLoader.h>
-#include <locsuplsettingsui.rsg>
-#include <csxhelp/locsupl.hlp.hrh>          // Help File
-
-// User Includes
-#include "locsuplsettings.hrh"
-#include "locsuplsettingsuid.hrh"
-#include "locsuplsettingscontainer.h"
-#include "locsuplsettingslbmodel.h"
-#include "locsuplsettingsuiengine.h"
-#include "locsuplsettingsview.h"
-#include "locsupldebug.h"
-
-
-// ========================= MEMBER FUNCTIONS ================================
-
-// ---------------------------------------------------------------------------
-// CLocSUPLSettingsContainer::CLocSUPLSettingsContainer
-// Overloaded Constructor
-//
-// ---------------------------------------------------------------------------
-//	
-CLocSUPLSettingsContainer::CLocSUPLSettingsContainer( 
-                                        CLocSUPLSettingsView&         aSettingsView )
-    : iSettingsView( aSettingsView )
-	{
-	}
-	
-// ---------------------------------------------------------------------------
-// CLocSUPLSettingsContainer::~CLocSUPLSettingsContainer
-// Destructor
-//
-// ---------------------------------------------------------------------------	
-//
-CLocSUPLSettingsContainer::~CLocSUPLSettingsContainer()
-	{
-	DEBUG( + CLocSUPLSettingsContainer::~CLocSUPLSettingsContainer );	
-	// Delete the List box model only after deleting the list box
-	delete iListBox;
-	iListBox = NULL;
-	
-	delete iListBoxModel;
-	iListBoxModel = NULL;
-	DEBUG( - CLocSUPLSettingsContainer::~CLocSUPLSettingsContainer );	
-	}
-	
-// ---------------------------------------------------------------------------
-// CLocSUPLSettingsContainer* CLocSUPLSettingsContainer::NewL
-// Static Two phase constructor that instantiates the CLocSUPLSettingsContainer
-//
-// @param aRect							Client rectangle
-// @param aEngine                       Reference to the SUPL Settings
-//                                      engine 
-// @param aSettingsView                 Reference to the container's view
-// @return CLocSUPLSettingsContainer*	Reference to the object created
-// ---------------------------------------------------------------------------    
-//
-CLocSUPLSettingsContainer* CLocSUPLSettingsContainer::NewL( 
-                    const TRect& 	                    aRect,
-                          CLocSUPLSettingsUiEngine&     aEngine,
-                          CLocSUPLSettingsView&         aSettingsView )
-	{	
- 	DEBUG( + CLocSUPLSettingsContainer::NewL );	
-   	CLocSUPLSettingsContainer* self = NewLC( aRect, 
-                                             aEngine,
-                                             aSettingsView );
-	CleanupStack::Pop( self );
-	DEBUG( - CLocSUPLSettingsContainer::NewL );	
-	return self;
-	}
-
-// ---------------------------------------------------------------------------
-// CLocSUPLSettingsContainer* CLocSUPLSettingsContainer::NewLC
-// Static Two phase contructor that instantiates the CLocSUPLSettingsContainer
-//
-// @param aRect							Client rectangle
-// @param aEngine                       Reference to the SUPL Settings
-//                                      engine 
-// @param @param aSettingsView                 Reference to the container's view
-// @return CLocSUPLSettingsContainer*	Reference to the object created
-// ---------------------------------------------------------------------------  
-//  
-CLocSUPLSettingsContainer* CLocSUPLSettingsContainer::NewLC( 
-                    const TRect& 	                    aRect,
-                          CLocSUPLSettingsUiEngine&     aEngine,
-                          CLocSUPLSettingsView&         aSettingsView  )
-	{	
-    CLocSUPLSettingsContainer* self = new ( ELeave ) CLocSUPLSettingsContainer(
-                                                        aSettingsView );
-	CleanupStack::PushL( self );
-	self->ConstructL( aRect, aEngine );
-	return self;
-	}
-
-// --------------------------------------------------------------------------- 
-// void CLocSUPLSettingsContainer::ConstructL
-// Second phase of the two phase Construction process
-//
-// @param aRect				 Client rectangle
-// @param aEngine            Reference to the SUPL Settings engine
-// ---------------------------------------------------------------------------
-//
-void CLocSUPLSettingsContainer::ConstructL( 
-                                    const TRect& 	aRect ,
-                                          CLocSUPLSettingsUiEngine&     aEngine )
-	{
-	DEBUG( + CLocSUPLSettingsContainer::ConstructL );	
-	//Make this control a window-owning control
-	CreateWindowL(); 
-	
-	// Create a New Title for the View
-	MakeTitleL( R_SUPLVIEW_TITLE );
-	
-	CreateListboxL( aEngine );
-	
-	// Get the Help context
-	iContextName = KLOC_HLP_SUPL();
-	
-    SetRect( aRect );
-    ActivateL();
-	DEBUG( - CLocSUPLSettingsContainer::ConstructL );	
-	}	
-
-// ---------------------------------------------------------------------------
-// void CLocSUPLSettingsContainer::UpdateScreen
-// Refreshes the screen so that the list box reflects the latest contents
-// ---------------------------------------------------------------------------
-//
-void CLocSUPLSettingsContainer::UpdateScreen()
-    {
-	DEBUG( + CLocSUPLSettingsContainer::UpdateScreen );	
-    if ( iListBox )
-        {
-    	// Update Listbox items
-    	TRAP_IGNORE( iListBox->HandleItemAdditionL() );
-    	TRAP_IGNORE( iListBox->HandleItemRemovalL() );
-        }
-    DrawNow();
-	DEBUG( - CLocSUPLSettingsContainer::UpdateScreen );	
-    }
-
-// -----------------------------------------------------------------------------
-// TInt CLocSUPLSettingsContainer::SelectedItemIndex
-// Returns the Selected element. The list box model defines the enumeration that
-// would determine the current element that has been selected
-//
-// @return TInt Index of the item selected
-// -----------------------------------------------------------------------------
-//
-TInt CLocSUPLSettingsContainer::SelectedItemIndex()
-    {
-    return iListBoxModel->ResolveSettingsItem( iListBox->CurrentItemIndex() );
-    }
-			       
-// ---------------------------------------------------------------------------
-// void CLocSUPLSettingsContainer::HandleResourceChange
-//
-// ---------------------------------------------------------------------------	
-void CLocSUPLSettingsContainer::HandleResourceChange(TInt aType)
-	{
-	DEBUG( + CLocSUPLSettingsContainer::HandleResourceChange );	
-	// Pass the event to the base class
-	CCoeControl::HandleResourceChange(aType);
-    switch( aType )
-    	{
-    	// Dynamic Layout switch
-    	case KEikDynamicLayoutVariantSwitch:
-    		{
-    		iSettingsView.HandleScreenSizeChange();
-			break;
-    		}
-    	default:
-    		{
-    		break;
-    		}
-    	}
-	DEBUG( - CLocSUPLSettingsContainer::HandleResourceChange );	
-	}
-   
-// -----------------------------------------------------------------------------
-// CLocSUPLSettingsContainer::GetHelpContext
-//
-// -----------------------------------------------------------------------------
-//
-void CLocSUPLSettingsContainer::GetHelpContext( TCoeHelpContext& aContext ) const
-    {
-	DEBUG( + CLocSUPLSettingsContainer::GetHelpContext );	
-    aContext.iContext = iContextName;
-    aContext.iMajor = TUid::Uid( KLOCSUPLSETTINGSUIUID3 );
-	DEBUG( - CLocSUPLSettingsContainer::GetHelpContext );	
-    }
-    
-// ---------------------------------------------------------------------------
-// TInt CLocSUPLSettingsContainer::CountComponentControls
-//
-// ---------------------------------------------------------------------------
-TInt CLocSUPLSettingsContainer::CountComponentControls() const
-	{
-	return 1;
-	}
-
-// ---------------------------------------------------------------------------
-// CCoeControl* CLocSUPLSettingsContainer::ComponentControl
-//
-// ---------------------------------------------------------------------------
-CCoeControl* CLocSUPLSettingsContainer::ComponentControl( TInt /*aIndex*/ ) const
-	{
-	return iListBox;	
-	}
-
-// ---------------------------------------------------------------------------
-// void CLocSUPLSettingsContainer::OfferKeyEventL
-//
-// ---------------------------------------------------------------------------	
-//
-TKeyResponse CLocSUPLSettingsContainer::OfferKeyEventL( const TKeyEvent& aKeyEvent,
-										   					  TEventCode aType )
-	{
-	DEBUG( + CLocSUPLSettingsContainer::OfferKeyEventL );	
-	if( aType == EEventKey )
-		{
-		switch ( aKeyEvent.iScanCode )
-	        {
-	        case EStdKeyUpArrow:
-	        case EStdKeyDownArrow:
-	        	{        	
-	        	TKeyResponse keyresponse = iListBox->OfferKeyEventL( aKeyEvent, aType );        	
-	            iSettingsView.HandleCommandL( ELocSuplOpenChange );
-	            return keyresponse;	
-	        	}
-	        default:
-	        	{
-	        	break;	
-	        	}
-	        }		
-		}
-	DEBUG( - CLocSUPLSettingsContainer::OfferKeyEventL );	
-    // now it's iListBox's job to process the key event
-    return iListBox->OfferKeyEventL( aKeyEvent, aType ); 
-	}
-	    
-// ---------------------------------------------------------------------------
-// void CLocSUPLSettingsContainer::HandleListBoxEventL
-//
-// ---------------------------------------------------------------------------
-//
-void CLocSUPLSettingsContainer::HandleListBoxEventL( CEikListBox*  /* aListBox */, 
-		 						   					 TListBoxEvent aEventType )
-	{
-	DEBUG( + CLocSUPLSettingsContainer::HandleListBoxEventL );	
-	switch (aEventType)
-        {
-        case EEventItemClicked:
-            {
-            // The item is just selected here. Change the MSK to reflect
-            // the Correct MSK value
-            iSettingsView.HandleCommandL( ELocSuplOpenChange );
-            break;    
-            }
-        // List box Item Selection
-        case EEventEnterKeyPressed:
-        case EEventItemSingleClicked: //case EEventItemDoubleClicked:
-            {
-            // Settings element has been selected. Command has to be issued to
-            // change the settings configuration
-            if ( SelectedItemIndex() == 0 )
-                {
-                iSettingsView.HandleCommandL( ELocSuplMSKChange );
-                }
-            else if ( SelectedItemIndex() == 1 || SelectedItemIndex() == 2 )
-                {
-                iSettingsView.HandleCommandL( ELocSuplMSKOpen );
-                }
-            break;	
-            }
-        default:
-           break;
-        }
-	DEBUG( - CLocSUPLSettingsContainer::HandleListBoxEventL );	
-	}
-	         		 	
-// ---------------------------------------------------------------------------
-// void CLocSUPLSettingsContainer::FocusChanged
-//
-// ---------------------------------------------------------------------------
-//
-void CLocSUPLSettingsContainer::FocusChanged( TDrawNow aDrawNow )
-	{
-	DEBUG( + CLocSUPLSettingsContainer::FocusChanged );	
-	CCoeControl::FocusChanged( aDrawNow );
-	// The focus event has to be explicitly handed over to all the compound
-	// controls since CCoeControl does not do that implicitly
-	if ( iListBox )
-		{
-		iListBox->SetFocus( IsFocused(), aDrawNow );				
-		}
-	DEBUG( - CLocSUPLSettingsContainer::FocusChanged );	
-	}
-		
-// ---------------------------------------------------------------------------
-// CLocSUPLSettingsContainer::SizeChanged
-// 
-// ---------------------------------------------------------------------------
-//
-void CLocSUPLSettingsContainer::SizeChanged()
-	{
-	DEBUG( + CLocSUPLSettingsContainer::SizeChanged );	
-	if ( iListBox )
-		{
-		iListBox->SetRect( Rect());
-		}
-	DEBUG( - CLocSUPLSettingsContainer::SizeChanged );	
-	}
-	
-// ---------------------------------------------------------------------------
-// void CLocSUPLSettingsContainer::MakeTitleL
-// Sets the Title text
-//
-// @param aResourceText Resource to create title
-// ---------------------------------------------------------------------------
-//
-void CLocSUPLSettingsContainer::MakeTitleL( TInt aResourceText )
-	{
-	DEBUG( + CLocSUPLSettingsContainer::MakeTitleL );	
-	// Obtain the title from the Status Pane
-	CAknTitlePane* title = static_cast<CAknTitlePane*>( StatusPane()->
-        ControlL( TUid::Uid( EEikStatusPaneUidTitle ) ) );
-       
-    // Set the Title's buffer    
-    HBufC* buf = StringLoader::LoadL( aResourceText );
-    title->SetText( buf ); // Takes ownership of buf
-	DEBUG( - CLocSUPLSettingsContainer::MakeTitleL );	
-	}
-
-// ---------------------------------------------------------------------------
-// void CLocSUPLSettingsContainer::StatusPane
-// Returns the Appui's status pane
-//
-// @return CEikStatusPane* Statuspane pointer
-// ---------------------------------------------------------------------------
-//
-CEikStatusPane* CLocSUPLSettingsContainer::StatusPane()
-	{
-	return iEikonEnv->AppUiFactory()->StatusPane();	
-	}
-
-// ---------------------------------------------------------------------------
-// void CLocSUPLSettingsContainer::CreateListboxL
-// Creates the List box and the Listbox model. Associates the list box model 
-// with the list box
-//
-// @param aEngine                       Reference to the SUPL Settings
-//                                      engine 
-// ---------------------------------------------------------------------------	
-//
-void CLocSUPLSettingsContainer::CreateListboxL( 
-                                    CLocSUPLSettingsUiEngine&     aEngine )
-	{
-	DEBUG( + CLocSUPLSettingsContainer::CreateListboxL );	
-	// Create the Listbox model
-    iListBoxModel = CLocSUPLSettingsLBModel::NewL( aEngine );
-	
-	// Create the List box
-	iListBox = new ( ELeave ) CAknSettingStyleListBox;
-    iListBox->ConstructL( this, EAknListBoxSelectionList );
-    iListBox->SetContainerWindowL( *this ); 
-    iListBox->SetListBoxObserver( this );
-    iListBox->CreateScrollBarFrameL( ETrue );
-    iListBox->ScrollBarFrame()->SetScrollBarVisibilityL( CEikScrollBarFrame::EOff,
-    													 CEikScrollBarFrame::EAuto ); 
-    													 
-    // The ownership of the list box model is retained with the Container.
-    // This is because the model contains the additional functionality of
-    // changing the settings values in addition to retreiving it.    													 
-    iListBox->Model()->SetItemTextArray( iListBoxModel );	
-    iListBox->Model()->SetOwnershipType( ELbmDoesNotOwnItemArray );									
-    iListBox->ActivateL();
-	DEBUG( - CLocSUPLSettingsContainer::CreateListboxL );	
-	}
-
-// ---------------------------------------------------------------------------
-// void CLocSUPLSettingsContainer::FocusToItemL
-// Focus move to server detail setting item
-//
-// ---------------------------------------------------------------------------
-//
-void CLocSUPLSettingsContainer::FocusToItemL( TInt aIndex )
-	{
-		iListBox->SetCurrentItemIndex( aIndex );
-	}
-    
-// ---------------------------------------------------------------------------
-// TInt CLocSUPLSettingsLBModel::ActiveSessionCount()
-// Returns the number of Active sessions.
-//
-// @return  TInt Returns the number of Active sessions count.
-// ---------------------------------------------------------------------------
-//	
-TInt CLocSUPLSettingsContainer::ActiveSessionCount( ) const
-    {
-	if( iListBoxModel )
-		{
-		return iListBoxModel->ActiveSessionCount();
-		}
-	else
-		{
-		return 0;
-		}
-	}
-
-// End of file
--- a/locationsystemui/locationsysui/locsuplsettingsui/src/locsuplsettingsimptable.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,48 +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:  ECOM proxy table for this plugin
-*
-*/
-
-
-// System includes
-#include <e32std.h>
-#include <ecom/implementationproxy.h>
-
-// User includes
-#include "locsuplsettings.h"
-#include "locsuplsettingsuid.hrh"
-
-// Constants
-const TImplementationProxy KExamplePluginImplementationTable[] = 
-	{
-	// UPDATE THIS - Uid for plugin implementation:
-	IMPLEMENTATION_PROXY_ENTRY( KLOCSUPLSETTINGSUIUID3,	CLocSUPLSettings::NewL )
-	};
-
-
-// ---------------------------------------------------------------------------
-// ImplementationGroupProxy
-// Gate/factory function
-//
-// ---------------------------------------------------------------------------
-//
-EXPORT_C const TImplementationProxy* ImplementationGroupProxy(TInt& aTableCount)
-	{
-	aTableCount = sizeof(KExamplePluginImplementationTable) 
-        / sizeof(TImplementationProxy);
-	return KExamplePluginImplementationTable;
-	}
-
-// End of file
--- a/locationsystemui/locationsysui/locsuplsettingsui/src/locsuplsettingslbmodel.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,430 +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:  List box for the SUPL Settings UI
-*
-*/
-
-
-// System Includes
-#include <e32keys.h>
-#include <locsuplsettingsui.rsg>
-#include <avkon.rsg>
-#include <StringLoader.h>
-#include <centralrepository.h>
-#include <epos_csuplsettings.h>
-
-
-// User Include
-#include "locsuplsettingslbmodel.h"
-#include "locsuplsettingsuiengine.h"
-#include "locsuplsettingsprivatecrkeys.h"
-#include "epos_omasuplconfigurationkeys.h"
-#include "locsupldebug.h"
-		  					   	  
-// Constants
-
-const TInt KMaxConversionBufferLength = 0x200;
-
-_LIT( KDefaultServerIPAddress, " " );
-
-// ========================= MEMBER FUNCTIONS ================================
-
-// ---------------------------------------------------------------------------
-// CLocSUPLSettingsLBModel::CLocSUPLSettingsLBModel
-// Default Constructor
-//
-// ---------------------------------------------------------------------------
-//
-CLocSUPLSettingsLBModel::CLocSUPLSettingsLBModel( 
-                            CLocSUPLSettingsUiEngine& aEngine )
-    :iEngine( aEngine )
-	{		
-	}
-
-// ---------------------------------------------------------------------------
-// CLocSUPLSettingsLBModel::~CLocSUPLSettingsLBModel
-// Destructor
-//
-// ---------------------------------------------------------------------------
-//
-CLocSUPLSettingsLBModel::~CLocSUPLSettingsLBModel()
-	{	
-	DEBUG( + CLocSUPLSettingsLBModel::~CLocSUPLSettingsLBModel );	
-	// Delete the Buffers
-	delete iBuffer;
-	iBuffer = NULL;
-	
-	delete iServerDetailTitle;
-	iServerDetailTitle = NULL;
-	
-	delete iSuplUsageTitle;
-	iSuplUsageTitle = NULL;
-	
-	delete iSuplServerDetail;
-	iSuplServerDetail = NULL;
-
-	delete iDefaultSuplUsage;
-	iDefaultSuplUsage = NULL;
-	DEBUG( - CLocSUPLSettingsLBModel::~CLocSUPLSettingsLBModel );	
-	}
-	
-// ---------------------------------------------------------------------------
-// CLocSUPLSettingsLBModel* CLocSUPLSettingsLBModel::NewL
-// Two-phased constructor
-// 
-// @param  aEngine                  Reference the SUPL Settings Engine 
-// @return CLocSUPLSettingsLBModel*	Reference to the object created
-//
-// ---------------------------------------------------------------------------
-//
-CLocSUPLSettingsLBModel* CLocSUPLSettingsLBModel::NewL( 
-                                    CLocSUPLSettingsUiEngine& aEngine )
-	{
-	DEBUG( + CLocSUPLSettingsLBModel::NewL );	
-	CLocSUPLSettingsLBModel* self = CLocSUPLSettingsLBModel::NewLC( aEngine );
-	CleanupStack::Pop( self );
-	DEBUG( - CLocSUPLSettingsLBModel::NewL );	
-	return self;
-	}
-
-// ---------------------------------------------------------------------------
-// CLocSUPLSettingsLBModel* CLocSUPLSettingsLBModel::NewLC
-// Two-phased constructor
-// 
-// @param  aEngine                  Reference the SUPL Settings Engine 
-// @return CLocSUPLSettingsLBModel*	Reference to the object created
-//
-// ---------------------------------------------------------------------------
-//
-CLocSUPLSettingsLBModel* CLocSUPLSettingsLBModel::NewLC( 
-                                    CLocSUPLSettingsUiEngine& aEngine )
-	{
-	CLocSUPLSettingsLBModel* self = 
-	                new( ELeave )CLocSUPLSettingsLBModel( aEngine );
-	CleanupStack::PushL( self );
-	self->ConstructL();
-	return self;
-	}
-		
-// ---------------------------------------------------------------------------
-// void CLocSUPLSettingsLBModel::ConstructL
-// Second Phase of the two phase constructor.
-// 
-// ---------------------------------------------------------------------------
-//
-void CLocSUPLSettingsLBModel::ConstructL()
-	{
-	DEBUG( + CLocSUPLSettingsLBModel::ConstructL );	
-    // Allocate the Conversion Buffer
-	iBuffer = HBufC16::NewL( KMaxConversionBufferLength ); 
-	 
-	// Read the Local Variation Key and set the Item count
-	TInt flagValue = 0;
-	CRepository* repository = CRepository::NewLC( TUid::Uid( KCRUidLocSuplSettingsUi ) );
-	repository->Get( KLocSuplSettingsLVFlags, flagValue );
-	CleanupStack::PopAndDestroy( repository );
-	repository = NULL;	
-	if( flagValue )
-	    {
-	    iServerAddressPresent = ETrue;
-	       
-     	// Allocate and set the server ip address title field
-    	iServerDetailTitle = StringLoader::LoadL( R_LOC_SUPL_SERVER_DETAIL );
-    	 
-    	// Allocate the Default IP address
-    	iSuplServerDetail = HBufC16::NewL( KDefaultServerIPAddress().Length() );
-    	TPtr16 ptr( iSuplServerDetail->Des() );
-    	ptr.Copy( KDefaultServerIPAddress );		       
-	    }
-    
-    // Reinitializing the flag value
-    flagValue = 0;
-    TRAPD( error, repository = CRepository::NewL( KCRUidOMASuplConfiguration ) );
-    if ( !error )
-        {
-        error = repository->Get( KOMASuplConfigurationSuplPermissionQueryUsage, flagValue );
-        if ( error || flagValue < 0 )
-            {
-            flagValue = 0;
-            }
-    	delete repository;
-    	repository = NULL;
-        }	
-	    	    
-	// Check for SUPL Setting usage variationing.
-	if( flagValue )
-	    {
-	    iSuplUsagePresent = ETrue;
-	       
-     	// Allocate and set the server ip address title field
-    	iSuplUsageTitle = StringLoader::LoadL( R_LOC_SUPL_USE );
-    	
-    	iDefaultSuplUsage =  StringLoader::LoadL( R_AVKON_SELEC_SETT_VAL_FIELD_NONE );
-    	// Default value can be used for this field as well
-    	// So no need to have another variable.		       
-	    }
-	    	
-	DEBUG( - CLocSUPLSettingsLBModel::ConstructL );	
-	}
-
-// ---------------------------------------------------------------------------
-// TSUPLSettingsItemId CLocSUPLSettingsLBModel::ResolveSettingsItem
-// Packs the server address to the end of the buffer passed.
-//
-// @param  aPtr Buffer to which the server address needs to be appended.
-// ---------------------------------------------------------------------------
-//
-CLocSUPLSettingsLBModel::TSUPLSettingsItemId 
-    CLocSUPLSettingsLBModel::ResolveSettingsItem( TInt aListboxIndex ) const
-    {
- 	DEBUG( + CLocSUPLSettingsLBModel::ResolveSettingsItem );	
-   	TSUPLSettingsItemId selectedItem = ESUPLSettingsUsage;
-    
-    switch ( aListboxIndex )
-        {
-        case 0:
-            {
-            selectedItem = ESUPLSettingsUsage;
-            break;
-            }        
-        case 1:
-            {
-            selectedItem = ESUPLSettingsServersDetail;
-            break;
-            }
-        case 2:
-            {
-            selectedItem = ESUPLSettingsActiveSessions;
-            break;   
-            }
-        default:
-            {
-            break;            
-            }
-        }
-	DEBUG( - CLocSUPLSettingsLBModel::ResolveSettingsItem );	
-    return selectedItem;
-    }
-        
-// ---------------------------------------------------------------------------
-// TInt CLocSUPLSettingsLBModel::MdcaCount() const
-// Inherited from MDesCArray. Returns the total number of items in the 
-// Settings description array
-//
-// @return TInt The total number of elements in the Settings Description array
-// ---------------------------------------------------------------------------
-//
-TInt CLocSUPLSettingsLBModel::MdcaCount() const
-	{
-	DEBUG( + CLocSUPLSettingsLBModel::MdcaCount );	
-	// Initialize the count to 0 
-	TInt itemCount = 0;
-	
-	// Check for SUPL usage.
-	if ( iSuplUsagePresent )
-	    {
-	    itemCount++;
-	    // Check if the usage value is disabled
-	    if ( iEngine.GetSuplUsage() == CSuplSettings::ESuplUsageDisabled )
-	        {
-	        return itemCount;
-	        }
-		// Check for Server address
-		iServerAddressPresent ? itemCount++ : itemCount;	
-	    }
-	itemCount++; // For the third entry "Active sessions"
-	// Check if the SUPL Usage value is Disabled
-	// If that is the case then only SUPL usage will be displayed
-	DEBUG( - CLocSUPLSettingsLBModel::MdcaCount );	
-	return itemCount;
-	}
-
-// ---------------------------------------------------------------------------
-// TPtrC16 CLocSUPLSettingsLBModel::MdcaPoint() const
-// Inherited from MDesCArray. Returns the list box entry corresponding to the 
-// index value
-//
-// @param  aIndex The index whose list box entry needs to be retrieved
-// @return TPtr16 The list box description 
-// ---------------------------------------------------------------------------
-//
-TPtrC16 CLocSUPLSettingsLBModel::MdcaPoint( TInt aIndex ) const
-	{
-	DEBUG( + CLocSUPLSettingsLBModel::MdcaPoint );	
-	// Zero the internal buffer
-	TPtr16 ptr( iBuffer->Des() );
-	ptr.Zero();
-	
-	// CAknSettingStyleListBox
-	// Format "\t%S\t\t%S"
-	
-	// Append the first tab
-	ptr.Append( EKeyTab );
-	
-	TSUPLSettingsItemId index = ResolveSettingsItem( aIndex );		
-	switch( index )
-	    {
-	    case ESUPLSettingsUsage:
-	        {
-	        AppendSuplUsage( ptr );
-	        break;
-	        }
-	    case ESUPLSettingsServersDetail:
-	        {
-	        AppendSuplServerDetail( ptr );
-	        break;    
-	        }
-	    case ESUPLSettingsActiveSessions:
-	        {
-	        TRAP_IGNORE( AppendSuplActiveSessionsDetailL( ptr ) );
-	        break;
-            }
-	    default:
-	        {
-        	// Append the second tab
-        	ptr.Append( EKeyTab );        	
-        	// Append the third tab
-        	ptr.Append( EKeyTab );
-	        break;    
-	        }
-	    }  
-	DEBUG( - CLocSUPLSettingsLBModel::MdcaPoint );	
-	return iBuffer->Des();
-	}
-
-// ---------------------------------------------------------------------------
-// TPtrC16 CLocSUPLSettingsLBModel::AppendSuplServerDetail()
-// Packs the server address to the end of the buffer passed.
-//
-// @param  aPtr Buffer to which the server address needs to be appended.
-// ---------------------------------------------------------------------------
-//	
-void CLocSUPLSettingsLBModel::AppendSuplUsage( TDes& aPtr ) const
-    {
-	DEBUG( + CLocSUPLSettingsLBModel::AppendSuplUsage );	
-    // Append the Title text
-    aPtr.Append( iSuplUsageTitle->Des() );
-    
-    // Append the second tab
-	aPtr.Append( EKeyTab ); 
-	
-	// Append the third tab
-	aPtr.Append( EKeyTab );
-	
-	// Obtain the SUPL usage from the SUPL Settings Engine. If
-	// the settings is not set then a Not defined value would be 
-	// displayed to the user
-    TPtr16 suplUsagePtr( NULL, 0 );
-    TRAPD( error, suplUsagePtr.Set( iEngine.GetSuplUsageL() ) );         
-    if( error || !suplUsagePtr.Length() )
-        {
-        // Using the same string as SUPL settings AP
-        aPtr.Append( iDefaultSuplUsage->Des() );
-        }
-    else
-        {
-        aPtr.Append( suplUsagePtr );              
-        }    
-	DEBUG( - CLocSUPLSettingsLBModel::AppendSuplUsage );	
-    }    
-
-// ---------------------------------------------------------------------------
-// TPtrC16 CLocSUPLSettingsLBModel::AppendSuplServerDetail()
-// Packs the server address to the end of the buffer passed.
-//
-// @param  aPtr Buffer to which the server address needs to be appended.
-// ---------------------------------------------------------------------------
-//	
-void CLocSUPLSettingsLBModel::AppendSuplServerDetail( TDes& aPtr ) const
-    {
-	DEBUG( + CLocSUPLSettingsLBModel::AppendSuplServerDetail );	
-    // Append the Title text
-    aPtr.Append( iServerDetailTitle->Des() );
-    
-    // Append the second tab
-	aPtr.Append( EKeyTab ); 
-	
-	// Append the third tab
-	aPtr.Append( EKeyTab );
-
-	// Append the forth tab
-	aPtr.Append( EKeyTab );	
-	DEBUG( - CLocSUPLSettingsLBModel::AppendSuplServerDetail );	
-    }
-    
-// ---------------------------------------------------------------------------
-// TPtrC16 CLocSUPLSettingsLBModel::AppendSuplActiveSessionsDetailL()
-// Packs the server address to the end of the buffer passed.
-//
-// @param  aPtr Buffer to which the server address needs to be appended.
-// ---------------------------------------------------------------------------
-//	
-void CLocSUPLSettingsLBModel::AppendSuplActiveSessionsDetailL( TDes& aPtr ) const
-    {
-	DEBUG( + CLocSUPLSettingsLBModel::AppendSuplActiveSessionsDetailL );	
-	
-    HBufC16* suplActiveSessionsTitle;
-    
-    TRAPD( error, iEngine.GetActiveSessionsCountL( iSessionCount ) );
-    
-	if( !error )
-		{
-		switch( iSessionCount )
-			{
-			case 0:
-				suplActiveSessionsTitle = StringLoader::LoadL( R_LOC_SUPL_NO_SERVICE );
-				break;
-			case 1:
-				suplActiveSessionsTitle = StringLoader::LoadL( R_LOC_SUPL_SINGLE_SERVICE );
-				break;
-			default:
-				suplActiveSessionsTitle = StringLoader::LoadL( R_LOC_SUPL_MULTIPLE_SERVICES, iSessionCount );
-				break;
-			}
-
-		if( suplActiveSessionsTitle )
-			{
-    	    // Append the Title text
-	        aPtr.Append( suplActiveSessionsTitle->Des() );
-            delete suplActiveSessionsTitle;
-	        suplActiveSessionsTitle = NULL;
-			}
-		}
-    
-    // Append the second tab
-	aPtr.Append( EKeyTab ); 
-	
-	// Append the third tab
-	aPtr.Append( EKeyTab );
-
-	// Append the forth tab
-	aPtr.Append( EKeyTab );	
-	
-	DEBUG( - CLocSUPLSettingsLBModel::AppendSuplActiveSessionsDetailL );	
-}
-    
-// ---------------------------------------------------------------------------
-// TInt CLocSUPLSettingsLBModel::ActiveSessionCount()
-// Returns the number of Active sessions.
-//
-// @return  TInt Returns the number of Active sessions count.
-// ---------------------------------------------------------------------------
-//	
-TInt CLocSUPLSettingsLBModel::ActiveSessionCount( ) const
-    {
-	return iSessionCount;
-	}
-
-
-// End of file
--- a/locationsystemui/locationsysui/locsuplsettingsui/src/locsuplsettingsuiengine.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,990 +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:  SUPL Settings UI Engine. The engine is resposible for handling
-*                all the UI components required for SUPL Settings UI. In addition
-*                to this it also is responsible for interacting with the SUPL
-*                Settings API
-*
-*/
-
-
-// System Includes
-#include <e32keys.h>
-#include <locsuplsettingsui.rsg>
-#include <StringLoader.h>
-#include <akntextsettingpage.h>     // Text editor
-#include <commdb.h>                 // CommsDatabase                                    
-#include <cmapplicationsettingsui.h>// Access Point Configurator
-#include <cmplugincsddef.h>			// For UID of CSD BearerType
-#include <cmpluginpacketdatadef.h>	// For UID of Packet data BearerType
-#include <cmmanager.h>				// For Conversion from UID to Name and Name to UID 
-#include <cmconnectionmethod.h> 	// For Conversion from UID to Name and Name to UID
-#include <aknnotewrappers.h>        // Error Notes
-#include <textresolver.h>
-#include <cdbcols.h>
-#include <bldvariant.hrh>           // For 3.2 SDK flag
-#include <AknGlobalConfirmationQuery.h> // For Global confirmation query
-#include <avkon.hrh>                // For the Softkey definition
-#include <aknSDData.h>              // Secondary display data for confirmation
-                                    // query
-#include <badesca.h>                // For Radio button array
-#include <aknradiobuttonsettingpage.h>    // Akn Radio button page                                    
-#include "locsuplsettingscoverui.h" // Secondary display API
-#include <aknViewAppUi.h>
-#include <epos_csuplsettingsconstants.h>
-
-// User Includes
-#include "locsuplsettingsuiengine.h"
-#include "locsuplsettingsuiengobserver.h"
-#include "locsuplsettingsadapter.h"
-#include "locsuplservereditor.h"
-#include "locsuplsessioneditor.h"
-#include "locsupldebug.h"
-
-// Constants
-const TInt KMaxBufferLength 		= 0x100;
-const TInt KNoofUsageSettings 		= 4;
-
-// ---------------------------------------------------------------------------
-// CLocSUPLSettingsUiEngine::CLocSUPLSettingsUiEngine
-// C++ default constructor.
-// ---------------------------------------------------------------------------
-//
-CLocSUPLSettingsUiEngine::CLocSUPLSettingsUiEngine( 
-                            MLocSUPLSettingsUiEngObserver&      aObserver )
-	: CActive( EPriorityStandard ), 
-	iObserver( aObserver ),
-	iConversionBufferPtr( NULL, 0 ),
-	iSettingsBufferPtr( NULL, 0),
-	iCurrentSlpId( -1 ),
-	iEditorObserver( NULL )
-	{
-	// No implementation
-	}
-
-// ---------------------------------------------------------------------------
-// CLocSUPLSettingsUiEngine::~CLocSUPLSettingsUiEngine
-// Destructor.
-// ---------------------------------------------------------------------------	
-//
-CLocSUPLSettingsUiEngine::~CLocSUPLSettingsUiEngine()	
-    {
-	DEBUG( + CLocSUPLSettingsUiEngine::~CLocSUPLSettingsUiEngine );	
-    Cancel(); 
-    
-    // Delete the Confirmation query
-    delete iConfirmQuery;
-    iConfirmQuery = NULL;
-    
-	delete iSUPLSettingsAdapter;
-	iSUPLSettingsAdapter = NULL;	
-	
-	// Delete the Conversion buffers
-	delete iConversionBuffer;
-	iConversionBuffer = NULL;
-	
-	delete iSettingsBuffer;
-	iSettingsBuffer = NULL;
-	
-	// Delete the Error handling utilities
-	delete iTextResolver;
-	iTextResolver = NULL;
-	DEBUG( - CLocSUPLSettingsUiEngine::~CLocSUPLSettingsUiEngine );	
-	}
-
-// ---------------------------------------------------------------------------
-// CLocSUPLSettingsUiEngine* CLocSUPLSettingsUiEngine::NewL
-// Symbian OS two-phased constructor
-// 
-// @return CLocSUPLSettingsUiEngine* Reference to the Settings UI Engine
-// ---------------------------------------------------------------------------	
-//
-CLocSUPLSettingsUiEngine* CLocSUPLSettingsUiEngine::NewL( 
-                                 MLocSUPLSettingsUiEngObserver&      aObserver )
-	{
-	DEBUG( + CLocSUPLSettingsUiEngine::NewL );	
-	CLocSUPLSettingsUiEngine* self = CLocSUPLSettingsUiEngine::NewLC(
-                                                                aObserver );
-	CleanupStack::Pop( self );
-	DEBUG( - CLocSUPLSettingsUiEngine::NewL );	
-	return self; 
-	}
-	
-// ---------------------------------------------------------------------------
-// CLocSUPLSettingsUiEngine* CLocSUPLSettingsUiEngine::NewLC
-// Symbian OS two-phased constructor
-// 
-// @return CLocSUPLSettingsUiEngine* Reference to the Settings UI Engine
-// ---------------------------------------------------------------------------	
-//
-CLocSUPLSettingsUiEngine* CLocSUPLSettingsUiEngine::NewLC( 
-                                 MLocSUPLSettingsUiEngObserver&      aObserver )
-	{
-	CLocSUPLSettingsUiEngine* self = 
-	                new ( ELeave ) CLocSUPLSettingsUiEngine( aObserver );
-	CleanupStack::PushL( self );
-	self->ConstructL();
-	return self; 
-	}	
-	
-// ---------------------------------------------------------------------------
-// void CLocSUPLSettingsUiEngine::ConstructL
-// Second phase constructor.
-// ---------------------------------------------------------------------------	
-//
-void CLocSUPLSettingsUiEngine::ConstructL()
-	{ 
-	DEBUG( + CLocSUPLSettingsUiEngine::ConstructL );	
-    // Allocate the conversion buffers
-    iConversionBuffer = HBufC16::NewL( KMaxBufferLength );
-    iConversionBufferPtr.Set( iConversionBuffer->Des() );
-    
-    iSettingsBuffer = HBufC::NewL( KMaxBufferLength );
-    iSettingsBufferPtr.Set( iSettingsBuffer->Des());
-    
-    iTextResolver = CTextResolver::NewL( *( CCoeEnv::Static() ) );
-    
-    // Create the SUPL Settings API adapter. 
-    iSUPLSettingsAdapter = CLocSUPLSettingsAdapter::NewL( *this ); 
-    
-    CActiveScheduler::Add( this );
-	DEBUG( - CLocSUPLSettingsUiEngine::ConstructL );	
-     
-	}
-
-// ---------------------------------------------------------------------------	
-// void CLocSUPLSettingsUiEngine::Initalize
-// Initializes the Settings Engine. This is an asynchronous call the
-// completion of which is communicated through the observer
-// ---------------------------------------------------------------------------	
-//
-void CLocSUPLSettingsUiEngine::Initalize()
-    {
-	DEBUG( + CLocSUPLSettingsUiEngine::Initalize );	
-    iSUPLSettingsAdapter->Initialize();
-	DEBUG( - CLocSUPLSettingsUiEngine::Initalize );	
-    }
-            
-void CLocSUPLSettingsUiEngine::SelectConnectionL()
-    {
-	DEBUG( + CLocSUPLSettingsUiEngine::SelectConnectionL );	
-    if( iDialogActive || IsActive() || iConfirmQuery )
-        {
-        User::Leave( KErrInUse );
-        }
-        
-    // In the case of a framework launching SUPL UI, the user is ignorant 
-    // of the action. Hence, a confirmation dialog is popped up to intimate
-    // the user that he needs to configure SUPL settings.
-    
-    iConfirmQuery = CAknGlobalConfirmationQuery::NewL();
-
-    CAknSDData* secondaryData = CAknSDData::NewL( KCatUidLocationSuplSettingsUi,
-                                                  ECmdSuplSettingsMissing,
-                                                  KNullDesC8 );
- 
-    // Send the Confirmation query information to the Secondary display
-    // The ownership of 'secondaryData' is taken up by the Global confirmation query
-    iConfirmQuery->SetSecondaryDisplayData( secondaryData );
-     
-    // Load the SUPL IAP confirmation query prompt text from the resource file
-	HBufC* promptText = StringLoader::LoadL( R_LOC_SUPL_IAP_QUERY );
-		
-	// Display the Confirmation query.  
-    iConfirmQuery->ShowConfirmationQueryL( iStatus,
-                                           *promptText,
-                                           R_AVKON_SOFTKEYS_YES_NO__YES,
-                                           R_QGN_NOTE_QUERY_ANIM );
-                                               
-    SetActive();  
-    delete promptText; //    
-    promptText = NULL;
-	DEBUG( - CLocSUPLSettingsUiEngine::SelectConnectionL );	
-    }
-
-// ---------------------------------------------------------------------------
-// void CLocSUPLSettingsUiEngine::LaunchApConfiguratorL
-// Launches the Access Point Configurator dialog
-//
-// ---------------------------------------------------------------------------
-//
-void CLocSUPLSettingsUiEngine::LaunchApConfiguratorL( TInt64 aSlpId, 
-		MSuplServerEditorObserver* aEditorObserver )
-    {     
-	DEBUG( + CLocSUPLSettingsUiEngine::LaunchApConfiguratorL );	
-	iCurrentSlpId =  aSlpId;
-	iEditorObserver = aEditorObserver;
-
-    if( iDialogActive )
-        {
-        User::Leave( KErrInUse );
-        }
-        
-    // Zeroing the Temporary buffers so that it doesn't contain any
-    // left over value from the previous access
-    iSettingsBufferPtr.Zero();
-    
-    // Obtain the Server address value from the SUPL settings
-    // API. If the value is set then it has to be shown to the user
-    // as the existing value when he tries to configure the UI
-    TRAP_IGNORE( iSUPLSettingsAdapter->GetIapNameL( iCurrentSlpId, iSettingsBufferPtr ) );
-    	
-    // Obtain the UID for the selected Access point so that the configurator
-    // can be highlighted
-    TUint32 highlightUid( 0 );
- 
-    TRAPD( error, highlightUid = ConvertIAPNameToIdL( iSettingsBufferPtr ) ); 
-    
-    if( error == KErrNotFound )
-    	{
-    	highlightUid = 0;
-    	}
-   
- 	CCmApplicationSettingsUi* apHandler =  CCmApplicationSettingsUi::NewLC();
- 	
- 	iDialogActive = ETrue;
-    TBool ret = EFalse;
-    TCmSettingSelection selectionUid;
-    selectionUid.iId = highlightUid;
-    selectionUid.iResult = CMManager::EConnectionMethod ;
-    TBearerFilterArray filter;
-	CleanupClosePushL( filter );
-	
-	// Need access points for bearer type CSD and Packet data only
-	filter.AppendL( KUidCSDBearerType );
-	filter.AppendL( KUidPacketDataBearerType );
-
-	// Run CCmApplicationSettingsUi dialog only for Access points (Connection methods)
-	// selectionUid contains UID to be highlighted, on return it will contain UID of selected CM
-    TRAP( error, ret = 
-    	apHandler->RunApplicationSettingsL( 
-    			selectionUid , CMManager::EShowConnectionMethods, filter 
-    ) ); // | CMManager::EShowAlwaysAsk
-    
-    iDialogActive = EFalse;  
-    if( error == CMManager::KErrConnectionNotFound )
-        {
-        // No AP defined, Show Note                
-        ShowNoteL();        
-        //User::Leave( error );    
-        }   
-    CleanupStack::PopAndDestroy( &filter );    
-    CleanupStack::PopAndDestroy( apHandler );   
-    
-    if( ret )
-        {            
-        RCmManager cmManager;
-		cmManager.OpenLC();
-	
-		RArray< TUint32 > cmArray;
-		HBufC* cmName = NULL;
-		RCmConnectionMethod method;
-		// Get all the CMs into cmArray
-		cmManager.ConnectionMethodL( cmArray, ETrue, EFalse );
-		CleanupClosePushL( cmArray );
-		
-		// Get name of selected CM
-		TInt count = cmArray.Count();
-		for ( TInt i = 0; i < count; i++ )
-		    {
-		    if (selectionUid.iId == cmArray[i] )
-		    	{
-		    	method = cmManager.ConnectionMethodL( cmArray[i] );
-		    	CleanupClosePushL( method );
-		    	cmName = method.GetStringAttributeL( CMManager::ECmName );
-		    	CleanupStack::PushL( cmName );
-		    	iSettingsBufferPtr.Copy( cmName->Des() );
-		    	CleanupStack::PopAndDestroy( cmName );
-		    	CleanupStack::PopAndDestroy( &method );
-		    	break;
-		    	}		    
-		    }
-		CleanupStack::PopAndDestroy( &cmArray );    
-    	CleanupStack::PopAndDestroy( &cmManager );          	
-
-		if( iEditorObserver )
-	       	{
-	       	iEditorObserver->UpdateIapL( iSettingsBufferPtr );		       	
-	       	}
-        }
-           
-	DEBUG( - CLocSUPLSettingsUiEngine::LaunchApConfiguratorL );	
-    }  
-
-// ---------------------------------------------------------------------------
-// void CLocSUPLSettingsUiEngine::LaunchSuplUsageConfiguratorL
-// Launches the SUPL Usage Configurator
-//
-// ---------------------------------------------------------------------------    
-//
-void CLocSUPLSettingsUiEngine::LaunchSuplUsageConfiguratorL()
-    {
-	DEBUG( + CLocSUPLSettingsUiEngine::LaunchSuplUsageConfiguratorL );	
-    if( iDialogActive )
-        {
-        User::Leave( KErrInUse );
-        }
-        
-    // Allocate the descriptor array for Text settings for System
-    // of measurement
-    CDesCArrayFlat* items = new( ELeave ) CDesCArrayFlat( KNoofUsageSettings );
-    CleanupStack::PushL( items );
-
-    // Allocate all the Settings usage string
-    
-    // Append the radio-button list items
-    items->AppendL( iSUPLSettingsAdapter->Automatic() );
-    items->AppendL( iSUPLSettingsAdapter->AutomaticAtHome() );
-    items->AppendL( iSUPLSettingsAdapter->AlwaysAsk() );
-    items->AppendL( iSUPLSettingsAdapter->Disable() );
-      
-    // Obtain the current value for SUPL settings usage
-    // This would be used for setting the default value for 
-    // the text settings page               
-    TInt currentSettings = iSUPLSettingsAdapter->GetSuplUsageIndex();
-        
-    CAknRadioButtonSettingPage* dlg = 
-                        new ( ELeave )CAknRadioButtonSettingPage( R_LOC_SUPLUSAGE_SETTINGS,
-                                                                  currentSettings, 
-                                                                  items );
-    // Settings Outstanding flag is marked True to enable dismissal incase
-    // of a Cancel event                                                                  
-    iDialogActive = ETrue;                                                                  
-    if ( dlg->ExecuteLD( CAknSettingPage::EUpdateWhenChanged ) )
-        {
-        CLocSUPLSettingsAdapter::TLocSuplUsage newValue = 
-                    static_cast<CLocSUPLSettingsAdapter::TLocSuplUsage>( currentSettings );
-                    
-        iSUPLSettingsAdapter->SetSuplUsageL( newValue );
-        }
-    
-    iDialogActive = EFalse;           
-    
-    // Free the items resource
-    CleanupStack::PopAndDestroy( items );   
-	DEBUG( - CLocSUPLSettingsUiEngine::LaunchSuplUsageConfiguratorL );	
-    }
-    
-// ---------------------------------------------------------------------------
-// void CLocSUPLSettingsUiEngine::Close
-// Closes the running Settings UI prematurely.
-// ---------------------------------------------------------------------------
-//
-void CLocSUPLSettingsUiEngine::Close()
-    {
-	DEBUG( + CLocSUPLSettingsUiEngine::Close );	
-    Cancel();   
-    
-    // Cancel the Initalization request. This call Cancels if there is an 
-    // outstanding request. If not, does nothing
-    iSUPLSettingsAdapter->CancelInitialize();
-     
-    // If any of the dialogs are active then issue a cancel event on the 
-    // dialogs
-    if( iDialogActive )
-        {
-        TKeyEvent   keyEvent;
-        keyEvent.iCode          = EKeyCBA2;
-        keyEvent.iScanCode      = EStdKeyDevice1;         
-        keyEvent.iModifiers     = EAllModifiers;
-        keyEvent.iRepeats       = 0;
-        CCoeEnv* cCoeEnv = CCoeEnv::Static();
-        
-        // Simulate a Cancel event on the running dialogs. The Simulated event
-        // is for the Left Soft Key.
-        // Ignore the error incase of a leave
-        
-        TRAP_IGNORE( cCoeEnv->SimulateKeyEventL( keyEvent, EEventKey ) );
-        }      
-	DEBUG( - CLocSUPLSettingsUiEngine::Close );	
-    }
-
-// ---------------------------------------------------------------------------
-// TPtr16 CLocSUPLSettingsAdapter::GetSuplUsage
-// ---------------------------------------------------------------------------
-//  
-TPtr16 CLocSUPLSettingsUiEngine::GetSuplUsageL()
-    {
-	DEBUG( + CLocSUPLSettingsUiEngine::GetSuplUsageL );	
-    // Zeroing the Temporary buffers so that it doesn't contain any
-    // left over value from the previous access
-    iSettingsBufferPtr.Zero();
-    iConversionBufferPtr.Zero();
-    
-    // Obtain the Settings values from the SUPL settings API
-    iSUPLSettingsAdapter->GetSuplUsageL( iSettingsBufferPtr );
-    iConversionBufferPtr.Copy( iSettingsBufferPtr );
-	DEBUG( - CLocSUPLSettingsUiEngine::GetSuplUsageL );	
-    return iConversionBufferPtr;
-    }
-    
-// ---------------------------------------------------------------------------
-// TInt CLocSUPLSettingsAdapter::GetSuplUsage
-// ---------------------------------------------------------------------------
-//
-TInt CLocSUPLSettingsUiEngine::GetSuplUsage()
-    {
-    return iSUPLSettingsAdapter->GetSuplUsage();
-    }
-            				
-// ---------------------------------------------------------------------------
-// void CLocSUPLSettingsUiEngine::HandleSuplSettingsChangeL
-// Inherited from MLocSUPLSettingsAdapterObserver
-// 
-// ---------------------------------------------------------------------------		 		                                                    
-//
-void CLocSUPLSettingsUiEngine::HandleSuplSettingsChangeL( 
-                                    TLocSUPLSettingsEvent aEvent )
-    {
-	DEBUG( + CLocSUPLSettingsUiEngine::HandleSuplSettingsChangeL );	
-    iObserver.HandleSettingsEventL( 
-        static_cast< MLocSUPLSettingsUiEngObserver::TSettingsEventType >( aEvent ) );		
-	DEBUG( - CLocSUPLSettingsUiEngine::HandleSuplSettingsChangeL );	
-    }
-                                       
-// ---------------------------------------------------------------------------
-// void CLocSUPLSettingsUiEngine::RunL()
-//
-// ---------------------------------------------------------------------------
-//
-void CLocSUPLSettingsUiEngine::RunL()
-    {    
-	DEBUG( + CLocSUPLSettingsUiEngine::RunL );	
-    // If the Confirmation query is present then we have to Pop up the 
-    // IAP Selection dialog based on User Action
-    if( iConfirmQuery )
-        {        
-        // Incase there has been a response from the User then the Key pressed
-        // is present in the iStatus variable 
-        if( EAknSoftkeyYes == iStatus.Int() )
-            {
-	        iObserver.HandleSettingsEventL( 
-	                MLocSUPLSettingsUiEngObserver::EIAPSelectionComplete );                       
-            }
-        else
-            {
-            iObserver.HandleSettingsEventL( 
-                    MLocSUPLSettingsUiEngObserver::EIAPSelectionCancelled );
-            }
-        
-        // Destroy the IAP confirmation query handle    
-        delete iConfirmQuery;
-        iConfirmQuery = NULL;
-        }
-	DEBUG( - CLocSUPLSettingsUiEngine::RunL );	
-    }
-
-// ---------------------------------------------------------------------------
-// void CLocSUPLSettingsUiEngine::DoCancel()
-//
-// ---------------------------------------------------------------------------
-//    
-void CLocSUPLSettingsUiEngine::DoCancel()    
-    {
-	DEBUG( + CLocSUPLSettingsUiEngine::DoCancel );	
-    if( iConfirmQuery )
-        {
-        // If the confirmation query is running Cancel the query
-        iConfirmQuery->CancelConfirmationQuery();
-        
-        delete iConfirmQuery;
-        iConfirmQuery = NULL;
-        
-        }
-	DEBUG( - CLocSUPLSettingsUiEngine::DoCancel );	
-    }
-
-// ---------------------------------------------------------------------------
-// TUint CLocSUPLSettingsUiEngine::ConvertIAPNameToIdL()
-// Obtains the index UID corresponding to the Access point name
-// 
-// @param   aIAPName     Access point name
-// @return  TUint       UID corresponding to the AP Name. Zero if 
-//                      the name does not exist
-// ---------------------------------------------------------------------------
-//
-TUint CLocSUPLSettingsUiEngine::ConvertIAPNameToIdL( const TDesC& aIAPName )
-    {
-	DEBUG( + CLocSUPLSettingsUiEngine::ConvertIAPNameToIdL );	
-    TUint32 idVal = 0;
-    
-    RCmManager cmManager;
-
-	cmManager.OpenLC();
-	
-	RArray< TUint32 > cmArray;	
-	HBufC* name = NULL;
-	RCmConnectionMethod method;
-	// Get all the CMs into cmArray
-	cmManager.ConnectionMethodL( cmArray, ETrue, EFalse );
-	CleanupClosePushL( cmArray );
-	
-	TInt count = cmArray.Count();
-	if( !count )
-        {
-        // No CM found
-        User::Leave( KErrNotFound );
-        }
-    // Get uid for CM name       
-	for ( TInt i = 0; i < count; i++ )
-        {
-        method = cmManager.ConnectionMethodL( cmArray[i] );
-        CleanupClosePushL( method );
-        name = method.GetStringAttributeL( CMManager::ECmName );
-        CleanupStack::PushL( name );
-        if (! aIAPName.Compare( name->Des() ))
-            {
-            idVal = cmArray[i];                               
-            CleanupStack::PopAndDestroy( name );
-            CleanupStack::PopAndDestroy( &method );
-            break; 
-            }
-        CleanupStack::PopAndDestroy( name );     
-        CleanupStack::PopAndDestroy( &method );   
-        }
-    CleanupStack::PopAndDestroy( &cmArray );    
-	CleanupStack::PopAndDestroy( &cmManager ); 
-    
-    if( !idVal )
-        {
-        User::Leave( KErrBadName );
-        }    
-	DEBUG( - CLocSUPLSettingsUiEngine::ConvertIAPNameToIdL );	
-    return idVal;
-    }
-
-// ---------------------------------------------------------------------------
-// void CLocSUPLSettingsUiEngine::DisplayErrorL()
-// Displays an Error note
-//
-// @param aError Error ID
-// ---------------------------------------------------------------------------
-//
-void CLocSUPLSettingsUiEngine::DisplayErrorL( TInt aError )
-    {
-	DEBUG( + CLocSUPLSettingsUiEngine::DisplayErrorL );	
-    // Show Error Note
-    TPtrC buffer = iTextResolver->ResolveErrorString( aError );
-    CAknErrorNote* errorNote = new ( ELeave ) CAknErrorNote;
-    TRAP_IGNORE( errorNote->ExecuteLD( buffer ) );
-	DEBUG( - CLocSUPLSettingsUiEngine::DisplayErrorL );	
-    }
-    
-// ---------------------------------------------------------------------------
-// void CLocSUPLSettingsUiEngine::ShowNoteL()
-// Displays No access point defined note
-//
-// @param None
-// ---------------------------------------------------------------------------
-//
-TInt CLocSUPLSettingsUiEngine::ShowNoteL()
-    {
-	DEBUG( + CLocSUPLSettingsUiEngine::ShowNoteL );	
-    // Show Info Note "No Access Points Defined"       
-    HBufC* tmp = StringLoader::LoadL( R_LOC_NO_AP_DEFINED );
-    CleanupStack::PushL( tmp );    
-    CAknNoteDialog* dlg =
-        new ( ELeave ) CAknNoteDialog
-                (
-                 REINTERPRET_CAST( CEikDialog**, &dlg ),
-                 CAknNoteDialog::ENoTone,
-                 CAknNoteDialog::EShortTimeout
-                );
-    dlg->PrepareLC( R_GENERAL_NOTE );  
-    dlg->SetTextL( *tmp );
-    TInt retval = dlg->RunLD();
-    CleanupStack::PopAndDestroy( tmp );  // temp    
-	DEBUG( - CLocSUPLSettingsUiEngine::ShowNoteL );	
-    return retval;
-    }
-
-// ---------------------------------------------------------------------------
-// void CLocSUPLSettingsUiEngine::EditServerL()
-// Displays No access point defined note
-//
-// @param iIsEditable
-// @param aSlpId
-// ---------------------------------------------------------------------------
-//
-void CLocSUPLSettingsUiEngine::EditServerL( TBool iIsEditable, TInt64 aSlpId )
-    {
-	DEBUG( + CLocSUPLSettingsUiEngine::EditServerL );		
-	if( iEditorDlg )
-		{		
-		delete iEditorDlg;
-		iEditorDlg = NULL;
-		}
-    iEditorDlg = CLocSUPLServerEditor::NewL( iIsEditable, *this, aSlpId );
-    TInt error = iEditorDlg->ExecuteLD();
-    if ( EEikCmdExit == error )
-        {
-        ( ( CAknViewAppUi* ) CEikonEnv::Static()->EikAppUi())->HandleCommandL( EEikCmdExit );
-        }        
-    iEditorDlg = NULL;                     	
-    
-	DEBUG( - CLocSUPLSettingsUiEngine::EditServerL );	
-    }
-    
-// ---------------------------------------------------------------------------
-// void CLocSUPLSettingsUiEngine::SlpCount()
-// returns total no of slp entries
-//
-// ---------------------------------------------------------------------------
-//    
-TInt CLocSUPLSettingsUiEngine::SlpCount()
-	{
-	TInt slpCount = 0;
-	TRAP_IGNORE( iSUPLSettingsAdapter->SlpCountL( slpCount ) );
-	return slpCount;
-	}
-
-// ---------------------------------------------------------------------------
-// void CLocSUPLSettingsUiEngine::AddNewServerL()
-// Method to add new server entry to SUPL settings with server attributes 
-//
-// ---------------------------------------------------------------------------
-//    
-void CLocSUPLSettingsUiEngine::AddNewServerL( 
-        const TDesC& aServerAddress,
-        const TDesC& aIapName,
-        const TBool aUsageInHomeNw
-        )
-    {
-	DEBUG( + CLocSUPLSettingsUiEngine::AddNewServerL );	
-    iSUPLSettingsAdapter->AddNewServerL( 
-    				aServerAddress, 
-    				aIapName, 
-    				aUsageInHomeNw );
- 	DEBUG( - CLocSUPLSettingsUiEngine::AddNewServerL );	
- 	}
-
-// ---------------------------------------------------------------------------
-// void CLocSUPLSettingsUiEngine::RemoveServerL
-// ---------------------------------------------------------------------------
-// 
-void CLocSUPLSettingsUiEngine::RemoveServerL(
-		const TInt64 aSlpId
-		)
-	{
-	DEBUG( + CLocSUPLSettingsUiEngine::RemoveServerL );	
-	iSUPLSettingsAdapter->RemoveServerL( aSlpId );
-	DEBUG( - CLocSUPLSettingsUiEngine::RemoveServerL );	
-	}
-
-// ---------------------------------------------------------------------------
-// void CLocSUPLSettingsUiEngine::ChangePriorityL
-// ---------------------------------------------------------------------------
-// 
-void CLocSUPLSettingsUiEngine::ChangePriorityL(
-        TInt64 aSlpId, 
-        TInt aPriority,
-        TBool aDirection
-		)
-	{
-	DEBUG( + CLocSUPLSettingsUiEngine::ChangePriorityL );	
-	iSUPLSettingsAdapter->ChangePriorityL( aSlpId, aPriority, aDirection );		
-	DEBUG( - CLocSUPLSettingsUiEngine::ChangePriorityL );	
-	}
-
-// ---------------------------------------------------------------------------
-// void CLocSUPLSettingsUiEngine::GetAllSlpL
-// ---------------------------------------------------------------------------
-// 
-void CLocSUPLSettingsUiEngine::GetAllSlpL(
-        RPointerArray<CServerParams>& aParamValues
-		) const
-	{
-	DEBUG( + CLocSUPLSettingsUiEngine::GetAllSlpL );	
-	iSUPLSettingsAdapter->GetAllSlpL( aParamValues ) ;
-	DEBUG( - CLocSUPLSettingsUiEngine::GetAllSlpL );	
-	}
-	
-// ---------------------------------------------------------------------------
-// void CLocSUPLSettingsUiEngine::GetSlpInfoFromIdL
-// ---------------------------------------------------------------------------
-// 
-void CLocSUPLSettingsUiEngine::GetSlpInfoFromIdL(
-	            const TInt64 aSlpId, 
-	            CServerParams *aParamValues
-	    ) const
-	{
-	DEBUG( + CLocSUPLSettingsUiEngine::GetSlpInfoFromIdL );	
-	iSUPLSettingsAdapter->GetSlpInfoFromIdL( aSlpId, aParamValues ) ;	
-	DEBUG( - CLocSUPLSettingsUiEngine::GetSlpInfoFromIdL );	
-	}
-
-// ---------------------------------------------------------------------------
-// void CLocSUPLSettingsUiEngine::SetServerAddressL
-// ---------------------------------------------------------------------------
-// 
-void CLocSUPLSettingsUiEngine::SetServerAddressL(
-	            const TInt64 aSlpId, 
-	            const TDesC& aServerAddress
-	    ) 
-	{
-	DEBUG( + CLocSUPLSettingsUiEngine::SetServerAddressL );	
-	iSUPLSettingsAdapter->SetServerAddressL( aSlpId, aServerAddress ) ;	
-	DEBUG( - CLocSUPLSettingsUiEngine::SetServerAddressL );	
-	}
-
-// ---------------------------------------------------------------------------
-// void CLocSUPLSettingsUiEngine::GetServerAddressL
-// ---------------------------------------------------------------------------
-// 
-void CLocSUPLSettingsUiEngine::GetServerAddressL( 
-        TInt64 aSlpId, 
-        TDes& aServerAddress
-		) const
-	{
-	DEBUG( + CLocSUPLSettingsUiEngine::GetServerAddressL );	
-	iSUPLSettingsAdapter->GetServerAddressL( aSlpId, aServerAddress );	
-	DEBUG( - CLocSUPLSettingsUiEngine::GetServerAddressL );	
-	}
-
-// ---------------------------------------------------------------------------
-// void CLocSUPLSettingsUiEngine::SetIapNameL
-// ---------------------------------------------------------------------------
-// 
-void CLocSUPLSettingsUiEngine::SetIapNameL(
-	            const TInt64 aSlpId, 
-	            const TDesC& aIapName
-	    ) 
-	{
-	DEBUG( + CLocSUPLSettingsUiEngine::SetIapNameL );	
-	iSUPLSettingsAdapter->SetIapNameL( aSlpId, aIapName ) ;	
-	DEBUG( - CLocSUPLSettingsUiEngine::SetIapNameL );	
-	}
-
-// ---------------------------------------------------------------------------
-// void CLocSUPLSettingsUiEngine::SetServerEnabledFlagL
-// ---------------------------------------------------------------------------
-// 
-void CLocSUPLSettingsUiEngine::SetServerEnabledFlagL(
-	            const TInt64 aSlpId, 
-	            const TBool aEnable 
-	    ) const
-	{
-	DEBUG( + CLocSUPLSettingsUiEngine::SetServerEnabledFlagL );	
-	iSUPLSettingsAdapter->SetServerEnabledFlagL( aSlpId, aEnable ) ;	
-	DEBUG( - CLocSUPLSettingsUiEngine::SetServerEnabledFlagL );	
-	}
-
-// ---------------------------------------------------------------------------
-// void CLocSUPLSettingsUiEngine::GetServerEnabledFlagL
-// ---------------------------------------------------------------------------
-// 
-void CLocSUPLSettingsUiEngine::GetServerEnabledFlagL(
-        const TInt64 aSlpId, 
-        TBool& aEnable 
-		) const
-	{
-	DEBUG( + CLocSUPLSettingsUiEngine::GetServerEnabledFlagL );	
-	iSUPLSettingsAdapter->GetServerEnabledFlagL( aSlpId, aEnable );	
-	DEBUG( - CLocSUPLSettingsUiEngine::GetServerEnabledFlagL );	
-	}
-
-// ---------------------------------------------------------------------------
-// void CLocSUPLSettingsUiEngine::SetUsageInHomwNwFlagL
-// ---------------------------------------------------------------------------
-// 
-void CLocSUPLSettingsUiEngine::SetUsageInHomwNwFlagL(
-	            const TInt64 aSlpId, 
-	            const TBool aHomeNwFlag 
-	    ) 
-	{
-	DEBUG( + CLocSUPLSettingsUiEngine::SetUsageInHomwNwFlagL );	
-	iSUPLSettingsAdapter->SetUsageInHomwNwFlagL( aSlpId, aHomeNwFlag ) ;	
-	DEBUG( - CLocSUPLSettingsUiEngine::SetUsageInHomwNwFlagL );	
-	}
-
-// ---------------------------------------------------------------------------
-// void CLocSUPLSettingsUiEngine::SetEditableFlagL
-// ---------------------------------------------------------------------------
-// 
-void CLocSUPLSettingsUiEngine::SetEditableFlagL( 
-	            const TInt64 aSlpId, 
-	            const TBool aEditFlag 
-	    ) const
-	{
-	DEBUG( + CLocSUPLSettingsUiEngine::SetEditableFlagL );	
-	iSUPLSettingsAdapter->SetEditableFlagL( aSlpId, aEditFlag );
-	DEBUG( - CLocSUPLSettingsUiEngine::SetEditableFlagL );	
-	}
-
-// ---------------------------------------------------------------------------
-// void CLocSUPLSettingsUiEngine::GetEditableFlagL
-// ---------------------------------------------------------------------------
-// 
-void CLocSUPLSettingsUiEngine::GetEditableFlagL(
-	            const TInt64 aSlpId, 
-	            TBool& aEditFlag 
-	    ) const
-	{
-	DEBUG( + CLocSUPLSettingsUiEngine::GetEditableFlagL );	
-	iSUPLSettingsAdapter->GetEditableFlagL( aSlpId, aEditFlag ) ;	
-	DEBUG( - CLocSUPLSettingsUiEngine::GetEditableFlagL );	
-	}
-
-// ---------------------------------------------------------------------------
-// void CLocSUPLSettingsUiEngine::GetActiveSessionsCountL
-// ---------------------------------------------------------------------------
-//
-void CLocSUPLSettingsUiEngine::GetActiveSessionsCountL( TInt& aAccessPointCount )
-    {
-    DEBUG( + CLocSUPLSettingsUiEngine::GetActiveSessionsCountL );
-    iSUPLSettingsAdapter->GetActiveSessionsCountL( aAccessPointCount );
-    DEBUG( - CLocSUPLSettingsUiEngine::GetActiveSessionsCountL );	
-    }
-
-// ---------------------------------------------------------------------------
-// void CLocSUPLSettingsUiEngine::GetTriggerParamsL
-// ---------------------------------------------------------------------------
-// 
-void CLocSUPLSettingsUiEngine::GetTriggerParamsL(
-        RPointerArray<CTriggerParams>& aParamValues
-		) const
-	{
-	DEBUG( + CLocSUPLSettingsUiEngine::GetTriggerParamsL );	
-	iSUPLSettingsAdapter->GetTriggerParamsL( aParamValues ) ;
-	DEBUG( - CLocSUPLSettingsUiEngine::GetTriggerParamsL );	
-	}
-
-// ---------------------------------------------------------------------------
-// void CLocSUPLSettingsUiEngine::GetTriggerParamsL
-// ---------------------------------------------------------------------------
-// 
-void CLocSUPLSettingsUiEngine::GetTriggerParamsL(  TInt64 aSessionId, 
-        CTriggerParams*& aTrigger
-		) const
-	{
-	DEBUG( + CLocSUPLSettingsUiEngine::GetTriggerParamsL );	
-	iSUPLSettingsAdapter->GetTriggerParamsL( aSessionId, aTrigger ) ;
-	DEBUG( - CLocSUPLSettingsUiEngine::GetTriggerParamsL );	
-	}
-	
-// ---------------------------------------------------------------------------
-// void CLocSUPLSettingsUiEngine::OpenSessionL
-// ---------------------------------------------------------------------------
-// 
-void CLocSUPLSettingsUiEngine::OpenSessionL( TInt64 aSessionId )
-	{
-	DEBUG( + CLocSUPLSettingsUiEngine::OpenSessionL );
-	
-	CLocSUPLSessionEditor* form = CLocSUPLSessionEditor::NewL( *this, aSessionId );  
-	TInt error = form->ExecuteLD( ); 
-    if ( EEikCmdExit == error )
-        {
-        ( ( CAknViewAppUi* ) CEikonEnv::Static()->EikAppUi())->HandleCommandL( EEikCmdExit );
-        }                       	
-    
-	DEBUG( - CLocSUPLSettingsUiEngine::OpenSessionL );	
-	}
-	
-// ---------------------------------------------------------------------------
-// void CLocSUPLSettingsUiEngine::ChangeNotificationStatusL
-// ---------------------------------------------------------------------------
-// 
-void CLocSUPLSettingsUiEngine::ChangeNotificationStatusL( TInt64 aSessionId, TBool aTriggerNotificationStatus ) const
-	{
-	DEBUG( + CLocSUPLSettingsUiEngine::ChangeNotificationStatusL );	
-	iSUPLSettingsAdapter->ChangeNotificationStatusL( aSessionId, aTriggerNotificationStatus ) ;
-	DEBUG( - CLocSUPLSettingsUiEngine::ChangeNotificationStatusL );	
-	}
-	
-// ---------------------------------------------------------------------------
-// void CLocSUPLSettingsUiEngine::RemoveTriggerSessionL
-// ---------------------------------------------------------------------------
-// 
-void CLocSUPLSettingsUiEngine::RemoveTriggerSessionL( TInt64 aSessionId ) const
-	{
-	DEBUG( + CLocSUPLSettingsUiEngine::RemoveTriggerSessionL );	
-	iSUPLSettingsAdapter->RemoveTriggerSessionL( aSessionId ) ;
-	DEBUG( - CLocSUPLSettingsUiEngine::RemoveTriggerSessionL );	
-	}
-	
-// ---------------------------------------------------------------------------
-// void CLocSUPLSettingsUiEngine::RemoveTriggerSessionsL
-// ---------------------------------------------------------------------------
-// 
-void CLocSUPLSettingsUiEngine::RemoveTriggerSessionsL( RArray< TInt64 >& aSessionIdList ) const
-	{
-	DEBUG( + CLocSUPLSettingsUiEngine::RemoveTriggerSessionsL );	
-	for( TInt i=0; i<aSessionIdList.Count(); i++ )
-		{
-		iSUPLSettingsAdapter->RemoveTriggerSessionL( aSessionIdList[i] ) ;
-		}
-	DEBUG( - CLocSUPLSettingsUiEngine::RemoveTriggerSessionsL );	
-	}
-	
-// ---------------------------------------------------------------------------
-// void CLocSUPLSettingsUiEngine::RemoveAllTriggerSessionsL
-// ---------------------------------------------------------------------------
-// 
-void CLocSUPLSettingsUiEngine::RemoveAllTriggerSessionsL( ) const
-	{
-	DEBUG( + CLocSUPLSettingsUiEngine::RemoveAllTriggerSessionsL );	
-	RPointerArray<CTriggerParams> paramValues;
-	CleanupClosePushL( paramValues );
-	
-	iSUPLSettingsAdapter->GetTriggerParamsL( paramValues ) ;
-	
-	for( TInt i=0; i<paramValues.Count(); i++ )
-		{
-        TInt64 sessionId;
-        TUint64 outstandingTrigger;
-        TUint64 interval;
-        TBool notificationPresent;
-        TBool triggerNotificationStatus;  
-        CTriggerParams::TTriggerType triggerType; 
-        CTriggerParams::TRequestType requestType;
-        HBufC* sessionName = HBufC::NewLC( KMaxTriggerSessionNameLen ); 
-                
-        TInt errParams = paramValues[i]->Get(
-    							sessionId, 
-    							sessionName->Des(), 
-    							notificationPresent, 
-    							triggerNotificationStatus, 
-    							triggerType,
-    							requestType, 
-    							outstandingTrigger, 
-    							interval);
-		iSUPLSettingsAdapter->RemoveTriggerSessionL( sessionId ) ;
-		
-		CleanupStack::PopAndDestroy( sessionName );
-		}
-		
-    paramValues.ResetAndDestroy();
-	CleanupStack::PopAndDestroy( &paramValues ); // paramValues
-	DEBUG( - CLocSUPLSettingsUiEngine::RemoveAllTriggerSessionsL );	
-	}
-	
-// ---------------------------------------------------------------------------
-// void CLocSUPLSettingsUiEngine::SetSessionObserver
-// ---------------------------------------------------------------------------
-// 
-void CLocSUPLSettingsUiEngine::SetSessionObserver( MLocSUPLSettingsSessionObserver* aObserver ) const
-	{
-	iSUPLSettingsAdapter->SetSessionObserver( aObserver );
-	}
-	
-// ---------------------------------------------------------------------------
-// void CLocSUPLSettingsUiEngine::RemoveSessionObserver
-// ---------------------------------------------------------------------------
-// 
-void CLocSUPLSettingsUiEngine::RemoveSessionObserver( ) const
-	{
-	iSUPLSettingsAdapter->RemoveSessionObserver( );
-	}
-	
-// End of File
--- a/locationsystemui/locationsysui/locsuplsettingsui/src/locsuplsettingsview.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,551 +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:  Source file for SUPL Settings UI view
-*
-*/
-
-
-// System Include
-#include <barsread.h> 		                // For TResourceReader
-#include <bautils.h>
-#include <StringLoader.h>
-#include <aknViewAppUi.h>
-#include <locsuplsettingsui.rsg>
-#include <avkon.rsg>
-#include <hlplch.h>			                // Help
-#include <featmgr.h> 						// FeatureManager
-#include <eikmenup.h>						// Menu pane
-#include <eikmenub.h>						// Menu Bar
-#include <AknQueryDialog.h> 
-
-// User Include
-#include "locsuplsettings.hrh"
-#include "locsuplsettingsview.h"
-#include "locsuplsettingscontainer.h"
-#include "locsettingsui.h"
-#include "locsupldebug.h"
-#include "locsuplserverview.h"
-#include "locsuplsessionview.h"
-#include "locsuplsettingsuiengine.h"
-
-// ========================= MEMBER FUNCTIONS ================================
-
-
-// ---------------------------------------------------------------------------
-// CLocSUPLSettingsView::CLocSUPLSettingsView
-// Overloaded Constructor
-//
-// ---------------------------------------------------------------------------
-//	
-CLocSUPLSettingsView::CLocSUPLSettingsView( 
-                              CLocSUPLSettingsUiEngine&     aEngine,
-		 					  MLocSUPLSettingsEventHandler&	aEventHandler )
-	:iEventHandler( aEventHandler ),
-	iEngine( aEngine ) 
-	{
-	}
-
-// ---------------------------------------------------------------------------
-// CLocSUPLSettingsView::~CLocSUPLSettingsView
-// Destructor
-//
-// ---------------------------------------------------------------------------
-//
-CLocSUPLSettingsView::~CLocSUPLSettingsView()
-	{
-	DEBUG( + CLocSUPLSettingsView::~CLocSUPLSettingsView );	
-    if ( iContainer )
-        {
-        AppUi()->RemoveFromViewStack( *this, iContainer );
-        }
-
-    delete iContainer;
-    iContainer = NULL;
-	DEBUG( - CLocSUPLSettingsView::~CLocSUPLSettingsView );	
-	}
-	
-// ---------------------------------------------------------------------------
-// CLocSUPLSettingsView* CLocSUPLSettingsView::NewL
-// Creates new Location Sys Ui plugin.
-//
-// @param aEngine               Reference to the SUPL Settings
-//                              engine          
-// @param aEventHandler		    Pointer to the Event Handler
-// @return CAknViewAppUi&		Reference to the application view
-// ---------------------------------------------------------------------------
-//    
-CLocSUPLSettingsView* CLocSUPLSettingsView::NewL( 
-                              CLocSUPLSettingsUiEngine&     aEngine,
-		 					  MLocSUPLSettingsEventHandler&	aEventHandler )
-	{	
-	DEBUG( + CLocSUPLSettingsView::NewL );	
-    CLocSUPLSettingsView* self = NewLC( aEngine, aEventHandler );
-	CleanupStack::Pop( self );
-	DEBUG( - CLocSUPLSettingsView::NewL );	
-	return self;
-	}
-
-// ---------------------------------------------------------------------------
-// CLocSUPLSettingsView* CLocSUPLSettingsView::NewLC
-// Creates new Location Sys Ui plugin.
-//
-// @param aEngine               Reference to the SUPL Settings
-//                              engine          
-// @param aEventHandler		    Pointer to the Event Handler
-// @return CAknViewAppUi&		Reference to the application view
-// ---------------------------------------------------------------------------
-//    
-CLocSUPLSettingsView* CLocSUPLSettingsView::NewLC( 
-                              CLocSUPLSettingsUiEngine&     aEngine,
-		 					  MLocSUPLSettingsEventHandler&	aEventHandler )
-	{	
-    CLocSUPLSettingsView* self = 
-                new( ELeave ) CLocSUPLSettingsView( aEngine,                          
-    										        aEventHandler );
-	CleanupStack::PushL(self);
-	self->ConstructL();
-	return self;
-	}
-	
-// ---------------------------------------------------------------------------
-// void CLocSUPLSettingsView::ConstructL
-// Second Phase Constructor
-//
-// ---------------------------------------------------------------------------
-//
-void CLocSUPLSettingsView::ConstructL()
-	{   	
-	DEBUG( + CLocSUPLSettingsView::ConstructL );	
-	// Call AknView's BaseConstrutL
-	BaseConstructL( R_SUPLSETTINGS_VIEW );	 
-	DEBUG( - CLocSUPLSettingsView::ConstructL );	
-	}
-
-// -----------------------------------------------------------------------------
-// CLocSUPLSettingsView::HandleScreenSizeChange
-// -----------------------------------------------------------------------------
-//
-void CLocSUPLSettingsView::HandleScreenSizeChange() 
-	{
-	DEBUG( + CLocSUPLSettingsView::HandleScreenSizeChange );	
-	if( iContainer )
-		{
-		iContainer->SetRect( ClientRect());		
-		}
-	DEBUG( - CLocSUPLSettingsView::HandleScreenSizeChange );	
-	}
-
-// -----------------------------------------------------------------------------
-// CLocSUPLSettingsView::UpdateView
-// -----------------------------------------------------------------------------
-//	
-void CLocSUPLSettingsView::UpdateView()
-    {
-	DEBUG( + CLocSUPLSettingsView::UpdateView );	
-    if( iContainer )
-		{
-		iContainer->UpdateScreen();		
-		}
-	  TRAP_IGNORE( ChangeMSKL() );		
-	DEBUG( - CLocSUPLSettingsView::UpdateView );	
-    }
-
-// -----------------------------------------------------------------------------
-// CLocSUPLSettingsView::StartedFromAppServer
-// -----------------------------------------------------------------------------
-//
-void CLocSUPLSettingsView::StartedFromAppServer()
-    {
-	DEBUG( + CLocSUPLSettingsView::StartedFromAppServer );	
-    iStartedFromServer = ETrue;
-	DEBUG( - CLocSUPLSettingsView::StartedFromAppServer );	
-    }
-
-// -----------------------------------------------------------------------------
-// CLocSUPLSettingsView::SwitchedFromServerView
-// -----------------------------------------------------------------------------
-//
-void CLocSUPLSettingsView::Reset()
-    {
-	DEBUG( + CLocSUPLSettingsView::Reset );	
-    iViewLaunched = 0;
-    StopDisplayingMenuBar();
-	DEBUG( - CLocSUPLSettingsView::Reset );	
-    }
-    
-// -----------------------------------------------------------------------------
-// TInt CLocSUPLSettingsView::SelectedItemIndex
-// Returns the Selected element. The list box model defines the enumeration that
-// would determine the current element that has been selected
-//
-// @return TInt Index of the item selected
-// -----------------------------------------------------------------------------
-//
-TInt CLocSUPLSettingsView::SelectedItemIndex()
-    {
-	DEBUG( CLocSUPLSettingsView::SelectedItemIndex );	
-    if( iContainer )
-        {
-        DEBUG1( CLocSUPLSettingsView::SelectedItemIndex =%d, iContainer->SelectedItemIndex() );	
-        return iContainer->SelectedItemIndex();
-        }
-    else
-        {
-        return KErrNotFound;
-        }	
-    }    
-    
-// ---------------------------------------------------------------------------
-// void CLocSUPLSettingsView::DoActivateL
-// 
-// ---------------------------------------------------------------------------	
-//
-void CLocSUPLSettingsView::DoActivateL( const TVwsViewId& 	/* PrevViewId*/,
-											   TUid		   	/* aCustomMessageId*/,
-						  				 const TDesC8&		/* aCustomMessage */)
-	{
-	DEBUG( + CLocSUPLSettingsView::DoActivateL );	
-	// Destroy the existing container
-	if( iContainer )
-        {
-        AppUi()->RemoveFromViewStack( *this, iContainer );
-        delete iContainer;
-        iContainer=NULL;
-        }						
-    
-    // Create new Container	
-	iContainer = CLocSUPLSettingsContainer::NewL( ClientRect(), 
-	                                              iEngine,
-	                                              *this );
-	iContainer->SetMopParent( this );
-	AppUi()->AddToViewStackL( *this, iContainer );
-	
-	if ( iStartedFromServer )
-	    {
-	    MenuBar()->SetMenuType( CEikMenuBar::EMenuOptionsNoTaskSwapper );
-	    }
-	
-	if( iViewLaunched )
-        {
-        iContainer->FocusToItemL(	iViewLaunched );
-        iViewLaunched = 0;
-        }
-	iContainer->DrawNow();
-	ChangeMSKL();
-	DEBUG( - CLocSUPLSettingsView::DoActivateL );	
-	}
-
-// ---------------------------------------------------------------------------
-// void CLocationSystemUiView::DoDeactivate
-//
-// ---------------------------------------------------------------------------
-//		
-void CLocSUPLSettingsView::DoDeactivate()
-	{
-	DEBUG( + CLocSUPLSettingsView::DoDeactivate );	
-	// Destroy Container
-	if ( iContainer )
-        {
-        AppUi()->RemoveFromViewStack( *this, iContainer );
-        delete iContainer;
-        iContainer = NULL;
-        }
-	DEBUG( - CLocSUPLSettingsView::DoDeactivate );	
-	}
-
-// ---------------------------------------------------------------------------
-// TUid CLocSUPLSettingsView::Id
-// Returns the View Id. Should be chosen to reflect the Implementation UID 
-// of the Plugin
-//
-// @return TUid The View Id
-// ---------------------------------------------------------------------------
-//	
-TUid CLocSUPLSettingsView::Id() const
-	{
-	return KLocSUPLSettingsUiViewId;
-	}
-
-// ---------------------------------------------------------------------------
-// void CLocSUPLSettingsView::HandleCommandL
-//
-// ---------------------------------------------------------------------------
-//	
-void CLocSUPLSettingsView::HandleCommandL(TInt aCommand)	
-	{
-	DEBUG( + CLocSUPLSettingsView::HandleCommandL );	
-	switch ( aCommand )
-        {
-		case ELocSuplOpenChange:
-			{
-			ChangeMSKL();
-			break;
-			}        
-        // Handle all the internal view specific commands here
-        case ELocSuplChange:
-        case ELocSuplMSKChange:
-            {
-            // Launch the SUPL Settings usage configurator.
-            // The error code is ignored since the necessary UI 
-            // notification would be convveyed by the Engine
-            TRAP_IGNORE( iEngine.LaunchSuplUsageConfiguratorL() );
-            break;
-            }
-    	case ELocSuplOpen:
-    	case ELocSuplMSKOpen:
-            {
-            TInt index = SelectedItemIndex();
-            switch( index )
-    	    {
-		      case 1:
-			    {      
-                // Launch the Supl Server List.
-                // The error code is ignored since the necessary UI 
-                // notification would be convveyed by the Engine
-                iViewLaunched = 1;
-                TRAP_IGNORE( AppUi()->ActivateLocalViewL ( KLocSUPLServerUiViewId ) );
-                break; 
-                }
-             case 2:
-                {
-                TInt sessionCount = iContainer->ActiveSessionCount();
-                if( sessionCount )
-                  {
-                  iViewLaunched = 2;
-                  // Launch the Supl sessions view.
-                  TRAP_IGNORE( AppUi()->ActivateLocalViewL ( KLocSUPLSessionUiViewId ) );
-                  }
-                  break;
-                }
-             default:
-			    break; 
-            }
-            break;   
-            } 
-        case ELocSuplClearSession:
-        case ELocSuplClearSessions:
-            {
-			if( iContainer->ActiveSessionCount() && DeletionConfirmationQueryL() )
-				{
-	            TRAP_IGNORE( iEngine.RemoveAllTriggerSessionsL( ) ); 
-	            ChangeMSKL();  
-				}
-            break;    
-            }
-		case ELocSuplMSKNo:
-			{
-			break;
-			}
-        case EAknCmdHelp:
-        	{
-           	HlpLauncher::LaunchHelpApplicationL( iCoeEnv->WsSession(),
-           										 AppUi()->AppHelpContextL());
-        	break;	
-        	}
-        case EAknCmdExit:
-        case EEikCmdExit:
-            {
-            // The Exit command has to be transferred back to the application
-            iEventHandler.HandleCommandL( EEikCmdExit );
-            break;    
-            }
-        case EAknSoftkeyBack:
-            {
-            // Back command is left to the Settings UI which is the command handler 
-            // in this case to handle
-            iEventHandler.HandleCommandL( EAknSoftkeyBack );
-            break;    
-            }
-        default:
-    	    {
-    	    // View Switiching, View closure and other external
-    	    // view related and AppUi related commands
-    	    iEventHandler.HandleCommandL( aCommand );
-            break;	
-    	    }
-        }
-	DEBUG( - CLocSUPLSettingsView::HandleCommandL );	
-	}
-
-// -----------------------------------------------------------------------------
-// CLocSUPLSettingsView::ChangeMSKL
-// -----------------------------------------------------------------------------
-//
-void CLocSUPLSettingsView::ChangeMSKL() 
-	{
-	DEBUG( + CLocSUPLSettingsView::ChangeMSKL );	
-	// Listbox takes all event even if it doesn't use them	
-    if( !Cba() || !iContainer )
-	    {
-	   	return;
-	    }
-	
-    TInt index = SelectedItemIndex();
-	TInt sessionCount = iContainer->ActiveSessionCount();
-    switch( index )
-    	{
-		case 0:
-			{
-			TRAP_IGNORE( 
-				Cba()->SetCommandSetL ( R_SUPLSETTINGS_OPTIONS_CHANGE_BACK ) ); 
-			break;
-			}
-		case 1:
-			{
-			TRAP_IGNORE( 
-				Cba()->SetCommandSetL ( R_SUPLSETTINGS_OPTIONS_OPEN_BACK ) ); 
-			break;
-			}
-		default:
-			{
-			if( sessionCount )
-				{
-				TRAP_IGNORE( 
-					Cba()->SetCommandSetL ( R_SUPLSETTINGS_OPTIONS_OPEN_BACK ) ); 
-				}
-			else
-				{
-				TRAP_IGNORE( 
-					Cba()->SetCommandSetL ( R_SUPLSETTINGS_OPTIONS_NOMSK_BACK ) ); 
-				}
-			break;
-			}   		
-    	}    	
-	Cba()->DrawDeferred();  	
-	DEBUG( - CLocSUPLSettingsView::ChangeMSKL );	
-	}
-
-// -----------------------------------------------------------------------------
-// CLocSUPLSettingsView::DynInitMenuPaneL
-// -----------------------------------------------------------------------------
-void CLocSUPLSettingsView::DynInitMenuPaneL( TInt          aResourceId, 
-                                             CEikMenuPane* aMenuPane )
-    {
-	DEBUG( + CLocSUPLSettingsView::DynInitMenuPaneL );	
-    if ( aResourceId == R_SUPLSETTINGS_MENU )
-        {
-        User::LeaveIfNull( aMenuPane );
-        //Handle Help Fature
-        HandleHelpFeature( *aMenuPane );
-        
-        //Disable Open/Change/Clear sessions options
-		switch( SelectedItemIndex() )
-			{
-			case 0:
-				{
-        		//aMenuPane->SetItemDimmed( ELocSuplChange, EFalse );
-	        	//aMenuPane->SetItemDimmed( ELocSuplOpen, ETrue );
-	        	aMenuPane->SetItemDimmed( ELocSuplClearSession, ETrue );
-	        	aMenuPane->SetItemDimmed( ELocSuplClearSessions, ETrue );
-				break;
-				}
-			case 1:
-				{
-        		//aMenuPane->SetItemDimmed( ELocSuplChange, ETrue );
-	        	//aMenuPane->SetItemDimmed( ELocSuplOpen, EFalse );
-	        	aMenuPane->SetItemDimmed( ELocSuplClearSession, ETrue );
-	        	aMenuPane->SetItemDimmed( ELocSuplClearSessions, ETrue );
-				break;
-				}
-			case 2:
-				{
-        		aMenuPane->SetItemDimmed( ELocSuplChange, ETrue );
-				TInt sessionCount = iContainer->ActiveSessionCount();
-				
-				switch( sessionCount )
-					{
-					case 0:
-						{
-	        			//aMenuPane->SetItemDimmed( ELocSuplOpen, ETrue );
-	        			aMenuPane->SetItemDimmed( ELocSuplClearSession, ETrue );
-	        			aMenuPane->SetItemDimmed( ELocSuplClearSessions, ETrue );
-					break;
-						}
-					case 1:
-						{
-	        			//aMenuPane->SetItemDimmed( ELocSuplOpen, EFalse );
-	        			aMenuPane->SetItemDimmed( ELocSuplClearSession, EFalse );
-					aMenuPane->SetItemSpecific(ELocSuplClearSession, ETrue);
-	        			aMenuPane->SetItemDimmed( ELocSuplClearSessions, ETrue );
-						break;
-						}
-					default:
-						{
-	        			//aMenuPane->SetItemDimmed( ELocSuplOpen, EFalse );
-		        		aMenuPane->SetItemDimmed( ELocSuplClearSession, ETrue );
-		        		aMenuPane->SetItemDimmed( ELocSuplClearSessions, EFalse );
-					aMenuPane->SetItemSpecific(ELocSuplClearSessions, ETrue);
-						break;
-						}
-					}
-				break;
-				}
-			 default:
-			    break;
-			}
-        //Context sensitive menu items
-        }
-	DEBUG( - CLocSUPLSettingsView::DynInitMenuPaneL );	
-    }
-    
-// -----------------------------------------------------------------------------
-// CLocSUPLSettingsView::HandleHelpFeature
-// -----------------------------------------------------------------------------
-void CLocSUPLSettingsView::HandleHelpFeature( CEikMenuPane& aMenuPane ) const
-    {
-	DEBUG( + CLocSUPLSettingsView::HandleHelpFeature );	
-    if ( FeatureManager::FeatureSupported( KFeatureIdHelp ))
-        {
-        aMenuPane.SetItemDimmed( EAknCmdHelp, EFalse );
-        }
-    else
-        {
-        aMenuPane.SetItemDimmed( EAknCmdHelp, ETrue );
-        }
-	DEBUG( - CLocSUPLSettingsView::HandleHelpFeature );	
-    }
-
-// -----------------------------------------------------------------------------
-// CLocSUPLSettingsView::DeletionConfirmationQueryL
-// ----------------------------------------------------------------------------
-//
-TInt CLocSUPLSettingsView::DeletionConfirmationQueryL( )
-    {    
-    HBufC* noteText = NULL;    
-    noteText = StringLoader::LoadLC( R_LOC_SUPL_QUERY_TERMINATE_ALL, iEikonEnv );
-    CAknQueryDialog* query = new( ELeave ) CAknQueryDialog( *noteText );    
-    TInt ret = query->ExecuteLD( R_LOC_SUPL_DELETE_QUERY );
-    CleanupStack::PopAndDestroy( noteText );   
-    return ret;
-    }
-
-#if 0
-// -----------------------------------------------------------------------------
-// CLocSUPLSettingsView::IsActive
-// -----------------------------------------------------------------------------
-TBool CLocSUPLSettingsView::IsActive()
-	{
-	if( iContainer )
-	    {
-	    return ETrue;		
-	    }		
-	else
-	    {
-	    return EFalse;
-	    }		
-	}
-	
-#endif
-
-// End of file
--- a/locationsystemui/locationsysui/locsysuiengine/BWINS/locsysuiengineu.def	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-EXPORTS
-	?CreateLocationSubSettingsUIL@CLocSysUiEngine@@QAEPAVMLocationUI@@VTUid@@@Z @ 1 NONAME ; class MLocationUI * CLocSysUiEngine::CreateLocationSubSettingsUIL(class TUid)
-	?CreatePositioningSettingsUIL@CLocSysUiEngine@@QAEPAVMLocationUI@@XZ @ 2 NONAME ; class MLocationUI * CLocSysUiEngine::CreatePositioningSettingsUIL(void)
-	?NewL@CLocSysUiEngine@@SAPAV1@AAVCAknViewAppUi@@@Z @ 3 NONAME ; class CLocSysUiEngine * CLocSysUiEngine::NewL(class CAknViewAppUi &)
-	?NewLC@CLocSysUiEngine@@SAPAV1@AAVCAknViewAppUi@@@Z @ 4 NONAME ; class CLocSysUiEngine * CLocSysUiEngine::NewLC(class CAknViewAppUi &)
-
--- a/locationsystemui/locationsysui/locsysuiengine/eabi/locsysuiengineu.def	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-EXPORTS
-	_ZN15CLocSysUiEngine28CreateLocationSubSettingsUILE4TUid @ 1 NONAME
-	_ZN15CLocSysUiEngine28CreatePositioningSettingsUILEv @ 2 NONAME
-	_ZN15CLocSysUiEngine4NewLER13CAknViewAppUi @ 3 NONAME
-	_ZN15CLocSysUiEngine5NewLCER13CAknViewAppUi @ 4 NONAME
-	_ZTI15CLocSysUiEngine @ 5 NONAME ; #<TI>#
-	_ZTV15CLocSysUiEngine @ 6 NONAME ; #<VT>#
-
--- a/locationsystemui/locationsysui/locsysuiengine/group/bld.inf	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,36 +0,0 @@
-/*
-* Copyright (c) 2005-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:  This file provides the information required for building
-*				 Location System UI Engine
-*                  
-*
-*/
-
-
-PRJ_PLATFORMS
-DEFAULT
-
-PRJ_EXPORTS
-
-// Exported as a part of the Location Settings UI Resources API
-../inc/locsysuiengine.h             	    |../../../inc/locsysuiengine.h
-../inc/locsysuiengineobserver.h      		|../../../inc/locsysuiengineobserver.h
-../inc/locationui.h             	        |../../../inc/locationui.h
-
-PRJ_MMPFILES
-locsysuiengine.mmp   
-
-PRJ_TESTMMPFILES
-
-//  End of File  
--- a/locationsystemui/locationsysui/locsysuiengine/group/locsysuiengine.mmp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,55 +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: Project definition file for Location System Ui Engine
-*
-*/
-
-
-// Includes 
-#include <data_caging_paths.hrh>    		//this is needed for RESOURCE_FILES_DIR
-#include "../inc/locsysuiengineuid.hrh"		// For UID3
-#include <platform_paths.hrh> // For the MW_LAYER_SYSTEMINCLUDE
-
-// Target information
-CAPABILITY 		CAP_GENERAL_DLL
-TARGET  		locsysuiengine.dll
-TARGETTYPE  	dll
-UID  			0x0 LOCSYSUIENGINE_UID3
-VENDORID 		VID_DEFAULT
-
-// Source Files
-SOURCEPATH 		../src
-SOURCE			locsysuiengine.cpp
-
-// System Includes
-MW_LAYER_SYSTEMINCLUDE
-
-// Uer Includes
-USERINCLUDE    	../inc
-USERINCLUDE		../../../inc
-USERINCLUDE		../../../../inc
-
-LIBRARY      	euser.lib
-LIBRARY    		ecom.lib
-LIBRARY         eikcore.lib      // EikonEnv
-LIBRARY         cone.lib         // CCoeEnv
-LIBRARY         avkon.lib
-LIBRARY         locsysuiview.lib // Location Setting UI Engine and 
-                                 // Positioning Settings
-
-#if defined(WINS)
- deffile   ../BWINS/locsysuiengine.def
-#elif defined(EABI)
- deffile   ../eabi/locsysuiengine.def
-#endif 
--- a/locationsystemui/locationsysui/locsysuiengine/inc/locationui.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,103 +0,0 @@
-/*
-* Copyright (c) 2006-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:  Location UI interface class. All the components intending to 
-*                provide UI services through the Location UI Server must implement
-*                this class
-*
-*/
-
-
-#ifndef M_LOCATIONUI_H_
-#define M_LOCATIONUI_H_
-
-// System Includes
-#include <e32base.h>
-
-// User Include
-
-// Forward Declarations
-
-// Class Definition
-/**
- * Observer for notification regarding the termination of the Launch call.
- *
- * @lib locsysuiengine.lib
- * @since S60 v3.2 
- */
-class MLocationUIObserver
-    {
-    public:
-    	/**
-    	 * Notifies the termination of the Location UI
-    	 *
-    	 * @since S60 v3.2
-    	 * @param aErrorCode The termination reason. KErrNone for normal 
-    	 *					 terminations. In case of error or pre-mature
-    	 *					 aborting System wide Error codes.
-    	 */      
-        virtual void LocationUIDismissed( TInt aErrorCode ) = 0;
-    };
-    
-/**
- * Location UI interface class. All the components intending to provide Location
- * UI related services must implement this class. This class provides the interface
- * to Launch and Close a Location UI component
- *
- * @lib locsysuiengine.lib
- * @since S60 v3.2
- */
-class MLocationUI
-	{		   		  
-	public:
-        /**
-         * Launches a Location UI component.
-         *
-         * @param aUiInputParams Flags that define specific configuration of the
-         *                       Location UI, that the user of the API wants to
-         *                       launch. If more than one functionality is
-         *                       requested then the various combinations are to be
-         *                       ORed. The interpretation of these flag values is
-         *                       a part of the understanding between the API user
-         *                       and the corresponding Location UI.
-         * @param aObserver      Observer where the termination of the Launch call
-         *                       needs to be notified.
-         *                          
-         */
-        virtual void LaunchLocationUIL( TInt		            aUiInputParams,
-                                        MLocationUIObserver*    aObserver ) = 0;
-
-        /**
-         * Launches a Location UI component.
-         *
-         * @param aUiInputParams String passed as a parameter to the
-         *                       Location UI, that the user of the API wants to
-         *                       launch. The interpretation of this string is
-         *                       a part of the understanding between the API user
-         *                       and the corresponding Location UI.
-         * @param aObserver      Observer where the termination of the Launch call
-         *                       needs to be notified.
-         *                          
-         */
-        virtual void LaunchLocationUIL( const TDesC&		            aUiInputParams,
-                                        MLocationUIObserver*    aObserver ) = 0;
-
-        /**
-         * Closes the running Location UI prematurely.
-         */
-        virtual void Close() = 0;
-        
-	};
-
-#endif // M_LOCATIONUI_H_
-
--- a/locationsystemui/locationsysui/locsysuiengine/inc/locsysuiengine.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,126 +0,0 @@
-/*
-* Copyright (c) 2005-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:  Location System UI Server's engine component. This class is 
-*                responsible for handling all the Location related UI components.
-*
-*/
-
-
-#ifndef C_LOCSYSUIENGINE_H_
-#define C_LOCSYSUIENGINE_H_
-
-// System Includes
-#include <e32base.h>
-
-// User Include
-
-// Forward Declarations
-class MLocationUI;
-class CLocSettingsUiEngine;
-class CAknViewAppUi;
-class CLocPosSettings;
-
-// Class Definition
-
-/**
- * Encapulates the logic necessary to launch various Location UIs. 
- * The Location UI AppServer will use this object for manipulating the Settings
- * components. The class contains funtionalities for discovering 
- * various available Location UIs, launching a UI, cancelling a UI request, 
- * terminating a UI after completion of the request..
- *
- * @lib locsysuiengine.lib
- * @since S60 v3.2
- */
-class CLocSysUiEngine : public CBase
-	{		   		  
-	public:
-        /**
-         * Two Phase Constructor for creating the Location Settings UI engine. 
-         *
-         * @param   aAppUi			    Reference to the Application UI class. 
-         * @return	CLocSysUiEngine*    Reference to the created object.
-         */
-        IMPORT_C static CLocSysUiEngine* NewL( 
-                                CAknViewAppUi&				aAppUi );
-
-        /**
-         * Two Phase Constructor for creating the Location Settings UI engine.
-         * Leaves the object on the cleanupstack.
-         *
-         * @param   aAppUi				Reference to the Application UI class.
-         * @return	CLocSysUiEngine*    Reference to the created object.
-         */
-        IMPORT_C static CLocSysUiEngine* NewLC( 
-                                CAknViewAppUi&				aAppUi );
-        						    	   
-        /**
-         * Destructor
-         */
-        virtual ~CLocSysUiEngine();
-
-        /**
-         * Creates the sub-Settings UI and  appends it to the existing list. The ownership
-         * of the created object is not returned to the callee function. The object would
-         * be destroyed only on the destruction of the plug-in.
-         * Incase the object alreacdy exists then the function would return a reference to
-         * to the existing object.
-         *
-         * @param  aImplementationUid The Implementation UID of the sub-settings plug-in that
-         *                            has to be created.
-         * @return MLocationUI*       Reference to the sub-settings UI that has been created.
-         */
-        IMPORT_C MLocationUI* CreateLocationSubSettingsUIL( TUid    aImplementationUid );
-        
-        /**
-         * Creates an instance of Postioning Settings UI. The ownership
-         * of the created object is not returned to the callee function. The object would
-         * be destroyed only on the destruction of the plug-in.
-         * Incase the object alreacdy exists then the function would return a reference to
-         * to the existing object.
-         *
-         * @return MLocationUI*       Reference to the Positioning UI that has been created.         
-         */
-        IMPORT_C MLocationUI* CreatePositioningSettingsUIL(); 
-            
-	private:
-	    /**
-         * Constructor
-         */
-        CLocSysUiEngine( CAknViewAppUi&				aAppUi );
-		 
-	private:
-	    /**
-	     * Reference to the applications UI
-	     */
-	    CAknViewAppUi&				                iAppUi;
-	    
-	    /**
-	     * Reference to the Location Settings UI Engine. This object is used
-	     * when there is a request to launch a Location sub-settings UI. The object
-	     * is created at the time of the first Launch request.
-	     * Owns
-	     */
-	    CLocSettingsUiEngine*                       iSettingsEngine;
-	    
-	    /**
-	     * Reference to the Positioning Settings UI. This object is used
-	     * when there is a request to launch Positioning Settings UI. The object
-	     * is created at the time of the first Launch request.
-	     */
-	    CLocPosSettings*                            iPosSettings;
-	};
-
-#endif // C_LOCSYSUIENGINE_H_
-
--- a/locationsystemui/locationsysui/locsysuiengine/inc/locsysuiengineobserver.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,51 +0,0 @@
-/*
-* Copyright (c) 2005-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:  Observer to the Location System UI Engine. 
-*                Notfies changes in the Location System UI related UI components
-*
-*/
-
-
-#ifndef M_LOCSYSUIENGINEOBSERVER_H_
-#define M_LOCSYSUIENGINEOBSERVER_H_
-
-// System Include
-#include <e32base.h>
-
-// Class Declaration
-
-/**
- * Observer class to Location System UI Engine.
- * It provides notfication about the user termination of the Location UIs.
- *
- * @lib locsysuiengine.lib
- * @since S60 v3.2
- */
-class MLocSysUiEngineObserver
-	{
-	public:
-		/**
-		 * Notifies the termination of the Location UI.
-		 *
-		 * @since S60 v3.2
-		 * @param aErrorCode The termination reason. KErrNone for normal 
-		 *					 terminations. In case of error or pre-mature
-		 *					 aborting System wide Error codes.
-		 */
-		 virtual void LocationUIDismissed( TInt aErrorCode )			= 0;
-	};
-
-#endif // M_LOCSYSUIENGINEOBSERVER_H_
-
-
--- a/locationsystemui/locationsysui/locsysuiengine/inc/locsysuiengineuid.hrh	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,31 +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 the UID3 value to be used for the Location System UI
-*				 Engine. The value is expected to one specific functions
-*				 1. UID3 for the LocationSystemUiEngine.dll Static Interface DLL
-*
-*
-*/
-
-#ifndef LOCSYSUIENGINEUID_HRH_
-#define LOCSYSUIENGINEUID_HRH_
-
-// Location System UI Engine UID3
-#define LOCSYSUIENGINE_UID3          0x10207463
-
-#endif      // LOCSYSUIENGINEUID_HRH_
-
-// End of File
-
-
--- a/locationsystemui/locationsysui/locsysuiengine/src/locsysuiengine.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,140 +0,0 @@
-/*
-* Copyright (c) 2005-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:  Location System UI Server's engine component. This class serves
-*                as a factory implementation for Location UI components
-*
-*/
-
-
-// System Include
-#include <aknViewAppUi.h>
-
-// User Include
-#include "locsysuiengine.h"
-#include "locsettingsuiengine.h"
-#include "locationsettings.h"
-#include "locpossettings.h"
-
-// ========================= MEMBER FUNCTIONS ================================
-
-// ---------------------------------------------------------------------------
-// CLocSysUiEngine::CLocSysUiEngine
-// Overloaded Constructor
-//
-// ---------------------------------------------------------------------------
-//
-CLocSysUiEngine::CLocSysUiEngine( CAknViewAppUi&    aAppUi )
-	:iAppUi( aAppUi )
-	{	
-	}
-
-// ---------------------------------------------------------------------------
-// CLocationSystemUiView::~CLocSysUiEngine
-// Destructor
-//
-// ---------------------------------------------------------------------------
-//
-CLocSysUiEngine::~CLocSysUiEngine()
-	{
-	// Incase a Location sub-settings request was made then the Settings
-	// UI engine has been created, In that case, the object and the 
-	// associated resources would be freed.
-	delete iSettingsEngine;
-	
-	// Incase Positioning settings request was made then the Settings UI
-	// and the associated resources would be freed.
-	delete iPosSettings;
-	}	
-					 
-// ---------------------------------------------------------------------------
-// CLocSysUiEngine* CLocSysUiEngine::NewL
-// Two Phase Constructor for creating the Location Settings UI engine.  
-//
-// @param    aAppUi			    Reference to the Application UI class.
-// @return	CLocSysUiEngine*    Reference to the created object.
-// ---------------------------------------------------------------------------  
-//
-EXPORT_C CLocSysUiEngine* CLocSysUiEngine::NewL( CAknViewAppUi&	 aAppUi )
-	{
-    CLocSysUiEngine* self = CLocSysUiEngine::NewLC( aAppUi );
-	CleanupStack::Pop( self );
-	return self;
-	}
-	
-// ---------------------------------------------------------------------------
-// CLocSysUiEngine* CLocSysUiEngine::NewL
-// Two Phase Constructor for creating the Location Settings UI engine.
-// Leaves the object on the cleanupstack.
-//
-// @param    aAppUi			    Reference to the Application UI class.
-// @return	CLocSysUiEngine*    Reference to the created object.
-// ---------------------------------------------------------------------------  
-//
-EXPORT_C CLocSysUiEngine* CLocSysUiEngine::NewLC( CAknViewAppUi&	aAppUi )
-	{
-    CLocSysUiEngine* self = new(ELeave) CLocSysUiEngine( aAppUi );
-	CleanupStack::PushL( self );
-    // No second phase construction required
-	return self;
-	}
-
-// ---------------------------------------------------------------------------
-// MLocationUI* CLocSysUiEngine::CreateSettingsUi
-// Creates the sub-Settings UI and  appends it to the existing list. The ownership
-// of the created object is not returned to the callee function. The object would
-// be destroyed only on the destruction of the plug-in.
-// Incase the object alreacdy exists then the function would return a reference to
-// to the existing object.
-//
-// @param  aImplementationUid The Implementation UID of the sub-settings plug-in that
-//                            has to be created.
-// @return MLocationUI*       Reference to the sub-settings UI that has been created.
-// ---------------------------------------------------------------------------
-//
-EXPORT_C MLocationUI* CLocSysUiEngine::CreateLocationSubSettingsUIL( 
-                                                TUid    aImplementationUid )
-    {
-    // If the Settings engine has already been created then use the same
-    // instance. If not, create a new instance
-    if( !iSettingsEngine )
-        {
-        iSettingsEngine = CLocSettingsUiEngine::NewL( iAppUi );
-        }   
-    return iSettingsEngine->CreateSettingsUiL( aImplementationUid );        
-    }
-    
-// ---------------------------------------------------------------------------
-// MLocationUI* CLocSysUiEngine::CreatePositioningSettingsUIL
-// Creates an instance of Postioning Settings UI. The ownership
-// of the created object is not returned to the callee function. The object would
-// be destroyed only on the destruction of the plug-in.
-// Incase the object alreacdy exists then the function would return a reference to
-// to the existing object.
-//
-// @return MLocationUI*       Reference to the Positioning UI that has been created.         
-// ---------------------------------------------------------------------------
-//
-EXPORT_C MLocationUI* CLocSysUiEngine::CreatePositioningSettingsUIL()
-    {
-    // If the Postioning Settings UI instance already exists then use the same
-    // If not, create a new instance
-    if( !iPosSettings )
-        {
-        iPosSettings = CLocPosSettings::NewL();
-        }
-    return iPosSettings;
-    }
-
-
-  
--- a/locationsystemui/locationsysui/locsysuiview/BWINS/locsysuiviewu.def	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-EXPORTS
-	?ImplementationGroupProxy@@YAPBUTImplementationProxy@@AAH@Z @ 1 NONAME ; struct TImplementationProxy const * ImplementationGroupProxy(int &)
-	?CreateSettingsUiL@CLocSettingsUiEngine@@QAEPAVCLocationSettings@@VTUid@@@Z @ 2 NONAME ; class CLocationSettings * CLocSettingsUiEngine::CreateSettingsUiL(class TUid)
-	?NewL@CLocPosSettings@@SAPAV1@XZ @ 3 NONAME ; class CLocPosSettings * CLocPosSettings::NewL(void)
-	?NewL@CLocSettingsUiEngine@@SAPAV1@AAVCAknViewAppUi@@@Z @ 4 NONAME ; class CLocSettingsUiEngine * CLocSettingsUiEngine::NewL(class CAknViewAppUi &)
-	?NewLC@CLocPosSettings@@SAPAV1@XZ @ 5 NONAME ; class CLocPosSettings * CLocPosSettings::NewLC(void)
-	?NewLC@CLocSettingsUiEngine@@SAPAV1@AAVCAknViewAppUi@@@Z @ 6 NONAME ; class CLocSettingsUiEngine * CLocSettingsUiEngine::NewLC(class CAknViewAppUi &)
-	?NewL@CLocSysUiView@@SAPAV1@XZ @ 7 NONAME ; class CLocSysUiView * CLocSysUiView::NewL(void)
-	?LaunchedfromPosSettingsApp@CLocSysUiView@@QAEXXZ @ 8 NONAME ; void CLocSysUiView::LaunchedfromPosSettingsApp(void)
-
--- a/locationsystemui/locationsysui/locsysuiview/data/10207462.rss	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,48 +0,0 @@
-/*
-* Copyright (c) 1020 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:  ECOM plugin resource file for Location System UI View
-
-*
-*/
-
-#include <ecom/registryinfo.rh>
-#include "locsysuiviewuid.hrh"
-
-#define LOCSYSUIVIEW_DISPLAYNAME "Location System UI View Plugin"
-#define LOCSYSUIVIEW_DEFAULTDATA "0x10207239"
-#define LOCSYSUIVIEW_OPAQUEDATA	 "80"  
-
-RESOURCE REGISTRY_INFO theInfo
-    {
-    dll_uid     = LOCSYSUIVIEW_UID3;
-    interfaces  =
-        {
-    	INTERFACE_INFO
-    		{
-    		interface_uid   = 0x10207236;
-    		implementations = 
-    			{
-    			IMPLEMENTATION_INFO
-    				{
-    				implementation_uid  = LOCSYSUIVIEW_UID3;
-    				version_no          = 1;
-    				display_name        = LOCSYSUIVIEW_DISPLAYNAME;
-    				default_data        = LOCSYSUIVIEW_DEFAULTDATA;	 // Parent UID
-    	            opaque_data         = LOCSYSUIVIEW_OPAQUEDATA; 	 // Order number
-    				}
-    			};
-    		}
-        };
-    }
-
--- a/locationsystemui/locationsysui/locsysuiview/data/locsysuiviewrsc.rss	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,238 +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:  Resource File for the Location System UI 
-*			  	  view that acts as a plug-in to GS
-*       
-*
-*/
-
-
-//  RESOURCE IDENTIFIER
-NAME    LSVW // 4 letter ID
-
-//  INCLUDES
-#include    <data_caging_paths_strings.hrh>
-#include    <bldvariant.hrh>
-#include    <avkon.rh>
-#include    <avkon.rsg>
-#include    <avkon.mbg>
-#include    <EIKCORE.rsg>
-#include    <eikon.rh>
-#include    <eikon.rsg>
-#include    <avkon.loc>
-
-#include 	"locsysuiview.hrh"
-#include  <location.loc>
-
-
-// CONSTANTS
-
-//  RESOURCE DEFINITIONS 
-
-//----------------------------------------------------
-//   
-//    
-//    Needed or loading the resource fails!
-//
-//----------------------------------------------------	
-//
-RESOURCE RSS_SIGNATURE
-    {
-    }
-
-
-//----------------------------------------------------
-//   
-//    r_locsysuiview_app_view
-//    Applications view.
-//
-//----------------------------------------------------
-//
-RESOURCE AVKON_VIEW r_locsysuiview_app_view
-    {
-    menubar = r_locsysuiview_menubar;
-	  cba = r_locsysuiview_softkeys_option_open_back;
-    }
-
-//----------------------------------------------------
-//   
-//    r_locsysuiview_softkeys_option_open_back
-//    CBA for Application view.
-//
-//----------------------------------------------------
-//   
-RESOURCE CBA r_locsysuiview_softkeys_option_open_back
-    {
-    flags = 0;
-    buttons = 
-        {
-        CBA_BUTTON 
-            {
-            id = EAknSoftkeyOptions; 
-            txt = text_softkey_option;
-            },
-        CBA_BUTTON 
-            {
-            id = EAknSoftkeyBack; 
-            txt = text_softkey_back;
-            },
-        CBA_BUTTON
-            {
-            id = ELocSysUiCmdOpen; 
-            txt = qtn_msk_open;
-            }
-        };
-    }
-
-//----------------------------------------------------
-//   
-//    r_gs_apps_view_title
-//    Application view's title.
-//
-//----------------------------------------------------
-//
-RESOURCE TITLE_PANE r_locsysuiview_title
-    {
-    txt = qtn_loc_pos_settings_title;
-    }
-
-
-//----------------------------------------------------
-//  r_gs_apps_view_caption
-// 
-// Applications view caption for plugin
-//----------------------------------------------------
-//
-RESOURCE TBUF r_locsysuiview_caption
-    {
-    buf = qtn_set_folder_positioning;
-    }
-
-
-//----------------------------------------------------
-//   
-//    r_locsysuiview_menubar
-//    Options menu with 'Open', 'Help' and 'Exit' items.
-//
-//----------------------------------------------------
-//
-RESOURCE MENU_BAR r_locsysuiview_menubar
-    {
-    titles =
-        {
-        MENU_TITLE 
-            { 
-            menu_pane = r_locsysuiview_menu_item_exit;
-            },
-        MENU_TITLE
-        	{
-        	menu_pane = r_locsysuiview_menu_item_help;
-        	},
-        MENU_TITLE 
-            {
-            menu_pane = r_locsysuiview_menu_item_open;
-            }
-        };
-    }
-
-    
-//----------------------------------------------------
-//   
-//    r_locsysuiview_menu_item_open
-//    Options menu item 'Open'.
-//
-//----------------------------------------------------
-//
-RESOURCE MENU_PANE r_locsysuiview_menu_item_open
-    {
-    items =
-        {
-        MENU_ITEM 
-            {
-            command = ELocSysUiCmdOpen;
-            txt = qtn_options_open;
-	    			flags = EEikMenuItemAction;
-            }
-        };
-    }
-
-//----------------------------------------------------
-//   
-//    r_locsysuiview_menu_item_help
-//    Options menu item 'Help'.
-//
-//----------------------------------------------------
-//
-RESOURCE MENU_PANE r_locsysuiview_menu_item_help
-    {
-    items =
-        {
-        MENU_ITEM 
-            {
-            command = EAknCmdHelp;
-            txt = qtn_options_help;
-            }
-        };
-    }
-
-//----------------------------------------------------
-//   
-//    r_locsysuiview_menu_item_exit
-//    Options menu item 'Exit'.
-//
-//----------------------------------------------------
-//
-RESOURCE MENU_PANE r_locsysuiview_menu_item_exit
-    {
-    items =
-        {
-        MENU_ITEM 
-            {
-            command = EAknCmdExit;
-            txt = qtn_options_exit;
-            }
-        };
-    }
-
-//----------------------------------------------------
-//   
-//    r_locsysuiview_softkeys_option_open_exit
-//    CBA for Application view.
-//
-//----------------------------------------------------
-//   
-RESOURCE CBA r_locsysuiview_softkeys_option_open_exit
-    {
-    flags = 0;
-    buttons = 
-        {
-        CBA_BUTTON 
-            {
-            id = EAknSoftkeyOptions; 
-            txt = text_softkey_option;
-            },
-        CBA_BUTTON 
-            {
-            id = EAknCmdExit; 
-            txt = text_softkey_exit;
-            },
-        CBA_BUTTON
-            {
-            id = ELocSysUiCmdOpen; 
-            txt = qtn_msk_open;
-            }
-        };
-    }
-//End of File
-
--- a/locationsystemui/locationsysui/locsysuiview/eabi/locsysuiviewu.def	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
-EXPORTS
-	_Z24ImplementationGroupProxyRi @ 1 NONAME
-	_ZN15CLocPosSettings4NewLEv @ 2 NONAME
-	_ZN15CLocPosSettings5NewLCEv @ 3 NONAME
-	_ZN20CLocSettingsUiEngine17CreateSettingsUiLE4TUid @ 4 NONAME
-	_ZN20CLocSettingsUiEngine4NewLER13CAknViewAppUi @ 5 NONAME
-	_ZN20CLocSettingsUiEngine5NewLCER13CAknViewAppUi @ 6 NONAME
-	_ZTI13CLocSysUiView @ 7 NONAME ; #<TI>#
-	_ZTI15CLocPosSettings @ 8 NONAME ; #<TI>#
-	_ZTI17CLocationSettings @ 9 NONAME ; #<TI>#
-	_ZTI20CLocSettingsUiEngine @ 10 NONAME ; #<TI>#
-	_ZTV13CLocSysUiView @ 11 NONAME ; #<VT>#
-	_ZTV15CLocPosSettings @ 12 NONAME ; #<VT>#
-	_ZTV17CLocationSettings @ 13 NONAME ; #<VT>#
-	_ZTV20CLocSettingsUiEngine @ 14 NONAME ; #<VT>#
-	_ZN13CLocSysUiView4NewLEv @ 15 NONAME
-	_ZN13CLocSysUiView26LaunchedfromPosSettingsAppEv @ 16 NONAME
-
--- a/locationsystemui/locationsysui/locsysuiview/group/bld.inf	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,51 +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 provides the information required for building 
-*								 Location System UI plugin to GS
-*                  
-*
-*/
-
-
-PRJ_PLATFORMS
-DEFAULT
-
-PRJ_EXPORTS
-../inc/locsettingsui.h 					    |../../../../inc/locsettingsui.h
-../inc/locsettingsui.inl      				|../../../../inc/locsettingsui.inl
-../inc/locsettingsuiobserver.h      		|../../../../inc/locsettingsuiobserver.h
-../inc/locsettingsuiparams.h				|../../../../inc/locsettingsuiparams.h
-../inc/locsettingsuiparams.inl				|../../../../inc/locsettingsuiparams.inl
-
-../inc/locsettingsuiengine.h                |../../../inc/locsettingsuiengine.h
-../inc/locationsettings.h                   |../../../inc/locationsettings.h
-../inc/locpossettings.h                     |../../../inc/locpossettings.h
-
-../inc/locsysuiview.h                       |../../../inc/locsysuiview.h
-../inc/locsysuiviewuid.hrh                  |../../../inc/locsysuiviewuid.hrh
-../inc/locsysuicontainereventhandler.h      |../../../inc/locsysuicontainereventhandler.h
-../inc/locsettingsuiecomnotifier.h          |../../../inc/locsettingsuiecomnotifier.h
-
-PRJ_MMPFILES
-locsysuiview.mmp    
-
-PRJ_TESTMMPFILES
-
-PRJ_EXTENSIONS
-START EXTENSION s60/mifconv
-OPTION TARGETFILE locsysuiview.mif
-OPTION HEADERFILE locsysuiview.mbg
-OPTION SOURCES -c8,8 qgn_prop_set_gene_loc.svg
-END
-//  End of File  
--- a/locationsystemui/locationsysui/locsysuiview/group/locsysuiview.mmp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,89 +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 is project specification file for Location System UI 
-*                 view that acts as a plug-in to GS
-*        
-*
-*/
-
-
-// Includes
-#include <platform_paths.hrh> // For the MW_LAYER_SYSTEMINCLUDE
-#include <data_caging_paths.hrh>          //this is needed for RESOURCE_FILES_DIR
-#include "../inc/locsysuiviewuid.hrh"    // For UID3
-
-CAPABILITY          CAP_ECOM_PLUGIN
-TARGET              locsysuiview.dll
-TARGETTYPE          PLUGIN
-UID                 0x10009D8D LOCSYSUIVIEW_UID3
-VENDORID            VID_DEFAULT
-
-SOURCEPATH          ../src
-SOURCE              locsysuiviewimptable.cpp
-SOURCE              locsysuiview.cpp
-SOURCE              locsysuicontainer.cpp
-SOURCE    		    locsysuilbmodel.cpp
-SOURCE 			    locationsettings.cpp
-SOURCE			    locsettingsuiengine.cpp
-SOURCE			    locsettingsuipluginloader.cpp
-SOURCE              locpossettings.cpp
-
-USERINCLUDE         ../inc
-USERINCLUDE         ../data
-USERINCLUDE         ../../inc
-USERINCLUDE			../../../inc
-USERINCLUDE		    ../../../../inc
-
-// System Include Path Definition
-APP_LAYER_SYSTEMINCLUDE
-
-SOURCEPATH          ../data
-
-//ECOM resource definition
-START RESOURCE      10207462.rss
-TARGET              locsysuiview.rsc
-END //  ECOM resource definition
-
-//View resources
-START RESOURCE      locsysuiviewrsc.rss
-HEADER
-TARGETPATH          RESOURCE_FILES_DIR
-LANGUAGE_IDS
-END // AppsPlugin resources
-
-LIBRARY             euser.lib
-LIBRARY             ecom.lib
-LIBRARY             efsrv.lib
-LIBRARY             avkon.lib
-LIBRARY             bafl.lib 
-LIBRARY             cone.lib 
-LIBRARY             eikcoctl.lib 
-LIBRARY             eikctl.lib
-LIBRARY             eikcore.lib 
-LIBRARY             egul.lib                    // CGulIcon
-LIBRARY             aknskins.lib                // AknsUtils.h
-LIBRARY             commonengine.lib            // For RConeResourceLoader
-LIBRARY             fbscli.lib                  // For CFbsBitmap
-LIBRARY             hlplch.lib
-LIBRARY 			featmgr.lib 		        // Feature manager API
-LIBRARY             GSEcomPlugin.lib            // CGSPluginInterface
-
-#if defined(WINS)
- deffile   ../BWINS/locsysuiview.def
-#elif defined(EABI)
- deffile   ../eabi/locsysuiview.def
-#endif 
-
-// End of File
-
--- a/locationsystemui/locationsysui/locsysuiview/inc/locationsettings.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,191 +0,0 @@
-/*
-* Copyright (c) 2006-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:  Location Settings implementation of Location UIs. 
-*
-*/
-
-
-#ifndef C_LOCATIONSETTINGS_H_
-#define C_LOCATIONSETTINGS_H_
-
-// System Include
-#include <e32base.h>
-
-// User Includes
-#include "locationui.h"
-#include "locsettingsuiobserver.h"
-
-// Forward Declarations
-class CLocSettingsUi;
-class CAknViewAppUi;
-
-// Class Definition
-/**
- * Location Settings implementation of Location UIs. This class extends the 
- * Location UI interface for Location sub-settings plug-ins. This class acts as
- * the container class for the Location sub-settings plug-ins and takes up
- * complete ownership of these classes.
- *
- * @lib locsysuiview.lib
- * @since S60 v3.2
- */
-class CLocationSettings : public CBase,
-                          public MLocationUI,
-                          public MLocSettingsUiObserver
-	{
-	public:	
-        /**
-         * Two Phase Constructor.
-         *
-         * @param   aImplementationId   Implementation UID of the settings plug-in.
-         * @param   aAppUi              Application's AppUi reference.
-         * @return	CLocationSettings*	Pointer to the created object
-         */
-        static CLocationSettings* NewL( const TUid	    aImplementationId,
-                                        CAknViewAppUi&	aAppUi );
-        	
-        /**
-         * Two Phase Constructor. The funcion leaves the CLocationSettings object
-         * on the CleanupStack
-         *
-         * @param   aImplementationId   Implementation UID of the settings plug-in.
-         * @param   aAppUi              Application's AppUi reference.
-         * @return	CLocationSettings*	Pointer to the created object
-         */
-        static CLocationSettings* NewLC( const TUid	    aImplementationId,
-                                         CAknViewAppUi&	aAppUi );
-        
-        /**
-         * C++ Destructor
-         */
-        virtual ~CLocationSettings();
-
-        /**
-         * Accessor Function for the Setings Ui Caption. The function does not
-         * allocate any buffer but returns its internal buffer. This buffer 
-         * should not be deleted/modified by the callee.
-         *
-         * @return const TPtrC Caption String
-         */
-        TPtrC Caption();
-
-        /**
-         * Returns the priority of the UI module. 
-         *
-         * @return TInt Priority of the Settings UI
-         */
-        TInt Priority();
-
-        /**
-         * Accessor Function for the Settings Ui Implementation UID
-         *
-         * @return TUid Settings UI Plug In's implementation UID
-         */
-        const TUid	ImplementationUid();         
-        
-    public: // Inherited from MLocationUI
-    
-        /**
-         * Launches a Location UI component.
-         *
-         * @param aUiInputParams Flags that define specific configuration of the
-         *                       Location UI, that the user of the API wants to
-         *                       launch. If more than one functionality is
-         *                       requested then the various combinations are to be
-         *                       ORed. The interpretation of these flag values is
-         *                       a part of the understanding between the API user
-         *                       and the corresponding Location UI.
-         * @param aObserver      Observer where the termination of the Launch call
-         *                       needs to be notified.
-         *                          
-         */
-        virtual void LaunchLocationUIL( TInt		            aUiInputParams,
-                                        MLocationUIObserver*    aObserver );
-    
-        /**
-         * Launches a Location UI component.
-         *
-         * @param aUiInputParams String passed as a parameter to the
-         *                       Location UI, that the user of the API wants to
-         *                       launch. The interpretation of this string is
-         *                       a part of the understanding between the API user
-         *                       and the corresponding Location UI.
-         * @param aObserver      Observer where the termination of the Launch call
-         *                       needs to be notified.
-         *                          
-         */
-        virtual void LaunchLocationUIL( const TDesC&		            aUiInputParams,
-                                        MLocationUIObserver*    aObserver );
-
-        /**
-         * Closes the running Location UI prematurely.
-         */
-        virtual void Close();       
-        
-    public:// Inherited from MLocSettingsUiObserver     
-        /**
-         * Inherited from MLocSettingsUiObserver. Notification from the Settings UI
-         * to indicate the termination of the Settings UI application
-         *
-         * @param aErrorCode The termination reason. KErrNone for normal 
-         *					 terminations. In case of error or pre-mature aborting
-         *					 System wide Error codes.
-         */
-        void SettingClosed( TInt aErrorCode );
-                        
-	private:
-	    /**
-         * C++ Constructor
-         *
-         * @param	aLocationSettings	Pointer to the Location sub-settings UI
-         *                              plug-in. The ownership of the plug-in is 
-         *                              transferred to the constructed class.
-         */
-        CLocationSettings( const TUid	     aImplementationId );
-        			        
-        /**
-         * Second Phase of the two phase constructor
-         *
-         */
-        void ConstructL( CAknViewAppUi&	aAppUi );
-
-	private:
-	    /**
-         * Buffer holding the localized caption string that is used to descibe
-         * the Settings UI
-         * Owns
-         */	 
-		HBufC*			    iCaption;
-			
-	    /**
-         * Pointer to the Location Sub-settings UI object
-         * Owns
-         */
-		CLocSettingsUi*     iLocationSettings;
-		
-		/**
-		 * Implementation UID of the Location sub-settings UI object
-		 */
-		const TUid          iImplementationId;
-		
-        /**
-         * Location UI Observer
-         * Reference
-         */
-        MLocationUIObserver*    iObserver;		
-	    	
-	};
-
-#endif // C_LOCATIONSETTINGS_H_
-
--- a/locationsystemui/locationsysui/locsysuiview/inc/locpossettings.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,104 +0,0 @@
-/*
-* Copyright (c) 2006-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:  Positioning Settings implementation of Location UIs. 
-*
-*/
-
-
-#ifndef C_LOCPOSSETTINGS_H_
-#define C_LOCPOSSETTINGS_H_
-
-// System Include
-#include <e32base.h>
-
-// User Includes
-#include "locationui.h"
-
-// Forward Declarations
-class CLocSysUiView;
- 
-// Class Definition
-/**
- * Positioning Settings implementation of Location UIs. This class extends the 
- * Location UI interface for Positioning Settings UI.
- *
- * @lib locsysuiview.lib
- * @since S60 v3.2
- */
-class CLocPosSettings : public CBase,
-                        public MLocationUI
-	{
-	public:	
-        /**
-         * Two Phase Constructor.
-         *
-         * @return	CLocPosSettings*	Pointer to the created object.
-         */
-        IMPORT_C static CLocPosSettings* NewL();
-       
-        /**
-         * Two Phase Constructor. The funcion leaves the CLocationSettings object
-         * on the CleanupStack
-         *
-         * @return	CLocPosSettings*	Pointer to the created object.
-         */         
-        IMPORT_C static CLocPosSettings* NewLC();
-        
-        /**
-         * C++ Destructor
-         */
-        virtual ~CLocPosSettings();
-       
-    public:
-    
-        /**
-         * Inherited from MLocationUI
-         *
-         */
-        void LaunchLocationUIL( TInt		            aUiInputParams,
-                                MLocationUIObserver*    aObserver );
-    
-        /**
-         * Inherited from MLocationUI
-         *
-         */
-        void LaunchLocationUIL( const TDesC&                    aUiInputParams,
-                                MLocationUIObserver*    aObserver );
-
-        /**
-         * Inherited from MLocationUI
-         *
-         */
-        void Close();
-            
-    private:
-        /**
-         * Overloaded constructor
-         */         
-        CLocPosSettings();
-        
-        /**
-         * Second phase of two phase construction
-         */
-        void ConstructL();        
-                
-    private:	
-	    /**
-	     * Postioning Settings View. The ownership lies with the App UI
-	     */
-	    CLocSysUiView*          iView;
-	};
-
-#endif // C_LOCPOSSETTINGS_H_
-
--- a/locationsystemui/locationsysui/locsysuiview/inc/locpossettingsobserver.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,51 +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:  Observer to Postioning Settings UI.
-*
-*/
-
-
-#ifndef M_LOCPOSSETTINGS_H_
-#define M_LOCPOSSETTINGS_H_
-
-// System Include
-#include <e32base.h>
-
-// User Includes
-
-// Forward Declarations
-
-// Class Definition
-/**
- * Observer to Postioning Settings UI.
- * This class provides notification regarding the termination of Positioning 
- * settibgs UI.
- * @lib locsysuiview.lib
- * @since S60 v3.2
- */
-class MLocPosSettingsObserver
-	{
-		/**
-		 * Notifies the termination of the Psotioning Settings UI
-		 *
-		 * @since S60 v3.2
-		 * @param aErrorCode The termination reason. KErrNone for normal 
-		 *					 terminations. In case of error or pre-mature
-		 *					 aborting System wide Error codes.
-		 */
-		 virtual void PositioningSettingClosed( TInt aErrorCode )			= 0;	    
-	};
-
-#endif // M_LOCPOSSETTINGS_H_
-
--- a/locationsystemui/locationsysui/locsysuiview/inc/locsettingsui.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,172 +0,0 @@
-/*
-* Copyright (c) 2005-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:  E-Comm Plugin interface. Defines a settings UI component. The 
-*				 Settings UI component should contain one or more Window owning 
-*				 control that provides the Setting funtionality.
-*
-*/
-
-
-#ifndef C_LOCSETTINGSUI_H_
-#define C_LOCSETTINGSUI_H_
-
-// System Include
-#include <e32base.h>
-
-// Forward Declarations
-class CLocSettingsUiParams;
-class MLocSettingsUiObserver;
-class CAknViewAppUi;
-
-// Global Constants
-/**
- * The Interface UID for the ECom interface. The implementations of this ECom
- * plug-in have to the use this value as their Interface UID if they intend 
- * to link to the Location System UI Engine
- */
-const TUid	KSettingsUiInterfaceUID			=  { 0x10275061 };
-
-// Class Definition
-/**
- * Settings UI ECom plug-in interface
- *
- * Interface class that provides the Settings UI funtionality. Any Settings UI
- * component should derive from this class and implement the abstract funtions
- * Includes support for launching a UI, premature closing of a running UI and 
- * re-launching a suspended UI application. The plug-in does not mandate the 
- * nature of the Settings Ui. Unless the Settings UI transfers the ownership
- * of its component objects ( For eg. It might decide to implement a view and 
- * transfer its ownership to the AppUi class ), it is responsible for completely
- * handling them
- *
- * @lib locsysuiview.lib
- * @since S60 v3.1
- */
-class CLocSettingsUi : public CBase
-	{		
-	public:
-        /**
-         * Creates and initializes the Settings UI component. The component 
-         * creation is handled through the E-Comm server
-         *
-         * @param aImplementationUid  Implementation UID of the Settings Ui that
-         *							  has to be launched
-         * @param aInitParams		  Initialization Parameters
-         */
-		inline static CLocSettingsUi* NewL( const TUid				aImplementationUid,
-										    CLocSettingsUiParams&	aInitParams );
-        /**
-         * Destructor. Handles the destruction of the object through the 
-         * EComm Session
-         */
-		inline virtual ~CLocSettingsUi();
-
-        /**
-         * Returns the Settings UI Id. A unique identifer that identifies the 
-         * Settings UI. Could be the E-Comm destructor Id
-         *
-         * @since S60 v3.1
-         * @return Settings UI Identifier
-         */
-        inline TUid GetSettingsUiID();
-
-        /**
-         * Launches the Settings UI
-         *
-         * @since S60 v3.1
-         * @param aUiLaunchParams	Flags that define specific configuration of
-         *                          if the Settings UI, that the user of the API
-         *                          wants to launch. If more than one functionality
-         *                          is requested then the various combinations
-         *                          are to be ORed. The interpretation of these
-         *                          flag values is a part of the understanding
-         *                          between the API user and the Settings UI
-         */
-        virtual void LaunchL( TInt		aUiLaunchParams )			   		= 0;
-
-        /**
-         * Launches the Settings UI
-         *
-         * @since S60 v9.2
-         * @param aUiInputParams String passed as a parameter to the
-         *                       Location UI, that the user of the API wants to
-         *                       launch. The interpretation of this string is
-         *                       a part of the understanding between the API user
-         *                       and the corresponding Location UI.
-         */
-        virtual void LaunchL( const TDesC&		aUiLaunchParams );
-
-        /**
-         * Closes the running Settings UI prematurely. The UI can be closed 
-         * permanently or could be temporarily suspended and relaunched. Incase of 
-         * temporary suspension it is left to the implementation to decide to
-         * either store its current state or discard the same. The Settings UI
-         * is expected to release all the resources that it owns on the Close
-         * call.
-         *
-         * @since S60 v3.1
-         */
-        virtual void Close()							   = 0;
-
-        /**
-         * Method for getting caption of this plugin. This should be the 
-         * localized name of the settings view to be shown in parent view.
-         *
-         * @since S60 v3.1
-         * @param aCaption Pointer to Caption variable. The memory for the 
-         *                 variable has to be allocated by the calling 
-         *                 function. If it is found that there is insufficient
-         *                 memory then the function can leave accordingly
-         */
-        virtual void GetCaptionL( TDes& aCaption ) const					   = 0;
-
-        /**
-         * Returns the priority of the UI module. The priority value is defined 
-         * by the position in which the UI would be present when displayed to 
-         * the user. 
-         * 
-         * @since S60 v3.1
-         * @return Priority of the Settings UI
-         */
-        virtual TInt GetPriority()											   = 0;
-        
-	protected:
-        /**
-         * Default Constructor
-         */
-        inline CLocSettingsUi( MLocSettingsUiObserver&		aSettingsUiObserver,
-        		 		       CAknViewAppUi&				aAppUi );
-        		 		       
-	protected:
-        /**
-         * Observer for the Settings UI Class
-         */	    
-		MLocSettingsUiObserver&		iSettingsUiObserver;
-		
-		/**
-         * Reference to the Application Ui to which the Settings UI would belong to
-         */
-		CAknViewAppUi&				iAppUi;
-			
-	private:
-        /**
-         * ECOM plugin instance UID.
-         */
-		TUid						iDtor_ID_Key;
-	};
-
-#include "locsettingsui.inl"
-
-#endif // C_LOCSETTINGSUI_H_
-
--- a/locationsystemui/locationsysui/locsysuiview/inc/locsettingsui.inl	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,87 +0,0 @@
-/*
-* Copyright (c) 2005-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:  Inline functions for CLocSettingsUi
-*
-*/
-
-
-// System Include 
-#include <aknViewAppUi.h>
-
-// User Includes
-#include "locsettingsuiobserver.h"
-#include "locsettingsuiparams.h"
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// CLocSettingsUi::CLocSettingsUi
-// C++ default constructor can NOT contain any code, that
-// might leave.
-// -----------------------------------------------------------------------------
-//
-inline CLocSettingsUi::CLocSettingsUi( MLocSettingsUiObserver&		aSettingsUiObserver,
-					 			       CAknViewAppUi&				aAppUi )
-    :iSettingsUiObserver( aSettingsUiObserver ),
-     iAppUi( aAppUi )
-    {
-    }
-
-// -----------------------------------------------------------------------------
-// CLocSettingsUi::~CLocSettingsUi
-// Destructor.
-// -----------------------------------------------------------------------------
-//
-inline CLocSettingsUi::~CLocSettingsUi()
-    {
-    // Call ECom Session Destroy function to delete the object
-    REComSession::DestroyedImplementation( iDtor_ID_Key );
-    }
-
-// -----------------------------------------------------------------------------
-// CLocSettingsUi* CLocSettingsUi::NewL
-// Two-phased constructor.
-// -----------------------------------------------------------------------------
-//
-inline CLocSettingsUi* CLocSettingsUi::NewL( const TUid					aImplementationUid,
-										 	 CLocSettingsUiParams&		aInitParams )
-    {
-    TAny* ptr;
-    TInt32 keyOffset = _FOFF( CLocSettingsUi, iDtor_ID_Key );
-    ptr = REComSession::CreateImplementationL( aImplementationUid, keyOffset, &aInitParams);
-    return reinterpret_cast<CLocSettingsUi*>( ptr );
-    }
-    
-// -----------------------------------------------------------------------------
-// TInt CLocSettingsUi::CLocSettingsUi
-//
-// -----------------------------------------------------------------------------
-//
-inline TUid CLocSettingsUi::GetSettingsUiID()
-    {
-    return iDtor_ID_Key;
-    }
-    
-// -----------------------------------------------------------------------------
-// TInt CLocSettingsUi::LaunchL
-//
-// -----------------------------------------------------------------------------
-//
-inline void CLocSettingsUi::LaunchL( const TDesC&		/*aUiLaunchParams*/ )
-    {
-    User::Leave( KErrNotSupported );
-    }
-    
-// End of File
-
--- a/locationsystemui/locationsysui/locsysuiview/inc/locsettingsuiecomnotifier.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,49 +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:  Observer to the Views Engine. Notfies changes in the Settings UI
-*				 and E-Com events
-*
-*/
-
-
-#ifndef M_LOCSETTINGSUIECOMNOTIFIER_H_
-#define M_LOCSETTINGSUIECOMNOTIFIER_H_
-
-// System Include
-#include <e32base.h>
-
-// Class Declaration
-
-/**
- * Observer class to CLocSettingsUiEngine.
- * Inaddtion to it it also provides notfication regarding the changes the 
- * plug-in loading and unloading states
- *
- * @lib locsysuiview.lib
- * @since S60 v3.2
- */
-class MLocSettingsUiEcomNotifer
-	{
-	public:
-		/** 
-		 * Notifies any change in the state of the underlying Settings UI
-		 * session
-		 *
-		 * @since S60 v3.1
-		 * @param aErrorCode Error Code denoting the state change
-		 */
-		 virtual void EComSessionStateChanged( TInt aErrorCode )	= 0;
-	};
-
-#endif // M_LOCSETTINGSUIENGINEOBSERVER_H_
--- a/locationsystemui/locationsysui/locsysuiview/inc/locsettingsuiengine.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,171 +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: This is a header file for engine class of Location settings Ui
-*
-*/
-
-
-#ifndef C_LOCSETTINGSUIENGINE_H_
-#define C_LOCSETTINGSUIENGINE_H_
-
-// System Includes
-#include <e32base.h>
-
-// User Include
-
-// Forward Declarations
-class CLocSettingsUi;
-class CAknViewAppUi;
-class MLocSettingsUiEcomNotifer;
-class CLocSettingsUiPluginLoader;
-class CLocationSettings;
-
-
-// Class Definition
-
-/**
- * Encapulates the logic necessary to launch various sub-settings UIs. 
- * The Location UI AppServer and the Location Systems Plugin to the 
- * General Settings will use this object for manipulating the Settings
- * components. The class contains funtionalities for discovering 
- * various available Settings UIs, launching a UI,cancelling a UI request ,
- * terminating a UI after completion of the request and to hold back
- * the suspended UIs.
- *
- * @lib locsysuiview.lib
- * @since S60 v3.2
- */
-class CLocSettingsUiEngine : public CBase
-	{		   		  
-	public: // Exported Functions
-        /**
-         * Two Phase Constructor. 
-         * 
-         * @param    aAppUi				     Reference to the Application UI class that 
-         *								     launched the Settings Application.
-         * @return	CLocSettingsUiEngine*    Reference to the created object.
-         */
-        IMPORT_C static CLocSettingsUiEngine* NewL( CAknViewAppUi&	aAppUi );
-
-        /**
-         * Two Phase Constructor. 
-         * 
-         * @param    aAppUi				    Reference to the Application UI class that 
-         *								    launched the Settings Application.
-         * @return	CLocSettingsUiEngine*	Reference to the created object.
-         */
-        IMPORT_C static CLocSettingsUiEngine* NewLC( CAknViewAppUi&	aAppUi );
-        						    	   
-        /**
-         * Destructor
-         */
-        virtual ~CLocSettingsUiEngine();
-
-    public: // Other Exported functions
-        /**
-         * Creates a single Settings UI Object.
-         * In case the object already exists, then a reference to the existing object is
-         * returned and no new object is created. In either case, the class retains the
-         * ownership of the created object.
-         *
-         * @param aImplementationUid The Implementation UID of the plug-in that
-         *                           has to be created.
-         * @return CLocationSettings* Reference to the created object.
-         */
-        IMPORT_C CLocationSettings* CreateSettingsUiL( TUid aImplementationUid );
-    
-    public: // Non exported functions
-        /**
-         * Creates all the available settings UI. This function call performs
-         * an ECom discovery of all the possible ECom plugins that are 
-         * available and creates the Settings UI components as well as the 
-         * plug-in UI. The ownership of the created objects is not transferred
-         * to the callee but retained with the Engine class. This function needs 
-         * that No settings UIs have been already created. Incase, there exists
-         * any Settings UIs then the function leaves with KErrAlreadyExists.
-         *
-         * @return RPointerArray<CLocationSettings>& Reference to the array of Settings
-         *                                           objects.
-         */
-        RPointerArray<CLocationSettings>& CreateAvailableSettingsUiL();
-        
-        /**
-         * Updates the list of available UIs. The new list would contain all the
-         * latest additions to the list of UIs in addition to the existing
-         * UIs. The interface does not delete any instances if they are not in
-         * the current implementation list.
-         *
-         * @return RPointerArray<CLocationSettings>& Reference to the array of Settings
-         *                                           objects.         
-         */
-        RPointerArray<CLocationSettings>& UpdateAvailableSettingsUisL();
-        
-        /**
-         * Accessor function to obtain the Settings UI structures. The ownership of the 
-         * internal objects is not transferred.
-         *
-         * @return RPointerArray<CLocationSettings>& Reference to the array of Settings
-         *                                           objects. 
-         */
-        RPointerArray<CLocationSettings>& SettingsUiArray();
-        
-        /**
-         * Starts the Ecom notification for observing loading and unloading of the 
-         * underlying sub-settings plug-ins
-         *
-         * @param aSettingsNotifer  Notifier for communication of changes in the 
-         *                          Ecom loading and unloading for sub-settings
-         *                          plug-ins
-         */
-        void    StartSettingsEComNotificationL( 
-                            MLocSettingsUiEcomNotifer*   aNotifier );
-                            
-        /**
-         * Stops ECom notification. Does nothing in case there was no outstanding
-         * request
-         */
-        void    StopSettingsEComNotification();                            
-
-	private:
-	    /**
-         * Constructor
-         */
-        CLocSettingsUiEngine( CAknViewAppUi&    aAppUi );
-        			   	 			   		  
-        /**
-         * Second Phase of construction
-         */
-        void ConstructL();
-		 
-	private:
-		/**
-         * Reference to the Application Ui to which the Settings UI would belong to
-         */
-		CAknViewAppUi&						iAppUi;
-		
-		/**
-		 * Array of Settings UI classes
-		 * Owns
-		 */
-		RPointerArray<CLocationSettings>	iSettingsArray;
-		
-		/**
-		 * Reference to the Plug-in Loader
-		 * Owns
-		 */
-		CLocSettingsUiPluginLoader*			iPluginLoader;
-	};
-
-#endif // C_LOCSETTINGSUIENGINE_H_
-
--- a/locationsystemui/locationsysui/locsysuiview/inc/locsettingsuiobserver.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,48 +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:  Observer SettingsUI interface class. Provides callback to notify
-*				 the termination of the Settings UI application
-*
-*/
-
-
-#ifndef M_LOCSETTINGSUIOBSERVER_H_
-#define M_LOCSETTINGSUIOBSERVER_H_
-
-// System Include 
-#include <e32base.h>
-
-// Class Definition
-/**
- * Observer class that provides notification from the Settings UI.
- *
- * @lib locsysuiengine.lib
- * @since S60 v3.1
- */
-class MLocSettingsUiObserver
-	{
-	public:
-        /**
-         * Notifies the termination of the Settings UI
-         *
-         * @since S60 3.1
-         * @param aErrorCode The termination reason. KErrNone for normal 
-         *					 terminations. In case of error or pre-mature
-         *					 aborting System wide Error codes.
-         */
-        virtual void SettingClosed( TInt aErrorCode )	= 0;
-	};
-
-#endif //M_LOCSETTINGSUIOBSERVER_H_
-
--- a/locationsystemui/locationsysui/locsysuiview/inc/locsettingsuiparams.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,115 +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:  Input Parameters to the Settings UI.
-*
-*/
-
-
-#ifndef C_LOCSETTINGSUIPARAMS_H_
-#define C_LOCSETTINGSUIPARAMS_H_
-
-// System Include
-#include <e32base.h>
-
-// Forward Declarations
-class MLocSettingsUiObserver;
-class CAknViewAppUi;
-
-// Class Defintions
-
-/**
-* Input Parameters to the Settings UI. 
-* 
-* The parameters are passed through the E-Comm frameworks Create function. 
-* The E-Comm framework is not expected to understand the parameters, it 
-* passes on the same to the creation funtion of the actual implementation.
-* The ownership of the object is vested with the class that calls the 
-* creation function
-*
-* @lib locsysuiview.lib
-* @since S60 v3.1
-*/
-class CLocSettingsUiParams : public CBase
-	{				   
-	public:
-        /**
-         * Creates the Settings Parameters. 
-         *
-         * @param aObserver			  Settings UI Observer 	
-         * @param aAppUi			  Pointer to the Application UI class that 
-         *							  launched the Settings Application
-         */
-        inline static CLocSettingsUiParams* NewL( MLocSettingsUiObserver&	aObserver,
-        							 		      CAknViewAppUi&			aAppUi );
-        /**
-         * Creates the Settings Parameters. 
-         *
-         * @param aObserver			  Settings UI Observer 	
-         * @param aAppUi			  Pointer to the Application UI class that 
-         *							  launched the Settings Application
-         */
-        inline static CLocSettingsUiParams* NewLC( MLocSettingsUiObserver&	aObserver,
-        							  		       CAknViewAppUi&			aAppUi );
-
-        /**
-         * Destructor
-         */
-        inline virtual ~CLocSettingsUiParams();
-        
-        /**
-         * SettingsUIObserver Accessor function
-         *
-         * @return MLocSettingsUiObserver&	Reference to the Settings UI Observer
-         */
-        inline MLocSettingsUiObserver&	SettingsUiObserver();
-
-        /**
-         * CAknViewAppUi Accessor function
-         *
-         * @return CAknViewAppUi&	Reference to the AppUi Object
-         */
-        inline CAknViewAppUi&	AppUi();
-
-	private:
-	    /** 
-         * Overloaded Constructor
-         *
-         * @param aObserver		  Settings UI Observer 	
-         * @param aAppUi			  Pointer to the Application UI class that 
-         *					      launched the Settings Application
-         */
-        inline CLocSettingsUiParams( MLocSettingsUiObserver&	aObserver,
-        			    	         CAknViewAppUi&		        aAppUi );
-        			    	         
-        /**
-         * Second Phase construction
-         */
-        inline void ConstructL();
-
-	private:
-	    /**
-         * Observer for the Settings UI Class
-         */	 
-		MLocSettingsUiObserver&		iSettingsUiObserver;
-		
-		/**
-         * Reference to the Application Ui to which the Settings UI would belong to
-         */
-		CAknViewAppUi&				iAppUi;
-	};
-
-#include "locsettingsuiparams.inl"
-
-#endif // C_LOCSETTINGSUIPARAMS_H_
- 
--- a/locationsystemui/locationsysui/locsysuiview/inc/locsettingsuiparams.inl	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,112 +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:  Inline functions for CLocSettingsUiParams
-*
-*/
-
-
-// System Include 
-#include <aknViewAppUi.h>
-
-// User Includes
-#include "locsettingsuiobserver.h"
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// CLocSettingsUiParams::CLocSettingsUiParams
-// C++ default constructor can NOT contain any code, that
-// might leave.
-// -----------------------------------------------------------------------------
-//
-inline CLocSettingsUiParams::CLocSettingsUiParams( MLocSettingsUiObserver&	aSettingsUiObserver,
-					 			 			       CAknViewAppUi&			aAppUi )
-    :iSettingsUiObserver( aSettingsUiObserver ),
-     iAppUi( aAppUi )
-    {
-    }
-
-// -----------------------------------------------------------------------------
-// CLocSettingsUiParams::~CLocSettingsUiParams
-// Destructor.
-// -----------------------------------------------------------------------------
-//
-inline CLocSettingsUiParams::~CLocSettingsUiParams()
-    {
-    }
-
-// -----------------------------------------------------------------------------
-// CLocSettingsUiParams* CLocSettingsUiParams::NewL
-// Two-phased constructor.
-// -----------------------------------------------------------------------------
-//
-inline CLocSettingsUiParams* CLocSettingsUiParams::NewL( MLocSettingsUiObserver& aObserver,
-									 	 		         CAknViewAppUi&		     aAppUi )
-    {
-   	CLocSettingsUiParams* self = new(ELeave) CLocSettingsUiParams( aObserver,
-    													 	       aAppUi );
-	CleanupStack::PushL(self);
-	self->ConstructL();
-	CleanupStack::Pop(self);
-	return self;
-    }
-  
-// -----------------------------------------------------------------------------
-// CLocSettingsUiParams* CLocSettingsUiParams::NewLC
-// Two-phased constructor.
-// -----------------------------------------------------------------------------
-//
-inline CLocSettingsUiParams* CLocSettingsUiParams::NewLC( MLocSettingsUiObserver&	aObserver,
-									 	 			      CAknViewAppUi&			aAppUi )
-    {
-   	CLocSettingsUiParams* self = new(ELeave) CLocSettingsUiParams( aObserver,
-    													 	       aAppUi );
-	CleanupStack::PushL(self);
-	self->ConstructL();
-	return self;
-    }
-
-// -----------------------------------------------------------------------------
-// void CLocSettingsUiParams::ConstructL
-// Second phase of Construction
-// -----------------------------------------------------------------------------
-//
-inline void CLocSettingsUiParams::ConstructL()
-	{
-	}
-		       
-// -----------------------------------------------------------------------------
-// SettingsUIObserver Accessor function
-//
-// @return MSettingsUIObserver&	Reference to the Settings UI Observer
-// -----------------------------------------------------------------------------
-//
- inline MLocSettingsUiObserver& CLocSettingsUiParams::SettingsUiObserver()
- 	{
- 	return iSettingsUiObserver;
- 	}
-
-// -----------------------------------------------------------------------------
-// CAknViewAppUi Accessor function
-//
-// @return CAknViewAppUi&	Reference to the AppUi Object
-// -----------------------------------------------------------------------------
-//
- inline CAknViewAppUi&	CLocSettingsUiParams::AppUi()
- 	{
- 	return iAppUi;
- 	}
-		 
-// End of File
-
--- a/locationsystemui/locationsysui/locsysuiview/inc/locsettingsuipluginloader.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,165 +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:  Manages the E-Comm Plugin handling for the Settings UI.
-*
-*/
-
-#ifndef C_LOCSETTINGSUIPLUGINLOADER_H_
-#define C_LOCSETTINGSUIPLUGINLOADER_H_
-
-// System Include
-#include <e32base.h>
-#include <ecom/ecom.h>
-
-// Forward Declarations
-class CLocationSettings;
-class CAknViewAppUi;
-class MLocSettingsUiEcomNotifer;
-
-// Class Declarations 
-
-/**
- * Plugin loader class. 
- * Loads all the Settings related ECom plugins and also registers itself for 
- * notfication from the ECOM server. It takes up complete onus of the creation
- * of the CSettingsUi objects.
- *
- * @lib locsysuiview.lib
- * @since S60 v3.2
- */
- NONSHARABLE_CLASS( CLocSettingsUiPluginLoader ) : public CActive
-	{
-	private:
-		/** 
-		 * Overloaded Constructor 
-		 *
-		 * @param aAppUi    App UI Reference
-		 */
-	 	CLocSettingsUiPluginLoader( CAknViewAppUi&	aAppUi );
-	public:
-		/**
-		 * Creates an instance of the Settings UI Plug-in Loader.
-		 *
-		 * @param  aObserver				    Observer to the CLocSettingsUiPluginLoader
-		 *									    class
-		 * @param  aAppUi					    App Ui Reference
-		 * @return CLocSettingsUiPluginLoader*	Reference to the instantiated class 
-		 */
-		static CLocSettingsUiPluginLoader* NewL( CAknViewAppUi&	    aAppUi );
-
-        /**
-         * Creates an instance of the Settings UI Plug-in Loader.
-         *
-         * @param  aObserver				Observer to the CLocSettingsUiPluginLoader
-         *									class
-         * @param  aAppUi					App Ui Reference
-         * @return CLocSettingsUiPluginLoader*	Reference to the instantiated class 
-         */
-        static CLocSettingsUiPluginLoader* NewLC( CAknViewAppUi&    aAppUi );
-        						
-        /**
-         * Destructor 
-         */
-        virtual ~CLocSettingsUiPluginLoader();
-
-        /** 
-         * Creates all the settings UI currently available in the system. The 
-         * user if this interface should ensure that he passes an empty
-         * Settings Array structure.
-         *
-         * @param aDescArray 		 Array of Settings UI.
-         */
-        void CreateAvailableSettingsUisL( 
-                        RPointerArray<CLocationSettings>&    aSettingsArray );
-        							   
-        /**
-         * Creates the Settings UI and the corresponding description entry. This
-         * function creates a new Setting UI ECOM plug-in and a Location Settings
-         * object. the created object is appended to the existing list and a reference to
-         * it returned. The ownership of the created Settings object is retained with
-         * the Settings array. This function assumes that the object doesnt already exists
-         *
-         * @param aImplementationUid The Implementation UID of the plug-in that
-         *                           has to be created
-         * @param aSettingsArray	 Array of Settings UIs
-         * @return CLocationSettings& Reference to the created object. The ownership is not
-         *                            by the return value.
-         */
-        CLocationSettings& CreateSettingsUiL( 
-                                TUid                                 aImplementationUid,
-                                RPointerArray<CLocationSettings>&    aSettingsArray );
-        /** 
-         * Updates the Settings UI list and the description structures. The new
-         * additions are appened in-order. The interface does not
-         * delete any instances if they are not in the current implementation 
-         * list
-         *
-         * @param aSettingsArray     Array of Settings UIs.
-         */
-        void UpdateAvailableSettingsUisL( 
-                        RPointerArray<CLocationSettings>&    aSettingsArray );
-
-        /**
-         * Initiates a notify request on the ECom Session
-         *
-         * @param aSettingsNotifer  Notifier for communication of changes in the 
-         *                          Ecom loading and unloading for sub-settings
-         *                          plug-ins. The default value is used if the
-         *                          caller of this API intends to obtain a 
-         *                          notification on the previously set observer.        
-         */ 
-        void StartEComNotifyL( MLocSettingsUiEcomNotifer*   aNotifier = NULL );
-        
-        /**
-         * Stop the outstanding EComNotification
-         */
-        void StopEComNotify();
-        
-	protected:
-        /** 
-         * Inherited from CActive 
-         */
-        void RunL();
-
-        /** 
-         * Inherited from CActive 
-         */
-        void DoCancel();
-
-        /** 
-         * Inherited from CActive 
-         */
-        TInt RunError( TInt aError );
-
-	private:		
-		/**
-         * Reference to the Application Ui to which all the Settings UI would
-         * belong to
-         */
-		CAknViewAppUi&					    iAppUi;
-		
-		/**
-		 * Handle to the ECom Session
-		 */
-		REComSession*					    iSession;
-		
-		/**
-		 * ECom notifier
-		 */
-		MLocSettingsUiEcomNotifer*          iNotifier;
-		
-	};
-
-#endif // C_LOCSETTINGSUIPLUGINLOADER_H_
-
--- a/locationsystemui/locationsysui/locsysuiview/inc/locsysuicontainer.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,221 +0,0 @@
-/*
-* Copyright (c) 2005-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:  Location System Ui Plugin View's container
-*
-*/
-
-
-#ifndef C_LOCSYSUICONTAINER_H_
-#define C_LOCSYSUICONTAINER_H_
-
-// System Includes 
-#include <e32base.h>
-#include <coecntrl.h>
-#include <eiklbo.h>
-
-
-// Forward Declarations
-class CAknSettingStyleListBox;
-class CLocSysUiView;
-class CLocSysUiLBModel;
-class CEikStatusPane;
-class MLocSysUiContainerEventHandler;
-class CLocationSettings;
-
-// Class Declarations
-/**
- * Container for the LocationSystemUiView. Contains the Listbox control that is used to 
- * display the various sub-views that are available. The List box takes a model
- * from the view which it inturn uses as a list box model
- *
- * @lib locsysuiview.lib
- * @since S60 v3.1
- */
- NONSHARABLE_CLASS( CLocSysUiContainer ): public CCoeControl, 
-						                  public MEikListBoxObserver
-	{
-    private:
-        
-        	
-	public:
-        /**
-         * Destructor
-         */
-        virtual ~CLocSysUiContainer();
-
-		/**
-         * Static Two phase contructor that instantiates the 
-         * CLocationSystemUiUIContainer
-         * 
-         * @param aEventHandler		 Reference to the Container's event handler
-         * @param aSettingsArray	 Reference to the Settings UI array.
-         * @param aRect				 Client rectangle.
-         * @return CLocSysUiContainer*	Reference to the object created.
-         */
-        static CLocSysUiContainer* NewL( 
-        		MLocSysUiContainerEventHandler&	    aEventHandler,
-        		RPointerArray<CLocationSettings>&   aSettingsArray,
-        		const TRect& 					    aRect );
-
-        /**
-         * Static Two phase contructor that instantiates the 
-         * CLocationSystemUiUIContainer. Leaves the object on the Cleanup stack
-         * 
-         * @param aEventHandler		 Reference to the Container's event handler
-         * @param aSettingsArray	 Reference to the Settings UI array.
-         * @param aRect				 Client rectangle.
-         * @return CLocSysUiContainer*	Reference to the object created.
-         */
-        static CLocSysUiContainer* NewLC( 
-        		MLocSysUiContainerEventHandler&	    aEventHandler,
-        		RPointerArray<CLocationSettings>&   aSettingsArray,
-        		const TRect& 					    aRect );
-
-        /**
-         * Returns the Settings Ui item that is currently focussed.
-         *
-         * @return	CLocationSettings& Referrence to the Settings UI corresponding
-         *							   to the index.
-         */
-        CLocationSettings&	GetFocussedSettingsUiL();
-
-        /**
-         * Calls upon the container to update the list bix contents.
-         *
-         * @param aSettingsArray Reference to the Settings UI array.
-         */
-        void UpdateListBoxL(RPointerArray<CLocationSettings>&	aSettingsArray);
-        
-        /**
-         * Returns the currently focussed element index
-         *
-         * @return TUint    Currently focussed element index    
-         */
-        TUint CurrentFocussedElement();
-        
-        /**
-         * Sets the current highlighted element
-         *
-         * @param aCurrentElement    Currently focussed element index    
-         */
-        void SetFocussedElement( TUint      aCurrentElement );
-        
-    public:
-        /**
-         * Inherited from CCoeControl
-         */
-        TKeyResponse OfferKeyEventL( const TKeyEvent& aKeyEvent,
-        						           TEventCode aType );
-        							    
-        /**
-         * Inherited from CCoeControl
-         */
-        void HandleResourceChange(TInt aType);
-
-        /**
-         * From CoeControl
-         */
-        TInt CountComponentControls() const;
-
-        /**
-         * From CCoeControl
-         */
-        CCoeControl* ComponentControl(TInt aIndex) const;
-
-        /**
-         * From CCoeControl
-         */
-        void GetHelpContext( TCoeHelpContext& aContext ) const;
-    
-    public:
-        /**
-         * Inherited from MEikListBoxObserver
-         */
-        void HandleListBoxEventL( CEikListBox*      aListBox, 
-        					      TListBoxEvent     aEventType );
-        					      
-	protected:
-        /**
-         * Handles Focus Change to list 
-         */
-        void FocusChanged(TDrawNow aDrawNow);
-
-        /**
-         * From CoeControl,SizeChanged.
-         */
-        void SizeChanged();
-
-	private:
-	    /**
-         * Overloaded Constructor
-         *
-         * @param aEventHandler		Reference to the Container's event handler
-         */
-        CLocSysUiContainer( MLocSysUiContainerEventHandler&	aEventHandler );
-        
-        /**
-         * Second phase of the two phase Construction process
-         *
-         * @param aSettingsArray    Reference to the Settings UI array.
-         * @param aRect				Client rectangle
-         */
-        void ConstructL( RPointerArray<CLocationSettings>&  aSettingsArray,
-        			     const TRect& 						aRect );
-
-        /** 
-         * Creates the List box and the Listbox model. Associates the 
-         * list box model wit the list box
-         *
-         * @param aSettingsArray	 Reference to the Settings UI array.
-         */
-        void CreateListboxL( RPointerArray<CLocationSettings>&  aSettingsArray );
-
-        /**
-         * Returns the Appui's status pane
-         * @return CEikStatusPane* Statuspane pointer
-         */
-        CEikStatusPane* StatusPane();
-
-        /**
-         * Sets the Title text
-         * @param aResourceText Resource to create title
-         */
-        void MakeTitleL( TInt aResourceText );
-
-	private:
-	    /**
-	     * Reference to the Container's event handler
-	     */
-		MLocSysUiContainerEventHandler&		iEventHandler;
-       
-        /**
-         * Help Context Name
-         */ 
-        TCoeContextName 					iContextName;
-        
-		/**
-		 * List box Model
-		 * Owns
-		 */
-		CLocSysUiLBModel*			iListBoxModel;
-		
-		/**
-		 * List box component control
-		 * Owns
-		 */
-		CAknSettingStyleListBox*			iListBox;
-	};
-
-#endif // C_LOCSYSUICONTAINER_H_
-
--- a/locationsystemui/locationsysui/locsysuiview/inc/locsysuicontainereventhandler.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,48 +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:  Handles Events from the container 
-*
-*/
-
-
-#ifndef M_LOCSYSUICONTAINEREVENTHANDLER_H_
-#define M_LOCSYSUICONTAINEREVENTHANDLER_H_
-
-// System Include
-#include <e32base.h>
-
-/**
- * Handles events from the Location System UI Container
- *
- * @lib locsysuiview.lib
- * @since S60 v3.1
- */
-class MLocSysUiContainerEventHandler
-	{
-	public:
-		/**
-		 * Handles the Item selection event from the container
-		 * @since S60 v3.1
-		 */
-	 	 virtual void ListBoxItemSelectedL() 	= 0;
-	 	 
-	 	/**
-		 * Handles the Screen Size update
-		 * @since S60 v3.1
-		 */
-		 virtual void HandleScreenSizeChange() 	= 0; 
-	};
-
-#endif // M_LOCSYSUICONTAINEREVENTHANDLER_H_
-
--- a/locationsystemui/locationsysui/locsysuiview/inc/locsysuilbmodel.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,105 +0,0 @@
-/*
-* Copyright (c) 2005-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:  List box for the Location Setting View
-*
-*/
-
-#ifndef C_LOCSYSUILBMODEL_H_
-#define C_LOCSYSUILBMODEL_H_
-
-// System Include
-#include <e32base.h>
-#include <bamdesca.h>  // MDesCArray
-
-// Forward Declarations 
-class CLocationSettings;
-
-// Class Declaration
-/**
- * Model for the Settings UI view container. Takes a Settings Description array
- * and creates a sorted array from it. 
- *
- * @lib locsysuiview.lib
- * @since S60 v3.1
- */
- NONSHARABLE_CLASS( CLocSysUiLBModel ): public CBase,
-						                public MDesCArray
-	{
-	public:
-        /**
-         * Two-phased constructor
-         * @param aSettingsArray	    Reference to the Settings UI array.
-         * @return CLocSysUiLBModel*    Reference to the object created.
-         */
-        static CLocSysUiLBModel* NewL(
-        				RPointerArray<CLocationSettings>& aSettingsArray );
-
-        /**
-        * Destructor.
-        */
-        virtual ~CLocSysUiLBModel();
-
-        /**
-         * Returns the Settings UI pertaining to a particular index value.
-         *
-         * @param	aIndex			   Index of the Settings Ui.
-         * @return	CLocationSettings& Referrence to the Settings UI corresponding
-         *							   to the index.
-         */
-        CLocationSettings&	SettingsUiL( TInt	aIndex );
-
-        /**
-         * Updates the List box contents
-         *
-         * @param aSettingsArray	Reference to the Settings UI array.
-         */
-        void UpdateListBoxContentsL( RPointerArray<CLocationSettings>& aSettingsArray );
-
-    protected:
-        /**
-         * Inherited from MDesCArray
-         */
-        TInt MdcaCount() const;
-
-        /**
-         * Inherited from MDesCArray
-         */
-        TPtrC16 MdcaPoint( TInt aIndex ) const;
-        
-    private:
-        /**
-         * C++ constructor.
-         */
-        CLocSysUiLBModel( RPointerArray<CLocationSettings>& aSettingsArray );
-        
-        /**
-         * Second Phase constructor
-         */
-        void ConstructL();
-
-    private:
-        /**
-         * Reference to the array of Settings UI.
-         */
-		RPointerArray<CLocationSettings>& iSettingsArray;
-
-        /**
-         * Format conversion buffer
-         * Owns
-         */
-        HBufC* iBuffer;
-	};
-
-#endif // C_LOCSYSUILBMODEL_H_
-
--- a/locationsystemui/locationsysui/locsysuiview/inc/locsysuiview.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,297 +0,0 @@
-/*
-* Copyright (c) 2005-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: This  is a header file for view class of Location settings Ui
-*
-*/
-
-#ifndef C_LOCSYSUIVIEW_H_
-#define C_LOCSYSUIVIEW_H_
-
-//  System Includes
-#include <e32base.h>
-#include <aknview.h>
-#include <eikclb.h>
-#include <ConeResLoader.h>
-#include <gsplugininterface.h>
-
-// User Includes
-#include "locsysuiviewuid.hrh"
-#include "locsysuicontainereventhandler.h"
-#include "locationui.h"
-#include "locsettingsuiecomnotifier.h"
-
-// Forward Declarations
-class CGulIcon;
-class CLocSysUiContainer;
-class CLocSettingsUiEngine;
-
-// Global Constant Declarations
-
-/** 
- * Plug-In Impletation and View ID 
- */
-const TUid KLocSysUiViewPluginUid = { LOCSYSUIVIEW_UID3 };
-
-/**
- * Name of the Plug-in resource file
- */
-_LIT( KLocSysUiViewResFileName, "locsysuiviewrsc.rsc" );
-
-// Class Declaration
-
-/**
-* Location System UI plugin. Extends the CGSPluginInterface to implement the 
-* Location Specific Settings. 
-*
-* @lib locsysuiview.lib
-* @since S60 v3.1  
-*/
-class CLocSysUiView : public CGSPluginInterface,
-					  public MLocationUIObserver,
-					  public MLocSettingsUiEcomNotifer,
-					  public MLocSysUiContainerEventHandler 
-	{        	
-	public:
-        /**
-         * Destructor
-         */
-        virtual ~CLocSysUiView();
-        
-        /**
-         * Creates new Location Sys Ui plugin.
-         *
-         * @return CLocSysUiView*	Reference to the application view
-         */                                                 
-        IMPORT_C static CLocSysUiView* NewL();
-
-        /**
-         * Creates new Location Sys Ui plugin. Leaves the object on the 
-         * Clean up stack
-         *
-         * @return CLocSysUiView*	Reference to the application view
-         */                                                 
-        static CLocSysUiView* NewLC();
-
-        /**
-         * Sets the flag that the view has been launched from Positioning
-         * Settings Application. This is necessary to variate the CBA for
-         * stand-alone launches.
-         */
-        IMPORT_C void LaunchedfromPosSettingsApp();
-        
-        /**
-         * Handles any change in the client rectangle
-         */
-        void HandleClientRectChange();
-
-        /**
-         * Open Postioning View. 
-         * Opens the Postioning View in the default mode.
-         */
-        void ActivateViewL();
-        
-        /**
-         * Closes the Positioning View and all the associated sub-settings
-         * views
-         */
-        void DeActivateView();
-       
-        /**
-         * Sets an External Observer for notification about the termination
-         * of Postioning Setting UI.
-         *
-         * @param aObserver Observer to Postioning Settings UI.
-         */
-        void SetObserver( MLocationUIObserver*       aObserver );
-         
-    public:
-        /**
-         * From CAknView. 
-         */
-        void DoActivateL( const TVwsViewId&  aPrevViewId,
-        					    TUid		 aCustomMessageId,
-        			      const TDesC8&	     aCustomMessage );
-
-        /**
-         * From CAknView. 
-         */
-        void DoDeactivate();
-
-        /**
-         * From CAknView. Returns the View Id. Should be chosen to reflect 
-         * the Implementation UID of the Plugin
-         */
-        TUid Id() const;
-
-        /**
-         * From CAknView. 
-         */
-        void HandleCommandL(TInt aCommand);
-    
-    public:
-        /**
-         * From MEikMenuObserver
-         */
-        void DynInitMenuPaneL( TInt aResourceId, CEikMenuPane* aMenuPane );
-           
-    public: 
-        /**
-         * Inherited from CGSPluginInterface. 
-         * Method for getting caption of this plugin. This should be the 
-         * localized name of the settings view to be shown in parent view.
-         *
-         * @param aCaption pointer to Caption variable
-         */
-        void GetCaptionL( TDes& aCaption ) const;
-
-        /**
-         * Inherited from CGSPluginInterface.
-         * Creates a new icon of desired type. Ownership of the created icon 
-         * is transferred to the caller.
-         *
-         * Icon type UIDs (use these defined constants):
-         * KGSIconTypeLbxItem  -   ListBox item icon.
-         * KGSIconTypeTab      -   Tab icon.
-         * 
-         * @param aIconType UID Icon type UID of the icon to be created.
-         * @return CGulIcon* Pointer of the icon. NOTE: Ownership of this
-         *					icon is transferred to the caller.
-         */
-        CGulIcon* CreateIconL( const TUid aIconType );
-
-        /**
-         * Inherited from CGSPluginInterface
-         * Method for reading the ID of the plugin provider category. 
-         *
-         * @return Plugin provider category ID defined by 
-         *         TGSPluginProviderCategory
-         */
-        TInt PluginProviderCategory() const;
-
-    public: // Inherited from MLocationUIObserver
-        /**
-         * Inherited from MLocationUIObserver
-         * Notifies the termination of the Settings UI
-         *
-         * @param aErrorCode The termination reason. KErrNone for normal 
-         *					terminations. In case of error or pre-mature
-         *					aborting System wide Error codes.
-         */
-        void LocationUIDismissed( TInt aErrorCode );
-
-    public: // Inherited from MLocSettingsUiEcomNotifer
-        /** 
-         * Inherited from MLocSettingsUiEcomNotifer
-         * Notifies any change in the state of the underlying Settings UI
-         * session
-         *
-         * @param aErrorCode Error Code denoting the state change
-         */
-        void EComSessionStateChanged( TInt aErrorCode );
-    
-    public:
-        /**
-         * Handles the Item selection event from the container.
-         * Inherited from MLocSysUiContainerEventHandler
-         */
-        void ListBoxItemSelectedL();
-
-        /**
-         * Handles the Screen Size update
-         * Inherited from MLocSysUiContainerEventHandler
-         */
-        void HandleScreenSizeChange();
-               
-	private:
-        /**
-         * Constructor
-         */
-        CLocSysUiView();
-        
-        /**
-         * Second Phase Constructor
-         */
-        void ConstructL();
-
-        /**
-         * Opens the nearest localized resourcefile using aResourceLoader. 
-         * aResourceLoader should be opened only once before closing it. 
-         * Otherwise it will raise a panic. Therefore it is better to have 
-         * multiple resource loaders.
-         * 
-         * @param aResourceFileName Drive and name of resource file in format 
-         *                          <path>:<rsc_file_name>
-         * @param aResourceLoader Resource loader for the resource. The loader 
-         *                        must not be opened allready or it will raise 
-         *                        a panic. It is caller's responsibility to 
-         *                        close the resource loader after using the 
-         *                        resource.
-         */
-        void OpenLocalizedResourceFileL( const TDesC& 				aResourceFileName, 
-        								       RConeResourceLoader& aResourceLoader );
-	    /**
-         * Shows or dims help option, depending wheather help feature
-         * is supported or not.
-         * @param aMenuPane
-         */
-        void HandleHelpFeature( CEikMenuPane& aMenuPane ) const;
-        	 
-	private:
-	    /**
-	     * View of the View that was active before this view was launched
-	     */
-		TVwsViewId 						iPrevViewId;
-		
-	    /**
-	     * Resource Loader
-	     */
-		RConeResourceLoader 			iResourceLoader;
-		
-	    /**
-	     * Reference to the Location System UI Engine
-	     * Owns
-	     */
-		CLocSettingsUiEngine*		    iEngine;
-		
-	    /**
-	     * Reference to the Location System UI Container
-	     * Owns
-	     */
-		CLocSysUiContainer*		        iContainer;
-		
-	    /**
-	     * Boolean flag to denote that a UI is waiting for its dismissal
-	     */
-		TBool							iSettingsUiDismissalPending;
-		
-		/**
-		 * Current Highlighted item index. Used to refresh the list box when 
-		 * we return from the Settings UIs
-		 */
-		TUint                           iHighlightedIndex;
-		 
-        /**
-         * Postioning Settings Observer.
-         */
-        MLocationUIObserver*            iObserver;		 
-        
-        /**
-         * Boolean flag to denote whether the view is launched from
-         * Positioning Settings Application
-         */
-        TBool                           isLaunchedFromPosSettingsApp;
-	};
-
-#endif // C_LOCSYSUIVIEW_H_
-
--- a/locationsystemui/locationsysui/locsysuiview/inc/locsysuiview.hrh	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +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:  Contains declarations for constants of location.
-*                This file can be included in C++ or resource file.
-*
-*/
-
-#ifndef LOCATIONSYSTEMUIVIEW_HRH_
-#define LOCATIONSYSTEMUIVIEW_HRH_
-
-/**
- * Enumeration for command Ids. Used in the Menu pane
- */ 
-enum TLocationCommandIds
-    {
-	ELocSysUiCmdOpen = 0x06000,
-    ELocCmdNone
-    };
-
-#endif      // LOCATIONSYSTEMUIVIEW_HRH_
-
-// End of File
--- a/locationsystemui/locationsysui/locsysuiview/inc/locsysuiviewuid.hrh	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,38 +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:  Contains the UID3 value to be used for the Location System UI
-*				 view. The value is expected to have three specific functions
-*				 1. UID3 for the LocationSystemUiView.dll ECOM DLL
-*				 2. Implementation UID for the ECOM plugin to GS
-*				 3. CLocationSystemUiView View ID. Returned by the ID function
-*
-*/
-
-#ifndef LOCATIONSYSUIVIEWUID_HRH_
-#define LOCATIONSYSUIVIEWUID_HRH_
-
-/**
- * Location System UI View UID3
- * The value is expected to have three specific functions				 
- *          1. UID3 for the LocationSystemUiView.dll ECOM DLL
- *			2. Implementation UID for the ECOM plugin to GS
- *			3. CLocationSystemUiView View ID. Returned by the ID function
- */  
-#define LOCSYSUIVIEW_UID3          0x10207462
-
-#endif      // LOCATIONSYSUIVIEWUID_HRH_
-
-// End of File
-
-
--- a/locationsystemui/locationsysui/locsysuiview/src/locationsettings.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,231 +0,0 @@
-/*
-* Copyright (c) 2006-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:  Location Settings implementation of Location UIs. This class
-*                extends the Location UI interface for Location sub-settings
-*                plug-ins.
-*
-*/
-
-
-// System Include
-#include <aknViewAppUi.h>
-
-// User Include
-#include "locationsettings.h"
-#include "locsettingsui.h"
-#include "locsettingsuiparams.h"
-
-// Constant
-const TInt KMaxSettingsUiCaptionSize = 0x100;
-
-// ========================= MEMBER FUNCTIONS ================================
-
-// ---------------------------------------------------------------------------
-// CLocationSettings::CLocationSettings
-// Overloaded Constructor
-//
-// ---------------------------------------------------------------------------
-//
-CLocationSettings::CLocationSettings( const TUid	     aImplementationId )
-	:iImplementationId( aImplementationId )
-	{		
-	}
-
-// ---------------------------------------------------------------------------
-// CLocationSettings::~CLocationSettings
-// Destructor
-//
-// ---------------------------------------------------------------------------
-//
-CLocationSettings::~CLocationSettings()
-	{
-	// Delete the caption string	
-	delete iCaption;
-	
-	// Delete the contained Settings UI pointer
-	delete iLocationSettings;
-	}	
-					 
-// ---------------------------------------------------------------------------
-// CLocationSettings* CLocationSettings::NewL
-// Two Phase Constructor.
-//
-// @param   aImplementationId   Implementation UID of the settings plug-in.
-// @param   aAppUi              Application's AppUi reference.
-// @return	CLocationSettings*	Pointer to the created object
-// ---------------------------------------------------------------------------  
-//
-CLocationSettings* CLocationSettings::NewL( const TUid	     aImplementationId,
-                                            CAknViewAppUi&	aAppUi )
-	{
-    CLocationSettings* self = CLocationSettings::NewLC( aImplementationId,
-                                                        aAppUi );
-	CleanupStack::Pop( self );
-	return self;
-	}
-	
-// ---------------------------------------------------------------------------
-// CLocationSettings* CLocationSettings::NewLC
-// Two Phase Constructor.
-//
-// @param   aImplementationId   Implementation UID of the settings plug-in.
-// @param   aAppUi              Application's AppUi reference.
-// @return	CLocationSettings*	Pointer to the created object
-// ---------------------------------------------------------------------------  
-//
-CLocationSettings* CLocationSettings::NewLC( const TUid	     aImplementationId,
-                                             CAknViewAppUi&	 aAppUi )
-	{
-    CLocationSettings* self = new(ELeave) CLocationSettings( aImplementationId );
-	CleanupStack::PushL( self );
-	self->ConstructL( aAppUi );
-	return self;
-	}
-
-// ---------------------------------------------------------------------------
-// void CLocationSettings::ConstructL
-// Second Phase of the two phase constructor.
-// ---------------------------------------------------------------------------
-//									 
-void CLocationSettings::ConstructL( CAknViewAppUi&	 aAppUi )
-	{
-	// Create the Location Settings ECom plug-in
-    CLocSettingsUiParams* param = CLocSettingsUiParams::NewLC( *this,
-                                                               aAppUi );
-                                                               
-    iLocationSettings = CLocSettingsUi::NewL( iImplementationId, *param );
-    
-    // Pop and destroy the Settings parameter
-    CleanupStack::PopAndDestroy( param );
-                                                                   
-	// Allocate the buffer for the Caption string and copy the caption from
-	// the plug-in
-	iCaption = HBufC::NewMaxL( KMaxSettingsUiCaptionSize );
-	TPtr  captionPtr = iCaption->Des();
-	iLocationSettings->GetCaptionL( captionPtr );
-		
-	}
-	
-// ---------------------------------------------------------------------------
-// const TPtrC CLocationSettings::Caption
-// Accessor Function for the Setings UI Caption
-//
-// @return const TPtrC Caption String
-// ---------------------------------------------------------------------------
-//
-TPtrC CLocationSettings::Caption()
-	{
-	return iCaption->Des();
-	}
-
-// ---------------------------------------------------------------------------
-// const TInt CLocationSettings::Priority()
-// Returns the priority of the UI module. 
-//
-// @return const TInt Priority of the Settings UI
-// ---------------------------------------------------------------------------
-//
-TInt CLocationSettings::Priority()	
-	{
-	return iLocationSettings->GetPriority();	
-	}
-
-// ---------------------------------------------------------------------------
-// const TUid CLocationSettings::ImplementationUid()
-// Accessor Function for the Setings UI Implementation UID
-//
-// @return const TUid Settings UI Plug In's implementation UID
-// ---------------------------------------------------------------------------
-//
-const TUid CLocationSettings::ImplementationUid()
-	{
-	return iImplementationId;	
-	}
-		
-// ---------------------------------------------------------------------------
-// void CLocationSettings::LaunchLocationUIL
-// Launches a Location UI component.
-//
-// @param aUiInputParams Flags that define specific configuration of the
-//                       Location UI, that the user of the API wants to
-//                       launch. If more than one functionality is
-//                       requested then the various combinations are to be
-//                       ORed. The interpretation of these flag values is
-//                       a part of the understanding between the API user
-//                       and the corresponding Location UI.
-// @param aObserver      Observer where the termination of the Launch call
-//                       needs to be notified.
-// ---------------------------------------------------------------------------
-//                                       
-void CLocationSettings::LaunchLocationUIL( TInt		            aUiInputParams,
-                                           MLocationUIObserver* aObserver )
-    {
-    // Set the Observer for the launch call
-    iObserver = aObserver;
-    
-    // Launch the sub-settings UI
-    iLocationSettings->LaunchL( aUiInputParams );
-    }
-		
-// ---------------------------------------------------------------------------
-// void CLocationSettings::LaunchLocationUIL
-// Launches a Location UI component.
-//
-// @param aUiInputParams String passed as a parameter to the
-//                       Location UI, that the user of the API wants to
-//                       launch. The interpretation of this string is
-//                       a part of the understanding between the API user
-//                       and the corresponding Location UI.
-// @param aObserver      Observer where the termination of the Launch call
-//                       needs to be notified.
-// ---------------------------------------------------------------------------
-//                                       
-void CLocationSettings::LaunchLocationUIL( const TDesC&		            aUiInputParams,
-                                           MLocationUIObserver* aObserver )
-    {
-    // Set the Observer for the launch call
-    iObserver = aObserver;
-    
-    // Launch the sub-settings UI
-    iLocationSettings->LaunchL( aUiInputParams );
-    }
-    
-// ---------------------------------------------------------------------------
-// void CLocationSettings::Close
-// Closes the running Location UI prematurely.
-// ---------------------------------------------------------------------------
-//
-void CLocationSettings::Close()
-    {
-    // Closes the Location sub-settings
-    iLocationSettings->Close();
-    }
-
-// ---------------------------------------------------------------------------	
-// void CLocationSettings::SettingClosed
-// Inherited from MLocSettingsUiObserver. Notification from the Settings UI
-// to indicate the termination of the Settings UI application
-//
-// @param aErrorCode The termination reason. KErrNone for normal 
-//					 terminations. In case of error or pre-mature aborting
-//					 System wide Error codes.
-// ---------------------------------------------------------------------------
-//
-void CLocationSettings::SettingClosed( TInt  aErrorCode )
-	{
-	if( iObserver )
-	    {
-	    iObserver->LocationUIDismissed( aErrorCode );
-	    }
-	}
--- a/locationsystemui/locationsysui/locsysuiview/src/locpossettings.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,129 +0,0 @@
-/*
-* Copyright (c) 2006-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:  Positioning Settings implementation of Location UIs.
-*
-*/
-
-
-// System Include
-#include <eikenv.h>
-#include <aknViewAppUi.h>
-
-// User Include
-#include "locpossettings.h"
-#include "locsysuiview.h"
-
-// ---------------------------------------------------------------------------
-// CLocPosSettings::CLocPosSettings
-// Overloaded Constructor
-//
-// ---------------------------------------------------------------------------
-//
-CLocPosSettings::CLocPosSettings()
-    {
-    }
-   
-// ---------------------------------------------------------------------------
-// CLocPosSettings::~CLocPosSettings
-// Destructor
-//
-// ---------------------------------------------------------------------------
-//    
-CLocPosSettings::~CLocPosSettings()
-    {
-    }
-
-// ---------------------------------------------------------------------------
-// CLocPosSettings* CLocPosSettings::NewL
-// Two phase constructor
-//
-// ---------------------------------------------------------------------------
-//
-EXPORT_C CLocPosSettings* CLocPosSettings::NewL()
-    {
-    CLocPosSettings* self = CLocPosSettings::NewLC();
-	CleanupStack::Pop( self );
-	return self;
-    }
-           
-// ---------------------------------------------------------------------------
-// CLocPosSettings* CLocPosSettings::NewL
-// Two phase constructor
-//
-// ---------------------------------------------------------------------------
-//         
-EXPORT_C CLocPosSettings* CLocPosSettings::NewLC()
-    {
-    CLocPosSettings* self = new(ELeave) CLocPosSettings();
-	CleanupStack::PushL( self );
-	self->ConstructL();
-	return self;
-    }
-
-// ---------------------------------------------------------------------------
-// void CLocPosSettings::ConstructL
-//
-// ---------------------------------------------------------------------------
-// 
-void CLocPosSettings::ConstructL()
-    {
-    // Create the Positioning Specfic view and set its observer
-    iView = CLocSysUiView::NewL();
-    
-    CEikonEnv* env = CEikonEnv::Static();
-    
-    // Transferring the view's control to AppUi
-    (static_cast<CAknViewAppUi*>( env->EikAppUi()))->AddViewL( iView );    
-    }
-    
-// ---------------------------------------------------------------------------
-// void CLocPosSettings::LaunchLocationUIL
-//
-// ---------------------------------------------------------------------------
-//
-void CLocPosSettings::LaunchLocationUIL( TInt		    /* aUiInputParams */,
-                                         MLocationUIObserver*    aObserver )
-    {
-    // Set the call back observer for this Launch call
-    iView->SetObserver( aObserver );
-    
-    // Activate the Positoning Settings View
-    iView->ActivateViewL();
-    }
-    
-// ---------------------------------------------------------------------------
-// void CLocPosSettings::LaunchLocationUIL
-//
-// ---------------------------------------------------------------------------
-//
-void CLocPosSettings::LaunchLocationUIL( const TDesC&           /* aUiInputParams */,
-                                         MLocationUIObserver*    aObserver )
-    {
-    // Set the call back observer for this Launch call
-    iView->SetObserver( aObserver );
-    
-    // Activate the Positoning Settings View
-    iView->ActivateViewL();
-    }
-    
-// ---------------------------------------------------------------------------
-// void CLocPosSettings::Close
-//
-// ---------------------------------------------------------------------------
-//
-void CLocPosSettings::Close()
-    {
-    // Deactivate the Postioning Settings view.
-    iView->DeActivateView();
-    }
--- a/locationsystemui/locationsysui/locsysuiview/src/locsettingsuiengine.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,262 +0,0 @@
-/*
-* Copyright (c) 2005-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: This defines the engine class for Location settings Ui
-*
-*/
-
-
-// System Include 
-#include <aknViewAppUi.h>
-
-// User Include
-#include "locsettingsuiengine.h"
-#include "locsettingsuiecomnotifier.h"
-#include "locationsettings.h"
-#include "locsettingsuipluginloader.h"
-#include "locsettingsui.h"
-#include "locsettingsuiparams.h"
-
-// ========================= MEMBER FUNCTIONS ================================
-
-// ---------------------------------------------------------------------------
-// CLocSettingsUiEngine::CLocSettingsUiEngine
-// Overloaded Constructor
-//
-// ---------------------------------------------------------------------------
-//
-CLocSettingsUiEngine::CLocSettingsUiEngine( CAknViewAppUi&	aAppUi )
-	:iAppUi( aAppUi )
-	{		
-	}
-
-// ---------------------------------------------------------------------------
-// CLocationSystemUiView::~CLocSettingsUiEngine
-// Destructor
-//
-// ---------------------------------------------------------------------------
-//
-CLocSettingsUiEngine::~CLocSettingsUiEngine()
-	{
-
-	// Delete the Settings UI Descriptions
-	while ( iSettingsArray.Count() > 0 )
-		{
-		// Remove the first item
-		CLocationSettings* item = iSettingsArray[0];
-		iSettingsArray.Remove( 0 );
-		
-		// Delete the element
-		delete item;
-		item = NULL;
-		}
-	iSettingsArray.Reset();
-	iSettingsArray.Close();
-	
-	// Delete the Plug-in Loader
-	delete iPluginLoader;	
-	}	
-					 
-// ---------------------------------------------------------------------------
-// CLocSettingsUiEngine* CLocSettingsUiEngine::NewL
-// Two Phase Constructor. 
-//
-// @param 	aAppUi				    Reference to the Application UI class that
-//									launched the Settings Application
-// @return	CLocSettingsUiEngine*	Reference to the created object
-// ---------------------------------------------------------------------------  
-//
-EXPORT_C CLocSettingsUiEngine* CLocSettingsUiEngine::NewL( CAknViewAppUi& aAppUi )
-	{
-    CLocSettingsUiEngine* self = CLocSettingsUiEngine::NewLC( aAppUi );
-	CleanupStack::Pop( self );
-	return self;
-	}
-	
-// ---------------------------------------------------------------------------
-// CLocSettingsUiEngine* CLocSettingsUiEngine::NewLC
-// Two Phase Constructor. 
-//
-// @param 	aAppUi					Reference to the Application UI class that
-//									launched the Settings Application
-// @return	CLocSettingsUiEngine*	Reference to the created object
-// ---------------------------------------------------------------------------  
-//
-EXPORT_C CLocSettingsUiEngine* CLocSettingsUiEngine::NewLC( CAknViewAppUi&	aAppUi )
-	{
-    CLocSettingsUiEngine* self = new(ELeave) CLocSettingsUiEngine( aAppUi );
-	CleanupStack::PushL( self );
-	self->ConstructL();
-	return self;
-	}
-
-// ---------------------------------------------------------------------------
-// void CLocSettingsUiDesc::ConstructL
-// Second Phase of the two phase constructor. The caption string is copied into
-// 
-// ---------------------------------------------------------------------------
-//									 
-void CLocSettingsUiEngine::ConstructL()
-	{
-	
-	// Construct the Plug-In Loader
-	iPluginLoader = CLocSettingsUiPluginLoader::NewL( iAppUi );
-
-	}
-
-// ---------------------------------------------------------------------------
-// CLocationSettings* CLocSettingsUiEngine::CreateSettingsUiL
-// 
-// Creates a single Settings UI Object.
-// In case the object already exists, then a reference to the existing object is
-// returned and no new object is created. In either case, the class retains the
-// ownership of the created object.
-//
-// @param aImplementationUid The Implementation UID of the plug-in that
-//                           has to be created.
-// @return CLocationSettings* Reference to the created object.
-// ---------------------------------------------------------------------------
-//
-EXPORT_C CLocationSettings* CLocSettingsUiEngine::CreateSettingsUiL( 
-                                                        TUid aImplementationUid )
-    {
-    // Scan through the existing list of Settings UIs. Incase, a UI with the
-    // same UID exists then return the same. If not create a new implmentation
-    // and return a reference to it
-    
-    TInt index = KErrNotFound;
-    
-    // Iterate through the Settings UI array
-	for ( TInt count = 0; count < iSettingsArray.Count(); count++ )
-	{
-	CLocationSettings* currentItem = iSettingsArray[count];
-	// If the Settings object for the Implementation UID already
-	// exisits then dont do anything
-	if ( aImplementationUid == currentItem->ImplementationUid())
-		{
-		index = count;
-		break;
-		}
-	}
-    
-    if( KErrNotFound != index )
-        {
-        // A Settings UI corresponding to the UID already exists. Return a 
-        // reference to the same.
-        return iSettingsArray[index];
-        }
-    else
-        {
-        // Settings UI does not exist. Create a new implementation and 
-        // return the same
-        return  &( iPluginLoader->CreateSettingsUiL( aImplementationUid,
-                                                     iSettingsArray ));                                                   
-        
-        }
-    }
-        
-// ---------------------------------------------------------------------------
-// RPointerArray<CLocationSettings>& CLocSettingsUiEngine::CreateAvailableSettingsUiL
-//
-// Creates all the available settings UI. This function call performs
-// an ECom discovery of all the possible ECom plugins that are 
-// available and creates the Settings UI components as well as the 
-// plug-in UI. The ownership of the created objects is not transferred
-// to the callee but retained with the Engine class. This function needs 
-// that No settings UIs have been already created. Incase, there exists
-// any Settings UIs then the function leaves with KErrAlreadyExists.
-//
-// @return RPointerArray<CLocationSettings>& Reference to the array of Settings
-//                                           objects.
-// ---------------------------------------------------------------------------
-//
-RPointerArray<CLocationSettings>& CLocSettingsUiEngine::CreateAvailableSettingsUiL()
-    {
-	
-	// The function expects that there are no existing Settings UI elements 
-	// present. Hence, the need to check
-	if( iSettingsArray.Count())
-	    {
-	    User::Leave( KErrAlreadyExists );
-	    }
-	    
-	// Create the Settings UIs 
-	iPluginLoader->CreateAvailableSettingsUisL( iSettingsArray );
-	
-	// Return a reference to the created Settings UI structures
-	return iSettingsArray;	
-    }
-        
-// ---------------------------------------------------------------------------
-// PointerArray<CLocationSettings>& CLocSettingsUiEngine::UpdateAvailableSettingsUisL()
-//
-// Updates the list of available UIs. The new list would contain all the
-// latest additions to the list of UIs in addition to the existing
-// UIs. The interface does not delete any instances if they are not in
-// the current implementation list.
-//
-// @return RPointerArray<CLocationSettings>& Reference to the array of Settings
-//                                           objects.   
-// ---------------------------------------------------------------------------
-//
-RPointerArray<CLocationSettings>& CLocSettingsUiEngine::UpdateAvailableSettingsUisL()
-	{
-	
-	// Create the Settings UIs 
-	iPluginLoader->CreateAvailableSettingsUisL( iSettingsArray );
-	
-	// Return a reference to the created Settings UI structures
-	return iSettingsArray;
-	}
-	
-// ---------------------------------------------------------------------------
-// RPointerArray<CLocationSettings>& CLocSettingsUiEngine::SettingsUiArray
-// 
-// Accessor function to obtain the Settings UI structures. The ownership of the 
-// internal objects is not transferred.
-// 
-//  @return RPointerArray<CLocationSettings>& Reference to the array of Settings
-//                                            objects. 
-// ---------------------------------------------------------------------------
-//
-RPointerArray<CLocationSettings>& CLocSettingsUiEngine::SettingsUiArray()
-    {
-    return iSettingsArray;
-    }
-
-// ---------------------------------------------------------------------------
-// void CLocSettingsUiEngine::StartSettingsEComNotification
-// Starts the Ecom notification for observing loading and unloading of the 
-// underlying sub-settings plug-ins
-//
-// @param aSettingsNotifer  Notifier for communication of changes in the 
-//                          Ecom loading and unloading for sub-settings
-//                          plug-ins
-// ---------------------------------------------------------------------------
-//
-void CLocSettingsUiEngine::StartSettingsEComNotificationL( 
-                            MLocSettingsUiEcomNotifer*   aNotifier )
-    {
-    iPluginLoader->StartEComNotifyL( aNotifier );
-    }
-                    
-// ---------------------------------------------------------------------------
-// void CLocSettingsUiEngine::StopSettingsEComNotification
-// Stops ECom notification. Does nothing in case there was no outstanding
-// request
-// ---------------------------------------------------------------------------
-//
-void CLocSettingsUiEngine::StopSettingsEComNotification()
-    {
-    iPluginLoader->StopEComNotify();
-    }
--- a/locationsystemui/locationsysui/locsysuiview/src/locsettingsuipluginloader.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,362 +0,0 @@
-/*
-* Copyright (c) 2005-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:  Manages the E-Comm Plugin handling for the Settings UI.
-*
-*/
-
-
-// System Include
-#include <ecom/implementationinformation.h>
-#include <aknViewAppUi.h>
-	
-// User Include
-#include "locsettingsuipluginloader.h"
-#include "locationsettings.h"
-#include "locsettingsui.h"
-#include "locsettingsuiparams.h"
-#include "locsettingsuiecomnotifier.h"
-
-
-// Global Constants
-
-//Forward declaration. Function for sorted ordering of settings ui plug-ins
-static TInt SettingsDescOrdering( const CLocationSettings& aSettings1, 
-		  					   	  const CLocationSettings& aSettings2 );
-		  					   	  
-// ========================= MEMBER FUNCTIONS ================================
-
-// ---------------------------------------------------------------------------
-// CLocSettingsUiPluginLoader::CLocSettingsUiPluginLoader
-// Overloaded Constructor
-//
-// ---------------------------------------------------------------------------
-//
-CLocSettingsUiPluginLoader::CLocSettingsUiPluginLoader( CAknViewAppUi&	aAppUi )
-	:CActive( EPriorityStandard ),
-	iAppUi( aAppUi )
-	{
-	// Add self to the Active scheduler
-	CActiveScheduler::Add( this );			
-	}
-
-// ---------------------------------------------------------------------------
-// CLocSettingsUiPluginLoader::~CLocSettingsUiPluginLoader
-// Destructor
-//
-// ---------------------------------------------------------------------------
-//
-CLocSettingsUiPluginLoader::~CLocSettingsUiPluginLoader()
-	{
-	Cancel();
-	}	
-					 
-// ---------------------------------------------------------------------------
-// CLocSettingsUiPluginLoader* CLocSettingsUiPluginLoader::NewL
-// Creates an instance of the Settings UI Plug-in Loader
-//
-// @param  aAppUi				    	App Ui Reference
-// @return CLocSettingsUiPluginLoader*	Reference to the instantiated class 
-// ---------------------------------------------------------------------------  
-//
-CLocSettingsUiPluginLoader* CLocSettingsUiPluginLoader::NewL( 
-                                                CAknViewAppUi&	aAppUi )
-	{
-    CLocSettingsUiPluginLoader* self = 
-                CLocSettingsUiPluginLoader::NewLC( aAppUi );
-	CleanupStack::Pop(self);
-	return self;
-	}
-	
-// ---------------------------------------------------------------------------
-// CLocSettingsUiPluginLoader* CLocSettingsUiPluginLoader::NewLC
-// Creates an instance of the Settings UI Plug-in Loader
-//
-// @param  aObserver				Observer to the CLocSettingsUiPluginLoader class
-// @param  aAppUi					App Ui Reference
-// @return CLocSettingsUiPluginLoader*	Reference to the instantiated class 
-// ---------------------------------------------------------------------------  
-//
-CLocSettingsUiPluginLoader* CLocSettingsUiPluginLoader::NewLC( 
-								                CAknViewAppUi&	aAppUi )
-	{
-    CLocSettingsUiPluginLoader* self = new(ELeave) CLocSettingsUiPluginLoader( aAppUi );
-	CleanupStack::PushL(self);
-	return self;
-	}
-
-// ---------------------------------------------------------------------------
-// void CLocSettingsUiPluginLoader::CreateAvailableSettingsUisL  
-// Creates all the settings UI currently available in the system. The 
-// user if this interface should ensure that he passes an empty
-// Settings Array structure.
-// 
-// @param aDescArray 		 Array of Settings UI.
-// --------------------------------------------------------------------------- 
-//
-void CLocSettingsUiPluginLoader::CreateAvailableSettingsUisL( 
-                                RPointerArray<CLocationSettings>&   aSettingsArray )
-	{
-	// List all the available implementations for KSettingsUiInterfaceUID
-	RImplInfoPtrArray	impInfoArray;
-	
-	REComSession::ListImplementationsL( KSettingsUiInterfaceUID,
-										impInfoArray );
-	for ( TInt impInfoArrayIterator = 0; 
-		 	   impInfoArrayIterator < impInfoArray.Count();
-		 	   impInfoArrayIterator ++ )
-		{
-		// Obtain the Implementation UID
-		CImplementationInformation* info = impInfoArray[impInfoArrayIterator];
-        TUid implUid = info->ImplementationUid();
-        
-        // Create the Location Settings UI class which inturn creates the
-        // sub-settings plug-in
-             			
-        CLocationSettings* settings = NULL;
-        TRAPD( error, settings = CLocationSettings::NewL( implUid, iAppUi ););
-        if( !error )
-            {
-            // Insert them in order. The order is specified by the SettingsDescOrdering
-    		// function			
-    		error = aSettingsArray.InsertInOrder( settings,
-    											  SettingsDescOrdering );
-    		if ( error )
-    			{
-    			// Issue with creating the Settings UI component. Delete it
-    			delete settings;   			
-    			}
-            }
-		}
-    // Destroy the implementation info array obtained from ECom Session
-	impInfoArray.ResetAndDestroy();	
-	}
-
-// ---------------------------------------------------------------------------
-// void CLocSettingsUiPluginLoader::CreateSettingsUiL
-// Creates the Settings UI and the corresponding description entry. This
-// Location Settings object. The created object is appended to the existing
-// list and a reference to it returned.
-// 
-// @param aImplementationUid The Implementation UID of the plug-in that
-//                           has to be created
-// @param aSettingsArray	 Array of Settings UIs
-// @return CLocationSettings& Reference to the created object. The ownership is not
-//                            by the return value.
-// ---------------------------------------------------------------------------
-//
-CLocationSettings& CLocSettingsUiPluginLoader::CreateSettingsUiL( 
-                    TUid                                 aImplementationUid,
-                    RPointerArray<CLocationSettings>&    aSettingsArray )
-    {
-    // Create the plug in
-    
-	// The Function does not check for the existence of the plug-in
-	// in the implementation array.
-	
-    // The function is not trapped. If there is a leave then the function would
-    // leave with the error code generated. The calling function has to take 
-    // care of the non-existence of the plug-in
-	
-	CLocationSettings* settings = CLocationSettings::NewLC( aImplementationUid,
-	                                                        iAppUi );
-    			                                                    
-	// Insert them in order. The order is specified by the SettingsDescOrdering
-	// function			
-	User::LeaveIfError(  aSettingsArray.InsertInOrder( settings,
-											           SettingsDescOrdering ));
-	CleanupStack::Pop( settings );
-		
-    // Return the reference to the Settings UI
-    return *settings;			
-    }
-						        
-// ---------------------------------------------------------------------------
-// void CLocSettingsUiPluginLoader::UpdateAvailableSettingsUisL
-// Updates the Settings UI list and the description structures. The new
-// additions are appened in-order. The interface does not
-// delete any instances if they are not in the current implementation 
-// list
-// 
-// @param aSettingsArray     Array of Settings UIs.
-// @param aInitParams		 Opaque Initialization parameters that are 
-// 							 passed onto the Settings UI. The PluginLoader 
-// 							 does not understand these parameters
-// ---------------------------------------------------------------------------
-//
-void CLocSettingsUiPluginLoader::UpdateAvailableSettingsUisL( 
-						RPointerArray<CLocationSettings>&    aSettingsArray )
-	{
-		// List all the available implementations for KSettingsUiInterfaceUID
-	RImplInfoPtrArray	impInfoArray;
-	
-	REComSession::ListImplementationsL( KSettingsUiInterfaceUID,
-										impInfoArray );
-
-	for ( TInt impInfoArrayIterator = 0; 
-		 	   impInfoArrayIterator < impInfoArray.Count();
-		 	   impInfoArrayIterator ++ )
-		{
-		// Obtain the Implementation UID
-		CImplementationInformation* info = impInfoArray[impInfoArrayIterator];
-        TUid implUid = info->ImplementationUid();
-        
-        // Search if the plug-in already exists.
-        TInt index = KErrNotFound;
-        // Iterate through the Settings UI array
-		for ( TInt count = 0; count < aSettingsArray.Count(); count++ )
-		{
-		CLocationSettings* currentItem = aSettingsArray[count];
-		// If the Settings object for the Implementation UID already
-		// exisits then dont do anything
-		if ( implUid == currentItem->ImplementationUid())
-			{
-			index = count;
-			break;
-			}
-		}
-        
-        // If the index value is not set Create the plug in
-        if ( KErrNotFound == index )
-        	{
-            // Create the Location Settings UI class which inturn creates the
-            // sub-settings plug-in
-             			
-            CLocationSettings* settings = NULL;
-            TRAPD( error, settings = CLocationSettings::NewL( implUid, iAppUi ););
-            if( !error )
-                {
-                // Insert them in order. The order is specified by the SettingsDescOrdering
-    		    // function			
-    	        error = aSettingsArray.InsertInOrder( settings,
-    												  SettingsDescOrdering );
-    		    if ( error )
-    			    {
-    			    // Issue with creating the Settings UI component. Delete it
-    			    delete settings;   			
-    			    }
-                }	
-        	}
-		}
-	
-	impInfoArray.ResetAndDestroy();	
-	}
-
-// --------------------------------------------------------------------------- 
-// Inherited from CActive 
-// ---------------------------------------------------------------------------
-//
-void CLocSettingsUiPluginLoader::RunL()
-	{
-	if ( iStatus.Int() != KErrCancel )
-		{
-		// Restart the Notification request inorder to listen for future 
-		// notifications
-		StartEComNotifyL();
-		// Notify the state change to the observer
-		if( iNotifier )
-		    {
-		    iNotifier->EComSessionStateChanged( iStatus.Int());
-		    }		
-		}
-	}
-
-// --------------------------------------------------------------------------- 
-// Inherited from CActive 
-// ---------------------------------------------------------------------------
-//
-void CLocSettingsUiPluginLoader::DoCancel()
-	{
-	if ( iSession )
-		{
-		iSession->CancelNotifyOnChange( iStatus );
-		iSession->Close();
-		iSession = NULL;
-		}		
-	}
-
-// --------------------------------------------------------------------------- 
-// Inherited from CActive 
-// ---------------------------------------------------------------------------
-//
-TInt CLocSettingsUiPluginLoader::RunError( TInt /* aError */)
-	{
-	return KErrNone;
-	}
-
-// --------------------------------------------------------------------------- 
-// Initiates a notify request on the ECom Session
-//
-// @param aSettingsNotifer  Notifier for communication of changes in the 
-//                          Ecom loading and unloading for sub-settings
-//                          plug-ins 
-// ---------------------------------------------------------------------------
-//
-void CLocSettingsUiPluginLoader::StartEComNotifyL( 
-                    MLocSettingsUiEcomNotifer*   aNotifier )
-	{
-	// Set the notifier if its valid
-	if( aNotifier )
-	    {
-	    iNotifier = aNotifier;
-	    }
-	
-	// If the notifier is present then initaite a request    
-    // Open the ECom Session handle if its not been opened
-    if( !iSession )
-        {
-        iSession = &( REComSession::OpenL());
-        }
-	
-	// Issue a new request	
-	if ( !IsActive())
-		{
-		// Set the notifier 
-		iSession->NotifyOnChange( iStatus );	
-		
-		SetActive();
-		}
-	}
-        
-// ---------------------------------------------------------------------------
-//
-// Stop the outstanding EComNotification
-// ---------------------------------------------------------------------------
-//
-void CLocSettingsUiPluginLoader::StopEComNotify()
-    {
-    // Cancel any outstanding request
-    Cancel();
-    }
-        	
-// ---------------------------------------------------------------------------
-// static TInt SettingsDescOrdering
-// Ordering function for inserting the elements into the List box array.
-// The ordering is done first based on the priority. 
-//
-// @param CLocationSettings& First Settings Element
-// @param CLocationSettings& Second Settings Element
-// @return 1. zero, if the two objects are equal.
-//
-//		   2. a negative value, if the first object is less than the second.
-//
-// 		   3. a positive value, if the first object is greater than the second.
-// 
-// ---------------------------------------------------------------------------	
-TInt SettingsDescOrdering( const CLocationSettings& aSettings1, 
-		  				   const CLocationSettings& aSettings2 )
-    {
-    CLocationSettings* settings1 = const_cast< CLocationSettings*>(&aSettings1);
-    CLocationSettings* settings2 = const_cast< CLocationSettings*>(&aSettings2);
-    return ( settings1->Priority() - settings2->Priority());
-	}
--- a/locationsystemui/locationsysui/locsysuiview/src/locsysuicontainer.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,381 +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:  Source file for Location System UI container.
-*
-*
-*/
-
-
-// System Includes
-#include <eikspane.h> 						// Status pane
-#include <akntitle.h>   					// CAknTitlePane
-#include <barsread.h>    					// For TResourceReader
-#include <aknlists.h>						// List box
-#include <locsysuiviewrsc.rsg>		
-#include <csxhelp/locset.hlp.hrh>
-
-// User Includes
-#include "locsysuicontainer.h"
-#include "locsysuiview.h"
-#include "locationsettings.h"
-#include "locsysuilbmodel.h"
-#include "locsysuiviewuid.hrh"
-
-// ========================= MEMBER FUNCTIONS ================================
-
-// ---------------------------------------------------------------------------
-// CLocSysUiContainer::CLocSysUiContainer
-// Overloaded Constructor
-//
-// ---------------------------------------------------------------------------
-//	
-CLocSysUiContainer::CLocSysUiContainer( 
-								MLocSysUiContainerEventHandler&	aEventHandler )
-	:iEventHandler( aEventHandler )
-	{
-	}
-	
-// ---------------------------------------------------------------------------
-// CLocSysUiContainer::~CLocSysUiContainer
-// Destructor
-//
-// ---------------------------------------------------------------------------
-//	
-CLocSysUiContainer::~CLocSysUiContainer()
-	{
-	// Delete the list box
-	delete iListBox;
-	
-	// Delete the List box model
-	delete iListBoxModel;
-	}
-	
-// ---------------------------------------------------------------------------
-// CLocSysUiContainer* CLocSysUiContainer::NewL
-// Static Two phase contructor that instantiates the CLocationSystemUiUIContainer
-//
-// @param aEventHandler		 Reference to the Container's event handler
-// @param aSettingsArray	 Reference to the Settings UI array.
-// @param aRect				 Client rectangle.
-// @return CLocSysUiContainer*	Reference to the object created.
-// --------------------------------------------------------------------------- 
-//   
-CLocSysUiContainer* CLocSysUiContainer::NewL( 
-        		MLocSysUiContainerEventHandler&	    aEventHandler,
-        		RPointerArray<CLocationSettings>&   aSettingsArray,
-        		const TRect& 					    aRect )
-	{	
-    CLocSysUiContainer* self = CLocSysUiContainer::NewLC( aEventHandler,
-                                                          aSettingsArray,
-                                                          aRect );
-	CleanupStack::Pop( self );
-	return self;
-	}
-
-// ---------------------------------------------------------------------------
-// CLocSysUiContainer* CLocSysUiContainer::NewL
-// Static Two phase contructor that instantiates the CLocationSystemUiUIContainer
-//
-// @param aEventHandler		 Reference to the Container's event handler
-// @param aSettingsArray	 Reference to the Settings UI array.
-// @param aRect				 Client rectangle.
-// @return CLocSysUiContainer*	Reference to the object created.
-// --------------------------------------------------------------------------- 
-//
-CLocSysUiContainer* CLocSysUiContainer::NewLC( 
-        		MLocSysUiContainerEventHandler&	    aEventHandler,
-        		RPointerArray<CLocationSettings>&   aSettingsArray,
-        		const TRect& 					    aRect )
-	{	
-    CLocSysUiContainer* self = new(ELeave) CLocSysUiContainer( aEventHandler );
-	CleanupStack::PushL( self );
-	self->ConstructL( aSettingsArray, aRect );
-	return self;
-	}
-
-// --------------------------------------------------------------------------- 
-// void CLocSysUiContainer::ConstructL
-// Second phase of the two phase Construction process
-//
-// @param aSettingsArray    Reference to the Settings UI array.
-// @param aRect				Client rectangle
-// ---------------------------------------------------------------------------
-//
-void CLocSysUiContainer::ConstructL( 
-                         RPointerArray<CLocationSettings>&  aSettingsArray,
-        			     const TRect& 						aRect )
-	{
-	//Make this control a window-owning control
-	CreateWindowL(); 
-	
-	// Create a New Title for the View
-	MakeTitleL(R_LOCSYSUIVIEW_TITLE);
-	 
-	CreateListboxL( aSettingsArray );
-	
-	iContextName = KLOC_HLP_SETTINGS();
-    SetRect( aRect );
-    ActivateL();
-	}	
-
-// ---------------------------------------------------------------------------
-// CLocationSettings&	CLocSysUiContainer::GetFocussedSettingsUiDescL
-// Returns the Description for the Settings Ui item that is currently focussed
-//
-// @return CLocSettingsUiDesc*	Reference to the description object of
-//							the item that is currently focussed
-// 		   NULL				If there is no list box
-// ---------------------------------------------------------------------------
-//
-CLocationSettings&	CLocSysUiContainer::GetFocussedSettingsUiL()
-	{		
-	TInt selectedItem = iListBox->CurrentItemIndex();
-	return iListBoxModel->SettingsUiL( selectedItem );
-	}
-
-// ---------------------------------------------------------------------------
-// void CLocSysUiContainer::UpdateListBoxL
-// Calls upon the container to update the list bix contents.
-//
-// @param aSettingsArray	Reference to the Settings UI array.
-// ---------------------------------------------------------------------------
-//
-void CLocSysUiContainer::UpdateListBoxL(
-						RPointerArray<CLocationSettings>& aSettingsArray )
-	{
-	iListBoxModel->UpdateListBoxContentsL( aSettingsArray );
-    iListBox->HandleItemAdditionL();
-    iListBox->HandleItemRemovalL();
-	DrawDeferred();
-	}
-
-// ---------------------------------------------------------------------------
-// TUint CLocSysUiContainer::CurrentFocussedElement
-// Returns the currently focussed element index
-//
-// @return TUint    Currently focussed element index    
-// ---------------------------------------------------------------------------
-//
-TUint CLocSysUiContainer::CurrentFocussedElement()
-    {
-    TInt ret = iListBox->CurrentItemIndex();
-    if( ret < 0 )
-        {
-        ret = 0;
-        }
-    return ret;
-    }
-   
-// ---------------------------------------------------------------------------
-// Sets the current highlighted element
-//
-// @param aCurrentElement    Currently focussed element index    
-// ---------------------------------------------------------------------------
-//
-void CLocSysUiContainer::SetFocussedElement( TUint      aCurrentElement )
-    {
-    iListBox->SetCurrentItemIndex( aCurrentElement );
-    }
-                	
-// ---------------------------------------------------------------------------
-// void CLocSysUiContainer::OfferKeyEventL
-//
-// ---------------------------------------------------------------------------	
-//
-TKeyResponse CLocSysUiContainer::OfferKeyEventL( const TKeyEvent& aKeyEvent,
-										   					   TEventCode aType )
-	{
-	switch ( aKeyEvent.iCode )
-        {
-        case EKeyLeftArrow:
-        case EKeyRightArrow:
-        	{
-        	// Listbox takes all event even if it doesn't use them
-            return EKeyWasNotConsumed;	
-        	}
-        default:
-        	{
-        	break;	
-        	}
-        }
-    // now it's iListBox's job to process the key event
-    return iListBox->OfferKeyEventL(aKeyEvent, aType); 
-	}
-
-// ---------------------------------------------------------------------------
-// void CLocSysUiContainer::HandleResourceChange
-//
-// ---------------------------------------------------------------------------	
-//
-void CLocSysUiContainer::HandleResourceChange(TInt aType)
-	{
-	// Pass the event to the base class
-	CCoeControl::HandleResourceChange(aType);
-    switch ( aType )
-    	{
-    	// Dynamic Layout switch
-    	case KEikDynamicLayoutVariantSwitch:
-    		{
-			iEventHandler.HandleScreenSizeChange();
-			break;
-    		}
-    	default:
-    		{
-    		break;
-    		}
-    	}
-	}
-
-// ---------------------------------------------------------------------------
-// TInt CLocSysUiContainer::CountComponentControls
-//
-// ---------------------------------------------------------------------------
-//
-TInt CLocSysUiContainer::CountComponentControls() const
-	{
-	return 1;
-	}
-
-// ---------------------------------------------------------------------------
-// CCoeControl* CLocSysUiContainer::ComponentControl
-//
-// ---------------------------------------------------------------------------
-//
-CCoeControl* CLocSysUiContainer::ComponentControl(TInt /*aIndex*/) const
-	{
-	return iListBox;	
-	}
-	
-// -----------------------------------------------------------------------------
-// CLocSysUiContainer::GetHelpContext
-// Overridden from CCoeControl. Retruns the help context
-//
-// @param aContext The requested Help context
-// -----------------------------------------------------------------------------
-//
-void CLocSysUiContainer::GetHelpContext( TCoeHelpContext& aContext ) const
-    {
-    aContext.iContext = iContextName;
-    aContext.iMajor = TUid::Uid( LOCSYSUIVIEW_UID3 );
-    }
-    
-// ---------------------------------------------------------------------------
-// void CLocSysUiContainer::HandleListBoxEventL
-//
-// ---------------------------------------------------------------------------
-//
-void CLocSysUiContainer::HandleListBoxEventL( CEikListBox*  /* aListBox */, 
-		 						   					  TListBoxEvent aEventType )
-	{
-	switch (aEventType)
-        {
-        // List box Item Selection
-        case EEventEnterKeyPressed:
-        case EEventItemSingleClicked:
-            {
-            iEventHandler.ListBoxItemSelectedL();
-            break;	
-            }
-        default:
-           break;
-        }
-	}
-    		 	
-// ---------------------------------------------------------------------------
-// void CLocSysUiContainer::FocusChanged
-//
-// ---------------------------------------------------------------------------
-//
-void CLocSysUiContainer::FocusChanged(TDrawNow aDrawNow)
-	{
-	CCoeControl::FocusChanged( aDrawNow );
-	if ( iListBox )
-		{
-		iListBox->SetFocus( IsFocused(), aDrawNow );				
-		}
-	}
-		
-// ---------------------------------------------------------------------------
-// CLocSysUiContainer::SizeChanged
-// 
-// ---------------------------------------------------------------------------
-//
-void CLocSysUiContainer::SizeChanged()
-	{
-	if ( iListBox )
-		{
-		iListBox->SetRect( Rect());
-		}
-	}
-	
-// ---------------------------------------------------------------------------
-// void CLocSysUiContainer::CreateListboxL
-// Creates the List box and the Listbox model. Associates the list box model 
-// with the list box
-// 
-// @param aSettingsArray	 Reference to the Settings UI array.
-// ---------------------------------------------------------------------------	
-//
-void CLocSysUiContainer::CreateListboxL( 
-						 RPointerArray<CLocationSettings>&  aSettingsArray )
-	{
-	// Create the Listbox model
-	iListBoxModel = CLocSysUiLBModel::NewL( aSettingsArray );
-	
-	// Create the List box
-	iListBox = new( ELeave )CAknSettingStyleListBox;
-    iListBox->ConstructL( this, EAknListBoxSelectionList );
-    iListBox->SetContainerWindowL( *this ); 
-    iListBox->SetListBoxObserver( this );
-    iListBox->CreateScrollBarFrameL(ETrue);
-    iListBox->ScrollBarFrame()->SetScrollBarVisibilityL( CEikScrollBarFrame::EOff,
-    													 CEikScrollBarFrame::EAuto );
-    													 
-    iListBox->Model()->SetItemTextArray( iListBoxModel );	
-    iListBox->Model()->SetOwnershipType( ELbmDoesNotOwnItemArray );									
-    iListBox->ActivateL();
-	}
-	
-// ---------------------------------------------------------------------------
-// void CLocSysUiContainer::StatusPane
-// Returns the Appui's status pane
-//
-// @return CEikStatusPane* Statuspane pointer
-// ---------------------------------------------------------------------------
-//
-CEikStatusPane* CLocSysUiContainer::StatusPane()
-	{
-	return iEikonEnv->AppUiFactory()->StatusPane();	
-	}
-        
-// ---------------------------------------------------------------------------
-// void CLocSysUiContainer::MakeTitleL
-// Sets the Title text
-//
-// @param aResourceText Resource to create title
-// ---------------------------------------------------------------------------
-//
-void CLocSysUiContainer::MakeTitleL( TInt aResourceText )
-	{
-	// Obtain the title from the Status Pane
-	CAknTitlePane* title = static_cast<CAknTitlePane*>( StatusPane()->
-        ControlL( TUid::Uid( EEikStatusPaneUidTitle )));
-       
-    // Set the Title's buffer    
-    TResourceReader rReader;
-    iCoeEnv->CreateResourceReaderLC( rReader, aResourceText );
-    title->SetFromResourceL( rReader );
-    CleanupStack::PopAndDestroy(); //rReader
-	}
-
--- a/locationsystemui/locationsysui/locsysuiview/src/locsysuilbmodel.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,174 +0,0 @@
-/*
-* Copyright (c) 2005-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:  List box model
-*
-*/
-
-
-// System Includes
-#include <e32keys.h>
-
-// User Include
-#include "locsysuilbmodel.h"
-#include "locationsettings.h"
-		  					   	  
-// Constants
-const TInt KMaxDescriptionText = 0x100;		  					   	  
-
-// ========================= MEMBER FUNCTIONS ================================
-
-// ---------------------------------------------------------------------------
-// CLocSysUiLBModel::CLocSysUiLBModel
-// Default Constructor
-//
-// ---------------------------------------------------------------------------
-//
-CLocSysUiLBModel::CLocSysUiLBModel( RPointerArray<CLocationSettings>& 
-														aSettingsArray )
-    :iSettingsArray( aSettingsArray )														
-	{		
-	}
-
-// ---------------------------------------------------------------------------
-// CLocSysUiLBModel::~CLocSysUiLBModel
-// Destructor
-//
-// ---------------------------------------------------------------------------
-//
-CLocSysUiLBModel::~CLocSysUiLBModel()
-	{
-	delete iBuffer;
-	}
-	
-// ---------------------------------------------------------------------------
-// CLocSysUiLBModel* CLocSysUiLBModel::NewL
-// Two-phased constructor
-// 
-// @param aSettingsArray	Reference to the Settings UI array
-//@return CLocSysUiLBModel*	Reference to the object created
-//
-// ---------------------------------------------------------------------------
-//
-CLocSysUiLBModel* CLocSysUiLBModel::NewL(
-		 					RPointerArray<CLocationSettings>& aSettingsArray )
-	{
-	CLocSysUiLBModel* self = new(ELeave)CLocSysUiLBModel( aSettingsArray );
-	CleanupStack::PushL( self );
-	self->ConstructL();
-	CleanupStack::Pop( self );
-	return self;
-	}
-	
-// ---------------------------------------------------------------------------
-// void CLocSysUiLBModel::ConstructL
-// Second Phase of the two phase constructor.
-// 
-// ---------------------------------------------------------------------------
-//
-void CLocSysUiLBModel::ConstructL()
-	{
-	// Allocate the conversion buffer. The maximum length of the conversion buffer
-	// is limited to 256 characters												  
-	iBuffer = HBufC::NewL( KMaxDescriptionText ); 
-	
-	}
-
-// ---------------------------------------------------------------------------
-// CLocationSettings* CLocSysUiLBModel::SettingsUi
-// Returns the Settings UI corresponding to a particular Index value.
-// The index value starts from 0
-//
-// @param	aIndex			   Index of the Settings Ui which is requested
-// @return	CLocationSettings& Referrence to the Settings UI corresponding
-//							   to the index.
-// ---------------------------------------------------------------------------
-//	
-CLocationSettings& CLocSysUiLBModel::SettingsUiL( TInt	aIndex )
-	{
-	if( aIndex < 0 || aIndex >= iSettingsArray.Count())
-		{
-		User::Leave( KErrNotFound );
-		}
-	return *iSettingsArray[ aIndex ];
-	}
-	
-// ---------------------------------------------------------------------------
-// void CLocationSettings::UpdateListBoxContentsL
-// Updates the List box contents
-//
-// @param aSettingsArray	Reference to the Settings UI array
-// ---------------------------------------------------------------------------
-//
-void CLocSysUiLBModel::UpdateListBoxContentsL( 
-                RPointerArray<CLocationSettings>& aSettingsArray )
-	{
-    iSettingsArray= aSettingsArray;
-	}
-
-// ---------------------------------------------------------------------------
-// TInt CLocSysUiLBModel::MdcaCount() const
-// Inherited from MDesCArray. Returns the total number of items in the 
-// Settings description array
-//
-// @return TInt The total number of elements in the Settings Description array
-// ---------------------------------------------------------------------------
-//
-TInt CLocSysUiLBModel::MdcaCount() const
-	{
-	return iSettingsArray.Count();
-	}
-
-// ---------------------------------------------------------------------------
-// TPtrC16 CLocSysUiLBModel::MdcaPoint() const
-// Inherited from MDesCArray. Returns the list box entry corresponding to the 
-// index value
-//
-// @param  aIndex The index whose list box entry needs to be retrieved
-// @return TPtr16 The list box description 
-// ---------------------------------------------------------------------------
-//
-TPtrC16 CLocSysUiLBModel::MdcaPoint( TInt aIndex ) const
-	{
-	// Zero the internal buffer
-	TPtr ptr( iBuffer->Des());
-    ptr.Zero();
-    
-    // Format "\t%S\t%d\t\t\t%S"
-    
-    // Append the first tab
-    ptr.Append( EKeyTab );
-    
-    // If the index is within the range append the caption string
-    if ( aIndex >= 0 && aIndex < iSettingsArray.Count())
-    	{
-    	CLocationSettings* settingsItem = iSettingsArray[ aIndex ];
-   		TPtrC caption = settingsItem->Caption();
-   		ptr.Append( caption );
-    	}
-    
-    // Append the second tab
-    ptr.Append( EKeyTab );
-    
-    // Append the third tab
-    ptr.Append( EKeyTab );
-    
-    // Append the fourth tab
-    ptr.Append( EKeyTab );
-    
-    // Append the fifth tab
-    ptr.Append( EKeyTab );
-    
-    return ptr;	
-	}
-
--- a/locationsystemui/locationsysui/locsysuiview/src/locsysuiview.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,585 +0,0 @@
-/*
-* Copyright (c) 2005-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:  Source file for Location System UI view.
-*
-*
-*/
-
-
-// System Include
-#include <barsread.h> 					// For TResourceReader
-#include <featmgr.h> 				    // FeatureManager
-#include <bautils.h>
-#include <StringLoader.h>				// String Loader
-#include <aknViewAppUi.h>				// App Ui
-#include <hlplch.h>						// Help
-#include <gulicon.h>					// Gul Icon
-#include <eikmenup.h>					// Menu pane
-#include <eikmenub.h>					// Menu Bar
-#include <bldvariant.hrh>               // KFeatureHelpId
-#include <data_caging_path_literals.hrh>
-#include <locsysuiviewrsc.rsg>
-#include <locsysuiview.mbg>	
-
-// User Include
-#include "locsysuiview.hrh"
-#include "locsysuiview.h"
-#include "locsysuicontainer.h"
-#include "locationsettings.h"
-#include "locsettingsuiengine.h"
-#include "locsettingsuiclient.h"
-#include "locpossettings.h"
-
-// Literal Definitions
-_LIT( KLocationSystemUiViewIconFileName, "\\resource\\apps\\locsysuiview.mif" );
-
-// ========================= MEMBER FUNCTIONS ================================
-
-
-// ---------------------------------------------------------------------------
-// CLocSysUiView::CLocSysUiView
-// Overloaded Constructor
-//
-// ---------------------------------------------------------------------------
-//	
-CLocSysUiView::CLocSysUiView()
-	:iResourceLoader( *CCoeEnv::Static())
-	{
-		
-	}
-
-// ---------------------------------------------------------------------------
-// CLocSysUiView::~CLocSysUiView
-// Destructor
-//
-// ---------------------------------------------------------------------------
-//
-CLocSysUiView::~CLocSysUiView()
-	{
-	// Delete the View engine	
-	delete iEngine;
-
-	// Close the Resource loader
-	iResourceLoader.Close();
-	
-	// Release all the resources associated with Feature Manager
-	FeatureManager::UnInitializeLib();
-	}
-	
-// ---------------------------------------------------------------------------
-// CLocSysUiView* CLocSysUiView::NewL
-// Creates new Location Sys Ui plugin. Internally calls NewLC
-//
-// @return CLocSysUiView*	Reference to the application view
-// ---------------------------------------------------------------------------    
-//
-EXPORT_C CLocSysUiView* CLocSysUiView::NewL()
-	{	
-    CLocSysUiView* self = CLocSysUiView::NewLC();
-	CleanupStack::Pop( self );
-	return self;
-	}
-
-// ---------------------------------------------------------------------------
-// CLocSysUiView* CLocSysUiView::NewLC
-// Creates new Location Sys Ui plugin. Leaves the object on the Cleanup stack
-// 
-// @return CLocSysUiView*	Reference to the application view
-// ---------------------------------------------------------------------------
-//
-CLocSysUiView* CLocSysUiView::NewLC()
-	{	
-    CLocSysUiView* self = new (ELeave) CLocSysUiView();
-	CleanupStack::PushL( self );
-	self->ConstructL();
-	return self;
-	}
-	
-// ---------------------------------------------------------------------------
-// void CLocSysUiView::ConstructL
-// Second Phase Constructor
-//
-// ---------------------------------------------------------------------------
-//
-void CLocSysUiView::ConstructL()
-    {
-    // Initialize the Feature Manager library
-    FeatureManager::InitializeLibL();
-    
-    if ( FeatureManager::FeatureSupported( KFeatureIdFfLocationsysuiHidePositioningMenu ) )
-        {
-        // To Do : changes for ou1cimx1#228781	Location: Positioning view does not open
-        // Commenting the leaving part as the hide positioning feature flag is get enabled for all configuration by default
-        // so till the flag issue resolved, the leaving part will be commented as this issue affected the BAT. 	
-        // User::Leave( KErrNotSupported );
-        }
-
-    // Open the Resource File
-    OpenLocalizedResourceFileL( KLocSysUiViewResFileName, iResourceLoader );
-    
-    // Call AknView's BaseConstrutL
-    BaseConstructL( R_LOCSYSUIVIEW_APP_VIEW );
-    
-    // Create the View Engine
-    iEngine = CLocSettingsUiEngine::NewL( *AppUi());
-    
-    // Load all the plug-ins. The creation of the engine does not load the
-    // plugins and they have to be explicitly loaded. The return value need
-    // not be stored here. Hence, the value is ignored
-    iEngine->CreateAvailableSettingsUiL();
-    
-    }
-
-EXPORT_C void CLocSysUiView::LaunchedfromPosSettingsApp()
-    {
-    isLaunchedFromPosSettingsApp = ETrue;
-    }
-
-// ---------------------------------------------------------------------------
-// void CLocSysUiView::HandleClientRectChange
-//
-// ---------------------------------------------------------------------------	
-//
-void CLocSysUiView::HandleClientRectChange()
-	{
-	if ( iContainer )
-		{
-		iContainer->SetRect( ClientRect());		
-		}
-	}
-
-// ---------------------------------------------------------------------------
-// void CLocSysUiView::ActivateView
-//
-// ---------------------------------------------------------------------------	
-//
-void CLocSysUiView::ActivateViewL()
-    {
-    // Activate the Current view in the default mode.
-    AppUi()->ActivateLocalViewL(Id());
-    }
-
-// ---------------------------------------------------------------------------
-// void CLocSysUiView::DeActivateView
-//
-// ---------------------------------------------------------------------------	
-//
-void CLocSysUiView::DeActivateView()
-    {
-        
-    // Close all the sub-settings views if they are Open
-    // Retrieve the Settings Description Array
-	RPointerArray<CLocationSettings>& settingsArray = iEngine->SettingsUiArray();
-    
-    for( TInt i = 0; i < settingsArray.Count(); i ++ )
-        {
-        // Retrieve each settings UI
-        CLocationSettings* settings = settingsArray[i];
-        
-        // Close the Settings UI
-        settings->Close();
-        }
-    // Stop displaying the Menubar if its being displayed.
-    StopDisplayingMenuBar();    
-    }
- 
-// ---------------------------------------------------------------------------
-// void CLocSysUiView::SetObserver
-//
-// ---------------------------------------------------------------------------	
-//    
-void CLocSysUiView::SetObserver( MLocationUIObserver*       aObserver )
-    {
-    iObserver = aObserver;
-    }
-        	
-// ---------------------------------------------------------------------------
-// void CLocSysUiView::DoActivateL
-// 
-// ---------------------------------------------------------------------------	
-//
-void CLocSysUiView::DoActivateL( const TVwsViewId& 	    aPrevViewId,
-											   TUid		/* aCustomMessageId*/,
-						  				 const TDesC8&	/* aCustomMessage */ )
-	{
-	if ( !iSettingsUiDismissalPending )
-		{
-		// Assign the previous view Id
-		iPrevViewId = aPrevViewId;
-		
-		// Set the Highlighted item to 0
-		iHighlightedIndex = 0;	
-		}
-	else
-		{
-		iSettingsUiDismissalPending = EFalse;
-		}	
-	
-	// Destroy the existing container if it exists
-	if ( iContainer )
-        {
-        AppUi()->RemoveFromViewStack( *this, iContainer );
-        delete iContainer;
-        iContainer=NULL;
-        }						
-    
-    // Retrieve the Settings Description Array
-	RPointerArray<CLocationSettings>& settingsArray = iEngine->SettingsUiArray();
-	 
-    // Create new Container	
-	iContainer = CLocSysUiContainer::NewL( *this, settingsArray, ClientRect());
-	iContainer->SetMopParent( this );
-	AppUi()->AddToViewStackL( *this, iContainer );
-	iContainer->SetFocussedElement( iHighlightedIndex );
-	
-	if ( isLaunchedFromPosSettingsApp && !iEikonEnv->StartedAsServerApp())
-		{
-		Cba()->SetCommandSetL( R_LOCSYSUIVIEW_SOFTKEYS_OPTION_OPEN_EXIT );	
-		}
-	// Start the ECom notification for observing changes in the plug-in loading
-	// and unloading for ECom plug-ins
-	iEngine->StartSettingsEComNotificationL( this );
-	}
-
-// ---------------------------------------------------------------------------
-// void CLocSysUiView::DoDeactivate
-//
-// ---------------------------------------------------------------------------	
-//	
-void CLocSysUiView::DoDeactivate()
-	{
-	// Stop the ECom notifcation
-	iEngine->StopSettingsEComNotification();
-	
-	// Destroy Container
-	if ( iContainer )
-        {
-        iHighlightedIndex = iContainer->CurrentFocussedElement();
-        AppUi()->RemoveFromViewStack( *this, iContainer );
-        delete iContainer;
-        iContainer = NULL;
-        }
-	}
-
-// ---------------------------------------------------------------------------
-// TUid CLocSysUiView::Id
-// Returns the View Id. Should be chosen to reflect the Implementation UID 
-// of the Plugin
-//
-// @return TUid The View Id
-// ---------------------------------------------------------------------------
-//	
-TUid CLocSysUiView::Id() const
-	{
-	return KLocSysUiViewPluginUid;
-	}
-
-// ---------------------------------------------------------------------------
-// void CLocSysUiView::HandleCommandL
-//
-// ---------------------------------------------------------------------------	
-void CLocSysUiView::HandleCommandL( TInt aCommand )	
-	{
-	switch ( aCommand )
-        {
-        case ELocSysUiCmdOpen:
-        	{
-			// Launch the corresponding Settings UI
-			TRAPD( error, 
-			       iContainer->GetFocussedSettingsUiL().
-			                        LaunchLocationUIL( KDefaultParamValue,
-			                                           this ));
-			if ( KErrNone == error )
-				{
-				iSettingsUiDismissalPending = ETrue;	
-				}
-			else if( KErrNoMemory == error )
-				{
-				User::Leave( error );
-				}
-        	break;
-        	}
-        case EAknCmdHelp:
-        	{
-        	// Launch Help file
-    		HlpLauncher::LaunchHelpApplicationL( 
-    		                CEikonEnv::Static()->WsSession(),
-       			            AppUi()->AppHelpContextL());
-        	break;
-        	}
-        case EAknSoftkeyBack:
-       		{
-       		if( iPrevViewId.iViewUid.iUid )
-       			{
-	       		// Activate the Parent view
-	       		AppUi()->ActivateLocalViewL( iPrevViewId.iViewUid );	       		    				
-	       		
-	       		// If someone is listening for the notification of the termination
-	       		// event hand it over to the observer
-	       		if( iObserver )
-	       		    {
-	       		    iObserver->LocationUIDismissed( KErrNone );
-	       		    }       			
-       			}
-			else
-				{
-				AppUi()->HandleCommandL( EAknSoftkeyExit );
-       		    }
-            break;	
-       		}
-        default:
-        	{
-        	AppUi()->HandleCommandL( aCommand );
-            break;	
-        	}
-        }
-	}
-
-// -----------------------------------------------------------------------------
-// CLocSysUiView::DynInitMenuPaneL
-// -----------------------------------------------------------------------------
-void CLocSysUiView::DynInitMenuPaneL( TInt          aResourceId, 
-                                      CEikMenuPane* aMenuPane )
-    {   
-    if( R_LOCSYSUIVIEW_MENU_ITEM_HELP == aResourceId )
-        {
-        User::LeaveIfNull( aMenuPane );
-        
-        //Handle Help Fature
-        HandleHelpFeature( *aMenuPane );
-        }
-    }
-// ---------------------------------------------------------------------------
-// void CLocSysUiView::GetCaptionL
-// Method for getting caption of this plugin. This should be the 
-// localized name of the settings view to be shown in parent view.
-
-// @param aCaption pointer to Caption variable
-//
-// ---------------------------------------------------------------------------	
-//
-void CLocSysUiView::GetCaptionL( TDes& aCaption ) const	
-	{
-	HBufC* caption = StringLoader::LoadL( R_LOCSYSUIVIEW_CAPTION );
-    aCaption.Copy( *caption );
-    delete caption;
-	}
-
-// ---------------------------------------------------------------------------
-// Inherited from CGSPluginInterface.
-// Creates a new icon of desired type. Ownership of the created icon 
-// is transferred to the caller.
-// 
-// Icon type UIDs (use these defined constants):
-// KGSIconTypeLbxItem  -   ListBox item icon.
-// KGSIconTypeTab      -   Tab icon.
-//  
-// @param aIconType UID Icon type UID of the icon to be created.
-// @return CGulIcon* Pointer of the icon. NOTE: Ownership of this
-// 					icon is transferred to the caller.
-// ---------------------------------------------------------------------------
-//
-CGulIcon* CLocSysUiView::CreateIconL( const TUid aIconType )
-	{
-	CGulIcon* icon;
-
-    if ( aIconType == KGSIconTypeLbxItem )
-        {
-		icon = AknsUtils::CreateGulIconL(
-                                    AknsUtils::SkinInstance(),
-                                    KAknsIIDQgnPropSetGeneLoc,
-                                    KLocationSystemUiViewIconFileName,
-                                    EMbmLocsysuiviewQgn_prop_set_gene_loc,
-                                    EMbmLocsysuiviewQgn_prop_set_gene_loc_mask );
-        }
-     else
-        {
-        icon = CGSPluginInterface::CreateIconL( aIconType );
-        }
-
-    return icon;
-	}
-         
-// ---------------------------------------------------------------------------
-// TInt CLocSysUiView::PluginProviderCategory()
-// Inherited from CGSPluginInterface
-// Method for reading the ID of the plugin provider category.
-//
-// @return Plugin provider category ID defined by 
-//		   TGSPluginProviderCategory
-// ---------------------------------------------------------------------------
-//
-TInt CLocSysUiView::PluginProviderCategory() const
-	{
-	return EGSPluginProviderOEM;
-	}
-        
-// ---------------------------------------------------------------------------
-// void CLocSysUiView::LocationUIDismissed
-// Inherited from MLocationUIObserver
-// Notifies the termination of the Settings UI
-//
-// @param aErrorCode The termination reason. KErrNone for normal 
-//					terminations. In case of error or pre-mature
-//					aborting System wide Error codes.
-// ---------------------------------------------------------------------------
-//
-void CLocSysUiView::LocationUIDismissed( TInt /*aErrorCode*/ )
-	{
-	// Check if the Location System UI View is the active view
-	// If not Activate it
-	TVwsViewId activeViewId;
-	if ( KErrNone != AppUi()->GetActiveViewId( activeViewId ) ||
-	    activeViewId.iViewUid != Id())
-		{
-		TRAP_IGNORE( AppUi()->ActivateLocalViewL( Id()));
-		}
-	}
-
-// --------------------------------------------------------------------------- 
-// void CLocSysUiView::SessionStateChanged
-// Inherited from MLocSettingsUiEcomNotifer
-// Notifies any change in the state of the underlying Settings UI
-// session
-//
-// @param aErrorCode Error Code denoting the state change
-// ---------------------------------------------------------------------------
-//
-void CLocSysUiView::EComSessionStateChanged( TInt /*aErrorCode*/ )
-	{
-	if ( iContainer )
-		{
-		// Update the Settings UI contents
-		TRAP_IGNORE( iEngine->UpdateAvailableSettingsUisL());
-		
-		// Obtain the latest Settings descriptions and update
-		// Update the list box contents
-		TRAP_IGNORE( iContainer->UpdateListBoxL( iEngine->SettingsUiArray()));
-		}
-	}
-		 	
-// ---------------------------------------------------------------------------
-// void CLocSysUiView::ListBoxItemSelected
-//
-// ---------------------------------------------------------------------------	
-//
-void CLocSysUiView::ListBoxItemSelectedL()
-	{
-	if ( iContainer )
-		{
-		// Launch the corresponding Settings UI
-		TRAPD( error, 
-		    iContainer->GetFocussedSettingsUiL().LaunchLocationUIL( 
-		                                            KDefaultParamValue,
-		                                            this ));
-		if ( KErrNone == error )
-			{
-			iSettingsUiDismissalPending = ETrue;	
-			}
-		else if( KErrNoMemory == error )
-			{
-			User::Leave( error );
-			}
-		}
-	}
-	
-// ---------------------------------------------------------------------------
-// void CLocSysUiView::HandleScreenSizeChange
-//
-// ---------------------------------------------------------------------------
-//	
-void CLocSysUiView::HandleScreenSizeChange()
-	{
-	if (iContainer)
-		{
-		iContainer->SetRect( ClientRect() );		
-		}
-	}
-
-// ---------------------------------------------------------------------------
-// void CLocSysUiView::OpenLocalizedResourceFileL
-// Opens the nearest localized resourcefile using aResourceLoader. 
-// aResourceLoader should be opened only once before closing it. 
-// Otherwise it will raise a panic. Therefore it is better to have 
-// multiple resource loaders.
-// 
-// @param aResourceFileName Drive and name of resource file in format 
-//                          <path>:<rsc_file_name>
-// @param aResourceLoader Resource loader for the resource. The loader 
-//                        must not be opened allready or it will raise 
-//                        a panic. It is caller's responsibility to 
-//                        close the resource loader after using the 
-//                        resource.
-// ---------------------------------------------------------------------------
-//	
-void CLocSysUiView::OpenLocalizedResourceFileL( 
-                        const TDesC& 			   aResourceFileName, 
-   							  RConeResourceLoader& aResourceLoader )
-    {
-    RFs fsSession;
-    User::LeaveIfError( fsSession.Connect());
-    
-    // Add the RFs session to the CleanupStack
-    CleanupClosePushL( fsSession );
-    
-	TFileName* tmpName = new(ELeave) TFileName;
-    CleanupStack::PushL( tmpName );
-    
-    // Append the Resource Files Directory
-    tmpName->Append( KDC_RESOURCE_FILES_DIR );
-    
-    // Append the Ressource File Name
-    tmpName->Append( aResourceFileName );
-   
-    // Obtain the drive where the DLL is installed
-    TFileName* dllDrive = new (ELeave) TFileName;
-    CleanupStack::PushL( dllDrive );
-    Dll::FileName( *dllDrive );
-    
-    // Obtain the Complete path for the Resource File
-    TParse parse;
-	User::LeaveIfError( parse.Set( *dllDrive, NULL, NULL ) );
-    User::LeaveIfError( parse.Set( parse.Drive(), tmpName, NULL ) );
-	TFileName* fileName = new(ELeave) TFileName;
-	CleanupStack::PushL( fileName );
-	fileName->Append( parse.FullName());
-    
-    // Get language of resource file
-    BaflUtils::NearestLanguageFile( fsSession, *fileName );
-    
-    // Open resource file    
-    aResourceLoader.OpenL( *fileName );
-    
-    // Pop all the fields
-    CleanupStack::PopAndDestroy( fileName );
-    CleanupStack::PopAndDestroy( dllDrive );
-    CleanupStack::PopAndDestroy( tmpName );
-   
-    CleanupStack::PopAndDestroy(); // fsSession
-    }
-
-// -----------------------------------------------------------------------------
-// CLocSysUiView::HandleHelpFeature
-// -----------------------------------------------------------------------------
-void CLocSysUiView::HandleHelpFeature( CEikMenuPane& aMenuPane ) const
-    {
-    if ( FeatureManager::FeatureSupported( KFeatureIdHelp ))
-        {
-        aMenuPane.SetItemDimmed( EAknCmdHelp, EFalse );
-        }
-    else
-        {
-        aMenuPane.SetItemDimmed( EAknCmdHelp, ETrue );
-        }
-    }
--- a/locationsystemui/locationsysui/locsysuiview/src/locsysuiviewimptable.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,52 +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:  ECOM proxy table for the Location System UI View plug-in to 
-*				  General Settings
-*
-*/
-
-
-// System includes
-#include <e32std.h>
-#include <ecom/implementationproxy.h>
-
-// User includes
-#include "locsysuiview.h"
-#include "locsysuiviewuid.hrh"
-
-// Constants
-const TImplementationProxy KLocSysUiViewPluginImpTable[] = 
-	{
-	IMPLEMENTATION_PROXY_ENTRY( LOCSYSUIVIEW_UID3, CLocSysUiView::NewL )
-	};
-
-
-// ---------------------------------------------------------------------------
-// ImplementationGroupProxy
-// Gate/factory function
-//
-// ---------------------------------------------------------------------------
-//
-EXPORT_C const TImplementationProxy* ImplementationGroupProxy( TInt& aTableCount )
-	{
-	aTableCount = sizeof( KLocSysUiViewPluginImpTable ) 
-        / sizeof( TImplementationProxy );
-        
-    return KLocSysUiViewPluginImpTable;
-	}
-
-
-
-
-
--- a/locationsystemui/locationsysui/locutils/BWINS/LocUtils_32u.def	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-EXPORTS
-	?ClipToFit@LocTextUtils@@SAHAAVTDes16@@W4TClipDirection@AknTextUtils@@PAVCEikFormattedCellListBox@@HHH@Z @ 1 NONAME ; int LocTextUtils::ClipToFit(class TDes16 &, enum AknTextUtils::TClipDirection, class CEikFormattedCellListBox *, int, int, int)
-	?Debug@@YAXV?$TRefByValue@$$CBVTDesC16@@@@ZZ @ 2 NONAME ; void Debug(class TRefByValue<class TDesC16 const >, ...)
-	?GetFileWithCorrectDriveL@LocFileUtils@@SAXABV?$TBuf@$0BAA@@@AAV2@@Z @ 3 NONAME ; void LocFileUtils::GetFileWithCorrectDriveL(class TBuf<256> const &, class TBuf<256> &)
-	?GetNearestLanguageFileL@LocFileUtils@@SAXAAVRFs@@ABV?$TBuf@$0BAA@@@AAV3@@Z @ 4 NONAME ; void LocFileUtils::GetNearestLanguageFileL(class RFs &, class TBuf<256> const &, class TBuf<256> &)
-	?NewL@CLocPhoneNumberFormat@@SAPAV1@XZ @ 5 NONAME ; class CLocPhoneNumberFormat * CLocPhoneNumberFormat::NewL(void)
-	?NewL@CLocRequestorUtilsResolver@@SAPAV1@XZ @ 6 NONAME ; class CLocRequestorUtilsResolver * CLocRequestorUtilsResolver::NewL(void)
-	?PhoneNumberAsName@CLocRequestorUtilsResolver@@SAHABVCPosRequestor@@@Z @ 7 NONAME ; int CLocRequestorUtilsResolver::PhoneNumberAsName(class CPosRequestor const &)
-	?PhoneNumberFormatL@CLocPhoneNumberFormat@@QAE?AW4TFormatResult@@ABVTDesC16@@AAVTDes16@@W4TClipDirection@AknTextUtils@@PAVCEikFormattedCellListBox@@HHH@Z @ 8 NONAME ; enum TFormatResult CLocPhoneNumberFormat::PhoneNumberFormatL(class TDesC16 const &, class TDes16 &, enum AknTextUtils::TClipDirection, class CEikFormattedCellListBox *, int, int, int)
-	?PhoneNumberGroupL@CLocPhoneNumberFormat@@QAEPAVHBufC16@@ABVTDesC16@@@Z @ 9 NONAME ; class HBufC16 * CLocPhoneNumberFormat::PhoneNumberGroupL(class TDesC16 const &)
-	?ProcessRequestorsL@CLocRequestorUtilsResolver@@QAEXAAV?$RPointerArray@VCPosRequestor@@@@@Z @ 10 NONAME ; void CLocRequestorUtilsResolver::ProcessRequestorsL(class RPointerArray<class CPosRequestor> &)
-	?RequestorIdValid@CLocRequestorUtilsResolver@@SAHABVCPosRequestor@@@Z @ 11 NONAME ; int CLocRequestorUtilsResolver::RequestorIdValid(class CPosRequestor const &)
-	?RequestorNameL@CLocRequestorUtilsResolver@@QAEPAVHBufC16@@ABVCPosRequestor@@@Z @ 12 NONAME ; class HBufC16 * CLocRequestorUtilsResolver::RequestorNameL(class CPosRequestor const &)
-
--- a/locationsystemui/locationsysui/locutils/eabi/LocUtils_32u.def	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
-EXPORTS
-	_Z5Debug11TRefByValueIK7TDesC16Ez @ 1 NONAME
-	_ZN12LocFileUtils23GetNearestLanguageFileLER3RFsRK4TBufILi256EERS3_ @ 2 NONAME
-	_ZN12LocFileUtils24GetFileWithCorrectDriveLERK4TBufILi256EERS1_ @ 3 NONAME
-	_ZN12LocTextUtils9ClipToFitER6TDes16N12AknTextUtils14TClipDirectionEP24CEikFormattedCellListBoxiii @ 4 NONAME
-	_ZN21CLocPhoneNumberFormat17PhoneNumberGroupLERK7TDesC16 @ 5 NONAME
-	_ZN21CLocPhoneNumberFormat18PhoneNumberFormatLERK7TDesC16R6TDes16N12AknTextUtils14TClipDirectionEP24CEikFormattedCellListBoxiii @ 6 NONAME
-	_ZN21CLocPhoneNumberFormat4NewLEv @ 7 NONAME
-	_ZN26CLocRequestorUtilsResolver14RequestorNameLERK13CPosRequestor @ 8 NONAME
-	_ZN26CLocRequestorUtilsResolver16RequestorIdValidERK13CPosRequestor @ 9 NONAME
-	_ZN26CLocRequestorUtilsResolver17PhoneNumberAsNameERK13CPosRequestor @ 10 NONAME
-	_ZN26CLocRequestorUtilsResolver18ProcessRequestorsLER13RPointerArrayI13CPosRequestorE @ 11 NONAME
-	_ZN26CLocRequestorUtilsResolver4NewLEv @ 12 NONAME
-	_ZTI21CLocPhoneNumberFormat @ 13 NONAME DATA 12 ; #<TI>#
-	_ZTI26CLocRequestorUtilsResolver @ 14 NONAME DATA 48 ; #<TI>#
-	_ZTV21CLocPhoneNumberFormat @ 15 NONAME DATA 20 ; #<VT>#
-	_ZTV26CLocRequestorUtilsResolver @ 16 NONAME DATA 160 ; #<VT>#
-
--- a/locationsystemui/locationsysui/locutils/group/bld.inf	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,37 +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 provides the information required for building
-*								 Location Utils
-*                  
-*
-*/
-
-
-PRJ_PLATFORMS
-DEFAULT
-
-PRJ_EXPORTS
-../inc/locfileutils.h					|../../../inc/locfileutils.h
-../inc/locphonenumberformat.h			|../../../inc/locphonenumberformat.h
-../inc/locrequestorutilsresolver.h		|../../../inc/locrequestorutilsresolver.h
-../inc/loctextutils.h					|../../../inc/loctextutils.h
-../inc/locutilsdebug.h					|../../../inc/locutilsdebug.h
-../inc/locutilsdebugconfig.hrh			|../../../inc/locutilsdebugconfig.hrh
-
-PRJ_MMPFILES
-locutils.mmp
-
-PRJ_TESTMMPFILES
-
-//  End of File  
--- a/locationsystemui/locationsysui/locutils/group/locutils.mmp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,73 +0,0 @@
-/*
-* Copyright (c) 2002-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: Project definition file for Location Utils
-*
-*/
-
-
-// INCLUDES
-#include <data_caging_paths.hrh>
-#include <bldvariant.hrh>
-#include "../inc/locutilsuid.hrh"
-#include <platform_paths.hrh> // For the APP_LAYER_SYSTEMINCLUDE
-
-TARGET  			locutils.dll
-TARGETTYPE  		dll
-UID  				0x0 LOCUTILS_UID3
-
-VENDORID	 		VID_DEFAULT
-CAPABILITY 			CAP_GENERAL_DLL
-
-SOURCEPATH 			../src
-
-SOURCE 				loctextutils.cpp
-SOURCE 				locfileutils.cpp
-SOURCE 				locrequestorutilsresolverimpl2.cpp
-SOURCE 				locphonenumberformat.cpp
-
-#ifdef LOC_ENABLE_DEBUG_PRINT
-SOURCE              locutilsdebug.cpp
-#else
-SOURCE              locutilsdebugdummy.cpp
-#endif
-
-// System Include
-MW_LAYER_SYSTEMINCLUDE
-
-USERINCLUDE 		.
-USERINCLUDE			../inc
-
-LIBRARY 			euser.lib 
-LIBRARY 			bafl.lib
-LIBRARY 			avkon.lib
-LIBRARY			 	aknlayout.lib
-LIBRARY 			cone.lib
-LIBRARY 			efsrv.lib
-LIBRARY 			sysutil.lib
-LIBRARY 			eposprvtyp.lib
-
-#ifdef LOC_ENABLE_DEBUG_PRINT
-LIBRARY 			flogger.lib
-#endif
-
-LIBRARY             CenRepNotifHandler.lib
-LIBRARY             CentralRepository.lib
-
-#if defined(WINS)
- deffile   ../BWINS/LocUtils_32.def
-#elif defined(EABI)
- deffile   ../eabi/LocUtils_32.def
-#endif 
-
-// End of file
\ No newline at end of file
--- a/locationsystemui/locationsysui/locutils/inc/locfileutils.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,66 +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:  Static utility class for file operations.
-*
-*/
-
-
-#ifndef LOCFILEUTILS_H_
-#define LOCFILEUTILS_H_
-
-//  INCLUDES
-#include <e32base.h>
-
-// FORWARD DECLARATIONS
-class RFs;
-
-// CLASS DECLARATION
-
-/**
-*  Static utility class for file operations.
-*  @lib locutils.lib
-*  @since 2.6
-*/
-class LocFileUtils
-    {
-    public: // New functions
-
-        /**
-        * Sets correct drive to aFileName. In normal use aDrive is the drive where
-        * calling dll resides, and it has been set by calling Dll::FileName().
-        *
-        * @param aDrive file name where drive is extracted from
-        * @param aFileName name which will be updated
-        */
-        IMPORT_C static void GetFileWithCorrectDriveL( const TFileName& aDrive,
-                                                       TFileName& aFileName );
-
-        /**
-        * Uses GetFileWithCorrectDriveL and then
-        * BaflUtils::NearestLanguageFile() to locate correct file and language
-        * version. To be used with resource files.
-        * Leaves if file is not found.
-        *
-        * @param aSession opened file server session
-        * @param aDrive file name where drive is extracted from        
-        * @param aFileName name which will be updated
-        */
-        IMPORT_C static void GetNearestLanguageFileL( RFs& aSession,
-                                                      const TFileName& aDrive,
-                                                      TFileName& aFileName );
-    };
-
-#endif // LOCFILEUTILS_H_
-            
-// End of File
--- a/locationsystemui/locationsysui/locutils/inc/locphonenumberformat.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,127 +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: 
-*     Abstract utility class for phone number formatting.
-*
-*/
-
-
-#ifndef CLOCPHONENUMBERFORMAT_H_
-#define CLOCPHONENUMBERFORMAT_H_
-
-//  INCLUDES
-#include <e32base.h>
-#include <AknUtils.h>
-#include <bldvariant.hrh>
-
-// DATA TYPES
-/**
-* Enumeration for numberformatting results.
-*/
-enum TFormatResult
-    {
-    EResultOK,          // No loss of precision on formatting.
-    EResultTruncated,   // result descriptor truncated from the start.
-    EResultClipped,     // result descriptor truncated and extra dots added to start
-    };
-
-
-// FORWARD DECLARATIONS
-class CFont;
-class CEikFormattedCellListBox;
-class CEikColumnListBox;
-class CAknPhoneNumberGrouping;
-
-// CLASS DECLARATION
-
-/**
-*   Class for phone number formatting. It uses the AknPhoneNumberGrouping feature.
-*	AknPhoneNumberGrouping takes care of grouping based on the feature flag
-*	__SERIES60_PHONE_NUMBER_GROUPING.
-*	Formatting & clipping is done using AknTextUtils helper methods.
-*/
-class CLocPhoneNumberFormat :public CBase
-    {
-    public:  // Constructors and destructor
-
-        /**
-        * Symbian OS constructor
-        * @return new object
-        */
-        IMPORT_C static CLocPhoneNumberFormat* NewL();
-
-        /**
-        * Destructor.
-        */
-        virtual ~CLocPhoneNumberFormat();
-
-    protected:
-
-        /**
-        * C++ default constructor.
-        */
-        CLocPhoneNumberFormat();
-        
-        /**
-        * Symbian 2nd Phase Contructor.
-        * This is always protected
-        */
-        void ConstructL();
-
-    public: // New functions
-
-        /**
-        * Phone number formatting for listbox texts.
-        * Uses AknTextUtils for clipping long descriptors.
-        * @param aNumberToFormat phone number in string to format
-        * @param aFormattedString formatted number
-        * @param aClipDirection tells how to clip
-        * @param aListBox reference to the listbox which shows the number
-        * @param aItemIndex item index
-        * @param aSubCellNumber subcell number
-        * @param aIcons 0->no icons, 1->ind. arrow, 2->1 icon, etc.
-        * @return TFormatResult
-        */
-        IMPORT_C TFormatResult PhoneNumberFormatL( const TDesC& aNumberToFormat,
-            TDes& aFormattedString, AknTextUtils::TClipDirection aClipDirection,
-            CEikFormattedCellListBox* aListBox, TInt aItemIndex,
-            TInt aSubCellNumber, TInt aIcons );
-     
-        /**
-         * Groups the Phone number according to the current settings
-         * The ownership of the grouped string is tranferred back to the 
-         * callee
-         * @param aNumberToGroup Phone number to group
-         * @return HBufC*        Phone number after grouping. If the number
-         *                       cannot be formatted then NULL is returned
-         */
-        IMPORT_C HBufC* PhoneNumberGroupL( const TDesC& aNumberToGroup );
-        
-	private:
-       /**
-        * Phone number formatting.
-        * @param aNumberToFormat phone number in string to format
-        * @param aFormattedString formatted number
-        * @return TFormatResult
-        */
-        TFormatResult PhoneNumberFormatL( const TDesC& aNumberToFormat,
-            TDes& aFormattedString );
-
-    private:
-    	CAknPhoneNumberGrouping* iPNGEngine;
-    };
-
-#endif // CLOCPHONENUMBERFORMAT_H_
-            
-// End of File
--- a/locationsystemui/locationsysui/locutils/inc/locrequestorutilsresolver.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,101 +0,0 @@
-/*
-* Copyright (c) 2005-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:  Requestor utilities, supports Resolving of Requestors.
-*
-*/
-
-
-#ifndef CLOCREQUESTORUTILSRESOLVER_H_
-#define CLOCREQUESTORUTILSRESOLVER_H_
-
-//  INCLUDES
-#include <e32base.h>
-
-//FORWARD DECLARATION
-class CPosRequestor;
-
-// CLASS DECLARATION
-
-/**
-*   This class is a version requestor utilities with resolving.
-*  @lib locutils.lib
-*  @since 3.0
-*/
-class CLocRequestorUtilsResolver  :	public CBase
-    {
-    public: // Constructors and destructor
-
-        /**
-        * Symbian OS constructor
-        * @param None
-        * @return new object
-        */
-        IMPORT_C static CLocRequestorUtilsResolver* NewL();
-
-        /**
-        * Destructor.
-        */
-        virtual ~CLocRequestorUtilsResolver();
-
-	public: // Implement base class virtual methods
-       /**
-        * Processes the requestors. In this case there is no processing done.
-        * @param aRequestors Array of Requestors
-        * @return name descriptor, ownership is transferred to caller
-        */
-        IMPORT_C void ProcessRequestorsL( 
-        				RPointerArray<CPosRequestor>& aRequestors );
-
-        /**
-        * This static method tells if requestor's name should be formatted
-        * according to phone number formatting rules.
-        * @param aRequestor who's name and id are investigated
-        * @return ETrue if requestor has no name and id is of type 
-        *               phone number.
-        */
-        IMPORT_C static TBool PhoneNumberAsName(
-                        const CPosRequestor& aRequestor );
-
-        /**
-        * Static method for checking whether requestor id is valid or not.
-        * Valid id means that a contact or service item can be created.
-        * @param aRequestor requestor to be checked
-        * @return ETrue if requestor id is valid, EFalse otherwise
-        */
-        IMPORT_C static TBool RequestorIdValid(
-                        const CPosRequestor& aRequestor );
-
-        /**
-        * Returns requestor name. In this case the requestor Id String.
-        * @param aRequestor Reference to the requestor for which
-        *					the name is required.
-        * @return name descriptor, ownership is transferred to caller
-        */
-        IMPORT_C HBufC* RequestorNameL( const CPosRequestor& aRequestor );
-		    
-    private: // Constructors
-        /**
-        * C++ default constructor.
-        */
-        CLocRequestorUtilsResolver();
-
-		/**
-		* The Symbian 2nd Phase Constructor is always Private
-		*/
-		void ConstructL();
-    };
-
-#endif // CLOCREQUESTORUTILSRESOLVER_H_
-            
-// End of File
--- a/locationsystemui/locationsysui/locutils/inc/locrequestorutilsresolverimpl2.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,99 +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:  Requestor utilities, supports Resolving of Requestors.
-*
-*/
-
-
-#ifndef CLOCREQUESTORUTILSRESOLVER_H_
-#define CLOCREQUESTORUTILSRESOLVER_H_
-
-
-//FORWARD DECLARATION
-class CPosRequestor;
-
-// CLASS DECLARATION
-
-/**
-*   This class is a version requestor utilities with resolving.
-*  @lib locutils.lib
-*  @since 3.0
-*/
-class CLocRequestorUtilsResolver  :	public CBase
-    {
-    public: // Constructors and destructor
-
-        /**
-        * Symbian OS constructor
-        * @param None
-        * @return new object
-        */
-        IMPORT_C static CLocRequestorUtilsResolver* NewL();
-
-        /**
-        * Destructor.
-        */
-        virtual ~CLocRequestorUtilsResolver();
-
-	public: // Implement base class virtual methods
-       /**
-        * Processes the requestors. In this case there is no processing done.
-        * @param aRequestors Array of Requestors
-        * @return name descriptor, ownership is transferred to caller
-        */
-        IMPORT_C void ProcessRequestorsL( 
-        				RPointerArray<CPosRequestor>& aRequestors );
-
-        /**
-        * This static method tells if requestor's name should be formatted
-        * according to phone number formatting rules.
-        * @param aRequestor who's name and id are investigated
-        * @return ETrue if requestor has no name and id is of type 
-        *               phone number.
-        */
-        IMPORT_C static TBool PhoneNumberAsName(
-                        const CPosRequestor& aRequestor );
-
-        /**
-        * Static method for checking whether requestor id is valid or not.
-        * Valid id means that a contact or service item can be created.
-        * @param aRequestor requestor to be checked
-        * @return ETrue if requestor id is valid, EFalse otherwise
-        */
-        IMPORT_C static TBool RequestorIdValid(
-                        const CPosRequestor& aRequestor );
-
-        /**
-        * Returns requestor name. In this case the requestor Id String.
-        * @param aRequestor Reference to the requestor for which
-        *					the name is required.
-        * @return name descriptor, ownership is transferred to caller
-        */
-        IMPORT_C HBufC* RequestorNameL( const CPosRequestor& aRequestor );
-		    
-    private: // Constructors
-        /**
-        * C++ default constructor.
-        */
-        CLocRequestorUtilsResolver();
-
-		/**
-		* The Symbian 2nd Phase Constructor is always Private
-		*/
-		void ConstructL();
-    };
-
-#endif // CLOCREQUESTORUTILSRESOLVER_H_
-            
-// End of File
--- a/locationsystemui/locationsysui/locutils/inc/loctextutils.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,61 +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:  Descriptor manipulation utilities.
-*
-*/
-
-
-#ifndef LOCTEXTUTILS_H_
-#define LOCTEXTUTILS_H_
-
-//  INCLUDES
-#include <e32base.h>
-#include <AknUtils.h>
-
-// FORWARD DECLARATIONS
-
-
-// CLASS DECLARATION
-
-/**
-*  Static class containing descriptor manipulation utilities.
-*  @lib locutils.lib
-*  @since 2.1
-*/
-class LocTextUtils
-    {
-    public: // New functions
-        /**
-        * Clips listbox data.
-        * Use this only if you have icons, otherwise AknTextUtils.
-        * @param aOriginal original text that is not modified
-        * @param aClipped modified text
-        * @param aClipDirection tells how to clip
-        * @param aListBox reference to the listbox which shows the data
-        * @param aItemIndex item index
-        * @param aSubCellNumber subcell number
-        * @param aIcons 0->no icons, 1->ind. arrow, 2->1 icon, etc.
-        * @return ETrue if clipping occurred
-        */
-        IMPORT_C static TBool ClipToFit( TDes& aText,
-            AknTextUtils::TClipDirection aClipDirection,
-            CEikFormattedCellListBox* aListBox,
-            TInt aItemIndex,
-            TInt aSubCellNumber,
-            TInt aIcons );
-    };
-
-#endif // LOCTEXTUTILS_H_
-            
-// End of File
--- a/locationsystemui/locationsysui/locutils/inc/locutilsdebug.h	Mon May 03 12:54:42 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:  LocUtilsDebug contains debug macros.
-*
-*/
-
-
-#ifndef _LOCUTILSDEBUG_H_
-#define _LOCUTILSDEBUG_H_
-
-// INCLUDES
-#include <e32std.h>
-#include "locutilsdebugconfig.hrh"
-
-// MACROS
-#define DEBUG(TEXT) 				 { \
-									  _LIT( KText, #TEXT ); \
-									   Debug(KText) \
-									 }
-									 
-#define LOC(TEXT, ARG1) 			 { \
-									   _LIT( KText, #TEXT ); \
-									   Debug( KText, (ARG1) ); \
-									 }
-									 
-#define LOC2(TEXT, ARG1, ARG2) 		 { \
-									   _LIT( KText, #TEXT ); \
-									   Debug( KText,(ARG1), (ARG2) ); \
-									 }
-									 
-#define LOC3(TEXT, ARG1, ARG2, ARG3) { \
-									   _LIT( KText, #TEXT ); \
-									   Debug( KText, (ARG1), (ARG2), (ARG3) ); \
-									 }
-
-IMPORT_C void Debug( TRefByValue<const TDesC> aText, ...);
-
-/**
-* By using component specific debug macros unnecessary 
-* debug prints can be avoided. 
-* Also component specific debugging is possible by compiling 
-* only certain components when LOC_ENABLE_DEBUG_PRINT is defined.
-*/
-
-#ifdef LOC_ENABLE_DEBUG_PRINT
-
-#define LOCUTILSDEBUG(TEXT)                     DEBUG(TEXT);
-#define LOCUTILSDEBUG1(TEXT, ARG1)              LOC(TEXT, ARG1);
-#define LOCUTILSDEBUG2(TEXT, ARG1, ARG2)        LOC2(TEXT, ARG1, ARG2);
-#define LOCUTILSDEBUG3(TEXT, ARG1, ARG2, ARG3)  LOC3(TEXT, ARG1, ARG2, ARG3);
-
-#else
-
-#define LOCUTILSDEBUG(TEXT)                     ;
-#define LOCUTILSDEBUG1(TEXT, ARG1)              ;
-#define LOCUTILSDEBUG2(TEXT, ARG1, ARG2)        ;
-#define LOCUTILSDEBUG3(TEXT, ARG1, ARG2, ARG3)  ;
-
-#endif
-
-#endif // _LOCUTILSDEBUG_H_
--- a/locationsystemui/locationsysui/locutils/inc/locutilsdebugconfig.hrh	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +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 the main build-time configuration file of Loc Utils
-*
-*/
-
-
-#ifndef LOCUTILSDEBUGCONFIG_HRH_
-#define LOCUTILSDEBUGCONFIG_HRH_
-
-//  INCLUDES
-
-// Flags for development:
-
-
-// Defined LOC_ENABLE_DEBUG_PRINT flag enables debug prints to a file.
-
-//#define LOC_ENABLE_DEBUG_PRINT
-
-#endif // LOCUTILSDEBUGCONFIG_HRH_
-
-// End of File
--- a/locationsystemui/locationsysui/locutils/inc/locutilsuid.hrh	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +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:  Common header for Location Utils UIDs.
-*
-*/
-
-
-#ifndef LOCUTILSUID_H_
-#define LOCUTILSUID_H_
-
-//  MACROS  
-
-/// Location utility component UID3
-#define LOCUTILS_UID3 0x101F84FB
-
-#endif // LOCUTILSUID_H_
-
-// End of File
--- a/locationsystemui/locationsysui/locutils/src/locfileutils.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,55 +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:  Static utility class for file operations.
-*
-*/
-
-
-// INCLUDE FILES
-#include "locfileutils.h"
-#include <bautils.h>
-#include <f32file.h>
-
-// ================= MEMBER FUNCTIONS =======================
-
-// -----------------------------------------------------------------------------
-// LocFileUtils::GetFileWithCorrectDriveL
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//
-EXPORT_C void LocFileUtils::GetFileWithCorrectDriveL(
-    const TFileName& aDrive,
-	TFileName& aFileName )
-    { 
-    TParse parse;
-	User::LeaveIfError( parse.Set( aDrive, NULL, NULL ) );
-    User::LeaveIfError( parse.Set( parse.Drive(), &aFileName, NULL ) );
-	aFileName = parse.FullName();
-    }
-
-// -----------------------------------------------------------------------------
-// LocFileUtils::GetNearestLanguageFileL
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//
-EXPORT_C void LocFileUtils::GetNearestLanguageFileL(
-    RFs& aSession,
-    const TFileName& aDrive,
-    TFileName& aFileName )
-    {
-    GetFileWithCorrectDriveL( aDrive, aFileName );
-    BaflUtils::NearestLanguageFile( aSession, aFileName );
-    }
-
-//  End of File
--- a/locationsystemui/locationsysui/locutils/src/locphonenumberformat.cpp	Mon May 03 12:54:42 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: 
-*     Default implementation for number formatting.
-*
-*/
-
-
-// INCLUDE FILES
-#include <AknUtils.h>
-#include <AknLayoutDef.h>
-#include <AknLayout.lag>
-#include <eikfrlbd.h>
-#include <AknPhoneNumberGrouping.h>
-#include "locphonenumberformat.h"
-
-// CONSTANT DEFINITIONS
-
-// maximum phone number length
-const TInt KLocPhoneNumberMaxLen = 48;
-
-// ============= CLOCPHONENUMBERFORMAT MEMBER FUNCTIONS ===================
-
-// ---------------------------------------------------------------------------
-// CLocPhoneNumberFormat::NewL
-// ---------------------------------------------------------------------------
-//
-EXPORT_C CLocPhoneNumberFormat* CLocPhoneNumberFormat::NewL()
-	{
-	CLocPhoneNumberFormat *self = new ( ELeave ) CLocPhoneNumberFormat;
-	CleanupStack::PushL(self);
-	self->ConstructL();
-	CleanupStack::Pop(self);
-	return self;
-	}
-
-// ---------------------------------------------------------------------------
-// CLocPhoneNumberFormat::ConstructL
-// ---------------------------------------------------------------------------
-//
-void CLocPhoneNumberFormat::ConstructL()
-	{
-	iPNGEngine = CAknPhoneNumberGrouping::NewL(KLocPhoneNumberMaxLen);
-    }
-
-// ---------------------------------------------------------------------------
-// CLocPhoneNumberFormat::CLocPhoneNumberFormat
-// ---------------------------------------------------------------------------
-//
-CLocPhoneNumberFormat::CLocPhoneNumberFormat()
-	{
-    // Intentionally empty
-	}
-
-// ---------------------------------------------------------------------------
-// CLocPhoneNumberFormat::~CLocPhoneNumberFormat
-// ---------------------------------------------------------------------------
-//
-CLocPhoneNumberFormat::~CLocPhoneNumberFormat()
-	{
-	delete iPNGEngine;
-	}
-
-// ---------------------------------------------------------------------------
-// CLocPhoneNumberFormat::PhoneNumberFormatL
-// ---------------------------------------------------------------------------
-//
-TFormatResult CLocPhoneNumberFormat::PhoneNumberFormatL(
-    const TDesC& aNumberToFormat,
-    TDes& aFormattedString )
-	{
-	TFormatResult rc( EResultOK );
-	if ( iPNGEngine->Set(aNumberToFormat) != KErrNone )
-		{
-		// If we cannot group the number then just return 
-		// the ungrouped number
-		return rc;
-		}
-
-	HBufC* groupedPhoneNumber = 
-		HBufC::NewL(iPNGEngine->FormattedNumber().Length());
-	// CAknPhoneNumberGrouping takes care of grouping based on the 
-	// current settings. If the __SERIES60_PHONE_NUMBER_GROUPING 
-	// feature flag is disabled then grouping is not done.
-	
-	TPtr grpPhoneNumberDesc = groupedPhoneNumber->Des();
-	iPNGEngine->CopyFormattedNumber(grpPhoneNumberDesc);
-	if (aFormattedString.MaxLength() < groupedPhoneNumber->Length())
-		{
-		// Store only as much as can be fitted into the resultant 
-		// Descriptor
-		rc = EResultTruncated;
-		aFormattedString = 
-			groupedPhoneNumber->Right( groupedPhoneNumber->Length() -
-										(groupedPhoneNumber->Length() - 
-										aFormattedString.MaxLength()) );
-		}
-	else
-		{
-		aFormattedString.Copy(*groupedPhoneNumber);
-		}
-
-	delete groupedPhoneNumber;
-	return rc;
-	}
-
-// ---------------------------------------------------------------------------
-// CLocPhoneNumberFormat::PhoneNumberGroupL
-// ---------------------------------------------------------------------------
-//	
-EXPORT_C HBufC* CLocPhoneNumberFormat::PhoneNumberGroupL( const TDesC& aNumberToGroup )
-    {
-	if ( iPNGEngine->Set(aNumberToGroup) != KErrNone )
-		{
-		// If we cannot group the number then just return NULL
-		return NULL;
-		}
-
-	HBufC* groupedPhoneNumber = HBufC::NewL(iPNGEngine->FormattedNumber().Length());
-		
-	// CAknPhoneNumberGrouping takes care of grouping based on the 
-	// current settings. If the __SERIES60_PHONE_NUMBER_GROUPING 
-	// feature flag is disabled then grouping is not done.
-	
-	TPtr grpPhoneNumberDesc = groupedPhoneNumber->Des();
-	iPNGEngine->CopyFormattedNumber( grpPhoneNumberDesc );
-	
-	return groupedPhoneNumber;	
-    }
-
-// ---------------------------------------------------------------------------
-// CLocPhoneNumberFormat::PhoneNumberFormatL
-// ---------------------------------------------------------------------------
-//
-EXPORT_C TFormatResult CLocPhoneNumberFormat::PhoneNumberFormatL(
-    const TDesC& aNumberToFormat,
-    TDes& aFormattedString,
-    AknTextUtils::TClipDirection aClipDirection,
-    CEikFormattedCellListBox *aListBox,
-    TInt aItemIndex,
-    TInt aSubCellNumber,
-    TInt aIcons )
-	{
-	TFormatResult rc = PhoneNumberFormatL( aNumberToFormat, aFormattedString );
-    if (aIcons == 0)
-    	{
-  		// There is no Icon so just use the AknTextUtils API
-   		if( AknTextUtils::ClipToFit( aFormattedString, aClipDirection, 
-   										aListBox, aItemIndex,
-   										aSubCellNumber ))
-   			{
-   			rc = EResultClipped;
-   			}
-    	}
-	else
-		{
-		// Adjust for the Icon Space.
-	    CFormattedCellListBoxData *data = 
-	        aListBox->ItemDrawer()->FormattedCellData();
-	    const CFont *font = data->Font( aListBox->ItemDrawer()->Properties( 
-	                                            aItemIndex ), aSubCellNumber );
-		
-		//Obtain the layout parameters for this element from the Avkon Layout
-
-	    TAknLayoutText textLayout;
-	    textLayout.LayoutText(aListBox->Rect() , 
-			AKN_LAYOUT_TEXT_List_pane_texts__menu_single__Line_1(aIcons));
-	     
-		TRect rect = textLayout.TextRect();
-	    TInt width = rect.Width();
-
-		TInt clipgap = data->SubCellTextClipGap( aSubCellNumber );
-
-		if ( AknTextUtils::ClipToFit( aFormattedString, *font, width,
-	                                  aClipDirection, width + clipgap ) )
-			{
-			rc = EResultClipped;
-			}
-		}
-    return rc;
-    }
-
-//  End of File
--- a/locationsystemui/locationsysui/locutils/src/locrequestorutilsresolverimpl2.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,136 +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:  Requestor utilities, supports privacy rules.
-*
-*/
-
-
-// INCLUDE FILES
-
-#include <e32base.h>
-#include <barsread.h>
-
-
-#include <lbs/epos_cposrequestor.h>
-#include <lbs/epos_cposservicerequestor.h>
-#include <lbs/epos_cposcontactrequestor.h>
-
-
-#include "locrequestorutilsresolverimpl2.h"
-#include "locutilsdebug.h"
-#include "locfileutils.h"
-
-// ============= CLocRequestorUtilsResolver MEMBER FUNCTIONS =================
-
-// ---------------------------------------------------------------------------
-// CLocRequestorUtilsResolver::NewL
-// 2 Phase Constructor
-// ---------------------------------------------------------------------------
-//
-EXPORT_C CLocRequestorUtilsResolver* CLocRequestorUtilsResolver::NewL()
-	{
-	CLocRequestorUtilsResolver* self = 
-							new(ELeave) CLocRequestorUtilsResolver();
-	CleanupStack::PushL(self);
-	self->ConstructL();
-	CleanupStack::Pop(self);
-    return self;
-	}
-
-// ---------------------------------------------------------------------------
-// destructor
-// ---------------------------------------------------------------------------
-//
-CLocRequestorUtilsResolver::~CLocRequestorUtilsResolver()
-	{
-	}
-
-// ---------------------------------------------------------------------------
-// The method resolves requestors with the contact database
-// ---------------------------------------------------------------------------
-//
-EXPORT_C void CLocRequestorUtilsResolver::ProcessRequestorsL( 
-	RPointerArray<CPosRequestor>& /*aRequestors*/ )
-	{
-    // Removed this functionality to avoid App layer dependency
-	}
-	
-// -----------------------------------------------------------------------------
-// CLocRequestorUtilsResolver::PhoneNumberAsName
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//
-EXPORT_C TBool CLocRequestorUtilsResolver::PhoneNumberAsName(
-    const CPosRequestor& aRequestor )
-    {
-    if ( aRequestor.RequestorIdFormat() != CPosRequestor::EIdFormatPhoneNumber )
-        { // id is of some other format
-        return EFalse;
-        }
-    else
-    	{
-    	return ETrue;
-    	}
-    }
-
-// -----------------------------------------------------------------------------
-// CLocRequestorUtilsResolver::RequestorIdValid
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//
-EXPORT_C TBool CLocRequestorUtilsResolver::RequestorIdValid(
-    const CPosRequestor& aRequestor )
-    {
-    TBool rc(ETrue);
-    if ( aRequestor.RequestorIdFormat() == CPosRequestor::EIdFormatUnknown )
-        {
-        rc = EFalse;
-        }
-    return rc;
-    }
-
-
-// -----------------------------------------------------------------------------
-// CLocRequestorUtilsResolver::RequestorNameL
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//
-EXPORT_C HBufC* CLocRequestorUtilsResolver::RequestorNameL(
-    const CPosRequestor& aRequestor )
-    {
-	return aRequestor.RequestorIdString().AllocL();
-    }
-
-// ---------------------------------------------------------------------------
-// CLocRequestorUtilsResolver::CLocRequestorUtilsResolver
-// C++ default constructor can NOT contain any code, that
-// might leave.
-// ---------------------------------------------------------------------------
-//
-CLocRequestorUtilsResolver::CLocRequestorUtilsResolver()
-	{
-	// Nothing to do.
-	}
-
-// ---------------------------------------------------------------------------
-// CLocRequestorUtilsResolver::ConstructL
-// Symbian Second Phase COnstructor
-// ---------------------------------------------------------------------------
-//
-void CLocRequestorUtilsResolver::ConstructL()
-	{
-	// Nothing to do.
-	}
-
-//  End of File
--- a/locationsystemui/locationsysui/locutils/src/loctextutils.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,68 +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:  Abstract base class for requestor utilities.
-*
-*/
-
-
-// INCLUDE FILES
-#include "loctextutils.h"
-#include <AknLayoutDef.h>
-#include <AknLayout.lag>
-#include <eikfrlbd.h>
-
-
-// ================= MEMBER FUNCTIONS =======================
-
-// ---------------------------------------------------------------------------
-// LocTextUtils::ClipToFit
-// (other items were commented in a header).
-// ---------------------------------------------------------------------------
-//      
-EXPORT_C TBool LocTextUtils::ClipToFit(
-    TDes& aText,
-    AknTextUtils::TClipDirection aClipDirection,
-    CEikFormattedCellListBox* aListBox,
-    TInt aItemIndex,
-    TInt aSubCellNumber,
-    TInt aIcons )
-    {
-    if (aIcons == 0)
-    	{
-    	// There is no Icon so just use the AknTextUtils API
-   		return AknTextUtils::ClipToFit( aText, aClipDirection, 
-   										aListBox, aItemIndex, 
-   										aSubCellNumber );
-    	}
-    CFormattedCellListBoxData *data = 
-        aListBox->ItemDrawer()->FormattedCellData();
-    const CFont *font = data->Font( aListBox->ItemDrawer()->Properties( 
-                                            aItemIndex ), aSubCellNumber );
-	
-	// Obtain the layout parameters for this element from the Avkon Layout
-
-    TAknLayoutText textLayout;
-    textLayout.LayoutText(aListBox->Rect() , 
-		AKN_LAYOUT_TEXT_List_pane_texts__menu_single__Line_1(aIcons));
-     
-	TRect rect = textLayout.TextRect();
-    TInt width = rect.Width();
-
-    TInt clipgap = data->SubCellTextClipGap( aSubCellNumber );
-
-	return AknTextUtils::ClipToFit( aText, *font, width,
-                                  aClipDirection, width + clipgap );
-    }
-
-//  End of File
--- a/locationsystemui/locationsysui/locutils/src/locutilsdebug.cpp	Mon May 03 12:54:42 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 debugging functions
-*
-*/
-
-
-
-// INCLUDE FILES
-#include "locutilsdebug.h"
-#include <flogger.h>
-#include <e32svr.h>
-// CONSTANTS
-
-/// Folder where the log resides
-_LIT( KLocLogFolder, "LocationSysUI" );
-
-/// The name of the log file
-_LIT( KLocLogFileName, "LocationsysUI" );
-
-/// The format in which the time is formatted in log
-_LIT( KLocLogTimeFormat, "%02d.%02d:%02d:%06d ");
-
-/// The length of the string produced by KLocLogTimeFormat
-const TInt KLocLogTimeFormatLength = 16;
-
-/// How many characters a log line can contain
-const TInt KLocLogLineLength = 256;
-
-// ========================== OTHER EXPORTED FUNCTIONS =========================
-
-
-// -----------------------------------------------------------------------------
-// Debug
-// Generates a log file if c:\logs\locationsysui\ folder exists
-// -----------------------------------------------------------------------------
-//
-EXPORT_C void Debug( TRefByValue<const TDesC> aText, ... )
-    {    
-    VA_LIST args;
-    VA_START( args, aText );
-    
-    TBuf<KLocLogLineLength> buf;
-    buf.FormatList( aText, args );
-
-    #ifdef _DEBUG
-    RDebug::Print(buf);
-    #endif
-
-    RFileLogger logger;
-    
-    TInt ret=logger.Connect();
-    if (ret==KErrNone)
-        {
-        logger.SetDateAndTime( EFalse,EFalse );
-        logger.CreateLog( KLocLogFolder, KLocLogFileName, EFileLoggingModeAppend );       
-        TBuf<KLocLogTimeFormatLength> timeStamp;
-        TTime now;
-        now.HomeTime();
-        TDateTime dateTime;
-        dateTime = now.DateTime();
-        timeStamp.Format( KLocLogTimeFormat, 
-            dateTime.Hour(), dateTime.Minute(),
-            dateTime.Second(), dateTime.MicroSecond() );
-        buf.Insert( 0, timeStamp );
-
-        logger.Write(buf);
-        }
-
-    logger.Close();
-
-    VA_END( args );
-    }
-
-//  End of File  
--- a/locationsystemui/locationsysui/locutils/src/locutilsdebugdummy.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,31 +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 dummy implementation for debugging function
-*
-*/
-
-
-#include "locutilsdebug.h"
-
-// ========================== OTHER EXPORTED FUNCTIONS =========================
-
-// -----------------------------------------------------------------------------
-// Debug
-// -----------------------------------------------------------------------------
-//
-EXPORT_C void Debug( TRefByValue<const TDesC> /*aText*/, ... )
-  {
-  }
-
-//  End of File  
--- a/locationsystemui/locationsysui/locverifier/BWINS/LocVerifierDlgu.def	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-EXPORTS
-	?NotifierArray@@YAPAV?$CArrayPtr@VMEikSrvNotifierBase2@@@@XZ @ 1 NONAME ; class CArrayPtr<class MEikSrvNotifierBase2> * NotifierArray(void)
-
--- a/locationsystemui/locationsysui/locverifier/eabi/LocVerifierDlgu.def	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-EXPORTS
-	_Z13NotifierArrayv @ 1 NONAME
-	_ZTI13CLpdBaseModel @ 2 NONAME ; #<TI>#
-	_ZTI13CLpdRequestAO @ 3 NONAME ; #<TI>#
-	_ZTI18CLpdVerifierPlugin @ 4 NONAME ; #<TI>#
-	_ZTI21CLpdQueryLauncherBase @ 5 NONAME ; #<TI>#
-	_ZTI21CLpdVerifNotifLBModel @ 6 NONAME ; #<TI>#
-	_ZTI22CLpdGlobalPluginDialog @ 7 NONAME ; #<TI>#
-	_ZTI22CLpdRequestorProcessor @ 8 NONAME ; #<TI>#
-	_ZTI25CLpdNotifierQueryLauncher @ 9 NONAME ; #<TI>#
-	_ZTI25CLpdVerifierQueryLauncher @ 10 NONAME ; #<TI>#
-	_ZTV13CLpdBaseModel @ 11 NONAME ; #<VT>#
-	_ZTV13CLpdRequestAO @ 12 NONAME ; #<VT>#
-	_ZTV18CLpdVerifierPlugin @ 13 NONAME ; #<VT>#
-	_ZTV21CLpdQueryLauncherBase @ 14 NONAME ; #<VT>#
-	_ZTV21CLpdVerifNotifLBModel @ 15 NONAME ; #<VT>#
-	_ZTV22CLpdGlobalPluginDialog @ 16 NONAME ; #<VT>#
-	_ZTV22CLpdRequestorProcessor @ 17 NONAME ; #<VT>#
-	_ZTV25CLpdNotifierQueryLauncher @ 18 NONAME ; #<VT>#
-	_ZTV25CLpdVerifierQueryLauncher @ 19 NONAME ; #<VT>#
-	_ZTI23CLpdMessagePluginDialog @ 20 NONAME
-	_ZTV23CLpdMessagePluginDialog @ 21 NONAME
-	_ZTI21CLpdPeriodicProcessor @ 22 NONAME ; #<TI>#
-	_ZTI23CLpdSUPLSettingsAdapter @ 23 NONAME ; #<TI>#
-	_ZTI28CLpdVerifierSettingsLauncher @ 24 NONAME ; #<TI>#
-	_ZTV21CLpdPeriodicProcessor @ 25 NONAME ; #<VT>#
-	_ZTV23CLpdSUPLSettingsAdapter @ 26 NONAME ; #<VT>#
-	_ZTV28CLpdVerifierSettingsLauncher @ 27 NONAME ; #<VT>#
-
--- a/locationsystemui/locationsysui/locverifier/ecom/locnotifierwrapper.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,153 +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:  Methods for Location notifier Ecom Plugins entry point
-*
-*/
-
-
-#include <ecom/implementationproxy.h>
-#include <AknNotifierWrapper.h> // link against aknnotifierwrapper.lib
-#include <lbs/epos_privacynotifier.hrh>
-
-#include "locnotifierwrapper.h"
-
-
-const MEikSrvNotifierBase2::TNotifierPriority KNotifierPriority =
-        MEikSrvNotifierBase2::ENotifierPriorityHigh;
-const TUid KNotifierChannel = { 0x100065ac };
-const TInt KMaxSynchReplyBufLength = 256;
-const TInt KPrivSrvSecureId = 0x10281D45;
-
-
-// ======== MEMBER FUNCTIONS ========
-
-// ---------------------------------------------------------------------------
-// CLocNotifierSecurityCheck::Release
-// This method will release all resources that have been allocated for
-// performing the custom security check.
-// ---------------------------------------------------------------------------
-//
-void CLocNotifierSecurityCheck::Release()
-    {
-    delete this;
-    }
-
-
-// ---------------------------------------------------------------------------
-// CLocNotifierSecurityCheck::CustomSecurityCheckL
-// This method performs the security check
-// ---------------------------------------------------------------------------
-//
-void CLocNotifierSecurityCheck::CustomSecurityCheckL(const RMessagePtr2& aMessage)
-    {
-    if (!aMessage.IsNull())
-        {
-		static _LIT_SECURITY_POLICY_S0(SidPolicy, KPrivSrvSecureId);
-		if (!SidPolicy().CheckPolicy(aMessage))
-			{
-			User::Leave(KErrPermissionDenied);
-			}
-        }
-    }
-    
-		
-// ======== LOCAL FUNCTIONS ========
-
-// ECom registration related methods
-
-// ---------------------------------------------------------------------------
-// Helper method to perform cleanup of the CArrayPtrFlat array object.
-// ---------------------------------------------------------------------------
-//
-void CleanupArray(TAny* aArray)
-    {
-    CArrayPtrFlat<MEikSrvNotifierBase2>*     
-        subjects=static_cast<CArrayPtrFlat<MEikSrvNotifierBase2>*>(aArray);
-    TInt lastInd = subjects->Count()-1;
-    for (TInt i=lastInd; i >= 0; i--)
-        subjects->At(i)->Release();	    	    
-    delete subjects;
-    }
-
-
-// ---------------------------------------------------------------------------
-// Creates an array of CAknCommonNotifierWrapper objects
-// ---------------------------------------------------------------------------
-//
-CArrayPtr<MEikSrvNotifierBase2>* DoCreateNotifierArrayL()
-    {
-    CArrayPtrFlat<MEikSrvNotifierBase2>* subjects=
-        new (ELeave)CArrayPtrFlat<MEikSrvNotifierBase2>(1);
-    
-    CleanupStack::PushL(TCleanupItem(CleanupArray, subjects));
-
-    CLocNotifierSecurityCheck* customSecurityImpl = 
-        new(ELeave) CLocNotifierSecurityCheck;
-    CleanupStack::PushL(customSecurityImpl);
-    
-    // Session owning notifier(if default implementation is enough)
-    CAknCommonNotifierWrapper* master = 
-        CAknCommonNotifierWrapper::NewL( TUid::Uid(KPosPrivacyNotifierImplUid),
-                                   KNotifierChannel,
-                                   KNotifierPriority,
-                                   _L("LocVerifierDlg.dll"),
-                                   KMaxSynchReplyBufLength);
-    // set the custom security handler.
-	
-    CleanupStack::Pop(customSecurityImpl);
-    // Control of customSecurityImpl transferred to CAknCommonNotifierWrapper
-    // object
-	master->SetCustomSecurityHandler(customSecurityImpl); 		   
-    subjects->AppendL( master );
-    CleanupStack::Pop(subjects);
-    return(subjects);
-    }
-
-
-// ---------------------------------------------------------------------------
-// Called to instantiate this ECOM Plugin implementation.
-// ---------------------------------------------------------------------------
-//
-CArrayPtr<MEikSrvNotifierBase2>* NotifierArray()
-    // old Lib main entry point
-    {
-    CArrayPtr<MEikSrvNotifierBase2>* array = NULL;
-    TRAPD(error, array = DoCreateNotifierArrayL());
-    if (error == KErrNone)
-    	{
-    	return array;
-    	}
-    else
-    	{
-    	return NULL;
-    	}
-    }
-
-const TImplementationProxy ImplementationTable[] =
-	{
-#ifdef __EABI__
-	{{0x10207243},(TFuncPtr)NotifierArray}
-#else
-	{{0x10207243},NotifierArray}
-#endif
-	};
-
-// ======== GLOBAL FUNCTIONS ========
-
-EXPORT_C const TImplementationProxy* ImplementationGroupProxy(TInt& aTableCount)
-	{
-	aTableCount = sizeof(ImplementationTable) / sizeof(TImplementationProxy) ;
-	return ImplementationTable;
-	}
-
--- a/locationsystemui/locationsysui/locverifier/group/ABLD.BAT	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-@ECHO OFF
-
-REM Bldmake-generated batch file - ABLD.BAT
-REM ** DO NOT EDIT **
-
-perl -S ABLD.PL "\sf\mw\locationsrv\locationsystemui\locationsysui\locverifier\group\\" %1 %2 %3 %4 %5 %6 %7 %8 %9
-if errorlevel==1 goto CheckPerl
-goto End
-
-:CheckPerl
-perl -v >NUL
-if errorlevel==1 echo Is Perl, version 5.003_07 or later, installed?
-goto End
-
-:End
--- a/locationsystemui/locationsysui/locverifier/group/bld.inf	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,34 +0,0 @@
-/*
-* Copyright (c) 2002-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: 
-*	 This file provides the information required for building the
-*    whole of a location application.
-*
-*/
-
-
-// To get the MW_LAYER_PLATFORM_EXPORT_PATH macro definitions
-#include <platform_paths.hrh>
-
-PRJ_PLATFORMS
-DEFAULT
-
-PRJ_EXPORTS
-
-
-PRJ_MMPFILES
-locverifierdlg.mmp
-locnotifierwrapper.mmp
-
-//  End of File
--- a/locationsystemui/locationsysui/locverifier/group/locnotifierwrapper.mmp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +0,0 @@
-/*
-* Copyright (c) 2004-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:  This is project specification file for the Location Notifier
-*									Ecom Plugins.
-*
-*/
-
-
-#include <platform_paths.hrh> // For the MW_LAYER_SYSTEMINCLUDE
-
-TARGET        	locnotifierwrapper.dll
-CAPABILITY 		All -TCB
-TARGETTYPE 		PLUGIN 
-
-VENDORID		VID_DEFAULT
-
-UID				0x10009D8D 0x10207242
-
-// System Include
-MW_LAYER_SYSTEMINCLUDE
-
-USERINCLUDE		. 
-USERINCLUDE		../inc
-USERINCLUDE             ../../loc
-
-SOURCEPATH		../ecom
-SOURCE  		locnotifierwrapper.cpp 
-
-SOURCEPATH      ../rss
-START RESOURCE  10207242.rss 
-TARGET          locnotifierwrapper.rsc
-END
-
-LIBRARY 		ecom.lib
-LIBRARY			aknnotifierwrapper.lib
-LIBRARY 		euser.lib
--- a/locationsystemui/locationsysui/locverifier/group/locverifierdlg.mmp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,89 +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 definition file for Location Verification Dialog
-*
-*/
-
-
-// INCLUDES
-#include "../inc/locverifieruid.h"
-#include <data_caging_paths.hrh>
-#include <platform_paths.hrh> // For the APP_LAYER_SYSTEMINCLUDE
-
-TARGET          locverifierdlg.dll
-TARGETTYPE      DLL
-UID             KNotifierUID2  KLocVerifierDlgUID3
-
-CAPABILITY 		CAP_ECOM_PLUGIN
-
-VENDORID		VID_DEFAULT
-
-SOURCEPATH      ../src
-SOURCE          lpdsuplsettingsadapter.cpp
-SOURCE			lpdverifierplugin.cpp
-SOURCE			lpdrequestao.cpp
-SOURCE			lpdrequestorprocessor.cpp
-SOURCE          lpdperiodicprocessor.cpp
-SOURCE			lpdverifiersettinglauncher.cpp
-SOURCE			lpdverifierquerylauncher.cpp
-SOURCE			lpdnotifierquerylauncher.cpp
-SOURCE			lpdbasemodel.cpp
-SOURCE			lpdverifnotiflbmodel.cpp
-SOURCE			lpdglobalplugindialog.cpp
-SOURCE			lpdmessageplugindialog.cpp
-SOURCE			lpdbkupevtlistenerao.cpp
-SOURCE			lpdquerylauncherbase.cpp
-SOURCE			lpddllmain.cpp
-SOURCE			lpdnotifreqinfo.cpp
-
-SOURCEPATH      ../rss
-START RESOURCE  locverifierdlg.rss
-HEADER
-TARGETPATH      RESOURCE_FILES_DIR
-LANGUAGE_IDS
-END
-
-// System Include
-APP_LAYER_SYSTEMINCLUDE
-
-USERINCLUDE     .
-USERINCLUDE		../inc
-USERINCLUDE		../../inc
-USERINCLUDE		../../../inc
-USERINCLUDE   ../../loc
-
-// EPos:
-LIBRARY			eposprvqnif.lib
-// Location:
-LIBRARY			locutils.lib
-// Symbian & Avkon:
-LIBRARY         euser.lib
-LIBRARY 		avkon.lib
-LIBRARY			eiksrvui.lib 
-LIBRARY			eikdlg.lib
-LIBRARY 		eikcoctl.lib
-LIBRARY			cone.lib 
-LIBRARY			eikcore.lib 
-LIBRARY			aknskins.lib
-LIBRARY 		egul.lib
-LIBRARY         commonengine.lib 		// StringLoader
-LIBRARY         apgrfx.lib 				// RApaLsSession
-LIBRARY         apparc.lib 				// TApaAppInfo
-LIBRARY         aknicon.lib 			// AvkonIconFileName
-LIBRARY         eposprvtyp.lib
-LIBRARY 		aknnotifierwrapper.lib
-LIBRARY         estor.lib bafl.lib
-LIBRARY		    epos_suplsettings.lib	// SUPL Settings API
-LIBRARY		    locsettingsuiclient.lib // Location Settings Launch API
-LIBRARY         flogger.lib
--- a/locationsystemui/locationsysui/locverifier/inc/locconsts.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,37 +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 constants
-*
-*/
-
-
-#ifndef __LOCCONSTS_H__
-#define __LOCCONSTS_H__
-
-// CONSTANTS
-
-// maximum listbox line length
-// however, use safe descriptor manamegent methods
-const TInt KLocLBLineMaxLen = 100;
-
-// maximum length of formatting characters in listbox line
-const TUint KLocLBItemFormatMaxLen = 18;   // formatting characters
-
-_LIT( KLocVerifierRscFileName, "LocVerifierDlg.rsc" );
-
-_LIT(KLocNotifierRscPath, "\\resource\\");
-#endif // __LOCCONSTS_H__
-
-// End of File
--- a/locationsystemui/locationsysui/locverifier/inc/locnotifierwrapper.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,61 +0,0 @@
-/*
-* Copyright (c) 2005-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:  This file contains the declarations for the Notifier Proxy.
-*
-*/
-
-
-#include <AknNotifierWrapper.h> // link against aknnotifierwrapper.lib
-
-#ifndef LOCNOTIFIERWRAPPER_H 
-#define LOCNOTIFIERWRAPPER_H
-
-
-/**
- *  The class to provide custom security check.
- *
- *  This class provides a custom security check that will be called whenever
- *  a Location notifier message is received by the UIKON Server.
- *
- *  @lib locnotifierwrapper.lib
- *  @since S60 v3.1
- */
- class CLocNotifierSecurityCheck : public CBase, 
-                                   public MAknNotifierCustomSecurityCheck
-    {
-    public: // from base class MAknNotifierCustomSecurityCheck
-    /**
-     * From MAknNotifierCustomSecurityCheck.
-     * This method will be called by the framework classes to free up all 
-     * resources that have been allocated while doing the security check.
-     *
-     * @since S60 v3.1
-     */
-    void Release();
-    
-    /**
-     * From MAknNotifierCustomSecurityCheck.
-     * This is the method that performs the Security check.
-     * It is called from the framework classes.
-     * This method Leaves with KErrPermissionDenied to indicate a check fail
-     *
-     * @since S60 v3.1
-     * @param aMessage Pointer the Notification request message.
-     */
-    void CustomSecurityCheckL(const RMessagePtr2& aMessage);
-    };
-
- 
-#endif //LOCNOTIFIERWRAPPER
-
--- a/locationsystemui/locationsysui/locverifier/inc/locverifierdlg.hrh	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,31 +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 declarations for constants of LocVerifierDlg.
-*                This file can be included in C++ or resource file.
-*
-*/
-
-#ifndef LOCVERIFIERDLG_HRH
-#define LOCVERIFIERDLG_HRH
-
-enum TLpdCommandIds
-    {
-    ELpdCmdEmergency = 0x06000,
-	ELpdCmdQuietExit
-    };
-
-
-#endif      // LOCVERIFIERDLG_HRH
-
-// End of File
\ No newline at end of file
--- a/locationsystemui/locationsysui/locverifier/inc/locverifierdlgdebug.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +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:  LocVerifierDlgDebug contains debug macros.
-*
-*/
-
-
-#ifndef LOCVERIFIERDLGDEBUG_H 
-#define LOCVERIFIERDLGDEBUG_H
-
-// INCLUDES
-#include <e32std.h>
-#include "locutilsdebug.h"
-
-// MACROS
-
-/**
-* By using component specific debug macros unnecessary 
-* debug prints can be avoided. 
-* Also component specific debugging is possible by compiling 
-* only certain components when LOC_ENABLE_DEBUG_PRINT is defined.
-*/
-
-#ifdef LOC_ENABLE_DEBUG_PRINT
-#define LOCVERIFIERDLGDEBUG(TEXT) DEBUG(TEXT);
-#define LOCVERIFIERDLGDEBUG1(TEXT, ARG1) LOC(TEXT, ARG1);
-#define LOCVERIFIERDLGDEBUG2(TEXT, ARG1, ARG2) LOC2(TEXT, ARG1, ARG2);
-#define LOCVERIFIERDLGDEBUG3(TEXT, ARG1, ARG2, ARG3) LOC3(TEXT, ARG1, ARG2, ARG3);
-#else
-#define LOCVERIFIERDLGDEBUG(TEXT);
-#define LOCVERIFIERDLGDEBUG1(TEXT, ARG1);
-#define LOCVERIFIERDLGDEBUG2(TEXT, ARG1, ARG2);
-#define LOCVERIFIERDLGDEBUG3(TEXT, ARG1, ARG2, ARG3);
-#endif
-
-#endif /* LOCVERIFIERDLGDEBUG_H */
--- a/locationsystemui/locationsysui/locverifier/inc/locverifieruid.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +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:  Common header for Location application UIDs.
-*
-*/
-
-
-#ifndef __LOCVERIFIERUID_H__
-#define __LOCVERIFIERUID_H__
-
-/// Location verifier dialog UID3
-#define KLocVerifierDlgUID3	0x101f84fc
-
-#define KNotifierUID2 0x101fdfae
-
-#endif // __LOCVERIFIERUID_H__
-
-// End of File
--- a/locationsystemui/locationsysui/locverifier/inc/lpdbasemodel.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,78 +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:  Model base class.
-*
-*/
-
-
-#ifndef CLPDBASEMODEL_H
-#define CLPDBASEMODEL_H
-
-//  INCLUDES
-#include <e32base.h>
-#include <bamdesca.h>
-
-// FORWARD DECLARATIONS
-class CLpdRequestorProcessor;
-class CLocRequestorUtilsResolver;
-
-// CLASS DECLARATION
-
-/**
-*  @lib locverifierdlg.dll
-*  @since 2.1
-*/
-class CLpdBaseModel : public CBase, public MDesCArray
-    {
-    public:  // Constructors and destructor
-        
-        /**
-        * Destructor.
-        */
-        virtual ~CLpdBaseModel();
-        
-    public: // Functions from base classes
-        
-        // Inherited from MDesCArray.
-        TPtrC16 MdcaPoint( TInt aIndex ) const;
-
-    protected: // New functions
-
-        // Leaving method, wrapped by MdcaPoint
-        virtual void MdcaPointL( TInt aIndex ) const = 0;
-
-    protected: // Constructors and destructors
-
-        /**
-        * C++ constructor.
-        */
-        CLpdBaseModel( const CLpdRequestorProcessor& aRtorProcessor );
-
-        /**
-        * By default Symbian 2nd phase constructor is private.
-        */
-        void BaseConstructL();
-
-    protected:    // Data
-        
-        const CLpdRequestorProcessor& iRtorProcessor;
-
-        HBufC* iBuffer; // owns
-
-        CLocRequestorUtilsResolver* iUtils; // owns
-    };
-
-#endif      // CLPDBASEMODEL_H   
-            
-// End of File
\ No newline at end of file
--- a/locationsystemui/locationsysui/locverifier/inc/lpdbkupevtlistenerao.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,96 +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:  Active object which listens to Backup / Restore Events
-*
-*/
-
-
-//  INCLUDES
-#include <e32base.h>
-#include <e32property.h>
-
-#ifndef CLPD_BKUPEVT_LISTENER_H
-#define CLPD_BKUPEVT_LISTENER_H
-
-//FORWARD DECLARATIONS
-class MLpdBkupEvtObserver;
-// CLASS DECLARATION
-
-/**
-*  Active object used by the verifier dialog. 
-*  Ensures that during backup / Restore start the dialog is closed
-*
-*  @lib locverifierdlg.lib
-*  @since 3.0
-*/
-NONSHARABLE_CLASS(CLpdBkupEvtListenerAO) : public CActive
-    {    
-	public: // Constructors and destructors        
-
-        /**
-        * Two-phased constructor.
-        * @param aDlg reference to the owner of this object
-        * @return created object
-        */
-	    static CLpdBkupEvtListenerAO* NewL( MLpdBkupEvtObserver& aDlg );        
-
-        /**
-        * Destructor.
-        */
-	    virtual ~CLpdBkupEvtListenerAO();
-
-    public: // New functions
-    
-    	/**
-    	* Start subscribing to Backup/Restore Events
-    	* Leaves in case the backup is already running
-    	*/
-    	void StartL();
-
-    private:
-
-	    /**
-        * Private C++ default constructor.
-        * @param aDlg reference to the owner of this object
-        */
-		CLpdBkupEvtListenerAO( MLpdBkupEvtObserver& aDlg ); 	    
-
-	    /**
-        * Private Symbian 2nd Phase constructor.
-        */
-		void ConstructL();
-		
-    private: // Functions from base classes
-        
-        /**
-        * From CActive.
-        */
-        void RunL();
-        
-        /**
-        * From CActive.
-        */
-        void DoCancel();
-    	
-    private: // Data
-
-        // Reference to backup event observer
-        MLpdBkupEvtObserver& iBkupObserver; // doesn't own   
-        // Reference to the Backup/Restore Property to Subscribe.
-        RProperty iProperty;  
-};
-
-#endif      // CLPD_BKUPEVT_LISTENER_H
-
-// End of File
--- a/locationsystemui/locationsysui/locverifier/inc/lpdbkupevtobserver.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,50 +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:  Callback interface class.
-*
-*/
-
-
-#ifndef MLPDBKUPEVTOBSERVER_H
-#define MLPDBKUPEVTOBSERVER_H
-
-// INCLUDES
-#include <e32def.h>
-#include <eiklbv.h>
-
-
-// CLASS DECLARATION
-
-/**
-*  Callback interface class.
-*  Implementor of this class gives a reference to itself when
-*  creating a global query dialog. A callback method is then
-*  called when the query is dismissed.
-*
-*  @lib locverifierdlg.lib
-*  @since 2.1
-*/
-class MLpdBkupEvtObserver
-    {
-    public:
-
-        /**
-        * Pure virtual callback method.
-        */
-        virtual void ExitDialogL() = 0;
-    };
-
-#endif  // MLPDBKUPEVTOBSERVER_H
-
-// End of File
--- a/locationsystemui/locationsysui/locverifier/inc/lpddlgobserver.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,53 +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:  Callback interface class.
-*
-*/
-
-
-#ifndef MLPDDLGOBSERVER_H
-#define MLPDDLGOBSERVER_H
-
-// INCLUDES
-#include <e32def.h>
-#include <eiklbv.h>
-
-
-// CLASS DECLARATION
-
-/**
-*  Callback interface class.
-*  Implementor of this class gives a reference to itself when
-*  creating a global query dialog. A callback method is then
-*  called when the query is dismissed.
-*
-*  @lib locverifierdlg.lib
-*  @since 2.1
-*/
-class MLpdDlgObserver
-    {
-    public:
-
-        /**
-        * Pure virtual callback method.
-        * @param aResult code of the query
-        * @param aCurrentIndex current item index
-        */
-        virtual void HandleDlgDismissedL( TInt aResult,
-                                          TInt aCurrentIndex) = 0;
-    };
-
-#endif  // MLPDDLGOBSERVER_H
-
-// End of File
\ No newline at end of file
--- a/locationsystemui/locationsysui/locverifier/inc/lpddllmain.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +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:  Dll entry point and plugin creation functions.
-*
-*/
-
-
-#ifndef CLPDDLLMAIN_H
-#define CLPDDLLMAIN_H
-
-// INCLUDES
-#include <e32base.h>
-#include <eiknotapi.h>
-
-
-// FUNCTION PROTOTYPES
-IMPORT_C CArrayPtr<MEikSrvNotifierBase2>* NotifierArray();
-
-#endif // CLPDDLLMAIN_H
-
-// End of File
--- a/locationsystemui/locationsysui/locverifier/inc/lpdglobalplugindialog.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,168 +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:  List query dialog suitable for verifier plug-in use.
-*
-*/
-
-
-#ifndef CLPDGLOBALPLUGINDIALOG_H
-#define CLPDGLOBALPLUGINDIALOG_H
-
-// INCLUDES
-#include <aknlistquerydialog.h>
-#include "lpdbkupevtobserver.h"
-
-// FORWARD DECLARATIONS
-class MLpdDlgObserver;
-class CLpdBkupEvtListenerAO;
-class MLpdBkupEvtObserver;
-
-// CLASS DECLARATION
-
-/**
-*  A list query dialog suitable for verifier plug-in use.
-*  Inherits from CAknListQueryDialog, utilizes MLpdDlgObserver
-*  for notifying when dialog is dismissed.
-*
-*  @lib locverifierdlg.lib
-*  @since 2.1
-*/
-class CLpdGlobalPluginDialog : public CAknListQueryDialog, public MLpdBkupEvtObserver
-	{
-    public:  // Constructors and destructor
-
-        /**
-        * Two-phased constructor.
-        * @param aCallBack is notified when dialog is dismissed
-        * @param aSelfPtr caller's ptr is set to null when dialog is deleted
-        * @param aSelected will contain selected items when available, i.e.
-        *                  since observer callback (in multiselectionlist)
-        * @return created object
-        */
-        static CLpdGlobalPluginDialog* NewL(
-                    MLpdDlgObserver& aCallBack,
-                    CLpdGlobalPluginDialog ** aSelfPtr,
-                    CListBoxView::CSelectionIndexArray* aSelected = NULL );
-
-		
-        /**
-        * C++ destructor.
-        */
-        virtual ~CLpdGlobalPluginDialog();
-
-    public: // Functions from base classes
-
-        /**
-        * From CAknDialog. Wrapper method for enabling better unit testing
-        * when using a stub implementation.
-        * @param aResourceId
-        */
-        void PrepareLC( TInt aResourceId );
-
-        /**
-        * Wrapper that suppresses application switching
-        * and call's base class RunLD().
-        */
-        TInt RunLD();
-
-        /**
-        * From CAknListQueryDialog.
-        * @param aKeyEvent
-        * @param aType
-        * @return EKeyWasConsumed if key was consumed by dialog
-        */
-        TKeyResponse OfferKeyEventL( const TKeyEvent& aKeyEvent,
-                                     TEventCode aType );
-
-		void HandleResourceChange(TInt aType);
-
-    public: // New functions
-
-        /**
-        * Sets header text of the dialog.
-        * It is intended to be called before executing the dialog.
-        * @param aText
-        */
-        void SetHeaderTextL( const TDesC& aText );
-
-        /**
-        * Allows exiting the dialog without user action.
-        * Can be called e.g. in case of timeout. Main reason for
-        * this method is that deleting a dialog is not a proper
-        * way to exit it. Calling this method causes
-        * MLpdDlgObserver::HandleDlgDismissedL() callback with
-        * EEikCmdExit result.
-        */
-        void ExitDialogL();
-
-        /**
-        * Similar as ExitDialogL(), but no callback method
-        * is called.
-        */
-        void ExitDialogQuietlyL();
-
-    protected: // Functions from base classes
-
-        /**
-        * From CAknListQueryDialog.
-        * @param aButtonId
-        * @return ETrue if dialog can be dismissed
-        */
-        TBool OkToExitL(TInt aButtonId);
-
-    private:  // Constructors and destructor
-
-        /**
-        * Symbian 2nd Phase Constructor.
-        */
-		void ConstructL();
-
-        /**
-        * C++ constructor.
-        * @param aCallBack is notified when dialog is dismissed
-        * @param aSelfPtr caller's ptr is set to null when dialog is deleted
-        * @param aSelected will contain selected items when available, i.e.
-        *                  since observer callback (in multiselectionlist)
-        */
-        CLpdGlobalPluginDialog(
-                    MLpdDlgObserver& aCallBack,
-                    CLpdGlobalPluginDialog ** aSelfPtr,
-                    CListBoxView::CSelectionIndexArray* aSelected );
-
-    private:    // Data
-
-        // Object which is notified when query is dismissed
-        MLpdDlgObserver& iCallBack;
-
-        // Holds the status of application switching
-        TBool iAppSwitchSuppressed;
-
-        // Contains indexes of selected item
-        CListBoxView::CSelectionIndexArray* iSelected; // does not own
-
-        // Caller's pointer to this query object is set to NULL
-        // when ExecuteLD destroys the object
-        CLpdGlobalPluginDialog** iSelfPtr;
-
-        // Index given to base class, not used
-        TInt iDummyIndex;
-        
-        // Reference to the Backup Event Listener
-        CLpdBkupEvtListenerAO* iBkupListener;
-        
-	};
-
-#endif      // CLPDGLOBALPLUGINDIALOG_H   
-            
-// End of File
--- a/locationsystemui/locationsysui/locverifier/inc/lpdmessageplugindialog.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,148 +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:  Message query dialog suitable for verifier plug-in use.
-*
-*/
-
-
-#ifndef CLPDMESSAGEPLUGINDIALOG_H
-#define CLPDMESSAGEPLUGINDIALOG_H
-
-// INCLUDES
-#include <aknmessagequerydialog.h>
-#include "lpdbkupevtobserver.h"
-
-// FORWARD DECLARATIONS
-class MLpdDlgObserver;
-class CLpdBkupEvtListenerAO;
-class MLpdBkupEvtObserver;
-
-// CLASS DECLARATION
-
-/**
-*  A message query dialog suitable for verifier plug-in use.
-*  Inherits from CAknMessageQueryDialog, utilizes MLpdDlgObserver
-*  for notifying when dialog is dismissed.
-*
-*  @lib locverifierdlg.lib
-*  @since 2.1
-*/
-class CLpdMessagePluginDialog : public CAknMessageQueryDialog, public MLpdBkupEvtObserver
-	{
-    public:  // Constructors and destructor
-
-        /**
-        * Two-phased constructor.
-        * @param aCallBack is notified when dialog is dismissed
-        * @param aSelfPtr caller's ptr is set to null when dialog is deleted
-        * @param aSelected will contain selected items when available, i.e.
-        *                  since observer callback (in multiselectionlist)
-        * @return created object
-        */
-        static CLpdMessagePluginDialog* NewL(
-                    MLpdDlgObserver& aCallBack,
-                    CLpdMessagePluginDialog ** aSelfPtr
-                    );
-
-		
-        /**
-        * C++ destructor.
-        */
-        virtual ~CLpdMessagePluginDialog();
-
-    public: // Functions from base classes
-
-        /**
-        * From CAknDialog. Wrapper method for enabling better unit testing
-        * when using a stub implementation.
-        * @param aResourceId
-        */
-        void PrepareLC( TInt aResourceId );
-
-        /**
-        * Wrapper that suppresses application switching
-        * and call's base class RunLD().
-        */
-        TInt RunLD();
-        
-
-		void HandleResourceChange(TInt aType);
-
-
-    public: // New functions
-
-        /**
-        * Allows exiting the dialog without user action.
-        * Can be called e.g. in case of timeout. Main reason for
-        * this method is that deleting a dialog is not a proper
-        * way to exit it. Calling this method causes
-        * MLpdDlgObserver::HandleDlgDismissedL() callback with
-        * EEikCmdExit result.
-        */
-        void ExitDialogL();
-
-        /**
-        * Similar as ExitDialogL(), but no callback method
-        * is called.
-        */
-        void ExitDialogQuietlyL();
-
-    protected: // Functions from base classes
-
-        /**
-        * From CAknListQueryDialog.
-        * @param aButtonId
-        * @return ETrue if dialog can be dismissed
-        */
-        TBool OkToExitL(TInt aButtonId);
-
-    private:  // Constructors and destructor
-
-        /**
-        * Symbian 2nd Phase Constructor.
-        */
-		void ConstructL();
-
-        /**
-        * C++ constructor.
-        * @param aCallBack is notified when dialog is dismissed
-        * @param aSelfPtr caller's ptr is set to null when dialog is deleted
-        * @param aSelected will contain selected items when available, i.e.
-        *                  since observer callback (in multiselectionlist)
-        */
-        CLpdMessagePluginDialog(
-                    MLpdDlgObserver& aCallBack,
-                    CLpdMessagePluginDialog ** aSelfPtr
-                   );
-
-    private:    // Data
-
-        // Object which is notified when query is dismissed
-        MLpdDlgObserver& iCallBack;
-
-        // Holds the status of application switching
-        TBool iAppSwitchSuppressed;
-
-        // Caller's pointer to this query object is set to NULL
-        // when ExecuteLD destroys the object
-        CLpdMessagePluginDialog** iSelfPtr;
-        
-        // Reference to the Backup Event Listener
-        CLpdBkupEvtListenerAO* iBkupListener;
-        
-	};
-
-#endif      // CLPDMESSAGEPLUGINDIALOG_H   
-            
-// End of File
--- a/locationsystemui/locationsysui/locverifier/inc/lpdnotifierquerylauncher.h	Mon May 03 12:54:42 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:  Class which handles the dialog and expiration timer.
-*
-*/
-
-
-#ifndef CLPDNOTIFIERQUERYLAUNCHER_H
-#define CLPDNOTIFIERQUERYLAUNCHER_H
-
-//  INCLUDES
-#include "lpdquerylauncherbase.h"
-#include <e32base.h>
-#include <lbs/epos_privacy.h>
-
-// FORWARD DECLARATIONS
-
-
-// CLASS DECLARATION
-
-/**
-*  Implements functionality for executing notifications.
-*
-*  @lib locverifierdlg.lib
-*  @since 2.1
-*/
-class CLpdNotifierQueryLauncher :
-public CLpdQueryLauncherBase
-    {
-    public:  // Constructors and destructor
-        
-        /**
-        * Two-phased constructor.
-        * @param aHandler of ther query result
-        * @return created object
-        */
-        static CLpdNotifierQueryLauncher* NewL( MLpdResultHandler& aHandler );
-        
-        /**
-        * Destructor. Call Cancel() first if you have launched a query.
-        */
-        virtual ~CLpdNotifierQueryLauncher();
-
-    public: // New functions
-
-        /**
-        * Prepares notification resources.
-        * @param aReason for notification
-        * @param aDecision that was applied to the request
-        * @param aCurrentRequest request id of current request
-        */
-        void PrepareNotificationResourcesL( TPosNotificationReason aReason,
-                                             TPosRequestDecision aDecision );
-        
-       /**
-        * Prepares notification resources for supl periodic request.
-        * @param aReason for notification
-        * @param aCurrentRequest request id of current request
-        */       
-        void PrepareSuplNotificationResourcesL( TPosNotificationReason aReason );
-
-        /**
-        * Prepares resources for error notification caused by
-        * privacy query cancellation. Otherwise similar to 
-        * PrepareNotificationResourcesL().
-        * @param aDecision that was applied to the request
-        * @param aCurrentRequest request id of current request
-        */
-        void PrepareCancelNotifResourcesL( TPosRequestDecision aDecision );
-
-      /**
-        * Prepares resources for error notification caused by
-        * privacy query cancellation in supl periodic request.
-        * Otherwise similar to PrepareNotificationResourcesL().
-        * @param aDecision that was applied to the request
-        * @param aCurrentRequest request id of current request
-        */
-        void PrepareSuplCancelNotifResourcesL( TPosRequestDecision aDecision );
-
-
-    protected: // Functions from base classes
-
-        /**
-        * From CLpdQueryLauncherBase, called when dialog is dismissed.
-        */
-        void ExtendedHandleDlgDismissedL();
-
-    private: // Constructors and destructors
-
-        /**
-        * C++ constructor.
-        * @param aHandler of the query result
-        */
-        CLpdNotifierQueryLauncher( MLpdResultHandler& aHandler );
-
-        /**
-        * By default Symbian 2nd phase constructor is private.
-        */
-        void ConstructL();
-
-    protected: // data
-
-    };
-
-#endif      // CLPDNOTIFIERQUERYLAUNCHER_H   
-            
-// End of File
--- a/locationsystemui/locationsysui/locverifier/inc/lpdnotifreqinfo.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,148 +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 class stores information regarding notification 
-*                requests.
-*
-*/
-
-
-#ifndef CLPDNOTIFREQINFO_H
-#define CLPDNOTIFREQINFO_H
-
-#include <lbs/epos_privacy.h>
-
-// Forward class declarations
-
-class RPosRequestorStack;
-
-/**
- *  Class to store information about Notification dialogs
- *
- *  If a notification query is already running, further requests for
- *  notification query will be ignored and the information will be lost.
- *  Instead the logic is to query these requests and show them to the
- *  user when the notification query is dismissed. This class is used to store
- *  information about each notification request.
- *
- *  @since S60 v3.0
- */
-NONSHARABLE_CLASS(CLpdNotifReqInfo) : public CBase
-    {
-
-public:
-
-    /**
-     * Symbian 2 Phase Constructor
-     * Ownership of the RequestorStack array is transferred to this class.
-     *
-     * @since S60 v3.0
-     * @param aSource     The Source of the Notification Request.
-     * @param aReason     The reason for cancellation request.
-     * @param aDecision   The decision by the network.
-     * @param aRequestors The array of requestors for this notification request.
-     * @return new instance of class CLpdNotifReqInfo
-     */
-    static CLpdNotifReqInfo* NewL(
-    	TPosRequestSource aSource,
-    	TPosVerifyCancelReason aReason,
-    	TPosRequestDecision aDecision,
-    	RPosRequestorStack* aRequestors);
-
-    /**
-     * Symbian 2 Phase Constructor
-     * Ownership of the RequestorStack array is transferred to this class.
-     *
-     * @since S60 v3.0
-     * @param aSource     The Source of the Notification Request.
-     * @param aReason     The reason for cancellation request.
-     * @param aDecision   The decision by the network.
-     * @param aRequestors The array of requestors for this notification request.
-     * @return new instance of class CLpdNotifReqInfo
-     */
-    static CLpdNotifReqInfo* NewLC(
-    	TPosRequestSource aSource,
-    	TPosVerifyCancelReason aReason,
-    	TPosRequestDecision aDecision,
-    	RPosRequestorStack* aRequestors);
-
-public:
-    /**
-     * Symbian virtual destructor
-     */
-    virtual ~CLpdNotifReqInfo();
-
-    /**
-     * Accessor Method
-     *
-     * @since S60 v3.0
-     * @return The Source of the Notification Request.
-     */
-    const TPosRequestSource& Source();
-
-    /**
-     * Accessor Method
-     *
-     * @since S60 v3.0
-     * @return The reason for cancellation request.
-     */
-    const TPosVerifyCancelReason& Reason();
-
-    /**
-     * Accessor Method
-     *
-     * @since S60 v3.0
-     * @return The decision by the network.
-     */
-    const TPosRequestDecision& Decision();
-
-    /**
-     * Accessor Method
-     *
-     * @since S60 v3.0
-     * @return The Array of Requestors.
-     */
-    const RPosRequestorStack& Requestors();
-
-private:
-
-    CLpdNotifReqInfo(
-    	TPosRequestSource aSource,
-    	TPosVerifyCancelReason aReason,
-    	TPosRequestDecision aDecision,
-    	RPosRequestorStack* aRequestors);
-
-    void ConstructL();
-
-private: // data
-
-    /**
-     * The Source of the Notification Request.
-     */
-    TPosRequestSource iSource;
-    /**
-     * The reason for cancellation request.
-     */
-    TPosVerifyCancelReason iReason;
-    /**
-     * The decision by the network.
-     */
-    TPosRequestDecision iDecision;
-    /**
-     * The array of requestors for this notification request.
-     * Own.
-     */
-	RPosRequestorStack* iRequestors;
-    };
-
-#endif // CLPDNOTIFREQINFO_H
--- a/locationsystemui/locationsysui/locverifier/inc/lpdperiodicprocessor.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,223 +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:  Helps retrieving request related information
-*
-*/
-
-
-#ifndef CLPDPERIODICPROCESSOR_H
-#define CLPDPERIODICPROCESSOR_H
-
-//  INCLUDES
-#include <EPos_CPosPrivacyNotifier.h>
-#include <lbs/epos_cposrequestor.h>
-#include "lpdsuplsettingsadapterobserver.h"
-
-
-// FORWARD DECLARATIONS
-class CEikonEnv;
-class CPosPrivacyNotifier;
-class CLpdVerifierSettingsLauncher;
-class CLpdSUPLSettingsAdapter;
-
-
-static TInt LinkClickedL(TAny* aPtr);
-
-// CLASS DECLARATION
-
-/**
- * Observer for the Periodic request. This will notify incase there
- * is change in periodic request contents
- * @lib locverifierdlg.lib
- * @since S60 v9.2tb
- */
-class MLpdPeriodicRequestObserver
-    {
-    public:
-            
-        /**
-         * Called when a change has been detected in the period
-         * request contents.
-         *
-         */
-        virtual void UpdateCurrentNotifierL( ) = 0;
-
-    };
-    
-/**
-*  This class processes and retreives information related to the request based on id
-*  @lib locverifierdlg.dll
-*  @since 2.1
-*/
-class CLpdPeriodicProcessor : public CBase, 
-                        public MLpdSUPLSettingsAdapterObserver
-    {
-    public:  // Constructors and destructor
-        
-        /**
-        * Two-phased constructor.
-        * @return created object
-        */
-        static CLpdPeriodicProcessor* NewL( MLpdPeriodicRequestObserver& aObserver );
-        
-        /**
-        * Two-phased constructor.
-        * @return created object
-        */
-        static CLpdPeriodicProcessor* NewLC( MLpdPeriodicRequestObserver& aObserver );
-        
-        /**
-        * Destructor.
-        */
-        virtual ~CLpdPeriodicProcessor();
-
-    public: // New functions
-    
-        /**
-        * Sets the Request Id to process
-        * @param aRequestorId periodic Request Id / Session Id
-        * @return ETrue if all requestor id's were valid, EFalse otherwise.
-        */
-        void SetSessionIdL( TInt64 aSessionId );
-        
-        /**
-         * Sets the requestor name parameter
-         * @param aRequestorName Requestor's name
-         */
-        void SetRequestorNameL( HBufC* aRequestorName);
-        
-        /**
-        * Gets the current Session Id
-        */
-        
-        TInt64 GetSessionId( );
-        
-        /**
-        * Sets the Request Type of process
-        * @param aRequestType Notification / Query Type
-        */
-        
-        void SetRequestTypeL( CPosPrivacyNotifier::TRequestType aRequestType );
-        
-         /**
-        * Sets the request id of the current request
-        * @param aRequestId Id of request
-        */
-      
-      
-       void SetRequestorIdL( TInt32 aRequestorId );
-
-      
-        /**
-        * Sets the Requestor to process
-        * @param aRequestor periodic Requestor
-        */
-       void SetRequestorL( CPosRequestor* aRequestor );
-       
-       /**
-        * Resets member variables
-        */
-       void ResetParameters();
-        
-	    /**
-        * Prepares to set the message text in notification dialog
-        */       
-        void NotificationMessageTextL( HBufC*& aMessageText);
-
-	    /**
-        * Resets requestor arrays and destroys requestor objects.
-        */
-        TCallBack LinkCallBack();
-        
-        /**
-        * Launches the Settings Ui for showing Supl periodic/Session details
-        */
-	    void LaunchSettingsL();
-	    
-	    
- 
-     public: // 
-
-        /**
-        * Inherited from MLpdSUPLSettingsAdapterObserver.
-        */
-        void UpdateSessionL( TInt64 aSessionId );
-               
-    protected: // Constructors and destructors
-
-        /**
-        * C++ constructor.
-        */
-        CLpdPeriodicProcessor( MLpdPeriodicRequestObserver& aObserver );
-       
-    
-    protected: // New methods
-        
-        /**
-          * Handles assert errors. Panics in debug build and leaves in
-          * release build, as this component runs in EikSrv 
-          * and must never panic  
-          */
-        void HandleAssertErrorL() const;
-
-    private:
-    		void ConstructL();
-    		
-    		void GetResourceAndPeriodL( TUint aSeconds, 
-    		                                    TInt& aResourceId, TDes& aPeriodString );
-    		void GetMessageStringL( HBufC*& aMessageString, 
-    		                    TInt& aResourceId, TDesC& aNameString, TDesC& aPeriodString );
-    		
-
-        
-    protected: //Data
-    
-        
-    private: //Data
-    
-    // Observer for the current request
-    MLpdPeriodicRequestObserver& iObserver;
-        
-    // Message Text to be displayed in Message Query control
-    HBufC* iMessageText; //Owns
-        
-    HBufC* iRequestorName;
-   
-	  // Current session id
-    TInt64 iSessionId; //Owns
-    
-    // Current Request Id
-    TInt iRequestorId;
-    
-    // Current Request Type
-    CPosPrivacyNotifier::TRequestType iRequestType;
-    
-    CPosRequestor::TRequestType iRequestorType;
-   
-    CLpdSUPLSettingsAdapter* iSUPLSettingsAdapter;
- 
-    // Settings Launcher
-    CLpdVerifierSettingsLauncher* iVerifierSettingsLauncher; //Owns
-   
-    // Current Request's Requestor
-    // :Owns
-    CPosRequestor* iRequestor;
-        
-    CEikonEnv* iEikEnv;
-        
-    };
-
-#endif      // CLPDPERIODICPROCESSOR_H   
-            
-// End of File
--- a/locationsystemui/locationsysui/locverifier/inc/lpdperiodicreqinfo.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,70 +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: Periodic info structure
-*
-*/
-
-
-#ifndef CLPDPERIODICREQINFO_H
-#define CLPDPERIODICREQINFO_H
-
-#include <e32base.h>
-#include <EPos_CPosPrivacyNotifier.h>
-
-/**
-*  Periodic info structure to Que.
-*
-*  @since S60 9.2tb
-*/
-class TLpdPeriodicReqInfo
-    { 
-    public :        
-		/**
-        * Copy constructor
-        */
-        TLpdPeriodicReqInfo(TPosQNRequestId aPrivacyId, TInt64 aSUPLSessionId)
-	        {
-	        iPrivacyId = aPrivacyId;
-	        iSUPLSessionId = aSUPLSessionId;
-	        };
-			
-		/**
-        * inline function used for comparision
-        */
-        static inline TInt MatchSession(const TLpdPeriodicReqInfo& aFirst, const TLpdPeriodicReqInfo& aSecond)
-            {
-            if ( aFirst.iSUPLSessionId == aSecond.iSUPLSessionId )
-                return 1;
-            return 0;
-            };
-            
-        /**
-        * inline function used for comparision
-        */
-        static inline TInt MatchPrivacy(const TLpdPeriodicReqInfo& aFirst, const TLpdPeriodicReqInfo& aSecond)
-            {
-            if ( aFirst.iPrivacyId == aSecond.iPrivacyId )
-                return 1;
-            return 0;
-            };
-			
-    public :
-		// Periodic Notification Request Information like TPosQNRequestId and SUPLSessionId
-    	TPosQNRequestId iPrivacyId;
-    	TInt64 iSUPLSessionId;
- };
-
-#endif //CLPDPERIODICREQINFO_H
-
-// End of File
--- a/locationsystemui/locationsysui/locverifier/inc/lpdquerylauncherbase.h	Mon May 03 12:54:42 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:  Abstract base class for queries.
-*
-*/
-
-
-#ifndef CLPDQUERYLAUNCHERBASE_H
-#define CLPDQUERYLAUNCHERBASE_H
-
-//  INCLUDES
-#include <e32base.h>
-#include <badesca.h>
-#include <coemain.h>
-#include <AknsItemID.h>
-#include <AknQueryDialog.h>
-#include <EPos_CPosPrivacyNotifier.h>
-
-
-// SYSTEM INCLUDE
-
-#include "lpddlgobserver.h"
-// FORWARD DECLARATIONS
-class CLpdGlobalPluginDialog;
-class CLpdMessagePluginDialog;
-class MLpdResultHandler;
-class CEikFormattedCellListBox;
-class CEikonEnv;
-
-    
-// CLASS DECLARATION
-
-/**
-*  Base class which handles the dialog and expiration timer.
-*  Expiration timer can be used to ensure that if the user doesn't handle
-*  a dialog in certain time the dialog is closed. NOTE: In current
-*  implementation the timer is not started, i.e. dialogs never expire.
-*  Implementations of this class should notify a result handler
-*  when dialog result is available. This base class takes care of
-*  notifying possible timeout with KErrTimedOut.
-*
-*  @lib locverifierdlg.lib
-*  @since 2.1
-*/
-class CLpdQueryLauncherBase : public CBase, public MLpdDlgObserver
-    {
-    public:  // Constructors and destructor
-                
-        /**
-        * Destructor. Exits possibly running dialog without callback.
-        */
-        virtual ~CLpdQueryLauncherBase();
-
-    public: // New functions, query setup and launching
-
-        /**
-        * Method for creating a query dialog object and reading its
-        * resources. Can and must be called once before launching.
-        * @param aResourceId
-        * @param aSuplNotifRequest Specifies if periodic notification request or not
-        */
-        virtual void PrepareQueryResourcesL( TInt aResourceId, TInt aSuplNotifRequest );
-
-        /**
-        * Method for setting text array.
-        * @param aArray listbox array, ownership is transferred
-        */
-        virtual void SetQueryTextArray( MDesCArray* aArray );
-
-        /**
-        * Method for setting message text for Message Query dialog.
-        */
-		virtual void SetMessageQueryTextL( const TDesC& aString, TCallBack aCallBack );
-		
-        /**
-        * Method for launching query, note that it must have been
-        * correctly prepared first.
-        */
-        virtual void StartQueryL();
-
-       /**
-        * Method for launching query for supl periodic request
-        * note that it must have been correctly prepared first.
-        */
-        virtual void StartSuplPeriodicQueryL();
-
-    public: // Other new functions
-
-        /**
-        * This method returns indexes of selected listbox items.
-        * Return value is valid after dialog has been finished
-        * (not cancelled) and new one has not yet been started.
-        * @return selected item indexes, ownership is not transferred
-        */
-        const CListBoxView::CSelectionIndexArray* SelectionIndexes() const;
-
-        /**
-        * Static timeout callback needed by the expiration timer.
-        * @param aThis, see TCallBack documentation
-        * @return always KErrNone
-        */
-        static TInt HandleTimeoutCallback( TAny* aThis );
-        
-
-        /**
-        * Method for cancelling query. Client classes can call this
-        * method if query canceling is needed.
-        */
-        void Cancel();
-        
-  
-        void CancelQuietly();
-
-        /**
-        * Returns a reference to the listbox (for formatting purposes).
-        * Leaves if listbox is NULL.
-        * @return listbox reference
-        */
-        CEikFormattedCellListBox& ListBoxL();
- 
-        /**
-         * Sets the requestor buffer array that needs to be published to
-         * Cover UI
-         * @param aRequestorBuffer Flat buffer containing the list of requestors
-         */
-        void SetRequestorBuffer( TDes8&     aRequestorBuffer );
-     
-        /**
-         * Sets the Cover UI Command ID
-         * @param aCommandId Cover UI Command
-         */
-        void SetCoverUICommand( TInt        aCommand );
-        
-
-    public: // Functions from base classes
-
-        /**
-        * From MLpdDlgObserver, called when dialog is dismissed.
-        * This method calls also pure virtual method
-        * ExtendedHandleDlgDismissedL().
-        * @param aResult code of the query
-        * @param aCurrentIndex current item index
-        */
-        void HandleDlgDismissedL( TInt aResult, TInt aCurrentIndex);
-
-    protected: // Constructors and destructors
-
-        /**
-        * C++ constructor.
-        * @param aHandler of the query result
-        */
-        CLpdQueryLauncherBase( MLpdResultHandler& aHandler );
-
-        /**
-        * Symbian 2nd phase constructor.
-        */
-        void BaseConstructL();
-
-    protected: // New functions
-
-        /**
-        * This pure virtual method must be implemented
-        * by the derived class to handle the result code
-        * appropriately and to notify the observer of this
-        * class.
-        */
-        virtual void ExtendedHandleDlgDismissedL() = 0;
-
-    private: // New functions
-
-        /**
-        * Internal method for handling timeout, called from static
-        * TCallBack method.
-        */
-        void HandleTimeout();
-        
-        /**
-        * General internal method for exiting query, called by Cancel() or
-        * HandleTimeout(), or from the destructor.
-        * @param aCallback ETrue if callback from the dialog is wanted.
-        */
-        void ExitQuery( TBool aCallback );
-   
-     
-        /**
-         * Prepare the requestor buffers and Publish the dialog to the 
-         * Cover UI
-         *
-         */
-        void PublishDialogtoCoverL();
-
-
-    protected: // Data
-
-        // Reference to the result handler
-        MLpdResultHandler& iHandler;
-
-        // Result code from the dialog
-        TInt iResult;
-
-        // Current listbox item when dialog dismiss occurred
-        TInt iCurrentIndex;
-
-        // Selected listbox items when dialog dismiss occurred
-        CListBoxView::CSelectionIndexArray* iSelectionIndex; // owns
-        
-        // Exit reason in case of result code EAknSoftkeyExit
-        TInt iExitReason;
-
-        // Indicates whether this object owns the QueryDlg or
-        // whether it is given away
-        TBool iOwnsQueryDlg;
-       
-        // Indicates whether this object owns the msgQueryDlg or
-        // whether it is given away 
-        TBool iOwnsMsgQueryDlg;
-
-        // Pointer to the list query dialog
-        CLpdGlobalPluginDialog* iQueryDlg; // owns untils RunLD() called
-        
-        // Pointer to the message query dialog
-        CLpdMessagePluginDialog* iMsgQueryDlg;
-
-        // Expiration timer, not started in current implementation
-        CPeriodic* iTimer; // owns
-        
-        TPtrC8     iRequestorBuffer;
-        
-        TInt       iCoverUiCommand;                        
-        
-    };
-
-#endif      // CLPDQUERYLAUNCHERBASE_H   
-            
-// End of File
--- a/locationsystemui/locationsysui/locverifier/inc/lpdrequestao.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,107 +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:  Active object which ensures that current call stack is run to
-*                completion before a new request is handled
-*
-*/
-
-
-#ifndef CLPDREQUESTAO_H
-#define CLPDREQUESTAO_H
-
-//  INCLUDES
-#include <e32base.h>
-#include <lbs/epos_privacy.h>
-
-#include "lpdnotifreqinfo.h"
-
-// FORWARD DECLARATIONS
-class CLpdVerifierPlugin;
-class RPosRequestorStack;
-
-// CLASS DECLARATION
-
-/**
-*  Active object used by the verifier plugin. 
-*  Ensures that current call stack is run to completion before a 
-*  new request is handled. Otherwise access violations might occur.
-*
-*  @lib locverifierdlg.lib
-*  @since 2.1
-*/
-class CLpdRequestAO : public CActive
-    {    
-	public: // Constructors and destructors        
-
-        /**
-        * Two-phased constructor.
-        * @param aPlugin reference to the owner of this object
-        * @return created object
-        */
-	    static CLpdRequestAO* NewL( CLpdVerifierPlugin& aPlugin );        
-
-        /**
-        * Destructor.
-        */
-	    virtual ~CLpdRequestAO();
-
-    public: // New functions
-
-        /**
-        * Issues a request and completes it immediatelly, so that it
-        * will be handled as soon as previous request is run to completion.
-        */
-        void ScheduleRequest();
-
-        /**
-        * To Queue up further verification cancel requests when a notification
-        * request is currently running.
-        */
-		void EnqueueRequestL( TPosRequestSource aSource,
-						     TPosVerifyCancelReason aReason,
-			 			     TPosRequestDecision aDecision,
-			 			     RPosRequestorStack* aRequestors );
-		
-    private:
-
-	    /**
-        * Private C++ default constructor.
-        * @param aPlugin reference to the owner of this object
-        */
-		CLpdRequestAO( CLpdVerifierPlugin& aPlugin ); 	    
-
-    private: // Functions from base classes
-        
-        /**
-        * From CActive.
-        */
-        void RunL();
-        
-        /**
-        * From CActive.
-        */
-        void DoCancel();
-    	
-    private: // Data
-
-        // Verifier plugin
-        CLpdVerifierPlugin& iPlugin; // doesn't own     
-
-		// Queue of Notification Request with all the necesary information.        
-        RPointerArray<CLpdNotifReqInfo> iNotificationQue;
-};
-
-#endif      // CLPDREQUESTAO_H
-
-// End of File
\ No newline at end of file
--- a/locationsystemui/locationsysui/locverifier/inc/lpdrequestorprocessor.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,161 +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:  Processes requestor related data.
-*
-*/
-
-
-#ifndef CLPDREQUESTORPROCESSOR_H
-#define CLPDREQUESTORPROCESSOR_H
-
-//  INCLUDES
-#include "locrequestorutilsresolver.h"
-#include <e32base.h>
-#include <eiklbv.h>
-#include <lbs/epos_rposrequestorstack.h>
-
-// FORWARD DECLARATIONS
-class CPosPrivacyNotifier;
-class CEikFormattedCellListBox;
-class CSelectionIndexArray;
-class CListBoxView;
-class CLpdBaseModel;
-
-// CLASS DECLARATION
-
-/**
-*  This class reads, processes and owns requestor data.
-*  @lib locverifierdlg.dll
-*  @since 2.1
-*/
-class CLpdRequestorProcessor : public CBase
-    {
-    public:  // Constructors and destructor
-        
-        /**
-        * Two-phased constructor.
-        * @return created object
-        */
-        static CLpdRequestorProcessor* NewL();
-        
-        /**
-        * Destructor.
-        */
-        virtual ~CLpdRequestorProcessor();
-
-    public: // New functions
-
-        /**
-        * Reads requestor information from the privacy notifier.
-        * Uses RequestorIdValid() for id validity check.
-        * Calls UpdateRuleRequestorsL().
-        * @param aPosNotifier reference
-        * @return ETrue if all requestor id's were valid, EFalse otherwise.
-        */
-        TBool ReadRequestorsL( const CPosPrivacyNotifier& aPosNotifier );
-
-        /**
-        * Returns requestor array for reading.
-        * @return array of requestors
-        */
-        const RPointerArray<CPosRequestor>& Requestors() const;
-       
-       /**
-        * Sets Type of Request
-        */
-        void CLpdRequestorProcessor::SetRequestType( TInt aReqType );
-
-        /**
-        * Resets requestor arrays and destroys requestor objects.
-        */
-        void ResetAndDestroyRequestors();
-
-        /**
-        * Method for creating a formatted array with
-        * icons and requestor names.
-        * Used for verifier queries and notifications.
-        * @param aListBox needed for formatting data
-        * @return created array, ownership is transferred to caller
-        */
-        CLpdBaseModel* RtorNamesForVerifNotifL(
-                        CEikFormattedCellListBox& aListBox );
-
-		/**
-		* In case where the verifcation cancellation event is queued, it
-		* is necessary to retrieve all the information needed for the
-		* notification dialog. The information is present in the base class
-		* of Query and Notification Interface.
-		*/
-		RPosRequestorStack* RetrieveRequestorsL( 
-						const CPosPrivacyNotifier& aPosNotifier );
-
-
-		/**
-		* Read the requestors into the iRequestors memeber variable.
-		* Process the requestors by resolving them with contacts information.
-		* CLocRequestorUtilsResolver is used to resolve the requestors.
-		*/
-		void ReadRequestorsL( 
-						const RPosRequestorStack& aRequestors );
-						
-       /**
-		* Retrieves Requestor name from string passed
-		*/
-        TPtrC RetrieveRequestorNameL(  
-                                    const TDesC& aString );
-       /**
-		* Retrieves session id from string passed
-		*/
-        TInt64 RetrieveSessionId(  
-                              const TDesC& aString );
-        /**
-		* Sets session id of request
-		*/
-        void SetSessionId( TInt64 aSessionId );
-        
-        /**
-		* Gets session id of request
-		*/
-        TInt64 GetSessionId();
-
-
-		
-    protected: // Constructors and destructors
-
-        /**
-        * C++ constructor.
-        */
-        CLpdRequestorProcessor();
-
-    protected: // New methods
-
-        /**
-        * Handles assert errors. Panics in debug build but leaves in release
-        * build, as this component runs in EikSrv and must never panic.
-        */
-        void HandleAssertErrorL() const;
-
-    private:    // Data
-
-		// Array of currently handled requestors...
-        RPointerArray<CPosRequestor> iRequestors;
-        
-        TInt iSuplRequest;
-
-        TInt64 iSessionId;
-    };
-
-#endif      // CLPDREQUESTORPROCESSOR_H   
-            
-// End of File
\ No newline at end of file
--- a/locationsystemui/locationsysui/locverifier/inc/lpdresulthandler.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,66 +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:  Callback interface class.
-*
-*/
-
-
-#ifndef MLPDRESULTHANDLER_H
-#define MLPDRESULTHANDLER_H
-
-// INCLUDES
-#include <e32def.h>
-
-// FORWARD DECLARATIONS
-class CLpdQueryLauncherBase;
-
-
-// CLASS DECLARATION
-
-/**
-*  Observer pattern for handling dialog result. Used by several
-*  classes deriving from CLpdQueryLauncherBase.
-*
-*  @lib locverifierdlg.lib
-*  @since 2.1
-*/
-class MLpdResultHandler
-    {
-    public: // New functions
-
-        /**
-        * Pure virtual observer method.
-        * @param aResultCode
-        */        
-        virtual void HandleVerificationResultL( TInt aResultCode ) = 0;
-
-        /**
-        * Pure virtual observer method.
-        * @param aResultCode
-        */        
-        virtual void HandleNotificationResultL( TInt aResultCode ) = 0;
-
-        /**
-        * Pure virtual observer method. Called if leave occurred in other
-        * callback methods. Used because it is not acceptable to propagate
-        * leave to AVKON dialog, plugin must clean up and continue with
-        * handling of request queue.
-        * @param aError code
-        */        
-        virtual void HandleLeave( TInt aError ) = 0;
-    };
-
-#endif      // MLPDRESULTHANDLER_H   
-            
-// End of File
--- a/locationsystemui/locationsysui/locverifier/inc/lpdsuplsettingsadapter.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,106 +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:  Adapter to the SUPL Settings API
-*
-*/
-
-
-#ifndef CLPDSUPLSETTINGSADAPTER_H_
-#define CLPDSUPLSETTINGSADAPTER_H_
-
-// System Includes
-#include <e32base.h>
-#include <epos_csuplsettingparams.h>		// class CServerParams
-#include <epos_csuplsettings.h>				// class CSuplSettings
-#include <epos_msuplsessionobserver.h>
-
-// User Includes
-
-// Forward Declarations
-class MLpdSUPLSettingsAdapterObserver;
-
-// Class Declaration
-
-/**
- * Adapter class for the SUPL settings API. Handles all the interfacing
- * functionality to the SUPL Settings API. It also observes for the Session
- * changes communicated through the MSuplSessionObserver
- */
-class CLpdSUPLSettingsAdapter : public CBase, public MSuplSessionObserver
-    {             
-    public:
-        /**
- 		 * Static Two phase contructor that instantiates the CLpdSUPLSettingsAdapter
-		 * 
-		 * @param aObserver				    Observer to the SUPL session change
-		 * @return CLpdSUPLSettingsAdapter*	Reference to the object created
-		 */
-        static CLpdSUPLSettingsAdapter* NewL(
-                            MLpdSUPLSettingsAdapterObserver&    aObserver );
-
-        /**
-         * Destructor
-         */
-        virtual ~CLpdSUPLSettingsAdapter();
-
-    private:
-        /**
-         * Private Constructor
-         */
-        CLpdSUPLSettingsAdapter( MLpdSUPLSettingsAdapterObserver&    aObserver );
-
-        /**
-         * Second phase of the two phase constructor
-         */
-        void ConstructL();
-        
-        
-
-
-              	
-	public:
-	    /** 
-	     * Inherited from MSuplSessionObserver
-	     */	
-		void HandleSuplSessionChangeL( 
-                TSuplSessionEventType aEvent,
-                TInt64 aSessionId                         
-        		);	
-        
-         /** 
-	     * Gets time period of a trigger based on session id
-	     */		
-        void GetTriggerPeriodL( TInt64 aSessionId, TUint& aTimePeriod );
-    				
-        
-
-    private:
-        
-        /**
-         * Observer for the specific SUPL session.
-         * Does not own.
-         */
-		MLpdSUPLSettingsAdapterObserver& iObserver;
-		
-        /**
-         * SUPL Settings UI
-         * Owns
-         */
-        CSuplSettings*                      iSUPLSettings;
-                
-    };
-
-#endif      // CLPDSUPLSETTINGSADAPTER_H_
-
-// End of File
--- a/locationsystemui/locationsysui/locverifier/inc/lpdsuplsettingsadapterobserver.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +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:  Observer for the SUPL Settings adapter
-*
-*/
-
-
-#ifndef MLPDSUPLSETTINGSADAPTEROBSERVER_H_
-#define MLPDSUPLSETTINGSADAPTEROBSERVER_H_
-
-// Class Declaration
-
-/**
- * Observer for the SUPL Session. The observer provides callbacks for
- * any changes in the SUPL session
- *
- * @lib locverifierdlg.lib
- * @since S60 v9.2tb 
- */
-class MLpdSUPLSettingsAdapterObserver
-    {
-    public:
-        	
-        /**
-         * Called when a change has been detected in the SUPL Session 
-         * identified by the session id parameter.
-         * @param aSessionId Updated Session Id.
-         *
-         */
-        virtual void UpdateSessionL( TInt64 aSessionId ) = 0;
-
-    };
-
-#endif      // MLPDSUPLSETTINGSADAPTEROBSERVER_H_  
-            
-// End of File
--- a/locationsystemui/locationsysui/locverifier/inc/lpdverifierplugin.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,325 +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:  Verifier plug-in which derives from CPosPrivacyNotifier.
-*
-*/
-
-
-// INCLUDES
-
-#include <EPos_CPosPrivacyNotifier.h>
-#include <lbs/epos_privacy.h>
-#include <lbs/epos_cposrequestor.h>
-
-
-#include "lpdrequestao.h"
-#include "lpdresulthandler.h"
-#include "lpdperiodicreqinfo.h"
-#include "lpdperiodicprocessor.h"
-
-
-#ifndef CLPDVERIFIERDLG_H
-#define CLPDVERIFIERDLG_H
-
-// SYSTEM INCLUDE
-#include <bldvariant.hrh>               // For the 3.2 Flag
-
-
-// FORWARD DECLARATIONS
-class CLpdVerifierQueryLauncher;
-class CLpdNotifierQueryLauncher;
-class CEikonEnv;
-class CLpdRequestorProcessor;
-class RPosRequestorStack;
-class CLocRequestorUtilsResolver;
-class CLpdPeriodicProcessor;
-
-
-// CLASS DECLARATION
-
-/**
-*  Verifier plug-in which derives from CPosPrivacyNotifier.
-*  Notifiers are based on RNotifier framework, and this particular
-*  notifier is used to launch a privacy query for accepting/rejecting
-*  privacy requests. It also shows informational notes and error
-*  messages, which are received as notification.
-*
-*  @lib locverifierdlg.lib
-*  @since 2.1
-*/
-class CLpdVerifierPlugin : public CPosPrivacyNotifier, public MLpdResultHandler,
-                                             public MLpdPeriodicRequestObserver
-    {
-    // To allow calls to HandleNextRequest() from active object
-    friend class CLpdRequestAO;
-    
-    private:
-
-        /**
-         * Enumeration for defining the type of Verification or notification
-         * request
-         */
-        enum TDialogType
-            {
-            EVerificationRequest,
-            ENotification,
-            ENotificationTimeout,
-            ECancelNotification,
-            ESuplPeriodicNotification,
-            };
-
-    public:  // Constructors and destructor
-        
-        /**
-        * Two-phased constructor.
-        * @return created object
-        */
-        static CLpdVerifierPlugin* NewL();
-        
-        /**
-        * Destructor.
-        */
-        virtual ~CLpdVerifierPlugin();
-
-		/**
-		* To popup a notification note for verification cancellation event.
-		*/
-		void NotifyCancellationL(
-			TPosRequestSource aSource,
-			TPosVerifyCancelReason aReason,
-			TPosRequestDecision aDecision,
-			const RPosRequestorStack& aRequestors );
-
-        /**
-        * Method for cancelling query or freeing
-        * resources after finishing query.
-        */
-        void FreeQueryResources();
-
-    public: // Functions from base classes
-
-        /**
-        * From CPosPrivacyNotifier, called when a new request arrives.
-        * @param aRequestId identifier of received request
-        */
-        void HandleNewRequestL( TPosQNRequestId aRequestId );
-
-        /**
-        * From CPosPrivacyNotifier, called when request has been cancelled
-        * @param aRequestId identifier of cancelled request
-        */
-        void HandleRequestCancelled( TPosQNRequestId aRequestId );
-
-        /**
-        * From CPosPrivacyNotifier, called when all requests are cancelled.
-        */
-        void HandleAllRequestCancelled();
-
-        /**
-        * From MLpdResultHandler, called when verification result is available.
-        * @param aResultCode
-        */        
-        void HandleVerificationResultL( TInt aResultCode );
-
-        /**
-        * From MLpdResultHandler, called when notification has been done.
-        * @param aResultCode
-        */        
-        void HandleNotificationResultL( TInt aResultCode );
-
-        /**
-        * From MLpdResultHandler, called if leave occurred in callback method
-        * @param aError code
-        */        
-        void HandleLeave( TInt aError );
-        
-      
-
-
-    protected:  // New functions
-
-        /**
-        * Non-leaving internal method for handling next pending request.
-        */
-        void HandleNextRequest();
-        
-        /**
-        * Internal method for handling next pending request.
-        */
-        void HandleNextRequestL();
-
-        /**
-        * Internal helper method used by HandleNextRequestL().
-        */
-        void HandleNextVerificationL();
-
-        /**
-        * Internal helper method used by HandleNextRequestL().
-        */
-        void HandleNextNotificationL();
-
-        /**
-          * Internal helper method used by HandleNextNotificationL().
-          */
-        void HandleNextNonPeriodicNotificationL();
-
-        /**
-        * Internal helper method used by HandleNextNotificationL().
-        */
-        void HandleNextPeriodicNotificationL();        
-
-        /**
-        * Internal helper method.
-        */
-        void NotifyCancellationL( TPosRequestSource aSource, 
-                                  TPosVerifyCancelReason aReason,
-                                  TPosRequestDecision aDecision );
-
-        /**
-        * Internal helper method.
-        * Completes current request and continues queue handling.
-        */
-        void CompleteCurrentAndContinue( TInt aResultCode );
-
-        /**
-        * Handles assert errors. Panics in debug build but leaves in release
-        * build, as this component runs in EikSrv and must never panic.
-        */
-        void HandleAssertErrorL() const;
-
-        /**
-        * Panics in debug build but does nothing in release build.
-        */
-        void HandleDebugAssertError() const;
-        
-        /**
-        * Handle the request if it is periodic.
-        */
-        void EnqueIfPeriodicL(TPosQNRequestId aRequestId);
-        
-         /**
-        * From MLperiodicRequestObserver, called if the currently
-        * displayed notifier has to be updated
-        * @param aError code
-        */        
-        void UpdateCurrentNotifierL();
-        
-        /**
-        * Gets session id of request
-        * @param aSessionId The session id
-        */  
-        void GetSessionIdL( TInt64& aSessionId );
-
-    private:
-
-        /**
-        * C++ default constructor.
-        */
-        CLpdVerifierPlugin();
-
-        /**
-        * By default Symbian 2nd phase constructor is private.
-        */
-        void ConstructL();
-    
-        /**
-         * Starts the Query dialog
-         * @param aQueryDialog Query dialog that has to be started
-         * @param aDialogType  Dialog type
-         * @param aDecision    Decision Type
-         */
-        void StartQueryDialogL( CLpdQueryLauncherBase*  aQueryDialog,
-                                TDialogType             aDialogType,
-                                TPosRequestDecision     aDecision );
-         
-        /**
-         * Packs the Requestor buffer to send across to Cover UI. The 
-         * ownership of the buffer is transferred back to the callee
-         * @return CBufFlat*    Flat buffer containing the list of requestors    
-         */
-        CBufFlat*  PackRequestorBufferL();
-                 
-        /**
-         * Determines the Cover UI command corresponding to a paricular
-         * request
-         * @param  TDialogType          Request Type
-         * @param  TPosRequestDecision  Decision Type
-         * @return TInt                 Cover UI Command ID.
-         */
-        TInt   CoverUICommandL( TDialogType         aRequestType, 
-                                TPosRequestDecision aDecision );
-        
-         /**
-          * Checks the type of request and helps to know
-          * if a given request is of SUPL periodic type
-          * @param aCurrentRequest request id
-          * @return CPosRequestor::TRequestType type of request enum
-         */
-        CPosRequestor::TRequestType CheckRequestTypeL();
-
-
-    private:    // Data
-
-        // Cancellation info needed if cancel handling is postponed
-        class TCancelInfo
-            {
-            public:
-                TBool iCancelled;
-                TPosVerifyCancelReason iReason;
-                TPosRequestDecision iDecision;
-                TPosRequestSource iSource;
-            };
-
-        // Cancellation info needed if verification query is cancelled
-        // during rule query and handling is therefore postponed
-        TCancelInfo iCancelInfo;
-
-        // Identifier of currently handled request
-        TPosQNRequestId iCurrentRequest;
-
-        // Type of the current request, valid if iCurrentRequest valid
-        TRequestType iCurrentRequestType;
-
-        // Result code of verifier query, needed if user cancels rule query
-        TInt iVerifyResult;
-
-        // Resource file needs to be explicitely added
-        // to the environment. Adding returns an offset value.
-        TInt iResourceOffset;
-
-        // Location request accept/reject query object
-        CLpdVerifierQueryLauncher* iVerifierQuery;  // owns
-
-        // Location request accept/reject query object
-        CLpdNotifierQueryLauncher* iNotifier;       // owns
-        
-        // Active object, used to let requests run to
-        // completion instead of recursive calls.
-        CLpdRequestAO* iRequestActiveObject;        // owns
-
-        CLpdRequestorProcessor* iRtorProcessor;     // owns
-        
-        CLocRequestorUtilsResolver* iUtils; // owns
-
-        CLpdPeriodicProcessor* iPeriodicProcessor;     // owns
-        
-        RArray<TLpdPeriodicReqInfo> iPeriodicNotQue; // owns
-
-        CEikonEnv* iEnv;                            // uses
-                        
-    };
-
-#endif      // CLPDVERIFIERDLG_H   
-            
-// End of File
--- a/locationsystemui/locationsysui/locverifier/inc/lpdverifierquerylauncher.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,98 +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:  Class which handles the dialog and expiration timer.
-*
-*/
-
-
-#ifndef CLPDVERIFIERQUERYLAUNCHER_H
-#define CLPDVERIFIERQUERYLAUNCHER_H
-
-//  INCLUDES
-#include "lpdquerylauncherbase.h"
-#include <e32base.h>
-#include <lbs/epos_privacy.h>
-
-// FORWARD DECLARATIONS
-class CLpdGlobalPluginDialog;
-
-
-// CLASS DECLARATION
-
-/**
-*  Implements functionality for executing verification queries.
-*
-*  @lib locverifierdlg.lib
-*  @since 2.1
-*/
-class CLpdVerifierQueryLauncher :
-public CLpdQueryLauncherBase
-    {
-    public:  // Constructors and destructor
-        
-        /**
-        * Two-phased constructor.
-        * @param aHandler of ther query result
-        * @return created object
-        */
-        static CLpdVerifierQueryLauncher* NewL( 
-            MLpdResultHandler& aHandler );
-        
-        /**
-        * Destructor. Call Cancel() first if you have launched a query.
-        */
-        virtual ~CLpdVerifierQueryLauncher();
-
-    public: // New functions
-        
-        /**
-        * Prepares verification resources, must be called before setting
-        * icons, text etc.
-        * @param aSource verification source
-        * @param aDefault default verification decision
-        */
-        void PrepareVerificationResourcesL( TPosRequestSource aSource,
-                                            TPosRequestDecision aDefault);
-        
-        /**
-        * Prepares verification resources for SUPL periodic request
-        * must be called before setting icons, text etc.
-        * @param aRequestId request id
-        */
-        void PrepareSuplVerificationResourcesL();
-
-    protected: // Functions from base classes
-
-        /**
-        * From CLpdQueryLauncherBase, called when dialog is dismissed.
-        */
-        void ExtendedHandleDlgDismissedL();
-
-    private: // Constructors and destructors
-
-        /**
-        * C++ constructor.
-        * @param aHandler of the query result
-        */
-        CLpdVerifierQueryLauncher( MLpdResultHandler& aHandler );
-
-        /**
-        * By default Symbian 2nd phase constructor is private.
-        */
-        void ConstructL();
-    };
-
-#endif      // CLPDVERIFIERQUERYLAUNCHER_H   
-            
-// End of File
--- a/locationsystemui/locationsysui/locverifier/inc/lpdverifiersettinglauncher.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,77 +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:  Responsible for launching SUPL session details
-*
-*/
-
-#ifndef LPDVERIFIERSETTINGSLAUNCHER_H
-#define LPDVERIFIERSETTINGSLAUNCHER_H
-
-// INCLUDES
-#include <e32base.h>
-#include <locsettingsuiclient.h>
-
-// CLASS DECLARATION
-/**
-*  CLpdVerifierSettingsLauncher class
-*  This class is a wrapper for launching Position settings - SUPL session details
-*/
-class CLpdVerifierSettingsLauncher : public CActive
-	{
-	private : // Constructors and destructor
-	      /**
-	       * C++ default constructor.
-	       */
-	    CLpdVerifierSettingsLauncher();
-	      
-	public:
-	      /**
-	       * Destructor.
-	       */
-	      ~CLpdVerifierSettingsLauncher();		
-	
-	public:	
-		/**
-         * Two-phased constructor.
-         *
-         */
-	     static CLpdVerifierSettingsLauncher* NewL();
-			      
-	private: 
-		 /**
-          * Second phase of construction.
-          */
-	      void ConstructL();
-	      
-	public: // new functions
-	      void LaunchL( TInt aSessionId );	      
-	      	      
-	protected: // from CActive
-	      void RunL();
-	      
-	      void DoCancel();
-	      
-	      void CancelRequest();
-	      
-	private:
-	    // Pointer to Location setings client library
-        CLocSettingsUiClient*       iClientLibrary;
-        
-        // Launch parameters
-        HBufC*       iLaunchParams;
-	};
-	
-#endif // LPDVERIFIERSETTINGSLAUNCHER_H
-
-// End of file
\ No newline at end of file
--- a/locationsystemui/locationsysui/locverifier/inc/lpdverifnotiflbmodel.h	Mon May 03 12:54:42 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: This  is a header file for verification notifier list box model
-*
-*/
-
-
-#ifndef CLPDVERIFNOTIFLBMODEL_H
-#define CLPDVERIFNOTIFLBMODEL_H
-
-//  INCLUDES
-#include "lpdbasemodel.h"
-
-// FORWARD DECLARATIONS
-class CLocPhoneNumberFormat;
-class CEikFormattedCellListBox;
-
-// CLASS DECLARATION
-
-/**
-*  @lib locverifierdlg.dll
-*  @since 2.1
-*/
-class CLpdVerifNotifLBModel : public CLpdBaseModel
-    {
-    public:  // Constructors and destructor
-        
-        /**
-        * Two-phased constructor.
-        * @param aRtorProcessor reference owning the requestor data
-        * @param aListBox reference to the listbox showing the items
-        * @return created object
-        */
-        static CLpdVerifNotifLBModel* NewL(
-                        const CLpdRequestorProcessor& aRtorProcessor,
-                        CEikFormattedCellListBox& aListBox );
-
-        /**
-        * Destructor.
-        */
-        virtual ~CLpdVerifNotifLBModel();
-        
-    public: // From MDesCArray
-
-        TInt MdcaCount() const;
-
-    protected: // From CLpdBaseModel
-
-        void MdcaPointL( TInt aIndex ) const;
-
-    protected: // Constructors and destructors
-
-        /**
-        * C++ constructor.
-        */
-        CLpdVerifNotifLBModel( const CLpdRequestorProcessor& aRtorProcessor,
-                               CEikFormattedCellListBox& aListBox );
-
-        /**
-        * By default Symbian 2nd phase constructor is private.
-        */
-        void ConstructL();
-
-    private:    // Data
-
-        CEikFormattedCellListBox& iListBox;
-
-        CLocPhoneNumberFormat* iFormatter; // owns
-
-    };
-
-#endif      // CLPDVERIFNOTIFLBMODEL_H   
-            
-// End of File
--- a/locationsystemui/locationsysui/locverifier/location.loc	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,276 +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 Location subsystem.
-*     A .loc file is the one and only place where the logical strings
-*     to be localised are defined. 
-*  -------------------------------------------------------------------
-*
-*/
-
-
-/**
- *  Default (implementation English) Resource localisation file.
- */
-
-//  LOCALISATION STRINGS  
-
-//d:Location application name
-//d:in the App Shell grid
-//l: cell_app_pane_t1
-//r:3.0
-//
-#define qtn_location_grid          		"Location"
-
-//d:Location application name
-//d:in the App Shell list
-//l: list_single_large_graphic_pane_t1
-//r:3.0
-//
-#define qtn_location_list          		"Location"
-
-//d:Title pane text for application's
-//d:positioning methods view
-//l:title_pane_t2/opt9
-//r:3.0
-//
-#define qtn_loc_psy_title 			"Positioning Methods"
-
-//d:Indicates empty positioning methods list
-//l:main_list_empty_pane
-//r:3.0
-//
-#define qtn_loc_no_psys 			"(No methods available for positioning)"
-
-//d:Options menu item for enabling a Positioning method
-//l:list_single_pane_t1_cp2
-//r:3.0
-//
-#define qtn_loc_opt_enable_psy 		"Enable"
-
-
-//d:Options menu item for for disabling a Positioning method
-//l:list_single_pane_t1_cp2
-//r:3.0
-//
-#define qtn_loc_opt_disable_psy 		"Disable"
-
-
-//d:Options menu item to configure a Positioning method
-//l:list_single_pane_t1_cp2
-//r:3.0
-//
-#define qtn_loc_opt_method_settings 		"Method settings"
-
-//d:Heading text of a location request
-//d:in a list query
-//l:heading_pane_t1
-//r:3.0
-//
-#define qtn_loc_request             		"Location request:"
-
-//d:Left softkey for accepting a
-//d:location request
-//l:control_pane_t1/opt7
-//r:3.0
-//
-#define qtn_loc_request_accept      		"Accept"
-
-//d:Right softkey for rejecting a
-//d:location request
-//l:control_pane_t1/opt7
-//r:3.0
-//
-#define qtn_loc_request_reject      		"Reject"
-
-//d:Unknown requester in list query dialog
-//l:list_single_pane_t1_cp2
-//r:3.0
-//
-#define qtn_loc_requester_unknown       	"Unknown requester"
-
-//d:Error text shown when request was rejected due to
-//d:a conflict despite of user's "accept" decision.
-//l:popup_note_window
-//r:3.0
-//
-#define qtn_loc_notification_failure_rejected      	 "Unable to accept the request"
-
-//d:Error text shown when request was accepted due to
-//d:a conflict despite of user's "reject" decision.
-//l:popup_note_window
-//r:3.0
-//
-#define qtn_loc_notification_failure_accepted       "Unable to reject the request"
-
-//d:Heading text for location notification
-//l:heading_pane_t1
-//r:3.0
-//
-#define qtn_loc_notification            		"Location notification:"
-
-//d:Location notification explanation text
-//l: loc_type_pane
-//r:3.0
-//
-#define qtn_loc_notification_accepted       	"The network sent your location to:"
-
-//d:Location request explanation text if
-//d:the default network policy is accept
-//l:loc_type_pane
-//r:3.0
-//
-#define qtn_loc_request_default_accept  	"By default the network will accept this request on your behalf. Requesters:"
-
-//d:Location request explanation text if
-//d:the default network policy is reject
-//l:loc_type_pane
-//r:3.0
-//
-#define qtn_loc_request_default_reject      	"By default the network will reject this request on your behalf. Requesters:"
-
-//d:Location request explanation text if
-//d:the default network policy is not specified
-//l:loc_type_pane
-//r:3.0
-//
-#define qtn_loc_request_default_none        	"Your location was requested by:"
-
-//d:Notification explanation text when network
-//d:made "accept" decision due to timeout
-//l:loc_type_pane
-//r:3.0
-//
-#define qtn_loc_notification_accepted_timeout       "The network accepted this request on your behalf. Your location was sent to:"
-
-//d:Notification explanation text when network
-//d:made "reject" decision due to timeout
-//l:loc_type_pane
-//r:3.0
-//
-#define qtn_loc_notification_rejected_timeout       "The network rejected this request. Your location was not sent to:"
-
-//d:Title for the Location System UI Plugin
-//d:Long string
-//l:title_pane_t2/opt9
-//r:3.1
-//
-#define qtn_loc_pos_settings_title		"Positioning settings"
-
-//d:Caption for the Location System UI Plugin
-//d:Long string
-//l:list_single_large_graphic_pane_t1 
-//r:3.1
-//
-#define qtn_set_folder_positioning		"Positioning"
-
-//d:Caption for Positioning Method Settings
-//d:List box text in Location System UI plugin view.
-//l:list_setting_pane_t1
-//r:3.1
-//
-#define qtn_loc_settings_psys 		"Positioning Methods"
-
-//d:Prompt text for warning the User when he tries to disable
-//d:a PSY that is currently being used
-//l:popup_note_window
-//r:3.2
-//
-#define qtn_loc_query_psy_used "Positioning method is being used. Disable anyway?"
-
-// d:Postioning Settings Application Name
-// d:List box text for Positioning Settings Application used in Location Centre
-// l:list_single_large_graphic_pane_t1_cp2
-// r:5.0
-//
-#define qtn_loc_app_settings      "Positioning settings"
-
-// d: Heading pane text for stylus activated popup.
-// l: heading_sub_pane_t1
-// w:
-// r:5.0
-//
-#define qtn_loc_stylus_title_gps    "GPS"
-
-// d: Single line GPS status text shown on the stylus popup.
-// l: list_single_touch_info_pane_t1
-// w:
-// r:5.0
-//
-#define qtn_loc_stylus_gps_info           "GPS is active"
-
-// d: Link text shown on the stylus popup
-// l: list_single_touch_info_pane_t2/opt1
-// w:
-// r:5.0
-//
-#define qtn_loc_stylus_gps_link          "More Info"
-
-// d: Multiline text, when the link is clicked, shown as info note.
-// l: list_single_touch_info_pane_t1
-// w:
-// r:5.0
-//
-#define qtn_loc_stylus_gps_details       "GPS is a satellite based positioning system, which works best outdoors and away closed areas."
-
-// d: Verification text in popup quesry for the periodic request
-// l: loc_type_pane
-// w:
-// r:9.2b
-//
-#define qtn_loc_request_default          	"Your location will be requested periodically. Do you want to allow"
-
-// d: Verification text in message quesry for the periodic request - time interval in minutes
-// l: popup_info_list_pane_t1
-// w:
-// r:9.2b
-//
-#define qtn_loc_notification_minutes         	"Your location was sent to %0U. This activity will continue for next %1U minutes"
-
-// d: Verification text in message quesry for the periodic request - time interval in hours
-// l: popup_info_list_pane_t1
-// w:
-// r:9.2b
-//
-#define qtn_loc_notification_hours         	"Your location was sent to %0U. This activity will continue for next %1U hours"
-
-// d: Verification text in message quesry for the periodic request - time interval in hour
-// l: popup_info_list_pane_t1
-// w:
-// r:9.2b
-//
-#define qtn_loc_notification_onehour        	"Your location was sent to %U. This activity will continue for next 1 hour"
-
-// d: Verification text in message quesry for the periodic request - time interval in days
-// l: popup_info_list_pane_t1
-// w:
-// r:9.2b
-//
-#define qtn_loc_notification_days          	"Your location was sent to %0U. This activity will continue for next %1U days"
-
-// d: Verification text in message quesry for the periodic request - time interval in day
-// l: popup_info_list_pane_t1
-// w:
-// r:9.2b
-//
-#define qtn_loc_notification_oneday        	"Your location was sent to %U. This activity will continue for next 1 day"
-
-// d: Link text shown on the message query for viewing the request/Session details
-// l: popup_info_list_pane_t1
-// w:
-// r:9.2b
-//
-#define qtn_loc_notification_service_link     	"Service details"
-
-// End of file
--- a/locationsystemui/locationsysui/locverifier/rss/10207242.rss	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,49 +0,0 @@
-/*
-* Copyright (c) 8873 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 specifies the interface and implementation information
-*                 for BTnotif Ecom Plugins.
-*
-*/
-
-
-#include "ecom/registryinfo.rh"
-#include "uikon.hrh"
-#include <lbs/epos_privacynotifier.hrh>
-
-#define PRINOTDISPLAYNAME "TTNOTIFY2V2 Plugin 1"
-#define PRINOTDEFAULTDATA "TTNOTIFY2V2"
-#define PRINOTOPAQUEDATA  "0"
-
-RESOURCE REGISTRY_INFO theInfo
-{
-	dll_uid = 0x10207242;
-	interfaces =
-	{
-	INTERFACE_INFO
-		{
-		interface_uid = KUikonUidPluginInterfaceNotifiers; // ECOM Notifier Plugin 
-		implementations =
-				{
-				IMPLEMENTATION_INFO
-					{
-					implementation_uid = 0x10207243;
-					version_no = 1;
-					display_name = PRINOTDISPLAYNAME;
-					default_data = PRINOTDEFAULTDATA;
-					opaque_data	 = PRINOTOPAQUEDATA;
-					}
-				};
-		}
-	};
-}
--- a/locationsystemui/locationsysui/locverifier/rss/locverifierdlg.rss	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,362 +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 all resources for LocVerfierDlg DLL.
-*
-*/
-
-
-//  RESOURCE IDENTIFIER
-
-NAME    LVDI
-
-//  INCLUDES
-#include <eikon.rh>
-#include <avkon.rsg>
-#include <avkon.rh>
-#include <avkon.mbg>
-#include <bldvariant.hrh>
-#include <location.loc>
-
-//  RESOURCE DEFINITIONS 
-
-RESOURCE RSS_SIGNATURE { }
-
-RESOURCE CBA r_lpd_softkeys_accept_reject
-    {
-    buttons =
-        {
-        CBA_BUTTON
-            {
-            id = EAknSoftkeyOk;
-            txt = qtn_loc_request_accept;
-            },
-        CBA_BUTTON
-            {
-            id = EAknSoftkeyCancel;
-            txt = qtn_loc_request_reject;
-            },
-        CBA_BUTTON
-            {
-            id = EAknSoftkeyOk;
-            txt = qtn_loc_request_accept;                
-            }         
-        };
-    }
-
-RESOURCE DIALOG r_lpd_supl_periodic_verification_default
-    {
-    flags = EEikDialogFlagNoDrag | EEikDialogFlagNoTitleBar |
-            EEikDialogFlagCbaButtons | EEikDialogFlagNotifyEsc;      
-    buttons = r_lpd_softkeys_accept_reject;
-    items =
-        {
-        DLG_LINE
-            {
-            type = EAknCtListQueryControl;
-            id = EListQueryControl;
-            control = AVKON_LIST_QUERY_CONTROL_WITH_MSGBOX
-                {
-                listtype = EAknListQueryWithMsgBox;
-                actuallisttype = EAknCtSinglePopupMenuListBox;
-                listbox = LISTBOX
-                    {
-                    flags = EAknListBoxViewerFlags;
-                    array_id = r_lpd_dummy_listbox_array;
-                    };
-                message = qtn_loc_request_default;
-                heading = qtn_loc_request;
-                };
-            }
-        };
-    }
-
-RESOURCE DIALOG r_lpd_global_verification_default_a
-    {
-    flags = EEikDialogFlagNoDrag | EEikDialogFlagNoTitleBar |
-    		EEikDialogFlagCbaButtons | EEikDialogFlagNotifyEsc;
-    		
-    buttons = r_lpd_softkeys_accept_reject;
-    items =
-        {
-        DLG_LINE
-            {
-            type = EAknCtListQueryControl;
-            id = EListQueryControl;
-            control = AVKON_LIST_QUERY_CONTROL_WITH_MSGBOX
-                {
-                listtype = EAknListQueryWithMsgBox;
-                actuallisttype = EAknCtSinglePopupMenuListBox;
-                listbox = LISTBOX
-                    {
-                    flags = EAknListBoxViewerFlags;
-                    array_id = r_lpd_dummy_listbox_array;
-                    };
-                message = qtn_loc_request_default_accept;
-                heading = qtn_loc_request;
-                };
-            }
-        };
-    }
- 
-RESOURCE DIALOG r_lpd_global_verification_default_r
-    {
-    flags = EEikDialogFlagNoDrag | EEikDialogFlagNoTitleBar | 
-    		EEikDialogFlagCbaButtons | EEikDialogFlagNotifyEsc;
-    		
-    buttons = r_lpd_softkeys_accept_reject;
-    items =
-        {
-        DLG_LINE
-            {
-            type = EAknCtListQueryControl;
-            id = EListQueryControl;
-            control = AVKON_LIST_QUERY_CONTROL_WITH_MSGBOX
-                {
-                listtype = EAknListQueryWithMsgBox;
-                actuallisttype = EAknCtSinglePopupMenuListBox;
-                listbox = LISTBOX
-                    {
-                    flags = EAknListBoxViewerFlags;
-                    array_id = r_lpd_dummy_listbox_array;
-                    };
-				message = qtn_loc_request_default_reject;
-                heading = qtn_loc_request;
-                };
-            }
-        };
-    }
-
-RESOURCE DIALOG r_lpd_global_verification_default_n
-    {
-    flags = EEikDialogFlagNoDrag | EEikDialogFlagNoTitleBar |
-    		EEikDialogFlagCbaButtons | EEikDialogFlagNotifyEsc;
-    		
-    buttons = r_lpd_softkeys_accept_reject;
-    items =
-        {
-        DLG_LINE
-            {
-            type = EAknCtListQueryControl;
-            id = EListQueryControl;
-            control = AVKON_LIST_QUERY_CONTROL_WITH_MSGBOX
-                {
-                listtype = EAknListQueryWithMsgBox;
-                actuallisttype = EAknCtSinglePopupMenuListBox;
-                listbox = LISTBOX
-                    {
-                    flags = EAknListBoxViewerFlags;
-                    array_id = r_lpd_dummy_listbox_array;
-                    };
-				message = qtn_loc_request_default_none;
-                heading = qtn_loc_request;
-                };
-            }
-        };
-    }
-
-RESOURCE TBUF r_lpd_unknown_requester
-    {
-    buf = qtn_loc_requester_unknown;
-    }
-
-RESOURCE DIALOG r_lpd_global_notification_a
-    {
-    flags = EEikDialogFlagNoDrag | EEikDialogFlagNoTitleBar |
-    		EEikDialogFlagCbaButtons | EEikDialogFlagNotifyEsc;
-		buttons = R_AVKON_SOFTKEYS_OK_EMPTY__OK;
-    items =
-        {
-        DLG_LINE
-            {
-            type = EAknCtListQueryControl;
-            id = EListQueryControl;
-            control = AVKON_LIST_QUERY_CONTROL_WITH_MSGBOX
-                {
-                listtype = EAknListQueryWithMsgBox;
-                actuallisttype = EAknCtSinglePopupMenuListBox;
-                listbox = LISTBOX
-                    {
-                    flags = EAknListBoxViewerFlags;
-                    array_id = r_lpd_dummy_listbox_array;
-                    };
-				message = qtn_loc_notification_accepted;
-                heading = qtn_loc_notification;
-                };
-            }
-        };
-    }
-
-RESOURCE DIALOG r_lpd_global_notification_fail_a
-    {
-    flags = EEikDialogFlagNoDrag | EEikDialogFlagNoTitleBar |
-    		EEikDialogFlagCbaButtons | EEikDialogFlagNotifyEsc;   		
-		buttons = R_AVKON_SOFTKEYS_OK_EMPTY__OK;
-    items =
-        {
-        DLG_LINE
-            {
-            type = EAknCtListQueryControl;
-            id = EListQueryControl;
-            control = AVKON_LIST_QUERY_CONTROL_WITH_MSGBOX
-                {
-                listtype = EAknListQueryWithMsgBox;
-                actuallisttype = EAknCtSinglePopupMenuListBox;
-                listbox = LISTBOX
-                    {
-                    flags = EAknListBoxViewerFlags;
-                    array_id = r_lpd_dummy_listbox_array;
-                    };
-				message = qtn_loc_notification_failure_accepted;
-                heading = qtn_loc_notification;
-                };
-            }
-        };
-    }
-
-RESOURCE DIALOG r_lpd_global_notification_fail_r
-    {
-    flags = EEikDialogFlagNoDrag | EEikDialogFlagNoTitleBar |
-     		EEikDialogFlagCbaButtons | EEikDialogFlagNotifyEsc;
-		buttons = R_AVKON_SOFTKEYS_OK_EMPTY__OK;
-    items =
-        {
-        DLG_LINE
-            {
-            type = EAknCtListQueryControl;
-            id = EListQueryControl;
-            control = AVKON_LIST_QUERY_CONTROL_WITH_MSGBOX
-                {
-                listtype = EAknListQueryWithMsgBox;
-                actuallisttype = EAknCtSinglePopupMenuListBox;
-                listbox = LISTBOX
-                    {
-                    flags = EAknListBoxViewerFlags;
-                    array_id = r_lpd_dummy_listbox_array;
-                    };
-				message = qtn_loc_notification_failure_rejected;
-                heading = qtn_loc_notification;
-                };
-            }
-        };
-    }
-
-RESOURCE DIALOG r_lpd_supl_periodic_notification
-    {
-    flags = EEikDialogFlagNoDrag | EEikDialogFlagCbaButtons
-     | EEikDialogFlagNotifyEsc;
-    buttons = R_AVKON_SOFTKEYS_OK_EMPTY__OK;
-    items =
-        {
-           DLG_LINE 
-           {
-           type = EAknCtPopupHeadingPane;
-           id = EAknMessageQueryHeaderId;
-           itemflags = EEikDlgItemNonFocusing;
-           control = AVKON_HEADING
-           {
-
-           };
-           },
-           DLG_LINE
-           {
-            type = EAknCtMessageQuery;
-            id = EAknMessageQueryContentId;
-            control = AVKON_MESSAGE_QUERY
-            {
-          
-            };
-            }    
-        };
-    }
-
-RESOURCE ARRAY r_lpd_dummy_listbox_array
-    {
-    items =
-        {
-        LBUF
-            {
-            txt = "";
-            }
-        };
-    }
-
-RESOURCE DIALOG r_lpd_global_notification_timeout_a
-    {
-    flags = EEikDialogFlagNoDrag | EEikDialogFlagNoTitleBar |
-    		EEikDialogFlagCbaButtons | EEikDialogFlagNotifyEsc;
-		buttons = R_AVKON_SOFTKEYS_OK_EMPTY__OK;
-    items =
-        {
-        DLG_LINE
-            {
-            type = EAknCtListQueryControl;
-            id = EListQueryControl;
-            control = AVKON_LIST_QUERY_CONTROL_WITH_MSGBOX
-                {
-                listtype = EAknListQueryWithMsgBox;
-                actuallisttype = EAknCtSinglePopupMenuListBox;
-                listbox = LISTBOX
-                    {
-                    flags = EAknListBoxViewerFlags;
-                    array_id = r_lpd_dummy_listbox_array;
-                    };
-				message = qtn_loc_notification_accepted_timeout;
-                heading = qtn_loc_notification;
-                };
-            }
-        };
-    }
-
-RESOURCE DIALOG r_lpd_global_notification_timeout_r
-    {
-    flags = EEikDialogFlagNoDrag | EEikDialogFlagNoTitleBar |
-    	 	EEikDialogFlagCbaButtons | EEikDialogFlagNotifyEsc;
-		buttons = R_AVKON_SOFTKEYS_OK_EMPTY__OK;
-    items =
-        {
-        DLG_LINE
-            {
-            type = EAknCtListQueryControl;
-            id = EListQueryControl;
-            control = AVKON_LIST_QUERY_CONTROL_WITH_MSGBOX
-                {
-                listtype = EAknListQueryWithMsgBox;
-                actuallisttype = EAknCtSinglePopupMenuListBox;
-                listbox = LISTBOX
-                    {
-                    flags = EAknListBoxViewerFlags;
-                    array_id = r_lpd_dummy_listbox_array;
-                    };
-				message = qtn_loc_notification_rejected_timeout;
-                heading = qtn_loc_notification;
-                };
-            }
-        };
-    }
-
-RESOURCE TBUF r_loc_notification_minutes { buf=qtn_loc_notification_minutes; }
-
-RESOURCE TBUF r_loc_notification_hours { buf=qtn_loc_notification_hours; }
-
-RESOURCE TBUF r_loc_notification_onehour { buf=qtn_loc_notification_onehour; }
-
-RESOURCE TBUF r_loc_notification_days { buf=qtn_loc_notification_days; }
-
-RESOURCE TBUF r_loc_notification_oneday { buf=qtn_loc_notification_oneday; }
-
-RESOURCE TBUF r_loc_notification_service_link { buf=qtn_loc_notification_service_link; }
-
-RESOURCE TBUF32 r_loc_supl_periodic_dialog_title { buf=qtn_loc_notification; }
-
-// End of File
--- a/locationsystemui/locationsysui/locverifier/src/lpdbasemodel.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,76 +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:  Model base class.
-*
-*/
-
-
-// INCLUDE FILES
-#include "lpdbasemodel.h"
-#include <eikenv.h>
-#include "locrequestorutilsresolver.h"
-#include "lpdrequestorprocessor.h"
-#include "locconsts.h"
-
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// CLpdBaseModel::CLpdBaseModel
-// C++ default constructor can NOT contain any code, that
-// might leave.
-// -----------------------------------------------------------------------------
-//
-CLpdBaseModel::CLpdBaseModel(
-    const CLpdRequestorProcessor& aRtorProcessor )
-    : iRtorProcessor( aRtorProcessor )
-    {
-    // Intentionally empty
-    }
-
-// -----------------------------------------------------------------------------
-// CLpdBaseModel::BaseConstructL
-// Symbian 2nd phase constructor can leave.
-// -----------------------------------------------------------------------------
-//
-void CLpdBaseModel::BaseConstructL()
-    {
-    iBuffer = HBufC::NewL( KLocLBLineMaxLen + KLocLBItemFormatMaxLen );
-    iUtils = CLocRequestorUtilsResolver::NewL();
-    }
-
-// Destructor
-CLpdBaseModel::~CLpdBaseModel()
-    {
-    delete iBuffer;
-    delete iUtils;
-    }
-
-// -----------------------------------------------------------------------------
-// CLpdBaseModel::MdcaPoint
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//
-TPtrC16 CLpdBaseModel::MdcaPoint( TInt aIndex ) const
-    {
-    TRAPD( err, MdcaPointL( aIndex ) );
-    if ( err )
-        {
-        iBuffer->Des().Zero();
-        CEikonEnv::Static()->HandleError(err);
-        }
-    return *iBuffer;
-    }
-
-// End of File
--- a/locationsystemui/locationsysui/locverifier/src/lpdbkupevtlistenerao.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,129 +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:  Active object which listens to Backup / Restore Events
-*
-*/
-
-
-// INCLUDE FILES
-#include "lpdbkupevtlistenerao.h"
-#include "lpdbkupevtobserver.h"
-#include <connect/sbdefs.h>
-#include <e32property.h>
-
-// ================= MEMBER FUNCTIONS =======================
-
-// -----------------------------------------------------------------------------
-// CLpdRequestAO::CLpdRequestAO
-// C++ default constructor can NOT contain any code, that
-// might leave.
-// -----------------------------------------------------------------------------
-//
-CLpdBkupEvtListenerAO::CLpdBkupEvtListenerAO( MLpdBkupEvtObserver& aBkupObserver )
-    : CActive( CActive::EPriorityHigh ), iBkupObserver( aBkupObserver )
-    {
-	CActiveScheduler::Add(this);
-	}
-
-void CLpdBkupEvtListenerAO::ConstructL()
-	{
-	User::LeaveIfError(iProperty.Attach(KUidSystemCategory,conn::KUidBackupRestoreKey));
-	}
-
-// -----------------------------------------------------------------------------
-// CLpdRequestAO::NewL
-// Two-phased constructor.
-// -----------------------------------------------------------------------------
-//
-CLpdBkupEvtListenerAO* CLpdBkupEvtListenerAO::NewL( MLpdBkupEvtObserver& aBkupObserver )
-	{
-    CLpdBkupEvtListenerAO* self = new( ELeave ) CLpdBkupEvtListenerAO( aBkupObserver );
-    CleanupStack::PushL(self);
-    self->ConstructL();
-    CleanupStack::Pop(self);
-    return self;
-	}
-
-// Destructor
-CLpdBkupEvtListenerAO::~CLpdBkupEvtListenerAO()
-	{
-    Cancel();
-    iProperty.Close();
-	}
-
-// -----------------------------------------------------------------------------
-// CLpdBkupEvtListenerAO::StartL
-// This method subscribes to Backup/Restore Event 
-// -----------------------------------------------------------------------------
-//
-void CLpdBkupEvtListenerAO::StartL()
-	{
-	TInt backupFlag = 0;
-	TInt error = iProperty.Get(backupFlag);
-	switch(error)
-		{
-		case KErrNone:
-			// Backup/Restore is already running so Leave with KErrCancel.
-			// This will stop the verifier dialogs from being popped up.
-			if ((backupFlag & conn::KBackupIncTypeMask) != conn::ENoBackup )
-				{
-				User::Leave(KErrCancel);
-				}
-			// fall-through necessary
-
-		case KErrNotFound:
-			iProperty.Subscribe(iStatus);
-			SetActive();
-			break;
-		
-		default:
-			// In case of any other error Leave with the returned error code
-			User::LeaveIfError(error);
-			break;
-		}
-	}
-	
-// -----------------------------------------------------------------------------
-// CLpdBkupEvtListenerAO::RunL
-// Control is in this function when Backup / Restore event happens. 
-// -----------------------------------------------------------------------------
-//
-void CLpdBkupEvtListenerAO::RunL()
-    {
-    // Check the value of the property.
-    // If backup is started or restore is started then close the dialogs.
-	  TInt backupFlag;
-	  User::LeaveIfError(iProperty.Get(backupFlag));
-	  if ( (backupFlag & conn::KBackupIncTypeMask) != conn::ENoBackup )
-		  {
-		  iBkupObserver.ExitDialogL();	
-		  }
-  	else
-		  {
-	    // Re-subscribe to the event
-	    iProperty.Subscribe(iStatus);
-	    SetActive();
-		  }
-    }
-
-// -----------------------------------------------------------------------------
-// CLpdBkupEvtListenerAO::DoCancel
-// -----------------------------------------------------------------------------
-//
-void CLpdBkupEvtListenerAO::DoCancel()
-    {
-    iProperty.Cancel();
-	  }
-
-//  End of File
--- a/locationsystemui/locationsysui/locverifier/src/lpddllmain.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,60 +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:  Dll entry point and plugin creation functions.
-*
-*/
-
-
-// INCLUDE FILES
-#include "lpddllmain.h"
-#include "lpdverifierplugin.h"
-#include <e32base.h>
-#include <eiknotapi.h>
-
-// ============================= LOCAL FUNCTIONS ===============================
-
-LOCAL_C void CreateNotifiersL( 
-    CArrayPtrFlat<MEikSrvNotifierBase2>* aNotifiers )
-    {
-    CLpdVerifierPlugin* notifier = CLpdVerifierPlugin::NewL();
-    CleanupStack::PushL( notifier );
-    aNotifiers->AppendL( notifier->NotifierBase() );
-    CleanupStack::Pop( notifier ); // Do not destroy. This is handled by the FW.
-    }
-
-// ========================== OTHER EXPORTED FUNCTIONS =========================
-
-EXPORT_C CArrayPtr<MEikSrvNotifierBase2>* NotifierArray()
-    {
-    CArrayPtrFlat<MEikSrvNotifierBase2>* notifiers =
-        new CArrayPtrFlat<MEikSrvNotifierBase2>( 1 );
-    if ( notifiers )
-        {
-        TRAPD( err, CreateNotifiersL( notifiers ) );
-        if ( err )
-            { // release any notifiers we have created
-            TInt count = notifiers->Count();
-            while ( --count >= 0 )
-                {
-                ( *notifiers )[count]->Release();
-                }
-            delete notifiers;
-            notifiers = NULL;
-            }
-        }
-    return notifiers;
-    }
-
-
-// End of File
--- a/locationsystemui/locationsysui/locverifier/src/lpdglobalplugindialog.cpp	Mon May 03 12:54:42 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:  List query dialog suitable for verifier plug-in use.
-*
-*/
-
-
-// INCLUDE FILES
-#include "lpdglobalplugindialog.h"
-#include "lpddlgobserver.h"
-#include "locverifierdlg.hrh"
-#include <uikon/eiksrvui.h>
-#include <AknNotiferAppServerApplication.h>
-#include <e32des16.h>
-#include "lpdbkupevtlistenerao.h"
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// CLpdGlobalPluginDialog::CLpdGlobalPluginDialog
-// C++ default constructor can NOT contain any code, that
-// might leave.
-// -----------------------------------------------------------------------------
-//
-CLpdGlobalPluginDialog::CLpdGlobalPluginDialog(                    
-    MLpdDlgObserver& aCallBack,
-    CLpdGlobalPluginDialog ** aSelfPtr,
-    CListBoxView::CSelectionIndexArray* aSelected)
-    : CAknListQueryDialog( &iDummyIndex ),
-      iCallBack( aCallBack ),
-      iAppSwitchSuppressed( EFalse ),
-      iSelected( aSelected ),
-      iSelfPtr( aSelfPtr )
-    {
-    }
-
-// -----------------------------------------------------------------------------
-// CLpdGlobalPluginDialog::ConstructL
-// Two-phased constructor.
-// -----------------------------------------------------------------------------
-//
-void CLpdGlobalPluginDialog::ConstructL()
-	{
-	iBkupListener = CLpdBkupEvtListenerAO::NewL( *this );
-	iBkupListener->StartL();
-	}
-
-
-// -----------------------------------------------------------------------------
-// CLpdGlobalPluginDialog::NewL
-// Two-phased constructor.
-// -----------------------------------------------------------------------------
-//
-CLpdGlobalPluginDialog* CLpdGlobalPluginDialog::NewL(                    
-    MLpdDlgObserver& aCallBack,
-    CLpdGlobalPluginDialog ** aSelfPtr,
-    CListBoxView::CSelectionIndexArray* aSelected)
-    {
-    CLpdGlobalPluginDialog* self =
-        new( ELeave ) CLpdGlobalPluginDialog( aCallBack, aSelfPtr, aSelected);
-	CleanupStack::PushL(self);
-	self->ConstructL();
-	CleanupStack::Pop(self);  
-    return self;
-    }
-
-// Destructor
-CLpdGlobalPluginDialog::~CLpdGlobalPluginDialog()
-	{
-    if ( iSelfPtr )
-        {
-        *iSelfPtr = NULL;
-        }
-    if ( iBkupListener )
-    	{
-    	delete iBkupListener;	
-    	}
-	}
-
-// -----------------------------------------------------------------------------
-// CLpdGlobalPluginDialog::PrepareLC
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//
-void CLpdGlobalPluginDialog::PrepareLC( TInt aResourceId )
-	{
-	CAknDialog::PrepareLC( aResourceId );
-	}
-
-// -----------------------------------------------------------------------------
-// CLpdGlobalPluginDialog::RunLD
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//
-TInt CLpdGlobalPluginDialog::RunLD()
-    {
- 		if ( !iAppSwitchSuppressed )
-      {
-			TInt err = 
-				((CAknNotifierAppServerAppUi *)
-					iEikonEnv->EikAppUi())->SuppressAppSwitching(ETrue);
-	 		if (!err)        
-	 			{
-	 			iAppSwitchSuppressed = ETrue;	
-	 			}
-      }
-    return CAknQueryDialog::RunLD();
-    }
-
-// -----------------------------------------------------------------------------
-// CLpdGlobalPluginDialog::OfferKeyEventL
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//
-TKeyResponse CLpdGlobalPluginDialog::OfferKeyEventL(
-    const TKeyEvent& aKeyEvent,
-    TEventCode aType )
-    {
-    if ( aType != EEventKey )
-        {
-        return EKeyWasNotConsumed;
-        }
-    
-    TInt code = aKeyEvent.iCode;
-
-    switch ( code )
-        {
-        case EKeyEscape:
-            { // emergency call support
-            TryExitL( ELpdCmdEmergency );
-			return EKeyWasConsumed;
-            }
-        default:
-        	break;
-        }
-    return ListBox()->OfferKeyEventL( aKeyEvent, aType );
-    }
-
-// -----------------------------------------------------------------------------
-// CLpdGlobalPluginDialog::SetHeaderTextL
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//
-void CLpdGlobalPluginDialog::SetHeaderTextL( const TDesC& aText )
-    {
-    CAknPopupHeadingPane* heading = NULL;
-    User::LeaveIfNull( heading = QueryHeading() );
-    heading->SetTextL( aText );
-    }
-
-// -----------------------------------------------------------------------------
-// CLpdGlobalPluginDialog::ExitDialogL
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//
-void CLpdGlobalPluginDialog::ExitDialogL()
-    {
-    TryExitL( EEikCmdExit );
-    }
-
-// -----------------------------------------------------------------------------
-// CLpdGlobalPluginDialog::ExitDialogL
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//
-void CLpdGlobalPluginDialog::ExitDialogQuietlyL()
-    {
-    TryExitL( ELpdCmdQuietExit );
-    }
-
-// -----------------------------------------------------------------------------
-// CLpdGlobalPluginDialog::OkToExitL
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//
-TBool CLpdGlobalPluginDialog::OkToExitL( TInt aButtonId )
-    {
-    if ( aButtonId == EAknSoftkeyCancel || aButtonId == EAknSoftkeyOk )
-        {
-        TInt currentIndex = ListBox()->CurrentItemIndex();
-        const CListBoxView::CSelectionIndexArray* aSelectionIndex = 
-            ListBox()->View()->SelectionIndexes();
-        if ( iSelected && aSelectionIndex->Count() > 0 )
-            { // CSelectionIndexArray was given in constructor and
-              // listbox view also has selection indexes.
-            ListBox()->View()->GetSelectionIndexesL( iSelected );
-            }
-        iCallBack.HandleDlgDismissedL( aButtonId, currentIndex );
-        }
-    else if ( ( aButtonId == EEikCmdExit ) || 
-              ( aButtonId == ELpdCmdEmergency ) )
-        { // Dialog needs to be exited or emergency key has been pressed.
-        iCallBack.HandleDlgDismissedL( aButtonId, -1 );
-        }
-    else if ( aButtonId == ELpdCmdQuietExit )
-        {
-        // No callback.
-        }
-    else
-        {
-        return EFalse; //dialog is not exited
-        }
-
-    if ( iAppSwitchSuppressed )
-        {
-				TInt er = 
-					((CAknNotifierAppServerAppUi *)
-						iEikonEnv->EikAppUi())->SuppressAppSwitching(EFalse);
-		 		if (!er)
-		 			{
-		 			iAppSwitchSuppressed = EFalse;
-		 			}
-        }
-    return ETrue; // dialog is exited
-    }
-
-void CLpdGlobalPluginDialog::HandleResourceChange(TInt aType)
-	{
-	CAknListQueryDialog::HandleResourceChange(aType);
-	}
-// End of file
-
--- a/locationsystemui/locationsysui/locverifier/src/lpdmessageplugindialog.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,188 +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:  List query dialog suitable for verifier plug-in use.
-*
-*/
-
-
-// INCLUDE FILES
-#include "lpdmessageplugindialog.h"
-#include "lpddlgobserver.h"
-#include "locverifierdlg.hrh"
-#include <uikon/eiksrvui.h>
-#include <AknNotiferAppServerApplication.h>
-#include <e32des16.h>
-#include "lpdbkupevtlistenerao.h"
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// CLpdMessagePluginDialog::CLpdMessagePluginDialog
-// C++ default constructor can NOT contain any code, that
-// might leave.
-// -----------------------------------------------------------------------------
-//
-CLpdMessagePluginDialog::CLpdMessagePluginDialog(  
-    MLpdDlgObserver& aCallBack,
-    CLpdMessagePluginDialog ** aSelfPtr)
-    : CAknMessageQueryDialog( static_cast<TTone>(EAvkonSIDLocationRequest) ),
-      iCallBack( aCallBack ),
-      iAppSwitchSuppressed( EFalse ),
-      iSelfPtr( aSelfPtr )
-    {
-    }
-
-// -----------------------------------------------------------------------------
-// CLpdMessagePluginDialog::ConstructL
-// Two-phased constructor.
-// -----------------------------------------------------------------------------
-//
-void CLpdMessagePluginDialog::ConstructL()
-	{
-	iBkupListener = CLpdBkupEvtListenerAO::NewL( *this );
-	iBkupListener->StartL();
-	}
-
-
-// -----------------------------------------------------------------------------
-// CLpdMessagePluginDialog::NewL
-// Two-phased constructor.
-// -----------------------------------------------------------------------------
-//
-CLpdMessagePluginDialog* CLpdMessagePluginDialog::NewL(                    
-    MLpdDlgObserver& aCallBack,
-    CLpdMessagePluginDialog ** aSelfPtr
-    )
-    {
-    CLpdMessagePluginDialog* self =
-        new( ELeave ) CLpdMessagePluginDialog( aCallBack, aSelfPtr);
-	  CleanupStack::PushL(self);
-	  self->ConstructL();
-	  CleanupStack::Pop(self);  
-    return self;
-    }
-
-// Destructor
-CLpdMessagePluginDialog::~CLpdMessagePluginDialog()
-	{
-    if ( iSelfPtr )
-        {
-        *iSelfPtr = NULL;
-        }
-    if ( iBkupListener )
-    	{
-    	delete iBkupListener;	
-    	}
-	}
-
-// -----------------------------------------------------------------------------
-// CLpdMessagePluginDialog::PrepareLC
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//
-void CLpdMessagePluginDialog::PrepareLC( TInt aResourceId )
-	{
-	CAknDialog::PrepareLC( aResourceId );
-	}
-
-// -----------------------------------------------------------------------------
-// CLpdMessagePluginDialog::RunLD
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//
-TInt CLpdMessagePluginDialog::RunLD()
-    {
- 		if ( !iAppSwitchSuppressed )
-      {
-			TInt err = 
-				((CAknNotifierAppServerAppUi *)
-					iEikonEnv->EikAppUi())->SuppressAppSwitching(ETrue);
-	 		if (!err)        
-	 			{
-	 			iAppSwitchSuppressed = ETrue;	
-	 			}
-      }
-    return CAknQueryDialog::RunLD();
-    }
-
-// -----------------------------------------------------------------------------
-// CLpdMessagePluginDialog::ExitDialogL
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//
-void CLpdMessagePluginDialog::ExitDialogL()
-    {
-    TryExitL( EEikCmdExit );
-    }
-
-// -----------------------------------------------------------------------------
-// CLpdMessagePluginDialog::ExitDialogL
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//
-void CLpdMessagePluginDialog::ExitDialogQuietlyL()
-    {
-    TryExitL( ELpdCmdQuietExit );
-    }
-
-// -----------------------------------------------------------------------------
-// CLpdMessagePluginDialog::OkToExitL
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//
-TBool CLpdMessagePluginDialog::OkToExitL( TInt aButtonId )
-    {
-    if ( aButtonId == EAknSoftkeyCancel || aButtonId == EAknSoftkeyOk )
-        {
-        iCallBack.HandleDlgDismissedL( aButtonId, 
-                    -1 );
-        }
-    else if ( ( aButtonId == EEikCmdExit ) || 
-              ( aButtonId == ELpdCmdEmergency ) )
-        { // Dialog needs to be exited or emergency key has been pressed.
-        iCallBack.HandleDlgDismissedL( aButtonId, -1 );
-        }
-    else if ( aButtonId == ELpdCmdQuietExit )
-        {
-        // No callback.
-        }
-    else
-        {
-        return EFalse; //dialog is not exited
-        }
-
-    if ( iAppSwitchSuppressed )
-        {
-				TInt er = 
-					((CAknNotifierAppServerAppUi *)
-						iEikonEnv->EikAppUi())->SuppressAppSwitching(EFalse);
-		 		if (!er)
-		 			{
-		 			iAppSwitchSuppressed = EFalse;
-		 			}
-        }
-    return ETrue; // dialog is exited
-    }
-
-// -----------------------------------------------------------------------------
-// CLpdMessagePluginDialog::HandleResourceChange
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//
-void CLpdMessagePluginDialog::HandleResourceChange(TInt aType)
-	{
-	CAknMessageQueryDialog::HandleResourceChange(aType);
-	}
-// End of file
-
--- a/locationsystemui/locationsysui/locverifier/src/lpdnotifierquerylauncher.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,250 +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:  Class which handles the dialog and expiration timer.
-*
-*/
-
-
-// INCLUDE FILES
-#include "lpdnotifierquerylauncher.h"
-#include "lpdglobalplugindialog.h"
-#include "lpdmessageplugindialog.h"
-#include "lpdresulthandler.h"
-#include "locverifierdlg.hrh"
-#include <locverifierdlg.rsg>
-#include <avkon.hrh>
-#include <lbs/epos_privacy.h>
-
-// CONSTANTS
-const TInt KNonPeriodicRequest = 0;
-const TInt KPeriodicRequest = 1;
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// CLpdNotifierQueryLauncher::CLpdNotifierQueryLauncher
-// C++ default constructor can NOT contain any code, that
-// might leave.
-// -----------------------------------------------------------------------------
-//
-CLpdNotifierQueryLauncher::CLpdNotifierQueryLauncher( 
-    MLpdResultHandler& aHandler ) 
-    : CLpdQueryLauncherBase( aHandler )
-    {
-    // Intentionally empty
-    }
-
-// -----------------------------------------------------------------------------
-// CLpdNotifierQueryLauncher::ConstructL
-// Symbian 2nd phase constructor can leave.
-// -----------------------------------------------------------------------------
-//
-void CLpdNotifierQueryLauncher::ConstructL()
-    {
-    BaseConstructL();
-    }
-
-// -----------------------------------------------------------------------------
-// CLpdNotifierQueryLauncher::NewL
-// Two-phased constructor.
-// -----------------------------------------------------------------------------
-//
-CLpdNotifierQueryLauncher* CLpdNotifierQueryLauncher::NewL( 
-    MLpdResultHandler& aHandler )
-    {
-    CLpdNotifierQueryLauncher* self = new( ELeave )
-             CLpdNotifierQueryLauncher( aHandler );
-    
-    CleanupStack::PushL( self );
-    self->ConstructL();
-    CleanupStack::Pop(self);
-
-    return self;
-    }
-
-// Destructor
-CLpdNotifierQueryLauncher::~CLpdNotifierQueryLauncher()
-    {
-    // Intentionally empty
-    }
-
-// -----------------------------------------------------------------------------
-// CLpdNotifierQueryLauncher::PrepareNotificationResourcesL
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//
-void CLpdNotifierQueryLauncher::PrepareNotificationResourcesL(
-    TPosNotificationReason aReason,
-    TPosRequestDecision aDecision)
-    {
-    switch ( aReason )
-        {
-        case EPosDecisionByRequestSource:
-            {
-            PrepareQueryResourcesL( R_LPD_GLOBAL_NOTIFICATION_A, KNonPeriodicRequest );
-            break;
-            }
-        case EPosVerificationTimeout:
-            {
-            switch ( aDecision )
-                {
-                case EPosDecisionAccepted:
-                    {
-                    PrepareQueryResourcesL( R_LPD_GLOBAL_NOTIFICATION_FAIL_A, KNonPeriodicRequest );
-                    break;
-                    }
-                case EPosDecisionRejected:
-                    {
-                    PrepareQueryResourcesL( R_LPD_GLOBAL_NOTIFICATION_FAIL_R, KNonPeriodicRequest );
-                    break;
-                    }
-                default:
-                    { // EPosDecisionNotAvailable or future extensions
-                    User::Leave( KErrArgument );
-                    break;
-                    }
-                }
-            break;
-            }
-        default:
-            { // other values do not make sense
-            User::Leave( KErrArgument );
-            break;
-            }
-        }
-
-    iQueryDlg->SetTone( EAvkonSIDLocationRequest );
-    }
-
-// -----------------------------------------------------------------------------
-// CLpdNotifierQueryLauncher::PrepareSuplNotificationResourcesL
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//
-void CLpdNotifierQueryLauncher::PrepareSuplNotificationResourcesL(
-        TPosNotificationReason aReason)
-    {
-    switch ( aReason )
-        {
-        case EPosDecisionByRequestSource:
-            {
-            PrepareQueryResourcesL( R_LPD_SUPL_PERIODIC_NOTIFICATION, KPeriodicRequest); 
-            break;
-            }
-        case EPosVerificationTimeout:
-            {
-            break;
-            }
-        default:
-            { // other values do not make sense
-            User::Leave( KErrArgument );
-            break;
-            }
-        }
-    }
-        
-// -----------------------------------------------------------------------------
-// CLpdNotifierQueryLauncher::PrepareCancelNotifResourcesL
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//
-void CLpdNotifierQueryLauncher::PrepareCancelNotifResourcesL(
-    TPosRequestDecision aDecision)
-    {
-    switch ( aDecision )
-        {
-        case EPosDecisionAccepted:
-            {
-            PrepareQueryResourcesL( R_LPD_GLOBAL_NOTIFICATION_TIMEOUT_A, KNonPeriodicRequest );
-            break;
-            }
-        case EPosDecisionRejected:
-            {
-            PrepareQueryResourcesL( R_LPD_GLOBAL_NOTIFICATION_TIMEOUT_R, KNonPeriodicRequest );
-            break;
-            }
-        default:
-            { // EPosDecisionNotAvailable or future extensions
-            User::Leave( KErrArgument );
-            break;
-            }
-        }
-
-    iQueryDlg->SetTone( EAvkonSIDLocationRequest );
-    }
-
-// -----------------------------------------------------------------------------
-// CLpdNotifierQueryLauncher::PrepareCancelNotifResourcesL
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//
-void CLpdNotifierQueryLauncher::PrepareSuplCancelNotifResourcesL(
-    TPosRequestDecision aDecision )
-    {
-    switch ( aDecision )
-        {
-        case EPosDecisionAccepted:
-            {
-            PrepareQueryResourcesL( R_LPD_SUPL_PERIODIC_NOTIFICATION, KPeriodicRequest );
-            break;
-            }
-        case EPosDecisionRejected:
-            {
-            break;
-            }
-        default:
-            { // EPosDecisionNotAvailable or future extensions
-            User::Leave( KErrArgument );
-            break;
-            }
-        }
-
-    }
-
-
-// -----------------------------------------------------------------------------
-// CLpdNotifierQueryLauncher::ExtendedHandleDlgDismissedL
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//
-void CLpdNotifierQueryLauncher::ExtendedHandleDlgDismissedL()
-    {
-    TInt retValue = KErrNone;
-    switch ( iResult )
-        {
-        case EAknSoftkeyOk:
-            {
-            retValue = KErrNone;
-            break;
-            }
-        case EEikCmdExit:
-            {
-            retValue = iExitReason;
-            break;
-            }
-        case ELpdCmdEmergency:
-            { // emergency call support
-            retValue = KErrAbort;
-            break;
-            }
-        default:
-            {
-            retValue = KErrGeneral;
-            break;
-            }
-        }
-    iHandler.HandleNotificationResultL( retValue );
-    }
-
-//  End of File
--- a/locationsystemui/locationsysui/locverifier/src/lpdnotifreqinfo.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,144 +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 class stores information regarding notification 
-*                requests.
-*
-*/
-
-#include <lbs/epos_cposrequestor.h>
-#include <lbs/epos_rposrequestorstack.h>
-#include "lpdnotifreqinfo.h"
-
-// ======== MEMBER FUNCTIONS ========
-
-// ---------------------------------------------------------------------------
-// Constructor
-// ---------------------------------------------------------------------------
-//
-CLpdNotifReqInfo::CLpdNotifReqInfo(
-	TPosRequestSource aSource,
-	TPosVerifyCancelReason aReason,
-	TPosRequestDecision aDecision,
-	RPosRequestorStack* aRequestors)
-	: iSource(aSource),
-	  iReason(aReason),
-	  iDecision(aDecision),
-	  iRequestors(aRequestors)
-  	{
-  	}
-
-
-// ---------------------------------------------------------------------------
-// 2nd Phase of Construction
-// ---------------------------------------------------------------------------
-//
-void CLpdNotifReqInfo::ConstructL()
-    {
-    // Intentionally left empty
-    }
-
-
-// ---------------------------------------------------------------------------
-// Symbian 2 Phase Constructor
-// ---------------------------------------------------------------------------
-//
-CLpdNotifReqInfo* CLpdNotifReqInfo::NewL(
-	TPosRequestSource aSource,
-	TPosVerifyCancelReason aReason,
-	TPosRequestDecision aDecision,
-	RPosRequestorStack* aRequestors)
-    {
-    CLpdNotifReqInfo* self = CLpdNotifReqInfo::NewLC(aSource,
-													 aReason,
-													 aDecision,
-													 aRequestors);
-    CleanupStack::Pop( self );
-    return self;
-    }
-
-
-// ---------------------------------------------------------------------------
-// Symbian 2 Phase Constructor
-// ---------------------------------------------------------------------------
-//
-CLpdNotifReqInfo* CLpdNotifReqInfo::NewLC(
-	TPosRequestSource aSource,
-	TPosVerifyCancelReason aReason,
-	TPosRequestDecision aDecision,
-	RPosRequestorStack* aRequestors)
-    {
-    CLpdNotifReqInfo* self = new( ELeave ) CLpdNotifReqInfo(aSource,
-    														aReason,
-    														aDecision,
-    														aRequestors);
-    CleanupStack::PushL( self );
-    self->ConstructL();
-    return self;
-    }
-
-
-// ---------------------------------------------------------------------------
-// Destructor
-// ---------------------------------------------------------------------------
-//
-CLpdNotifReqInfo::~CLpdNotifReqInfo()
-	{
-	if(iRequestors)
-		{
-		iRequestors->ResetAndDestroy();
-		delete iRequestors;
-		}
-	}
-
-
-// ---------------------------------------------------------------------------
-// CLpdNotifReqInfo::Source()
-// ---------------------------------------------------------------------------
-//
-const TPosRequestSource& CLpdNotifReqInfo::Source()
-    {
-    return iSource;
-    }
-
-
-// ---------------------------------------------------------------------------
-// CLpdNotifReqInfo::Reason()
-// ---------------------------------------------------------------------------
-//
-const TPosVerifyCancelReason& CLpdNotifReqInfo::Reason()
-    {
-    return iReason;
-    }
-
-
-// ---------------------------------------------------------------------------
-// CLpdNotifReqInfo::Decision()
-// ---------------------------------------------------------------------------
-//
-const TPosRequestDecision& CLpdNotifReqInfo::Decision()
-    {
-    return iDecision;
-    }
-
-
-// ---------------------------------------------------------------------------
-// CLpdNotifReqInfo::Requestors()
-// ---------------------------------------------------------------------------
-//
-const RPosRequestorStack& CLpdNotifReqInfo::Requestors()
-    {
-    return *iRequestors;
-    }
-
-//end of file
--- a/locationsystemui/locationsysui/locverifier/src/lpdperiodicprocessor.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,426 +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:   Helps retrieving request related information
-*
-*/
-
-
-// INCLUDE FILES
-//#include <eikenv.h>
-#include <StringLoader.h>
-#include <locverifierdlg.rsg>
-#include <aknmessagequerydialog.h>
-#include <epos_csuplsettingsconstants.h>
-#include <e32math.h>
-#include <badesca.h>
-#include <aknconsts.h>
-#include "lpdperiodicprocessor.h"
-#include "locverifierdlgdebug.h"
-#include "lpdverifiersettinglauncher.h"
-#include "lpdsuplsettingsadapter.h"
-
-
-// CONSTANTS
-const TInt KRequestorNameSize   = 256;
-const TInt KMinToSecs = 60;
-const TInt KHrToSecs  = 3600;
-const TInt KdayToSecs = 86400;
-const TInt KRealWidth = 50;
-_LIT( KNewLineEntry, "\n" );
-
-
-// Unnamed namespace for local definitions
-
-#ifdef _DEBUG
-_LIT( KPanicText, "CLpdPeriodicProcessor" );
-enum TPanicCode
-    {
-    KLpdErrGeneral = 1
-    };
-#endif
-
-// LinkClickedL
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//
-static TInt LinkClickedL(TAny* aPtr)
-    {
-    CLpdPeriodicProcessor* self = static_cast<CLpdPeriodicProcessor*>(aPtr);
-    self->LaunchSettingsL();
-    return ETrue;
-    }
-
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// CLpdPeriodicProcessor::CLpdPeriodicProcessor
-// C++ default constructor can NOT contain any code, that
-// might leave.
-// -----------------------------------------------------------------------------
-//
-CLpdPeriodicProcessor::CLpdPeriodicProcessor( MLpdPeriodicRequestObserver& aObserver )
-: iObserver(aObserver), iMessageText( NULL ), iRequestorName( NULL ), iSessionId(-1), iRequestorId(-1) 
-    {
-    }
-
-// -----------------------------------------------------------------------------
-// CLpdPeriodicProcessor::NewL
-// Two-phased constructor.
-// -----------------------------------------------------------------------------
-//
-CLpdPeriodicProcessor* CLpdPeriodicProcessor::NewL( MLpdPeriodicRequestObserver& aObserver )
-    {
-    CLpdPeriodicProcessor* self = CLpdPeriodicProcessor::NewLC( aObserver );
-    CleanupStack::Pop();
-    return self;
-    }
-
-// -----------------------------------------------------------------------------
-// CLpdPeriodicProcessor::NewL
-// Two-phased constructor.
-// -----------------------------------------------------------------------------
-//
-CLpdPeriodicProcessor* CLpdPeriodicProcessor::NewLC( MLpdPeriodicRequestObserver& aObserver)
-    {
-    CLpdPeriodicProcessor* self = new( ELeave ) CLpdPeriodicProcessor ( aObserver );
-    CleanupStack::PushL( self );
-    self->ConstructL();
-    return self;
-    }
-
-// Destructor
-CLpdPeriodicProcessor::~CLpdPeriodicProcessor()
-    {
-    delete iRequestor;    
-    delete iSUPLSettingsAdapter;
-    delete iVerifierSettingsLauncher;
-    delete iMessageText;
-    delete iRequestorName;
-    }
-
-// -----------------------------------------------------------------------------
-// CLpdPeriodicProcessor::ConstructL
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//
-void CLpdPeriodicProcessor::ConstructL()
-    {
-    iSUPLSettingsAdapter = CLpdSUPLSettingsAdapter::NewL(*this);
-    iVerifierSettingsLauncher = CLpdVerifierSettingsLauncher::NewL();
-    iRequestorName = HBufC::NewL( KRequestorNameSize );
-    iEikEnv = CEikonEnv::Static();
-
-    }
-    
-// -----------------------------------------------------------------------------
-// CLpdPeriodicProcessor::LaunchSettingsL
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//
-void CLpdPeriodicProcessor::LaunchSettingsL( )
-    {
-    if( iVerifierSettingsLauncher )
-		{
-		iVerifierSettingsLauncher->LaunchL( iSessionId );
-		}
-    }
-
-// -----------------------------------------------------------------------------
-// CLpdPeriodicProcessor::GetSessionId
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//
-TInt64 CLpdPeriodicProcessor::GetSessionId( )
-    {
-    return iSessionId;
-    }
-
-// -----------------------------------------------------------------------------
-// CLpdPeriodicRequestProcessor::SetRequestorId
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//
-void CLpdPeriodicProcessor::SetRequestorIdL( TInt32 aRequestorId )
-    {
-    __ASSERT_DEBUG( aRequestorId != KPosNullQNRequestId,
-                    HandleAssertErrorL() );
-    
-    iRequestorId = aRequestorId;
-    }
-        
-// -----------------------------------------------------------------------------
-// CLpdPeriodicProcessor::SetSessionId
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//
-void CLpdPeriodicProcessor::SetSessionIdL( TInt64 aSessionId )
-    {
-    __ASSERT_DEBUG( iRequestorId != KPosNullQNRequestId,
-                    HandleAssertErrorL() );
-	
-	  iSessionId = aSessionId;
-    }
-
-// -----------------------------------------------------------------------------
-// CLpdPeriodicProcessor::SetRequestorIdL
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//
-void CLpdPeriodicProcessor::SetRequestorNameL( HBufC* aRequestorName)
-   {
-   __ASSERT_DEBUG( iRequestorId != KPosNullQNRequestId,
-                   HandleAssertErrorL() );
-   iRequestorName->Des().Copy( aRequestorName->Des() );
-   }
-
-// -----------------------------------------------------------------------------
-// CLpdPeriodicProcessor::SetRequestTypeL
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//
-void CLpdPeriodicProcessor::SetRequestTypeL( 
-        CPosPrivacyNotifier::TRequestType aRequestType )
-    {
-    	 __ASSERT_DEBUG( iRequestorId != KPosNullQNRequestId,
-                    HandleAssertErrorL() );
-	  iRequestType = aRequestType;
-    }	
-
-// -----------------------------------------------------------------------------
-// CLpdPeriodicProcessor::SetRequestorL
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//
-void CLpdPeriodicProcessor::SetRequestorL( CPosRequestor* aRequestor )
-    {
-     __ASSERT_DEBUG( iRequestorId != KPosNullQNRequestId,
-                    HandleAssertErrorL() );
-    if( iRequestor )
-        {
-        delete iRequestor;
-        iRequestor = NULL;
-        }
-    
-    iRequestor = aRequestor;
-    }    
-
-// -----------------------------------------------------------------------------
-// CLpdPeriodicProcessor::ResetParameters
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//
-void CLpdPeriodicProcessor::ResetParameters()
-    {
-    iRequestorId = -1;
-    iSessionId = -1;
-    if( iRequestor )
-        {
-        delete iRequestor;
-        iRequestor = NULL;
-        }
-    
-    }   
-
-// -----------------------------------------------------------------------------
-// CLpdPeriodicProcessor::NotificationMessageText
-// Used to prepare notification message text
-// -----------------------------------------------------------------------------
-//
-
-void CLpdPeriodicProcessor::NotificationMessageTextL( HBufC*& aMessageText)
-    {
-    __ASSERT_DEBUG( iRequestorId != KPosNullQNRequestId,
-               HandleAssertErrorL() );    
-    TUint aTimePeriod;
-    
-    TRAPD( ret, iSUPLSettingsAdapter->GetTriggerPeriodL( iSessionId, aTimePeriod)); 
-    
-    if(ret != KErrNone)
-    {
-     User::Leave(ret);    	
-    }
-
-    if( iMessageText )
-		 {
-	     delete iMessageText;
-	     iMessageText = NULL;
-		 }   
-
-    TInt resourceId;
-    TBuf<KRealWidth> periodString;
-    HBufC* msgText = NULL;
-
-    GetResourceAndPeriodL( aTimePeriod, resourceId, periodString );
-    
-    GetMessageStringL(msgText, resourceId, *iRequestorName, periodString );
-   
-    if( msgText )
-    {
-    CleanupStack::PushL( msgText );
-    HBufC* linkText = NULL;
-    linkText = StringLoader::LoadL( R_LOC_NOTIFICATION_SERVICE_LINK, iEikEnv );
-    CleanupStack::PushL( linkText );
-    iMessageText = HBufC::NewL( msgText->Length() + KNewLineEntry().Length() + KOpeningLinkTag().Length() + 
-                                                linkText->Length() + KClosingLinkTag().Length() );
-    iMessageText->Des().Copy( *msgText );
-    iMessageText->Des().Append( KNewLineEntry );
-    iMessageText->Des().Append( KOpeningLinkTag );
-    iMessageText->Des().Append( *linkText );
-    iMessageText->Des().Append( KClosingLinkTag );
-    
-    CleanupStack::PopAndDestroy( ); //msgText
-    CleanupStack::PopAndDestroy( ); //linkText
-    //delete msgText; 
-    //delete linkText; 
-    }
-    else
-    {
-      iMessageText = HBufC::NewL( KMaxTriggerSessionNameLen );
-    }         
-    
-    aMessageText->Des().Copy(iMessageText->Des());
-  }
-
-// -----------------------------------------------------------------------------
-// CLpdPeriodicProcessor::LinkCallBack
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//
-TCallBack CLpdPeriodicProcessor::LinkCallBack()
-    {
-    return TCallBack(LinkClickedL, this);
-    }
-
-// -----------------------------------------------------------------------------
-// CLpdPeriodicRequestProcessor::UpdateSessionL
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//
-void CLpdPeriodicProcessor::UpdateSessionL( TInt64 aSessionId )
-    {
-	if( iSessionId == aSessionId &&
-	iRequestType == CPosPrivacyNotifier::ENotification && iRequestor
-	 && CPosRequestor::ERequestPeriodic == iRequestor->RequestType())
-      {
-	    iObserver.UpdateCurrentNotifierL();
-	    }
-    }
-
-// -----------------------------------------------------------------------------
-// CLpdPeriodicProcessor::GetMessageStringL
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//
-void CLpdPeriodicProcessor::GetMessageStringL( HBufC*& aMessageString, 
-                    TInt& aResourceId, TDesC& aNameString, TDesC& aPeriodString )
-    {
-
-    switch( aResourceId )
-        {
-        case R_LOC_NOTIFICATION_ONEHOUR:
-            {
-            aMessageString = StringLoader::LoadL( R_LOC_NOTIFICATION_ONEDAY, aNameString, iEikEnv ); 
-            break;
-            }
-        case R_LOC_NOTIFICATION_ONEDAY:
-            {
-            aMessageString = StringLoader::LoadL( R_LOC_NOTIFICATION_ONEDAY, aNameString, iEikEnv ); 
-            break;
-            }
-        case R_LOC_NOTIFICATION_MINUTES:
-        case R_LOC_NOTIFICATION_HOURS:
-        case R_LOC_NOTIFICATION_DAYS:
-        default:
-            {
-            CDesCArrayFlat* strings = new CDesCArrayFlat( 2 );
-            CleanupStack::PushL( strings );
-                    
-            strings->AppendL( aNameString ); // aNameString string
-            strings->AppendL( aPeriodString ); // aPeriodString string
-            
-            aMessageString = StringLoader::LoadL(aResourceId, *strings, iEikEnv );
-            
-            CleanupStack::PopAndDestroy( ); // strings
-            break;
-            }
-        }
-    }
-
-// -----------------------------------------------------------------------------
-// CLpdPeriodicProcessor::GetResourceAndPeriodL
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//
-void CLpdPeriodicProcessor::GetResourceAndPeriodL( TUint aSeconds, 
-									TInt& aResourceId, TDes& aPeriodString )
-    {
-    TRealFormat fmt(KDefaultRealWidth, 2);
-
-    if( !aSeconds )
-        {
-        aResourceId = R_LOC_NOTIFICATION_MINUTES;
-        aPeriodString.Num(aSeconds);
-        return;
-        }
-
-    TReal hrs = TReal(aSeconds)/KHrToSecs;
-    TReal value;
-    if( hrs < 1 )
-        {
-        TReal mins = TReal(aSeconds)/KMinToSecs; 
-        aResourceId = R_LOC_NOTIFICATION_MINUTES;
-        Math::Round( value, mins, 2 );
-        aPeriodString.Num(value, fmt);
-        }
-    else if( hrs == 1 )
-        {
-        aResourceId = R_LOC_NOTIFICATION_ONEHOUR;
-        }
-    else
-        {
-        TReal days = TReal(aSeconds)/KdayToSecs;
-        if( days < 1 )
-            {
-            aResourceId = R_LOC_NOTIFICATION_HOURS;
-            Math::Round( value, hrs, 2 );
-            aPeriodString.Num(value, fmt);
-            }
-        else if( days == 1 )
-            {
-            aResourceId = R_LOC_NOTIFICATION_ONEDAY;
-            }
-        else
-            {
-            aResourceId = R_LOC_NOTIFICATION_DAYS;
-            Math::Round( value, days, 2 );
-            aPeriodString.Num(value, fmt);
-            }
-        }
-    }
-        
-// -----------------------------------------------------------------------------
-// CLpdPeriodicProcessor::HandleAssertErrorL
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//
-void CLpdPeriodicProcessor::HandleAssertErrorL() const
-    {
-    #ifdef _DEBUG
-        User::Panic( KPanicText, KLpdErrGeneral );
-    #else
-        User::Leave( KErrCorrupt );
-    #endif
-    }	
-// end of file
--- a/locationsystemui/locationsysui/locverifier/src/lpdquerylauncherbase.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,474 +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:  Abstract base class for queries.
-*
-*/
-
-
-// INCLUDE FILES
-#include <locverifierdlg.rsg>
-#include <StringLoader.h>
-
-#include "locverifierdlg.hrh"
-#include "lpdquerylauncherbase.h"
-#include "lpdresulthandler.h"
-#include "locconsts.h"
-#include "lpdglobalplugindialog.h"
-#include "lpdmessageplugindialog.h"
-#include "lpdperiodicprocessor.h"
-
-
-// CONSTANTS
-
-// Unnamed namespace for local definitions
-
-const TUint KSelectionArrayGranularity = 5;
-const TInt KVerDlgTimeout = 900000000; // == 15 minutes
-
-#ifdef _DEBUG
-_LIT( KPanicText, "CLpdQueryLauncherBase" );
-enum TPanicCode
-    {
-    KLpdErrGeneral = 1
-    };
-#endif
-
-// INCLUDE FILES
-#include <s32mem.h>
-#include <AknMediatorFacade.h>
-#include "locverifiercoverui.h"
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// CLpdQueryLauncherBase::CLpdQueryLauncherBase
-// C++ default constructor can NOT contain any code, that
-// might leave.
-// -----------------------------------------------------------------------------
-//
-CLpdQueryLauncherBase::CLpdQueryLauncherBase( MLpdResultHandler& aHandler )
-    : iHandler( aHandler ),
-      iResult( KErrArgument ),
-      iCurrentIndex( -1 ),
-      iExitReason( KErrNone ),
-      iOwnsQueryDlg( EFalse ),
-      iOwnsMsgQueryDlg( EFalse )   
-    {
-    }
-
-// -----------------------------------------------------------------------------
-// CLpdQueryLauncherBase::BaseConstructL
-// Symbian 2nd phase constructor can leave.
-// -----------------------------------------------------------------------------
-//
-void CLpdQueryLauncherBase::BaseConstructL()
-    {
-    // In current implementation timer is not used. If needed, take timer 
-    // into use by uncommenting the following line:
-    // iTimer = CPeriodic::NewL( CActive::EPriorityStandard )
-    }
-
-// Destructor
-CLpdQueryLauncherBase::~CLpdQueryLauncherBase()
-    {
-    // This does cleanup nicely even if dialog was not running:
-    ExitQuery( EFalse ); // no callback from dialog anymore
-    delete iTimer; // ok even if timer is NULL 
-    }
-
-// -----------------------------------------------------------------------------
-// CLpdQueryLauncherBase::PrepareQueryResourcesL
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//
-void CLpdQueryLauncherBase::PrepareQueryResourcesL( TInt aResourceId, TInt aSuplNotifRequest)
-    {
-    
-    if( aSuplNotifRequest )
-        {
-        // Cancel deletes dialog resources:
-        Cancel();    
-       __ASSERT_DEBUG( !iMsgQueryDlg,
-                    User::Panic( KPanicText, KLpdErrGeneral ) );
-  
-        iMsgQueryDlg = CLpdMessagePluginDialog::NewL( *this, &iMsgQueryDlg );
-        iMsgQueryDlg->PrepareLC(aResourceId);    
-        CleanupStack::Pop(iMsgQueryDlg); //iMsgQueryDlg, must be pushed back when launching
-        iOwnsMsgQueryDlg = ETrue; 
- 
-        }
-    else
-        {
-       // Cancel deletes dialog resources:
-       Cancel();    
-     __ASSERT_DEBUG( !iSelectionIndex && !iQueryDlg,
-                    User::Panic( KPanicText, KLpdErrGeneral ) );
-        iSelectionIndex =
-            new( ELeave ) CArrayFixFlat<TInt>( KSelectionArrayGranularity );
-        iQueryDlg = CLpdGlobalPluginDialog::NewL( *this, &iQueryDlg, iSelectionIndex );
-        iQueryDlg->PrepareLC( aResourceId );
-        CleanupStack::Pop(iQueryDlg); //iQueryDlg, must be pushed back when launching
-        iOwnsQueryDlg = ETrue; 
-            
-        }
-    }
-
-// -----------------------------------------------------------------------------
-// CLpdQueryLauncherBase::SetQueryTextArray
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//
-void CLpdQueryLauncherBase::SetQueryTextArray( MDesCArray* aArray )
-    {
-    __ASSERT_DEBUG( iQueryDlg, User::Panic( KPanicText, KLpdErrGeneral ) );
-    iQueryDlg->SetItemTextArray( aArray );
-    // ownership of array is transferred:
-    iQueryDlg->SetOwnershipType( ELbmOwnsItemArray );
-    }
-
-// -----------------------------------------------------------------------------
-// CLpdQueryLauncherBase::SetMessageQueryTextL
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//
-void CLpdQueryLauncherBase::SetMessageQueryTextL( const TDesC& aString, TCallBack aCallBack )
-    {
-    __ASSERT_DEBUG( iMsgQueryDlg, User::Panic( KPanicText, KLpdErrGeneral ) );
-    
-    HBufC* dialogTitle = NULL;
-    // set title text
-    dialogTitle = StringLoader::LoadLC( R_LOC_SUPL_PERIODIC_DIALOG_TITLE );  
-    iMsgQueryDlg->QueryHeading()->SetTextL( *dialogTitle ); 
-    // set message text                  
-	  iMsgQueryDlg->SetMessageTextL( aString );
-	  iMsgQueryDlg->SetLink( aCallBack );
-	
-	  CleanupStack::PopAndDestroy( dialogTitle );
-    }
-    
-// -----------------------------------------------------------------------------
-// CLpdQueryLauncherBase::StartQueryL
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//
-void CLpdQueryLauncherBase::StartQueryL()
-    {
-    User::LeaveIfNull( iQueryDlg );
-
-    iExitReason = KErrNone;
-    
-    CLpdGlobalPluginDialog* queryDialog = iQueryDlg;
-    
-    // Publish the dialog to Cover UI  
-    PublishDialogtoCoverL();
-       
-    CleanupStack::PushL( queryDialog ); // RunLD() requires this
-    iOwnsQueryDlg = EFalse; // ownership transferred to RunLD
-    queryDialog->RunLD();
-
-    if ( iTimer )
-        {
-        TCallBack callback( HandleTimeoutCallback, this );
-        TTimeIntervalMicroSeconds32 timeout( KVerDlgTimeout );
-        // This timer will not expire periodically, so the second
-        // parameter is not so important in this case.
-        
-		    iTimer->Cancel();
-        iTimer->Start( timeout, timeout, callback );
-        }
-    }
-
-// -----------------------------------------------------------------------------
-// CLpdQueryLauncherBase::StartSuplPeriodicQueryL
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//
-void CLpdQueryLauncherBase::StartSuplPeriodicQueryL()
-    {
-    User::LeaveIfNull( iMsgQueryDlg );
-    
-    iExitReason = KErrNone;
-    CLpdMessagePluginDialog* queryDialog = iMsgQueryDlg;
-    
-    // Publish the dialog to Cover UI  
-    PublishDialogtoCoverL();
-       
-    CleanupStack::PushL( queryDialog ); // RunLD() requires this
-    iOwnsMsgQueryDlg = EFalse; // ownership transferred to RunLD
-    queryDialog->RunLD();
-    
-    if ( iTimer )
-        {
-        TCallBack callback( HandleTimeoutCallback, this );
-        TTimeIntervalMicroSeconds32 timeout( KVerDlgTimeout );
-        // This timer will not expire periodically, so the second
-        // parameter is not so important in this case.
-        
-        iTimer->Cancel();
-        iTimer->Start( timeout, timeout, callback );
-        }
-         
-    }
-
-// -----------------------------------------------------------------------------
-// CLpdQueryLauncherBase::SelectionIndexes
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//
-const CListBoxView::CSelectionIndexArray* CLpdQueryLauncherBase::SelectionIndexes() const
-    {
-    return iSelectionIndex;
-    }
-
-// -----------------------------------------------------------------------------
-// CLpdQueryLauncherBase::HandleTimeoutCallback
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//
-TInt CLpdQueryLauncherBase::HandleTimeoutCallback( TAny* aThis )
-    {
-	  static_cast<CLpdQueryLauncherBase*>( aThis )->HandleTimeout();
-    return KErrNone; // Return value is unimportant in this case
-    }
-
-// -----------------------------------------------------------------------------
-// CLpdQueryLauncherBase::Cancel
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//
-void CLpdQueryLauncherBase::Cancel()
-    {
-    iExitReason = KErrCancel;
-    ExitQuery( ETrue );
-    }
-
-// -----------------------------------------------------------------------------
-// CLpdQueryLauncherBase::CancelQuietly
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//
-void CLpdQueryLauncherBase::CancelQuietly()
-    {
-    iExitReason = KErrCancel;
-    ExitQuery( EFalse );
-    }
-
-// -----------------------------------------------------------------------------
-// CLpdQueryLauncherBase::ListBoxL
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//
-CEikFormattedCellListBox& CLpdQueryLauncherBase::ListBoxL()
-    {
-	__ASSERT_DEBUG( iQueryDlg, User::Panic( KPanicText, KLpdErrGeneral ) );
-    CEikFormattedCellListBox* listbox = iQueryDlg->ListControl()->Listbox();
-    User::LeaveIfNull( listbox );
-	  return *listbox;    
-    }
-
-// -----------------------------------------------------------------------------
-// CLpdQueryLauncherBase::SetRequestorBuffer
-// Sets the requestor buffer array that needs to be published to
-// Cover UI
-// @param aRequestorBuffer Flat buffer containing the list of requestors
-// -----------------------------------------------------------------------------
-//
-void CLpdQueryLauncherBase::SetRequestorBuffer( TDes8&     aRequestorBuffer )
-    {
-    iRequestorBuffer.Set( aRequestorBuffer);
-    }
-
-// -----------------------------------------------------------------------------
-// CLpdQueryLauncherBase::SetCoverUICommand
-// Sets the Cover UI Command ID
-// @param aCommandId Cover UI Command
-// -----------------------------------------------------------------------------
-//
-void CLpdQueryLauncherBase::SetCoverUICommand( TInt        aCommand )
-    {
-    iCoverUiCommand = aCommand;
-    }
-
-
-// -----------------------------------------------------------------------------
-// CLpdQueryLauncherBase::HandleDlgDismissedL
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//
-void CLpdQueryLauncherBase::HandleDlgDismissedL(    
-    TInt aResult,
-    TInt aCurrentIndex )
-    {
-    // ExtendedHandleDlgDismissedL() implementation probably
-    // makes a callback to the observer of this class, which
-    // might delete this object. Therefore it is important
-    // that members are carefully used.
-
-    if ( iTimer )
-        {
-        iTimer->Cancel();
-        }
-
-    iResult = aResult;
-    iCurrentIndex = aCurrentIndex;
-    
-    if(iQueryDlg)
-    {
-    // Cancel the dialog from secondary
-    CAknMediatorFacade* covercl = AknMediatorFacade(iQueryDlg);
-    if( covercl )
-      {
-      covercl->CancelCommand();
-      }
-    }
-    if(iMsgQueryDlg)
-    {
-      // Cancel the dialog from secondary
-    CAknMediatorFacade* coverclmsg = AknMediatorFacade(iMsgQueryDlg);
-    if( coverclmsg )
-        {
-        coverclmsg->CancelCommand();
-        }
-    }
-    // iQueryDlg, which will delete itself, is becoming invalid now
-    iQueryDlg = NULL;
-    iMsgQueryDlg = NULL;
-    TRAPD( err, ExtendedHandleDlgDismissedL() );
-         if ( err )
-             { // Leave occurred in dialog result processing, we must let
-               // plugin handle the situation instead of propagating error to
-               // AVKON, which would mean that dialog would not be exited and
-               // user could alter his decision --> risk of conflicts.
-             iHandler.HandleLeave( err );
-             }
-      
-    }
-
-// -----------------------------------------------------------------------------
-// CLpdQueryLauncherBase::HandleTimeout
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//
-void CLpdQueryLauncherBase::HandleTimeout()
-    {
-    iExitReason = KErrTimedOut;
-    ExitQuery( ETrue );
-    }
-
-// -----------------------------------------------------------------------------
-// CLpdQueryLauncherBase::ExitQuery
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//
-void CLpdQueryLauncherBase::ExitQuery( TBool aCallback )
-    {
-    if ( iTimer )
-        {
-        iTimer->Cancel();
-        }
-    if ( iQueryDlg )
-        {
-        if ( iOwnsQueryDlg )
-            { // Dialog not running yet --> must be explicitely deleted
-            delete iQueryDlg;
-            }
-        else
-            { // Dialog running --> exit
-            TInt err = KErrNone;
-            if ( aCallback )
-                {
-                TRAP( err, iQueryDlg->ExitDialogL() );
-                }
-            else
-                {
-                TRAP( err, iQueryDlg->ExitDialogQuietlyL() );
-                }
-            if ( err )
-                {
-                CEikonEnv::Static()->HandleError( err );
-                }
-            }
-        iQueryDlg = NULL;
-        }
-    if ( iMsgQueryDlg )
-        {
-        if ( iOwnsQueryDlg )
-            { // Dialog not running yet --> must be explicitely deleted
-            delete iMsgQueryDlg;
-            }
-        else
-            { // Dialog running --> exit
-            TInt err = KErrNone;
-            if ( aCallback )
-                {
-                TRAP( err, iMsgQueryDlg->ExitDialogL() );
-                }
-            else
-                {
-                TRAP( err, iMsgQueryDlg->ExitDialogQuietlyL() );
-                }
-            if ( err )
-                {
-                CEikonEnv::Static()->HandleError( err );
-                }
-            }
-        iMsgQueryDlg = NULL;
-        }
-        iResult = KErrArgument;
-        iCurrentIndex = -1;
-        if( iSelectionIndex )
-           {
-           delete iSelectionIndex;
-           iSelectionIndex = NULL;
-           }
- }
-
-// -----------------------------------------------------------------------------
-// CLpdQueryLauncherBase::PublishDialogtoCoverL
-// Prepare the requestor buffers and Publish the dialog to the 
-// Cover UI
-// -----------------------------------------------------------------------------
-//
-void CLpdQueryLauncherBase::PublishDialogtoCoverL()
-    {
-    
-    CAknMediatorFacade* covercl = NULL;
-	if( iQueryDlg )
-		{
-	    // Publish the Dialog to Cover UI
-	    iQueryDlg->PublishDialogL( iCoverUiCommand, KCatUidLocationVerifierDlgs );
-		
-   		// Send the requestor buffer to the Cover UI
-		covercl = AknMediatorFacade( iQueryDlg );
-		}
-	else if( iMsgQueryDlg )
-		{
-	    // Publish the Dialog to Cover UI
-	    iMsgQueryDlg->PublishDialogL( iCoverUiCommand, KCatUidLocationVerifierDlgs );
-		
-   		// Send the requestor buffer to the Cover UI
-		covercl = AknMediatorFacade( iMsgQueryDlg );
-		}
-		
-    if (covercl)
-        {
-        RBufWriteStream& writeStream = covercl->BufStream();
-        
-        TUint8* ptr = const_cast<TUint8 *>(iRequestorBuffer.Ptr());
-        writeStream.WriteL( ptr, iRequestorBuffer.Length());
-        writeStream.CommitL();
-        }
-    }
-
-//  End of File
--- a/locationsystemui/locationsysui/locverifier/src/lpdrequestao.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,150 +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:  Active object which ensures that current call stack is run to
-*                completion before a new request is handled
-*
-*/
-
-
-// INCLUDE FILES
-#include "lpdrequestao.h"
-#include "lpdverifierplugin.h"
-#include <lbs/epos_cposrequestor.h>
-#include <lbs/epos_rposrequestorstack.h>
-#include <AknNotifierAppServer.h>
-#include <eikenv.h>
-#include <eiknotapi.h>
-
-// ================= MEMBER FUNCTIONS =======================
-
-// -----------------------------------------------------------------------------
-// CLpdRequestAO::CLpdRequestAO
-// C++ default constructor can NOT contain any code, that
-// might leave.
-// -----------------------------------------------------------------------------
-//
-CLpdRequestAO::CLpdRequestAO( CLpdVerifierPlugin& aPlugin )
-    : CActive( CActive::EPriorityHigh ), iPlugin( aPlugin )
-    {
-	}
-
-// -----------------------------------------------------------------------------
-// CLpdRequestAO::NewL
-// Two-phased constructor.
-// -----------------------------------------------------------------------------
-//
-CLpdRequestAO* CLpdRequestAO::NewL( CLpdVerifierPlugin& aPlugin )
-	{
-    CLpdRequestAO* self = new( ELeave ) CLpdRequestAO( aPlugin );
-    CActiveScheduler::Add(self);
-
-    CAknNotifierAppServer* AknNServer = 
-        static_cast<CAknNotifierAppServer*>(CEikonEnv::Static()->AppServer());
-    AknNServer->UnbalanceReferenceCountForNotif(aPlugin.NotifierBase()->Info().iUid,ETrue);
-    // Nothing to do in the Second Phase Constructor
-    return self;
-	}
-
-// Destructor
-CLpdRequestAO::~CLpdRequestAO()
-	{
-    Cancel();
-    iNotificationQue.ResetAndDestroy();
-    iNotificationQue.Close();
-	}
-
-// -----------------------------------------------------------------------------
-// CLpdRequestAO::ScheduleRequest
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//
-void CLpdRequestAO::ScheduleRequest()
-    {	     
-    Cancel();
-    SetActive();
-    TRequestStatus* status = &iStatus;
-    User::RequestComplete( status, KErrNone );            
-    }
-
-// -----------------------------------------------------------------------------
-// CLpdRequestAO::RunL
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//
-void CLpdRequestAO::RunL()
-    {	    
-    // Let's call the non-leaving method so that plugin
-    // takes care of error handling.
-    RArray<TPosQNRequestId> requests;
-    CleanupClosePushL( requests );
-    iPlugin.GetRequestsL( requests );
-    if ( requests.Count() == 0 )
-    	{
-    	if( iNotificationQue.Count() )
-    	    {
-        	iPlugin.FreeQueryResources();
-        	CLpdNotifReqInfo* notifInfo = iNotificationQue[0];
-        	iPlugin.NotifyCancellationL(notifInfo->Source(),
-        								notifInfo->Reason(),
-        								notifInfo->Decision(),
-        								notifInfo->Requestors());
-    	    iNotificationQue.Remove(0);
-    	    delete notifInfo;
-    	    iNotificationQue.Compress();
-    	    }
-        else
-            {
-    	    CAknNotifierAppServer* AknNServer = 
-                static_cast<CAknNotifierAppServer*>(CEikonEnv::Static()->AppServer());
-            AknNServer->UnbalanceReferenceCountForNotif(iPlugin.NotifierBase()->Info().iUid,EFalse);
-    	    iPlugin.HandleNextRequest();
-            }
-    	}
-    else
-    	{
-	    iPlugin.HandleNextRequest();
-    	}
-    CleanupStack::PopAndDestroy();
-    }
-
-// -----------------------------------------------------------------------------
-// CLpdRequestAO::DoCancel
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//
-void CLpdRequestAO::DoCancel()
-    {
-    // Not important with this AO
-	}
-
-
-// -----------------------------------------------------------------------------
-// CLpdRequestAO::EnqueueRequestL
-// -----------------------------------------------------------------------------
-//
-void CLpdRequestAO::EnqueueRequestL( TPosRequestSource aSource,
-								    TPosVerifyCancelReason aReason,
-								    TPosRequestDecision aDecision,
-								    RPosRequestorStack* aRequestors )
-	{
-	CLpdNotifReqInfo* notifReqInfo = CLpdNotifReqInfo::NewL(aSource, 
-													  aReason,
-													  aDecision,
-													  aRequestors);
-	
-	// The ownership is transferred to iNotificationQue
-	iNotificationQue.Append(notifReqInfo);
-	}
-	
-//  End of File
--- a/locationsystemui/locationsysui/locverifier/src/lpdrequestorprocessor.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,293 +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:  Processes requestor related data.
-*
-*/
-
-
-// INCLUDE FILES
-#include "lpdrequestorprocessor.h"
-#include "lpdverifnotiflbmodel.h"
-#include "lpdbasemodel.h"
-#include "locconsts.h"
-#include "locverifierdlgdebug.h"
-#include <lbs/epos_cposrequestor.h>
-#include <lbs/epos_cposcontactrequestor.h>
-#include <lbs/epos_cposservicerequestor.h>
-#include <EPos_CPosPrivacyNotifier.h>
-
-// CONSTANTS
-_LIT( KUnknownRequestor, "Unknown" );
-
-// Unnamed namespace for local definitions
-
-const TInt KRequestorsGranularity = 5;
-#ifdef _DEBUG
-_LIT( KPanicText, "CLpdRequestorProcessor" );
-enum TPanicCode
-    {
-    KLpdErrGeneral = 1
-    };
-#endif
-
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// CLpdRequestorProcessor::CLpdRequestorProcessor
-// C++ default constructor can NOT contain any code, that
-// might leave.
-// -----------------------------------------------------------------------------
-//
-CLpdRequestorProcessor::CLpdRequestorProcessor() 
-: iRequestors( KRequestorsGranularity),
-  iSuplRequest ( 0 ),
-  iSessionId ( 0 )
-    {
-    }
-
-// -----------------------------------------------------------------------------
-// CLpdRequestorProcessor::NewL
-// Two-phased constructor.
-// -----------------------------------------------------------------------------
-//
-CLpdRequestorProcessor* CLpdRequestorProcessor::NewL()
-    {
-    CLpdRequestorProcessor* self = new( ELeave ) CLpdRequestorProcessor;
-    // Nothing to do in the Second Phase Constructor
-    return self;
-    }
-    
-// Destructor
-CLpdRequestorProcessor::~CLpdRequestorProcessor()
-    {
-    iRequestors.ResetAndDestroy();
-    }
-
-// -----------------------------------------------------------------------------
-// CLpdRequestorProcessor::ReadRequestorsL
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//
-TBool CLpdRequestorProcessor::ReadRequestorsL(
-    const CPosPrivacyNotifier& aPosNotifier )
-    {
-    __ASSERT_DEBUG( aPosNotifier.CurrentRequest() != KPosNullQNRequestId,
-                    HandleAssertErrorL() );
-
-    this->ResetAndDestroyRequestors();
-    
-    TBool allRequestorIdsValid = ETrue;
-	  CLocRequestorUtilsResolver* reqUtils = CLocRequestorUtilsResolver::NewL();
-	  CleanupStack::PushL(reqUtils);
-    // Let's read the requestors associated with the current request:
-    TInt nofRequestors = aPosNotifier.RequestorCountL();
-
-    for ( TInt i = 0; i < nofRequestors; i++ )
-        {
-        CPosRequestor* requestor = aPosNotifier.RequestorLC( i );
-        if ( !reqUtils->RequestorIdValid( *requestor ) )
-            { // mark that some requestor id is invalid
-            allRequestorIdsValid = EFalse;
-            }
-   
-        if( iSuplRequest )
-           {
-           TInt64 sessionId = RetrieveSessionId( requestor->RequestorIdString() );
-           SetSessionId( sessionId );
-           TPtrC RequestorName = RetrieveRequestorNameL(requestor->RequestorIdString());           
-           requestor->SetRequestorIdL(requestor->RequestorIdFormat(), RequestorName);
-           }
-        User::LeaveIfError( iRequestors.Append( requestor ) );
-        CleanupStack::Pop( requestor ); // iRequestors owns now the requestor
-        }
-
-    if ( nofRequestors == 0 )
-        {
-        allRequestorIdsValid = EFalse; // zero requestors == invalid
-        }
-
-    // Use Requestor Utils and resolve the requestor here itself
-    reqUtils->ProcessRequestorsL(iRequestors);
-    CleanupStack::PopAndDestroy(reqUtils);
-    return allRequestorIdsValid;
-    }
-
-// -----------------------------------------------------------------------------
-// CLpdRequestorProcessor::RtorNamesForVerifNotifL
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//
-CLpdBaseModel* CLpdRequestorProcessor::RtorNamesForVerifNotifL(
-    CEikFormattedCellListBox& aListBox )
-    {
-    return CLpdVerifNotifLBModel::NewL( *this, aListBox );
-    }
-
-// -----------------------------------------------------------------------------
-// CLpdRequestorProcessor::ResetAndDestroyRequestors
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//
-void CLpdRequestorProcessor::ResetAndDestroyRequestors()
-    {
-    iRequestors.ResetAndDestroy();
-    }
-
-void CLpdRequestorProcessor::SetRequestType( TInt aReqType )
-    {
-       iSuplRequest = aReqType ;
-    } 
-// -----------------------------------------------------------------------------
-// CLpdRequestorProcessor::Requestors
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//
-const RPointerArray<CPosRequestor>& CLpdRequestorProcessor::Requestors() const
-    {
-    return iRequestors;
-    }
-
-// -----------------------------------------------------------------------------
-// CLpdRequestorProcessor::HandleAssertErrorL
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//
-void CLpdRequestorProcessor::HandleAssertErrorL() const
-    {
-    #ifdef _DEBUG
-        User::Panic( KPanicText, KLpdErrGeneral );
-    #else
-        User::Leave( KErrCorrupt );
-    #endif
-    }
-
-// -----------------------------------------------------------------------------
-// CLpdRequestorProcessor::RetrieveRequestorsL
-// The Requestors information for the current request is read and returned.
-// -----------------------------------------------------------------------------
-//
-RPosRequestorStack* CLpdRequestorProcessor::RetrieveRequestorsL( 
-	const CPosPrivacyNotifier& aPosNotifier )
-	{
-    __ASSERT_DEBUG( aPosNotifier.CurrentRequest() != KPosNullQNRequestId,
-                    HandleAssertErrorL() );
-
-    RPosRequestorStack* requestors = new(ELeave) RPosRequestorStack;
-
-    // Let's read the requestors associated with the current request:
-    TInt nofRequestors = aPosNotifier.RequestorCountL();
-
-    for ( TInt i = 0; i < nofRequestors; i++ )
-        {
-        CPosRequestor* requestor = aPosNotifier.RequestorLC( i );
-        requestors->AppendL( requestor );
-        CleanupStack::Pop( requestor ); // requestors owns now the requestor
-        }
-
-    // Return the Index of the Array where the requestor Arary is appended.
-    return requestors;
-	}
-
-// -----------------------------------------------------------------------------
-// CLpdRequestorProcessor::ReadRequestorsL
-// Read the requestors passed as parameter. Resolve them and store in
-// iRequestors member variable.
-// -----------------------------------------------------------------------------
-//
-void CLpdRequestorProcessor::ReadRequestorsL( 
-	const RPosRequestorStack& aRequestors )
-	{
-    TInt nofRequestors = aRequestors.Count();
-	  CLocRequestorUtilsResolver* reqUtils = CLocRequestorUtilsResolver::NewL();
-	  CleanupStack::PushL(reqUtils);
-
-    for ( TInt i = 0; i < nofRequestors; i++ )
-        {
-        CPosRequestor* requestor;
-        if( iSuplRequest )
-            {
-                TInt64 sessionId = RetrieveSessionId( aRequestors[i]->RequestorIdString() );
-                SetSessionId( sessionId );
-                TPtrC RequestorName = RetrieveRequestorNameL(aRequestors[i]->RequestorIdString());
-                aRequestors[i]->SetRequestorIdL(aRequestors[i]->RequestorIdFormat(), RequestorName);
-            }
-        if (aRequestors[i]->RequestorType() == 
-        	CPosRequestor::ERequestorService)
-        	{
-        	    requestor = CPosServiceRequestor::NewLC(
-        					    	aRequestors[i]->RequestorIdFormat(),
-        					    	aRequestors[i]->RequestorIdString());
-        	}
-        else
-        	{
-        	requestor = CPosContactRequestor::NewLC(
-        						aRequestors[i]->RequestorIdFormat(),
-        						aRequestors[i]->RequestorIdString());
-        	}
-        
-        iRequestors.AppendL( requestor );
-        CleanupStack::Pop( requestor ); // requestors owns now the requestor
-        }
-
-    // Return the Index of the Array where the requestor Arary is appended.
-    // Use Requestor Utils and resolve the requestor here itself
-    reqUtils->ProcessRequestorsL(iRequestors);
-    CleanupStack::PopAndDestroy(reqUtils);
-	}
-
-TPtrC CLpdRequestorProcessor::RetrieveRequestorNameL(  const TDesC& aString )
-{
-    //Parse string and extract characters leaving last
-    // 3 characters and return as requestor name. 
-    //If requestor name not there, say unknown requestor
-    if( aString.Length() > 3 )
-    {
-       TPtrC requestorName = aString.Left( aString.Length() - 3 );
-       return requestorName;
-    }
-    else   
-    {
-    HBufC* buf = HBufC::NewL( KUnknownRequestor().Length() );
-    buf->Des().Append( KUnknownRequestor );
-    return buf->Des();
-    }
-}
-
-
-TInt64 CLpdRequestorProcessor::RetrieveSessionId(  const TDesC& aString )
-{
-    //Parse string and return session id(last 3 characters)
-    //after converting to TInt
-    TInt sessId;
-    TInt64 sessionId;
-    TPtrC sessionIdPart = aString.Right( 3 );
-
-    TLex lex( sessionIdPart );
-    lex.Val( sessId );
-    sessionId = sessId;
-    return sessionId;
-}
-
-void CLpdRequestorProcessor::SetSessionId(  TInt64 aSessionId )
-{
-    iSessionId = aSessionId;
-}
-	
-TInt64 CLpdRequestorProcessor::GetSessionId()
-{
-    return iSessionId;
-}
-
-// end of file
--- a/locationsystemui/locationsysui/locverifier/src/lpdsuplsettingsadapter.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,147 +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:  Adapter to the SUPL Settings API
-*
-*/
-
-
-// System Includes
-#include <epos_csuplsettings.h>
-#include <locsuplsettingsui.rsg>
-#include <StringLoader.h>
-
-// User Includes
-#include "lpdsuplsettingsadapter.h"
-#include "lpdsuplsettingsadapterobserver.h"
-
-
-// ---------------------------------------------------------------------------
-// Private Constructor
-// ---------------------------------------------------------------------------
-//
-CLpdSUPLSettingsAdapter::CLpdSUPLSettingsAdapter( 
-                            MLpdSUPLSettingsAdapterObserver&    aObserver )
-		:iObserver( aObserver )
-    {
-    }
- 
-// ---------------------------------------------------------------------------
-// Destructor
-// ---------------------------------------------------------------------------
-//    
-CLpdSUPLSettingsAdapter::~CLpdSUPLSettingsAdapter()
-    {
-   // delete iTimer;
-    if( iSUPLSettings )
-        {
-        iSUPLSettings->RemoveSessionObserver();
-        }
-        
-    delete iSUPLSettings;
-    iSUPLSettings = NULL;	
-
-    } 
-
-// ---------------------------------------------------------------------------
-// CLpdSUPLSettingsAdapter* CLpdSUPLSettingsAdapter::NewL
-// Static Two phase contructor that instantiates the CLpdSUPLSettingsAdapter
-// 
-// @param aObserver				    Observer to the SUPL settings adapter
-// @return CLpdSUPLSettingsAdapter*	Reference to the object created
-// ---------------------------------------------------------------------------
-//    
-CLpdSUPLSettingsAdapter* CLpdSUPLSettingsAdapter::NewL(
-                            MLpdSUPLSettingsAdapterObserver&    aObserver )
-    {
-    CLpdSUPLSettingsAdapter* self = 
-                new ( ELeave ) CLpdSUPLSettingsAdapter( aObserver );
-    CleanupStack::PushL( self );
-    self->ConstructL();
-    CleanupStack::Pop( self );	
-    return self;
-    }
-
-// ---------------------------------------------------------------------------
-// void CLpdSUPLSettingsAdapter::ConstructL
-// Second phase of the two phase constructor
-// ---------------------------------------------------------------------------
-// 
-void CLpdSUPLSettingsAdapter::ConstructL()
-    {
-    // Create the SUPL Settings
-    iSUPLSettings = CSuplSettings::NewL();
-    
-    // Set the Observer for SUPL Sessions
-    iSUPLSettings->SetSessionObserverL( *this );
-   
-    }  
-
-// ---------------------------------------------------------------------------
-// void CLpdSUPLSettingsAdapter::HandleSuplSessionChangeL
-// Handle the Supl Session changes
-// ---------------------------------------------------------------------------
-//     
-void CLpdSUPLSettingsAdapter::HandleSuplSessionChangeL( 
-                TSuplSessionEventType aEvent,
-                TInt64 aSessionId                        
-        		)
-    {
-	if( aEvent == MSuplSessionObserver::ESuplSessionDBUpdateEvent ||
-		aEvent == MSuplSessionObserver::ESuplSessionDBDeleteEvent )
-		  {
-      iObserver.UpdateSessionL( aSessionId );
-	    }	
-    }
-
-// -----------------------------------------------------------------------------
-// CLpdSUPLSettingsAdapter::GetSessionNameAndPeriodL
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//
-void CLpdSUPLSettingsAdapter::GetTriggerPeriodL( TInt64 aSessionId, TUint& aTimePeriod )
-    {
-    CTriggerParams* trigParams = CTriggerParams::NewL();
-    CleanupStack::PushL( trigParams );
-     
-    User::LeaveIfError( iSUPLSettings->GetTriggerParams( aSessionId, trigParams ) );
-     
-    TUint64 outstandingTrigger;
-    TUint64 interval;
-    TBool notificationPresent;
-    TBool triggerNotificationStatus;  
-    CTriggerParams::TTriggerType triggerType; 
-    CTriggerParams::TRequestType requestType;
-    
-    HBufC* sessionName;
-    sessionName = HBufC::NewLC( 256 ); 
-                  
-    sessionName->Des().Zero();
-       
-    User::LeaveIfError( trigParams->Get(
-                             aSessionId, 
-                             sessionName->Des(), 
-                             notificationPresent, 
-                             triggerNotificationStatus, 
-                             triggerType,
-                             requestType, 
-                             outstandingTrigger, 
-                             interval) );
-    
-    aTimePeriod = interval*outstandingTrigger;
-    
-    CleanupStack::PopAndDestroy( ); // sessionName
-    CleanupStack::PopAndDestroy( ); // trigParams
-    }
-
-// End of file
--- a/locationsystemui/locationsysui/locverifier/src/lpdverifierplugin.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1232 +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:  Verifier plug-in which derives from CPosPrivacyNotifier.
- *
- */
-
-// INCLUDE FILES
-#include <eikenv.h>
-#include <eiknotapi.h>
-#include <AknIconArray.h>
-#include <apgcli.h>
-#include <lbs/epos_rposrequestorstack.h>
-#include <epos_csuplsettingsconstants.h>
-#include <StringLoader.h>
-#include <locverifierdlg.rsg>
-#include "lpdverifierplugin.h"
-#include "lpdrequestao.h"
-#include "lpdrequestorprocessor.h"
-#include "lpdverifierquerylauncher.h"
-#include "lpdnotifierquerylauncher.h"
-#include "lpdbasemodel.h"
-#include "locconsts.h"
-#include "locverifierdlgdebug.h"
-#include "locfileutils.h"
-#include "locrequestorutilsresolver.h"
-#include "lpdperiodicprocessor.h"
-
-// INCLUDE FILES
-#include <s32mem.h>
-#include "locphonenumberformat.h"
-#include "locverifiercoverui.h"
-// CONSTANTS
-
-// The Increment size for the package buffer used for packing the descriptors
-const TInt KReqBufferIncrSize = 256;
-const TInt KLpdItemArrayGranularity = 50;
-
-const TInt KNonPeriodicRequest = 0;
-const TInt KPeriodicRequest = 1;
-
-const TInt KNotifyMessageLength = 300;
-
-// CONSTANTS
-
-// Unnamed namespace for local definitions
-
-const MEikSrvNotifierBase2::TNotifierPriority KNotifierPriority =
-        MEikSrvNotifierBase2::ENotifierPriorityHigh;
-const TUid KNotifierChannel =
-    {
-    0x100065ac
-    };
-_LIT_SECURE_ID(KUikonSrvSecureId,0x10003a4a);
-#ifdef _DEBUG
-_LIT( KPanicText, "CLpdVerifierPlugin" );
-enum TPanicCode
-    {
-    KLpdErrGeneral = 1
-    };
-#endif
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// CLpdVerifierPlugin::CLpdVerifierPlugin
-// C++ default constructor can NOT contain any code, that
-// might leave.
-// -----------------------------------------------------------------------------
-//
-CLpdVerifierPlugin::CLpdVerifierPlugin() :
-    iCurrentRequest(KPosNullQNRequestId), iPeriodicNotQue(
-            KLpdItemArrayGranularity)
-
-    {
-    iEnv = CEikonEnv::Static();
-    }
-
-// -----------------------------------------------------------------------------
-// CLpdVerifierPlugin::ConstructL
-// Symbian 2nd phase constructor can leave.
-// -----------------------------------------------------------------------------
-//
-void CLpdVerifierPlugin::ConstructL()
-    {
-    BaseConstructL(KNotifierChannel, KNotifierPriority);
-
-    TFileName* resourceFile = new (ELeave) TFileName;
-    CleanupStack::PushL(resourceFile);
-    // these appends are always safe:
-    resourceFile->Append(KLocNotifierRscPath);
-    resourceFile->Append(KLocVerifierRscFileName);
-    TFileName* dllDrive = new (ELeave) TFileName;
-    CleanupStack::PushL(dllDrive);
-    Dll::FileName(*dllDrive);
-    LocFileUtils::GetNearestLanguageFileL(iEnv->FsSession(), *dllDrive,
-            *resourceFile);
-    CleanupStack::PopAndDestroy(dllDrive);
-    iResourceOffset = iEnv->AddResourceFileL(*resourceFile);
-    CleanupStack::PopAndDestroy(resourceFile);
-
-    iRtorProcessor = CLpdRequestorProcessor::NewL();
-    iPeriodicProcessor = CLpdPeriodicProcessor::NewL( *this );
-    }
-
-// -----------------------------------------------------------------------------
-// CLpdVerifierPlugin::NewL
-// Two-phased constructor.
-// -----------------------------------------------------------------------------
-//
-CLpdVerifierPlugin* CLpdVerifierPlugin::NewL()
-    {
-    CLpdVerifierPlugin* self = new (ELeave) CLpdVerifierPlugin;
-
-    CleanupStack::PushL(self);
-    self->ConstructL();
-    CleanupStack::Pop(self);
-
-    return self;
-    }
-
-// Destructor
-CLpdVerifierPlugin::~CLpdVerifierPlugin()
-    {
-    // Destruction of this plugin should only occur only in shutdown
-    // or in severe problem situation.
-
-    // A very special scenario is that base class construction leaves and
-    // this destructor is called. In that case CompleteAllRequests() causes
-    // access violation (noticed this by checking source code of base class).
-    if (NotifierBase())
-        { // base class has been fully constructed, method call is safe
-        CompleteAllRequests(KErrGeneral);
-        }
-
-    // It is enough to delete queries so when don't get callbacks.
-    FreeQueryResources();
-    iPeriodicNotQue.Close();
-    delete iPeriodicProcessor;
-    delete iRequestActiveObject;
-    delete iRtorProcessor;
-    iEnv->DeleteResourceFile(iResourceOffset);
-    }
-
-// -----------------------------------------------------------------------------
-// CLpdVerifierPlugin::HandleNewRequestL
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//
-void CLpdVerifierPlugin::HandleNewRequestL(TPosQNRequestId aRequestId)
-    {
-    EnqueIfPeriodicL(aRequestId);
-    // Check whether the notifier is already handling a request
-    // If yes, do nothing for now.
-    if (iRequestActiveObject)
-        {
-        return;
-        }
-    else
-        {
-        iRequestActiveObject = CLpdRequestAO::NewL(*this);
-        iRequestActiveObject->ScheduleRequest();
-        }
-    }
-
-// -----------------------------------------------------------------------------
-// CLpdVerifierPlugin::EnqueIfPeriodicL
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//
-void CLpdVerifierPlugin::EnqueIfPeriodicL(TPosQNRequestId aRequestId)
-    {
-    SetCurrentRequestL(aRequestId);
-    TRequestType requestType = RequestTypeL(aRequestId);
-    CPosRequestor::TRequestType requestorType = CheckRequestTypeL();
-
-    if (requestType == ENotification && requestorType
-            == CPosRequestor::ERequestPeriodic)
-        {
-        TInt64 sessionId = -1;
-        GetSessionIdL( sessionId );
-
-        TLpdPeriodicReqInfo newReq(aRequestId, sessionId);
-
-        if (iPeriodicProcessor)
-            {
-            if (iPeriodicProcessor->GetSessionId() == sessionId)
-                {
-                CompleteRequest(aRequestId, KErrNone);
-                }
-            return;
-            }
-        else
-            {
-            TIdentityRelation<TLpdPeriodicReqInfo> matcher(
-                    TLpdPeriodicReqInfo::MatchSession);
-            TInt index = iPeriodicNotQue.Find(newReq, matcher);
-
-            // Remove if it was present in Que
-            if (index == KErrNotFound)
-                {
-                iPeriodicNotQue.Append(newReq);
-                }
-            else
-                {
-                CompleteRequest(aRequestId, KErrNone);
-                }
-            }
-        }
-
-    if (KPosNullQNRequestId != iCurrentRequest)
-        SetCurrentRequestL(iCurrentRequest);
-    }
-
-// -----------------------------------------------------------------------------
-// CLpdVerifierPlugin::HandleRequestCancelled
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//
-void CLpdVerifierPlugin::HandleRequestCancelled(TPosQNRequestId aRequestId)
-    {
-    // Check whether the request is coming from Uikon Server. 
-    // If not reject this request.
-    if (!CheckClientSecureId(KUikonSrvSecureId))
-        {
-        return;
-        }
-
-    // This method is called for Verification Query Cancellation.
-    // There are 2 scenarios when the cancellation can come.
-    // 1. The verification query for which the cancellation is done is 
-    //         currently is running
-    // 2. The verification query is not running currently but is in the 
-    //         requests Queue maintained by the base class.
-    //
-    // Case 1 :
-    //		
-    // If there is a Verification query currently running and the requestId
-    //         matches then the cancel notificaiton has to be popped up.
-    //
-    // Case 2 :
-    //		
-    //     1. A Verification query was popped up.
-    //     2. The network timed out and sent a cancel request which popped 
-    //           up a notification request.
-    //     3. The network sends another verification query in the mean time
-    //           and also cancels it. The resulting notification dialog will
-    //           not be run since there is still a notification that has not
-    //           been dismissed by the user.
-    //
-    // Hence in case 2 the notification information is maintained in a Que 
-    // in the iRequestActiveObject. Once the current notification dialog 
-    // closes and there are no more verification dialogs pending, the 
-    // notification dialogs are run one after the other.
-
-    if (aRequestId != iCurrentRequest)
-        {
-        if (aRequestId == KPosNullQNRequestId)
-            {
-            return;
-            }
-        //Put this new Notification Request on the queue and then process
-        //it later from iRequestActiveObject(CLpdRequestAO class) RunL.		
-        RPosRequestorStack* requestors = NULL;
-            TRAP_IGNORE(
-                    SetCurrentRequestL(aRequestId);
-                    // requestors is allocated in iRtorProcessor and ownership is finally
-                    // transferred to iRequestActiveObject.
-                    requestors = iRtorProcessor->RetrieveRequestorsL( *this );
-                    // Enqueue the request to iRequestActiveObject
-                    iRequestActiveObject->EnqueueRequestL(RequestSource(),
-                            CancelReason(),
-                            QueryTimeoutStrategy(),
-                            requestors););
-        return;
-        }
-
-    iCancelInfo.iCancelled = ETrue;
-    iCancelInfo.iReason = CancelReason();
-    iCancelInfo.iDecision = QueryTimeoutStrategy();
-    iCancelInfo.iSource = RequestSource();
-
-    if (iCurrentRequestType == EQuery)
-        { // Verification was cancelled
-        __ASSERT_DEBUG( iVerifierQuery, HandleDebugAssertError() );
-        __ASSERT_DEBUG( !iNotifier, HandleDebugAssertError() );
-        iVerifierQuery->Cancel();
-        }
-    else
-        {
-        // It must be a notification then, this case is not probable but
-        // we can cancel the dialog if this would happen.
-        __ASSERT_DEBUG( iCurrentRequestType == ENotification,
-                HandleDebugAssertError() );
-        __ASSERT_DEBUG( !iVerifierQuery, HandleDebugAssertError() );
-        __ASSERT_DEBUG( iNotifier, HandleDebugAssertError() );
-        iNotifier->Cancel();
-        }
-    }
-
-// -----------------------------------------------------------------------------
-// CLpdVerifierPlugin::HandleAllRequestCancelled
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//
-void CLpdVerifierPlugin::HandleAllRequestCancelled()
-    {
-    if (iCurrentRequest != KPosNullQNRequestId)
-        { // current request requires some specific behavior
-        HandleRequestCancelled(iCurrentRequest);
-        }
-    // Note that ScheduleRequest in the end of HandleRequestCancelled() allows
-    // current call chain run to completion and resources are released after
-    // that. Pending requests have been completed so they won't be processed.
-    }
-
-// -----------------------------------------------------------------------------
-// CLpdVerifierPlugin::HandleVerificationResultL
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//
-void CLpdVerifierPlugin::HandleVerificationResultL(TInt aResultCode)
-    {
-    iVerifyResult = aResultCode;
-
-        LOCVERIFIERDLGDEBUG1( "CLpdVerifierPlugin::HandleVerificationResultL(%d)",
-                iVerifyResult );
-
-    switch (iVerifyResult)
-        {
-        case KErrNone: // fall through
-        case KErrAccessDenied:
-            {
-            // No need for rules now in 3.0
-            break;
-            }
-        case KErrTimedOut:
-            { // UI's internal timer expired
-            break;
-            }
-        case KErrCancel:
-            {
-            __ASSERT_DEBUG( iCancelInfo.iCancelled, HandleAssertErrorL() );
-            NotifyCancellationL(iCancelInfo.iSource, iCancelInfo.iReason,
-                    iCancelInfo.iDecision);
-
-            return; // don't handle next req. yet
-            }
-        case KErrAbort: // This is used for emergency call support
-            {
-            CompleteAllRequests(iVerifyResult);
-            // ScheduleRequest() allows the current call chain
-            // run to completion and resources are released after that.
-            iRequestActiveObject->ScheduleRequest();
-            return;
-            }
-        default:
-            {
-            iEnv->HandleError(iVerifyResult);
-            break;
-            }
-        }
-
-    CompleteCurrentAndContinue(iVerifyResult); // this request was handled
-    }
-// -----------------------------------------------------------------------------
-// CLpdVerifierPlugin::HandleNotificationResultL
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//
-void CLpdVerifierPlugin::HandleNotificationResultL(TInt aResultCode)
-    {
-
-    TLpdPeriodicReqInfo newReq(iCurrentRequest, -1);
-    TIdentityRelation<TLpdPeriodicReqInfo> matcher(
-            TLpdPeriodicReqInfo::MatchPrivacy);
-    TInt index = iPeriodicNotQue.Find(newReq, matcher);
-
-    // Remove if it was present in Que
-    if (index != KErrNotFound)
-        {
-        iPeriodicNotQue.Remove(index);
-        }
-    CompleteRequest(iCurrentRequest, aResultCode);
-    iCurrentRequest = KPosNullQNRequestId;
-
-    switch (aResultCode)
-        {
-        case KErrNone: // fall through
-        case KErrTimedOut: // fall through
-            {
-            break;
-            }
-        case KErrCancel:
-            {
-            break;
-            }
-        case KErrAbort: // This is used for emergency call support
-            {
-            CompleteAllRequests(aResultCode);
-            // ScheduleRequest() -> allows the current call chain
-            // run to completion and resources are released after that.
-            break;
-            }
-        default:
-            {
-            iEnv->HandleError(aResultCode);
-            break;
-            }
-        }
-
-    iRequestActiveObject->ScheduleRequest(); // handle next req.
-    }
-
-// -----------------------------------------------------------------------------
-// CLpdVerifierPlugin::HandleLeave
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//
-void CLpdVerifierPlugin::HandleLeave(TInt aError)
-    {
-        LOCVERIFIERDLGDEBUG1( "CLpdVerifierPlugin::HandleLeave(%d)", aError);
-    // In this case user needs feedback about the error situation:
-    iEnv->HandleError(aError);
-
-    // In case of leave current request is completed with
-    // iVerifyResult, but queue handling is still continued.
-    // iVerifyResult is better completion code for request than aError.
-    CompleteCurrentAndContinue(iVerifyResult);
-    }
-
-// -----------------------------------------------------------------------------
-// CLpdVerifierPlugin::HandleNextRequest
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//
-void CLpdVerifierPlugin::HandleNextRequest()
-    {
-    TRAPD( err, HandleNextRequestL() );
-    if (err)
-        {
-        // In case of leave current request is completed with
-        // error code, but queue handling is still continued.
-
-        // If we couldn't start handling the request it is
-        // better not to confuse user with an error note.
-
-        CompleteCurrentAndContinue(iVerifyResult);
-        }
-    }
-
-// -----------------------------------------------------------------------------
-// CLpdVerifierPlugin::HandleNextRequestL
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//
-void CLpdVerifierPlugin::HandleNextRequestL()
-    {
-
-    // It is better to free previous query resources here, because
-    // now all callback methods have finished (active object allowed
-    // run to completion)
-    this->FreeQueryResources();
-
-    // Read the next request:
-    RArray<TPosQNRequestId> requests;
-    CleanupClosePushL(requests);
-    GetRequestsL(requests);
-
-    if (requests.Count() == 0)
-        { // No more requests to handle
-        CleanupStack::PopAndDestroy(); // requests
-        // This is a very important step, it allows new requests
-        // to flow in ( see HandleNewRequestL() ):
-        delete iRequestActiveObject;
-        iRequestActiveObject = NULL;
-        return;
-        }
-    iCurrentRequest = requests[0];
-    CleanupStack::PopAndDestroy(); // requests
-    SetCurrentRequestL(iCurrentRequest);
-
-    // Check whether the request is coming from Uikon Server. If not reject this request.
-    if (!CheckClientSecureId(KUikonSrvSecureId))
-        {
-        CompleteCurrentAndContinue(KErrPermissionDenied);
-        return;
-        }
-   
-    // Check the request type
-    iCurrentRequestType = RequestTypeL(iCurrentRequest);
-
-    if ((CheckRequestTypeL() == CPosRequestor::ERequestPeriodic)
-            && (iCurrentRequestType == ENotification))
-        iRtorProcessor->SetRequestType(KPeriodicRequest);
-    else
-        iRtorProcessor->SetRequestType(KNonPeriodicRequest);
-
-    iRtorProcessor->ReadRequestorsL(*this);
-
-    if (iCurrentRequestType == EQuery)
-        {
-        HandleNextVerificationL();
-        }
-    else if (iCurrentRequestType == ENotification)
-        {
-        HandleNextNotificationL();
-        }
-    else
-        {
-        User::Leave(KErrNotSupported);
-        }
-    }
-
-// -----------------------------------------------------------------------------
-// CLpdVerifierPlugin::HandleNextVerificationL
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//
-void CLpdVerifierPlugin::HandleNextVerificationL()
-    {
-    __ASSERT_DEBUG( iCurrentRequest != KPosNullQNRequestId,
-            HandleAssertErrorL() );
-    __ASSERT_DEBUG( !iVerifierQuery, HandleAssertErrorL() );
-    TInt suplRequest;
-    if (CheckRequestTypeL() == CPosRequestor::ERequestPeriodic)
-        suplRequest = 1;
-    else
-        suplRequest = 0;
-
-    TPosRequestSource source(RequestSource());
-    if (source == EPosRequestSourceNotAvailable)
-        {
-        CompleteCurrentAndContinue(KErrNone);
-        }
-    else
-        {
-        if(suplRequest)
-        {	
-        iPeriodicProcessor->SetRequestorIdL( CurrentRequest() );     
-        iPeriodicProcessor->SetRequestTypeL(iCurrentRequestType);
-        
-        CPosRequestor* req = NULL;
-        if( RequestorCountL() )
-        {
-          req = RequestorLC( 0 );
-          CleanupStack::Pop();
-          }
-        iPeriodicProcessor->SetRequestorL( req );
-
-      }
-      
-      iVerifierQuery = CLpdVerifierQueryLauncher::NewL(*this);
-      TPosRequestDecision decision(QueryTimeoutStrategy());
-      // Note that item is left in cleanupstack until StartQuery():
-      if (suplRequest)
-          iVerifierQuery->PrepareSuplVerificationResourcesL();
-      else
-          iVerifierQuery->PrepareVerificationResourcesL(source, decision);
-
-       // Ownership of text is immediatelly transferred:
-       CLpdBaseModel* requestors = iRtorProcessor->RtorNamesForVerifNotifL(
-                iVerifierQuery->ListBoxL());
-       iVerifierQuery->SetQueryTextArray(requestors);
-
-        // Start the Verification query
-        StartQueryDialogL(iVerifierQuery, EVerificationRequest, decision);
-        }
-    }
-
-// -----------------------------------------------------------------------------
-// CLpdVerifierPlugin::HandleNextNotificationL
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//
-void CLpdVerifierPlugin::HandleNextNotificationL()
-    {
-    __ASSERT_DEBUG( iCurrentRequest != KPosNullQNRequestId,
-            HandleAssertErrorL() );
-    
-    if (CheckRequestTypeL() == CPosRequestor::ERequestPeriodic)
-        HandleNextPeriodicNotificationL();
-    else
-        HandleNextNonPeriodicNotificationL();
-
-    }
-// -----------------------------------------------------------------------------
-// CLpdVerifierPlugin::HandleNextNonPeriodicNotificationL
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//
-void CLpdVerifierPlugin::HandleNextNonPeriodicNotificationL()
-    {
-    __ASSERT_DEBUG( iCurrentRequest != KPosNullQNRequestId,
-            HandleAssertErrorL() );
-    __ASSERT_DEBUG( !iNotifier, HandleAssertErrorL() );
-
-    if (RequestSource() != EPosRequestSourceNetwork)
-        { // Notifications are supported only for network requests
-        User::Leave(KErrNotSupported);
-        }
-
-    TPosNotificationReason reason = NotificationReason();
-    switch (reason)
-        {
-        // Decision without user's consent:
-        case EPosDecisionByRequestSource:
-            // Policy conflict, network timeout occurred before user's
-            // response was received
-            {
-          
-            TPosRequestDecision decision = LocationRequestDecision();
-            if(!iNotifier)
-            iNotifier = CLpdNotifierQueryLauncher::NewL(*this);
-            iNotifier->PrepareNotificationResourcesL(reason, decision);
-            CLpdBaseModel* requestors =
-                    iRtorProcessor->RtorNamesForVerifNotifL(
-                            iNotifier->ListBoxL());
-
-            iNotifier->SetQueryTextArray(requestors);
-
-            // Start the notification query
-            StartQueryDialogL(iNotifier, ENotification, decision);
-            break;
-            }
-        case EPosVerificationTimeout:
-            {
-            TPosRequestDecision decision = LocationRequestDecision();
-            if(!iNotifier)
-            iNotifier = CLpdNotifierQueryLauncher::NewL(*this);
-            iNotifier->PrepareNotificationResourcesL(reason, decision);
-            CLpdBaseModel* requestors =
-                    iRtorProcessor->RtorNamesForVerifNotifL(
-                            iNotifier->ListBoxL());
-            iNotifier->SetQueryTextArray(requestors);
-
-            // Start the notification query
-            StartQueryDialogL(iNotifier, ENotificationTimeout, decision);
-
-            break;
-            }
-        case EPosNotificationReasonNotAvailable: // fall through
-        default: // Future extensions -> EPosNotificationReasonNotAvailable
-            {
-            User::Leave(KErrNotSupported);
-            break;
-            }
-        }
-    }
-
-// -----------------------------------------------------------------------------
-// CLpdVerifierPlugin::HandleNextPeriodicNotificationL
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//
-void CLpdVerifierPlugin::HandleNextPeriodicNotificationL()
-    {
-    __ASSERT_DEBUG( iCurrentRequest != KPosNullQNRequestId,
-            HandleAssertErrorL() );
-
-    if (RequestSource() != EPosRequestSourceNetwork)
-        { // Notifications are supported only for network requests
-        User::Leave(KErrNotSupported);
-        }
-
-    TPosNotificationReason reason = NotificationReason();
-
-    switch (reason)
-        {
-        // Decision without user's consent:
-        case EPosDecisionByRequestSource:
-            // Policy conflict, network timeout occurred before user's
-            // response was received
-            {
-            iPeriodicProcessor->SetRequestorIdL( CurrentRequest() );     
-            iPeriodicProcessor->SetRequestTypeL(iCurrentRequestType);
-            CPosRequestor* req = NULL;
-            if( RequestorCountL() )
-            {
-            req = RequestorLC( 0 );
-            CleanupStack::Pop();
-            }
-            iPeriodicProcessor->SetRequestorL( req );
-        
-            TPosRequestDecision decision = LocationRequestDecision();
-            
-            if(!iNotifier)
-            iNotifier = CLpdNotifierQueryLauncher::NewL(*this);
-
-            TInt64 sessionId = -1;
-            sessionId = iRtorProcessor->GetSessionId();
-            iPeriodicProcessor->SetSessionIdL(sessionId);
-
-            HBufC* requestorName = NULL;
-            if (iRtorProcessor->Requestors().Count() == 0)
-                {
-                requestorName = StringLoader::LoadL(R_LPD_UNKNOWN_REQUESTER);
-                }
-            else
-                {
-                const CPosRequestor& requestor =
-                        *(iRtorProcessor->Requestors())[1];
-                iUtils = CLocRequestorUtilsResolver::NewL();
-                requestorName = iUtils->RequestorNameL(requestor);
-                if ((requestorName->Des()).CompareC(_L("Unknown")) == 0)
-                    {
-                    requestorName = NULL;
-                    requestorName = StringLoader::LoadL(
-                            R_LPD_UNKNOWN_REQUESTER);
-                    }
-                delete iUtils;
-                iUtils = NULL;
-                }
-            iPeriodicProcessor->SetRequestorNameL(requestorName);
-
-            delete requestorName;
-            iNotifier->PrepareSuplNotificationResourcesL(reason);
-
-            HBufC* notifyMessage = HBufC::NewLC(KNotifyMessageLength);
-            TRAPD( err, iPeriodicProcessor->NotificationMessageTextL(notifyMessage));
-  
-            if (err == KErrNotFound)
-                {
-                    CleanupStack::PopAndDestroy(); // notifyMessage
-                    CompleteCurrentAndContinue(err);
-                }
-            else
-                {
-                iNotifier->SetMessageQueryTextL(notifyMessage->Des(),
-                        iPeriodicProcessor->LinkCallBack());
-
-                CleanupStack::PopAndDestroy(); // notifyMessage
-                // Start the notification query
-                StartQueryDialogL(iNotifier, ESuplPeriodicNotification,
-                        decision);
-                }
-            break;
-            }
-        case EPosVerificationTimeout:
-            {
-            break;
-            }
-        case EPosNotificationReasonNotAvailable: // fall through
-        default: // Future extensions -> EPosNotificationReasonNotAvailable
-            {
-            User::Leave(KErrNotSupported);
-            break;
-            }
-        }
-    }
-
-// -----------------------------------------------------------------------------
-// CLpdVerifierPlugin::NotifyCancellationL
-// Helper method
-// -----------------------------------------------------------------------------
-//
-void CLpdVerifierPlugin::NotifyCancellationL(TPosRequestSource aSource,
-        TPosVerifyCancelReason aReason, TPosRequestDecision aDecision)
-    {
-    __ASSERT_DEBUG( iCurrentRequestType == EQuery, HandleAssertErrorL() );
-
-    if (aSource == EPosRequestSourceNetwork)
-        { // Notifications supported only for network-originated requests
-
-        switch (aReason)
-            {
-            case EPosCancelReasonTimeout:
-                {
-                __ASSERT_DEBUG( !iNotifier, HandleAssertErrorL() );
-				if(aDecision != EPosDecisionNotAvailable)
-					{
-	                iNotifier = CLpdNotifierQueryLauncher::NewL( *this );
-	                iNotifier->PrepareCancelNotifResourcesL( aDecision );
-	                CLpdBaseModel* requestors =
-	                                iRtorProcessor->RtorNamesForVerifNotifL(
-	                                                    iNotifier->ListBoxL() );
-	                iNotifier->SetQueryTextArray( requestors );
-
-                    // Start the notification query
-                    StartQueryDialogL( iNotifier,
-                                       ECancelNotification,
-                                       aDecision );
-                
-	                return;
-					}
-				break;
-                }
-            case EPosCancelReasonNotAvailable: // fall through
-            default: // future extensions -> EPosCancelReasonNotAvailable
-                {
-                break;
-                }
-            }
-        }
-
-    // If notification dialog was not launched, handle next request:
-    iRequestActiveObject->ScheduleRequest();
-
-    }
-
-// -----------------------------------------------------------------------------
-// CLpdVerifierPlugin::CompleteCurrentAndContinue
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//
-void CLpdVerifierPlugin::CompleteCurrentAndContinue(TInt aResultCode)
-    {
-    if (iCurrentRequest != KPosNullQNRequestId)
-        {
-        CompleteRequest(iCurrentRequest, aResultCode);
-        }
-    iCurrentRequest = KPosNullQNRequestId;
-
-    __ASSERT_DEBUG( iRequestActiveObject, HandleDebugAssertError() );
-    iRequestActiveObject->ScheduleRequest(); // handle next req.
-    }
-
-// -----------------------------------------------------------------------------
-// CLpdVerifierPlugin::FreeQueryResources
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//
-void CLpdVerifierPlugin::FreeQueryResources()
-    {
-    if(iPeriodicProcessor)
-    iPeriodicProcessor->ResetParameters();
-    iCurrentRequest = KPosNullQNRequestId;
-    delete iVerifierQuery;
-    iVerifierQuery = NULL;
-    iVerifyResult = KErrGeneral;
-    iCancelInfo.iCancelled = EFalse;
-    delete iNotifier;
-    iNotifier = NULL;
-    if (iRtorProcessor)
-        { // if already construction fails iRtorProcessor may
-        // be NULL, otherwise it points to an instance.
-        iRtorProcessor->ResetAndDestroyRequestors();
-        }
-    }
-
-// -----------------------------------------------------------------------------
-// CLpdVerifierPlugin::HandleAssertErrorL
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//
-void CLpdVerifierPlugin::HandleAssertErrorL() const
-    {
-#ifdef _DEBUG        
-    User::Panic(KPanicText, KLpdErrGeneral);
-#else
-    User::Leave( KErrCorrupt );
-#endif
-    }
-
-// -----------------------------------------------------------------------------
-// CLpdVerifierPlugin::HandleDebugAssertError
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//
-void CLpdVerifierPlugin::HandleDebugAssertError() const
-    {
-#ifdef _DEBUG
-    User::Panic(KPanicText, KLpdErrGeneral);
-#endif
-    }
-
-// -----------------------------------------------------------------------------
-// CLpdVerifierPlugin::NotifyTimeoutL
-// Helper method
-// -----------------------------------------------------------------------------
-//
-void CLpdVerifierPlugin::NotifyCancellationL(
-    TPosRequestSource aSource,
-    TPosVerifyCancelReason aReason,
-    TPosRequestDecision aDecision,
-    const RPosRequestorStack& aRequestors )
-    {
-    if ( aSource == EPosRequestSourceNetwork )
-        { // Notifications supported only for network-originated requests
-
-        switch ( aReason )
-            {
-            case EPosCancelReasonTimeout:
-                {
-                __ASSERT_DEBUG( !iNotifier, HandleAssertErrorL() );
-				if(aDecision != EPosDecisionNotAvailable)
-					{
-	                iNotifier = CLpdNotifierQueryLauncher::NewL( *this );
-	                iNotifier->PrepareCancelNotifResourcesL( aDecision );
-	                iRtorProcessor->ReadRequestorsL(aRequestors);
-	                CLpdBaseModel* requestors =
-	                                iRtorProcessor->RtorNamesForVerifNotifL(
-	                                                    iNotifier->ListBoxL() );
-	                iNotifier->SetQueryTextArray( requestors );
-                    
-                    // Start the notification query
-                    StartQueryDialogL( iNotifier,
-                                       ECancelNotification,
-                                       aDecision );
-                
-	                return;
-					}
-				break;
-                }
-            case EPosCancelReasonNotAvailable: // fall through
-            default: // future extensions -> EPosCancelReasonNotAvailable
-                {
-                break;
-                }
-            }
-        }
-
-    // If notification dialog was not launched, handle next request:
-    iRequestActiveObject->ScheduleRequest();
-    }
-
-// -----------------------------------------------------------------------------
-// CLpdVerifierPlugin::StartQueryDialogL
-// Starts the Query dialog
-// @param aQueryDialog Query dialog that has to be started
-// @param aDialogType  Dialog type
-// @param aDecision    Decision Type
-// -----------------------------------------------------------------------------
-void CLpdVerifierPlugin::StartQueryDialogL(
-        CLpdQueryLauncherBase* aQueryDialog, TDialogType aDialogType,
-        TPosRequestDecision aDecision)
-    {
-    // Set the Command ID
-    TInt coverUiCmd = CoverUICommandL(aDialogType, aDecision);
-
-    aQueryDialog->SetCoverUICommand(coverUiCmd);
-    // Set the Requestor buffer                               
-    CBufFlat* reqBuffer = PackRequestorBufferL();
-    CleanupStack::PushL(reqBuffer);
-
-    TPtr8 reqBufferPtr(reqBuffer->Ptr(0));
-    aQueryDialog->SetRequestorBuffer(reqBufferPtr);
-
-    if (aDialogType == ESuplPeriodicNotification)
-        aQueryDialog->StartSuplPeriodicQueryL();
-    else
-        aQueryDialog->StartQueryL();
-    
-    CleanupStack::PopAndDestroy(reqBuffer);
-
-
-    }
-
-// -----------------------------------------------------------------------------
-// CLpdVerifierPlugin::PackRequestorBufferL
-// Packs the Requestor buffer to send across to Cover UI. The 
-// ownership of the buffer is transferred back to the callee
-// @return CBufFlat*    Flat buffer containing the list of requestors    
-// -----------------------------------------------------------------------------
-//
-CBufFlat* CLpdVerifierPlugin::PackRequestorBufferL()
-    {
-    // Construct the conversion buffers and the package buffer
-    CBufFlat* requestorBuffer = CBufFlat::NewL(KReqBufferIncrSize);
-    CleanupStack::PushL(requestorBuffer);
-
-    // Opening a Write stream to assist in packing data onto CBufFlat
-    RBufWriteStream writeStream;
-    writeStream.Open(*requestorBuffer);
-    CleanupClosePushL(writeStream);
-
-    // Obtain the list of requestors from which the individual requestor
-    // Ids can be obtained
-    const RPointerArray<CPosRequestor>& requestors =
-            iRtorProcessor->Requestors();
-
-    // The buffer is packed according to the below mentioned
-    // format.
-    // 
-    // | Count | Length(1) | String(1) | ..... | Length( Count ) | String( Count ) |
-    // 
-    // where,
-    // Count   - ( 4 bytes ) - The number of requestor strings. 
-    // Length(n) - ( 4 bytes ) - Length of the nth requestor string.
-    // String(n) - ( Length(n) * 2 bytes ) - String for the nth requestor.
-    // 
-    // Each entry is packed one after another without any delimters between them
-    //
-
-    // Packing the count
-    writeStream.WriteInt32L(requestors.Count());
-
-    for (TInt i = 0; i < requestors.Count(); i++)
-        {
-        const CPosRequestor& req = *(requestors[i]);
-
-        // Obtain the Requestor Id string
-        TPtrC reqStr = req.RequestorIdString();
-
-        // We need a 16 bit buffer for converting. Since the requestor strings that
-        // need to be packed have to always be of the UCS-2 ( UNICODE ) format.
-        // The buffer would be allocated just before copying the requestor content
-        HBufC16* conversionBuf = NULL;
-        TPtr16 conBufPtr(0, 0);
-
-        // If the string is a phone number then it needs to be grouped and the
-        // converted to a UNICODE string. If not, then simpy convert it to
-        // a UNICODE string
-        if (CPosRequestor::EIdFormatPhoneNumber == req.RequestorIdFormat())
-            {
-            // Creating the Phone number formatter for grouping
-            CLocPhoneNumberFormat* formatter = CLocPhoneNumberFormat::NewL();
-            CleanupStack::PushL(formatter);
-
-            HBufC* groupedName = NULL;
-            TRAPD( error, groupedName = formatter->PhoneNumberGroupL( reqStr ));
-            if (error || !groupedName)
-                {
-                // If there was a Leave in the grouping function or the 
-                // grouping failed then pack the original name
-
-                // Allocate the conversion buffer and copy the Requestor string
-                conversionBuf = HBufC16::NewL(reqStr.Length());
-                conBufPtr.Set(conversionBuf->Des());
-
-                // Copy the original string to the conversion buffer
-                conBufPtr.Copy(reqStr);
-                }
-            else
-                {
-                // Take ownership of the grouped phone number buffer and 
-                // copy it to the conversion buffer
-                CleanupStack::PushL(groupedName);
-
-                TPtr groupedNamePtr = groupedName->Des();
-
-                // Allocate the conversion buffer and copy the Requestor string
-                conversionBuf = HBufC16::NewL(groupedNamePtr.Length());
-                conBufPtr.Set(conversionBuf->Des());
-
-                // Copy the grouped string to the conversion buffer
-                conBufPtr.Copy(groupedNamePtr);
-
-                CleanupStack::PopAndDestroy(groupedName);
-                }
-
-            CleanupStack::PopAndDestroy(formatter);
-            }
-        else
-            {
-            // Copy the Requestor ID string
-
-            // Allocate the conversion buffer and copy the Requestor string
-            conversionBuf = HBufC16::NewL(reqStr.Length());
-            conBufPtr.Set(conversionBuf->Des());
-
-            // Copy the original string to the conversion buffer
-            conBufPtr.Copy(reqStr);
-            }
-
-        // Push the Conversion buffer to the CleanupStack
-        CleanupStack::PushL(conversionBuf);
-
-        // The conversion buffer now contains the string in the UNICODE 
-        // format. First pack the length of the string and then the 
-        // actual string itself
-        writeStream.WriteInt32L(conBufPtr.Length());
-
-        TUint8* buffer = (TUint8*) (conBufPtr.Ptr());
-        writeStream.WriteL(buffer, conBufPtr.Size());
-
-        // Destroying the Conversion buffer before it goes out of scope
-        CleanupStack::PopAndDestroy(conversionBuf);
-        }
-
-    // flush stream data to our buffer
-    writeStream.CommitL();
-    CleanupStack::PopAndDestroy(&writeStream);
-
-    // The ownership of the requestor buffer should be transferred to the callee
-    CleanupStack::Pop(requestorBuffer);
-
-    return requestorBuffer;
-    }
-
-// -----------------------------------------------------------------------------
-// Determines the Cover UI command corresponding to a paricular
-// request
-// @param  TRequestType         Request Type
-// @param  TPosRequestDecision  Decision Type
-// @return TInt                 Cover UI Command ID.
-// -----------------------------------------------------------------------------
-//
-TInt CLpdVerifierPlugin::CoverUICommandL(TDialogType aRequestType,
-        TPosRequestDecision aDecision)
-    {
-    TInt result = 0;
-
-    if (EVerificationRequest == aRequestType)
-        {
-        switch (aDecision)
-            {
-            case EPosDecisionAccepted:
-                {
-                result = ECmdDefaultAccept;
-                break;
-                }
-            case EPosDecisionRejected:
-                {
-                result = ECmdDefaultReject;
-                break;
-                }
-            default:
-                {
-                result = ECmdDefaultNone;
-                break;
-                }
-            }
-        }
-    else if ((ENotification == aRequestType) || (ESuplPeriodicNotification
-            == aRequestType))
-        {
-        result = ECmdNotifyAccept;
-        }
-    else if (ENotificationTimeout == aRequestType)
-        {
-        switch (aDecision)
-            {
-            case EPosDecisionAccepted:
-                {
-                result = ECmdNotifyRejectFailure;
-                break;
-                }
-            case EPosDecisionRejected:
-                {
-                result = ECmdNotifyAcceptFailure;
-                break;
-                }
-            default:
-                {
-                User::Leave(KErrNotFound);
-                break;
-                }
-            }
-        }
-    else if (ECancelNotification == aRequestType)
-        {
-        switch (aDecision)
-            {
-            case EPosDecisionAccepted:
-                {
-                result = ECmdNotifyAcceptTimeout;
-                break;
-                }
-            case EPosDecisionRejected:
-                {
-                result = ECmdNotifyRejectTimeout;
-                break;
-                }
-            default:
-                {
-                User::Leave(KErrNotFound);
-                break;
-                }
-            }
-        }
-    else
-        {
-        User::Leave(KErrNotFound);
-        }
-    return result;
-    }
-
-// -----------------------------------------------------------------------------
-// CLpdVerifierPlugin::CheckRequestTypeL
-// Checks the type of request and helps to know
-// if a given request is of SUPL periodic type
-// @param aCurrentRequest request id
-// @return TRequestType type of request enum
-// -----------------------------------------------------------------------------
-CPosRequestor::TRequestType CLpdVerifierPlugin::CheckRequestTypeL()
-    {
-    CPosRequestor::TRequestType reqType = CPosRequestor::ENetworkTypeUnknown;
-    if (RequestorCountL() > 0)
-        {
-        CPosRequestor* requestor = RequestorLC(0);
-        reqType = requestor->RequestType();
-        CleanupStack::PopAndDestroy(requestor);
-        }
-    return reqType;
-    }
-
-// -----------------------------------------------------------------------------
-// CLpdVerifierPlugin::GetSessionIdL
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//
-void CLpdVerifierPlugin::GetSessionIdL( TInt64& aSessionId )
-    {
-    CPosRequestor* curRequestor = RequestorLC( 0 );
-    TInt length = curRequestor->RequestorIdString().Length();
-    TPtrC reqString(curRequestor->RequestorIdString().Mid( length - 3 ));
-    TLex temp(reqString);
-    temp.Val(aSessionId);
-    CleanupStack::PopAndDestroy( curRequestor );
-    }
-
-// -----------------------------------------------------------------------------
-// CLpdVerifierPlugin::UpdateCurrentNotifierL
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//
-void CLpdVerifierPlugin::UpdateCurrentNotifierL()
-    {
-    // Confirm if the current request type is Notification before
-    // processing/updating.
-
-    __ASSERT_DEBUG( iCurrentRequestType == ENotification,
-            HandleDebugAssertError() );
-    __ASSERT_DEBUG( iPeriodicProcessor, HandleDebugAssertError() );
-    if(iNotifier)
-    iNotifier->CancelQuietly();
-    HandleNextPeriodicNotificationL();
-    
-    }
-
-//  End of File
--- a/locationsystemui/locationsysui/locverifier/src/lpdverifierquerylauncher.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,158 +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:  Class which handles the dialog and expiration timer.
-*
-*/
-
-
-// INCLUDE FILES
-#include "lpdverifierquerylauncher.h"
-#include "lpdglobalplugindialog.h"
-#include "lpdresulthandler.h"
-#include "locverifierdlg.hrh"
-#include <locverifierdlg.rsg>
-#include <avkon.hrh>
-
-// CONSTANTS
-
-const TInt KNonPeriodicRequest = 0;
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// CLpdVerifierQueryLauncher::CLpdVerifierQueryLauncher
-// C++ default constructor can NOT contain any code, that
-// might leave.
-// -----------------------------------------------------------------------------
-//
-CLpdVerifierQueryLauncher::CLpdVerifierQueryLauncher( 
-    MLpdResultHandler& aHandler ) 
-    : CLpdQueryLauncherBase( aHandler )
-    {
-    // Intentionally empty
-    }
-
-// -----------------------------------------------------------------------------
-// CLpdVerifierQueryLauncher::ConstructL
-// Symbian 2nd phase constructor can leave.
-// -----------------------------------------------------------------------------
-//
-void CLpdVerifierQueryLauncher::ConstructL()
-    {
-    BaseConstructL();
-    }
-
-// -----------------------------------------------------------------------------
-// CLpdVerifierQueryLauncher::NewL
-// Two-phased constructor.
-// -----------------------------------------------------------------------------
-//
-CLpdVerifierQueryLauncher* CLpdVerifierQueryLauncher::NewL( 
-    MLpdResultHandler& aHandler )
-    {
-    CLpdVerifierQueryLauncher* self =
-        new( ELeave ) CLpdVerifierQueryLauncher( aHandler );
-    
-    CleanupStack::PushL( self );
-    self->ConstructL();
-    CleanupStack::Pop(self);
-
-    return self;
-    }
-
-// Destructor
-CLpdVerifierQueryLauncher::~CLpdVerifierQueryLauncher()
-    {
-    // Intentionally empty
-    }
-
-
-// -----------------------------------------------------------------------------
-// CLpdVerifierQueryLauncher::PrepareVerificationResourcesL
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//
-void CLpdVerifierQueryLauncher::PrepareVerificationResourcesL(
-    TPosRequestSource aSource,
-    TPosRequestDecision aDefault)
-    {
-    if ( aSource == EPosRequestSourceNetwork && 
-         aDefault == EPosDecisionAccepted )
-        {
-        PrepareQueryResourcesL( R_LPD_GLOBAL_VERIFICATION_DEFAULT_A, KNonPeriodicRequest );
-        }
-    else if ( aSource == EPosRequestSourceNetwork && 
-              aDefault == EPosDecisionRejected )
-        {
-        PrepareQueryResourcesL( R_LPD_GLOBAL_VERIFICATION_DEFAULT_R, KNonPeriodicRequest );
-        }
-    else
-        { // Terminal request, EPosDecisionNotAvailable or future extensions
-        PrepareQueryResourcesL( R_LPD_GLOBAL_VERIFICATION_DEFAULT_N, KNonPeriodicRequest );
-        }
-
-    iQueryDlg->SetTone( EAvkonSIDLocationRequest );
-    }
-
-// -----------------------------------------------------------------------------
-// CLpdVerifierQueryLauncher::PrepareSuplVerificationResourcesL
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//
-void CLpdVerifierQueryLauncher::PrepareSuplVerificationResourcesL()
-{
-  PrepareQueryResourcesL( R_LPD_SUPL_PERIODIC_VERIFICATION_DEFAULT, KNonPeriodicRequest );
-  iQueryDlg->SetTone( EAvkonSIDLocationRequest );
-}
-
-// -----------------------------------------------------------------------------
-// CLpdVerifierQueryLauncher::ExtendedHandleDlgDismissedL
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//
-void CLpdVerifierQueryLauncher::ExtendedHandleDlgDismissedL()
-    {
-    TInt retValue = KErrNone;
-    switch ( iResult )
-        {
-        case EAknSoftkeyOk:
-            {
-            retValue = KErrNone;
-            break;
-            }
-        case EAknSoftkeyCancel:
-            {
-            retValue = KErrAccessDenied;
-            break;
-            }
-        case EEikCmdExit:
-            {
-            retValue = iExitReason;
-            break;
-            }
-        case ELpdCmdEmergency:
-            { // emergency call support
-            retValue = KErrAbort;
-            break;
-            }
-        default:
-            {
-            retValue = KErrGeneral;
-            break;
-            }
-        }
-    iHandler.HandleVerificationResultL( retValue );
-    }
-
-//  End of File
--- a/locationsystemui/locationsysui/locverifier/src/lpdverifiersettinglauncher.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,117 +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:  Responsible for launching SUPL session details
-*
-*/
-
-
-// INCLUDE FILES
-#include "lpdverifiersettinglauncher.h"
-
-// CONSTANTS
-const TInt KSettingsParamBufferLength = 64;
-
-// ================= MEMBER FUNCTIONS =======================
-// ----------------------------------------------------------------------------
-// CLmkLocSettingsLauncher::NewL
-// Two-phased constructor.
-// ----------------------------------------------------------------------------
-//
-CLpdVerifierSettingsLauncher* CLpdVerifierSettingsLauncher:: NewL()
-	{
-	CLpdVerifierSettingsLauncher* self = new (ELeave) CLpdVerifierSettingsLauncher();
-	CleanupStack::PushL(self);
-	self->ConstructL();
-	CleanupStack::Pop(); // self
-	return self;
-	}
-
-// ----------------------------------------------------------------------------
-// CLmkLocSettingsLauncher::CLmkLocSettingsLauncher
-// ----------------------------------------------------------------------------
-//
-CLpdVerifierSettingsLauncher::CLpdVerifierSettingsLauncher()
-	: CActive( EPriorityStandard )
-	{
-	}
-
-// ----------------------------------------------------------------------------
-// CLpdVerifierSettingsLauncher::~CLpdVerifierSettingsLauncher
-// ----------------------------------------------------------------------------
-//
-CLpdVerifierSettingsLauncher::~CLpdVerifierSettingsLauncher()
-	{
-	Cancel();
-    delete iClientLibrary;
-    delete iLaunchParams;
-	}
-
-// ----------------------------------------------------------------------------
-// CLpdVerifierSettingsLauncher::ConstructL
-// ----------------------------------------------------------------------------
-//
-void CLpdVerifierSettingsLauncher::ConstructL()
-	{
-	iClientLibrary  = CLocSettingsUiClient::NewL();    
-	iLaunchParams = HBufC::NewL( KSettingsParamBufferLength );
-  CActiveScheduler::Add( this );
-	}
-
-// ----------------------------------------------------------------------------
-// CLpdVerifierSettingsLauncher::LaunchL
-// ----------------------------------------------------------------------------
-//
-void CLpdVerifierSettingsLauncher::LaunchL( TInt aSessionId )
-	{
-	Cancel();
-	iLaunchParams->Des().Zero();
-	iLaunchParams->Des().AppendNum( aSessionId );
-	iClientLibrary->LaunchSettingsUiAsEmbeddedAppL( TUid::Uid( KLocSUPLSettingsUID ), *iLaunchParams, iStatus );
-	SetActive();
-	}
-
-// ----------------------------------------------------------------------------
-// CLpdVerifierSettingsLauncher::RunL
-// ----------------------------------------------------------------------------
-//
-void CLpdVerifierSettingsLauncher::RunL()
-    {
-    switch( iStatus.Int())
-        {
-        case KErrNone:
-            {
-            break;
-            }
-        case KErrCancel:
-            {
-            break;
-            }
-        default:
-            {
-            break;    
-            }
-        }
-    }
-
-// ----------------------------------------------------------------------------
-// CLpdVerifierSettingsLauncher::DoCancel
-// ----------------------------------------------------------------------------
-//
-void CLpdVerifierSettingsLauncher::DoCancel()
-    {
-    iClientLibrary->CancelLaunchedSettingsUi();
-    }
-
-// End of File
-
--- a/locationsystemui/locationsysui/locverifier/src/lpdverifnotiflbmodel.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,159 +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:  Listbox model representing all requestors.
-*
-*/
-
-
-// INCLUDE FILES
-#include "lpdverifnotiflbmodel.h"
-#include "locrequestorutilsresolver.h"
-#include "lpdrequestorprocessor.h"
-#include "locphonenumberformat.h"
-#include "loctextutils.h"
-#include "locconsts.h"
-#include <locverifierdlg.rsg>
-#include <eikenv.h>
-
-// Unnamed namespace for local definitions
-
-const TInt KPostfixLBNameCellNbr = 0; // postfix icon
-// This fixed the space for icons in case icons are needed in verifier notifiers
-// Change this value to 2 if an icon is to be displayed.
-const TInt KLBIconMargin = 0; // space for zero icon
-
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// CLpdVerifNotifLBModel::NewL
-// Two-phased constructor.
-// -----------------------------------------------------------------------------
-//
-CLpdVerifNotifLBModel* CLpdVerifNotifLBModel::NewL(
-    const CLpdRequestorProcessor& aRtorProcessor,
-    CEikFormattedCellListBox& aListBox )
-    {
-    CLpdVerifNotifLBModel* self =
-        new( ELeave ) CLpdVerifNotifLBModel( aRtorProcessor, aListBox );
-    CleanupStack::PushL( self );
-    self->ConstructL();
-    CleanupStack::Pop(self);
-
-    return self;
-    }
-
-// -----------------------------------------------------------------------------
-// CLpdVerifNotifLBModel::CLpdVerifNotifLBModel
-// C++ default constructor can NOT contain any code, that
-// might leave.
-// -----------------------------------------------------------------------------
-//
-CLpdVerifNotifLBModel::CLpdVerifNotifLBModel(
-    const CLpdRequestorProcessor& aRtorProcessor,
-    CEikFormattedCellListBox& aListBox )
-    : CLpdBaseModel( aRtorProcessor ),
-      iListBox( aListBox )
-    {
-    // Intentionally empty
-    }
-
-// -----------------------------------------------------------------------------
-// CLpdVerifNotifLBModel::ConstructL
-// Symbian 2nd phase constructor can leave.
-// -----------------------------------------------------------------------------
-//
-void CLpdVerifNotifLBModel::ConstructL()
-    {
-    BaseConstructL();
-    iFormatter = CLocPhoneNumberFormat::NewL();
-    }
-
-// Destructor
-CLpdVerifNotifLBModel::~CLpdVerifNotifLBModel()
-    {
-    delete iFormatter;
-    }
-
-// -----------------------------------------------------------------------------
-// CLpdVerifNotifLBModel::MdcaCount
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//
-TInt CLpdVerifNotifLBModel::MdcaCount() const
-    {
-    TInt count = 0;
-    count = iRtorProcessor.Requestors().Count();
-
-    if ( count == 0 )
-        { // if there are no requestors we must add unknown requestor
-        count = 1;
-        }
-    return count;
-    }
-
-// -----------------------------------------------------------------------------
-// CLpdVerifNotifLBModel::MdcaPointL
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//
-void CLpdVerifNotifLBModel::MdcaPointL( TInt aIndex ) const
-    {
-        
-        
-    if( aIndex >= MdcaCount() )
-        {
-        User::Leave( KErrArgument );
-        }
-
-    TPtr bufferDes = iBuffer->Des();
-    HBufC* name = NULL;
-
-    if ( iRtorProcessor.Requestors().Count() == 0 ) // unknown requestor
-        {
-        name = CEikonEnv::Static()->AllocReadResourceLC(
-                                    R_LPD_UNKNOWN_REQUESTER );
-        // No icons, no clipping, everything surely ok:
-        bufferDes.Zero();
-        bufferDes.Append( *name );
-        }
-
-    else
-        {
-        const CPosRequestor& requestor =
-            *( iRtorProcessor.Requestors() )[aIndex];
-        name = iUtils->RequestorNameL( requestor );
-        CleanupStack::PushL( name );
-        TPtr nameDes = name->Des();
-        if ( iUtils->PhoneNumberAsName( requestor ) )
-            {
-            iFormatter->PhoneNumberFormatL( nameDes, bufferDes,
-                                           AknTextUtils::EClipFromBeginning,
-                                           &iListBox, aIndex, 
-                                           KPostfixLBNameCellNbr,
-                                           KLBIconMargin );
-            }
-        else
-            {
-            LocTextUtils::ClipToFit( nameDes, AknTextUtils::EClipFromEnd,
-                    &iListBox, aIndex, KPostfixLBNameCellNbr, KLBIconMargin );
-            bufferDes.Zero();
-            bufferDes.Append( *name ); // this is safe after clipping
-            }
-        }
-
-    CleanupStack::PopAndDestroy(name);
-    }
-
-// End of File
--- a/locationsystemui/locationsysui/queryandnotification/inc/EPos_CPosPrivacyNotifierExtension.h	Mon May 03 12:54:42 2010 +0300
+++ b/locationsystemui/locationsysui/queryandnotification/inc/EPos_CPosPrivacyNotifierExtension.h	Fri May 14 16:17:02 2010 +0300
@@ -30,7 +30,7 @@
 //  INCLUDES
 #include <eiknotapi.h>
 #include <lbs/epos_rposrequestorstack.h>
-#include <lbs/EPos_TPosQNInputData.h>
+#include <lbs/epos_tposqninputdata.h>
 #include <EPos_CPosPrivacyNotifier.h>
 // FORWARD DECLARATIONS
 class CPosRequestHandler;
--- a/locationsystemui/locationsysui/queryandnotification/inc/EPos_CPosRequestHandler.h	Mon May 03 12:54:42 2010 +0300
+++ b/locationsystemui/locationsysui/queryandnotification/inc/EPos_CPosRequestHandler.h	Fri May 14 16:17:02 2010 +0300
@@ -29,7 +29,7 @@
 
 //  INCLUDES
 #include <e32base.h>
-#include <lbs/EPos_TPosQNInputData.h>
+#include <lbs/epos_tposqninputdata.h>
 #include <EPos_CPosPrivacyNotifier.h>
 
 // FORWARD DECLARATIONS
--- a/locationsystemui/locationsysui/rom/locationsystemuistub.iby	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +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: IBY file for Location System Ui Stub
-*
-*/
-#ifndef __LOCATIONSYSTEMUISTUB_IBY__
-#define __LOCATIONSYSTEMUISTUB_IBY__
-
-#ifdef __LOCATIONSYSUI
-
-// Location System UI stub
-data=ZSYSTEM\install\locationsysuistub.sis    system\install\locationsysuistub.sis
-
-#endif // (__LOCATIONSYSUI)
-
-#endif // (__LOCATIONSYSTEMUISTUB_IBY__)
--- a/locationsystemui/locationsysui/rom/locationsysui.iby	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +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: IBY file for Location System Ui
-*
-*/
-#ifndef __LOCATIONSYSTEMUI_IBY__
-#define __LOCATIONSYSTEMUI_IBY__
-
-#ifdef __LOCATIONSYSUI
-
-	// LocationSystemUIView GS ECOM Plugin
-  ECOM_PLUGIN(locsysuiview.dll,10207462.rsc)
-
-	SCALABLE_IMAGE(APP_BITMAP_DIR,APP_BITMAP_DIR,locsysuiview)
-
-	//LocationSystemUI GS Plugin Engine
-	file=ABI_DIR\BUILD_DIR\locsysuiengine.dll   SHARED_LIB_DIR\locsysuiengine.dll
-
-#endif // (__LOCATIONSYSUI)
-
-#endif
--- a/locationsystemui/locationsysui/rom/locationsysui_resources.iby	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +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: IBY file for Location System Ui Resource
-*
-*/
-#ifndef __LOCATIONSYSTEMUI_RSC_IBY__
-#define __LOCATIONSYSTEMUI_RSC_IBY__
-
-#ifdef __LOCATIONSYSUI
-
-	//LocationSystemUI localisable resource file
-	data=DATAZ_\RESOURCE_FILES_DIR\locsysuiviewrsc.rsc		RESOURCE_FILES_DIR\locsysuiviewrsc.rsc
-
-#endif // (__LOCATIONSYSUI)
-
-#endif //__LOCATIONSYSTEMUI_RSC_IBY__
\ No newline at end of file
--- a/locationsystemui/locationsysui/rom/locbtnotifier.iby	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,31 +0,0 @@
-/*
-* Copyright (c) 2008 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:  Image description file for project locbtnotifier
-*
-*/
-
-
-
-#ifndef LOCBTNOTIFIER_IBY
-#define LOCBTNOTIFIER_IBY
-
-#include <data_caging_paths_for_iby.hrh>
-
-
-ECOM_PLUGIN( locbtnotifier.dll, locbtnotifier.rsc )
-data=\epoc32\data\Z\private\10282BC4\Rules\locbtgpspsypscontextstate.rul    private\10282BC4\Rules\locbtgpspsypscontextstate.rul
-data=\epoc32\data\Z\private\10282BC4\Settings\10282C74\locbtgpspsypscontextstate.xml private\10282BC4\Settings\10282C74\locbtgpspsypscontextstate.xml
-
-
-#endif // LOCBTNOTIFIER_IBY
--- a/locationsystemui/locationsysui/rom/locbtnotifier_resources.iby	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,28 +0,0 @@
-/*
-* Copyright (c) 2008 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:  Image description file for project locbtnotifier
-*
-*/
-
-
-
-#ifndef LOCBTNOTIFIER_RESOURCES_IBY
-#define LOCBTNOTIFIER_RESOURCES_IBY
-
-#include <data_caging_paths_for_iby.hrh>
-
-data=DATAZ_\RESOURCE_FILES_DIR\apps\locbtnotifierresources.rsc		RESOURCE_FILES_DIR\apps\locbtnotifierresources.rsc
-
-
-#endif // LOCBTNOTIFIER_RESOURCES_IBY
--- a/locationsystemui/locationsysui/rom/locgpsindicatorplugin.iby	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +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: IBY file for Location GPS Indicator Plugin
-*
-*/
-#ifndef __LOCGPSINDICATORPLUGIN_IBY__
-#define __LOCGPSINDICATORPLUGIN_IBY__
-
-#if  defined(__LOCATIONSYSUI) && defined(__PEN_SUPPORT)
-// GPS indicator ECOM Plugin
-ECOM_PLUGIN(locgpsindicatorplugin.dll,10275097.rsc)
-#endif // (__LOCATIONSYSUI), __PEN_SUPPORT
-
-#endif//__LOCGPSINDICATORPLUGIN_IBY__
--- a/locationsystemui/locationsysui/rom/locgpsindicatorplugin_resources.iby	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +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: IBY file for Location GPS Indicator Plugin Resource
-*
-*/
-#ifndef __LOCGPSINDICATORPLUGIN_RSC_IBY__
-#define __LOCGPSINDICATORPLUGIN_RSC_IBY__
-
-#if  defined(__LOCATIONSYSUI) && defined(__PEN_SUPPORT)
-//GPS indicator plug-in resource file
-	data=DATAZ_\RESOURCE_FILES_DIR\locgpsindicatorplugin.rsc		RESOURCE_FILES_DIR\locgpsindicatorplugin.rsc
-#endif // (__LOCATIONSYSUI), __PEN_SUPPORT
-
-#endif //__LOCGPSINDICATORPLUGIN_RSC_IBY__
\ No newline at end of file
--- a/locationsystemui/locationsysui/rom/locnotprefplugin.iby	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +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: IBY file for Location Notation Preference
-*
-*/
-#ifndef __LOCNOTPREFPLUGIN_IBY__
-#define __LOCNOTPREFPLUGIN_IBY__
-
-#ifdef __LOCATIONSYSUI
-	
-// Location Notation Preferences ECOM Plugin
-ECOM_PLUGIN(locnotprefplugin.dll,1020690F.rsc)
-
-#endif // __LOCATIONSYSUI
-
-#endif // __LOCNOTPREFPLUGIN_IBY__
--- a/locationsystemui/locationsysui/rom/locnotprefplugin_resources.iby	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +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: IBY file for Location Notation Preference Resource
-*
-*/
-#ifndef __LOCNOTPREFPLUGIN_RSC_IBY__
-#define __LOCNOTPREFPLUGIN_RSC_IBY__
-
-#ifdef __LOCATIONSYSUI
-
-//Location Notation Preferences Settings UI localisable resource file
-data=DATAZ_\RESOURCE_FILES_DIR\locnotprefpluginview.rsc		RESOURCE_FILES_DIR\locnotprefpluginview.rsc
-
-#endif // __LOCATIONSYSUI
-
-#endif //__LOCNOTPREFPLUGIN_RSC_IBY__
\ No newline at end of file
--- a/locationsystemui/locationsysui/rom/locpossettingsapp.iby	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,36 +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: IBY file for Location Position Settings Application
-*
-*/
-#ifndef __LOCPOSSETTINGSAPP_IBY__
-#define __LOCPOSSETTINGSAPP_IBY__
-
-#ifdef __LOCATIONSYSUI
-
-// Postioning Settings Application EXE
-file=ABI_DIR\BUILD_DIR\locpossettingsapp.exe                PROGRAMS_DIR\locpossettingsapp.exe
-
-// Positioning Settings Application Icon
-S60_APP_AIF_ICONS(locpossettingsapp)
-
-// Positioning Settings Application Registration Info
-S60_UPGRADABLE_APP_REG_RSC(locpossettingsapp)
-
-// Location Centre Registration file
-data=ZPRIVATE\10283138\import\locpossettingsapp_reg.xml     \private\10283138\import\locpossettingsapp_reg.xml
-
-#endif // ( __LOCPOSSETTINGSAPP_IBY__ )
-
-#endif
--- a/locationsystemui/locationsysui/rom/locpossettingsapp_resources.iby	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +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: IBY file for Location Position Settings Application Resource
-*
-*/
-#ifndef __LOCPOSSETTINGSAPP_RESOURCES_IBY__
-#define __LOCPOSSETTINGSAPP_RESOURCES_IBY__
-
-#ifdef __LOCATIONSYSUI
-
-	// Postioning Settings application Resource
-	data=ZRESOURCE\apps\locpossettingsapp.rsc		APP_RESOURCE_DIR\locpossettingsapp.rsc
-
-#endif // (__LOCATIONSYSUI)
-
-#endif // __LOCPOSSETTINGSAPP_RESOURCES_IBY__
\ No newline at end of file
--- a/locationsystemui/locationsysui/rom/locpsysettings.iby	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +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: IBY file for Location Positioning Settings
-*
-*/
-#ifndef __LOCPSYSETTINGS_IBY__
-#define __LOCPSYSETTINGS_IBY__
-
-#if  defined(__LOCATIONSYSUI) && defined(__LOCATIONFRAMEWORKCORE)
-
-	// Position Method Settings LocSysUi ECOM Plugin
-  ECOM_PLUGIN(locpsysettingsui.dll,10275062.rsc)
-
-	SCALABLE_IMAGE(APP_BITMAP_DIR,APP_BITMAP_DIR,locpsysettings)
-
-	//LocationSystemUI GS Plugin Engine
-	file=ABI_DIR\BUILD_DIR\locpsysettingseng.dll   SHARED_LIB_DIR\locpsysettingseng.dll
-
-#endif // (__LOCATIONSYSUI) && (__LOCATIONFRAMEWORKCORE)
-
-#endif
--- a/locationsystemui/locationsysui/rom/locpsysettings_resources.iby	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +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: IBY file for Location Positioning Settings Resource
-*
-*/
-#ifndef __LOCPSYSETTINGS_RSC_IBY__
-#define __LOCPSYSETTINGS_RSC_IBY__
-
-#if  defined(__LOCATIONSYSUI) && defined(__LOCATIONFRAMEWORKCORE)
-
-	//LocationSystemUI localisable resource file
-	data=DATAZ_\RESOURCE_FILES_DIR\locpsysettingsuiview.rsc		RESOURCE_FILES_DIR\locpsysettingsuiview.rsc
-
-#endif // (__LOCATIONSYSUI) && (__LOCATIONFRAMEWORKCORE)
-
-#endif //__LOCPSYSETTINGS_RSC_IBY__
\ No newline at end of file
--- a/locationsystemui/locationsysui/rom/locsettingsuiservice.iby	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,38 +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: IBY file for Location Settings Ui Service
-*
-*/
-#ifndef __LOCSETTINGSUISERVICE_IBY__
-#define __LOCSETTINGSUISERVICE_IBY__
-
-	// Location Settings UI client
-	file=ABI_DIR\BUILD_DIR\locsettingsuiclient.dll          SHARED_LIB_DIR\locsettingsuiclient.dll
-	
-#ifdef __LOCATIONSYSUI
-    
-  // Location Settings UI server
-  file=ABI_DIR\BUILD_DIR\locsettingsuiserver.exe         PROGRAMS_DIR\locsettingsuiserver.exe
-
-	// Location Settings UI server icon file
-    S60_APP_AIF_ICONS(locsettingsuiserver)
-	// Location Settings UI server registration file
-    S60_UPGRADABLE_APP_REG_RSC(locsettingsuiserver)
-    
-    // Backup and Restore XML
-    data=DATAZ_\private\10281861\backup_registration.xml    private\10281861\backup_registration.xml
-    
-#endif // (__LOCSETTINGSUISERVICE_IBY__)
-
-#endif
--- a/locationsystemui/locationsysui/rom/locsettingsuiservice_resources.iby	Mon May 03 12:54:42 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: IBY file for Location Settings Ui Service Resource
-*
-*/
-#ifndef __LOCSETTINGSUISERVICE_RSC_IBY__
-#define __LOCSETTINGSUISERVICE_RSC_IBY__
-
-#if defined(__LOCATIONSYSUI)
-	
-	data=DATAZ_\RESOURCE\APPS\locsettingsuiserver.rsc 	resource\apps\locsettingsuiserver.rsc       
-	
-#endif // (__LOCATIONSYSUI)
-
-#endif //__LOCSETTINGSUISERVICE_RSC_IBY__
\ No newline at end of file
--- a/locationsystemui/locationsysui/rom/locsuplsettings.iby	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +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: IBY file for Location SUPL Settings
-*
-*/
-#ifndef __LOCSUPLSETTINGS_IBY__
-#define __LOCSUPLSETTINGS_IBY__
-
-#if  defined(__LOCATIONSYSUI) && defined(__SUPL_FRAMEWORK) && defined(__OMA_SUPL_PLUGINS)
-	
-// Position Method Settings LocSysUi ECOM Plugin
-ECOM_PLUGIN(locsuplsettings.dll,10275091.rsc)
-
-SCALABLE_IMAGE(APP_BITMAP_DIR,APP_BITMAP_DIR,locsuplsettings)
-
-#endif // (__LOCATIONSYSUI) && (__SUPL_FRAMEWORK) && (__OMA_SUPL_PLUGINS)
-
-#endif
--- a/locationsystemui/locationsysui/rom/locsuplsettings_resources.iby	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +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: IBY file for Location SUPL Settings Resource
-*
-*/
-#ifndef __LOCSUPLSETTINGS_RSC_IBY__
-#define __LOCSUPLSETTINGS_RSC_IBY__
-
-#if  defined(__LOCATIONSYSUI) && defined(__SUPL_FRAMEWORK) && defined(__OMA_SUPL_PLUGINS)
-
-	//LocationSystemUI localisable resource file
-	data=DATAZ_\RESOURCE_FILES_DIR\locsuplsettingsui.rsc		RESOURCE_FILES_DIR\locsuplsettingsui.rsc
-
-#endif // (__LOCATIONSYSUI) && (__SUPL_FRAMEWORK) && (__OMA_SUPL_PLUGINS)
-
-#endif //__LOCSUPLSETTINGS_RSC_IBY__
\ No newline at end of file
--- a/locationsystemui/locationsysui/rom/locverifierdlg.iby	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,36 +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: IBY file for Location Verification Dialog
-*
-*/
-#ifndef __LOCVERIFIERDLG_IBY__
-#define __LOCVERIFIERDLG_IBY__
-
-#if defined(__PRIVACYFRAMEWORK)
-
-	// Location Verifier ECom Plug-in Wrapper
-  ECOM_PLUGIN(locnotifierwrapper.dll,10207242.rsc)
-    
-	// Location Verifier dialog
-	file=ABI_DIR\BUILD_DIR\locverifierdlg.dll       SHARED_LIB_DIR\locverifierdlg.dll
-
-	// Location Utils
-	file=ABI_DIR\BUILD_DIR\locutils.dll             SHARED_LIB_DIR\locutils.dll
-	
-	// LocNotifier App Server Resource File
-	data=DATAZ_\RESOURCE\locutils.rsc               resource\locutils.rsc       
-    
-#endif // (__PRIVACYFRAMEWORK)
-
-#endif
--- a/locationsystemui/locationsysui/rom/locverifierdlg_resources.iby	Mon May 03 12:54:42 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: IBY file for Location Verification Dialog Resource
-*
-*/
-#ifndef __LOCVERIFIERDLG_RSC_IBY__
-#define __LOCVERIFIERDLG_RSC_IBY__
-
-#if defined(__PRIVACYFRAMEWORK)
-	
-	data=DATAZ_\RESOURCE\locverifierdlg.RSC 	resource\locverifierdlg.rsc       
-	
-#endif // (__PRIVACYFRAMEWORK)
-
-#endif //__LOCVERIFIERDLG_RSC_IBY__
\ No newline at end of file
Binary file locationtriggering/data/lbtstub.sis has changed
--- a/locationtriggering/group/bld.inf	Mon May 03 12:54:42 2010 +0300
+++ b/locationtriggering/group/bld.inf	Fri May 14 16:17:02 2010 +0300
@@ -25,6 +25,10 @@
 #ifdef CORE_MW_LAYER_IBY_EXPORT_PATH
 ../rom/locationtriggering.iby                         CORE_MW_LAYER_IBY_EXPORT_PATH(locationtriggering.iby)
 ../rom/locationtriggeringstub.iby                     CORE_MW_LAYER_IBY_EXPORT_PATH(locationtriggeringstub.iby)
+
+// Export SIS File
+../data/lbtstub.sis  					/epoc32/data/z/system/install/lbtstub.sis
+
 #endif
 
 #ifdef MW_LAYER_CONFML
@@ -44,7 +48,6 @@
 #include "../ltstrategyengine/group/bld.inf"
 #include "../ltmovementdetectionpluginapi/group/bld.inf"
 #include "../ltcellidmovementdetector/group/bld.inf"
-#include "../lbtmgmtui/group/bld.inf"
 #include "../ltcontextsourceplugin/group/bld.inf"
 
 PRJ_MMPFILES
--- a/locationtriggering/install/lbtstub.pkg	Mon May 03 12:54:42 2010 +0300
+++ b/locationtriggering/install/lbtstub.pkg	Fri May 14 16:17:02 2010 +0300
@@ -34,22 +34,21 @@
 ;
 ; Files to be eclipsed
 ;
-""-"!:\sys\bin\lbt.dll"
-""-"!:\sys\bin\lbtlogger.dll"
-""-"!:\sys\bin\lbtmanager.dll"
-""-"!:\resource\plugins\lbtserverlogic.rsc"
-""-"!:\sys\bin\lbtserverlogic.dll"
-""-"!:\sys\bin\lbtserverlogicbase.dll"
-""-"!:\sys\bin\lbtcontainer.dll"
-""-"!:\sys\bin\lbtstrategy.dll"
-""-"!:\sys\bin\lbtstrategypluginapi.dll"
-""-"!:\resource\plugins\lbtstrategy.rsc"
-""-"!:\sys\bin\ltmvmtdetapi.dll"
-""-"!:\sys\bin\ltcellidmovdet.dll"
-""-"!:\resource\plugins\ltcellidmovdet.rsc"
-""-"!:\sys\bin\lbtserver.exe"
-""-"!:\private\1028312B\backup_registration.xml"
-""-"C:\private\101f875a\import\[1028312B].rsc"
+""-"Z:\sys\bin\lbt.dll"
+""-"Z:\sys\bin\lbtlogger.dll"
+""-"Z:\sys\bin\lbtmanager.dll"
+""-"Z:\resource\plugins\lbtserverlogic.rsc"
+""-"Z:\sys\bin\lbtserverlogic.dll"
+""-"Z:\sys\bin\lbtserverlogicbase.dll"
+""-"Z:\sys\bin\lbtcontainer.dll"
+""-"Z:\sys\bin\lbtstrategy.dll"
+""-"Z:\sys\bin\lbtstrategypluginapi.dll"
+""-"Z:\resource\plugins\lbtstrategy.rsc"
+""-"Z:\sys\bin\ltmvmtdetapi.dll"
+""-"Z:\sys\bin\ltcellidmovdet.dll"
+""-"Z:\resource\plugins\ltcellidmovdet.rsc"
+""-"Z:\sys\bin\lbtserver.exe"
+""-"Z:\private\1028312B\backup_registration.xml"
 
 
 
--- a/locationtriggering/lbtmgmtui/data/2001E66E.rss	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,45 +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:  ECOM plugin resource file for Location Triggering Plugin.
-*
-*/
-
-#include <ecom/registryinfo.rh>
-#include "lbtmgmtpluginuid.hrh"
-
-#define PLUGINDISPLAYNAME "Location Triggering"
-
-RESOURCE REGISTRY_INFO theInfo
-    {
-    dll_uid     = KLbtMgmtPluginUID3;
-    interfaces  = 
-        {
-        INTERFACE_INFO
-            {
-            interface_uid   = 0x10275061;
-            implementations = 
-                {
-                IMPLEMENTATION_INFO
-                    {
-                    implementation_uid  = KLbtMgmtPluginUID3;
-                    version_no          = 1;
-                    display_name        = PLUGINDISPLAYNAME;
-                    default_data        = "";
-                    opaque_data         = "";                   
-                    }
-                };
-            }
-        };
-    }
-
--- a/locationtriggering/lbtmgmtui/data/lbtmgmtpluginview.rss	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,413 +0,0 @@
-/*
-* Copyright (c) 2008 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 all the resource definitions for the Location Triggering
-*                Management UI.
-*
-*/
-
-
-//  RESOURCE IDENTIFIER
-
-NAME    LBTU // 4 Letter Identifier
-
-//  SYSTEM INCLUDES
-#include <data_caging_paths_strings.hrh>
-#include <bldvariant.hrh>
-#include <avkon.rh>
-#include <avkon.rsg>
-#include <avkon.mbg>
-#include <EIKCORE.rsg>
-#include <eikon.rh>
-#include <eikon.rsg>
-#include <avkon.loc>
-#include <lbtmgmtsettings.loc>
-
-// USER INCLUDES
-#include "lbtmgmtplugin.hrh"
-
-//  RESOURCE DEFINITIONS 
-    
-RESOURCE RSS_SIGNATURE 
-    {
-    }
-
-//------------------------------------------------------------------------------
-//   
-// r_lbtmgmtplugin_view
-// Location Trigger Management plug-in view
-//
-//------------------------------------------------------------------------------
-//
-RESOURCE AVKON_VIEW r_lbtmgmtplugin_view
-    {
-    menubar = r_lbtmgmtplugin_menubar_view;
-    cba = r_lbtmgmtplugin_cba_change;    
-    }
-
-//------------------------------------------------------------------------------
-//   
-// r_lbtmgmtplugin_cba_change
-// CBA for Location Trigger Management plug-in
-//
-//-------------------------------------------------------------------------------
-//   
-RESOURCE CBA r_lbtmgmtplugin_cba_change
-    {
-    flags = 0;
-    buttons = 
-        {
-        CBA_BUTTON 
-            {
-            id = EAknSoftkeyOptions; 
-            txt = text_softkey_option;
-            },
-        CBA_BUTTON 
-            {
-            id = EAknSoftkeyBack; 
-            txt = text_softkey_back;
-            },
-        CBA_BUTTON
-            {
-            id = ELbtMgmtMSKChange; 
-            txt = qtn_msk_change;
-            }
-        };
-    }
-
-//------------------------------------------------------------------------------
-//   
-// r_lbtmgmtplugin_cba_info
-// CBA for Location Trigger Management plug-in
-//
-//-------------------------------------------------------------------------------
-//
-   
-RESOURCE CBA r_lbtmgmtplugin_cba_info
-    {
-    flags = 0;
-    buttons = 
-        {
-        CBA_BUTTON 
-            {
-            id = EAknSoftkeyOptions; 
-            txt = text_softkey_option;
-            },
-        CBA_BUTTON 
-            {
-            id = EAknSoftkeyBack; 
-            txt = text_softkey_back;
-            },
-        CBA_BUTTON
-            {
-            id = ELbtMgmtMSKInfo; 
-            txt = qtn_msk_loctr_info;
-            }
-        };
-    }
-
-//------------------------------------------------------------------------------
-//   
-// r_lbtmgmtplugin_cba_noactivetriggers
-// CBA for Location Trigger Management plug-in when there are no active triggers
-//
-//-------------------------------------------------------------------------------
-//
-   
-RESOURCE CBA r_lbtmgmtplugin_cba_noactivetriggers
-    {
-    flags = 0;
-    buttons = 
-        {
-        CBA_BUTTON 
-            {
-            id = EAknSoftkeyOptions; 
-            txt = text_softkey_option;
-            },
-        CBA_BUTTON 
-            {
-            id = EAknSoftkeyBack; 
-            txt = text_softkey_back;
-            }
-        };
-    }
-
-
-//------------------------------------------------------------------------------
-//   
-// r_lbtmgmtplugin_menubar_view
-//
-// Menu bar for Location Trigger Management plug-in view.
-//
-//------------------------------------------------------------------------------
-//
-RESOURCE MENU_BAR r_lbtmgmtplugin_menubar_view
-    {
-    titles=
-        {
-        MENU_TITLE 
-            { 
-            menu_pane = r_lbtmgmtplugin_menu; txt=""; 
-            }
-        };
-    }
-
-//------------------------------------------------------------------------------
-//   
-// r_lbtmgmtplugin_menu
-//
-// Menu Items for Location Trigger Management plug-in view.
-//
-//------------------------------------------------------------------------------
-//
-RESOURCE MENU_PANE r_lbtmgmtplugin_menu
-    {
-    items=
-        {
-        MENU_ITEM 
-            { 
-            command = ELbtMgmtChange; 
-            txt = qtn_options_change; 
-            },
-        MENU_ITEM 
-            { 
-            command = ELbtMgmtInfo; 
-            txt = qtn_options_loctr_info; 
-            },
-        MENU_ITEM 
-            { 
-            command = ELbtMgmtClearAll; 
-            txt = qtn_options_loctr_clear_triggers; 
-            },
-        MENU_ITEM 
-            { 
-            command = EAknCmdHelp; 
-            txt = qtn_options_help; 
-            },
-        MENU_ITEM 
-            {
-            // Exit option should use 'EEikCmdExit' instead of 'EEAknCmdExit'
-            // This is to ensure that the Exit command is not handled by the 
-            // ProcessCommandL of CAknView and is transferred to 
-            // CAknViewAppUi::HandleCommandL. This behaviour is necessary 
-            // for proper handling of the Exit command from an App Server's 
-            // perspective.
-            command = EEikCmdExit;  
-            txt = qtn_options_exit; 
-            }
-        };
-    }
-       
-//------------------------------------------------------------------------------
-// r_loctr_title_text_lt
-// 
-// Title text for Location Trigger Management settings
-//------------------------------------------------------------------------------
-//
-RESOURCE TBUF r_loctr_title_text_lt
-    {
-    buf = qtn_loctr_title_text_lt;
-    }
-    
-//------------------------------------------------------------------------------
-// r_loctr_list_lbt_triggering
-// 
-// List box text for Triggering Status
-//------------------------------------------------------------------------------
-//
-RESOURCE TBUF r_loctr_list_lbt_triggering
-    {
-    buf = qtn_loctr_list_lbl_triggering;
-    }
-
-//------------------------------------------------------------------------------
-// qtn_loctr_one_active_trigger
-// 
-// List box text for 1 Active Trigger
-//------------------------------------------------------------------------------
-//
-RESOURCE TBUF r_loctr_one_active_trigger
-    {
-    buf = qtn_loctr_one_active_trigger;
-    }
-
-//------------------------------------------------------------------------------
-// r_loctr_list_active_trigger
-// 
-// List box text for Active Triggers
-//------------------------------------------------------------------------------
-//
-RESOURCE TBUF r_loctr_list_active_trigger
-    {
-    buf = qtn_loctr_list_active_trigger;
-    }
-
-//------------------------------------------------------------------------------
-// r_loctr_list_no_active_trigger
-// 
-// List box text for No Active Triggers
-//------------------------------------------------------------------------------
-//
-RESOURCE TBUF r_loctr_list_no_active_trigger
-    {
-    buf = qtn_loctr_list_no_active_trigger;
-    }
-
-//------------------------------------------------------------------------------
-// r_loctr_list_value_trigger_on
-// 
-// Settings value for Triggering Status. Indicates Location Triggering Status
-// is On
-//------------------------------------------------------------------------------
-//
-RESOURCE TBUF r_loctr_list_value_trigger_on
-    {
-    buf = qtn_loctr_list_value_trigger_on;
-    }
-
-//------------------------------------------------------------------------------
-// r_loctr_list_value_trigger_off
-// 
-// Settings value for Triggering Status. Indicates Location Triggering Status
-// is Off
-//------------------------------------------------------------------------------
-//
-RESOURCE TBUF r_loctr_list_value_trigger_off
-    {
-    buf = qtn_loctr_list_value_trigger_off;
-    }
-
-//------------------------------------------------------------------------------
-// r_loctr_note_turnoff
-// 
-// Confirmatiom message when triggering mechanism is set to OFF when 
-// there are active triggers
-//------------------------------------------------------------------------------
-//
-RESOURCE TBUF r_loctr_note_turnoff
-    {
-    buf = qtn_loctr_note_turnoff;
-    }
-
-//------------------------------------------------------------------------------
-// r_loctr_note_cleartriggers
-// 
-// Confirmatiom message when triggering mechanism is set to OFF when 
-// there are active triggers
-//------------------------------------------------------------------------------
-//
-RESOURCE TBUF r_loctr_note_cleartriggers
-    {
-    buf = qtn_loctr_note_cleartriggers;
-    }
-    
-//------------------------------------------------------------------------------
-// r_loctr_list_lbt_triggering_setting
-//
-// Settings page for manipulating Trigger Status settings
-//------------------------------------------------------------------------------
-//
-RESOURCE AVKON_SETTING_PAGE r_loctr_list_lbt_triggering_setting
-    { 
-    label = qtn_loctr_list_lbl_triggering;
-    softkey_resource = R_AVKON_SOFTKEYS_OK_CANCEL__OK;
-    type = EAknSetListBox;
-    editor_resource_id = r_loc_trigger_settings_listbox;
-    }
-    
-//------------------------------------------------------------------------------
-//   
-// r_loc_trigger_settings_listbox 
-// Listbox Control for Trigger Status Settings Page
-//
-//------------------------------------------------------------------------------
-//
-RESOURCE LISTBOX r_loc_trigger_settings_listbox 
-    {
-    flags = EEikListBoxMultipleSelection;
-    }    
-    
-//------------------------------------------------------------------------------
-//   
-// r_loctr_confirmation_query
-//
-// Confirmation Query Dialog
-//------------------------------------------------------------------------------
-//
-RESOURCE DIALOG r_loctr_confirmation_query
-    {
-    flags = EGeneralQueryFlags;
-    buttons = R_AVKON_SOFTKEYS_YES_NO;
-    items =
-        {
-        DLG_LINE
-            {
-            type = EAknCtQuery;
-            id = EGeneralQuery;
-            control = AVKON_CONFIRMATION_QUERY
-                {
-                layout = EConfirmationQueryLayout;
-                label = "";
-                };
-            }
-        };
-    }
-
-//------------------------------------------------------------------------------
-//   
-// r_loctr_message_query_dialog
-//
-// Message Query Dialog for Displaying Trigger Info
-//------------------------------------------------------------------------------
-//
-RESOURCE DIALOG r_loctr_message_query_dialog
-		{
-    flags = EGeneralQueryFlags | EEikDialogFlagNoBorder | EEikDialogFlagNoShadow;
-    buttons = R_AVKON_SOFTKEYS_OK_EMPTY;
-    items=
-        {
-        DLG_LINE
-            {
-            type = EAknCtPopupHeadingPane;
-            id = EAknMessageQueryHeaderId;
-            control = AVKON_HEADING
-                {
-                label = qtn_msk_loctr_info;
-                headinglayout = R_AVKON_WML_SIGN_QUERY_HEADING_PANE;
-                };
-            },
-        DLG_LINE
-            {
-            type = EAknCtMessageQuery;
-            id = EAknMessageQueryContentId;
-            control = AVKON_MESSAGE_QUERY
-                {
-                message = "";
-                };
-            }
-        };
-    }
-
-//------------------------------------------------------------------------------
-// r_loctr_info_popup_text
-// 
-// Info Message to be displayed when there are active and enabled Triggers  
-// minutes and decimal minutes
-//------------------------------------------------------------------------------
-//
-RESOURCE TBUF r_loctr_info_popup_text
-    {
-    buf = qtn_loctr_info_popup_text;
-    }
-    
-// End of File
Binary file locationtriggering/lbtmgmtui/data/lbtmgmtuistub.sis has changed
--- a/locationtriggering/lbtmgmtui/group/bld.inf	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +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:  This file provides the information required for building 
-*                Location Triggering Management UI.
-*
-*/
-
-
-// To get the MW_LAYER_PLATFORM_EXPORT_PATH macro definitions
-#include <platform_paths.hrh>
-
-PRJ_PLATFORMS
-DEFAULT
-
-PRJ_EXPORTS
-// Export Localization Files
-../loc/lbtmgmtsettings.loc                MW_LAYER_LOC_EXPORT_PATH(lbtmgmtsettings.loc)
-
-// Export IBY Files
-../rom/lbtmgmtui.iby            					CORE_MW_LAYER_IBY_EXPORT_PATH(lbtmgmtui.iby)
-../rom/lbtmgmtui_resources.iby           	LANGUAGE_MW_LAYER_IBY_EXPORT_PATH(lbtmgmtui_resources.iby)
-
-// Export SIS File
-../data/lbtmgmtuistub.sis  								/epoc32/data/z/system/install/lbtmgmtuistub.sis
-
-// Stub IBY Files
-../rom/lbtmgmtuistub.iby    								CORE_MW_LAYER_IBY_EXPORT_PATH(lbtmgmtuistub.iby)
-PRJ_MMPFILES
-lbtmgmtui.mmp    
-
-PRJ_TESTMMPFILES
-
-//  End of File  
--- a/locationtriggering/lbtmgmtui/group/lbtmgmtui.mmp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,81 +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:  Project definition file for Location Triggering Management UI.
-*
-*/
-
-
-#include <platform_paths.hrh> // For the MW_LAYER_SYSTEMINCLUDE
-#include <data_caging_paths.hrh>
-#include "../inc/lbtmgmtpluginuid.hrh"    // For UID3
-
-CAPABILITY          CAP_ECOM_PLUGIN
-TARGET              lbtmgmtplugin.dll
-TARGETTYPE          PLUGIN
-UID                 0x10009D8D KLbtMgmtPluginUID3
-VENDORID            VID_DEFAULT
-
-SOURCEPATH          ../src
-SOURCE              lbtmgmtplugin.cpp
-SOURCE              lbtmgmtpluginimptable.cpp
-SOURCE              lbtmgmtplugincontainer.cpp
-SOURCE              lbtmgmtpluginview.cpp
-SOURCE              lbtmgmtpluginengine.cpp
-SOURCE 							lbtmgmtlbtadapter.cpp
-SOURCE 							lbtmgmtdebug.cpp
-
-USERINCLUDE         ../inc
-USERINCLUDE         ../data
-USERINCLUDE         ../../inc
-USERINCLUDE         ../../../inc
-
-// System Include
-APP_LAYER_SYSTEMINCLUDE
-
-SOURCEPATH          ../data
-
-//ECOM resource definition
-START RESOURCE      2001E66E.rss
-TARGET              lbtmgmtplugin.rsc
-END // ECOM resource definition
-
-//View resources
-START RESOURCE      lbtmgmtpluginview.rss
-HEADER
-TARGETPATH          RESOURCE_FILES_DIR
-LANGUAGE_IDS
-END // View Resources
-
-LIBRARY             euser.lib
-LIBRARY             ecom.lib
-LIBRARY             efsrv.lib
-LIBRARY             avkon.lib
-LIBRARY             bafl.lib 
-LIBRARY             cone.lib 
-LIBRARY             eikcoctl.lib 
-LIBRARY             eikcore.lib 
-LIBRARY             commonengine.lib        // RConeResourceLoader
-LIBRARY             egul.lib                // CGulIcon
-LIBRARY             aknskins.lib            // AknsUtils.h
-LIBRARY             flogger.lib				// Logging 
-LIBRARY             featmgr.lib             // Feature manager API
-LIBRARY             hlplch.lib              // Help File
-LIBRARY				lbtmanager.lib			//LBT Manager
-LIBRARY				lbt.lib					//LBT Server
-
-PAGED
-
-SMPSAFE
-
-// End of File
--- a/locationtriggering/lbtmgmtui/inc/lbtmgmtadapterobserver.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +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:  Observer to Location Location Triggering Management settings' adapters
-*
-*/
-
-#ifndef MLBTMGMTADAPTEROBSERVER_H_
-#define MLBTMGMTADAPTEROBSERVER_H_
-
-//  System Includes
-#include <e32base.h>
-
-// User Includes
-
-// Forward Declarations
-
-// Constant Declarations
-// Class Definition
-
-/**
- * Observer to the Location Triggering Management settings' adapter. This class
- * provides notification about the changes to the Settings values of
- * Location Triggering Management settings.
- */
-class MLbtMgmtAdapterObserver
-    {
-    public:
-        /**
-         * Creates new Location Triggering Management plug-in view.
-         */                                                 
-        virtual void HandleSettingsChangeL() = 0;
-
-    };          
-
-#endif // MLBTMGMTADAPTEROBSERVER_H_
-
--- a/locationtriggering/lbtmgmtui/inc/lbtmgmtdebug.h	Mon May 03 12:54:42 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:  Debug File.
-*
-*/
-
-
-#ifndef _LBTMGMTDEBUG_H_
-#define _LBTMGMTDEBUG_H_
-
-// INCLUDES
-#include <e32std.h>
-#include "lbtmgmtdebugconfig.hrh"
-
-// MACROS
-#define DEBUG(TEXT) 				 { \
-									  _LIT( KText, #TEXT ); \
-									   Debug(KText); \
-									 }
-									 
-#define LBTMGMTUI(TEXT, ARG1) 			 { \
-									   _LIT( KText, #TEXT ); \
-									   Debug( KText, (ARG1) ); \
-									 }
-									 
-#define LBTMGMTUI2(TEXT, ARG1, ARG2) 		 { \
-									   _LIT( KText, #TEXT ); \
-									   Debug( KText,(ARG1), (ARG2) ); \
-									 }
-									 
-#define LBTMGMTUI3(TEXT, ARG1, ARG2, ARG3) { \
-									   _LIT( KText, #TEXT ); \
-									   Debug( KText, (ARG1), (ARG2), (ARG3) ); \
-									 }
-
-void Debug( TRefByValue<const TDesC> aText, ...);
-
-/**
-* By using component specific debug macros unnecessary 
-* debug prints can be avoided. 
-* Also component specific debugging is possible by compiling 
-* only certain components when LBTMGMTUI_ENABLE_DEBUG_PRINT is defined.
-*/
-
-#ifdef LBTMGMTUI_ENABLE_DEBUG_PRINT
-							 
-#define LBTMGMTUIDEBUG(TEXT)                     DEBUG(TEXT);
-#define LBTMGMTUIDEBUG1(TEXT, ARG1)              LBTMGMTUI(TEXT, ARG1);
-#define LBTMGMTUIDEBUG2(TEXT, ARG1, ARG2)        LBTMGMTUI2(TEXT, ARG1, ARG2);
-#define LBTMGMTUIDEBUG3(TEXT, ARG1, ARG2, ARG3)  LBTMGMTUI3(TEXT, ARG1, ARG2, ARG3);
-
-#else
-
-#define LBTMGMTUIDEBUG(TEXT)                     ;
-#define LBTMGMTUIDEBUG1(TEXT, ARG1)              ;
-#define LBTMGMTUIDEBUG2(TEXT, ARG1, ARG2)        ;
-#define LBTMGMTUIDEBUG3(TEXT, ARG1, ARG2, ARG3)  ;
-
-#endif
-
-#endif // _LBTMGMTDEBUG_H_
--- a/locationtriggering/lbtmgmtui/inc/lbtmgmtdebugconfig.hrh	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +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 the main build-time configuration file of Events Ui
-*
-*/
-
-
-#ifndef LBTMGMTUICONFIG_HRH_
-#define LBTMGMTUICONFIG_HRH_
-
-//  INCLUDES
-
-// Flags for development:
-
-
-// Defined LBTMGMTUI_ENABLE_DEBUG_PRINT flag enables debug prints to a file.
-
-#define LBTMGMTUI_ENABLE_DEBUG_PRINT
-
-#endif // LBTMGMTUICONFIG_HRH_
-
-// End of File
--- a/locationtriggering/lbtmgmtui/inc/lbtmgmtengobserver.h	Mon May 03 12:54:42 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:  Location Triggering Management Plugin Engine Observer
-*
-*/
-
-
-#ifndef MLBTMGMTENGOBSERVER_H_
-#define MLBTMGMTENGOBSERVER_H_
-
-// Class Declaration
-/**
- * Observer to the Location Triggering Management plug-in.
- */
- 
-class MLbtMgmtEngObserver
-    {
-    public:
-        /**
-         * Notifies a change in the Location Triggering Management settings values
-         */
-        virtual void HandleSettingsChangeEventL() = 0;
-           
-    };
-    
-#endif // MLBTMGMTENGOBSERVER_H_
-
--- a/locationtriggering/lbtmgmtui/inc/lbtmgmtlbtadapter.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,203 +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:  Location Triggering Management's Lbt adapter
-*
-*/
-
-#ifndef CLBTMGMTLBTADAPTER_H_
-#define CLBTMGMTLBTADAPTER_H_
-
-//  System Includes
-#include <e32base.h>
-#include <lbtserver.h>
-#include <lbtmanager.h>
-#include <lbt.h>
-#include <lbttriggerchangeeventobserver.h> 
-
-// User Includes
-
-// Forward Declarations
-class MLbtMgmtAdapterObserver;
-class CLbtTriggerChangeEventNotifier;
-
-// Constant Declarations
-
-// Class Definition
-
-/**
- * Adapter to the Lbt operations
- */
-class CLbtMgmtLbtAdapter : public CActive,
-								public MLbtTriggerChangeEventObserver
-    {
-    public:
-        /**
-         * Enumeration for Trigger Status Values
-         */         
-        enum TTriggeringStatus
-            {
-            /**
-             * Enumeration to display Trigger Status Value as On
-             */
-            EOn = 0x00000000,
-            
-            /**
-             * Enumeration to display Trigger Status Value as Off
-             */             
-            EOff            
-            };            
-    public:
-        /**
-         * Creates new Lbt adapter
-         *
-         * @param  aAdapterObsrv                        Observer to the Lbt adapter
-         * @return CLbtMgmtLbtAdapter& Reference to the adapter
-         */                                                 
-        static CLbtMgmtLbtAdapter* NewL( 
-                            MLbtMgmtAdapterObserver& aAdapterObsrv );
-
-
-        /**
-         * Creates new Lbt adapter
-         * Leaves the object on the Clean up stack         
-         *
-         * @param  aAdapterObsrv                        Observer to the Lbt adapter
-         * @return CLbtMgmtLbtAdapter& Reference to the adapter
-         */                                                 
-        static CLbtMgmtLbtAdapter* NewLC( 
-                            MLbtMgmtAdapterObserver& aAdapterObsrv );    
-
-        
-        /**
-         * Destructor
-         */
-        ~CLbtMgmtLbtAdapter ();
-        
-        /**
-         * Returns the Location Trigger Status settings value.
-         *
-         * @return TTriggeringStatus - Current Trigger Status.
-         */
-        CLbtMgmtLbtAdapter::TTriggeringStatus GetCurrentTriggeringStatusL();
-        
-        /**
-         * Sets the value of Location Trigger Status settings value.
-         *
-         * @param aTiggerStatus - Trigger Status Value.
-         */
-        void SetCurrentTriggeringStatusL( CLbtMgmtLbtAdapter::TTriggeringStatus aTiggerStatus );
-        
-        /**
-         * Toggle the value of Location Trigger Status settings value.
-         *
-         */
-        void ToggleTiggerStatusL();
-        
-        /**
-         * Deletes all active triggers
-         */           
-        void DeleteActiveTriggersL();
-        
-        /**
-        * Return the total active triggers from Location Triggering Server.
-        *
-        * @return TInt - Total active triggers.
-        */
-        TInt ActiveTriggers();
-        
-        /*
-         * Derived from MLbtTriggerChangeEventObserver
-         */
-    	void TriggerChangedL(const TLbtTriggerChangeEvent &aEvent);
-        
-
-    protected:
-        /**
-         * Inherited from CActive
-         */
-        void RunL();
-        
-        /**
-         * Inherited from CActive
-         */
-        void DoCancel();
-                    
-    private:
-        
-        /**
-        * Gets the total active triggers from Location Triggering Server.
-        */
-        void GetTotalActiveTriggersL();
-        
-        /**
-         * Constructor
-         */
-        CLbtMgmtLbtAdapter( MLbtMgmtAdapterObserver&    aAdapterObsrv );
-
-        /**
-         * Second Phase Constructor
-         */
-        void ConstructL();
-       
-        /**
-         * Start Notification
-         */
-        void StartNotification();
-        
-    private:
-                
-        /**
-         * Reference to the Adapter observer
-         */
-        MLbtMgmtAdapterObserver&     iObserver;
-        
-        /**
-         * Reference to the Lbt Server
-         *
-         */
-       	 RLbtServer iLbtServ;
-       	 
-        /**
-         * Reference to the Lbt Manager Session
-         *
-         */
-       	 RLbtManager iLbtMgr;
-       	 
-        /**
-         * Reference to the Lbt Manager Session
-         *
-         */
-       	 RLbtManager iLbtMgrObserver;
-       	 
-        /**
-         * Reference to the Lbt Manager Session
-         *
-         */
-       	 CLbtTriggerChangeEventNotifier * iEventChangeObserver;
-       	 
-        /**
-         * Triggering System structure
-         *
-         */
-       	 TLbtTriggeringSystemManagementSettings iTriggerSettings;
-       	 
-        /**
-         * Total Active Triggers
-         *
-         */
-    	 TInt iTotalActiveTriggers;
-    };          
-
-#endif // CLBTMGMTLBTADAPTER_H_
-
--- a/locationtriggering/lbtmgmtui/inc/lbtmgmtplugin.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,144 +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:  Location Triggering Management Plugin View's container
-*
-*/
-
-#ifndef CLBTMGMTPLUGIN_H_
-#define CLBTMGMTPLUGIN_H_
-
-// System Includes
-#include <ConeResLoader.h>
-
-// User Includes
-#include "locsettingsui.h"
-
-// Classes referenced
-class MLocSettingsUiObserver;
-class CAknViewAppUi;
-class CLbtMgmtPluginView;
-
-// Constant Definition
-//Location Triggering Management plug-in RSC file name
-_LIT( KLbtMgmtUiResFileName, "lbtmgmtpluginview.rsc" );
-
-// Class Definition
-/**
- * Location Triggering Management plug-in.
- */
-class CLbtMgmtPlugin : public CLocSettingsUi
-    {
-    
-    public: // Constructors and destructor
-        
-        /**
-         * Symbian OS two-phased constructor
-         *
-         * @param aParam Generic parameter structure to the Settings UI plug-in
-         * @return 
-         */
-        static CLbtMgmtPlugin* NewL( TAny* aParam );
-    
-        /**
-         * Destructor.
-         */
-        ~CLbtMgmtPlugin();
- 
-        /**
-         * Inherited from CSettingsUi
-         * Launches the Settings UI
-         *
-         * @param aUiLaunchParams   Flags that define specific configuration of
-         *                          if the Settings UI, that the user of the API
-         *                          wants to launch. If more than one functionality
-         *                          is requested then the various combinations
-         *                          are to be ORed. The interpretation of these
-         *                          flag values is a part of the understanding
-         *                          between the API user and the Settings UI
-         */
-        void LaunchL( TInt      aUiLaunchParams );
-
-        /**
-         * Inherited from CSettingsUi
-         * Closes the running Settings UI prematurely.
-         */
-        void Close();
-
-        /**
-         * Inherited from CSettingsUi
-         * Method for getting caption of this plugin. This should be the 
-         * localized name of the settings view to be shown in parent view.
-         *
-         * @param aCaption pointer to Caption variable
-         */
-        void GetCaptionL( TDes& aCaption ) const;
-
-        /**
-         * Inherited from CSettingsUi
-         * Returns the priority of the UI module.
-         * 
-         * @return Priority of the Settings UI
-         */
-        TInt GetPriority();
-         
-    private:
-        /**
-         * C++ default constructor.
-         */
-        CLbtMgmtPlugin( MLocSettingsUiObserver&      aSettingsUiObserver,
-                           CAknViewAppUi&               aAppUi );
-
-        /**
-         * Second phase constructor.
-         */
-        void ConstructL();
-
-        /**
-         * Opens the nearest localized resourcefile using aResourceLoader. 
-         * aResourceLoader should be opened only once before closing it. 
-         * Otherwise it will raise a panic. Therefore it is better to have 
-         * multiple resource loaders.
-         * 
-         * @param aResourceFileName Drive and name of resource file in format 
-         *                          <path>:<rsc_file_name>
-         * @param aResourceLoader Resource loader for the resource. The loader 
-         *                        must not be opened allready or it will raise 
-         *                        a panic. It is caller's responsibility to 
-         *                        close the resource loader after using the 
-         *                        resource.
-         */
-        void OpenLocalizedResourceFileL( const TDesC&               aResourceFileName, 
-                                               RConeResourceLoader& aResourceLoader );
-                                                       
-  
-    private:
-        /**
-         * Resource Loader handle for handling Location Triggering Management settings' 
-         * specific resources
-         */
-        RConeResourceLoader             iResourceLoader;
-            
-        /**
-         * Location Triggering Management view
-         * Owns
-         */
-        CLbtMgmtPluginView*      iView;
-        
-        /**
-         * Location Triggering Management view Id
-         */
-        TUid                        iViewId;
-    };
-
-#endif // CLBTMGMTPLUGIN_H_
--- a/locationtriggering/lbtmgmtui/inc/lbtmgmtplugin.hrh	Mon May 03 12:54:42 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:  Contains declarations for constants of Location Triggering 
-*                Management UI. This file can be included in C++ or resource file.
-*
-*/
-
-
-#ifndef _LBTMGMTPLUGIN_HRH_
-#define _LBTMGMTPLUGIN_HRH_
-
-/**
- * Enumeration of Command Ids for Location Triggering Management plug-in
- */
-enum TLbtMgmtCommandIds
-    {
-    ELbtMgmtChange = 0x6000,
-    ELbtMgmtMSKChange,
-    ELbtMgmtInfo,
-    ELbtMgmtMSKInfo,
-    ELbtMgmtClearAll,
-    ECmdNone
-    };
-
-#endif      // _LBTMGMTPLUGIN_HRH_
-
-// End of File
--- a/locationtriggering/lbtmgmtui/inc/lbtmgmtplugincmdhdlr.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,66 +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:  Interface class that provides the command handling functionality.
-*                The class implementing it should be prepared to handle all commands
-*                except those internal to the calling UI
-*
-*/
-
-
-#ifndef MLBTMGMTPLUGINCMDHDLR_H_
-#define MLBTMGMTPLUGINCMDHDLR_H_
-
-// System Include 
-#include <e32base.h>
-
-// Class Definition
-/**
- *  Interface class that provides the command handling functionality.
- */
-class MLbtMgmtPluginCmdHdlr
-    {
-    public:
-	     /**
-         * Enumeration for Command Handler commands
-         */
-	 enum TLbtMgmtPluginCmd
-	    {
-	    /**
-	     * List box item selection
-	     */
-	    EListBoxItemSelected,
-	    
-	    /**
-	     * List box item focused
-	     */
-	    EListBoxItemFocused,
-	    
-	    /**
-	     * Screen size changed
-	     */
-	    EScreenSizeChanged
-	    };
-	    
-    public:
-        /**
-         * Command handling function
-         *
-         * @param aCommand Command that needs to be handled
-         */
-         virtual void HandleCmdL( TLbtMgmtPluginCmd aCommand )   = 0;
-         
-    };
-
-#endif // MLBTMGMTPLUGINCMDHDLR_H_
-
--- a/locationtriggering/lbtmgmtui/inc/lbtmgmtplugincontainer.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,189 +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:  Location Triggering Managemen Plugin View's container
-*
-*/
-
-#ifndef CLBTMGMTPLUGINCONTAINER_H_
-#define CLBTMGMTPLUGINCONTAINER_H_
-
-// System Includes 
-#include <e32base.h>
-#include <coecntrl.h>
-#include <eiklbo.h>
-
-// Forward Declarations
-class MDesCArray;
-class MLbtMgmtPluginCmdHdlr;
-class CAknSettingStyleListBox;
-
-// Class Definition
-
-/**
- * Container for the CLbtMgmtPluginView.
- */
-class CLbtMgmtPluginContainer : public CCoeControl,
-                                    public MEikListBoxObserver
-    {
-    public:
-        /**
-         * Static Two phase contructor that instantiates the CLbtMgmtPluginContainer
-         * 
-         * @param aRect                         Client rectangle
-         * @param aListBoxModel                 Model for the container's list box
-         * @param aCmdHandler                   List box command handler
-         * @return CLbtMgmtPluginContainer*  Reference to the object created
-         */
-        static CLbtMgmtPluginContainer* NewL( 
-                                const TRect&                    aRect,
-                                      MDesCArray&               aListBoxModel,
-                                      MLbtMgmtPluginCmdHdlr& aCmdHandler );
-
-        /**
-         * Static Two phase contructor that instantiates the CLbtMgmtPluginContainer
-         * Leaves the object on the Cleanup stack
-         * 
-         * @param aRect                         Client rectangle
-         * @param aListBoxModel                 Model for the container's list box
-         * @param aCmdHandler                   List box command handler     
-         * @return CLbtMgmtPluginContainer*  Reference to the object created
-         */
-        static CLbtMgmtPluginContainer* NewLC(
-                                const TRect&                    aRect,
-                                      MDesCArray&               aListBoxModel,
-                                      MLbtMgmtPluginCmdHdlr& aCmdHandler );
-        /**
-         * Destructor
-         */
-        ~CLbtMgmtPluginContainer();
-         
-        /**
-         * Returns the currentlt focussed element.
-         *
-         * @return TInt Index of the item selected
-         */
-        TInt GetFocussedItem();
-        
-        /**
-         * Inherited from CCoeControl
-         */
-        void HandleResourceChange(TInt aType);
-
-        /**
-         * From CoeControl
-         */
-        TInt CountComponentControls() const;
-
-        /**
-         * From CCoeControl
-         */
-        CCoeControl* ComponentControl(TInt aIndex) const;
-
-        /**
-         * Inherited from CCoeControl
-         */
-        TKeyResponse OfferKeyEventL( const TKeyEvent& aKeyEvent,
-                                           TEventCode aType );
-        
-        /**
-         * Inherited from CCoeControl
-         */                         
-        void HandlePointerEventL(const TPointerEvent &aPointerEvent);
- 
-        /**
-         * Inherited from MEikListBoxObserver
-         */
-        void HandleListBoxEventL( CEikListBox*      aListBox, 
-                                  TListBoxEvent     aEventType );        
-                
-        /**
-         * Returns the help context
-         *
-         * @param aContext  The help context that has to be determined
-         */
-        void GetHelpContext( TCoeHelpContext& aContext ) const;
-                
-        /**
-         * Updates listbox model          
-         */
-       void Update();
-             
-    protected:
-        /**
-         * Handles Focus Change to list 
-         */
-        void FocusChanged(TDrawNow aDrawNow);
-         
-        /**
-         * From CoeControl,SizeChanged.
-         */
-        void SizeChanged();
-
-    private:
-        /**
-         * Overloaded Constructor
-         */
-        CLbtMgmtPluginContainer( MDesCArray&               aListBoxModel,
-                                    MLbtMgmtPluginCmdHdlr& aCmdHandler );
-
-        /**
-         * Second phase of the two phase Construction process
-         */
-        void ConstructL( const TRect& aRect );
-           
-        /** 
-         * Creates the List box and the Listbox model. Associates the 
-         * list box model wit the list box
-         *         
-         */
-        void CreateListboxL();
-                      
-        /**
-         * Sets the Title text
-         * @param aResourceText Resource to create title
-         */
-        void MakeTitleL( TInt aResourceText );
-              
-         /**
-          * Returns the Appui's status pane
-          * @return CEikStatusPane* Statuspane pointer
-          */
-         CEikStatusPane* StatusPane();
-     
-    private:
-        /**
-         * Reference to the List box model
-         */
-        MDesCArray&                 iListBoxModel;
-          
-        /**
-         * Reference to the List box command handler
-         */
-        MLbtMgmtPluginCmdHdlr&   iCmdHandler;
-        
-        /**
-         * Settings list box for Trigger Management settings
-         * Owns
-         */
-        CAknSettingStyleListBox*        iListBox;    
-        
-        /**
-         * Help context
-         */
-        TCoeContextName                 iContextName;
-        
-  };
-
-#endif // CLBTMGMTPLUGINCONTAINER_H_
-
--- a/locationtriggering/lbtmgmtui/inc/lbtmgmtpluginengine.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,217 +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:  Location Triggering Management Plugin Engine
-*
-*/
-
-#ifndef CLBTMGMTPLUGINENGINE_H_
-#define CLBTMGMTPLUGINENGINE_H_
-
-//  System Includes
-#include <e32base.h>
-#include <bamdesca.h>  // MDesCArray
-
-// User Includes
-#include "lbtmgmtadapterobserver.h"
-
-// Forward Declarations
-class MLbtMgmtEngObserver;
-class CLbtMgmtLbtAdapter;
-
-// Constant Declarations
-
-// Class Definition
-
-/**
- * Engine for Location Triggering Management Plugin.
- *
- * The class for interacting accessing and modifying Triggering Management settings. The 
- * class interfaces with the corresponding Adapter Class for Trigger Status 
- * and Default Tone.
- * Further, its also doubles up as a model for the Location Triggering Management 
- * list-box
- */
-class CLbtMgmtPluginEngine : public CBase,
-                                public MDesCArray,
-                                public MLbtMgmtAdapterObserver
-    {
-    public:
-        /**
-         * Enumeration for the Settings list
-         */
-        enum TSettingsList
-            {
-            /**
-             * Trigger status
-             */
-            ETriggeringStatus = 0,
-            
-            /**
-             * Active Triggers
-             */
-            EActiveTriggers    
-            };    
-    public:
-        /**
-         * Creates new Location Triggering Management plug-in engine instance.
-         *
-         * @param  aEngineObserver           Observer to the Triggering Management engine
-         * @return CLbtMgmtPluginEngine* Reference to the application view
-         */                                                 
-        static CLbtMgmtPluginEngine* NewL( MLbtMgmtEngObserver& aEngineObserver );
-
-        /**
-         * Creates new Location Triggering Management plug-in engine instance.
-         * Leaves the object on the Clean-up stack.
-         *
-         * @param  aEngineObserver           Observer to the Triggering Management engine
-         * @return CLbtMgmtPluginEngine* Reference to the application view
-         */                                                 
-        static CLbtMgmtPluginEngine* NewLC( MLbtMgmtEngObserver& aEngineObserver );
-        
-        /**
-         * Destructor
-         */
-        ~CLbtMgmtPluginEngine();
-        
-    public:
-        /**
-         * Inherited from MDesCArray
-         */
-        TInt MdcaCount() const;
-
-        /**
-         * Inherited from MDesCArray
-         */
-        TPtrC16 MdcaPoint( TInt aIndex ) const;
-
-        /**
-         * Inherited from MLbtMgmtAdapterObserver
-         */     
-        void HandleSettingsChangeL();
-        
-    public:
-        /**
-         * Closes the running Settings UI prematurely. This would result in dismissing
-         * any active dialogs currently running
-         */
-        void Close();
-            
-        /**
-         * Change Trigger settings
-         */
-        void ChangeTiggerStatusL();
-        
-        /**
-         * Toggle Trigger settings
-         */
-        void ToggleTiggerStatusL();
-        
-        /**
-         * Show Info dialog for active triggers
-         */
-        void ShowInfoDialogL();
-        
-        /**
-         * Clears all triggers
-         */
-        void ClearAllTriggersL();
-        
-        /**
-         * Returns total active triggers
-         */
-        TInt ActiveTriggers();
-                
-    private:
-        /**
-         * Constructor
-         */
-        CLbtMgmtPluginEngine(  MLbtMgmtEngObserver& aEngineObserver );
-
-        /**
-         * Second Phase Constructor
-         */
-        void ConstructL();
-        
-    private:
-        
-        /**
-         * Reference to the Engine observer
-         */
-        MLbtMgmtEngObserver&                 iObserver;
-        
-        /**
-         * Lbt Adapter handle
-         * Owns
-         */ 
-        CLbtMgmtLbtAdapter*    iLbtAdapter;
-        
-        /**
-         * Triggering Settings heading
-         * Owns
-         */
-        HBufC16*                                iTriggeringTitle;
-        
-        /**
-         * Active Triggers Settings heading
-         * Owns
-         */
-        HBufC16*                                iActiveTitle;
-        
-        /**
-         * No Active Triggers Settings heading
-         * Owns
-         */
-        HBufC16*                                iNoActiveTitle;
-        
-        /* Info message about active triggers
-          * Owns
-          */
-        HBufC16*                                iInfoMessage;    
-        
-        /**
-         * Triggering Settings Value - On
-         * Owns
-         */
-        HBufC16*                                iOnSettings;
-        
-        /**
-         * Triggering Settings Value - Off
-         * Owns
-         */
-        HBufC16*                                iOffSettings; 
-
-        /**
-         * Temporary Buffer for returning values to the Accessor 
-         * functions.
-         * Owns
-         */
-       HBufC16*                                iConversionBuffer;
-        
-        /**
-         * Boolean value to denote whether any settings dialog is currently
-         * outstanding
-         */
-        TBool                                   iSettingsDialogOutstanding;     
-       	 
-        /**
-         * Total Active Triggers
-         *
-         */
-    	 TInt iTotalActiveTriggers;
-                    
-    };          
-
-#endif // CLBTMGMTPLUGINENGINE_H_
-
--- a/locationtriggering/lbtmgmtui/inc/lbtmgmtpluginuid.hrh	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +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:  Contains the UID3 value to be used for the Location Trigger 
-*                Management plug-in. This value is expected to have two specific
-*                functions
-*                1. UID3 for the lbtmgmtplugin.dll ECOM DLL
-                 2. Implementation UID for the ECOM plugin to LocSysUiEngine
-*
-*/
-
-
-#ifndef _LBTMGMTPLUGINUID_HRH_
-#define _LBTMGMTPLUGINUID_HRH_
-
-// Location System UI View UID3
-#define KLbtMgmtPluginUID3          0x2001E66E
-
-#endif      // _LBTMGMTPLUGINUID_HRH_
-
-// End of File
-
-
--- a/locationtriggering/lbtmgmtui/inc/lbtmgmtpluginview.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,198 +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:  Location Triggering Management Plugin view
-*
-*/
-
-#ifndef CLBTMGMTPLUGINVIEW_H_
-#define CLBTMGMTPLUGINVIEW_H_
-
-//  System Includes
-#include <data_caging_path_literals.hrh>
-#include <e32base.h>
-#include <aknview.h>
-#include <aknViewAppUi.h>
-#include <ConeResLoader.h>
-
-// User Includes
-#include "lbtmgmtpluginuid.hrh"
-#include "lbtmgmtplugincmdhdlr.h"
-#include "lbtmgmtengobserver.h"
-
-// Forward Declarations
-class CLbtMgmtPluginContainer;
-class MLbtMgmtEngObserver;
-class MLocSettingsUiObserver;
-class CLbtMgmtPluginEngine;
-    
-// Constant Declarations
-const TUid KLbtMgmtViewPluginUid = { KLbtMgmtPluginUID3 };
-_LIT( KLbtMgmtViewResFileName, "lbtmgmtpluginview.rsc" );
-
-// Class Definition
-
-/**
- * Location Triggering Management Plugin view class. 
- */
-class CLbtMgmtPluginView : public CAknView,
-                              public MLbtMgmtPluginCmdHdlr,
-                              public MLbtMgmtEngObserver
-    {
-    public:
-        /**
-         * Creates new Location Triggering Management plug-in view.
-         *
-         * @param  aSettingsObsrv           Observer to the Settings UI
-         * @return CLbtMgmtPluginView&   Reference to the application view
-         */                                                 
-        static CLbtMgmtPluginView* NewL( MLocSettingsUiObserver& aSettingsObsrv );
-
-        /**
-         * Creates new Location Triggering Management plug-in view. 
-         * Leaves the object on the Clean up stack
-         *
-         * @param  aSettingsObsrv           Observer to the Settings UI         
-         * @return CLbtMgmtPluginView&   Reference to the application view
-         */                                                 
-        static CLbtMgmtPluginView* NewLC( MLocSettingsUiObserver& aSettingsObsrv );
-        
-        /**
-         * Destructor
-         */
-        ~CLbtMgmtPluginView ();
-
-        /**
-         * Close the Triggering Management Settings
-         */
-        void CloseSettings();
-        
-        /**
-         * From CAknView. 
-         */
-        void DoActivateL( const TVwsViewId& aPrevViewId,
-                                TUid        aCustomMessageId,
-                          const TDesC8&     aCustomMessage );
-        
-        /**
-         * From CAknView. 
-         */
-        void DoDeactivate();
- 
-        /**
-         * From CAknView. Returns the View Id. Should be chosen to reflect 
-         * the Implementation UID of the Plugin
-         */
-        TUid Id() const;
-
-        /**
-         * From CAknView. 
-         */
-        void HandleCommandL(TInt aCommand);
-        
-       /**
-        * From MEikMenuObserver
-        */
-        void DynInitMenuPaneL( TInt aResourceId, CEikMenuPane* aMenuPane );        
-
-       /**
-        * For CBA Change
-        */
-				void SetCba( TInt aResourceId );
-
-    public:
-        /**
-         * Inherited from MLbtMgmtPluginCmdHdlr
-         * Handles commands from the container
-         *
-         * @param  aCommand Command ID
-         */
-        void HandleCmdL( TLbtMgmtPluginCmd aCommand );
-
-    public:
-        /**
-         * Inherited from MLbtMgmtEngObserver
-         */
-        void HandleSettingsChangeEventL();
-                
-    private:
-        /**
-         * Constructor
-         */
-        CLbtMgmtPluginView( MLocSettingsUiObserver& aSettingsObsrv );
-
-        /**
-         * Second Phase Constructor
-         */
-        void ConstructL();
-            
-        /**
-         * Shows or dims help option, depending wheather help feature
-         * is supported or not.
-         * @param aMenuPane
-         */
-        void HandleHelpFeature( CEikMenuPane& aMenuPane ) const;
-              
-        /**
-         * Handle Settings Change Event
-         * 
-         * @param aCmd Settings change command
-         */
-        void SettingsChangeL( TInt aCmd );
-        
-        /**
-         * Opens the nearest localized resourcefile using aResourceLoader. 
-         * aResourceLoader should be opened only once before closing it. 
-         * Otherwise it will raise a panic. Therefore it is better to have 
-         * multiple resource loaders.
-         * 
-         * @param aResourceFileName Drive and name of resource file in format 
-         *                          <path>:<rsc_file_name>
-         * @param aResourceLoader Resource loader for the resource. The loader 
-         *                        must not be opened allready or it will raise 
-         *                        a panic. It is caller's responsibility to 
-         *                        close the resource loader after using the 
-         *                        resource.
-         */
-        void OpenLocalizedResourceFileL( const TDesC&                aResourceFileName, 
-                                               RConeResourceLoader&  aResourceLoader );
-        
-    private:        
-        /**
-         * Reference to the Settings UI Observer. Used to notify the dismissal of the 
-         * plug-in
-         */
-        MLocSettingsUiObserver&         iSettingsObserver;
-        
-        /**
-         * Resource loader handle
-         * Owns
-         */
-        RConeResourceLoader             iResourceLoader;
-        
-        /**
-         * Location Trigger Management Container
-         * Owns
-         */
-        CLbtMgmtPluginContainer*     iContainer;
-        
-        /**
-         * Location Trigger Management engine
-         * Owns
-         */
-        CLbtMgmtPluginEngine*        iEngine;
-       
-    };          
-
-#endif // CLBTMGMTPLUGINVIEW_H_
-
--- a/locationtriggering/lbtmgmtui/install/lbtmgmtui.pkg	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,45 +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: Package file for lbtmgmtui Plugin
-;
-;
-; Installation file for lbtmgmtui Plugin
-;
-;Languages
-&EN
-;
-; UID is the app's UID
-;
-#{"lbtmgmtui"},( 0x2001E66E ),1,0,0,TYPE=SA, RU
-;
-; Localised Vendor name
-%{"Nokia"}
-
-; Unique Vendor name
-:"Nokia"
-
-;Supports Series 60 v 3.0
-;This line indicates that this installation is for the Series 60 platform v3.0
-;This line must appear _exactly_ as shown below in the sis file
-;If this line is missing or incorrect, the sis file will not be able
-;to be installed on Series 60 v3.0 platforms
-[0x102752AE], 0, 0, 0, {"Series60ProductID"} ; S60 3.2 and variants
-[0x1028315F], 0, 0, 0, {"Series60ProductID"} ; S60 5.0
-;
-;
-
-; Install lbtmgmtui Settings
-"\epoc32\data\z\resource\plugins\lbtmgmtplugin.rsc"			-"!:\resource\plugins\lbtmgmtplugin.rsc"
-"\epoc32\release\armv5\urel\lbtmgmtplugin.dll"					-"!:\sys\bin\lbtmgmtplugin.dll"
-"\epoc32\data\z\resource\lbtmgmtpluginview.rsc"				  -"!:\resource\lbtmgmtpluginview.rsc"
Binary file locationtriggering/lbtmgmtui/install/lbtmgmtui.sis has changed
Binary file locationtriggering/lbtmgmtui/install/lbtmgmtui.sisx has changed
--- a/locationtriggering/lbtmgmtui/install/lbtmgmtuistub.pkg	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,45 +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: Stub package file for lbtmgmtui Plugin
-;
-;
-; Installation file for lbtmgmtui Plugin
-;
-;Languages
-&EN
-;
-; UID is the app's UID
-;
-#{"lbtmgmtui"},( 0x2001E66E ),1,0,0,TYPE=SA
-;
-; Localised Vendor name
-%{"Nokia"}
-
-; Unique Vendor name
-:"Nokia"
-
-;Supports Series 60 v 3.0
-;This line indicates that this installation is for the Series 60 platform v3.0
-;This line must appear _exactly_ as shown below in the sis file
-;If this line is missing or incorrect, the sis file will not be able
-;to be installed on Series 60 v3.0 platforms
-[0x102752AE], 0, 0, 0, {"Series60ProductID"} ; S60 3.2 and variants
-[0x1028315F], 0, 0, 0, {"Series60ProductID"} ; S60 5.0
-;
-;
-
-; Install lbtmgmtui Settings
-""-"z:\resource\plugins\lbtmgmtplugin.rsc"
-""-"z:\sys\bin\lbtmgmtplugin.dll"
-""-"z:\resource\lbtmgmtpluginview.rsc"
--- a/locationtriggering/lbtmgmtui/loc/lbtmgmtsettings.loc	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,104 +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:  Localization file Location Triggering Management Plugin
-*
-*/
-
-
-/**
- *  Default (implementation English) Resource localisation file.
- */
-
-//  LOCALISATION STRINGS  
-
-//d: Title pane text for Location Triggering Management settings
-//l: title_pane_t2/opt9
-//r: 9.1tb
-//
-#define qtn_loctr_title_text_lt "Location triggering"
-
-//d: List box Settings item for Triggering
-//l: list_setting_pane_t1
-//r: 9.1tb
-//
-#define qtn_loctr_list_lbl_triggering "Triggering"
-
-//d: Settings value for Triggering, Indicates the Location Triggering is On
-//l: list_set_graphic_pane_t1
-//r: 9.1tb
-//
-#define qtn_loctr_list_value_trigger_on "On"
-
-//d: Settings value for Triggering, Indicates the Location Triggering is Off
-//l: list_set_graphic_pane_t1
-//r: 9.1tb
-//
-#define qtn_loctr_list_value_trigger_off "Off"
-
-//d: Confirmatiom message when triggering mechanism is set to OFF
-//d: there are active triggers
-//l: popup_note_window
-//r: 9.1tb
-//
-#define qtn_loctr_note_turnoff "There are active triggers. Turn off anyway"
-
-//d: List box Settings item when no Active triggers exist 
-//l: list_setting_pane_t1
-//r: 9.1tb
-//
-#define qtn_loctr_list_no_active_trigger "No Active triggers exist"
-
-//d: List box Settings item when Active triggers exist 
-//l: list_setting_pane_t1
-//r: 9.1tb
-//
-#define qtn_loctr_list_active_trigger "%N Active triggers exist"
-
-//d: List box Settings item when 1 Active trigger exist 
-//l: list_setting_pane_t1
-//r: 9.1tb
-//
-#define qtn_loctr_one_active_trigger "1 Active trigger exist"
-
-//d: Middle soft Key string when the focus is on Active triggers.
-//l: control_pane_t3/opt7
-//r: 9.1tb
-//
-#define qtn_msk_loctr_info "Info"
-
-//d: Menu Item to show info about the Active triggers
-//l: list_single_pane_t1_cp2
-//r: 9.1tb
-//
-#define qtn_options_loctr_info "Info"
-
-//d: Menu Item for Clear all the Triggers
-//l: list_single_pane_t1_cp2
-//r: 9.1tb
-//
-#define qtn_options_loctr_clear_triggers "Clear triggers"
-
-//d: Text to display in Message Query, if there are active triggers
-//l: popup_info_list_pane_t1
-//r: 9.1tb
-//
-#define qtn_loctr_info_popup_text "There are active location triggers. Individual triggers can be managed in applications where created. All active triggers can be cleared from options menu."
-
-//d: Confirmation String to Clear all Triggers
-//l: popup_note_window/opt1
-//r: 9.1tb
-//
-#define qtn_loctr_note_cleartriggers "Clear all active triggers"
-
-// End of file
--- a/locationtriggering/lbtmgmtui/rom/lbtmgmtui.iby	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,31 +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: Lbt Management Ui IBY definition
-*
-*/
-#ifndef __LBTMGMTUI_IBY__
-#define __LBTMGMTUI_IBY__
-
-#include <bldvariant.hrh>
-
-#ifdef FF_LBT_ENGINE
-#ifdef FF_LBT_MGTUI
-
-// Location Trigger Management Settings ECOM Plugin
-ECOM_PLUGIN(lbtmgmtplugin.dll,2001E66E.rsc)
-
-#endif // ( FF_LBT_MGTUI )
-#endif // ( FF_LBT_ENGINE )
-
-#endif // ( __LBTMGMTUI_IBY__ )
--- a/locationtriggering/lbtmgmtui/rom/lbtmgmtui_resources.iby	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,31 +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: Lbt Management Ui resource IBY definition
-*
-*/
-#ifndef __LBTMGMTUI_RSC_IBY__
-#define __LBTMGMTUI_RSC_IBY__
-
-#include <bldvariant.hrh>
-
-#ifdef FF_LBT_ENGINE
-#ifdef FF_LBT_MGTUI
-
-//Location Trigger Management Settings UI localisable resource file
-data=DATAZ_\RESOURCE_FILES_DIR\lbtmgmtpluginview.rsc		RESOURCE_FILES_DIR\lbtmgmtpluginview.rsc
-
-#endif // ( FF_LBT_MGTUI )
-#endif // ( FF_LBT_ENGINE )
-
-#endif //__LBTMGMTUI_RSC_IBY__
\ No newline at end of file
--- a/locationtriggering/lbtmgmtui/rom/lbtmgmtuistub.iby	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,31 +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: Stub IBY definition
-*
-*/
-#ifndef __LBTMGMTUISTUB_IBY__
-#define __LBTMGMTUISTUB_IBY__
-
-#include <bldvariant.hrh>
-
-#ifdef FF_LBT_ENGINE
-#ifdef FF_LBT_MGTUI
-
-// Location System UI stub
-data=ZSYSTEM\install\lbtmgmtuistub.sis    system\install\lbtmgmtuistub.sis
-
-#endif // ( FF_LBT_MGTUI )
-#endif // ( FF_LBT_ENGINE )
-
-#endif // (__LBTMGMTUISTUB_IBY__)
--- a/locationtriggering/lbtmgmtui/src/lbtmgmtdebug.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,89 +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:  Debug File.
-*
-*/
-
-
-
-// INCLUDE FILES
-#include "lbtmgmtdebug.h"
-#include <flogger.h>
-#include <e32svr.h>
-#include <bautils.h>
-// CONSTANTS
-
-/// Folder where the log resides
-_LIT( KLbtMgmtLogFolder, "epos" );
-
-/// The name of the log file
-_LIT( KLbtMgmtLogFileName, "lbtmgmtui.txt" );
-
-/// The format in which the time is formatted in log
-_LIT( KLbtMgmtLogTimeFormat, "%02d.%02d:%02d:%06d ");
-
-/// The length of the string produced by KLbtMgmtLogTimeFormat
-const TInt KLbtMgmtLogTimeFormatLength = 16;
-
-/// How many characters a log line can contain
-const TInt KLbtMgmtLogLineLength = 256;
-
-// ========================== OTHER EXPORTED FUNCTIONS =========================
-
-
-
-// -----------------------------------------------------------------------------
-// Debug
-// Generates a log file if c:\logs\epos\ folder exists
-// -----------------------------------------------------------------------------
-//
-void Debug( TRefByValue<const TDesC> aText, ... )
-    {    
-    // coverity[var_decl : FALSE] 
-    VA_LIST args;
-    VA_START( args, aText );
-    
-    TBuf<KLbtMgmtLogLineLength> buf;
-    buf.FormatList( aText, args );
-
-    #ifdef _DEBUG
-    RDebug::Print(buf);
-    #endif
-	
-    RFileLogger logger;
-    
-    TInt ret=logger.Connect();
-    if (ret==KErrNone)
-        {
-        logger.SetDateAndTime( EFalse,EFalse );
-        logger.CreateLog( KLbtMgmtLogFolder, KLbtMgmtLogFileName, EFileLoggingModeAppend );       
-        TBuf<KLbtMgmtLogTimeFormatLength> timeStamp;
-        TTime now;
-        now.HomeTime();
-        TDateTime dateTime;
-        dateTime = now.DateTime();
-        timeStamp.Format( KLbtMgmtLogTimeFormat, 
-            dateTime.Hour(), dateTime.Minute(),
-            dateTime.Second(), dateTime.MicroSecond() );
-        buf.Insert( 0, timeStamp );
-
-        logger.Write(buf);
-        }
-
-    logger.Close();
-
-    VA_END( args );
-    }
-	
-//  End of File  
--- a/locationtriggering/lbtmgmtui/src/lbtmgmtlbtadapter.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,340 +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:  Location Triggering Management's Lbt adapter
-*
-*/
-
-
-// User Include
-#include "lbtmgmtlbtadapter.h"
-#include "lbtmgmtadapterobserver.h"
-#include "lbtmgmtdebug.h"
-#include <lbtstatuspskeys.h>
-#include <lbttriggerfilterbyattribute.h> 
-#include <lbttriggerchangeeventnotifier.h>
-
-// System Include
-#include <lbttriggeringsystemmanagementsettings.h> 
-#include <lbtcommon.h>
-#include <e32property.h>
-
-// Constant Definition
-
-// ========================= MEMBER FUNCTIONS ================================
-
-
-// ---------------------------------------------------------------------------
-// CLbtMgmtLbtAdapter::CLbtMgmtLbtAdapter
-// Overloaded Constructor
-//
-// ---------------------------------------------------------------------------
-//  
-CLbtMgmtLbtAdapter::CLbtMgmtLbtAdapter(  
-                                MLbtMgmtAdapterObserver& aAdapterObsrv )
-    :CActive(EPriorityStandard),
-    iObserver(aAdapterObsrv)
-    {
-    }
-
-// ---------------------------------------------------------------------------
-// CLbtMgmtLbtAdapter::~CLbtMgmtLbtAdapter
-// Destructor
-//
-// ---------------------------------------------------------------------------
-//
-CLbtMgmtLbtAdapter::~CLbtMgmtLbtAdapter()
-    {
-    Cancel();
-    delete iEventChangeObserver;
-    iLbtMgrObserver.Close();
-    iLbtMgr.Close();
-    iLbtServ.Close();
-    }
-    
-// ---------------------------------------------------------------------------
-// CLbtMgmtLbtAdapter* CLbtMgmtLbtAdapter::NewL
-// Creates new Trigger Status adapter
-//
-// @param  aAdapterObsrv                        Observer to the Settings adapter
-// @return CLbtMgmtLbtAdapter& Reference to the Trigger Status adapter
-// ---------------------------------------------------------------------------
-//    
-CLbtMgmtLbtAdapter* CLbtMgmtLbtAdapter::NewL( 
-                            MLbtMgmtAdapterObserver& aAdapterObsrv )
-    {   
-    CLbtMgmtLbtAdapter* self = 
-                        CLbtMgmtLbtAdapter::NewLC( aAdapterObsrv );
-    CleanupStack::Pop(self);
-    return self;
-    }
-
-// ---------------------------------------------------------------------------
-// CLbtMgmtLbtAdapter* CLbtMgmtLbtAdapter::NewLC
-// Creates new Trigger Status adapter. Leaves the object on the clean-up
-// stack
-//
-// @param  aAdapterObsrv                        Observer to the Settings adapter
-// @return CLbtMgmtLbtAdapter& Reference to the Trigger Status adapter
-// ---------------------------------------------------------------------------
-// 
-CLbtMgmtLbtAdapter* CLbtMgmtLbtAdapter::NewLC( 
-                            MLbtMgmtAdapterObserver& aAdapterObsrv )
-    {   
-    CLbtMgmtLbtAdapter* self = 
-                        new(ELeave) CLbtMgmtLbtAdapter( aAdapterObsrv );
-    CleanupStack::PushL(self);
-    self->ConstructL();
-    return self;
-    }
-    
-// ---------------------------------------------------------------------------
-// void CLbtMgmtLbtAdapter::ConstructL
-// Second Phase Constructor
-//
-// ---------------------------------------------------------------------------
-//
-void CLbtMgmtLbtAdapter::ConstructL()
-    {  
-    
-    // Create the Central repository object for manipulating Avkon Central
-    // repository for Co-ordinate display settings
-    User::LeaveIfError( iLbtServ.Connect() );
-	User::LeaveIfError( iLbtMgr.Open(iLbtServ) );
-	User::LeaveIfError( iLbtMgrObserver.Open(iLbtServ) );
-    
-	CActiveScheduler::Add( this );
-    StartNotification();
-    
-    iEventChangeObserver = CLbtTriggerChangeEventNotifier::NewL( iLbtMgrObserver, *this );
-    iEventChangeObserver->Start();
-    
-    iLbtMgr.GetTriggeringSystemSettingsL( iTriggerSettings );
-    GetTotalActiveTriggersL();
-    }
-    
-// ---------------------------------------------------------------------------
-// CLbtMgmtLbtAdapter::TCordDisSetListPosition 
-//                CLbtMgmtLbtAdapter::GetCurrentDisplayFormatL
-// Returns the position of the Co-ordinate display format settings value.
-//
-// @return TCordDisSetListPosition Current postion of the Co-ordinate display
-//                                 settings value.
-// ---------------------------------------------------------------------------
-//
-CLbtMgmtLbtAdapter::TTriggeringStatus 
-                CLbtMgmtLbtAdapter::GetCurrentTriggeringStatusL()
-    {	
-    LBTMGMTUIDEBUG("+ CLbtMgmtLbtAdapter::GetCurrentTriggeringStatusL()");
-    CLbtMgmtLbtAdapter::TTriggeringStatus status = CLbtMgmtLbtAdapter::EOff;
-    
-    switch( iTriggerSettings.TriggeringMechanismState() )
-    	{
-    	case ETriggeringMechanismOn:
-    		status = CLbtMgmtLbtAdapter::EOn;
-    		break;
-    	case ETriggeringMechanismOff:
-    		status = CLbtMgmtLbtAdapter::EOff;
-    		break;
-    	default :
-    		break;
-    	}
-    LBTMGMTUIDEBUG1("- CLbtMgmtLbtAdapter::GetCurrentTriggeringStatusL() - %d", status);
-    
-    return status;    
-    }
-
-// --------------------------------------------------------------------------
-// void CLbtMgmtLbtAdapter::SetCurrentDisplayFormatL
-// Sets the value of the Co-ordinate display format settings based on the
-// display position.
-//
-// @param aSettingsPos  Position of the new Co-ordinate display settings value
-// ---------------------------------------------------------------------------
-//
-void CLbtMgmtLbtAdapter::SetCurrentTriggeringStatusL( 
-        CLbtMgmtLbtAdapter::TTriggeringStatus aSettingsValue )
-   {	
-   LBTMGMTUIDEBUG1("+ CLbtMgmtLbtAdapter::SetCurrentTriggeringStatusL() - %d", aSettingsValue);
-    switch( aSettingsValue )
-    	{
-    	case CLbtMgmtLbtAdapter::EOn:
-    		iTriggerSettings.SetTriggeringMechanismState(ETriggeringMechanismOn);
-		    LBTMGMTUIDEBUG("Before SetTriggeringSystemSettingsL"); 
-			iLbtMgr.SetTriggeringSystemSettingsL(iTriggerSettings,ETriggeringMechanismState); 
-    	    LBTMGMTUIDEBUG("After SetTriggeringSystemSettingsL"); 
-    		break;
-    	case CLbtMgmtLbtAdapter::EOff:
-    		iTriggerSettings.SetTriggeringMechanismState(ETriggeringMechanismOff);
-		    LBTMGMTUIDEBUG("Before SetTriggeringSystemSettingsL"); 
-			iLbtMgr.SetTriggeringSystemSettingsL(iTriggerSettings,ETriggeringMechanismState); 
-    	    LBTMGMTUIDEBUG("After SetTriggeringSystemSettingsL"); 
-    		break;
-    	default :
-    		break;
-    	}	
-    LBTMGMTUIDEBUG("- CLbtMgmtLbtAdapter::SetCurrentTriggeringStatusL()");	
-   }
-    
-// --------------------------------------------------------------------------
-// void CLbtMgmtLbtAdapter::RunL
-// Inherited from CActive
-//
-// ---------------------------------------------------------------------------
-//
-void CLbtMgmtLbtAdapter::RunL()
-    {
-    LBTMGMTUIDEBUG("+ CLbtMgmtLbtAdapter::RunL() - Settings Changed");  
-    // Issue Notification
-    iObserver.HandleSettingsChangeL();
-    
-    // Schedule for listening to change events again
-    StartNotification();
-
-    LBTMGMTUIDEBUG("- CLbtMgmtLbtAdapter::RunL()");  
-    }
-
-// --------------------------------------------------------------------------
-// void CLbtMgmtLbtAdapter::DoCancel
-// Inherited from CActive
-//
-// ---------------------------------------------------------------------------
-//
-void CLbtMgmtLbtAdapter::DoCancel()
-    {
-    // Cancel the outstanding CR notification request
-    iLbtMgr.CancelNotifyTriggeringSystemSettingChange();
-    }
-    
-// --------------------------------------------------------------------------
-// void CLbtMgmtLbtAdapter::StartNotification
-// Start notification from the Central repository server for any changes in the
-// Co-ordinate display format key value
-//
-// ---------------------------------------------------------------------------
-//
-void CLbtMgmtLbtAdapter::StartNotification()
-    {
-    if( !IsActive())
-        {
-        iStatus = KRequestPending;
-        // Request for notification        
-        iLbtMgr.NotifyTriggeringSystemSettingChange(iTriggerSettings, iStatus);
-        SetActive(); 
-        }  
-    }
-
-// ---------------------------------------------------------------------------
-// void CLbtMgmtPluginEngine::ShowInfoDialog
-// It will return total active triggers
-// ---------------------------------------------------------------------------
-//
-TInt CLbtMgmtLbtAdapter::ActiveTriggers()
-    {
-    return iTotalActiveTriggers;
-    }
-
-// --------------------------------------------------------------------------
-// TInt CLbtMgmtLbtAdapter::GetTotalActiveTriggersL()
-// Gets all active triggers from Location Triggering Server. 
-// ---------------------------------------------------------------------------
-//
-void CLbtMgmtLbtAdapter::GetTotalActiveTriggersL()
-    {
-    LBTMGMTUIDEBUG("+ CLbtMgmtLbtAdapter::GetTotalActiveTriggersL()");  
-    RArray<TLbtTriggerId> triggerList;
-    
-    //Construct list options
-    //XXX: should use NewLC() when it is available
-    CLbtListTriggerOptions* listOptions = CLbtListTriggerOptions::NewL();
-    CleanupStack::PushL(listOptions);
-        
-    //Construct an attribute filter
-    CLbtTriggerFilterByAttribute* attribFilter = CLbtTriggerFilterByAttribute::NewLC();
-
-    //Add trigger state to the filter. List only enabled triggers.
-    attribFilter->AddTriggerStateL( CLbtTriggerEntry::EStateEnabled );
-    
-    //Add trigger validity to the filter. List only valid triggers.
-    attribFilter->AddTriggerValidityL( TLbtTriggerDynamicInfo::EValid );
-    
-    listOptions->SetFilter(attribFilter);
-    
-    //List triggers
-
-   LBTMGMTUIDEBUG("Before ListTriggerIdsL");  
-   TRAPD( err, iLbtMgr.ListTriggerIdsL(triggerList, listOptions ) );
-   LBTMGMTUIDEBUG("After ListTriggerIdsL"); 
-   
-   if( err == KErrNone )
-       {
-       iTotalActiveTriggers = triggerList.Count();
-       }
-    
-    //Cleanup   
-    triggerList.Close();
-    CleanupStack::PopAndDestroy(2);//attribFilter, listOptions
-
-    LBTMGMTUIDEBUG("- CLbtMgmtLbtAdapter::GetTotalActiveTriggersL()");  
-    }
-
-// --------------------------------------------------------------------------
-// TInt CLbtMgmtLbtAdapter::DeleteActiveTriggersL()
-// Deletes all active triggers from Location Triggering Server. 
-// ---------------------------------------------------------------------------
-//
-void CLbtMgmtLbtAdapter::DeleteActiveTriggersL()
-    {
-    LBTMGMTUIDEBUG("+ CLbtMgmtLbtAdapter::DeleteActiveTriggersL()");  
-    //Construct an attribute filter
-    CLbtTriggerFilterByAttribute* attribFilter = CLbtTriggerFilterByAttribute::NewLC();
-
-    //Add trigger state to the filter. List only enabled triggers.
-    attribFilter->AddTriggerStateL( CLbtTriggerEntry::EStateEnabled );
-    
-    //Add trigger validity to the filter. List only valid triggers.
-    attribFilter->AddTriggerValidityL( TLbtTriggerDynamicInfo::EValid );   
-
-    LBTMGMTUIDEBUG("Before DeleteTriggersL"); 
-    iLbtMgr.DeleteTriggersL( attribFilter );
-    LBTMGMTUIDEBUG("After DeleteTriggersL"); 
-    
-    CleanupStack::PopAndDestroy( attribFilter );
-    LBTMGMTUIDEBUG("- CLbtMgmtLbtAdapter::DeleteActiveTriggersL()");  
-    }
-
-// ---------------------------------------------------------------------------
-// CLbtMgmtLbtAdapter::TriggerChangedL()
-// Gets the notification on Change in Trigger.
-// ---------------------------------------------------------------------------
-//
-void CLbtMgmtLbtAdapter::TriggerChangedL(
-							const TLbtTriggerChangeEvent &aEvent)
-	{
-    LBTMGMTUIDEBUG("+ CLbtMgmtLbtAdapter::TriggerChangedL()"); 
-	switch( aEvent.iEventType )
-		{
-		case ELbtTriggerChangeEventMultiple:
-		case ELbtTriggerChangeEventDeleted:
-		case ELbtTriggerChangeEventCreated:
-		case ELbtTriggerChangeEventUpdated:
-			GetTotalActiveTriggersL();
-		    // Issue Notification
-		    iObserver.HandleSettingsChangeL();
-			break;
-		default:
-			break;
-		}
-    LBTMGMTUIDEBUG("- CLbtMgmtLbtAdapter::TriggerChangedL()"); 
-	}
-
--- a/locationtriggering/lbtmgmtui/src/lbtmgmtplugin.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,227 +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:  Location Triggering Management Plugin View's container
-*
-*/
-
-
-// System Include
-#include <aknViewAppUi.h>
-#include <StringLoader.h>           // For String Loader
-#include <lbtmgmtpluginview.rsg>
-#include <barsread.h>               // For TResourceReader
-#include <bautils.h>
-
-// User Includes
-#include "locsettingsuiobserver.h"
-#include "locsettingsuiparams.h"
-#include "lbtmgmtplugin.h"
-#include "lbtmgmtpluginview.h"
-
-// Constant Definition
-/**
- * Position of Triggering Management plug-in the Postioning View.
- * As defined by the Location System UI UI specification, the Location
- * Triggering Management plug-in should be inserted at the Third level
- */
-const TInt KLbtMgmtPluginPriority = 0x00000003;
-
-// ---------------------------------------------------------------------------
-// CLbtMgmtPlugin::CLbtMgmtPlugin
-// C++ default constructor.
-// ---------------------------------------------------------------------------
-CLbtMgmtPlugin::CLbtMgmtPlugin( MLocSettingsUiObserver&   aSettingsUiObserver,
-                                      CAknViewAppUi&            aAppUi )
-    :CLocSettingsUi( aSettingsUiObserver, aAppUi ),
-    iResourceLoader( *CCoeEnv::Static() )
-    {
-    }
-
-// ---------------------------------------------------------------------------
-// CLbtMgmtPlugin::~CLbtMgmtPlugin
-// Destructor.
-// ---------------------------------------------------------------------------  
-CLbtMgmtPlugin::~CLbtMgmtPlugin() 
-    {
-    iResourceLoader.Close();
-    }
-
-// ---------------------------------------------------------------------------
-// CLbtMgmtPlugin* CLbtMgmtPlugin::NewL
-// Symbian OS two-phased constructor
-// 
-// @return CLbtMgmtPlugin* Reference to the Settings UI object
-// ---------------------------------------------------------------------------  
-CLbtMgmtPlugin* CLbtMgmtPlugin::NewL( TAny* aParam )
-    {
-    CLocSettingsUiParams*   param = reinterpret_cast<CLocSettingsUiParams *>( aParam );
-    MLocSettingsUiObserver& observer = param->SettingsUiObserver();
-    CAknViewAppUi&          appUi = param->AppUi();
-    CLbtMgmtPlugin* self = new (ELeave )CLbtMgmtPlugin( observer,
-                                                              appUi );
-    CleanupStack::PushL( self );
-    self->ConstructL();
-    CleanupStack::Pop( self );
-    return self; 
-    }
-
-// ---------------------------------------------------------------------------
-// void CLbtMgmtPlugin::ConstructL
-// Second phase constructor.
-// ---------------------------------------------------------------------------  
-void CLbtMgmtPlugin::ConstructL()
-    {
-    // Open the Resource file for the plugin. The resource file is not 
-    // explicity opened by system. Hence, the opening and closind if tied
-    // down to the time when the DLL is active
-    OpenLocalizedResourceFileL( KLbtMgmtUiResFileName, 
-                                iResourceLoader );
-                                    
-    // Creating an Application view
-    iView = CLbtMgmtPluginView::NewL( iSettingsUiObserver );
-    
-    // Transferring the view's control to AppUi
-    iAppUi.AddViewL( iView );
-    
-    // Obtaining the View Id for reference
-    iViewId = iView->Id();
-    }
-
-// ---------------------------------------------------------------------------
-// void CLbtMgmtPlugin::LaunchL
-// Inherited from CSettingsUi
-// Launches the Settings UI
-//
-// @param aUiLaunchParams   Flags for Launch options
-// ---------------------------------------------------------------------------  
-void CLbtMgmtPlugin::LaunchL( TInt       /* aUiLaunchParams */)
-    {
-    // Activate self
-    iAppUi.ActivateLocalViewL( iViewId );
-    }
-
-// ---------------------------------------------------------------------------
-// void CLbtMgmtPlugin::Close
-// Inherited from CSettingsUi
-// Closes the running Settings UI
-// ---------------------------------------------------------------------------  
-void CLbtMgmtPlugin::Close()
-    {
-    iView->CloseSettings();
-    }
-
-// ---------------------------------------------------------------------------
-// void CLbtMgmtPlugin::GetCaptionL
-// Inherited from CSettingsUi
-// Method for getting caption of this plugin. This should be the 
-// localized name of the settings view to be shown in parent view.
-//
-// @param aCaption pointer to Caption variable
-// ---------------------------------------------------------------------------
-void CLbtMgmtPlugin::GetCaptionL( TDes& aCaption ) const
-    {
-    // Load the Location Triggering setting caption from the resource file 
-    // and hand it back to the callee. It is assuemed here that the calling function has 
-    // allocated enough memory for the aCaption string. If not the fucntion
-    // would leave
-    HBufC* caption = StringLoader::LoadL( R_LOCTR_TITLE_TEXT_LT );
-    
-    if( aCaption.MaxLength() < caption->Length())
-        {
-        User::Leave( KErrNoMemory );
-        }
-    aCaption.Copy( *caption );
-    delete caption; 
-    }
-
-// ---------------------------------------------------------------------------
-// TInt CLbtMgmtPlugin::GetPriority
-// Inherited from CSettingsUi
-// Returns the priority of the UI module. 
-// 
-// @return Priority of the Settings UI
-// ---------------------------------------------------------------------------
-TInt CLbtMgmtPlugin::GetPriority()
-    {
-    return KLbtMgmtPluginPriority;
-    }
-
-// ---------------------------------------------------------------------------
-// void CLbtMgmtPlugin::OpenLocalizedResourceFileL
-// Opens the nearest localized resourcefile using aResourceLoader. 
-// aResourceLoader should be opened only once before closing it. 
-// Otherwise it will raise a panic. Therefore it is better to have 
-// multiple resource loaders.
-// 
-// @param aResourceFileName Drive and name of resource file in format 
-//                          <path>:<rsc_file_name>
-// @param aResourceLoader Resource loader for the resource. The loader 
-//                        must not be opened allready or it will raise 
-//                        a panic. It is caller's responsibility to 
-//                        close the resource loader after using the 
-//                        resource.
-// ---------------------------------------------------------------------------  
-//
-void CLbtMgmtPlugin::OpenLocalizedResourceFileL( 
-                                const TDesC&               aResourceFileName, 
-                                      RConeResourceLoader& aResourceLoader )
-    {
-    RFs fsSession;
-    User::LeaveIfError( fsSession.Connect());
-    
-    // Add the RFs session to the CleanupStack
-    CleanupClosePushL( fsSession );
-    
-    TFileName* tmpName = new( ELeave ) TFileName;
-    CleanupStack::PushL( tmpName );
-    
-    // Append the Resource Files Directory
-    tmpName->Append( KDC_RESOURCE_FILES_DIR );
-    
-    // Append the Ressource File Name
-    tmpName->Append( aResourceFileName );
-    
-    
-    // Obtain the drive where the DLL is installed
-    TFileName* dllDrive = new ( ELeave ) TFileName;
-    CleanupStack::PushL( dllDrive );
-    Dll::FileName( *dllDrive );
-    
-    // Obtain the Complete path for the Resource File
-    TParse parse;
-    User::LeaveIfError( parse.Set( *dllDrive, NULL, NULL ));
-    User::LeaveIfError( parse.Set( parse.Drive(), tmpName, NULL ));
-    TFileName* fileName = new ( ELeave ) TFileName;
-    CleanupStack::PushL( fileName );
-    fileName->Append( parse.FullName() );
-    
-    // Get language of resource file
-    BaflUtils::NearestLanguageFile( fsSession, *fileName );
-        
-    // Open resource file    
-    aResourceLoader.OpenL( *fileName );
-    
-    // Pop all the fields
-    CleanupStack::PopAndDestroy( fileName );
-    CleanupStack::PopAndDestroy( dllDrive );
-    CleanupStack::PopAndDestroy( tmpName );
-   
-    CleanupStack::Pop(); // fsSession
-               
-    //If leave occurs before this, close is called automatically when the thread exits.
-    fsSession.Close();
-   
-    }
-
-
--- a/locationtriggering/lbtmgmtui/src/lbtmgmtplugincontainer.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,367 +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:  Location Triggering Management Plugin View's container
-*
-*/
-
-
-// System Includes
-#include <eikspane.h>       // Status pane
-#include <akntitle.h>       // CAknTitlePane
-#include <StringLoader.h>   // String Loader
-#include <lbtmgmtpluginview.rsg>
-#include <aknlists.h>       // Settings Style list box
-#include <csxhelp/lbt.hlp.hrh> // LBT Help
-
-// User Includes
-#include "lbtmgmtplugincontainer.h"
-#include "lbtmgmtplugincmdhdlr.h"
-#include "lbtmgmtplugin.hrh"
-#include "lbtmgmtpluginuid.hrh"
-
-// Constant defintions
-const TInt KNoofComponentControls = 1;
-
-
-// ========================= MEMBER FUNCTIONS ================================
-
-// ---------------------------------------------------------------------------
-// CLbtMgmtPluginContainer::CLbtMgmtPluginContainer
-// Overloaded Constructor
-//
-// ---------------------------------------------------------------------------
-//  
-CLbtMgmtPluginContainer::CLbtMgmtPluginContainer( 
-                                    MDesCArray&               aListBoxModel,
-                                    MLbtMgmtPluginCmdHdlr& aCmdHandler )
-    :iListBoxModel( aListBoxModel ),
-    iCmdHandler( aCmdHandler )
-    {
-    }
-    
-// ---------------------------------------------------------------------------
-// CLbtMgmtPluginContainer::~CLbtMgmtPluginContainer
-// Destructor
-//
-// ---------------------------------------------------------------------------
-//
-CLbtMgmtPluginContainer::~CLbtMgmtPluginContainer()
-    {
-    // Delete the List box model only after deleting the list box
-    delete iListBox;    
-    }
-    
-// ---------------------------------------------------------------------------
-// CLbtMgmtPluginContainer* CLbtMgmtPluginContainer::NewL
-// Static Two phase contructor that instantiates the CLbtMgmtPluginContainer
-//
-// @param aRect                         Client rectangle
-// @param aListBoxModel                 Model for the container's list box
-// @param aCmdHandler                   List box command handler 
-// @return CLbtMgmtPluginContainer*  Reference to the object created
-// --------------------------------------------------------------------------- 
-//   
-CLbtMgmtPluginContainer* CLbtMgmtPluginContainer::NewL( 
-                    const TRect&                    aRect,
-                          MDesCArray&               aListBoxModel,
-                          MLbtMgmtPluginCmdHdlr& aCmdHandler )
-    {   
-    CLbtMgmtPluginContainer* self = 
-                    NewLC( aRect, aListBoxModel, aCmdHandler );
-    CleanupStack::Pop( self );
-    return self;
-    }
-
-// ---------------------------------------------------------------------------
-// CLbtMgmtPluginContainer* CLbtMgmtPluginContainer::NewLC
-// Static Two phase contructor that instantiates the CLbtMgmtPluginContainer
-//
-// @param aRect                         Client rectangle
-// @param aListBoxModel                 Model for the container's list box
-// @param aCmdHandler                   List box command handler 
-// @return CLbtMgmtPluginContainer*  Reference to the object created
-// --------------------------------------------------------------------------- 
-//  
-CLbtMgmtPluginContainer* CLbtMgmtPluginContainer::NewLC(
-                    const TRect&                    aRect,
-                          MDesCArray&               aListBoxModel,
-                          MLbtMgmtPluginCmdHdlr& aCmdHandler  )
-    {   
-    CLbtMgmtPluginContainer* self = 
-            new(ELeave) CLbtMgmtPluginContainer( aListBoxModel, aCmdHandler );
-    CleanupStack::PushL( self );
-    self->ConstructL( aRect );
-    return self;
-    }
-
-// --------------------------------------------------------------------------- 
-// void CLbtMgmtPluginContainer::ConstructL
-// Second phase of the two phase Construction process
-//
-// @param aRect              Client rectangle
-// ---------------------------------------------------------------------------
-//
-void CLbtMgmtPluginContainer::ConstructL( const TRect&   aRect )
-    {
-    //Make this control a window-owning control
-    CreateWindowL(); 
-    
-    // Create a New Title for the View
-    MakeTitleL( R_LOCTR_TITLE_TEXT_LT );
-    
-    CreateListboxL();
-    
-    // Get the Help context
-    iContextName = KLOC_HLP_LBT_SETTINGS();
-        
-    SetRect( aRect );
-    ActivateL();
-    }
- 
-// ---------------------------------------------------------------------------
-// CLbtMgmtPluginContainer::GetFocussedItem
-// Returns the currentlt focussed element.
-//
- // @return TInt Index of the item selected
-// ---------------------------------------------------------------------------
-//
-TInt CLbtMgmtPluginContainer::GetFocussedItem()
-    {
-    return iListBox->CurrentItemIndex();
-    }
-        
-// ---------------------------------------------------------------------------
-// void CLbtMgmtPluginContainer::HandleResourceChange
-//
-// ---------------------------------------------------------------------------
-//  
-void CLbtMgmtPluginContainer::HandleResourceChange(TInt aType)
-    {
-    // Pass the event to the base class
-    CCoeControl::HandleResourceChange( aType );
-    switch( aType )
-        {
-        // Dynamic Layout switch
-        case KEikDynamicLayoutVariantSwitch:
-            {
-            // Handle the screen change event
-            // Trap and Ignore the error
-            TRAP_IGNORE(
-                iCmdHandler.HandleCmdL( MLbtMgmtPluginCmdHdlr::EScreenSizeChanged ));
-            break;
-            }
-        default:
-            {
-            break;
-            }
-        }
-    }
-
-// ---------------------------------------------------------------------------
-// TInt CLbtMgmtPluginContainer::CountComponentControls
-//
-// ---------------------------------------------------------------------------
-//
-TInt CLbtMgmtPluginContainer::CountComponentControls() const
-    {
-    return KNoofComponentControls;
-    }
-
-// ---------------------------------------------------------------------------
-// CCoeControl* CLbtMgmtPluginContainer::ComponentControl
-//
-// ---------------------------------------------------------------------------
-//
-CCoeControl* CLbtMgmtPluginContainer::ComponentControl(TInt /*aIndex*/) const
-    {
-    return iListBox;    
-    }
-
-// ---------------------------------------------------------------------------
-// void CLbtMgmtPluginContainer::OfferKeyEventL
-//
-// ---------------------------------------------------------------------------  
-//
-TKeyResponse CLbtMgmtPluginContainer::OfferKeyEventL( const TKeyEvent& aKeyEvent,
-                                                               TEventCode aType )
-    {
-    TKeyResponse keyresponse;
-    switch ( aKeyEvent.iCode )
-        {
-        case EKeyLeftArrow:
-        case EKeyRightArrow:
-            {
-            // Listbox takes all event even if it doesn't use them
-            return EKeyWasNotConsumed;  
-            }
-        case EKeyUpArrow:
-        case EKeyDownArrow:
-	        {
-	        keyresponse = iListBox->OfferKeyEventL( aKeyEvent, aType );
-        	iCmdHandler.HandleCmdL( MLbtMgmtPluginCmdHdlr::EListBoxItemFocused );    
-        	return keyresponse;        	
-	        }
-        default:
-            {
-            break;  
-            }
-        }
-    // now it's iListBox's job to process the key event
-    return iListBox->OfferKeyEventL( aKeyEvent, aType ); 
-    }
-        
-// ---------------------------------------------------------------------------
-// void CLbtMgmtPluginContainer::HandleListBoxEventL
-//
-// ---------------------------------------------------------------------------
-//
-void CLbtMgmtPluginContainer::HandleListBoxEventL( 
-                                        CEikListBox*                      /* aListBox */, 
-                                        MEikListBoxObserver::TListBoxEvent aEventType )
-    {
-    switch ( aEventType )
-        {
-        // List box Item Selection
-        case EEventEnterKeyPressed:
-        case EEventItemSingleClicked:
-            {
-            // Settings element has been selected. Command has to be issued to
-            // change the settings configuration
-            iCmdHandler.HandleCmdL( MLbtMgmtPluginCmdHdlr::EListBoxItemSelected );
-            break;
-            }  
-        default:
-           break;
-        }
-    }
-
-// -----------------------------------------------------------------------------
-// CLocNotPrefPluginContainer::GetHelpContext
-//
-// -----------------------------------------------------------------------------
-//
-void CLbtMgmtPluginContainer::GetHelpContext( TCoeHelpContext& aContext ) const
-    {
-    aContext.iContext = iContextName;
-    aContext.iMajor = TUid::Uid( KLbtMgmtPluginUID3 );
-    }
-    
-// ---------------------------------------------------------------------------
-// void CLbtMgmtPluginContainer::HandlePointerEventL
-//
-// ---------------------------------------------------------------------------
-//       
-   void CLbtMgmtPluginContainer::HandlePointerEventL(const TPointerEvent &aPointerEvent)
-     {
-    // Check if touch is enabled or not
-    if( !AknLayoutUtils::PenEnabled() || !iListBox )
-        {
-        return;
-        }
-    iListBox->HandlePointerEventL( aPointerEvent );      
-   }                  
-// ---------------------------------------------------------------------------
-// void CLbtMgmtPluginContainer::FocusChanged
-//
-// ---------------------------------------------------------------------------
-//
-void CLbtMgmtPluginContainer::FocusChanged( TDrawNow aDrawNow )
-    {
-    CCoeControl::FocusChanged( aDrawNow );
-    // The focus event has to be explicitly handed over to all the compound
-    // controls since CCoeControl does not do that implicitly
-    iListBox->SetFocus( IsFocused(), aDrawNow );
-    }
-        
-// ---------------------------------------------------------------------------
-// CLbtMgmtPluginContainer::SizeChanged
-// 
-// ---------------------------------------------------------------------------
-//
-void CLbtMgmtPluginContainer::SizeChanged()
-    {
-    iListBox->SetRect( Rect() ); 
-    }
-    
-// ---------------------------------------------------------------------------
-// void CLbtMgmtPluginContainer::CreateListboxL
-// Creates the List box and the Listbox model. Associates the list box model 
-// with the list box
-//
-// ---------------------------------------------------------------------------  
-//
-void CLbtMgmtPluginContainer::CreateListboxL()
-    {
-    
-    // Create the List box
-    iListBox = new ( ELeave ) CAknSettingStyleListBox;
-    iListBox->ConstructL( this, EAknListBoxSelectionList );
-    iListBox->SetContainerWindowL( *this ); 
-    iListBox->SetListBoxObserver( this );
-    iListBox->CreateScrollBarFrameL( ETrue );
-    iListBox->ScrollBarFrame()->SetScrollBarVisibilityL( CEikScrollBarFrame::EOff,
-                                                         CEikScrollBarFrame::EAuto ); 
-                                                         
-    // The ownership of the list box model is retained with the Container.
-    // This is because the model contains the additional functionality of
-    // changing the settings values in addition to retreiving it.                                                        
-    iListBox->Model()->SetItemTextArray( &iListBoxModel );  
-    iListBox->Model()->SetOwnershipType( ELbmDoesNotOwnItemArray );  
-    iListBox->ItemDrawer()->ColumnData()->EnableMarqueeL( ETrue );                    
-    iListBox->ActivateL();
-    }
-    
-// ---------------------------------------------------------------------------
-// void CLbtMgmtPluginContainer::MakeTitleL
-// Sets the Title text
-//
-// @param aResourceText Resource to create title
-// ---------------------------------------------------------------------------
-//
-void CLbtMgmtPluginContainer::MakeTitleL( TInt aResourceText )
-    {
-    // Obtain the title from the Status Pane
-    CAknTitlePane* title = static_cast<CAknTitlePane*>( StatusPane()->
-        ControlL( TUid::Uid( EEikStatusPaneUidTitle )));
-       
-    // Set the Title's buffer    
-    HBufC* buf = StringLoader::LoadL( aResourceText );
-    title->SetText( buf ); // Takes ownership of buf
-    }
-
-// ---------------------------------------------------------------------------
-// void CLbtMgmtPluginContainer::StatusPane
-// Returns the Appui's status pane
-//
-// @return CEikStatusPane* Statuspane pointer
-// ---------------------------------------------------------------------------
-//
-CEikStatusPane* CLbtMgmtPluginContainer::StatusPane()
-    {
-    return iEikonEnv->AppUiFactory()->StatusPane(); 
-    }
-
-// ---------------------------------------------------------------------------
-// void CLbtMgmtPluginContainer::Update
-// It will updates listbox model
-// ---------------------------------------------------------------------------
-//
-void CLbtMgmtPluginContainer::Update()
-    {
-    if(iListBox)
-        {
-        iListBox->DrawDeferred(); 
-        }
-	}
-
--- a/locationtriggering/lbtmgmtui/src/lbtmgmtpluginengine.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,454 +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:  Location Triggering Management Plugin Engine
-*
-*/
-
-
-// System Include
-#include <e32keys.h>        // Tab Keys
-#include <StringLoader.h>   // String Loader
-#include <lbtmgmtpluginview.rsg>
-#include <aknradiobuttonsettingpage.h>
-#include <aknslidersettingpage.h> 
-#include <aknmessagequerydialog.h> 
-
-
-// User Include
-#include "lbtmgmtpluginengine.h"
-#include "lbtmgmtengobserver.h"
-#include "lbtmgmtlbtadapter.h"
-#include "lbtmgmtdebug.h"
-
-// Constant Defintions
-const TInt KNumberofSettingsItems = 2;
-const TInt KMaxConversionBufferLength = 0x200;
-const TInt KNoofTriggerStatus = 2;
-
-// ========================= MEMBER FUNCTIONS ================================
-
-
-// ---------------------------------------------------------------------------
-// CLbtMgmtPluginEngine::CLbtMgmtPluginEngine
-// Overloaded Constructor
-//
-// ---------------------------------------------------------------------------
-//  
-CLbtMgmtPluginEngine::CLbtMgmtPluginEngine(  
-                                MLbtMgmtEngObserver& aEngineObserver )
-    :iObserver( aEngineObserver ),
-    iSettingsDialogOutstanding( EFalse )
-    {
-    }
-
-// ---------------------------------------------------------------------------
-// CLbtMgmtPluginEngine::~CLbtMgmtPluginEngine
-// Destructor
-//
-// ---------------------------------------------------------------------------
-//
-CLbtMgmtPluginEngine::~CLbtMgmtPluginEngine()
-    {
-    // Delete the list box strings
-    delete iTriggeringTitle;
-    
-    delete iActiveTitle;
-    
-    delete iNoActiveTitle;
-    
-    delete iInfoMessage;
-    
-    delete iOnSettings;
-    
-    delete iOffSettings;
-    
-    delete iConversionBuffer;
-        
-    // Delete the Lbt settings handle
-    delete iLbtAdapter;
-    }
-    
-// ---------------------------------------------------------------------------
-// CLbtMgmtPluginEngine* CLbtMgmtPluginEngine::NewL
-// Creates new Location Trigger Management plug-in engine instance.
-//
-// @param  aEngineObserver           Observer to the Trigger Management engine
-// @return CLbtMgmtPluginEngine* Reference to the application view
-// ---------------------------------------------------------------------------
-//    
-CLbtMgmtPluginEngine* CLbtMgmtPluginEngine::NewL( 
-                            MLbtMgmtEngObserver& aEngineObserver )
-    {   
-    CLbtMgmtPluginEngine* self = 
-                        CLbtMgmtPluginEngine::NewLC( aEngineObserver );
-    CleanupStack::Pop( self );
-    return self;
-    }
-
-// ---------------------------------------------------------------------------
-// CLbtMgmtPluginEngine* CLbtMgmtPluginEngine::NewLC
-// Creates new Location Trigger Management plug-in engine instance. Leaves
-// the object on the Cleanup stack
-//
-// @param  aEngineObserver           Observer to the Trigger Management engine
-// @return CLbtMgmtPluginEngine* Reference to the application view
-// ---------------------------------------------------------------------------
-// 
-CLbtMgmtPluginEngine* CLbtMgmtPluginEngine::NewLC( 
-                            MLbtMgmtEngObserver& aEngineObserver )
-    {   
-    CLbtMgmtPluginEngine* self = 
-                        new(ELeave) CLbtMgmtPluginEngine( aEngineObserver );
-    CleanupStack::PushL( self );
-    self->ConstructL();
-    return self;
-    }
-    
-// ---------------------------------------------------------------------------
-// void CLbtMgmtPluginEngine::ConstructL
-// Second Phase Constructor
-//
-// ---------------------------------------------------------------------------
-//
-void CLbtMgmtPluginEngine::ConstructL()
-    {
-    // Create Lbt Adapter handle
-    iLbtAdapter = CLbtMgmtLbtAdapter::NewL( *this );
-    
-    // Load the list box strings
-    // Allocate and set the System of measurement heading
-    iTriggeringTitle = StringLoader::LoadL( R_LOCTR_LIST_LBT_TRIGGERING );
-    
-    // Allocate and set the server ip address title field
-    iActiveTitle = StringLoader::LoadL( R_LOCTR_LIST_ACTIVE_TRIGGER );
-    
-    // Allocate and set the server ip address title field
-    iNoActiveTitle = StringLoader::LoadL( R_LOCTR_LIST_NO_ACTIVE_TRIGGER );
-     
-    //Allocate and set the Info message text
-    iInfoMessage = StringLoader::LoadL( R_LOCTR_INFO_POPUP_TEXT );
-      
-    // Allocate and set the Imperial settings text
-    iOnSettings = StringLoader::LoadL( R_LOCTR_LIST_VALUE_TRIGGER_ON );
-    
-    // Allocate and set the Metric settings text
-    iOffSettings = StringLoader::LoadL( R_LOCTR_LIST_VALUE_TRIGGER_OFF );
-    
-    // Allocate the Conversion Buffer
-    iConversionBuffer = HBufC16::NewL( KMaxConversionBufferLength );    
-   }
-    
-// ---------------------------------------------------------------------------
-// TInt CLbtMgmtPluginEngine::MdcaCount
-// Inherited from MDesCArray
-//
-// ---------------------------------------------------------------------------
-//
-TInt CLbtMgmtPluginEngine::MdcaCount() const
-    {
-    return KNumberofSettingsItems;
-    }
-
-// ---------------------------------------------------------------------------
-// TInt CLbtMgmtPluginEngine::MdcaPoint
-// Inherited from MDesCArray
-//
-// ---------------------------------------------------------------------------
-//
-TPtrC16 CLbtMgmtPluginEngine::MdcaPoint( TInt aIndex ) const
-    {
-    // Zero the internal buffer
-    TPtr16 ptr( iConversionBuffer->Des());
-    ptr.Zero();
-    
-    // Format "\t%S\t\t%S"
-    
-    // Append the first tab
-    ptr.Append( EKeyTab );
-            
-    switch( aIndex )
-        {
-        case ETriggeringStatus:
-            {
-            // Append the Title text
-            ptr.Append( iTriggeringTitle->Des() );
-            
-            // Append the second tab
-            ptr.Append( EKeyTab ); 
-                            
-            // Append the third tab
-            ptr.Append( EKeyTab );
-            
-            // Obtain the current value of system of measurement and append
-            // to the buffer
-           CLbtMgmtLbtAdapter::TTriggeringStatus state = CLbtMgmtLbtAdapter::EOn;
-           TRAPD( err, state = iLbtAdapter->GetCurrentTriggeringStatusL() );
-            if( !err && state == CLbtMgmtLbtAdapter::EOn )
-                {
-          		ptr.Append( iOnSettings->Des() );
-                }
-            else if ( state == CLbtMgmtLbtAdapter::EOff )
-                {
-                ptr.Append( iOffSettings->Des());
-                }  
-            break;    
-            }
-        case EActiveTriggers:
-            {
-            // Append the Title text
-            //XXX: Optimization::should be called  when there is a change in lbt database
-            TInt activeTriggers = iLbtAdapter->ActiveTriggers();
-        	
-           	if( activeTriggers == 0 )
-                ptr.Append( iNoActiveTitle->Des() );
-           	else
-           		{
-        		HBufC* activeTriggersString = NULL;
-        		if( activeTriggers == 1 )
-        		    {
-        		    TRAP_IGNORE( activeTriggersString = StringLoader::LoadL( R_LOCTR_ONE_ACTIVE_TRIGGER ) ); 
-        		    }
-        		else
-        		    {
-        		    TRAP_IGNORE( activeTriggersString = StringLoader::LoadL( R_LOCTR_LIST_ACTIVE_TRIGGER, activeTriggers ) ); 
-				    }
-				if( activeTriggersString )
-					{
-					ptr.Append( activeTriggersString->Des() );
-					delete activeTriggersString;
-					}
-            	}
-            	
-            // Append the second tab
-            ptr.Append( EKeyTab ); 
-            
-            // Append the third tab
-            ptr.Append( EKeyTab );            
-        
-            break;    
-            }            
-        default:
-            {
-            // Append the second tab
-            ptr.Append( EKeyTab );          
-            // Append the third tab
-            ptr.Append( EKeyTab );
-            break;    
-            }
-        }  
-    return iConversionBuffer->Des();
-    }
- 
-// ---------------------------------------------------------------------------
-// void CLbtMgmtPluginEngine::HandleSettingsChangeL
-// Inherited from MLocNotPrefAdapterObserver
-//
-// ---------------------------------------------------------------------------
-//   
-void CLbtMgmtPluginEngine::HandleSettingsChangeL()
-    {
-    iObserver.HandleSettingsChangeEventL();
-    }
- 
-// ---------------------------------------------------------------------------
-// void CLbtMgmtPluginEngine::Close
-// Closes the running Settings UI prematurely. This would result in dismissing
-// any active dialogs currently running
-//
-// ---------------------------------------------------------------------------
-//
-void CLbtMgmtPluginEngine::Close()
-    {
-    // If any of the dialogs are active then issue a cancel event on the 
-    // dialogs
-    if( iSettingsDialogOutstanding )
-        {
-        TKeyEvent   keyEvent;
-        keyEvent.iCode          = EKeyCBA2;
-        keyEvent.iScanCode      = EStdKeyDevice1;         
-        keyEvent.iModifiers     = EAllModifiers;
-        keyEvent.iRepeats       = 0;
-        CCoeEnv* cCoeEnv = CCoeEnv::Static();
-        
-        // Simulate a Cancel event on the running dialogs. The Simulated event
-        // is for the Left Soft Key.
-        // Ignore the error incase of a leave
-        
-        TRAP_IGNORE( cCoeEnv->SimulateKeyEventL( keyEvent, EEventKey ) );
-        }
-    iSettingsDialogOutstanding = EFalse;                
-    }
-            
-// ---------------------------------------------------------------------------
-// void CLbtMgmtPluginEngine::ChangeTiggerStatusL
-// Change Trigger settings
-// 
-// ---------------------------------------------------------------------------
-// 
-void CLbtMgmtPluginEngine::ChangeTiggerStatusL()
-    {
-    LBTMGMTUIDEBUG("+ CLbtMgmtPluginEngine::ChangeTiggerStatusL()");
-    if( iSettingsDialogOutstanding )
-        {
-        User::Leave( KErrInUse );
-        }
-    // Allocate the descriptor array for Text settings for System
-    // of measurement
-    CDesCArrayFlat* items = new( ELeave ) CDesCArrayFlat( KNoofTriggerStatus );
-    CleanupStack::PushL( items );
-
-    // Append the radio-button list items
-    items->AppendL( iOnSettings->Des());
-    items->AppendL( iOffSettings->Des());   
- 
-     
-    // Obtain the current value for current system of measurement
-    // This would be used for setting the default value for 
-    // the text settings page               
-    
-    TInt currentSettings = iLbtAdapter->GetCurrentTriggeringStatusL();
-    TInt prevSettings = currentSettings;
-        
-    CAknRadioButtonSettingPage* dlg = 
-                        new ( ELeave )CAknRadioButtonSettingPage( R_LOCTR_LIST_LBT_TRIGGERING_SETTING,
-                                                                  currentSettings, 
-                                                                  items );
-    // Settings Outstanding flag is marked True to enable dismissal incase
-    // of a Cancel event                                                                  
-    iSettingsDialogOutstanding = ETrue;                                                                  
-    if ( dlg->ExecuteLD( CAknSettingPage::EUpdateWhenChanged ))
-        {           
-	    if(prevSettings != currentSettings)
-    	    {
-            switch(currentSettings)
-                {
-                case CLbtMgmtLbtAdapter::EOff: //Off
-                    {
-                    //Confirmation is required if any active trigger exists                
-                    if( 0 != ActiveTriggers() )
-                        {
-                        HBufC* msg = StringLoader::LoadLC( R_LOCTR_NOTE_TURNOFF );
-                        CAknQueryDialog* confirmationQuery = CAknQueryDialog::NewL();     
-                        if(confirmationQuery->ExecuteLD(R_LOCTR_CONFIRMATION_QUERY, *msg))
-                            {
-                            iLbtAdapter->SetCurrentTriggeringStatusL( CLbtMgmtLbtAdapter::EOff  );     
-                            }   
-                        CleanupStack::PopAndDestroy(msg);
-                        }
-                    else
-                        {
-                        iLbtAdapter->SetCurrentTriggeringStatusL( CLbtMgmtLbtAdapter::EOff  );      
-                        }
-                    }
-                    break;
-                case CLbtMgmtLbtAdapter::EOn: //On
-                    {
-                    //No Warning note is required.               
-                    iLbtAdapter->SetCurrentTriggeringStatusL( CLbtMgmtLbtAdapter::EOn );
-                    }
-                    break;
-                default:
-                    break;                
-                } 
-    	    }      
-        } 
-     iSettingsDialogOutstanding = EFalse;       
-    // Free the items resource
-    CleanupStack::PopAndDestroy( items );
-
-    LBTMGMTUIDEBUG("- CLbtMgmtPluginEngine::ChangeTiggerStatusL()");
-    }
-
-// ---------------------------------------------------------------------------
-// void CLbtMgmtPluginEngine::ToggleTiggerStatusL
-// Toggle Trigger settings
-// 
-// ---------------------------------------------------------------------------
-//
-void CLbtMgmtPluginEngine::ToggleTiggerStatusL()
-    {
-    LBTMGMTUIDEBUG("+ CLbtMgmtPluginEngine::ToggleTiggerStatusL()");
-    if( iSettingsDialogOutstanding )
-        {
-        User::Leave( KErrInUse );
-        }    
-	CLbtMgmtLbtAdapter::TTriggeringStatus status = iLbtAdapter->GetCurrentTriggeringStatusL();
-	
-	if( CLbtMgmtLbtAdapter::EOn == status )
-		{
-        //Confirmation is required if any active trigger exists                
-        if( 0 != ActiveTriggers() )
-            {
-            HBufC* msg = StringLoader::LoadLC( R_LOCTR_NOTE_TURNOFF );
-            CAknQueryDialog* confirmationQuery = CAknQueryDialog::NewL();     
-            if(confirmationQuery->ExecuteLD(R_LOCTR_CONFIRMATION_QUERY, *msg))
-                {
-                iLbtAdapter->SetCurrentTriggeringStatusL( CLbtMgmtLbtAdapter::EOff  );     
-                }   
-            CleanupStack::PopAndDestroy(msg);
-            }
-        else
-            {
-            //No Warning note is required.   
-            iLbtAdapter->SetCurrentTriggeringStatusL( CLbtMgmtLbtAdapter::EOff  );      
-            } 
-		}
-	else
-		{
-        iLbtAdapter->SetCurrentTriggeringStatusL( CLbtMgmtLbtAdapter::EOn ); 
-		}
-    LBTMGMTUIDEBUG("- CLbtMgmtPluginEngine::ToggleTiggerStatusL()");
-    }
-
-
-// ---------------------------------------------------------------------------
-// void CLbtMgmtPluginEngine::ShowInfoDialog
-// Show Info dialog for active triggers
-// ---------------------------------------------------------------------------
-//
-void CLbtMgmtPluginEngine::ShowInfoDialogL()
-    {   
-    LBTMGMTUIDEBUG("+ CLbtMgmtPluginEngine::ShowInfoDialogL()");
-    CAknMessageQueryDialog*  info = CAknMessageQueryDialog::NewL(*iInfoMessage);
-    info->ExecuteLD(R_LOCTR_MESSAGE_QUERY_DIALOG);
-    LBTMGMTUIDEBUG("- CLbtMgmtPluginEngine::ShowInfoDialogL()");
-    }
-
-// ---------------------------------------------------------------------------
-// void CLbtMgmtPluginEngine::ClearAllTriggersL
-// It will clear all triggers
-// ---------------------------------------------------------------------------
-//
-void CLbtMgmtPluginEngine::ClearAllTriggersL()
-    {    
-    LBTMGMTUIDEBUG("+ CLbtMgmtPluginEngine::ClearAllTriggersL()");
-    HBufC* msg = StringLoader::LoadLC( R_LOCTR_NOTE_CLEARTRIGGERS );
-    CAknQueryDialog* confirmationQuery = CAknQueryDialog::NewL();     
-    if(confirmationQuery->ExecuteLD(R_LOCTR_CONFIRMATION_QUERY, *msg))
-        {
-		iLbtAdapter->DeleteActiveTriggersL();           
-        }   
-    CleanupStack::PopAndDestroy(msg);
-    LBTMGMTUIDEBUG("- CLbtMgmtPluginEngine::ClearAllTriggersL()");
-    }
-
-// ---------------------------------------------------------------------------
-// void CLbtMgmtPluginEngine::ShowInfoDialog
-// It will return total active triggers
-// ---------------------------------------------------------------------------
-//
-TInt CLbtMgmtPluginEngine::ActiveTriggers()
-    {
-    return iLbtAdapter->ActiveTriggers();
-    }
--- a/locationtriggering/lbtmgmtui/src/lbtmgmtpluginimptable.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,45 +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:  ECOM proxy table for this plugin
-*
-*/
-
-
-// System includes
-#include <e32std.h>
-#include <ecom/implementationproxy.h>
-
-// User includes
-#include "lbtmgmtplugin.h"
-#include "lbtmgmtpluginuid.hrh"
-
-// Constants
-const TImplementationProxy KLbtMgmtPluginImplementationTable[] = 
-    {
-    IMPLEMENTATION_PROXY_ENTRY( KLbtMgmtPluginUID3,  CLbtMgmtPlugin::NewL )
-    };
-
-
-// ---------------------------------------------------------------------------
-// ImplementationGroupProxy
-// Gate/factory function
-//
-// ---------------------------------------------------------------------------
-//
-EXPORT_C const TImplementationProxy* ImplementationGroupProxy( TInt& aTableCount )
-    {
-    aTableCount = sizeof( KLbtMgmtPluginImplementationTable ) 
-        / sizeof( TImplementationProxy );
-    return KLbtMgmtPluginImplementationTable;
-    }
--- a/locationtriggering/lbtmgmtui/src/lbtmgmtpluginview.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,501 +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:  Location Triggering Management Plugin view
-*
-*/
-
-
-// System Include
-#include <barsread.h>               // For TResourceReader
-#include <bautils.h>   
-#include <StringLoader.h>
-#include <aknViewAppUi.h>
-#include <lbtmgmtpluginview.rsg>
-#include <avkon.rsg>
-#include <aknnotewrappers.h>        // Error Notes
-#include <textresolver.h>           // Text Resolver
-#include <hlplch.h>                 // Help
-#include <featmgr.h>                // FeatureManager
-
-// User Include
-#include "locsettingsui.h"
-#include "locsettingsuiobserver.h"
-#include "lbtmgmtplugin.hrh"
-#include "lbtmgmtpluginview.h"
-#include "lbtmgmtplugincontainer.h"
-#include "lbtmgmtpluginengine.h"
-
-
-// ========================= MEMBER FUNCTIONS ================================
-
-
-// ---------------------------------------------------------------------------
-// CLbtMgmtPluginView::CLbtMgmtPluginView
-// Overloaded Constructor
-//
-// ---------------------------------------------------------------------------
-//  
-CLbtMgmtPluginView::CLbtMgmtPluginView( 
-                            MLocSettingsUiObserver& aSettingsObsrv )
-    :iSettingsObserver( aSettingsObsrv ),
-    iResourceLoader( *CCoeEnv::Static() )
-    {
-    }
-
-// ---------------------------------------------------------------------------
-// CLbtMgmtPluginView::~CLbtMgmtPluginView
-// Destructor
-//
-// ---------------------------------------------------------------------------
-//
-CLbtMgmtPluginView::~CLbtMgmtPluginView()
-    {    
-    // Close the resource loader
-    iResourceLoader.Close(); 
-    }
-    
-// ---------------------------------------------------------------------------
-// CLbtMgmtPluginView* CLbtMgmtPluginView::NewL
-// Creates new Location Trigger Management view.
-//
-// @param aSettingsObsrv            Pointer to the Command Handler
-// @return CLbtMgmtPluginView*   Reference to the application view
-// ---------------------------------------------------------------------------
-//   
-CLbtMgmtPluginView* CLbtMgmtPluginView::NewL( 
-                            MLocSettingsUiObserver& aSettingsObsrv )
-    {   
-    CLbtMgmtPluginView* self = 
-                        CLbtMgmtPluginView::NewLC( aSettingsObsrv );
-    CleanupStack::Pop( self );
-    return self;
-    }
-
-// ---------------------------------------------------------------------------
-// CLbtMgmtPluginView* CLbtMgmtPluginView::NewLC
-// Creates new Location Trigger Management view.
-//
-// @param aSettingsObsrv            Pointer to the Command Handler
-// @return CLbtMgmtPluginView*   Reference to the application view
-// ---------------------------------------------------------------------------
-//  
-CLbtMgmtPluginView* CLbtMgmtPluginView::NewLC( 
-                            MLocSettingsUiObserver& aSettingsObsrv )
-    {   
-    CLbtMgmtPluginView* self = 
-                        new(ELeave) CLbtMgmtPluginView( aSettingsObsrv );
-    CleanupStack::PushL( self );
-    self->ConstructL();
-    return self;
-    }
-    
-// ---------------------------------------------------------------------------
-// void CLbtMgmtPluginView::ConstructL
-// Second Phase Constructor
-//
-// ---------------------------------------------------------------------------
-//
-void CLbtMgmtPluginView::ConstructL()
-    {
-        
-    // Open the Resource File
-    OpenLocalizedResourceFileL( KLbtMgmtViewResFileName, iResourceLoader );
-    
-    // Call AknView's BaseConstrutL
-    BaseConstructL( R_LBTMGMTPLUGIN_VIEW );
- 
-    }
-
-// ---------------------------------------------------------------------------
-// void CLbtMgmtPluginView::CloseSettings
-// Close the Location Triggering Management Settings
-//
-// ---------------------------------------------------------------------------
-//
-void CLbtMgmtPluginView::CloseSettings()
-    {
-    // Stop displaying the menu bar, if its currently being displayed
-    StopDisplayingMenuBar();
-    
-    // Close all the active dialogs
-    if( iEngine )
-    		iEngine->Close();
-    }
-        
-// ---------------------------------------------------------------------------
-// void CLbtMgmtPluginView::DoActivateL
-// 
-// ---------------------------------------------------------------------------
-//
-void CLbtMgmtPluginView::DoActivateL( const TVwsViewId&  /* PrevViewId*/,
-                                               TUid         /* aCustomMessageId*/,
-                                         const TDesC8&      /* aCustomMessage */)
-    {
-    // Destroy the existing container if it exists
-    if( iContainer )
-        {
-        AppUi()->RemoveFromViewStack( *this, iContainer );
-        delete iContainer;
-        iContainer=NULL;
-        }                       
-    
-    // Create the Location Triggering engine instance
-    iEngine = CLbtMgmtPluginEngine::NewL( *this );
-    
-    // Create new Container 
-    iContainer = CLbtMgmtPluginContainer::NewL( ClientRect(),
-                                                   *iEngine,
-                                                   *this );
-    iContainer->SetMopParent( this );
-    AppUi()->AddToViewStackL( *this, iContainer );
-    
-    SetCba( R_LBTMGMTPLUGIN_CBA_CHANGE );
-    }
-
-// ---------------------------------------------------------------------------
-// void CLocationSystemUiView::DoDeactivate
-//
-// ---------------------------------------------------------------------------
-//      
-void CLbtMgmtPluginView::DoDeactivate()
-    {
-    // Destroy Container
-    AppUi()->RemoveFromViewStack( *this, iContainer );
-    delete iContainer;
-    iContainer = NULL;
-    
-    // Delete the engine
-		delete iEngine;
-		iEngine = NULL;
-    
-    }
-
-// ---------------------------------------------------------------------------
-// TUid CLbtMgmtPluginView::Id
-// Returns the View Id. Should be chosen to reflect the Implementation UID 
-// of the Plugin
-//
-// @return TUid The View Id
-// ---------------------------------------------------------------------------
-//  
-TUid CLbtMgmtPluginView::Id() const
-    {
-    return TUid::Uid( KLbtMgmtPluginUID3 );
-    }
-
-// ---------------------------------------------------------------------------
-// void CLbtMgmtPluginView::HandleCommandL
-//
-// ---------------------------------------------------------------------------
-//  
-void CLbtMgmtPluginView::HandleCommandL(TInt aCommand)   
-    {
-    switch( aCommand )
-        {
-        case ELbtMgmtChange:
-        case ELbtMgmtMSKChange:
-    		{
-    		SettingsChangeL(aCommand);   		
-          	break;
-          	}
-        case ELbtMgmtInfo:
-        case ELbtMgmtMSKInfo:
-        	{
-			iEngine->ShowInfoDialogL();
-        	break;
-        	}
-        case ELbtMgmtClearAll:
-    		{
-    		iEngine->ClearAllTriggersL();
-    		iContainer->Update();
-    		HandleCmdL(EListBoxItemFocused);
-    		break;
-          	}
-        case EAknCmdHelp:        
-            {
-            HlpLauncher::LaunchHelpApplicationL( iCoeEnv->WsSession(),
-                                                 AppUi()->AppHelpContextL());
-            break;  
-          	}           
-        // Handle any plug-in specific internal commands here
-        case EAknSoftkeyBack:
-            {
-            // The UI is intended to be closed. Pass the event 
-            // to the observer
-            iSettingsObserver.SettingClosed( KErrNone );
-            break;
-            }
-        default:
-            {
-            // Un-handled commands are to be passed to the 
-            // App UI
-            AppUi()->HandleCommandL( aCommand );
-            break;  
-            }
-        }
-    }
-    
-// -----------------------------------------------------------------------------
-// CLbtMgmtPluginView::DynInitMenuPaneL
-// -----------------------------------------------------------------------------
-//
-void CLbtMgmtPluginView::DynInitMenuPaneL( TInt          aResourceId, 
-                                              CEikMenuPane* aMenuPane )
-    {
-    if ( aResourceId == R_LBTMGMTPLUGIN_MENU )
-        {
-        User::LeaveIfNull( aMenuPane );
-        //Handle Help Feature
-
-        //Context sensitive menu items
-        if( CLbtMgmtPluginEngine::EActiveTriggers == iContainer->GetFocussedItem() )
-        	{
-        	aMenuPane->SetItemDimmed( ELbtMgmtChange, ETrue );
-        	if( iEngine->ActiveTriggers() )
-        	    {
-        	    aMenuPane->SetItemDimmed( ELbtMgmtClearAll, EFalse );  			            
-        	    aMenuPane->SetItemDimmed( ELbtMgmtInfo, EFalse );
-        	    }
-        	else
-        	    {
-        	    aMenuPane->SetItemDimmed( ELbtMgmtClearAll, ETrue );                          
-        	     aMenuPane->SetItemDimmed( ELbtMgmtInfo, ETrue );
-        	    }
-        	}
-        else
-        	{
-			aMenuPane->SetItemDimmed( ELbtMgmtChange, EFalse );  
-			 aMenuPane->SetItemDimmed( ELbtMgmtClearAll, ETrue ); 
-			aMenuPane->SetItemDimmed( ELbtMgmtInfo, ETrue );
-        	}
-        }
-    }   
-
-// -----------------------------------------------------------------------------
-// CLbtMgmtPluginView::SetCba
-// -----------------------------------------------------------------------------
-//
-void CLbtMgmtPluginView::SetCba( TInt aResourceId ) 
-		{
-		if( Cba() )
-		    {
-		   	TRAP_IGNORE(Cba()->SetCommandSetL(aResourceId));
-		    }
-	  Cba()->DrawDeferred(); 
-		}
-
-// ---------------------------------------------------------------------------
-// void CLbtMgmtPluginView::HandleCommandL
-// Inherited from MLbtMgmtPluginCmdHdlr
-// Handles Selection events from the container
-// 
-// @param  aCommand Command ID
-// ---------------------------------------------------------------------------
-//
-void CLbtMgmtPluginView::HandleCmdL( TLbtMgmtPluginCmd aCommand )
-    {
-    switch( aCommand )
-        {
-        // Handle any plug-in specific internal commands here
-        case EListBoxItemSelected:
-	          	{
-	          	// Handle List Box Selected Event   
-	            TRAPD( error, SettingsChangeL( ELbtMgmtMSKChange ));
-	            if( error )
-	                {
-	                // Show Error Note
-	    			CTextResolver* iTextResolver = CTextResolver::NewLC(*iCoeEnv);
-	                TPtrC buffer = iTextResolver->ResolveErrorString( error );
-	                CAknErrorNote* errorNote = new ( ELeave )CAknErrorNote( ETrue );
-	                TRAP_IGNORE( errorNote->ExecuteLD( buffer ));
-	    			CleanupStack::PopAndDestroy( iTextResolver );
-	                }    
-				break;    
-	          	}
-        case EListBoxItemFocused:
-        		{
-	        	if( CLbtMgmtPluginEngine::EActiveTriggers == iContainer->GetFocussedItem()   )
-	        	    {
-	        	    if( iEngine->ActiveTriggers() )
-	        			SetCba( R_LBTMGMTPLUGIN_CBA_INFO );
-	        	    else
-	        	        SetCba( R_LBTMGMTPLUGIN_CBA_NOACTIVETRIGGERS );
-	        	    }
-	        	else
-	        			SetCba( R_LBTMGMTPLUGIN_CBA_CHANGE );
-	        	break;
-	        	}
-        case EScreenSizeChanged:
-	          {
-            if( iContainer )
-                {
-                iContainer->SetRect( ClientRect());     
-                }
-	          break;
-	          }
-        default:
-            {
-            break;  
-            }
-        }
-    }
-
-// ---------------------------------------------------------------------------
-// Inherited from MLbtMgmtEngObserver
-// ---------------------------------------------------------------------------
-//
-void CLbtMgmtPluginView::HandleSettingsChangeEventL()
-    {
-    // Observer callback notifies that one/more of the settings values have
-    // changed. Hence, need to refresh the container to show the latest
-    // values
-    if( iContainer )
-        {
-        iContainer->DrawDeferred();
-        }
-    
-    // Handle any changes to the MSK configuration. 
-    HandleCmdL( EListBoxItemFocused );
-    }
-    
-// -----------------------------------------------------------------------------
-// CLbtMgmtPluginView::HandleHelpFeature
-// -----------------------------------------------------------------------------
-//
-void CLbtMgmtPluginView::HandleHelpFeature( CEikMenuPane& aMenuPane ) const
-    {
-    if ( FeatureManager::FeatureSupported( KFeatureIdHelp ))
-        {
-        aMenuPane.SetItemDimmed( EAknCmdHelp, EFalse );
-        }
-    else
-        {
-        aMenuPane.SetItemDimmed( EAknCmdHelp, ETrue );
-        }
-    }
-    
-
-// ---------------------------------------------------------------------------
-// Handle Settings Change Event
-// 
-// @param aCmd Settings change command
-// ---------------------------------------------------------------------------
-//
-void CLbtMgmtPluginView::SettingsChangeL( TInt aCmd )
-    {
-    if( !iContainer )
-        {
-        // No container available. Nothing to do in this case. Hence, returning
-        return;
-        }
-    CLbtMgmtPluginEngine::TSettingsList currentElement;
-    currentElement = static_cast<CLbtMgmtPluginEngine::TSettingsList>
-                        ( iContainer->GetFocussedItem() );
-    
-    // Switch based on the currently focussed element
-    switch( currentElement )
-        {
-        case CLbtMgmtPluginEngine::ETriggeringStatus:
-            {
-            // Different handling needed for Touch handling and Item selection
-            // using the OK key.
-            // Incase the User has selected the item using the OK key then 
-            // normal handling required
-            // Incase the User has selected the item using touch selection
-            // then the Trigger Status needs to be toggled
-            if( ELbtMgmtChange == aCmd )
-                {
-                iEngine->ChangeTiggerStatusL();
-                }
-            else
-                {
-                iEngine->ToggleTiggerStatusL();
-                }
-            iContainer->Update();
-            break;
-            }
-        case CLbtMgmtPluginEngine::EActiveTriggers:
-            {
-			// If condition is added for any pointer event from container
-            if( iEngine->ActiveTriggers() )
-            		iEngine->ShowInfoDialogL();
-            break;
-            }
-        default:
-            {
-            // Element not found
-            User::Leave( KErrNotFound );
-            }
-        }
-    }
-                    
-// ---------------------------------------------------------------------------
-// void CLbtMgmtPluginView::OpenLocalizedResourceFileL
-// Opens the nearest localized resourcefile using aResourceLoader. 
-// aResourceLoader should be opened only once before closing it. 
-// Otherwise it will raise a panic. Therefore it is better to have 
-// multiple resource loaders.
-// 
-// @param aResourceFileName Drive and name of resource file in format 
-//                          <path>:<rsc_file_name>
-// @param aResourceLoader Resource loader for the resource. The loader 
-//                        must not be opened allready or it will raise 
-//                        a panic. It is caller's responsibility to 
-//                        close the resource loader after using the 
-//                        resource.
-// ---------------------------------------------------------------------------
-//  
-void CLbtMgmtPluginView::OpenLocalizedResourceFileL( 
-                            const TDesC&               aResourceFileName, 
-                                  RConeResourceLoader& aResourceLoader )
-    {
-    RFs fsSession;
-    User::LeaveIfError( fsSession.Connect());
-    
-    TFileName* tmpName = new(ELeave) TFileName;
-    CleanupStack::PushL( tmpName );
-    
-    // Append the Resource Files Directory
-    tmpName->Append( KDC_RESOURCE_FILES_DIR );
-    
-    // Append the Ressource File Name
-    tmpName->Append( aResourceFileName );
-    
-    // Obtain the drive where the DLL is installed
-    TFileName* dllDrive = new (ELeave) TFileName;
-    CleanupStack::PushL( dllDrive );
-    Dll::FileName( *dllDrive );
-    
-    // Obtain the Complete path for the Resource File
-    TParse parse;
-    User::LeaveIfError( parse.Set( *dllDrive, NULL, NULL ) );
-    User::LeaveIfError( parse.Set( parse.Drive(), tmpName, NULL ) );
-    TFileName* fileName = new(ELeave) TFileName;
-    CleanupStack::PushL( fileName );
-    fileName->Append( parse.FullName() );
-    
-    // Get language of resource file
-    BaflUtils::NearestLanguageFile( fsSession, *fileName );
-    
-    // Open resource file    
-    aResourceLoader.OpenL( *fileName );
-    
-    // Pop all the fields
-    CleanupStack::PopAndDestroy( fileName );
-    CleanupStack::PopAndDestroy( dllDrive );
-    CleanupStack::PopAndDestroy( tmpName );
-    
-    //If leave occurs before this, close is called automatically when the thread exits.
-    fsSession.Close();
-    }
--- a/locsrv_plat/group/bld.inf	Mon May 03 12:54:42 2010 +0300
+++ b/locsrv_plat/group/bld.inf	Fri May 14 16:17:02 2010 +0300
@@ -18,26 +18,14 @@
 
 
 
-#include "../map_and_navigation_api/group/bld.inf"
-#include "../map_and_navigation_provider_discovery_api/group/bld.inf"
 #include "../geocoding_api/group/bld.inf"
-#include "../map_image_api/group/bld.inf"
-#include "../map_and_navigation_aiw_api/group/bld.inf"
-#include "../map_and_navigation_provider_api/group/bld.inf"
 //#include "../supl_pos_message_plugin_api/group/bld.inf"
 #include "../landmarks_category_definition_api/group/bld.inf"
 #include "../supl_settings_api/group/bld.inf"
-#include "../location_settings_launch_api/group/bld.inf"
-#include "../map_image_conversion_plugin_api/group/bld.inf"
-#include "../psy_configuration_ui_plugin_api/group/bld.inf"
 #include "../np_proxy_configuration_api/group/bld.inf"
 #include "../supl_terminal_initiation_api/group/bld.inf"
-#include "../location_notation_preferences_settings_api/group/bld.inf"
-#include "../supl_settings_notifier_secondary_display_api/group/bld.inf"
 #include "../supl_network_initiation_api/group/bld.inf"
-#include "../privacy_notifiers_secondary_display_api/group/bld.inf"
 #include "../oma_supl_configuration_parameter_api/group/bld.inf"
-#include "../supl_query_secondary_display_api/group/bld.inf"
 #include "../location_triggering_management_api/group/bld.inf"
 #include "../location_triggering_status_information_api/group/bld.inf"
 #include "../oma_supl_asn_codec_plugin_api/group/bld.inf"
--- a/locsrv_plat/location_notation_preferences_settings_api/group/bld.inf	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +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 
-:                Location Notation Preferences Settings API
-*
-*/
-
-
-#include <platform_paths.hrh>
-
-PRJ_PLATFORMS
-DEFAULT
-
-PRJ_EXPORTS
-
-../inc/locnotprefplugindomaincrkeys.h     MW_LAYER_PLATFORM_EXPORT_PATH(locnotprefplugindomaincrkeys.h)
--- a/locsrv_plat/location_notation_preferences_settings_api/inc/locnotprefplugindomaincrkeys.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,56 +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:  Central Repository keys for Location Notation Preferences
-*                plug-in. Defines the various Systems of measurements that 
-*                can be used by Location application.
-*                
-*
-*/
-
-
-#ifndef LOCNOTPREFPLUGINDOMAINCRKEYS_H
-#define LOCNOTPREFPLUGINDOMAINCRKEYS_H
-
-/**
- * UID value for the Central Repository Key used for Location Notation 
- * preferences
- */
-const TInt KCRUidLocNotationPref = 0x10206910;
-
-/**
- * Central repository Key identifer value for Location Notation Preferences / System of Measurements
- */
-const TInt KLocSystemofMeasurements = 0x00000001;
-
-/**
- * Enumeration list of values for KLocSystemofMeasurements
- * 
- * Defines the System of measurements available for Location related values.
- */
-enum TLocSystemofMeasurementValues
-    {
-    /**
-     * Metric System of measurement ( mt, kgs, etc. ) would be used for
-     * Location related values.
-     */
-    ELocMetric      = 0x00000001,
-            
-    /**
-     * Imperial System of measurement ( ft, lbs, etc. ) would be used for 
-     * Location related values.
-     */  
-    ELocImperial    = 0x00000002
-    };
-
-#endif      // LOCNOTPREFPLUGINDOMAINCRKEYS_H
\ No newline at end of file
--- a/locsrv_plat/location_notation_preferences_settings_api/location_notation_preferences_settings_api.metaxml	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-<?xml version="1.0" ?>
-<api id="510fa54044e873aa6f076650bea4405d" dataversion="2.0">
-  <name>Location Notation Preferences Settings API</name>
-  <description>Provides Central Repository Keys for setting notation preferences, like Unit-of-measurement format etc.</description>
-  <type>c++</type>
-  <collection>locationsystemui</collection>
-  <libs>
-  </libs>
-  <release category="platform"/>
-  <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>no</htmldocprovided>
-     <adaptation>no</adaptation>
-  </attributes>
-</api>
--- a/locsrv_plat/location_settings_launch_api/group/bld.inf	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +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 
-:                Location Settings Launch API
-*
-*/
-
-
-#include <platform_paths.hrh>
-
-PRJ_PLATFORMS
-DEFAULT
-
-PRJ_EXPORTS
-
-../inc/locsettingsuiclient.h     MW_LAYER_PLATFORM_EXPORT_PATH(locsettingsuiclient.h)
--- a/locsrv_plat/location_settings_launch_api/inc/locsettingsuiclient.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,316 +0,0 @@
-/*
-* Copyright (c) 2005-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:  Client Side handle for using the Location System UI services
-*
-*/
-
-
-#ifndef C_LOCSETTINGSUICLIENT_H
-#define C_LOCSETTINGSUICLIENT_H
-
-// System Includes
-#include <e32base.h>
-
-// Forward Declarations
-class RLocSettingsUiService;
-class CLocLaunchUiAO;
-class CEikonEnv;
-
-// Global Constants
-
-// UIDs for Launching the Location Based Settings UIs through the Launch
-// API. The UIDs of all the Settings UI plug-ins that plug into this framework
-// need to be consolidated here.
-
-/**
- * UID for launching Position Method Settings 
- */
-const TInt  KLocPsySettingsUID  = 0x10275062;
-
-/**
- * UID for launching SUPL Settings UI
- */
-const TInt  KLocSUPLSettingsUID = 0x10275091;
-
-/**
- * UID for launching Location Notation Prefences Settings UI
- */
-const TInt  KLocNotPrefSettingsUID = 0x1020690F;
-
-// Parameters for Individual Location Based Settings UIs. All parameter 
-// enumerations of all Settings UI plug-ins that plug into this framwork
-// need to be consolidated here
-
-/**
- * Default Value for all paramter enumerations. This should be the first 
- * enumeration value for all the parameter enumerations that we define
- */
-const TInt  KDefaultParamValue  = 0x00000000;
-
-/**
- * SUPL Settings UI parameter enumerations
- */
-enum TLocSUPLSettingsParams
-    {
-    ELocSUPLDefault         = KDefaultParamValue,   // Default Settings View
-    ELocSUPLIAPSelection    = 0x00000001,           // IAP Selection dialog
-    ELocSUPLStateSelection  = 0x00000002,           // State enable dialog 
-    ELocSuplSettingsPage    = 0x00000010            // SUPL settings page
-    };
-    
- 
-/**
- *  Client side resource class to launch Location settings UI.
- *
- *  Client side interface class used by all clients to
- *  launch Location settings UIs. For UI applications the settings UIs 
- *  can be launched as embedded application. Frameworks can launch the
- *  settings UIs in a separate UI server.
- *
- *  The client application / framework can also cancel the launched
- *  settings UI by calling the Cancel method.
- *
- *  @lib locsettingsuiclient.lib
- *  @since S60 v3.1
- */
-class CLocSettingsUiClient : public CBase
-    {
-
-public:
-    /**
-     * Two Phase constructor 
-     * 
-     * @since S60 v3.1
-     * @return The reference of the newly allocated CLocSettingsUiClient 
-     *         object
-     */
-    IMPORT_C static CLocSettingsUiClient* NewL();
-
-    /**
-     * Two Phase constructor. Leaves the allocated object on the Clean-up
-     * stack 
-     * 
-     * @since S60 v3.1
-     * @return The reference of the newly allocated CLocSettingsUiClient 
-     *         object
-     */
-    IMPORT_C static CLocSettingsUiClient* NewLC();
-
-    /**
-     * C++ Destructor
-     * 
-     * @since S60 v3.1
-     */
-    virtual ~CLocSettingsUiClient();
-
-public: // Exported functions related to the handling of Location sub-setting UI.
-    /**
-     * Launch a Settings UI in an ui app server. 
-     * The API is used to launch a settings UI. It is expected to be used 
-     * by Framework executables that do not have a UI environment.
-     * There can be only one outstanding Launch request at any instant of 
-     * time. This is an asynchronous function. If a session is already 
-     * running then the function leaves with KErrInUse.
-     *
-     * @since S60 v3.1
-     * @param aImplementationUid The ECOM Implementation UID of the 
-     *                           settings UI ECOM plug-in that has to be 
-     *                           launched.
-     * @param aParams            Opaque parameters that is handed over to
-     *                           the Settings UI. Flags that define 
-     *                           specific configuration of the Settings UI,
-     *                           that the user of the API wants to launch. 
-     *                           The interpretation of these flag values is a
-     *                           part of the understanding between the API 
-     *                           user and the Settings UI
-     * @param aStatus            Request status. On completion contains: 
-     *                           KErrNone, if successful, otherwise one of
-     *                           the other system-wide error codes.
-     *
-     */
-    IMPORT_C void LaunchSettingsUiL( TUid            aImplementationUid, 
-                                     TInt            aParams,
-                                     TRequestStatus& aStatus );
-    
-    /**
-     * Launch a Settings UI as an embedded application.
-     * The API is used to launch a settings UI as an embeded. This is
-     * expected to be used by UI applications. There can be only 
-     * one outstanding Launch request at any instant of time. This is
-     * an asynchronous function.
-     *
-     * @since S60 v3.1
-     * @param aImplementationUid The ECOM Implementation UID of the 
-     *                           settings UI ECOM plug-in that has to be 
-     *                           launched.
-     * @param aParams            Opaque parameters that is handed over to
-     *                           the Settings UI. Flags that define 
-     *                           specific configuration of the Settings UI,
-     *                           that the user of the API wants to launch.
-     *                           The interpretation of these flag values is a
-     *                           part of the understanding between the API 
-     *                           user and the Settings UI
-     * @param aStatus            Request status. On completion contains: 
-     *                           KErrNone, if successful, otherwise one of
-     *                           the other system-wide error codes.
-     *
-     */
-    IMPORT_C void LaunchSettingsUiAsEmbeddedAppL( 
-                                    TUid            aImplementationUid, 
-                                    TInt            aParams,
-                                    TRequestStatus& aStatus );    
-    /**
-     * Launch a Settings UI in an ui app server. 
-     * The API is used to launch a settings UI. It is expected to be used 
-     * by Framework executables that do not have a UI environment.
-     * There can be only one outstanding Launch request at any instant of 
-     * time. This is an asynchronous function. If a session is already 
-     * running then the function leaves with KErrInUse.
-     *
-     * @since S60 v9.2
-     * @param aImplementationUid The ECOM Implementation UID of the 
-     *                           settings UI ECOM plug-in that has to be 
-     *                           launched.
-     * @param aParamsString      Opaque parameters that is handed over to
-     *                           the Settings UI. This allows the API user  
-     *                           to pass buffer to the Settings UI.
-     *                           The interpretation of this buffer is the
-     *                           part of the understanding between the API 
-     *                           user and the Settings UI
-     * @param aStatus            Request status. On completion contains: 
-     *                           KErrNone, if successful, otherwise one of
-     *                           the other system-wide error codes.
-     *
-     */
-    IMPORT_C void LaunchSettingsUiL( TUid            aImplementationUid, 
-                                     const TDesC&            aParamsString,
-                                     TRequestStatus& aStatus );
-    
-    /**
-     * Launch a Settings UI as an embedded application.
-     * The API is used to launch a settings UI as an embeded. This is
-     * expected to be used by UI applications. There can be only 
-     * one outstanding Launch request at any instant of time. This is
-     * an asynchronous function.
-     *
-     * @since S60 v9.2
-     * @param aImplementationUid The ECOM Implementation UID of the 
-     *                           settings UI ECOM plug-in that has to be 
-     *                           launched.
-     * @param aParamsString      Opaque parameters that is handed over to
-     *                           the Settings UI. This allows the API user  
-     *                           to pass buffer to the Settings UI.
-     *                           The interpretation of this buffer is the
-     *                           part of the understanding between the API 
-     *                           user and the Settings UI
-     * @param aStatus            Request status. On completion contains: 
-     *                           KErrNone, if successful, otherwise one of
-     *                           the other system-wide error codes.
-     *
-     */
-    IMPORT_C void LaunchSettingsUiAsEmbeddedAppL( 
-                                    TUid            aImplementationUid, 
-                                    const TDesC&            aParamsString,
-                                    TRequestStatus& aStatus );    
-    
-    /**
-     * Cancels an already launched settings UI.
-     *
-     * @since S60 v3.1
-     * @return a Symbian OS Error Code in case a settings UI was not launched.
-     * Returns KErrNone if successful. 
-     */
-    IMPORT_C TInt CancelLaunchedSettingsUi();
-
-public: // Exported functions pertaining to the handling of Postioning Settings
-
-    /**
-     * Launch Positioning Settings UI.
-     * The API is used to launch Positioning Settings UI. It is expected to 
-     * be used by Framework executables that do not have a UI environment.
-     * There can be only one outstanding Launch request at any instant of 
-     * time. This is an asynchronous function. If a session is already 
-     * running then the function leaves with KErrInUse.
-     *
-     * @since S60 v3.2
-     * @param aStatus            Request status. On completion contains: 
-     *                           KErrNone, if successful, otherwise one of
-     *                           the other system-wide error codes.     
-     *
-     */
-    IMPORT_C void LaunchPosSettingsL( TRequestStatus& aStatus );
-    
-    /**
-     * Launch Positioning Settings UI as an embedded application.
-     * The API is used to launch Positioning Settings UI. his is
-     * expected to be used by UI applications. There can be only 
-     * one outstanding Launch request at any instant of time. This is
-     * an asynchronous function. If a session is already 
-     * running then the function leaves with KErrInUse.
-     *
-     * @since S60 v3.2
-     * @param aStatus            Request status. On completion contains: 
-     *                           KErrNone, if successful, otherwise one of
-     *                           the other system-wide error codes.     
-     *
-     */    
-    IMPORT_C void LaunchPosSettingsAsEmbeddedAppL(  TRequestStatus& aStatus );
- 
-    /**
-     * Closes an already launched Positioning Settings UI.
-     *
-     * @since S60 v3.2
-     * @return Symbian OS Error Code in case Positioning settings UI
-     *         was not launched.
-     * Returns KErrNone if successful. 
-     */   
-    IMPORT_C TInt ClosePosSettings();
-    
-private:
-    /**
-     * C++ Default Constructor
-     */
-    CLocSettingsUiClient();
-
-    /**
-     * Second phase of Two phase construction
-     */
-    void ConstructL();
-
-private:
-
-    /**
-     * Handle to the Client side resource to the Settings UI Server
-     * Owns
-     */
-    RLocSettingsUiService*          iLocService;
-     
-    /**
-     * Active Object to initiate asynchronous requests
-     * Owns
-     */
-    CLocLaunchUiAO*                 iLaunchUiAO;
-     
-    /**
-     * Reference to the UI environment from where this client is launched.
-     * It will be NULL if the Client Application is launched from frameworks
-     */
-    CEikonEnv*                        iCEikonEnv; 
-     
-    /** Unused variable for future expansion. */
-    TAny* iReserved;
-
-    };
-
-#endif // C_LOCSETTINGSUICLIENT_H
--- a/locsrv_plat/location_settings_launch_api/location_settings_launch_api.metaxml	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
-<?xml version="1.0" ?>
-<api id="3e0e4e01430744753c90e5086b2f8db4" dataversion="2.0">
-  <name>Location Settings Launch API</name>
-  <description>Provides the interface for directly launching the Location Settings main view or any of it's sub settings view.</description>
-  <type>c++</type>
-  <collection>locationsystemui</collection>
-  <libs>
-    <lib name="locsettingsuiclient.lib" />
-  </libs>
-  <release category="platform"/>
-  <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>no</htmldocprovided>
-     <adaptation>no</adaptation>
-  </attributes>
-</api>
--- a/locsrv_plat/location_settings_launch_api/tsrc/bmarm/testlocsettingsuiclientu.def	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-EXPORTS
-	LibEntryL__FR13CTestModuleIf @ 1 NONAME R3UNUSED ; LibEntryL(CTestModuleIf &)
-
--- a/locsrv_plat/location_settings_launch_api/tsrc/bwins/testlocsettingsuiclientu.def	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-EXPORTS
-	?LibEntryL@@YAPAVCScriptBase@@AAVCTestModuleIf@@@Z @ 1 NONAME ; class CScriptBase * __cdecl LibEntryL(class CTestModuleIf &)
-
--- a/locsrv_plat/location_settings_launch_api/tsrc/conf/testlocsettingsuiclient.cfg	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,133 +0,0 @@
-[Define]
-ELaunchPosSettingsL							 	0
-ELaunchPosSettingsAsEmbeddedAppL	1
-ELaunchSettingsUiL								2
-ELaunchSettingsUiAsEmbeddedAppL		3
-ELaunchSettingsUiLOverLoaded		4
-ELaunchSettingsUiAsEmbeddedAppLOverLoaded		5
-
-KLocPsySettingsUID 			0x10275062
-KLocSUPLSettingsUID 		0x10275091
-KLocNotPrefSettingsUID 	0x1020690F
-KLocPsySettingsUIDErr 	0x10575060
-
-ELocSUPLDefault 			0
-ELocSUPLDefaultErr		6
-ELocSUPLIAPSelection	1
-ELocSuplSettingsPage	10
-
-KErrNotSupported -5
-
-[Enddefine]
-
-[Test] 
-title TCLOCSETTINGSUI0001 
-create testlocsettingsuiclient Obj
-Obj TestNewL
-print TestNewL...
-delete Obj
-[Endtest]
-
-[Test] 
-title TCLOCSETTINGSUI0002
-create testlocsettingsuiclient Obj
-Obj TestNewLC
-print TestNewL...
-delete Obj
-[Endtest]
-
-[Test] 
-title TCLOCSETTINGSUI0003
-create testlocsettingsuiclient Obj
-allownextresult KErrNotSupported
-Obj TestLaunchSettingsL ELaunchPosSettingsAsEmbeddedAppL
-print TestLaunchSettingsL...
-delete Obj
-[Endtest]
-
-[Test] 
-title TCLOCSETTINGSUI0004
-create testlocsettingsuiclient Obj
-allownextresult KErrNotSupported
-Obj TestLaunchSettingsL ELaunchSettingsUiAsEmbeddedAppL KLocSUPLSettingsUID ELocSUPLDefault
-print TestLaunchSettingsL...
-delete Obj
-[Endtest]
-
-[Test] 
-title TCLOCSETTINGSUI0005
-create testlocsettingsuiclient Obj
-allownextresult KErrNotSupported
-Obj TestLaunchSettingsL ELaunchSettingsUiAsEmbeddedAppL KLocPsySettingsUID ELocSUPLDefault
-print TestLaunchSettingsL...
-delete Obj
-[Endtest]
-
-[Test] 
-title TCLOCSETTINGSUI0006
-create testlocsettingsuiclient Obj
-allownextresult KErrNotSupported
-Obj TestLaunchSettingsL ELaunchSettingsUiAsEmbeddedAppL KLocNotPrefSettingsUID ELocSUPLDefault
-print TestLaunchSettingsL...
-delete Obj
-[Endtest]
-
-[Test] 
-title TCLOCSETTINGSUI0007
-create testlocsettingsuiclient Obj
-Obj TestLaunchSettingsL ELaunchSettingsUiL KLocSUPLSettingsUIDErr ELocSUPLDefault
-print TestLaunchSettingsL...
-delete Obj
-[Endtest]
-
-[Test] 
-title TCLOCSETTINGSUI0007a
-create testlocsettingsuiclient Obj
-Obj TestLaunchSettingsL ELaunchSettingsUiLOverLoaded KLocSUPLSettingsUIDErr ELocSUPLDefault
-print TestLaunchSettingsL...
-delete Obj
-[Endtest]
-
-[Test] 
-title TCLOCSETTINGSUI0007b
-create testlocsettingsuiclient Obj
-allownextresult KErrNotSupported
-Obj TestLaunchSettingsL ELaunchSettingsUiAsEmbeddedAppLOverLoaded KLocSUPLSettingsUIDErr ELocSUPLDefault
-print TestLaunchSettingsL...
-delete Obj
-[Endtest]
-
-[Test] 
-title TCLOCSETTINGSUI0008
-create testlocsettingsuiclient Obj
-allownextresult KErrNotSupported
-Obj TestCancelLaunchedSettingsUi KLocSUPLSettingsUID ELocSUPLDefault
-print TestLaunchPosSettingsAsEmbeddedAppL...
-delete Obj
-[Endtest]
-
-[Test] 
-title TCLOCSETTINGSUI0009
-create testlocsettingsuiclient Obj
-allownextresult KErrNotSupported
-Obj TestCancelLaunchedSettingsUiErr
-print TestLaunchPosSettingsAsEmbeddedAppL...
-delete Obj
-[Endtest]
-
-[Test] 
-title TCLOCSETTINGSUI0010
-create testlocsettingsuiclient Obj
-Obj TestClosePosSettings
-print TestLaunchPosSettingsAsEmbeddedAppL...
-delete Obj
-[Endtest]
-
-[Test] 
-title TCLOCSETTINGSUI0011
-create testlocsettingsuiclient Obj
-allownextresult KErrNotSupported
-Obj TestClosePosSettingsErr
-print TestLaunchPosSettingsAsEmbeddedAppL...
-delete Obj
-[Endtest]
--- a/locsrv_plat/location_settings_launch_api/tsrc/eabi/testlocsettingsuiclientu.def	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,5 +0,0 @@
-EXPORTS
-	_Z9LibEntryLR13CTestModuleIf @ 1 NONAME
-	_ZTI26CTestLocSettingsUiClientAO @ 2 NONAME ; #<TI>#
-	_ZTV26CTestLocSettingsUiClientAO @ 3 NONAME ; #<VT>#
-
--- a/locsrv_plat/location_settings_launch_api/tsrc/group/bld.inf	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,60 +0,0 @@
-/*
-* Copyright (c) 2007 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:   Test Module DLL to Location Settings Launch API
-*
-*/
-
-
-
-
-PRJ_PLATFORMS
-// specify the platforms your component needs to be built for here
-// defaults to WINS MARM so you can ignore this if you just build these
-DEFAULT
-
-PRJ_TESTEXPORTS
-// NOTE: If using ARS requirements all export operations should be done under this.
-// 'abld test export'
-
-PRJ_EXPORTS
-// Specify the source file followed by its destination here
-// copy will be used to copy the source file to its destination
-// If there's no destination then the source file will be copied
-// to the same name in /epoc32/include
-// Example: 
-/*
-/agnmodel/inc/AGMCOMON.H
-*/
-
-PRJ_TESTMMPFILES
-// NOTE: If using ARS requirements .mmp file operation should be done under this.
-// 'abld test build'
-testlocsettingsuiclient.mmp
-
-PRJ_MMPFILES
-// Specify the .mmp files required for building the important component
-// releasables.
-//
-// Specify "tidy" if the component you need to build doesn't need to be
-// released. Specify "ignore" if the MMP file exists but should be
-// ignored.
-// Example:
-/*
-/agnmodel/group/agnmodel.mmp
-#if defined(MARM)
-/agnmodel/group/agsvexe.mmp
-#endif
-*/
-
-//  End of File
\ No newline at end of file
--- a/locsrv_plat/location_settings_launch_api/tsrc/group/testlocsettingsuiclient.mmp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,68 +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:
-*
-*/
-/*TYPE TESTCLASS*//*
-* Copyright (c) 2007 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:  Test Module DLL to Location Settings Launch API
-*
-*/
-
-
-#include <platform_paths.hrh>
-
-TARGET          testlocsettingsuiclient.dll
-TARGETTYPE      dll
-UID             0x1000008D 0x101FB3E3
-
-CAPABILITY      ALL -TCB
-/* Remove comments and replace 0x00000000 with correct vendor id */
-// VENDORID     0x00000000
-/* Remove comments and replace 0x00000000 with correct secure id */
-// SECUREID     0x00000000
-
-//TARGETPATH
-DEFFILE         testlocsettingsuiclient.def
-
-SOURCEPATH      ../src
-SOURCE          testlocsettingsuiclient.cpp
-SOURCE          testlocsettingsuiclientBlocks.cpp
-SOURCE          testlocsettingsuiclientao.cpp
-
-//RESOURCE        resource_file
-//RESOURCE        resource_file2
-
-USERINCLUDE     ../inc 
-
-MW_LAYER_SYSTEMINCLUDE
-
-LIBRARY         euser.lib
-LIBRARY         stiftestinterface.lib
-LIBRARY			locsettingsuiclient.lib cone.lib
-
-LANG            SC
-
-// End of File
--- a/locsrv_plat/location_settings_launch_api/tsrc/group/testlocsettingsuiclient.pkg	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,40 +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:   Package file for test code of Location Settings Launch API
-;
-&EN
-;
-; UID is the app's UID
-;
-#{"testlocsettingsuiclient"},(0x101FB3E3),2,0,0,TYPE=SA
-;
-; Localised Vendor name
-%{"Nokia-EN"}
-
-; Unique Vendor name
-:"Nokia"
-
-;Supports Series 60 v 3.0
-;This line indicates that this installation is for the Series 60 platform v0.9
-;This line must appear _exactly_ as shown below in the sis file
-;If this line is missing or incorrect, the sis file will not be able
-;to be installed on Series 60 v3.0 platforms
-;(0x101F7961), 0, 0, 0, {"Series60ProductID"}
-;
-;
-; Files to install
-"\epoc32\release\armv5\urel\testlocsettingsuiclient.dll"-"C:\sys\bin\testlocsettingsuiclient.dll"
-"..\conf\testlocsettingsuiclient.cfg"-"C:\testframework\testlocsettingsuiclient.cfg"
-"..\init\testframework.ini"-"C:\data\testframework.ini"
-
--- a/locsrv_plat/location_settings_launch_api/tsrc/inc/testlocsettingsuiclient.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,172 +0,0 @@
-/*
-* Copyright (c) 2007 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:   Test Module DLL to Location Settings Launch API
-*
-*/
-
-
-
-
-#ifndef TESTLOCSETTINGSUICLIENT_H
-#define TESTLOCSETTINGSUICLIENT_H
-
-//  INCLUDES
-#include <StifLogger.h>
-#include <TestScripterInternal.h>
-#include <StifTestModule.h>
-
-
-// CONSTANTS
-_LIT( KtestlocsettingsuiclientLogPath, "\\logs\\testframework\\testlocsettingsuiclient\\" ); 
-_LIT( KtestlocsettingsuiclientLogFile, "testlocsettingsuiclient.txt" ); 
-
-// FORWARD DECLARATIONS
-class CTestLocSettingsUiClient;
-class CTestLocSettingsUiClientAO;
-
-// CLASS DECLARATION
-
-/**
-*  CTestLocSettingsUiClient test class for STIF Test Framework TestScripter.
-*  This is the testclass for Location Settings Launch API
-*
-*  @lib testlocsettingsuiclient.lib
-*  @since S60 v3.2
-*/
-
-NONSHARABLE_CLASS(CTestLocSettingsUiClient) : public CScriptBase
-    {
-    public:  // Constructors and destructor
-
-        /**
-        * Two-phased constructor.
-        */
-        static CTestLocSettingsUiClient* NewL( CTestModuleIf& aTestModuleIf );
-
-        /**
-        * Destructor.
-        */
-        virtual ~CTestLocSettingsUiClient();
-
-    public: // New functions
-
-    public: // Functions from base classes
-
-        /**
-        * From CScriptBase Runs a script line.
-        * @since S60 v3.2
-        * @param aItem Script line containing method name and parameters
-        * @return Symbian OS error code
-        */
-        virtual TInt RunMethodL( CStifItemParser& aItem );
-
-    private:
-
-        /**
-        * C++ default constructor.
-        */
-        CTestLocSettingsUiClient( CTestModuleIf& aTestModuleIf );
-
-        /**
-        * By default Symbian 2nd phase constructor is private.
-        */
-          void ConstructL();
-
-        /**
-        * Frees all resources allocated from test methods.
-        * @since S60 v3.2
-        */
-          void Delete();
-
-	    /**
-	     * Test Case for create a new instance of 
-	     * CLocSettingsUiClient with NewL
-	     *
-	     * @since S60 v3.2
-	     * Returns KErrNone if successful. 
-	     *
-	     */ 
-		  TInt TestNewL( CStifItemParser& aItem );
-		
-	    /**
-	     * Test Case for create a new instance of 
-	     * CLocSettingsUiClient with NewLC
-	     *
-	     * @since S60 v3.2
-	     * Returns KErrNone if successful. 
-	     *
-	     */ 
-	 	  TInt TestNewLC( CStifItemParser& aItem );
-	 	  		
-	    /**
-	     * Test Case for Launching Settings Ui 
-	     * CLocSettingsUiClient
-	     *
-	     * @since S60 v3.2
-	     * Returns KErrNone if successful. 
-	     *
-	     */ 
-	 	  TInt TestLaunchSettingsL( CStifItemParser& aItem );
-	 	  		
-	    /**
-	     * Test Case for Cancelling a Launch of Settings Ui 
-	     * CLocSettingsUiClient
-	     *
-	     * @since S60 v3.2
-	     * Returns KErrNone if successful. 
-	     *
-	     */ 
-	 	  TInt TestCancelLaunchedSettingsUi(CStifItemParser& aItem);
-	 	  	 	  		
-	    /**
-	     * Test Case for Cancelling a Launch of Settings Ui 
-	     * which results in Error
-	     *
-	     * @since S60 v3.2
-	     * Returns KErrNone if successful. 
-	     *
-	     */ 
-	 	  TInt TestCancelLaunchedSettingsUiErr( CStifItemParser& aItem );
-	 	  	 	  		
-	    /**
-	     * Test Case for Closing a Position Settings 
-	     * CLocSettingsUiClient
-	     *
-	     * @since S60 v3.2
-	     * Returns KErrNone if successful. 
-	     *
-	     */ 
-	 	  TInt TestClosePosSettings( CStifItemParser& aItem );
-	 	  	 	  		
-	    /**
-	     * Test Case for Closing a Position Settings 
-	     * which results in Error
-	     *
-	     * @since S60 v3.2
-	     * Returns KErrNone if successful. 
-	     *
-	     */ 
-	 	  TInt TestClosePosSettingsErr( CStifItemParser& aItem );
-
-    private:    // Data
-        /**
-        * Tester Class for CTestLocSettingsUiClient API methods
-        */
-    	 CTestLocSettingsUiClientAO* iLocSettingsUiClientAO;
-        
-    };
-
-#endif      // TESTLOCSETTINGSUICLIENT_H
-
-// End of File
--- a/locsrv_plat/location_settings_launch_api/tsrc/inc/testlocsettingsuiclientao.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,192 +0,0 @@
-/*
-* Copyright (c) 2007 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:   Test Class For RPositionServer
-*
-*/
-
-
-
-#ifndef TESTLOCSETTINGSUICLIENTAO_H
-#define TESTLOCSETTINGSUICLIENTAO_H
-
-// System Includes
-#include <StifLogger.h>
-#include <StifTestModule.h>
-#include <StifParser.h>
-#include <e32base.h>
-#include <e32std.h>
-
-
-// Constants
-class CLocSettingsUiClient;
-
-// CLASS DECLARATION
-/**
- *  Test Class to invoke the CLocSettingsUiClient methods
- *
- *  This class is a helper class. The status variable of this active obect is 
- *  used to provide the asynchronous method Calls.
- *
- *  @lib testlbslocacquisition.lib
- *  @since S60 v3.2
- */
-
-class CTestLocSettingsUiClientAO :public CActive
-    {
-    public:
-    	enum TState
-    		{
-    		EStart = 0,
-    		EExecuting,
-    		ECompleted
-    		};
-    
-    	enum TFunction
-    		{
-    		ELaunchPosSettingsL = 0,
-    		ELaunchPosSettingsAsEmbeddedAppL,
-    		ELaunchSettingsUiL,
-    		ELaunchSettingsUiAsEmbeddedAppL,
-    		ELaunchSettingsUiLOverLoaded,
-    		ELaunchSettingsUiAsEmbeddedAppLOverLoaded
-    		};
-    
-    public:  // Constructors and destructor
-
-        /**
-        * Destructor. 
-        */
-        static CTestLocSettingsUiClientAO* NewL(CStifLogger* aLog);
-        
-        /**
-        * Destructor. 
-        */
-        ~CTestLocSettingsUiClientAO();
-
-    public:         
-        
-        //From CActive
-          void RunL();
-          void DoCancel();
-		  TInt RunError(TInt aError);   
-
-		//
-	    /**
-	     * Test Case for create a new instance of 
-	     * CLocSettingsUiClient with NewL
-	     *
-	     * @since S60 v3.2
-	     * Returns KErrNone if successful. 
-	     *
-	     */ 
-		  TInt TestNewL();
-		
-	    /**
-	     * Test Case for create a new instance of 
-	     * CLocSettingsUiClient with NewLC
-	     *
-	     * @since S60 v3.2
-	     * Returns KErrNone if successful. 
-	     *
-	     */ 
-	 	  TInt TestNewLC();
-		  		  	 		
-	    /**
-	     * Test Case for Launching Settings Ui 
-	     * CLocSettingsUiClient
-	     *
-	     * @since S60 v3.2
-	     * Returns KErrNone if successful. 
-	     *
-	     */ 
-	 	  TInt TestLaunchSettingsL( CStifItemParser& aItem );
-	 	  
-	 	 /**
-	     * Test Case for Cancelling a Launch of Settings Ui 
-	     * CLocSettingsUiClient
-	     *
-	     * @since S60 v3.2
-	     * Returns KErrNone if successful. 
-	     *
-	     */ 
-	 	  TInt TestCancelLaunchedSettingsUi(CStifItemParser& aItem);
-	 	  	 	  	 	  		
-	    /**
-	     * Test Case for Cancelling a Launch of Settings Ui 
-	     * which results in Error
-	     *
-	     * @since S60 v3.2
-	     * Returns KErrNone if successful. 
-	     *
-	     */ 
-	 	  TInt TestCancelLaunchedSettingsUiErr();
-	 	  	 	  	 	  		
-	    /**
-	     * Test Case for Closing a Position Settings 
-	     * CLocSettingsUiClient
-	     *
-	     * @since S60 v3.2
-	     * Returns KErrNone if successful. 
-	     *
-	     */ 
-	 	  TInt TestClosePosSettings();
-	 	  	 	  	 	  		
-	    /**
-	     * Test Case for Closing a Position Settings 
-	     * which results in Error
-	     *
-	     * @since S60 v3.2
-	     * Returns KErrNone if successful. 
-	     *
-	     */ 
-	 	  TInt TestClosePosSettingsErr();
-	 	  
-	private:
-	
-		void IssueRequestL(TFunction aFunction);
-		void ConstructL();
-	
-        /**
-        * C++ default constructor.
-        */
-        CTestLocSettingsUiClientAO(CStifLogger* aLog);
-	 	    
-    private:  //data
-	    /**
-	     * Loc system UI Client instance
-	     */     		 
-    	CLocSettingsUiClient*         iLocSettingsUiClient;
-
-	    /**
-	     * iLog instance - Not owned
-	     */         
-        CStifLogger* 			iLog;
-        
-        TInt iErr;
-        
-        TUid iTUid;
-        
-        TInt iParam;
-        
-        TBuf<50> iParamString;
-        
-        TFunction iFunction;
-        
-        TState iState;
-	        
-     };     
-
-#endif      // TESTLOCSETTINGSUICLIENTAO_H
-
-// End of File
--- a/locsrv_plat/location_settings_launch_api/tsrc/init/testframework.ini	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,182 +0,0 @@
-#
-# This is STIFTestFramework initialization file
-# Comment lines start with '#'-character.
-# See STIF TestFramework users guide.doc for instructions
-
-# -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
-# Set following test engine settings:
-#	- Set Test Reporting mode. TestReportMode's possible values are:
-#		+ 'Summary': Summary of the tested test cases.
-#		+ 'Environment': Hardware and software info.
-#		+ 'TestCases': Test case report.
-#		+ 'FullReport': Set of all above ones.
-#		+ Example 'TestReportMode= Summary TestCases'
-#
-# 	- CreateTestReport setting controls report creation mode
-#		+ YES, Test report will created.
-#		+ NO, No Test report.
-#
-# 	- File path indicates the base path of the test report.
-# 	- File name indicates the name of the test report.
-#
-# 	- File format indicates the type of the test report.
-#		+ TXT, Test report file will be txt type, for example 'TestReport.txt'.
-#		+ HTML, Test report will be html type, for example 'TestReport.html'.
-#
-# 	- File output indicates output source of the test report.
-#		+ FILE, Test report logging to file.
-#		+ RDEBUG, Test report logging to using rdebug.
-#
-# 	- File Creation Mode indicates test report overwriting if file exist.
-#		+ OVERWRITE, Overwrites if the Test report file exist.
-#		+ APPEND, Continue logging after the old Test report information if 
-#                 report exist.
-# 	- Sets a device reset module's dll name(Reboot).
-#		+ If Nokia specific reset module is not available or it is not correct one
-#		  StifHWResetStub module may use as a template for user specific reset
-#		  module. 
-
-[Engine_Defaults]
-
-TestReportMode= FullReport		# Possible values are: 'Empty', 'Summary', 'Environment',
-                                                               'TestCases' or 'FullReport'
-
-CreateTestReport= YES			# Possible values: YES or NO
-
-TestReportFilePath= C:\LOGS\TestFramework\
-TestReportFileName= TestReport
-
-TestReportFormat= TXT			# Possible values: TXT or HTML
-TestReportOutput= FILE			# Possible values: FILE or RDEBUG
-TestReportFileCreationMode= OVERWRITE	# Possible values: OVERWRITE or APPEND
-
-DeviceResetDllName= StifResetForNokia.dll # e.g. 'StifHWResetStub.dll' for user specific reseting
-
-[End_Defaults]
-# -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
-
-
-
-# -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
-# Module configurations start
-# Modules are added between module tags
-# tags. Module name is specified after ModuleName= tag, like
-# ModuleName= XXXXXXXXX
-# Modules might have initialisation file, specified as
-# IniFile= c:\testframework\YYYYYY
-# Modules might have several configuration files, like
-# TestCaseFile= c:\testframework\NormalCases.txt
-# TestCaseFile= c:\testframework\SmokeCases.txt
-# TestCaseFile= c:\testframework\ManualCases.txt
-
-# (TestCaseFile is synonym for old term ConfigFile)
-
-# Following case specifies demo module settings. Demo module
-# does not read any settings from file, so tags 
-# IniFile and TestCaseFile are not used.
-# In the simplest case it is enough to specify only the
-# name of the test module when adding new test module
-
-#[New_Module]
-#ModuleName= demomodule
-#[End_Module]
-
-[New_Module]
-ModuleName= TestScripter
-TestCaseFile= C:\Testframework\testlocsettingsuiclient.cfg
-[End_Module]
-
-# Load testmoduleXXX, optionally with initialization file and/or test case files
-#[New_Module]
-#ModuleName= testmodulexxx
-
-#TestModuleXXX used initialization file
-#IniFile= c:\testframework\init.txt
-
-#TestModuleXXX used configuration file(s)
-#TestCaseFile= c:\testframework\testcases1.cfg
-#TestCaseFile= c:\testframework\testcases2.cfg
-#TestCaseFile= c:\testframework\manualtestcases.cfg
-
-#[End_Module]
-# -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
-
-
-
-# -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
-# Set STIFTestFramework logging overwrite parameters for Logger.
-# 	Hardware and emulator environment logging path and styles can
-# 	be configured from here to overwrite the Logger's implemented values.
-#	
-#	Settings description:
-#	- Indicates option for creation log directory/directories. If log directory/directories
-#         is/are not created by user they will make by software.
-#		+ YES, Create log directory/directories if not allready exist.
-#		+ NO, Log directory/directories not created. Only created one is used.
-#
-#	- Overwrite emulator path setting.
-#		+ Example: If 'EmulatorBasePath= C:\LOGS\TestFramework\' and in code is defined 
-#		           Logger's path 'D:\\LOGS\\Module\\' with those definition the path
-#		           will be 'C:\LOGS\TestFramework\LOGS\Module\'
-#
-#	- Overwrite emulator's logging format.
-#		+ TXT, Log file(s) will be txt type(s), for example 'Module.txt'.
-#		+ HTML, Log file(s) will be html type(s), for example 'Module.html'.
-#
-#	- Overwrited emulator logging output source.
-#		+ FILE, Logging to file(s).
-#		+ RDEBUG, Logging to using rdebug(s).
-#
-#	- Overwrite hardware path setting (Same description as above in emulator path).
-#	- Overwrite hardware's logging format(Same description as above in emulator format).
-#	- Overwrite hardware's logging output source(Same description as above in emulator output).
-#
-#	- File Creation Mode indicates file overwriting if file exist.
-#		+ OVERWRITE, Overwrites if file(s) exist.
-#		+ APPEND, Continue logging after the old logging information if file(s) exist.
-#
-#	- Will thread id include to the log filename.
-#		+ YES, Thread id to log file(s) name, Example filename 'Module_b9.txt'.
-#		+ NO, No thread id to log file(s), Example filename 'Module.txt'.
-#
-#	- Will time stamps include the to log file.
-#		+ YES, Time stamp added to each line in log file(s). Time stamp is 
-#                 for example'12.Nov.2003 115958    LOGGING INFO'
-#		+ NO, No time stamp(s).
-#
-#	- Will line breaks include to the log file.
-#		+ YES, Each logging event includes line break and next log event is in own line.
-#		+ NO, No line break(s).
-#
-#	- Will event ranking include to the log file.
-#		+ YES, Event ranking number added to each line in log file(s). Ranking number 
-#                 depends on environment's tics, for example(includes time stamp also)
-#                 '012   12.Nov.2003 115958    LOGGING INFO'
-#		+ NO, No event ranking.
-#
-
-[Logger_Defaults]
-
-#NOTE: If you want to set Logger using next setting(s) remove comment(s)'#' 
-
-#CreateLogDirectories= YES		# Possible values: YES or NO
-
-#EmulatorBasePath= C:\LOGS\TestFramework\
-#EmulatorFormat= HTML			# Possible values: TXT or HTML
-#EmulatorOutput= FILE			# Possible values: FILE or RDEBUG
-
-#HardwareBasePath= D:\LOGS\TestFramework\
-#HardwareFormat= HTML			# Possible values: TXT or HTML
-#HardwareOutput= FILE			# Possible values: FILE or RDEBUG
-
-#FileCreationMode= OVERWRITE		# Possible values: OVERWRITE or APPEND
-
-#ThreadIdToLogFile= YES			# Possible values: YES or NO
-#WithTimeStamp= YES			# Possible values: YES or NO
-#WithLineBreak= YES			# Possible values: YES or NO
-#WithEventRanking= YES			# Possible values: YES or NO
-
-[End_Logger_Defaults]
-# -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
-
-# End of file
--- a/locsrv_plat/location_settings_launch_api/tsrc/src/testlocsettingsuiclient.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,106 +0,0 @@
-/*
-* Copyright (c) 2007 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:   Test Module DLL to Location Settings Launch API
-*
-*/
-
-
-
-
-// INCLUDE FILES
-#include <Stiftestinterface.h>
-#include "testlocsettingsuiclient.h"
-#include "testlocsettingsuiclientao.h"
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// CTestLocSettingsUiClient::CTestLocSettingsUiClient
-// C++ default constructor can NOT contain any code, that
-// might leave.
-// -----------------------------------------------------------------------------
-//
-CTestLocSettingsUiClient::CTestLocSettingsUiClient( 
-    CTestModuleIf& aTestModuleIf ):
-        CScriptBase( aTestModuleIf )
-    {
-    }
-
-// -----------------------------------------------------------------------------
-// CTestLocSettingsUiClient::ConstructL
-// Symbian 2nd phase constructor can leave.
-// -----------------------------------------------------------------------------
-//
-void CTestLocSettingsUiClient::ConstructL()
-    {
-    iLog = CStifLogger::NewL( KtestlocsettingsuiclientLogPath, 
-                          KtestlocsettingsuiclientLogFile,
-                          CStifLogger::ETxt,
-                          CStifLogger::EFile,
-                          EFalse );
-                          
-	iLocSettingsUiClientAO = CTestLocSettingsUiClientAO::NewL(iLog);
-
-    }
-
-// -----------------------------------------------------------------------------
-// CTestLocSettingsUiClient::NewL
-// Two-phased constructor.
-// -----------------------------------------------------------------------------
-//
-CTestLocSettingsUiClient* CTestLocSettingsUiClient::NewL( 
-    CTestModuleIf& aTestModuleIf )
-    {
-    CTestLocSettingsUiClient* self = new (ELeave) CTestLocSettingsUiClient( aTestModuleIf );
-
-    CleanupStack::PushL( self );
-    self->ConstructL();
-    CleanupStack::Pop();
-
-    return self;
-
-    }
-
-// -----------------------------------------------------------------------------
-// Destructor
-// -----------------------------------------------------------------------------
-//
-CTestLocSettingsUiClient::~CTestLocSettingsUiClient()
-    { 
-
-    // Delete resources allocated from test methods
-    Delete();
-
-    // Delete logger
-    delete iLog; 
-
-    }
-
-// ========================== OTHER EXPORTED FUNCTIONS =========================
-
-// -----------------------------------------------------------------------------
-// LibEntryL is a polymorphic Dll entry point.
-// Returns: CScriptBase: New CScriptBase derived object
-// -----------------------------------------------------------------------------
-//
-EXPORT_C CScriptBase* LibEntryL( 
-    CTestModuleIf& aTestModuleIf ) // Backpointer to STIF Test Framework
-    {
-
-    return ( CScriptBase* ) CTestLocSettingsUiClient::NewL( aTestModuleIf );
-
-    }
-
-
-//  End of File
--- a/locsrv_plat/location_settings_launch_api/tsrc/src/testlocsettingsuiclientBlocks.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,161 +0,0 @@
-/*
-* Copyright (c) 2007 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:   Test Module DLL to Location Settings Launch API
-*
-*/
-
-
-
-
-// INCLUDE FILES
-#include <e32svr.h>
-#include <StifParser.h>
-#include <Stiftestinterface.h>
-#include <locsettingsuiclient.h>
-
-#include "testlocsettingsuiclient.h"
-#include "testlocsettingsuiclientao.h"
-
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// CTestLocSettingsUiClient::Delete
-// Delete here all resources allocated and opened from test methods. 
-// Called from destructor. 
-// -----------------------------------------------------------------------------
-//
-void CTestLocSettingsUiClient::Delete() 
-    {
-    if(iLocSettingsUiClientAO)
-    	{
-    	delete iLocSettingsUiClientAO;	
-    	iLocSettingsUiClientAO = NULL;
-    	}	
-    }
-
-// -----------------------------------------------------------------------------
-// CTestLocSettingsUiClient::RunMethodL
-// Run specified method. Contains also table of test mothods and their names.
-// -----------------------------------------------------------------------------
-//
-TInt CTestLocSettingsUiClient::RunMethodL( 
-    CStifItemParser& aItem ) 
-    {
-
-    static TStifFunctionInfo const KFunctions[] =
-        {  
-
-        ENTRY( "TestNewL", CTestLocSettingsUiClient::TestNewL ),
-        ENTRY( "TestNewLC", CTestLocSettingsUiClient::TestNewLC ),
-        ENTRY( "TestLaunchSettingsL", CTestLocSettingsUiClient::TestLaunchSettingsL ),
-        ENTRY( "TestCancelLaunchedSettingsUi", CTestLocSettingsUiClient::TestCancelLaunchedSettingsUi ),
-        ENTRY( "TestCancelLaunchedSettingsUiErr", CTestLocSettingsUiClient::TestCancelLaunchedSettingsUiErr ),
-        ENTRY( "TestClosePosSettings", CTestLocSettingsUiClient::TestClosePosSettings ),
-        ENTRY( "TestClosePosSettingsErr", CTestLocSettingsUiClient::TestClosePosSettingsErr ),
-
-        };
-
-    const TInt count = sizeof( KFunctions ) / 
-                        sizeof( TStifFunctionInfo );
-
-    return RunInternalL( KFunctions, count, aItem );
-
-    }
-
-// ---------------------------------------------------------
-// CTestLocSettingsUiClient::TestNewL
-//
-// (other items are commented in a header).
-// ---------------------------------------------------------
-//
-TInt CTestLocSettingsUiClient::TestNewL( CStifItemParser& /*aItem*/ )
-	{
-	return iLocSettingsUiClientAO->TestNewL();
-	}
-	
-// ---------------------------------------------------------
-// CTestLocSettingsUiClient::TestNewLC
-//
-// (other items are commented in a header).
-// ---------------------------------------------------------
-//
-TInt CTestLocSettingsUiClient::TestNewLC( CStifItemParser& /*aItem*/ )
-	{
-	return iLocSettingsUiClientAO->TestNewLC();
-	}
-
-// ---------------------------------------------------------
-// CTestLocSettingsUiClientAO::TestLaunchPosSettingsAsEmbeddedAppL
-//
-// (other items are commented in a header).
-// ---------------------------------------------------------
-//
-TInt CTestLocSettingsUiClient::TestLaunchSettingsL(
-								 CStifItemParser& aItem )
-	{
-	TInt err = iLocSettingsUiClientAO->TestLaunchSettingsL(aItem);
-//	CActiveScheduler::Start();
-	return err;
-	}
-
-// ---------------------------------------------------------
-// CTestLocSettingsUiClientAO::TestCancelLaunchedSettingsUi
-//
-// (other items are commented in a header).
-// ---------------------------------------------------------
-//
-TInt CTestLocSettingsUiClient::TestCancelLaunchedSettingsUi(CStifItemParser& aItem)
-	{
-	TInt err = iLocSettingsUiClientAO->TestCancelLaunchedSettingsUi(aItem);
-	return err;	
-	}
-	
-// ---------------------------------------------------------
-// CTestLocSettingsUiClientAO::TestCancelLaunchedSettingsUi
-//
-// (other items are commented in a header).
-// ---------------------------------------------------------
-//
-TInt CTestLocSettingsUiClient::TestCancelLaunchedSettingsUiErr( CStifItemParser& /*aItem*/ )
-	{
-	TInt err = iLocSettingsUiClientAO->TestCancelLaunchedSettingsUiErr();
-	return err;	
-	}
-	
-// ---------------------------------------------------------
-// CTestLocSettingsUiClientAO::TestClosePosSettings
-//
-// (other items are commented in a header).
-// ---------------------------------------------------------
-//
-TInt CTestLocSettingsUiClient::TestClosePosSettings( CStifItemParser& /*aItem*/ )
-	{
-	TInt err = iLocSettingsUiClientAO->TestClosePosSettings();
-	return err;	;		
-	}
-
-// ---------------------------------------------------------
-// CTestLocSettingsUiClientAO::TestClosePosSettings
-//
-// (other items are commented in a header).
-// ---------------------------------------------------------
-//
-TInt CTestLocSettingsUiClient::TestClosePosSettingsErr( CStifItemParser& /*aItem*/ )
-	{
-	TInt err = iLocSettingsUiClientAO->TestClosePosSettingsErr();
-	return err;	;		
-	}
-
-//  End of File
--- a/locsrv_plat/location_settings_launch_api/tsrc/src/testlocsettingsuiclientao.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,364 +0,0 @@
-/*
-* Copyright (c) 2007 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:   Test Module DLL to Location Settings Launch API
-*
-*/
-
-
-
-// System Includes
-#include <locsettingsuiclient.h>
-#include <w32std.h>
-#include <coemain.h>
-#include <eikon.hrh>
-
-// User Includes
-#include "testlocsettingsuiclientao.h"
-
-
-// Constant Declarations
-
-    
-// ======== MEMBER FUNCTIONS ========
-
-// ---------------------------------------------------------------------------
-// C++ Default Constructor
-// ---------------------------------------------------------------------------
-//
-CTestLocSettingsUiClientAO* CTestLocSettingsUiClientAO::NewL(CStifLogger* aLog)
-    {
-    CTestLocSettingsUiClientAO* self = new(ELeave) CTestLocSettingsUiClientAO(aLog);
-    CleanupStack::PushL(self);
-    self->ConstructL();
-    CleanupStack::Pop(self);
-    return self;
-    }
-
-// ---------------------------------------------------------------------------
-// C++ Default Constructor
-// ---------------------------------------------------------------------------
-//
-void CTestLocSettingsUiClientAO::ConstructL()
-    {
-    iLocSettingsUiClient = CLocSettingsUiClient::NewL();
-    }
-    
-// ---------------------------------------------------------------------------
-// C++ Default Constructor
-// ---------------------------------------------------------------------------
-//
-CTestLocSettingsUiClientAO::CTestLocSettingsUiClientAO(CStifLogger* aLog)
-    :CActive(0),iLog(aLog),iErr(0)
-    {
-    CActiveScheduler::Add(this);
-    }
-
-// ---------------------------------------------------------------------------
-// C++ Destructor
-// ---------------------------------------------------------------------------
-//
-CTestLocSettingsUiClientAO::~CTestLocSettingsUiClientAO()
-    {
-    if( IsActive() )
-	    {
-	    Cancel(); 	
-	    }
-	    
-    if(iLocSettingsUiClient)
-    	{
-    	delete iLocSettingsUiClient;	
-    	iLocSettingsUiClient = NULL;
-    	}
-    }
-
-// ---------------------------------------------------------
-// CTestLocSettingsUiClientAO::RunL 
-//
-// RunL to Handle Completed Request
-// ---------------------------------------------------------
-//	
-void CTestLocSettingsUiClientAO::RunL()
-	{
-	switch(iState)
-		{		
-		case EStart:
-			switch(iFunction)
-				{
-				case ELaunchPosSettingsL:
-					iState = ECompleted;
-					iLocSettingsUiClient->LaunchPosSettingsL(iStatus);
-					SetActive();
-				break;				
-				case ELaunchPosSettingsAsEmbeddedAppL:
-					iState = ECompleted;
-					iLocSettingsUiClient->LaunchPosSettingsAsEmbeddedAppL(iStatus);
-					SetActive();
-				case ELaunchSettingsUiL:
-					iState = ECompleted;
-					iLocSettingsUiClient->LaunchSettingsUiL(iTUid,iParam,iStatus);
-					SetActive();
-				break;				
-				case ELaunchSettingsUiAsEmbeddedAppL:
-					iState = ECompleted;
-					iLocSettingsUiClient->LaunchSettingsUiAsEmbeddedAppL(iTUid,iParam,iStatus);
-					SetActive();
-					break;
-					
-				case ELaunchSettingsUiLOverLoaded:
-					iState = ECompleted;
-					iLocSettingsUiClient->LaunchSettingsUiL(iTUid,iParamString,iStatus);
-					SetActive();
-					break;
-					
-				case ELaunchSettingsUiAsEmbeddedAppLOverLoaded:
-					iState = ECompleted;
-					iLocSettingsUiClient->LaunchSettingsUiAsEmbeddedAppL(iTUid,iParamString,iStatus);
-					SetActive();
-					break;					
-				}
-		break;	
-		case ECompleted:
-			{
-
-			iLog->Log(_L("RunL %d"),iStatus.Int());		
-			CActiveScheduler::Stop();			
-			}
-		break;
-		}
-	}
-	
-// ---------------------------------------------------------
-// CTestLocSettingsUiClientAO::DoCancel 
-//
-// To Handle Cancel Request
-// ---------------------------------------------------------
-//	
-void CTestLocSettingsUiClientAO::DoCancel()
-	{
-//	TInt err = iPosServer.CancelRequest(EPositionServerNotifyModuleStatusEvent);
-//	iLog->Log(_L("CancelL %d"),err);
-
-	}
-
-// ---------------------------------------------------------
-// CTestLocSettingsUiClientAO::RunError 
-//
-// To Handle Error in RunL
-// ---------------------------------------------------------
-//
-TInt CTestLocSettingsUiClientAO::RunError(TInt aError)
-	{
-	iErr = aError;
-	iLog->Log(_L("Leave in RunError %d"),aError);
-	CActiveScheduler::Stop();
-	return KErrNone;
-	}
-	
-// ---------------------------------------------------------
-// CTestLocSettingsUiClientAO::TestNewL
-//
-// (other items are commented in a header).
-// ---------------------------------------------------------
-//
-TInt CTestLocSettingsUiClientAO::TestNewL()
-	{
-	CLocSettingsUiClient* aLocSettingsUiClient = CLocSettingsUiClient::NewL();
-    if(aLocSettingsUiClient)
-    	{
-    	delete aLocSettingsUiClient;	
-    	aLocSettingsUiClient = NULL;
-    	}
-	return KErrNone;
-	}
-	
-// ---------------------------------------------------------
-// CTestLocSettingsUiClientAO::TestNewLC
-//
-// (other items are commented in a header).
-// ---------------------------------------------------------
-//
-TInt CTestLocSettingsUiClientAO::TestNewLC()
-	{
-	CLocSettingsUiClient* aLocSettingsUiClient = CLocSettingsUiClient::NewLC();
-	CleanupStack::PopAndDestroy(aLocSettingsUiClient);
-	return KErrNone;
-	}
-		
-// ---------------------------------------------------------
-// CTestLocSettingsUiClientAO::TestLaunchSettingsL
-//
-// (other items are commented in a header).
-// ---------------------------------------------------------
-//
-TInt CTestLocSettingsUiClientAO::TestLaunchSettingsL(CStifItemParser& aItem)
-	{
-	TInt choice;
-	User::LeaveIfError(aItem.GetNextInt(choice));
-	switch(choice)
-		{
-		case 0:
-			IssueRequestL(ELaunchPosSettingsL);
-		break;
-		case 1:
-			IssueRequestL(ELaunchPosSettingsAsEmbeddedAppL);
-		break;
-		case 2:
-			TUint UidInInt;
-			TInt param;
-			if(aItem.GetNextInt(UidInInt, EHex) != KErrNotFound && 
-				aItem.GetNextInt(param) != KErrNotFound )
-				{
-				iTUid.iUid = UidInInt;
-				iParam = param;
-				IssueRequestL(ELaunchSettingsUiL);
-				}
-			else
-				{
-				return KErrGeneral;
-				}
-		break;
-		case 3:
-			TUint UidInInt1;
-			TInt param1;
-			if(aItem.GetNextInt(UidInInt1, EHex) != KErrNotFound && 
-				aItem.GetNextInt(param1) != KErrNotFound )
-				{
-				iTUid.iUid = UidInInt1;
-				iParam = param1;
-				IssueRequestL(ELaunchSettingsUiAsEmbeddedAppL);
-				}
-			else
-				{
-				return KErrGeneral;
-				}
-			break;
-
-		case 4:
-			TUint UidInInt2;
-			TPtrC param2;
-			if(aItem.GetNextInt(UidInInt2, EHex) != KErrNotFound && 
-				aItem.GetNextString(param2) != KErrNotFound )
-				{
-				iTUid.iUid = UidInInt2;
-				iParamString.Copy(param2);
-				IssueRequestL(ELaunchSettingsUiLOverLoaded);
-				}
-			else
-				{
-				return KErrGeneral;
-				}
-			break;
-			
-		case 5:
-			TUint UidInInt3;
-			TPtrC param3;
-			if(aItem.GetNextInt(UidInInt3, EHex) != KErrNotFound && 
-				aItem.GetNextString(param3) != KErrNotFound )
-				{
-				iTUid.iUid = UidInInt3;
-				iParamString.Copy(param3);
-				IssueRequestL(ELaunchSettingsUiAsEmbeddedAppLOverLoaded);
-				}
-			else
-				{
-				return KErrGeneral;
-				}
-			break;
-			
-		default:
-			return KErrGeneral;
-		}
-	CActiveScheduler::Start();
-
-	if(iErr != KErrNone)
-		{
-		iLog->Log(_L("TestLaunchPosSettingsAsEmbeddedAppL - %d"),iErr);	
-		}
-	
-	return iErr;
-	}
-	
-// ---------------------------------------------------------
-// CTestLocSettingsUiClientAO::IssueRequestL
-//
-// (other items are commented in a header).
-// ---------------------------------------------------------
-//
-void CTestLocSettingsUiClientAO::IssueRequestL(TFunction aFunction)
-	{
-	SetActive();
-	iFunction = aFunction;
-	iState = EStart;
-    TRequestStatus* status = &iStatus;
-    User::RequestComplete(status, KErrNone);	
-	}
-	
-// ---------------------------------------------------------
-// CTestLocSettingsUiClientAO::TestCancelLaunchedSettingsUi
-//
-// (other items are commented in a header).
-// ---------------------------------------------------------
-//
-TInt CTestLocSettingsUiClientAO::TestCancelLaunchedSettingsUi(CStifItemParser& aItem)
-	{
-	TUint UidInInt1;
-	TInt param1;
-	User::LeaveIfError(aItem.GetNextInt(UidInInt1, EHex));
-	User::LeaveIfError(aItem.GetNextInt(param1));
-	iTUid.iUid = UidInInt1;
-	iParam = param1;
-	
-	iLocSettingsUiClient->LaunchSettingsUiAsEmbeddedAppL(iTUid,iParam,iStatus);
-	TInt err = iLocSettingsUiClient->CancelLaunchedSettingsUi();
-	return err;	
-	}
-	
-// ---------------------------------------------------------
-// CTestLocSettingsUiClientAO::TestCancelLaunchedSettingsUi
-//
-// (other items are commented in a header).
-// ---------------------------------------------------------
-//
-TInt CTestLocSettingsUiClientAO::TestCancelLaunchedSettingsUiErr()
-	{
-	TInt err = iLocSettingsUiClient->CancelLaunchedSettingsUi();
-	return err;	
-	}
-
-// ---------------------------------------------------------
-// CTestLocSettingsUiClientAO::TestClosePosSettings
-//
-// (other items are commented in a header).
-// ---------------------------------------------------------
-//
-TInt CTestLocSettingsUiClientAO::TestClosePosSettings()
-	{
-	iLocSettingsUiClient->LaunchPosSettingsL(iStatus);
-	SetActive();
-	TInt err = iLocSettingsUiClient->ClosePosSettings();
-	return err;	
-	}
-	
-// ---------------------------------------------------------
-// CTestLocSettingsUiClientAO::TestClosePosSettingsErr
-//
-// (other items are commented in a header).
-// ---------------------------------------------------------
-//
-TInt CTestLocSettingsUiClientAO::TestClosePosSettingsErr()
-	{
-	TInt err = iLocSettingsUiClient->ClosePosSettings();
-	return err;	
-	}
-	
--- a/locsrv_plat/map_and_navigation_aiw_api/group/bld.inf	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +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 
-:                Map and Navigation AIW API
-*
-*/
-
-
-#include <platform_paths.hrh>
-
-PRJ_PLATFORMS
-DEFAULT
-
-PRJ_EXPORTS
-
-../inc/mnaiwservices.h     MW_LAYER_PLATFORM_EXPORT_PATH(mnaiwservices.h)
--- a/locsrv_plat/map_and_navigation_aiw_api/inc/mnaiwservices.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,130 +0,0 @@
-/*
-* Copyright (c) 2005-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:  Enumerations and structures for Map and Navigation AIW parameters
-*
-*/
-
-
-#ifndef MN_AIWSERVICES_H
-#define MN_AIWSERVICES_H
-
-#include <lbsposition.h>
-
-/** Common options for Map and Navigation AIW services.
- *
- *  Semantic ID must be \p EGenericParamMnCommonOptions.
- *  Type ID must be \p EVariantTypeDesC8 (packed as TPckg).
- *  @since 3.1
- *  \ingroup MnAiwAPI
- */
-struct TMnAiwCommonOptionsParam
-    {
-    /** Whether Provider Application Server shall
-     * be executed chained or standalone. */
-    TBool iRunChained;
-    /** Reserved for future use. */
-    TInt8 reserved[8];
-    };
-
-/** Field types, to be used with TMnAiwCommonOptionsParamExtended::iFieldsSet */
-enum TMnAiwCommonOptionsFields
-    {
-    EMnAiwCommonOptionsFieldsNotSet = 0,
-    EMnAiwCommonOptionsFieldRunChained = 0x01,
-    EMnAiwCommonOptionsFieldProviderId = 0x02,
-    EMnAiwCommonOptionsFieldMessagesDisabled = 0x04,
-    };
-
-/** Extended common options for Map and Navigation AIW services.
- *
- *  Semantic ID must be \p EGenericParamMnCommonOptions.
- *  Type ID must be \p EVariantTypeDesC8 (packed as TPckg).
- *  @since 5.0
- *  \ingroup MnAiwAPI
- *  @see TMnAiwCommonOptionsParam
- */
-struct TMnAiwCommonOptionsParamExtended
-    {
-    /** Bitmask of fields set in the struct, defined in @ref TMnAiwCommonOptionsFields.
-     *  If a bit is unset, the appropriate fields is ignored. */
-    TInt iFieldsSet;
-
-    /** Whether Provider Application Server shall
-     *  be executed chained or standalone.
-     *  This field is used only if EMnAiwCommonOptionsFieldRunChained flag is 
-     *  set in iFieldsSet bit map, otherwise ignored. */
-    TBool iRunChained;
-
-    /** Integer value of needed Provider application UID.
-     *  This field is used only if EMnAiwCommonOptionsFieldProviderId flag is 
-     *  set in iFieldsSet bit map, otherwise ignored. */
-    TInt32 iProviderId;
-    
-    /** Defines whether UI messages are allowed to be shown to user or not.
-     *  By default error messages are shown if request fails. Setting this
-     *  field to ETrue will ban these messages. Client has to process
-     *  the error code returned itself. */
-    TBool iMessagesDisabled;
-
-    /** Reserved for future use. */
-    TInt8 reserved[32];
-    };
-
-/** Contains additional parameters for
- *  @ref svcShowMap and @ref svcSelectFromMap AIW service commands.
- *
- *  These parameters work same as defined by @ref CMnMapView.
- *
- *  Semantic ID must be \p EGenericParamMnMapViewOptions.
- *  Type ID must be \p EVariantTypeDesC8 (packed as TPckg).
- *  @since 3.1
- *  \ingroup MnAiwAPI
- */
-struct TMnAiwMapViewOptionsParam
-    {
-    /** How current location should be drawn, 
-     *  one of @ref CMnMapView::TCurrentLocationOption values */
-    TUint32 iCurrentLocationOption;
-    /** Bitmap of additional options of map view, see @ref CMnMapView::TOptions. */
-    TUint32 iOptions;
-    /** Radius of visible map area in map view. */
-    TReal iRadius;
-    /** Central point of map view. */
-    TCoordinate iCenterPoint;
-    /** Reserved for future use. */
-    TInt8 reserved[8];
-    };
-
-/** Contains geocoding parameters for
- *  @ref svcAddrByCoord and @ref svcCoordByAddr AIW service commands.
- *
- *  These parameters are same as defined by @ref CMnGeocoder.
- *
- *  Semantic ID must be \p EGenericParamMnGeocodingOptions.
- *  Type ID must be \p EVariantTypeDesC8 (packed as TPckg).
- *  @since 3.1
- *  \ingroup MnAiwAPI
- */
-struct TMnAiwGeocodingOptionsParam
-    {
-    /** Bitmap of @ref CMnGeocoder::TOption values */
-    TUint32 iOptions;
-    /** Reserved for future use. */
-    TInt8 reserved[8];
-    };
-
-
-#endif // MN_AIWSERVICES_H
-
-//End of file
--- a/locsrv_plat/map_and_navigation_aiw_api/map_and_navigation_aiw_api.metaxml	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-<?xml version="1.0" ?>
-<api id="aea0bbba2cae7c315b2ca257c245b861" dataversion="2.0">
-  <name>Map and Navigation AIW API</name>
-  <description>This API defines how clients may utilize Map and Navigation FW via AIW mechanisms: services, input and output parameters and so on. This is no call-based API.</description>
-  <type>c++</type>
-  <collection>locationmapnavfw</collection>
-  <libs>
-  </libs>
-  <release category="platform" sinceversion="0"/>
-  <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>no</htmldocprovided>
-     <adaptation>no</adaptation>
-  </attributes>
-</api>
--- a/locsrv_plat/map_and_navigation_api/group/bld.inf	Mon May 03 12:54:42 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 
-:                Map and Navigation API
-*
-*/
-
-
-#include <platform_paths.hrh>
-
-PRJ_PLATFORMS
-DEFAULT
-
-PRJ_EXPORTS
-
-../inc/mnerrors.h        MW_LAYER_PLATFORM_EXPORT_PATH(mnerrors.h)
-../inc/mnnavigator.h     MW_LAYER_PLATFORM_EXPORT_PATH(mnnavigator.h)
-../inc/mnmapview.h       MW_LAYER_PLATFORM_EXPORT_PATH(mnmapview.h)
--- a/locsrv_plat/map_and_navigation_api/inc/mnerrors.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,54 +0,0 @@
-/*
-* Copyright (c) 2005-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:  Error constants for Map and Navigation FW
-*
-*/
-
-
-#ifndef MN_ERRORS_H
-#define MN_ERRORS_H
-
-/** \file MnErrors.h Defines Map and Navigation APIs error constants 
- */
-
-/** Client panic category
- *  Used to report client's irrecoverable error.
- */
-_LIT(KMnPanicClientFault, "MnPanicClient");
-
-/** Server panic category
- *  Used to report irrecoverable errors in service implementations.
- */
-_LIT(KMnPanicServerFault, "MnPanicServer");
-
-/** Panic codes */
-enum TMnPanicCodes 
-    {
-    /** Raised if array index is out of bounds */
-    KMnPanicArrayIndexOutOfBounds,
-
-    /** Raised if client issues new asynchronous request 
-     *  before previous one is completed or cancelled. */
-    KMnPanicDuplicateRequest,
-
-    /** Raised if CMnServiceBase-derived class attempts 
-     *  to complete async request, when there is no outstanding one. */
-    KMnPanicAttemptToCompleteNoRequest,
-    
-    /** Raised if CMnServiceBase-derived class 
-     *  completes a request and provides invalid result parameters */
-     KMnPanicInvalidResult
-    };
-
-#endif // MN_ERRORS_H
--- a/locsrv_plat/map_and_navigation_api/inc/mnmapview.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,393 +0,0 @@
-/*
-* Copyright (c) 2005-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:  CMnMapView class
-*
-*/
-
-
-#ifndef MN_MAPVIEW_H
-#define MN_MAPVIEW_H
-
-#include <e32base.h>
-#include <epos_landmarks.h>
-#include <lbsposition.h>
-
-class RFs;
-class CApaServerAppExitMonitor;
-class MAknServerAppExitObserver;
-class CMnProvider;
-class CPosLandmark;
-class RMnMapViewServiceClient;
-
-/** @brief Provides access to map view features.
- *
- *  The ShowMapL() method allows to show map of some area, which can be specified
- *  by SetMapAreaL(). ShowCurrentLocationL() opens a map with current location
- *  in the center. SelectFromMapL() allows to ask user to select some location
- *  from the map. Client can request that some landmarks should be drawn on the map,
- *  when it is shown, by using AddLandmarksToShowL.
- *  Subsequent calls to this method will add landmarks to show list. To reset the
- *  list, call @ref ResetLandmarksToShow.
- *
- *  Two overloads of AddLandmarksToShowL exist for linked and not linked landmarks.
- *  The linked landmark is the one, which has its landmark ID set.
- *  Linked landmarks are sent to Provider Application along with their
- *  landmark database URI, which allows Provider Application to get full category
- *  information of the landmark.
- *
- *  To create an instance of the class, use @ref NewL or @ref NewChainedL methods. They
- *  require instance of CMnProvider, defined in Map and Navigation Provider Discovery API.
- *
- *  Asynchronous operations can be cancelled by @ref Cancel().
- *  Only one asynchronous request can be issued at a time, otherwise client
- *  will be panicked with KMnPanicDuplicateRequest.
- *
- *  @since 3.1
- *  @lib mnclientlib.dll
- *  @ingroup MapNavAPI
- */
-class CMnMapView : public CBase
-    {
-    public :
-
-        /** Type for bitmap of flags defined by TOption */
-        typedef TUint32 TOptions;
-
-        /** @brief Map view options */
-        enum TOption
-            {
-            /** Default value */
-            EOptionNone,
-            /** Defines that only landmarks specified by AddLandmarksToShowL
-             *  are allowed to be selected by user. */
-            EOptionRestrictSelection
-            };
-
-        /** @brief Defines whether current location shall be marked on map */
-        enum TCurrentLocationOption
-            {
-            /** Current location is not shown (default). */
-            ECurrentLocationDisabled,
-            /** Current location is shown only if it's within visible area */
-            ECurrentLocationEnabled,
-            /** Current location is visible always. Provider Application selects
-                appropriate zoom (and position, if area center is not specified)
-                to make sure current location is visible. */
-            ECurrentLocationShowAlways
-            };
-
-        /** @brief Defines type of selection result */
-        enum TSelectionResultType
-            {
-            /** Undefined result */
-            ESelectionNone,
-            /** Free location has been selected.
-             *  Use @ref RetrieveSelectionResultL() to
-             *  get result of selection. */
-            ESelectionFreeLandmark,
-            /** One of landmarks passed by instance has been selected.
-             *  Use @ref RetrieveSelectionResultL(TInt&) to
-             *  get result of selection. */
-            ESelectionLandmarkIndex,
-            /** One of landmarks passed as landmark ID and database URI has been selected.
-             *  Use @ref RetrieveSelectionResultL(TPosLmItemId&, HBufC*&) to
-             *  get result of selection. */
-            ESelectionLinkedLandmark
-            };
-
-        /** Destructor */
-        virtual ~CMnMapView();
-
-        /** @brief Creates new instance of the class. Provider Application
-         *  will be executed standalone.
-         *
-         *  @param[in] aProvider Provider Application to be used for showing map.
-         *  @return Pointer to new instance of the class.
-         *
-         *  @leave KErrNotSupported Selected Provider Application does not support
-         *      map view services (@ref CMnProvider::EServiceMapView).
-         */
-        IMPORT_C static CMnMapView* NewL( CMnProvider& aProvider );
-
-        /** @brief Creates new instance of the class. Provider Application
-         *  will be executed chained (unless Provider Application defines that
-         *  it should be started in background).
-         *
-         *  @param[in] aProvider Provider Application to be used for showing map.
-         *  @return Pointer to new instance of the class.
-         *
-         *  @leave KErrNotSupported Selected Provider Application does not support
-         *      map view services (@ref CMnProvider::EServiceMapView).
-         */
-        IMPORT_C static CMnMapView* NewChainedL( CMnProvider& aProvider );
-
-        /** @brief Shows map on the screen.
-         *
-         *  This method completes as soon as request reaches Provider
-         *  Application. Map is shown then in Provider Application's process.
-         *
-         *  If map area is specified by SetMapAreaL(), then this area of map
-         *  will be visible, when it is shown.
-         *  Otherwise, if only list of landmarks to show is specified,
-         *  then area covering all landmarks is visible.
-         *  If Current Location Option is set to @ref
-         *  ECurrentLocationShowAlways, then it may modify visible area.
-         *
-         *  If neither area nor landmarks are specified, and current location
-         *  option is not "always", then simply last shown map (as determined by selected
-         *  provider application) is shown. If map was never shown before, then
-         *  Provider Application shows map from its default position.
-         */
-        IMPORT_C void ShowMapL();
-
-        /** @brief Shows map on the screen, with current location in the center.
-         *
-         *  This method completes as soon as request reaches Provider
-         *  Application. Map is shown then in Provider Application's process.
-         *
-         *  Same options are applied to this method as to ShowMapL()
-         *  (with the exception that area center point is ignored)
-         */
-        IMPORT_C void ShowCurrentLocationL();
-
-        /** @brief Shows map on the screen and asks user to select a position.
-         *
-         *  If EOptionsRestrictSelection option is set, then user can select
-         *  only those landmarks, which are specified with one of AddLandmarksToShowL
-         *  overrides. Otherwise any location is allowed to be selected.
-         *
-         *  User is shown a view with default selection request text. This text
-         *  can be overridden with SetCustomRequestTextL().
-         *
-         *  See SelectionResultType() for how to retrieve selection result.
-         *
-         *  This is asynchronous request and can be cancelled with Cancel().
-         *
-         *  This method can leave in case of memory lack or other system error.
-         *  If it leaves, no asynchronous request is outstanding.
-         *
-         *  @param[out] aStatus Status of asynchronous operation. Contains error code,
-         *                 when request is completed: KErrNone, if user has made
-         *                 selection, KErrCancel - if request is cancelled, or user
-         *                 refused to make selection. KErrArgument if no landmarks to
-         *                 be shown are specified and ERestrictSelection is set.
-         *                 Otherwise any of system-wide error codes.
-         *
-         *  @panic "MnClientPanic"-KMnPanicDuplicateRequest if new asynchronous request
-         *          is issued before previous one is completed.
-         */
-        IMPORT_C void SelectFromMapL( TRequestStatus& aStatus );
-
-        /** @brief Adds linked landmarks to the list of landmarks to be shown on map.
-         *
-         *  Landmarks are passed along with URL of the database, where they reside.
-         *  This allows to utilize category information from landmarks.
-         *  If landmarks from several databases shall be shown, call this method
-         *  for every such database. All landmarks are added to a single list.
-         *  To clear that list, call ResetLandmarksToShow().
-         *
-         *  @param[in] aDatabaseUri A database, to which belong landmarks, listed
-         *                      in aLandmarkIds parameter.
-         *  @param[in] aLandmarkIds IDs of landmarks to add to show list.
-         *
-         *  @leave KErrLocked Asynchronous request (SelectFromMapL) is outstanding.
-         */
-        IMPORT_C void AddLandmarksToShowL(
-            const TDesC& aDatabaseUri,
-            RArray<TPosLmItemId>& aLandmarkIds );
-
-        /** @brief Adds landmarks to the list of landmarks to be shown on map.
-         *
-         *  Landmarks are passed as instances. This variant is
-         *  for passing landmarks, which are not stored in databases.
-         *
-         *  All landmarks are added to a single list.
-         *  To clear that list, call ResetLandmarksToShow().
-         *
-         *  With large amount of landmarks, it is recommended to use overload,
-         *  which accepts linked landmarks, if possible.
-         *
-         *  @param[in] aLandmarks Array of landmarks to add to show list.
-         *
-         *  @leave KErrLocked Asynchronous request (SelectFromMapL) is outstanding.
-         */
-        IMPORT_C void AddLandmarksToShowL( RPointerArray<CPosLandmark>& aLandmarks );
-
-        /** @brief Adds landmarks to the list of landmarks to be shown on map.
-         *
-         *  Landmarks are passed as packed instances (see @p PosLandmarkSeriazation from
-         *  Landmarks API). This overload is for passing landmarks, which are not stored
-         *  in databases. It is more efficient than
-         *  AddLandmarksToShowL( RPointerArray<CPosLandmark>& ) in terms of memory usage,
-         *  if client already possess landmarks in packed form.
-         *
-         *  All landmarks are added to a single list.
-         *  To clear that list, call ResetLandmarksToShow().
-         *
-         *  With large amount of landmarks, it is recommended to use overload,
-         *  which accepts linked landmarks, if possible.
-         *
-         *  @param[in] aPackedLandmarks Array of landmarks to add to show list.
-         *
-         *  @leave KErrLocked Asynchronous request (SelectFromMapL) is outstanding.
-         */
-        IMPORT_C void AddLandmarksToShowL( RArray<TPtrC8>& aPackedLandmarks );
-
-        /** @brief Clears the list of landmarks to be shown on map. 
-         *  This call has no effect during the time when asynchronous request
-         *  (SelectFromMapL) is outstanding.
-         */
-        IMPORT_C void ResetLandmarksToShow();
-
-        /** @brief Defines the map area to be shown.
-         *  @param[in] aCentralPoint    Point on the Earth to be shown in the center
-         *                              of map view. This setting is ignored, when
-         *                              ShowCurrentLocationL() is called.
-         *  @param aRadius      Radius in meters of the area around central point,
-         *                      which should be visible, when map is shown.
-         *                      If this setting is too small, then
-         *                      Provider Application selects smallest possible
-         *                      radius (maximum zoom).
-         *                      If NaN, then Provider Application automatically
-         *                      selects appropriate zoom. This setting is ignored if
-         *                      ECurrentLocationShowAlways is set.
-         */
-        IMPORT_C void SetMapAreaL( const TCoordinate& aCentralPoint, TReal aRadius );
-
-        /** @brief Clears map area setting. */
-        IMPORT_C void ResetMapArea();
-
-        /** @brief Specifies custom request text for SelectFromMapL() request.
-         *
-         *  If not specified, than default request text will be used (as
-         *  defined in UI specification).
-         *  New setting will have effect only for next map display request.
-         *
-         *  @param[in] aCustomText Text to be shown as selection request to user.
-         */
-        IMPORT_C void SetCustomRequestTextL(const TDesC& aCustomText);
-
-        /** @brief Specifies that default request text shall be used
-         *  starting from next SelectFromMapL() request.
-         */
-        IMPORT_C void SetUseDefaultRequestText();
-
-        /** @brief Specifies how current location is shown on map.
-         *  New setting will have effect only for next map display request.
-         *  @param aCurrentLocationOption One of TCurrentLocationOption values.
-         */
-        IMPORT_C void SetCurrentLocationOption(
-            TCurrentLocationOption aCurrentLocationOption );
-
-        /** @brief Retrieves current state of current location option.
-         *  @return One of TCurrentLocationOption values.
-         */
-        IMPORT_C TCurrentLocationOption CurrentLocationOption() const;
-
-        /** @brief Sets map view options.
-         *  New settings will have effect only for next map display request.
-         *  @param aOptions Bitmap of TOption values.
-         */
-        IMPORT_C void SetOptions( TOptions aOptions );
-
-        /** @brief Retrieves current map view options.
-         *  @return Bitmap of TOption values.
-         */
-        IMPORT_C TOptions Options() const;
-
-        /** @brief  Returns type of selection result
-         *  @return One of @ref TSelectionResultType values.
-         */
-        IMPORT_C TSelectionResultType SelectionResultType() const;
-
-        /** @brief Retrieves selection result as landmark instance.
-         *  @return Landmark with information about selected location. Client takes ownership.
-         *  @leave KErrNotFound Result is not available or is of other type.
-         *      See @ref SelectionResultType() for details.
-         *
-         *  @see SelectionResultType()
-         *  @see RetrieveSelectionResultL(TInt&)
-         *  @see RetrieveSelectionResultL(TPosLmItemId&, HBufC*&)
-         */
-        IMPORT_C CPosLandmark* RetrieveSelectionResultL();
-
-        /** @brief Retrieves selection result as index of given landmark instance.
-         *  @param[out] aLandmarkIndex Index of a landmark passed as instance,
-         *                             which has been selected.
-         *  @leave KErrNotFound Result is not available or is of other type.
-         *      See @ref SelectionResultType() for details.
-         *
-         *  @see SelectionResultType()
-         *  @see RetrieveSelectionResultL()
-         *  @see RetrieveSelectionResultL(TPosLmItemId&, HBufC*&)
-         */
-        IMPORT_C void RetrieveSelectionResultL( TInt& aLandmarkIndex );
-
-        /** @brief Retrieves ID of selected landmark.
-         *  @param[out] aLandmarkId On return, ID of selected landmark in the database,
-         *                          specified by aDatabaseUri.
-         *  @param[out] aDatabaseUri On return, URI of the database of selected landmark.
-                                     Client takes ownership.
-         *  @leave KErrNotFound Result is not available or is of other type.
-         *      See @ref SelectionResultType() for details.
-         *
-         *  @see SelectionResultType()
-         *  @see RetrieveSelectionResultL()
-         *  @see RetrieveSelectionResultL(TInt&)
-         */
-        IMPORT_C void RetrieveSelectionResultL( TPosLmItemId& aLandmarkId, HBufC*& aDatabaseUri );
-
-        /** @brief Cancels current outstanding asynchronous request. */
-        IMPORT_C void Cancel();
-        
-        /** @brief Sets observer of provider application lifetime.
-         * 	Client will receive exit event from provider application.
-         *  By default exit events from provider application are not monitored.
-         *  @param[in] aObserver Exit observer.
-         *  @leave KErrAlreadyExists if observer is already set. 
-         */
-        IMPORT_C void SetExitObserverL( MAknServerAppExitObserver& aObserver );
-
-        /** @brief Removes observer of provider application lifetime. */
-        IMPORT_C void RemoveExitObserver();
-
-    private :
-        /** C++ constructor */
-        CMnMapView();
-        CMnMapView( const CMnMapView& );            //prevent default copy constructor
-        CMnMapView& operator=( const CMnMapView& ); //prevent default assignment operator
-
-        void ConstructCommonL( CMnProvider& aProvider );
-        void ConstructNewL( CMnProvider& aProvider );
-        void ConstructChainedL( CMnProvider& aProvider );
-        void PostConstructL();
-
-        HBufC* LoadResourceTextL(
-            RFs& aFsSession,
-            const TDesC& aRscFile,
-            TInt aResourceId );
-
-    private :
-        TOptions                iOptions;
-        TCurrentLocationOption  iCurrentLocationOption;
-        TCoordinate             iCentralPoint;
-        TReal                   iRadius;
-
-        HBufC*                  iDefaultRequestText;
-
-        RMnMapViewServiceClient*  iSession;
-        CApaServerAppExitMonitor* iExitMonitor;
-    };
-
-#endif // MN_MAPVIEW_H
--- a/locsrv_plat/map_and_navigation_api/inc/mnnavigator.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,114 +0,0 @@
-/*
-* Copyright (c) 2005-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:  CMnNavigator class
-*
-*/
-
-
-#ifndef MN_NAVIGATOR_H
-#define MN_NAVIGATOR_H
-
-#include <e32base.h>
-
-class CApaServerAppExitMonitor;
-class MAknServerAppExitObserver;
-class CMnProvider;
-class CPosLandmark;
-class RMnNavigationServiceClient;
-
-/** @brief Provides navigation features.
- *
- *  To create an instance of the class, use @ref NewL or @ref NewChainedL methods. They
- *  require instance of CMnProvider, defined in Map and Navigation Provider Discovery API.
- *
- *  @since 3.1
- *  @lib mnclientlib.dll
- *  @ingroup MapNavAPI
- */
-class CMnNavigator : public CBase
-    {
-    public :
-        /** Destructor */
-        IMPORT_C ~CMnNavigator();
-
-        /** @brief Creates new instance of the class. Provider Application
-         *  will be executed standalone.
-         *
-         *  @param[in] aProvider Provider Application to be used for navigation.
-         *  @return Pointer to new instance of the class.
-         *
-         *  @leave KErrNotSupported Selected Provider Application does not support
-         *      navigation services (CMnProvider::EServiceNavigation).
-         */
-        IMPORT_C static CMnNavigator* NewL( CMnProvider& aProvider );
-
-        /** @brief Creates new instance of the class. Provider Application
-         *  will be executed chained (unless Provider Application defines that
-         *  it should be started in background).
-         *
-         *  @param[in] aProvider Provider Application to be used for navigation.
-         *  @return Pointer to new instance of the class.
-         *
-         *  @leave KErrNotSupported Selected Provider Application does not support
-         *      navigation services (CMnProvider::EServiceNavigation).
-         */
-        IMPORT_C static CMnNavigator* NewChainedL( CMnProvider& aProvider );
-
-        /** @brief Starts navigation from current location to specified destination.
-         *
-         *  This method completes as soon as navigation request reaches Provider
-         *  Application. Navigation is held then in Provider Application's process.
-         *
-         *  Navigation destination is specified as landmark. This landmark
-         *  does not have to contain coordinate information, in which case
-         *  its address information will be used, if present. If neither
-         *  coordinate nor address information is present in the landmark,
-         *  then this method leaves with KErrArgument.
-         *
-         *  This is synchronous request. It is completed as soon as navigation
-         *  starts on Provider Application side.
-         *
-         *  @param[in] aDestination Navigation destination.
-         *
-         *  @leave KErrArgument if neither coordinate nor address information is present in the landmark
-         */
-        IMPORT_C void NavigateToL( const CPosLandmark& aDestination );
-
-        /** @brief Sets observer of provider application lifetime.
-         * 	Client will receive exit event from provider application.
-         *  By default exit events from provider application are not monitored.
-         *  @param[in] aObserver Exit observer.
-         *  @leave KErrAlreadyExists if observer is already set. 
-         */
-        IMPORT_C void SetExitObserverL( MAknServerAppExitObserver& aObserver );
-
-        /** @brief Removes observer of provider application lifetime. */
-        IMPORT_C void RemoveExitObserver();
-
-    private :
-        /** C++ constructor */
-        CMnNavigator();
-
-        void ConstructCommonL( CMnProvider& aProvider );
-        void ConstructNewL( CMnProvider& aProvider );
-        void ConstructChainedL( CMnProvider& aProvider );
-
-    private :
-
-        RMnNavigationServiceClient* iSession;
-        CApaServerAppExitMonitor* iExitMonitor;
-    };
-
-#endif // MN_NAVIGATOR_H
-
--- a/locsrv_plat/map_and_navigation_api/map_and_navigation_api.metaxml	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
-<?xml version="1.0" ?>
-<api id="a1e4ccc05687b09ddcb73974ba3bccfa" dataversion="2.0">
-  <name>Map and Navigation API</name>
-  <description>This API provides access to map and navgation features, such as showing maps, navigating etc.</description>
-  <type>c++</type>
-  <collection>locationmapnavfw</collection>
-  <libs>
-    <lib name="mnclientlib.lib" />
-  </libs>
-  <release category="platform" sinceversion="0"/>
-  <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>no</htmldocprovided>
-     <adaptation>no</adaptation>
-  </attributes>
-</api>
--- a/locsrv_plat/map_and_navigation_api/tsrc/bmarm/testmapandnavapiu.def	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-EXPORTS
-	LibEntryL__FR13CTestModuleIf @ 1 NONAME R3UNUSED ; LibEntryL(CTestModuleIf &)
-
--- a/locsrv_plat/map_and_navigation_api/tsrc/bwins/testmapandnavapiu.def	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-EXPORTS
-	?LibEntryL@@YAPAVCScriptBase@@AAVCTestModuleIf@@@Z @ 1 NONAME ; class CScriptBase * __cdecl LibEntryL(class CTestModuleIf &)
-
--- a/locsrv_plat/map_and_navigation_api/tsrc/conf/testmapandnavapi.cfg	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,139 +0,0 @@
-[Define]
-KErrNotFound -1
-KErrNotSupported -5
-KErrArgument -6
-KErrAlreadyExists -11 
-[Enddefine]
-
-[Test]
-title Create Navigator
-create testmapandnavapi foobar
-foobar CreateNavigator
-delete foobar
-[Endtest] 
-
-[Test]
-title Set Navigator Exit Observer
-create testmapandnavapi foobar
-foobar SetNavigatorExitObserver
-delete foobar
-[Endtest] 
-
-[Test]
-title Remove Navigator Exit Observer
-create testmapandnavapi foobar
-foobar RemoveNavigatorExitObserver
-delete foobar
-[Endtest] 
-
-[Test]
-title Create MapView
-create testmapandnavapi foobar
-foobar CreateMapView
-delete foobar
-[Endtest]
-
-[Test]
-title Add Linked Landmarks To Show
-create testmapandnavapi foobar
-foobar AddLinkedLmksToShow
-delete foobar
-[Endtest]  
-
-[Test]
-title Add Landmarks To Show
-create testmapandnavapi foobar
-foobar AddLmksToShow
-delete foobar
-[Endtest]
-
-[Test]
-title Add Packed Landmarks To Show
-create testmapandnavapi foobar
-foobar AddPackedLmksToShow
-delete foobar
-[Endtest]  
-
-[Test]
-title Reset Landmarks To Show
-create testmapandnavapi foobar
-foobar ResetLmksToShow
-delete foobar
-[Endtest]  
-
-[Test]
-title Set Map Area
-create testmapandnavapi foobar
-foobar SetMapArea
-delete foobar
-[Endtest]
-
-[Test]
-title Reset Map Area
-create testmapandnavapi foobar
-foobar ResetMapArea
-delete foobar
-[Endtest]
-
-[Test]
-title Set Custom Request Text
-create testmapandnavapi foobar
-foobar SetCustomRequestText Select_A_Position
-delete foobar
-[Endtest]
-
-[Test]
-title Set Use Default Request Text
-create testmapandnavapi foobar
-foobar SetUseDefaultRequestText 
-delete foobar
-[Endtest]
-
-[Test]
-title Set Current Location Option
-create testmapandnavapi foobar
-foobar SetCurrentLocationOption
-delete foobar
-[Endtest]
-
-[Test]
-title Get Current Location Option
-create testmapandnavapi foobar
-foobar GetCurrentLocationOption
-delete foobar
-[Endtest]
-
-[Test]
-title Set And Get Map View Option
-create testmapandnavapi foobar
-foobar SetAndGetOptions
-delete foobar
-[Endtest]
-
-[Test]
-title Get Selection Result Type
-create testmapandnavapi foobar
-foobar SelectionResultType
-delete foobar
-[Endtest]
-
-[Test]
-title Select From Map
-create testmapandnavapi foobar
-foobar SelectFromMap
-delete foobar
-[Endtest]
-
-[Test]
-title Set View Exit Observer
-create testmapandnavapi foobar
-foobar SetViewExitObserver
-delete foobar
-[Endtest]
-
-[Test]
-title Remove View Exit Observer
-create testmapandnavapi foobar
-foobar RemoveViewExitObserver
-delete foobar
-[Endtest]
\ No newline at end of file
Binary file locsrv_plat/map_and_navigation_api/tsrc/data/armv5/urel/MnRefProvider.mbm has changed
Binary file locsrv_plat/map_and_navigation_api/tsrc/data/armv5/urel/MnRefProvider.mif has changed
Binary file locsrv_plat/map_and_navigation_api/tsrc/data/armv5/urel/MnRefProvider.rsc has changed
Binary file locsrv_plat/map_and_navigation_api/tsrc/data/armv5/urel/MnRefProviderPlugin.dll has changed
--- a/locsrv_plat/map_and_navigation_api/tsrc/data/armv5/urel/MnRefProviderPlugin.dll.map	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,160 +0,0 @@
-ARM Linker, RVCT2.2 [Build 593]
-
-================================================================================
-
-Image Symbol Table
-
-    Local Symbols
-
-    Symbol Name                              Value     Ov Type        Size  Object(Section)
-
-    [Anonymous Symbol]                       0x00000000   Number         0  drtaeabi{000a0000}-184.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnrefproviderengine{000a0000}-43.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnclientlib{000a0000}-97.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  scppnwdl{000a0000}-3.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnrefproviderengine{000a0000}-44.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnrefproviderengine{000a0000}-12.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  drtaeabi{000a0000}-158.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  drtaeabi{000a0000}-147.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnrefproviderengine{000a0000}-16.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnclientlib{000a0000}-101.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-208.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnrefproviderengine{000a0000}-21.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-654.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-2123.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnclientlib{000a0000}-100.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-205.o ABSOLUTE
-    M:/epoc32/build/compsupp/c_18558cc638e6e874/drtaeabi_dll/armv5/udeb\VtblExports.s 0x00000000   Number         0  VtblExports.o ABSOLUTE
-    M:\\sf\\os\\kernelhwsrv\\kernel\\eka\\compsupp\\rvct2_2\\ucppinit_aeabi.cpp 0x00000000   Number         0  ucppinit_aeabi.o ABSOLUTE
-    M:\sf\os\kernelhwsrv\kernel\eka\compsupp\rvct2_2\ucppinit_aeabi.cpp 0x00000000   Number         0  ucppinit_aeabi.o ABSOLUTE
-    \EPOC32\BUILD\sf\app\location\group\MNREFENGINE\ARMV5\VtblExports.s 0x00000000   Number         0  VtblExports.o ABSOLUTE
-    \EPOC32\BUILD\sf\app\location\mapnavproviderrefapp\group\MNREFPROVIDERPLUGIN\ARMV5\urel\MnRefProviderPlugin{000a0000}.s 0x00000000   Number         0  MnRefProviderPlugin{000a0000}.exp ABSOLUTE
-    \EPOC32\BUILD\sf\mw\locationsrv\group\MNCLIENTLIB\ARMV5\VtblExports.s 0x00000000   Number         0  VtblExports.o ABSOLUTE
-    \EPOC32\BUILD\sf\os\kernelhwsrv\kernel\eka\euser\EDLL\ARMV6_ABIV1\urel\uc_dll_.cpp 0x00000000   Number         0  uc_dll_.o ABSOLUTE
-    \EPOC32\BUILD\sf\os\kernelhwsrv\kernel\eka\euser\EUSER\ARMV5\VtblExports.s 0x00000000   Number         0  VtblExports.o ABSOLUTE
-    \EPOC32\BUILD\sf\os\lbs\locationmgmt\locationadmin\group\LBSAPIVARIANT2\ARMV5\VtblExports.s 0x00000000   Number         0  VtblExports.o ABSOLUTE
-    \\EPOC32\\BUILD\\sf\\os\\kernelhwsrv\\kernel\\eka\\euser\\EDLL\\ARMV6_ABIV1\\urel\\uc_dll_.cpp 0x00000000   Number         0  uc_dll_.o ABSOLUTE
-    \sf\app\location\mapnavproviderrefapp\src\mnrefproviderplugin.cpp 0x00000000   Number         0  MnRefProviderPlugin.in ABSOLUTE
-    \sf\app\location\mapnavproviderrefapp\src\mnrpcoordconverter.cpp 0x00000000   Number         0  MnRefProviderPlugin.in ABSOLUTE
-    \sf\os\kernelhwsrv\kernel\eka\euser\epoc\arm\uc_dll.cpp 0x00000000   Number         0  uc_dll.o ABSOLUTE
-    .emb_text                                0x00008000   Section       40  uc_dll_.o(.emb_text)
-    .emb_text                                0x00008028   Section       72  ucppinit_aeabi.o(.emb_text)
-    skip                                     0x0000803c   ARM Code       0  ucppinit_aeabi.o(.emb_text)
-    loop                                     0x0000804c   ARM Code       0  ucppinit_aeabi.o(.emb_text)
-    fpinit                                   0x00008064   Data           0  ucppinit_aeabi.o(.emb_text)
-    base                                     0x00008068   Data           0  ucppinit_aeabi.o(.emb_text)
-    limit                                    0x0000806c   Data           0  ucppinit_aeabi.o(.emb_text)
-    .text                                    0x00008070   Section       12  MnRefProviderPlugin.in(.text)
-    .text                                    0x0000807c   Section      232  MnRefProviderPlugin.in(.text)
-    .text                                    0x00008164   Section       40  uc_dll.o(.text)
-    .text.clean                              0x0000818c   Section       10  MnRefProviderPlugin.in(.text.clean)
-    ExportTable                              0x00008198   Section       12  MnRefProviderPlugin{000a0000}.exp(ExportTable)
-    StubCode                                 0x000081a4   Section        8  euser{000a0000}-205.o(StubCode)
-    theImportedSymbol                        0x000081a8   Data           0  euser{000a0000}-205.o(StubCode)
-    StubCode                                 0x000081ac   Section        8  euser{000a0000}-208.o(StubCode)
-    theImportedSymbol                        0x000081b0   Data           0  euser{000a0000}-208.o(StubCode)
-    StubCode                                 0x000081b4   Section        8  euser{000a0000}-2123.o(StubCode)
-    theImportedSymbol                        0x000081b8   Data           0  euser{000a0000}-2123.o(StubCode)
-    StubCode                                 0x000081bc   Section        8  euser{000a0000}-654.o(StubCode)
-    theImportedSymbol                        0x000081c0   Data           0  euser{000a0000}-654.o(StubCode)
-    StubCode                                 0x000081c4   Section        8  mnclientlib{000a0000}-100.o(StubCode)
-    theImportedSymbol                        0x000081c8   Data           0  mnclientlib{000a0000}-100.o(StubCode)
-    StubCode                                 0x000081cc   Section        8  mnclientlib{000a0000}-101.o(StubCode)
-    theImportedSymbol                        0x000081d0   Data           0  mnclientlib{000a0000}-101.o(StubCode)
-    StubCode                                 0x000081d4   Section        8  mnclientlib{000a0000}-97.o(StubCode)
-    theImportedSymbol                        0x000081d8   Data           0  mnclientlib{000a0000}-97.o(StubCode)
-    StubCode                                 0x000081dc   Section        8  mnrefproviderengine{000a0000}-12.o(StubCode)
-    theImportedSymbol                        0x000081e0   Data           0  mnrefproviderengine{000a0000}-12.o(StubCode)
-    StubCode                                 0x000081e4   Section        8  mnrefproviderengine{000a0000}-16.o(StubCode)
-    theImportedSymbol                        0x000081e8   Data           0  mnrefproviderengine{000a0000}-16.o(StubCode)
-    StubCode                                 0x000081ec   Section        8  mnrefproviderengine{000a0000}-21.o(StubCode)
-    theImportedSymbol                        0x000081f0   Data           0  mnrefproviderengine{000a0000}-21.o(StubCode)
-    StubCode                                 0x000081f4   Section        8  mnrefproviderengine{000a0000}-43.o(StubCode)
-    theImportedSymbol                        0x000081f8   Data           0  mnrefproviderengine{000a0000}-43.o(StubCode)
-    StubCode                                 0x000081fc   Section        8  mnrefproviderengine{000a0000}-44.o(StubCode)
-    theImportedSymbol                        0x00008200   Data           0  mnrefproviderengine{000a0000}-44.o(StubCode)
-    StubCode                                 0x00008204   Section        8  drtaeabi{000a0000}-147.o(StubCode)
-    theImportedSymbol                        0x00008208   Data           0  drtaeabi{000a0000}-147.o(StubCode)
-    StubCode                                 0x0000820c   Section        8  drtaeabi{000a0000}-158.o(StubCode)
-    theImportedSymbol                        0x00008210   Data           0  drtaeabi{000a0000}-158.o(StubCode)
-    StubCode                                 0x00008214   Section        8  drtaeabi{000a0000}-184.o(StubCode)
-    theImportedSymbol                        0x00008218   Data           0  drtaeabi{000a0000}-184.o(StubCode)
-    StubCode                                 0x0000821c   Section        8  scppnwdl{000a0000}-3.o(StubCode)
-    theImportedSymbol                        0x00008220   Data           0  scppnwdl{000a0000}-3.o(StubCode)
-    .extab._ZN19CMnrpCoordConverterD1Ev      0x00008224   Data           0  MnRefProviderPlugin.in(.ARM.extab)
-    .constdata$1                             0x00008234   Data           0  MnRefProviderPlugin.in(.constdata)
-    ImplementationTable                      0x00008234   Data           8  MnRefProviderPlugin.in(.constdata)
-    .constdata                               0x00008234   Section        8  MnRefProviderPlugin.in(.constdata)
-    .constdata__ZTI19CMnrpCoordConverter     0x0000823c   Section       12  MnRefProviderPlugin.in(.constdata__ZTI19CMnrpCoordConverter)
-    .constdata__ZTS19CMnrpCoordConverter     0x00008248   Section       22  MnRefProviderPlugin.in(.constdata__ZTS19CMnrpCoordConverter)
-    .constdata__ZTV19CMnrpCoordConverter     0x00008260   Section       28  MnRefProviderPlugin.in(.constdata__ZTV19CMnrpCoordConverter)
-    .ARM.exidx                               0x0000827c   Section        8  ucppinit_aeabi.o(.ARM.exidx)
-
-    Global Symbols
-
-    Symbol Name                              Value     Ov Type        Size  Object(Section)
-
-    BuildAttributes$$THUMB_ISAv3$ARM_ISAv6$M$E$P$PE$A:L22$X:L11$S22$IEEE1$IW$USESV6$~STKCKD$USESV7$~SHL$OSPACE$IEEEJ$EBA8$UX$REQ8$PRES8$EABIv2 0x00000000   Number         0  anon$$obj.o ABSOLUTE
-    #<DLL>drtaeabi{000a0000}.dll#<\DLL>93     - Undefined Reference
-    #<DLL>drtaeabi{000a0000}.dll#<\DLL>9e     - Undefined Reference
-    #<DLL>drtaeabi{000a0000}.dll#<\DLL>b8     - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>28e  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>84b  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>cd  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>d0  - Undefined Reference
-    #<DLL>mnclientlib{000a0000}[10206902].dll#<\DLL>61  - Undefined Reference
-    #<DLL>mnclientlib{000a0000}[10206902].dll#<\DLL>64  - Undefined Reference
-    #<DLL>mnclientlib{000a0000}[10206902].dll#<\DLL>65  - Undefined Reference
-    #<DLL>mnrefproviderengine{000a0000}[03132015].dll#<\DLL>10  - Undefined Reference
-    #<DLL>mnrefproviderengine{000a0000}[03132015].dll#<\DLL>15  - Undefined Reference
-    #<DLL>mnrefproviderengine{000a0000}[03132015].dll#<\DLL>2b  - Undefined Reference
-    #<DLL>mnrefproviderengine{000a0000}[03132015].dll#<\DLL>2c  - Undefined Reference
-    #<DLL>mnrefproviderengine{000a0000}[03132015].dll#<\DLL>c  - Undefined Reference
-    #<DLL>scppnwdl{000a0000}.dll#<\DLL>3      - Undefined Reference
-    SHT$$INIT_ARRAY$$Base                     - Undefined Weak Reference
-    SHT$$INIT_ARRAY$$Limit                    - Undefined Weak Reference
-    typeinfo for CMnCoordinateConverterBase   - Undefined Reference
-    vtable for __cxxabiv1::__si_class_type_info  - Undefined Reference
-    _fp_init                                  - Undefined Weak Reference
-    run_static_dtors                          - Undefined Weak Reference
-    Image$$ER_RO$$Base                       0x00008000   Number         0  anon$$obj.o(linker$$defined$$symbols)
-    _E32Dll                                  0x00008000   ARM Code      40  uc_dll_.o(.emb_text)
-    Symbian$$CPP$$Exception$$Descriptor      0x00008014   Data           0  uc_dll_.o(.emb_text)
-    __cpp_initialize__aeabi_                 0x00008028   ARM Code      72  ucppinit_aeabi.o(.emb_text)
-    ImplementationGroupProxy(int&)           0x00008071   Thumb Code     8  MnRefProviderPlugin.in(.text)
-    std::nothrow                             0x00008071   Thumb Code     0  ucppinit_aeabi.o(.emb_text)
-    CMnrpCoordConverter::CMnrpCoordConverter() 0x0000807d   Thumb Code    12  MnRefProviderPlugin.in(.text)
-    CMnrpCoordConverter::CMnrpCoordConverter__sub_object() 0x0000807d   Thumb Code     0  MnRefProviderPlugin.in(.text)
-    CMnrpCoordConverter::NewL()              0x00008089   Thumb Code    38  MnRefProviderPlugin.in(.text)
-    CMnrpCoordConverter::~CMnrpCoordConverter() 0x000080af   Thumb Code    40  MnRefProviderPlugin.in(.text)
-    CMnrpCoordConverter::~CMnrpCoordConverter__sub_object() 0x000080af   Thumb Code     0  MnRefProviderPlugin.in(.text)
-    CMnrpCoordConverter::~CMnrpCoordConverter__deallocating() 0x000080d7   Thumb Code    16  MnRefProviderPlugin.in(.text)
-    CMnrpCoordConverter::GetImageCoordinate(const TCoordinate&, TPoint&) 0x000080e7   Thumb Code    62  MnRefProviderPlugin.in(.text)
-    CMnrpCoordConverter::GetWorldCoordinate(const TPoint&, TCoordinate&) 0x00008125   Thumb Code    60  MnRefProviderPlugin.in(.text)
-    _E32Dll_Body                             0x00008165   Thumb Code    34  uc_dll.o(.text)
-    __DLL_Export_Table__                     0x00008198   ARM Code       0  MnRefProviderPlugin{000a0000}.exp(ExportTable)
-    DLL##ExportTableSize                     0x0000819c   Data           0  MnRefProviderPlugin{000a0000}.exp(ExportTable)
-    DLL##ExportTable                         0x000081a0   Data           0  MnRefProviderPlugin{000a0000}.exp(ExportTable)
-    CleanupStack::Pop()                      0x000081a4   ARM Code       0  euser{000a0000}-205.o(StubCode)
-    CleanupStack::PushL(CBase*)              0x000081ac   ARM Code       0  euser{000a0000}-208.o(StubCode)
-    CBase::Extension_(unsigned, void*&, void*) 0x000081b4   ARM Code       0  euser{000a0000}-2123.o(StubCode)
-    User::AllocZL(int)                       0x000081bc   ARM Code       0  euser{000a0000}-654.o(StubCode)
-    CMnCoordinateConverterBase::~CMnCoordinateConverterBase__sub_object() 0x000081c4   ARM Code       0  mnclientlib{000a0000}-100.o(StubCode)
-    CMnCoordinateConverterBase::MapImageParams() const 0x000081cc   ARM Code       0  mnclientlib{000a0000}-101.o(StubCode)
-    CMnCoordinateConverterBase::CMnCoordinateConverterBase__sub_object() 0x000081d4   ARM Code       0  mnclientlib{000a0000}-97.o(StubCode)
-    CMnrpEngine::NewL()                      0x000081dc   ARM Code       0  mnrefproviderengine{000a0000}-12.o(StubCode)
-    CMnrpMapModel::UpdateModel(const TMnMapImageParams&) 0x000081e4   ARM Code       0  mnrefproviderengine{000a0000}-16.o(StubCode)
-    CMnrpMapModel::NewL(CMnrpEngine&)        0x000081ec   ARM Code       0  mnrefproviderengine{000a0000}-21.o(StubCode)
-    CMnrpMapModel::AbsoluteToScreen(TCoordinate) const 0x000081f4   ARM Code       0  mnrefproviderengine{000a0000}-43.o(StubCode)
-    CMnrpMapModel::ScreenToAbsolute(TPoint) const 0x000081fc   ARM Code       0  mnrefproviderengine{000a0000}-44.o(StubCode)
-    __aeabi_memcpy4                          0x00008204   ARM Code       0  drtaeabi{000a0000}-147.o(StubCode)
-    __aeabi_unwind_cpp_pr0                   0x0000820c   ARM Code       0  drtaeabi{000a0000}-158.o(StubCode)
-    __cxa_end_cleanup                        0x00008214   ARM Code       0  drtaeabi{000a0000}-184.o(StubCode)
-    operator delete (void*)                  0x0000821c   ARM Code       0  scppnwdl{000a0000}-3.o(StubCode)
-    typeinfo for CMnrpCoordConverter         0x0000823c   Data          12  MnRefProviderPlugin.in(.constdata__ZTI19CMnrpCoordConverter)
-    typeinfo name for CMnrpCoordConverter    0x00008248   Data          22  MnRefProviderPlugin.in(.constdata__ZTS19CMnrpCoordConverter)
-    vtable for CMnrpCoordConverter           0x00008260   Data          28  MnRefProviderPlugin.in(.constdata__ZTV19CMnrpCoordConverter)
-    .ARM.exidx$$Base                         0x0000827c   Number         0  ucppinit_aeabi.o(.ARM.exidx)
-    .ARM.exidx$$Limit                        0x000082b4   Number         0  uc_dll.o(.ARM.exidx)
-    Image$$ER_RO$$Limit                      0x000082b4   Number         0  anon$$obj.o(linker$$defined$$symbols)
-
Binary file locsrv_plat/map_and_navigation_api/tsrc/data/armv5/urel/MnRefProvider_reg.rsc has changed
Binary file locsrv_plat/map_and_navigation_api/tsrc/data/armv5/urel/mnrefprovider.exe has changed
--- a/locsrv_plat/map_and_navigation_api/tsrc/data/armv5/urel/mnrefprovider.exe.map	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2589 +0,0 @@
-ARM Linker, RVCT2.2 [Build 593]
-
-================================================================================
-
-Image Symbol Table
-
-    Local Symbols
-
-    Symbol Name                              Value     Ov Type        Size  Object(Section)
-
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-374.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-73.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-29.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-375.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-74.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-291.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-377.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-75.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-293.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-3826.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-76.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-294.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-3831.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-77.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-295.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-3832.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-78.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-296.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-3857.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-79.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-297.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-3860.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcoctl{000a0000}-1376.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-298.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-3861.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcoctl{000a0000}-140.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-299.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-3868.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcoctl{000a0000}-1430.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-30.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-3947.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcoctl{000a0000}-35.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-302.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-3948.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcoctl{000a0000}-46.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-31.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-3949.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcoctl{000a0000}-605.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-315.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-3983.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcoctl{000a0000}-606.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-317.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-4014.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcoctl{000a0000}-660.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-319.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-4030.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcoctl{000a0000}-875.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-352.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  AknIcon{000a0000}-13.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcoctl{000a0000}-880.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-37.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  egul{000a0000}-94.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcoctl{000a0000}-881.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-390.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  egul{000a0000}-95.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikctl{000a0000}-455.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-392.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  gdi{000a0000}-310.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-1132.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-394.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  gdi{000a0000}-311.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-129.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-467.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  gdi{000a0000}-312.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-130.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-472.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  fbscli{000a0000}-26.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-131.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-473.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  fbscli{000a0000}-31.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-1341.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-479.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eposlandmarks{000a0000}-12.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-198.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-490.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eposlandmarks{000a0000}-15.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-199.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-506.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eposlandmarks{000a0000}-4.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-1996.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-523.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eposlandmarks{000a0000}-50.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-201.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-532.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eposlandmarks{000a0000}-65.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-206.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-533.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eposlandmarks{000a0000}-67.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-211.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-534.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eposlandmarks{000a0000}-75.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-213.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-535.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  lbs{000a0000}-152.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-214.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-536.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  lbs{000a0000}-180.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-215.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-537.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  lbs{000a0000}-181.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-216.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-565.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  lbs{000a0000}-205.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-2163.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-61.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  lbs{000a0000}-207.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-217.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-62.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  lbs{000a0000}-21.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-2178.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-63.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  lbs{000a0000}-214.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-220.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-64.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  lbs{000a0000}-223.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-2591.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-67.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  lbs{000a0000}-225.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-2624.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-72.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  lbs{000a0000}-226.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-2632.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnrefproviderengine{000a0000}-39.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  lbs{000a0000}-23.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-2895.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnrefproviderengine{000a0000}-40.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  lbs{000a0000}-28.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-2898.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnrefproviderengine{000a0000}-41.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  lbs{000a0000}-304.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-2899.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnrefproviderengine{000a0000}-42.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  lbs{000a0000}-306.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-2900.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnrefproviderengine{000a0000}-43.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnservicelib{000a0000}-1.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-2901.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnrefproviderengine{000a0000}-44.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnservicelib{000a0000}-10.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-2902.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnrefproviderengine{000a0000}-45.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnservicelib{000a0000}-11.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-2903.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnrefproviderengine{000a0000}-46.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnservicelib{000a0000}-12.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-2904.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnrefproviderengine{000a0000}-47.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnservicelib{000a0000}-13.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-2905.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnrefproviderengine{000a0000}-48.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnservicelib{000a0000}-14.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-2906.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnrefproviderengine{000a0000}-50.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnservicelib{000a0000}-15.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-2907.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnrefproviderengine{000a0000}-51.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnservicelib{000a0000}-16.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-2909.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnrefproviderengine{000a0000}-53.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnservicelib{000a0000}-17.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-2910.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnrefproviderengine{000a0000}-54.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnservicelib{000a0000}-2.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-2912.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  dfpaeabi{000a0000}-12.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnservicelib{000a0000}-20.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-2913.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  dfpaeabi{000a0000}-20.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnservicelib{000a0000}-28.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-2914.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  dfpaeabi{000a0000}-23.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnservicelib{000a0000}-29.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-2917.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  dfpaeabi{000a0000}-24.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnservicelib{000a0000}-30.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-2919.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  dfpaeabi{000a0000}-41.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnservicelib{000a0000}-33.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-2920.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  dfpaeabi{000a0000}-8.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnservicelib{000a0000}-4.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-2922.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  drtaeabi{000a0000}-147.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnservicelib{000a0000}-5.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-2928.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  drtaeabi{000a0000}-158.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnservicelib{000a0000}-7.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-2929.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  drtaeabi{000a0000}-159.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnrefproviderengine{000a0000}-12.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-2930.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  drtaeabi{000a0000}-180.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnrefproviderengine{000a0000}-17.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-2932.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  drtaeabi{000a0000}-182.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnrefproviderengine{000a0000}-19.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-2934.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  drtaeabi{000a0000}-183.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnrefproviderengine{000a0000}-20.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-2936.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  drtaeabi{000a0000}-184.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnrefproviderengine{000a0000}-22.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-2993.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  drtaeabi{000a0000}-189.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnrefproviderengine{000a0000}-23.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-2997.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  scppnwdl{000a0000}-3.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnrefproviderengine{000a0000}-24.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-3417.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-1360.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnrefproviderengine{000a0000}-25.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-3420.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-641.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnrefproviderengine{000a0000}-26.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-1025.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-159.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnrefproviderengine{000a0000}-27.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-1096.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-169.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnrefproviderengine{000a0000}-28.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-1116.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-171.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnrefproviderengine{000a0000}-29.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-1119.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-175.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnrefproviderengine{000a0000}-30.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-1172.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-18.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnrefproviderengine{000a0000}-31.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-1288.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-20.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnrefproviderengine{000a0000}-32.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-1507.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-25.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnrefproviderengine{000a0000}-33.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-1510.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-26.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnrefproviderengine{000a0000}-34.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-1553.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  drtaeabi{000a0000}-204.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnrefproviderengine{000a0000}-38.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-1590.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-28.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-829.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-1593.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-197.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-830.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-1648.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-199.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-838.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-1817.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-203.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-839.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-1995.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-21.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-841.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-1997.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-210.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-842.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-1999.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-211.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-973.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-203.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-212.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  apparc{000a0000}-121.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-204.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-220.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  apparc{000a0000}-132.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-205.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-25.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  apparc{000a0000}-171.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-2060.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-257.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  apparc{000a0000}-191.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-2061.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-26.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  apparc{000a0000}-192.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-207.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-263.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  apparc{000a0000}-194.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-208.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-265.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  apparc{000a0000}-202.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-2082.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-266.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  apparc{000a0000}-222.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-2120.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-270.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  apparc{000a0000}-232.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-2123.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-271.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  apparc{000a0000}-253.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-2125.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-272.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  apparc{000a0000}-273.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-2131.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-275.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  apparc{000a0000}-274.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-245.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-276.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  apparc{000a0000}-275.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-250.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-287.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  apparc{000a0000}-279.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-254.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-288.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  apparc{000a0000}-280.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-257.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-29.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  apparc{000a0000}-284.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-46.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-30.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  apparc{000a0000}-285.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-464.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-351.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  apparc{000a0000}-286.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-470.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-353.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  apparc{000a0000}-287.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-471.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-355.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  apparc{000a0000}-30.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-472.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-36.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  bafl{000a0000}-43.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-476.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-39.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  bafl{000a0000}-98.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-48.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-396.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-100.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-481.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-397.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-101.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-55.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-3421.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-11.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-551.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-3422.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-12.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-593.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-3423.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-127.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-613.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-3424.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-128.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-649.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-367.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-13.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-652.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-368.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-15.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-654.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-369.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-18.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-669.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-370.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-182.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-81.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-372.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-19.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-824.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-373.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-196.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-638.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-50.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-147.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-639.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-502.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-152.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-64.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-51.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-155.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-664.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-514.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-158.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-67.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-56.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-9.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-670.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-57.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-141.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-671.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-580.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-142.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-676.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-581.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-143.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-677.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-582.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-144.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-482.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-583.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-41.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-61.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-584.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-42.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-62.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-27.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-444.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-585.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-477.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-48.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-40.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-478.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-479.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-650.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-474.o ABSOLUTE
-    M:/epoc32/build/apputils/c_da81efa927799d7f/bafl_dll/armv5/udeb\VtblExports.s 0x00000000   Number         0  VtblExports.o ABSOLUTE
-    M:/epoc32/build/compsupp/c_18558cc638e6e874/drtaeabi_dll/armv5/udeb\VtblExports.s 0x00000000   Number         0  VtblExports.o ABSOLUTE
-    M:/epoc32/build/cone/c_17e36feeaf3b2ee8/cone_dll/armv5/udeb\VtblExports.s 0x00000000   Number         0  VtblExports.o ABSOLUTE
-    M:/epoc32/build/fontandbitmapserver/c_7ea974cb4182c047/fbscli_dll/armv5/udeb\VtblExports.s 0x00000000   Number         0  VtblExports.o ABSOLUTE
-    M:/epoc32/build/gdi/c_5dab287815cadb7b/gdi_dll/armv5/udeb\VtblExports.s 0x00000000   Number         0  VtblExports.o ABSOLUTE
-    M:/epoc32/build/imagingfws/c_c0b0915f285c9e63/imageconversion_dll/armv5/udeb\VtblExports.s 0x00000000   Number         0  VtblExports.o ABSOLUTE
-    M:/epoc32/build/store/c_93a13d203e6d3ba7/estor_dll/armv5/udeb\VtblExports.s 0x00000000   Number         0  VtblExports.o ABSOLUTE
-    M:/epoc32/build/uigraphicsutils/c_d265b80414e63acf/egul_dll/armv5/udeb\VtblExports.s 0x00000000   Number         0  VtblExports.o ABSOLUTE
-    M:/epoc32/build/uikon/c_9cf7bef4a7562444/eikcore_dll/armv5/udeb\VtblExports.s 0x00000000   Number         0  VtblExports.o ABSOLUTE
-    M:\\sf\\os\\kernelhwsrv\\kernel\\eka\\compsupp\\rvct2_2\\ucppinit_aeabi.cpp 0x00000000   Number         0  ucppinit_aeabi.o ABSOLUTE
-    M:\sf\os\kernelhwsrv\kernel\eka\compsupp\rvct2_2\dllexp.cpp 0x00000000   Number         0  dllexp.o ABSOLUTE
-    M:\sf\os\kernelhwsrv\kernel\eka\compsupp\rvct2_2\ucppinit_aeabi.cpp 0x00000000   Number         0  ucppinit_aeabi.o ABSOLUTE
-    M:\sf\os\kernelhwsrv\kernel\eka\compsupp\symaehabi\callfirstprocessfn.cpp 0x00000000   Number         0  callfirstprocessfn.o ABSOLUTE
-    \EPOC32\BUILD\sf\app\location\group\MNREFENGINE\ARMV5\VtblExports.s 0x00000000   Number         0  VtblExports.o ABSOLUTE
-    \EPOC32\BUILD\sf\mw\appsupport\appfw\apparchitecture\group\APPARC\ARMV5\VtblExports.s 0x00000000   Number         0  VtblExports.o ABSOLUTE
-    \EPOC32\BUILD\sf\mw\classicui\group\AVKON\ARMV5\VtblExports.s 0x00000000   Number         0  VtblExports.o ABSOLUTE
-    \EPOC32\BUILD\sf\mw\classicui\group\EIKCOCTL\ARMV5\VtblExports.s 0x00000000   Number         0  VtblExports.o ABSOLUTE
-    \EPOC32\BUILD\sf\mw\classicui\group\EIKCTL\ARMV5\VtblExports.s 0x00000000   Number         0  VtblExports.o ABSOLUTE
-    \EPOC32\BUILD\sf\mw\classicui\group\EIKDLG\ARMV5\VtblExports.s 0x00000000   Number         0  VtblExports.o ABSOLUTE
-    \EPOC32\BUILD\sf\mw\locationsrv\group\EPOS_LANDMARKSCLIENTLIBRARY\ARMV5\VtblExports.s 0x00000000   Number         0  VtblExports.o ABSOLUTE
-    \EPOC32\BUILD\sf\mw\locationsrv\group\EPOS_LANDMARKSSEARCHCLIENTLIBRARY\ARMV5\VtblExports.s 0x00000000   Number         0  VtblExports.o ABSOLUTE
-    \EPOC32\BUILD\sf\mw\locationsrv\group\MNSERVICELIB\ARMV5\VtblExports.s 0x00000000   Number         0  VtblExports.o ABSOLUTE
-    \EPOC32\BUILD\sf\mw\uiresources\group\AKNICON\ARMV5\VtblExports.s 0x00000000   Number         0  VtblExports.o ABSOLUTE
-    \EPOC32\BUILD\sf\mw\uiresources\group\AKNSKINS\ARMV5\VtblExports.s 0x00000000   Number         0  VtblExports.o ABSOLUTE
-    \EPOC32\BUILD\sf\os\graphics\windowing\windowserver\group\WS32LIB\ARMV5\VtblExports.s 0x00000000   Number         0  VtblExports.o ABSOLUTE
-    \EPOC32\BUILD\sf\os\kernelhwsrv\kernel\eka\euser\EEXE\ARMV6_ABIV1\urel\uc_exe_.cpp 0x00000000   Number         0  uc_exe_.o ABSOLUTE
-    \EPOC32\BUILD\sf\os\kernelhwsrv\kernel\eka\euser\EUSER\ARMV5\VtblExports.s 0x00000000   Number         0  VtblExports.o ABSOLUTE
-    \EPOC32\BUILD\sf\os\kernelhwsrv\userlibandfileserver\fileserver\group\EFSRV\ARMV5\VtblExports.s 0x00000000   Number         0  VtblExports.o ABSOLUTE
-    \EPOC32\BUILD\sf\os\lbs\locationmgmt\locationadmin\group\LBSAPIVARIANT2\ARMV5\VtblExports.s 0x00000000   Number         0  VtblExports.o ABSOLUTE
-    \\EPOC32\\BUILD\\sf\\os\\kernelhwsrv\\kernel\\eka\\euser\\EEXE\\ARMV6_ABIV1\\urel\\uc_exe_.cpp 0x00000000   Number         0  uc_exe_.o ABSOLUTE
-    \sf\app\location\mapnavproviderrefapp\src\mnrefprovider.cpp 0x00000000   Number         0  mnrefprovider.in ABSOLUTE
-    \sf\app\location\mapnavproviderrefapp\src\mnrpappcontrol.cpp 0x00000000   Number         0  mnrefprovider.in ABSOLUTE
-    \sf\app\location\mapnavproviderrefapp\src\mnrpapplication.cpp 0x00000000   Number         0  mnrefprovider.in ABSOLUTE
-    \sf\app\location\mapnavproviderrefapp\src\mnrpappserver.cpp 0x00000000   Number         0  mnrefprovider.in ABSOLUTE
-    \sf\app\location\mapnavproviderrefapp\src\mnrpappui.cpp 0x00000000   Number         0  mnrefprovider.in ABSOLUTE
-    \sf\app\location\mapnavproviderrefapp\src\mnrpappview.cpp 0x00000000   Number         0  mnrefprovider.in ABSOLUTE
-    \sf\app\location\mapnavproviderrefapp\src\mnrpdocument.cpp 0x00000000   Number         0  mnrefprovider.in ABSOLUTE
-    \sf\app\location\mapnavproviderrefapp\src\mnrpmapcontrol.cpp 0x00000000   Number         0  mnrefprovider.in ABSOLUTE
-    \sf\app\location\mapnavproviderrefapp\src\mnrpmapview.cpp 0x00000000   Number         0  mnrefprovider.in ABSOLUTE
-    \sf\app\location\mapnavproviderrefapp\src\mnrpmapviewservice.cpp 0x00000000   Number         0  mnrefprovider.in ABSOLUTE
-    \sf\app\location\mapnavproviderrefapp\src\mnrpnavicontrol.cpp 0x00000000   Number         0  mnrefprovider.in ABSOLUTE
-    \sf\app\location\mapnavproviderrefapp\src\mnrpnavigationservice.cpp 0x00000000   Number         0  mnrefprovider.in ABSOLUTE
-    \sf\app\location\mapnavproviderrefapp\src\mnrpnavimodel.cpp 0x00000000   Number         0  mnrefprovider.in ABSOLUTE
-    \sf\app\location\mapnavproviderrefapp\src\mnrpnaviview.cpp 0x00000000   Number         0  mnrefprovider.in ABSOLUTE
-    \sf\os\kernelhwsrv\kernel\eka\euser\epoc\arm\uc_exe.cpp 0x00000000   Number         0  uc_exe.o ABSOLUTE
-    .emb_text                                0x00008000   Section      112  uc_exe_.o(.emb_text)
-    .emb_text                                0x00008070   Section       72  ucppinit_aeabi.o(.emb_text)
-    skip                                     0x00008084   ARM Code       0  ucppinit_aeabi.o(.emb_text)
-    loop                                     0x00008094   ARM Code       0  ucppinit_aeabi.o(.emb_text)
-    fpinit                                   0x000080ac   Data           0  ucppinit_aeabi.o(.emb_text)
-    base                                     0x000080b0   Data           0  ucppinit_aeabi.o(.emb_text)
-    limit                                    0x000080b4   Data           0  ucppinit_aeabi.o(.emb_text)
-    .text                                    0x000080c0   Section       16  uc_exe_.o(.text)
-    NewApplication()                         0x000080d1   Thumb Code    30  mnrefprovider.in(.text)
-    .text                                    0x000080d0   Section       60  mnrefprovider.in(.text)
-    .text                                    0x0000810c   Section       44  mnrefprovider.in(.text)
-    .text                                    0x00008138   Section     1688  mnrefprovider.in(.text)
-    .text                                    0x000087d0   Section      140  mnrefprovider.in(.text)
-    .text                                    0x0000885c   Section      128  mnrefprovider.in(.text)
-    .text                                    0x000088dc   Section      244  mnrefprovider.in(.text)
-    .text                                    0x000089d0   Section      196  mnrefprovider.in(.text)
-    .text                                    0x00008a94   Section      612  mnrefprovider.in(.text)
-    .text                                    0x00008cf8   Section     3148  mnrefprovider.in(.text)
-    |L1.1176|                                0x00009190   Data           0  mnrefprovider.in(.text)
-    |L1.1200|                                0x000091a8   Data           0  mnrefprovider.in(.text)
-    __sti___18_mnrpmapcontrol_cpp            0x000098f1   Thumb Code    24  mnrefprovider.in(.text)
-    .text                                    0x00009944   Section      360  mnrefprovider.in(.text)
-    .text                                    0x00009aac   Section     1084  mnrefprovider.in(.text)
-    .text                                    0x00009ee8   Section      580  mnrefprovider.in(.text)
-    .text                                    0x0000a12c   Section      100  mnrefprovider.in(.text)
-    .text                                    0x0000a190   Section      508  mnrefprovider.in(.text)
-    .text                                    0x0000a394   Section       36  uc_exe.o(.text)
-    .text                                    0x0000a3b8   Section      120  callfirstprocessfn.o(.text)
-    .text                                    0x0000a430   Section        4  dllexp.o(.text)
-    .text.clean                              0x0000a434   Section       10  mnrefprovider.in(.text.clean)
-    .text.clean                              0x0000a43e   Section       18  mnrefprovider.in(.text.clean)
-    .text.clean                              0x0000a450   Section       10  mnrefprovider.in(.text.clean)
-    .text.clean                              0x0000a45a   Section       10  mnrefprovider.in(.text.clean)
-    .text.clean                              0x0000a464   Section       14  mnrefprovider.in(.text.clean)
-    .text.clean                              0x0000a472   Section       28  mnrefprovider.in(.text.clean)
-    .text.clean                              0x0000a48e   Section       10  mnrefprovider.in(.text.clean)
-    .text.clean                              0x0000a498   Section       20  mnrefprovider.in(.text.clean)
-    .text.clean                              0x0000a4ac   Section       14  mnrefprovider.in(.text.clean)
-    .text.clean                              0x0000a4ba   Section       22  mnrefprovider.in(.text.clean)
-    .text.clean                              0x0000a4d0   Section        8  callfirstprocessfn.o(.text.clean)
-    StubCode                                 0x0000a4d8   Section        8  euser{000a0000}-1025.o(StubCode)
-    theImportedSymbol                        0x0000a4dc   Data           0  euser{000a0000}-1025.o(StubCode)
-    StubCode                                 0x0000a4e0   Section        8  euser{000a0000}-1096.o(StubCode)
-    theImportedSymbol                        0x0000a4e4   Data           0  euser{000a0000}-1096.o(StubCode)
-    StubCode                                 0x0000a4e8   Section        8  euser{000a0000}-1116.o(StubCode)
-    theImportedSymbol                        0x0000a4ec   Data           0  euser{000a0000}-1116.o(StubCode)
-    StubCode                                 0x0000a4f0   Section        8  euser{000a0000}-1119.o(StubCode)
-    theImportedSymbol                        0x0000a4f4   Data           0  euser{000a0000}-1119.o(StubCode)
-    StubCode                                 0x0000a4f8   Section        8  euser{000a0000}-1172.o(StubCode)
-    theImportedSymbol                        0x0000a4fc   Data           0  euser{000a0000}-1172.o(StubCode)
-    StubCode                                 0x0000a500   Section        8  euser{000a0000}-1288.o(StubCode)
-    theImportedSymbol                        0x0000a504   Data           0  euser{000a0000}-1288.o(StubCode)
-    StubCode                                 0x0000a508   Section        8  euser{000a0000}-1507.o(StubCode)
-    theImportedSymbol                        0x0000a50c   Data           0  euser{000a0000}-1507.o(StubCode)
-    StubCode                                 0x0000a510   Section        8  euser{000a0000}-1510.o(StubCode)
-    theImportedSymbol                        0x0000a514   Data           0  euser{000a0000}-1510.o(StubCode)
-    StubCode                                 0x0000a518   Section        8  euser{000a0000}-1553.o(StubCode)
-    theImportedSymbol                        0x0000a51c   Data           0  euser{000a0000}-1553.o(StubCode)
-    StubCode                                 0x0000a520   Section        8  euser{000a0000}-1590.o(StubCode)
-    theImportedSymbol                        0x0000a524   Data           0  euser{000a0000}-1590.o(StubCode)
-    StubCode                                 0x0000a528   Section        8  euser{000a0000}-1593.o(StubCode)
-    theImportedSymbol                        0x0000a52c   Data           0  euser{000a0000}-1593.o(StubCode)
-    StubCode                                 0x0000a530   Section        8  euser{000a0000}-1648.o(StubCode)
-    theImportedSymbol                        0x0000a534   Data           0  euser{000a0000}-1648.o(StubCode)
-    StubCode                                 0x0000a538   Section        8  euser{000a0000}-1817.o(StubCode)
-    theImportedSymbol                        0x0000a53c   Data           0  euser{000a0000}-1817.o(StubCode)
-    StubCode                                 0x0000a540   Section        8  euser{000a0000}-1995.o(StubCode)
-    theImportedSymbol                        0x0000a544   Data           0  euser{000a0000}-1995.o(StubCode)
-    StubCode                                 0x0000a548   Section        8  euser{000a0000}-1997.o(StubCode)
-    theImportedSymbol                        0x0000a54c   Data           0  euser{000a0000}-1997.o(StubCode)
-    StubCode                                 0x0000a550   Section        8  euser{000a0000}-1999.o(StubCode)
-    theImportedSymbol                        0x0000a554   Data           0  euser{000a0000}-1999.o(StubCode)
-    StubCode                                 0x0000a558   Section        8  euser{000a0000}-203.o(StubCode)
-    theImportedSymbol                        0x0000a55c   Data           0  euser{000a0000}-203.o(StubCode)
-    StubCode                                 0x0000a560   Section        8  euser{000a0000}-204.o(StubCode)
-    theImportedSymbol                        0x0000a564   Data           0  euser{000a0000}-204.o(StubCode)
-    StubCode                                 0x0000a568   Section        8  euser{000a0000}-205.o(StubCode)
-    theImportedSymbol                        0x0000a56c   Data           0  euser{000a0000}-205.o(StubCode)
-    StubCode                                 0x0000a570   Section        8  euser{000a0000}-2060.o(StubCode)
-    theImportedSymbol                        0x0000a574   Data           0  euser{000a0000}-2060.o(StubCode)
-    StubCode                                 0x0000a578   Section        8  euser{000a0000}-2061.o(StubCode)
-    theImportedSymbol                        0x0000a57c   Data           0  euser{000a0000}-2061.o(StubCode)
-    StubCode                                 0x0000a580   Section        8  euser{000a0000}-207.o(StubCode)
-    theImportedSymbol                        0x0000a584   Data           0  euser{000a0000}-207.o(StubCode)
-    StubCode                                 0x0000a588   Section        8  euser{000a0000}-208.o(StubCode)
-    theImportedSymbol                        0x0000a58c   Data           0  euser{000a0000}-208.o(StubCode)
-    StubCode                                 0x0000a590   Section        8  euser{000a0000}-2082.o(StubCode)
-    theImportedSymbol                        0x0000a594   Data           0  euser{000a0000}-2082.o(StubCode)
-    StubCode                                 0x0000a598   Section        8  euser{000a0000}-2120.o(StubCode)
-    theImportedSymbol                        0x0000a59c   Data           0  euser{000a0000}-2120.o(StubCode)
-    StubCode                                 0x0000a5a0   Section        8  euser{000a0000}-2123.o(StubCode)
-    theImportedSymbol                        0x0000a5a4   Data           0  euser{000a0000}-2123.o(StubCode)
-    StubCode                                 0x0000a5a8   Section        8  euser{000a0000}-2125.o(StubCode)
-    theImportedSymbol                        0x0000a5ac   Data           0  euser{000a0000}-2125.o(StubCode)
-    StubCode                                 0x0000a5b0   Section        8  euser{000a0000}-2131.o(StubCode)
-    theImportedSymbol                        0x0000a5b4   Data           0  euser{000a0000}-2131.o(StubCode)
-    StubCode                                 0x0000a5b8   Section        8  euser{000a0000}-245.o(StubCode)
-    theImportedSymbol                        0x0000a5bc   Data           0  euser{000a0000}-245.o(StubCode)
-    StubCode                                 0x0000a5c0   Section        8  euser{000a0000}-250.o(StubCode)
-    theImportedSymbol                        0x0000a5c4   Data           0  euser{000a0000}-250.o(StubCode)
-    StubCode                                 0x0000a5c8   Section        8  euser{000a0000}-254.o(StubCode)
-    theImportedSymbol                        0x0000a5cc   Data           0  euser{000a0000}-254.o(StubCode)
-    StubCode                                 0x0000a5d0   Section        8  euser{000a0000}-257.o(StubCode)
-    theImportedSymbol                        0x0000a5d4   Data           0  euser{000a0000}-257.o(StubCode)
-    StubCode                                 0x0000a5d8   Section        8  euser{000a0000}-46.o(StubCode)
-    theImportedSymbol                        0x0000a5dc   Data           0  euser{000a0000}-46.o(StubCode)
-    StubCode                                 0x0000a5e0   Section        8  euser{000a0000}-464.o(StubCode)
-    theImportedSymbol                        0x0000a5e4   Data           0  euser{000a0000}-464.o(StubCode)
-    StubCode                                 0x0000a5e8   Section        8  euser{000a0000}-470.o(StubCode)
-    theImportedSymbol                        0x0000a5ec   Data           0  euser{000a0000}-470.o(StubCode)
-    StubCode                                 0x0000a5f0   Section        8  euser{000a0000}-471.o(StubCode)
-    theImportedSymbol                        0x0000a5f4   Data           0  euser{000a0000}-471.o(StubCode)
-    StubCode                                 0x0000a5f8   Section        8  euser{000a0000}-472.o(StubCode)
-    theImportedSymbol                        0x0000a5fc   Data           0  euser{000a0000}-472.o(StubCode)
-    StubCode                                 0x0000a600   Section        8  euser{000a0000}-476.o(StubCode)
-    theImportedSymbol                        0x0000a604   Data           0  euser{000a0000}-476.o(StubCode)
-    StubCode                                 0x0000a608   Section        8  euser{000a0000}-48.o(StubCode)
-    theImportedSymbol                        0x0000a60c   Data           0  euser{000a0000}-48.o(StubCode)
-    StubCode                                 0x0000a610   Section        8  euser{000a0000}-481.o(StubCode)
-    theImportedSymbol                        0x0000a614   Data           0  euser{000a0000}-481.o(StubCode)
-    StubCode                                 0x0000a618   Section        8  euser{000a0000}-55.o(StubCode)
-    theImportedSymbol                        0x0000a61c   Data           0  euser{000a0000}-55.o(StubCode)
-    StubCode                                 0x0000a620   Section        8  euser{000a0000}-551.o(StubCode)
-    theImportedSymbol                        0x0000a624   Data           0  euser{000a0000}-551.o(StubCode)
-    StubCode                                 0x0000a628   Section        8  euser{000a0000}-593.o(StubCode)
-    theImportedSymbol                        0x0000a62c   Data           0  euser{000a0000}-593.o(StubCode)
-    StubCode                                 0x0000a630   Section        8  euser{000a0000}-613.o(StubCode)
-    theImportedSymbol                        0x0000a634   Data           0  euser{000a0000}-613.o(StubCode)
-    StubCode                                 0x0000a638   Section        8  euser{000a0000}-649.o(StubCode)
-    theImportedSymbol                        0x0000a63c   Data           0  euser{000a0000}-649.o(StubCode)
-    StubCode                                 0x0000a640   Section        8  euser{000a0000}-652.o(StubCode)
-    theImportedSymbol                        0x0000a644   Data           0  euser{000a0000}-652.o(StubCode)
-    StubCode                                 0x0000a648   Section        8  euser{000a0000}-654.o(StubCode)
-    theImportedSymbol                        0x0000a64c   Data           0  euser{000a0000}-654.o(StubCode)
-    StubCode                                 0x0000a650   Section        8  euser{000a0000}-669.o(StubCode)
-    theImportedSymbol                        0x0000a654   Data           0  euser{000a0000}-669.o(StubCode)
-    StubCode                                 0x0000a658   Section        8  euser{000a0000}-81.o(StubCode)
-    theImportedSymbol                        0x0000a65c   Data           0  euser{000a0000}-81.o(StubCode)
-    StubCode                                 0x0000a660   Section        8  euser{000a0000}-824.o(StubCode)
-    theImportedSymbol                        0x0000a664   Data           0  euser{000a0000}-824.o(StubCode)
-    StubCode                                 0x0000a668   Section        8  euser{000a0000}-829.o(StubCode)
-    theImportedSymbol                        0x0000a66c   Data           0  euser{000a0000}-829.o(StubCode)
-    StubCode                                 0x0000a670   Section        8  euser{000a0000}-830.o(StubCode)
-    theImportedSymbol                        0x0000a674   Data           0  euser{000a0000}-830.o(StubCode)
-    StubCode                                 0x0000a678   Section        8  euser{000a0000}-838.o(StubCode)
-    theImportedSymbol                        0x0000a67c   Data           0  euser{000a0000}-838.o(StubCode)
-    StubCode                                 0x0000a680   Section        8  euser{000a0000}-839.o(StubCode)
-    theImportedSymbol                        0x0000a684   Data           0  euser{000a0000}-839.o(StubCode)
-    StubCode                                 0x0000a688   Section        8  euser{000a0000}-841.o(StubCode)
-    theImportedSymbol                        0x0000a68c   Data           0  euser{000a0000}-841.o(StubCode)
-    StubCode                                 0x0000a690   Section        8  euser{000a0000}-842.o(StubCode)
-    theImportedSymbol                        0x0000a694   Data           0  euser{000a0000}-842.o(StubCode)
-    StubCode                                 0x0000a698   Section        8  euser{000a0000}-973.o(StubCode)
-    theImportedSymbol                        0x0000a69c   Data           0  euser{000a0000}-973.o(StubCode)
-    StubCode                                 0x0000a6a0   Section        8  apparc{000a0000}-121.o(StubCode)
-    theImportedSymbol                        0x0000a6a4   Data           0  apparc{000a0000}-121.o(StubCode)
-    StubCode                                 0x0000a6a8   Section        8  apparc{000a0000}-132.o(StubCode)
-    theImportedSymbol                        0x0000a6ac   Data           0  apparc{000a0000}-132.o(StubCode)
-    StubCode                                 0x0000a6b0   Section        8  apparc{000a0000}-171.o(StubCode)
-    theImportedSymbol                        0x0000a6b4   Data           0  apparc{000a0000}-171.o(StubCode)
-    StubCode                                 0x0000a6b8   Section        8  apparc{000a0000}-191.o(StubCode)
-    theImportedSymbol                        0x0000a6bc   Data           0  apparc{000a0000}-191.o(StubCode)
-    StubCode                                 0x0000a6c0   Section        8  apparc{000a0000}-192.o(StubCode)
-    theImportedSymbol                        0x0000a6c4   Data           0  apparc{000a0000}-192.o(StubCode)
-    StubCode                                 0x0000a6c8   Section        8  apparc{000a0000}-194.o(StubCode)
-    theImportedSymbol                        0x0000a6cc   Data           0  apparc{000a0000}-194.o(StubCode)
-    StubCode                                 0x0000a6d0   Section        8  apparc{000a0000}-202.o(StubCode)
-    theImportedSymbol                        0x0000a6d4   Data           0  apparc{000a0000}-202.o(StubCode)
-    StubCode                                 0x0000a6d8   Section        8  apparc{000a0000}-222.o(StubCode)
-    theImportedSymbol                        0x0000a6dc   Data           0  apparc{000a0000}-222.o(StubCode)
-    StubCode                                 0x0000a6e0   Section        8  apparc{000a0000}-232.o(StubCode)
-    theImportedSymbol                        0x0000a6e4   Data           0  apparc{000a0000}-232.o(StubCode)
-    StubCode                                 0x0000a6e8   Section        8  apparc{000a0000}-253.o(StubCode)
-    theImportedSymbol                        0x0000a6ec   Data           0  apparc{000a0000}-253.o(StubCode)
-    StubCode                                 0x0000a6f0   Section        8  apparc{000a0000}-273.o(StubCode)
-    theImportedSymbol                        0x0000a6f4   Data           0  apparc{000a0000}-273.o(StubCode)
-    StubCode                                 0x0000a6f8   Section        8  apparc{000a0000}-274.o(StubCode)
-    theImportedSymbol                        0x0000a6fc   Data           0  apparc{000a0000}-274.o(StubCode)
-    StubCode                                 0x0000a700   Section        8  apparc{000a0000}-275.o(StubCode)
-    theImportedSymbol                        0x0000a704   Data           0  apparc{000a0000}-275.o(StubCode)
-    StubCode                                 0x0000a708   Section        8  apparc{000a0000}-279.o(StubCode)
-    theImportedSymbol                        0x0000a70c   Data           0  apparc{000a0000}-279.o(StubCode)
-    StubCode                                 0x0000a710   Section        8  apparc{000a0000}-280.o(StubCode)
-    theImportedSymbol                        0x0000a714   Data           0  apparc{000a0000}-280.o(StubCode)
-    StubCode                                 0x0000a718   Section        8  apparc{000a0000}-284.o(StubCode)
-    theImportedSymbol                        0x0000a71c   Data           0  apparc{000a0000}-284.o(StubCode)
-    StubCode                                 0x0000a720   Section        8  apparc{000a0000}-285.o(StubCode)
-    theImportedSymbol                        0x0000a724   Data           0  apparc{000a0000}-285.o(StubCode)
-    StubCode                                 0x0000a728   Section        8  apparc{000a0000}-286.o(StubCode)
-    theImportedSymbol                        0x0000a72c   Data           0  apparc{000a0000}-286.o(StubCode)
-    StubCode                                 0x0000a730   Section        8  apparc{000a0000}-287.o(StubCode)
-    theImportedSymbol                        0x0000a734   Data           0  apparc{000a0000}-287.o(StubCode)
-    StubCode                                 0x0000a738   Section        8  apparc{000a0000}-30.o(StubCode)
-    theImportedSymbol                        0x0000a73c   Data           0  apparc{000a0000}-30.o(StubCode)
-    StubCode                                 0x0000a740   Section        8  bafl{000a0000}-43.o(StubCode)
-    theImportedSymbol                        0x0000a744   Data           0  bafl{000a0000}-43.o(StubCode)
-    StubCode                                 0x0000a748   Section        8  bafl{000a0000}-98.o(StubCode)
-    theImportedSymbol                        0x0000a74c   Data           0  bafl{000a0000}-98.o(StubCode)
-    StubCode                                 0x0000a750   Section        8  cone{000a0000}-100.o(StubCode)
-    theImportedSymbol                        0x0000a754   Data           0  cone{000a0000}-100.o(StubCode)
-    StubCode                                 0x0000a758   Section        8  cone{000a0000}-101.o(StubCode)
-    theImportedSymbol                        0x0000a75c   Data           0  cone{000a0000}-101.o(StubCode)
-    StubCode                                 0x0000a760   Section        8  cone{000a0000}-11.o(StubCode)
-    theImportedSymbol                        0x0000a764   Data           0  cone{000a0000}-11.o(StubCode)
-    StubCode                                 0x0000a768   Section        8  cone{000a0000}-12.o(StubCode)
-    theImportedSymbol                        0x0000a76c   Data           0  cone{000a0000}-12.o(StubCode)
-    StubCode                                 0x0000a770   Section        8  cone{000a0000}-127.o(StubCode)
-    theImportedSymbol                        0x0000a774   Data           0  cone{000a0000}-127.o(StubCode)
-    StubCode                                 0x0000a778   Section        8  cone{000a0000}-128.o(StubCode)
-    theImportedSymbol                        0x0000a77c   Data           0  cone{000a0000}-128.o(StubCode)
-    StubCode                                 0x0000a780   Section        8  cone{000a0000}-13.o(StubCode)
-    theImportedSymbol                        0x0000a784   Data           0  cone{000a0000}-13.o(StubCode)
-    StubCode                                 0x0000a788   Section        8  cone{000a0000}-15.o(StubCode)
-    theImportedSymbol                        0x0000a78c   Data           0  cone{000a0000}-15.o(StubCode)
-    StubCode                                 0x0000a790   Section        8  cone{000a0000}-18.o(StubCode)
-    theImportedSymbol                        0x0000a794   Data           0  cone{000a0000}-18.o(StubCode)
-    StubCode                                 0x0000a798   Section        8  cone{000a0000}-182.o(StubCode)
-    theImportedSymbol                        0x0000a79c   Data           0  cone{000a0000}-182.o(StubCode)
-    StubCode                                 0x0000a7a0   Section        8  cone{000a0000}-19.o(StubCode)
-    theImportedSymbol                        0x0000a7a4   Data           0  cone{000a0000}-19.o(StubCode)
-    StubCode                                 0x0000a7a8   Section        8  cone{000a0000}-196.o(StubCode)
-    theImportedSymbol                        0x0000a7ac   Data           0  cone{000a0000}-196.o(StubCode)
-    StubCode                                 0x0000a7b0   Section        8  cone{000a0000}-197.o(StubCode)
-    theImportedSymbol                        0x0000a7b4   Data           0  cone{000a0000}-197.o(StubCode)
-    StubCode                                 0x0000a7b8   Section        8  cone{000a0000}-199.o(StubCode)
-    theImportedSymbol                        0x0000a7bc   Data           0  cone{000a0000}-199.o(StubCode)
-    StubCode                                 0x0000a7c0   Section        8  cone{000a0000}-203.o(StubCode)
-    theImportedSymbol                        0x0000a7c4   Data           0  cone{000a0000}-203.o(StubCode)
-    StubCode                                 0x0000a7c8   Section        8  cone{000a0000}-21.o(StubCode)
-    theImportedSymbol                        0x0000a7cc   Data           0  cone{000a0000}-21.o(StubCode)
-    StubCode                                 0x0000a7d0   Section        8  cone{000a0000}-210.o(StubCode)
-    theImportedSymbol                        0x0000a7d4   Data           0  cone{000a0000}-210.o(StubCode)
-    StubCode                                 0x0000a7d8   Section        8  cone{000a0000}-211.o(StubCode)
-    theImportedSymbol                        0x0000a7dc   Data           0  cone{000a0000}-211.o(StubCode)
-    StubCode                                 0x0000a7e0   Section        8  cone{000a0000}-212.o(StubCode)
-    theImportedSymbol                        0x0000a7e4   Data           0  cone{000a0000}-212.o(StubCode)
-    StubCode                                 0x0000a7e8   Section        8  cone{000a0000}-220.o(StubCode)
-    theImportedSymbol                        0x0000a7ec   Data           0  cone{000a0000}-220.o(StubCode)
-    StubCode                                 0x0000a7f0   Section        8  cone{000a0000}-25.o(StubCode)
-    theImportedSymbol                        0x0000a7f4   Data           0  cone{000a0000}-25.o(StubCode)
-    StubCode                                 0x0000a7f8   Section        8  cone{000a0000}-257.o(StubCode)
-    theImportedSymbol                        0x0000a7fc   Data           0  cone{000a0000}-257.o(StubCode)
-    StubCode                                 0x0000a800   Section        8  cone{000a0000}-26.o(StubCode)
-    theImportedSymbol                        0x0000a804   Data           0  cone{000a0000}-26.o(StubCode)
-    StubCode                                 0x0000a808   Section        8  cone{000a0000}-263.o(StubCode)
-    theImportedSymbol                        0x0000a80c   Data           0  cone{000a0000}-263.o(StubCode)
-    StubCode                                 0x0000a810   Section        8  cone{000a0000}-265.o(StubCode)
-    theImportedSymbol                        0x0000a814   Data           0  cone{000a0000}-265.o(StubCode)
-    StubCode                                 0x0000a818   Section        8  cone{000a0000}-266.o(StubCode)
-    theImportedSymbol                        0x0000a81c   Data           0  cone{000a0000}-266.o(StubCode)
-    StubCode                                 0x0000a820   Section        8  cone{000a0000}-270.o(StubCode)
-    theImportedSymbol                        0x0000a824   Data           0  cone{000a0000}-270.o(StubCode)
-    StubCode                                 0x0000a828   Section        8  cone{000a0000}-271.o(StubCode)
-    theImportedSymbol                        0x0000a82c   Data           0  cone{000a0000}-271.o(StubCode)
-    StubCode                                 0x0000a830   Section        8  cone{000a0000}-272.o(StubCode)
-    theImportedSymbol                        0x0000a834   Data           0  cone{000a0000}-272.o(StubCode)
-    StubCode                                 0x0000a838   Section        8  cone{000a0000}-275.o(StubCode)
-    theImportedSymbol                        0x0000a83c   Data           0  cone{000a0000}-275.o(StubCode)
-    StubCode                                 0x0000a840   Section        8  cone{000a0000}-276.o(StubCode)
-    theImportedSymbol                        0x0000a844   Data           0  cone{000a0000}-276.o(StubCode)
-    StubCode                                 0x0000a848   Section        8  cone{000a0000}-287.o(StubCode)
-    theImportedSymbol                        0x0000a84c   Data           0  cone{000a0000}-287.o(StubCode)
-    StubCode                                 0x0000a850   Section        8  cone{000a0000}-288.o(StubCode)
-    theImportedSymbol                        0x0000a854   Data           0  cone{000a0000}-288.o(StubCode)
-    StubCode                                 0x0000a858   Section        8  cone{000a0000}-29.o(StubCode)
-    theImportedSymbol                        0x0000a85c   Data           0  cone{000a0000}-29.o(StubCode)
-    StubCode                                 0x0000a860   Section        8  cone{000a0000}-30.o(StubCode)
-    theImportedSymbol                        0x0000a864   Data           0  cone{000a0000}-30.o(StubCode)
-    StubCode                                 0x0000a868   Section        8  cone{000a0000}-351.o(StubCode)
-    theImportedSymbol                        0x0000a86c   Data           0  cone{000a0000}-351.o(StubCode)
-    StubCode                                 0x0000a870   Section        8  cone{000a0000}-353.o(StubCode)
-    theImportedSymbol                        0x0000a874   Data           0  cone{000a0000}-353.o(StubCode)
-    StubCode                                 0x0000a878   Section        8  cone{000a0000}-355.o(StubCode)
-    theImportedSymbol                        0x0000a87c   Data           0  cone{000a0000}-355.o(StubCode)
-    StubCode                                 0x0000a880   Section        8  cone{000a0000}-36.o(StubCode)
-    theImportedSymbol                        0x0000a884   Data           0  cone{000a0000}-36.o(StubCode)
-    StubCode                                 0x0000a888   Section        8  cone{000a0000}-39.o(StubCode)
-    theImportedSymbol                        0x0000a88c   Data           0  cone{000a0000}-39.o(StubCode)
-    StubCode                                 0x0000a890   Section        8  cone{000a0000}-396.o(StubCode)
-    theImportedSymbol                        0x0000a894   Data           0  cone{000a0000}-396.o(StubCode)
-    StubCode                                 0x0000a898   Section        8  cone{000a0000}-397.o(StubCode)
-    theImportedSymbol                        0x0000a89c   Data           0  cone{000a0000}-397.o(StubCode)
-    StubCode                                 0x0000a8a0   Section        8  cone{000a0000}-40.o(StubCode)
-    theImportedSymbol                        0x0000a8a4   Data           0  cone{000a0000}-40.o(StubCode)
-    StubCode                                 0x0000a8a8   Section        8  cone{000a0000}-41.o(StubCode)
-    theImportedSymbol                        0x0000a8ac   Data           0  cone{000a0000}-41.o(StubCode)
-    StubCode                                 0x0000a8b0   Section        8  cone{000a0000}-42.o(StubCode)
-    theImportedSymbol                        0x0000a8b4   Data           0  cone{000a0000}-42.o(StubCode)
-    StubCode                                 0x0000a8b8   Section        8  cone{000a0000}-444.o(StubCode)
-    theImportedSymbol                        0x0000a8bc   Data           0  cone{000a0000}-444.o(StubCode)
-    StubCode                                 0x0000a8c0   Section        8  cone{000a0000}-474.o(StubCode)
-    theImportedSymbol                        0x0000a8c4   Data           0  cone{000a0000}-474.o(StubCode)
-    StubCode                                 0x0000a8c8   Section        8  cone{000a0000}-477.o(StubCode)
-    theImportedSymbol                        0x0000a8cc   Data           0  cone{000a0000}-477.o(StubCode)
-    StubCode                                 0x0000a8d0   Section        8  cone{000a0000}-478.o(StubCode)
-    theImportedSymbol                        0x0000a8d4   Data           0  cone{000a0000}-478.o(StubCode)
-    StubCode                                 0x0000a8d8   Section        8  cone{000a0000}-479.o(StubCode)
-    theImportedSymbol                        0x0000a8dc   Data           0  cone{000a0000}-479.o(StubCode)
-    StubCode                                 0x0000a8e0   Section        8  cone{000a0000}-48.o(StubCode)
-    theImportedSymbol                        0x0000a8e4   Data           0  cone{000a0000}-48.o(StubCode)
-    StubCode                                 0x0000a8e8   Section        8  cone{000a0000}-482.o(StubCode)
-    theImportedSymbol                        0x0000a8ec   Data           0  cone{000a0000}-482.o(StubCode)
-    StubCode                                 0x0000a8f0   Section        8  cone{000a0000}-50.o(StubCode)
-    theImportedSymbol                        0x0000a8f4   Data           0  cone{000a0000}-50.o(StubCode)
-    StubCode                                 0x0000a8f8   Section        8  cone{000a0000}-502.o(StubCode)
-    theImportedSymbol                        0x0000a8fc   Data           0  cone{000a0000}-502.o(StubCode)
-    StubCode                                 0x0000a900   Section        8  cone{000a0000}-51.o(StubCode)
-    theImportedSymbol                        0x0000a904   Data           0  cone{000a0000}-51.o(StubCode)
-    StubCode                                 0x0000a908   Section        8  cone{000a0000}-514.o(StubCode)
-    theImportedSymbol                        0x0000a90c   Data           0  cone{000a0000}-514.o(StubCode)
-    StubCode                                 0x0000a910   Section        8  cone{000a0000}-56.o(StubCode)
-    theImportedSymbol                        0x0000a914   Data           0  cone{000a0000}-56.o(StubCode)
-    StubCode                                 0x0000a918   Section        8  cone{000a0000}-57.o(StubCode)
-    theImportedSymbol                        0x0000a91c   Data           0  cone{000a0000}-57.o(StubCode)
-    StubCode                                 0x0000a920   Section        8  cone{000a0000}-580.o(StubCode)
-    theImportedSymbol                        0x0000a924   Data           0  cone{000a0000}-580.o(StubCode)
-    StubCode                                 0x0000a928   Section        8  cone{000a0000}-581.o(StubCode)
-    theImportedSymbol                        0x0000a92c   Data           0  cone{000a0000}-581.o(StubCode)
-    StubCode                                 0x0000a930   Section        8  cone{000a0000}-582.o(StubCode)
-    theImportedSymbol                        0x0000a934   Data           0  cone{000a0000}-582.o(StubCode)
-    StubCode                                 0x0000a938   Section        8  cone{000a0000}-583.o(StubCode)
-    theImportedSymbol                        0x0000a93c   Data           0  cone{000a0000}-583.o(StubCode)
-    StubCode                                 0x0000a940   Section        8  cone{000a0000}-584.o(StubCode)
-    theImportedSymbol                        0x0000a944   Data           0  cone{000a0000}-584.o(StubCode)
-    StubCode                                 0x0000a948   Section        8  cone{000a0000}-61.o(StubCode)
-    theImportedSymbol                        0x0000a94c   Data           0  cone{000a0000}-61.o(StubCode)
-    StubCode                                 0x0000a950   Section        8  cone{000a0000}-62.o(StubCode)
-    theImportedSymbol                        0x0000a954   Data           0  cone{000a0000}-62.o(StubCode)
-    StubCode                                 0x0000a958   Section        8  cone{000a0000}-638.o(StubCode)
-    theImportedSymbol                        0x0000a95c   Data           0  cone{000a0000}-638.o(StubCode)
-    StubCode                                 0x0000a960   Section        8  cone{000a0000}-639.o(StubCode)
-    theImportedSymbol                        0x0000a964   Data           0  cone{000a0000}-639.o(StubCode)
-    StubCode                                 0x0000a968   Section        8  cone{000a0000}-64.o(StubCode)
-    theImportedSymbol                        0x0000a96c   Data           0  cone{000a0000}-64.o(StubCode)
-    StubCode                                 0x0000a970   Section        8  cone{000a0000}-664.o(StubCode)
-    theImportedSymbol                        0x0000a974   Data           0  cone{000a0000}-664.o(StubCode)
-    StubCode                                 0x0000a978   Section        8  cone{000a0000}-67.o(StubCode)
-    theImportedSymbol                        0x0000a97c   Data           0  cone{000a0000}-67.o(StubCode)
-    StubCode                                 0x0000a980   Section        8  cone{000a0000}-670.o(StubCode)
-    theImportedSymbol                        0x0000a984   Data           0  cone{000a0000}-670.o(StubCode)
-    StubCode                                 0x0000a988   Section        8  cone{000a0000}-671.o(StubCode)
-    theImportedSymbol                        0x0000a98c   Data           0  cone{000a0000}-671.o(StubCode)
-    StubCode                                 0x0000a990   Section        8  cone{000a0000}-676.o(StubCode)
-    theImportedSymbol                        0x0000a994   Data           0  cone{000a0000}-676.o(StubCode)
-    StubCode                                 0x0000a998   Section        8  cone{000a0000}-677.o(StubCode)
-    theImportedSymbol                        0x0000a99c   Data           0  cone{000a0000}-677.o(StubCode)
-    StubCode                                 0x0000a9a0   Section        8  cone{000a0000}-9.o(StubCode)
-    theImportedSymbol                        0x0000a9a4   Data           0  cone{000a0000}-9.o(StubCode)
-    StubCode                                 0x0000a9a8   Section        8  eikcore{000a0000}-141.o(StubCode)
-    theImportedSymbol                        0x0000a9ac   Data           0  eikcore{000a0000}-141.o(StubCode)
-    StubCode                                 0x0000a9b0   Section        8  eikcore{000a0000}-142.o(StubCode)
-    theImportedSymbol                        0x0000a9b4   Data           0  eikcore{000a0000}-142.o(StubCode)
-    StubCode                                 0x0000a9b8   Section        8  eikcore{000a0000}-143.o(StubCode)
-    theImportedSymbol                        0x0000a9bc   Data           0  eikcore{000a0000}-143.o(StubCode)
-    StubCode                                 0x0000a9c0   Section        8  eikcore{000a0000}-144.o(StubCode)
-    theImportedSymbol                        0x0000a9c4   Data           0  eikcore{000a0000}-144.o(StubCode)
-    StubCode                                 0x0000a9c8   Section        8  eikcore{000a0000}-147.o(StubCode)
-    theImportedSymbol                        0x0000a9cc   Data           0  eikcore{000a0000}-147.o(StubCode)
-    StubCode                                 0x0000a9d0   Section        8  eikcore{000a0000}-152.o(StubCode)
-    theImportedSymbol                        0x0000a9d4   Data           0  eikcore{000a0000}-152.o(StubCode)
-    StubCode                                 0x0000a9d8   Section        8  eikcore{000a0000}-155.o(StubCode)
-    theImportedSymbol                        0x0000a9dc   Data           0  eikcore{000a0000}-155.o(StubCode)
-    StubCode                                 0x0000a9e0   Section        8  eikcore{000a0000}-158.o(StubCode)
-    theImportedSymbol                        0x0000a9e4   Data           0  eikcore{000a0000}-158.o(StubCode)
-    StubCode                                 0x0000a9e8   Section        8  eikcore{000a0000}-159.o(StubCode)
-    theImportedSymbol                        0x0000a9ec   Data           0  eikcore{000a0000}-159.o(StubCode)
-    StubCode                                 0x0000a9f0   Section        8  eikcore{000a0000}-169.o(StubCode)
-    theImportedSymbol                        0x0000a9f4   Data           0  eikcore{000a0000}-169.o(StubCode)
-    StubCode                                 0x0000a9f8   Section        8  eikcore{000a0000}-171.o(StubCode)
-    theImportedSymbol                        0x0000a9fc   Data           0  eikcore{000a0000}-171.o(StubCode)
-    StubCode                                 0x0000aa00   Section        8  eikcore{000a0000}-175.o(StubCode)
-    theImportedSymbol                        0x0000aa04   Data           0  eikcore{000a0000}-175.o(StubCode)
-    StubCode                                 0x0000aa08   Section        8  eikcore{000a0000}-18.o(StubCode)
-    theImportedSymbol                        0x0000aa0c   Data           0  eikcore{000a0000}-18.o(StubCode)
-    StubCode                                 0x0000aa10   Section        8  eikcore{000a0000}-20.o(StubCode)
-    theImportedSymbol                        0x0000aa14   Data           0  eikcore{000a0000}-20.o(StubCode)
-    StubCode                                 0x0000aa18   Section        8  eikcore{000a0000}-25.o(StubCode)
-    theImportedSymbol                        0x0000aa1c   Data           0  eikcore{000a0000}-25.o(StubCode)
-    StubCode                                 0x0000aa20   Section        8  eikcore{000a0000}-26.o(StubCode)
-    theImportedSymbol                        0x0000aa24   Data           0  eikcore{000a0000}-26.o(StubCode)
-    StubCode                                 0x0000aa28   Section        8  eikcore{000a0000}-27.o(StubCode)
-    theImportedSymbol                        0x0000aa2c   Data           0  eikcore{000a0000}-27.o(StubCode)
-    StubCode                                 0x0000aa30   Section        8  eikcore{000a0000}-28.o(StubCode)
-    theImportedSymbol                        0x0000aa34   Data           0  eikcore{000a0000}-28.o(StubCode)
-    StubCode                                 0x0000aa38   Section        8  eikcore{000a0000}-29.o(StubCode)
-    theImportedSymbol                        0x0000aa3c   Data           0  eikcore{000a0000}-29.o(StubCode)
-    StubCode                                 0x0000aa40   Section        8  eikcore{000a0000}-291.o(StubCode)
-    theImportedSymbol                        0x0000aa44   Data           0  eikcore{000a0000}-291.o(StubCode)
-    StubCode                                 0x0000aa48   Section        8  eikcore{000a0000}-293.o(StubCode)
-    theImportedSymbol                        0x0000aa4c   Data           0  eikcore{000a0000}-293.o(StubCode)
-    StubCode                                 0x0000aa50   Section        8  eikcore{000a0000}-294.o(StubCode)
-    theImportedSymbol                        0x0000aa54   Data           0  eikcore{000a0000}-294.o(StubCode)
-    StubCode                                 0x0000aa58   Section        8  eikcore{000a0000}-295.o(StubCode)
-    theImportedSymbol                        0x0000aa5c   Data           0  eikcore{000a0000}-295.o(StubCode)
-    StubCode                                 0x0000aa60   Section        8  eikcore{000a0000}-296.o(StubCode)
-    theImportedSymbol                        0x0000aa64   Data           0  eikcore{000a0000}-296.o(StubCode)
-    StubCode                                 0x0000aa68   Section        8  eikcore{000a0000}-297.o(StubCode)
-    theImportedSymbol                        0x0000aa6c   Data           0  eikcore{000a0000}-297.o(StubCode)
-    StubCode                                 0x0000aa70   Section        8  eikcore{000a0000}-298.o(StubCode)
-    theImportedSymbol                        0x0000aa74   Data           0  eikcore{000a0000}-298.o(StubCode)
-    StubCode                                 0x0000aa78   Section        8  eikcore{000a0000}-299.o(StubCode)
-    theImportedSymbol                        0x0000aa7c   Data           0  eikcore{000a0000}-299.o(StubCode)
-    StubCode                                 0x0000aa80   Section        8  eikcore{000a0000}-30.o(StubCode)
-    theImportedSymbol                        0x0000aa84   Data           0  eikcore{000a0000}-30.o(StubCode)
-    StubCode                                 0x0000aa88   Section        8  eikcore{000a0000}-302.o(StubCode)
-    theImportedSymbol                        0x0000aa8c   Data           0  eikcore{000a0000}-302.o(StubCode)
-    StubCode                                 0x0000aa90   Section        8  eikcore{000a0000}-31.o(StubCode)
-    theImportedSymbol                        0x0000aa94   Data           0  eikcore{000a0000}-31.o(StubCode)
-    StubCode                                 0x0000aa98   Section        8  eikcore{000a0000}-315.o(StubCode)
-    theImportedSymbol                        0x0000aa9c   Data           0  eikcore{000a0000}-315.o(StubCode)
-    StubCode                                 0x0000aaa0   Section        8  eikcore{000a0000}-317.o(StubCode)
-    theImportedSymbol                        0x0000aaa4   Data           0  eikcore{000a0000}-317.o(StubCode)
-    StubCode                                 0x0000aaa8   Section        8  eikcore{000a0000}-319.o(StubCode)
-    theImportedSymbol                        0x0000aaac   Data           0  eikcore{000a0000}-319.o(StubCode)
-    StubCode                                 0x0000aab0   Section        8  eikcore{000a0000}-352.o(StubCode)
-    theImportedSymbol                        0x0000aab4   Data           0  eikcore{000a0000}-352.o(StubCode)
-    StubCode                                 0x0000aab8   Section        8  eikcore{000a0000}-37.o(StubCode)
-    theImportedSymbol                        0x0000aabc   Data           0  eikcore{000a0000}-37.o(StubCode)
-    StubCode                                 0x0000aac0   Section        8  eikcore{000a0000}-390.o(StubCode)
-    theImportedSymbol                        0x0000aac4   Data           0  eikcore{000a0000}-390.o(StubCode)
-    StubCode                                 0x0000aac8   Section        8  eikcore{000a0000}-392.o(StubCode)
-    theImportedSymbol                        0x0000aacc   Data           0  eikcore{000a0000}-392.o(StubCode)
-    StubCode                                 0x0000aad0   Section        8  eikcore{000a0000}-394.o(StubCode)
-    theImportedSymbol                        0x0000aad4   Data           0  eikcore{000a0000}-394.o(StubCode)
-    StubCode                                 0x0000aad8   Section        8  eikcore{000a0000}-467.o(StubCode)
-    theImportedSymbol                        0x0000aadc   Data           0  eikcore{000a0000}-467.o(StubCode)
-    StubCode                                 0x0000aae0   Section        8  eikcore{000a0000}-472.o(StubCode)
-    theImportedSymbol                        0x0000aae4   Data           0  eikcore{000a0000}-472.o(StubCode)
-    StubCode                                 0x0000aae8   Section        8  eikcore{000a0000}-473.o(StubCode)
-    theImportedSymbol                        0x0000aaec   Data           0  eikcore{000a0000}-473.o(StubCode)
-    StubCode                                 0x0000aaf0   Section        8  eikcore{000a0000}-479.o(StubCode)
-    theImportedSymbol                        0x0000aaf4   Data           0  eikcore{000a0000}-479.o(StubCode)
-    StubCode                                 0x0000aaf8   Section        8  eikcore{000a0000}-490.o(StubCode)
-    theImportedSymbol                        0x0000aafc   Data           0  eikcore{000a0000}-490.o(StubCode)
-    StubCode                                 0x0000ab00   Section        8  eikcore{000a0000}-506.o(StubCode)
-    theImportedSymbol                        0x0000ab04   Data           0  eikcore{000a0000}-506.o(StubCode)
-    StubCode                                 0x0000ab08   Section        8  eikcore{000a0000}-523.o(StubCode)
-    theImportedSymbol                        0x0000ab0c   Data           0  eikcore{000a0000}-523.o(StubCode)
-    StubCode                                 0x0000ab10   Section        8  eikcore{000a0000}-532.o(StubCode)
-    theImportedSymbol                        0x0000ab14   Data           0  eikcore{000a0000}-532.o(StubCode)
-    StubCode                                 0x0000ab18   Section        8  eikcore{000a0000}-533.o(StubCode)
-    theImportedSymbol                        0x0000ab1c   Data           0  eikcore{000a0000}-533.o(StubCode)
-    StubCode                                 0x0000ab20   Section        8  eikcore{000a0000}-534.o(StubCode)
-    theImportedSymbol                        0x0000ab24   Data           0  eikcore{000a0000}-534.o(StubCode)
-    StubCode                                 0x0000ab28   Section        8  eikcore{000a0000}-535.o(StubCode)
-    theImportedSymbol                        0x0000ab2c   Data           0  eikcore{000a0000}-535.o(StubCode)
-    StubCode                                 0x0000ab30   Section        8  eikcore{000a0000}-536.o(StubCode)
-    theImportedSymbol                        0x0000ab34   Data           0  eikcore{000a0000}-536.o(StubCode)
-    StubCode                                 0x0000ab38   Section        8  eikcore{000a0000}-537.o(StubCode)
-    theImportedSymbol                        0x0000ab3c   Data           0  eikcore{000a0000}-537.o(StubCode)
-    StubCode                                 0x0000ab40   Section        8  eikcore{000a0000}-565.o(StubCode)
-    theImportedSymbol                        0x0000ab44   Data           0  eikcore{000a0000}-565.o(StubCode)
-    StubCode                                 0x0000ab48   Section        8  eikcore{000a0000}-61.o(StubCode)
-    theImportedSymbol                        0x0000ab4c   Data           0  eikcore{000a0000}-61.o(StubCode)
-    StubCode                                 0x0000ab50   Section        8  eikcore{000a0000}-62.o(StubCode)
-    theImportedSymbol                        0x0000ab54   Data           0  eikcore{000a0000}-62.o(StubCode)
-    StubCode                                 0x0000ab58   Section        8  eikcore{000a0000}-63.o(StubCode)
-    theImportedSymbol                        0x0000ab5c   Data           0  eikcore{000a0000}-63.o(StubCode)
-    StubCode                                 0x0000ab60   Section        8  eikcore{000a0000}-64.o(StubCode)
-    theImportedSymbol                        0x0000ab64   Data           0  eikcore{000a0000}-64.o(StubCode)
-    StubCode                                 0x0000ab68   Section        8  eikcore{000a0000}-67.o(StubCode)
-    theImportedSymbol                        0x0000ab6c   Data           0  eikcore{000a0000}-67.o(StubCode)
-    StubCode                                 0x0000ab70   Section        8  eikcore{000a0000}-72.o(StubCode)
-    theImportedSymbol                        0x0000ab74   Data           0  eikcore{000a0000}-72.o(StubCode)
-    StubCode                                 0x0000ab78   Section        8  eikcore{000a0000}-73.o(StubCode)
-    theImportedSymbol                        0x0000ab7c   Data           0  eikcore{000a0000}-73.o(StubCode)
-    StubCode                                 0x0000ab80   Section        8  eikcore{000a0000}-74.o(StubCode)
-    theImportedSymbol                        0x0000ab84   Data           0  eikcore{000a0000}-74.o(StubCode)
-    StubCode                                 0x0000ab88   Section        8  eikcore{000a0000}-75.o(StubCode)
-    theImportedSymbol                        0x0000ab8c   Data           0  eikcore{000a0000}-75.o(StubCode)
-    StubCode                                 0x0000ab90   Section        8  eikcore{000a0000}-76.o(StubCode)
-    theImportedSymbol                        0x0000ab94   Data           0  eikcore{000a0000}-76.o(StubCode)
-    StubCode                                 0x0000ab98   Section        8  eikcore{000a0000}-77.o(StubCode)
-    theImportedSymbol                        0x0000ab9c   Data           0  eikcore{000a0000}-77.o(StubCode)
-    StubCode                                 0x0000aba0   Section        8  eikcore{000a0000}-78.o(StubCode)
-    theImportedSymbol                        0x0000aba4   Data           0  eikcore{000a0000}-78.o(StubCode)
-    StubCode                                 0x0000aba8   Section        8  eikcore{000a0000}-79.o(StubCode)
-    theImportedSymbol                        0x0000abac   Data           0  eikcore{000a0000}-79.o(StubCode)
-    StubCode                                 0x0000abb0   Section        8  eikcoctl{000a0000}-1376.o(StubCode)
-    theImportedSymbol                        0x0000abb4   Data           0  eikcoctl{000a0000}-1376.o(StubCode)
-    StubCode                                 0x0000abb8   Section        8  eikcoctl{000a0000}-140.o(StubCode)
-    theImportedSymbol                        0x0000abbc   Data           0  eikcoctl{000a0000}-140.o(StubCode)
-    StubCode                                 0x0000abc0   Section        8  eikcoctl{000a0000}-1430.o(StubCode)
-    theImportedSymbol                        0x0000abc4   Data           0  eikcoctl{000a0000}-1430.o(StubCode)
-    StubCode                                 0x0000abc8   Section        8  eikcoctl{000a0000}-35.o(StubCode)
-    theImportedSymbol                        0x0000abcc   Data           0  eikcoctl{000a0000}-35.o(StubCode)
-    StubCode                                 0x0000abd0   Section        8  eikcoctl{000a0000}-46.o(StubCode)
-    theImportedSymbol                        0x0000abd4   Data           0  eikcoctl{000a0000}-46.o(StubCode)
-    StubCode                                 0x0000abd8   Section        8  eikcoctl{000a0000}-605.o(StubCode)
-    theImportedSymbol                        0x0000abdc   Data           0  eikcoctl{000a0000}-605.o(StubCode)
-    StubCode                                 0x0000abe0   Section        8  eikcoctl{000a0000}-606.o(StubCode)
-    theImportedSymbol                        0x0000abe4   Data           0  eikcoctl{000a0000}-606.o(StubCode)
-    StubCode                                 0x0000abe8   Section        8  eikcoctl{000a0000}-660.o(StubCode)
-    theImportedSymbol                        0x0000abec   Data           0  eikcoctl{000a0000}-660.o(StubCode)
-    StubCode                                 0x0000abf0   Section        8  eikcoctl{000a0000}-875.o(StubCode)
-    theImportedSymbol                        0x0000abf4   Data           0  eikcoctl{000a0000}-875.o(StubCode)
-    StubCode                                 0x0000abf8   Section        8  eikcoctl{000a0000}-880.o(StubCode)
-    theImportedSymbol                        0x0000abfc   Data           0  eikcoctl{000a0000}-880.o(StubCode)
-    StubCode                                 0x0000ac00   Section        8  eikcoctl{000a0000}-881.o(StubCode)
-    theImportedSymbol                        0x0000ac04   Data           0  eikcoctl{000a0000}-881.o(StubCode)
-    StubCode                                 0x0000ac08   Section        8  eikctl{000a0000}-455.o(StubCode)
-    theImportedSymbol                        0x0000ac0c   Data           0  eikctl{000a0000}-455.o(StubCode)
-    StubCode                                 0x0000ac10   Section        8  avkon{000a0000}-1132.o(StubCode)
-    theImportedSymbol                        0x0000ac14   Data           0  avkon{000a0000}-1132.o(StubCode)
-    StubCode                                 0x0000ac18   Section        8  avkon{000a0000}-129.o(StubCode)
-    theImportedSymbol                        0x0000ac1c   Data           0  avkon{000a0000}-129.o(StubCode)
-    StubCode                                 0x0000ac20   Section        8  avkon{000a0000}-130.o(StubCode)
-    theImportedSymbol                        0x0000ac24   Data           0  avkon{000a0000}-130.o(StubCode)
-    StubCode                                 0x0000ac28   Section        8  avkon{000a0000}-131.o(StubCode)
-    theImportedSymbol                        0x0000ac2c   Data           0  avkon{000a0000}-131.o(StubCode)
-    StubCode                                 0x0000ac30   Section        8  avkon{000a0000}-1341.o(StubCode)
-    theImportedSymbol                        0x0000ac34   Data           0  avkon{000a0000}-1341.o(StubCode)
-    StubCode                                 0x0000ac38   Section        8  avkon{000a0000}-198.o(StubCode)
-    theImportedSymbol                        0x0000ac3c   Data           0  avkon{000a0000}-198.o(StubCode)
-    StubCode                                 0x0000ac40   Section        8  avkon{000a0000}-199.o(StubCode)
-    theImportedSymbol                        0x0000ac44   Data           0  avkon{000a0000}-199.o(StubCode)
-    StubCode                                 0x0000ac48   Section        8  avkon{000a0000}-1996.o(StubCode)
-    theImportedSymbol                        0x0000ac4c   Data           0  avkon{000a0000}-1996.o(StubCode)
-    StubCode                                 0x0000ac50   Section        8  avkon{000a0000}-201.o(StubCode)
-    theImportedSymbol                        0x0000ac54   Data           0  avkon{000a0000}-201.o(StubCode)
-    StubCode                                 0x0000ac58   Section        8  avkon{000a0000}-206.o(StubCode)
-    theImportedSymbol                        0x0000ac5c   Data           0  avkon{000a0000}-206.o(StubCode)
-    StubCode                                 0x0000ac60   Section        8  avkon{000a0000}-211.o(StubCode)
-    theImportedSymbol                        0x0000ac64   Data           0  avkon{000a0000}-211.o(StubCode)
-    StubCode                                 0x0000ac68   Section        8  avkon{000a0000}-213.o(StubCode)
-    theImportedSymbol                        0x0000ac6c   Data           0  avkon{000a0000}-213.o(StubCode)
-    StubCode                                 0x0000ac70   Section        8  avkon{000a0000}-214.o(StubCode)
-    theImportedSymbol                        0x0000ac74   Data           0  avkon{000a0000}-214.o(StubCode)
-    StubCode                                 0x0000ac78   Section        8  avkon{000a0000}-215.o(StubCode)
-    theImportedSymbol                        0x0000ac7c   Data           0  avkon{000a0000}-215.o(StubCode)
-    StubCode                                 0x0000ac80   Section        8  avkon{000a0000}-216.o(StubCode)
-    theImportedSymbol                        0x0000ac84   Data           0  avkon{000a0000}-216.o(StubCode)
-    StubCode                                 0x0000ac88   Section        8  avkon{000a0000}-2163.o(StubCode)
-    theImportedSymbol                        0x0000ac8c   Data           0  avkon{000a0000}-2163.o(StubCode)
-    StubCode                                 0x0000ac90   Section        8  avkon{000a0000}-217.o(StubCode)
-    theImportedSymbol                        0x0000ac94   Data           0  avkon{000a0000}-217.o(StubCode)
-    StubCode                                 0x0000ac98   Section        8  avkon{000a0000}-2178.o(StubCode)
-    theImportedSymbol                        0x0000ac9c   Data           0  avkon{000a0000}-2178.o(StubCode)
-    StubCode                                 0x0000aca0   Section        8  avkon{000a0000}-220.o(StubCode)
-    theImportedSymbol                        0x0000aca4   Data           0  avkon{000a0000}-220.o(StubCode)
-    StubCode                                 0x0000aca8   Section        8  avkon{000a0000}-2591.o(StubCode)
-    theImportedSymbol                        0x0000acac   Data           0  avkon{000a0000}-2591.o(StubCode)
-    StubCode                                 0x0000acb0   Section        8  avkon{000a0000}-2624.o(StubCode)
-    theImportedSymbol                        0x0000acb4   Data           0  avkon{000a0000}-2624.o(StubCode)
-    StubCode                                 0x0000acb8   Section        8  avkon{000a0000}-2632.o(StubCode)
-    theImportedSymbol                        0x0000acbc   Data           0  avkon{000a0000}-2632.o(StubCode)
-    StubCode                                 0x0000acc0   Section        8  avkon{000a0000}-2895.o(StubCode)
-    theImportedSymbol                        0x0000acc4   Data           0  avkon{000a0000}-2895.o(StubCode)
-    StubCode                                 0x0000acc8   Section        8  avkon{000a0000}-2898.o(StubCode)
-    theImportedSymbol                        0x0000accc   Data           0  avkon{000a0000}-2898.o(StubCode)
-    StubCode                                 0x0000acd0   Section        8  avkon{000a0000}-2899.o(StubCode)
-    theImportedSymbol                        0x0000acd4   Data           0  avkon{000a0000}-2899.o(StubCode)
-    StubCode                                 0x0000acd8   Section        8  avkon{000a0000}-2900.o(StubCode)
-    theImportedSymbol                        0x0000acdc   Data           0  avkon{000a0000}-2900.o(StubCode)
-    StubCode                                 0x0000ace0   Section        8  avkon{000a0000}-2901.o(StubCode)
-    theImportedSymbol                        0x0000ace4   Data           0  avkon{000a0000}-2901.o(StubCode)
-    StubCode                                 0x0000ace8   Section        8  avkon{000a0000}-2902.o(StubCode)
-    theImportedSymbol                        0x0000acec   Data           0  avkon{000a0000}-2902.o(StubCode)
-    StubCode                                 0x0000acf0   Section        8  avkon{000a0000}-2903.o(StubCode)
-    theImportedSymbol                        0x0000acf4   Data           0  avkon{000a0000}-2903.o(StubCode)
-    StubCode                                 0x0000acf8   Section        8  avkon{000a0000}-2904.o(StubCode)
-    theImportedSymbol                        0x0000acfc   Data           0  avkon{000a0000}-2904.o(StubCode)
-    StubCode                                 0x0000ad00   Section        8  avkon{000a0000}-2905.o(StubCode)
-    theImportedSymbol                        0x0000ad04   Data           0  avkon{000a0000}-2905.o(StubCode)
-    StubCode                                 0x0000ad08   Section        8  avkon{000a0000}-2906.o(StubCode)
-    theImportedSymbol                        0x0000ad0c   Data           0  avkon{000a0000}-2906.o(StubCode)
-    StubCode                                 0x0000ad10   Section        8  avkon{000a0000}-2907.o(StubCode)
-    theImportedSymbol                        0x0000ad14   Data           0  avkon{000a0000}-2907.o(StubCode)
-    StubCode                                 0x0000ad18   Section        8  avkon{000a0000}-2909.o(StubCode)
-    theImportedSymbol                        0x0000ad1c   Data           0  avkon{000a0000}-2909.o(StubCode)
-    StubCode                                 0x0000ad20   Section        8  avkon{000a0000}-2910.o(StubCode)
-    theImportedSymbol                        0x0000ad24   Data           0  avkon{000a0000}-2910.o(StubCode)
-    StubCode                                 0x0000ad28   Section        8  avkon{000a0000}-2912.o(StubCode)
-    theImportedSymbol                        0x0000ad2c   Data           0  avkon{000a0000}-2912.o(StubCode)
-    StubCode                                 0x0000ad30   Section        8  avkon{000a0000}-2913.o(StubCode)
-    theImportedSymbol                        0x0000ad34   Data           0  avkon{000a0000}-2913.o(StubCode)
-    StubCode                                 0x0000ad38   Section        8  avkon{000a0000}-2914.o(StubCode)
-    theImportedSymbol                        0x0000ad3c   Data           0  avkon{000a0000}-2914.o(StubCode)
-    StubCode                                 0x0000ad40   Section        8  avkon{000a0000}-2917.o(StubCode)
-    theImportedSymbol                        0x0000ad44   Data           0  avkon{000a0000}-2917.o(StubCode)
-    StubCode                                 0x0000ad48   Section        8  avkon{000a0000}-2919.o(StubCode)
-    theImportedSymbol                        0x0000ad4c   Data           0  avkon{000a0000}-2919.o(StubCode)
-    StubCode                                 0x0000ad50   Section        8  avkon{000a0000}-2920.o(StubCode)
-    theImportedSymbol                        0x0000ad54   Data           0  avkon{000a0000}-2920.o(StubCode)
-    StubCode                                 0x0000ad58   Section        8  avkon{000a0000}-2922.o(StubCode)
-    theImportedSymbol                        0x0000ad5c   Data           0  avkon{000a0000}-2922.o(StubCode)
-    StubCode                                 0x0000ad60   Section        8  avkon{000a0000}-2928.o(StubCode)
-    theImportedSymbol                        0x0000ad64   Data           0  avkon{000a0000}-2928.o(StubCode)
-    StubCode                                 0x0000ad68   Section        8  avkon{000a0000}-2929.o(StubCode)
-    theImportedSymbol                        0x0000ad6c   Data           0  avkon{000a0000}-2929.o(StubCode)
-    StubCode                                 0x0000ad70   Section        8  avkon{000a0000}-2930.o(StubCode)
-    theImportedSymbol                        0x0000ad74   Data           0  avkon{000a0000}-2930.o(StubCode)
-    StubCode                                 0x0000ad78   Section        8  avkon{000a0000}-2932.o(StubCode)
-    theImportedSymbol                        0x0000ad7c   Data           0  avkon{000a0000}-2932.o(StubCode)
-    StubCode                                 0x0000ad80   Section        8  avkon{000a0000}-2934.o(StubCode)
-    theImportedSymbol                        0x0000ad84   Data           0  avkon{000a0000}-2934.o(StubCode)
-    StubCode                                 0x0000ad88   Section        8  avkon{000a0000}-2936.o(StubCode)
-    theImportedSymbol                        0x0000ad8c   Data           0  avkon{000a0000}-2936.o(StubCode)
-    StubCode                                 0x0000ad90   Section        8  avkon{000a0000}-2993.o(StubCode)
-    theImportedSymbol                        0x0000ad94   Data           0  avkon{000a0000}-2993.o(StubCode)
-    StubCode                                 0x0000ad98   Section        8  avkon{000a0000}-2997.o(StubCode)
-    theImportedSymbol                        0x0000ad9c   Data           0  avkon{000a0000}-2997.o(StubCode)
-    StubCode                                 0x0000ada0   Section        8  avkon{000a0000}-3417.o(StubCode)
-    theImportedSymbol                        0x0000ada4   Data           0  avkon{000a0000}-3417.o(StubCode)
-    StubCode                                 0x0000ada8   Section        8  avkon{000a0000}-3420.o(StubCode)
-    theImportedSymbol                        0x0000adac   Data           0  avkon{000a0000}-3420.o(StubCode)
-    StubCode                                 0x0000adb0   Section        8  avkon{000a0000}-3421.o(StubCode)
-    theImportedSymbol                        0x0000adb4   Data           0  avkon{000a0000}-3421.o(StubCode)
-    StubCode                                 0x0000adb8   Section        8  avkon{000a0000}-3422.o(StubCode)
-    theImportedSymbol                        0x0000adbc   Data           0  avkon{000a0000}-3422.o(StubCode)
-    StubCode                                 0x0000adc0   Section        8  avkon{000a0000}-3423.o(StubCode)
-    theImportedSymbol                        0x0000adc4   Data           0  avkon{000a0000}-3423.o(StubCode)
-    StubCode                                 0x0000adc8   Section        8  avkon{000a0000}-3424.o(StubCode)
-    theImportedSymbol                        0x0000adcc   Data           0  avkon{000a0000}-3424.o(StubCode)
-    StubCode                                 0x0000add0   Section        8  avkon{000a0000}-367.o(StubCode)
-    theImportedSymbol                        0x0000add4   Data           0  avkon{000a0000}-367.o(StubCode)
-    StubCode                                 0x0000add8   Section        8  avkon{000a0000}-368.o(StubCode)
-    theImportedSymbol                        0x0000addc   Data           0  avkon{000a0000}-368.o(StubCode)
-    StubCode                                 0x0000ade0   Section        8  avkon{000a0000}-369.o(StubCode)
-    theImportedSymbol                        0x0000ade4   Data           0  avkon{000a0000}-369.o(StubCode)
-    StubCode                                 0x0000ade8   Section        8  avkon{000a0000}-370.o(StubCode)
-    theImportedSymbol                        0x0000adec   Data           0  avkon{000a0000}-370.o(StubCode)
-    StubCode                                 0x0000adf0   Section        8  avkon{000a0000}-372.o(StubCode)
-    theImportedSymbol                        0x0000adf4   Data           0  avkon{000a0000}-372.o(StubCode)
-    StubCode                                 0x0000adf8   Section        8  avkon{000a0000}-373.o(StubCode)
-    theImportedSymbol                        0x0000adfc   Data           0  avkon{000a0000}-373.o(StubCode)
-    StubCode                                 0x0000ae00   Section        8  avkon{000a0000}-374.o(StubCode)
-    theImportedSymbol                        0x0000ae04   Data           0  avkon{000a0000}-374.o(StubCode)
-    StubCode                                 0x0000ae08   Section        8  avkon{000a0000}-375.o(StubCode)
-    theImportedSymbol                        0x0000ae0c   Data           0  avkon{000a0000}-375.o(StubCode)
-    StubCode                                 0x0000ae10   Section        8  avkon{000a0000}-377.o(StubCode)
-    theImportedSymbol                        0x0000ae14   Data           0  avkon{000a0000}-377.o(StubCode)
-    StubCode                                 0x0000ae18   Section        8  avkon{000a0000}-3826.o(StubCode)
-    theImportedSymbol                        0x0000ae1c   Data           0  avkon{000a0000}-3826.o(StubCode)
-    StubCode                                 0x0000ae20   Section        8  avkon{000a0000}-3831.o(StubCode)
-    theImportedSymbol                        0x0000ae24   Data           0  avkon{000a0000}-3831.o(StubCode)
-    StubCode                                 0x0000ae28   Section        8  avkon{000a0000}-3832.o(StubCode)
-    theImportedSymbol                        0x0000ae2c   Data           0  avkon{000a0000}-3832.o(StubCode)
-    StubCode                                 0x0000ae30   Section        8  avkon{000a0000}-3857.o(StubCode)
-    theImportedSymbol                        0x0000ae34   Data           0  avkon{000a0000}-3857.o(StubCode)
-    StubCode                                 0x0000ae38   Section        8  avkon{000a0000}-3860.o(StubCode)
-    theImportedSymbol                        0x0000ae3c   Data           0  avkon{000a0000}-3860.o(StubCode)
-    StubCode                                 0x0000ae40   Section        8  avkon{000a0000}-3861.o(StubCode)
-    theImportedSymbol                        0x0000ae44   Data           0  avkon{000a0000}-3861.o(StubCode)
-    StubCode                                 0x0000ae48   Section        8  avkon{000a0000}-3868.o(StubCode)
-    theImportedSymbol                        0x0000ae4c   Data           0  avkon{000a0000}-3868.o(StubCode)
-    StubCode                                 0x0000ae50   Section        8  avkon{000a0000}-3947.o(StubCode)
-    theImportedSymbol                        0x0000ae54   Data           0  avkon{000a0000}-3947.o(StubCode)
-    StubCode                                 0x0000ae58   Section        8  avkon{000a0000}-3948.o(StubCode)
-    theImportedSymbol                        0x0000ae5c   Data           0  avkon{000a0000}-3948.o(StubCode)
-    StubCode                                 0x0000ae60   Section        8  avkon{000a0000}-3949.o(StubCode)
-    theImportedSymbol                        0x0000ae64   Data           0  avkon{000a0000}-3949.o(StubCode)
-    StubCode                                 0x0000ae68   Section        8  avkon{000a0000}-3983.o(StubCode)
-    theImportedSymbol                        0x0000ae6c   Data           0  avkon{000a0000}-3983.o(StubCode)
-    StubCode                                 0x0000ae70   Section        8  avkon{000a0000}-4014.o(StubCode)
-    theImportedSymbol                        0x0000ae74   Data           0  avkon{000a0000}-4014.o(StubCode)
-    StubCode                                 0x0000ae78   Section        8  avkon{000a0000}-4030.o(StubCode)
-    theImportedSymbol                        0x0000ae7c   Data           0  avkon{000a0000}-4030.o(StubCode)
-    StubCode                                 0x0000ae80   Section        8  AknIcon{000a0000}-13.o(StubCode)
-    theImportedSymbol                        0x0000ae84   Data           0  AknIcon{000a0000}-13.o(StubCode)
-    StubCode                                 0x0000ae88   Section        8  egul{000a0000}-94.o(StubCode)
-    theImportedSymbol                        0x0000ae8c   Data           0  egul{000a0000}-94.o(StubCode)
-    StubCode                                 0x0000ae90   Section        8  egul{000a0000}-95.o(StubCode)
-    theImportedSymbol                        0x0000ae94   Data           0  egul{000a0000}-95.o(StubCode)
-    StubCode                                 0x0000ae98   Section        8  gdi{000a0000}-310.o(StubCode)
-    theImportedSymbol                        0x0000ae9c   Data           0  gdi{000a0000}-310.o(StubCode)
-    StubCode                                 0x0000aea0   Section        8  gdi{000a0000}-311.o(StubCode)
-    theImportedSymbol                        0x0000aea4   Data           0  gdi{000a0000}-311.o(StubCode)
-    StubCode                                 0x0000aea8   Section        8  gdi{000a0000}-312.o(StubCode)
-    theImportedSymbol                        0x0000aeac   Data           0  gdi{000a0000}-312.o(StubCode)
-    StubCode                                 0x0000aeb0   Section        8  fbscli{000a0000}-26.o(StubCode)
-    theImportedSymbol                        0x0000aeb4   Data           0  fbscli{000a0000}-26.o(StubCode)
-    StubCode                                 0x0000aeb8   Section        8  fbscli{000a0000}-31.o(StubCode)
-    theImportedSymbol                        0x0000aebc   Data           0  fbscli{000a0000}-31.o(StubCode)
-    StubCode                                 0x0000aec0   Section        8  eposlandmarks{000a0000}-12.o(StubCode)
-    theImportedSymbol                        0x0000aec4   Data           0  eposlandmarks{000a0000}-12.o(StubCode)
-    StubCode                                 0x0000aec8   Section        8  eposlandmarks{000a0000}-15.o(StubCode)
-    theImportedSymbol                        0x0000aecc   Data           0  eposlandmarks{000a0000}-15.o(StubCode)
-    StubCode                                 0x0000aed0   Section        8  eposlandmarks{000a0000}-4.o(StubCode)
-    theImportedSymbol                        0x0000aed4   Data           0  eposlandmarks{000a0000}-4.o(StubCode)
-    StubCode                                 0x0000aed8   Section        8  eposlandmarks{000a0000}-50.o(StubCode)
-    theImportedSymbol                        0x0000aedc   Data           0  eposlandmarks{000a0000}-50.o(StubCode)
-    StubCode                                 0x0000aee0   Section        8  eposlandmarks{000a0000}-65.o(StubCode)
-    theImportedSymbol                        0x0000aee4   Data           0  eposlandmarks{000a0000}-65.o(StubCode)
-    StubCode                                 0x0000aee8   Section        8  eposlandmarks{000a0000}-67.o(StubCode)
-    theImportedSymbol                        0x0000aeec   Data           0  eposlandmarks{000a0000}-67.o(StubCode)
-    StubCode                                 0x0000aef0   Section        8  eposlandmarks{000a0000}-75.o(StubCode)
-    theImportedSymbol                        0x0000aef4   Data           0  eposlandmarks{000a0000}-75.o(StubCode)
-    StubCode                                 0x0000aef8   Section        8  lbs{000a0000}-152.o(StubCode)
-    theImportedSymbol                        0x0000aefc   Data           0  lbs{000a0000}-152.o(StubCode)
-    StubCode                                 0x0000af00   Section        8  lbs{000a0000}-180.o(StubCode)
-    theImportedSymbol                        0x0000af04   Data           0  lbs{000a0000}-180.o(StubCode)
-    StubCode                                 0x0000af08   Section        8  lbs{000a0000}-181.o(StubCode)
-    theImportedSymbol                        0x0000af0c   Data           0  lbs{000a0000}-181.o(StubCode)
-    StubCode                                 0x0000af10   Section        8  lbs{000a0000}-205.o(StubCode)
-    theImportedSymbol                        0x0000af14   Data           0  lbs{000a0000}-205.o(StubCode)
-    StubCode                                 0x0000af18   Section        8  lbs{000a0000}-207.o(StubCode)
-    theImportedSymbol                        0x0000af1c   Data           0  lbs{000a0000}-207.o(StubCode)
-    StubCode                                 0x0000af20   Section        8  lbs{000a0000}-21.o(StubCode)
-    theImportedSymbol                        0x0000af24   Data           0  lbs{000a0000}-21.o(StubCode)
-    StubCode                                 0x0000af28   Section        8  lbs{000a0000}-214.o(StubCode)
-    theImportedSymbol                        0x0000af2c   Data           0  lbs{000a0000}-214.o(StubCode)
-    StubCode                                 0x0000af30   Section        8  lbs{000a0000}-223.o(StubCode)
-    theImportedSymbol                        0x0000af34   Data           0  lbs{000a0000}-223.o(StubCode)
-    StubCode                                 0x0000af38   Section        8  lbs{000a0000}-225.o(StubCode)
-    theImportedSymbol                        0x0000af3c   Data           0  lbs{000a0000}-225.o(StubCode)
-    StubCode                                 0x0000af40   Section        8  lbs{000a0000}-226.o(StubCode)
-    theImportedSymbol                        0x0000af44   Data           0  lbs{000a0000}-226.o(StubCode)
-    StubCode                                 0x0000af48   Section        8  lbs{000a0000}-23.o(StubCode)
-    theImportedSymbol                        0x0000af4c   Data           0  lbs{000a0000}-23.o(StubCode)
-    StubCode                                 0x0000af50   Section        8  lbs{000a0000}-28.o(StubCode)
-    theImportedSymbol                        0x0000af54   Data           0  lbs{000a0000}-28.o(StubCode)
-    StubCode                                 0x0000af58   Section        8  lbs{000a0000}-304.o(StubCode)
-    theImportedSymbol                        0x0000af5c   Data           0  lbs{000a0000}-304.o(StubCode)
-    StubCode                                 0x0000af60   Section        8  lbs{000a0000}-306.o(StubCode)
-    theImportedSymbol                        0x0000af64   Data           0  lbs{000a0000}-306.o(StubCode)
-    StubCode                                 0x0000af68   Section        8  mnservicelib{000a0000}-1.o(StubCode)
-    theImportedSymbol                        0x0000af6c   Data           0  mnservicelib{000a0000}-1.o(StubCode)
-    StubCode                                 0x0000af70   Section        8  mnservicelib{000a0000}-10.o(StubCode)
-    theImportedSymbol                        0x0000af74   Data           0  mnservicelib{000a0000}-10.o(StubCode)
-    StubCode                                 0x0000af78   Section        8  mnservicelib{000a0000}-11.o(StubCode)
-    theImportedSymbol                        0x0000af7c   Data           0  mnservicelib{000a0000}-11.o(StubCode)
-    StubCode                                 0x0000af80   Section        8  mnservicelib{000a0000}-12.o(StubCode)
-    theImportedSymbol                        0x0000af84   Data           0  mnservicelib{000a0000}-12.o(StubCode)
-    StubCode                                 0x0000af88   Section        8  mnservicelib{000a0000}-13.o(StubCode)
-    theImportedSymbol                        0x0000af8c   Data           0  mnservicelib{000a0000}-13.o(StubCode)
-    StubCode                                 0x0000af90   Section        8  mnservicelib{000a0000}-14.o(StubCode)
-    theImportedSymbol                        0x0000af94   Data           0  mnservicelib{000a0000}-14.o(StubCode)
-    StubCode                                 0x0000af98   Section        8  mnservicelib{000a0000}-15.o(StubCode)
-    theImportedSymbol                        0x0000af9c   Data           0  mnservicelib{000a0000}-15.o(StubCode)
-    StubCode                                 0x0000afa0   Section        8  mnservicelib{000a0000}-16.o(StubCode)
-    theImportedSymbol                        0x0000afa4   Data           0  mnservicelib{000a0000}-16.o(StubCode)
-    StubCode                                 0x0000afa8   Section        8  mnservicelib{000a0000}-17.o(StubCode)
-    theImportedSymbol                        0x0000afac   Data           0  mnservicelib{000a0000}-17.o(StubCode)
-    StubCode                                 0x0000afb0   Section        8  mnservicelib{000a0000}-2.o(StubCode)
-    theImportedSymbol                        0x0000afb4   Data           0  mnservicelib{000a0000}-2.o(StubCode)
-    StubCode                                 0x0000afb8   Section        8  mnservicelib{000a0000}-20.o(StubCode)
-    theImportedSymbol                        0x0000afbc   Data           0  mnservicelib{000a0000}-20.o(StubCode)
-    StubCode                                 0x0000afc0   Section        8  mnservicelib{000a0000}-28.o(StubCode)
-    theImportedSymbol                        0x0000afc4   Data           0  mnservicelib{000a0000}-28.o(StubCode)
-    StubCode                                 0x0000afc8   Section        8  mnservicelib{000a0000}-29.o(StubCode)
-    theImportedSymbol                        0x0000afcc   Data           0  mnservicelib{000a0000}-29.o(StubCode)
-    StubCode                                 0x0000afd0   Section        8  mnservicelib{000a0000}-30.o(StubCode)
-    theImportedSymbol                        0x0000afd4   Data           0  mnservicelib{000a0000}-30.o(StubCode)
-    StubCode                                 0x0000afd8   Section        8  mnservicelib{000a0000}-33.o(StubCode)
-    theImportedSymbol                        0x0000afdc   Data           0  mnservicelib{000a0000}-33.o(StubCode)
-    StubCode                                 0x0000afe0   Section        8  mnservicelib{000a0000}-4.o(StubCode)
-    theImportedSymbol                        0x0000afe4   Data           0  mnservicelib{000a0000}-4.o(StubCode)
-    StubCode                                 0x0000afe8   Section        8  mnservicelib{000a0000}-5.o(StubCode)
-    theImportedSymbol                        0x0000afec   Data           0  mnservicelib{000a0000}-5.o(StubCode)
-    StubCode                                 0x0000aff0   Section        8  mnservicelib{000a0000}-7.o(StubCode)
-    theImportedSymbol                        0x0000aff4   Data           0  mnservicelib{000a0000}-7.o(StubCode)
-    StubCode                                 0x0000aff8   Section        8  mnrefproviderengine{000a0000}-12.o(StubCode)
-    theImportedSymbol                        0x0000affc   Data           0  mnrefproviderengine{000a0000}-12.o(StubCode)
-    StubCode                                 0x0000b000   Section        8  mnrefproviderengine{000a0000}-17.o(StubCode)
-    theImportedSymbol                        0x0000b004   Data           0  mnrefproviderengine{000a0000}-17.o(StubCode)
-    StubCode                                 0x0000b008   Section        8  mnrefproviderengine{000a0000}-19.o(StubCode)
-    theImportedSymbol                        0x0000b00c   Data           0  mnrefproviderengine{000a0000}-19.o(StubCode)
-    StubCode                                 0x0000b010   Section        8  mnrefproviderengine{000a0000}-20.o(StubCode)
-    theImportedSymbol                        0x0000b014   Data           0  mnrefproviderengine{000a0000}-20.o(StubCode)
-    StubCode                                 0x0000b018   Section        8  mnrefproviderengine{000a0000}-22.o(StubCode)
-    theImportedSymbol                        0x0000b01c   Data           0  mnrefproviderengine{000a0000}-22.o(StubCode)
-    StubCode                                 0x0000b020   Section        8  mnrefproviderengine{000a0000}-23.o(StubCode)
-    theImportedSymbol                        0x0000b024   Data           0  mnrefproviderengine{000a0000}-23.o(StubCode)
-    StubCode                                 0x0000b028   Section        8  mnrefproviderengine{000a0000}-24.o(StubCode)
-    theImportedSymbol                        0x0000b02c   Data           0  mnrefproviderengine{000a0000}-24.o(StubCode)
-    StubCode                                 0x0000b030   Section        8  mnrefproviderengine{000a0000}-25.o(StubCode)
-    theImportedSymbol                        0x0000b034   Data           0  mnrefproviderengine{000a0000}-25.o(StubCode)
-    StubCode                                 0x0000b038   Section        8  mnrefproviderengine{000a0000}-26.o(StubCode)
-    theImportedSymbol                        0x0000b03c   Data           0  mnrefproviderengine{000a0000}-26.o(StubCode)
-    StubCode                                 0x0000b040   Section        8  mnrefproviderengine{000a0000}-27.o(StubCode)
-    theImportedSymbol                        0x0000b044   Data           0  mnrefproviderengine{000a0000}-27.o(StubCode)
-    StubCode                                 0x0000b048   Section        8  mnrefproviderengine{000a0000}-28.o(StubCode)
-    theImportedSymbol                        0x0000b04c   Data           0  mnrefproviderengine{000a0000}-28.o(StubCode)
-    StubCode                                 0x0000b050   Section        8  mnrefproviderengine{000a0000}-29.o(StubCode)
-    theImportedSymbol                        0x0000b054   Data           0  mnrefproviderengine{000a0000}-29.o(StubCode)
-    StubCode                                 0x0000b058   Section        8  mnrefproviderengine{000a0000}-30.o(StubCode)
-    theImportedSymbol                        0x0000b05c   Data           0  mnrefproviderengine{000a0000}-30.o(StubCode)
-    StubCode                                 0x0000b060   Section        8  mnrefproviderengine{000a0000}-31.o(StubCode)
-    theImportedSymbol                        0x0000b064   Data           0  mnrefproviderengine{000a0000}-31.o(StubCode)
-    StubCode                                 0x0000b068   Section        8  mnrefproviderengine{000a0000}-32.o(StubCode)
-    theImportedSymbol                        0x0000b06c   Data           0  mnrefproviderengine{000a0000}-32.o(StubCode)
-    StubCode                                 0x0000b070   Section        8  mnrefproviderengine{000a0000}-33.o(StubCode)
-    theImportedSymbol                        0x0000b074   Data           0  mnrefproviderengine{000a0000}-33.o(StubCode)
-    StubCode                                 0x0000b078   Section        8  mnrefproviderengine{000a0000}-34.o(StubCode)
-    theImportedSymbol                        0x0000b07c   Data           0  mnrefproviderengine{000a0000}-34.o(StubCode)
-    StubCode                                 0x0000b080   Section        8  mnrefproviderengine{000a0000}-38.o(StubCode)
-    theImportedSymbol                        0x0000b084   Data           0  mnrefproviderengine{000a0000}-38.o(StubCode)
-    StubCode                                 0x0000b088   Section        8  mnrefproviderengine{000a0000}-39.o(StubCode)
-    theImportedSymbol                        0x0000b08c   Data           0  mnrefproviderengine{000a0000}-39.o(StubCode)
-    StubCode                                 0x0000b090   Section        8  mnrefproviderengine{000a0000}-40.o(StubCode)
-    theImportedSymbol                        0x0000b094   Data           0  mnrefproviderengine{000a0000}-40.o(StubCode)
-    StubCode                                 0x0000b098   Section        8  mnrefproviderengine{000a0000}-41.o(StubCode)
-    theImportedSymbol                        0x0000b09c   Data           0  mnrefproviderengine{000a0000}-41.o(StubCode)
-    StubCode                                 0x0000b0a0   Section        8  mnrefproviderengine{000a0000}-42.o(StubCode)
-    theImportedSymbol                        0x0000b0a4   Data           0  mnrefproviderengine{000a0000}-42.o(StubCode)
-    StubCode                                 0x0000b0a8   Section        8  mnrefproviderengine{000a0000}-43.o(StubCode)
-    theImportedSymbol                        0x0000b0ac   Data           0  mnrefproviderengine{000a0000}-43.o(StubCode)
-    StubCode                                 0x0000b0b0   Section        8  mnrefproviderengine{000a0000}-44.o(StubCode)
-    theImportedSymbol                        0x0000b0b4   Data           0  mnrefproviderengine{000a0000}-44.o(StubCode)
-    StubCode                                 0x0000b0b8   Section        8  mnrefproviderengine{000a0000}-45.o(StubCode)
-    theImportedSymbol                        0x0000b0bc   Data           0  mnrefproviderengine{000a0000}-45.o(StubCode)
-    StubCode                                 0x0000b0c0   Section        8  mnrefproviderengine{000a0000}-46.o(StubCode)
-    theImportedSymbol                        0x0000b0c4   Data           0  mnrefproviderengine{000a0000}-46.o(StubCode)
-    StubCode                                 0x0000b0c8   Section        8  mnrefproviderengine{000a0000}-47.o(StubCode)
-    theImportedSymbol                        0x0000b0cc   Data           0  mnrefproviderengine{000a0000}-47.o(StubCode)
-    StubCode                                 0x0000b0d0   Section        8  mnrefproviderengine{000a0000}-48.o(StubCode)
-    theImportedSymbol                        0x0000b0d4   Data           0  mnrefproviderengine{000a0000}-48.o(StubCode)
-    StubCode                                 0x0000b0d8   Section        8  mnrefproviderengine{000a0000}-50.o(StubCode)
-    theImportedSymbol                        0x0000b0dc   Data           0  mnrefproviderengine{000a0000}-50.o(StubCode)
-    StubCode                                 0x0000b0e0   Section        8  mnrefproviderengine{000a0000}-51.o(StubCode)
-    theImportedSymbol                        0x0000b0e4   Data           0  mnrefproviderengine{000a0000}-51.o(StubCode)
-    StubCode                                 0x0000b0e8   Section        8  mnrefproviderengine{000a0000}-53.o(StubCode)
-    theImportedSymbol                        0x0000b0ec   Data           0  mnrefproviderengine{000a0000}-53.o(StubCode)
-    StubCode                                 0x0000b0f0   Section        8  mnrefproviderengine{000a0000}-54.o(StubCode)
-    theImportedSymbol                        0x0000b0f4   Data           0  mnrefproviderengine{000a0000}-54.o(StubCode)
-    StubCode                                 0x0000b0f8   Section        8  dfpaeabi{000a0000}-12.o(StubCode)
-    theImportedSymbol                        0x0000b0fc   Data           0  dfpaeabi{000a0000}-12.o(StubCode)
-    StubCode                                 0x0000b100   Section        8  dfpaeabi{000a0000}-20.o(StubCode)
-    theImportedSymbol                        0x0000b104   Data           0  dfpaeabi{000a0000}-20.o(StubCode)
-    StubCode                                 0x0000b108   Section        8  dfpaeabi{000a0000}-23.o(StubCode)
-    theImportedSymbol                        0x0000b10c   Data           0  dfpaeabi{000a0000}-23.o(StubCode)
-    StubCode                                 0x0000b110   Section        8  dfpaeabi{000a0000}-24.o(StubCode)
-    theImportedSymbol                        0x0000b114   Data           0  dfpaeabi{000a0000}-24.o(StubCode)
-    StubCode                                 0x0000b118   Section        8  dfpaeabi{000a0000}-41.o(StubCode)
-    theImportedSymbol                        0x0000b11c   Data           0  dfpaeabi{000a0000}-41.o(StubCode)
-    StubCode                                 0x0000b120   Section        8  dfpaeabi{000a0000}-8.o(StubCode)
-    theImportedSymbol                        0x0000b124   Data           0  dfpaeabi{000a0000}-8.o(StubCode)
-    StubCode                                 0x0000b128   Section        8  drtaeabi{000a0000}-147.o(StubCode)
-    theImportedSymbol                        0x0000b12c   Data           0  drtaeabi{000a0000}-147.o(StubCode)
-    StubCode                                 0x0000b130   Section        8  drtaeabi{000a0000}-158.o(StubCode)
-    theImportedSymbol                        0x0000b134   Data           0  drtaeabi{000a0000}-158.o(StubCode)
-    StubCode                                 0x0000b138   Section        8  drtaeabi{000a0000}-159.o(StubCode)
-    theImportedSymbol                        0x0000b13c   Data           0  drtaeabi{000a0000}-159.o(StubCode)
-    StubCode                                 0x0000b140   Section        8  drtaeabi{000a0000}-180.o(StubCode)
-    theImportedSymbol                        0x0000b144   Data           0  drtaeabi{000a0000}-180.o(StubCode)
-    StubCode                                 0x0000b148   Section        8  drtaeabi{000a0000}-182.o(StubCode)
-    theImportedSymbol                        0x0000b14c   Data           0  drtaeabi{000a0000}-182.o(StubCode)
-    StubCode                                 0x0000b150   Section        8  drtaeabi{000a0000}-183.o(StubCode)
-    theImportedSymbol                        0x0000b154   Data           0  drtaeabi{000a0000}-183.o(StubCode)
-    StubCode                                 0x0000b158   Section        8  drtaeabi{000a0000}-184.o(StubCode)
-    theImportedSymbol                        0x0000b15c   Data           0  drtaeabi{000a0000}-184.o(StubCode)
-    StubCode                                 0x0000b160   Section        8  drtaeabi{000a0000}-189.o(StubCode)
-    theImportedSymbol                        0x0000b164   Data           0  drtaeabi{000a0000}-189.o(StubCode)
-    StubCode                                 0x0000b168   Section        8  scppnwdl{000a0000}-3.o(StubCode)
-    theImportedSymbol                        0x0000b16c   Data           0  scppnwdl{000a0000}-3.o(StubCode)
-    StubCode                                 0x0000b170   Section        8  euser{000a0000}-1360.o(StubCode)
-    theImportedSymbol                        0x0000b174   Data           0  euser{000a0000}-1360.o(StubCode)
-    StubCode                                 0x0000b178   Section        8  euser{000a0000}-641.o(StubCode)
-    theImportedSymbol                        0x0000b17c   Data           0  euser{000a0000}-641.o(StubCode)
-    StubCode                                 0x0000b180   Section        8  euser{000a0000}-585.o(StubCode)
-    theImportedSymbol                        0x0000b184   Data           0  euser{000a0000}-585.o(StubCode)
-    StubCode                                 0x0000b188   Section        8  euser{000a0000}-650.o(StubCode)
-    theImportedSymbol                        0x0000b18c   Data           0  euser{000a0000}-650.o(StubCode)
-    StubCode                                 0x0000b190   Section        8  drtaeabi{000a0000}-204.o(StubCode)
-    theImportedSymbol                        0x0000b194   Data           0  drtaeabi{000a0000}-204.o(StubCode)
-    i._ZN12CAknDocumentD2Ev                  0x0000b198   Section        8  mnrefprovider.in(i._ZN12CAknDocumentD2Ev)
-    i._ZN12CApaDocument16DetachFromStoreLEN8CPicture7TDetachE 0x0000b1a0   Section        2  mnrefprovider.in(i._ZN12CApaDocument16DetachFromStoreLEN8CPicture7TDetachE)
-    i._ZN12CArrayPtrSegI8CGulIconED0Ev       0x0000b1a2   Section       16  mnrefprovider.in(i._ZN12CArrayPtrSegI8CGulIconED0Ev)
-    i._ZN12CArrayPtrSegI8CGulIconED1Ev       0x0000b1b2   Section        8  mnrefprovider.in(i._ZN12CArrayPtrSegI8CGulIconED1Ev)
-    i._ZN13CAknViewAppUiC1Ev                 0x0000b1bc   Section       60  mnrefprovider.in(i._ZN13CAknViewAppUiC1Ev)
-    i._ZN13CAknViewAppUiC1Ev.clean           0x0000b1f8   Section       10  mnrefprovider.in(i._ZN13CAknViewAppUiC1Ev.clean)
-    i._ZN16CMnrpApplicationD0Ev              0x0000b202   Section       16  mnrefprovider.in(i._ZN16CMnrpApplicationD0Ev)
-    i._ZN16CMnrpApplicationD1Ev              0x0000b212   Section        8  mnrefprovider.in(i._ZN16CMnrpApplicationD1Ev)
-    i._ZN5CBasenwEj                          0x0000b21a   Section        8  mnrefprovider.in(i._ZN5CBasenwEj)
-    i._ZN5TRectC1ERKS_                       0x0000b222   Section       18  mnrefprovider.in(i._ZN5TRectC1ERKS_)
-    i._ZN9CArrayFixIP8CGulIconED1Ev          0x0000b234   Section        8  mnrefprovider.in(i._ZN9CArrayFixIP8CGulIconED1Ev)
-    i._ZN9CArrayPtrI8CGulIconED1Ev           0x0000b23c   Section        8  mnrefprovider.in(i._ZN9CArrayPtrI8CGulIconED1Ev)
-    t._ZN12CleanupCloseI6RArrayIiEE5CloseEPv 0x0000b244   Section        8  mnrefprovider.in(t._ZN12CleanupCloseI6RArrayIiEE5CloseEPv)
-    t._ZN12CleanupCloseI6RArrayImEE5CloseEPv 0x0000b24c   Section        8  mnrefprovider.in(t._ZN12CleanupCloseI6RArrayImEE5CloseEPv)
-    t._ZN13RPointerArrayIN14CMnrpNaviModel9CListItemEE15ResetAndDestroyEv 0x0000b254   Section       48  mnrefprovider.in(t._ZN13RPointerArrayIN14CMnrpNaviModel9CListItemEE15ResetAndDestroyEv)
-    t._ZN13RPointerArrayIN14CMnrpNaviModel9CListItemEE7AppendLEPKS1_ 0x0000b284   Section       12  mnrefprovider.in(t._ZN13RPointerArrayIN14CMnrpNaviModel9CListItemEE7AppendLEPKS1_)
-    t._ZN4TBufILi15EEC1Ev                    0x0000b290   Section       10  mnrefprovider.in(t._ZN4TBufILi15EEC1Ev)
-    .ARM.extab                               0x0000b29c   Section       16  uc_exe_.o(.ARM.extab)
-    .extab._Z14NewApplicationv               0x0000b2ac   Data           0  mnrefprovider.in(.ARM.extab)
-    .extab._ZN5CBasenwEj                     0x0000b2bc   Data           0  mnrefprovider.in(.ARM.extab)
-    .extab._ZN10CMnrpAppUiD1Ev               0x0000b2cc   Data           0  mnrefprovider.in(.ARM.extab)
-    .extab._ZN10CMnrpAppUi13StopSelectionEv  0x0000b2dc   Data           0  mnrefprovider.in(.ARM.extab)
-    .extab._ZN13CAknViewAppUiC1Ev            0x0000b30c   Data           0  mnrefprovider.in(.ARM.extab)
-    .extab._ZN13CMnrpDocumentD1Ev            0x0000b31c   Data           0  mnrefprovider.in(.ARM.extab)
-    .extab._ZN12CMnrpAppViewD1Ev             0x0000b32c   Data           0  mnrefprovider.in(.ARM.extab)
-    .extab._ZN12CMnrpMapViewD1Ev             0x0000b33c   Data           0  mnrefprovider.in(.ARM.extab)
-    .extab._ZN15CMnrpMapControlC1ER12CMnrpMapView 0x0000b36c   Data           0  mnrefprovider.in(.ARM.extab)
-    .extab._ZN15CMnrpMapControlD1Ev          0x0000b37c   Data           0  mnrefprovider.in(.ARM.extab)
-    .extab._ZN15CMnrpMapControl11SizeChangedEv 0x0000b38c   Data           0  mnrefprovider.in(.ARM.extab)
-    .extab._ZN13CMnrpNaviViewD1Ev            0x0000b3d4   Data           0  mnrefprovider.in(.ARM.extab)
-    .extab._ZN14CMnrpNaviModelC1ER18MNaviModelObserverR11CMnrpEngine 0x0000b3e4   Data           0  mnrefprovider.in(.ARM.extab)
-    .extab._ZN14CMnrpNaviModelD1Ev           0x0000b3f4   Data           0  mnrefprovider.in(.ARM.extab)
-    .extab._ZN16CMnrpNaviControlD1Ev         0x0000b404   Data           0  mnrefprovider.in(.ARM.extab)
-    .extab._ZN19CMnrpMapViewServiceD1Ev      0x0000b414   Data           0  mnrefprovider.in(.ARM.extab)
-    .extab._ZN19CMnrpMapViewService16HandleSelectionLERK11TCoordinate 0x0000b424   Data           0  mnrefprovider.in(.ARM.extab)
-    .extab.CallThrdProcEntry                 0x0000b44c   Data           0  callfirstprocessfn.o(.ARM.extab)
-    .constdata$1                             0x0000b468   Data           0  mnrefprovider.in(.constdata)
-    KUidMnRefProviderApp                     0x0000b468   Data           4  mnrefprovider.in(.constdata)
-    .constdata                               0x0000b468   Section        4  mnrefprovider.in(.constdata)
-    .constdata$1                             0x0000b46c   Data           0  mnrefprovider.in(.constdata)
-    KMbmFile                                 0x0000b46c   Data          72  mnrefprovider.in(.constdata)
-    .constdata                               0x0000b46c   Section       92  mnrefprovider.in(.constdata)
-    KListItemFormat@_Z12AddLandmarkLRK12CPosLandmarkR12CDesC16ArrayR9CArrayPtrI8CGulIconE_0 0x0000b4b4   Data          20  mnrefprovider.in(.constdata)
-    .constdata$1                             0x0000b4c8   Data           0  mnrefprovider.in(.constdata)
-    KEmpty@_ZN12CMnrpAppView11DoActivateLERK10TVwsViewId4TUidRK6TDesC8_0 0x0000b4c8   Data           8  mnrefprovider.in(.constdata)
-    .constdata                               0x0000b4c8   Section        8  mnrefprovider.in(.constdata)
-    .constdata$1                             0x0000b4d0   Data           0  mnrefprovider.in(.constdata)
-    KMapView@_ZN12CMnrpMapView11DoActivateLERK10TVwsViewId4TUidRK6TDesC8_0 0x0000b4d0   Data          20  mnrefprovider.in(.constdata)
-    .constdata                               0x0000b4d0   Section       20  mnrefprovider.in(.constdata)
-    .constdata$1                             0x0000b4e4   Data           0  mnrefprovider.in(.constdata)
-    _ZZN15CMnrpMapControl18HandleModelUpdateLEvE17KMessageIgnoredLm@_ZN15CMnrpMapControl18HandleModelUpdateLEv_0 0x0000b4e4   Data         108  mnrefprovider.in(.constdata)
-    .constdata                               0x0000b4e4   Section      220  mnrefprovider.in(.constdata)
-    _ZZN15CMnrpMapControl18HandleModelUpdateLEvE18KMessageIgnoredLms@_ZN15CMnrpMapControl18HandleModelUpdateLEv_1 0x0000b550   Data         112  mnrefprovider.in(.constdata)
-    .constdata$1                             0x0000b5c0   Data           0  mnrefprovider.in(.constdata)
-    KNavigation@_ZN13CMnrpNaviView11DoActivateLERK10TVwsViewId4TUidRK6TDesC8_0 0x0000b5c0   Data          28  mnrefprovider.in(.constdata)
-    .constdata                               0x0000b5c0   Section       28  mnrefprovider.in(.constdata)
-    .constdata$1                             0x0000b5dc   Data           0  mnrefprovider.in(.constdata)
-    KNotDefined                              0x0000b5dc   Data          16  mnrefprovider.in(.constdata)
-    .constdata                               0x0000b5dc   Section      344  mnrefprovider.in(.constdata)
-    KDestination                             0x0000b5ec   Data          28  mnrefprovider.in(.constdata)
-    KPosition                                0x0000b608   Data          24  mnrefprovider.in(.constdata)
-    KDistance                                0x0000b620   Data          24  mnrefprovider.in(.constdata)
-    KBearing                                 0x0000b638   Data          20  mnrefprovider.in(.constdata)
-    KDestinationLat                          0x0000b64c   Data          24  mnrefprovider.in(.constdata)
-    KDestinationLon                          0x0000b664   Data          24  mnrefprovider.in(.constdata)
-    KPositionLat                             0x0000b67c   Data          24  mnrefprovider.in(.constdata)
-    KPositionLon                             0x0000b694   Data          24  mnrefprovider.in(.constdata)
-    KSpeed                                   0x0000b6ac   Data          16  mnrefprovider.in(.constdata)
-    KHeading                                 0x0000b6bc   Data          20  mnrefprovider.in(.constdata)
-    KMagHeading                              0x0000b6d0   Data          24  mnrefprovider.in(.constdata)
-    KCourse                                  0x0000b6e8   Data          20  mnrefprovider.in(.constdata)
-    KMagCourse                               0x0000b6fc   Data          24  mnrefprovider.in(.constdata)
-    KRequestorName@_ZN14CMnrpNaviModel10ConstructLEv_0 0x0000b714   Data          32  mnrefprovider.in(.constdata)
-    .constdata$1                             0x0000b734   Data           0  mnrefprovider.in(.constdata)
-    _ZZN16CMnrpNaviControl18HandleModelUpdateLEvE11KItemFormat@_ZN16CMnrpNaviControl18HandleModelUpdateLEv_0 0x0000b734   Data          20  mnrefprovider.in(.constdata)
-    .constdata                               0x0000b734   Section       20  mnrefprovider.in(.constdata)
-    .constdata$1                             0x0000b748   Data           0  callfirstprocessfn.o(.constdata)
-    KLitUser                                 0x0000b748   Data          16  callfirstprocessfn.o(.constdata)
-    .constdata                               0x0000b748   Section       16  callfirstprocessfn.o(.constdata)
-    .constdata__ZTI10CMnrpAppUi              0x0000b758   Section       12  mnrefprovider.in(.constdata__ZTI10CMnrpAppUi)
-    .constdata__ZTI12CArrayPtrSegI8CGulIconE 0x0000b764   Section       12  mnrefprovider.in(.constdata__ZTI12CArrayPtrSegI8CGulIconE)
-    .constdata__ZTI12CMnrpAppView            0x0000b770   Section       12  mnrefprovider.in(.constdata__ZTI12CMnrpAppView)
-    .constdata__ZTI12CMnrpMapView            0x0000b77c   Section       12  mnrefprovider.in(.constdata__ZTI12CMnrpMapView)
-    .constdata__ZTI13CMnrpDocument           0x0000b788   Section       12  mnrefprovider.in(.constdata__ZTI13CMnrpDocument)
-    .constdata__ZTI13CMnrpNaviView           0x0000b794   Section       12  mnrefprovider.in(.constdata__ZTI13CMnrpNaviView)
-    .constdata__ZTI14CMnrpAppServer          0x0000b7a0   Section       12  mnrefprovider.in(.constdata__ZTI14CMnrpAppServer)
-    .constdata__ZTI14CMnrpNaviModel          0x0000b7ac   Section       32  mnrefprovider.in(.constdata__ZTI14CMnrpNaviModel)
-    .constdata__ZTI15CMnrpAppControl         0x0000b7cc   Section       12  mnrefprovider.in(.constdata__ZTI15CMnrpAppControl)
-    .constdata__ZTI15CMnrpMapControl         0x0000b7d8   Section       32  mnrefprovider.in(.constdata__ZTI15CMnrpMapControl)
-    .constdata__ZTI16CMnrpApplication        0x0000b7f8   Section       12  mnrefprovider.in(.constdata__ZTI16CMnrpApplication)
-    .constdata__ZTI16CMnrpNaviControl        0x0000b804   Section       32  mnrefprovider.in(.constdata__ZTI16CMnrpNaviControl)
-    .constdata__ZTI17MMapModelObserver       0x0000b824   Section        8  mnrefprovider.in(.constdata__ZTI17MMapModelObserver)
-    .constdata__ZTI18MNaviModelObserver      0x0000b82c   Section        8  mnrefprovider.in(.constdata__ZTI18MNaviModelObserver)
-    .constdata__ZTI19CMnrpMapViewService     0x0000b834   Section       32  mnrefprovider.in(.constdata__ZTI19CMnrpMapViewService)
-    .constdata__ZTI21MMapSelectionCallback   0x0000b854   Section        8  mnrefprovider.in(.constdata__ZTI21MMapSelectionCallback)
-    .constdata__ZTI21MMnrpPositionObserver   0x0000b85c   Section        8  mnrefprovider.in(.constdata__ZTI21MMnrpPositionObserver)
-    .constdata__ZTI22CMnrpNavigationService  0x0000b864   Section       12  mnrefprovider.in(.constdata__ZTI22CMnrpNavigationService)
-    .constdata__ZTI22MEikStatusPaneObserver  0x0000b870   Section        8  mnrefprovider.in(.constdata__ZTI22MEikStatusPaneObserver)
-    .constdata__ZTI9CArrayFixIP8CGulIconE    0x0000b878   Section       12  mnrefprovider.in(.constdata__ZTI9CArrayFixIP8CGulIconE)
-    .constdata__ZTI9CArrayPtrI8CGulIconE     0x0000b884   Section       12  mnrefprovider.in(.constdata__ZTI9CArrayPtrI8CGulIconE)
-    .constdata__ZTIN14CMnrpNaviModel9CListItemE 0x0000b890   Section       12  mnrefprovider.in(.constdata__ZTIN14CMnrpNaviModel9CListItemE)
-    .constdata__ZTS10CMnrpAppUi              0x0000b89c   Section       13  mnrefprovider.in(.constdata__ZTS10CMnrpAppUi)
-    .constdata__ZTS12CArrayPtrSegI8CGulIconE 0x0000b8a9   Section       26  mnrefprovider.in(.constdata__ZTS12CArrayPtrSegI8CGulIconE)
-    .constdata__ZTS12CMnrpAppView            0x0000b8c3   Section       15  mnrefprovider.in(.constdata__ZTS12CMnrpAppView)
-    .constdata__ZTS12CMnrpMapView            0x0000b8d2   Section       15  mnrefprovider.in(.constdata__ZTS12CMnrpMapView)
-    .constdata__ZTS13CMnrpDocument           0x0000b8e1   Section       16  mnrefprovider.in(.constdata__ZTS13CMnrpDocument)
-    .constdata__ZTS13CMnrpNaviView           0x0000b8f1   Section       16  mnrefprovider.in(.constdata__ZTS13CMnrpNaviView)
-    .constdata__ZTS14CMnrpAppServer          0x0000b901   Section       17  mnrefprovider.in(.constdata__ZTS14CMnrpAppServer)
-    .constdata__ZTS14CMnrpNaviModel          0x0000b912   Section       17  mnrefprovider.in(.constdata__ZTS14CMnrpNaviModel)
-    .constdata__ZTS15CMnrpAppControl         0x0000b923   Section       18  mnrefprovider.in(.constdata__ZTS15CMnrpAppControl)
-    .constdata__ZTS15CMnrpMapControl         0x0000b935   Section       18  mnrefprovider.in(.constdata__ZTS15CMnrpMapControl)
-    .constdata__ZTS16CMnrpApplication        0x0000b947   Section       19  mnrefprovider.in(.constdata__ZTS16CMnrpApplication)
-    .constdata__ZTS16CMnrpNaviControl        0x0000b95a   Section       19  mnrefprovider.in(.constdata__ZTS16CMnrpNaviControl)
-    .constdata__ZTS17MMapModelObserver       0x0000b96d   Section       20  mnrefprovider.in(.constdata__ZTS17MMapModelObserver)
-    .constdata__ZTS18MNaviModelObserver      0x0000b981   Section       21  mnrefprovider.in(.constdata__ZTS18MNaviModelObserver)
-    .constdata__ZTS19CMnrpMapViewService     0x0000b996   Section       22  mnrefprovider.in(.constdata__ZTS19CMnrpMapViewService)
-    .constdata__ZTS21MMapSelectionCallback   0x0000b9ac   Section       24  mnrefprovider.in(.constdata__ZTS21MMapSelectionCallback)
-    .constdata__ZTS21MMnrpPositionObserver   0x0000b9c4   Section       24  mnrefprovider.in(.constdata__ZTS21MMnrpPositionObserver)
-    .constdata__ZTS22CMnrpNavigationService  0x0000b9dc   Section       25  mnrefprovider.in(.constdata__ZTS22CMnrpNavigationService)
-    .constdata__ZTS22MEikStatusPaneObserver  0x0000b9f5   Section       25  mnrefprovider.in(.constdata__ZTS22MEikStatusPaneObserver)
-    .constdata__ZTS9CArrayFixIP8CGulIconE    0x0000ba0e   Section       23  mnrefprovider.in(.constdata__ZTS9CArrayFixIP8CGulIconE)
-    .constdata__ZTS9CArrayPtrI8CGulIconE     0x0000ba25   Section       22  mnrefprovider.in(.constdata__ZTS9CArrayPtrI8CGulIconE)
-    .constdata__ZTSN14CMnrpNaviModel9CListItemE 0x0000ba3b   Section       29  mnrefprovider.in(.constdata__ZTSN14CMnrpNaviModel9CListItemE)
-    .constdata__ZTV10CMnrpAppUi              0x0000ba58   Section      340  mnrefprovider.in(.constdata__ZTV10CMnrpAppUi)
-    .constdata__ZTV12CArrayPtrSegI8CGulIconE 0x0000bbac   Section       20  mnrefprovider.in(.constdata__ZTV12CArrayPtrSegI8CGulIconE)
-    .constdata__ZTV12CMnrpAppView            0x0000bbc0   Section      232  mnrefprovider.in(.constdata__ZTV12CMnrpAppView)
-    .constdata__ZTV12CMnrpMapView            0x0000bca8   Section      236  mnrefprovider.in(.constdata__ZTV12CMnrpMapView)
-    .constdata__ZTV13CMnrpDocument           0x0000bd94   Section      112  mnrefprovider.in(.constdata__ZTV13CMnrpDocument)
-    .constdata__ZTV13CMnrpNaviView           0x0000be04   Section      232  mnrefprovider.in(.constdata__ZTV13CMnrpNaviView)
-    .constdata__ZTV14CMnrpAppServer          0x0000beec   Section       76  mnrefprovider.in(.constdata__ZTV14CMnrpAppServer)
-    .constdata__ZTV14CMnrpNaviModel          0x0000bf38   Section       36  mnrefprovider.in(.constdata__ZTV14CMnrpNaviModel)
-    .constdata__ZTV15CMnrpAppControl         0x0000bf5c   Section      208  mnrefprovider.in(.constdata__ZTV15CMnrpAppControl)
-    .constdata__ZTV15CMnrpMapControl         0x0000c02c   Section      224  mnrefprovider.in(.constdata__ZTV15CMnrpMapControl)
-    .constdata__ZTV16CMnrpApplication        0x0000c10c   Section       80  mnrefprovider.in(.constdata__ZTV16CMnrpApplication)
-    .constdata__ZTV16CMnrpNaviControl        0x0000c15c   Section      224  mnrefprovider.in(.constdata__ZTV16CMnrpNaviControl)
-    .constdata__ZTV19CMnrpMapViewService     0x0000c23c   Section      112  mnrefprovider.in(.constdata__ZTV19CMnrpMapViewService)
-    .constdata__ZTV22CMnrpNavigationService  0x0000c2ac   Section       64  mnrefprovider.in(.constdata__ZTV22CMnrpNavigationService)
-    .constdata__ZTV22MEikStatusPaneObserver  0x0000c2ec   Section       12  mnrefprovider.in(.constdata__ZTV22MEikStatusPaneObserver)
-    .constdata__ZTVN14CMnrpNaviModel9CListItemE 0x0000c2f8   Section       20  mnrefprovider.in(.constdata__ZTVN14CMnrpNaviModel9CListItemE)
-    .init_array                              0x0000c30c   Section        4  mnrefprovider.in(.init_array)
-    .ARM.exidx                               0x0000c310   Section        8  uc_exe_.o(.ARM.exidx)
-    .ARM.exidx                               0x0000c318   Section        8  ucppinit_aeabi.o(.ARM.exidx)
-    .data$0                                  0x00400000   Data           0  mnrefprovider.in(.data)
-    KCursorColor                             0x00400000   Data           4  mnrefprovider.in(.data)
-    .data                                    0x00400000   Section       12  mnrefprovider.in(.data)
-    KGridTextColor                           0x00400004   Data           4  mnrefprovider.in(.data)
-    KOriginMarkColor                         0x00400008   Data           4  mnrefprovider.in(.data)
-
-    Global Symbols
-
-    Symbol Name                              Value     Ov Type        Size  Object(Section)
-
-    BuildAttributes$$THUMB_ISAv3$ARM_ISAv6$M$E$P$PE$A:L22$X:L11$S22$IEEE1$IW$USESV6$~STKCKD$USESV7$~SHL$OSPACE$IEEEJ$EBA8$UX$REQ8$PRES8$EABIv2 0x00000000   Number         0  anon$$obj.o ABSOLUTE
-    #<DLL>AknIcon{000a0000}[1020735a].dll#<\DLL>d  - Undefined Reference
-    #<DLL>apparc{000a0000}[10003a3d].dll#<\DLL>111  - Undefined Reference
-    #<DLL>apparc{000a0000}[10003a3d].dll#<\DLL>112  - Undefined Reference
-    #<DLL>apparc{000a0000}[10003a3d].dll#<\DLL>113  - Undefined Reference
-    #<DLL>apparc{000a0000}[10003a3d].dll#<\DLL>117  - Undefined Reference
-    #<DLL>apparc{000a0000}[10003a3d].dll#<\DLL>118  - Undefined Reference
-    #<DLL>apparc{000a0000}[10003a3d].dll#<\DLL>11c  - Undefined Reference
-    #<DLL>apparc{000a0000}[10003a3d].dll#<\DLL>11d  - Undefined Reference
-    #<DLL>apparc{000a0000}[10003a3d].dll#<\DLL>11e  - Undefined Reference
-    #<DLL>apparc{000a0000}[10003a3d].dll#<\DLL>11f  - Undefined Reference
-    #<DLL>apparc{000a0000}[10003a3d].dll#<\DLL>1e  - Undefined Reference
-    #<DLL>apparc{000a0000}[10003a3d].dll#<\DLL>79  - Undefined Reference
-    #<DLL>apparc{000a0000}[10003a3d].dll#<\DLL>84  - Undefined Reference
-    #<DLL>apparc{000a0000}[10003a3d].dll#<\DLL>ab  - Undefined Reference
-    #<DLL>apparc{000a0000}[10003a3d].dll#<\DLL>bf  - Undefined Reference
-    #<DLL>apparc{000a0000}[10003a3d].dll#<\DLL>c0  - Undefined Reference
-    #<DLL>apparc{000a0000}[10003a3d].dll#<\DLL>c2  - Undefined Reference
-    #<DLL>apparc{000a0000}[10003a3d].dll#<\DLL>ca  - Undefined Reference
-    #<DLL>apparc{000a0000}[10003a3d].dll#<\DLL>de  - Undefined Reference
-    #<DLL>apparc{000a0000}[10003a3d].dll#<\DLL>e8  - Undefined Reference
-    #<DLL>apparc{000a0000}[10003a3d].dll#<\DLL>fd  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>16f  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>170  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>171  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>172  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>174  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>175  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>176  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>177  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>179  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>46c  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>53d  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>7cc  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>81  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>82  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>83  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>873  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>882  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>a1f  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>a40  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>a48  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>b4f  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>b52  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>b53  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>b54  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>b55  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>b56  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>b57  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>b58  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>b59  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>b5a  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>b5b  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>b5d  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>b5e  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>b60  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>b61  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>b62  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>b65  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>b67  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>b68  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>b6a  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>b70  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>b71  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>b72  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>b74  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>b76  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>b78  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>bb1  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>bb5  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>c6  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>c7  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>c9  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>ce  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>d3  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>d5  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>d59  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>d5c  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>d5d  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>d5e  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>d5f  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>d6  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>d60  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>d7  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>d8  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>d9  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>dc  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>ef2  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>ef7  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>ef8  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>f11  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>f14  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>f15  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>f1c  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>f6b  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>f6c  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>f6d  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>f8f  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>fae  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>fbe  - Undefined Reference
-    #<DLL>bafl{000a0000}[10003a0f].dll#<\DLL>2b  - Undefined Reference
-    #<DLL>bafl{000a0000}[10003a0f].dll#<\DLL>62  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>101  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>107  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>109  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>10a  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>10e  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>10f  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>110  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>113  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>114  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>11f  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>12  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>120  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>13  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>15  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>15f  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>161  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>163  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>18c  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>18d  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>19  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>1a  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>1bc  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>1d  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>1da  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>1dd  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>1de  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>1df  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>1e  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>1e2  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>1f6  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>202  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>24  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>244  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>245  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>246  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>247  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>248  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>27  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>27e  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>27f  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>28  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>29  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>298  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>29e  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>29f  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>2a  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>2a4  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>2a5  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>30  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>32  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>33  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>38  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>39  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>3d  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>3e  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>40  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>43  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>64  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>65  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>7f  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>80  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>9  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>b  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>b6  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>c  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>c4  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>c5  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>c7  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>cb  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>d  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>d2  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>d3  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>d4  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>dc  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>f  - Undefined Reference
-    #<DLL>dfpaeabi{000a0000}.dll#<\DLL>14     - Undefined Reference
-    #<DLL>dfpaeabi{000a0000}.dll#<\DLL>17     - Undefined Reference
-    #<DLL>dfpaeabi{000a0000}.dll#<\DLL>18     - Undefined Reference
-    #<DLL>dfpaeabi{000a0000}.dll#<\DLL>29     - Undefined Reference
-    #<DLL>dfpaeabi{000a0000}.dll#<\DLL>8      - Undefined Reference
-    #<DLL>dfpaeabi{000a0000}.dll#<\DLL>c      - Undefined Reference
-    #<DLL>drtaeabi{000a0000}.dll#<\DLL>93     - Undefined Reference
-    #<DLL>drtaeabi{000a0000}.dll#<\DLL>9e     - Undefined Reference
-    #<DLL>drtaeabi{000a0000}.dll#<\DLL>9f     - Undefined Reference
-    #<DLL>drtaeabi{000a0000}.dll#<\DLL>b4     - Undefined Reference
-    #<DLL>drtaeabi{000a0000}.dll#<\DLL>b6     - Undefined Reference
-    #<DLL>drtaeabi{000a0000}.dll#<\DLL>b7     - Undefined Reference
-    #<DLL>drtaeabi{000a0000}.dll#<\DLL>b8     - Undefined Reference
-    #<DLL>drtaeabi{000a0000}.dll#<\DLL>bd     - Undefined Reference
-    #<DLL>drtaeabi{000a0000}.dll#<\DLL>cc     - Undefined Reference
-    #<DLL>egul{000a0000}[100048a2].dll#<\DLL>5e  - Undefined Reference
-    #<DLL>egul{000a0000}[100048a2].dll#<\DLL>5f  - Undefined Reference
-    #<DLL>eikcoctl{000a0000}[1000489e].dll#<\DLL>23  - Undefined Reference
-    #<DLL>eikcoctl{000a0000}[1000489e].dll#<\DLL>25d  - Undefined Reference
-    #<DLL>eikcoctl{000a0000}[1000489e].dll#<\DLL>25e  - Undefined Reference
-    #<DLL>eikcoctl{000a0000}[1000489e].dll#<\DLL>294  - Undefined Reference
-    #<DLL>eikcoctl{000a0000}[1000489e].dll#<\DLL>2e  - Undefined Reference
-    #<DLL>eikcoctl{000a0000}[1000489e].dll#<\DLL>36b  - Undefined Reference
-    #<DLL>eikcoctl{000a0000}[1000489e].dll#<\DLL>370  - Undefined Reference
-    #<DLL>eikcoctl{000a0000}[1000489e].dll#<\DLL>371  - Undefined Reference
-    #<DLL>eikcoctl{000a0000}[1000489e].dll#<\DLL>560  - Undefined Reference
-    #<DLL>eikcoctl{000a0000}[1000489e].dll#<\DLL>596  - Undefined Reference
-    #<DLL>eikcoctl{000a0000}[1000489e].dll#<\DLL>8c  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>12  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>123  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>125  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>126  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>127  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>128  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>129  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>12a  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>12b  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>12e  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>13b  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>13d  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>13f  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>14  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>160  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>186  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>188  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>18a  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>19  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>1a  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>1b  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>1c  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>1d  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>1d3  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>1d8  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>1d9  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>1df  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>1e  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>1ea  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>1f  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>1fa  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>20b  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>214  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>215  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>216  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>217  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>218  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>219  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>235  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>25  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>3d  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>3e  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>3f  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>40  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>43  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>48  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>49  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>4a  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>4b  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>4c  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>4d  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>4e  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>4f  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>8d  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>8e  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>8f  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>90  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>93  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>98  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>9b  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>9e  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>9f  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>a9  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>ab  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>af  - Undefined Reference
-    #<DLL>eikctl{000a0000}[1000489c].dll#<\DLL>1c7  - Undefined Reference
-    #<DLL>eposlandmarks{000a0000}[101fdf8a].dll#<\DLL>32  - Undefined Reference
-    #<DLL>eposlandmarks{000a0000}[101fdf8a].dll#<\DLL>4  - Undefined Reference
-    #<DLL>eposlandmarks{000a0000}[101fdf8a].dll#<\DLL>41  - Undefined Reference
-    #<DLL>eposlandmarks{000a0000}[101fdf8a].dll#<\DLL>43  - Undefined Reference
-    #<DLL>eposlandmarks{000a0000}[101fdf8a].dll#<\DLL>4b  - Undefined Reference
-    #<DLL>eposlandmarks{000a0000}[101fdf8a].dll#<\DLL>c  - Undefined Reference
-    #<DLL>eposlandmarks{000a0000}[101fdf8a].dll#<\DLL>f  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>101  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>1d0  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>1d6  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>1d7  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>1d8  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>1dc  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>1e1  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>227  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>249  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>251  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>265  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>281  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>289  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>28a  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>28c  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>28e  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>29d  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>2e  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>30  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>338  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>33d  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>33e  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>346  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>347  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>349  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>34a  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>37  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>3cd  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>401  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>448  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>45c  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>45f  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>494  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>508  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>51  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>550  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>5e3  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>5e6  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>611  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>636  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>639  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>670  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>719  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>7cb  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>7cd  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>7cf  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>80c  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>80d  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>822  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>848  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>84b  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>84d  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>853  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>cb  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>cc  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>cd  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>cf  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>d0  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>f5  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>fa  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>fe  - Undefined Reference
-    #<DLL>fbscli{000a0000}[10003a15].dll#<\DLL>1a  - Undefined Reference
-    #<DLL>fbscli{000a0000}[10003a15].dll#<\DLL>1f  - Undefined Reference
-    #<DLL>gdi{000a0000}[10003b15].dll#<\DLL>136  - Undefined Reference
-    #<DLL>gdi{000a0000}[10003b15].dll#<\DLL>137  - Undefined Reference
-    #<DLL>gdi{000a0000}[10003b15].dll#<\DLL>138  - Undefined Reference
-    #<DLL>lbs{000a0000}[101f97b1].dll#<\DLL>130  - Undefined Reference
-    #<DLL>lbs{000a0000}[101f97b1].dll#<\DLL>132  - Undefined Reference
-    #<DLL>lbs{000a0000}[101f97b1].dll#<\DLL>15  - Undefined Reference
-    #<DLL>lbs{000a0000}[101f97b1].dll#<\DLL>17  - Undefined Reference
-    #<DLL>lbs{000a0000}[101f97b1].dll#<\DLL>1c  - Undefined Reference
-    #<DLL>lbs{000a0000}[101f97b1].dll#<\DLL>98  - Undefined Reference
-    #<DLL>lbs{000a0000}[101f97b1].dll#<\DLL>b4  - Undefined Reference
-    #<DLL>lbs{000a0000}[101f97b1].dll#<\DLL>b5  - Undefined Reference
-    #<DLL>lbs{000a0000}[101f97b1].dll#<\DLL>cd  - Undefined Reference
-    #<DLL>lbs{000a0000}[101f97b1].dll#<\DLL>cf  - Undefined Reference
-    #<DLL>lbs{000a0000}[101f97b1].dll#<\DLL>d6  - Undefined Reference
-    #<DLL>lbs{000a0000}[101f97b1].dll#<\DLL>df  - Undefined Reference
-    #<DLL>lbs{000a0000}[101f97b1].dll#<\DLL>e1  - Undefined Reference
-    #<DLL>lbs{000a0000}[101f97b1].dll#<\DLL>e2  - Undefined Reference
-    #<DLL>mnrefproviderengine{000a0000}[03132015].dll#<\DLL>11  - Undefined Reference
-    #<DLL>mnrefproviderengine{000a0000}[03132015].dll#<\DLL>13  - Undefined Reference
-    #<DLL>mnrefproviderengine{000a0000}[03132015].dll#<\DLL>14  - Undefined Reference
-    #<DLL>mnrefproviderengine{000a0000}[03132015].dll#<\DLL>16  - Undefined Reference
-    #<DLL>mnrefproviderengine{000a0000}[03132015].dll#<\DLL>17  - Undefined Reference
-    #<DLL>mnrefproviderengine{000a0000}[03132015].dll#<\DLL>18  - Undefined Reference
-    #<DLL>mnrefproviderengine{000a0000}[03132015].dll#<\DLL>19  - Undefined Reference
-    #<DLL>mnrefproviderengine{000a0000}[03132015].dll#<\DLL>1a  - Undefined Reference
-    #<DLL>mnrefproviderengine{000a0000}[03132015].dll#<\DLL>1b  - Undefined Reference
-    #<DLL>mnrefproviderengine{000a0000}[03132015].dll#<\DLL>1c  - Undefined Reference
-    #<DLL>mnrefproviderengine{000a0000}[03132015].dll#<\DLL>1d  - Undefined Reference
-    #<DLL>mnrefproviderengine{000a0000}[03132015].dll#<\DLL>1e  - Undefined Reference
-    #<DLL>mnrefproviderengine{000a0000}[03132015].dll#<\DLL>1f  - Undefined Reference
-    #<DLL>mnrefproviderengine{000a0000}[03132015].dll#<\DLL>20  - Undefined Reference
-    #<DLL>mnrefproviderengine{000a0000}[03132015].dll#<\DLL>21  - Undefined Reference
-    #<DLL>mnrefproviderengine{000a0000}[03132015].dll#<\DLL>22  - Undefined Reference
-    #<DLL>mnrefproviderengine{000a0000}[03132015].dll#<\DLL>26  - Undefined Reference
-    #<DLL>mnrefproviderengine{000a0000}[03132015].dll#<\DLL>27  - Undefined Reference
-    #<DLL>mnrefproviderengine{000a0000}[03132015].dll#<\DLL>28  - Undefined Reference
-    #<DLL>mnrefproviderengine{000a0000}[03132015].dll#<\DLL>29  - Undefined Reference
-    #<DLL>mnrefproviderengine{000a0000}[03132015].dll#<\DLL>2a  - Undefined Reference
-    #<DLL>mnrefproviderengine{000a0000}[03132015].dll#<\DLL>2b  - Undefined Reference
-    #<DLL>mnrefproviderengine{000a0000}[03132015].dll#<\DLL>2c  - Undefined Reference
-    #<DLL>mnrefproviderengine{000a0000}[03132015].dll#<\DLL>2d  - Undefined Reference
-    #<DLL>mnrefproviderengine{000a0000}[03132015].dll#<\DLL>2e  - Undefined Reference
-    #<DLL>mnrefproviderengine{000a0000}[03132015].dll#<\DLL>2f  - Undefined Reference
-    #<DLL>mnrefproviderengine{000a0000}[03132015].dll#<\DLL>30  - Undefined Reference
-    #<DLL>mnrefproviderengine{000a0000}[03132015].dll#<\DLL>32  - Undefined Reference
-    #<DLL>mnrefproviderengine{000a0000}[03132015].dll#<\DLL>33  - Undefined Reference
-    #<DLL>mnrefproviderengine{000a0000}[03132015].dll#<\DLL>35  - Undefined Reference
-    #<DLL>mnrefproviderengine{000a0000}[03132015].dll#<\DLL>36  - Undefined Reference
-    #<DLL>mnrefproviderengine{000a0000}[03132015].dll#<\DLL>c  - Undefined Reference
-    #<DLL>mnservicelib{000a0000}[10206903].dll#<\DLL>1  - Undefined Reference
-    #<DLL>mnservicelib{000a0000}[10206903].dll#<\DLL>10  - Undefined Reference
-    #<DLL>mnservicelib{000a0000}[10206903].dll#<\DLL>11  - Undefined Reference
-    #<DLL>mnservicelib{000a0000}[10206903].dll#<\DLL>14  - Undefined Reference
-    #<DLL>mnservicelib{000a0000}[10206903].dll#<\DLL>1c  - Undefined Reference
-    #<DLL>mnservicelib{000a0000}[10206903].dll#<\DLL>1d  - Undefined Reference
-    #<DLL>mnservicelib{000a0000}[10206903].dll#<\DLL>1e  - Undefined Reference
-    #<DLL>mnservicelib{000a0000}[10206903].dll#<\DLL>2  - Undefined Reference
-    #<DLL>mnservicelib{000a0000}[10206903].dll#<\DLL>21  - Undefined Reference
-    #<DLL>mnservicelib{000a0000}[10206903].dll#<\DLL>4  - Undefined Reference
-    #<DLL>mnservicelib{000a0000}[10206903].dll#<\DLL>5  - Undefined Reference
-    #<DLL>mnservicelib{000a0000}[10206903].dll#<\DLL>7  - Undefined Reference
-    #<DLL>mnservicelib{000a0000}[10206903].dll#<\DLL>a  - Undefined Reference
-    #<DLL>mnservicelib{000a0000}[10206903].dll#<\DLL>b  - Undefined Reference
-    #<DLL>mnservicelib{000a0000}[10206903].dll#<\DLL>c  - Undefined Reference
-    #<DLL>mnservicelib{000a0000}[10206903].dll#<\DLL>d  - Undefined Reference
-    #<DLL>mnservicelib{000a0000}[10206903].dll#<\DLL>e  - Undefined Reference
-    #<DLL>mnservicelib{000a0000}[10206903].dll#<\DLL>f  - Undefined Reference
-    #<DLL>scppnwdl{000a0000}.dll#<\DLL>3      - Undefined Reference
-    typeinfo for CCoeControl                  - Undefined Reference
-    typeinfo for CAknDocument                 - Undefined Reference
-    typeinfo for CAknAppServer                - Undefined Reference
-    typeinfo for CAknViewAppUi                - Undefined Reference
-    typeinfo for CArrayFixBase                - Undefined Reference
-    typeinfo for CEikApplication              - Undefined Reference
-    typeinfo for XLeaveException              - Undefined Reference
-    typeinfo for CMnMapViewServiceBase        - Undefined Reference
-    typeinfo for CMnNavigationServiceBase     - Undefined Reference
-    typeinfo for CBase                        - Undefined Reference
-    typeinfo for CAknView                     - Undefined Reference
-    vtable for CAknViewAppUi                  - Undefined Reference
-    vtable for __cxxabiv1::__class_type_info  - Undefined Reference
-    vtable for __cxxabiv1::__si_class_type_info  - Undefined Reference
-    vtable for __cxxabiv1::__vmi_class_type_info  - Undefined Reference
-    _fp_init                                  - Undefined Weak Reference
-    Image$$ER_RO$$Base                       0x00008000   Number         0  anon$$obj.o(linker$$defined$$symbols)
-    _E32Startup                              0x00008000   ARM Code     112  uc_exe_.o(.emb_text)
-    Symbian$$CPP$$Exception$$Descriptor      0x0000805c   Data           0  uc_exe_.o(.emb_text)
-    __cpp_initialize__aeabi_                 0x00008070   ARM Code      72  ucppinit_aeabi.o(.emb_text)
-    std::nothrow                             0x000080b8   ARM Code       0  ucppinit_aeabi.o(.emb_text)
-    Inline ARM to Thumb Veneer to _xxxx_call_user_invariant 0x000080b8   ARM Code       0  uc_exe_.o(.text)
-    _xxxx_call_user_invariant                0x000080c1   Thumb Code     8  uc_exe_.o(.text)
-    _xxxx_call_user_handle_exception         0x000080c9   Thumb Code     8  uc_exe_.o(.text)
-    E32Main()                                0x000080ef   Thumb Code    22  mnrefprovider.in(.text)
-    CMnrpApplication::AppDllUid() const      0x0000810d   Thumb Code     6  mnrefprovider.in(.text)
-    CMnrpApplication::CreateDocumentL()      0x00008113   Thumb Code     8  mnrefprovider.in(.text)
-    CMnrpApplication::NewAppServerL(CApaAppServer*&) 0x0000811b   Thumb Code    22  mnrefprovider.in(.text)
-    CleanupIconArray(void*)                  0x00008139   Thumb Code    50  mnrefprovider.in(.text)
-    AddIconL(CArrayPtr<CGulIcon>&, const TDesC16&, int, int) 0x0000816b   Thumb Code    64  mnrefprovider.in(.text)
-    CreateIconListLC(int)                    0x000081ab   Thumb Code    52  mnrefprovider.in(.text)
-    AddLandmarkL(const CPosLandmark&, CDesC16Array&, CArrayPtr<CGulIcon>&) 0x000081df   Thumb Code   130  mnrefprovider.in(.text)
-    CMnrpAppUi::CMnrpAppUi(CMnrpEngine&)     0x00008261   Thumb Code    42  mnrefprovider.in(.text)
-    CMnrpAppUi::CMnrpAppUi__sub_object(CMnrpEngine&) 0x00008261   Thumb Code     0  mnrefprovider.in(.text)
-    CMnrpAppUi::ConstructL()                 0x0000828b   Thumb Code    74  mnrefprovider.in(.text)
-    CMnrpAppUi::~CMnrpAppUi()                0x000082d5   Thumb Code    54  mnrefprovider.in(.text)
-    CMnrpAppUi::~CMnrpAppUi__sub_object()    0x000082d5   Thumb Code     0  mnrefprovider.in(.text)
-    CMnrpAppUi::~CMnrpAppUi__deallocating()  0x0000830b   Thumb Code    16  mnrefprovider.in(.text)
-    CMnrpAppUi::IsChainedMode()              0x0000831b   Thumb Code    16  mnrefprovider.in(.text)
-    CMnrpAppUi::ShowMapL(CMnrpMapViewService&) 0x0000832b   Thumb Code    64  mnrefprovider.in(.text)
-    CMnrpAppUi::SelectFromDialogL(CMnrpMapViewService&, MMapSelectionCallback&) 0x0000836b   Thumb Code   526  mnrefprovider.in(.text)
-    CMnrpAppUi::SetNaviPaneTitleL(const TDesC16&) 0x00008579   Thumb Code   100  mnrefprovider.in(.text)
-    CMnrpAppUi::StartSelectionL(CMnrpMapViewService&, MMapSelectionCallback&) 0x000085dd   Thumb Code   104  mnrefprovider.in(.text)
-    CMnrpAppUi::StopSelection()              0x00008645   Thumb Code    68  mnrefprovider.in(.text)
-    CMnrpAppUi::ShowNavigationL(const CPosLandmark&) 0x00008689   Thumb Code    64  mnrefprovider.in(.text)
-    CMnrpAppUi::IsAnyUserViewActive()        0x000086c9   Thumb Code    38  mnrefprovider.in(.text)
-    CMnrpAppUi::SetRightSoftkeyCommandL(int, const TDesC16&) 0x000086ef   Thumb Code    44  mnrefprovider.in(.text)
-    CMnrpAppUi::HandleCommandL(int)          0x0000871b   Thumb Code    62  mnrefprovider.in(.text)
-    CMnrpAppUi::HandleResourceChangeL(int)   0x00008759   Thumb Code    80  mnrefprovider.in(.text)
-    CMnrpAppUi::ProcessCommandParametersL(CApaCommandLine&) 0x000087a9   Thumb Code    26  mnrefprovider.in(.text)
-    CMnrpDocument::ConstructL()              0x000087d1   Thumb Code    12  mnrefprovider.in(.text)
-    CMnrpDocument::CMnrpDocument(CEikApplication&) 0x000087dd   Thumb Code    16  mnrefprovider.in(.text)
-    CMnrpDocument::CMnrpDocument__sub_object(CEikApplication&) 0x000087dd   Thumb Code     0  mnrefprovider.in(.text)
-    CMnrpDocument::NewL(CEikApplication&)    0x000087ed   Thumb Code    36  mnrefprovider.in(.text)
-    CMnrpDocument::~CMnrpDocument()          0x00008811   Thumb Code    32  mnrefprovider.in(.text)
-    CMnrpDocument::~CMnrpDocument__sub_object() 0x00008811   Thumb Code     0  mnrefprovider.in(.text)
-    CMnrpDocument::~CMnrpDocument__deallocating() 0x00008831   Thumb Code    16  mnrefprovider.in(.text)
-    CMnrpDocument::Engine()                  0x00008841   Thumb Code     4  mnrefprovider.in(.text)
-    CMnrpDocument::CreateAppUiL()            0x00008845   Thumb Code    18  mnrefprovider.in(.text)
-    CMnrpAppServer::~CMnrpAppServer()        0x0000885d   Thumb Code     8  mnrefprovider.in(.text)
-    CMnrpAppServer::~CMnrpAppServer__sub_object() 0x0000885d   Thumb Code     0  mnrefprovider.in(.text)
-    CMnrpAppServer::~CMnrpAppServer__deallocating() 0x00008865   Thumb Code    16  mnrefprovider.in(.text)
-    CMnrpAppServer::AppUi()                  0x00008875   Thumb Code    10  mnrefprovider.in(.text)
-    CMnrpAppServer::CreateNavigationServiceL() const 0x0000887f   Thumb Code     8  mnrefprovider.in(.text)
-    CMnrpAppServer::CreateMapViewServiceL() const 0x00008887   Thumb Code     8  mnrefprovider.in(.text)
-    CMnrpAppServer::CreateServiceL(TUid) const 0x0000888f   Thumb Code    30  mnrefprovider.in(.text)
-    CMnrpAppServer::HandleAllClientsClosed() 0x000088ad   Thumb Code    42  mnrefprovider.in(.text)
-    CMnrpAppView::ConstructL()               0x000088dd   Thumb Code    10  mnrefprovider.in(.text)
-    CMnrpAppView::CMnrpAppView()             0x000088e7   Thumb Code    24  mnrefprovider.in(.text)
-    CMnrpAppView::CMnrpAppView__sub_object() 0x000088e7   Thumb Code     0  mnrefprovider.in(.text)
-    CMnrpAppView::NewL()                     0x000088ff   Thumb Code    32  mnrefprovider.in(.text)
-    CMnrpAppView::~CMnrpAppView()            0x0000891f   Thumb Code    40  mnrefprovider.in(.text)
-    CMnrpAppView::~CMnrpAppView__sub_object() 0x0000891f   Thumb Code     0  mnrefprovider.in(.text)
-    CMnrpAppView::~CMnrpAppView__deallocating() 0x00008947   Thumb Code    16  mnrefprovider.in(.text)
-    CMnrpAppView::Id() const                 0x00008957   Thumb Code     4  mnrefprovider.in(.text)
-    CMnrpAppView::DoActivateL(const TVwsViewId&, TUid, const TDesC8&) 0x0000895b   Thumb Code    78  mnrefprovider.in(.text)
-    CMnrpAppView::DoDeactivate()             0x000089a9   Thumb Code    32  mnrefprovider.in(.text)
-    CMnrpAppControl::ConstructL(const TRect&) 0x000089d1   Thumb Code    28  mnrefprovider.in(.text)
-    CMnrpAppControl::CMnrpAppControl(CMnrpAppView&) 0x000089ed   Thumb Code    20  mnrefprovider.in(.text)
-    CMnrpAppControl::CMnrpAppControl__sub_object(CMnrpAppView&) 0x000089ed   Thumb Code     0  mnrefprovider.in(.text)
-    CMnrpAppControl::NewL(CMnrpAppView&, const TRect&) 0x00008a01   Thumb Code    40  mnrefprovider.in(.text)
-    CMnrpAppControl::~CMnrpAppControl()      0x00008a29   Thumb Code     8  mnrefprovider.in(.text)
-    CMnrpAppControl::~CMnrpAppControl__sub_object() 0x00008a29   Thumb Code     0  mnrefprovider.in(.text)
-    CMnrpAppControl::~CMnrpAppControl__deallocating() 0x00008a31   Thumb Code    16  mnrefprovider.in(.text)
-    CMnrpAppControl::CountComponentControls() const 0x00008a41   Thumb Code     4  mnrefprovider.in(.text)
-    CMnrpAppControl::ComponentControl(int) const 0x00008a45   Thumb Code     4  mnrefprovider.in(.text)
-    CMnrpAppControl::HandleResourceChange(int) 0x00008a49   Thumb Code    34  mnrefprovider.in(.text)
-    CMnrpAppControl::Draw(const TRect&) const 0x00008a6b   Thumb Code    32  mnrefprovider.in(.text)
-    CMnrpMapView::ConstructL(int)            0x00008a95   Thumb Code    22  mnrefprovider.in(.text)
-    CMnrpMapView::CMnrpMapView(CMnrpEngine&) 0x00008aab   Thumb Code    28  mnrefprovider.in(.text)
-    CMnrpMapView::CMnrpMapView__sub_object(CMnrpEngine&) 0x00008aab   Thumb Code     0  mnrefprovider.in(.text)
-    CMnrpMapView::NewL(int, CMnrpEngine&)    0x00008ac7   Thumb Code    40  mnrefprovider.in(.text)
-    CMnrpMapView::HandleUserSelectionL(int)  0x00008aef   Thumb Code    56  mnrefprovider.in(.text)
-    CMnrpMapView::~CMnrpMapView()            0x00008b27   Thumb Code    86  mnrefprovider.in(.text)
-    CMnrpMapView::~CMnrpMapView__sub_object() 0x00008b27   Thumb Code     0  mnrefprovider.in(.text)
-    CMnrpMapView::~CMnrpMapView__deallocating() 0x00008b7d   Thumb Code    16  mnrefprovider.in(.text)
-    CMnrpMapView::SetMapModeL(CMnrpMapViewService&) 0x00008b8d   Thumb Code     8  mnrefprovider.in(.text)
-    CMnrpMapView::SetSelectionModeL(CMnrpMapViewService&, MMapSelectionCallback&) 0x00008b95   Thumb Code    18  mnrefprovider.in(.text)
-    CMnrpMapView::StopSelection()            0x00008ba7   Thumb Code     8  mnrefprovider.in(.text)
-    CMnrpMapView::Id() const                 0x00008baf   Thumb Code     4  mnrefprovider.in(.text)
-    CMnrpMapView::HandleCommandL(int)        0x00008bb3   Thumb Code    84  mnrefprovider.in(.text)
-    CMnrpMapView::DoActivateL(const TVwsViewId&, TUid, const TDesC8&) 0x00008c07   Thumb Code   144  mnrefprovider.in(.text)
-    CMnrpMapView::DoDeactivate()             0x00008c97   Thumb Code    32  mnrefprovider.in(.text)
-    CMnrpMapView::DynInitMenuPaneL(int, CEikMenuPane*) 0x00008cb7   Thumb Code    40  mnrefprovider.in(.text)
-    thunk{-12} to CMnrpMapView::DynInitMenuPaneL(int, CEikMenuPane*) 0x00008cdf   Thumb Code     4  mnrefprovider.in(.text)
-    CMnrpMapControl::CreateScreenBufferL(const TSize&) 0x00008cf9   Thumb Code    70  mnrefprovider.in(.text)
-    CMnrpMapControl::CreateFonts()           0x00008d3f   Thumb Code    62  mnrefprovider.in(.text)
-    CMnrpMapControl::ConstructL(const TRect&, CMnrpEngine&) 0x00008d7d   Thumb Code   134  mnrefprovider.in(.text)
-    CMnrpMapControl::CMnrpMapControl(CMnrpMapView&) 0x00008e03   Thumb Code    46  mnrefprovider.in(.text)
-    CMnrpMapControl::CMnrpMapControl__sub_object(CMnrpMapView&) 0x00008e03   Thumb Code     0  mnrefprovider.in(.text)
-    CMnrpMapControl::NewL(CMnrpMapView&, const TRect&, CMnrpEngine&) 0x00008e31   Thumb Code    44  mnrefprovider.in(.text)
-    CMnrpMapControl::DestroyFonts()          0x00008e5d   Thumb Code    38  mnrefprovider.in(.text)
-    CMnrpMapControl::~CMnrpMapControl()      0x00008e83   Thumb Code    54  mnrefprovider.in(.text)
-    CMnrpMapControl::~CMnrpMapControl__sub_object() 0x00008e83   Thumb Code     0  mnrefprovider.in(.text)
-    CMnrpMapControl::~CMnrpMapControl__deallocating() 0x00008eb9   Thumb Code    16  mnrefprovider.in(.text)
-    CMnrpMapControl::UpdateModelL(CMnrpMapViewService&) 0x00008ec9   Thumb Code    10  mnrefprovider.in(.text)
-    CMnrpMapControl::SetSelectionModeL(int)  0x00008ed3   Thumb Code    66  mnrefprovider.in(.text)
-    CMnrpMapControl::CurrentLocation()       0x00008f15   Thumb Code    12  mnrefprovider.in(.text)
-    CMnrpMapControl::SetFullScreen(int)      0x00008f21   Thumb Code    36  mnrefprovider.in(.text)
-    CMnrpMapControl::ToggleFullScreen()      0x00008f45   Thumb Code    12  mnrefprovider.in(.text)
-    CMnrpMapControl::DrawCursor(CWindowGc&) const 0x00008f51   Thumb Code   224  mnrefprovider.in(.text)
-    CMnrpMapControl::DrawGridText(CWindowGc&, const TRect&, const TRect&, const CFont*, CMnrpMapModel::TGrid&) const 0x00009031   Thumb Code   610  mnrefprovider.in(.text)
-    CMnrpMapControl::BorderSize() const      0x00009293   Thumb Code    44  mnrefprovider.in(.text)
-    CMnrpMapControl::Draw(const TRect&) const 0x000092bf   Thumb Code   306  mnrefprovider.in(.text)
-    CMnrpMapControl::RenderL()               0x000093f1   Thumb Code   106  mnrefprovider.in(.text)
-    CMnrpMapControl::CursorMargin()          0x0000945b   Thumb Code    30  mnrefprovider.in(.text)
-    CMnrpMapControl::MoveCursor(int, int)    0x00009479   Thumb Code   324  mnrefprovider.in(.text)
-    CMnrpMapControl::Zoom(double)            0x000095bd   Thumb Code    90  mnrefprovider.in(.text)
-    CMnrpMapControl::OfferKeyEventL(const TKeyEvent&, TEventCode) 0x00009617   Thumb Code   446  mnrefprovider.in(.text)
-    CMnrpMapControl::SizeChanged()           0x000097d5   Thumb Code   174  mnrefprovider.in(.text)
-    CMnrpMapControl::HandleResourceChange(int) 0x00009883   Thumb Code    26  mnrefprovider.in(.text)
-    CMnrpMapControl::HandleModelUpdateL()    0x0000989d   Thumb Code    80  mnrefprovider.in(.text)
-    thunk{-52} to CMnrpMapControl::HandleModelUpdateL() 0x000098ed   Thumb Code     4  mnrefprovider.in(.text)
-    CMnrpNaviView::ConstructL(int)           0x00009945   Thumb Code    20  mnrefprovider.in(.text)
-    CMnrpNaviView::CMnrpNaviView(CMnrpEngine&) 0x00009959   Thumb Code    28  mnrefprovider.in(.text)
-    CMnrpNaviView::CMnrpNaviView__sub_object(CMnrpEngine&) 0x00009959   Thumb Code     0  mnrefprovider.in(.text)
-    CMnrpNaviView::NewL(int, CMnrpEngine&)   0x00009975   Thumb Code    40  mnrefprovider.in(.text)
-    CMnrpNaviView::~CMnrpNaviView()          0x0000999d   Thumb Code    52  mnrefprovider.in(.text)
-    CMnrpNaviView::~CMnrpNaviView__sub_object() 0x0000999d   Thumb Code     0  mnrefprovider.in(.text)
-    CMnrpNaviView::~CMnrpNaviView__deallocating() 0x000099d1   Thumb Code    16  mnrefprovider.in(.text)
-    CMnrpNaviView::SetDestinationL(const CPosLandmark&) 0x000099e1   Thumb Code    46  mnrefprovider.in(.text)
-    CMnrpNaviView::Id() const                0x00009a0f   Thumb Code     4  mnrefprovider.in(.text)
-    CMnrpNaviView::HandleCommandL(int)       0x00009a13   Thumb Code    18  mnrefprovider.in(.text)
-    CMnrpNaviView::DoActivateL(const TVwsViewId&, TUid, const TDesC8&) 0x00009a25   Thumb Code    92  mnrefprovider.in(.text)
-    CMnrpNaviView::DoDeactivate()            0x00009a81   Thumb Code    32  mnrefprovider.in(.text)
-    CMnrpNaviModel::ConstructL()             0x00009aad   Thumb Code    64  mnrefprovider.in(.text)
-    CMnrpNaviModel::CMnrpNaviModel(MNaviModelObserver&, CMnrpEngine&) 0x00009aed   Thumb Code    44  mnrefprovider.in(.text)
-    CMnrpNaviModel::CMnrpNaviModel__sub_object(MNaviModelObserver&, CMnrpEngine&) 0x00009aed   Thumb Code     0  mnrefprovider.in(.text)
-    CMnrpNaviModel::NewL(MNaviModelObserver&, CMnrpEngine&) 0x00009b19   Thumb Code    40  mnrefprovider.in(.text)
-    CMnrpNaviModel::SetDestinationL(const CPosLandmark&) 0x00009b41   Thumb Code    42  mnrefprovider.in(.text)
-    CMnrpNaviModel::CListItem::NewL(const TDesC16&, const TDesC16&) 0x00009b6b   Thumb Code    48  mnrefprovider.in(.text)
-    CMnrpNaviModel::ListItemsL()             0x00009b9b   Thumb Code   630  mnrefprovider.in(.text)
-    CMnrpNaviModel::~CMnrpNaviModel()        0x00009e11   Thumb Code    56  mnrefprovider.in(.text)
-    CMnrpNaviModel::~CMnrpNaviModel__sub_object() 0x00009e11   Thumb Code     0  mnrefprovider.in(.text)
-    CMnrpNaviModel::~CMnrpNaviModel__deallocating() 0x00009e49   Thumb Code    48  mnrefprovider.in(.text)
-    CMnrpNaviModel::HandlePositionRequestCompletedL(int) 0x00009e79   Thumb Code    60  mnrefprovider.in(.text)
-    thunk{-4} to CMnrpNaviModel::HandlePositionRequestCompletedL(int) 0x00009eb5   Thumb Code     4  mnrefprovider.in(.text)
-    CMnrpNaviModel::CListItem::~CListItem()  0x00009eb9   Thumb Code    28  mnrefprovider.in(.text)
-    CMnrpNaviModel::CListItem::~CListItem__sub_object() 0x00009eb9   Thumb Code     0  mnrefprovider.in(.text)
-    CMnrpNaviModel::CListItem::~CListItem__deallocating() 0x00009ed5   Thumb Code    16  mnrefprovider.in(.text)
-    CMnrpNaviControl::CreateListBoxL()       0x00009ee9   Thumb Code    58  mnrefprovider.in(.text)
-    CMnrpNaviControl::ConstructL(const TRect&, CMnrpEngine&) 0x00009f23   Thumb Code    48  mnrefprovider.in(.text)
-    CMnrpNaviControl::CMnrpNaviControl(CMnrpNaviView&) 0x00009f53   Thumb Code    24  mnrefprovider.in(.text)
-    CMnrpNaviControl::CMnrpNaviControl__sub_object(CMnrpNaviView&) 0x00009f53   Thumb Code     0  mnrefprovider.in(.text)
-    CMnrpNaviControl::NewL(CMnrpNaviView&, const TRect&, CMnrpEngine&) 0x00009f6b   Thumb Code    44  mnrefprovider.in(.text)
-    CMnrpNaviControl::~CMnrpNaviControl()    0x00009f97   Thumb Code    48  mnrefprovider.in(.text)
-    CMnrpNaviControl::~CMnrpNaviControl__sub_object() 0x00009f97   Thumb Code     0  mnrefprovider.in(.text)
-    CMnrpNaviControl::~CMnrpNaviControl__deallocating() 0x00009fc7   Thumb Code    16  mnrefprovider.in(.text)
-    CMnrpNaviControl::UpdateModelL(CPosLandmark&) 0x00009fd7   Thumb Code    10  mnrefprovider.in(.text)
-    CMnrpNaviControl::HandleModelUpdateL()   0x00009fe1   Thumb Code   174  mnrefprovider.in(.text)
-    thunk{-52} to CMnrpNaviControl::HandleModelUpdateL() 0x0000a08f   Thumb Code     4  mnrefprovider.in(.text)
-    CMnrpNaviControl::CountComponentControls() const 0x0000a093   Thumb Code     4  mnrefprovider.in(.text)
-    CMnrpNaviControl::ComponentControl(int) const 0x0000a097   Thumb Code    12  mnrefprovider.in(.text)
-    CMnrpNaviControl::OfferKeyEventL(const TKeyEvent&, TEventCode) 0x0000a0a3   Thumb Code    54  mnrefprovider.in(.text)
-    CMnrpNaviControl::SizeChanged()          0x0000a0d9   Thumb Code    28  mnrefprovider.in(.text)
-    CMnrpNaviControl::HandleResourceChange(int) 0x0000a0f5   Thumb Code    34  mnrefprovider.in(.text)
-    CMnrpNavigationService::ConstructL()     0x0000a12d   Thumb Code     8  mnrefprovider.in(.text)
-    CMnrpNavigationService::CMnrpNavigationService() 0x0000a135   Thumb Code    12  mnrefprovider.in(.text)
-    CMnrpNavigationService::CMnrpNavigationService__sub_object() 0x0000a135   Thumb Code     0  mnrefprovider.in(.text)
-    CMnrpNavigationService::NewL()           0x0000a141   Thumb Code    32  mnrefprovider.in(.text)
-    CMnrpNavigationService::~CMnrpNavigationService() 0x0000a161   Thumb Code     8  mnrefprovider.in(.text)
-    CMnrpNavigationService::~CMnrpNavigationService__sub_object() 0x0000a161   Thumb Code     0  mnrefprovider.in(.text)
-    CMnrpNavigationService::~CMnrpNavigationService__deallocating() 0x0000a169   Thumb Code    16  mnrefprovider.in(.text)
-    CMnrpNavigationService::HandleNavigateToL(const CPosLandmark&) 0x0000a179   Thumb Code    18  mnrefprovider.in(.text)
-    CMnrpNavigationService::DoCancel()       0x0000a18b   Thumb Code     2  mnrefprovider.in(.text)
-    CMnrpMapViewService::ConstructL()        0x0000a191   Thumb Code     8  mnrefprovider.in(.text)
-    CMnrpMapViewService::CMnrpMapViewService() 0x0000a199   Thumb Code    20  mnrefprovider.in(.text)
-    CMnrpMapViewService::CMnrpMapViewService__sub_object() 0x0000a199   Thumb Code     0  mnrefprovider.in(.text)
-    CMnrpMapViewService::NewL()              0x0000a1ad   Thumb Code    32  mnrefprovider.in(.text)
-    CMnrpMapViewService::AppUi()             0x0000a1cd   Thumb Code    18  mnrefprovider.in(.text)
-    CMnrpMapViewService::StopSelection()     0x0000a1df   Thumb Code    24  mnrefprovider.in(.text)
-    CMnrpMapViewService::DoCancel()          0x0000a1f7   Thumb Code    18  mnrefprovider.in(.text)
-    CMnrpMapViewService::~CMnrpMapViewService() 0x0000a209   Thumb Code    48  mnrefprovider.in(.text)
-    CMnrpMapViewService::~CMnrpMapViewService__sub_object() 0x0000a209   Thumb Code     0  mnrefprovider.in(.text)
-    CMnrpMapViewService::~CMnrpMapViewService__deallocating() 0x0000a239   Thumb Code    16  mnrefprovider.in(.text)
-    CMnrpMapViewService::HandleShowMapL()    0x0000a249   Thumb Code    44  mnrefprovider.in(.text)
-    CMnrpMapViewService::HandleShowCurrentLocationL() 0x0000a275   Thumb Code    12  mnrefprovider.in(.text)
-    CMnrpMapViewService::HandleSelectFromMapL() 0x0000a281   Thumb Code    54  mnrefprovider.in(.text)
-    CMnrpMapViewService::CompleteSelectionL(const TCoordinate&) 0x0000a2b7   Thumb Code    42  mnrefprovider.in(.text)
-    CMnrpMapViewService::HandleSelectionL(const TCoordinate&) 0x0000a2e1   Thumb Code    88  mnrefprovider.in(.text)
-    thunk{-212} to CMnrpMapViewService::HandleSelectionL(const TCoordinate&) 0x0000a339   Thumb Code     4  mnrefprovider.in(.text)
-    CMnrpMapViewService::HandleSelectionL(int) 0x0000a33d   Thumb Code    24  mnrefprovider.in(.text)
-    thunk{-212} to CMnrpMapViewService::HandleSelectionL(int) 0x0000a355   Thumb Code     4  mnrefprovider.in(.text)
-    CMnrpMapViewService::HandleSelectionL(unsigned long, int) 0x0000a359   Thumb Code    24  mnrefprovider.in(.text)
-    thunk{-212} to CMnrpMapViewService::HandleSelectionL(unsigned long, int) 0x0000a371   Thumb Code     4  mnrefprovider.in(.text)
-    CMnrpMapViewService::HandleSelectionErrorL(int) 0x0000a375   Thumb Code    16  mnrefprovider.in(.text)
-    thunk{-212} to CMnrpMapViewService::HandleSelectionErrorL(int) 0x0000a385   Thumb Code     4  mnrefprovider.in(.text)
-    Inline ARM to Thumb Veneer to RunThread  0x0000a38c   ARM Code       0  uc_exe.o(.text)
-    RunThread                                0x0000a395   Thumb Code    36  uc_exe.o(.text)
-    CallThrdProcEntry                        0x0000a3b8   ARM Code     116  callfirstprocessfn.o(.text)
-    __DLL_Export_Table__                     0x0000a430   ARM Code       4  dllexp.o(.text)
-    TPoint::operator +=(const TPoint&)       0x0000a4d8   ARM Code       0  euser{000a0000}-1025.o(StubCode)
-    CBufSeg::NewL(int)                       0x0000a4e0   ARM Code       0  euser{000a0000}-1096.o(StubCode)
-    HBufC16::Des()                           0x0000a4e8   ARM Code       0  euser{000a0000}-1116.o(StubCode)
-    HBufC16::NewLC(int)                      0x0000a4f0   ARM Code       0  euser{000a0000}-1119.o(StubCode)
-    TPtrC16::TPtrC16()                       0x0000a4f8   ARM Code       0  euser{000a0000}-1172.o(StubCode)
-    CServer2::DoCancel()                     0x0000a500   ARM Code       0  euser{000a0000}-1288.o(StubCode)
-    RArrayBase::At(int) const                0x0000a508   ARM Code       0  euser{000a0000}-1507.o(StubCode)
-    RArrayBase::Count() const                0x0000a510   ARM Code       0  euser{000a0000}-1510.o(StubCode)
-    CArrayFixBase::At(int) const             0x0000a518   ARM Code       0  euser{000a0000}-1553.o(StubCode)
-    RPointerArrayBase::At(int) const         0x0000a520   ARM Code       0  euser{000a0000}-1590.o(StubCode)
-    RPointerArrayBase::Count() const         0x0000a528   ARM Code       0  euser{000a0000}-1593.o(StubCode)
-    TRect::Size() const                      0x0000a530   ARM Code       0  euser{000a0000}-1648.o(StubCode)
-    TDesC16::AllocL() const                  0x0000a538   ARM Code       0  euser{000a0000}-1817.o(StubCode)
-    CPolicyServer::CustomFailureActionL(const RMessage2&, int, const TSecurityInfo&) 0x0000a540   ARM Code       0  euser{000a0000}-1995.o(StubCode)
-    CPolicyServer::RunL()                    0x0000a548   ARM Code       0  euser{000a0000}-1997.o(StubCode)
-    CPolicyServer::RunError(int)             0x0000a550   ARM Code       0  euser{000a0000}-1999.o(StubCode)
-    CleanupStack::PopAndDestroy()            0x0000a558   ARM Code       0  euser{000a0000}-203.o(StubCode)
-    CleanupStack::Pop(int)                   0x0000a560   ARM Code       0  euser{000a0000}-204.o(StubCode)
-    CleanupStack::Pop()                      0x0000a568   ARM Code       0  euser{000a0000}-205.o(StubCode)
-    User::MarkCleanupStack()                 0x0000a570   ARM Code       0  euser{000a0000}-2060.o(StubCode)
-    User::UnMarkCleanupStack(TTrapHandler*)  0x0000a578   ARM Code       0  euser{000a0000}-2061.o(StubCode)
-    CleanupStack::PushL(TCleanupItem)        0x0000a580   ARM Code       0  euser{000a0000}-207.o(StubCode)
-    CleanupStack::PushL(CBase*)              0x0000a588   ARM Code       0  euser{000a0000}-208.o(StubCode)
-    XLeaveException::GetReason() const       0x0000a590   ARM Code       0  euser{000a0000}-2082.o(StubCode)
-    CPolicyServer::Extension_(unsigned, void*&, void*) 0x0000a598   ARM Code       0  euser{000a0000}-2120.o(StubCode)
-    CBase::Extension_(unsigned, void*&, void*) 0x0000a5a0   ARM Code       0  euser{000a0000}-2123.o(StubCode)
-    CBase::~CBase()                          0x0000a5a8   ARM Code       0  euser{000a0000}-2125.o(StubCode)
-    CSession2::Extension_(unsigned, void*&, void*) 0x0000a5b0   ARM Code       0  euser{000a0000}-2131.o(StubCode)
-    CArrayFixBase::Reset()                   0x0000a5b8   ARM Code       0  euser{000a0000}-245.o(StubCode)
-    CArrayFixBase::InsertL(int, const void*) 0x0000a5c0   ARM Code       0  euser{000a0000}-250.o(StubCode)
-    CArrayFixBase::CArrayFixBase(CBufBase*(*)(int), int, int) 0x0000a5c8   ARM Code       0  euser{000a0000}-254.o(StubCode)
-    CArrayFixBase::~CArrayFixBase()          0x0000a5d0   ARM Code       0  euser{000a0000}-257.o(StubCode)
-    RArrayBase::Close()                      0x0000a5d8   ARM Code       0  euser{000a0000}-46.o(StubCode)
-    RPointerArrayBase::GetElementPtr(const CBase*, int) 0x0000a5e0   ARM Code       0  euser{000a0000}-464.o(StubCode)
-    RPointerArrayBase::Close()               0x0000a5e8   ARM Code       0  euser{000a0000}-470.o(StubCode)
-    RPointerArrayBase::Reset()               0x0000a5f0   ARM Code       0  euser{000a0000}-471.o(StubCode)
-    RPointerArrayBase::Append(const void*)   0x0000a5f8   ARM Code       0  euser{000a0000}-472.o(StubCode)
-    RPointerArrayBase::GetCount(const CBase*) 0x0000a600   ARM Code       0  euser{000a0000}-476.o(StubCode)
-    RArrayBase::Append(const void*)          0x0000a608   ARM Code       0  euser{000a0000}-48.o(StubCode)
-    RPointerArrayBase::RPointerArrayBase()   0x0000a610   ARM Code       0  euser{000a0000}-481.o(StubCode)
-    RArrayBase::RArrayBase(int)              0x0000a618   ARM Code       0  euser{000a0000}-55.o(StubCode)
-    Math::IsNaN(const double&)               0x0000a620   ARM Code       0  euser{000a0000}-551.o(StubCode)
-    User::LeaveIfError(int)                  0x0000a628   ARM Code       0  euser{000a0000}-593.o(StubCode)
-    User::HandleException(void*)             0x0000a630   ARM Code       0  euser{000a0000}-613.o(StubCode)
-    User::Leave(int)                         0x0000a638   ARM Code       0  euser{000a0000}-649.o(StubCode)
-    User::AllocZ(int)                        0x0000a640   ARM Code       0  euser{000a0000}-652.o(StubCode)
-    User::AllocZL(int)                       0x0000a648   ARM Code       0  euser{000a0000}-654.o(StubCode)
-    User::Invariant()                        0x0000a650   ARM Code       0  euser{000a0000}-669.o(StubCode)
-    TBufBase16::TBufBase16(int)              0x0000a658   ARM Code       0  euser{000a0000}-81.o(StubCode)
-    TRect::Grow(int, int)                    0x0000a660   ARM Code       0  euser{000a0000}-824.o(StubCode)
-    TRect::Shrink(const TSize&)              0x0000a668   ARM Code       0  euser{000a0000}-829.o(StubCode)
-    TRect::Shrink(int, int)                  0x0000a670   ARM Code       0  euser{000a0000}-830.o(StubCode)
-    TRect::TRect(const TSize&)               0x0000a678   ARM Code       0  euser{000a0000}-838.o(StubCode)
-    TRect::TRect(const TPoint&, const TSize&) 0x0000a680   ARM Code       0  euser{000a0000}-839.o(StubCode)
-    TRect::TRect(int, int, int, int)         0x0000a688   ARM Code       0  euser{000a0000}-841.o(StubCode)
-    TRect::TRect()                           0x0000a690   ARM Code       0  euser{000a0000}-842.o(StubCode)
-    TDes16::Format(TRefByValue<const TDesC16>, ...) 0x0000a698   ARM Code       0  euser{000a0000}-973.o(StubCode)
-    CApaDocument::Capability() const         0x0000a6a0   ARM Code       0  apparc{000a0000}-121.o(StubCode)
-    CApaApplication::AppFullName() const     0x0000a6a8   ARM Code       0  apparc{000a0000}-132.o(StubCode)
-    TApaApplicationFactory::TApaApplicationFactory(CApaApplication*(*)()) 0x0000a6b0   ARM Code       0  apparc{000a0000}-171.o(StubCode)
-    CApaAppServer::NotifyServerExit(int)     0x0000a6b8   ARM Code       0  apparc{000a0000}-191.o(StubCode)
-    CApaAppServer::CustomSecurityCheckL(const RMessage2&, int&, TSecurityInfo&) 0x0000a6c0   ARM Code       0  apparc{000a0000}-192.o(StubCode)
-    CApaAppServer::CApaAppServer()           0x0000a6c8   ARM Code       0  apparc{000a0000}-194.o(StubCode)
-    CApaAppServiceBase::SecurityCheckL(const RMessage2&, int&, TSecurityInfo&) 0x0000a6d0   ARM Code       0  apparc{000a0000}-202.o(StubCode)
-    CApaAppServer::NewSessionL(const TVersion&, const RMessage2&) const 0x0000a6d8   ARM Code       0  apparc{000a0000}-222.o(StubCode)
-    CApaAppServiceBase::ExtensionInterface(TUid, void*&) 0x0000a6e0   ARM Code       0  apparc{000a0000}-232.o(StubCode)
-    CApaCommandLine::ParentWindowGroupID() const 0x0000a6e8   ARM Code       0  apparc{000a0000}-253.o(StubCode)
-    CApaAppServer::CApaAppServer_Reserved1() 0x0000a6f0   ARM Code       0  apparc{000a0000}-273.o(StubCode)
-    CApaAppServer::CApaAppServer_Reserved2() 0x0000a6f8   ARM Code       0  apparc{000a0000}-274.o(StubCode)
-    CApaAppServer::DoConnect(const RMessage2&) 0x0000a700   ARM Code       0  apparc{000a0000}-275.o(StubCode)
-    CApaApplication::CApaApplication_Reserved1() 0x0000a708   ARM Code       0  apparc{000a0000}-279.o(StubCode)
-    CApaApplication::CApaApplication_Reserved2() 0x0000a710   ARM Code       0  apparc{000a0000}-280.o(StubCode)
-    CApaAppServiceBase::Disconnect(const RMessage2&) 0x0000a718   ARM Code       0  apparc{000a0000}-284.o(StubCode)
-    CApaAppServiceBase::CountResources()     0x0000a720   ARM Code       0  apparc{000a0000}-285.o(StubCode)
-    CApaAppServiceBase::CApaAppServiceBase_Reserved1() 0x0000a728   ARM Code       0  apparc{000a0000}-286.o(StubCode)
-    CApaAppServiceBase::CApaAppServiceBase_Reserved2() 0x0000a730   ARM Code       0  apparc{000a0000}-287.o(StubCode)
-    CApaDocument::GlassPictureL()            0x0000a738   ARM Code       0  apparc{000a0000}-30.o(StubCode)
-    CDesC16Array::AppendL(const TDesC16&)    0x0000a740   ARM Code       0  bafl{000a0000}-43.o(StubCode)
-    CDesC16ArraySeg::CDesC16ArraySeg(int)    0x0000a748   ARM Code       0  bafl{000a0000}-98.o(StubCode)
-    MCoeMessageObserver::MCoeMessageObserver_Reserved_1() 0x0000a750   ARM Code       0  cone{000a0000}-100.o(StubCode)
-    MCoeMessageObserver::MCoeMessageObserver_Reserved_2() 0x0000a758   ARM Code       0  cone{000a0000}-101.o(StubCode)
-    CCoeControl::MakeVisible(int)            0x0000a760   ARM Code       0  cone{000a0000}-11.o(StubCode)
-    CCoeControl::MinimumSize()               0x0000a768   ARM Code       0  cone{000a0000}-12.o(StubCode)
-    MCoeViewDeactivationObserver::MCoeViewDeactivationObserver_Reserved_1() 0x0000a770   ARM Code       0  cone{000a0000}-127.o(StubCode)
-    MCoeViewDeactivationObserver::MCoeViewDeactivationObserver_Reserved_2() 0x0000a778   ARM Code       0  cone{000a0000}-128.o(StubCode)
-    CCoeControl::SetAdjacent(int)            0x0000a780   ARM Code       0  cone{000a0000}-13.o(StubCode)
-    CCoeControl::SetNeighbor(CCoeControl*)   0x0000a788   ARM Code       0  cone{000a0000}-15.o(StubCode)
-    CCoeControl::SizeChanged()               0x0000a790   ARM Code       0  cone{000a0000}-18.o(StubCode)
-    CCoeEnv::Static()                        0x0000a798   ARM Code       0  cone{000a0000}-182.o(StubCode)
-    CCoeControl::FocusChanged(TDrawNow)      0x0000a7a0   ARM Code       0  cone{000a0000}-19.o(StubCode)
-    MCoeView::ViewConstructL()               0x0000a7a8   ARM Code       0  cone{000a0000}-196.o(StubCode)
-    MCoeView::PrepareForViewActivation()     0x0000a7b0   ARM Code       0  cone{000a0000}-197.o(StubCode)
-    MCoeView::ViewScreenModeCompatible(int)  0x0000a7b8   ARM Code       0  cone{000a0000}-199.o(StubCode)
-    CCoeAppUi::AddToStackL(const MCoeView&, CCoeControl*, int, int) 0x0000a7c0   ARM Code       0  cone{000a0000}-203.o(StubCode)
-    CCoeControl::SetMopParent(MObjectProvider*) 0x0000a7c8   ARM Code       0  cone{000a0000}-21.o(StubCode)
-    CCoeAppUi::HandleKeyEventL(const TKeyEvent&, TEventCode) 0x0000a7d0   ARM Code       0  cone{000a0000}-210.o(StubCode)
-    CCoeAppUi::RemoveFromStack(CCoeControl*) 0x0000a7d8   ARM Code       0  cone{000a0000}-211.o(StubCode)
-    CCoeAppUi::SetAndDrawFocus(int)          0x0000a7e0   ARM Code       0  cone{000a0000}-212.o(StubCode)
-    CCoeAppUi::HandleSwitchOnEventL(CCoeControl*) 0x0000a7e8   ARM Code       0  cone{000a0000}-220.o(StubCode)
-    CCoeControl::CreateWindowL()             0x0000a7f0   ARM Code       0  cone{000a0000}-25.o(StubCode)
-    CCoeControl::DrawDeferred() const        0x0000a7f8   ARM Code       0  cone{000a0000}-257.o(StubCode)
-    CCoeControl::OfferKeyEventL(const TKeyEvent&, TEventCode) 0x0000a800   ARM Code       0  cone{000a0000}-26.o(StubCode)
-    CCoeControl::GetHelpContext(TCoeHelpContext&) const 0x0000a808   ARM Code       0  cone{000a0000}-263.o(StubCode)
-    CCoeControl::ComponentControl(int) const 0x0000a810   ARM Code       0  cone{000a0000}-265.o(StubCode)
-    CCoeControl::GetColorUseListL(CArrayFix<TCoeColorUse>&) const 0x0000a818   ARM Code       0  cone{000a0000}-266.o(StubCode)
-    CCoeControl::InputCapabilities() const   0x0000a820   ARM Code       0  cone{000a0000}-270.o(StubCode)
-    CCoeControl::WriteInternalStateL(RWriteStream&) const 0x0000a828   ARM Code       0  cone{000a0000}-271.o(StubCode)
-    CCoeControl::CountComponentControls() const 0x0000a830   ARM Code       0  cone{000a0000}-272.o(StubCode)
-    CCoeControl::Draw(const TRect&) const    0x0000a838   ARM Code       0  cone{000a0000}-275.o(StubCode)
-    CCoeControl::Rect() const                0x0000a840   ARM Code       0  cone{000a0000}-276.o(StubCode)
-    CCoeControl::SystemGc() const            0x0000a848   ARM Code       0  cone{000a0000}-287.o(StubCode)
-    CCoeControl::HasBorder() const           0x0000a850   ARM Code       0  cone{000a0000}-288.o(StubCode)
-    CCoeControl::MopSupplyObject(TTypeUid)   0x0000a858   ARM Code       0  cone{000a0000}-29.o(StubCode)
-    CCoeControl::PositionChanged()           0x0000a860   ARM Code       0  cone{000a0000}-30.o(StubCode)
-    CCoeAppUi::HelpContextL() const          0x0000a868   ARM Code       0  cone{000a0000}-351.o(StubCode)
-    CCoeAppUi::GetActiveViewId(TVwsViewId&) const 0x0000a870   ARM Code       0  cone{000a0000}-353.o(StubCode)
-    CCoeAppUi::InputCapabilities() const     0x0000a878   ARM Code       0  cone{000a0000}-355.o(StubCode)
-    CCoeControl::HandlePointerEventL(const TPointerEvent&) 0x0000a880   ARM Code       0  cone{000a0000}-36.o(StubCode)
-    CCoeControl::SetContainerWindowL(const CCoeControl&) 0x0000a888   ARM Code       0  cone{000a0000}-39.o(StubCode)
-    thunk{-4} to CCoeControl::MopSupplyObject(TTypeUid) 0x0000a890   ARM Code       0  cone{000a0000}-396.o(StubCode)
-    thunk{-4} to CCoeControl::MopNext()      0x0000a898   ARM Code       0  cone{000a0000}-397.o(StubCode)
-    CCoeControl::HandleResourceChange(int)   0x0000a8a0   ARM Code       0  cone{000a0000}-40.o(StubCode)
-    CCoeControl::PrepareForFocusGainL()      0x0000a8a8   ARM Code       0  cone{000a0000}-41.o(StubCode)
-    CCoeControl::PrepareForFocusLossL()      0x0000a8b0   ARM Code       0  cone{000a0000}-42.o(StubCode)
-    CCoeControl::SetParent(CCoeControl*)     0x0000a8b8   ARM Code       0  cone{000a0000}-444.o(StubCode)
-    CCoeControl::SetLayoutManagerL(MCoeLayoutManager*) 0x0000a8c0   ARM Code       0  cone{000a0000}-474.o(StubCode)
-    CCoeControl::GetTextDrawer(CCoeTextDrawerBase*&, const CCoeControl*, int) const 0x0000a8c8   ARM Code       0  cone{000a0000}-477.o(StubCode)
-    CCoeControl::Reserved_CCoeControl_8()    0x0000a8d0   ARM Code       0  cone{000a0000}-478.o(StubCode)
-    CCoeControl::Reserved_CCoeControl_9()    0x0000a8d8   ARM Code       0  cone{000a0000}-479.o(StubCode)
-    CCoeControl::ConstructFromResourceL(TResourceReader&) 0x0000a8e0   ARM Code       0  cone{000a0000}-48.o(StubCode)
-    CCoeControl::RequestRelayout(const CCoeControl*) 0x0000a8e8   ARM Code       0  cone{000a0000}-482.o(StubCode)
-    CCoeControl::SetExtentToWholeScreen()    0x0000a8f0   ARM Code       0  cone{000a0000}-50.o(StubCode)
-    CCoeControl::SetTextBaselineSpacing(int) 0x0000a8f8   ARM Code       0  cone{000a0000}-502.o(StubCode)
-    CCoeControl::HandlePointerBufferReadyL() 0x0000a900   ARM Code       0  cone{000a0000}-51.o(StubCode)
-    CCoeControl::TextBaselineOffset(const TSize&) const 0x0000a908   ARM Code       0  cone{000a0000}-514.o(StubCode)
-    CCoeControl::MopNext()                   0x0000a910   ARM Code       0  cone{000a0000}-56.o(StubCode)
-    CCoeControl::SetRect(const TRect&)       0x0000a918   ARM Code       0  cone{000a0000}-57.o(StubCode)
-    CCoeControl::Reserved_CCoeControl_10()   0x0000a920   ARM Code       0  cone{000a0000}-580.o(StubCode)
-    CCoeControl::Reserved_CCoeControl_11()   0x0000a928   ARM Code       0  cone{000a0000}-581.o(StubCode)
-    CCoeControl::Reserved_CCoeControl_12()   0x0000a930   ARM Code       0  cone{000a0000}-582.o(StubCode)
-    CCoeControl::Reserved_CCoeControl_13()   0x0000a938   ARM Code       0  cone{000a0000}-583.o(StubCode)
-    CCoeControl::HandleControlArrayEventL(CCoeControlArray::TEvent, const CCoeControlArray*, CCoeControl*, int) 0x0000a940   ARM Code       0  cone{000a0000}-584.o(StubCode)
-    CCoeControl::ActivateL()                 0x0000a948   ARM Code       0  cone{000a0000}-61.o(StubCode)
-    CCoeControl::SetDimmed(int)              0x0000a950   ARM Code       0  cone{000a0000}-62.o(StubCode)
-    MObjectProvider::MObjectProvider_Reserved1() 0x0000a958   ARM Code       0  cone{000a0000}-638.o(StubCode)
-    MObjectProvider::MObjectProvider_Reserved2() 0x0000a960   ARM Code       0  cone{000a0000}-639.o(StubCode)
-    CCoeControl::CCoeControl()               0x0000a968   ARM Code       0  cone{000a0000}-64.o(StubCode)
-    MCoeViewDeactivationObserver::MCoeViewDeactivationObserver__sub_object() 0x0000a970   ARM Code       0  cone{000a0000}-664.o(StubCode)
-    CCoeControl::~CCoeControl()              0x0000a978   ARM Code       0  cone{000a0000}-67.o(StubCode)
-    MCoeView::MCoeView_Reserved_2()          0x0000a980   ARM Code       0  cone{000a0000}-670.o(StubCode)
-    MCoeView::MCoeView_Reserved_3()          0x0000a988   ARM Code       0  cone{000a0000}-671.o(StubCode)
-    CCoeAppUi::FrameworkCallsRendezvous() const 0x0000a990   ARM Code       0  cone{000a0000}-676.o(StubCode)
-    CCoeAppUi::CCoeAppUi_Reserved_2()        0x0000a998   ARM Code       0  cone{000a0000}-677.o(StubCode)
-    CCoeControl::Reserved_2()                0x0000a9a0   ARM Code       0  cone{000a0000}-9.o(StubCode)
-    thunk{-20} to CEikDocument::SaveL(MSaveObserver::TSaveType) 0x0000a9a8   ARM Code       0  eikcore{000a0000}-141.o(StubCode)
-    CEikAppUi::Reserved_3()                  0x0000a9b0   ARM Code       0  eikcore{000a0000}-142.o(StubCode)
-    CEikAppUi::Reserved_4()                  0x0000a9b8   ARM Code       0  eikcore{000a0000}-143.o(StubCode)
-    CEikAppUi::CreateFileL(const TDesC16&)   0x0000a9c0   ARM Code       0  eikcore{000a0000}-144.o(StubCode)
-    CEikAppUi::SetEmphasis(CCoeControl*, int) 0x0000a9c8   ARM Code       0  eikcore{000a0000}-147.o(StubCode)
-    CEikAppUi::HandleMessageL(unsigned long, TUid, const TDesC8&) 0x0000a9d0   ARM Code       0  eikcore{000a0000}-152.o(StubCode)
-    CEikAppUi::ProcessMessageL(TUid, const TDesC8&) 0x0000a9d8   ARM Code       0  eikcore{000a0000}-155.o(StubCode)
-    CEikAppUi::HandleModelChangeL()          0x0000a9e0   ARM Code       0  eikcore{000a0000}-158.o(StubCode)
-    CEikAppUi::HandleSideBarMenuL(int, const TPoint&, int, const CEikHotKeyTable*) 0x0000a9e8   ARM Code       0  eikcore{000a0000}-159.o(StubCode)
-    CEikAppUi::ProcessCommandParametersL(TApaCommand, TBuf<(int)256>&, const TDesC8&) 0x0000a9f0   ARM Code       0  eikcore{000a0000}-169.o(StubCode)
-    CEikAppUi::ReportResourceChangedToAppL(int) 0x0000a9f8   ARM Code       0  eikcore{000a0000}-171.o(StubCode)
-    CEikAppUi::OpenFileL(const TDesC16&)     0x0000aa00   ARM Code       0  eikcore{000a0000}-175.o(StubCode)
-    CEikDocument::Reserved_2()               0x0000aa08   ARM Code       0  eikcore{000a0000}-18.o(StubCode)
-    CEikDocument::NewDocumentL()             0x0000aa10   ARM Code       0  eikcore{000a0000}-20.o(StubCode)
-    CEikDocument::UpdateTaskNameL(CApaWindowGroupName*) 0x0000aa18   ARM Code       0  eikcore{000a0000}-25.o(StubCode)
-    CEikDocument::CreateFileStoreLC(RFs&, const TDesC16&) 0x0000aa20   ARM Code       0  eikcore{000a0000}-26.o(StubCode)
-    CEikDocument::EditL(MApaEmbeddedDocObserver*, int) 0x0000aa28   ARM Code       0  eikcore{000a0000}-27.o(StubCode)
-    CEikDocument::SaveL(MSaveObserver::TSaveType) 0x0000aa30   ARM Code       0  eikcore{000a0000}-28.o(StubCode)
-    CEikDocument::SaveL()                    0x0000aa38   ARM Code       0  eikcore{000a0000}-29.o(StubCode)
-    CEikDocument::HasChanged() const         0x0000aa40   ARM Code       0  eikcore{000a0000}-291.o(StubCode)
-    CEikDocument::ExternalizeL(RWriteStream&) const 0x0000aa48   ARM Code       0  eikcore{000a0000}-293.o(StubCode)
-    CEikDocument::StoreL(CStreamStore&, CStreamDictionary&) const 0x0000aa50   ARM Code       0  eikcore{000a0000}-294.o(StubCode)
-    CEikDocument::IsEmpty() const            0x0000aa58   ARM Code       0  eikcore{000a0000}-295.o(StubCode)
-    CEikApplication::Capability(TDes8&) const 0x0000aa60   ARM Code       0  eikcore{000a0000}-296.o(StubCode)
-    CEikApplication::OpenIniFileLC(RFs&) const 0x0000aa68   ARM Code       0  eikcore{000a0000}-297.o(StubCode)
-    CEikApplication::BitmapStoreName() const 0x0000aa70   ARM Code       0  eikcore{000a0000}-298.o(StubCode)
-    CEikApplication::ResourceFileName() const 0x0000aa78   ARM Code       0  eikcore{000a0000}-299.o(StubCode)
-    CEikDocument::PrintL(const CStreamStore&) 0x0000aa80   ARM Code       0  eikcore{000a0000}-30.o(StubCode)
-    CEikApplication::GetDefaultDocumentFileName(TBuf<(int)256>&) const 0x0000aa88   ARM Code       0  eikcore{000a0000}-302.o(StubCode)
-    CEikDocument::RestoreL(const CStreamStore&, const CStreamDictionary&) 0x0000aa90   ARM Code       0  eikcore{000a0000}-31.o(StubCode)
-    CEikAppUi::ClientRect() const            0x0000aa98   ARM Code       0  eikcore{000a0000}-315.o(StubCode)
-    CEikAppUi::ValidFileType(TUid) const     0x0000aaa0   ARM Code       0  eikcore{000a0000}-317.o(StubCode)
-    CEikAppUi::Document() const              0x0000aaa8   ARM Code       0  eikcore{000a0000}-319.o(StubCode)
-    CEikonEnv::DenseFont() const             0x0000aab0   ARM Code       0  eikcore{000a0000}-352.o(StubCode)
-    CEikDocument::~CEikDocument__sub_object() 0x0000aab8   ARM Code       0  eikcore{000a0000}-37.o(StubCode)
-    thunk{-36} to CEikAppUi::HandleMessageL(unsigned long, TUid, const TDesC8&) 0x0000aac0   ARM Code       0  eikcore{000a0000}-390.o(StubCode)
-    thunk{-40} to CEikAppUi::MopNext()       0x0000aac8   ARM Code       0  eikcore{000a0000}-392.o(StubCode)
-    EikStart::RunApplication(TApaApplicationFactory) 0x0000aad0   ARM Code       0  eikcore{000a0000}-394.o(StubCode)
-    CEikAppServer::ExtensionInterface(TUid, void*&) 0x0000aad8   ARM Code       0  eikcore{000a0000}-467.o(StubCode)
-    CEikonEnv::StartedAsServerApp() const    0x0000aae0   ARM Code       0  eikcore{000a0000}-472.o(StubCode)
-    CEikonEnv::AppServer() const             0x0000aae8   ARM Code       0  eikcore{000a0000}-473.o(StubCode)
-    CEikAppUi::MopNext()                     0x0000aaf0   ARM Code       0  eikcore{000a0000}-479.o(StubCode)
-    thunk{-24} to CEikAppUi::HandleSideBarMenuL(int, const TPoint&, int, const CEikHotKeyTable*) 0x0000aaf8   ARM Code       0  eikcore{000a0000}-490.o(StubCode)
-    CEikAppUi::ProcessCommandParametersL(CApaCommandLine&) 0x0000ab00   ARM Code       0  eikcore{000a0000}-506.o(StubCode)
-    CEikAppServer::CreateServiceSecurityCheckL(TUid, const RMessage2&, int&, TSecurityInfo&) 0x0000ab08   ARM Code       0  eikcore{000a0000}-523.o(StubCode)
-    CEikApplication::CEikApplication_Reserved1() 0x0000ab10   ARM Code       0  eikcore{000a0000}-532.o(StubCode)
-    CEikApplication::CEikApplication_Reserved2() 0x0000ab18   ARM Code       0  eikcore{000a0000}-533.o(StubCode)
-    MEikMenuObserver::Reserved_2_MenuObserver() 0x0000ab20   ARM Code       0  eikcore{000a0000}-534.o(StubCode)
-    MEikMenuObserver::CreateCustomCommandControlL(int) 0x0000ab28   ARM Code       0  eikcore{000a0000}-535.o(StubCode)
-    MEikMenuObserver::MEikCommandObserver_Reserved1() 0x0000ab30   ARM Code       0  eikcore{000a0000}-536.o(StubCode)
-    MEikMenuObserver::MEikCommandObserver_Reserved2() 0x0000ab38   ARM Code       0  eikcore{000a0000}-537.o(StubCode)
-    CEikDocument::ValidatePasswordL() const  0x0000ab40   ARM Code       0  eikcore{000a0000}-565.o(StubCode)
-    CEikApplication::CreateDocumentL(CApaProcess*) 0x0000ab48   ARM Code       0  eikcore{000a0000}-61.o(StubCode)
-    CEikApplication::PreDocConstructL()      0x0000ab50   ARM Code       0  eikcore{000a0000}-62.o(StubCode)
-    thunk{-24} to CEikAppUi::SetEmphasis(CCoeControl*, int) 0x0000ab58   ARM Code       0  eikcore{000a0000}-63.o(StubCode)
-    CEikApplication::CEikApplication__sub_object() 0x0000ab60   ARM Code       0  eikcore{000a0000}-64.o(StubCode)
-    CEikApplication::~CEikApplication__sub_object() 0x0000ab68   ARM Code       0  eikcore{000a0000}-67.o(StubCode)
-    MEikMenuObserver::RestoreMenuL(CCoeControl*, int, MEikMenuObserver::TMenuType) 0x0000ab70   ARM Code       0  eikcore{000a0000}-72.o(StubCode)
-    MEikMenuObserver::OfferKeyToAppL(const TKeyEvent&, TEventCode) 0x0000ab78   ARM Code       0  eikcore{000a0000}-73.o(StubCode)
-    MEikMenuObserver::DynInitMenuBarL(int, CEikMenuBar*) 0x0000ab80   ARM Code       0  eikcore{000a0000}-74.o(StubCode)
-    MEikMenuObserver::DynInitMenuPaneL(int, CEikMenuPane*) 0x0000ab88   ARM Code       0  eikcore{000a0000}-75.o(StubCode)
-    MEikMenuObserver::HandleSideBarMenuL(int, const TPoint&, int, const CEikHotKeyTable*) 0x0000ab90   ARM Code       0  eikcore{000a0000}-76.o(StubCode)
-    MEikMenuObserver::CheckHotKeyNotDimmedL(int) 0x0000ab98   ARM Code       0  eikcore{000a0000}-77.o(StubCode)
-    MEikMenuObserver::Reserved_1_MenuObserver() 0x0000aba0   ARM Code       0  eikcore{000a0000}-78.o(StubCode)
-    MEikMenuObserver::HandleAttemptDimmedSelectionL(int) 0x0000aba8   ARM Code       0  eikcore{000a0000}-79.o(StubCode)
-    CEikStatusPaneBase::ControlL(TUid) const 0x0000abb0   ARM Code       0  eikcoctl{000a0000}-1376.o(StubCode)
-    CEikMenuPane::SetItemDimmed(int, int)    0x0000abb8   ARM Code       0  eikcoctl{000a0000}-140.o(StubCode)
-    CEikButtonGroupContainer::ReduceRect(TRect&) const 0x0000abc0   ARM Code       0  eikcoctl{000a0000}-1430.o(StubCode)
-    CEikListBox::HandleItemAdditionL()       0x0000abc8   ARM Code       0  eikcoctl{000a0000}-35.o(StubCode)
-    CEikListBox::CreateScrollBarFrameL(int)  0x0000abd0   ARM Code       0  eikcoctl{000a0000}-46.o(StubCode)
-    CTextListBoxModel::SetItemTextArray(MDesC16Array*) 0x0000abd8   ARM Code       0  eikcoctl{000a0000}-605.o(StubCode)
-    CTextListBoxModel::SetOwnershipType(TListBoxModelItemArrayOwnership) 0x0000abe0   ARM Code       0  eikcoctl{000a0000}-606.o(StubCode)
-    CEikScrollBarFrame::SetScrollBarVisibilityL(CEikScrollBarFrame::TScrollBarVisibility, CEikScrollBarFrame::TScrollBarVisibility) 0x0000abe8   ARM Code       0  eikcoctl{000a0000}-660.o(StubCode)
-    CEikButtonGroupContainer::DoSetCommandL(int, int, const TDesC16*, const CFbsBitmap*, const CFbsBitmap*, CEikButtonGroupContainer::TCommandOp) 0x0000abf0   ARM Code       0  eikcoctl{000a0000}-875.o(StubCode)
-    CEikButtonGroupContainer::SetCommandSetL(int) 0x0000abf8   ARM Code       0  eikcoctl{000a0000}-880.o(StubCode)
-    CEikButtonGroupContainer::SetBoundingRect(const TRect&) 0x0000ac00   ARM Code       0  eikcoctl{000a0000}-881.o(StubCode)
-    CEikColumnListBox::Model() const         0x0000ac08   ARM Code       0  eikctl{000a0000}-455.o(StubCode)
-    CAknAppServiceBase::CreateL()            0x0000ac10   ARM Code       0  avkon{000a0000}-1132.o(StubCode)
-    CAknDocument::OpenFileL(CFileStore*&, RFile&) 0x0000ac18   ARM Code       0  avkon{000a0000}-129.o(StubCode)
-    CAknDocument::OpenFileL(int, const TDesC16&, RFs&) 0x0000ac20   ARM Code       0  avkon{000a0000}-130.o(StubCode)
-    CAknDocument::CAknDocument__sub_object(CEikApplication&) 0x0000ac28   ARM Code       0  avkon{000a0000}-131.o(StubCode)
-    CAknInformationNote::CAknInformationNote(int) 0x0000ac30   ARM Code       0  avkon{000a0000}-1341.o(StubCode)
-    CAknAppServer::ConstructL(const TDesC16&) 0x0000ac38   ARM Code       0  avkon{000a0000}-198.o(StubCode)
-    CAknAppServer::HandleAllClientsClosed()  0x0000ac40   ARM Code       0  avkon{000a0000}-199.o(StubCode)
-    CAknResourceNoteDialog::ExecuteLD(const TDesC16&) 0x0000ac48   ARM Code       0  avkon{000a0000}-1996.o(StubCode)
-    CAknAppServer::~CAknAppServer()          0x0000ac50   ARM Code       0  avkon{000a0000}-201.o(StubCode)
-    CAknAppUiBase::MopSupplyObject(TTypeUid) 0x0000ac58   ARM Code       0  avkon{000a0000}-206.o(StubCode)
-    CAknAppUiBase::HandleResourceChangeL(int) 0x0000ac60   ARM Code       0  avkon{000a0000}-211.o(StubCode)
-    CAknAppUiBase::HandleScreenDeviceChangedL() 0x0000ac68   ARM Code       0  avkon{000a0000}-213.o(StubCode)
-    CAknAppUiBase::HandleApplicationSpecificEventL(int, const TWsEvent&) 0x0000ac70   ARM Code       0  avkon{000a0000}-214.o(StubCode)
-    CAknAppUiBase::Exit()                    0x0000ac78   ARM Code       0  avkon{000a0000}-215.o(StubCode)
-    CAknAppUiBase::SetFadedL(int)            0x0000ac80   ARM Code       0  avkon{000a0000}-216.o(StubCode)
-    CAknSelectionListDialog::SetIconArrayL(CArrayPtr<CGulIcon>*) 0x0000ac88   ARM Code       0  avkon{000a0000}-2163.o(StubCode)
-    CAknAppUiBase::CAknAppUiBase()           0x0000ac90   ARM Code       0  avkon{000a0000}-217.o(StubCode)
-    CAknSelectionListDialog::NewL(int&, MDesC16Array*, int, MEikCommandObserver*) 0x0000ac98   ARM Code       0  avkon{000a0000}-2178.o(StubCode)
-    CAknAppUiBase::~CAknAppUiBase()          0x0000aca0   ARM Code       0  avkon{000a0000}-220.o(StubCode)
-    CAknSingleHeadingStyleListBox::CAknSingleHeadingStyleListBox() 0x0000aca8   ARM Code       0  avkon{000a0000}-2591.o(StubCode)
-    CAknNavigationControlContainer::CreateNavigationLabelL(const TDesC16&) 0x0000acb0   ARM Code       0  avkon{000a0000}-2624.o(StubCode)
-    CAknNavigationControlContainer::ReplaceL(CAknNavigationDecorator&, CAknNavigationDecorator&) 0x0000acb8   ARM Code       0  avkon{000a0000}-2632.o(StubCode)
-    CAknView::SetEmphasis(CCoeControl*, int) 0x0000acc0   ARM Code       0  avkon{000a0000}-2895.o(StubCode)
-    CAknView::BaseConstructL(int)            0x0000acc8   ARM Code       0  avkon{000a0000}-2898.o(StubCode)
-    CAknView::HandleCommandL(int)            0x0000acd0   ARM Code       0  avkon{000a0000}-2899.o(StubCode)
-    CAknView::ViewActivatedL(const TVwsViewId&, TUid, const TDesC8&) 0x0000acd8   ARM Code       0  avkon{000a0000}-2900.o(StubCode)
-    CAknView::MopSupplyObject(TTypeUid)      0x0000ace0   ARM Code       0  avkon{000a0000}-2901.o(StubCode)
-    CAknView::ProcessCommandL(int)           0x0000ace8   ARM Code       0  avkon{000a0000}-2902.o(StubCode)
-    CAknView::ViewDeactivated()              0x0000acf0   ARM Code       0  avkon{000a0000}-2903.o(StubCode)
-    CAknView::AknViewActivatedL(const TVwsViewId&, TUid, const TDesC8&) 0x0000acf8   ARM Code       0  avkon{000a0000}-2904.o(StubCode)
-    CAknView::Reserved_MtsmObject()          0x0000ad00   ARM Code       0  avkon{000a0000}-2905.o(StubCode)
-    CAknView::HandleViewRectChange()         0x0000ad08   ARM Code       0  avkon{000a0000}-2906.o(StubCode)
-    CAknView::Reserved_MtsmPosition()        0x0000ad10   ARM Code       0  avkon{000a0000}-2907.o(StubCode)
-    CAknView::HandleForegroundEventL(int)    0x0000ad18   ARM Code       0  avkon{000a0000}-2909.o(StubCode)
-    CAknView::ViewScreenDeviceChangedL()     0x0000ad20   ARM Code       0  avkon{000a0000}-2910.o(StubCode)
-    CAknView::HandleStatusPaneSizeChange()   0x0000ad28   ARM Code       0  avkon{000a0000}-2912.o(StubCode)
-    CAknView::MopNext()                      0x0000ad30   ARM Code       0  avkon{000a0000}-2913.o(StubCode)
-    CAknView::CAknView__sub_object()         0x0000ad38   ARM Code       0  avkon{000a0000}-2914.o(StubCode)
-    CAknView::~CAknView__sub_object()        0x0000ad40   ARM Code       0  avkon{000a0000}-2917.o(StubCode)
-    CAknAppUi::StatusPane()                  0x0000ad48   ARM Code       0  avkon{000a0000}-2919.o(StubCode)
-    CAknAppUi::HandleError(int, const SExtendedError&, TDes16&, TDes16&) 0x0000ad50   ARM Code       0  avkon{000a0000}-2920.o(StubCode)
-    CAknAppUi::PrepareToExit()               0x0000ad58   ARM Code       0  avkon{000a0000}-2922.o(StubCode)
-    CAknAppUi::HandleSystemEventL(const TWsEvent&) 0x0000ad60   ARM Code       0  avkon{000a0000}-2928.o(StubCode)
-    CAknAppUi::Reserved_MtsmObject()         0x0000ad68   ARM Code       0  avkon{000a0000}-2929.o(StubCode)
-    CAknAppUi::Reserved_MtsmPosition()       0x0000ad70   ARM Code       0  avkon{000a0000}-2930.o(StubCode)
-    CAknAppUi::HandleViewDeactivation(const TVwsViewId&, const TVwsViewId&) 0x0000ad78   ARM Code       0  avkon{000a0000}-2932.o(StubCode)
-    CAknAppUi::HandleTouchPaneSizeChange()   0x0000ad80   ARM Code       0  avkon{000a0000}-2934.o(StubCode)
-    CAknAppUi::Cba()                         0x0000ad88   ARM Code       0  avkon{000a0000}-2936.o(StubCode)
-    CAknAppServer::CreateServiceL(TUid) const 0x0000ad90   ARM Code       0  avkon{000a0000}-2993.o(StubCode)
-    CAknAppUiBase::ApplicationRect() const   0x0000ad98   ARM Code       0  avkon{000a0000}-2997.o(StubCode)
-    CAknView::ClientRect() const             0x0000ada0   ARM Code       0  avkon{000a0000}-3417.o(StubCode)
-    CAknView::Cba() const                    0x0000ada8   ARM Code       0  avkon{000a0000}-3420.o(StubCode)
-    CAknView::AppUi() const                  0x0000adb0   ARM Code       0  avkon{000a0000}-3421.o(StubCode)
-    CAknView::Redraw() const                 0x0000adb8   ARM Code       0  avkon{000a0000}-3422.o(StubCode)
-    CAknView::ViewId() const                 0x0000adc0   ARM Code       0  avkon{000a0000}-3423.o(StubCode)
-    CAknView::MenuBar() const                0x0000adc8   ARM Code       0  avkon{000a0000}-3424.o(StubCode)
-    CAknViewAppUi::BaseConstructL(int)       0x0000add0   ARM Code       0  avkon{000a0000}-367.o(StubCode)
-    CAknViewAppUi::HandleWsEventL(const TWsEvent&, CCoeControl*) 0x0000add8   ARM Code       0  avkon{000a0000}-368.o(StubCode)
-    CAknViewAppUi::ProcessCommandL(int)      0x0000ade0   ARM Code       0  avkon{000a0000}-369.o(StubCode)
-    CAknViewAppUi::ActivateLocalViewL(TUid)  0x0000ade8   ARM Code       0  avkon{000a0000}-370.o(StubCode)
-    CAknViewAppUi::StopDisplayingMenuBar()   0x0000adf0   ARM Code       0  avkon{000a0000}-372.o(StubCode)
-    CAknViewAppUi::HandleForegroundEventL(int) 0x0000adf8   ARM Code       0  avkon{000a0000}-373.o(StubCode)
-    CAknViewAppUi::HandleStatusPaneSizeChange() 0x0000ae00   ARM Code       0  avkon{000a0000}-374.o(StubCode)
-    CAknViewAppUi::AddViewL(CAknView*)       0x0000ae08   ARM Code       0  avkon{000a0000}-375.o(StubCode)
-    CAknViewAppUi::~CAknViewAppUi()          0x0000ae10   ARM Code       0  avkon{000a0000}-377.o(StubCode)
-    thunk{-100} to CAknAppUi::HandleTouchPaneSizeChange() 0x0000ae18   ARM Code       0  avkon{000a0000}-3826.o(StubCode)
-    thunk{-12} to CAknView::SetEmphasis(CCoeControl*, int) 0x0000ae20   ARM Code       0  avkon{000a0000}-3831.o(StubCode)
-    thunk{-12} to CAknView::ProcessCommandL(int) 0x0000ae28   ARM Code       0  avkon{000a0000}-3832.o(StubCode)
-    thunk{-24} to CAknViewAppUi::ProcessCommandL(int) 0x0000ae30   ARM Code       0  avkon{000a0000}-3857.o(StubCode)
-    thunk{-24} to CAknView::MopSupplyObject(TTypeUid) 0x0000ae38   ARM Code       0  avkon{000a0000}-3860.o(StubCode)
-    thunk{-24} to CAknView::MopNext()        0x0000ae40   ARM Code       0  avkon{000a0000}-3861.o(StubCode)
-    thunk{-40} to CAknAppUiBase::MopSupplyObject(TTypeUid) 0x0000ae48   ARM Code       0  avkon{000a0000}-3868.o(StubCode)
-    thunk{-4} to CAknView::ViewActivatedL(const TVwsViewId&, TUid, const TDesC8&) 0x0000ae50   ARM Code       0  avkon{000a0000}-3947.o(StubCode)
-    thunk{-4} to CAknView::ViewDeactivated() 0x0000ae58   ARM Code       0  avkon{000a0000}-3948.o(StubCode)
-    thunk{-4} to CAknView::ViewScreenDeviceChangedL() 0x0000ae60   ARM Code       0  avkon{000a0000}-3949.o(StubCode)
-    thunk{-4} to CAknView::ViewId() const    0x0000ae68   ARM Code       0  avkon{000a0000}-3983.o(StubCode)
-    thunk{-88} to CAknViewAppUi::HandleStatusPaneSizeChange() 0x0000ae70   ARM Code       0  avkon{000a0000}-4014.o(StubCode)
-    thunk{-92} to CAknAppUi::HandleViewDeactivation(const TVwsViewId&, const TVwsViewId&) 0x0000ae78   ARM Code       0  avkon{000a0000}-4030.o(StubCode)
-    AknIconUtils::CreateIconLC(CFbsBitmap*&, CFbsBitmap*&, const TDesC16&, int, int) 0x0000ae80   ARM Code       0  AknIcon{000a0000}-13.o(StubCode)
-    CGulIcon::SetBitmapsOwnedExternally(int) 0x0000ae88   ARM Code       0  egul{000a0000}-94.o(StubCode)
-    CGulIcon::NewL(CFbsBitmap*, CFbsBitmap*) 0x0000ae90   ARM Code       0  egul{000a0000}-95.o(StubCode)
-    CFont::AscentInPixels() const            0x0000ae98   ARM Code       0  gdi{000a0000}-310.o(StubCode)
-    CFont::HeightInPixels() const            0x0000aea0   ARM Code       0  gdi{000a0000}-311.o(StubCode)
-    CFont::FontSpecInTwips() const           0x0000aea8   ARM Code       0  gdi{000a0000}-312.o(StubCode)
-    CFbsBitmap::Create(const TSize&, TDisplayMode) 0x0000aeb0   ARM Code       0  fbscli{000a0000}-26.o(StubCode)
-    CFbsBitmap::CFbsBitmap()                 0x0000aeb8   ARM Code       0  fbscli{000a0000}-31.o(StubCode)
-    CPosLandmark::NewL(const CPosLandmark&)  0x0000aec0   ARM Code       0  eposlandmarks{000a0000}-12.o(StubCode)
-    CPosLandmark::NewLC()                    0x0000aec8   ARM Code       0  eposlandmarks{000a0000}-15.o(StubCode)
-    CPosLandmark::SetPositionL(const TLocality&) 0x0000aed0   ARM Code       0  eposlandmarks{000a0000}-4.o(StubCode)
-    CPosLandmarkDatabase::OpenL(const TDesC16&) 0x0000aed8   ARM Code       0  eposlandmarks{000a0000}-50.o(StubCode)
-    CPosLandmark::GetPosition(TLocality&) const 0x0000aee0   ARM Code       0  eposlandmarks{000a0000}-65.o(StubCode)
-    CPosLandmark::GetLandmarkName(TPtrC16&) const 0x0000aee8   ARM Code       0  eposlandmarks{000a0000}-67.o(StubCode)
-    CPosLandmark::GetIcon(TPtrC16&, int&, int&) const 0x0000aef0   ARM Code       0  eposlandmarks{000a0000}-75.o(StubCode)
-    TPositionUpdateOptions::TPositionUpdateOptions() 0x0000aef8   ARM Code       0  lbs{000a0000}-152.o(StubCode)
-    TPositionUpdateOptionsBase::SetUpdateTimeOut(TTimeIntervalMicroSeconds) 0x0000af00   ARM Code       0  lbs{000a0000}-180.o(StubCode)
-    TPositionUpdateOptionsBase::SetUpdateInterval(TTimeIntervalMicroSeconds) 0x0000af08   ARM Code       0  lbs{000a0000}-181.o(StubCode)
-    TLocality::TLocality(const TCoordinate&, float) 0x0000af10   ARM Code       0  lbs{000a0000}-205.o(StubCode)
-    TLocality::TLocality()                   0x0000af18   ARM Code       0  lbs{000a0000}-207.o(StubCode)
-    TCoordinate::TCoordinate(const double&, const double&) 0x0000af20   ARM Code       0  lbs{000a0000}-21.o(StubCode)
-    TPosition::TPosition()                   0x0000af28   ARM Code       0  lbs{000a0000}-214.o(StubCode)
-    TCoordinate::Latitude() const            0x0000af30   ARM Code       0  lbs{000a0000}-223.o(StubCode)
-    TCoordinate::Longitude() const           0x0000af38   ARM Code       0  lbs{000a0000}-225.o(StubCode)
-    TPositionInfo::GetPosition(TPosition&) const 0x0000af40   ARM Code       0  lbs{000a0000}-226.o(StubCode)
-    TCoordinate::TCoordinate()               0x0000af48   ARM Code       0  lbs{000a0000}-23.o(StubCode)
-    TPositionInfo::TPositionInfo()           0x0000af50   ARM Code       0  lbs{000a0000}-28.o(StubCode)
-    TLocality::Distance(const TCoordinate&, float&) const 0x0000af58   ARM Code       0  lbs{000a0000}-304.o(StubCode)
-    TLocality::BearingTo(const TCoordinate&, float&) const 0x0000af60   ARM Code       0  lbs{000a0000}-306.o(StubCode)
-    CMnServiceBase::ServiceError(const RMessage2&, int) 0x0000af68   ARM Code       0  mnservicelib{000a0000}-1.o(StubCode)
-    CMnMapViewServiceBase::LinkedLandmarksToShow(int) 0x0000af70   ARM Code       0  mnservicelib{000a0000}-10.o(StubCode)
-    CMnMapViewServiceBase::CompleteSelectionRequest(int) 0x0000af78   ARM Code       0  mnservicelib{000a0000}-11.o(StubCode)
-    CMnMapViewServiceBase::CompleteSelectionRequest(unsigned long, int) 0x0000af80   ARM Code       0  mnservicelib{000a0000}-12.o(StubCode)
-    CMnMapViewServiceBase::LandmarksToShowDatabases() 0x0000af88   ARM Code       0  mnservicelib{000a0000}-13.o(StubCode)
-    CMnMapViewServiceBase::CompleteSelectionRequestL(const CPosLandmark&) 0x0000af90   ARM Code       0  mnservicelib{000a0000}-14.o(StubCode)
-    CMnMapViewServiceBase::Options()         0x0000af98   ARM Code       0  mnservicelib{000a0000}-15.o(StubCode)
-    CMnMapViewServiceBase::ServiceL(const RMessage2&) 0x0000afa0   ARM Code       0  mnservicelib{000a0000}-16.o(StubCode)
-    CMnMapViewServiceBase::CMnMapViewServiceBase__sub_object() 0x0000afa8   ARM Code       0  mnservicelib{000a0000}-17.o(StubCode)
-    CMnServiceBase::CompleteRequest(int)     0x0000afb0   ARM Code       0  mnservicelib{000a0000}-2.o(StubCode)
-    CMnMapViewServiceBase::~CMnMapViewServiceBase__sub_object() 0x0000afb8   ARM Code       0  mnservicelib{000a0000}-20.o(StubCode)
-    CMnNavigationServiceBase::BaseConstructL() 0x0000afc0   ARM Code       0  mnservicelib{000a0000}-28.o(StubCode)
-    CMnNavigationServiceBase::ServiceL(const RMessage2&) 0x0000afc8   ARM Code       0  mnservicelib{000a0000}-29.o(StubCode)
-    CMnNavigationServiceBase::CMnNavigationServiceBase__sub_object() 0x0000afd0   ARM Code       0  mnservicelib{000a0000}-30.o(StubCode)
-    CMnNavigationServiceBase::~CMnNavigationServiceBase__sub_object() 0x0000afd8   ARM Code       0  mnservicelib{000a0000}-33.o(StubCode)
-    CMnMapViewServiceBase::BaseConstructL()  0x0000afe0   ARM Code       0  mnservicelib{000a0000}-4.o(StubCode)
-    CMnMapViewServiceBase::LandmarksToShow() 0x0000afe8   ARM Code       0  mnservicelib{000a0000}-5.o(StubCode)
-    CMnMapViewServiceBase::SelectionRequestText() 0x0000aff0   ARM Code       0  mnservicelib{000a0000}-7.o(StubCode)
-    CMnrpEngine::NewL()                      0x0000aff8   ARM Code       0  mnrefproviderengine{000a0000}-12.o(StubCode)
-    CMnrpMapModel::UpdateModelL(CMnrpMapViewService&) 0x0000b000   ARM Code       0  mnrefproviderengine{000a0000}-17.o(StubCode)
-    CMnrpMapModel::SetScreenSize(TSize)      0x0000b008   ARM Code       0  mnrefproviderengine{000a0000}-19.o(StubCode)
-    CMnrpMapModel::NumIgnoredLandmarks()     0x0000b010   ARM Code       0  mnrefproviderengine{000a0000}-20.o(StubCode)
-    CMnrpMapModel::NewL(MMapModelObserver&, CMnrpEngine&) 0x0000b018   ARM Code       0  mnrefproviderengine{000a0000}-22.o(StubCode)
-    CMnrpMapModel::Zoom(double)              0x0000b020   ARM Code       0  mnrefproviderengine{000a0000}-23.o(StubCode)
-    CMnrpMapModel::MoveTo(TCoordinate)       0x0000b028   ARM Code       0  mnrefproviderengine{000a0000}-24.o(StubCode)
-    CMnrpMapModel::GoCenter()                0x0000b030   ARM Code       0  mnrefproviderengine{000a0000}-25.o(StubCode)
-    CMnrpPositionRequest::GetPosition(TPositionInfo&) 0x0000b038   ARM Code       0  mnrefproviderengine{000a0000}-26.o(StubCode)
-    CMnrpPositionRequest::SetOptionsL(const TPositionUpdateOptionsBase&) 0x0000b040   ARM Code       0  mnrefproviderengine{000a0000}-27.o(StubCode)
-    CMnrpPositionRequest::MagneticCourse()   0x0000b048   ARM Code       0  mnrefproviderengine{000a0000}-28.o(StubCode)
-    CMnrpPositionRequest::MagneticHeading()  0x0000b050   ARM Code       0  mnrefproviderengine{000a0000}-29.o(StubCode)
-    CMnrpPositionRequest::FetchNewPosition(int) 0x0000b058   ARM Code       0  mnrefproviderengine{000a0000}-30.o(StubCode)
-    CMnrpPositionRequest::NewL(const TDesC16&, MMnrpPositionObserver&) 0x0000b060   ARM Code       0  mnrefproviderengine{000a0000}-31.o(StubCode)
-    CMnrpPositionRequest::Speed()            0x0000b068   ARM Code       0  mnrefproviderengine{000a0000}-32.o(StubCode)
-    CMnrpPositionRequest::Course()           0x0000b070   ARM Code       0  mnrefproviderengine{000a0000}-33.o(StubCode)
-    CMnrpPositionRequest::Heading()          0x0000b078   ARM Code       0  mnrefproviderengine{000a0000}-34.o(StubCode)
-    MnrpUtils::AngleToString(double, TDes16&) 0x0000b080   ARM Code       0  mnrefproviderengine{000a0000}-38.o(StubCode)
-    MnrpUtils::SpeedToString(double, TDes16&) 0x0000b088   ARM Code       0  mnrefproviderengine{000a0000}-39.o(StubCode)
-    MnrpUtils::DistanceToString(double, TDes16&) 0x0000b090   ARM Code       0  mnrefproviderengine{000a0000}-40.o(StubCode)
-    MnrpUtils::PrintableStringLC(const TDesC16&) 0x0000b098   ARM Code       0  mnrefproviderengine{000a0000}-41.o(StubCode)
-    MnrpUtils::CoordinateToString(double, TDes16&, int, int) 0x0000b0a0   ARM Code       0  mnrefproviderengine{000a0000}-42.o(StubCode)
-    CMnrpMapModel::AbsoluteToScreen(TCoordinate) const 0x0000b0a8   ARM Code       0  mnrefproviderengine{000a0000}-43.o(StubCode)
-    CMnrpMapModel::ScreenToAbsolute(TPoint) const 0x0000b0b0   ARM Code       0  mnrefproviderengine{000a0000}-44.o(StubCode)
-    CMnrpMapModel::ScreenToAbsolute(int) const 0x0000b0b8   ARM Code       0  mnrefproviderengine{000a0000}-45.o(StubCode)
-    CMnrpMapModel::Top() const               0x0000b0c0   ARM Code       0  mnrefproviderengine{000a0000}-46.o(StubCode)
-    CMnrpMapModel::Left() const              0x0000b0c8   ARM Code       0  mnrefproviderengine{000a0000}-47.o(StubCode)
-    CMnrpMapModel::Right() const             0x0000b0d0   ARM Code       0  mnrefproviderengine{000a0000}-48.o(StubCode)
-    CMnrpMapModel::Bottom() const            0x0000b0d8   ARM Code       0  mnrefproviderengine{000a0000}-50.o(StubCode)
-    CMnrpMapModel::Center() const            0x0000b0e0   ARM Code       0  mnrefproviderengine{000a0000}-51.o(StubCode)
-    CMnrpMapModel::GetGrid(CMnrpMapModel::TGrid&) const 0x0000b0e8   ARM Code       0  mnrefproviderengine{000a0000}-53.o(StubCode)
-    CMnrpMapModel::RenderL(CFbsBitmap&, TRect, CFont*, CFont*) const 0x0000b0f0   ARM Code       0  mnrefproviderengine{000a0000}-54.o(StubCode)
-    __aeabi_dadd                             0x0000b0f8   ARM Code       0  dfpaeabi{000a0000}-12.o(StubCode)
-    __aeabi_dmul                             0x0000b100   ARM Code       0  dfpaeabi{000a0000}-20.o(StubCode)
-    __aeabi_dsub                             0x0000b108   ARM Code       0  dfpaeabi{000a0000}-23.o(StubCode)
-    __aeabi_f2d                              0x0000b110   ARM Code       0  dfpaeabi{000a0000}-24.o(StubCode)
-    __aeabi_i2d                              0x0000b118   ARM Code       0  dfpaeabi{000a0000}-41.o(StubCode)
-    __aeabi_d2iz                             0x0000b120   ARM Code       0  dfpaeabi{000a0000}-8.o(StubCode)
-    __aeabi_memcpy4                          0x0000b128   ARM Code       0  drtaeabi{000a0000}-147.o(StubCode)
-    __aeabi_unwind_cpp_pr0                   0x0000b130   ARM Code       0  drtaeabi{000a0000}-158.o(StubCode)
-    __aeabi_unwind_cpp_pr1                   0x0000b138   ARM Code       0  drtaeabi{000a0000}-159.o(StubCode)
-    __cxa_begin_catch                        0x0000b140   ARM Code       0  drtaeabi{000a0000}-180.o(StubCode)
-    __cxa_call_unexpected                    0x0000b148   ARM Code       0  drtaeabi{000a0000}-182.o(StubCode)
-    __cxa_end_catch                          0x0000b150   ARM Code       0  drtaeabi{000a0000}-183.o(StubCode)
-    __cxa_end_cleanup                        0x0000b158   ARM Code       0  drtaeabi{000a0000}-184.o(StubCode)
-    __cxa_pure_virtual                       0x0000b160   ARM Code       0  drtaeabi{000a0000}-189.o(StubCode)
-    operator delete (void*)                  0x0000b168   ARM Code       0  scppnwdl{000a0000}-3.o(StubCode)
-    UserHeap::SetupThreadHeap(int, SStdEpocThreadCreateInfo&) 0x0000b170   ARM Code       0  euser{000a0000}-1360.o(StubCode)
-    User::Exit(int)                          0x0000b178   ARM Code       0  euser{000a0000}-641.o(StubCode)
-    User::InitProcess()                      0x0000b180   ARM Code       0  euser{000a0000}-585.o(StubCode)
-    User::Panic(const TDesC16&, int)         0x0000b188   ARM Code       0  euser{000a0000}-650.o(StubCode)
-    TCppRTExceptionsGlobals::TCppRTExceptionsGlobals() 0x0000b190   ARM Code       0  drtaeabi{000a0000}-204.o(StubCode)
-    CAknDocument::~CAknDocument()            0x0000b199   Thumb Code     0  mnrefprovider.in(i._ZN12CAknDocumentD2Ev)
-    CAknDocument::~CAknDocument__sub_object() 0x0000b199   Thumb Code     8  mnrefprovider.in(i._ZN12CAknDocumentD2Ev)
-    CApaDocument::DetachFromStoreL(CPicture::TDetach) 0x0000b1a1   Thumb Code     2  mnrefprovider.in(i._ZN12CApaDocument16DetachFromStoreLEN8CPicture7TDetachE)
-    CArrayPtrSeg<CGulIcon>::~CArrayPtrSeg__deallocating() 0x0000b1a3   Thumb Code    16  mnrefprovider.in(i._ZN12CArrayPtrSegI8CGulIconED0Ev)
-    CArrayPtrSeg<CGulIcon>::~CArrayPtrSeg()  0x0000b1b3   Thumb Code     8  mnrefprovider.in(i._ZN12CArrayPtrSegI8CGulIconED1Ev)
-    CArrayPtrSeg<CGulIcon>::~CArrayPtrSeg__sub_object() 0x0000b1b3   Thumb Code     0  mnrefprovider.in(i._ZN12CArrayPtrSegI8CGulIconED1Ev)
-    CAknViewAppUi::CAknViewAppUi()           0x0000b1bd   Thumb Code    50  mnrefprovider.in(i._ZN13CAknViewAppUiC1Ev)
-    CAknViewAppUi::CAknViewAppUi__sub_object() 0x0000b1bd   Thumb Code     0  mnrefprovider.in(i._ZN13CAknViewAppUiC1Ev)
-    CMnrpApplication::~CMnrpApplication__deallocating() 0x0000b203   Thumb Code    16  mnrefprovider.in(i._ZN16CMnrpApplicationD0Ev)
-    CMnrpApplication::~CMnrpApplication()    0x0000b213   Thumb Code     8  mnrefprovider.in(i._ZN16CMnrpApplicationD1Ev)
-    CMnrpApplication::~CMnrpApplication__sub_object() 0x0000b213   Thumb Code     0  mnrefprovider.in(i._ZN16CMnrpApplicationD1Ev)
-    CBase::operator new(unsigned)            0x0000b21b   Thumb Code     8  mnrefprovider.in(i._ZN5CBasenwEj)
-    TRect::TRect(const TRect&)               0x0000b223   Thumb Code    18  mnrefprovider.in(i._ZN5TRectC1ERKS_)
-    TRect::TRect__sub_object(const TRect&)   0x0000b223   Thumb Code     0  mnrefprovider.in(i._ZN5TRectC1ERKS_)
-    CArrayFix<CGulIcon*>::~CArrayFix()       0x0000b235   Thumb Code     8  mnrefprovider.in(i._ZN9CArrayFixIP8CGulIconED1Ev)
-    CArrayFix<CGulIcon*>::~CArrayFix__sub_object() 0x0000b235   Thumb Code     0  mnrefprovider.in(i._ZN9CArrayFixIP8CGulIconED1Ev)
-    CArrayPtr<CGulIcon>::~CArrayPtr()        0x0000b23d   Thumb Code     8  mnrefprovider.in(i._ZN9CArrayPtrI8CGulIconED1Ev)
-    CArrayPtr<CGulIcon>::~CArrayPtr__sub_object() 0x0000b23d   Thumb Code     0  mnrefprovider.in(i._ZN9CArrayPtrI8CGulIconED1Ev)
-    CleanupClose<RArray<int>>::Close(void*)  0x0000b245   Thumb Code     8  mnrefprovider.in(t._ZN12CleanupCloseI6RArrayIiEE5CloseEPv)
-    CleanupClose<RArray<unsigned long>>::Close(void*) 0x0000b24d   Thumb Code     8  mnrefprovider.in(t._ZN12CleanupCloseI6RArrayImEE5CloseEPv)
-    RPointerArray<CMnrpNaviModel::CListItem>::ResetAndDestroy() 0x0000b255   Thumb Code    48  mnrefprovider.in(t._ZN13RPointerArrayIN14CMnrpNaviModel9CListItemEE15ResetAndDestroyEv)
-    RPointerArray<CMnrpNaviModel::CListItem>::AppendL(const CMnrpNaviModel::CListItem*) 0x0000b285   Thumb Code    12  mnrefprovider.in(t._ZN13RPointerArrayIN14CMnrpNaviModel9CListItemEE7AppendLEPKS1_)
-    TBuf<(int)15>::TBuf()                    0x0000b291   Thumb Code    10  mnrefprovider.in(t._ZN4TBufILi15EEC1Ev)
-    TBuf<(int)15>::TBuf__sub_object()        0x0000b291   Thumb Code     0  mnrefprovider.in(t._ZN4TBufILi15EEC1Ev)
-    typeinfo for CMnrpAppUi                  0x0000b758   Data          12  mnrefprovider.in(.constdata__ZTI10CMnrpAppUi)
-    typeinfo for CArrayPtrSeg<CGulIcon>      0x0000b764   Data          12  mnrefprovider.in(.constdata__ZTI12CArrayPtrSegI8CGulIconE)
-    typeinfo for CMnrpAppView                0x0000b770   Data          12  mnrefprovider.in(.constdata__ZTI12CMnrpAppView)
-    typeinfo for CMnrpMapView                0x0000b77c   Data          12  mnrefprovider.in(.constdata__ZTI12CMnrpMapView)
-    typeinfo for CMnrpDocument               0x0000b788   Data          12  mnrefprovider.in(.constdata__ZTI13CMnrpDocument)
-    typeinfo for CMnrpNaviView               0x0000b794   Data          12  mnrefprovider.in(.constdata__ZTI13CMnrpNaviView)
-    typeinfo for CMnrpAppServer              0x0000b7a0   Data          12  mnrefprovider.in(.constdata__ZTI14CMnrpAppServer)
-    typeinfo for CMnrpNaviModel              0x0000b7ac   Data          32  mnrefprovider.in(.constdata__ZTI14CMnrpNaviModel)
-    typeinfo for CMnrpAppControl             0x0000b7cc   Data          12  mnrefprovider.in(.constdata__ZTI15CMnrpAppControl)
-    typeinfo for CMnrpMapControl             0x0000b7d8   Data          32  mnrefprovider.in(.constdata__ZTI15CMnrpMapControl)
-    typeinfo for CMnrpApplication            0x0000b7f8   Data          12  mnrefprovider.in(.constdata__ZTI16CMnrpApplication)
-    typeinfo for CMnrpNaviControl            0x0000b804   Data          32  mnrefprovider.in(.constdata__ZTI16CMnrpNaviControl)
-    typeinfo for MMapModelObserver           0x0000b824   Data           8  mnrefprovider.in(.constdata__ZTI17MMapModelObserver)
-    typeinfo for MNaviModelObserver          0x0000b82c   Data           8  mnrefprovider.in(.constdata__ZTI18MNaviModelObserver)
-    typeinfo for CMnrpMapViewService         0x0000b834   Data          32  mnrefprovider.in(.constdata__ZTI19CMnrpMapViewService)
-    typeinfo for MMapSelectionCallback       0x0000b854   Data           8  mnrefprovider.in(.constdata__ZTI21MMapSelectionCallback)
-    typeinfo for MMnrpPositionObserver       0x0000b85c   Data           8  mnrefprovider.in(.constdata__ZTI21MMnrpPositionObserver)
-    typeinfo for CMnrpNavigationService      0x0000b864   Data          12  mnrefprovider.in(.constdata__ZTI22CMnrpNavigationService)
-    typeinfo for MEikStatusPaneObserver      0x0000b870   Data           8  mnrefprovider.in(.constdata__ZTI22MEikStatusPaneObserver)
-    typeinfo for CArrayFix<CGulIcon*>        0x0000b878   Data          12  mnrefprovider.in(.constdata__ZTI9CArrayFixIP8CGulIconE)
-    typeinfo for CArrayPtr<CGulIcon>         0x0000b884   Data          12  mnrefprovider.in(.constdata__ZTI9CArrayPtrI8CGulIconE)
-    typeinfo for CMnrpNaviModel::CListItem   0x0000b890   Data          12  mnrefprovider.in(.constdata__ZTIN14CMnrpNaviModel9CListItemE)
-    typeinfo name for CMnrpAppUi             0x0000b89c   Data          13  mnrefprovider.in(.constdata__ZTS10CMnrpAppUi)
-    typeinfo name for CArrayPtrSeg<CGulIcon> 0x0000b8a9   Data          26  mnrefprovider.in(.constdata__ZTS12CArrayPtrSegI8CGulIconE)
-    typeinfo name for CMnrpAppView           0x0000b8c3   Data          15  mnrefprovider.in(.constdata__ZTS12CMnrpAppView)
-    typeinfo name for CMnrpMapView           0x0000b8d2   Data          15  mnrefprovider.in(.constdata__ZTS12CMnrpMapView)
-    typeinfo name for CMnrpDocument          0x0000b8e1   Data          16  mnrefprovider.in(.constdata__ZTS13CMnrpDocument)
-    typeinfo name for CMnrpNaviView          0x0000b8f1   Data          16  mnrefprovider.in(.constdata__ZTS13CMnrpNaviView)
-    typeinfo name for CMnrpAppServer         0x0000b901   Data          17  mnrefprovider.in(.constdata__ZTS14CMnrpAppServer)
-    typeinfo name for CMnrpNaviModel         0x0000b912   Data          17  mnrefprovider.in(.constdata__ZTS14CMnrpNaviModel)
-    typeinfo name for CMnrpAppControl        0x0000b923   Data          18  mnrefprovider.in(.constdata__ZTS15CMnrpAppControl)
-    typeinfo name for CMnrpMapControl        0x0000b935   Data          18  mnrefprovider.in(.constdata__ZTS15CMnrpMapControl)
-    typeinfo name for CMnrpApplication       0x0000b947   Data          19  mnrefprovider.in(.constdata__ZTS16CMnrpApplication)
-    typeinfo name for CMnrpNaviControl       0x0000b95a   Data          19  mnrefprovider.in(.constdata__ZTS16CMnrpNaviControl)
-    typeinfo name for MMapModelObserver      0x0000b96d   Data          20  mnrefprovider.in(.constdata__ZTS17MMapModelObserver)
-    typeinfo name for MNaviModelObserver     0x0000b981   Data          21  mnrefprovider.in(.constdata__ZTS18MNaviModelObserver)
-    typeinfo name for CMnrpMapViewService    0x0000b996   Data          22  mnrefprovider.in(.constdata__ZTS19CMnrpMapViewService)
-    typeinfo name for MMapSelectionCallback  0x0000b9ac   Data          24  mnrefprovider.in(.constdata__ZTS21MMapSelectionCallback)
-    typeinfo name for MMnrpPositionObserver  0x0000b9c4   Data          24  mnrefprovider.in(.constdata__ZTS21MMnrpPositionObserver)
-    typeinfo name for CMnrpNavigationService 0x0000b9dc   Data          25  mnrefprovider.in(.constdata__ZTS22CMnrpNavigationService)
-    typeinfo name for MEikStatusPaneObserver 0x0000b9f5   Data          25  mnrefprovider.in(.constdata__ZTS22MEikStatusPaneObserver)
-    typeinfo name for CArrayFix<CGulIcon*>   0x0000ba0e   Data          23  mnrefprovider.in(.constdata__ZTS9CArrayFixIP8CGulIconE)
-    typeinfo name for CArrayPtr<CGulIcon>    0x0000ba25   Data          22  mnrefprovider.in(.constdata__ZTS9CArrayPtrI8CGulIconE)
-    typeinfo name for CMnrpNaviModel::CListItem 0x0000ba3b   Data          29  mnrefprovider.in(.constdata__ZTSN14CMnrpNaviModel9CListItemE)
-    vtable for CMnrpAppUi                    0x0000ba58   Data         340  mnrefprovider.in(.constdata__ZTV10CMnrpAppUi)
-    vtable for CArrayPtrSeg<CGulIcon>        0x0000bbac   Data          20  mnrefprovider.in(.constdata__ZTV12CArrayPtrSegI8CGulIconE)
-    vtable for CMnrpAppView                  0x0000bbc0   Data         232  mnrefprovider.in(.constdata__ZTV12CMnrpAppView)
-    vtable for CMnrpMapView                  0x0000bca8   Data         236  mnrefprovider.in(.constdata__ZTV12CMnrpMapView)
-    vtable for CMnrpDocument                 0x0000bd94   Data         112  mnrefprovider.in(.constdata__ZTV13CMnrpDocument)
-    vtable for CMnrpNaviView                 0x0000be04   Data         232  mnrefprovider.in(.constdata__ZTV13CMnrpNaviView)
-    vtable for CMnrpAppServer                0x0000beec   Data          76  mnrefprovider.in(.constdata__ZTV14CMnrpAppServer)
-    vtable for CMnrpNaviModel                0x0000bf38   Data          36  mnrefprovider.in(.constdata__ZTV14CMnrpNaviModel)
-    vtable for CMnrpAppControl               0x0000bf5c   Data         208  mnrefprovider.in(.constdata__ZTV15CMnrpAppControl)
-    vtable for CMnrpMapControl               0x0000c02c   Data         224  mnrefprovider.in(.constdata__ZTV15CMnrpMapControl)
-    vtable for CMnrpApplication              0x0000c10c   Data          80  mnrefprovider.in(.constdata__ZTV16CMnrpApplication)
-    vtable for CMnrpNaviControl              0x0000c15c   Data         224  mnrefprovider.in(.constdata__ZTV16CMnrpNaviControl)
-    vtable for CMnrpMapViewService           0x0000c23c   Data         112  mnrefprovider.in(.constdata__ZTV19CMnrpMapViewService)
-    vtable for CMnrpNavigationService        0x0000c2ac   Data          64  mnrefprovider.in(.constdata__ZTV22CMnrpNavigationService)
-    vtable for MEikStatusPaneObserver        0x0000c2ec   Data          12  mnrefprovider.in(.constdata__ZTV22MEikStatusPaneObserver)
-    vtable for CMnrpNaviModel::CListItem     0x0000c2f8   Data          20  mnrefprovider.in(.constdata__ZTVN14CMnrpNaviModel9CListItemE)
-    SHT$$INIT_ARRAY$$Base                    0x0000c30c   Number         0  mnrefprovider.in(.init_array)
-    .ARM.exidx$$Base                         0x0000c310   Number         0  uc_exe_.o(.ARM.exidx)
-    SHT$$INIT_ARRAY$$Limit                   0x0000c310   Data           0  mnrefprovider.in(.init_array)
-    .ARM.exidx$$Limit                        0x0000c6a0   Number         0  mnrefprovider.in(.ARM.exidx)
-    Image$$ER_RO$$Limit                      0x0000c6a0   Number         0  anon$$obj.o(linker$$defined$$symbols)
-
Binary file locsrv_plat/map_and_navigation_api/tsrc/data/armv5/urel/mnrefproviderback.exe has changed
--- a/locsrv_plat/map_and_navigation_api/tsrc/data/armv5/urel/mnrefproviderback.exe.map	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1319 +0,0 @@
-ARM Linker, RVCT2.2 [Build 593]
-
-================================================================================
-
-Image Symbol Table
-
-    Local Symbols
-
-    Symbol Name                              Value     Ov Type        Size  Object(Section)
-
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-293.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eposlandmarks{000a0000}-13.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-1995.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-294.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eposlandmarks{000a0000}-65.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-1997.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-295.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eposlandmarks{000a0000}-68.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-1999.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-296.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  lbs{000a0000}-207.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-203.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-297.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  lbs{000a0000}-23.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-205.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-298.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnservicelib{000a0000}-1.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-2060.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-299.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnservicelib{000a0000}-2.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-2061.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-30.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnservicelib{000a0000}-21.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  drtaeabi{000a0000}-204.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-302.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnservicelib{000a0000}-22.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-208.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-31.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnservicelib{000a0000}-23.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-2082.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-317.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnservicelib{000a0000}-24.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-2120.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-352.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnservicelib{000a0000}-27.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-2123.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-37.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnservicelib{000a0000}-34.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-2125.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-390.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnservicelib{000a0000}-45.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-213.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-392.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnservicelib{000a0000}-46.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-214.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-394.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnservicelib{000a0000}-47.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-215.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-467.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnservicelib{000a0000}-49.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-216.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-479.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnservicelib{000a0000}-50.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-217.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-490.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnservicelib{000a0000}-53.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-220.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-506.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnservicelib{000a0000}-56.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-2920.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-523.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnrefproviderengine{000a0000}-10.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-2922.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-532.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnrefproviderengine{000a0000}-12.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-2924.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-533.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnrefproviderengine{000a0000}-18.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-2925.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-534.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnrefproviderengine{000a0000}-19.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-2926.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-535.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnrefproviderengine{000a0000}-21.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-2928.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-536.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnrefproviderengine{000a0000}-4.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-2929.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-537.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnrefproviderengine{000a0000}-5.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-2930.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-565.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnrefproviderengine{000a0000}-54.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-2931.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-61.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnrefproviderengine{000a0000}-6.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-2932.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-62.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  drtaeabi{000a0000}-144.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-2934.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-63.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  drtaeabi{000a0000}-158.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-2935.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-1088.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  drtaeabi{000a0000}-159.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-2938.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-1116.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  drtaeabi{000a0000}-180.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-2993.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-1119.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  drtaeabi{000a0000}-182.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-2997.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-1171.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  drtaeabi{000a0000}-183.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-3826.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-1288.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  drtaeabi{000a0000}-184.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-3862.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-1379.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  drtaeabi{000a0000}-189.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-3868.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-1381.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  scppnwdl{000a0000}-3.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-4021.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-1590.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-1360.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-4030.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-1593.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-641.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eposlandmarks{000a0000}-12.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-1817.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  ws32{000a0000}-211.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  apparc{000a0000}-280.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-677.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  gdi{000a0000}-312.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  apparc{000a0000}-284.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  apparc{000a0000}-121.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-1132.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-585.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  apparc{000a0000}-132.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-129.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-650.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  apparc{000a0000}-171.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-130.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  apparc{000a0000}-287.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  apparc{000a0000}-192.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-131.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  apparc{000a0000}-30.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  apparc{000a0000}-194.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-1350.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-141.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  apparc{000a0000}-202.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-1351.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-142.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-207.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-1366.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-143.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  apparc{000a0000}-232.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-198.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-144.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  apparc{000a0000}-273.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-199.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-147.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  apparc{000a0000}-274.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-201.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-152.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  apparc{000a0000}-275.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-206.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-155.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  apparc{000a0000}-279.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-2131.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-158.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-100.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-471.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-159.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-101.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-474.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-166.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  apparc{000a0000}-285.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-481.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-169.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  apparc{000a0000}-286.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-613.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-171.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-182.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-649.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-175.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-210.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-652.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-18.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-212.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-654.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-20.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-220.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-669.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-25.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-351.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-679.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-26.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-355.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-681.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-27.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-638.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-838.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-28.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-639.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  bafl{000a0000}-43.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-29.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-664.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  bafl{000a0000}-98.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-291.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-676.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-64.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-77.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-75.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-67.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-78.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-128.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-127.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-79.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-74.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-211.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  apparc{000a0000}-222.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-72.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-73.o ABSOLUTE
-    M:/epoc32/build/apputils/c_da81efa927799d7f/bafl_dll/armv5/udeb\VtblExports.s 0x00000000   Number         0  VtblExports.o ABSOLUTE
-    M:/epoc32/build/compsupp/c_18558cc638e6e874/drtaeabi_dll/armv5/udeb\VtblExports.s 0x00000000   Number         0  VtblExports.o ABSOLUTE
-    M:/epoc32/build/cone/c_17e36feeaf3b2ee8/cone_dll/armv5/udeb\VtblExports.s 0x00000000   Number         0  VtblExports.o ABSOLUTE
-    M:/epoc32/build/gdi/c_5dab287815cadb7b/gdi_dll/armv5/udeb\VtblExports.s 0x00000000   Number         0  VtblExports.o ABSOLUTE
-    M:/epoc32/build/store/c_93a13d203e6d3ba7/estor_dll/armv5/udeb\VtblExports.s 0x00000000   Number         0  VtblExports.o ABSOLUTE
-    M:/epoc32/build/uikon/c_9cf7bef4a7562444/eikcore_dll/armv5/udeb\VtblExports.s 0x00000000   Number         0  VtblExports.o ABSOLUTE
-    M:\\sf\\os\\kernelhwsrv\\kernel\\eka\\compsupp\\rvct2_2\\ucppinit_aeabi.cpp 0x00000000   Number         0  ucppinit_aeabi.o ABSOLUTE
-    M:\sf\os\kernelhwsrv\kernel\eka\compsupp\rvct2_2\dllexp.cpp 0x00000000   Number         0  dllexp.o ABSOLUTE
-    M:\sf\os\kernelhwsrv\kernel\eka\compsupp\rvct2_2\ucppinit_aeabi.cpp 0x00000000   Number         0  ucppinit_aeabi.o ABSOLUTE
-    M:\sf\os\kernelhwsrv\kernel\eka\compsupp\symaehabi\callfirstprocessfn.cpp 0x00000000   Number         0  callfirstprocessfn.o ABSOLUTE
-    \EPOC32\BUILD\sf\app\location\group\MNREFENGINE\ARMV5\VtblExports.s 0x00000000   Number         0  VtblExports.o ABSOLUTE
-    \EPOC32\BUILD\sf\mw\appsupport\appfw\apparchitecture\group\APPARC\ARMV5\VtblExports.s 0x00000000   Number         0  VtblExports.o ABSOLUTE
-    \EPOC32\BUILD\sf\mw\classicui\group\AVKON\ARMV5\VtblExports.s 0x00000000   Number         0  VtblExports.o ABSOLUTE
-    \EPOC32\BUILD\sf\mw\classicui\group\EIKCOCTL\ARMV5\VtblExports.s 0x00000000   Number         0  VtblExports.o ABSOLUTE
-    \EPOC32\BUILD\sf\mw\locationsrv\group\EPOS_LANDMARKSCLIENTLIBRARY\ARMV5\VtblExports.s 0x00000000   Number         0  VtblExports.o ABSOLUTE
-    \EPOC32\BUILD\sf\mw\locationsrv\group\MNSERVICELIB\ARMV5\VtblExports.s 0x00000000   Number         0  VtblExports.o ABSOLUTE
-    \EPOC32\BUILD\sf\mw\uiresources\group\AKNSKINS\ARMV5\VtblExports.s 0x00000000   Number         0  VtblExports.o ABSOLUTE
-    \EPOC32\BUILD\sf\os\graphics\windowing\windowserver\group\WS32LIB\ARMV5\VtblExports.s 0x00000000   Number         0  VtblExports.o ABSOLUTE
-    \EPOC32\BUILD\sf\os\kernelhwsrv\kernel\eka\euser\EEXE\ARMV6_ABIV1\urel\uc_exe_.cpp 0x00000000   Number         0  uc_exe_.o ABSOLUTE
-    \EPOC32\BUILD\sf\os\kernelhwsrv\kernel\eka\euser\EUSER\ARMV5\VtblExports.s 0x00000000   Number         0  VtblExports.o ABSOLUTE
-    \EPOC32\BUILD\sf\os\kernelhwsrv\userlibandfileserver\fileserver\group\EFSRV\ARMV5\VtblExports.s 0x00000000   Number         0  VtblExports.o ABSOLUTE
-    \EPOC32\BUILD\sf\os\lbs\locationmgmt\locationadmin\group\LBSAPIVARIANT2\ARMV5\VtblExports.s 0x00000000   Number         0  VtblExports.o ABSOLUTE
-    \\EPOC32\\BUILD\\sf\\os\\kernelhwsrv\\kernel\\eka\\euser\\EEXE\\ARMV6_ABIV1\\urel\\uc_exe_.cpp 0x00000000   Number         0  uc_exe_.o ABSOLUTE
-    \sf\app\location\mapnavproviderrefapp\src\mnrefproviderback.cpp 0x00000000   Number         0  mnrefproviderback.in ABSOLUTE
-    \sf\app\location\mapnavproviderrefapp\src\mnrpapplicationback.cpp 0x00000000   Number         0  mnrefproviderback.in ABSOLUTE
-    \sf\app\location\mapnavproviderrefapp\src\mnrpappserverback.cpp 0x00000000   Number         0  mnrefproviderback.in ABSOLUTE
-    \sf\app\location\mapnavproviderrefapp\src\mnrpappuiback.cpp 0x00000000   Number         0  mnrefproviderback.in ABSOLUTE
-    \sf\app\location\mapnavproviderrefapp\src\mnrpdocumentback.cpp 0x00000000   Number         0  mnrefproviderback.in ABSOLUTE
-    \sf\app\location\mapnavproviderrefapp\src\mnrpgeocodingservice.cpp 0x00000000   Number         0  mnrefproviderback.in ABSOLUTE
-    \sf\app\location\mapnavproviderrefapp\src\mnrpmapimageservice.cpp 0x00000000   Number         0  mnrefproviderback.in ABSOLUTE
-    \sf\os\kernelhwsrv\kernel\eka\euser\epoc\arm\uc_exe.cpp 0x00000000   Number         0  uc_exe.o ABSOLUTE
-    .emb_text                                0x00008000   Section      112  uc_exe_.o(.emb_text)
-    .emb_text                                0x00008070   Section       72  ucppinit_aeabi.o(.emb_text)
-    skip                                     0x00008084   ARM Code       0  ucppinit_aeabi.o(.emb_text)
-    loop                                     0x00008094   ARM Code       0  ucppinit_aeabi.o(.emb_text)
-    fpinit                                   0x000080ac   Data           0  ucppinit_aeabi.o(.emb_text)
-    base                                     0x000080b0   Data           0  ucppinit_aeabi.o(.emb_text)
-    limit                                    0x000080b4   Data           0  ucppinit_aeabi.o(.emb_text)
-    .text                                    0x000080c0   Section       16  uc_exe_.o(.text)
-    NewApplication()                         0x000080d1   Thumb Code    30  mnrefproviderback.in(.text)
-    .text                                    0x000080d0   Section       60  mnrefproviderback.in(.text)
-    .text                                    0x0000810c   Section       32  mnrefproviderback.in(.text)
-    .text                                    0x0000812c   Section       68  mnrefproviderback.in(.text)
-    .text                                    0x00008170   Section       64  mnrefproviderback.in(.text)
-    .text                                    0x000081b0   Section      168  mnrefproviderback.in(.text)
-    .text                                    0x00008258   Section      988  mnrefproviderback.in(.text)
-    .text                                    0x00008634   Section      684  mnrefproviderback.in(.text)
-    __sti___23_mnrpmapimageservice_cpp       0x000088c7   Thumb Code     8  mnrefproviderback.in(.text)
-    .text                                    0x000088e8   Section       36  uc_exe.o(.text)
-    .text                                    0x0000890c   Section      120  callfirstprocessfn.o(.text)
-    .text                                    0x00008984   Section        4  dllexp.o(.text)
-    .text.clean                              0x00008988   Section       10  mnrefproviderback.in(.text.clean)
-    .text.clean                              0x00008992   Section       10  mnrefproviderback.in(.text.clean)
-    .text.clean                              0x0000899c   Section       18  mnrefproviderback.in(.text.clean)
-    .text.clean                              0x000089ae   Section       26  mnrefproviderback.in(.text.clean)
-    .text.clean                              0x000089c8   Section        8  callfirstprocessfn.o(.text.clean)
-    StubCode                                 0x000089d0   Section        8  euser{000a0000}-1088.o(StubCode)
-    theImportedSymbol                        0x000089d4   Data           0  euser{000a0000}-1088.o(StubCode)
-    StubCode                                 0x000089d8   Section        8  euser{000a0000}-1116.o(StubCode)
-    theImportedSymbol                        0x000089dc   Data           0  euser{000a0000}-1116.o(StubCode)
-    StubCode                                 0x000089e0   Section        8  euser{000a0000}-1119.o(StubCode)
-    theImportedSymbol                        0x000089e4   Data           0  euser{000a0000}-1119.o(StubCode)
-    StubCode                                 0x000089e8   Section        8  euser{000a0000}-1171.o(StubCode)
-    theImportedSymbol                        0x000089ec   Data           0  euser{000a0000}-1171.o(StubCode)
-    StubCode                                 0x000089f0   Section        8  euser{000a0000}-1288.o(StubCode)
-    theImportedSymbol                        0x000089f4   Data           0  euser{000a0000}-1288.o(StubCode)
-    StubCode                                 0x000089f8   Section        8  euser{000a0000}-1379.o(StubCode)
-    theImportedSymbol                        0x000089fc   Data           0  euser{000a0000}-1379.o(StubCode)
-    StubCode                                 0x00008a00   Section        8  euser{000a0000}-1381.o(StubCode)
-    theImportedSymbol                        0x00008a04   Data           0  euser{000a0000}-1381.o(StubCode)
-    StubCode                                 0x00008a08   Section        8  euser{000a0000}-1590.o(StubCode)
-    theImportedSymbol                        0x00008a0c   Data           0  euser{000a0000}-1590.o(StubCode)
-    StubCode                                 0x00008a10   Section        8  euser{000a0000}-1593.o(StubCode)
-    theImportedSymbol                        0x00008a14   Data           0  euser{000a0000}-1593.o(StubCode)
-    StubCode                                 0x00008a18   Section        8  euser{000a0000}-1817.o(StubCode)
-    theImportedSymbol                        0x00008a1c   Data           0  euser{000a0000}-1817.o(StubCode)
-    StubCode                                 0x00008a20   Section        8  euser{000a0000}-1995.o(StubCode)
-    theImportedSymbol                        0x00008a24   Data           0  euser{000a0000}-1995.o(StubCode)
-    StubCode                                 0x00008a28   Section        8  euser{000a0000}-1997.o(StubCode)
-    theImportedSymbol                        0x00008a2c   Data           0  euser{000a0000}-1997.o(StubCode)
-    StubCode                                 0x00008a30   Section        8  euser{000a0000}-1999.o(StubCode)
-    theImportedSymbol                        0x00008a34   Data           0  euser{000a0000}-1999.o(StubCode)
-    StubCode                                 0x00008a38   Section        8  euser{000a0000}-203.o(StubCode)
-    theImportedSymbol                        0x00008a3c   Data           0  euser{000a0000}-203.o(StubCode)
-    StubCode                                 0x00008a40   Section        8  euser{000a0000}-205.o(StubCode)
-    theImportedSymbol                        0x00008a44   Data           0  euser{000a0000}-205.o(StubCode)
-    StubCode                                 0x00008a48   Section        8  euser{000a0000}-2060.o(StubCode)
-    theImportedSymbol                        0x00008a4c   Data           0  euser{000a0000}-2060.o(StubCode)
-    StubCode                                 0x00008a50   Section        8  euser{000a0000}-2061.o(StubCode)
-    theImportedSymbol                        0x00008a54   Data           0  euser{000a0000}-2061.o(StubCode)
-    StubCode                                 0x00008a58   Section        8  euser{000a0000}-207.o(StubCode)
-    theImportedSymbol                        0x00008a5c   Data           0  euser{000a0000}-207.o(StubCode)
-    StubCode                                 0x00008a60   Section        8  euser{000a0000}-208.o(StubCode)
-    theImportedSymbol                        0x00008a64   Data           0  euser{000a0000}-208.o(StubCode)
-    StubCode                                 0x00008a68   Section        8  euser{000a0000}-2082.o(StubCode)
-    theImportedSymbol                        0x00008a6c   Data           0  euser{000a0000}-2082.o(StubCode)
-    StubCode                                 0x00008a70   Section        8  euser{000a0000}-2120.o(StubCode)
-    theImportedSymbol                        0x00008a74   Data           0  euser{000a0000}-2120.o(StubCode)
-    StubCode                                 0x00008a78   Section        8  euser{000a0000}-2123.o(StubCode)
-    theImportedSymbol                        0x00008a7c   Data           0  euser{000a0000}-2123.o(StubCode)
-    StubCode                                 0x00008a80   Section        8  euser{000a0000}-2131.o(StubCode)
-    theImportedSymbol                        0x00008a84   Data           0  euser{000a0000}-2131.o(StubCode)
-    StubCode                                 0x00008a88   Section        8  euser{000a0000}-471.o(StubCode)
-    theImportedSymbol                        0x00008a8c   Data           0  euser{000a0000}-471.o(StubCode)
-    StubCode                                 0x00008a90   Section        8  euser{000a0000}-474.o(StubCode)
-    theImportedSymbol                        0x00008a94   Data           0  euser{000a0000}-474.o(StubCode)
-    StubCode                                 0x00008a98   Section        8  euser{000a0000}-481.o(StubCode)
-    theImportedSymbol                        0x00008a9c   Data           0  euser{000a0000}-481.o(StubCode)
-    StubCode                                 0x00008aa0   Section        8  euser{000a0000}-613.o(StubCode)
-    theImportedSymbol                        0x00008aa4   Data           0  euser{000a0000}-613.o(StubCode)
-    StubCode                                 0x00008aa8   Section        8  euser{000a0000}-649.o(StubCode)
-    theImportedSymbol                        0x00008aac   Data           0  euser{000a0000}-649.o(StubCode)
-    StubCode                                 0x00008ab0   Section        8  euser{000a0000}-652.o(StubCode)
-    theImportedSymbol                        0x00008ab4   Data           0  euser{000a0000}-652.o(StubCode)
-    StubCode                                 0x00008ab8   Section        8  euser{000a0000}-654.o(StubCode)
-    theImportedSymbol                        0x00008abc   Data           0  euser{000a0000}-654.o(StubCode)
-    StubCode                                 0x00008ac0   Section        8  euser{000a0000}-669.o(StubCode)
-    theImportedSymbol                        0x00008ac4   Data           0  euser{000a0000}-669.o(StubCode)
-    StubCode                                 0x00008ac8   Section        8  euser{000a0000}-679.o(StubCode)
-    theImportedSymbol                        0x00008acc   Data           0  euser{000a0000}-679.o(StubCode)
-    StubCode                                 0x00008ad0   Section        8  euser{000a0000}-681.o(StubCode)
-    theImportedSymbol                        0x00008ad4   Data           0  euser{000a0000}-681.o(StubCode)
-    StubCode                                 0x00008ad8   Section        8  euser{000a0000}-838.o(StubCode)
-    theImportedSymbol                        0x00008adc   Data           0  euser{000a0000}-838.o(StubCode)
-    StubCode                                 0x00008ae0   Section        8  bafl{000a0000}-43.o(StubCode)
-    theImportedSymbol                        0x00008ae4   Data           0  bafl{000a0000}-43.o(StubCode)
-    StubCode                                 0x00008ae8   Section        8  bafl{000a0000}-98.o(StubCode)
-    theImportedSymbol                        0x00008aec   Data           0  bafl{000a0000}-98.o(StubCode)
-    StubCode                                 0x00008af0   Section        8  cone{000a0000}-100.o(StubCode)
-    theImportedSymbol                        0x00008af4   Data           0  cone{000a0000}-100.o(StubCode)
-    StubCode                                 0x00008af8   Section        8  cone{000a0000}-101.o(StubCode)
-    theImportedSymbol                        0x00008afc   Data           0  cone{000a0000}-101.o(StubCode)
-    StubCode                                 0x00008b00   Section        8  cone{000a0000}-127.o(StubCode)
-    theImportedSymbol                        0x00008b04   Data           0  cone{000a0000}-127.o(StubCode)
-    StubCode                                 0x00008b08   Section        8  cone{000a0000}-128.o(StubCode)
-    theImportedSymbol                        0x00008b0c   Data           0  cone{000a0000}-128.o(StubCode)
-    StubCode                                 0x00008b10   Section        8  cone{000a0000}-182.o(StubCode)
-    theImportedSymbol                        0x00008b14   Data           0  cone{000a0000}-182.o(StubCode)
-    StubCode                                 0x00008b18   Section        8  cone{000a0000}-210.o(StubCode)
-    theImportedSymbol                        0x00008b1c   Data           0  cone{000a0000}-210.o(StubCode)
-    StubCode                                 0x00008b20   Section        8  cone{000a0000}-212.o(StubCode)
-    theImportedSymbol                        0x00008b24   Data           0  cone{000a0000}-212.o(StubCode)
-    StubCode                                 0x00008b28   Section        8  cone{000a0000}-220.o(StubCode)
-    theImportedSymbol                        0x00008b2c   Data           0  cone{000a0000}-220.o(StubCode)
-    StubCode                                 0x00008b30   Section        8  cone{000a0000}-351.o(StubCode)
-    theImportedSymbol                        0x00008b34   Data           0  cone{000a0000}-351.o(StubCode)
-    StubCode                                 0x00008b38   Section        8  cone{000a0000}-355.o(StubCode)
-    theImportedSymbol                        0x00008b3c   Data           0  cone{000a0000}-355.o(StubCode)
-    StubCode                                 0x00008b40   Section        8  cone{000a0000}-638.o(StubCode)
-    theImportedSymbol                        0x00008b44   Data           0  cone{000a0000}-638.o(StubCode)
-    StubCode                                 0x00008b48   Section        8  cone{000a0000}-639.o(StubCode)
-    theImportedSymbol                        0x00008b4c   Data           0  cone{000a0000}-639.o(StubCode)
-    StubCode                                 0x00008b50   Section        8  cone{000a0000}-664.o(StubCode)
-    theImportedSymbol                        0x00008b54   Data           0  cone{000a0000}-664.o(StubCode)
-    StubCode                                 0x00008b58   Section        8  cone{000a0000}-676.o(StubCode)
-    theImportedSymbol                        0x00008b5c   Data           0  cone{000a0000}-676.o(StubCode)
-    StubCode                                 0x00008b60   Section        8  cone{000a0000}-677.o(StubCode)
-    theImportedSymbol                        0x00008b64   Data           0  cone{000a0000}-677.o(StubCode)
-    StubCode                                 0x00008b68   Section        8  apparc{000a0000}-121.o(StubCode)
-    theImportedSymbol                        0x00008b6c   Data           0  apparc{000a0000}-121.o(StubCode)
-    StubCode                                 0x00008b70   Section        8  apparc{000a0000}-132.o(StubCode)
-    theImportedSymbol                        0x00008b74   Data           0  apparc{000a0000}-132.o(StubCode)
-    StubCode                                 0x00008b78   Section        8  apparc{000a0000}-171.o(StubCode)
-    theImportedSymbol                        0x00008b7c   Data           0  apparc{000a0000}-171.o(StubCode)
-    StubCode                                 0x00008b80   Section        8  apparc{000a0000}-192.o(StubCode)
-    theImportedSymbol                        0x00008b84   Data           0  apparc{000a0000}-192.o(StubCode)
-    StubCode                                 0x00008b88   Section        8  apparc{000a0000}-194.o(StubCode)
-    theImportedSymbol                        0x00008b8c   Data           0  apparc{000a0000}-194.o(StubCode)
-    StubCode                                 0x00008b90   Section        8  apparc{000a0000}-202.o(StubCode)
-    theImportedSymbol                        0x00008b94   Data           0  apparc{000a0000}-202.o(StubCode)
-    StubCode                                 0x00008b98   Section        8  apparc{000a0000}-222.o(StubCode)
-    theImportedSymbol                        0x00008b9c   Data           0  apparc{000a0000}-222.o(StubCode)
-    StubCode                                 0x00008ba0   Section        8  apparc{000a0000}-232.o(StubCode)
-    theImportedSymbol                        0x00008ba4   Data           0  apparc{000a0000}-232.o(StubCode)
-    StubCode                                 0x00008ba8   Section        8  apparc{000a0000}-273.o(StubCode)
-    theImportedSymbol                        0x00008bac   Data           0  apparc{000a0000}-273.o(StubCode)
-    StubCode                                 0x00008bb0   Section        8  apparc{000a0000}-274.o(StubCode)
-    theImportedSymbol                        0x00008bb4   Data           0  apparc{000a0000}-274.o(StubCode)
-    StubCode                                 0x00008bb8   Section        8  apparc{000a0000}-275.o(StubCode)
-    theImportedSymbol                        0x00008bbc   Data           0  apparc{000a0000}-275.o(StubCode)
-    StubCode                                 0x00008bc0   Section        8  apparc{000a0000}-279.o(StubCode)
-    theImportedSymbol                        0x00008bc4   Data           0  apparc{000a0000}-279.o(StubCode)
-    StubCode                                 0x00008bc8   Section        8  apparc{000a0000}-280.o(StubCode)
-    theImportedSymbol                        0x00008bcc   Data           0  apparc{000a0000}-280.o(StubCode)
-    StubCode                                 0x00008bd0   Section        8  apparc{000a0000}-284.o(StubCode)
-    theImportedSymbol                        0x00008bd4   Data           0  apparc{000a0000}-284.o(StubCode)
-    StubCode                                 0x00008bd8   Section        8  apparc{000a0000}-285.o(StubCode)
-    theImportedSymbol                        0x00008bdc   Data           0  apparc{000a0000}-285.o(StubCode)
-    StubCode                                 0x00008be0   Section        8  apparc{000a0000}-286.o(StubCode)
-    theImportedSymbol                        0x00008be4   Data           0  apparc{000a0000}-286.o(StubCode)
-    StubCode                                 0x00008be8   Section        8  apparc{000a0000}-287.o(StubCode)
-    theImportedSymbol                        0x00008bec   Data           0  apparc{000a0000}-287.o(StubCode)
-    StubCode                                 0x00008bf0   Section        8  apparc{000a0000}-30.o(StubCode)
-    theImportedSymbol                        0x00008bf4   Data           0  apparc{000a0000}-30.o(StubCode)
-    StubCode                                 0x00008bf8   Section        8  eikcore{000a0000}-141.o(StubCode)
-    theImportedSymbol                        0x00008bfc   Data           0  eikcore{000a0000}-141.o(StubCode)
-    StubCode                                 0x00008c00   Section        8  eikcore{000a0000}-142.o(StubCode)
-    theImportedSymbol                        0x00008c04   Data           0  eikcore{000a0000}-142.o(StubCode)
-    StubCode                                 0x00008c08   Section        8  eikcore{000a0000}-143.o(StubCode)
-    theImportedSymbol                        0x00008c0c   Data           0  eikcore{000a0000}-143.o(StubCode)
-    StubCode                                 0x00008c10   Section        8  eikcore{000a0000}-144.o(StubCode)
-    theImportedSymbol                        0x00008c14   Data           0  eikcore{000a0000}-144.o(StubCode)
-    StubCode                                 0x00008c18   Section        8  eikcore{000a0000}-147.o(StubCode)
-    theImportedSymbol                        0x00008c1c   Data           0  eikcore{000a0000}-147.o(StubCode)
-    StubCode                                 0x00008c20   Section        8  eikcore{000a0000}-152.o(StubCode)
-    theImportedSymbol                        0x00008c24   Data           0  eikcore{000a0000}-152.o(StubCode)
-    StubCode                                 0x00008c28   Section        8  eikcore{000a0000}-155.o(StubCode)
-    theImportedSymbol                        0x00008c2c   Data           0  eikcore{000a0000}-155.o(StubCode)
-    StubCode                                 0x00008c30   Section        8  eikcore{000a0000}-158.o(StubCode)
-    theImportedSymbol                        0x00008c34   Data           0  eikcore{000a0000}-158.o(StubCode)
-    StubCode                                 0x00008c38   Section        8  eikcore{000a0000}-159.o(StubCode)
-    theImportedSymbol                        0x00008c3c   Data           0  eikcore{000a0000}-159.o(StubCode)
-    StubCode                                 0x00008c40   Section        8  eikcore{000a0000}-166.o(StubCode)
-    theImportedSymbol                        0x00008c44   Data           0  eikcore{000a0000}-166.o(StubCode)
-    StubCode                                 0x00008c48   Section        8  eikcore{000a0000}-169.o(StubCode)
-    theImportedSymbol                        0x00008c4c   Data           0  eikcore{000a0000}-169.o(StubCode)
-    StubCode                                 0x00008c50   Section        8  eikcore{000a0000}-171.o(StubCode)
-    theImportedSymbol                        0x00008c54   Data           0  eikcore{000a0000}-171.o(StubCode)
-    StubCode                                 0x00008c58   Section        8  eikcore{000a0000}-175.o(StubCode)
-    theImportedSymbol                        0x00008c5c   Data           0  eikcore{000a0000}-175.o(StubCode)
-    StubCode                                 0x00008c60   Section        8  eikcore{000a0000}-18.o(StubCode)
-    theImportedSymbol                        0x00008c64   Data           0  eikcore{000a0000}-18.o(StubCode)
-    StubCode                                 0x00008c68   Section        8  eikcore{000a0000}-20.o(StubCode)
-    theImportedSymbol                        0x00008c6c   Data           0  eikcore{000a0000}-20.o(StubCode)
-    StubCode                                 0x00008c70   Section        8  eikcore{000a0000}-25.o(StubCode)
-    theImportedSymbol                        0x00008c74   Data           0  eikcore{000a0000}-25.o(StubCode)
-    StubCode                                 0x00008c78   Section        8  eikcore{000a0000}-26.o(StubCode)
-    theImportedSymbol                        0x00008c7c   Data           0  eikcore{000a0000}-26.o(StubCode)
-    StubCode                                 0x00008c80   Section        8  eikcore{000a0000}-27.o(StubCode)
-    theImportedSymbol                        0x00008c84   Data           0  eikcore{000a0000}-27.o(StubCode)
-    StubCode                                 0x00008c88   Section        8  eikcore{000a0000}-28.o(StubCode)
-    theImportedSymbol                        0x00008c8c   Data           0  eikcore{000a0000}-28.o(StubCode)
-    StubCode                                 0x00008c90   Section        8  eikcore{000a0000}-29.o(StubCode)
-    theImportedSymbol                        0x00008c94   Data           0  eikcore{000a0000}-29.o(StubCode)
-    StubCode                                 0x00008c98   Section        8  eikcore{000a0000}-291.o(StubCode)
-    theImportedSymbol                        0x00008c9c   Data           0  eikcore{000a0000}-291.o(StubCode)
-    StubCode                                 0x00008ca0   Section        8  eikcore{000a0000}-293.o(StubCode)
-    theImportedSymbol                        0x00008ca4   Data           0  eikcore{000a0000}-293.o(StubCode)
-    StubCode                                 0x00008ca8   Section        8  eikcore{000a0000}-294.o(StubCode)
-    theImportedSymbol                        0x00008cac   Data           0  eikcore{000a0000}-294.o(StubCode)
-    StubCode                                 0x00008cb0   Section        8  eikcore{000a0000}-295.o(StubCode)
-    theImportedSymbol                        0x00008cb4   Data           0  eikcore{000a0000}-295.o(StubCode)
-    StubCode                                 0x00008cb8   Section        8  eikcore{000a0000}-296.o(StubCode)
-    theImportedSymbol                        0x00008cbc   Data           0  eikcore{000a0000}-296.o(StubCode)
-    StubCode                                 0x00008cc0   Section        8  eikcore{000a0000}-297.o(StubCode)
-    theImportedSymbol                        0x00008cc4   Data           0  eikcore{000a0000}-297.o(StubCode)
-    StubCode                                 0x00008cc8   Section        8  eikcore{000a0000}-298.o(StubCode)
-    theImportedSymbol                        0x00008ccc   Data           0  eikcore{000a0000}-298.o(StubCode)
-    StubCode                                 0x00008cd0   Section        8  eikcore{000a0000}-299.o(StubCode)
-    theImportedSymbol                        0x00008cd4   Data           0  eikcore{000a0000}-299.o(StubCode)
-    StubCode                                 0x00008cd8   Section        8  eikcore{000a0000}-30.o(StubCode)
-    theImportedSymbol                        0x00008cdc   Data           0  eikcore{000a0000}-30.o(StubCode)
-    StubCode                                 0x00008ce0   Section        8  eikcore{000a0000}-302.o(StubCode)
-    theImportedSymbol                        0x00008ce4   Data           0  eikcore{000a0000}-302.o(StubCode)
-    StubCode                                 0x00008ce8   Section        8  eikcore{000a0000}-31.o(StubCode)
-    theImportedSymbol                        0x00008cec   Data           0  eikcore{000a0000}-31.o(StubCode)
-    StubCode                                 0x00008cf0   Section        8  eikcore{000a0000}-317.o(StubCode)
-    theImportedSymbol                        0x00008cf4   Data           0  eikcore{000a0000}-317.o(StubCode)
-    StubCode                                 0x00008cf8   Section        8  eikcore{000a0000}-352.o(StubCode)
-    theImportedSymbol                        0x00008cfc   Data           0  eikcore{000a0000}-352.o(StubCode)
-    StubCode                                 0x00008d00   Section        8  eikcore{000a0000}-37.o(StubCode)
-    theImportedSymbol                        0x00008d04   Data           0  eikcore{000a0000}-37.o(StubCode)
-    StubCode                                 0x00008d08   Section        8  eikcore{000a0000}-390.o(StubCode)
-    theImportedSymbol                        0x00008d0c   Data           0  eikcore{000a0000}-390.o(StubCode)
-    StubCode                                 0x00008d10   Section        8  eikcore{000a0000}-392.o(StubCode)
-    theImportedSymbol                        0x00008d14   Data           0  eikcore{000a0000}-392.o(StubCode)
-    StubCode                                 0x00008d18   Section        8  eikcore{000a0000}-394.o(StubCode)
-    theImportedSymbol                        0x00008d1c   Data           0  eikcore{000a0000}-394.o(StubCode)
-    StubCode                                 0x00008d20   Section        8  eikcore{000a0000}-467.o(StubCode)
-    theImportedSymbol                        0x00008d24   Data           0  eikcore{000a0000}-467.o(StubCode)
-    StubCode                                 0x00008d28   Section        8  eikcore{000a0000}-479.o(StubCode)
-    theImportedSymbol                        0x00008d2c   Data           0  eikcore{000a0000}-479.o(StubCode)
-    StubCode                                 0x00008d30   Section        8  eikcore{000a0000}-490.o(StubCode)
-    theImportedSymbol                        0x00008d34   Data           0  eikcore{000a0000}-490.o(StubCode)
-    StubCode                                 0x00008d38   Section        8  eikcore{000a0000}-506.o(StubCode)
-    theImportedSymbol                        0x00008d3c   Data           0  eikcore{000a0000}-506.o(StubCode)
-    StubCode                                 0x00008d40   Section        8  eikcore{000a0000}-523.o(StubCode)
-    theImportedSymbol                        0x00008d44   Data           0  eikcore{000a0000}-523.o(StubCode)
-    StubCode                                 0x00008d48   Section        8  eikcore{000a0000}-532.o(StubCode)
-    theImportedSymbol                        0x00008d4c   Data           0  eikcore{000a0000}-532.o(StubCode)
-    StubCode                                 0x00008d50   Section        8  eikcore{000a0000}-533.o(StubCode)
-    theImportedSymbol                        0x00008d54   Data           0  eikcore{000a0000}-533.o(StubCode)
-    StubCode                                 0x00008d58   Section        8  eikcore{000a0000}-534.o(StubCode)
-    theImportedSymbol                        0x00008d5c   Data           0  eikcore{000a0000}-534.o(StubCode)
-    StubCode                                 0x00008d60   Section        8  eikcore{000a0000}-535.o(StubCode)
-    theImportedSymbol                        0x00008d64   Data           0  eikcore{000a0000}-535.o(StubCode)
-    StubCode                                 0x00008d68   Section        8  eikcore{000a0000}-536.o(StubCode)
-    theImportedSymbol                        0x00008d6c   Data           0  eikcore{000a0000}-536.o(StubCode)
-    StubCode                                 0x00008d70   Section        8  eikcore{000a0000}-537.o(StubCode)
-    theImportedSymbol                        0x00008d74   Data           0  eikcore{000a0000}-537.o(StubCode)
-    StubCode                                 0x00008d78   Section        8  eikcore{000a0000}-565.o(StubCode)
-    theImportedSymbol                        0x00008d7c   Data           0  eikcore{000a0000}-565.o(StubCode)
-    StubCode                                 0x00008d80   Section        8  eikcore{000a0000}-61.o(StubCode)
-    theImportedSymbol                        0x00008d84   Data           0  eikcore{000a0000}-61.o(StubCode)
-    StubCode                                 0x00008d88   Section        8  eikcore{000a0000}-62.o(StubCode)
-    theImportedSymbol                        0x00008d8c   Data           0  eikcore{000a0000}-62.o(StubCode)
-    StubCode                                 0x00008d90   Section        8  eikcore{000a0000}-63.o(StubCode)
-    theImportedSymbol                        0x00008d94   Data           0  eikcore{000a0000}-63.o(StubCode)
-    StubCode                                 0x00008d98   Section        8  eikcore{000a0000}-64.o(StubCode)
-    theImportedSymbol                        0x00008d9c   Data           0  eikcore{000a0000}-64.o(StubCode)
-    StubCode                                 0x00008da0   Section        8  eikcore{000a0000}-67.o(StubCode)
-    theImportedSymbol                        0x00008da4   Data           0  eikcore{000a0000}-67.o(StubCode)
-    StubCode                                 0x00008da8   Section        8  eikcore{000a0000}-72.o(StubCode)
-    theImportedSymbol                        0x00008dac   Data           0  eikcore{000a0000}-72.o(StubCode)
-    StubCode                                 0x00008db0   Section        8  eikcore{000a0000}-73.o(StubCode)
-    theImportedSymbol                        0x00008db4   Data           0  eikcore{000a0000}-73.o(StubCode)
-    StubCode                                 0x00008db8   Section        8  eikcore{000a0000}-74.o(StubCode)
-    theImportedSymbol                        0x00008dbc   Data           0  eikcore{000a0000}-74.o(StubCode)
-    StubCode                                 0x00008dc0   Section        8  eikcore{000a0000}-75.o(StubCode)
-    theImportedSymbol                        0x00008dc4   Data           0  eikcore{000a0000}-75.o(StubCode)
-    StubCode                                 0x00008dc8   Section        8  eikcore{000a0000}-77.o(StubCode)
-    theImportedSymbol                        0x00008dcc   Data           0  eikcore{000a0000}-77.o(StubCode)
-    StubCode                                 0x00008dd0   Section        8  eikcore{000a0000}-78.o(StubCode)
-    theImportedSymbol                        0x00008dd4   Data           0  eikcore{000a0000}-78.o(StubCode)
-    StubCode                                 0x00008dd8   Section        8  eikcore{000a0000}-79.o(StubCode)
-    theImportedSymbol                        0x00008ddc   Data           0  eikcore{000a0000}-79.o(StubCode)
-    StubCode                                 0x00008de0   Section        8  ws32{000a0000}-211.o(StubCode)
-    theImportedSymbol                        0x00008de4   Data           0  ws32{000a0000}-211.o(StubCode)
-    StubCode                                 0x00008de8   Section        8  gdi{000a0000}-312.o(StubCode)
-    theImportedSymbol                        0x00008dec   Data           0  gdi{000a0000}-312.o(StubCode)
-    StubCode                                 0x00008df0   Section        8  avkon{000a0000}-1132.o(StubCode)
-    theImportedSymbol                        0x00008df4   Data           0  avkon{000a0000}-1132.o(StubCode)
-    StubCode                                 0x00008df8   Section        8  avkon{000a0000}-129.o(StubCode)
-    theImportedSymbol                        0x00008dfc   Data           0  avkon{000a0000}-129.o(StubCode)
-    StubCode                                 0x00008e00   Section        8  avkon{000a0000}-130.o(StubCode)
-    theImportedSymbol                        0x00008e04   Data           0  avkon{000a0000}-130.o(StubCode)
-    StubCode                                 0x00008e08   Section        8  avkon{000a0000}-131.o(StubCode)
-    theImportedSymbol                        0x00008e0c   Data           0  avkon{000a0000}-131.o(StubCode)
-    StubCode                                 0x00008e10   Section        8  avkon{000a0000}-1350.o(StubCode)
-    theImportedSymbol                        0x00008e14   Data           0  avkon{000a0000}-1350.o(StubCode)
-    StubCode                                 0x00008e18   Section        8  avkon{000a0000}-1351.o(StubCode)
-    theImportedSymbol                        0x00008e1c   Data           0  avkon{000a0000}-1351.o(StubCode)
-    StubCode                                 0x00008e20   Section        8  avkon{000a0000}-1366.o(StubCode)
-    theImportedSymbol                        0x00008e24   Data           0  avkon{000a0000}-1366.o(StubCode)
-    StubCode                                 0x00008e28   Section        8  avkon{000a0000}-198.o(StubCode)
-    theImportedSymbol                        0x00008e2c   Data           0  avkon{000a0000}-198.o(StubCode)
-    StubCode                                 0x00008e30   Section        8  avkon{000a0000}-199.o(StubCode)
-    theImportedSymbol                        0x00008e34   Data           0  avkon{000a0000}-199.o(StubCode)
-    StubCode                                 0x00008e38   Section        8  avkon{000a0000}-201.o(StubCode)
-    theImportedSymbol                        0x00008e3c   Data           0  avkon{000a0000}-201.o(StubCode)
-    StubCode                                 0x00008e40   Section        8  avkon{000a0000}-206.o(StubCode)
-    theImportedSymbol                        0x00008e44   Data           0  avkon{000a0000}-206.o(StubCode)
-    StubCode                                 0x00008e48   Section        8  avkon{000a0000}-211.o(StubCode)
-    theImportedSymbol                        0x00008e4c   Data           0  avkon{000a0000}-211.o(StubCode)
-    StubCode                                 0x00008e50   Section        8  avkon{000a0000}-213.o(StubCode)
-    theImportedSymbol                        0x00008e54   Data           0  avkon{000a0000}-213.o(StubCode)
-    StubCode                                 0x00008e58   Section        8  avkon{000a0000}-214.o(StubCode)
-    theImportedSymbol                        0x00008e5c   Data           0  avkon{000a0000}-214.o(StubCode)
-    StubCode                                 0x00008e60   Section        8  avkon{000a0000}-215.o(StubCode)
-    theImportedSymbol                        0x00008e64   Data           0  avkon{000a0000}-215.o(StubCode)
-    StubCode                                 0x00008e68   Section        8  avkon{000a0000}-216.o(StubCode)
-    theImportedSymbol                        0x00008e6c   Data           0  avkon{000a0000}-216.o(StubCode)
-    StubCode                                 0x00008e70   Section        8  avkon{000a0000}-217.o(StubCode)
-    theImportedSymbol                        0x00008e74   Data           0  avkon{000a0000}-217.o(StubCode)
-    StubCode                                 0x00008e78   Section        8  avkon{000a0000}-220.o(StubCode)
-    theImportedSymbol                        0x00008e7c   Data           0  avkon{000a0000}-220.o(StubCode)
-    StubCode                                 0x00008e80   Section        8  avkon{000a0000}-2920.o(StubCode)
-    theImportedSymbol                        0x00008e84   Data           0  avkon{000a0000}-2920.o(StubCode)
-    StubCode                                 0x00008e88   Section        8  avkon{000a0000}-2922.o(StubCode)
-    theImportedSymbol                        0x00008e8c   Data           0  avkon{000a0000}-2922.o(StubCode)
-    StubCode                                 0x00008e90   Section        8  avkon{000a0000}-2924.o(StubCode)
-    theImportedSymbol                        0x00008e94   Data           0  avkon{000a0000}-2924.o(StubCode)
-    StubCode                                 0x00008e98   Section        8  avkon{000a0000}-2925.o(StubCode)
-    theImportedSymbol                        0x00008e9c   Data           0  avkon{000a0000}-2925.o(StubCode)
-    StubCode                                 0x00008ea0   Section        8  avkon{000a0000}-2926.o(StubCode)
-    theImportedSymbol                        0x00008ea4   Data           0  avkon{000a0000}-2926.o(StubCode)
-    StubCode                                 0x00008ea8   Section        8  avkon{000a0000}-2928.o(StubCode)
-    theImportedSymbol                        0x00008eac   Data           0  avkon{000a0000}-2928.o(StubCode)
-    StubCode                                 0x00008eb0   Section        8  avkon{000a0000}-2929.o(StubCode)
-    theImportedSymbol                        0x00008eb4   Data           0  avkon{000a0000}-2929.o(StubCode)
-    StubCode                                 0x00008eb8   Section        8  avkon{000a0000}-2930.o(StubCode)
-    theImportedSymbol                        0x00008ebc   Data           0  avkon{000a0000}-2930.o(StubCode)
-    StubCode                                 0x00008ec0   Section        8  avkon{000a0000}-2931.o(StubCode)
-    theImportedSymbol                        0x00008ec4   Data           0  avkon{000a0000}-2931.o(StubCode)
-    StubCode                                 0x00008ec8   Section        8  avkon{000a0000}-2932.o(StubCode)
-    theImportedSymbol                        0x00008ecc   Data           0  avkon{000a0000}-2932.o(StubCode)
-    StubCode                                 0x00008ed0   Section        8  avkon{000a0000}-2934.o(StubCode)
-    theImportedSymbol                        0x00008ed4   Data           0  avkon{000a0000}-2934.o(StubCode)
-    StubCode                                 0x00008ed8   Section        8  avkon{000a0000}-2935.o(StubCode)
-    theImportedSymbol                        0x00008edc   Data           0  avkon{000a0000}-2935.o(StubCode)
-    StubCode                                 0x00008ee0   Section        8  avkon{000a0000}-2938.o(StubCode)
-    theImportedSymbol                        0x00008ee4   Data           0  avkon{000a0000}-2938.o(StubCode)
-    StubCode                                 0x00008ee8   Section        8  avkon{000a0000}-2993.o(StubCode)
-    theImportedSymbol                        0x00008eec   Data           0  avkon{000a0000}-2993.o(StubCode)
-    StubCode                                 0x00008ef0   Section        8  avkon{000a0000}-2997.o(StubCode)
-    theImportedSymbol                        0x00008ef4   Data           0  avkon{000a0000}-2997.o(StubCode)
-    StubCode                                 0x00008ef8   Section        8  avkon{000a0000}-3826.o(StubCode)
-    theImportedSymbol                        0x00008efc   Data           0  avkon{000a0000}-3826.o(StubCode)
-    StubCode                                 0x00008f00   Section        8  avkon{000a0000}-3862.o(StubCode)
-    theImportedSymbol                        0x00008f04   Data           0  avkon{000a0000}-3862.o(StubCode)
-    StubCode                                 0x00008f08   Section        8  avkon{000a0000}-3868.o(StubCode)
-    theImportedSymbol                        0x00008f0c   Data           0  avkon{000a0000}-3868.o(StubCode)
-    StubCode                                 0x00008f10   Section        8  avkon{000a0000}-4021.o(StubCode)
-    theImportedSymbol                        0x00008f14   Data           0  avkon{000a0000}-4021.o(StubCode)
-    StubCode                                 0x00008f18   Section        8  avkon{000a0000}-4030.o(StubCode)
-    theImportedSymbol                        0x00008f1c   Data           0  avkon{000a0000}-4030.o(StubCode)
-    StubCode                                 0x00008f20   Section        8  eposlandmarks{000a0000}-12.o(StubCode)
-    theImportedSymbol                        0x00008f24   Data           0  eposlandmarks{000a0000}-12.o(StubCode)
-    StubCode                                 0x00008f28   Section        8  eposlandmarks{000a0000}-13.o(StubCode)
-    theImportedSymbol                        0x00008f2c   Data           0  eposlandmarks{000a0000}-13.o(StubCode)
-    StubCode                                 0x00008f30   Section        8  eposlandmarks{000a0000}-65.o(StubCode)
-    theImportedSymbol                        0x00008f34   Data           0  eposlandmarks{000a0000}-65.o(StubCode)
-    StubCode                                 0x00008f38   Section        8  eposlandmarks{000a0000}-68.o(StubCode)
-    theImportedSymbol                        0x00008f3c   Data           0  eposlandmarks{000a0000}-68.o(StubCode)
-    StubCode                                 0x00008f40   Section        8  lbs{000a0000}-207.o(StubCode)
-    theImportedSymbol                        0x00008f44   Data           0  lbs{000a0000}-207.o(StubCode)
-    StubCode                                 0x00008f48   Section        8  lbs{000a0000}-23.o(StubCode)
-    theImportedSymbol                        0x00008f4c   Data           0  lbs{000a0000}-23.o(StubCode)
-    StubCode                                 0x00008f50   Section        8  mnservicelib{000a0000}-1.o(StubCode)
-    theImportedSymbol                        0x00008f54   Data           0  mnservicelib{000a0000}-1.o(StubCode)
-    StubCode                                 0x00008f58   Section        8  mnservicelib{000a0000}-2.o(StubCode)
-    theImportedSymbol                        0x00008f5c   Data           0  mnservicelib{000a0000}-2.o(StubCode)
-    StubCode                                 0x00008f60   Section        8  mnservicelib{000a0000}-21.o(StubCode)
-    theImportedSymbol                        0x00008f64   Data           0  mnservicelib{000a0000}-21.o(StubCode)
-    StubCode                                 0x00008f68   Section        8  mnservicelib{000a0000}-22.o(StubCode)
-    theImportedSymbol                        0x00008f6c   Data           0  mnservicelib{000a0000}-22.o(StubCode)
-    StubCode                                 0x00008f70   Section        8  mnservicelib{000a0000}-23.o(StubCode)
-    theImportedSymbol                        0x00008f74   Data           0  mnservicelib{000a0000}-23.o(StubCode)
-    StubCode                                 0x00008f78   Section        8  mnservicelib{000a0000}-24.o(StubCode)
-    theImportedSymbol                        0x00008f7c   Data           0  mnservicelib{000a0000}-24.o(StubCode)
-    StubCode                                 0x00008f80   Section        8  mnservicelib{000a0000}-27.o(StubCode)
-    theImportedSymbol                        0x00008f84   Data           0  mnservicelib{000a0000}-27.o(StubCode)
-    StubCode                                 0x00008f88   Section        8  mnservicelib{000a0000}-34.o(StubCode)
-    theImportedSymbol                        0x00008f8c   Data           0  mnservicelib{000a0000}-34.o(StubCode)
-    StubCode                                 0x00008f90   Section        8  mnservicelib{000a0000}-45.o(StubCode)
-    theImportedSymbol                        0x00008f94   Data           0  mnservicelib{000a0000}-45.o(StubCode)
-    StubCode                                 0x00008f98   Section        8  mnservicelib{000a0000}-46.o(StubCode)
-    theImportedSymbol                        0x00008f9c   Data           0  mnservicelib{000a0000}-46.o(StubCode)
-    StubCode                                 0x00008fa0   Section        8  mnservicelib{000a0000}-47.o(StubCode)
-    theImportedSymbol                        0x00008fa4   Data           0  mnservicelib{000a0000}-47.o(StubCode)
-    StubCode                                 0x00008fa8   Section        8  mnservicelib{000a0000}-49.o(StubCode)
-    theImportedSymbol                        0x00008fac   Data           0  mnservicelib{000a0000}-49.o(StubCode)
-    StubCode                                 0x00008fb0   Section        8  mnservicelib{000a0000}-50.o(StubCode)
-    theImportedSymbol                        0x00008fb4   Data           0  mnservicelib{000a0000}-50.o(StubCode)
-    StubCode                                 0x00008fb8   Section        8  mnservicelib{000a0000}-53.o(StubCode)
-    theImportedSymbol                        0x00008fbc   Data           0  mnservicelib{000a0000}-53.o(StubCode)
-    StubCode                                 0x00008fc0   Section        8  mnservicelib{000a0000}-56.o(StubCode)
-    theImportedSymbol                        0x00008fc4   Data           0  mnservicelib{000a0000}-56.o(StubCode)
-    StubCode                                 0x00008fc8   Section        8  mnrefproviderengine{000a0000}-10.o(StubCode)
-    theImportedSymbol                        0x00008fcc   Data           0  mnrefproviderengine{000a0000}-10.o(StubCode)
-    StubCode                                 0x00008fd0   Section        8  mnrefproviderengine{000a0000}-12.o(StubCode)
-    theImportedSymbol                        0x00008fd4   Data           0  mnrefproviderengine{000a0000}-12.o(StubCode)
-    StubCode                                 0x00008fd8   Section        8  mnrefproviderengine{000a0000}-18.o(StubCode)
-    theImportedSymbol                        0x00008fdc   Data           0  mnrefproviderengine{000a0000}-18.o(StubCode)
-    StubCode                                 0x00008fe0   Section        8  mnrefproviderengine{000a0000}-19.o(StubCode)
-    theImportedSymbol                        0x00008fe4   Data           0  mnrefproviderengine{000a0000}-19.o(StubCode)
-    StubCode                                 0x00008fe8   Section        8  mnrefproviderengine{000a0000}-21.o(StubCode)
-    theImportedSymbol                        0x00008fec   Data           0  mnrefproviderengine{000a0000}-21.o(StubCode)
-    StubCode                                 0x00008ff0   Section        8  mnrefproviderengine{000a0000}-4.o(StubCode)
-    theImportedSymbol                        0x00008ff4   Data           0  mnrefproviderengine{000a0000}-4.o(StubCode)
-    StubCode                                 0x00008ff8   Section        8  mnrefproviderengine{000a0000}-5.o(StubCode)
-    theImportedSymbol                        0x00008ffc   Data           0  mnrefproviderengine{000a0000}-5.o(StubCode)
-    StubCode                                 0x00009000   Section        8  mnrefproviderengine{000a0000}-54.o(StubCode)
-    theImportedSymbol                        0x00009004   Data           0  mnrefproviderengine{000a0000}-54.o(StubCode)
-    StubCode                                 0x00009008   Section        8  mnrefproviderengine{000a0000}-6.o(StubCode)
-    theImportedSymbol                        0x0000900c   Data           0  mnrefproviderengine{000a0000}-6.o(StubCode)
-    StubCode                                 0x00009010   Section        8  drtaeabi{000a0000}-144.o(StubCode)
-    theImportedSymbol                        0x00009014   Data           0  drtaeabi{000a0000}-144.o(StubCode)
-    StubCode                                 0x00009018   Section        8  drtaeabi{000a0000}-158.o(StubCode)
-    theImportedSymbol                        0x0000901c   Data           0  drtaeabi{000a0000}-158.o(StubCode)
-    StubCode                                 0x00009020   Section        8  drtaeabi{000a0000}-159.o(StubCode)
-    theImportedSymbol                        0x00009024   Data           0  drtaeabi{000a0000}-159.o(StubCode)
-    StubCode                                 0x00009028   Section        8  drtaeabi{000a0000}-180.o(StubCode)
-    theImportedSymbol                        0x0000902c   Data           0  drtaeabi{000a0000}-180.o(StubCode)
-    StubCode                                 0x00009030   Section        8  drtaeabi{000a0000}-182.o(StubCode)
-    theImportedSymbol                        0x00009034   Data           0  drtaeabi{000a0000}-182.o(StubCode)
-    StubCode                                 0x00009038   Section        8  drtaeabi{000a0000}-183.o(StubCode)
-    theImportedSymbol                        0x0000903c   Data           0  drtaeabi{000a0000}-183.o(StubCode)
-    StubCode                                 0x00009040   Section        8  drtaeabi{000a0000}-184.o(StubCode)
-    theImportedSymbol                        0x00009044   Data           0  drtaeabi{000a0000}-184.o(StubCode)
-    StubCode                                 0x00009048   Section        8  drtaeabi{000a0000}-189.o(StubCode)
-    theImportedSymbol                        0x0000904c   Data           0  drtaeabi{000a0000}-189.o(StubCode)
-    StubCode                                 0x00009050   Section        8  scppnwdl{000a0000}-3.o(StubCode)
-    theImportedSymbol                        0x00009054   Data           0  scppnwdl{000a0000}-3.o(StubCode)
-    StubCode                                 0x00009058   Section        8  euser{000a0000}-1360.o(StubCode)
-    theImportedSymbol                        0x0000905c   Data           0  euser{000a0000}-1360.o(StubCode)
-    StubCode                                 0x00009060   Section        8  euser{000a0000}-641.o(StubCode)
-    theImportedSymbol                        0x00009064   Data           0  euser{000a0000}-641.o(StubCode)
-    StubCode                                 0x00009068   Section        8  euser{000a0000}-585.o(StubCode)
-    theImportedSymbol                        0x0000906c   Data           0  euser{000a0000}-585.o(StubCode)
-    StubCode                                 0x00009070   Section        8  euser{000a0000}-650.o(StubCode)
-    theImportedSymbol                        0x00009074   Data           0  euser{000a0000}-650.o(StubCode)
-    StubCode                                 0x00009078   Section        8  drtaeabi{000a0000}-204.o(StubCode)
-    theImportedSymbol                        0x0000907c   Data           0  drtaeabi{000a0000}-204.o(StubCode)
-    i._ZN12CApaDocument16DetachFromStoreLEN8CPicture7TDetachE 0x00009080   Section        2  mnrefproviderback.in(i._ZN12CApaDocument16DetachFromStoreLEN8CPicture7TDetachE)
-    i._ZN14CMnrpAppUiBackC1Ev                0x00009084   Section       60  mnrefproviderback.in(i._ZN14CMnrpAppUiBackC1Ev)
-    i._ZN14CMnrpAppUiBackC1Ev.clean          0x000090c0   Section       10  mnrefproviderback.in(i._ZN14CMnrpAppUiBackC1Ev.clean)
-    i._ZN14CMnrpAppUiBackD0Ev                0x000090ca   Section       16  mnrefproviderback.in(i._ZN14CMnrpAppUiBackD0Ev)
-    i._ZN14CMnrpAppUiBackD1Ev                0x000090da   Section        8  mnrefproviderback.in(i._ZN14CMnrpAppUiBackD1Ev)
-    i._ZN17CMnrpDocumentBackD0Ev             0x000090e2   Section       16  mnrefproviderback.in(i._ZN17CMnrpDocumentBackD0Ev)
-    i._ZN17CMnrpDocumentBackD1Ev             0x000090f2   Section        8  mnrefproviderback.in(i._ZN17CMnrpDocumentBackD1Ev)
-    i._ZN20CMnrpApplicationBackD0Ev          0x000090fa   Section       16  mnrefproviderback.in(i._ZN20CMnrpApplicationBackD0Ev)
-    i._ZN20CMnrpApplicationBackD1Ev          0x0000910a   Section        8  mnrefproviderback.in(i._ZN20CMnrpApplicationBackD1Ev)
-    i._ZN5CBasenwEj                          0x00009112   Section        8  mnrefproviderback.in(i._ZN5CBasenwEj)
-    t._ZNK13RPointerArrayI12CPosLandmarkE5CountEv 0x0000911a   Section        8  mnrefproviderback.in(t._ZNK13RPointerArrayI12CPosLandmarkE5CountEv)
-    .ARM.extab                               0x00009124   Section       16  uc_exe_.o(.ARM.extab)
-    .extab._Z14NewApplicationv               0x00009134   Data           0  mnrefproviderback.in(.ARM.extab)
-    .extab._ZN5CBasenwEj                     0x00009144   Data           0  mnrefproviderback.in(.ARM.extab)
-    .extab._ZN14CMnrpAppUiBackC1Ev           0x00009154   Data           0  mnrefproviderback.in(.ARM.extab)
-    .extab._ZN18CMnrpAppServerBackD1Ev       0x00009164   Data           0  mnrefproviderback.in(.ARM.extab)
-    .extab._ZN21CMnrpGeocodingServiceD1Ev    0x00009174   Data           0  mnrefproviderback.in(.ARM.extab)
-    .extab._ZN21CMnrpGeocodingService24HandleGeocodingCompletedEv 0x00009184   Data           0  mnrefproviderback.in(.ARM.extab)
-    .extab._ZN20CMnrpMapImageServiceD1Ev     0x000091ac   Data           0  mnrefproviderback.in(.ARM.extab)
-    .extab._ZN20CMnrpMapImageService24HandleMapImageCompletedLEv 0x000091bc   Data           0  mnrefproviderback.in(.ARM.extab)
-    .extab._ZN20CMnrpMapImageService26MapImageProcessingCallBackEPv 0x000091e4   Data           0  mnrefproviderback.in(.ARM.extab)
-    .extab.CallThrdProcEntry                 0x0000920c   Data           0  callfirstprocessfn.o(.ARM.extab)
-    .constdata$1                             0x00009228   Data           0  mnrefproviderback.in(.constdata)
-    KUidMnRefProviderBackApp                 0x00009228   Data           4  mnrefproviderback.in(.constdata)
-    .constdata                               0x00009228   Section        4  mnrefproviderback.in(.constdata)
-    .constdata$1                             0x0000922c   Data           0  callfirstprocessfn.o(.constdata)
-    KLitUser                                 0x0000922c   Data          16  callfirstprocessfn.o(.constdata)
-    .constdata                               0x0000922c   Section       16  callfirstprocessfn.o(.constdata)
-    .constdata__ZTI14CMnrpAppUiBack          0x0000923c   Section       12  mnrefproviderback.in(.constdata__ZTI14CMnrpAppUiBack)
-    .constdata__ZTI17CMnrpDocumentBack       0x00009248   Section       12  mnrefproviderback.in(.constdata__ZTI17CMnrpDocumentBack)
-    .constdata__ZTI18CMnrpAppServerBack      0x00009254   Section       12  mnrefproviderback.in(.constdata__ZTI18CMnrpAppServerBack)
-    .constdata__ZTI20CMnrpApplicationBack    0x00009260   Section       12  mnrefproviderback.in(.constdata__ZTI20CMnrpApplicationBack)
-    .constdata__ZTI20CMnrpMapImageService    0x0000926c   Section       12  mnrefproviderback.in(.constdata__ZTI20CMnrpMapImageService)
-    .constdata__ZTI21CMnrpGeocodingService   0x00009278   Section       12  mnrefproviderback.in(.constdata__ZTI21CMnrpGeocodingService)
-    .constdata__ZTI22MEikStatusPaneObserver  0x00009284   Section        8  mnrefproviderback.in(.constdata__ZTI22MEikStatusPaneObserver)
-    .constdata__ZTS14CMnrpAppUiBack          0x0000928c   Section       17  mnrefproviderback.in(.constdata__ZTS14CMnrpAppUiBack)
-    .constdata__ZTS17CMnrpDocumentBack       0x0000929d   Section       20  mnrefproviderback.in(.constdata__ZTS17CMnrpDocumentBack)
-    .constdata__ZTS18CMnrpAppServerBack      0x000092b1   Section       21  mnrefproviderback.in(.constdata__ZTS18CMnrpAppServerBack)
-    .constdata__ZTS20CMnrpApplicationBack    0x000092c6   Section       23  mnrefproviderback.in(.constdata__ZTS20CMnrpApplicationBack)
-    .constdata__ZTS20CMnrpMapImageService    0x000092dd   Section       23  mnrefproviderback.in(.constdata__ZTS20CMnrpMapImageService)
-    .constdata__ZTS21CMnrpGeocodingService   0x000092f4   Section       24  mnrefproviderback.in(.constdata__ZTS21CMnrpGeocodingService)
-    .constdata__ZTS22MEikStatusPaneObserver  0x0000930c   Section       25  mnrefproviderback.in(.constdata__ZTS22MEikStatusPaneObserver)
-    .constdata__ZTV14CMnrpAppUiBack          0x00009328   Section      340  mnrefproviderback.in(.constdata__ZTV14CMnrpAppUiBack)
-    .constdata__ZTV17CMnrpDocumentBack       0x0000947c   Section      112  mnrefproviderback.in(.constdata__ZTV17CMnrpDocumentBack)
-    .constdata__ZTV18CMnrpAppServerBack      0x000094ec   Section       76  mnrefproviderback.in(.constdata__ZTV18CMnrpAppServerBack)
-    .constdata__ZTV20CMnrpApplicationBack    0x00009538   Section       80  mnrefproviderback.in(.constdata__ZTV20CMnrpApplicationBack)
-    .constdata__ZTV20CMnrpMapImageService    0x00009588   Section       64  mnrefproviderback.in(.constdata__ZTV20CMnrpMapImageService)
-    .constdata__ZTV21CMnrpGeocodingService   0x000095c8   Section       72  mnrefproviderback.in(.constdata__ZTV21CMnrpGeocodingService)
-    .constdata__ZTV22MEikStatusPaneObserver  0x00009610   Section       12  mnrefproviderback.in(.constdata__ZTV22MEikStatusPaneObserver)
-    .init_array                              0x0000961c   Section        4  mnrefproviderback.in(.init_array)
-    .ARM.exidx                               0x00009620   Section        8  uc_exe_.o(.ARM.exidx)
-    .ARM.exidx                               0x00009628   Section        8  ucppinit_aeabi.o(.ARM.exidx)
-    .data$0                                  0x00400000   Data           0  mnrefproviderback.in(.data)
-    KProcessingDelay                         0x00400000   Data           4  mnrefproviderback.in(.data)
-    .data                                    0x00400000   Section        4  mnrefproviderback.in(.data)
-
-    Global Symbols
-
-    Symbol Name                              Value     Ov Type        Size  Object(Section)
-
-    BuildAttributes$$THUMB_ISAv3$ARM_ISAv6$M$E$P$PE$A:L22$X:L11$S22$IEEE1$IW$USESV6$~STKCKD$USESV7$~SHL$OSPACE$IEEEJ$EBA8$UX$REQ8$PRES8$EABIv2 0x00000000   Number         0  anon$$obj.o ABSOLUTE
-    #<DLL>apparc{000a0000}[10003a3d].dll#<\DLL>111  - Undefined Reference
-    #<DLL>apparc{000a0000}[10003a3d].dll#<\DLL>112  - Undefined Reference
-    #<DLL>apparc{000a0000}[10003a3d].dll#<\DLL>113  - Undefined Reference
-    #<DLL>apparc{000a0000}[10003a3d].dll#<\DLL>117  - Undefined Reference
-    #<DLL>apparc{000a0000}[10003a3d].dll#<\DLL>118  - Undefined Reference
-    #<DLL>apparc{000a0000}[10003a3d].dll#<\DLL>11c  - Undefined Reference
-    #<DLL>apparc{000a0000}[10003a3d].dll#<\DLL>11d  - Undefined Reference
-    #<DLL>apparc{000a0000}[10003a3d].dll#<\DLL>11e  - Undefined Reference
-    #<DLL>apparc{000a0000}[10003a3d].dll#<\DLL>11f  - Undefined Reference
-    #<DLL>apparc{000a0000}[10003a3d].dll#<\DLL>1e  - Undefined Reference
-    #<DLL>apparc{000a0000}[10003a3d].dll#<\DLL>79  - Undefined Reference
-    #<DLL>apparc{000a0000}[10003a3d].dll#<\DLL>84  - Undefined Reference
-    #<DLL>apparc{000a0000}[10003a3d].dll#<\DLL>ab  - Undefined Reference
-    #<DLL>apparc{000a0000}[10003a3d].dll#<\DLL>c0  - Undefined Reference
-    #<DLL>apparc{000a0000}[10003a3d].dll#<\DLL>c2  - Undefined Reference
-    #<DLL>apparc{000a0000}[10003a3d].dll#<\DLL>ca  - Undefined Reference
-    #<DLL>apparc{000a0000}[10003a3d].dll#<\DLL>de  - Undefined Reference
-    #<DLL>apparc{000a0000}[10003a3d].dll#<\DLL>e8  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>46c  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>546  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>547  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>556  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>81  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>82  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>83  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>b68  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>b6a  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>b6c  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>b6d  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>b6e  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>b70  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>b71  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>b72  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>b73  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>b74  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>b76  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>b77  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>b7a  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>bb1  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>bb5  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>c6  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>c7  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>c9  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>ce  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>d3  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>d5  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>d6  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>d7  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>d8  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>d9  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>dc  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>ef2  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>f16  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>f1c  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>fb5  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>fbe  - Undefined Reference
-    #<DLL>bafl{000a0000}[10003a0f].dll#<\DLL>2b  - Undefined Reference
-    #<DLL>bafl{000a0000}[10003a0f].dll#<\DLL>62  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>15f  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>163  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>27e  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>27f  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>298  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>2a4  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>2a5  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>64  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>65  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>7f  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>80  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>b6  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>d2  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>d4  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>dc  - Undefined Reference
-    #<DLL>drtaeabi{000a0000}.dll#<\DLL>90     - Undefined Reference
-    #<DLL>drtaeabi{000a0000}.dll#<\DLL>9e     - Undefined Reference
-    #<DLL>drtaeabi{000a0000}.dll#<\DLL>9f     - Undefined Reference
-    #<DLL>drtaeabi{000a0000}.dll#<\DLL>b4     - Undefined Reference
-    #<DLL>drtaeabi{000a0000}.dll#<\DLL>b6     - Undefined Reference
-    #<DLL>drtaeabi{000a0000}.dll#<\DLL>b7     - Undefined Reference
-    #<DLL>drtaeabi{000a0000}.dll#<\DLL>b8     - Undefined Reference
-    #<DLL>drtaeabi{000a0000}.dll#<\DLL>bd     - Undefined Reference
-    #<DLL>drtaeabi{000a0000}.dll#<\DLL>cc     - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>12  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>123  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>125  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>126  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>127  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>128  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>129  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>12a  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>12b  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>12e  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>13d  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>14  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>160  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>186  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>188  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>18a  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>19  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>1a  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>1b  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>1c  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>1d  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>1d3  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>1df  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>1e  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>1ea  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>1f  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>1fa  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>20b  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>214  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>215  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>216  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>217  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>218  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>219  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>235  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>25  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>3d  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>3e  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>3f  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>40  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>43  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>48  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>49  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>4a  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>4b  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>4d  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>4e  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>4f  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>8d  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>8e  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>8f  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>90  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>93  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>98  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>9b  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>9e  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>9f  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>a6  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>a9  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>ab  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>af  - Undefined Reference
-    #<DLL>eposlandmarks{000a0000}[101fdf8a].dll#<\DLL>41  - Undefined Reference
-    #<DLL>eposlandmarks{000a0000}[101fdf8a].dll#<\DLL>44  - Undefined Reference
-    #<DLL>eposlandmarks{000a0000}[101fdf8a].dll#<\DLL>c  - Undefined Reference
-    #<DLL>eposlandmarks{000a0000}[101fdf8a].dll#<\DLL>d  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>1d7  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>1da  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>1e1  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>249  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>265  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>281  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>289  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>28a  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>28c  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>28e  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>29d  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>2a7  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>2a9  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>346  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>440  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>45c  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>45f  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>493  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>508  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>550  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>563  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>565  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>636  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>639  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>719  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>7cb  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>7cd  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>7cf  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>80c  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>80d  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>822  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>848  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>84b  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>84d  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>853  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>cb  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>cd  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>cf  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>d0  - Undefined Reference
-    #<DLL>gdi{000a0000}[10003b15].dll#<\DLL>138  - Undefined Reference
-    #<DLL>lbs{000a0000}[101f97b1].dll#<\DLL>17  - Undefined Reference
-    #<DLL>lbs{000a0000}[101f97b1].dll#<\DLL>cf  - Undefined Reference
-    #<DLL>mnrefproviderengine{000a0000}[03132015].dll#<\DLL>12  - Undefined Reference
-    #<DLL>mnrefproviderengine{000a0000}[03132015].dll#<\DLL>13  - Undefined Reference
-    #<DLL>mnrefproviderengine{000a0000}[03132015].dll#<\DLL>15  - Undefined Reference
-    #<DLL>mnrefproviderengine{000a0000}[03132015].dll#<\DLL>36  - Undefined Reference
-    #<DLL>mnrefproviderengine{000a0000}[03132015].dll#<\DLL>4  - Undefined Reference
-    #<DLL>mnrefproviderengine{000a0000}[03132015].dll#<\DLL>5  - Undefined Reference
-    #<DLL>mnrefproviderengine{000a0000}[03132015].dll#<\DLL>6  - Undefined Reference
-    #<DLL>mnrefproviderengine{000a0000}[03132015].dll#<\DLL>a  - Undefined Reference
-    #<DLL>mnrefproviderengine{000a0000}[03132015].dll#<\DLL>c  - Undefined Reference
-    #<DLL>mnservicelib{000a0000}[10206903].dll#<\DLL>1  - Undefined Reference
-    #<DLL>mnservicelib{000a0000}[10206903].dll#<\DLL>15  - Undefined Reference
-    #<DLL>mnservicelib{000a0000}[10206903].dll#<\DLL>16  - Undefined Reference
-    #<DLL>mnservicelib{000a0000}[10206903].dll#<\DLL>17  - Undefined Reference
-    #<DLL>mnservicelib{000a0000}[10206903].dll#<\DLL>18  - Undefined Reference
-    #<DLL>mnservicelib{000a0000}[10206903].dll#<\DLL>1b  - Undefined Reference
-    #<DLL>mnservicelib{000a0000}[10206903].dll#<\DLL>2  - Undefined Reference
-    #<DLL>mnservicelib{000a0000}[10206903].dll#<\DLL>22  - Undefined Reference
-    #<DLL>mnservicelib{000a0000}[10206903].dll#<\DLL>2d  - Undefined Reference
-    #<DLL>mnservicelib{000a0000}[10206903].dll#<\DLL>2e  - Undefined Reference
-    #<DLL>mnservicelib{000a0000}[10206903].dll#<\DLL>2f  - Undefined Reference
-    #<DLL>mnservicelib{000a0000}[10206903].dll#<\DLL>31  - Undefined Reference
-    #<DLL>mnservicelib{000a0000}[10206903].dll#<\DLL>32  - Undefined Reference
-    #<DLL>mnservicelib{000a0000}[10206903].dll#<\DLL>35  - Undefined Reference
-    #<DLL>mnservicelib{000a0000}[10206903].dll#<\DLL>38  - Undefined Reference
-    #<DLL>scppnwdl{000a0000}.dll#<\DLL>3      - Undefined Reference
-    #<DLL>ws32{000a0000}[10003b21].dll#<\DLL>d3  - Undefined Reference
-    typeinfo for CAknDocument                 - Undefined Reference
-    typeinfo for CAknAppServer                - Undefined Reference
-    typeinfo for CEikApplication              - Undefined Reference
-    typeinfo for XLeaveException              - Undefined Reference
-    typeinfo for CMnMapImageServiceBase       - Undefined Reference
-    typeinfo for CMnGeocodingServiceBase      - Undefined Reference
-    typeinfo for CBase                        - Undefined Reference
-    typeinfo for CAknAppUi                    - Undefined Reference
-    vtable for __cxxabiv1::__class_type_info  - Undefined Reference
-    vtable for __cxxabiv1::__si_class_type_info  - Undefined Reference
-    _fp_init                                  - Undefined Weak Reference
-    Image$$ER_RO$$Base                       0x00008000   Number         0  anon$$obj.o(linker$$defined$$symbols)
-    _E32Startup                              0x00008000   ARM Code     112  uc_exe_.o(.emb_text)
-    Symbian$$CPP$$Exception$$Descriptor      0x0000805c   Data           0  uc_exe_.o(.emb_text)
-    __cpp_initialize__aeabi_                 0x00008070   ARM Code      72  ucppinit_aeabi.o(.emb_text)
-    std::nothrow                             0x000080b8   ARM Code       0  ucppinit_aeabi.o(.emb_text)
-    Inline ARM to Thumb Veneer to _xxxx_call_user_invariant 0x000080b8   ARM Code       0  uc_exe_.o(.text)
-    _xxxx_call_user_invariant                0x000080c1   Thumb Code     8  uc_exe_.o(.text)
-    _xxxx_call_user_handle_exception         0x000080c9   Thumb Code     8  uc_exe_.o(.text)
-    E32Main()                                0x000080ef   Thumb Code    22  mnrefproviderback.in(.text)
-    CMnrpApplicationBack::AppDllUid() const  0x0000810d   Thumb Code     6  mnrefproviderback.in(.text)
-    CMnrpApplicationBack::CreateDocumentL()  0x00008113   Thumb Code     8  mnrefproviderback.in(.text)
-    CMnrpApplicationBack::NewAppServerL(CApaAppServer*&) 0x0000811b   Thumb Code    12  mnrefproviderback.in(.text)
-    CMnrpAppUiBack::ConstructL()             0x0000812d   Thumb Code    12  mnrefproviderback.in(.text)
-    CMnrpAppUiBack::MoveForeground()         0x00008139   Thumb Code    14  mnrefproviderback.in(.text)
-    CMnrpAppUiBack::MoveBackground()         0x00008147   Thumb Code    16  mnrefproviderback.in(.text)
-    CMnrpAppUiBack::HandleCommandL(int)      0x00008157   Thumb Code    20  mnrefproviderback.in(.text)
-    CMnrpDocumentBack::CMnrpDocumentBack(CEikApplication&) 0x00008171   Thumb Code    16  mnrefproviderback.in(.text)
-    CMnrpDocumentBack::CMnrpDocumentBack__sub_object(CEikApplication&) 0x00008171   Thumb Code     0  mnrefproviderback.in(.text)
-    CMnrpDocumentBack::NewL(CEikApplication&) 0x00008181   Thumb Code    18  mnrefproviderback.in(.text)
-    CMnrpDocumentBack::CreateAppUiL()        0x00008193   Thumb Code    24  mnrefproviderback.in(.text)
-    CMnrpAppServerBack::ConstructL()         0x000081b1   Thumb Code    12  mnrefproviderback.in(.text)
-    CMnrpAppServerBack::NewL()               0x000081bd   Thumb Code    48  mnrefproviderback.in(.text)
-    CMnrpAppServerBack::~CMnrpAppServerBack() 0x000081ed   Thumb Code    28  mnrefproviderback.in(.text)
-    CMnrpAppServerBack::~CMnrpAppServerBack__sub_object() 0x000081ed   Thumb Code     0  mnrefproviderback.in(.text)
-    CMnrpAppServerBack::~CMnrpAppServerBack__deallocating() 0x00008209   Thumb Code    16  mnrefproviderback.in(.text)
-    CMnrpAppServerBack::CreateMapImageServiceL() const 0x00008219   Thumb Code    10  mnrefproviderback.in(.text)
-    CMnrpAppServerBack::CreateGeocodingServiceL() const 0x00008223   Thumb Code    10  mnrefproviderback.in(.text)
-    CMnrpAppServerBack::CreateServiceL(TUid) const 0x0000822d   Thumb Code    32  mnrefproviderback.in(.text)
-    CleanupLandmarksArray(void*)             0x00008259   Thumb Code    48  mnrefproviderback.in(.text)
-    CleanupForeground(void*)                 0x00008289   Thumb Code     8  mnrefproviderback.in(.text)
-    CMnrpGeocodingService::ConstructL()      0x00008291   Thumb Code    20  mnrefproviderback.in(.text)
-    CMnrpGeocodingService::CMnrpGeocodingService(CMnrpEngine&) 0x000082a5   Thumb Code    16  mnrefproviderback.in(.text)
-    CMnrpGeocodingService::CMnrpGeocodingService__sub_object(CMnrpEngine&) 0x000082a5   Thumb Code     0  mnrefproviderback.in(.text)
-    CMnrpGeocodingService::NewL(CMnrpEngine&) 0x000082b5   Thumb Code    36  mnrefproviderback.in(.text)
-    CMnrpGeocodingService::~CMnrpGeocodingService() 0x000082d9   Thumb Code    46  mnrefproviderback.in(.text)
-    CMnrpGeocodingService::~CMnrpGeocodingService__sub_object() 0x000082d9   Thumb Code     0  mnrefproviderback.in(.text)
-    CMnrpGeocodingService::~CMnrpGeocodingService__deallocating() 0x00008307   Thumb Code    16  mnrefproviderback.in(.text)
-    CMnrpGeocodingService::LeaveIfBusyL()    0x00008317   Thumb Code    22  mnrefproviderback.in(.text)
-    CMnrpGeocodingService::LetUserSelectBestMatchL(const CPosLandmark&) 0x0000832d   Thumb Code   318  mnrefproviderback.in(.text)
-    CMnrpGeocodingService::FinishProcessingL() 0x0000846b   Thumb Code   130  mnrefproviderback.in(.text)
-    CMnrpGeocodingService::HandleGeocodingCompleted() 0x000084ed   Thumb Code    72  mnrefproviderback.in(.text)
-    CMnrpGeocodingService::GeocodingProcessingCallBack(void*) 0x00008535   Thumb Code    10  mnrefproviderback.in(.text)
-    CMnrpGeocodingService::StartProcessingL() 0x0000853f   Thumb Code    14  mnrefproviderback.in(.text)
-    CMnrpGeocodingService::HandleFindAddressByCoordinateL(const CPosLandmark&) 0x0000854d   Thumb Code    60  mnrefproviderback.in(.text)
-    CMnrpGeocodingService::HandleFindCoordinateByAddressL(const CPosLandmark&) 0x00008589   Thumb Code    60  mnrefproviderback.in(.text)
-    CMnrpGeocodingService::HandleFindCoordinateByAddressL(const TDesC16&) 0x000085c5   Thumb Code    74  mnrefproviderback.in(.text)
-    CMnrpGeocodingService::DoCancel()        0x0000860f   Thumb Code    16  mnrefproviderback.in(.text)
-    CMnrpMapImageService::CreateFonts()      0x00008635   Thumb Code    64  mnrefproviderback.in(.text)
-    CMnrpMapImageService::ConstructL()       0x00008675   Thumb Code    44  mnrefproviderback.in(.text)
-    CMnrpMapImageService::CMnrpMapImageService(CMnrpEngine&) 0x000086a1   Thumb Code    20  mnrefproviderback.in(.text)
-    CMnrpMapImageService::CMnrpMapImageService__sub_object(CMnrpEngine&) 0x000086a1   Thumb Code     0  mnrefproviderback.in(.text)
-    CMnrpMapImageService::NewL(CMnrpEngine&) 0x000086b5   Thumb Code    36  mnrefproviderback.in(.text)
-    CMnrpMapImageService::DestroyFonts()     0x000086d9   Thumb Code    32  mnrefproviderback.in(.text)
-    CMnrpMapImageService::~CMnrpMapImageService() 0x000086f9   Thumb Code    60  mnrefproviderback.in(.text)
-    CMnrpMapImageService::~CMnrpMapImageService__sub_object() 0x000086f9   Thumb Code     0  mnrefproviderback.in(.text)
-    CMnrpMapImageService::~CMnrpMapImageService__deallocating() 0x00008735   Thumb Code    16  mnrefproviderback.in(.text)
-    CMnrpMapImageService::LeaveIfBusyL()     0x00008745   Thumb Code    24  mnrefproviderback.in(.text)
-    CMnrpMapImageService::RenderL()          0x0000875d   Thumb Code   116  mnrefproviderback.in(.text)
-    CMnrpMapImageService::FinishProcessingL() 0x000087d1   Thumb Code    52  mnrefproviderback.in(.text)
-    CMnrpMapImageService::HandleMapImageCompletedL() 0x00008805   Thumb Code    80  mnrefproviderback.in(.text)
-    CMnrpMapImageService::MapImageProcessingCallBack(void*) 0x00008855   Thumb Code    50  mnrefproviderback.in(.text)
-    CMnrpMapImageService::StartProcessingL() 0x00008887   Thumb Code    22  mnrefproviderback.in(.text)
-    CMnrpMapImageService::HandleRenderingL() 0x0000889d   Thumb Code    24  mnrefproviderback.in(.text)
-    CMnrpMapImageService::DoCancel()         0x000088b5   Thumb Code    18  mnrefproviderback.in(.text)
-    Inline ARM to Thumb Veneer to RunThread  0x000088e0   ARM Code       0  uc_exe.o(.text)
-    RunThread                                0x000088e9   Thumb Code    36  uc_exe.o(.text)
-    CallThrdProcEntry                        0x0000890c   ARM Code     116  callfirstprocessfn.o(.text)
-    __DLL_Export_Table__                     0x00008984   ARM Code       4  dllexp.o(.text)
-    CActive::Cancel()                        0x000089d0   ARM Code       0  euser{000a0000}-1088.o(StubCode)
-    HBufC16::Des()                           0x000089d8   ARM Code       0  euser{000a0000}-1116.o(StubCode)
-    HBufC16::NewLC(int)                      0x000089e0   ARM Code       0  euser{000a0000}-1119.o(StubCode)
-    TPtrC16::TPtrC16(const TDesC16&)         0x000089e8   ARM Code       0  euser{000a0000}-1171.o(StubCode)
-    CServer2::DoCancel()                     0x000089f0   ARM Code       0  euser{000a0000}-1288.o(StubCode)
-    CPeriodic::NewL(int)                     0x000089f8   ARM Code       0  euser{000a0000}-1379.o(StubCode)
-    CPeriodic::Start(TTimeIntervalMicroSeconds32, TTimeIntervalMicroSeconds32, TCallBack) 0x00008a00   ARM Code       0  euser{000a0000}-1381.o(StubCode)
-    RPointerArrayBase::At(int) const         0x00008a08   ARM Code       0  euser{000a0000}-1590.o(StubCode)
-    RPointerArrayBase::Count() const         0x00008a10   ARM Code       0  euser{000a0000}-1593.o(StubCode)
-    TDesC16::AllocL() const                  0x00008a18   ARM Code       0  euser{000a0000}-1817.o(StubCode)
-    CPolicyServer::CustomFailureActionL(const RMessage2&, int, const TSecurityInfo&) 0x00008a20   ARM Code       0  euser{000a0000}-1995.o(StubCode)
-    CPolicyServer::RunL()                    0x00008a28   ARM Code       0  euser{000a0000}-1997.o(StubCode)
-    CPolicyServer::RunError(int)             0x00008a30   ARM Code       0  euser{000a0000}-1999.o(StubCode)
-    CleanupStack::PopAndDestroy()            0x00008a38   ARM Code       0  euser{000a0000}-203.o(StubCode)
-    CleanupStack::Pop()                      0x00008a40   ARM Code       0  euser{000a0000}-205.o(StubCode)
-    User::MarkCleanupStack()                 0x00008a48   ARM Code       0  euser{000a0000}-2060.o(StubCode)
-    User::UnMarkCleanupStack(TTrapHandler*)  0x00008a50   ARM Code       0  euser{000a0000}-2061.o(StubCode)
-    CleanupStack::PushL(TCleanupItem)        0x00008a58   ARM Code       0  euser{000a0000}-207.o(StubCode)
-    CleanupStack::PushL(CBase*)              0x00008a60   ARM Code       0  euser{000a0000}-208.o(StubCode)
-    XLeaveException::GetReason() const       0x00008a68   ARM Code       0  euser{000a0000}-2082.o(StubCode)
-    CPolicyServer::Extension_(unsigned, void*&, void*) 0x00008a70   ARM Code       0  euser{000a0000}-2120.o(StubCode)
-    CBase::Extension_(unsigned, void*&, void*) 0x00008a78   ARM Code       0  euser{000a0000}-2123.o(StubCode)
-    CSession2::Extension_(unsigned, void*&, void*) 0x00008a80   ARM Code       0  euser{000a0000}-2131.o(StubCode)
-    RPointerArrayBase::Reset()               0x00008a88   ARM Code       0  euser{000a0000}-471.o(StubCode)
-    RPointerArrayBase::Remove(int)           0x00008a90   ARM Code       0  euser{000a0000}-474.o(StubCode)
-    RPointerArrayBase::RPointerArrayBase()   0x00008a98   ARM Code       0  euser{000a0000}-481.o(StubCode)
-    User::HandleException(void*)             0x00008aa0   ARM Code       0  euser{000a0000}-613.o(StubCode)
-    User::Leave(int)                         0x00008aa8   ARM Code       0  euser{000a0000}-649.o(StubCode)
-    User::AllocZ(int)                        0x00008ab0   ARM Code       0  euser{000a0000}-652.o(StubCode)
-    User::AllocZL(int)                       0x00008ab8   ARM Code       0  euser{000a0000}-654.o(StubCode)
-    User::Invariant()                        0x00008ac0   ARM Code       0  euser{000a0000}-669.o(StubCode)
-    CIdle::NewL(int)                         0x00008ac8   ARM Code       0  euser{000a0000}-679.o(StubCode)
-    CIdle::Start(TCallBack)                  0x00008ad0   ARM Code       0  euser{000a0000}-681.o(StubCode)
-    TRect::TRect(const TSize&)               0x00008ad8   ARM Code       0  euser{000a0000}-838.o(StubCode)
-    CDesC16Array::AppendL(const TDesC16&)    0x00008ae0   ARM Code       0  bafl{000a0000}-43.o(StubCode)
-    CDesC16ArraySeg::CDesC16ArraySeg(int)    0x00008ae8   ARM Code       0  bafl{000a0000}-98.o(StubCode)
-    MCoeMessageObserver::MCoeMessageObserver_Reserved_1() 0x00008af0   ARM Code       0  cone{000a0000}-100.o(StubCode)
-    MCoeMessageObserver::MCoeMessageObserver_Reserved_2() 0x00008af8   ARM Code       0  cone{000a0000}-101.o(StubCode)
-    MCoeViewDeactivationObserver::MCoeViewDeactivationObserver_Reserved_1() 0x00008b00   ARM Code       0  cone{000a0000}-127.o(StubCode)
-    MCoeViewDeactivationObserver::MCoeViewDeactivationObserver_Reserved_2() 0x00008b08   ARM Code       0  cone{000a0000}-128.o(StubCode)
-    CCoeEnv::Static()                        0x00008b10   ARM Code       0  cone{000a0000}-182.o(StubCode)
-    CCoeAppUi::HandleKeyEventL(const TKeyEvent&, TEventCode) 0x00008b18   ARM Code       0  cone{000a0000}-210.o(StubCode)
-    CCoeAppUi::SetAndDrawFocus(int)          0x00008b20   ARM Code       0  cone{000a0000}-212.o(StubCode)
-    CCoeAppUi::HandleSwitchOnEventL(CCoeControl*) 0x00008b28   ARM Code       0  cone{000a0000}-220.o(StubCode)
-    CCoeAppUi::HelpContextL() const          0x00008b30   ARM Code       0  cone{000a0000}-351.o(StubCode)
-    CCoeAppUi::InputCapabilities() const     0x00008b38   ARM Code       0  cone{000a0000}-355.o(StubCode)
-    MObjectProvider::MObjectProvider_Reserved1() 0x00008b40   ARM Code       0  cone{000a0000}-638.o(StubCode)
-    MObjectProvider::MObjectProvider_Reserved2() 0x00008b48   ARM Code       0  cone{000a0000}-639.o(StubCode)
-    MCoeViewDeactivationObserver::MCoeViewDeactivationObserver__sub_object() 0x00008b50   ARM Code       0  cone{000a0000}-664.o(StubCode)
-    CCoeAppUi::FrameworkCallsRendezvous() const 0x00008b58   ARM Code       0  cone{000a0000}-676.o(StubCode)
-    CCoeAppUi::CCoeAppUi_Reserved_2()        0x00008b60   ARM Code       0  cone{000a0000}-677.o(StubCode)
-    CApaDocument::Capability() const         0x00008b68   ARM Code       0  apparc{000a0000}-121.o(StubCode)
-    CApaApplication::AppFullName() const     0x00008b70   ARM Code       0  apparc{000a0000}-132.o(StubCode)
-    TApaApplicationFactory::TApaApplicationFactory(CApaApplication*(*)()) 0x00008b78   ARM Code       0  apparc{000a0000}-171.o(StubCode)
-    CApaAppServer::CustomSecurityCheckL(const RMessage2&, int&, TSecurityInfo&) 0x00008b80   ARM Code       0  apparc{000a0000}-192.o(StubCode)
-    CApaAppServer::CApaAppServer()           0x00008b88   ARM Code       0  apparc{000a0000}-194.o(StubCode)
-    CApaAppServiceBase::SecurityCheckL(const RMessage2&, int&, TSecurityInfo&) 0x00008b90   ARM Code       0  apparc{000a0000}-202.o(StubCode)
-    CApaAppServer::NewSessionL(const TVersion&, const RMessage2&) const 0x00008b98   ARM Code       0  apparc{000a0000}-222.o(StubCode)
-    CApaAppServiceBase::ExtensionInterface(TUid, void*&) 0x00008ba0   ARM Code       0  apparc{000a0000}-232.o(StubCode)
-    CApaAppServer::CApaAppServer_Reserved1() 0x00008ba8   ARM Code       0  apparc{000a0000}-273.o(StubCode)
-    CApaAppServer::CApaAppServer_Reserved2() 0x00008bb0   ARM Code       0  apparc{000a0000}-274.o(StubCode)
-    CApaAppServer::DoConnect(const RMessage2&) 0x00008bb8   ARM Code       0  apparc{000a0000}-275.o(StubCode)
-    CApaApplication::CApaApplication_Reserved1() 0x00008bc0   ARM Code       0  apparc{000a0000}-279.o(StubCode)
-    CApaApplication::CApaApplication_Reserved2() 0x00008bc8   ARM Code       0  apparc{000a0000}-280.o(StubCode)
-    CApaAppServiceBase::Disconnect(const RMessage2&) 0x00008bd0   ARM Code       0  apparc{000a0000}-284.o(StubCode)
-    CApaAppServiceBase::CountResources()     0x00008bd8   ARM Code       0  apparc{000a0000}-285.o(StubCode)
-    CApaAppServiceBase::CApaAppServiceBase_Reserved1() 0x00008be0   ARM Code       0  apparc{000a0000}-286.o(StubCode)
-    CApaAppServiceBase::CApaAppServiceBase_Reserved2() 0x00008be8   ARM Code       0  apparc{000a0000}-287.o(StubCode)
-    CApaDocument::GlassPictureL()            0x00008bf0   ARM Code       0  apparc{000a0000}-30.o(StubCode)
-    thunk{-20} to CEikDocument::SaveL(MSaveObserver::TSaveType) 0x00008bf8   ARM Code       0  eikcore{000a0000}-141.o(StubCode)
-    CEikAppUi::Reserved_3()                  0x00008c00   ARM Code       0  eikcore{000a0000}-142.o(StubCode)
-    CEikAppUi::Reserved_4()                  0x00008c08   ARM Code       0  eikcore{000a0000}-143.o(StubCode)
-    CEikAppUi::CreateFileL(const TDesC16&)   0x00008c10   ARM Code       0  eikcore{000a0000}-144.o(StubCode)
-    CEikAppUi::SetEmphasis(CCoeControl*, int) 0x00008c18   ARM Code       0  eikcore{000a0000}-147.o(StubCode)
-    CEikAppUi::HandleMessageL(unsigned long, TUid, const TDesC8&) 0x00008c20   ARM Code       0  eikcore{000a0000}-152.o(StubCode)
-    CEikAppUi::ProcessMessageL(TUid, const TDesC8&) 0x00008c28   ARM Code       0  eikcore{000a0000}-155.o(StubCode)
-    CEikAppUi::HandleModelChangeL()          0x00008c30   ARM Code       0  eikcore{000a0000}-158.o(StubCode)
-    CEikAppUi::HandleSideBarMenuL(int, const TPoint&, int, const CEikHotKeyTable*) 0x00008c38   ARM Code       0  eikcore{000a0000}-159.o(StubCode)
-    CEikAppUi::StopDisplayingMenuBar()       0x00008c40   ARM Code       0  eikcore{000a0000}-166.o(StubCode)
-    CEikAppUi::ProcessCommandParametersL(TApaCommand, TBuf<(int)256>&, const TDesC8&) 0x00008c48   ARM Code       0  eikcore{000a0000}-169.o(StubCode)
-    CEikAppUi::ReportResourceChangedToAppL(int) 0x00008c50   ARM Code       0  eikcore{000a0000}-171.o(StubCode)
-    CEikAppUi::OpenFileL(const TDesC16&)     0x00008c58   ARM Code       0  eikcore{000a0000}-175.o(StubCode)
-    CEikDocument::Reserved_2()               0x00008c60   ARM Code       0  eikcore{000a0000}-18.o(StubCode)
-    CEikDocument::NewDocumentL()             0x00008c68   ARM Code       0  eikcore{000a0000}-20.o(StubCode)
-    CEikDocument::UpdateTaskNameL(CApaWindowGroupName*) 0x00008c70   ARM Code       0  eikcore{000a0000}-25.o(StubCode)
-    CEikDocument::CreateFileStoreLC(RFs&, const TDesC16&) 0x00008c78   ARM Code       0  eikcore{000a0000}-26.o(StubCode)
-    CEikDocument::EditL(MApaEmbeddedDocObserver*, int) 0x00008c80   ARM Code       0  eikcore{000a0000}-27.o(StubCode)
-    CEikDocument::SaveL(MSaveObserver::TSaveType) 0x00008c88   ARM Code       0  eikcore{000a0000}-28.o(StubCode)
-    CEikDocument::SaveL()                    0x00008c90   ARM Code       0  eikcore{000a0000}-29.o(StubCode)
-    CEikDocument::HasChanged() const         0x00008c98   ARM Code       0  eikcore{000a0000}-291.o(StubCode)
-    CEikDocument::ExternalizeL(RWriteStream&) const 0x00008ca0   ARM Code       0  eikcore{000a0000}-293.o(StubCode)
-    CEikDocument::StoreL(CStreamStore&, CStreamDictionary&) const 0x00008ca8   ARM Code       0  eikcore{000a0000}-294.o(StubCode)
-    CEikDocument::IsEmpty() const            0x00008cb0   ARM Code       0  eikcore{000a0000}-295.o(StubCode)
-    CEikApplication::Capability(TDes8&) const 0x00008cb8   ARM Code       0  eikcore{000a0000}-296.o(StubCode)
-    CEikApplication::OpenIniFileLC(RFs&) const 0x00008cc0   ARM Code       0  eikcore{000a0000}-297.o(StubCode)
-    CEikApplication::BitmapStoreName() const 0x00008cc8   ARM Code       0  eikcore{000a0000}-298.o(StubCode)
-    CEikApplication::ResourceFileName() const 0x00008cd0   ARM Code       0  eikcore{000a0000}-299.o(StubCode)
-    CEikDocument::PrintL(const CStreamStore&) 0x00008cd8   ARM Code       0  eikcore{000a0000}-30.o(StubCode)
-    CEikApplication::GetDefaultDocumentFileName(TBuf<(int)256>&) const 0x00008ce0   ARM Code       0  eikcore{000a0000}-302.o(StubCode)
-    CEikDocument::RestoreL(const CStreamStore&, const CStreamDictionary&) 0x00008ce8   ARM Code       0  eikcore{000a0000}-31.o(StubCode)
-    CEikAppUi::ValidFileType(TUid) const     0x00008cf0   ARM Code       0  eikcore{000a0000}-317.o(StubCode)
-    CEikonEnv::DenseFont() const             0x00008cf8   ARM Code       0  eikcore{000a0000}-352.o(StubCode)
-    CEikDocument::~CEikDocument__sub_object() 0x00008d00   ARM Code       0  eikcore{000a0000}-37.o(StubCode)
-    thunk{-36} to CEikAppUi::HandleMessageL(unsigned long, TUid, const TDesC8&) 0x00008d08   ARM Code       0  eikcore{000a0000}-390.o(StubCode)
-    thunk{-40} to CEikAppUi::MopNext()       0x00008d10   ARM Code       0  eikcore{000a0000}-392.o(StubCode)
-    EikStart::RunApplication(TApaApplicationFactory) 0x00008d18   ARM Code       0  eikcore{000a0000}-394.o(StubCode)
-    CEikAppServer::ExtensionInterface(TUid, void*&) 0x00008d20   ARM Code       0  eikcore{000a0000}-467.o(StubCode)
-    CEikAppUi::MopNext()                     0x00008d28   ARM Code       0  eikcore{000a0000}-479.o(StubCode)
-    thunk{-24} to CEikAppUi::HandleSideBarMenuL(int, const TPoint&, int, const CEikHotKeyTable*) 0x00008d30   ARM Code       0  eikcore{000a0000}-490.o(StubCode)
-    CEikAppUi::ProcessCommandParametersL(CApaCommandLine&) 0x00008d38   ARM Code       0  eikcore{000a0000}-506.o(StubCode)
-    CEikAppServer::CreateServiceSecurityCheckL(TUid, const RMessage2&, int&, TSecurityInfo&) 0x00008d40   ARM Code       0  eikcore{000a0000}-523.o(StubCode)
-    CEikApplication::CEikApplication_Reserved1() 0x00008d48   ARM Code       0  eikcore{000a0000}-532.o(StubCode)
-    CEikApplication::CEikApplication_Reserved2() 0x00008d50   ARM Code       0  eikcore{000a0000}-533.o(StubCode)
-    MEikMenuObserver::Reserved_2_MenuObserver() 0x00008d58   ARM Code       0  eikcore{000a0000}-534.o(StubCode)
-    MEikMenuObserver::CreateCustomCommandControlL(int) 0x00008d60   ARM Code       0  eikcore{000a0000}-535.o(StubCode)
-    MEikMenuObserver::MEikCommandObserver_Reserved1() 0x00008d68   ARM Code       0  eikcore{000a0000}-536.o(StubCode)
-    MEikMenuObserver::MEikCommandObserver_Reserved2() 0x00008d70   ARM Code       0  eikcore{000a0000}-537.o(StubCode)
-    CEikDocument::ValidatePasswordL() const  0x00008d78   ARM Code       0  eikcore{000a0000}-565.o(StubCode)
-    CEikApplication::CreateDocumentL(CApaProcess*) 0x00008d80   ARM Code       0  eikcore{000a0000}-61.o(StubCode)
-    CEikApplication::PreDocConstructL()      0x00008d88   ARM Code       0  eikcore{000a0000}-62.o(StubCode)
-    thunk{-24} to CEikAppUi::SetEmphasis(CCoeControl*, int) 0x00008d90   ARM Code       0  eikcore{000a0000}-63.o(StubCode)
-    CEikApplication::CEikApplication__sub_object() 0x00008d98   ARM Code       0  eikcore{000a0000}-64.o(StubCode)
-    CEikApplication::~CEikApplication__sub_object() 0x00008da0   ARM Code       0  eikcore{000a0000}-67.o(StubCode)
-    MEikMenuObserver::RestoreMenuL(CCoeControl*, int, MEikMenuObserver::TMenuType) 0x00008da8   ARM Code       0  eikcore{000a0000}-72.o(StubCode)
-    MEikMenuObserver::OfferKeyToAppL(const TKeyEvent&, TEventCode) 0x00008db0   ARM Code       0  eikcore{000a0000}-73.o(StubCode)
-    MEikMenuObserver::DynInitMenuBarL(int, CEikMenuBar*) 0x00008db8   ARM Code       0  eikcore{000a0000}-74.o(StubCode)
-    MEikMenuObserver::DynInitMenuPaneL(int, CEikMenuPane*) 0x00008dc0   ARM Code       0  eikcore{000a0000}-75.o(StubCode)
-    MEikMenuObserver::CheckHotKeyNotDimmedL(int) 0x00008dc8   ARM Code       0  eikcore{000a0000}-77.o(StubCode)
-    MEikMenuObserver::Reserved_1_MenuObserver() 0x00008dd0   ARM Code       0  eikcore{000a0000}-78.o(StubCode)
-    MEikMenuObserver::HandleAttemptDimmedSelectionL(int) 0x00008dd8   ARM Code       0  eikcore{000a0000}-79.o(StubCode)
-    RWindowTreeNode::SetOrdinalPosition(int) 0x00008de0   ARM Code       0  ws32{000a0000}-211.o(StubCode)
-    CFont::FontSpecInTwips() const           0x00008de8   ARM Code       0  gdi{000a0000}-312.o(StubCode)
-    CAknAppServiceBase::CreateL()            0x00008df0   ARM Code       0  avkon{000a0000}-1132.o(StubCode)
-    CAknDocument::OpenFileL(CFileStore*&, RFile&) 0x00008df8   ARM Code       0  avkon{000a0000}-129.o(StubCode)
-    CAknDocument::OpenFileL(int, const TDesC16&, RFs&) 0x00008e00   ARM Code       0  avkon{000a0000}-130.o(StubCode)
-    CAknDocument::CAknDocument__sub_object(CEikApplication&) 0x00008e08   ARM Code       0  avkon{000a0000}-131.o(StubCode)
-    CAknListQueryDialog::SetItemTextArray(MDesC16Array*) 0x00008e10   ARM Code       0  avkon{000a0000}-1350.o(StubCode)
-    CAknListQueryDialog::SetOwnershipType(TListBoxModelItemArrayOwnership) 0x00008e18   ARM Code       0  avkon{000a0000}-1351.o(StubCode)
-    CAknListQueryDialog::CAknListQueryDialog(int*) 0x00008e20   ARM Code       0  avkon{000a0000}-1366.o(StubCode)
-    CAknAppServer::ConstructL(const TDesC16&) 0x00008e28   ARM Code       0  avkon{000a0000}-198.o(StubCode)
-    CAknAppServer::HandleAllClientsClosed()  0x00008e30   ARM Code       0  avkon{000a0000}-199.o(StubCode)
-    CAknAppServer::~CAknAppServer()          0x00008e38   ARM Code       0  avkon{000a0000}-201.o(StubCode)
-    CAknAppUiBase::MopSupplyObject(TTypeUid) 0x00008e40   ARM Code       0  avkon{000a0000}-206.o(StubCode)
-    CAknAppUiBase::HandleResourceChangeL(int) 0x00008e48   ARM Code       0  avkon{000a0000}-211.o(StubCode)
-    CAknAppUiBase::HandleScreenDeviceChangedL() 0x00008e50   ARM Code       0  avkon{000a0000}-213.o(StubCode)
-    CAknAppUiBase::HandleApplicationSpecificEventL(int, const TWsEvent&) 0x00008e58   ARM Code       0  avkon{000a0000}-214.o(StubCode)
-    CAknAppUiBase::Exit()                    0x00008e60   ARM Code       0  avkon{000a0000}-215.o(StubCode)
-    CAknAppUiBase::SetFadedL(int)            0x00008e68   ARM Code       0  avkon{000a0000}-216.o(StubCode)
-    CAknAppUiBase::CAknAppUiBase()           0x00008e70   ARM Code       0  avkon{000a0000}-217.o(StubCode)
-    CAknAppUiBase::~CAknAppUiBase()          0x00008e78   ARM Code       0  avkon{000a0000}-220.o(StubCode)
-    CAknAppUi::HandleError(int, const SExtendedError&, TDes16&, TDes16&) 0x00008e80   ARM Code       0  avkon{000a0000}-2920.o(StubCode)
-    CAknAppUi::PrepareToExit()               0x00008e88   ARM Code       0  avkon{000a0000}-2922.o(StubCode)
-    CAknAppUi::BaseConstructL(int)           0x00008e90   ARM Code       0  avkon{000a0000}-2924.o(StubCode)
-    CAknAppUi::HandleWsEventL(const TWsEvent&, CCoeControl*) 0x00008e98   ARM Code       0  avkon{000a0000}-2925.o(StubCode)
-    CAknAppUi::ProcessCommandL(int)          0x00008ea0   ARM Code       0  avkon{000a0000}-2926.o(StubCode)
-    CAknAppUi::HandleSystemEventL(const TWsEvent&) 0x00008ea8   ARM Code       0  avkon{000a0000}-2928.o(StubCode)
-    CAknAppUi::Reserved_MtsmObject()         0x00008eb0   ARM Code       0  avkon{000a0000}-2929.o(StubCode)
-    CAknAppUi::Reserved_MtsmPosition()       0x00008eb8   ARM Code       0  avkon{000a0000}-2930.o(StubCode)
-    CAknAppUi::HandleForegroundEventL(int)   0x00008ec0   ARM Code       0  avkon{000a0000}-2931.o(StubCode)
-    CAknAppUi::HandleViewDeactivation(const TVwsViewId&, const TVwsViewId&) 0x00008ec8   ARM Code       0  avkon{000a0000}-2932.o(StubCode)
-    CAknAppUi::HandleTouchPaneSizeChange()   0x00008ed0   ARM Code       0  avkon{000a0000}-2934.o(StubCode)
-    CAknAppUi::HandleStatusPaneSizeChange()  0x00008ed8   ARM Code       0  avkon{000a0000}-2935.o(StubCode)
-    CAknAppUi::~CAknAppUi()                  0x00008ee0   ARM Code       0  avkon{000a0000}-2938.o(StubCode)
-    CAknAppServer::CreateServiceL(TUid) const 0x00008ee8   ARM Code       0  avkon{000a0000}-2993.o(StubCode)
-    CAknAppUiBase::ApplicationRect() const   0x00008ef0   ARM Code       0  avkon{000a0000}-2997.o(StubCode)
-    thunk{-100} to CAknAppUi::HandleTouchPaneSizeChange() 0x00008ef8   ARM Code       0  avkon{000a0000}-3826.o(StubCode)
-    thunk{-24} to CAknAppUi::ProcessCommandL(int) 0x00008f00   ARM Code       0  avkon{000a0000}-3862.o(StubCode)
-    thunk{-40} to CAknAppUiBase::MopSupplyObject(TTypeUid) 0x00008f08   ARM Code       0  avkon{000a0000}-3868.o(StubCode)
-    thunk{-88} to CAknAppUi::HandleStatusPaneSizeChange() 0x00008f10   ARM Code       0  avkon{000a0000}-4021.o(StubCode)
-    thunk{-92} to CAknAppUi::HandleViewDeactivation(const TVwsViewId&, const TVwsViewId&) 0x00008f18   ARM Code       0  avkon{000a0000}-4030.o(StubCode)
-    CPosLandmark::NewL(const CPosLandmark&)  0x00008f20   ARM Code       0  eposlandmarks{000a0000}-12.o(StubCode)
-    CPosLandmark::NewL()                     0x00008f28   ARM Code       0  eposlandmarks{000a0000}-13.o(StubCode)
-    CPosLandmark::GetPosition(TLocality&) const 0x00008f30   ARM Code       0  eposlandmarks{000a0000}-65.o(StubCode)
-    CPosLandmark::GetPositionField(unsigned short, TPtrC16&) const 0x00008f38   ARM Code       0  eposlandmarks{000a0000}-68.o(StubCode)
-    TLocality::TLocality()                   0x00008f40   ARM Code       0  lbs{000a0000}-207.o(StubCode)
-    TCoordinate::TCoordinate()               0x00008f48   ARM Code       0  lbs{000a0000}-23.o(StubCode)
-    CMnServiceBase::ServiceError(const RMessage2&, int) 0x00008f50   ARM Code       0  mnservicelib{000a0000}-1.o(StubCode)
-    CMnServiceBase::CompleteRequest(int)     0x00008f58   ARM Code       0  mnservicelib{000a0000}-2.o(StubCode)
-    CMnGeocodingServiceBase::BaseConstructL() 0x00008f60   ARM Code       0  mnservicelib{000a0000}-21.o(StubCode)
-    CMnGeocodingServiceBase::CompleteGeocodingRequestL(const CPosLandmark&) 0x00008f68   ARM Code       0  mnservicelib{000a0000}-22.o(StubCode)
-    CMnGeocodingServiceBase::ServiceL(const RMessage2&) 0x00008f70   ARM Code       0  mnservicelib{000a0000}-23.o(StubCode)
-    CMnGeocodingServiceBase::CMnGeocodingServiceBase__sub_object() 0x00008f78   ARM Code       0  mnservicelib{000a0000}-24.o(StubCode)
-    CMnGeocodingServiceBase::~CMnGeocodingServiceBase__sub_object() 0x00008f80   ARM Code       0  mnservicelib{000a0000}-27.o(StubCode)
-    CMnGeocodingServiceBase::Options() const 0x00008f88   ARM Code       0  mnservicelib{000a0000}-34.o(StubCode)
-    CMnMapImageServiceBase::BaseConstructL() 0x00008f90   ARM Code       0  mnservicelib{000a0000}-45.o(StubCode)
-    CMnMapImageServiceBase::MapImageParams() 0x00008f98   ARM Code       0  mnservicelib{000a0000}-46.o(StubCode)
-    CMnMapImageServiceBase::CompleteRendering() 0x00008fa0   ARM Code       0  mnservicelib{000a0000}-47.o(StubCode)
-    CMnMapImageServiceBase::ServiceL(const RMessage2&) 0x00008fa8   ARM Code       0  mnservicelib{000a0000}-49.o(StubCode)
-    CMnMapImageServiceBase::CMnMapImageServiceBase__sub_object() 0x00008fb0   ARM Code       0  mnservicelib{000a0000}-50.o(StubCode)
-    CMnMapImageServiceBase::~CMnMapImageServiceBase__sub_object() 0x00008fb8   ARM Code       0  mnservicelib{000a0000}-53.o(StubCode)
-    CMnMapImageServiceBase::TargetBitmap() const 0x00008fc0   ARM Code       0  mnservicelib{000a0000}-56.o(StubCode)
-    CMnrpEngine::BestCoordToAddressMatchesL(const TCoordinate&, RPointerArray<CPosLandmark>&, int) 0x00008fc8   ARM Code       0  mnrefproviderengine{000a0000}-10.o(StubCode)
-    CMnrpEngine::NewL()                      0x00008fd0   ARM Code       0  mnrefproviderengine{000a0000}-12.o(StubCode)
-    CMnrpMapModel::UpdateModelL(const CMnrpMapImageService&) 0x00008fd8   ARM Code       0  mnrefproviderengine{000a0000}-18.o(StubCode)
-    CMnrpMapModel::SetScreenSize(TSize)      0x00008fe0   ARM Code       0  mnrefproviderengine{000a0000}-19.o(StubCode)
-    CMnrpMapModel::NewL(CMnrpEngine&)        0x00008fe8   ARM Code       0  mnrefproviderengine{000a0000}-21.o(StubCode)
-    CMnrpEngine::AddressToCoordLC(const CPosLandmark&) 0x00008ff0   ARM Code       0  mnrefproviderengine{000a0000}-4.o(StubCode)
-    CMnrpEngine::AddressToCoordLC(const TDesC16&) 0x00008ff8   ARM Code       0  mnrefproviderengine{000a0000}-5.o(StubCode)
-    CMnrpMapModel::RenderL(CFbsBitmap&, TRect, CFont*, CFont*) const 0x00009000   ARM Code       0  mnrefproviderengine{000a0000}-54.o(StubCode)
-    CMnrpEngine::CoordToAddressLC(const TCoordinate&) 0x00009008   ARM Code       0  mnrefproviderengine{000a0000}-6.o(StubCode)
-    __aeabi_memclr4                          0x00009010   ARM Code       0  drtaeabi{000a0000}-144.o(StubCode)
-    __aeabi_unwind_cpp_pr0                   0x00009018   ARM Code       0  drtaeabi{000a0000}-158.o(StubCode)
-    __aeabi_unwind_cpp_pr1                   0x00009020   ARM Code       0  drtaeabi{000a0000}-159.o(StubCode)
-    __cxa_begin_catch                        0x00009028   ARM Code       0  drtaeabi{000a0000}-180.o(StubCode)
-    __cxa_call_unexpected                    0x00009030   ARM Code       0  drtaeabi{000a0000}-182.o(StubCode)
-    __cxa_end_catch                          0x00009038   ARM Code       0  drtaeabi{000a0000}-183.o(StubCode)
-    __cxa_end_cleanup                        0x00009040   ARM Code       0  drtaeabi{000a0000}-184.o(StubCode)
-    __cxa_pure_virtual                       0x00009048   ARM Code       0  drtaeabi{000a0000}-189.o(StubCode)
-    operator delete (void*)                  0x00009050   ARM Code       0  scppnwdl{000a0000}-3.o(StubCode)
-    UserHeap::SetupThreadHeap(int, SStdEpocThreadCreateInfo&) 0x00009058   ARM Code       0  euser{000a0000}-1360.o(StubCode)
-    User::Exit(int)                          0x00009060   ARM Code       0  euser{000a0000}-641.o(StubCode)
-    User::InitProcess()                      0x00009068   ARM Code       0  euser{000a0000}-585.o(StubCode)
-    User::Panic(const TDesC16&, int)         0x00009070   ARM Code       0  euser{000a0000}-650.o(StubCode)
-    TCppRTExceptionsGlobals::TCppRTExceptionsGlobals() 0x00009078   ARM Code       0  drtaeabi{000a0000}-204.o(StubCode)
-    CApaDocument::DetachFromStoreL(CPicture::TDetach) 0x00009081   Thumb Code     2  mnrefproviderback.in(i._ZN12CApaDocument16DetachFromStoreLEN8CPicture7TDetachE)
-    CMnrpAppUiBack::CMnrpAppUiBack()         0x00009085   Thumb Code    50  mnrefproviderback.in(i._ZN14CMnrpAppUiBackC1Ev)
-    CMnrpAppUiBack::CMnrpAppUiBack__sub_object() 0x00009085   Thumb Code     0  mnrefproviderback.in(i._ZN14CMnrpAppUiBackC1Ev)
-    CMnrpAppUiBack::~CMnrpAppUiBack__deallocating() 0x000090cb   Thumb Code    16  mnrefproviderback.in(i._ZN14CMnrpAppUiBackD0Ev)
-    CMnrpAppUiBack::~CMnrpAppUiBack()        0x000090db   Thumb Code     8  mnrefproviderback.in(i._ZN14CMnrpAppUiBackD1Ev)
-    CMnrpAppUiBack::~CMnrpAppUiBack__sub_object() 0x000090db   Thumb Code     0  mnrefproviderback.in(i._ZN14CMnrpAppUiBackD1Ev)
-    CMnrpDocumentBack::~CMnrpDocumentBack__deallocating() 0x000090e3   Thumb Code    16  mnrefproviderback.in(i._ZN17CMnrpDocumentBackD0Ev)
-    CMnrpDocumentBack::~CMnrpDocumentBack()  0x000090f3   Thumb Code     8  mnrefproviderback.in(i._ZN17CMnrpDocumentBackD1Ev)
-    CMnrpDocumentBack::~CMnrpDocumentBack__sub_object() 0x000090f3   Thumb Code     0  mnrefproviderback.in(i._ZN17CMnrpDocumentBackD1Ev)
-    CMnrpApplicationBack::~CMnrpApplicationBack__deallocating() 0x000090fb   Thumb Code    16  mnrefproviderback.in(i._ZN20CMnrpApplicationBackD0Ev)
-    CMnrpApplicationBack::~CMnrpApplicationBack() 0x0000910b   Thumb Code     8  mnrefproviderback.in(i._ZN20CMnrpApplicationBackD1Ev)
-    CMnrpApplicationBack::~CMnrpApplicationBack__sub_object() 0x0000910b   Thumb Code     0  mnrefproviderback.in(i._ZN20CMnrpApplicationBackD1Ev)
-    CBase::operator new(unsigned)            0x00009113   Thumb Code     8  mnrefproviderback.in(i._ZN5CBasenwEj)
-    RPointerArray<CPosLandmark>::Count() const 0x0000911b   Thumb Code     8  mnrefproviderback.in(t._ZNK13RPointerArrayI12CPosLandmarkE5CountEv)
-    typeinfo for CMnrpAppUiBack              0x0000923c   Data          12  mnrefproviderback.in(.constdata__ZTI14CMnrpAppUiBack)
-    typeinfo for CMnrpDocumentBack           0x00009248   Data          12  mnrefproviderback.in(.constdata__ZTI17CMnrpDocumentBack)
-    typeinfo for CMnrpAppServerBack          0x00009254   Data          12  mnrefproviderback.in(.constdata__ZTI18CMnrpAppServerBack)
-    typeinfo for CMnrpApplicationBack        0x00009260   Data          12  mnrefproviderback.in(.constdata__ZTI20CMnrpApplicationBack)
-    typeinfo for CMnrpMapImageService        0x0000926c   Data          12  mnrefproviderback.in(.constdata__ZTI20CMnrpMapImageService)
-    typeinfo for CMnrpGeocodingService       0x00009278   Data          12  mnrefproviderback.in(.constdata__ZTI21CMnrpGeocodingService)
-    typeinfo for MEikStatusPaneObserver      0x00009284   Data           8  mnrefproviderback.in(.constdata__ZTI22MEikStatusPaneObserver)
-    typeinfo name for CMnrpAppUiBack         0x0000928c   Data          17  mnrefproviderback.in(.constdata__ZTS14CMnrpAppUiBack)
-    typeinfo name for CMnrpDocumentBack      0x0000929d   Data          20  mnrefproviderback.in(.constdata__ZTS17CMnrpDocumentBack)
-    typeinfo name for CMnrpAppServerBack     0x000092b1   Data          21  mnrefproviderback.in(.constdata__ZTS18CMnrpAppServerBack)
-    typeinfo name for CMnrpApplicationBack   0x000092c6   Data          23  mnrefproviderback.in(.constdata__ZTS20CMnrpApplicationBack)
-    typeinfo name for CMnrpMapImageService   0x000092dd   Data          23  mnrefproviderback.in(.constdata__ZTS20CMnrpMapImageService)
-    typeinfo name for CMnrpGeocodingService  0x000092f4   Data          24  mnrefproviderback.in(.constdata__ZTS21CMnrpGeocodingService)
-    typeinfo name for MEikStatusPaneObserver 0x0000930c   Data          25  mnrefproviderback.in(.constdata__ZTS22MEikStatusPaneObserver)
-    vtable for CMnrpAppUiBack                0x00009328   Data         340  mnrefproviderback.in(.constdata__ZTV14CMnrpAppUiBack)
-    vtable for CMnrpDocumentBack             0x0000947c   Data         112  mnrefproviderback.in(.constdata__ZTV17CMnrpDocumentBack)
-    vtable for CMnrpAppServerBack            0x000094ec   Data          76  mnrefproviderback.in(.constdata__ZTV18CMnrpAppServerBack)
-    vtable for CMnrpApplicationBack          0x00009538   Data          80  mnrefproviderback.in(.constdata__ZTV20CMnrpApplicationBack)
-    vtable for CMnrpMapImageService          0x00009588   Data          64  mnrefproviderback.in(.constdata__ZTV20CMnrpMapImageService)
-    vtable for CMnrpGeocodingService         0x000095c8   Data          72  mnrefproviderback.in(.constdata__ZTV21CMnrpGeocodingService)
-    vtable for MEikStatusPaneObserver        0x00009610   Data          12  mnrefproviderback.in(.constdata__ZTV22MEikStatusPaneObserver)
-    SHT$$INIT_ARRAY$$Base                    0x0000961c   Number         0  mnrefproviderback.in(.init_array)
-    .ARM.exidx$$Base                         0x00009620   Number         0  uc_exe_.o(.ARM.exidx)
-    SHT$$INIT_ARRAY$$Limit                   0x00009620   Data           0  mnrefproviderback.in(.init_array)
-    .ARM.exidx$$Limit                        0x00009750   Number         0  mnrefproviderback.in(.ARM.exidx)
-    Image$$ER_RO$$Limit                      0x00009750   Number         0  anon$$obj.o(linker$$defined$$symbols)
-
Binary file locsrv_plat/map_and_navigation_api/tsrc/data/armv5/urel/mnrefproviderback.rsc has changed
Binary file locsrv_plat/map_and_navigation_api/tsrc/data/armv5/urel/mnrefproviderback_reg.rsc has changed
Binary file locsrv_plat/map_and_navigation_api/tsrc/data/armv5/urel/mnrefproviderengine.dll has changed
--- a/locsrv_plat/map_and_navigation_api/tsrc/data/armv5/urel/mnrefproviderengine.dll.map	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1138 +0,0 @@
-ARM Linker, RVCT2.2 [Build 593]
-
-================================================================================
-
-Image Symbol Table
-
-    Local Symbols
-
-    Symbol Name                              Value     Ov Type        Size  Object(Section)
-
-    [Anonymous Symbol]                       0x00000000   Number         0  drtaeabi{000a0000}-184.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  lbs{000a0000}-28.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  AknIcon{000a0000}-15.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  scppnwdl{000a0000}-3.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  lbs{000a0000}-303.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  AknIcon{000a0000}-16.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnservicelib{000a0000}-5.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  lbs{000a0000}-304.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  AknIcon{000a0000}-21.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnservicelib{000a0000}-55.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  lbs{000a0000}-47.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  gdi{000a0000}-311.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnservicelib{000a0000}-57.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  lbs{000a0000}-48.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  gdi{000a0000}-314.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnservicelib{000a0000}-6.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  lbs{000a0000}-49.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  bitgdi{000a0000}-14.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnservicelib{000a0000}-8.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  lbs{000a0000}-7.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  bitgdi{000a0000}-44.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnservicelib{000a0000}-9.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  lbs{000a0000}-8.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eposlandmarks{000a0000}-12.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  dfpaeabi{000a0000}-12.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  lbs{000a0000}-82.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eposlandmarks{000a0000}-14.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  dfpaeabi{000a0000}-19.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  lbs{000a0000}-83.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eposlandmarks{000a0000}-15.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  dfpaeabi{000a0000}-2.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  lbs{000a0000}-87.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eposlandmarks{000a0000}-4.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  dfpaeabi{000a0000}-20.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  lbs{000a0000}-97.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eposlandmarks{000a0000}-50.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  dfpaeabi{000a0000}-22.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnservicelib{000a0000}-10.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eposlandmarks{000a0000}-51.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  dfpaeabi{000a0000}-23.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnservicelib{000a0000}-13.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eposlandmarks{000a0000}-56.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  dfpaeabi{000a0000}-24.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnservicelib{000a0000}-3.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eposlandmarks{000a0000}-6.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  dfpaeabi{000a0000}-25.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  lbs{000a0000}-180.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eposlandmarks{000a0000}-65.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  dfpaeabi{000a0000}-3.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  lbs{000a0000}-181.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eposlandmarks{000a0000}-66.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  dfpaeabi{000a0000}-36.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  lbs{000a0000}-205.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eposlandmarks{000a0000}-67.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  dfpaeabi{000a0000}-41.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  lbs{000a0000}-207.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eposlandmarks{000a0000}-68.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  dfpaeabi{000a0000}-5.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  lbs{000a0000}-21.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eposlandmarks{000a0000}-75.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  dfpaeabi{000a0000}-8.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  lbs{000a0000}-214.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eposlandmarks{000a0000}-8.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  drtaeabi{000a0000}-135.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  lbs{000a0000}-218.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eposlandmarks{000a0000}-82.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  drtaeabi{000a0000}-147.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  lbs{000a0000}-219.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  lbs{000a0000}-10.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  drtaeabi{000a0000}-158.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  lbs{000a0000}-223.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  lbs{000a0000}-13.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  drtaeabi{000a0000}-159.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  lbs{000a0000}-225.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  lbs{000a0000}-15.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  drtaeabi{000a0000}-180.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  lbs{000a0000}-226.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  lbs{000a0000}-152.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  drtaeabi{000a0000}-183.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  lbs{000a0000}-23.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  lbs{000a0000}-167.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  AknIcon{000a0000}-11.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-476.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  lbs{000a0000}-17.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-838.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-48.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-1090.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-839.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-481.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-1091.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-841.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-49.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-1094.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-936.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-50.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-1116.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-953.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-55.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-1119.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-960.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-551.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-1171.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-966.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-593.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-1172.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-968.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-649.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-120.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-973.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-654.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-1507.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-1051.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-669.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-1510.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-1059.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-81.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-1590.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-1073.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-824.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-1593.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-1074.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-826.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-1625.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-1088.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-207.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-1646.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  efsrv{000a0000}-190.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-208.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-1648.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  efsrv{000a0000}-200.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-2082.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-1649.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  efsrv{000a0000}-204.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-209.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-1651.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  efsrv{000a0000}-68.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-2123.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-1753.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  bafl{000a0000}-123.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-2125.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-1806.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  bafl{000a0000}-124.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-2128.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-1815.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  bafl{000a0000}-129.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-424.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-1821.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  bafl{000a0000}-141.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-46.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-1826.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  bafl{000a0000}-145.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-984.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-203.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  bafl{000a0000}-147.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  efsrv{000a0000}-115.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-205.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  bafl{000a0000}-59.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  efsrv{000a0000}-118.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-2060.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  bafl{000a0000}-62.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  efsrv{000a0000}-181.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-2061.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-472.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  efsrv{000a0000}-182.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-47.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-464.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-471.o ABSOLUTE
-    M:/epoc32/build/apputils/c_da81efa927799d7f/bafl_dll/armv5/udeb\VtblExports.s 0x00000000   Number         0  VtblExports.o ABSOLUTE
-    M:/epoc32/build/bitgdi/c_92c016796215bf55/bitgdi_lib/armv5/udeb\VtblExports.s 0x00000000   Number         0  VtblExports.o ABSOLUTE
-    M:/epoc32/build/compsupp/c_18558cc638e6e874/drtaeabi_dll/armv5/udeb\VtblExports.s 0x00000000   Number         0  VtblExports.o ABSOLUTE
-    M:/epoc32/build/gdi/c_5dab287815cadb7b/gdi_dll/armv5/udeb\VtblExports.s 0x00000000   Number         0  VtblExports.o ABSOLUTE
-    M:/epoc32/build/store/c_93a13d203e6d3ba7/estor_dll/armv5/udeb\VtblExports.s 0x00000000   Number         0  VtblExports.o ABSOLUTE
-    M:/epoc32/build/uigraphicsutils/c_d265b80414e63acf/egul_dll/armv5/udeb\VtblExports.s 0x00000000   Number         0  VtblExports.o ABSOLUTE
-    M:/epoc32/build/uikon/c_9cf7bef4a7562444/eikcore_dll/armv5/udeb\VtblExports.s 0x00000000   Number         0  VtblExports.o ABSOLUTE
-    M:\\sf\\os\\kernelhwsrv\\kernel\\eka\\compsupp\\rvct2_2\\ucppinit_aeabi.cpp 0x00000000   Number         0  ucppinit_aeabi.o ABSOLUTE
-    M:\sf\os\kernelhwsrv\kernel\eka\compsupp\rvct2_2\ucppinit_aeabi.cpp 0x00000000   Number         0  ucppinit_aeabi.o ABSOLUTE
-    \EPOC32\BUILD\sf\app\location\mapnavproviderrefapp\group\MNREFENGINE\ARMV5\urel\mnrefproviderengine{000a0000}.s 0x00000000   Number         0  mnrefproviderengine{000a0000}.exp ABSOLUTE
-    \EPOC32\BUILD\sf\mw\locationsrv\group\EPOS_LANDMARKSCLIENTLIBRARY\ARMV5\VtblExports.s 0x00000000   Number         0  VtblExports.o ABSOLUTE
-    \EPOC32\BUILD\sf\mw\locationsrv\group\MNCLIENTLIB\ARMV5\VtblExports.s 0x00000000   Number         0  VtblExports.o ABSOLUTE
-    \EPOC32\BUILD\sf\mw\locationsrv\group\MNSERVICELIB\ARMV5\VtblExports.s 0x00000000   Number         0  VtblExports.o ABSOLUTE
-    \EPOC32\BUILD\sf\mw\uiresources\group\AKNICON\ARMV5\VtblExports.s 0x00000000   Number         0  VtblExports.o ABSOLUTE
-    \EPOC32\BUILD\sf\os\kernelhwsrv\kernel\eka\euser\EDLL\ARMV6_ABIV1\urel\uc_dll_.cpp 0x00000000   Number         0  uc_dll_.o ABSOLUTE
-    \EPOC32\BUILD\sf\os\kernelhwsrv\kernel\eka\euser\EUSER\ARMV5\VtblExports.s 0x00000000   Number         0  VtblExports.o ABSOLUTE
-    \EPOC32\BUILD\sf\os\kernelhwsrv\userlibandfileserver\fileserver\group\EFSRV\ARMV5\VtblExports.s 0x00000000   Number         0  VtblExports.o ABSOLUTE
-    \EPOC32\BUILD\sf\os\lbs\locationmgmt\locationadmin\group\LBSAPIVARIANT2\ARMV5\VtblExports.s 0x00000000   Number         0  VtblExports.o ABSOLUTE
-    \\EPOC32\\BUILD\\sf\\os\\kernelhwsrv\\kernel\\eka\\euser\\EDLL\\ARMV6_ABIV1\\urel\\uc_dll_.cpp 0x00000000   Number         0  uc_dll_.o ABSOLUTE
-    \sf\app\location\mapnavproviderrefapp\src\mnrpengine.cpp 0x00000000   Number         0  mnrefproviderengine.in ABSOLUTE
-    \sf\app\location\mapnavproviderrefapp\src\mnrpmapmodel.cpp 0x00000000   Number         0  mnrefproviderengine.in ABSOLUTE
-    \sf\app\location\mapnavproviderrefapp\src\mnrppositionrequest.cpp 0x00000000   Number         0  mnrefproviderengine.in ABSOLUTE
-    \sf\app\location\mapnavproviderrefapp\src\mnrputils.cpp 0x00000000   Number         0  mnrefproviderengine.in ABSOLUTE
-    \sf\os\kernelhwsrv\kernel\eka\euser\epoc\arm\uc_dll.cpp 0x00000000   Number         0  uc_dll.o ABSOLUTE
-    .emb_text                                0x00008000   Section       40  uc_dll_.o(.emb_text)
-    .emb_text                                0x00008028   Section       72  ucppinit_aeabi.o(.emb_text)
-    skip                                     0x0000803c   ARM Code       0  ucppinit_aeabi.o(.emb_text)
-    loop                                     0x0000804c   ARM Code       0  ucppinit_aeabi.o(.emb_text)
-    fpinit                                   0x00008064   Data           0  ucppinit_aeabi.o(.emb_text)
-    base                                     0x00008068   Data           0  ucppinit_aeabi.o(.emb_text)
-    limit                                    0x0000806c   Data           0  ucppinit_aeabi.o(.emb_text)
-    .text                                    0x00008070   Section     1622  mnrefproviderengine.in(.text)
-    .text                                    0x000086c8   Section     5840  mnrefproviderengine.in(.text)
-    |L1.1020|                                0x00008ac4   Data           0  mnrefproviderengine.in(.text)
-    |L1.1028|                                0x00008acc   Data           0  mnrefproviderengine.in(.text)
-    |L1.1056|                                0x00008ae8   Data           0  mnrefproviderengine.in(.text)
-    |L1.1064|                                0x00008af0   Data           0  mnrefproviderengine.in(.text)
-    |L1.2128|                                0x00008f18   Data           0  mnrefproviderengine.in(.text)
-    |L1.2136|                                0x00008f20   Data           0  mnrefproviderengine.in(.text)
-    |L1.2148|                                0x00008f2c   Data           0  mnrefproviderengine.in(.text)
-    |L1.3444|                                0x0000943c   Data           0  mnrefproviderengine.in(.text)
-    .text                                    0x00009d98   Section      756  mnrefproviderengine.in(.text)
-    .text                                    0x0000a08c   Section     1120  mnrefproviderengine.in(.text)
-    .text                                    0x0000a4ec   Section       40  uc_dll.o(.text)
-    .text.clean                              0x0000a514   Section       38  mnrefproviderengine.in(.text.clean)
-    .text.clean                              0x0000a53a   Section       50  mnrefproviderengine.in(.text.clean)
-    .text.clean                              0x0000a56c   Section       20  mnrefproviderengine.in(.text.clean)
-    ExportTable                              0x0000a580   Section      256  mnrefproviderengine{000a0000}.exp(ExportTable)
-    StubCode                                 0x0000a680   Section        8  euser{000a0000}-1051.o(StubCode)
-    theImportedSymbol                        0x0000a684   Data           0  euser{000a0000}-1051.o(StubCode)
-    StubCode                                 0x0000a688   Section        8  euser{000a0000}-1059.o(StubCode)
-    theImportedSymbol                        0x0000a68c   Data           0  euser{000a0000}-1059.o(StubCode)
-    StubCode                                 0x0000a690   Section        8  euser{000a0000}-1073.o(StubCode)
-    theImportedSymbol                        0x0000a694   Data           0  euser{000a0000}-1073.o(StubCode)
-    StubCode                                 0x0000a698   Section        8  euser{000a0000}-1074.o(StubCode)
-    theImportedSymbol                        0x0000a69c   Data           0  euser{000a0000}-1074.o(StubCode)
-    StubCode                                 0x0000a6a0   Section        8  euser{000a0000}-1088.o(StubCode)
-    theImportedSymbol                        0x0000a6a4   Data           0  euser{000a0000}-1088.o(StubCode)
-    StubCode                                 0x0000a6a8   Section        8  euser{000a0000}-1090.o(StubCode)
-    theImportedSymbol                        0x0000a6ac   Data           0  euser{000a0000}-1090.o(StubCode)
-    StubCode                                 0x0000a6b0   Section        8  euser{000a0000}-1091.o(StubCode)
-    theImportedSymbol                        0x0000a6b4   Data           0  euser{000a0000}-1091.o(StubCode)
-    StubCode                                 0x0000a6b8   Section        8  euser{000a0000}-1094.o(StubCode)
-    theImportedSymbol                        0x0000a6bc   Data           0  euser{000a0000}-1094.o(StubCode)
-    StubCode                                 0x0000a6c0   Section        8  euser{000a0000}-1116.o(StubCode)
-    theImportedSymbol                        0x0000a6c4   Data           0  euser{000a0000}-1116.o(StubCode)
-    StubCode                                 0x0000a6c8   Section        8  euser{000a0000}-1119.o(StubCode)
-    theImportedSymbol                        0x0000a6cc   Data           0  euser{000a0000}-1119.o(StubCode)
-    StubCode                                 0x0000a6d0   Section        8  euser{000a0000}-1171.o(StubCode)
-    theImportedSymbol                        0x0000a6d4   Data           0  euser{000a0000}-1171.o(StubCode)
-    StubCode                                 0x0000a6d8   Section        8  euser{000a0000}-1172.o(StubCode)
-    theImportedSymbol                        0x0000a6dc   Data           0  euser{000a0000}-1172.o(StubCode)
-    StubCode                                 0x0000a6e0   Section        8  euser{000a0000}-120.o(StubCode)
-    theImportedSymbol                        0x0000a6e4   Data           0  euser{000a0000}-120.o(StubCode)
-    StubCode                                 0x0000a6e8   Section        8  euser{000a0000}-1507.o(StubCode)
-    theImportedSymbol                        0x0000a6ec   Data           0  euser{000a0000}-1507.o(StubCode)
-    StubCode                                 0x0000a6f0   Section        8  euser{000a0000}-1510.o(StubCode)
-    theImportedSymbol                        0x0000a6f4   Data           0  euser{000a0000}-1510.o(StubCode)
-    StubCode                                 0x0000a6f8   Section        8  euser{000a0000}-1590.o(StubCode)
-    theImportedSymbol                        0x0000a6fc   Data           0  euser{000a0000}-1590.o(StubCode)
-    StubCode                                 0x0000a700   Section        8  euser{000a0000}-1593.o(StubCode)
-    theImportedSymbol                        0x0000a704   Data           0  euser{000a0000}-1593.o(StubCode)
-    StubCode                                 0x0000a708   Section        8  euser{000a0000}-1625.o(StubCode)
-    theImportedSymbol                        0x0000a70c   Data           0  euser{000a0000}-1625.o(StubCode)
-    StubCode                                 0x0000a710   Section        8  euser{000a0000}-1646.o(StubCode)
-    theImportedSymbol                        0x0000a714   Data           0  euser{000a0000}-1646.o(StubCode)
-    StubCode                                 0x0000a718   Section        8  euser{000a0000}-1648.o(StubCode)
-    theImportedSymbol                        0x0000a71c   Data           0  euser{000a0000}-1648.o(StubCode)
-    StubCode                                 0x0000a720   Section        8  euser{000a0000}-1649.o(StubCode)
-    theImportedSymbol                        0x0000a724   Data           0  euser{000a0000}-1649.o(StubCode)
-    StubCode                                 0x0000a728   Section        8  euser{000a0000}-1651.o(StubCode)
-    theImportedSymbol                        0x0000a72c   Data           0  euser{000a0000}-1651.o(StubCode)
-    StubCode                                 0x0000a730   Section        8  euser{000a0000}-1753.o(StubCode)
-    theImportedSymbol                        0x0000a734   Data           0  euser{000a0000}-1753.o(StubCode)
-    StubCode                                 0x0000a738   Section        8  euser{000a0000}-1806.o(StubCode)
-    theImportedSymbol                        0x0000a73c   Data           0  euser{000a0000}-1806.o(StubCode)
-    StubCode                                 0x0000a740   Section        8  euser{000a0000}-1815.o(StubCode)
-    theImportedSymbol                        0x0000a744   Data           0  euser{000a0000}-1815.o(StubCode)
-    StubCode                                 0x0000a748   Section        8  euser{000a0000}-1821.o(StubCode)
-    theImportedSymbol                        0x0000a74c   Data           0  euser{000a0000}-1821.o(StubCode)
-    StubCode                                 0x0000a750   Section        8  euser{000a0000}-1826.o(StubCode)
-    theImportedSymbol                        0x0000a754   Data           0  euser{000a0000}-1826.o(StubCode)
-    StubCode                                 0x0000a758   Section        8  euser{000a0000}-203.o(StubCode)
-    theImportedSymbol                        0x0000a75c   Data           0  euser{000a0000}-203.o(StubCode)
-    StubCode                                 0x0000a760   Section        8  euser{000a0000}-205.o(StubCode)
-    theImportedSymbol                        0x0000a764   Data           0  euser{000a0000}-205.o(StubCode)
-    StubCode                                 0x0000a768   Section        8  euser{000a0000}-2060.o(StubCode)
-    theImportedSymbol                        0x0000a76c   Data           0  euser{000a0000}-2060.o(StubCode)
-    StubCode                                 0x0000a770   Section        8  euser{000a0000}-2061.o(StubCode)
-    theImportedSymbol                        0x0000a774   Data           0  euser{000a0000}-2061.o(StubCode)
-    StubCode                                 0x0000a778   Section        8  euser{000a0000}-207.o(StubCode)
-    theImportedSymbol                        0x0000a77c   Data           0  euser{000a0000}-207.o(StubCode)
-    StubCode                                 0x0000a780   Section        8  euser{000a0000}-208.o(StubCode)
-    theImportedSymbol                        0x0000a784   Data           0  euser{000a0000}-208.o(StubCode)
-    StubCode                                 0x0000a788   Section        8  euser{000a0000}-2082.o(StubCode)
-    theImportedSymbol                        0x0000a78c   Data           0  euser{000a0000}-2082.o(StubCode)
-    StubCode                                 0x0000a790   Section        8  euser{000a0000}-209.o(StubCode)
-    theImportedSymbol                        0x0000a794   Data           0  euser{000a0000}-209.o(StubCode)
-    StubCode                                 0x0000a798   Section        8  euser{000a0000}-2123.o(StubCode)
-    theImportedSymbol                        0x0000a79c   Data           0  euser{000a0000}-2123.o(StubCode)
-    StubCode                                 0x0000a7a0   Section        8  euser{000a0000}-2125.o(StubCode)
-    theImportedSymbol                        0x0000a7a4   Data           0  euser{000a0000}-2125.o(StubCode)
-    StubCode                                 0x0000a7a8   Section        8  euser{000a0000}-2128.o(StubCode)
-    theImportedSymbol                        0x0000a7ac   Data           0  euser{000a0000}-2128.o(StubCode)
-    StubCode                                 0x0000a7b0   Section        8  euser{000a0000}-424.o(StubCode)
-    theImportedSymbol                        0x0000a7b4   Data           0  euser{000a0000}-424.o(StubCode)
-    StubCode                                 0x0000a7b8   Section        8  euser{000a0000}-46.o(StubCode)
-    theImportedSymbol                        0x0000a7bc   Data           0  euser{000a0000}-46.o(StubCode)
-    StubCode                                 0x0000a7c0   Section        8  euser{000a0000}-464.o(StubCode)
-    theImportedSymbol                        0x0000a7c4   Data           0  euser{000a0000}-464.o(StubCode)
-    StubCode                                 0x0000a7c8   Section        8  euser{000a0000}-47.o(StubCode)
-    theImportedSymbol                        0x0000a7cc   Data           0  euser{000a0000}-47.o(StubCode)
-    StubCode                                 0x0000a7d0   Section        8  euser{000a0000}-471.o(StubCode)
-    theImportedSymbol                        0x0000a7d4   Data           0  euser{000a0000}-471.o(StubCode)
-    StubCode                                 0x0000a7d8   Section        8  euser{000a0000}-472.o(StubCode)
-    theImportedSymbol                        0x0000a7dc   Data           0  euser{000a0000}-472.o(StubCode)
-    StubCode                                 0x0000a7e0   Section        8  euser{000a0000}-476.o(StubCode)
-    theImportedSymbol                        0x0000a7e4   Data           0  euser{000a0000}-476.o(StubCode)
-    StubCode                                 0x0000a7e8   Section        8  euser{000a0000}-48.o(StubCode)
-    theImportedSymbol                        0x0000a7ec   Data           0  euser{000a0000}-48.o(StubCode)
-    StubCode                                 0x0000a7f0   Section        8  euser{000a0000}-481.o(StubCode)
-    theImportedSymbol                        0x0000a7f4   Data           0  euser{000a0000}-481.o(StubCode)
-    StubCode                                 0x0000a7f8   Section        8  euser{000a0000}-49.o(StubCode)
-    theImportedSymbol                        0x0000a7fc   Data           0  euser{000a0000}-49.o(StubCode)
-    StubCode                                 0x0000a800   Section        8  euser{000a0000}-50.o(StubCode)
-    theImportedSymbol                        0x0000a804   Data           0  euser{000a0000}-50.o(StubCode)
-    StubCode                                 0x0000a808   Section        8  euser{000a0000}-55.o(StubCode)
-    theImportedSymbol                        0x0000a80c   Data           0  euser{000a0000}-55.o(StubCode)
-    StubCode                                 0x0000a810   Section        8  euser{000a0000}-551.o(StubCode)
-    theImportedSymbol                        0x0000a814   Data           0  euser{000a0000}-551.o(StubCode)
-    StubCode                                 0x0000a818   Section        8  euser{000a0000}-593.o(StubCode)
-    theImportedSymbol                        0x0000a81c   Data           0  euser{000a0000}-593.o(StubCode)
-    StubCode                                 0x0000a820   Section        8  euser{000a0000}-649.o(StubCode)
-    theImportedSymbol                        0x0000a824   Data           0  euser{000a0000}-649.o(StubCode)
-    StubCode                                 0x0000a828   Section        8  euser{000a0000}-654.o(StubCode)
-    theImportedSymbol                        0x0000a82c   Data           0  euser{000a0000}-654.o(StubCode)
-    StubCode                                 0x0000a830   Section        8  euser{000a0000}-669.o(StubCode)
-    theImportedSymbol                        0x0000a834   Data           0  euser{000a0000}-669.o(StubCode)
-    StubCode                                 0x0000a838   Section        8  euser{000a0000}-81.o(StubCode)
-    theImportedSymbol                        0x0000a83c   Data           0  euser{000a0000}-81.o(StubCode)
-    StubCode                                 0x0000a840   Section        8  euser{000a0000}-824.o(StubCode)
-    theImportedSymbol                        0x0000a844   Data           0  euser{000a0000}-824.o(StubCode)
-    StubCode                                 0x0000a848   Section        8  euser{000a0000}-826.o(StubCode)
-    theImportedSymbol                        0x0000a84c   Data           0  euser{000a0000}-826.o(StubCode)
-    StubCode                                 0x0000a850   Section        8  euser{000a0000}-838.o(StubCode)
-    theImportedSymbol                        0x0000a854   Data           0  euser{000a0000}-838.o(StubCode)
-    StubCode                                 0x0000a858   Section        8  euser{000a0000}-839.o(StubCode)
-    theImportedSymbol                        0x0000a85c   Data           0  euser{000a0000}-839.o(StubCode)
-    StubCode                                 0x0000a860   Section        8  euser{000a0000}-841.o(StubCode)
-    theImportedSymbol                        0x0000a864   Data           0  euser{000a0000}-841.o(StubCode)
-    StubCode                                 0x0000a868   Section        8  euser{000a0000}-936.o(StubCode)
-    theImportedSymbol                        0x0000a86c   Data           0  euser{000a0000}-936.o(StubCode)
-    StubCode                                 0x0000a870   Section        8  euser{000a0000}-953.o(StubCode)
-    theImportedSymbol                        0x0000a874   Data           0  euser{000a0000}-953.o(StubCode)
-    StubCode                                 0x0000a878   Section        8  euser{000a0000}-960.o(StubCode)
-    theImportedSymbol                        0x0000a87c   Data           0  euser{000a0000}-960.o(StubCode)
-    StubCode                                 0x0000a880   Section        8  euser{000a0000}-966.o(StubCode)
-    theImportedSymbol                        0x0000a884   Data           0  euser{000a0000}-966.o(StubCode)
-    StubCode                                 0x0000a888   Section        8  euser{000a0000}-968.o(StubCode)
-    theImportedSymbol                        0x0000a88c   Data           0  euser{000a0000}-968.o(StubCode)
-    StubCode                                 0x0000a890   Section        8  euser{000a0000}-973.o(StubCode)
-    theImportedSymbol                        0x0000a894   Data           0  euser{000a0000}-973.o(StubCode)
-    StubCode                                 0x0000a898   Section        8  euser{000a0000}-984.o(StubCode)
-    theImportedSymbol                        0x0000a89c   Data           0  euser{000a0000}-984.o(StubCode)
-    StubCode                                 0x0000a8a0   Section        8  efsrv{000a0000}-115.o(StubCode)
-    theImportedSymbol                        0x0000a8a4   Data           0  efsrv{000a0000}-115.o(StubCode)
-    StubCode                                 0x0000a8a8   Section        8  efsrv{000a0000}-118.o(StubCode)
-    theImportedSymbol                        0x0000a8ac   Data           0  efsrv{000a0000}-118.o(StubCode)
-    StubCode                                 0x0000a8b0   Section        8  efsrv{000a0000}-181.o(StubCode)
-    theImportedSymbol                        0x0000a8b4   Data           0  efsrv{000a0000}-181.o(StubCode)
-    StubCode                                 0x0000a8b8   Section        8  efsrv{000a0000}-182.o(StubCode)
-    theImportedSymbol                        0x0000a8bc   Data           0  efsrv{000a0000}-182.o(StubCode)
-    StubCode                                 0x0000a8c0   Section        8  efsrv{000a0000}-190.o(StubCode)
-    theImportedSymbol                        0x0000a8c4   Data           0  efsrv{000a0000}-190.o(StubCode)
-    StubCode                                 0x0000a8c8   Section        8  efsrv{000a0000}-200.o(StubCode)
-    theImportedSymbol                        0x0000a8cc   Data           0  efsrv{000a0000}-200.o(StubCode)
-    StubCode                                 0x0000a8d0   Section        8  efsrv{000a0000}-204.o(StubCode)
-    theImportedSymbol                        0x0000a8d4   Data           0  efsrv{000a0000}-204.o(StubCode)
-    StubCode                                 0x0000a8d8   Section        8  efsrv{000a0000}-68.o(StubCode)
-    theImportedSymbol                        0x0000a8dc   Data           0  efsrv{000a0000}-68.o(StubCode)
-    StubCode                                 0x0000a8e0   Section        8  bafl{000a0000}-123.o(StubCode)
-    theImportedSymbol                        0x0000a8e4   Data           0  bafl{000a0000}-123.o(StubCode)
-    StubCode                                 0x0000a8e8   Section        8  bafl{000a0000}-124.o(StubCode)
-    theImportedSymbol                        0x0000a8ec   Data           0  bafl{000a0000}-124.o(StubCode)
-    StubCode                                 0x0000a8f0   Section        8  bafl{000a0000}-129.o(StubCode)
-    theImportedSymbol                        0x0000a8f4   Data           0  bafl{000a0000}-129.o(StubCode)
-    StubCode                                 0x0000a8f8   Section        8  bafl{000a0000}-141.o(StubCode)
-    theImportedSymbol                        0x0000a8fc   Data           0  bafl{000a0000}-141.o(StubCode)
-    StubCode                                 0x0000a900   Section        8  bafl{000a0000}-145.o(StubCode)
-    theImportedSymbol                        0x0000a904   Data           0  bafl{000a0000}-145.o(StubCode)
-    StubCode                                 0x0000a908   Section        8  bafl{000a0000}-147.o(StubCode)
-    theImportedSymbol                        0x0000a90c   Data           0  bafl{000a0000}-147.o(StubCode)
-    StubCode                                 0x0000a910   Section        8  bafl{000a0000}-59.o(StubCode)
-    theImportedSymbol                        0x0000a914   Data           0  bafl{000a0000}-59.o(StubCode)
-    StubCode                                 0x0000a918   Section        8  bafl{000a0000}-62.o(StubCode)
-    theImportedSymbol                        0x0000a91c   Data           0  bafl{000a0000}-62.o(StubCode)
-    StubCode                                 0x0000a920   Section        8  AknIcon{000a0000}-11.o(StubCode)
-    theImportedSymbol                        0x0000a924   Data           0  AknIcon{000a0000}-11.o(StubCode)
-    StubCode                                 0x0000a928   Section        8  AknIcon{000a0000}-15.o(StubCode)
-    theImportedSymbol                        0x0000a92c   Data           0  AknIcon{000a0000}-15.o(StubCode)
-    StubCode                                 0x0000a930   Section        8  AknIcon{000a0000}-16.o(StubCode)
-    theImportedSymbol                        0x0000a934   Data           0  AknIcon{000a0000}-16.o(StubCode)
-    StubCode                                 0x0000a938   Section        8  AknIcon{000a0000}-21.o(StubCode)
-    theImportedSymbol                        0x0000a93c   Data           0  AknIcon{000a0000}-21.o(StubCode)
-    StubCode                                 0x0000a940   Section        8  gdi{000a0000}-311.o(StubCode)
-    theImportedSymbol                        0x0000a944   Data           0  gdi{000a0000}-311.o(StubCode)
-    StubCode                                 0x0000a948   Section        8  gdi{000a0000}-314.o(StubCode)
-    theImportedSymbol                        0x0000a94c   Data           0  gdi{000a0000}-314.o(StubCode)
-    StubCode                                 0x0000a950   Section        8  bitgdi{000a0000}-14.o(StubCode)
-    theImportedSymbol                        0x0000a954   Data           0  bitgdi{000a0000}-14.o(StubCode)
-    StubCode                                 0x0000a958   Section        8  bitgdi{000a0000}-44.o(StubCode)
-    theImportedSymbol                        0x0000a95c   Data           0  bitgdi{000a0000}-44.o(StubCode)
-    StubCode                                 0x0000a960   Section        8  eposlandmarks{000a0000}-12.o(StubCode)
-    theImportedSymbol                        0x0000a964   Data           0  eposlandmarks{000a0000}-12.o(StubCode)
-    StubCode                                 0x0000a968   Section        8  eposlandmarks{000a0000}-14.o(StubCode)
-    theImportedSymbol                        0x0000a96c   Data           0  eposlandmarks{000a0000}-14.o(StubCode)
-    StubCode                                 0x0000a970   Section        8  eposlandmarks{000a0000}-15.o(StubCode)
-    theImportedSymbol                        0x0000a974   Data           0  eposlandmarks{000a0000}-15.o(StubCode)
-    StubCode                                 0x0000a978   Section        8  eposlandmarks{000a0000}-4.o(StubCode)
-    theImportedSymbol                        0x0000a97c   Data           0  eposlandmarks{000a0000}-4.o(StubCode)
-    StubCode                                 0x0000a980   Section        8  eposlandmarks{000a0000}-50.o(StubCode)
-    theImportedSymbol                        0x0000a984   Data           0  eposlandmarks{000a0000}-50.o(StubCode)
-    StubCode                                 0x0000a988   Section        8  eposlandmarks{000a0000}-51.o(StubCode)
-    theImportedSymbol                        0x0000a98c   Data           0  eposlandmarks{000a0000}-51.o(StubCode)
-    StubCode                                 0x0000a990   Section        8  eposlandmarks{000a0000}-56.o(StubCode)
-    theImportedSymbol                        0x0000a994   Data           0  eposlandmarks{000a0000}-56.o(StubCode)
-    StubCode                                 0x0000a998   Section        8  eposlandmarks{000a0000}-6.o(StubCode)
-    theImportedSymbol                        0x0000a99c   Data           0  eposlandmarks{000a0000}-6.o(StubCode)
-    StubCode                                 0x0000a9a0   Section        8  eposlandmarks{000a0000}-65.o(StubCode)
-    theImportedSymbol                        0x0000a9a4   Data           0  eposlandmarks{000a0000}-65.o(StubCode)
-    StubCode                                 0x0000a9a8   Section        8  eposlandmarks{000a0000}-66.o(StubCode)
-    theImportedSymbol                        0x0000a9ac   Data           0  eposlandmarks{000a0000}-66.o(StubCode)
-    StubCode                                 0x0000a9b0   Section        8  eposlandmarks{000a0000}-67.o(StubCode)
-    theImportedSymbol                        0x0000a9b4   Data           0  eposlandmarks{000a0000}-67.o(StubCode)
-    StubCode                                 0x0000a9b8   Section        8  eposlandmarks{000a0000}-68.o(StubCode)
-    theImportedSymbol                        0x0000a9bc   Data           0  eposlandmarks{000a0000}-68.o(StubCode)
-    StubCode                                 0x0000a9c0   Section        8  eposlandmarks{000a0000}-75.o(StubCode)
-    theImportedSymbol                        0x0000a9c4   Data           0  eposlandmarks{000a0000}-75.o(StubCode)
-    StubCode                                 0x0000a9c8   Section        8  eposlandmarks{000a0000}-8.o(StubCode)
-    theImportedSymbol                        0x0000a9cc   Data           0  eposlandmarks{000a0000}-8.o(StubCode)
-    StubCode                                 0x0000a9d0   Section        8  eposlandmarks{000a0000}-82.o(StubCode)
-    theImportedSymbol                        0x0000a9d4   Data           0  eposlandmarks{000a0000}-82.o(StubCode)
-    StubCode                                 0x0000a9d8   Section        8  lbs{000a0000}-10.o(StubCode)
-    theImportedSymbol                        0x0000a9dc   Data           0  lbs{000a0000}-10.o(StubCode)
-    StubCode                                 0x0000a9e0   Section        8  lbs{000a0000}-13.o(StubCode)
-    theImportedSymbol                        0x0000a9e4   Data           0  lbs{000a0000}-13.o(StubCode)
-    StubCode                                 0x0000a9e8   Section        8  lbs{000a0000}-15.o(StubCode)
-    theImportedSymbol                        0x0000a9ec   Data           0  lbs{000a0000}-15.o(StubCode)
-    StubCode                                 0x0000a9f0   Section        8  lbs{000a0000}-152.o(StubCode)
-    theImportedSymbol                        0x0000a9f4   Data           0  lbs{000a0000}-152.o(StubCode)
-    StubCode                                 0x0000a9f8   Section        8  lbs{000a0000}-167.o(StubCode)
-    theImportedSymbol                        0x0000a9fc   Data           0  lbs{000a0000}-167.o(StubCode)
-    StubCode                                 0x0000aa00   Section        8  lbs{000a0000}-17.o(StubCode)
-    theImportedSymbol                        0x0000aa04   Data           0  lbs{000a0000}-17.o(StubCode)
-    StubCode                                 0x0000aa08   Section        8  lbs{000a0000}-180.o(StubCode)
-    theImportedSymbol                        0x0000aa0c   Data           0  lbs{000a0000}-180.o(StubCode)
-    StubCode                                 0x0000aa10   Section        8  lbs{000a0000}-181.o(StubCode)
-    theImportedSymbol                        0x0000aa14   Data           0  lbs{000a0000}-181.o(StubCode)
-    StubCode                                 0x0000aa18   Section        8  lbs{000a0000}-205.o(StubCode)
-    theImportedSymbol                        0x0000aa1c   Data           0  lbs{000a0000}-205.o(StubCode)
-    StubCode                                 0x0000aa20   Section        8  lbs{000a0000}-207.o(StubCode)
-    theImportedSymbol                        0x0000aa24   Data           0  lbs{000a0000}-207.o(StubCode)
-    StubCode                                 0x0000aa28   Section        8  lbs{000a0000}-21.o(StubCode)
-    theImportedSymbol                        0x0000aa2c   Data           0  lbs{000a0000}-21.o(StubCode)
-    StubCode                                 0x0000aa30   Section        8  lbs{000a0000}-214.o(StubCode)
-    theImportedSymbol                        0x0000aa34   Data           0  lbs{000a0000}-214.o(StubCode)
-    StubCode                                 0x0000aa38   Section        8  lbs{000a0000}-218.o(StubCode)
-    theImportedSymbol                        0x0000aa3c   Data           0  lbs{000a0000}-218.o(StubCode)
-    StubCode                                 0x0000aa40   Section        8  lbs{000a0000}-219.o(StubCode)
-    theImportedSymbol                        0x0000aa44   Data           0  lbs{000a0000}-219.o(StubCode)
-    StubCode                                 0x0000aa48   Section        8  lbs{000a0000}-223.o(StubCode)
-    theImportedSymbol                        0x0000aa4c   Data           0  lbs{000a0000}-223.o(StubCode)
-    StubCode                                 0x0000aa50   Section        8  lbs{000a0000}-225.o(StubCode)
-    theImportedSymbol                        0x0000aa54   Data           0  lbs{000a0000}-225.o(StubCode)
-    StubCode                                 0x0000aa58   Section        8  lbs{000a0000}-226.o(StubCode)
-    theImportedSymbol                        0x0000aa5c   Data           0  lbs{000a0000}-226.o(StubCode)
-    StubCode                                 0x0000aa60   Section        8  lbs{000a0000}-23.o(StubCode)
-    theImportedSymbol                        0x0000aa64   Data           0  lbs{000a0000}-23.o(StubCode)
-    StubCode                                 0x0000aa68   Section        8  lbs{000a0000}-28.o(StubCode)
-    theImportedSymbol                        0x0000aa6c   Data           0  lbs{000a0000}-28.o(StubCode)
-    StubCode                                 0x0000aa70   Section        8  lbs{000a0000}-303.o(StubCode)
-    theImportedSymbol                        0x0000aa74   Data           0  lbs{000a0000}-303.o(StubCode)
-    StubCode                                 0x0000aa78   Section        8  lbs{000a0000}-304.o(StubCode)
-    theImportedSymbol                        0x0000aa7c   Data           0  lbs{000a0000}-304.o(StubCode)
-    StubCode                                 0x0000aa80   Section        8  lbs{000a0000}-47.o(StubCode)
-    theImportedSymbol                        0x0000aa84   Data           0  lbs{000a0000}-47.o(StubCode)
-    StubCode                                 0x0000aa88   Section        8  lbs{000a0000}-48.o(StubCode)
-    theImportedSymbol                        0x0000aa8c   Data           0  lbs{000a0000}-48.o(StubCode)
-    StubCode                                 0x0000aa90   Section        8  lbs{000a0000}-49.o(StubCode)
-    theImportedSymbol                        0x0000aa94   Data           0  lbs{000a0000}-49.o(StubCode)
-    StubCode                                 0x0000aa98   Section        8  lbs{000a0000}-7.o(StubCode)
-    theImportedSymbol                        0x0000aa9c   Data           0  lbs{000a0000}-7.o(StubCode)
-    StubCode                                 0x0000aaa0   Section        8  lbs{000a0000}-8.o(StubCode)
-    theImportedSymbol                        0x0000aaa4   Data           0  lbs{000a0000}-8.o(StubCode)
-    StubCode                                 0x0000aaa8   Section        8  lbs{000a0000}-82.o(StubCode)
-    theImportedSymbol                        0x0000aaac   Data           0  lbs{000a0000}-82.o(StubCode)
-    StubCode                                 0x0000aab0   Section        8  lbs{000a0000}-83.o(StubCode)
-    theImportedSymbol                        0x0000aab4   Data           0  lbs{000a0000}-83.o(StubCode)
-    StubCode                                 0x0000aab8   Section        8  lbs{000a0000}-87.o(StubCode)
-    theImportedSymbol                        0x0000aabc   Data           0  lbs{000a0000}-87.o(StubCode)
-    StubCode                                 0x0000aac0   Section        8  lbs{000a0000}-97.o(StubCode)
-    theImportedSymbol                        0x0000aac4   Data           0  lbs{000a0000}-97.o(StubCode)
-    StubCode                                 0x0000aac8   Section        8  mnservicelib{000a0000}-10.o(StubCode)
-    theImportedSymbol                        0x0000aacc   Data           0  mnservicelib{000a0000}-10.o(StubCode)
-    StubCode                                 0x0000aad0   Section        8  mnservicelib{000a0000}-13.o(StubCode)
-    theImportedSymbol                        0x0000aad4   Data           0  mnservicelib{000a0000}-13.o(StubCode)
-    StubCode                                 0x0000aad8   Section        8  mnservicelib{000a0000}-3.o(StubCode)
-    theImportedSymbol                        0x0000aadc   Data           0  mnservicelib{000a0000}-3.o(StubCode)
-    StubCode                                 0x0000aae0   Section        8  mnservicelib{000a0000}-5.o(StubCode)
-    theImportedSymbol                        0x0000aae4   Data           0  mnservicelib{000a0000}-5.o(StubCode)
-    StubCode                                 0x0000aae8   Section        8  mnservicelib{000a0000}-55.o(StubCode)
-    theImportedSymbol                        0x0000aaec   Data           0  mnservicelib{000a0000}-55.o(StubCode)
-    StubCode                                 0x0000aaf0   Section        8  mnservicelib{000a0000}-57.o(StubCode)
-    theImportedSymbol                        0x0000aaf4   Data           0  mnservicelib{000a0000}-57.o(StubCode)
-    StubCode                                 0x0000aaf8   Section        8  mnservicelib{000a0000}-6.o(StubCode)
-    theImportedSymbol                        0x0000aafc   Data           0  mnservicelib{000a0000}-6.o(StubCode)
-    StubCode                                 0x0000ab00   Section        8  mnservicelib{000a0000}-8.o(StubCode)
-    theImportedSymbol                        0x0000ab04   Data           0  mnservicelib{000a0000}-8.o(StubCode)
-    StubCode                                 0x0000ab08   Section        8  mnservicelib{000a0000}-9.o(StubCode)
-    theImportedSymbol                        0x0000ab0c   Data           0  mnservicelib{000a0000}-9.o(StubCode)
-    StubCode                                 0x0000ab10   Section        8  dfpaeabi{000a0000}-12.o(StubCode)
-    theImportedSymbol                        0x0000ab14   Data           0  dfpaeabi{000a0000}-12.o(StubCode)
-    StubCode                                 0x0000ab18   Section        8  dfpaeabi{000a0000}-19.o(StubCode)
-    theImportedSymbol                        0x0000ab1c   Data           0  dfpaeabi{000a0000}-19.o(StubCode)
-    StubCode                                 0x0000ab20   Section        8  dfpaeabi{000a0000}-2.o(StubCode)
-    theImportedSymbol                        0x0000ab24   Data           0  dfpaeabi{000a0000}-2.o(StubCode)
-    StubCode                                 0x0000ab28   Section        8  dfpaeabi{000a0000}-20.o(StubCode)
-    theImportedSymbol                        0x0000ab2c   Data           0  dfpaeabi{000a0000}-20.o(StubCode)
-    StubCode                                 0x0000ab30   Section        8  dfpaeabi{000a0000}-22.o(StubCode)
-    theImportedSymbol                        0x0000ab34   Data           0  dfpaeabi{000a0000}-22.o(StubCode)
-    StubCode                                 0x0000ab38   Section        8  dfpaeabi{000a0000}-23.o(StubCode)
-    theImportedSymbol                        0x0000ab3c   Data           0  dfpaeabi{000a0000}-23.o(StubCode)
-    StubCode                                 0x0000ab40   Section        8  dfpaeabi{000a0000}-24.o(StubCode)
-    theImportedSymbol                        0x0000ab44   Data           0  dfpaeabi{000a0000}-24.o(StubCode)
-    StubCode                                 0x0000ab48   Section        8  dfpaeabi{000a0000}-25.o(StubCode)
-    theImportedSymbol                        0x0000ab4c   Data           0  dfpaeabi{000a0000}-25.o(StubCode)
-    StubCode                                 0x0000ab50   Section        8  dfpaeabi{000a0000}-3.o(StubCode)
-    theImportedSymbol                        0x0000ab54   Data           0  dfpaeabi{000a0000}-3.o(StubCode)
-    StubCode                                 0x0000ab58   Section        8  dfpaeabi{000a0000}-36.o(StubCode)
-    theImportedSymbol                        0x0000ab5c   Data           0  dfpaeabi{000a0000}-36.o(StubCode)
-    StubCode                                 0x0000ab60   Section        8  dfpaeabi{000a0000}-41.o(StubCode)
-    theImportedSymbol                        0x0000ab64   Data           0  dfpaeabi{000a0000}-41.o(StubCode)
-    StubCode                                 0x0000ab68   Section        8  dfpaeabi{000a0000}-5.o(StubCode)
-    theImportedSymbol                        0x0000ab6c   Data           0  dfpaeabi{000a0000}-5.o(StubCode)
-    StubCode                                 0x0000ab70   Section        8  dfpaeabi{000a0000}-8.o(StubCode)
-    theImportedSymbol                        0x0000ab74   Data           0  dfpaeabi{000a0000}-8.o(StubCode)
-    StubCode                                 0x0000ab78   Section        8  drtaeabi{000a0000}-135.o(StubCode)
-    theImportedSymbol                        0x0000ab7c   Data           0  drtaeabi{000a0000}-135.o(StubCode)
-    StubCode                                 0x0000ab80   Section        8  drtaeabi{000a0000}-147.o(StubCode)
-    theImportedSymbol                        0x0000ab84   Data           0  drtaeabi{000a0000}-147.o(StubCode)
-    StubCode                                 0x0000ab88   Section        8  drtaeabi{000a0000}-158.o(StubCode)
-    theImportedSymbol                        0x0000ab8c   Data           0  drtaeabi{000a0000}-158.o(StubCode)
-    StubCode                                 0x0000ab90   Section        8  drtaeabi{000a0000}-159.o(StubCode)
-    theImportedSymbol                        0x0000ab94   Data           0  drtaeabi{000a0000}-159.o(StubCode)
-    StubCode                                 0x0000ab98   Section        8  drtaeabi{000a0000}-180.o(StubCode)
-    theImportedSymbol                        0x0000ab9c   Data           0  drtaeabi{000a0000}-180.o(StubCode)
-    StubCode                                 0x0000aba0   Section        8  drtaeabi{000a0000}-183.o(StubCode)
-    theImportedSymbol                        0x0000aba4   Data           0  drtaeabi{000a0000}-183.o(StubCode)
-    StubCode                                 0x0000aba8   Section        8  drtaeabi{000a0000}-184.o(StubCode)
-    theImportedSymbol                        0x0000abac   Data           0  drtaeabi{000a0000}-184.o(StubCode)
-    StubCode                                 0x0000abb0   Section        8  scppnwdl{000a0000}-3.o(StubCode)
-    theImportedSymbol                        0x0000abb4   Data           0  scppnwdl{000a0000}-3.o(StubCode)
-    i._Z18ExecuteAndDeleteLDP15CPosLmOperation 0x0000abb8   Section       22  mnrefproviderengine.in(i._Z18ExecuteAndDeleteLDP15CPosLmOperation)
-    i._ZN7TPtrC163SetERK7TDesC16             0x0000abce   Section       28  mnrefproviderengine.in(i._ZN7TPtrC163SetERK7TDesC16)
-    i._ZN7TPtrC163SetERK7TDesC16.clean       0x0000abea   Section       12  mnrefproviderengine.in(i._ZN7TPtrC163SetERK7TDesC16.clean)
-    i._ZdlPvS_                               0x0000abf6   Section        2  mnrefproviderengine.in(i._ZdlPvS_)
-    i._ZnwjPv                                0x0000abf8   Section        4  mnrefproviderengine.in(i._ZnwjPv)
-    t._Z17CleanupClosePushLI6RArrayIN11CMnrpEngine14TDistanceToPoiEEEvRT_ 0x0000abfc   Section       16  mnrefproviderengine.in(t._Z17CleanupClosePushLI6RArrayIN11CMnrpEngine14TDistanceToPoiEEEvRT_)
-    t._Z3AbsIdET_S0_                         0x0000ac0c   Section       44  mnrefproviderengine.in(t._Z3AbsIdET_S0_)
-    t._Z3MaxIdET_S0_S0_                      0x0000ac38   Section       28  mnrefproviderengine.in(t._Z3MaxIdET_S0_S0_)
-    t._Z3MinIdET_S0_S0_                      0x0000ac54   Section       28  mnrefproviderengine.in(t._Z3MinIdET_S0_S0_)
-    t._ZN12CleanupCloseI6RArrayIN11CMnrpEngine14TDistanceToPoiEEE5CloseEPv 0x0000ac70   Section        8  mnrefproviderengine.in(t._ZN12CleanupCloseI6RArrayIN11CMnrpEngine14TDistanceToPoiEEE5CloseEPv)
-    t._ZN12CleanupCloseI6RArrayImEE5CloseEPv 0x0000ac78   Section        8  mnrefproviderengine.in(t._ZN12CleanupCloseI6RArrayImEE5CloseEPv)
-    t._ZN13RPointerArrayI12CPosLandmarkE7AppendLEPKS0_ 0x0000ac80   Section       12  mnrefproviderengine.in(t._ZN13RPointerArrayI12CPosLandmarkE7AppendLEPKS0_)
-    t._ZN13RPointerArrayIN13CMnrpMapModel9CDrawItemEE15ResetAndDestroyEv 0x0000ac8c   Section       48  mnrefproviderengine.in(t._ZN13RPointerArrayIN13CMnrpMapModel9CDrawItemEE15ResetAndDestroyEv)
-    t._ZN13RPointerArrayIN13CMnrpMapModel9CDrawItemEE7AppendLEPKS1_ 0x0000acbc   Section       12  mnrefproviderengine.in(t._ZN13RPointerArrayIN13CMnrpMapModel9CDrawItemEE7AppendLEPKS1_)
-    t._ZNK20HPositionGenericInfo8GetValueIfEEitRT_ 0x0000acc8   Section       16  mnrefproviderengine.in(t._ZNK20HPositionGenericInfo8GetValueIfEEitRT_)
-    t._ZNK6RArrayIN11CMnrpEngine14TDistanceToPoiEE5CountEv 0x0000acd8   Section        8  mnrefproviderengine.in(t._ZNK6RArrayIN11CMnrpEngine14TDistanceToPoiEE5CountEv)
-    t._ZNK6TArrayIP12CPosLandmarkEixEi       0x0000ace0   Section        8  mnrefproviderengine.in(t._ZNK6TArrayIP12CPosLandmarkEixEi)
-    t._ZNK6TArrayIPN13CMnrpMapModel9CDrawItemEEixEi 0x0000ace8   Section        8  mnrefproviderengine.in(t._ZNK6TArrayIPN13CMnrpMapModel9CDrawItemEEixEi)
-    .extab._ZN11CMnrpEngineC1Ev              0x0000acf0   Data           0  mnrefproviderengine.in(.ARM.extab)
-    .extab._ZN11CMnrpEngineD1Ev              0x0000ad00   Data           0  mnrefproviderengine.in(.ARM.extab)
-    .extab._ZN11CMnrpEngine17FindResourceFileLERK7TDesC16R4TBufILi256EE 0x0000ad10   Data           0  mnrefproviderengine.in(.ARM.extab)
-    .extab._ZN11CMnrpEngine16LoadKnownPlacesLEv 0x0000ad1c   Data           0  mnrefproviderengine.in(.ARM.extab)
-    .extab._ZN11CMnrpEngine12KnownPlacesLEv  0x0000ad2c   Data           0  mnrefproviderengine.in(.ARM.extab)
-    .extab._ZN13CMnrpMapModel9CDrawItem5NewLCERK12CPosLandmark 0x0000ad54   Data           0  mnrefproviderengine.in(.ARM.extab)
-    .extab._ZN13CMnrpMapModelC1ER17MMapModelObserverR11CMnrpEngine 0x0000ad64   Data           0  mnrefproviderengine.in(.ARM.extab)
-    .extab._ZN13CMnrpMapModelC1ER11CMnrpEngine 0x0000ad74   Data           0  mnrefproviderengine.in(.ARM.extab)
-    .extab._ZN13CMnrpMapModelD1Ev            0x0000ad84   Data           0  mnrefproviderengine.in(.ARM.extab)
-    .extab._ZN13CMnrpMapModel9CDrawItemD1Ev  0x0000ad94   Data           0  mnrefproviderengine.in(.ARM.extab)
-    .extab._ZN20CMnrpPositionRequestC1ER21MMnrpPositionObserver 0x0000ada4   Data           0  mnrefproviderengine.in(.ARM.extab)
-    .extab._ZN20CMnrpPositionRequestD1Ev     0x0000adb4   Data           0  mnrefproviderengine.in(.ARM.extab)
-    .extab._ZN7TPtrC163SetERK7TDesC16        0x0000adc4   Data           0  mnrefproviderengine.in(.ARM.extab)
-    .constdata$1                             0x0000add4   Data           0  mnrefproviderengine.in(.constdata)
-    KCitiesResourceFile                      0x0000add4   Data          72  mnrefproviderengine.in(.constdata)
-    .constdata                               0x0000add4   Section      128  mnrefproviderengine.in(.constdata)
-    KLocationNameFormat@_ZN11CMnrpEngine21CreateCloseLandmarkLCERK12CPosLandmarkf_0 0x0000ae1c   Data          28  mnrefproviderengine.in(.constdata)
-    KLocationNameFormatKm@_ZN11CMnrpEngine21CreateCloseLandmarkLCERK12CPosLandmarkf_1 0x0000ae38   Data          28  mnrefproviderengine.in(.constdata)
-    .constdata$1                             0x0000ae54   Data           0  mnrefproviderengine.in(.constdata)
-    KCellDividers                            0x0000ae54   Data          12  mnrefproviderengine.in(.constdata)
-    .constdata                               0x0000ae54   Section       44  mnrefproviderengine.in(.constdata)
-    KRequestorName@_ZN13CMnrpMapModel10ConstructLEv_0 0x0000ae60   Data          32  mnrefproviderengine.in(.constdata)
-    .constdata$1                             0x0000ae80   Data           0  mnrefproviderengine.in(.constdata)
-    KNorth@_ZN9MnrpUtils13AngleToStringEdR6TDes16_1 0x0000ae80   Data           8  mnrefproviderengine.in(.constdata)
-    .constdata                               0x0000ae80   Section      276  mnrefproviderengine.in(.constdata)
-    KSouth@_ZN9MnrpUtils13AngleToStringEdR6TDes16_2 0x0000ae88   Data           8  mnrefproviderengine.in(.constdata)
-    KWest@_ZN9MnrpUtils13AngleToStringEdR6TDes16_3 0x0000ae90   Data           8  mnrefproviderengine.in(.constdata)
-    KEast@_ZN9MnrpUtils13AngleToStringEdR6TDes16_4 0x0000ae98   Data           8  mnrefproviderengine.in(.constdata)
-    KNan                                     0x0000aea0   Data          16  mnrefproviderengine.in(.constdata)
-    KNeg                                     0x0000aeb0   Data          16  mnrefproviderengine.in(.constdata)
-    KOutOfBounds                             0x0000aec0   Data          16  mnrefproviderengine.in(.constdata)
-    KCoordFormatFull@_ZN9MnrpUtils18CoordinateToStringEdR6TDes16ii_0 0x0000aed0   Data          44  mnrefproviderengine.in(.constdata)
-    KCoordFormatPartMseconds@_ZN9MnrpUtils18CoordinateToStringEdR6TDes16ii_1 0x0000aefc   Data          20  mnrefproviderengine.in(.constdata)
-    KSmall@_ZN9MnrpUtils16DistanceToStringEdR6TDes16_0 0x0000af10   Data          16  mnrefproviderengine.in(.constdata)
-    KMeters@_ZN9MnrpUtils16DistanceToStringEdR6TDes16_1 0x0000af20   Data          16  mnrefproviderengine.in(.constdata)
-    KKiloMeters@_ZN9MnrpUtils16DistanceToStringEdR6TDes16_2 0x0000af30   Data          20  mnrefproviderengine.in(.constdata)
-    KThousandsKiloMeters@_ZN9MnrpUtils16DistanceToStringEdR6TDes16_3 0x0000af44   Data          24  mnrefproviderengine.in(.constdata)
-    KAngleFormat@_ZN9MnrpUtils13AngleToStringEdR6TDes16_0 0x0000af5c   Data          44  mnrefproviderengine.in(.constdata)
-    KPerSecond@_ZN9MnrpUtils13SpeedToStringEdR6TDes16_0 0x0000af88   Data          12  mnrefproviderengine.in(.constdata)
-    .constdata__ZTI11CMnrpEngine             0x0000af94   Section       12  mnrefproviderengine.in(.constdata__ZTI11CMnrpEngine)
-    .constdata__ZTI13CMnrpMapModel           0x0000afa0   Section       32  mnrefproviderengine.in(.constdata__ZTI13CMnrpMapModel)
-    .constdata__ZTI20CMnrpPositionRequest    0x0000afc0   Section       12  mnrefproviderengine.in(.constdata__ZTI20CMnrpPositionRequest)
-    .constdata__ZTI21MMnrpPositionObserver   0x0000afcc   Section        8  mnrefproviderengine.in(.constdata__ZTI21MMnrpPositionObserver)
-    .constdata__ZTIN13CMnrpMapModel9CDrawItemE 0x0000afd4   Section       12  mnrefproviderengine.in(.constdata__ZTIN13CMnrpMapModel9CDrawItemE)
-    .constdata__ZTS11CMnrpEngine             0x0000afe0   Section       14  mnrefproviderengine.in(.constdata__ZTS11CMnrpEngine)
-    .constdata__ZTS13CMnrpMapModel           0x0000afee   Section       16  mnrefproviderengine.in(.constdata__ZTS13CMnrpMapModel)
-    .constdata__ZTS20CMnrpPositionRequest    0x0000affe   Section       23  mnrefproviderengine.in(.constdata__ZTS20CMnrpPositionRequest)
-    .constdata__ZTS21MMnrpPositionObserver   0x0000b015   Section       24  mnrefproviderengine.in(.constdata__ZTS21MMnrpPositionObserver)
-    .constdata__ZTSN13CMnrpMapModel9CDrawItemE 0x0000b02d   Section       28  mnrefproviderengine.in(.constdata__ZTSN13CMnrpMapModel9CDrawItemE)
-    .constdata__ZTV11CMnrpEngine             0x0000b04c   Section       20  mnrefproviderengine.in(.constdata__ZTV11CMnrpEngine)
-    .constdata__ZTV13CMnrpMapModel           0x0000b060   Section       36  mnrefproviderengine.in(.constdata__ZTV13CMnrpMapModel)
-    .constdata__ZTV20CMnrpPositionRequest    0x0000b084   Section       32  mnrefproviderengine.in(.constdata__ZTV20CMnrpPositionRequest)
-    .constdata__ZTVN13CMnrpMapModel9CDrawItemE 0x0000b0a4   Section       20  mnrefproviderengine.in(.constdata__ZTVN13CMnrpMapModel9CDrawItemE)
-    .ARM.exidx                               0x0000b0b8   Section        8  ucppinit_aeabi.o(.ARM.exidx)
-
-    Global Symbols
-
-    Symbol Name                              Value     Ov Type        Size  Object(Section)
-
-    BuildAttributes$$THUMB_ISAv3$ARM_ISAv6$M$E$P$PE$A:L22$X:L11$S22$IEEE1$IW$USESV6$~STKCKD$USESV7$~SHL$OSPACE$IEEEJ$EBA8$UX$REQ8$PRES8$EABIv2 0x00000000   Number         0  anon$$obj.o ABSOLUTE
-    #<DLL>AknIcon{000a0000}[1020735a].dll#<\DLL>10  - Undefined Reference
-    #<DLL>AknIcon{000a0000}[1020735a].dll#<\DLL>15  - Undefined Reference
-    #<DLL>AknIcon{000a0000}[1020735a].dll#<\DLL>b  - Undefined Reference
-    #<DLL>AknIcon{000a0000}[1020735a].dll#<\DLL>f  - Undefined Reference
-    #<DLL>bafl{000a0000}[10003a0f].dll#<\DLL>3b  - Undefined Reference
-    #<DLL>bafl{000a0000}[10003a0f].dll#<\DLL>3e  - Undefined Reference
-    #<DLL>bafl{000a0000}[10003a0f].dll#<\DLL>7b  - Undefined Reference
-    #<DLL>bafl{000a0000}[10003a0f].dll#<\DLL>7c  - Undefined Reference
-    #<DLL>bafl{000a0000}[10003a0f].dll#<\DLL>81  - Undefined Reference
-    #<DLL>bafl{000a0000}[10003a0f].dll#<\DLL>8d  - Undefined Reference
-    #<DLL>bafl{000a0000}[10003a0f].dll#<\DLL>91  - Undefined Reference
-    #<DLL>bafl{000a0000}[10003a0f].dll#<\DLL>93  - Undefined Reference
-    #<DLL>bitgdi{000a0000}[10003b18].dll#<\DLL>2c  - Undefined Reference
-    #<DLL>bitgdi{000a0000}[10003b18].dll#<\DLL>e  - Undefined Reference
-    #<DLL>dfpaeabi{000a0000}.dll#<\DLL>13     - Undefined Reference
-    #<DLL>dfpaeabi{000a0000}.dll#<\DLL>14     - Undefined Reference
-    #<DLL>dfpaeabi{000a0000}.dll#<\DLL>16     - Undefined Reference
-    #<DLL>dfpaeabi{000a0000}.dll#<\DLL>17     - Undefined Reference
-    #<DLL>dfpaeabi{000a0000}.dll#<\DLL>18     - Undefined Reference
-    #<DLL>dfpaeabi{000a0000}.dll#<\DLL>19     - Undefined Reference
-    #<DLL>dfpaeabi{000a0000}.dll#<\DLL>2      - Undefined Reference
-    #<DLL>dfpaeabi{000a0000}.dll#<\DLL>24     - Undefined Reference
-    #<DLL>dfpaeabi{000a0000}.dll#<\DLL>29     - Undefined Reference
-    #<DLL>dfpaeabi{000a0000}.dll#<\DLL>3      - Undefined Reference
-    #<DLL>dfpaeabi{000a0000}.dll#<\DLL>5      - Undefined Reference
-    #<DLL>dfpaeabi{000a0000}.dll#<\DLL>8      - Undefined Reference
-    #<DLL>dfpaeabi{000a0000}.dll#<\DLL>c      - Undefined Reference
-    #<DLL>drtaeabi{000a0000}.dll#<\DLL>87     - Undefined Reference
-    #<DLL>drtaeabi{000a0000}.dll#<\DLL>93     - Undefined Reference
-    #<DLL>drtaeabi{000a0000}.dll#<\DLL>9e     - Undefined Reference
-    #<DLL>drtaeabi{000a0000}.dll#<\DLL>9f     - Undefined Reference
-    #<DLL>drtaeabi{000a0000}.dll#<\DLL>b4     - Undefined Reference
-    #<DLL>drtaeabi{000a0000}.dll#<\DLL>b7     - Undefined Reference
-    #<DLL>drtaeabi{000a0000}.dll#<\DLL>b8     - Undefined Reference
-    #<DLL>efsrv{000a0000}[100039e4].dll#<\DLL>44  - Undefined Reference
-    #<DLL>efsrv{000a0000}[100039e4].dll#<\DLL>73  - Undefined Reference
-    #<DLL>efsrv{000a0000}[100039e4].dll#<\DLL>76  - Undefined Reference
-    #<DLL>efsrv{000a0000}[100039e4].dll#<\DLL>b5  - Undefined Reference
-    #<DLL>efsrv{000a0000}[100039e4].dll#<\DLL>b6  - Undefined Reference
-    #<DLL>efsrv{000a0000}[100039e4].dll#<\DLL>be  - Undefined Reference
-    #<DLL>efsrv{000a0000}[100039e4].dll#<\DLL>c8  - Undefined Reference
-    #<DLL>efsrv{000a0000}[100039e4].dll#<\DLL>cc  - Undefined Reference
-    #<DLL>eposlandmarks{000a0000}[101fdf8a].dll#<\DLL>32  - Undefined Reference
-    #<DLL>eposlandmarks{000a0000}[101fdf8a].dll#<\DLL>33  - Undefined Reference
-    #<DLL>eposlandmarks{000a0000}[101fdf8a].dll#<\DLL>38  - Undefined Reference
-    #<DLL>eposlandmarks{000a0000}[101fdf8a].dll#<\DLL>4  - Undefined Reference
-    #<DLL>eposlandmarks{000a0000}[101fdf8a].dll#<\DLL>41  - Undefined Reference
-    #<DLL>eposlandmarks{000a0000}[101fdf8a].dll#<\DLL>42  - Undefined Reference
-    #<DLL>eposlandmarks{000a0000}[101fdf8a].dll#<\DLL>43  - Undefined Reference
-    #<DLL>eposlandmarks{000a0000}[101fdf8a].dll#<\DLL>44  - Undefined Reference
-    #<DLL>eposlandmarks{000a0000}[101fdf8a].dll#<\DLL>4b  - Undefined Reference
-    #<DLL>eposlandmarks{000a0000}[101fdf8a].dll#<\DLL>52  - Undefined Reference
-    #<DLL>eposlandmarks{000a0000}[101fdf8a].dll#<\DLL>6  - Undefined Reference
-    #<DLL>eposlandmarks{000a0000}[101fdf8a].dll#<\DLL>8  - Undefined Reference
-    #<DLL>eposlandmarks{000a0000}[101fdf8a].dll#<\DLL>c  - Undefined Reference
-    #<DLL>eposlandmarks{000a0000}[101fdf8a].dll#<\DLL>e  - Undefined Reference
-    #<DLL>eposlandmarks{000a0000}[101fdf8a].dll#<\DLL>f  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>1a8  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>1d0  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>1d7  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>1d8  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>1dc  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>1e1  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>227  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>251  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>289  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>28e  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>29d  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>2e  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>2f  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>30  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>31  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>32  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>338  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>33a  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>346  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>347  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>349  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>37  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>3a8  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>3b9  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>3c0  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>3c6  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>3c8  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>3cd  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>3d8  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>41b  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>423  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>431  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>432  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>440  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>442  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>443  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>446  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>45c  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>45f  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>493  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>494  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>51  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>5e3  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>5e6  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>636  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>639  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>659  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>66e  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>670  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>671  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>673  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>6d9  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>70e  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>717  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>71d  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>722  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>78  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>80c  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>80d  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>822  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>84b  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>84d  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>850  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>cb  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>cd  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>cf  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>d0  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>d1  - Undefined Reference
-    #<DLL>gdi{000a0000}[10003b15].dll#<\DLL>137  - Undefined Reference
-    #<DLL>gdi{000a0000}[10003b15].dll#<\DLL>13a  - Undefined Reference
-    #<DLL>lbs{000a0000}[101f97b1].dll#<\DLL>11  - Undefined Reference
-    #<DLL>lbs{000a0000}[101f97b1].dll#<\DLL>12f  - Undefined Reference
-    #<DLL>lbs{000a0000}[101f97b1].dll#<\DLL>130  - Undefined Reference
-    #<DLL>lbs{000a0000}[101f97b1].dll#<\DLL>15  - Undefined Reference
-    #<DLL>lbs{000a0000}[101f97b1].dll#<\DLL>17  - Undefined Reference
-    #<DLL>lbs{000a0000}[101f97b1].dll#<\DLL>1c  - Undefined Reference
-    #<DLL>lbs{000a0000}[101f97b1].dll#<\DLL>2f  - Undefined Reference
-    #<DLL>lbs{000a0000}[101f97b1].dll#<\DLL>30  - Undefined Reference
-    #<DLL>lbs{000a0000}[101f97b1].dll#<\DLL>31  - Undefined Reference
-    #<DLL>lbs{000a0000}[101f97b1].dll#<\DLL>52  - Undefined Reference
-    #<DLL>lbs{000a0000}[101f97b1].dll#<\DLL>53  - Undefined Reference
-    #<DLL>lbs{000a0000}[101f97b1].dll#<\DLL>57  - Undefined Reference
-    #<DLL>lbs{000a0000}[101f97b1].dll#<\DLL>61  - Undefined Reference
-    #<DLL>lbs{000a0000}[101f97b1].dll#<\DLL>7  - Undefined Reference
-    #<DLL>lbs{000a0000}[101f97b1].dll#<\DLL>8  - Undefined Reference
-    #<DLL>lbs{000a0000}[101f97b1].dll#<\DLL>98  - Undefined Reference
-    #<DLL>lbs{000a0000}[101f97b1].dll#<\DLL>a  - Undefined Reference
-    #<DLL>lbs{000a0000}[101f97b1].dll#<\DLL>a7  - Undefined Reference
-    #<DLL>lbs{000a0000}[101f97b1].dll#<\DLL>b4  - Undefined Reference
-    #<DLL>lbs{000a0000}[101f97b1].dll#<\DLL>b5  - Undefined Reference
-    #<DLL>lbs{000a0000}[101f97b1].dll#<\DLL>cd  - Undefined Reference
-    #<DLL>lbs{000a0000}[101f97b1].dll#<\DLL>cf  - Undefined Reference
-    #<DLL>lbs{000a0000}[101f97b1].dll#<\DLL>d  - Undefined Reference
-    #<DLL>lbs{000a0000}[101f97b1].dll#<\DLL>d6  - Undefined Reference
-    #<DLL>lbs{000a0000}[101f97b1].dll#<\DLL>da  - Undefined Reference
-    #<DLL>lbs{000a0000}[101f97b1].dll#<\DLL>db  - Undefined Reference
-    #<DLL>lbs{000a0000}[101f97b1].dll#<\DLL>df  - Undefined Reference
-    #<DLL>lbs{000a0000}[101f97b1].dll#<\DLL>e1  - Undefined Reference
-    #<DLL>lbs{000a0000}[101f97b1].dll#<\DLL>e2  - Undefined Reference
-    #<DLL>lbs{000a0000}[101f97b1].dll#<\DLL>f  - Undefined Reference
-    #<DLL>mnservicelib{000a0000}[10206903].dll#<\DLL>3  - Undefined Reference
-    #<DLL>mnservicelib{000a0000}[10206903].dll#<\DLL>37  - Undefined Reference
-    #<DLL>mnservicelib{000a0000}[10206903].dll#<\DLL>39  - Undefined Reference
-    #<DLL>mnservicelib{000a0000}[10206903].dll#<\DLL>5  - Undefined Reference
-    #<DLL>mnservicelib{000a0000}[10206903].dll#<\DLL>6  - Undefined Reference
-    #<DLL>mnservicelib{000a0000}[10206903].dll#<\DLL>8  - Undefined Reference
-    #<DLL>mnservicelib{000a0000}[10206903].dll#<\DLL>9  - Undefined Reference
-    #<DLL>mnservicelib{000a0000}[10206903].dll#<\DLL>a  - Undefined Reference
-    #<DLL>mnservicelib{000a0000}[10206903].dll#<\DLL>d  - Undefined Reference
-    #<DLL>scppnwdl{000a0000}.dll#<\DLL>3      - Undefined Reference
-    SHT$$INIT_ARRAY$$Base                     - Undefined Weak Reference
-    SHT$$INIT_ARRAY$$Limit                    - Undefined Weak Reference
-    typeinfo for XLeaveException              - Undefined Reference
-    typeinfo for CBase                        - Undefined Reference
-    typeinfo for CActive                      - Undefined Reference
-    vtable for __cxxabiv1::__class_type_info  - Undefined Reference
-    vtable for __cxxabiv1::__si_class_type_info  - Undefined Reference
-    vtable for __cxxabiv1::__vmi_class_type_info  - Undefined Reference
-    _fp_init                                  - Undefined Weak Reference
-    run_static_dtors                          - Undefined Weak Reference
-    Image$$ER_RO$$Base                       0x00008000   Number         0  anon$$obj.o(linker$$defined$$symbols)
-    _E32Dll                                  0x00008000   ARM Code      40  uc_dll_.o(.emb_text)
-    Symbian$$CPP$$Exception$$Descriptor      0x00008014   Data           0  uc_dll_.o(.emb_text)
-    __cpp_initialize__aeabi_                 0x00008028   ARM Code      72  ucppinit_aeabi.o(.emb_text)
-    CMnrpEngine::ConstructL()                0x00008071   Thumb Code    18  mnrefproviderengine.in(.text)
-    std::nothrow                             0x00008071   Thumb Code     0  ucppinit_aeabi.o(.emb_text)
-    CMnrpEngine::CMnrpEngine()               0x00008083   Thumb Code    22  mnrefproviderengine.in(.text)
-    CMnrpEngine::CMnrpEngine__sub_object()   0x00008083   Thumb Code     0  mnrefproviderengine.in(.text)
-    CMnrpEngine::NewL()                      0x00008099   Thumb Code    32  mnrefproviderengine.in(.text)
-    CMnrpEngine::~CMnrpEngine()              0x000080b9   Thumb Code    74  mnrefproviderengine.in(.text)
-    CMnrpEngine::~CMnrpEngine__sub_object()  0x000080b9   Thumb Code     0  mnrefproviderengine.in(.text)
-    CMnrpEngine::~CMnrpEngine__deallocating() 0x00008103   Thumb Code    16  mnrefproviderengine.in(.text)
-    CMnrpEngine::ReadPlacesResourceL(RResourceReader&) 0x00008113   Thumb Code   154  mnrefproviderengine.in(.text)
-    CMnrpEngine::FindResourceFileL(const TDesC16&, TBuf<(int)256>&) 0x000081ad   Thumb Code   118  mnrefproviderengine.in(.text)
-    CMnrpEngine::LoadKnownPlacesL()          0x00008223   Thumb Code    94  mnrefproviderengine.in(.text)
-    CMnrpEngine::KnownPlacesL()              0x00008281   Thumb Code    76  mnrefproviderengine.in(.text)
-    CMnrpEngine::AddressToCoordL(const CPosLandmark&) 0x000082cd   Thumb Code   124  mnrefproviderengine.in(.text)
-    CMnrpEngine::AddressToCoordLC(const CPosLandmark&) 0x00008349   Thumb Code    32  mnrefproviderengine.in(.text)
-    CMnrpEngine::AddressToCoordL(const TDesC16&) 0x00008369   Thumb Code   124  mnrefproviderengine.in(.text)
-    CMnrpEngine::AddressToCoordLC(const TDesC16&) 0x000083e5   Thumb Code    32  mnrefproviderengine.in(.text)
-    CMnrpEngine::CreateCloseLandmarkLC(const CPosLandmark&, float) 0x00008405   Thumb Code   178  mnrefproviderengine.in(.text)
-    CMnrpEngine::DistanceBetweenLandmarks(const CPosLandmark&, const CPosLandmark&) 0x000084b7   Thumb Code    86  mnrefproviderengine.in(.text)
-    CMnrpEngine::FindClosestPoisL(const CPosLandmark&, RArray<CMnrpEngine::TDistanceToPoi>&, int) 0x0000850d   Thumb Code   178  mnrefproviderengine.in(.text)
-    CMnrpEngine::CoordToAddressLC(const TCoordinate&) 0x000085bf   Thumb Code   124  mnrefproviderengine.in(.text)
-    CMnrpEngine::Fs()                        0x0000863b   Thumb Code     4  mnrefproviderengine.in(.text)
-    CMnrpEngine::BestCoordToAddressMatchesL(const TCoordinate&, RPointerArray<CPosLandmark>&, int) 0x0000863f   Thumb Code   136  mnrefproviderengine.in(.text)
-    AbsoluteToImage(TRealPoint, double)      0x000086c9   Thumb Code    74  mnrefproviderengine.in(.text)
-    TRealPoint::TRealPoint()                 0x00008713   Thumb Code    40  mnrefproviderengine.in(.text)
-    TRealPoint::TRealPoint__sub_object()     0x00008713   Thumb Code     0  mnrefproviderengine.in(.text)
-    TRealPoint::TRealPoint(double, double)   0x0000873b   Thumb Code    16  mnrefproviderengine.in(.text)
-    TRealPoint::TRealPoint__sub_object(double, double) 0x0000873b   Thumb Code     0  mnrefproviderengine.in(.text)
-    TRealPoint::TRealPoint(TCoordinate)      0x0000874b   Thumb Code    36  mnrefproviderengine.in(.text)
-    TRealPoint::TRealPoint__sub_object(TCoordinate) 0x0000874b   Thumb Code     0  mnrefproviderengine.in(.text)
-    TRealPoint::operator +(const TRealPoint&) 0x0000876f   Thumb Code    54  mnrefproviderengine.in(.text)
-    TRealPoint::operator -(const TRealPoint&) 0x000087a5   Thumb Code    52  mnrefproviderengine.in(.text)
-    TRealPoint::operator *(const double&)    0x000087d9   Thumb Code    58  mnrefproviderengine.in(.text)
-    TRealPoint::operator /(const double&)    0x00008813   Thumb Code    56  mnrefproviderengine.in(.text)
-    TRealPoint::Set(double, double)          0x0000884b   Thumb Code    16  mnrefproviderengine.in(.text)
-    TRealPoint::Coordinate()                 0x0000885b   Thumb Code    30  mnrefproviderengine.in(.text)
-    TRealPoint::IsValid()                    0x00008879   Thumb Code    32  mnrefproviderengine.in(.text)
-    CMnrpMapModel::CDrawItem::SetAbsolutePosition(const TLocality&) 0x00008899   Thumb Code    44  mnrefproviderengine.in(.text)
-    CMnrpMapModel::CDrawItem::NewLC(const CPosLandmark&) 0x000088c5   Thumb Code   146  mnrefproviderengine.in(.text)
-    CMnrpMapModel::AddCitiesL()              0x00008957   Thumb Code    64  mnrefproviderengine.in(.text)
-    CMnrpMapModel::ConstructL()              0x00008997   Thumb Code    62  mnrefproviderengine.in(.text)
-    CMnrpMapModel::CMnrpMapModel(MMapModelObserver&, CMnrpEngine&) 0x000089d5   Thumb Code   102  mnrefproviderengine.in(.text)
-    CMnrpMapModel::CMnrpMapModel__sub_object(MMapModelObserver&, CMnrpEngine&) 0x000089d5   Thumb Code     0  mnrefproviderengine.in(.text)
-    CMnrpMapModel::NewL(MMapModelObserver&, CMnrpEngine&) 0x00008a3b   Thumb Code    40  mnrefproviderengine.in(.text)
-    CMnrpMapModel::CMnrpMapModel(CMnrpEngine&) 0x00008a63   Thumb Code   150  mnrefproviderengine.in(.text)
-    CMnrpMapModel::CMnrpMapModel__sub_object(CMnrpEngine&) 0x00008a63   Thumb Code     0  mnrefproviderengine.in(.text)
-    CMnrpMapModel::NewL(CMnrpEngine&)        0x00008af9   Thumb Code    36  mnrefproviderengine.in(.text)
-    CMnrpMapModel::~CMnrpMapModel()          0x00008b1d   Thumb Code    40  mnrefproviderengine.in(.text)
-    CMnrpMapModel::~CMnrpMapModel__sub_object() 0x00008b1d   Thumb Code     0  mnrefproviderengine.in(.text)
-    CMnrpMapModel::~CMnrpMapModel__deallocating() 0x00008b45   Thumb Code    16  mnrefproviderengine.in(.text)
-    CMnrpMapModel::Height() const            0x00008b55   Thumb Code    22  mnrefproviderengine.in(.text)
-    CMnrpMapModel::Bottom() const            0x00008b6b   Thumb Code    28  mnrefproviderengine.in(.text)
-    CMnrpMapModel::Top() const               0x00008b87   Thumb Code    28  mnrefproviderengine.in(.text)
-    CMnrpMapModel::Width() const             0x00008ba3   Thumb Code    22  mnrefproviderengine.in(.text)
-    CMnrpMapModel::Right() const             0x00008bb9   Thumb Code    28  mnrefproviderengine.in(.text)
-    CMnrpMapModel::Left() const              0x00008bd5   Thumb Code    28  mnrefproviderengine.in(.text)
-    CMnrpMapModel::MaxScale() const          0x00008bf1   Thumb Code    60  mnrefproviderengine.in(.text)
-    CMnrpMapModel::CheckBorders()            0x00008c2d   Thumb Code   240  mnrefproviderengine.in(.text)
-    CMnrpMapModel::AdjustBoundingBox(CMnrpMapModel::CDrawItem&, TRealPoint&, TRealPoint&) 0x00008d1d   Thumb Code   166  mnrefproviderengine.in(.text)
-    CMnrpMapModel::CheckDrawItemHasPositionL(CMnrpMapModel::CDrawItem&, const CPosLandmark&) 0x00008dc3   Thumb Code    90  mnrefproviderengine.in(.text)
-    CMnrpMapModel::CDrawItem::NewLC(const CPosLandmark&, CPosLmCategoryManager&) 0x00008e1d   Thumb Code   134  mnrefproviderengine.in(.text)
-    CMnrpMapModel::UpdateModelL(CMnrpMapViewService&) 0x00008ea3   Thumb Code   802  mnrefproviderengine.in(.text)
-    CMnrpMapModel::SetScreenSize(TSize)      0x000091c5   Thumb Code    14  mnrefproviderengine.in(.text)
-    CMnrpMapModel::UpdateModel(const TMnMapImageParams&) 0x000091d3   Thumb Code   178  mnrefproviderengine.in(.text)
-    CMnrpMapModel::UpdateModelL(const CMnrpMapImageService&) 0x00009285   Thumb Code   278  mnrefproviderengine.in(.text)
-    CMnrpMapModel::AbsoluteToScreen(TRealPoint) const 0x0000939b   Thumb Code   106  mnrefproviderengine.in(.text)
-    CMnrpMapModel::AbsoluteToScreen(TCoordinate) const 0x00009405   Thumb Code    84  mnrefproviderengine.in(.text)
-    CMnrpMapModel::CurrentLocation() const   0x00009459   Thumb Code   216  mnrefproviderengine.in(.text)
-    CMnrpMapModel::DrawCurrentLocation(CFbsBitGc&, const TSize&) const 0x00009531   Thumb Code   176  mnrefproviderengine.in(.text)
-    CMnrpMapModel::Items() const             0x000095e1   Thumb Code    88  mnrefproviderengine.in(.text)
-    CMnrpMapModel::DrawLandmarks(CFbsBitGc&, CFont&, const TSize&, int) const 0x00009639   Thumb Code   672  mnrefproviderengine.in(.text)
-    CMnrpMapModel::DrawHorizontalLine(CFbsBitGc&, int, TSize) const 0x000098d9   Thumb Code    28  mnrefproviderengine.in(.text)
-    CMnrpMapModel::DrawVerticalLine(CFbsBitGc&, int, TSize) const 0x000098f5   Thumb Code    30  mnrefproviderengine.in(.text)
-    CMnrpMapModel::DrawGrid(CFbsBitGc&, const TSize&, CMnrpMapModel::TGrid&) const 0x00009913   Thumb Code   128  mnrefproviderengine.in(.text)
-    CMnrpMapModel::AbsoluteToScreen(double) const 0x00009993   Thumb Code    24  mnrefproviderengine.in(.text)
-    CMnrpMapModel::GetGrid(CMnrpMapModel::TGrid&) const 0x000099ab   Thumb Code   348  mnrefproviderengine.in(.text)
-    CMnrpMapModel::RenderL(CFbsBitmap&, TRect, CFont*, CFont*) const 0x00009b07   Thumb Code   204  mnrefproviderengine.in(.text)
-    CMnrpMapModel::NumIgnoredLandmarks()     0x00009bd3   Thumb Code     6  mnrefproviderengine.in(.text)
-    CMnrpMapModel::Zoom(double)              0x00009bd9   Thumb Code    28  mnrefproviderengine.in(.text)
-    CMnrpMapModel::MoveTo(TCoordinate)       0x00009bf5   Thumb Code    54  mnrefproviderengine.in(.text)
-    CMnrpMapModel::GoCenter()                0x00009c2b   Thumb Code    32  mnrefproviderengine.in(.text)
-    CMnrpMapModel::ScreenToAbsolute(TPoint) const 0x00009c4b   Thumb Code   108  mnrefproviderengine.in(.text)
-    CMnrpMapModel::ScreenToAbsolute(int) const 0x00009cb7   Thumb Code    58  mnrefproviderengine.in(.text)
-    CMnrpMapModel::Center() const            0x00009cf1   Thumb Code    32  mnrefproviderengine.in(.text)
-    CMnrpMapModel::HandlePositionRequestCompletedL(int) 0x00009d11   Thumb Code    54  mnrefproviderengine.in(.text)
-    thunk{-4} to CMnrpMapModel::HandlePositionRequestCompletedL(int) 0x00009d47   Thumb Code     4  mnrefproviderengine.in(.text)
-    CMnrpMapModel::CDrawItem::~CDrawItem()   0x00009d4b   Thumb Code    56  mnrefproviderengine.in(.text)
-    CMnrpMapModel::CDrawItem::~CDrawItem__sub_object() 0x00009d4b   Thumb Code     0  mnrefproviderengine.in(.text)
-    CMnrpMapModel::CDrawItem::~CDrawItem__deallocating() 0x00009d83   Thumb Code    16  mnrefproviderengine.in(.text)
-    CMnrpPositionRequest::SetOptionsL(const TPositionUpdateOptionsBase&) 0x00009d99   Thumb Code    14  mnrefproviderengine.in(.text)
-    CMnrpPositionRequest::ConstructL(const TDesC16&) 0x00009da7   Thumb Code    94  mnrefproviderengine.in(.text)
-    CMnrpPositionRequest::CMnrpPositionRequest(MMnrpPositionObserver&) 0x00009e05   Thumb Code   106  mnrefproviderengine.in(.text)
-    CMnrpPositionRequest::CMnrpPositionRequest__sub_object(MMnrpPositionObserver&) 0x00009e05   Thumb Code     0  mnrefproviderengine.in(.text)
-    CMnrpPositionRequest::NewL(const TDesC16&, MMnrpPositionObserver&) 0x00009e6f   Thumb Code    40  mnrefproviderengine.in(.text)
-    CMnrpPositionRequest::~CMnrpPositionRequest() 0x00009e97   Thumb Code    44  mnrefproviderengine.in(.text)
-    CMnrpPositionRequest::~CMnrpPositionRequest__sub_object() 0x00009e97   Thumb Code     0  mnrefproviderengine.in(.text)
-    CMnrpPositionRequest::~CMnrpPositionRequest__deallocating() 0x00009ec3   Thumb Code    16  mnrefproviderengine.in(.text)
-    CMnrpPositionRequest::InitContainer(HPositionGenericInfo&) 0x00009ed3   Thumb Code    56  mnrefproviderengine.in(.text)
-    CMnrpPositionRequest::ExecuteNextStep()  0x00009f0b   Thumb Code    74  mnrefproviderengine.in(.text)
-    CMnrpPositionRequest::FetchNewPosition(int) 0x00009f55   Thumb Code    28  mnrefproviderengine.in(.text)
-    CMnrpPositionRequest::GetPosition(TPositionInfo&) 0x00009f71   Thumb Code    18  mnrefproviderengine.in(.text)
-    CMnrpPositionRequest::Speed()            0x00009f83   Thumb Code     6  mnrefproviderengine.in(.text)
-    CMnrpPositionRequest::Heading()          0x00009f89   Thumb Code     6  mnrefproviderengine.in(.text)
-    CMnrpPositionRequest::MagneticHeading()  0x00009f8f   Thumb Code     6  mnrefproviderengine.in(.text)
-    CMnrpPositionRequest::Course()           0x00009f95   Thumb Code     6  mnrefproviderengine.in(.text)
-    CMnrpPositionRequest::MagneticCourse()   0x00009f9b   Thumb Code     6  mnrefproviderengine.in(.text)
-    CMnrpPositionRequest::DoCancel()         0x00009fa1   Thumb Code    36  mnrefproviderengine.in(.text)
-    CMnrpPositionRequest::SaveContainer(const HPositionGenericInfo&) 0x00009fc5   Thumb Code   116  mnrefproviderengine.in(.text)
-    CMnrpPositionRequest::RunL()             0x0000a039   Thumb Code    64  mnrefproviderengine.in(.text)
-    CMnrpPositionRequest::RunError(int)      0x0000a079   Thumb Code     4  mnrefproviderengine.in(.text)
-    MnrpUtils::CoordinateToString(double, TDes16&, int, int) 0x0000a08d   Thumb Code   426  mnrefproviderengine.in(.text)
-    MnrpUtils::DistanceToString(double, TDes16&) 0x0000a237   Thumb Code   164  mnrefproviderengine.in(.text)
-    MnrpUtils::AngleToString(double, TDes16&) 0x0000a2db   Thumb Code   260  mnrefproviderengine.in(.text)
-    MnrpUtils::SpeedToString(double, TDes16&) 0x0000a3df   Thumb Code    66  mnrefproviderengine.in(.text)
-    MnrpUtils::PrintableStringLC(const TDesC16&) 0x0000a421   Thumb Code   204  mnrefproviderengine.in(.text)
-    _E32Dll_Body                             0x0000a4ed   Thumb Code    34  uc_dll.o(.text)
-    __DLL_Export_Table__                     0x0000a580   ARM Code       0  mnrefproviderengine{000a0000}.exp(ExportTable)
-    DLL##ExportTableSize                     0x0000a584   Data           0  mnrefproviderengine{000a0000}.exp(ExportTable)
-    DLL##ExportTable                         0x0000a588   Data           0  mnrefproviderengine{000a0000}.exp(ExportTable)
-    TRealX::SetNaN()                         0x0000a680   ARM Code       0  euser{000a0000}-1051.o(StubCode)
-    TRealX::TRealX()                         0x0000a688   ARM Code       0  euser{000a0000}-1059.o(StubCode)
-    TRealX::operator double() const          0x0000a690   ARM Code       0  euser{000a0000}-1073.o(StubCode)
-    TRealX::operator float() const           0x0000a698   ARM Code       0  euser{000a0000}-1074.o(StubCode)
-    CActive::Cancel()                        0x0000a6a0   ARM Code       0  euser{000a0000}-1088.o(StubCode)
-    CActive::SetActive()                     0x0000a6a8   ARM Code       0  euser{000a0000}-1090.o(StubCode)
-    CActive::CActive__sub_object(int)        0x0000a6b0   ARM Code       0  euser{000a0000}-1091.o(StubCode)
-    CActive::~CActive__sub_object()          0x0000a6b8   ARM Code       0  euser{000a0000}-1094.o(StubCode)
-    HBufC16::Des()                           0x0000a6c0   ARM Code       0  euser{000a0000}-1116.o(StubCode)
-    HBufC16::NewLC(int)                      0x0000a6c8   ARM Code       0  euser{000a0000}-1119.o(StubCode)
-    TPtrC16::TPtrC16(const TDesC16&)         0x0000a6d0   ARM Code       0  euser{000a0000}-1171.o(StubCode)
-    TPtrC16::TPtrC16()                       0x0000a6d8   ARM Code       0  euser{000a0000}-1172.o(StubCode)
-    RHandleBase::Close()                     0x0000a6e0   ARM Code       0  euser{000a0000}-120.o(StubCode)
-    RArrayBase::At(int) const                0x0000a6e8   ARM Code       0  euser{000a0000}-1507.o(StubCode)
-    RArrayBase::Count() const                0x0000a6f0   ARM Code       0  euser{000a0000}-1510.o(StubCode)
-    RPointerArrayBase::At(int) const         0x0000a6f8   ARM Code       0  euser{000a0000}-1590.o(StubCode)
-    RPointerArrayBase::Count() const         0x0000a700   ARM Code       0  euser{000a0000}-1593.o(StubCode)
-    TChar::IsPrint() const                   0x0000a708   ARM Code       0  euser{000a0000}-1625.o(StubCode)
-    TRect::Intersects(const TRect&) const    0x0000a710   ARM Code       0  euser{000a0000}-1646.o(StubCode)
-    TRect::Size() const                      0x0000a718   ARM Code       0  euser{000a0000}-1648.o(StubCode)
-    TRect::Width() const                     0x0000a720   ARM Code       0  euser{000a0000}-1649.o(StubCode)
-    TRect::Height() const                    0x0000a728   ARM Code       0  euser{000a0000}-1651.o(StubCode)
-    TPoint::operator +(const TPoint&) const  0x0000a730   ARM Code       0  euser{000a0000}-1753.o(StubCode)
-    TDesC16::AtC(int) const                  0x0000a738   ARM Code       0  euser{000a0000}-1806.o(StubCode)
-    TDesC16::FindF(const TDesC16&) const     0x0000a740   ARM Code       0  euser{000a0000}-1815.o(StubCode)
-    TDesC16::AllocLC() const                 0x0000a748   ARM Code       0  euser{000a0000}-1821.o(StubCode)
-    TDesC16::CompareF(const TDesC16&) const  0x0000a750   ARM Code       0  euser{000a0000}-1826.o(StubCode)
-    CleanupStack::PopAndDestroy()            0x0000a758   ARM Code       0  euser{000a0000}-203.o(StubCode)
-    CleanupStack::Pop()                      0x0000a760   ARM Code       0  euser{000a0000}-205.o(StubCode)
-    User::MarkCleanupStack()                 0x0000a768   ARM Code       0  euser{000a0000}-2060.o(StubCode)
-    User::UnMarkCleanupStack(TTrapHandler*)  0x0000a770   ARM Code       0  euser{000a0000}-2061.o(StubCode)
-    CleanupStack::PushL(TCleanupItem)        0x0000a778   ARM Code       0  euser{000a0000}-207.o(StubCode)
-    CleanupStack::PushL(CBase*)              0x0000a780   ARM Code       0  euser{000a0000}-208.o(StubCode)
-    XLeaveException::GetReason() const       0x0000a788   ARM Code       0  euser{000a0000}-2082.o(StubCode)
-    CleanupStack::PushL(void*)               0x0000a790   ARM Code       0  euser{000a0000}-209.o(StubCode)
-    CBase::Extension_(unsigned, void*&, void*) 0x0000a798   ARM Code       0  euser{000a0000}-2123.o(StubCode)
-    CBase::~CBase()                          0x0000a7a0   ARM Code       0  euser{000a0000}-2125.o(StubCode)
-    CActive::Extension_(unsigned, void*&, void*) 0x0000a7a8   ARM Code       0  euser{000a0000}-2128.o(StubCode)
-    CActiveScheduler::Add(CActive*)          0x0000a7b0   ARM Code       0  euser{000a0000}-424.o(StubCode)
-    RArrayBase::Close()                      0x0000a7b8   ARM Code       0  euser{000a0000}-46.o(StubCode)
-    RPointerArrayBase::GetElementPtr(const CBase*, int) 0x0000a7c0   ARM Code       0  euser{000a0000}-464.o(StubCode)
-    RArrayBase::Reset()                      0x0000a7c8   ARM Code       0  euser{000a0000}-47.o(StubCode)
-    RPointerArrayBase::Reset()               0x0000a7d0   ARM Code       0  euser{000a0000}-471.o(StubCode)
-    RPointerArrayBase::Append(const void*)   0x0000a7d8   ARM Code       0  euser{000a0000}-472.o(StubCode)
-    RPointerArrayBase::GetCount(const CBase*) 0x0000a7e0   ARM Code       0  euser{000a0000}-476.o(StubCode)
-    RArrayBase::Append(const void*)          0x0000a7e8   ARM Code       0  euser{000a0000}-48.o(StubCode)
-    RPointerArrayBase::RPointerArrayBase()   0x0000a7f0   ARM Code       0  euser{000a0000}-481.o(StubCode)
-    RArrayBase::Insert(const void*, int)     0x0000a7f8   ARM Code       0  euser{000a0000}-49.o(StubCode)
-    RArrayBase::Remove(int)                  0x0000a800   ARM Code       0  euser{000a0000}-50.o(StubCode)
-    RArrayBase::RArrayBase(int)              0x0000a808   ARM Code       0  euser{000a0000}-55.o(StubCode)
-    Math::IsNaN(const double&)               0x0000a810   ARM Code       0  euser{000a0000}-551.o(StubCode)
-    User::LeaveIfError(int)                  0x0000a818   ARM Code       0  euser{000a0000}-593.o(StubCode)
-    User::Leave(int)                         0x0000a820   ARM Code       0  euser{000a0000}-649.o(StubCode)
-    User::AllocZL(int)                       0x0000a828   ARM Code       0  euser{000a0000}-654.o(StubCode)
-    User::Invariant()                        0x0000a830   ARM Code       0  euser{000a0000}-669.o(StubCode)
-    TBufBase16::TBufBase16(int)              0x0000a838   ARM Code       0  euser{000a0000}-81.o(StubCode)
-    TRect::Grow(int, int)                    0x0000a840   ARM Code       0  euser{000a0000}-824.o(StubCode)
-    TRect::Move(int, int)                    0x0000a848   ARM Code       0  euser{000a0000}-826.o(StubCode)
-    TRect::TRect(const TSize&)               0x0000a850   ARM Code       0  euser{000a0000}-838.o(StubCode)
-    TRect::TRect(const TPoint&, const TSize&) 0x0000a858   ARM Code       0  euser{000a0000}-839.o(StubCode)
-    TRect::TRect(int, int, int, int)         0x0000a860   ARM Code       0  euser{000a0000}-841.o(StubCode)
-    TDes16::AppendFormat(TRefByValue<const TDesC16>, ...) 0x0000a868   ARM Code       0  euser{000a0000}-936.o(StubCode)
-    TDes16::Copy(const TDesC16&)             0x0000a870   ARM Code       0  euser{000a0000}-953.o(StubCode)
-    TDes16::Zero()                           0x0000a878   ARM Code       0  euser{000a0000}-960.o(StubCode)
-    TDes16::Append(TChar)                    0x0000a880   ARM Code       0  euser{000a0000}-966.o(StubCode)
-    TDes16::Append(const TDesC16&)           0x0000a888   ARM Code       0  euser{000a0000}-968.o(StubCode)
-    TDes16::Format(TRefByValue<const TDesC16>, ...) 0x0000a890   ARM Code       0  euser{000a0000}-973.o(StubCode)
-    TDes16::AppendNum(long long)             0x0000a898   ARM Code       0  euser{000a0000}-984.o(StubCode)
-    TParse::Set(const TDesC16&, const TDesC16*, const TDesC16*) 0x0000a8a0   ARM Code       0  efsrv{000a0000}-115.o(StubCode)
-    TParse::TParse()                         0x0000a8a8   ARM Code       0  efsrv{000a0000}-118.o(StubCode)
-    TFindFile::FindByDir(const TDesC16&, const TDesC16&) 0x0000a8b0   ARM Code       0  efsrv{000a0000}-181.o(StubCode)
-    TFindFile::TFindFile(RFs&)               0x0000a8b8   ARM Code       0  efsrv{000a0000}-182.o(StubCode)
-    TParseBase::NameAndExt() const           0x0000a8c0   ARM Code       0  efsrv{000a0000}-190.o(StubCode)
-    TParseBase::Path() const                 0x0000a8c8   ARM Code       0  efsrv{000a0000}-200.o(StubCode)
-    TParseBase::FullName() const             0x0000a8d0   ARM Code       0  efsrv{000a0000}-204.o(StubCode)
-    RFs::Connect(int)                        0x0000a8d8   ARM Code       0  efsrv{000a0000}-68.o(StubCode)
-    RResourceReader::ReadHBufCL()            0x0000a8e0   ARM Code       0  bafl{000a0000}-123.o(StubCode)
-    RResourceReader::ReadInt16L()            0x0000a8e8   ARM Code       0  bafl{000a0000}-124.o(StubCode)
-    RResourceReader::ReadReal64L()           0x0000a8f0   ARM Code       0  bafl{000a0000}-129.o(StubCode)
-    RResourceReader::OpenLC(const CResourceFile*, int) 0x0000a8f8   ARM Code       0  bafl{000a0000}-141.o(StubCode)
-    RResourceReader::RResourceReader()       0x0000a900   ARM Code       0  bafl{000a0000}-145.o(StubCode)
-    RResourceReader::~RResourceReader()      0x0000a908   ARM Code       0  bafl{000a0000}-147.o(StubCode)
-    CResourceFile::ConfirmSignatureL(int)    0x0000a910   ARM Code       0  bafl{000a0000}-59.o(StubCode)
-    CResourceFile::NewLC(RFs&, const TDesC16&, unsigned, int) 0x0000a918   ARM Code       0  bafl{000a0000}-62.o(StubCode)
-    AknIconUtils::CreateIconL(CFbsBitmap*&, CFbsBitmap*&, const TDesC16&, int, int) 0x0000a920   ARM Code       0  AknIcon{000a0000}-11.o(StubCode)
-    AknIconUtils::DestroyIconData(CFbsBitmap*) 0x0000a928   ARM Code       0  AknIcon{000a0000}-15.o(StubCode)
-    AknIconUtils::PreserveIconData(CFbsBitmap*) 0x0000a930   ARM Code       0  AknIcon{000a0000}-16.o(StubCode)
-    AknIconUtils::SetSize(CFbsBitmap*, const TSize&, TScaleMode) 0x0000a938   ARM Code       0  AknIcon{000a0000}-21.o(StubCode)
-    CFont::HeightInPixels() const            0x0000a940   ARM Code       0  gdi{000a0000}-311.o(StubCode)
-    CFont::TextWidthInPixels(const TDesC16&) const 0x0000a948   ARM Code       0  gdi{000a0000}-314.o(StubCode)
-    CFbsDevice::CreateContext(CFbsBitGc*&)   0x0000a950   ARM Code       0  bitgdi{000a0000}-14.o(StubCode)
-    CFbsBitmapDevice::NewL(CFbsBitmap*)      0x0000a958   ARM Code       0  bitgdi{000a0000}-44.o(StubCode)
-    CPosLandmark::NewL(const CPosLandmark&)  0x0000a960   ARM Code       0  eposlandmarks{000a0000}-12.o(StubCode)
-    CPosLandmark::NewLC(const CPosLandmark&) 0x0000a968   ARM Code       0  eposlandmarks{000a0000}-14.o(StubCode)
-    CPosLandmark::NewLC()                    0x0000a970   ARM Code       0  eposlandmarks{000a0000}-15.o(StubCode)
-    CPosLandmark::SetPositionL(const TLocality&) 0x0000a978   ARM Code       0  eposlandmarks{000a0000}-4.o(StubCode)
-    CPosLandmarkDatabase::OpenL(const TDesC16&) 0x0000a980   ARM Code       0  eposlandmarks{000a0000}-50.o(StubCode)
-    CPosLandmarkDatabase::OpenL()            0x0000a988   ARM Code       0  eposlandmarks{000a0000}-51.o(StubCode)
-    CPosLmCategoryManager::NewL(CPosLandmarkDatabase&) 0x0000a990   ARM Code       0  eposlandmarks{000a0000}-56.o(StubCode)
-    CPosLandmark::SetLandmarkNameL(const TDesC16&) 0x0000a998   ARM Code       0  eposlandmarks{000a0000}-6.o(StubCode)
-    CPosLandmark::GetPosition(TLocality&) const 0x0000a9a0   ARM Code       0  eposlandmarks{000a0000}-65.o(StubCode)
-    CPosLandmark::GetCategoriesL(RArray<unsigned long>&) const 0x0000a9a8   ARM Code       0  eposlandmarks{000a0000}-66.o(StubCode)
-    CPosLandmark::GetLandmarkName(TPtrC16&) const 0x0000a9b0   ARM Code       0  eposlandmarks{000a0000}-67.o(StubCode)
-    CPosLandmark::GetPositionField(unsigned short, TPtrC16&) const 0x0000a9b8   ARM Code       0  eposlandmarks{000a0000}-68.o(StubCode)
-    CPosLandmark::GetIcon(TPtrC16&, int&, int&) const 0x0000a9c0   ARM Code       0  eposlandmarks{000a0000}-75.o(StubCode)
-    CPosLandmark::SetPositionFieldL(unsigned short, const TDesC16&) 0x0000a9c8   ARM Code       0  eposlandmarks{000a0000}-8.o(StubCode)
-    CPosLandmarkCategory::GetIcon(TPtrC16&, int&, int&) const 0x0000a9d0   ARM Code       0  eposlandmarks{000a0000}-82.o(StubCode)
-    RPositioner::Open(RPositionServer&)      0x0000a9d8   ARM Code       0  lbs{000a0000}-10.o(StubCode)
-    RPositioner::Close()                     0x0000a9e0   ARM Code       0  lbs{000a0000}-13.o(StubCode)
-    RPositioner::RPositioner()               0x0000a9e8   ARM Code       0  lbs{000a0000}-15.o(StubCode)
-    TPositionUpdateOptions::TPositionUpdateOptions() 0x0000a9f0   ARM Code       0  lbs{000a0000}-152.o(StubCode)
-    RPositionerSubSessionBase::CancelRequest(int) 0x0000a9f8   ARM Code       0  lbs{000a0000}-167.o(StubCode)
-    TCoordinate::SetCoordinate(const double&, const double&) 0x0000aa00   ARM Code       0  lbs{000a0000}-17.o(StubCode)
-    TPositionUpdateOptionsBase::SetUpdateTimeOut(TTimeIntervalMicroSeconds) 0x0000aa08   ARM Code       0  lbs{000a0000}-180.o(StubCode)
-    TPositionUpdateOptionsBase::SetUpdateInterval(TTimeIntervalMicroSeconds) 0x0000aa10   ARM Code       0  lbs{000a0000}-181.o(StubCode)
-    TLocality::TLocality(const TCoordinate&, float) 0x0000aa18   ARM Code       0  lbs{000a0000}-205.o(StubCode)
-    TLocality::TLocality()                   0x0000aa20   ARM Code       0  lbs{000a0000}-207.o(StubCode)
-    TCoordinate::TCoordinate(const double&, const double&) 0x0000aa28   ARM Code       0  lbs{000a0000}-21.o(StubCode)
-    TPosition::TPosition()                   0x0000aa30   ARM Code       0  lbs{000a0000}-214.o(StubCode)
-    RPositioner::GetLastKnownPosition(TPositionInfoBase&, TRequestStatus&) const 0x0000aa38   ARM Code       0  lbs{000a0000}-218.o(StubCode)
-    RPositioner::NotifyPositionUpdate(TPositionInfoBase&, TRequestStatus&) const 0x0000aa40   ARM Code       0  lbs{000a0000}-219.o(StubCode)
-    TCoordinate::Latitude() const            0x0000aa48   ARM Code       0  lbs{000a0000}-223.o(StubCode)
-    TCoordinate::Longitude() const           0x0000aa50   ARM Code       0  lbs{000a0000}-225.o(StubCode)
-    TPositionInfo::GetPosition(TPosition&) const 0x0000aa58   ARM Code       0  lbs{000a0000}-226.o(StubCode)
-    TCoordinate::TCoordinate()               0x0000aa60   ARM Code       0  lbs{000a0000}-23.o(StubCode)
-    TPositionInfo::TPositionInfo()           0x0000aa68   ARM Code       0  lbs{000a0000}-28.o(StubCode)
-    TLocality::HorizontalAccuracy() const    0x0000aa70   ARM Code       0  lbs{000a0000}-303.o(StubCode)
-    TLocality::Distance(const TCoordinate&, float&) const 0x0000aa78   ARM Code       0  lbs{000a0000}-304.o(StubCode)
-    RPositionServer::Close()                 0x0000aa80   ARM Code       0  lbs{000a0000}-47.o(StubCode)
-    RPositionServer::Connect()               0x0000aa88   ARM Code       0  lbs{000a0000}-48.o(StubCode)
-    RPositionServer::RPositionServer()       0x0000aa90   ARM Code       0  lbs{000a0000}-49.o(StubCode)
-    RPositioner::SetRequestor(int, int, const TDesC16&) 0x0000aa98   ARM Code       0  lbs{000a0000}-7.o(StubCode)
-    RPositioner::SetUpdateOptions(const TPositionUpdateOptionsBase&) 0x0000aaa0   ARM Code       0  lbs{000a0000}-8.o(StubCode)
-    HPositionGenericInfo::ClearPositionData() 0x0000aaa8   ARM Code       0  lbs{000a0000}-82.o(StubCode)
-    HPositionGenericInfo::SetRequestedField(unsigned short) 0x0000aab0   ARM Code       0  lbs{000a0000}-83.o(StubCode)
-    HPositionGenericInfo::NewL(int, int)     0x0000aab8   ARM Code       0  lbs{000a0000}-87.o(StubCode)
-    PositionFieldManager::GetValue(unsigned short, float&, const HPositionGenericInfo&) 0x0000aac0   ARM Code       0  lbs{000a0000}-97.o(StubCode)
-    CMnMapViewServiceBase::LinkedLandmarksToShow(int) 0x0000aac8   ARM Code       0  mnservicelib{000a0000}-10.o(StubCode)
-    CMnMapViewServiceBase::LandmarksToShowDatabases() 0x0000aad0   ARM Code       0  mnservicelib{000a0000}-13.o(StubCode)
-    CMnMapViewServiceBase::AreaRadius()      0x0000aad8   ARM Code       0  mnservicelib{000a0000}-3.o(StubCode)
-    CMnMapViewServiceBase::LandmarksToShow() 0x0000aae0   ARM Code       0  mnservicelib{000a0000}-5.o(StubCode)
-    CMnMapImageServiceBase::ShowOptions() const 0x0000aae8   ARM Code       0  mnservicelib{000a0000}-55.o(StubCode)
-    CMnMapImageServiceBase::MapImageParams() const 0x0000aaf0   ARM Code       0  mnservicelib{000a0000}-57.o(StubCode)
-    CMnMapViewServiceBase::GetAreaCentralPoint(TCoordinate&) 0x0000aaf8   ARM Code       0  mnservicelib{000a0000}-6.o(StubCode)
-    CMnMapViewServiceBase::CurrentLocationOption() 0x0000ab00   ARM Code       0  mnservicelib{000a0000}-8.o(StubCode)
-    CMnMapViewServiceBase::IsAreaCentralPointSet() 0x0000ab08   ARM Code       0  mnservicelib{000a0000}-9.o(StubCode)
-    __aeabi_dadd                             0x0000ab10   ARM Code       0  dfpaeabi{000a0000}-12.o(StubCode)
-    __aeabi_ddiv                             0x0000ab18   ARM Code       0  dfpaeabi{000a0000}-19.o(StubCode)
-    __aeabi_cdcmple                          0x0000ab20   ARM Code       0  dfpaeabi{000a0000}-2.o(StubCode)
-    __aeabi_dmul                             0x0000ab28   ARM Code       0  dfpaeabi{000a0000}-20.o(StubCode)
-    __aeabi_drsub                            0x0000ab30   ARM Code       0  dfpaeabi{000a0000}-22.o(StubCode)
-    __aeabi_dsub                             0x0000ab38   ARM Code       0  dfpaeabi{000a0000}-23.o(StubCode)
-    __aeabi_f2d                              0x0000ab40   ARM Code       0  dfpaeabi{000a0000}-24.o(StubCode)
-    __aeabi_f2iz                             0x0000ab48   ARM Code       0  dfpaeabi{000a0000}-25.o(StubCode)
-    __aeabi_cdrcmple                         0x0000ab50   ARM Code       0  dfpaeabi{000a0000}-3.o(StubCode)
-    __aeabi_fdiv                             0x0000ab58   ARM Code       0  dfpaeabi{000a0000}-36.o(StubCode)
-    __aeabi_i2d                              0x0000ab60   ARM Code       0  dfpaeabi{000a0000}-41.o(StubCode)
-    __aeabi_cfcmple                          0x0000ab68   ARM Code       0  dfpaeabi{000a0000}-5.o(StubCode)
-    __aeabi_d2iz                             0x0000ab70   ARM Code       0  dfpaeabi{000a0000}-8.o(StubCode)
-    __aeabi_idivmod                          0x0000ab78   ARM Code       0  drtaeabi{000a0000}-135.o(StubCode)
-    __aeabi_memcpy4                          0x0000ab80   ARM Code       0  drtaeabi{000a0000}-147.o(StubCode)
-    __aeabi_unwind_cpp_pr0                   0x0000ab88   ARM Code       0  drtaeabi{000a0000}-158.o(StubCode)
-    __aeabi_unwind_cpp_pr1                   0x0000ab90   ARM Code       0  drtaeabi{000a0000}-159.o(StubCode)
-    __cxa_begin_catch                        0x0000ab98   ARM Code       0  drtaeabi{000a0000}-180.o(StubCode)
-    __cxa_end_catch                          0x0000aba0   ARM Code       0  drtaeabi{000a0000}-183.o(StubCode)
-    __cxa_end_cleanup                        0x0000aba8   ARM Code       0  drtaeabi{000a0000}-184.o(StubCode)
-    operator delete (void*)                  0x0000abb0   ARM Code       0  scppnwdl{000a0000}-3.o(StubCode)
-    ExecuteAndDeleteLD(CPosLmOperation*)     0x0000abb9   Thumb Code    22  mnrefproviderengine.in(i._Z18ExecuteAndDeleteLDP15CPosLmOperation)
-    TPtrC16::Set(const TDesC16&)             0x0000abcf   Thumb Code    28  mnrefproviderengine.in(i._ZN7TPtrC163SetERK7TDesC16)
-    operator delete (void*, void*)           0x0000abf7   Thumb Code     2  mnrefproviderengine.in(i._ZdlPvS_)
-    operator new(unsigned, void*)            0x0000abf9   Thumb Code     4  mnrefproviderengine.in(i._ZnwjPv)
-    CleanupClosePushL<RArray<CMnrpEngine::TDistanceToPoi>>(T1&) 0x0000abfd   Thumb Code    12  mnrefproviderengine.in(t._Z17CleanupClosePushLI6RArrayIN11CMnrpEngine14TDistanceToPoiEEEvRT_)
-    Abs<double>(T1)                          0x0000ac0d   Thumb Code    36  mnrefproviderengine.in(t._Z3AbsIdET_S0_)
-    Max<double>(T1, T1)                      0x0000ac39   Thumb Code    28  mnrefproviderengine.in(t._Z3MaxIdET_S0_S0_)
-    Min<double>(T1, T1)                      0x0000ac55   Thumb Code    28  mnrefproviderengine.in(t._Z3MinIdET_S0_S0_)
-    CleanupClose<RArray<CMnrpEngine::TDistanceToPoi>>::Close(void*) 0x0000ac71   Thumb Code     8  mnrefproviderengine.in(t._ZN12CleanupCloseI6RArrayIN11CMnrpEngine14TDistanceToPoiEEE5CloseEPv)
-    CleanupClose<RArray<unsigned long>>::Close(void*) 0x0000ac79   Thumb Code     8  mnrefproviderengine.in(t._ZN12CleanupCloseI6RArrayImEE5CloseEPv)
-    RPointerArray<CPosLandmark>::AppendL(const CPosLandmark*) 0x0000ac81   Thumb Code    12  mnrefproviderengine.in(t._ZN13RPointerArrayI12CPosLandmarkE7AppendLEPKS0_)
-    RPointerArray<CMnrpMapModel::CDrawItem>::ResetAndDestroy() 0x0000ac8d   Thumb Code    48  mnrefproviderengine.in(t._ZN13RPointerArrayIN13CMnrpMapModel9CDrawItemEE15ResetAndDestroyEv)
-    RPointerArray<CMnrpMapModel::CDrawItem>::AppendL(const CMnrpMapModel::CDrawItem*) 0x0000acbd   Thumb Code    12  mnrefproviderengine.in(t._ZN13RPointerArrayIN13CMnrpMapModel9CDrawItemEE7AppendLEPKS1_)
-    HPositionGenericInfo::GetValue<float>(unsigned short, T1&) const 0x0000acc9   Thumb Code    16  mnrefproviderengine.in(t._ZNK20HPositionGenericInfo8GetValueIfEEitRT_)
-    RArray<CMnrpEngine::TDistanceToPoi>::Count() const 0x0000acd9   Thumb Code     8  mnrefproviderengine.in(t._ZNK6RArrayIN11CMnrpEngine14TDistanceToPoiEE5CountEv)
-    TArray<CPosLandmark*>::operator [](int) const 0x0000ace1   Thumb Code     8  mnrefproviderengine.in(t._ZNK6TArrayIP12CPosLandmarkEixEi)
-    TArray<CMnrpMapModel::CDrawItem*>::operator [](int) const 0x0000ace9   Thumb Code     8  mnrefproviderengine.in(t._ZNK6TArrayIPN13CMnrpMapModel9CDrawItemEEixEi)
-    typeinfo for CMnrpEngine                 0x0000af94   Data          12  mnrefproviderengine.in(.constdata__ZTI11CMnrpEngine)
-    typeinfo for CMnrpMapModel               0x0000afa0   Data          32  mnrefproviderengine.in(.constdata__ZTI13CMnrpMapModel)
-    typeinfo for CMnrpPositionRequest        0x0000afc0   Data          12  mnrefproviderengine.in(.constdata__ZTI20CMnrpPositionRequest)
-    typeinfo for MMnrpPositionObserver       0x0000afcc   Data           8  mnrefproviderengine.in(.constdata__ZTI21MMnrpPositionObserver)
-    typeinfo for CMnrpMapModel::CDrawItem    0x0000afd4   Data          12  mnrefproviderengine.in(.constdata__ZTIN13CMnrpMapModel9CDrawItemE)
-    typeinfo name for CMnrpEngine            0x0000afe0   Data          14  mnrefproviderengine.in(.constdata__ZTS11CMnrpEngine)
-    typeinfo name for CMnrpMapModel          0x0000afee   Data          16  mnrefproviderengine.in(.constdata__ZTS13CMnrpMapModel)
-    typeinfo name for CMnrpPositionRequest   0x0000affe   Data          23  mnrefproviderengine.in(.constdata__ZTS20CMnrpPositionRequest)
-    typeinfo name for MMnrpPositionObserver  0x0000b015   Data          24  mnrefproviderengine.in(.constdata__ZTS21MMnrpPositionObserver)
-    typeinfo name for CMnrpMapModel::CDrawItem 0x0000b02d   Data          28  mnrefproviderengine.in(.constdata__ZTSN13CMnrpMapModel9CDrawItemE)
-    vtable for CMnrpEngine                   0x0000b04c   Data          20  mnrefproviderengine.in(.constdata__ZTV11CMnrpEngine)
-    vtable for CMnrpMapModel                 0x0000b060   Data          36  mnrefproviderengine.in(.constdata__ZTV13CMnrpMapModel)
-    vtable for CMnrpPositionRequest          0x0000b084   Data          32  mnrefproviderengine.in(.constdata__ZTV20CMnrpPositionRequest)
-    vtable for CMnrpMapModel::CDrawItem      0x0000b0a4   Data          20  mnrefproviderengine.in(.constdata__ZTVN13CMnrpMapModel9CDrawItemE)
-    .ARM.exidx$$Base                         0x0000b0b8   Number         0  ucppinit_aeabi.o(.ARM.exidx)
-    .ARM.exidx$$Limit                        0x0000b358   Number         0  mnrefproviderengine.in(.ARM.exidx)
-    Image$$ER_RO$$Limit                      0x0000b358   Number         0  anon$$obj.o(linker$$defined$$symbols)
-
Binary file locsrv_plat/map_and_navigation_api/tsrc/data/armv5/urel/mnrefproviderengine.rsc has changed
Binary file locsrv_plat/map_and_navigation_api/tsrc/data/winscw/udeb/MnRefProviderPlugin.dll has changed
Binary file locsrv_plat/map_and_navigation_api/tsrc/data/winscw/udeb/mnrefprovider.exe has changed
Binary file locsrv_plat/map_and_navigation_api/tsrc/data/winscw/udeb/mnrefproviderback.exe has changed
Binary file locsrv_plat/map_and_navigation_api/tsrc/data/winscw/udeb/mnrefproviderengine.dll has changed
--- a/locsrv_plat/map_and_navigation_api/tsrc/eabi/testmapandnavapiu.def	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-EXPORTS
-	_Z9LibEntryLR13CTestModuleIf @ 1 NONAME
-	_ZTI14CTestMnMapView @ 2 NONAME ; #<TI>#
-	_ZTI16CTestMnNavigator @ 3 NONAME ; #<TI>#
-	_ZTV14CTestMnMapView @ 4 NONAME ; #<VT>#
-	_ZTV16CTestMnNavigator @ 5 NONAME ; #<VT>#
-
--- a/locsrv_plat/map_and_navigation_api/tsrc/group/bld.inf	Mon May 03 12:54:42 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: Build information file for test code of Map and Navigation API
-*
-*/
-
-
-
-PRJ_PLATFORMS
-// specify the platforms your component needs to be built for here
-// defaults to WINS MARM so you can ignore this if you just build these
-DEFAULT
-
-PRJ_TESTEXPORTS
-// NOTE: If using ARS requirements all export operations should be done under this.
-// 'abld test export'
-
-PRJ_EXPORTS
-// Specify the source file followed by its destination here
-// copy will be used to copy the source file to its destination
-// If there's no destination then the source file will be copied
-// to the same name in /epoc32/include
-// Example: 
-/*
-/agnmodel/inc/AGMCOMON.H
-*/
-
-PRJ_TESTMMPFILES
-// NOTE: If using ARS requirements .mmp file operation should be done under this.
-// 'abld test build'
-testmapandnavapi.mmp
-
-PRJ_MMPFILES
-// Specify the .mmp files required for building the important component
-// releasables.
-//
-// Specify "tidy" if the component you need to build doesn't need to be
-// released. Specify "ignore" if the MMP file exists but should be
-// ignored.
-// Example:
-/*
-/agnmodel/group/agnmodel.mmp
-#if defined(MARM)
-/agnmodel/group/agsvexe.mmp
-#endif
-*/
-
-//  End of File
\ No newline at end of file
--- a/locsrv_plat/map_and_navigation_api/tsrc/group/map_and_navigation_api_test.pkg	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,58 +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: Package file for test code of Map and Navigation API
-;
-;
-; Installation file for map_and_navigation_api_test application
-;
-;Languages
-&EN
-;
-; UID is the app's UID
-;
-#{"map_and_navigation_api_test"},(0x101FB3E3),2,0,0,TYPE=SA
-;
-; Localised Vendor name
-%{"Nokia"}
-
-; Unique Vendor name
-:"Nokia"
-
-;Supports Series 60 v 3.0
-;This line indicates that this installation is for the Series 60 platform v0.9
-;This line must appear _exactly_ as shown below in the sis file
-;If this line is missing or incorrect, the sis file will not be able
-;to be installed on Series 60 v3.0 platforms
-;(0x101F7961), 0, 0, 0, {"Series60ProductID"}
-;
-;
-; Files to install
-"\epoc32\release\armv5\urel\testmapandnavapi.dll"-"C:\sys\bin\testmapandnavapi.dll"
-
-;refapp dlls
-"..\data\armv5\urel\mnrefprovider.exe"-"C:\sys\bin\mnrefprovider.exe"
-"..\data\armv5\urel\mnrefprovider.rsc"-"C:\resource\apps\mnrefprovider.rsc"
-"..\data\armv5\urel\mnrefprovider.mbm"-"C:\resource\apps\mnrefprovider.mbm"
-"..\data\armv5\urel\mnrefprovider.mif"-"C:\resource\apps\mnrefprovider.mif"
-"..\data\armv5\urel\mnrefprovider_reg.rsc"-"C:\private\10003a3f\import\apps\mnrefprovider_reg.rsc"
-
-"..\data\armv5\urel\mnrefproviderback.exe"-"C:\sys\bin\mnrefproviderback.exe"
-"..\data\armv5\urel\mnrefproviderback.rsc"-"C:\resource\apps\mnrefproviderback.rsc"
-"..\data\armv5\urel\mnrefproviderback_reg.rsc"-"C:\private\10003a3f\import\apps\mnrefproviderback_reg.rsc"
-
-"..\data\armv5\urel\mnrefproviderengine.dll"-"C:\sys\bin\mnrefproviderengine.dll"
-"..\data\armv5\urel\mnrefproviderengine.rsc"-"C:\resource\mnrefproviderengine.rsc"
-
-"..\conf\testmapandnavapi.cfg"-"C:\testframework\testmapandnavapi.cfg"
-"..\init\testframework.ini"-"C:\testframework\testframework.ini"
\ No newline at end of file
--- a/locsrv_plat/map_and_navigation_api/tsrc/group/testmapandnavapi.mmp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,84 +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: Project definition file for test code of Map and Navigation API
-*
-*/
-
-
-
-#include <platform_paths.hrh>
-
-TARGET          testmapandnavapi.dll
-TARGETTYPE      dll
-UID             0x1000008D 0x101FB3E3
-
-CAPABILITY      ALL -TCB
-/* Remove comments and replace 0x00000000 with correct vendor id */
-// VENDORID     0x00000000
-/* Remove comments and replace 0x00000000 with correct secure id */
-// SECUREID     0x00000000
-
-//TARGETPATH      ?target_path
-DEFFILE         testmapandnavapi.def
-
-SOURCEPATH      ../src
-SOURCE          testmapandnavapi.cpp
-SOURCE          testmapandnavapiblocks.cpp
-SOURCE			testcmnnavigator.cpp
-SOURCE			testcmnmapview.cpp
-
-//RESOURCE        resource_file
-//RESOURCE        resource_file2
-
-USERINCLUDE     ../inc 
-
-MW_LAYER_SYSTEMINCLUDE
-
-LIBRARY         euser.lib
-LIBRARY         stiftestinterface.lib
-LIBRARY			mnclientlib.lib
-LIBRARY			eposlandmarks.lib
-LIBRARY			Lbs.lib
-LIBRARY			avkon.lib
-LIBRARY			apparc.lib
-LIBRARY			swinstcli.lib
-
-LANG            SC
-
-/*
-START WINS      
-?wins_specific_information
-END
-
-START MARM
-?marm_specific_information
-END
-*/
-// Other possible keywords:
- 
-// DOCUMENT     ?file, that is not compiled, but added to MSVC project workspace (i.e. release notes)
-/*
-START BITMAP ?target
-TARGETPATH   ?emulated_path_on_target_machine
-HEADER
-SOURCE       ?color_depth ?source_bitmap
-END
-*/
-// DEFFILE ?filename
-// AIF ?filename
-
-
-SMPSAFE
-
-// End of File
--- a/locsrv_plat/map_and_navigation_api/tsrc/inc/testcmnmapview.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,164 +0,0 @@
-/*
-* Copyright (c) 2007 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: Provides testing of CMnMapView class methods
-*
-*/
-
-
-
-#ifndef CTESTMNMAPVIEW_H
-#define CTESTMNMAPVIEW_H
-
-//  INCLUDES
-#include <StifLogger.h>
-#include <TestScripterInternal.h>
-#include <StifTestModule.h>
-#include <mnnavigator.h>
-#include <AknServerApp.h>
-
-// CLASS 
-
-class CTestMnMapView : public CActive, public MAknServerAppExitObserver
-	{
-	public:	//Public constructor of class
-	
-		/**
-		*
-		*/
-		CTestMnMapView(CStifLogger* aLog);
-		
-		static CTestMnMapView* NewL(CStifLogger* aLog);
-		
-		void ConstructL();
-		
-		~CTestMnMapView();
-		
-	public:	//Public methods
-		
-	public:	//Public methods
-	
-		/**
-		*
-		*/
-		TInt CreateMapViewL( CStifItemParser& aItem );
-		
-		/**
-		*
-		*/
-		TInt CreateChainedMapViewL( CStifItemParser& aItem );
-		
-		/**
-		*
-		*/
-		TInt AddLinkedLmksToShowL( CStifItemParser& aItem );
-		
-		/**
-		*
-		*/
-		TInt AddLmksToShowL( CStifItemParser& aItem );
-		
-		/**
-		*
-		*/
-		TInt AddPackedLmksToShowL( CStifItemParser& aItem );
-		
-		/**
-		*
-		*/
-		TInt ResetLmksToShowL( CStifItemParser& aItem );
-		
-		/**
-		*
-		*/
-		TInt SetMapAreaL( CStifItemParser& aItem );
-		
-		/**
-		*
-		*/
-		TInt ResetMapAreaL( CStifItemParser& aItem );
-		
-		/**
-		*
-		*/
-		TInt SetCustomRequestTextL( CStifItemParser& aItem );
-		
-		/**
-		*
-		*/
-		TInt SetUseDefaultRequestTextL( CStifItemParser& aItem );
-		
-		/**
-		*
-		*/
-		TInt SetCurrentLocationOptionL( CStifItemParser& aItem );
-		
-		/**
-		*
-		*/
-		TInt GetCurrentLocationOptionL( CStifItemParser& aItem );
-		
-		/**
-		*
-		*/
-		TInt SetAndGetOptionsL( CStifItemParser& aItem );
-		
-		/**
-		*
-		*/
-		TInt SelectionResultTypeL( CStifItemParser& aItem );
-		
-		/**
-		*
-		*/
-		TInt ShowMapL( CStifItemParser& aItem );
-		
-		/**
-		*
-		*/
-		TInt ShowCurrentLocationL( CStifItemParser& aItem );
-		
-		/**
-		*
-		*/
-		TInt SelectFromMapL( CStifItemParser& aItem );
-		
-		/**
-		*
-		*/
-		TInt SetViewExitObserverL( CStifItemParser& aItem );
-		
-		/**
-		*
-		*/
-		TInt RemoveViewExitObserverL( CStifItemParser& aItem );
-		
-		/**
-		*
-		*/
-		void HandleServerAppExit(TInt aReason);	
-		
-	protected:
-
-		void RunL();
-	
-		void DoCancel();
-			
-	private:
-		
-		// Private members
-		CStifLogger* iLog;	//Log		
-	};
-	
-#endif // CTESTMNMAPVIEW_H
-	
\ No newline at end of file
--- a/locsrv_plat/map_and_navigation_api/tsrc/inc/testcmnnavigator.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,91 +0,0 @@
-/*
-* Copyright (c) 2007 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: Provides testing of CMnNavigator class methods
-*
-*/
-
-
-
-#ifndef CTESTMNNAVIGATOR_H
-#define CTESTMNNAVIGATOR_H
-
-//  INCLUDES
-#include <StifLogger.h>
-#include <TestScripterInternal.h>
-#include <StifTestModule.h>
-#include <mnnavigator.h>
-#include <EPos_CPosLandmark.h>
-#include <LbsPosition.h>
-#include <AknServerApp.h>
-
-
-// CLASS 
-
-class CTestMnNavigator : public CBase, public MAknServerAppExitObserver
-	{
-	public:	//Public constructor of class
-	
-		/**
-		*
-		*/
-		CTestMnNavigator(CStifLogger* aLog);
-		
-		static CTestMnNavigator* NewL(CStifLogger* aLog);
-		
-		void ConstructL();
-		
-		~CTestMnNavigator();
-		
-	public:	//Public methods
-		
-	public:	//Public methods
-	
-		/**
-		*
-		*/
-		TInt CreateNavigatorL( CStifItemParser& aItem );
-		
-		/**
-		*
-		*/
-		TInt CreateChainedNavigatorL( CStifItemParser& aItem );
-		
-		/**
-		*
-		*/
-		TInt NavigateToL( CStifItemParser& aItem );
-		
-		/**
-		*
-		*/
-		TInt SetExitObserverL( CStifItemParser& aItem );
-		
-		/**
-		*
-		*/
-		TInt RemoveExitObserverL( CStifItemParser& aItem );
-		
-		/**
-		*
-		*/
-		void HandleServerAppExit(TInt aReason);	
-		
-	private:
-		
-		// Private members
-		CStifLogger* iLog;	//Log		
-	};
-	
-#endif // CTESTMNNAVIGATOR_H
-	
\ No newline at end of file
--- a/locsrv_plat/map_and_navigation_api/tsrc/inc/testmapandnavapi.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,289 +0,0 @@
-/*
-* Copyright (c) 2007 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 test class for map_and_navigation_api
-*
-*/
-
-
-
-#ifndef TESTMAPANDNAVAPI_H
-#define TESTMAPANDNAVAPI_H
-
-//  INCLUDES
-#include <StifLogger.h>
-#include <TestScripterInternal.h>
-#include <StifTestModule.h>
-#include "testcmnnavigator.h"
-#include "testcmnmapview.h"
-
-
-// Logging path
-_LIT( KtestmapandnavapiLogPath, "\\logs\\testframework\\testmapandnavapi\\" ); 
-// Log file
-_LIT( KtestmapandnavapiLogFile, "testmapandnavapi.txt" ); 
-
-
-// FORWARD DECLARATIONS
-class CTestMapAndNavApi;
-
-
-
-// CLASS DECLARATION
-
-/**
-*  Ctestmapandnavapi test class for STIF Test Framework TestScripter.
-*  ?other_description_lines
-*
-*  @lib ?library
-*  @since ?Series60_version
-*/
-NONSHARABLE_CLASS(CTestMapAndNavApi) : public CScriptBase
-    {
-    public:  // Constructors and destructor
-
-        /**
-        * Two-phased constructor.
-        */
-        static CTestMapAndNavApi* NewL( CTestModuleIf& aTestModuleIf );
-
-        /**
-        * Destructor.
-        */
-        virtual ~CTestMapAndNavApi();
-        
-        
-
-    public: // Functions from base classes
-
-        /**
-        * From CScriptBase Runs a script line.
-        * @since ?Series60_version
-        * @param aItem Script line containing method name and parameters
-        * @return Symbian OS error code
-        */
-        virtual TInt RunMethodL( CStifItemParser& aItem );
-
-    protected:  // New functions
-
-        
-    protected:  // Functions from base classes
-
-        
-
-    private:
-
-        /**
-        * C++ default constructor.
-        */
-        CTestMapAndNavApi( CTestModuleIf& aTestModuleIf );
-
-        /**
-        * By default Symbian 2nd phase constructor is private.
-        */
-        void ConstructL();
-
-        
-        /**
-        * Frees all resources allocated from test methods.
-        * @since ?Series60_version
-        */
-        void Delete();
-
-        /**
-        * Test methods are listed below. 
-        */
-      
-      	/**
-      	* Installs provider application
-      	*
-      	*/
-		TInt InstallProvider( const TDesC& aPackagePath );
-		
-        /**
-        * CreateNavigatorL test method.
-        * @since ?Series60_version
-        * @param aItem Script line containing parameters.
-        * @return Symbian OS error code.
-        */
-        virtual TInt CreateNavigatorL( CStifItemParser& aItem );
-        
-        /**
-        * CreateChainedNavigatorL test method.
-        * @since ?Series60_version
-        * @param aItem Script line containing parameters.
-        * @return Symbian OS error code.
-        */
-        virtual TInt CreateChainedNavigatorL( CStifItemParser& aItem );
-        
-               
-        /**
-        * SetExitObserverL test method.
-        * @since ?Series60_version
-        * @param aItem Script line containing parameters.
-        * @return Symbian OS error code.
-        */
-        virtual TInt SetExitObserverL( CStifItemParser& aItem );
-        
-        /**
-        * RemoveExitObserverL test method.
-        * @since ?Series60_version
-        * @param aItem Script line containing parameters.
-        * @return Symbian OS error code.
-        */
-        virtual TInt RemoveExitObserverL( CStifItemParser& aItem );
-        
-        /**
-        * CreateMapViewL test method.
-        * @since ?Series60_version
-        * @param aItem Script line containing parameters.
-        * @return Symbian OS error code.
-        */
-        virtual TInt CreateMapViewL( CStifItemParser& aItem );
-        
-        /**
-        * CreateChainedMapViewL test method.
-        * @since ?Series60_version
-        * @param aItem Script line containing parameters.
-        * @return Symbian OS error code.
-        */
-        virtual TInt CreateChainedMapViewL( CStifItemParser& aItem );
-        
-        /**
-        * AddLinkedLmksToShowL test method.
-        * @since ?Series60_version
-        * @param aItem Script line containing parameters.
-        * @return Symbian OS error code.
-        */
-        virtual TInt AddLinkedLmksToShowL( CStifItemParser& aItem );
-        
-        /**
-        * AddLmksToShowL test method.
-        * @since ?Series60_version
-        * @param aItem Script line containing parameters.
-        * @return Symbian OS error code.
-        */
-        virtual TInt AddLmksToShowL( CStifItemParser& aItem );
-        
-        /**
-        * AddPackedLmksToShowL test method.
-        * @since ?Series60_version
-        * @param aItem Script line containing parameters.
-        * @return Symbian OS error code.
-        */
-        virtual TInt AddPackedLmksToShowL( CStifItemParser& aItem );
-        
-        /**
-        * ResetLmksToShowL test method.
-        * @since ?Series60_version
-        * @param aItem Script line containing parameters.
-        * @return Symbian OS error code.
-        */
-        virtual TInt ResetLmksToShowL( CStifItemParser& aItem );
-        
-        /**
-        * SetMapAreaL test method.
-        * @since ?Series60_version
-        * @param aItem Script line containing parameters.
-        * @return Symbian OS error code.
-        */
-        virtual TInt SetMapAreaL( CStifItemParser& aItem );
-        
-        /**
-        * ResetMapAreaL test method.
-        * @since ?Series60_version
-        * @param aItem Script line containing parameters.
-        * @return Symbian OS error code.
-        */
-        virtual TInt ResetMapAreaL( CStifItemParser& aItem );
-
-		/**
-        * SetCustomRequestTextL test method.
-        * @since ?Series60_version
-        * @param aItem Script line containing parameters.
-        * @return Symbian OS error code.
-        */
-        virtual TInt SetCustomRequestTextL( CStifItemParser& aItem );        
-        
-        /**
-        * SetUseDefaultRequestTextL test method.
-        * @since ?Series60_version
-        * @param aItem Script line containing parameters.
-        * @return Symbian OS error code.
-        */
-        virtual TInt SetUseDefaultRequestTextL( CStifItemParser& aItem );        
-        
-        /**
-        * SetCurrentLocationOptionL test method.
-        * @since ?Series60_version
-        * @param aItem Script line containing parameters.
-        * @return Symbian OS error code.
-        */
-        virtual TInt SetCurrentLocationOptionL( CStifItemParser& aItem );        
-        
-        /**
-        * GetCurrentLocationOptionL test method.
-        * @since ?Series60_version
-        * @param aItem Script line containing parameters.
-        * @return Symbian OS error code.
-        */
-        virtual TInt GetCurrentLocationOptionL( CStifItemParser& aItem );        
-        
-        /**
-        * SetAndGetOptionsL test method.
-        * @since ?Series60_version
-        * @param aItem Script line containing parameters.
-        * @return Symbian OS error code.
-        */
-        virtual TInt SetAndGetOptionsL( CStifItemParser& aItem );        
-        
-        /**
-        * SelectionResultTypeL test method.
-        * @since ?Series60_version
-        * @param aItem Script line containing parameters.
-        * @return Symbian OS error code.
-        */
-        virtual TInt SelectionResultTypeL( CStifItemParser& aItem );        
-        
-        
-        /**
-        * SelectFromMapL test method.
-        * @since ?Series60_version
-        * @param aItem Script line containing parameters.
-        * @return Symbian OS error code.
-        */
-        virtual TInt SelectFromMapL( CStifItemParser& aItem );
-        
-        /**
-        * SetViewExitObserverL test method.
-        * @since ?Series60_version
-        * @param aItem Script line containing parameters.
-        * @return Symbian OS error code.
-        */
-        virtual TInt SetViewExitObserverL( CStifItemParser& aItem );
-        
-        /**
-        * RemoveViewExitObserverL test method.
-        * @since ?Series60_version
-        * @param aItem Script line containing parameters.
-        * @return Symbian OS error code.
-        */
-        virtual TInt RemoveViewExitObserverL( CStifItemParser& aItem );
-        
-        //ADD NEW METHOD DEC HERE
-    
-    };
-
-#endif      // TESTMAPANDNAVAPI_H
-
-// End of File
--- a/locsrv_plat/map_and_navigation_api/tsrc/init/testframework.ini	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,182 +0,0 @@
-#
-# This is STIFTestFramework initialization file
-# Comment lines start with '#'-character.
-# See STIF TestFramework users guide.doc for instructions
-
-# -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
-# Set following test engine settings:
-#	- Set Test Reporting mode. TestReportMode's possible values are:
-#		+ 'Summary': Summary of the tested test cases.
-#		+ 'Environment': Hardware and software info.
-#		+ 'TestCases': Test case report.
-#		+ 'FullReport': Set of all above ones.
-#		+ Example 'TestReportMode= Summary TestCases'
-#
-# 	- CreateTestReport setting controls report creation mode
-#		+ YES, Test report will created.
-#		+ NO, No Test report.
-#
-# 	- File path indicates the base path of the test report.
-# 	- File name indicates the name of the test report.
-#
-# 	- File format indicates the type of the test report.
-#		+ TXT, Test report file will be txt type, for example 'TestReport.txt'.
-#		+ HTML, Test report will be html type, for example 'TestReport.html'.
-#
-# 	- File output indicates output source of the test report.
-#		+ FILE, Test report logging to file.
-#		+ RDEBUG, Test report logging to using rdebug.
-#
-# 	- File Creation Mode indicates test report overwriting if file exist.
-#		+ OVERWRITE, Overwrites if the Test report file exist.
-#		+ APPEND, Continue logging after the old Test report information if 
-#                 report exist.
-# 	- Sets a device reset module's dll name(Reboot).
-#		+ If Nokia specific reset module is not available or it is not correct one
-#		  StifHWResetStub module may use as a template for user specific reset
-#		  module. 
-
-[Engine_Defaults]
-
-TestReportMode= FullReport		# Possible values are: 'Empty', 'Summary', 'Environment',
-                                                               'TestCases' or 'FullReport'
-
-CreateTestReport= YES			# Possible values: YES or NO
-
-TestReportFilePath= C:\LOGS\TestFramework\
-TestReportFileName= TestReport
-
-TestReportFormat= TXT			# Possible values: TXT or HTML
-TestReportOutput= FILE			# Possible values: FILE or RDEBUG
-TestReportFileCreationMode= OVERWRITE	# Possible values: OVERWRITE or APPEND
-
-DeviceResetDllName= StifResetForNokia.dll # e.g. 'StifHWResetStub.dll' for user specific reseting
-
-[End_Defaults]
-# -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
-
-
-
-# -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
-# Module configurations start
-# Modules are added between module tags
-# tags. Module name is specified after ModuleName= tag, like
-# ModuleName= XXXXXXXXX
-# Modules might have initialisation file, specified as
-# IniFile= c:\testframework\YYYYYY
-# Modules might have several configuration files, like
-# TestCaseFile= c:\testframework\NormalCases.txt
-# TestCaseFile= c:\testframework\SmokeCases.txt
-# TestCaseFile= c:\testframework\ManualCases.txt
-
-# (TestCaseFile is synonym for old term ConfigFile)
-
-# Following case specifies demo module settings. Demo module
-# does not read any settings from file, so tags 
-# IniFile and TestCaseFile are not used.
-# In the simplest case it is enough to specify only the
-# name of the test module when adding new test module
-
-#[New_Module]
-#ModuleName= demomodule
-#[End_Module]
-
-[New_Module]
-ModuleName= TestScripter
-TestCaseFile= C:\Testframework\testmapandnavapi.cfg
-[End_Module]
-
-# Load testmoduleXXX, optionally with initialization file and/or test case files
-#[New_Module]
-#ModuleName= testmodulexxx
-
-#TestModuleXXX used initialization file
-#IniFile= c:\testframework\init.txt
-
-#TestModuleXXX used configuration file(s)
-#TestCaseFile= c:\testframework\testcases1.cfg
-#TestCaseFile= c:\testframework\testcases2.cfg
-#TestCaseFile= c:\testframework\manualtestcases.cfg
-
-#[End_Module]
-# -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
-
-
-
-# -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
-# Set STIFTestFramework logging overwrite parameters for Logger.
-# 	Hardware and emulator environment logging path and styles can
-# 	be configured from here to overwrite the Logger's implemented values.
-#	
-#	Settings description:
-#	- Indicates option for creation log directory/directories. If log directory/directories
-#         is/are not created by user they will make by software.
-#		+ YES, Create log directory/directories if not allready exist.
-#		+ NO, Log directory/directories not created. Only created one is used.
-#
-#	- Overwrite emulator path setting.
-#		+ Example: If 'EmulatorBasePath= C:\LOGS\TestFramework\' and in code is defined 
-#		           Logger's path 'D:\\LOGS\\Module\\' with those definition the path
-#		           will be 'C:\LOGS\TestFramework\LOGS\Module\'
-#
-#	- Overwrite emulator's logging format.
-#		+ TXT, Log file(s) will be txt type(s), for example 'Module.txt'.
-#		+ HTML, Log file(s) will be html type(s), for example 'Module.html'.
-#
-#	- Overwrited emulator logging output source.
-#		+ FILE, Logging to file(s).
-#		+ RDEBUG, Logging to using rdebug(s).
-#
-#	- Overwrite hardware path setting (Same description as above in emulator path).
-#	- Overwrite hardware's logging format(Same description as above in emulator format).
-#	- Overwrite hardware's logging output source(Same description as above in emulator output).
-#
-#	- File Creation Mode indicates file overwriting if file exist.
-#		+ OVERWRITE, Overwrites if file(s) exist.
-#		+ APPEND, Continue logging after the old logging information if file(s) exist.
-#
-#	- Will thread id include to the log filename.
-#		+ YES, Thread id to log file(s) name, Example filename 'Module_b9.txt'.
-#		+ NO, No thread id to log file(s), Example filename 'Module.txt'.
-#
-#	- Will time stamps include the to log file.
-#		+ YES, Time stamp added to each line in log file(s). Time stamp is 
-#                 for example'12.Nov.2003 115958    LOGGING INFO'
-#		+ NO, No time stamp(s).
-#
-#	- Will line breaks include to the log file.
-#		+ YES, Each logging event includes line break and next log event is in own line.
-#		+ NO, No line break(s).
-#
-#	- Will event ranking include to the log file.
-#		+ YES, Event ranking number added to each line in log file(s). Ranking number 
-#                 depends on environment's tics, for example(includes time stamp also)
-#                 '012   12.Nov.2003 115958    LOGGING INFO'
-#		+ NO, No event ranking.
-#
-
-[Logger_Defaults]
-
-#NOTE: If you want to set Logger using next setting(s) remove comment(s)'#' 
-
-#CreateLogDirectories= YES		# Possible values: YES or NO
-
-#EmulatorBasePath= C:\LOGS\TestFramework\
-#EmulatorFormat= HTML			# Possible values: TXT or HTML
-#EmulatorOutput= FILE			# Possible values: FILE or RDEBUG
-
-#HardwareBasePath= D:\LOGS\TestFramework\
-#HardwareFormat= HTML			# Possible values: TXT or HTML
-#HardwareOutput= FILE			# Possible values: FILE or RDEBUG
-
-#FileCreationMode= OVERWRITE		# Possible values: OVERWRITE or APPEND
-
-#ThreadIdToLogFile= YES			# Possible values: YES or NO
-#WithTimeStamp= YES			# Possible values: YES or NO
-#WithLineBreak= YES			# Possible values: YES or NO
-#WithEventRanking= YES			# Possible values: YES or NO
-
-[End_Logger_Defaults]
-# -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
-
-# End of file
--- a/locsrv_plat/map_and_navigation_api/tsrc/mapnavproviderrefapp/BWINS/mnrefproviderengine.50u.def	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,55 +0,0 @@
-EXPORTS
-	?FindResourceFileL@CMnrpEngine@@QAEXABVTDesC16@@AAV?$TBuf@$0BAA@@@@Z @ 1 NONAME ; void CMnrpEngine::FindResourceFileL(class TDesC16 const &, class TBuf<256> &)
-	?Center@CMnrpMapModel@@QBE?AVTCoordinate@@XZ @ 2 NONAME ; class TCoordinate CMnrpMapModel::Center(void) const
-	?ScreenToAbsolute@CMnrpMapModel@@QBENH@Z @ 3 NONAME ; double CMnrpMapModel::ScreenToAbsolute(int) const
-	?NewL@CMnrpMapModel@@SAPAV1@AAVMMapModelObserver@@AAVCMnrpEngine@@@Z @ 4 NONAME ; class CMnrpMapModel * CMnrpMapModel::NewL(class MMapModelObserver &, class CMnrpEngine &)
-	?Width@CMnrpMapModel@@QBENXZ @ 5 NONAME ; double CMnrpMapModel::Width(void) const
-	?GetPosition@CMnrpPositionRequest@@QAEXAAVTPositionInfo@@@Z @ 6 NONAME ; void CMnrpPositionRequest::GetPosition(class TPositionInfo &)
-	?NewL@CMnrpMapModel@@SAPAV1@AAVCMnrpEngine@@@Z @ 7 NONAME ; class CMnrpMapModel * CMnrpMapModel::NewL(class CMnrpEngine &)
-	?SetOptionsL@CMnrpPositionRequest@@QAEXABVTPositionUpdateOptionsBase@@@Z @ 8 NONAME ; void CMnrpPositionRequest::SetOptionsL(class TPositionUpdateOptionsBase const &)
-	?GoCenter@CMnrpMapModel@@QAEXXZ @ 9 NONAME ; void CMnrpMapModel::GoCenter(void)
-	?FetchNewPosition@CMnrpPositionRequest@@QAEXH@Z @ 10 NONAME ; void CMnrpPositionRequest::FetchNewPosition(int)
-	?Course@CMnrpPositionRequest@@QAEMXZ @ 11 NONAME ; float CMnrpPositionRequest::Course(void)
-	?CoordinateToString@MnrpUtils@@SAXNAAVTDes16@@HH@Z @ 12 NONAME ; void MnrpUtils::CoordinateToString(double, class TDes16 &, int, int)
-	?CurrentLocation@CMnrpMapModel@@QBE?AVTCurrentLocation@1@XZ @ 13 NONAME ; class CMnrpMapModel::TCurrentLocation CMnrpMapModel::CurrentLocation(void) const
-	?AddressToCoordL@CMnrpEngine@@QAEPAVCPosLandmark@@ABV2@@Z @ 14 NONAME ; class CPosLandmark * CMnrpEngine::AddressToCoordL(class CPosLandmark const &)
-	?MoveTo@CMnrpMapModel@@QAEXVTCoordinate@@@Z @ 15 NONAME ; void CMnrpMapModel::MoveTo(class TCoordinate)
-	?AbsoluteToScreen@CMnrpMapModel@@QBEHN@Z @ 16 NONAME ; int CMnrpMapModel::AbsoluteToScreen(double) const
-	?Zoom@CMnrpMapModel@@QAEXN@Z @ 17 NONAME ; void CMnrpMapModel::Zoom(double)
-	?NewL@CMnrpPositionRequest@@SAPAV1@ABVTDesC16@@AAVMMnrpPositionObserver@@@Z @ 18 NONAME ; class CMnrpPositionRequest * CMnrpPositionRequest::NewL(class TDesC16 const &, class MMnrpPositionObserver &)
-	?Right@CMnrpMapModel@@QBENXZ @ 19 NONAME ; double CMnrpMapModel::Right(void) const
-	?Height@CMnrpMapModel@@QBENXZ @ 20 NONAME ; double CMnrpMapModel::Height(void) const
-	?Left@CMnrpMapModel@@QBENXZ @ 21 NONAME ; double CMnrpMapModel::Left(void) const
-	?Heading@CMnrpPositionRequest@@QAEMXZ @ 22 NONAME ; float CMnrpPositionRequest::Heading(void)
-	?AbsoluteToScreen@CMnrpMapModel@@QBE?AVTPoint@@VTCoordinate@@@Z @ 23 NONAME ; class TPoint CMnrpMapModel::AbsoluteToScreen(class TCoordinate) const
-	?GetGrid@CMnrpMapModel@@QBEXAAVTGrid@1@@Z @ 24 NONAME ; void CMnrpMapModel::GetGrid(class CMnrpMapModel::TGrid &) const
-	?UpdateModelL@CMnrpMapModel@@QAEXABVCMnrpMapImageService@@@Z @ 25 NONAME ; void CMnrpMapModel::UpdateModelL(class CMnrpMapImageService const &)
-	?UpdateModel@CMnrpMapModel@@QAEXABVTMnMapImageParams@@@Z @ 26 NONAME ; void CMnrpMapModel::UpdateModel(class TMnMapImageParams const &)
-	?FindClosestPoisL@CMnrpEngine@@QAEXABVCPosLandmark@@AAV?$RArray@UTDistanceToPoi@CMnrpEngine@@@@H@Z @ 27 NONAME ; void CMnrpEngine::FindClosestPoisL(class CPosLandmark const &, class RArray<struct CMnrpEngine::TDistanceToPoi> &, int)
-	?Fs@CMnrpEngine@@QAEAAVRFs@@XZ @ 28 NONAME ; class RFs & CMnrpEngine::Fs(void)
-	?AddressToCoordL@CMnrpEngine@@QAEPAVCPosLandmark@@ABVTDesC16@@@Z @ 29 NONAME ; class CPosLandmark * CMnrpEngine::AddressToCoordL(class TDesC16 const &)
-	?AddressToCoordLC@CMnrpEngine@@QAEPAVCPosLandmark@@ABVTDesC16@@@Z @ 30 NONAME ; class CPosLandmark * CMnrpEngine::AddressToCoordLC(class TDesC16 const &)
-	?DistanceToString@MnrpUtils@@SAXNAAVTDes16@@@Z @ 31 NONAME ; void MnrpUtils::DistanceToString(double, class TDes16 &)
-	?Speed@CMnrpPositionRequest@@QAEMXZ @ 32 NONAME ; float CMnrpPositionRequest::Speed(void)
-	??1CMnrpMapModel@@UAE@XZ @ 33 NONAME ; CMnrpMapModel::~CMnrpMapModel(void)
-	?Bottom@CMnrpMapModel@@QBENXZ @ 34 NONAME ; double CMnrpMapModel::Bottom(void) const
-	?CoordToAddressLC@CMnrpEngine@@QAEPAVCPosLandmark@@ABVTCoordinate@@@Z @ 35 NONAME ; class CPosLandmark * CMnrpEngine::CoordToAddressLC(class TCoordinate const &)
-	?SpeedToString@MnrpUtils@@SAXNAAVTDes16@@@Z @ 36 NONAME ; void MnrpUtils::SpeedToString(double, class TDes16 &)
-	?NumIgnoredLandmarks@CMnrpMapModel@@QAEHXZ @ 37 NONAME ; int CMnrpMapModel::NumIgnoredLandmarks(void)
-	??1CMnrpEngine@@UAE@XZ @ 38 NONAME ; CMnrpEngine::~CMnrpEngine(void)
-	?AngleToString@MnrpUtils@@SAXNAAVTDes16@@@Z @ 39 NONAME ; void MnrpUtils::AngleToString(double, class TDes16 &)
-	?PrintableStringLC@MnrpUtils@@SAPAVHBufC16@@ABVTDesC16@@@Z @ 40 NONAME ; class HBufC16 * MnrpUtils::PrintableStringLC(class TDesC16 const &)
-	?MagneticCourse@CMnrpPositionRequest@@QAEMXZ @ 41 NONAME ; float CMnrpPositionRequest::MagneticCourse(void)
-	?SetScreenSize@CMnrpMapModel@@QAEXVTSize@@@Z @ 42 NONAME ; void CMnrpMapModel::SetScreenSize(class TSize)
-	?BestCoordToAddressMatchesL@CMnrpEngine@@QAEXABVTCoordinate@@AAV?$RPointerArray@VCPosLandmark@@@@H@Z @ 43 NONAME ; void CMnrpEngine::BestCoordToAddressMatchesL(class TCoordinate const &, class RPointerArray<class CPosLandmark> &, int)
-	?AddressToCoordLC@CMnrpEngine@@QAEPAVCPosLandmark@@ABV2@@Z @ 44 NONAME ; class CPosLandmark * CMnrpEngine::AddressToCoordLC(class CPosLandmark const &)
-	?MagneticHeading@CMnrpPositionRequest@@QAEMXZ @ 45 NONAME ; float CMnrpPositionRequest::MagneticHeading(void)
-	?Top@CMnrpMapModel@@QBENXZ @ 46 NONAME ; double CMnrpMapModel::Top(void) const
-	??1CMnrpPositionRequest@@UAE@XZ @ 47 NONAME ; CMnrpPositionRequest::~CMnrpPositionRequest(void)
-	?ScreenToAbsolute@CMnrpMapModel@@QBE?AVTCoordinate@@VTPoint@@@Z @ 48 NONAME ; class TCoordinate CMnrpMapModel::ScreenToAbsolute(class TPoint) const
-	?DistanceBetweenLandmarks@CMnrpEngine@@QAEMABVCPosLandmark@@0@Z @ 49 NONAME ; float CMnrpEngine::DistanceBetweenLandmarks(class CPosLandmark const &, class CPosLandmark const &)
-	?KnownPlacesL@CMnrpEngine@@QAE?AV?$TArray@PAVCPosLandmark@@@@XZ @ 50 NONAME ; class TArray<class CPosLandmark *> CMnrpEngine::KnownPlacesL(void)
-	?UpdateModelL@CMnrpMapModel@@QAEXAAVCMnrpMapViewService@@@Z @ 51 NONAME ; void CMnrpMapModel::UpdateModelL(class CMnrpMapViewService &)
-	?NewL@CMnrpEngine@@SAPAV1@XZ @ 52 NONAME ; class CMnrpEngine * CMnrpEngine::NewL(void)
-	?RenderL@CMnrpMapModel@@QBEXAAVCFbsBitmap@@VTRect@@PAVCFont@@2@Z @ 53 NONAME ; void CMnrpMapModel::RenderL(class CFbsBitmap &, class TRect, class CFont *, class CFont *) const
-
--- a/locsrv_plat/map_and_navigation_api/tsrc/mapnavproviderrefapp/BWINS/mnrefproviderengineu.def	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,53 +0,0 @@
-EXPORTS
-	??1CMnrpEngine@@UAE@XZ @ 1 NONAME ; CMnrpEngine::~CMnrpEngine(void)
-	??1CMnrpMapModel@@UAE@XZ @ 2 NONAME ; CMnrpMapModel::~CMnrpMapModel(void)
-	??1CMnrpPositionRequest@@UAE@XZ @ 3 NONAME ; CMnrpPositionRequest::~CMnrpPositionRequest(void)
-	?AbsoluteToScreen@CMnrpMapModel@@QBE?AVTPoint@@VTCoordinate@@@Z @ 4 NONAME ; class TPoint CMnrpMapModel::AbsoluteToScreen(class TCoordinate) const
-	?AbsoluteToScreen@CMnrpMapModel@@QBEHN@Z @ 5 NONAME ; int CMnrpMapModel::AbsoluteToScreen(double) const
-	?AddressToCoordLC@CMnrpEngine@@QAEPAVCPosLandmark@@ABV2@@Z @ 6 NONAME ; class CPosLandmark * CMnrpEngine::AddressToCoordLC(class CPosLandmark const &)
-	?AddressToCoordLC@CMnrpEngine@@QAEPAVCPosLandmark@@ABVTDesC16@@@Z @ 7 NONAME ; class CPosLandmark * CMnrpEngine::AddressToCoordLC(class TDesC16 const &)
-	?AngleToString@MnrpUtils@@SAXNAAVTDes16@@@Z @ 8 NONAME ; void MnrpUtils::AngleToString(double, class TDes16 &)
-	?BestCoordToAddressMatchesL@CMnrpEngine@@QAEXABVTCoordinate@@AAV?$RPointerArray@VCPosLandmark@@@@H@Z @ 9 NONAME ; void CMnrpEngine::BestCoordToAddressMatchesL(class TCoordinate const &, class RPointerArray<class CPosLandmark> &, int)
-	?Bottom@CMnrpMapModel@@QBENXZ @ 10 NONAME ; double CMnrpMapModel::Bottom(void) const
-	?Center@CMnrpMapModel@@QBE?AVTCoordinate@@XZ @ 11 NONAME ; class TCoordinate CMnrpMapModel::Center(void) const
-	?CoordToAddressLC@CMnrpEngine@@QAEPAVCPosLandmark@@ABVTCoordinate@@@Z @ 12 NONAME ; class CPosLandmark * CMnrpEngine::CoordToAddressLC(class TCoordinate const &)
-	?CoordinateToString@MnrpUtils@@SAXNAAVTDes16@@HH@Z @ 13 NONAME ; void MnrpUtils::CoordinateToString(double, class TDes16 &, int, int)
-	?Course@CMnrpPositionRequest@@QAEMXZ @ 14 NONAME ; float CMnrpPositionRequest::Course(void)
-	?CurrentLocation@CMnrpMapModel@@QBE?AVTCurrentLocation@1@XZ @ 15 NONAME ; class CMnrpMapModel::TCurrentLocation CMnrpMapModel::CurrentLocation(void) const
-	?DistanceBetweenLandmarks@CMnrpEngine@@QAEMABVCPosLandmark@@0@Z @ 16 NONAME ; float CMnrpEngine::DistanceBetweenLandmarks(class CPosLandmark const &, class CPosLandmark const &)
-	?DistanceToString@MnrpUtils@@SAXNAAVTDes16@@@Z @ 17 NONAME ; void MnrpUtils::DistanceToString(double, class TDes16 &)
-	?FetchNewPosition@CMnrpPositionRequest@@QAEXH@Z @ 18 NONAME ; void CMnrpPositionRequest::FetchNewPosition(int)
-	?FindClosestPoisL@CMnrpEngine@@QAEXABVCPosLandmark@@AAV?$RArray@UTDistanceToPoi@CMnrpEngine@@@@H@Z @ 19 NONAME ; void CMnrpEngine::FindClosestPoisL(class CPosLandmark const &, class RArray<struct CMnrpEngine::TDistanceToPoi> &, int)
-	?FindResourceFileL@CMnrpEngine@@QAEXABVTDesC16@@AAV?$TBuf@$0BAA@@@@Z @ 20 NONAME ; void CMnrpEngine::FindResourceFileL(class TDesC16 const &, class TBuf<256> &)
-	?Fs@CMnrpEngine@@QAEAAVRFs@@XZ @ 21 NONAME ; class RFs & CMnrpEngine::Fs(void)
-	?GetGrid@CMnrpMapModel@@QBEXAAVTGrid@1@@Z @ 22 NONAME ; void CMnrpMapModel::GetGrid(class CMnrpMapModel::TGrid &) const
-	?GetPosition@CMnrpPositionRequest@@QAEXAAVTPositionInfo@@@Z @ 23 NONAME ; void CMnrpPositionRequest::GetPosition(class TPositionInfo &)
-	?GoCenter@CMnrpMapModel@@QAEXXZ @ 24 NONAME ; void CMnrpMapModel::GoCenter(void)
-	?Heading@CMnrpPositionRequest@@QAEMXZ @ 25 NONAME ; float CMnrpPositionRequest::Heading(void)
-	?Height@CMnrpMapModel@@QBENXZ @ 26 NONAME ; double CMnrpMapModel::Height(void) const
-	?KnownPlacesL@CMnrpEngine@@QAE?AV?$TArray@PAVCPosLandmark@@@@XZ @ 27 NONAME ; class TArray<class CPosLandmark *> CMnrpEngine::KnownPlacesL(void)
-	?Left@CMnrpMapModel@@QBENXZ @ 28 NONAME ; double CMnrpMapModel::Left(void) const
-	?MagneticCourse@CMnrpPositionRequest@@QAEMXZ @ 29 NONAME ; float CMnrpPositionRequest::MagneticCourse(void)
-	?MagneticHeading@CMnrpPositionRequest@@QAEMXZ @ 30 NONAME ; float CMnrpPositionRequest::MagneticHeading(void)
-	?MoveTo@CMnrpMapModel@@QAEXVTCoordinate@@@Z @ 31 NONAME ; void CMnrpMapModel::MoveTo(class TCoordinate)
-	?NewL@CMnrpEngine@@SAPAV1@XZ @ 32 NONAME ; class CMnrpEngine * CMnrpEngine::NewL(void)
-	?NewL@CMnrpMapModel@@SAPAV1@AAVCMnrpEngine@@@Z @ 33 NONAME ; class CMnrpMapModel * CMnrpMapModel::NewL(class CMnrpEngine &)
-	?NewL@CMnrpMapModel@@SAPAV1@AAVMMapModelObserver@@AAVCMnrpEngine@@@Z @ 34 NONAME ; class CMnrpMapModel * CMnrpMapModel::NewL(class MMapModelObserver &, class CMnrpEngine &)
-	?NewL@CMnrpPositionRequest@@SAPAV1@ABVTDesC16@@AAVMMnrpPositionObserver@@@Z @ 35 NONAME ; class CMnrpPositionRequest * CMnrpPositionRequest::NewL(class TDesC16 const &, class MMnrpPositionObserver &)
-	?RenderL@CMnrpMapModel@@QBEXAAVCFbsBitmap@@VTRect@@PAVCFont@@2@Z @ 36 NONAME ; void CMnrpMapModel::RenderL(class CFbsBitmap &, class TRect, class CFont *, class CFont *) const
-	?Right@CMnrpMapModel@@QBENXZ @ 37 NONAME ; double CMnrpMapModel::Right(void) const
-	?ScreenToAbsolute@CMnrpMapModel@@QBE?AVTCoordinate@@VTPoint@@@Z @ 38 NONAME ; class TCoordinate CMnrpMapModel::ScreenToAbsolute(class TPoint) const
-	?ScreenToAbsolute@CMnrpMapModel@@QBENH@Z @ 39 NONAME ; double CMnrpMapModel::ScreenToAbsolute(int) const
-	?SetOptionsL@CMnrpPositionRequest@@QAEXABVTPositionUpdateOptionsBase@@@Z @ 40 NONAME ; void CMnrpPositionRequest::SetOptionsL(class TPositionUpdateOptionsBase const &)
-	?SetScreenSize@CMnrpMapModel@@QAEXVTSize@@@Z @ 41 NONAME ; void CMnrpMapModel::SetScreenSize(class TSize)
-	?Speed@CMnrpPositionRequest@@QAEMXZ @ 42 NONAME ; float CMnrpPositionRequest::Speed(void)
-	?SpeedToString@MnrpUtils@@SAXNAAVTDes16@@@Z @ 43 NONAME ; void MnrpUtils::SpeedToString(double, class TDes16 &)
-	?Top@CMnrpMapModel@@QBENXZ @ 44 NONAME ; double CMnrpMapModel::Top(void) const
-	?UpdateModelL@CMnrpMapModel@@QAEXAAVCMnrpMapViewService@@@Z @ 45 NONAME ; void CMnrpMapModel::UpdateModelL(class CMnrpMapViewService &)
-	?Width@CMnrpMapModel@@QBENXZ @ 46 NONAME ; double CMnrpMapModel::Width(void) const
-	?Zoom@CMnrpMapModel@@QAEXN@Z @ 47 NONAME ; void CMnrpMapModel::Zoom(double)
-	?PrintableStringLC@MnrpUtils@@SAPAVHBufC16@@ABVTDesC16@@@Z @ 48 NONAME ; class HBufC16 * MnrpUtils::PrintableStringLC(class TDesC16 const &)
-	?AddressToCoord@CMnrpEngine@@QAEPAVCPosLandmark@@ABV2@@Z @ 49 NONAME ; class CPosLandmark * CMnrpEngine::AddressToCoord(class CPosLandmark const &)
-	?AddressToCoord@CMnrpEngine@@QAEPAVCPosLandmark@@ABVTDesC16@@@Z @ 50 NONAME ; class CPosLandmark * CMnrpEngine::AddressToCoord(class TDesC16 const &)
-	?NumIgnoredLandmarks@CMnrpMapModel@@QAEHXZ @ 51 NONAME ; int CMnrpMapModel::NumIgnoredLandmarks(void)
-
Binary file locsrv_plat/map_and_navigation_api/tsrc/mapnavproviderrefapp/data/default_lm.bmp has changed
Binary file locsrv_plat/map_and_navigation_api/tsrc/mapnavproviderrefapp/data/default_lm_mask_soft.bmp has changed
--- a/locsrv_plat/map_and_navigation_api/tsrc/mapnavproviderrefapp/data/mnrefprovider.rss	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,156 +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:  Resource definition file for MnRefProvider
-*
-*/
-
-
-NAME MNTP
-
-#include <eikon.rsg>
-#include <eikon.rh>
-#include <avkon.rsg>
-#include <avkon.mbg>
-#include <avkon.rh>
-
-#include <appinfo.rh>
-#include "mnrp.hrh"
-
-RESOURCE RSS_SIGNATURE {  }
-
-RESOURCE TBUF { buf="MnRefProvider"; }
-
-RESOURCE EIK_APP_INFO
-    {
-    menubar = r_mnrefprovider_menubar;
-    cba = R_AVKON_SOFTKEYS_OPTIONS_EXIT;
-    }
-
-RESOURCE LOCALISABLE_APP_INFO r_mnrefprovider_localisable_app_info
-    {
-    short_caption = "MnRefProvider";
-    caption_and_icon =
-        CAPTION_AND_ICON_INFO
-            {
-            caption = "MnRefProvider";
-            };
-    view_list = {};
-    }
-
-RESOURCE CONTEXT_PANE r_mnrefprovider_app_icon
-    {
-    }
-
-RESOURCE MENU_BAR r_mnrefprovider_menubar
-    {
-    titles =
-        {
-        MENU_TITLE
-            {
-            menu_pane = r_mnrefprovider_menu;
-            }
-        };
-    }
-
-RESOURCE MENU_PANE r_mnrefprovider_menu
-    {
-    items =
-        {
-        MENU_ITEM
-            {
-            command = EAknSoftkeyExit;
-            txt = "Exit";
-            }
-        };
-    }
-
-RESOURCE DIALOG r_mnrefprovider_selection_dialog
-    {
-    flags = EAknDialogSelectionList;
-    buttons = R_AVKON_SOFTKEYS_OK_CANCEL;
-    items =
-        {
-        DLG_LINE
-            {
-            type = EAknCtSingleGraphicListBox;
-            id = ESelectionListControl;
-            control = LISTBOX
-                {
-                flags = EAknListBoxSelectionList;
-                };
-            },
-        // the next dlg line is optional.
-        DLG_LINE
-            {
-            itemflags = EEikDlgItemNonFocusing;
-            id = EFindControl;
-            type = EAknCtSelectionListFixedFind;
-            }
-        };
-    }
-
-RESOURCE AVKON_VIEW r_mnrefprovider_map_view
-    {
-    menubar = r_mnrefprovider_map_view_menubar;
-    cba = R_AVKON_SOFTKEYS_OPTIONS_EXIT;
-    }
-
-RESOURCE AVKON_VIEW r_mnrefprovider_map_view_chained
-    {
-    menubar = r_mnrefprovider_map_view_menubar;
-    cba = R_AVKON_SOFTKEYS_OPTIONS_BACK;
-    }
-
-RESOURCE MENU_BAR r_mnrefprovider_map_view_menubar
-    {
-    titles =
-        {
-        MENU_TITLE
-            {
-            menu_pane = r_mnrefprovider_map_view_menu;
-            }
-        };
-    }
-
-RESOURCE MENU_PANE r_mnrefprovider_map_view_menu
-    {
-    items =
-        {
-        MENU_ITEM
-            {
-            command = EMnrpCommandSelect;
-            txt = "Select";
-            },
-        MENU_ITEM
-            {
-            command = EMnrpCommandFullScreen;
-            txt = "Toggle Fullscreen";
-            },
-        MENU_ITEM
-            {
-            command = EAknSoftkeyExit;
-            txt = "Exit";
-            }
-        };
-    }
-
-RESOURCE AVKON_VIEW r_mnrefprovider_navi_view
-    {
-    cba = R_AVKON_SOFTKEYS_EXIT;
-    }
-
-RESOURCE AVKON_VIEW r_mnrefprovider_navi_view_chained
-    {
-    cba = R_AVKON_SOFTKEYS_BACK;
-    }
--- a/locsrv_plat/map_and_navigation_api/tsrc/mapnavproviderrefapp/data/mnrefprovider_reg.rss	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,66 +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:  Registration file for MnRefProvider
-*
-*/
-
-
-#include <appinfo.rh>
-
-#include "mnappserviceuids.hrh"
-#include "mnappservices.hrh"
-#include "mnserviceinfo.rh"
-
-#include <MnRefProvider.rsg>
-
-UID2 KUidAppRegistrationResourceFile
-UID3 0x03132013
-
-RESOURCE APP_REGISTRATION_INFO
-    {
-    app_file = "MnRefProvider";
-    localisable_resource_file = "\\resource\\apps\\MnRefProvider";
-    localisable_resource_id = R_MNREFPROVIDER_LOCALISABLE_APP_INFO;
-    
-    launch = KAppLaunchInForeground;
-    hidden = KAppNotHidden;
-        
-    datatype_list = {};
-    file_ownership_list = {};
-    service_list =
-        {
-        SERVICE_INFO
-            {
-            uid = KMnAppMapViewService;
-            datatype_list = {};
-            opaque_data = r_mnrefprovider_mapview_opaquedata;
-            },
-        SERVICE_INFO
-            {
-            uid = KMnAppNavigationService;
-            datatype_list = {};
-            opaque_data = r_mnrefprovider_navigation_opaquedata;
-            }
-        };
-    }
-
-RESOURCE MN_SERVICE_INFO r_mnrefprovider_mapview_opaquedata
-    {
-    service_features = KMnSvcFeatureShowMap | KMnSvcFeatureSelectFromMap;
-    }
-
-RESOURCE MN_SERVICE_INFO r_mnrefprovider_navigation_opaquedata
-    {
-    service_features = KMnSvcFeatureNavigateTo;
-    }
--- a/locsrv_plat/map_and_navigation_api/tsrc/mapnavproviderrefapp/data/mnrefproviderback.rss	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,95 +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:  Resource definition file for MnRefProviderBack
-*
-*/
-
-
-NAME MNRG
-
-#include <eikon.rsg>
-#include <eikon.rh>
-#include <avkon.rsg>
-#include <avkon.mbg>
-#include <avkon.rh>
-
-#include <appinfo.rh>
-
-RESOURCE RSS_SIGNATURE {  }
-
-RESOURCE TBUF { buf="MnRefProviderBack"; }
-
-RESOURCE EIK_APP_INFO
-    {
-    menubar = r_mnrefgeocoder_menubar;
-    cba = R_AVKON_SOFTKEYS_OPTIONS_EXIT;
-    }
-
-RESOURCE LOCALISABLE_APP_INFO r_mnrefgeocoder_localisable_app_info
-    {
-    short_caption = "MnRefProvider";
-    caption_and_icon =
-        CAPTION_AND_ICON_INFO
-            {
-            caption = "MnRefProvider";
-            };
-    view_list = {};
-    }
-
-RESOURCE CONTEXT_PANE r_mnrefgeocoder_app_icon
-    {
-    }
-
-RESOURCE MENU_BAR r_mnrefgeocoder_menubar
-    {
-    titles =
-        {
-        MENU_TITLE
-            {
-            menu_pane = r_mnrefgeocoder_menu;
-            }
-        };
-    }
-
-RESOURCE MENU_PANE r_mnrefgeocoder_menu
-    {
-    items =
-        {
-        MENU_ITEM
-            {
-            command = EAknSoftkeyExit;
-            txt = "Exit";
-            }
-        };
-    }
-
-RESOURCE AVKON_LIST_QUERY r_mnrefgeocoder_list_query
-    {
-    flags = EGeneralQueryFlags;
-    softkeys = R_AVKON_SOFTKEYS_OK_CANCEL;
-    items =
-        {
-        AVKON_LIST_QUERY_DLG_LINE
-            {
-            control = AVKON_LIST_QUERY_CONTROL
-                {
-                listtype = EAknCtSinglePopupMenuListBox;
-                listbox = AVKON_LIST_QUERY_LIST
-                    {
-                    };
-                heading = "Select best match";
-                };
-            }
-        };
-    }
--- a/locsrv_plat/map_and_navigation_api/tsrc/mapnavproviderrefapp/data/mnrefproviderback_reg.rss	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,75 +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:  Registration file for MnRefProviderBack
-*
-*/
-
-
-#include <appinfo.rh>
-
-#include "mnappserviceuids.hrh"
-#include "mnappservices.hrh"
-#include "mnserviceinfo.rh"
-
-#include <mnrefproviderback.rsg>
-
-UID2 KUidAppRegistrationResourceFile
-UID3 0x03132014
-
-RESOURCE APP_REGISTRATION_INFO
-    {
-    app_file = "mnrefproviderback";
-    localisable_resource_file = "\\resource\\apps\\mnrefproviderback";
-    localisable_resource_id = R_MNREFGEOCODER_LOCALISABLE_APP_INFO;
-
-    launch = KAppLaunchInBackground;
-    hidden = KAppIsHidden;
-
-    datatype_list = {};
-    file_ownership_list = {};
-    service_list =
-        {
-        SERVICE_INFO
-            {
-            uid = KMnAppGeocodingService;
-            datatype_list = {};
-            opaque_data = r_mnrefgeocoder_geocoding_opaquedata;
-            }
-#ifdef RD_MAPNAV_BITMAP_ACCESS
-        ,
-        SERVICE_INFO
-            {
-            uid = KMnAppMapImageService;
-            datatype_list = {};
-            opaque_data = r_mnrefprovider_mapimage_opaquedata;
-            }
-#endif
-        };
-    }
-
-RESOURCE MN_SERVICE_INFO r_mnrefgeocoder_geocoding_opaquedata
-    {
-    service_features =
-        KMnSvcFeatureCoordToAddr |
-        KMnSvcFeatureAddrToCoord |
-        KMnSvcFeaturePlainAddrToCoord;
-    }
-
-#ifdef RD_MAPNAV_BITMAP_ACCESS
-RESOURCE MN_SERVICE_INFO r_mnrefprovider_mapimage_opaquedata
-    {
-    service_features = KMnSvcFeatureVectorMap;
-    }
-#endif
-	 
--- a/locsrv_plat/map_and_navigation_api/tsrc/mapnavproviderrefapp/data/mnrefproviderengine.rss	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,205 +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:  Resource definition file for MnRefProviderEngine
-*
-*/
-
-
-NAME MNRE
-
-#include <eikon.rsg>
-#include <eikon.rh>
-#include <avkon.rsg>
-#include <avkon.mbg>
-#include <avkon.rh>
-
-#include <appinfo.rh>
-
-RESOURCE RSS_SIGNATURE {  }
-
-RESOURCE TBUF { buf=""; }
-
-STRUCT PLACE
-    {
-    LTEXT city;
-    LTEXT country;
-    DOUBLE lat;
-    DOUBLE lon;
-    }
-
-STRUCT PLACES
-    {
-    STRUCT places[];
-    }
-
-RESOURCE PLACES r_mnrefproviderengine_places
-    {
-    places =
-        {
-        PLACE { city="Tampere"; country="Finland"; lat=61.50; lon=23.83; }, 
-        PLACE { city="Turku"; country="Finland"; lat=60.45; lon=22.28; }, 
-        PLACE { city="Oulu"; country="Finland"; lat=65.02; lon=28.47; }, 
-        PLACE { city="Saint-Petersburg"; country="Russia"; lat=59.92; lon=30.42; }, 
-        PLACE { city="Göteborg"; country="Sweden"; lat=57.72; lon=11.97; }, 
-        PLACE { city="Kabul"; country="Afghanistan"; lat=35.10; lon=68.55; },
-        PLACE { city="Tirana"; country="Albania"; lat=41.74; lon=19.38; },
-        PLACE { city="Algiers"; country="Algeria"; lat=37.55; lon=2.29; },
-        PLACE { city="Luanda"; country="Angola"; lat=-8.35; lon=12.76; },
-        PLACE { city="Yerevan"; country="Armenia"; lat=40.47; lon=44.21; },
-        PLACE { city="Oranjestad"; country="Aruba"; lat=13.12; lon=-70.76; },
-        PLACE { city="Canberra"; country="Australia"; lat=-35.15; lon=149.04; },
-        PLACE { city="Vienna"; country="Austria"; lat=48.75; lon=15.82; },
-        PLACE { city="Baku"; country="Azerbaijan"; lat=40.79; lon=49.50; },
-        PLACE { city="Nassau"; country="Bahamas"; lat=25.74; lon=-77.99; },
-        PLACE { city="Dhaka"; country="Bangladesh"; lat=24.10; lon=90.05; },
-        PLACE { city="Bridgetown"; country="Barbados"; lat=13.68; lon=-60.20; },
-        PLACE { city="Minsk"; country="Belarus"; lat=54.08; lon=27.43; },
-        PLACE { city="Brussels"; country="Belgium"; lat=51.64; lon=3.56; },
-        PLACE { city="Belmopan"; country="Belize"; lat=17.32; lon=-88.52; },
-        PLACE { city="Hamilton"; country="Bermuda"; lat=-37.75; lon=175.28; },
-        PLACE { city="Thimphu"; country="Bhutan"; lat=28.07; lon=89.05; },
-        PLACE { city="Gaborone"; country="Botswana"; lat=-24.36; lon=25.56; },
-        PLACE { city="Brasilia"; country="Brazil"; lat=-15.48; lon=-48.22; },
-        PLACE { city="Sofia"; country="Bulgaria"; lat=43.08; lon=23.00; },
-        PLACE { city="Bujumbura"; country="Burundi"; lat=-3.19; lon=29.17; },
-        PLACE { city="Yaounde"; country="Cameroon"; lat=4.52; lon=10.90; },
-        PLACE { city="Ottawa"; country="Canada"; lat=46.28; lon=-76.53; },
-        PLACE { city="Santiago"; country="Chile"; lat=-33.07; lon=-70.99; },
-        PLACE { city="Beijing"; country="China"; lat=40.13; lon=116.12; },
-        PLACE { city="Bogota"; country="Colombia"; lat=4.78; lon=-74.21; },
-        PLACE { city="Moroni"; country="Comoros"; lat=-11.10; lon=42.69; },
-        PLACE { city="Brazzaville"; country="Congo"; lat=-3.48; lon=14.50; },
-        PLACE { city="Zagreb"; country="Croatia"; lat=45.95; lon=15.88; },
-        PLACE { city="Havana"; country="Cuba"; lat=23.82; lon=-83.05; },
-        PLACE { city="Nicosia"; country="Cyprus"; lat=35.79; lon=32.73; },
-        PLACE { city="Copenhagen"; country="Denmark"; lat=56.32; lon=11.93; },
-        PLACE { city="Djibouti"; country="Djibouti"; lat=12.24; lon=42.35; },
-        PLACE { city="Roseau"; country="Dominica"; lat=15.85; lon=-61.91; },
-        PLACE { city="Quito"; country="Ecuador"; lat=-0.20; lon=-78.55; },
-        PLACE { city="Cairo"; country="Egypt"; lat=30.38; lon=30.87; },
-        PLACE { city="Asmara"; country="Eritrea"; lat=15.40; lon=38.83; },
-        PLACE { city="Tallinn"; country="Estonia"; lat=60.28; lon=23.90; },
-        PLACE { city="Suva"; country="Fiji"; lat=-18.07; lon=178.47; },
-        PLACE { city="Helsinki"; country="Finland"; lat=60.32; lon=24.98; },
-        PLACE { city="Paris"; country="France"; lat=49.86; lon=1.34; },
-        PLACE { city="Libreville"; country="Gabon"; lat=1.11; lon=8.74; },
-        PLACE { city="Banjul"; country="Gambia"; lat=14.07; lon=-17.27; },
-        PLACE { city="Tbilisi"; country="Georgia"; lat=42.63; lon=43.90; },
-        PLACE { city="Berlin"; country="Germany"; lat=52.67; lon=13.23; },
-        PLACE { city="Accra"; country="Ghana"; lat=6.16; lon=-0.79; },
-        PLACE { city="Gibraltar"; country="Gibraltar"; lat=36.14; lon=-5.39; },
-        PLACE { city="Athens"; country="Greece"; lat=38.94; lon=22.74; },
-        PLACE { city="Godthabsfjord"; country="Greenland"; lat=64.47; lon=-52.05; },
-        PLACE { city="Agana"; country="Guam"; lat=14.05; lon=144.17; },
-        PLACE { city="Guatemala"; country="Guatemala"; lat=14.69; lon=-90.39; },
-        PLACE { city="Conakry"; country="Guinea"; lat=9.87; lon=-14.20; },
-        PLACE { city="Georgetown"; country="Guyana"; lat=6.90; lon=-58.26; },
-        PLACE { city="Tegucigalpa"; country="Honduras"; lat=14.40; lon=-87.55; },
-        PLACE { city="Budapest"; country="Hungary"; lat=47.53; lon=19.04; },
-        PLACE { city="Reykjavik"; country="Iceland"; lat=64.58; lon=-22.36; },
-        PLACE { city="Delhi"; country="India"; lat=29.56; lon=76.29; },
-        PLACE { city="Jakarta"; country="Indonesia"; lat=-5.99; lon=106.66; },
-        PLACE { city="Tehran"; country="Iran"; lat=35.91; lon=51.24; },
-        PLACE { city="Baghdad"; country="Iraq"; lat=33.40; lon=44.35; },
-        PLACE { city="Jerusalem"; country="Israel"; lat=31.98; lon=34.97; },
-        PLACE { city="Rome"; country="Italy"; lat=42.78; lon=11.60; },
-        PLACE { city="Kingston"; country="Jamaica"; lat=29.30; lon=167.80; },
-        PLACE { city="Tokyo"; country="Japan"; lat=36.39; lon=139.04; },
-        PLACE { city="Amman"; country="Jordan"; lat=32.28; lon=35.54; },
-        PLACE { city="Almaty"; country="Kazakhstan"; lat=43.45; lon=76.75; },
-        PLACE { city="Nairobi"; country="Kenya"; lat=-0.91; lon=36.43; },
-        PLACE { city="Bairiki"; country="Kiribati"; lat=1.87; lon=172.55; },
-        PLACE { city="Bishkek"; country="Kyrgyzstan"; lat=43.45; lon=74.02; },
-        PLACE { city="Vientiane"; country="Laos"; lat=18.51; lon=102.05; },
-        PLACE { city="Riga"; country="Latvia"; lat=57.18; lon=23.92; },
-        PLACE { city="Beirut"; country="Lebanon"; lat=34.19; lon=35.21; },
-        PLACE { city="Maseru"; country="Lesotho"; lat=-28.58; lon=26.78; },
-        PLACE { city="Monrovia"; country="Liberia"; lat=7.24; lon=-11.72; },
-        PLACE { city="Tripoli"; country="Libya"; lat=33.21; lon=12.87; },
-        PLACE { city="Vaduz"; country="Liechtenstein"; lat=48.11; lon=8.54; },
-        PLACE { city="Vilnius"; country="Lithuania"; lat=54.97; lon=25.00; },
-        PLACE { city="Luxembourg"; country="Luxembourg"; lat=50.55; lon=5.22; },
-        PLACE { city="Macau"; country="Macau"; lat=22.49; lon=113.33; },
-        PLACE { city="Antananarivo"; country="Madagascar"; lat=-18.61; lon=47.21; },
-        PLACE { city="Lilongwe"; country="Malawi"; lat=-13.42; lon=33.22; },
-        PLACE { city="Male"; country="Maldives"; lat=4.90; lon=72.77; },
-        PLACE { city="Bamako"; country="Mali"; lat=13.47; lon=-8.82; },
-        PLACE { city="Valletta"; country="Malta"; lat=36.43; lon=13.97; },
-        PLACE { city="Nouakchott"; country="Mauritania"; lat=18.32; lon=-16.14; },
-        PLACE { city="Dzaoudzi"; country="Mayotte"; lat=-12.34; lon=44.84; },
-        PLACE { city="Palikir"; country="Micronesia"; lat=7.51; lon=157.56; },
-        PLACE { city="Chisinau"; country="Moldova"; lat=47.92; lon=27.95; },
-        PLACE { city="Monaco"; country="Monaco"; lat=44.41; lon=6.67; },
-        PLACE { city="Plymouth"; country="Montserrat"; lat=50.65; lon=-4.42; },
-        PLACE { city="Rabat"; country="Morocco"; lat=34.81; lon=-7.57; },
-        PLACE { city="Maputo"; country="Mozambique"; lat=-25.66; lon=32.23; },
-        PLACE { city="Yangon"; country="Myanmar"; lat=16.84; lon=96.08; },
-        PLACE { city="Windhoek"; country="Namibia"; lat=-21.94; lon=16.42; },
-        PLACE { city="Domaneab"; country="Nauru"; lat=0.31; lon=166.07; },
-        PLACE { city="Kathmandu"; country="Nepal"; lat=28.43; lon=84.66; },
-        PLACE { city="Amsterdam"; country="Netherlands"; lat=53.17; lon=4.01; },
-        PLACE { city="Managua"; country="Nicaragua"; lat=12.61; lon=-86.84; },
-        PLACE { city="Niamey"; country="Niger"; lat=13.73; lon=1.89; },
-        PLACE { city="Lagos"; country="Nigeria"; lat=38.00; lon=-9.60; },
-        PLACE { city="Alofi"; country="Niue"; lat=-18.95; lon=-170.02; },
-        PLACE { city="Oslo"; country="Norway"; lat=60.46; lon=10.20; },
-        PLACE { city="Muscat"; country="Oman"; lat=24.48; lon=57.74; },
-        PLACE { city="Islamabad"; country="Pakistan"; lat=34.43; lon=72.40; },
-        PLACE { city="Koror"; country="Palau"; lat=7.77; lon=134.06; },
-        PLACE { city="Panama"; country="Panama"; lat=9.97; lon=-80.52; },
-        PLACE { city="Asuncion"; country="Paraguay"; lat=-25.26; lon=-57.67; },
-        PLACE { city="Lima"; country="Peru"; lat=-11.31; lon=-77.79; },
-        PLACE { city="Manila"; country="Philippines"; lat=14.80; lon=120.75; },
-        PLACE { city="Adamstown"; country="Pitcairn"; lat=-24.53; lon=-130.62; },
-        PLACE { city="Warsaw"; country="Poland"; lat=52.94; lon=20.28; },
-        PLACE { city="Lisbon"; country="Portugal"; lat=38.72; lon=-9.20; },
-        PLACE { city="Doha"; country="Qatar"; lat=25.95; lon=50.93; },
-        PLACE { city="Bucharest"; country="Romania"; lat=45.34; lon=25.21; },
-        PLACE { city="Moscow"; country="Russia"; lat=55.88; lon=37.50; },
-        PLACE { city="Kigali"; country="Rwanda"; lat=-1.70; lon=29.78; },
-        PLACE { city="Dakar"; country="Senegal"; lat=15.06; lon=-17.87; },
-        PLACE { city="Victoria"; country="Seychelles"; lat=-3.71; lon=54.53; },
-        PLACE { city="Singapore"; country="Singapore"; lat=1.28; lon=103.85; },
-        PLACE { city="Ljubljana"; country="Slovenia"; lat=46.83; lon=13.79; },
-        PLACE { city="Mogadishu"; country="Somalia"; lat=2.60; lon=44.85; },
-        PLACE { city="Madrid"; country="Spain"; lat=41.49; lon=-4.74; },
-        PLACE { city="Khartoum"; country="Sudan"; lat=15.56; lon=32.54; },
-        PLACE { city="Paramaribo"; country="Surinam"; lat=5.85; lon=-55.18; },
-        PLACE { city="Mbabane"; country="Swaziland"; lat=-25.92; lon=30.72; },
-        PLACE { city="Stockholm"; country="Sweden"; lat=59.67; lon=17.71; },
-        PLACE { city="Berne"; country="Switzerland"; lat=47.49; lon=6.92; },
-        PLACE { city="Damascus"; country="Syria"; lat=33.89; lon=35.91; },
-        PLACE { city="Taipei"; country="Taiwan"; lat=25.93; lon=120.62; },
-        PLACE { city="Dushanbe"; country="Tajikistan"; lat=39.48; lon=67.88; },
-        PLACE { city="Dodoma"; country="Tanzania"; lat=-5.16; lon=34.78; },
-        PLACE { city="Bangkok"; country="Thailand"; lat=14.36; lon=99.90; },
-        PLACE { city="Lhasa"; country="Tibet"; lat=30.60; lon=90.17; },
-        PLACE { city="Lome"; country="Togo"; lat=6.63; lon=0.73; },
-        PLACE { city="Tunis"; country="Tunisia"; lat=36.85; lon=10.17; },
-        PLACE { city="Ankara"; country="Turkey"; lat=40.34; lon=32.56; },
-        PLACE { city="Ashkhabad"; country="Turkmenistan"; lat=38.22; lon=58.11; },
-        PLACE { city="Funafuti"; country="Tuvalu"; lat=-8.30; lon=178.96; },
-        PLACE { city="Kampala"; country="Uganda"; lat=1.20; lon=31.64; },
-        PLACE { city="Kiev"; country="Ukraine"; lat=50.92; lon=30.06; },
-        PLACE { city="Montevideo"; country="Uruguay"; lat=-34.21; lon=-56.81; },
-        PLACE { city="Tashkent"; country="Uzbekistan"; lat=41.40; lon=69.24; },
-        PLACE { city="Caracas"; country="Venezuela"; lat=11.16; lon=-67.58; },
-        PLACE { city="Hanoi"; country="Vietnam"; lat=21.33; lon=105.67; },
-        PLACE { city="Sanaa"; country="Yemen"; lat=16.39; lon=43.26; },
-        PLACE { city="Belgrade"; country="Yugoslavia"; lat=45.56; lon=19.77; },
-        PLACE { city="Lusaka"; country="Zambia"; lat=-15.00; lon=27.80; },
-        PLACE { city="Harare"; country="Zimbabwe"; lat=-17.30; lon=30.61; }
-		};
-	}
-
--- a/locsrv_plat/map_and_navigation_api/tsrc/mapnavproviderrefapp/data/mnrefproviderplugin.rss	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,51 +0,0 @@
-/*
-* Copyright (c) 2007 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 ECom registration resource for TestProviderPlugin.
-*
-*/
-
-
-//  RESOURCE IDENTIFIER
-NAME MNTP
-
-#include <ecom/registryinfov2.rh>
-#include <mnpluginuids.hrh> // defines interface UID
-
-RESOURCE REGISTRY_INFO r_mycoordconverterplugin_reginfo
-	{
-	resource_format_version = RESOURCE_FORMAT_VERSION_2;
-	// DLL UID of the DLL
-	dll_uid = 0x03133037;
-	interfaces =
-	    {
-	    INTERFACE_INFO
-	        {
-	        // UID of coordinate converter interface,
-	        // defined in mnpluginuids.hrh
-	        interface_uid = KMnMapImageConverterIf;
-	        implementations =
-	            {
-	            IMPLEMENTATION_INFO
-	                {
-	                // The licensee needs to allocate this UID from Symbian
-	                implementation_uid = 0x03133038;
-	                version_no = 1;
-	                display_name = "MnRefProviderCoordConverter";
-	                // SID of provider application executable
-	                default_data = "03132014";
-	                }
-	            };
-	        }
-	    };
-	}
--- a/locsrv_plat/map_and_navigation_api/tsrc/mapnavproviderrefapp/eabi/mnrefproviderengine.50u.def	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,64 +0,0 @@
-EXPORTS
-	_ZN11CMnrpEngine12KnownPlacesLEv @ 1 NONAME
-	_ZN11CMnrpEngine15AddressToCoordLERK12CPosLandmark @ 2 NONAME
-	_ZN11CMnrpEngine15AddressToCoordLERK7TDesC16 @ 3 NONAME
-	_ZN11CMnrpEngine16AddressToCoordLCERK12CPosLandmark @ 4 NONAME
-	_ZN11CMnrpEngine16AddressToCoordLCERK7TDesC16 @ 5 NONAME
-	_ZN11CMnrpEngine16CoordToAddressLCERK11TCoordinate @ 6 NONAME
-	_ZN11CMnrpEngine16FindClosestPoisLERK12CPosLandmarkR6RArrayINS_14TDistanceToPoiEEi @ 7 NONAME
-	_ZN11CMnrpEngine17FindResourceFileLERK7TDesC16R4TBufILi256EE @ 8 NONAME
-	_ZN11CMnrpEngine24DistanceBetweenLandmarksERK12CPosLandmarkS2_ @ 9 NONAME
-	_ZN11CMnrpEngine26BestCoordToAddressMatchesLERK11TCoordinateR13RPointerArrayI12CPosLandmarkEi @ 10 NONAME
-	_ZN11CMnrpEngine2FsEv @ 11 NONAME
-	_ZN11CMnrpEngine4NewLEv @ 12 NONAME
-	_ZN11CMnrpEngineD0Ev @ 13 NONAME
-	_ZN11CMnrpEngineD1Ev @ 14 NONAME
-	_ZN11CMnrpEngineD2Ev @ 15 NONAME
-	_ZN13CMnrpMapModel11UpdateModelERK17TMnMapImageParams @ 16 NONAME
-	_ZN13CMnrpMapModel12UpdateModelLER19CMnrpMapViewService @ 17 NONAME
-	_ZN13CMnrpMapModel12UpdateModelLERK20CMnrpMapImageService @ 18 NONAME
-	_ZN13CMnrpMapModel13SetScreenSizeE5TSize @ 19 NONAME
-	_ZN13CMnrpMapModel19NumIgnoredLandmarksEv @ 20 NONAME
-	_ZN13CMnrpMapModel4NewLER11CMnrpEngine @ 21 NONAME
-	_ZN13CMnrpMapModel4NewLER17MMapModelObserverR11CMnrpEngine @ 22 NONAME
-	_ZN13CMnrpMapModel4ZoomEd @ 23 NONAME
-	_ZN13CMnrpMapModel6MoveToE11TCoordinate @ 24 NONAME
-	_ZN13CMnrpMapModel8GoCenterEv @ 25 NONAME
-	_ZN20CMnrpPositionRequest11GetPositionER13TPositionInfo @ 26 NONAME
-	_ZN20CMnrpPositionRequest11SetOptionsLERK26TPositionUpdateOptionsBase @ 27 NONAME
-	_ZN20CMnrpPositionRequest14MagneticCourseEv @ 28 NONAME
-	_ZN20CMnrpPositionRequest15MagneticHeadingEv @ 29 NONAME
-	_ZN20CMnrpPositionRequest16FetchNewPositionEi @ 30 NONAME
-	_ZN20CMnrpPositionRequest4NewLERK7TDesC16R21MMnrpPositionObserver @ 31 NONAME
-	_ZN20CMnrpPositionRequest5SpeedEv @ 32 NONAME
-	_ZN20CMnrpPositionRequest6CourseEv @ 33 NONAME
-	_ZN20CMnrpPositionRequest7HeadingEv @ 34 NONAME
-	_ZN20CMnrpPositionRequestD0Ev @ 35 NONAME
-	_ZN20CMnrpPositionRequestD1Ev @ 36 NONAME
-	_ZN20CMnrpPositionRequestD2Ev @ 37 NONAME
-	_ZN9MnrpUtils13AngleToStringEdR6TDes16 @ 38 NONAME
-	_ZN9MnrpUtils13SpeedToStringEdR6TDes16 @ 39 NONAME
-	_ZN9MnrpUtils16DistanceToStringEdR6TDes16 @ 40 NONAME
-	_ZN9MnrpUtils17PrintableStringLCERK7TDesC16 @ 41 NONAME
-	_ZN9MnrpUtils18CoordinateToStringEdR6TDes16ii @ 42 NONAME
-	_ZNK13CMnrpMapModel16AbsoluteToScreenE11TCoordinate @ 43 NONAME
-	_ZNK13CMnrpMapModel16ScreenToAbsoluteE6TPoint @ 44 NONAME
-	_ZNK13CMnrpMapModel16ScreenToAbsoluteEi @ 45 NONAME
-	_ZNK13CMnrpMapModel3TopEv @ 46 NONAME
-	_ZNK13CMnrpMapModel4LeftEv @ 47 NONAME
-	_ZNK13CMnrpMapModel5RightEv @ 48 NONAME
-	_ZNK13CMnrpMapModel5WidthEv @ 49 NONAME
-	_ZNK13CMnrpMapModel6BottomEv @ 50 NONAME
-	_ZNK13CMnrpMapModel6CenterEv @ 51 NONAME
-	_ZNK13CMnrpMapModel6HeightEv @ 52 NONAME
-	_ZNK13CMnrpMapModel7GetGridERNS_5TGridE @ 53 NONAME
-	_ZNK13CMnrpMapModel7RenderLER10CFbsBitmap5TRectP5CFontS4_ @ 54 NONAME
-	_ZTI11CMnrpEngine @ 55 NONAME ; #<TI>#
-	_ZTI13CMnrpMapModel @ 56 NONAME ; #<TI>#
-	_ZTI20CMnrpPositionRequest @ 57 NONAME ; #<TI>#
-	_ZTIN13CMnrpMapModel9CDrawItemE @ 58 NONAME ; #<TI>#
-	_ZTV11CMnrpEngine @ 59 NONAME ; #<VT>#
-	_ZTV13CMnrpMapModel @ 60 NONAME ; #<VT>#
-	_ZTV20CMnrpPositionRequest @ 61 NONAME ; #<VT>#
-	_ZTVN13CMnrpMapModel9CDrawItemE @ 62 NONAME ; #<VT>#
-
--- a/locsrv_plat/map_and_navigation_api/tsrc/mapnavproviderrefapp/eabi/mnrefproviderengineu.def	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,62 +0,0 @@
-EXPORTS
-	_ZN11CMnrpEngine12KnownPlacesLEv @ 1 NONAME
-	_ZN11CMnrpEngine16AddressToCoordLCERK12CPosLandmark @ 2 NONAME
-	_ZN11CMnrpEngine16AddressToCoordLCERK7TDesC16 @ 3 NONAME
-	_ZN11CMnrpEngine16CoordToAddressLCERK11TCoordinate @ 4 NONAME
-	_ZN11CMnrpEngine16FindClosestPoisLERK12CPosLandmarkR6RArrayINS_14TDistanceToPoiEEi @ 5 NONAME
-	_ZN11CMnrpEngine17FindResourceFileLERK7TDesC16R4TBufILi256EE @ 6 NONAME
-	_ZN11CMnrpEngine24DistanceBetweenLandmarksERK12CPosLandmarkS2_ @ 7 NONAME
-	_ZN11CMnrpEngine26BestCoordToAddressMatchesLERK11TCoordinateR13RPointerArrayI12CPosLandmarkEi @ 8 NONAME
-	_ZN11CMnrpEngine2FsEv @ 9 NONAME
-	_ZN11CMnrpEngine4NewLEv @ 10 NONAME
-	_ZN11CMnrpEngineD0Ev @ 11 NONAME
-	_ZN11CMnrpEngineD1Ev @ 12 NONAME
-	_ZN11CMnrpEngineD2Ev @ 13 NONAME
-	_ZN13CMnrpMapModel12UpdateModelLER19CMnrpMapViewService @ 14 NONAME
-	_ZN13CMnrpMapModel13SetScreenSizeE5TSize @ 15 NONAME
-	_ZN13CMnrpMapModel4NewLER11CMnrpEngine @ 16 NONAME
-	_ZN13CMnrpMapModel4NewLER17MMapModelObserverR11CMnrpEngine @ 17 NONAME
-	_ZN13CMnrpMapModel4ZoomEd @ 18 NONAME
-	_ZN13CMnrpMapModel6MoveToE11TCoordinate @ 19 NONAME
-	_ZN13CMnrpMapModel8GoCenterEv @ 20 NONAME
-	_ZN20CMnrpPositionRequest11GetPositionER13TPositionInfo @ 21 NONAME
-	_ZN20CMnrpPositionRequest11SetOptionsLERK26TPositionUpdateOptionsBase @ 22 NONAME
-	_ZN20CMnrpPositionRequest14MagneticCourseEv @ 23 NONAME
-	_ZN20CMnrpPositionRequest15MagneticHeadingEv @ 24 NONAME
-	_ZN20CMnrpPositionRequest16FetchNewPositionEi @ 25 NONAME
-	_ZN20CMnrpPositionRequest4NewLERK7TDesC16R21MMnrpPositionObserver @ 26 NONAME
-	_ZN20CMnrpPositionRequest5SpeedEv @ 27 NONAME
-	_ZN20CMnrpPositionRequest6CourseEv @ 28 NONAME
-	_ZN20CMnrpPositionRequest7HeadingEv @ 29 NONAME
-	_ZN20CMnrpPositionRequestD0Ev @ 30 NONAME
-	_ZN20CMnrpPositionRequestD1Ev @ 31 NONAME
-	_ZN20CMnrpPositionRequestD2Ev @ 32 NONAME
-	_ZN9MnrpUtils13AngleToStringEdR6TDes16 @ 33 NONAME
-	_ZN9MnrpUtils13SpeedToStringEdR6TDes16 @ 34 NONAME
-	_ZN9MnrpUtils16DistanceToStringEdR6TDes16 @ 35 NONAME
-	_ZN9MnrpUtils18CoordinateToStringEdR6TDes16ii @ 36 NONAME
-	_ZNK13CMnrpMapModel16AbsoluteToScreenE11TCoordinate @ 37 NONAME
-	_ZNK13CMnrpMapModel16ScreenToAbsoluteE6TPoint @ 38 NONAME
-	_ZNK13CMnrpMapModel16ScreenToAbsoluteEi @ 39 NONAME
-	_ZNK13CMnrpMapModel3TopEv @ 40 NONAME
-	_ZNK13CMnrpMapModel4LeftEv @ 41 NONAME
-	_ZNK13CMnrpMapModel5RightEv @ 42 NONAME
-	_ZNK13CMnrpMapModel5WidthEv @ 43 NONAME
-	_ZNK13CMnrpMapModel6BottomEv @ 44 NONAME
-	_ZNK13CMnrpMapModel6CenterEv @ 45 NONAME
-	_ZNK13CMnrpMapModel6HeightEv @ 46 NONAME
-	_ZNK13CMnrpMapModel7GetGridERNS_5TGridE @ 47 NONAME
-	_ZNK13CMnrpMapModel7RenderLER10CFbsBitmap5TRectP5CFontS4_ @ 48 NONAME
-	_ZTI11CMnrpEngine @ 49 NONAME ; #<TI>#
-	_ZTI13CMnrpMapModel @ 50 NONAME ; #<TI>#
-	_ZTI20CMnrpPositionRequest @ 51 NONAME ; #<TI>#
-	_ZTIN13CMnrpMapModel9CDrawItemE @ 52 NONAME ; #<TI>#
-	_ZTV11CMnrpEngine @ 53 NONAME ; #<VT>#
-	_ZTV13CMnrpMapModel @ 54 NONAME ; #<VT>#
-	_ZTV20CMnrpPositionRequest @ 55 NONAME ; #<VT>#
-	_ZTVN13CMnrpMapModel9CDrawItemE @ 56 NONAME ; #<VT>#
-	_ZN9MnrpUtils17PrintableStringLCERK7TDesC16 @ 57 NONAME
-	_ZN11CMnrpEngine14AddressToCoordERK12CPosLandmark @ 58 NONAME
-	_ZN11CMnrpEngine14AddressToCoordERK7TDesC16 @ 59 NONAME
-	_ZN13CMnrpMapModel19NumIgnoredLandmarksEv @ 60 NONAME
-
--- a/locsrv_plat/map_and_navigation_api/tsrc/mapnavproviderrefapp/group/bld.inf	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,42 +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:  Build information file for project MapNavRefProviderApp
-*
-*/
-
-#include <bldvariant.hrh>
-#include <platform_paths.hrh>
-
-PRJ_PLATFORMS
-DEFAULT
-
-PRJ_EXTENSIONS
-START EXTENSION s60/mifconv
-OPTION TARGETFILE MnRefProvider.mif  // this will also generate .mbm;
-OPTION HEADERFILE MnRefProvider.mbg
-OPTION SOURCES -c8,8 default_lm.bmp
-OPTION SOURCEDIR ../data
-END
-PRJ_MMPFILES
-PRJ_TESTMMPFILES
-
-mapnavrefengine.mmp
-mapnavrefprovider.mmp
-mapnavrefproviderback.mmp
-
-#ifdef RD_MAPNAV_BITMAP_ACCESS
-mapnavrefproviderplugin.mmp
-#endif
-
-
--- a/locsrv_plat/map_and_navigation_api/tsrc/mapnavproviderrefapp/group/mapnavrefengine.mmp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,64 +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:  Project definition file for MnRefProviderEngine
-*
-*/
-
-
-#include <platform_paths.hrh>
-
-TARGET              mnrefproviderengine.dll
-TARGETTYPE          dll
-UID                 0x1000008D 0x03132015
-
-VENDORID            VID_DEFAULT
-CAPABILITY          ReadUserData WriteUserData Location
-
-SOURCEPATH          ../src
-
-SOURCE              mnrpengine.cpp
-SOURCE              mnrpmapmodel.cpp
-SOURCE              mnrppositionrequest.cpp
-SOURCE              mnrputils.cpp
-
-USERINCLUDE         ../inc
-MW_LAYER_SYSTEMINCLUDE
-
-LIBRARY             euser.lib efsrv.lib estor.lib bafl.lib
-LIBRARY             eikcore.lib
-LIBRARY             aknicon.lib egul.lib gdi.lib bitgdi.lib
-
-LIBRARY             eposlandmarks.lib
-LIBRARY             lbs.lib
-LIBRARY             mnclientlib.lib mnservicelib.lib
-
-DEBUGLIBRARY        flogger.lib
-
-START RESOURCE      ../data/mnrefproviderengine.rss
-HEADER
-TARGETPATH          /resource
-END
-
-#ifdef RD_MAPNAV_BITMAP_ACCESS
-#ifdef WINS
-DEFFILE         ../bwins/mnrefproviderengine.50.def
-#else
-DEFFILE         ../eabi/mnrefproviderengine.50.def
-#endif
-#endif
-
-SMPSAFE
-
-// END OF FILE
-
--- a/locsrv_plat/map_and_navigation_api/tsrc/mapnavproviderrefapp/group/mapnavrefprovider.mmp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,82 +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:  Project definition file for MnRefProvider
-*
-*/
-
-
-#include <platform_paths.hrh>
-
-TARGET              mnrefprovider.exe
-TARGETTYPE          exe
-EPOCSTACKSIZE       0x5000
-UID                 0x100039CE 0x03132013
-
-VENDORID            VID_DEFAULT
-CAPABILITY          ReadUserData WriteUserData Location
-
-SOURCEPATH          ../src
-
-SOURCE              mnrefprovider.cpp
-SOURCE              mnrpapplication.cpp
-SOURCE              mnrpappui.cpp
-SOURCE              mnrpdocument.cpp
-SOURCE              mnrpappserver.cpp
-
-SOURCE              mnrpappview.cpp
-SOURCE              mnrpappcontrol.cpp
-
-SOURCE              mnrpmapview.cpp
-SOURCE              mnrpmapcontrol.cpp
-
-SOURCE              mnrpnaviview.cpp
-SOURCE              mnrpnavimodel.cpp
-SOURCE              mnrpnavicontrol.cpp
-
-SOURCE              mnrpnavigationservice.cpp
-SOURCE              mnrpmapviewservice.cpp
-
-USERINCLUDE         ../inc
-
-MW_LAYER_SYSTEMINCLUDE
-
-LIBRARY             euser.lib efsrv.lib estor.lib apparc.lib bafl.lib
-LIBRARY             cone.lib eikcore.lib eikcoctl.lib eikctl.lib eikdlg.lib
-
-LIBRARY             avkon.lib aknskins.lib aknicon.lib
-LIBRARY             egul.lib gdi.lib ws32.lib fbscli.lib
-LIBRARY             imageconversion.lib
-
-LIBRARY             eposlandmarks.lib eposlmsearchlib.lib
-LIBRARY             lbs.lib
-LIBRARY             mnservicelib.lib
-
-LIBRARY             mnrefproviderengine.lib
-
-DEBUGLIBRARY        flogger.lib
-
-START RESOURCE      ../data/MnRefProvider.rss
-HEADER
-TARGETPATH          /resource/apps
-END
-
-START RESOURCE      ../data/MnRefProvider_reg.rss
-DEPENDS mnrefprovider.rsg
-TARGETPATH          /private/10003a3f/apps
-END
-
-SMPSAFE
-
-// END OF FILE
-
--- a/locsrv_plat/map_and_navigation_api/tsrc/mapnavproviderrefapp/group/mapnavrefproviderback.mmp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,72 +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:  Project definition file for MnRefGeocoder
-*
-*/
-
-
-#include <platform_paths.hrh>
-
-TARGET              mnrefproviderback.exe
-TARGETTYPE          exe
-EPOCSTACKSIZE       0x5000
-UID                 0x100039CE 0x03132014
-
-VENDORID            VID_DEFAULT
-CAPABILITY          ReadUserData WriteUserData Location
-
-SOURCEPATH          ../src
-
-SOURCE              mnrefproviderback.cpp
-SOURCE              mnrpapplicationback.cpp
-SOURCE              mnrpappuiback.cpp
-SOURCE              mnrpdocumentback.cpp
-SOURCE              mnrpappserverback.cpp
-
-SOURCE              mnrpgeocodingservice.cpp
-#ifdef RD_MAPNAV_BITMAP_ACCESS
-SOURCE              mnrpmapimageservice.cpp
-#endif
-
-USERINCLUDE         ../inc
-MW_LAYER_SYSTEMINCLUDE
-
-LIBRARY             euser.lib efsrv.lib estor.lib bafl.lib
-LIBRARY             cone.lib apparc.lib eikcore.lib eikcoctl.lib
-LIBRARY             ws32.lib gdi.lib
-
-LIBRARY             avkon.lib aknskins.lib
-
-LIBRARY             eposlandmarks.lib
-LIBRARY             lbs.lib
-LIBRARY             mnservicelib.lib
-
-LIBRARY             mnrefproviderengine.lib
-
-DEBUGLIBRARY        flogger.lib
-
-START RESOURCE      ../data/mnrefproviderback.rss
-HEADER
-TARGETPATH          /resource/apps
-END
-
-START RESOURCE      ../data/mnrefproviderback_reg.rss
-DEPENDS mnrefproviderback.rsg
-TARGETPATH          /private/10003a3f/apps
-END
-
-SMPSAFE
-
-// END OF FILE
-
--- a/locsrv_plat/map_and_navigation_api/tsrc/mapnavproviderrefapp/group/mapnavrefproviderplugin.mmp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,50 +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:  Project definition file for MnRefProviderPlugin
-*
-*/
-
-
-#include <platform_paths.hrh>
-
-TARGET              MnRefProviderPlugin.dll
-TARGETTYPE          PLUGIN
-UID                 0x10009D8D 0x03133037
-
-VENDORID            VID_DEFAULT
-CAPABILITY          ReadUserData WriteUserData Location
-
-SOURCEPATH          ../src
-
-SOURCE              mnrefproviderplugin.cpp
-SOURCE				mnrpcoordconverter.cpp
-
-USERINCLUDE         ../inc
-MW_LAYER_SYSTEMINCLUDE
-
-LIBRARY             euser.lib
-LIBRARY             lbs.lib
-LIBRARY             mnclientlib.lib
-LIBRARY             mnrefproviderengine.lib
-DEBUGLIBRARY        flogger.lib
-
-START RESOURCE      ../data/mnrefproviderplugin.rss
-TARGET			    mnrefproviderplugin.rsc
-TARGETPATH          /resource/plugins
-END
-
-SMPSAFE
-
-// END OF FILE
-
--- a/locsrv_plat/map_and_navigation_api/tsrc/mapnavproviderrefapp/inc/debug.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,86 +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:  Debug macros
-*
-*/
-
-
-#ifndef MNRP_DEBUG_H
-#define MNRP_DEBUG_H
-
-#include <e32base.h>
-
-#ifdef _DEBUG
-
-#include <e32svr.h>
-#include <e32std.h>
-#include <f32file.h>
-#include <flogger.h>
-
-_LIT(KLogFile, "mnlog.txt");
-_LIT(KLogDirFullName, "c:\\logs\\");
-_LIT(KLogDir, "mn");
-
-inline void Prefix( TDes& aMessage )
-    {
-    RProcess process;
-    _LIT( KPrefix, "[MnRefProvider/%ld]: ");
-    aMessage.Format( KPrefix, process.Id().Id() );
-    }
-
-inline void Log( TRefByValue<const TDesC> aFmt, ... )
-    {
-    VA_LIST list;
-    VA_START( list, aFmt );
-
-    HBufC* buf = HBufC::New(512);
-    if ( buf )
-    	{
-    	TPtr ptr( buf->Des() );
-	    Prefix( ptr );
-	    ptr.AppendFormatList( aFmt, list );
-
-	    RDebug::RawPrint( ptr );
-	    RFileLogger::Write( KLogDir, KLogFile, EFileLoggingModeAppend, ptr );
-
-	    delete buf;
-    	}
-    }
-
-#define LOG( a )             { Log( _L( a ) ); }
-#define LOG1( a, b )         { Log( _L( a ), b ); }
-#define LOG2( a, b, c )      { Log( _L( a ), b, c ); }
-#define LOG3( a, b, c, d )   { Log( _L( a ), b, c, d ); }
-#define LOG4( a, b, c, d, e )   { Log( _L( a ), b, c, d, e ); }
-
-#else // _DEBUG
-
-// Release version - no logging
-#define LOG( a)
-#define LOG1( a, b )
-#define LOG2( a, b, c )
-#define LOG3( a, b, c, d )
-#define LOG4( a, b, c, d, e )
-
-#endif // _DEBUG
-
-inline void Panic( TInt aReason )
-    {
-    _LIT( KPanicCategory, "MnRefProvider" );
-    LOG1("Panicking: %1", aReason);
-    User::Panic( KPanicCategory, aReason );
-    }
-
-#endif // MNRP_DEBUG_H
-
--- a/locsrv_plat/map_and_navigation_api/tsrc/mapnavproviderrefapp/inc/mnrp.hrh	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,35 +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:  Common source and resource constants
-*
-*/
-
-
-#ifndef __MNRP_HRH__
-#define __MNRP_HRH__
-
-enum TMnrpCommandIds
-    {
-	EMnrpCommandFullScreen = 100,
-	EMnrpCommandSelect
-    };
-
-enum TMnrpViewIds
-    {
-    EMnrpAppViewId = 1,
-    EMnrpMapViewId,
-    EMnrpNavigationViewId
-    };
-
-#endif // __MNRP_HRH__
--- a/locsrv_plat/map_and_navigation_api/tsrc/mapnavproviderrefapp/inc/mnrpappcontrol.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,53 +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:  CMnrpAppControl class definition 
-*
-*/
-
-
-#ifndef MNRP_APPCONTROL_H
-#define MNRP_APPCONTROL_H
-
-#include <coecntrl.h>
-class CMnrpAppView;
-
-/** Empty view for the case when application is started
- *	from menu */
-class CMnrpAppControl : public CCoeControl
-    {
-    public:
-
-        static CMnrpAppControl* NewL( CMnrpAppView& aView, const TRect& aRect );
-
-        virtual ~CMnrpAppControl();
-
-    public:  // From CCoeControl
-
-        TInt CountComponentControls() const;
-        CCoeControl* ComponentControl( TInt aIndex ) const;
-        void HandleResourceChange( TInt aType );
-
-        void Draw( const TRect& aRect ) const;
-        
-    private:
-
-        void ConstructL( const TRect& aRect );
-        CMnrpAppControl( CMnrpAppView& aView );
-        
-    private:
-        CMnrpAppView&   iView;
-    };
-
-#endif // MNRP_APPCONTROL_H
-
--- a/locsrv_plat/map_and_navigation_api/tsrc/mapnavproviderrefapp/inc/mnrpapplication.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,55 +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:  CMnrpApplication class definition 
-*
-*/
-
-
-#ifndef MNRP_APPLICATION_H
-#define MNRP_APPLICATION_H
-
-#include <eikapp.h>
-
-/**
- *  An instance of CMnrpApplication is the application part of the Eikon
- *  application framework for the MnRefProvider.
- *	MnRefProvider is an Application Server, which implements MapView and Navigation
- *	services of M&N FW.
- */
-class CMnrpApplication : public CEikApplication
-    {
-    public:  // from CEikApplication
-
-        /** 
-        * AppDllUid returns the application DLL UID value.
-        *
-        *  @return the UID of this Application/Dll
-        */
-        TUid AppDllUid() const;
-
-    protected: // from CEikApplication
-
-        /** 
-        * CreateDocumentL creates a CApaDocument object and return a pointer to it
-        *
-        * @return a pointer to the created document
-        */
-        CApaDocument* CreateDocumentL();
-        
-        void NewAppServerL(CApaAppServer *&aAppServer);
-
-    };
-
-#endif // MNRP_APPLICATION_H
-
--- a/locsrv_plat/map_and_navigation_api/tsrc/mapnavproviderrefapp/inc/mnrpapplicationback.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,56 +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:  CMnrpApplicationBack class definition
-*
-*/
-
-
-#ifndef MNRP_APPLICATIONBACK_H
-#define MNRP_APPLICATIONBACK_H
-
-#include <eikapp.h>
-
-/**
- *  An instance of CMnrpApplicationBack is the application part of the Eikon
- *  application framework for the MnRefGeocoder.
- *	MnRefGeocoder is a hidden application and works only as geocoder server.
- *	It accepts geocoding requests from M&N FW, serves them and exits, when 
- *	all clients are disconnected.
- */
-class CMnrpApplicationBack : public CEikApplication
-    {
-    public:  // from CEikApplication
-
-        /** 
-        * AppDllUid returns the application DLL UID value.
-        *
-        *  @return the UID of this Application/Dll
-        */
-        TUid AppDllUid() const;
-
-    protected: // from CEikApplication
-
-        /** 
-        * CreateDocumentL creates a CApaDocument object and return a pointer to it
-        *
-        * @return a pointer to the created document
-        */
-        CApaDocument* CreateDocumentL();
-        
-        void NewAppServerL(CApaAppServer *&aAppServer);
-
-    };
-
-#endif // MNRP_APPLICATIONBACK_H
-
--- a/locsrv_plat/map_and_navigation_api/tsrc/mapnavproviderrefapp/inc/mnrpappserver.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,55 +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:  CMnrpAppServer class definition
-*
-*/
-
-
-#ifndef MNRP_APPSERVER_H
-#define MNRP_APPSERVER_H
-
-#include <aknserverapp.h>
-
-class CMnrpAppUi;
-class CMnrpNavigationService;
-class CMnrpMapViewService;
-
-/** Application Server class of MnRefProvider component */
-class CMnrpAppServer : public CAknAppServer
-    {
-    public:
-        ~CMnrpAppServer();
-        
-        CMnrpAppUi* AppUi();
-
-    public: // from CAknAppServer
-    	/** Creates new service class and returns pointer to it */
-        IMPORT_C CApaAppServiceBase* CreateServiceL(TUid aServiceType) const;
-        
-        /** Overrides base function. Doesn't close application evenb if all
-         *	clients have disconnected until user closes it herself. 
-         *	It is important for standalone execution, when calling application
-         *	may be closed, but user still wants to continue with Map or Navigation.
-         */
-        IMPORT_C void HandleAllClientsClosed();
-        
-    protected:        
-    	/** Creates new navigation service class and returns pointer to it */
-        CMnrpNavigationService* CreateNavigationServiceL() const;
-    	/** Creates new map view service class and returns pointer to it */
-        CMnrpMapViewService* CreateMapViewServiceL() const;
-    };
-
-#endif // MNRP_APPSERVER_H
-
--- a/locsrv_plat/map_and_navigation_api/tsrc/mapnavproviderrefapp/inc/mnrpappserverback.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,60 +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:  CMnrpAppServerBack class definition
-*
-*/
-
-
-#ifndef MNRP_APPSERVERBACK_H
-#define MNRP_APPSERVERBACK_H
-
-#include <aknserverapp.h>
-
-class CMnrpGeocodingService;
-class CMnrpEngine;
-
-#ifdef RD_MAPNAV_BITMAP_ACCESS
-class CMnrpMapImageService;
-#endif
-
-/** Application Server class of MnRefGeocoder component
- *	It ows Engine instance.
- */
-class CMnrpAppServerBack : public CAknAppServer
-    {
-    public:
-        static CMnrpAppServerBack* NewL();
-        ~CMnrpAppServerBack();
-
-    public: // from CAknAppServer
-    	/** Creates new geocoding service class and returns pointer to it */
-        IMPORT_C CApaAppServiceBase* CreateServiceL( TUid aServiceType ) const;
-
-    protected:
-        void ConstructL();
-
-    	/** Creates new geocoding service class and returns pointer to it */
-        CMnrpGeocodingService* CreateGeocodingServiceL() const;
-
-#ifdef RD_MAPNAV_BITMAP_ACCESS
-    	/** Creates new map image service class and returns pointer to it */
-        CMnrpMapImageService* CreateMapImageServiceL() const;
-#endif
-
-    private:
-        CMnrpEngine* iEngine;
-    };
-
-#endif // MNRP_APPSERVERBACK_H
-
--- a/locsrv_plat/map_and_navigation_api/tsrc/mapnavproviderrefapp/inc/mnrpappui.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,120 +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:  CMnrpAppUi class definition
-*
-*/
-
-
-#ifndef MNRP_APPUI_H
-#define MNRP_APPUI_H
-
-#include <aknviewappui.h>
-#include <epos_landmarks.h>
-
-class TCoordinate;
-class CPosLandmark;
-
-class CMnrpAppView;
-class CMnrpNaviView;
-class CMnrpMapView;
-
-class CMnrpMapViewService;
-
-class CAknNavigationDecorator;
-class CAknNavigationControlContainer;
-
-class CMnrpEngine;
-
-/** Map selection callback class */
-class MMapSelectionCallback
-    {
-    public:
-        /** Called when user selects location from map */
-        virtual void HandleSelectionL( const TCoordinate& aSelection ) = 0;
-
-        /** Called when user selects landmark from dialog list */
-        virtual void HandleSelectionL( TInt aLandmarkIndex ) = 0;
-        virtual void HandleSelectionL( TPosLmItemId aLandmarkId, TInt aDbIndex ) = 0;
-        
-        /** Called when user refuses selection */
-        virtual void HandleSelectionErrorL( TInt aError ) = 0;
-    };
-
-/** Simple App UI for MnRefProvider component.
- *	It manages application views.
- */
-class CMnrpAppUi : public CAknViewAppUi
-    {
-    public:
-
-        CMnrpAppUi( CMnrpEngine& aEngine );
-        void ConstructL();
-        ~CMnrpAppUi();
-
-        void ShowMapL( CMnrpMapViewService& aService );
-
-        void StartSelectionL( 
-            CMnrpMapViewService& aService,  
-            MMapSelectionCallback& aCallback );
-
-        void StopSelection();
-
-        void ShowNavigationL( const CPosLandmark& aDestination );
-
-		/** Returns ETrue if Map or Navigaton view is still open */
-        TBool IsAnyUserViewActive();
-        
-		/** Returns ETrue if application was started embedded */
-        TBool IsChainedMode();
-
-        void SetNaviPaneTitleL( const TDesC& aPaneTitle );
-        void SetRightSoftkeyCommandL( TInt aCommand, const TDesC& aButtonTitle );
-        
-    protected: // from CAknAppUi
-    
-        void HandleCommandL(TInt aCommand);
-        void HandleResourceChangeL( TInt aType );
-        TBool ProcessCommandParametersL( CApaCommandLine &aCommandLine );
-
-    private:
-
-        void PostConstructL();
-
-        void SelectFromDialogL(
-            CMnrpMapViewService& aService,
-            MMapSelectionCallback& aCallback );
-
-    private:
-    	/** Empty view */
-        CMnrpAppView* iAppView;
-
-		/** Navigation view */
-        CMnrpNaviView* iNaviView;
-		/** Map view */
-        CMnrpMapView* iMapView;
-
-        //Own:
-        CAknNavigationDecorator* iNaviPaneLabel;
-
-        //Ref:
-        CAknNavigationControlContainer* iNaviPane;
-        
-        TInt iParentWg;
-
-        /** Reference to engine */
-        CMnrpEngine& iEngine;
-    };
-
-#endif // MNRP_APPUI_H
-
--- a/locsrv_plat/map_and_navigation_api/tsrc/mapnavproviderrefapp/inc/mnrpappuiback.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,42 +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:   class definition
-*
-*/
-
-
-#ifndef MNRP_APPUIBACK_H
-#define MNRP_APPUIBACK_H
-
-#include <aknviewappui.h>
-
-/** Simple App UI class of the MnRefGeocoder component */
-class CMnrpAppUiBack : public CAknAppUi
-    {
-    public:
-        void ConstructL();
-
-        /**  Moves application to foreground */
-        void MoveForeground();
-        
-        /**  Moves application to background */
-        void MoveBackground();
-
-    public: // from CEikAppUi
-
-        void HandleCommandL(TInt aCommand);
-    };
-
-#endif // MNRP_APPUIBACK_H
-
--- a/locsrv_plat/map_and_navigation_api/tsrc/mapnavproviderrefapp/inc/mnrpappview.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,59 +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:  CMnrpAppView class definition 
-*
-*/
-
-
-#ifndef MNRP_APPVIEW_H
-#define MNRP_APPVIEW_H
-
-#include <aknview.h>
-
-class CMnrpAppControl;
-
-/** Empty view for the case when application is started
- *	from menu*/
-class CMnrpAppView : public CAknView
-    {
-    public:
-
-        static CMnrpAppView* NewL();
-        virtual ~CMnrpAppView();
-
-    public: // from CAknView
-
-        TUid Id() const;
-
-        void DoActivateL(
-            const TVwsViewId& aPrevViewId,
-            TUid aCustomMessageId,
-            const TDesC8& aCustomMessage);
-
-        void DoDeactivate();
-
-    private:
-
-        CMnrpAppView();
-        void ConstructL();
-        
-    private:
-    
-    	/** UI control */
-        CMnrpAppControl* iControl;    
-
-    };
-
-#endif // MNRP_APPVIEW_H
-
--- a/locsrv_plat/map_and_navigation_api/tsrc/mapnavproviderrefapp/inc/mnrpcoordconverter.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,53 +0,0 @@
-/*
-* Copyright (c) 2007 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:  CMnrpCoordConverter class definition
-*
-*/
-
-
-#ifndef MNRP_COORDINATECONVERTER_H
-#define MNRP_COORDINATECONVERTER_H
-
-#include <mncoordinateconverterbase.h>
-
-class CMnrpEngine;
-class CMnrpMapModel;
-
-class CMnrpCoordConverter : public CMnCoordinateConverterBase
-    {
-    public:
-        static CMnrpCoordConverter* NewL();
-
-        ~CMnrpCoordConverter();
-
-    protected: // From CMnCoordinateConverterBase
-
-        TInt GetImageCoordinate(
-            const TCoordinate& aWorldCoordinate,
-            TPoint& aImagePoint );
-
-        TInt GetWorldCoordinate(
-            const TPoint& aImagePoint,
-            TCoordinate& aWorldCoordinate );
-
-    protected:
-        CMnrpCoordConverter();
-
-    private:
-
-        CMnrpEngine*            iEngine;
-        CMnrpMapModel*          iModel;
-    };
-
-#endif /*MNTP_COORDINATECONVERTER_H*/
--- a/locsrv_plat/map_and_navigation_api/tsrc/mapnavproviderrefapp/inc/mnrpdocument.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,54 +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:  CMnrpDocument class definition
-*
-*/
-
-
-#ifndef MNRP_DOCUMENT_H
-#define MNRP_DOCUMENT_H
-
-#include <akndoc.h>
-
-class CMnrpEngine;
-class CEikApplication;
-
-/** Document class of MnRefProvider component.
- *	It creates and owns Engine instance
- */
-class CMnrpDocument : public CAknDocument
-    {
-    public:
-
-        static CMnrpDocument* NewL( CEikApplication& aApp );
-        ~CMnrpDocument();
-
-		/** Returns reference to Engine instance */        
-        CMnrpEngine& Engine();
-
-    public: // from CAknDocument
-
-        CEikAppUi* CreateAppUiL();
-
-    private:
-
-        CMnrpDocument( CEikApplication& aApp );
-        void ConstructL();
-    
-    private:
-        CMnrpEngine* iEngine;        
-    };
-
-#endif // MNRP_DOCUMENT_H
-
--- a/locsrv_plat/map_and_navigation_api/tsrc/mapnavproviderrefapp/inc/mnrpdocumentback.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,43 +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:  CMnrpDocumentBack class definition
-*
-*/
-
-
-#ifndef MNRP_DOCUMENTGEO_H
-#define MNRP_DOCUMENTGEO_H
-
-#include <akndoc.h>
-
-class CEikApplication;
-
-/** Document class of MnRefGeocoder component */
-class CMnrpDocumentBack : public CAknDocument
-    {
-    public:
-
-        static CMnrpDocumentBack* NewL( CEikApplication& aApp );
-
-    public: // from CAknDocument
-
-        CEikAppUi* CreateAppUiL();
-
-    private:
-
-        CMnrpDocumentBack( CEikApplication& aApp );
-    };
-
-#endif // MNRP_DOCUMENTGEO_H
-
--- a/locsrv_plat/map_and_navigation_api/tsrc/mapnavproviderrefapp/inc/mnrpengine.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,147 +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:  CMnrpEngine class definition
-*
-*/
-
-
-#ifndef MNRP_ENGINE_H
-#define MNRP_ENGINE_H
-
-#include <e32base.h>
-#include <f32file.h>
-
-class CPosLandmark;
-class TCoordinate;
-class RResourceReader;
-
-/** Engine class used both by MnRefProvider and MnRefGeocoder 
- *	components. Provides access to POIs database ( resource file,
- *	some cities ) and geocoding services. 
- */
-class CMnrpEngine : public CBase
-    {
-    public:
-    
-        struct TDistanceToPoi
-            {
-            TInt iPoiIndex; // index to KnownPlaces
-            TReal32 iDistance; // distance to Poi of iPoiIndex
-            };
-    
-    public:
-        IMPORT_C static CMnrpEngine* NewL();
-        IMPORT_C ~CMnrpEngine();
-
-		/** Gives access to set of POIs */
-        IMPORT_C TArray<CPosLandmark*> KnownPlacesL();
-        
-        /** Returns coordinate of given address:
-		 *	Find a POI, which country or city matches given address
-		 *	and returns its coordinates.
-		 *	@param aAddress landmark, containing address
-		 *	@return landmark, containg coordinates
-		 *	@leave KErrNotFound if can't find POI matching given address
- 		 */
-        IMPORT_C CPosLandmark* AddressToCoordLC( const CPosLandmark& aAddress );
-
-        /** @overload
-         *  @return landmark, containg coordinates, or NULL
-         */
-        IMPORT_C CPosLandmark* AddressToCoordL( const CPosLandmark& aAddress );
-        
-        /** @overload
-		 *	@param aAddress string containing address
-		 *	@return landmark, containg coordinates
-		 *	@leave KErrNotFound if can't find POI matching given address
- 		 */
-        IMPORT_C CPosLandmark* AddressToCoordLC( const TDesC& aAddress );
-
-        /** @overload
-         *  @param aAddress string containing address
-         *  @return landmark, containg coordinates, or NULL
-         */
-        IMPORT_C CPosLandmark* AddressToCoordL( const TDesC& aAddress );
-
-        /** Returns address for given coordinate:
-		 *	Find a closest POI and return its city and country and
- 		 *	fill street with "%d[m,Km,tKm] from <city>" string, like "5 km to Tampere"
-		 *	@param aLocation coordinate
-		 *	@return landmark, containg address
-		 *	@leave KErrNotFound if can't find any POI
- 		 */
-        IMPORT_C CPosLandmark* CoordToAddressLC( const TCoordinate& aLocation );
-        
-        /** Finds a resource file in the system. 
-         *	It looks on all the drives for the file and folder given as parameter
-         *	@param[in] aFilePathAndName path and name of the file to search for. Drive
-         *							info is ignored
-         *	@param[out] aRscFile full name of found resource file
-         *	@leave KErrNotFound if file is not found.
-         */
-        IMPORT_C void FindResourceFileL( 
-            const TDesC& aFilePathAndName,
-            TFileName& aRscFile );
-
-        /** Returns reference to open file session, given at construction */
-        IMPORT_C RFs& Fs();
-
-        /** Calculates distance between two landmarks.
-         *  @param aFrom Source landmark
-         *  @param aTo Destination landmark
-         *  @return Distance, or NaN, if distance cannot be calculated
-         */
-        IMPORT_C TReal32 DistanceBetweenLandmarks( 
-            const CPosLandmark& aFrom, 
-            const CPosLandmark& aTo );
-
-        /** Finds POIs closest to given reference landmark. 
-         *  @param[in] aReference reference landmark
-         *  @param[out] aNeighbourPois List of closest POIs. 
-         *  @param[in] aMaxMatches Maximum number of results needed
-         */
-        IMPORT_C void FindClosestPoisL( 
-            const CPosLandmark& aReference,
-            RArray<CMnrpEngine::TDistanceToPoi>& aNeighbourPois,
-            TInt aMaxMatches );
-
-        /** Finds POIs closest to given location. 
-         *  @param[in] aReference reference location
-         *  @param[out] aNeighbourPois List of landmarks of closest POIs. 
-         *  @param[in] aMaxMatches Maximum number of results needed
-         */
-        IMPORT_C void BestCoordToAddressMatchesL( 
-            const TCoordinate& aLocation,
-            RPointerArray<CPosLandmark>& aMatches,
-            TInt aMaxMatches );
-
-    protected:
-
-        void ConstructL();
-        CMnrpEngine();
-
-		/** Loads POIs from database ( resource file ) */
-        void LoadKnownPlacesL();
-        /** Reads array of PLACES resource structures */
-        void ReadPlacesResourceL( RResourceReader& aReader );
-        
-        CPosLandmark* CreateCloseLandmarkLC( const CPosLandmark& aReference, TReal32 aDistance );
-
-    private:
-        RPointerArray<CPosLandmark> iPlaces;
-        RFs                         iFileSession;
-    };
-
-#endif // MNRP_ENGINE_H
-
--- a/locsrv_plat/map_and_navigation_api/tsrc/mapnavproviderrefapp/inc/mnrpgeocodingservice.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,102 +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:  CMnrpGeocodingService class definition
-*
-*/
-
-
-#ifndef MNRP_GEOCODINGSERVICE_H
-#define MNRP_GEOCODINGSERVICE_H
-
-#include "mngeocodingservicebase.h"
-
-class CPosLandmark;
-class CMnrpEngine;
-
-/** Implementation of geocoding service (KMnAppGeocodingService). 
- *	It uses CIdle to simulate asynchronous processing. All the geocoding
- *	job is done using the CMnrpEngine class.
- */
-class CMnrpGeocodingService : public CMnGeocodingServiceBase
-    {
-    public :
-        static CMnrpGeocodingService* NewL( CMnrpEngine& aEngine );
-        
-    protected :
-        CMnrpGeocodingService( CMnrpEngine& aEngine );
-        virtual ~CMnrpGeocodingService();
-
-        void ConstructL();
-
-		/** Prevents parallel asynchronous requests */
-        void LeaveIfBusyL();
-        /** Starts processing of new request by starting CIdle.*/
-        void StartProcessingL();
-        /** Callback for CIdle. Parameter is the pointer to this. */
-        static TInt GeocodingProcessingCallBack( TAny* aPtr );
-        /** Non-leaving part of geocoding. Calls FinishProcessingL and if
-         *	it leaves, completes client's request with error.*/
-        void HandleGeocodingCompleted();
-        /** Does the geocoding and completes user's request.*/
-        void FinishProcessingL();
-
-        /** Asks user to select one of best Coord to Addr matches */
-        CPosLandmark* LetUserSelectBestMatchL( const CPosLandmark& aReference );
-
-    protected: // from CMnGeocodingServiceBase
-    
-        /** Handles client's request for finding address by given coordinate. */
-        void HandleFindAddressByCoordinateL( const CPosLandmark& aLandmark );
-        
-        /** Handles client's request for finding coordinate by given address. */
-        void HandleFindCoordinateByAddressL( const CPosLandmark& aLandmark );
-
-        /** Handles client's request for finding coordinate by given address. */
-        void HandleFindCoordinateByAddressL( const TDesC& aAddress );
-        
-    protected: // from CMnServiceBase
-
-        /** Reports that client cancelled request */
-        void DoCancel();
-
-    private:
-        CMnrpEngine&            iEngine;
-    
-        enum TServiceType
-            {
-            ENone,
-            ECoordToAddr,
-            EAddrToCoord,
-            EPlainToCoord
-            };
-        
-        /** Type of last received request to make correct request to Engine */    
-        TServiceType            iCurrentService;
-    
-    	/** Keeps client's data */
-        CPosLandmark*           iLandmark;
-    	/** Keeps client's data */
-        HBufC*                  iPlainAddress;
-
-        /** Keeps client's option */
-        TBool                   iDialogAllowed;
-
-		/** Asynchronous geocoding processor */        
-        CIdle*                  iProcessor;
-        
-    };
-
-#endif // MNRP_GEOCODINGSERVICE_H
-
-
--- a/locsrv_plat/map_and_navigation_api/tsrc/mapnavproviderrefapp/inc/mnrpmapcontrol.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,117 +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:  CMnrpMapControl class definition
-*
-*/
-
-
-#ifndef MNRP_MAPCONTROL_H
-#define MNRP_MAPCONTROL_H
-
-#include <coecntrl.h>
-#include "mnrpmapmodel.h"
-
-class CMnrpEngine;
-class CMnrpMapView;
-
-/** Map view. Draws map on screen using information from 
- 	CMnrpMapModel.
- */
-class CMnrpMapControl : public CCoeControl, public MMapModelObserver
-    {
-    public: 
-
-        static CMnrpMapControl* NewL( CMnrpMapView& aView, const TRect& aRect, CMnrpEngine& aEngine );
-        virtual ~CMnrpMapControl();
-        
-        void UpdateModelL( CMnrpMapViewService& aService );
-        void SetSelectionModeL( TBool aSelectionMode );
-        
-        /** Returns current cursor location in selection mode */
-        TCoordinate CurrentLocation();
-
-        void ToggleFullScreen();
-
-    public:  // from CCoeControl
-
-        void Draw( const TRect& aRect ) const;
-        TKeyResponse OfferKeyEventL( const TKeyEvent& aKeyEvent, TEventCode aType );
-        void SizeChanged();
-        void HandleResourceChange( TInt aType );
-
-    public:  // from MMapModelObserver
-
-		/** Redraws itself when model is updated */
-        void HandleModelUpdateL();
-
-    private:
-
-        CMnrpMapControl( CMnrpMapView& aView );
-        void ConstructL( const TRect& aRect, CMnrpEngine& aEngine );
-        
-        void DrawCursor( CWindowGc& aGc ) const;
-
-		/** Draws text around map
-		 *	Top area - left longitude, cell size, right longitude
-		 *	Left area - top latitude, bottom latitude
-		 *	Bottom area - center coordinates
-		 */
-        void DrawGridText( 
-            CWindowGc& aGc, 
-            const TRect& aInnerBox,
-            const TRect& aOuterBox,
-            const CFont* aFont,
-            CMnrpMapModel::TGrid& aGrid ) const;
-
-        /** Helper to find out border size based on font dimensions */
-        TSize BorderSize() const;
-
-		/** Returns specifications of used font */
-        TFontSpec SmallFontSpec( TInt aFontHeightInTwips ) const;
-        
-        void MoveCursor( TInt aXmove, TInt aYmove );
-        TRect CursorMargin();
-
-        void Zoom( TReal aRate );
-
-        void SetFullScreen( TBool aFullScreen );
-
-		void CreateFonts();
-		void DestroyFonts();
-
-		void CreateScreenBufferL( const TSize& aSize );
-        void RenderL();
-
-    private:
-        /** Parent view */
-        CMnrpMapView& iView;
-        
-    	/** Model */
-        CMnrpMapModel* iModel;
-        TSize iViewSize;
-        
-        TBool iSelectionMode;
-        TPoint iCursor;
-        TCoordinate iAbsoluteCursor;
-
-        /** Whether fullscreen mode on or off*/
-        TBool iIsFullScreen;
-        
-        mutable CFbsBitmap* iOffScreenBitmap;
-        CFont* iTextFont;
-        CFont* iItemFont;
-    };
-
-#endif // MNRP_MAPVIEW_H
-
--- a/locsrv_plat/map_and_navigation_api/tsrc/mapnavproviderrefapp/inc/mnrpmapimageservice.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,92 +0,0 @@
-/*
-* Copyright (c) 2005-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:  CMnrpMapImageService class
-*
-*/
-
-
-#ifndef MN_TPMAPIMAGESERVICE_H
-#define MN_TPMAPIMAGESERVICE_H
-
-#include "mnmapimageservicebase.h"
-
-class CPosLandmark;
-class CEikonEnv;
-class CFont;
-class CMnrpMapModel;
-
-/** Implementation of geocoding service (KMnAppMapImageService). 
- */
-class CMnrpMapImageService : public CMnMapImageServiceBase
-    {
-    public :
-        static CMnrpMapImageService* NewL( CMnrpEngine& aEngine );
-        
-        void HandleTestCommandL( TInt aCommand );
-
-    protected :
-        /** C++ constructor */
-        CMnrpMapImageService( CMnrpEngine& aEngine );
-        /** Destructor */
-        virtual ~CMnrpMapImageService();
-
-        void ConstructL();
-
-        void LeaveIfBusyL();
-        void LeaveIfInstructedL();
-        void StartProcessingL();
-        static TInt MapImageProcessingCallBack( TAny* aPtr );
-        void HandleMapImageCompletedL();
-        void FinishProcessingL();
-
-        TInt GetTestCommand();
-
-        void RenderL();
-
-    private:
-        void DumpDataL();
-        
-        void CreateFonts();
-        void DestroyFonts();
-
-    protected: // from CMnMapImageServiceBase
-    
-        /** Handles client's request for finding address by given coordinate. */
-        void HandleRenderingL();
-        
-    protected: // from CMnServiceBase
-
-        /** Reports that client cancelled request */
-        void DoCancel();
-
-    private:
-    
-        enum TServiceType
-            {
-            ENone,
-            ERender,
-            };
-            
-        TServiceType            iCurrentService;
-        CMnrpEngine&            iEngine;
-        CMnrpMapModel*          iModel;
-        CPeriodic*              iProcessor;
-        CEikonEnv*              iEikon;
-        CFont*                  iItemFont;
-        CFont*                  iTextFont;
-    };
-
-#endif // MN_TPMAPIMAGESERVICE_H
-
-
--- a/locsrv_plat/map_and_navigation_api/tsrc/mapnavproviderrefapp/inc/mnrpmapmodel.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,301 +0,0 @@
-/*
-* Copyright (c) 2006-2007 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:  CMnrpMapModel class definition
-*
-*/
-
-
-#ifndef MNRP_MAPMODEL_H
-#define MNRP_MAPMODEL_H
-
-#include <coecntrl.h>
-#include "mnrppositionrequest.h"
-#include "epos_landmarks.h"
-
-class CFbsBitmap;
-class CImageDecoder;
-
-class CPosLandmark;
-class CPosLandmarkDatabase;
-class CPosLmCategoryManager;
-
-class CMnrpMapViewService;
-#ifdef RD_MAPNAV_BITMAP_ACCESS
-class CMnrpMapImageService;
-class TMnMapImageParams;
-#endif
-class CMnrpEngine;
-
-class MImageLoaderObserver;
-
-/** Point with real coordinates */
-class TRealPoint
-    {
-    public:
-        TRealPoint();
-        TRealPoint( TReal aX, TReal aY );
-        TRealPoint( TCoordinate aCoordinate );
-
-        TRealPoint operator+( const TRealPoint& aRight );
-        TRealPoint operator-( const TRealPoint& aRight );
-        TRealPoint operator*( const TReal& aRight );
-        TRealPoint operator/( const TReal& aRight );
-
-        void Set( TReal aX, TReal aY );
-        TCoordinate Coordinate();
-        TBool IsValid();
-
-        TReal iX; // matches longitude in this model
-        TReal iY; // matches latitude in this model
-    };
-
-/** Model observer class */
-class MMapModelObserver
-    {
-    public:
-        virtual void HandleModelUpdateL() =0;
-    };
-
-/** Data model for MapView.
- *  This implementation shows map as rectangle and does not support
- *  passing its borders. It displays POIs from Engine and client's
- *	landmarks, which define view area, if not specified by client.
- */
-class CMnrpMapModel : public CBase, public MMnrpPositionObserver
-    {
-    public:
-        IMPORT_C static CMnrpMapModel* NewL(
-            MMapModelObserver& aObserver,
-            CMnrpEngine& aEngine );
-
-        IMPORT_C static CMnrpMapModel* NewL(
-            CMnrpEngine& aEngine );
-
-        IMPORT_C ~CMnrpMapModel();
-
-		/** Service calls it when new ShowOnMap request comes
-		 *	from client */
-        IMPORT_C void UpdateModelL( CMnrpMapViewService& aService );
-
-#ifdef RD_MAPNAV_BITMAP_ACCESS
-		/** Service calls it when new RenderImage request comes
-		 *	from client */
-        IMPORT_C void UpdateModelL( const CMnrpMapImageService& aService );
-
-		/** Plugin calls it when new CoordinateConversion request comes
-		 *	from client */
-        IMPORT_C void UpdateModel( const TMnMapImageParams& aParams );
-#endif
-		/** Defines dimensions of view used for map display.
-		 *	this information is used to convert absolute coordinates
-		 *	to screen coordinates. Absolute coordinates are plain
-		 *	latitude and longitude degrees.
-		 */
-        IMPORT_C void SetScreenSize( TSize aScreenSize );
-
-        IMPORT_C void RenderL(
-            CFbsBitmap& aBitmap,
-            TRect aTargetRect,
-            CFont* aTextFont,
-            CFont* aItemFont ) const;
-        
-        IMPORT_C TInt NumIgnoredLandmarks();
-
-		/** Draw item.
-		 *	It is a POI or client's landmark, holds coordinates
-		 *	and associated text and icon.
-		 */
-        class CDrawItem : public CBase
-            {
-            public:
-            	/** Constructs from landmark instance */
-                static CDrawItem* NewLC( const CPosLandmark& );
-            	/** Constructs from linked landmark. If landmark
-            	 *	does not have icon, it tries to get icon of its
-            	 *	category, if only single category is assigned.
-            	 */
-                static CDrawItem* NewLC(
-                    const CPosLandmark& aLm,
-                    CPosLmCategoryManager& aCatman );
-
-                ~CDrawItem();
-
-                const TDesC& Text() { return *iText; };
-                TPoint& Position() { return iScreenPosition; };
-                TRealPoint AbsolutePosition() { return iAbsolutePosition; };
-                CFbsBitmap* Bitmap() { return iBitmap; };
-                CFbsBitmap* Mask() { return iMask; };
-                TBool IsPoi() { return iOwnPoi; };
-                
-                void SetAbsolutePosition( const TLocality& aLocality );
-
-            private:
-                HBufC*      iText;
-               	/** Absolute coordinates - lat,lon */
-                TRealPoint  iAbsolutePosition;
-                /** Coordinates on screen (pixels) */
-                TPoint      iScreenPosition;
-                CFbsBitmap* iBitmap;
-                CFbsBitmap* iMask;
-                /** Whether it is client's landmark or internal POI */
-                TBool       iOwnPoi;
-
-            friend class CMnrpMapModel;
-            };
-		/** Returns all items, that can be shown on screen. Screen
-		 *	coordinates are updated according to current scale and viewport */
-        TArray<CDrawItem*> Items() const;
-
-		/** Describes grid to show */
-        class TGrid
-            {
-            public:
-            	/** Reference grid point (screen) */
-                TPoint iReference;
-                /** Distance between grid lines (screen)*/
-                TInt iGridStep;
-
-            	/** Coordinate of reference grid point (absolute) */
-                TCoordinate iAbsoluteReference;
-                /** Distance between grid lines (absolute) */
-                TReal iAbsoluteGridStep;
-            };
-
-        /** Returns grid for current viewport and scale */
-        void GetGrid( TGrid& aGrid ) const;
-
-        /** Information about current location */
-        class TCurrentLocation
-            {
-            public:
-            	/** Screen coordinates */
-                TPoint  iLocation;
-            	/** Error radius in screen units - pixels */
-                TInt    iErrorRadius;
-
-                /** Absolute coordinates */
-                TCoordinate iAbsoluteLocation;
-            	/** Error radius in degrees */
-                TReal       iAbsoluteErrorDegrees;
-
-                TBool       iIsValid;
-            };
-
-        /** Returns current location */
-        IMPORT_C TCurrentLocation CurrentLocation() const;
-
-		// Zooming
-        IMPORT_C void Zoom( TReal aZoomRate );
-
-		// View movement
-        IMPORT_C void MoveTo( TCoordinate aTarget );
-
-        // Reset-kind of action, moves to world center
-        IMPORT_C void GoCenter();
-
-		/** Converts absolute units to screen */
-        IMPORT_C TPoint AbsoluteToScreen( TCoordinate aAbsolutePoint ) const;
-        IMPORT_C TInt AbsoluteToScreen( TReal aDistance ) const;
-
-		/** Converts screen coords to absolute */
-        IMPORT_C TCoordinate ScreenToAbsolute( TPoint aScreenPoint ) const;
-        IMPORT_C TReal ScreenToAbsolute( TInt aDistance ) const;
-
-		// Viewport in absolute units - degrees
-        IMPORT_C TReal Left() const;
-        IMPORT_C TReal Top() const;
-        IMPORT_C TReal Right() const;
-        IMPORT_C TReal Bottom() const;
-        IMPORT_C TReal Width() const;
-        IMPORT_C TReal Height() const;
-        IMPORT_C TCoordinate Center() const;
-
-    protected:
-		/** Converts absolute coords to screen */
-        TPoint AbsoluteToScreen( TRealPoint aAbsolutePoint ) const;
-
-    protected:  // from MMnrpPositionObserver
-
-		/** Forces map view update when new position comes */
-        void HandlePositionRequestCompletedL( TInt aError );
-
-    private:
-
-        void ConstructL();
-        CMnrpMapModel( MMapModelObserver& aObserver, CMnrpEngine& aEngine );
-        CMnrpMapModel( CMnrpEngine& aEngine );
-
-        void AddCitiesL();
-
-		/** Includes given draw item into bounding box */
-        void AdjustBoundingBox( CDrawItem& aItem, TRealPoint& aMin, TRealPoint& aMax );
-        
-        /** Verifies if draw item has position. If not, tries geocoding.
-         *  Updates the item if position is found from geocoding.
-         *  @return ETrue if position is found (possibly from geocoding), EFalse otherwise */
-        TBool CheckDrawItemHasPositionL( CDrawItem& aItem, const CPosLandmark& aLandmark );
-
-		/** Adjusts viewport if movement or zooming goes beyond the borders */
-        void CheckBorders();
-
-        TReal MaxScale() const;
-        TRect CursorMargin();
-
-		// Grid drawing
-        void DrawGrid(
-            CFbsBitGc& aGc,
-            const TSize& aBoxSize,
-            CMnrpMapModel::TGrid& aGrid ) const;
-
-        void DrawVerticalLine( CFbsBitGc& aGc, TInt aX, TSize aBoxSize ) const;
-        void DrawHorizontalLine( CFbsBitGc& aGc, TInt aY, TSize aBoxSize ) const;
-
-		/** Draws drawable items */
-        void DrawLandmarks(
-            CFbsBitGc& aGc,
-            CFont& aFont,
-            const TSize& aBoxSize,
-            TBool aSwitchColorAndShadow ) const;
-
-		/** Draws current location */
-        void DrawCurrentLocation(
-            CFbsBitGc& aGc,
-            const TSize& aBoxSize ) const;
-
-    private:
-        CMnrpPositionRequest*           iPositionRequest;
-        TPositionInfo                   iPosInfo;
-
-        TSize                           iScreenSize;
-        TRealPoint                      iViewOrigin;
-
-        TReal                           iScale; // 1 == 1 degree per pixel
-
-        MMapModelObserver*              iObserver;
-
-        mutable RPointerArray<CDrawItem> iDrawItems;
-
-        CMnrpEngine&            		iEngine;
-
-        TBool                           iUseCurrentLocationAsOrigin;
-        TBool                           iShowCurrentLocation;
-
-        CFont*                          iTextFont;
-        CFont*                          iItemFont;
-        
-        TInt 							iNumIgnoredLandmarks; 
-    };
-
-#endif // MNRP_MAPMODEL_H
-
--- a/locsrv_plat/map_and_navigation_api/tsrc/mapnavproviderrefapp/inc/mnrpmapview.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,95 +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:  CMnrpMapView class definition
-*
-*/
-
-
-#ifndef MNRP_MAPVIEW_H
-#define MNRP_MAPVIEW_H
-
-#include <aknview.h>
-
-class CMnrpEngine;
-class CMnrpMapModel;
-class CMnrpMapControl;
-
-class CMnrpMapViewService;
-class MMapSelectionCallback;
-
-/** Map view. Draws map on screen using information from 
- 	CMnrpMapModel.
- */
-class CMnrpMapView : public CAknView
-    {
-    public: 
-
-        static CMnrpMapView* NewL( TBool aChained, CMnrpEngine& aEngine );
-        virtual ~CMnrpMapView();
-        
-        /** Shows map view in browser mode 
-         *  @param aService Object to get map view options from
-         */
-        void SetMapModeL( CMnrpMapViewService& aService );
-
-        /** Shows map view in selection mode 
-         *  @param aService Object to get map view options from
-         *  @param aCallback Object to inform about selection
-         */
-        void SetSelectionModeL( 
-            CMnrpMapViewService& aService,  
-            MMapSelectionCallback& aCallback );
-
-        void HandleUserSelectionL( TInt aError );
-
-        void StopSelection();
-		
-    public: // from CAknView
-
-        TUid Id() const;
-
-        void HandleCommandL( TInt aCommand );
-
-        void DoActivateL(
-            const TVwsViewId& aPrevViewId,
-            TUid aCustomMessageId,
-            const TDesC8& aCustomMessage);
-
-        void DoDeactivate();
-        
-        void DynInitMenuPaneL( TInt aResourceId, CEikMenuPane *aMenuPane );
-
-    private:
-
-        CMnrpMapView( CMnrpEngine& aEngine );
-        void ConstructL( TBool aChained );
-        
-    private:
-        /** Application engine */
-        CMnrpEngine& iEngine;
-    	
-    	/** UI control */
-        CMnrpMapControl* iControl;    
-
-        /** Map view data */
-        CMnrpMapViewService* iMapViewService;
-
-        /** Selection callback listener */        
-        MMapSelectionCallback* iSelectionCallback;
-        
-        TBool iChained;
-    };
-
-#endif // MNRP_MAPVIEW_H
-
--- a/locsrv_plat/map_and_navigation_api/tsrc/mapnavproviderrefapp/inc/mnrpmapviewservice.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,80 +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:  CMnrpMapViewService class definition
-*
-*/
-
-
-#ifndef MNRP_MAPVIEWSERVICE_H
-#define MNRP_MAPVIEWSERVICE_H
-
-#include <mnmapviewservicebase.h>
-
-#include "mnrpappui.h"
-
-class CPosLandmark;
-
-/** Implementation of MapView service (KMnAppMapViewService). 
- */
-class CMnrpMapViewService : public CMnMapViewServiceBase, public MMapSelectionCallback
-    {
-    public :
-        static CMnrpMapViewService* NewL();
-        
-    protected :
-        CMnrpMapViewService();
-        virtual ~CMnrpMapViewService();
-        void ConstructL();
-
-        CMnrpAppUi* AppUi();
-
-    protected: // from CMnMapViewServiceBase
-    
-        /** Handles client's request for showing map */
-        void HandleShowMapL();
-
-        /** Handles client's request for showing map from current location */
-        void HandleShowCurrentLocationL();
-
-        /** Handles client's request for selecting a location from map */
-        void HandleSelectFromMapL();
-
-    protected: // from CMnServiceBase
-
-        /** Reports that client cancelled request */
-        void DoCancel();
-
-        void CompleteSelectionL( const TCoordinate& aSelection );
-
-    protected: // from MMapSelectionCallback
-            
-        void HandleSelectionL( const TCoordinate& aSelection );
-
-        void HandleSelectionL( TInt aLandmarkIndex );
-        void HandleSelectionL( TPosLmItemId aLandmarkId, TInt aDbIndex );
-
-        void HandleSelectionErrorL( TInt aError );
-
-    private:
-        void StopSelection();
-
-    private:
-
-        /** Flag shows that selection is ongoing */
-        TBool                   iSelecting;
-    };
-
-#endif // MNRP_MAPVIEWSERVICE_H
-
-
--- a/locsrv_plat/map_and_navigation_api/tsrc/mapnavproviderrefapp/inc/mnrpnavicontrol.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,69 +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:  CMnrpNaviControl class definition
-*
-*/
-
-
-#ifndef MNRP_NAVICONTROL_H
-#define MNRP_NAVICONTROL_H
-
-#include <coecntrl.h>
-#include "mnrpnavimodel.h"
-
-class CAknSingleHeadingStyleListBox;
-class CMnrpNaviView;
-
-/** Navigation view.
- *	Shows list box with navigation information items: 
- *	destination name and coordinates, current position coordinates
- *	distance and bearing to destination.
- */	
-class CMnrpNaviControl : public CCoeControl, public MNaviModelObserver
-    {
-    public:
-
-        static CMnrpNaviControl* NewL( CMnrpNaviView& aView, const TRect& aRect, CMnrpEngine& aEngine );
-        virtual ~CMnrpNaviControl();
-
-        void UpdateModelL( CPosLandmark& aDestination );
-        
-    protected:    
-    	/** Creates list box */
-        void CreateListBoxL();
-
-    public: // from MNaviModelObserver
-        void HandleModelUpdateL();
-
-    protected:  // from CCoeControl
-        TInt CountComponentControls() const;
-        CCoeControl* ComponentControl( TInt aIndex ) const;
-        TKeyResponse OfferKeyEventL( const TKeyEvent& aKeyEvent, TEventCode aType );
-        void SizeChanged();
-        void HandleResourceChange( TInt aType );
-
-    private:
-
-        void ConstructL( const TRect& aRect, CMnrpEngine& aEngine );
-        CMnrpNaviControl( CMnrpNaviView& aView );
-    
-    private:
-        CMnrpNaviView&                  iView;
-    
-        CAknSingleHeadingStyleListBox*  iListBox;
-        CMnrpNaviModel*         		iModel;
-    };
-
-#endif // MNRP_NAVICONTROL_H
-
--- a/locsrv_plat/map_and_navigation_api/tsrc/mapnavproviderrefapp/inc/mnrpnavigationservice.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,51 +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:  CMnrpNavigationService class definition
-*
-*/
-
-
-#ifndef MNRP_NAVIGATIONSERVICE_H
-#define MNRP_NAVIGATIONSERVICE_H
-
-#include "mnnavigationservicebase.h"
-
-class CPosLandmark;
-
-/** Implementation of Navigation service (KMnAppNavigationService). 
- */
-class CMnrpNavigationService : public CMnNavigationServiceBase
-    {
-    public :
-        static CMnrpNavigationService* NewL();
-        
-    protected :
-        CMnrpNavigationService();
-        virtual ~CMnrpNavigationService();
-        void ConstructL();
-
-    public: // from CMnNavigationServiceBase
-    
-        /** Handles client's request for navigation. */
-        void HandleNavigateToL( const CPosLandmark& aDestination );
-    
-    protected: // from CMnServiceBase
-
-        /** Empty implementation, as the only request is sychcronous */
-        void DoCancel();
-    };
-
-#endif // MNRP_NAVIGATIONSERVICE_H
-
-
--- a/locsrv_plat/map_and_navigation_api/tsrc/mapnavproviderrefapp/inc/mnrpnavimodel.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,96 +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:  CMnrpNaviModel class definition
-*
-*/
-
-
-#ifndef MNRP_NAVIMODEL_H
-#define MNRP_NAVIMODEL_H
-
-#include <coecntrl.h>
-#include "mnrppositionrequest.h"
-
-class CMnrpEngine;
-class CPosLandmark;
-
-/** Model observer class */
-class MNaviModelObserver
-    {
-    public:
-        virtual void HandleModelUpdateL() =0;
-    };
-
-/** Navigation view model. 
- *	Prepares data to be shown on navigation view
- */
-class CMnrpNaviModel : public CBase, public MMnrpPositionObserver
-    {
-    public:
-        static CMnrpNaviModel* NewL( MNaviModelObserver& aObserver, CMnrpEngine& aEngine );
-
-		/** Called by service class to inform that client has changed 
-		 *	navigation target */
-        void SetDestinationL( const CPosLandmark& aNewDestination );
-
-		/** List item information */
-        class CListItem : public CBase
-            {
-            public:
-                static CListItem* NewL( 
-                	const TDesC& aItemHeader, 
-                	const TDesC& aItemValue );
-            
-                ~CListItem();
-                
-                const TDesC& Header() { return *iHeader; };
-                const TDesC& Value() { return *iValue; };
-                
-            private:
-            	/** List item header */
-                HBufC* iHeader;
-            	/** List item text */
-                HBufC* iValue;                
-            };
-
-		/** Returns list items to be shown on Navigation view */
-        TArray<CListItem*> ListItemsL();
-
-        ~CMnrpNaviModel();
-        
-    public:  // from MMnrpPositionObserver
-
-		/** Informs navigation view that data has been changed */
-        void HandlePositionRequestCompletedL( TInt aError );
-        
-    private: 
-
-        void ConstructL();
-        CMnrpNaviModel( MNaviModelObserver& aObserver, CMnrpEngine& aEngine );
-    
-    private:
-        CMnrpEngine&                    iEngine;
-    
-        CMnrpPositionRequest*   		iPositionRequest;
-        TPositionInfo                   iPosInfo;
-
-        CPosLandmark*                   iDestination;
-        
-        MNaviModelObserver&             iObserver;
-        
-        RPointerArray<CListItem>        iListItems;
-    };
-
-#endif // MNRP_NAVIMODEL_H
-
--- a/locsrv_plat/map_and_navigation_api/tsrc/mapnavproviderrefapp/inc/mnrpnaviview.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,74 +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:  CMnrpNaviView class definition
-*
-*/
-
-
-#ifndef MNRP_NAVIVIEW_H
-#define MNRP_NAVIVIEW_H
-
-#include <aknview.h>
-
-class CMnrpEngine;
-class CMnrpNaviModel;
-class CMnrpNaviControl;
-class CPosLandmark;
-
-/** Map view. Draws map on screen using information from 
- 	CMnrpMapModel.
- */
-class CMnrpNaviView : public CAknView
-    {
-    public: 
-
-        static CMnrpNaviView* NewL( TBool aChained, CMnrpEngine& aEngine );
-        virtual ~CMnrpNaviView();
-        
-        /** Shows map view in browser mode 
-         *  @param aService Object to get map view options from
-         */
-        void SetDestinationL( const CPosLandmark& aDestination );
-        
-    public: // from CAknView
-
-        TUid Id() const;
-
-        void HandleCommandL( TInt aCommand );
-
-        void DoActivateL(
-            const TVwsViewId& aPrevViewId,
-            TUid aCustomMessageId,
-            const TDesC8& aCustomMessage);
-
-        void DoDeactivate();
-
-    private:
-
-        CMnrpNaviView( CMnrpEngine& aEngine );
-        void ConstructL( TBool aChained );
-        
-    private:
-        /** Application engine */
-        CMnrpEngine& iEngine;
-    	
-    	/** UI control */
-        CMnrpNaviControl* iControl;    
-        
-        /** Destination */
-        CPosLandmark* iDestination;
-    };
-
-#endif // MNRP_NAVIVIEW_H
-
--- a/locsrv_plat/map_and_navigation_api/tsrc/mapnavproviderrefapp/inc/mnrppositionrequest.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,141 +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:  CMnrpPositionRequest class definition
-*
-*/
-
-
-#ifndef MNRP_POSITION_REQUEST_H_
-#define MNRP_POSITION_REQUEST_H_
-
-#include <e32base.h>
-#include <lbs.h>
-
-class TPositionUpdateOptions;
-
-/** Position observer */
-class MMnrpPositionObserver
-    {
-    public:
-        virtual void HandlePositionRequestCompletedL( TInt aError ) =0;
-    };
-
-/** Provides an interface for retrieving the current location.
- */
-class CMnrpPositionRequest: public CActive
-    {
-    public: 
-
-        /** Creates new instance of request
-        * @param aAppName the name of this application
-        * @param aObserver observer to callback when locations are retrieved
-        */
-        IMPORT_C static CMnrpPositionRequest* NewL(
-            const TDesC& aRequestorName,
-            MMnrpPositionObserver& aObserver);
-
-        IMPORT_C ~CMnrpPositionRequest();
-
-    public: 
-
-        /**
-         * Starts the fetching of a location. In the first place the default 
-         * proxy is used for retrieving a location. If fetching default location
-         * fails the last known location is fetched. If fetching last known 
-         * location fails, an error code is returned to the observer.
-         *
-         * @param aLastKnownLocationAllowed whether last know location is allowed
-         */
-        IMPORT_C void FetchNewPosition( TBool aLastKnownLocationAllowed = EFalse );
-
- 		/** Returns current location */
-        IMPORT_C void GetPosition( TPositionInfo& aPosition );
-
- 		/** Returns current speed info */
-        IMPORT_C TReal32 Speed();
-
- 		/** Returns current heading info */
-        IMPORT_C TReal32 Heading();
-
- 		/** Returns current magnetic heading info */
-        IMPORT_C TReal32 MagneticHeading();
-
- 		/** Returns current course info */
-        IMPORT_C TReal32 Course();
-
- 		/** Returns current magnetic course info */
-        IMPORT_C TReal32 MagneticCourse();
-
-		/** Modifies options for the next request */
-        IMPORT_C void SetOptionsL( const TPositionUpdateOptionsBase& aOptions );
-
-    protected: // from CActive
-
-        void DoCancel();
-        void RunL();
-        TInt RunError(TInt aError);
-
-    private:
-
-        CMnrpPositionRequest( MMnrpPositionObserver& aObserver );
-        void ConstructL( const TDesC& aAppName );
-
-        /** Issues new request for location retrieval. */
-        void ExecuteNextStep();
-
-        void InitContainer( HPositionGenericInfo& aGenericInfo );
-        void SaveContainer( const HPositionGenericInfo& aGenericInfo );
-
-    private:
-
-        /**
-        * TState defines the different states this object may enter.
-        */
-        enum TState 
-            {
-            EIdle,
-            EAcquiringDefaultLocation,
-            EAcquiringLastKnownLocation
-            };
-
-    private: 
-
-        //! Contains the location
-        HPositionGenericInfo* iGenericPosition;
-        
-        //! Local storage for last location info
-        TPositionInfo iPositionInfo;
-        TReal32 iSpeed;
-        TReal32 iHeading;
-        TReal32 iMagneticHeading;
-        TReal32 iCourse;
-        TReal32 iMagneticCourse;
-
-        //! The observer to callback when location retieval is ready
-        MMnrpPositionObserver& iObserver;
-
-        //! Reference to the Location Server session
-        RPositionServer iLocationServer;
-
-        //! Reference to the Location Server subsession
-        RPositioner iPositioner;
-        
-        TBool iLastKnownLocationAllowed;
-
-        //! The current state this object has entered
-        TState iState;
-    };
-
-#endif // MNRP_POSITION_REQUEST_H_
-
--- a/locsrv_plat/map_and_navigation_api/tsrc/mapnavproviderrefapp/inc/mnrputils.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,67 +0,0 @@
-/*
-* Copyright (c) 2006-2007 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:  MnrpUtils class definition
-*
-*/
-
-
-#ifndef MNRP_UTILS_H
-#define MNRP_UTILS_H
-
-const TInt KMaxCoordStrSize = 15;
-
-class MnrpUtils
-    {
-    public:
-    
-        /** Converts given coordinate into a string 
-         *  \param aCoord coordinate
-         *  \param aStr target string of KMaxCoordStrSize length (at least)
-         *  \param aFull if EFalse, will omit higher parts if they are 0,
-         *               if ETrue, outputs degrees, minutes, seconds and milliseconds
-         *  \param aMillis whether milliseconds should be included or not
-         */
-        IMPORT_C static void CoordinateToString( 
-            TReal aCoord, 
-            TDes& aStr, 
-            TBool aFull = EFalse,
-            TBool aMillis = EFalse );
-            
-        /** Converts given distance value to a string with units
-         *  \param aDistance distance in meters 
-         *  \param aStr target string
-         */
-        IMPORT_C static void DistanceToString( TReal aDistance, TDes& aStr );
-
-        /** Converts given angle value to a string
-         *  \param aAngle angle in degrees (angle form North Pole) 
-         *  \param aStr target string
-         */
-        IMPORT_C static void AngleToString( TReal aAngle, TDes& aStr );
-
-        /** Converts given speed value to a string with units
-         *  \param aSpeed speed in meters per second
-         *  \param aStr target string
-         */
-        IMPORT_C static void SpeedToString( TReal aSpeed, TDes& aStr );
-
-        /** Replaces unprintable characters in a string with spaces
-         *  \param aStr string to work with
-         *  \return pointer to new string buffer with ownership
-         */
-        IMPORT_C static HBufC* PrintableStringLC( const TDesC& aStr );
-    };
-
-#endif // MNRP_UTILS_H
-
--- a/locsrv_plat/map_and_navigation_api/tsrc/mapnavproviderrefapp/sis/mnrefprovider_armv5.pkg	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,85 +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: Installation file for MN ref provider
-;
-
-ÿþ;   I n s t a l l a t i o n   f i l e   f o r   M & N   R e f e r e n c e   P r o v i d e r   A p p 
- 
- 
- 
- ;   L a n g u a g e s 
- 
- & E N , R U 
- 
- 
- 
- ;   s t a n d a r d   S I S   f i l e   h e a d e r 
- 
- # { " M n R e f P r o v i d e r E N " , " M n R e f P r o v i d e r R U " } , ( 0 x 0 3 1 3 2 0 1 3 ) , 1 , 2 , 4 
- 
- 
- 
- ;   L o c a l i s e d   V e n d o r   n a m e 
- 
- % { " V e n d o r - E N " , " V e n d o r - R U " } 
- 
- 
- 
- ;   U n i q u e   V e n d o r   n a m e 
- 
- : " V e n d o r " 
- 
- 
- 
- ;   S u p p o r t s   S 6 0   v   3 . 0 
- 
- [ 0 x 1 0 1 F 7 9 6 1 ] ,   0 ,   0 ,   0 ,   { " S 6 0 P r o d u c t I D " , " S 6 0 P r o d u c t I D " } 
- 
- 
- 
- ;   F i l e s   t o   i n s t a l l 
- 
- " \ e p o c 3 2 \ r e l e a s e \ a r m v 5 \ u r e l \ m n r e f p r o v i d e r . e x e " - " ! : \ s y s \ b i n \ m n r e f p r o v i d e r . e x e " 
- 
- " \ e p o c 3 2 \ d a t a \ z \ r e s o u r c e \ a p p s \ m n r e f p r o v i d e r . r s c " - " ! : \ r e s o u r c e \ a p p s \ m n r e f p r o v i d e r . r s c " 
- 
- " \ e p o c 3 2 \ d a t a \ z \ r e s o u r c e \ a p p s \ m n r e f p r o v i d e r . m b m " - " ! : \ r e s o u r c e \ a p p s \ m n r e f p r o v i d e r . m b m " 
- 
- " \ e p o c 3 2 \ d a t a \ z \ r e s o u r c e \ a p p s \ m n r e f p r o v i d e r . m i f " - " ! : \ r e s o u r c e \ a p p s \ m n r e f p r o v i d e r . m i f " 
- 
- " \ e p o c 3 2 \ d a t a \ z \ p r i v a t e \ 1 0 0 0 3 a 3 f \ a p p s \ m n r e f p r o v i d e r _ r e g . r s c " - " ! : \ p r i v a t e \ 1 0 0 0 3 a 3 f \ i m p o r t \ a p p s \ m n r e f p r o v i d e r _ r e g . r s c " 
- 
- 
- 
- " \ e p o c 3 2 \ r e l e a s e \ a r m v 5 \ u r e l \ m n r e f p r o v i d e r b a c k . e x e " - " ! : \ s y s \ b i n \ m n r e f p r o v i d e r b a c k . e x e " 
- 
- " \ e p o c 3 2 \ d a t a \ z \ r e s o u r c e \ a p p s \ m n r e f p r o v i d e r b a c k . r s c " - " ! : \ r e s o u r c e \ a p p s \ m n r e f p r o v i d e r b a c k . r s c " 
- 
- " \ e p o c 3 2 \ d a t a \ z \ p r i v a t e \ 1 0 0 0 3 a 3 f \ a p p s \ m n r e f p r o v i d e r b a c k _ r e g . r s c " - " ! : \ p r i v a t e \ 1 0 0 0 3 a 3 f \ i m p o r t \ a p p s \ m n r e f p r o v i d e r b a c k _ r e g . r s c " 
- 
- 
- 
- " \ e p o c 3 2 \ r e l e a s e \ a r m v 5 \ u r e l \ m n r e f p r o v i d e r e n g i n e . d l l " - " ! : \ s y s \ b i n \ m n r e f p r o v i d e r e n g i n e . d l l " 
- 
- " \ e p o c 3 2 \ d a t a \ z \ r e s o u r c e \ m n r e f p r o v i d e r e n g i n e . r s c " - " ! : \ r e s o u r c e \ m n r e f p r o v i d e r e n g i n e . r s c " 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
\ No newline at end of file
Binary file locsrv_plat/map_and_navigation_api/tsrc/mapnavproviderrefapp/sis/mnrefprovider_armv5.sis has changed
--- a/locsrv_plat/map_and_navigation_api/tsrc/mapnavproviderrefapp/sis/mnrefprovider_bitmap_armv5.pkg	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,89 +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: Installation file for MN ref provider ( includes map image service)
-;
-
-ÿþ;   I n s t a l l a t i o n   f i l e   f o r   M & N   R e f e r e n c e   P r o v i d e r   A p p 
- 
- 
- 
- ;   L a n g u a g e s 
- 
- & E N , R U 
- 
- 
- 
- ;   s t a n d a r d   S I S   f i l e   h e a d e r 
- 
- # { " M n R e f P r o v i d e r E N " , " M n R e f P r o v i d e r R U " } , ( 0 x 0 3 1 3 2 0 1 3 ) , 1 , 2 , 4 
- 
- 
- 
- ;   L o c a l i s e d   V e n d o r   n a m e 
- 
- % { " V e n d o r - E N " , " V e n d o r - R U " } 
- 
- 
- 
- ;   U n i q u e   V e n d o r   n a m e 
- 
- : " V e n d o r " 
- 
- 
- 
- ;   S u p p o r t s   S 6 0   v   3 . 0 
- 
- [ 0 x 1 0 1 F 7 9 6 1 ] ,   0 ,   0 ,   0 ,   { " S 6 0 P r o d u c t I D " , " S 6 0 P r o d u c t I D " } 
- 
- 
- 
- ;   F i l e s   t o   i n s t a l l 
- 
- " \ e p o c 3 2 \ r e l e a s e \ a r m v 5 \ u r e l \ m n r e f p r o v i d e r . e x e " - " ! : \ s y s \ b i n \ m n r e f p r o v i d e r . e x e " 
- 
- " \ e p o c 3 2 \ d a t a \ z \ r e s o u r c e \ a p p s \ m n r e f p r o v i d e r . r s c " - " ! : \ r e s o u r c e \ a p p s \ m n r e f p r o v i d e r . r s c " 
- 
- " \ e p o c 3 2 \ d a t a \ z \ r e s o u r c e \ a p p s \ m n r e f p r o v i d e r . m b m " - " ! : \ r e s o u r c e \ a p p s \ m n r e f p r o v i d e r . m b m " 
- 
- " \ e p o c 3 2 \ d a t a \ z \ r e s o u r c e \ a p p s \ m n r e f p r o v i d e r . m i f " - " ! : \ r e s o u r c e \ a p p s \ m n r e f p r o v i d e r . m i f " 
- 
- " \ e p o c 3 2 \ d a t a \ z \ p r i v a t e \ 1 0 0 0 3 a 3 f \ a p p s \ m n r e f p r o v i d e r _ r e g . r s c " - " ! : \ p r i v a t e \ 1 0 0 0 3 a 3 f \ i m p o r t \ a p p s \ m n r e f p r o v i d e r _ r e g . r s c " 
- 
- 
- 
- " \ e p o c 3 2 \ r e l e a s e \ a r m v 5 \ u r e l \ m n r e f p r o v i d e r b a c k . e x e " - " ! : \ s y s \ b i n \ m n r e f p r o v i d e r b a c k . e x e " 
- 
- " \ e p o c 3 2 \ d a t a \ z \ r e s o u r c e \ a p p s \ m n r e f p r o v i d e r b a c k . r s c " - " ! : \ r e s o u r c e \ a p p s \ m n r e f p r o v i d e r b a c k . r s c " 
- 
- " \ e p o c 3 2 \ d a t a \ z \ p r i v a t e \ 1 0 0 0 3 a 3 f \ a p p s \ m n r e f p r o v i d e r b a c k _ r e g . r s c " - " ! : \ p r i v a t e \ 1 0 0 0 3 a 3 f \ i m p o r t \ a p p s \ m n r e f p r o v i d e r b a c k _ r e g . r s c " 
- 
- 
- 
- " \ e p o c 3 2 \ r e l e a s e \ a r m v 5 \ u r e l \ m n r e f p r o v i d e r e n g i n e . d l l " - " ! : \ s y s \ b i n \ m n r e f p r o v i d e r e n g i n e . d l l " 
- 
- " \ e p o c 3 2 \ d a t a \ z \ r e s o u r c e \ m n r e f p r o v i d e r e n g i n e . r s c " - " ! : \ r e s o u r c e \ m n r e f p r o v i d e r e n g i n e . r s c " 
- 
- 
- 
- " \ e p o c 3 2 \ r e l e a s e \ a r m v 5 \ u r e l \ m n r e f p r o v i d e r p l u g i n . d l l " - " ! : \ s y s \ b i n \ m n r e f p r o v i d e r p l u g i n . d l l " 
- 
- " \ e p o c 3 2 \ d a t a \ z \ r e s o u r c e \ p l u g i n s \ m n r e f p r o v i d e r p l u g i n . r s c " - " ! : \ r e s o u r c e \ p l u g i n s \ m n r e f p r o v i d e r p l u g i n . r s c " 
- 
- 
- 
- 
- 
- 
- 
- 
\ No newline at end of file
Binary file locsrv_plat/map_and_navigation_api/tsrc/mapnavproviderrefapp/sis/mnrefprovider_bitmap_armv5.sis has changed
Binary file locsrv_plat/map_and_navigation_api/tsrc/mapnavproviderrefapp/sis/mnrefprovider_bitmap_armv5.sisx has changed
--- a/locsrv_plat/map_and_navigation_api/tsrc/mapnavproviderrefapp/sis/rd-key.pem	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-MIICXAIBAAKBgQDLRF+r1FGGkCwTrb420kbnAps7gi1yYUcXYUdWeFTuBeQe5eW4
-6Y+LWaA8HMlDdoHRB0FgASisYcFagwno9+oFf4AJka4H1gWEs5XTGwAA1s0d8XGh
-7W7Dt9F5FZij8F7/9Pi6+FhhxZFIf1DD+yry9D7+Sp+BgdNALe4XOpf25QIBAwKB
-gQCHgupyjYuvCsgNHn7PNtnvVxInrB5MQNoPli+O+uNJWUK/Q+57Rl+yO8AoEzDX
-pFaLWiuVVhsdloDnAgabT/FXzYncs6uOHyEUV+dSXb78vtLPJqAX+Fg2i3hOXreB
-yskcZ13/OsKVOu5wgrJkx2baZufkqMwOSytf5y9nwjEIKwJBAP+inobagVNrN62j
-KQva3cC+UN/6XnKdTc0CA6bHyLOaJoH1xiMwG/VS2PGjHI0tiSMNtLn/QPpHJ003
-iabGhdUCQQDLjp/9UjFT6K6CF66Chqf30pZXhx+GTSQZmv/gvZiMly7X9fX9BGX3
-2MbJohBC4yI21XKTbisWywkF73Hwh+TRAkEAqmxprzxWN5zPyRdwspHpKymLP/w+
-9xOJM1atGdqFzRFvAU6EF3Vn+OHl9my9s3OwwgkjJqorUYTE3iUGby8D4wJBAIe0
-aqjhdjfwdFa6dFcEb/qMZDpaFQQzbWZnVUB+ZbMPdI/5TqitmU/l2dvBYCyXbCSO
-TGJJcg8yBgP09qBamIsCQFL7j1tM0XPVQJQ89WpKCld7O9ORxRGVj1eG0tWijrH8
-mGbYh8SGCVoWV3vrKSS8GBrFVgQnqUaHuEdtM7tpCAQ=
------END RSA PRIVATE KEY-----
--- a/locsrv_plat/map_and_navigation_api/tsrc/mapnavproviderrefapp/sis/rd.cer	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
------BEGIN CERTIFICATE-----
-MIICzDCCAjWgAwIBAgIBADANBgkqhkiG9w0BAQUFADArMRAwDgYDVQQKEwdSRCBD
-ZXJ0MRcwFQYDVQQDEw5SRCBDZXJ0aWZpY2F0ZTAeFw0wNDExMTUxMjQyMDZaFw0z
-NzA5MjMxMjQyMDZaMCsxEDAOBgNVBAoTB1JEIENlcnQxFzAVBgNVBAMTDlJEIENl
-cnRpZmljYXRlMIGdMA0GCSqGSIb3DQEBAQUAA4GLADCBhwKBgQDLRF+r1FGGkCwT
-rb420kbnAps7gi1yYUcXYUdWeFTuBeQe5eW46Y+LWaA8HMlDdoHRB0FgASisYcFa
-gwno9+oFf4AJka4H1gWEs5XTGwAA1s0d8XGh7W7Dt9F5FZij8F7/9Pi6+FhhxZFI
-f1DD+yry9D7+Sp+BgdNALe4XOpf25QIBA6OCAQAwgf0wDAYDVR0TBAUwAwEB/zAL
-BgNVHQ8EBAMCAoQwHQYDVR0OBBYEFFi/kuGzxhVpjGxe9ZwlxC3fH9jFMFMGA1Ud
-IwRMMEqAFFi/kuGzxhVpjGxe9ZwlxC3fH9jFoS+kLTArMRAwDgYDVQQKEwdSRCBD
-ZXJ0MRcwFQYDVQQDEw5SRCBDZXJ0aWZpY2F0ZYIBADBsBgNVHSAEZTBjMGEGBFUd
-IAAwWTATBggrBgEFBQcCARYHaHR0cDovLzBCBggrBgEFBQcCAjA2GjRGb3IgUiZE
-IHVzYWdlIG9ubHkuIFRoaXMgY2VydGlmaWNhdGUgaXMgbm90IHRydXN0ZWQuMA0G
-CSqGSIb3DQEBBQUAA4GBAHGB4RQMAgBdeT2hxfOr6f2nA/dZm+M5yX5daUtZnET9
-Ed0A9sazLawfN2G1KFQT9kxEParAyoAkpbMAsRrnRz/9cM3OHgFm/NiKRnf50DpT
-7oCx0I/65mVD2kt+xXE62/Ii5KPnTufIkPi2uLvURCia1tTS8JmJ8dtxDGyQt8BR
------END CERTIFICATE-----
--- a/locsrv_plat/map_and_navigation_api/tsrc/mapnavproviderrefapp/src/mnrefprovider.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,31 +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:  CApaApplication class implementation
-*
-*/
-
-
-#include <eikstart.h>
-#include "mnrpapplication.h"
-
-LOCAL_C CApaApplication* NewApplication()
-{
-    return new CMnrpApplication;
-}
-
-TInt E32Main()
-{
-    return EikStart::RunApplication( NewApplication );
-}
-
--- a/locsrv_plat/map_and_navigation_api/tsrc/mapnavproviderrefapp/src/mnrefproviderback.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,31 +0,0 @@
-/*
-* Copyright (c) 2006-2007 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:  Main application methods
-*
-*/
-
-
-#include <eikstart.h>
-#include "mnrpapplicationback.h"
-
-LOCAL_C CApaApplication* NewApplication()
-{
-    return new CMnrpApplicationBack;
-}
-
-TInt E32Main()
-{
-    return EikStart::RunApplication( NewApplication );
-}
-
--- a/locsrv_plat/map_and_navigation_api/tsrc/mapnavproviderrefapp/src/mnrefproviderplugin.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +0,0 @@
-/*
-* Copyright (c) 2007 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:  Main application methods
-*
-*/
-
-
-#include <e32base.h>
-#include <ecom/ecom.h>
-#include <ecom/implementationproxy.h>
-
-#include "debug.h"
-#include "mnrpcoordconverter.h"
-
-// ========================== GLOBAL FUNCTIONS ===============================
-
-// ---------------------------------------------------------------------------
-// Table of implementations
-// ---------------------------------------------------------------------------
-//
-const TImplementationProxy ImplementationTable[] =
-    {
-    // Note! UID below is implementation UID, not DLL UID.
-    IMPLEMENTATION_PROXY_ENTRY( 0x03133038, CMnrpCoordConverter::NewL ),
-    };
-
-// ---------------------------------------------------------------------------
-// Note this function must be exported at ordinal 1
-// ---------------------------------------------------------------------------
-//
-EXPORT_C const TImplementationProxy* ImplementationGroupProxy(
-    TInt& aTableCount)
-    {
-    aTableCount = 1;
-    return ImplementationTable;
-    }
--- a/locsrv_plat/map_and_navigation_api/tsrc/mapnavproviderrefapp/src/mnrpappcontrol.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,109 +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:  CMnrpAppControlclass implementation
-*
-*/
-
-
-#include <coemain.h>
-#include <akndef.h>
-#include "mnrpappview.h"
-#include "mnrpappcontrol.h"
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CMnrpAppControl::CMnrpAppControl( CMnrpAppView& aView )
-: iView( aView )
-    {
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CMnrpAppControl::~CMnrpAppControl()
-    {
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CMnrpAppControl* CMnrpAppControl::NewL( CMnrpAppView& aView, const TRect& aRect)
-    {
-    CMnrpAppControl* self = new (ELeave) CMnrpAppControl( aView );
-    CleanupStack::PushL( self );
-    self->ConstructL( aRect );
-    CleanupStack::Pop( self );
-    return self;
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-TInt CMnrpAppControl::CountComponentControls() const 
-    { 
-    return 0; 
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CCoeControl* CMnrpAppControl::ComponentControl( TInt /*aIndex*/ ) const
-    {
-    return NULL;
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpAppControl::ConstructL( const TRect& aRect )
-    {
-    // Create a window for this application view
-    CreateWindowL();
-
-    // Set the windows size
-    SetRect( aRect );
-
-    // Activate the window, which makes it ready to be drawn
-    ActivateL();
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpAppControl::Draw( const TRect& /*aRect*/ ) const
-    {
-    // Get the standard graphics context
-    CWindowGc& gc = SystemGc();
-
-    // Gets the control's extent
-    TRect rect = Rect();
-
-    // Clears the screen
-    gc.Clear( rect );
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpAppControl::HandleResourceChange( TInt aType )
-    {
-    CCoeControl::HandleResourceChange( aType );
-    if ( aType == KEikDynamicLayoutVariantSwitch )
-        {
-        SetRect( iView.ClientRect() );
-        }
-    }
--- a/locsrv_plat/map_and_navigation_api/tsrc/mapnavproviderrefapp/src/mnrpapplication.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,56 +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:  CMnrpApplication class implementation
-*
-*/
-
-
-#include "debug.h"
-
-#include "mnrpdocument.h"
-#include "mnrpappserver.h"
-#include "mnrpapplication.h"
-
-// UID for the application, this should match the uid defined in the mmp file.
-static const TUid KUidMnRefProviderApp = {0x03132013};
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CApaDocument* CMnrpApplication::CreateDocumentL()
-    {  
-    LOG( "MnRefProvider: CreateDocumentL" );
-    CApaDocument* document = CMnrpDocument::NewL( *this );
-    return document;
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-TUid CMnrpApplication::AppDllUid() const
-    {
-    // Return the UID for the MnRefProvider application
-    return KUidMnRefProviderApp;
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpApplication::NewAppServerL( CApaAppServer*& aAppServer )
-    {
-    LOG( "MnRefProvider: NewAppServerL" );
-    aAppServer = new (ELeave) CMnrpAppServer;
-    }
--- a/locsrv_plat/map_and_navigation_api/tsrc/mapnavproviderrefapp/src/mnrpapplicationback.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,56 +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:  CMnrpApplicationGeoGeo class implementation
-*
-*/
-
-
-#include "debug.h"
-
-#include "mnrpdocumentback.h"
-#include "mnrpappserverback.h"
-#include "mnrpapplicationback.h"
-
-// UID for the application, this should match the uid defined in the mmp file.
-static const TUid KUidMnRefProviderBackApp = {0x03132014};
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CApaDocument* CMnrpApplicationBack::CreateDocumentL()
-    {  
-    LOG( "MnRefProviderBack: CreateDocumentL" );
-    CApaDocument* document = CMnrpDocumentBack::NewL( *this );
-    return document;
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-TUid CMnrpApplicationBack::AppDllUid() const
-    {
-    // Return the UID for the MnRefProvider application
-    return KUidMnRefProviderBackApp;
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpApplicationBack::NewAppServerL( CApaAppServer*& aAppServer )
-    {
-    LOG( "MnRefProviderBack: NewAppServerL" );
-    aAppServer = CMnrpAppServerBack::NewL();
-    }
--- a/locsrv_plat/map_and_navigation_api/tsrc/mapnavproviderrefapp/src/mnrpappserver.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,125 +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:  CMnrpAppServer class implementation
-*
-*/
-
-
-#include <mnappserviceuids.hrh>
-#include "debug.h"
-
-#include <lbsposition.h>
-#include <epos_cposlandmark.h>
-
-#include "mnrpnavigationservice.h"
-#include "mnrpmapviewservice.h"
-
-#include <MnRefProvider.rsg>
-#include "mnrpappui.h"
-#include "mnrpengine.h"
-#include "mnrpappserver.h"
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CMnrpAppServer::~CMnrpAppServer()
-    {
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-EXPORT_C CApaAppServiceBase* CMnrpAppServer::CreateServiceL(TUid aServiceType) const
-    {  
-    LOG1("MnRefProvider::CreateServiceL, svcUid = %X", aServiceType.iUid);
-    switch ( aServiceType.iUid )
-        {
-        case KMnAppMapViewService:
-            return CreateMapViewServiceL();
-
-        case KMnAppNavigationService:
-            return CreateNavigationServiceL();
-            
-        default:
-            return CAknAppServer::CreateServiceL( aServiceType );
-        }
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-EXPORT_C void CMnrpAppServer::HandleAllClientsClosed()
-    {
-    LOG( "MnRefProvider: HandleAllClientsClosed" );
-    CMnrpAppUi* appUi = AppUi();
-    if ( appUi )
-    	{
-    	if ( appUi->IsChainedMode() ) 
-    		{
-    		// close
-    		CAknAppServer::HandleAllClientsClosed();
-    		}
-    	else // standalone mode
-    		{
-    		if ( !appUi->IsAnyUserViewActive() )
-    			{
-	    		// close
-	    		CAknAppServer::HandleAllClientsClosed();
-    			}
-    		else
-    			{	
-    			// "remain active until user closes me"
-    			}
-    		}	
-    	}
-	else
-        {
-        CAknAppServer::HandleAllClientsClosed();
-        }
-    }
-    
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CMnrpNavigationService* CMnrpAppServer::CreateNavigationServiceL() const
-    {
-    LOG( "MnRefProvider: CreateNavigationServiceL" );
-    CMnrpNavigationService* svc = CMnrpNavigationService::NewL();
-    return svc;
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CMnrpMapViewService* CMnrpAppServer::CreateMapViewServiceL() const
-    {
-    LOG( "MnRefProvider: CreateMapViewServiceL" );
-    CMnrpMapViewService* svc = CMnrpMapViewService::NewL();
-    return svc;
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CMnrpAppUi* CMnrpAppServer::AppUi()
-    {
-    CMnrpAppUi* ui = (CMnrpAppUi*) CEikonEnv::Static()->AppUi();
-    if ( !ui )
-        {
-        LOG("MnRefProvider: UI not found!");
-        }
-    return ui;
-    }
--- a/locsrv_plat/map_and_navigation_api/tsrc/mapnavproviderrefapp/src/mnrpappserverback.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,107 +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:  CMnrpAppServerBack class implementation
-*
-*/
-
-
-#include <mnappserviceuids.hrh>
-#include "debug.h"
-
-#include <lbsposition.h>
-#include <epos_cposlandmark.h>
-
-#include "mnrpgeocodingservice.h"
-
-#ifdef RD_MAPNAV_BITMAP_ACCESS
-#include "mnrpmapimageservice.h"
-#endif
-
-#include "mnrpappuiback.h"
-#include "mnrpengine.h"
-#include "mnrpappserverback.h"
-
-// ============================ LOCAL FUNCTIONS ===============================
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CMnrpAppServerBack::~CMnrpAppServerBack()
-    {
-    delete iEngine;
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CMnrpAppServerBack* CMnrpAppServerBack::NewL()
-    {
-    CMnrpAppServerBack* self = new (ELeave) CMnrpAppServerBack();
-    CleanupStack::PushL( self );
-    self->ConstructL();
-    CleanupStack::Pop( self );
-    return self;
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpAppServerBack::ConstructL()
-    {
-    iEngine = CMnrpEngine::NewL();
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-EXPORT_C CApaAppServiceBase* CMnrpAppServerBack::CreateServiceL(TUid aServiceType) const
-    {
-    LOG1("MnRefProviderBack::CreateServiceL, svcUid = %X", aServiceType.iUid);
-    switch ( aServiceType.iUid )
-        {
-        case KMnAppGeocodingService:
-            return CreateGeocodingServiceL();
-
-#ifdef RD_MAPNAV_BITMAP_ACCESS
-        case KMnAppMapImageService:
-            return CreateMapImageServiceL();
-#endif
-        default:
-            return CAknAppServer::CreateServiceL( aServiceType );
-        }
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CMnrpGeocodingService* CMnrpAppServerBack::CreateGeocodingServiceL() const
-    {
-    LOG( "MnRefProviderBack: CreateGeocodingServiceL" );
-    CMnrpGeocodingService* svc = CMnrpGeocodingService::NewL( *iEngine );
-    return svc;
-    }
-
-#ifdef RD_MAPNAV_BITMAP_ACCESS
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CMnrpMapImageService* CMnrpAppServerBack::CreateMapImageServiceL() const
-    {
-    LOG( "MnRefProviderBack: CreateGeocodingServiceL" );
-    CMnrpMapImageService* svc = CMnrpMapImageService::NewL( *iEngine );
-    return svc;
-    }
-#endif
--- a/locsrv_plat/map_and_navigation_api/tsrc/mapnavproviderrefapp/src/mnrpappui.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,492 +0,0 @@
-/*
-* Copyright (c) 2006-2007 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:  CMnrpAppUi class implementation
-*
-*/
-
-
-#include <aknnavi.h>
-#include <aknnavide.h>
-#include <eikbtgpc.h>
-
-#include <akniconutils.h>
-#include <aknselectionlist.h>
-#include <gulicon.h>
-
-#include <MnRefProvider.rsg>
-#include <MnRefProvider.mbg>
-#include "mnrp.hrh"
-
-#include <epos_cposlandmark.h>
-#include <epos_cposlandmarkdatabase.h>
-
-#include "mnrpappview.h"
-#include "mnrpnaviview.h"
-#include "mnrpmapview.h"
-
-#include "mnrpmapviewservice.h"
-#include "mnrpnavigationservice.h"
-
-#include "mnrpdocument.h"
-#include "mnrpengine.h"
-#include "mnrpappui.h"
-#include "mnrputils.h"
-#include "debug.h"
-
-const TInt KDefaultLmIconIndex = 0;
-_LIT( KMbmFile, "\\resource\\apps\\MnRefProvider.mbm");
-
-// ============================ LOCAL FUNCTIONS ===============================
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-void CleanupIconArray( TAny* aArray )
-    {
-    LOG("MnRefProvider::CleanupIconArray in");
-    ( ( CArrayPtrSeg<CGulIcon>* ) aArray)->ResetAndDestroy();
-    delete aArray;
-    LOG("MnRefProvider::CleanupIconArray out");
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-void AddIconL(
-    CArrayPtr<CGulIcon>& aIconArray,
-    const TDesC& aFileName,
-    TInt aIconIndex,
-    TInt aMaskIndex )
-    {
-    LOG("MnRefProvider::AddIconL in");
-    CFbsBitmap* icon = NULL;
-    CFbsBitmap* mask = NULL;
-
-    AknIconUtils::CreateIconLC( icon, mask, aFileName, aIconIndex, aMaskIndex );
-    CGulIcon* gul = CGulIcon::NewL( icon, mask );
-
-    gul->SetBitmapsOwnedExternally( EFalse );
-    CleanupStack::PushL( gul );
-    aIconArray.AppendL( gul );
-    CleanupStack::Pop( 3 ); // gul, icon & mask
-    LOG("MnRefProvider::AddIconL out");
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-CArrayPtrSeg<CGulIcon>* CreateIconListLC( TInt aGranularity )
-    {
-    CArrayPtrSeg<CGulIcon>* iconList =
-        new (ELeave) CArrayPtrSeg<CGulIcon>( aGranularity );
-    CleanupStack::PushL( TCleanupItem( CleanupIconArray, iconList ) );
-
-    AddIconL(
-        *iconList,
-        KMbmFile,
-        EMbmMnrefproviderDefault_lm,
-        EMbmMnrefproviderDefault_lm_mask);
-
-    return iconList;
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-void AddLandmarkL(
-    const CPosLandmark& aLandmark,
-    CDesCArray& aTextArray,
-    CArrayPtr<CGulIcon>& aIconArray )
-    {
-    TPtrC name;
-    aLandmark.GetLandmarkName( name );
-
-    HBufC* printableName = MnrpUtils::PrintableStringLC( name );
-    
-    TPtrC iconFile;
-    TInt iconIndex, maskIndex, iconArrayIndex;
-
-    if ( aLandmark.GetIcon( iconFile, iconIndex, maskIndex ) == KErrNone )
-        {
-        AddIconL( aIconArray, iconFile, iconIndex, maskIndex );
-        iconArrayIndex = aIconArray.Count() - 1;
-        }
-    else
-        {
-        iconArrayIndex = KDefaultLmIconIndex;
-        }
-
-    _LIT(KListItemFormat, "%d\t%S\t\t");
-    const TInt KListItemMinSize = 20;
-
-    HBufC* item = HBufC::NewLC( printableName->Size() + KListItemMinSize );
-    item->Des().Format( KListItemFormat, iconArrayIndex, printableName );
-
-    aTextArray.AppendL( *item );
-
-    CleanupStack::PopAndDestroy( item );
-    CleanupStack::PopAndDestroy( printableName );
-    }
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CMnrpAppUi::CMnrpAppUi( CMnrpEngine& aEngine )
-  : iEngine( aEngine )
-    {
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpAppUi::ConstructL()
-    {
-    BaseConstructL( EAknEnableSkin );
-    
-    // This is empty view, it will be shown by UI framework,
-    // when application starts
-    iAppView = CMnrpAppView::NewL();
-    AddViewL( iAppView );
-
-    if ( !iEikonEnv->StartedAsServerApp() )
-        {
-        // switch to map view if started normally
-        iMapView = CMnrpMapView::NewL( EFalse, iEngine );
-        AddViewL( iMapView );
-        ActivateLocalViewL( iMapView->Id() );
-        }
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CMnrpAppUi::~CMnrpAppUi()
-    {
-    delete iNaviPaneLabel;
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpAppUi::HandleCommandL( TInt aCommand )
-    {
-    switch(aCommand)
-        {
-        case EAknSoftkeyBack:
-        	{
-    	    CEikAppServer* server = iEikonEnv->AppServer();
-		    if ( server )
-		    	{
-		        server->NotifyServerExit( EEikCmdExit );
-		    	}
-		    Exit();	
-        	break;
-        	}
-        	
-        case EEikCmdExit:
-        case EAknSoftkeyExit:
-            {
-    	    CEikAppServer* server = iEikonEnv->AppServer();
-		    if ( server )
-		    	{
-		        server->NotifyServerExit( EAknCmdExit ); // this will close client also
-		    	}
-		    Exit();	
-        	break;
-            }
-        default:
-            break;
-        }
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-TBool CMnrpAppUi::IsChainedMode()
-    {
-    return ( iParentWg != 0 );
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-TBool CMnrpAppUi::IsAnyUserViewActive()
-    {
-    TVwsViewId viewId;
-    if ( ( GetActiveViewId( viewId ) == KErrNotFound ) ||
-         ( viewId.iViewUid.iUid != EMnrpMapViewId && 
-           viewId.iViewUid.iUid != EMnrpNavigationViewId ) )
-        {
-        return EFalse;
-        }
-    else
-        {
-        return ETrue;
-        }
-    }
-
-// ----------------------------------------------------------------------------
-// ----------------------------------------------------------------------------
-//
-void CMnrpAppUi::SetNaviPaneTitleL( const TDesC& aPaneTitle )
-    {
-    if ( !iNaviPane )
-        {
-        iNaviPane = static_cast<CAknNavigationControlContainer*>(
-                StatusPane()->ControlL( TUid::Uid( EEikStatusPaneUidNavi ) ) );
-        }
-
-    if ( iNaviPaneLabel )
-        {
-        CAknNavigationDecorator* naviLabel = iNaviPane->CreateNavigationLabelL( aPaneTitle );
-        CleanupStack::PushL( naviLabel );
-
-        iNaviPane->ReplaceL( *iNaviPaneLabel, *naviLabel );
-
-        delete iNaviPaneLabel;
-        iNaviPaneLabel = naviLabel;
-
-        CleanupStack::Pop( naviLabel );
-        }
-    else
-        {
-        iNaviPaneLabel = iNaviPane->CreateNavigationLabelL( aPaneTitle );
-        iNaviPane->PushL( *iNaviPaneLabel );
-        }
-    }    
-
-// ----------------------------------------------------------------------------
-// ----------------------------------------------------------------------------
-//
-void CMnrpAppUi::SetRightSoftkeyCommandL( TInt aCommand, const TDesC& aButtonTitle )
-    {
-    if ( Cba() )
-        {
-        Cba()->SetCommandL( 1, aCommand, aButtonTitle );
-        }
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-TBool CMnrpAppUi::ProcessCommandParametersL( CApaCommandLine &aCommandLine )
-    {
-    iParentWg = aCommandLine.ParentWindowGroupID();
-    LOG1("parent window group id %d", iParentWg );
-    
-    return CAknAppUi::ProcessCommandParametersL( aCommandLine );
-    }
-
-// ----------------------------------------------------------------------------
-// ----------------------------------------------------------------------------
-//
-void CMnrpAppUi::HandleResourceChangeL( TInt aType )
-    {
-    CAknAppUi::HandleResourceChangeL( aType );
-    
-    TRect rect( ClientRect() );
-    if ( Cba() )
-        {
-		Cba()->SetBoundingRect( TRect() );
-		Cba()->ReduceRect( rect );
-        }
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpAppUi::ShowMapL( CMnrpMapViewService& aService )
-    {
-    if ( !iMapView )
-        {
-        iMapView = CMnrpMapView::NewL( IsChainedMode(), iEngine );
-        AddViewL( iMapView );
-        }
-        
-    iMapView->SetMapModeL( aService );
-    ActivateLocalViewL( iMapView->Id() );
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpAppUi::ShowNavigationL( const CPosLandmark& aDestination )
-    {
-    if ( !iNaviView )
-        {
-        iNaviView = CMnrpNaviView::NewL( IsChainedMode(), iEngine );
-        AddViewL( iNaviView );
-        }
-        
-    iNaviView->SetDestinationL( aDestination );
-    ActivateLocalViewL( iNaviView->Id() );
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpAppUi::StartSelectionL( 
-    CMnrpMapViewService& aService,  
-    MMapSelectionCallback& aCallback )
-    {
-	SetNaviPaneTitleL( aService.SelectionRequestText() );
-
-    if ( aService.Options() & CMnMapView::EOptionRestrictSelection )
-        {
-        // select from dialog 
-        SelectFromDialogL( aService, aCallback );
-        }
-    else
-        {
-        // select from map
-        if ( !iMapView )
-            {
-            iMapView = CMnrpMapView::NewL( IsChainedMode(), iEngine );
-            AddViewL( iMapView );
-            }
-
-        iMapView->SetSelectionModeL( aService, aCallback );
-        ActivateLocalViewL( iMapView->Id() );
-        }
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpAppUi::StopSelection()
-    {
-    __ASSERT_DEBUG( iMapView, Panic( KErrGeneral ) );
-    iMapView->StopSelection();
-
-    // Selection is done - close selection view
-    TRAP_IGNORE( ActivateLocalViewL( iAppView->Id() ) );
-    }
-    
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpAppUi::SelectFromDialogL(
-    CMnrpMapViewService& aService,
-    MMapSelectionCallback& aCallback )
-    {
-    LOG("MnRefProvider::SelectFromDialogL in");
-
-    const TInt KGranularity = 8;
-
-    CDesCArraySeg *textArray = new (ELeave) CDesCArraySeg( KGranularity );
-    CleanupStack::PushL( textArray );
-    CArrayPtrSeg<CGulIcon>* iconArray = CreateIconListLC( KGranularity );
-
-    TInt linkedLmsOffset = 0;
-
-    CMnrpDocument* doc = ( CMnrpDocument* ) Document();
-    CMnrpEngine& engine = doc->Engine();
-
-    // add non-linked landmarks
-    LOG("MnRefProvider::DoSelectionDialogL adding non-linked landmarks");
-    for ( TInt i = 0; i < aService.LandmarksToShow().Count(); i++)
-        {
-        const CPosLandmark* lm = aService.LandmarksToShow()[i];
-        AddLandmarkL( *lm, *textArray, *iconArray );
-        }
-
-    // add linked landmarks
-    LOG("MnRefProvider::DoSelectionDialogL adding linked landmarks");
-
-    // create dictionary of linked landmarks
-    // in order to ease searching for return values
-    // when completing request
-    RArray<TInt> dbIndices;
-    RArray<TPosLmItemId> lmIds;
-
-    CleanupClosePushL( dbIndices );
-    CleanupClosePushL( lmIds );
-
-    linkedLmsOffset = textArray->Count();
-    for ( TInt db = 0; db < aService.LandmarksToShowDatabases().Count(); db++ )
-        {
-        const HBufC* uri = aService.LandmarksToShowDatabases()[db];
-
-        CPosLandmarkDatabase* lmdb = CPosLandmarkDatabase::OpenL( *uri );
-        CleanupStack::PushL( lmdb );
-
-        if ( lmdb->IsInitializingNeeded() )
-            {
-            ExecuteAndDeleteLD( lmdb->InitializeL() );
-            }
-
-        for ( TInt i = 0; i < aService.LinkedLandmarksToShow(db).Count(); i++)
-            {
-            TPosLmItemId id = aService.LinkedLandmarksToShow(db)[i];
-
-            CPosLandmark* lm = lmdb->ReadLandmarkLC( id );
-            AddLandmarkL( *lm, *textArray, *iconArray );
-            
-            dbIndices.AppendL( db );
-            lmIds.AppendL( id );
-
-            CleanupStack::PopAndDestroy( lm );
-            }
-
-        CleanupStack::PopAndDestroy( lmdb );
-        }
-
-    TInt selected = 0;
-    CAknSelectionListDialog *dialog =
-        CAknSelectionListDialog::NewL( selected, textArray, R_MNREFPROVIDER_MENUBAR );
-
-    dialog->PrepareLC( R_MNREFPROVIDER_SELECTION_DIALOG );
-
-    dialog->SetIconArrayL( iconArray );
-    CleanupStack::Pop(); // iconArray cleanup
-
-    LOG1("MnRefProvider::SelectFromDialogL launching dialog with %d items", textArray->Count() );
-    TInt result = dialog->RunLD();
-    if ( result )
-        {
-        LOG("MnRefProvider::SelectFromDialogL approved");
-        if ( selected < linkedLmsOffset )
-            {
-            aCallback.HandleSelectionL( selected );
-            }
-        else
-            {
-            TInt linkedLmIndex = selected - linkedLmsOffset;
-            if ( linkedLmIndex < dbIndices.Count() && 
-                 linkedLmIndex < lmIds.Count() )
-                {
-                aCallback.HandleSelectionL( lmIds[linkedLmIndex], dbIndices[linkedLmIndex] );
-                }
-            else
-                {
-                // never happens
-                LOG("MnRefProvider::SelectFromDialogL selection out of range, out");
-                aCallback.HandleSelectionErrorL( KErrGeneral );
-                }
-            }
-        }
-    else
-        {
-        LOG("MnRefProvider::SelectFromDialogL cancelled, out");
-        aCallback.HandleSelectionErrorL( KErrCancel );
-        }
-
-    CleanupStack::PopAndDestroy( &lmIds );
-    CleanupStack::PopAndDestroy( &dbIndices );
-
-    CleanupStack::PopAndDestroy( textArray );
-    LOG("MnRefProvider::SelectFromDialogL out");
-}    
--- a/locsrv_plat/map_and_navigation_api/tsrc/mapnavproviderrefapp/src/mnrpappuiback.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,69 +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:  CMnrpAppUiBack classimplementation
-*
-*/
-
-
-#include <aknnavi.h>
-#include <aknnavide.h>
-
-#include "mnrpengine.h"
-#include "mnrpappuiback.h"
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpAppUiBack::ConstructL()
-    {
-    BaseConstructL( EAknEnableSkin );
-    // no view is created as this application is intended to be run
-    // only as hidden server
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpAppUiBack::HandleCommandL(TInt aCommand)
-    {
-    switch(aCommand)
-        {
-        case EEikCmdExit:
-        case EAknSoftkeyExit:
-            Exit();
-            break;
-        default:
-            break;
-        }
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-void CMnrpAppUiBack::MoveForeground()
-    {
-    RWindowGroup& window = iEikonEnv->RootWin();
-    window.SetOrdinalPosition( 0 );
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-void CMnrpAppUiBack::MoveBackground()
-    {
-    RWindowGroup& window = iEikonEnv->RootWin();
-    window.SetOrdinalPosition( -1 );
-    }
--- a/locsrv_plat/map_and_navigation_api/tsrc/mapnavproviderrefapp/src/mnrpappview.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,107 +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:  CMnrpAppView class implementation
-*
-*/
-
-
-#include "mnrp.hrh"
-#include "mnrpappui.h"
-#include "mnrpappcontrol.h"
-#include "mnrpappview.h"
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CMnrpAppView::CMnrpAppView()
-    {
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CMnrpAppView::~CMnrpAppView()
-    {
-    delete iControl;
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CMnrpAppView* CMnrpAppView::NewL()
-    {
-    CMnrpAppView* self = new ( ELeave ) CMnrpAppView();
-    CleanupStack::PushL( self );
-    self->ConstructL();
-    CleanupStack::Pop( self );
-    return self;
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpAppView::ConstructL()
-    {
-    BaseConstructL();
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-TUid CMnrpAppView::Id() const
-    {
-    return TUid::Uid( EMnrpAppViewId );
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpAppView::DoActivateL(
-    const TVwsViewId& /*aPrevViewId*/,
-    TUid /* aCustomMessageId */,
-    const TDesC8& /* aCustomMessage */)
-    {
-    if ( !iControl )
-        {
-        iControl = CMnrpAppControl::NewL( *this, ClientRect() );
-        iControl->SetMopParent( this );
-        }
-
-    // Enable receiving of keyboard events.
-    CMnrpAppUi* ui = ( CMnrpAppUi* ) AppUi();
-    ui->AddToStackL( *this, iControl );
-
-    _LIT( KEmpty, "" );
-    ui->SetNaviPaneTitleL( KEmpty );
-
-    // Make view visible.
-    iControl->MakeVisible( ETrue );
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpAppView::DoDeactivate()
-    {
-    if ( iControl )
-        {
-        // Hide view.
-        iControl->MakeVisible( EFalse );
-
-        // Disable receiving keyboard events.
-        AppUi()->RemoveFromStack( iControl );
-        }
-    }
--- a/locsrv_plat/map_and_navigation_api/tsrc/mapnavproviderrefapp/src/mnrpcoordconverter.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,97 +0,0 @@
-/*
-* Copyright (c) 2007 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:  CMnrpCoordConverter implementation
-*
-*/
-
-
-#include <e32base.h>
-
-#include "debug.h"
-#include "mnrpengine.h"
-#include "mnrpmapmodel.h"
-#include "mnrpcoordconverter.h"
-
-// ========================== MEMBER FUNCTIONS ===============================
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-CMnrpCoordConverter* CMnrpCoordConverter::NewL()
-    {
-    CMnrpCoordConverter* self = new (ELeave) CMnrpCoordConverter;
-    CleanupStack::PushL( self );
-
-    self->iEngine = CMnrpEngine::NewL();
-    self->iModel = CMnrpMapModel::NewL( *self->iEngine );
-
-    CleanupStack::Pop( self );
-    return self;
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-CMnrpCoordConverter::CMnrpCoordConverter()
-    {
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-CMnrpCoordConverter::~CMnrpCoordConverter()
-    {
-    delete iModel;
-    delete iEngine;
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-TInt CMnrpCoordConverter::GetImageCoordinate(
-    const TCoordinate& aWorldCoordinate,
-    TPoint& aImagePoint )
-    {
-    const TMnMapImageParams& params = MapImageParams();
-
-    if ( params.ImageType() == TMnMapImageParams::ETypeSatelliteImage )
-        {
-        return KErrArgument;
-        }
-
-    iModel->UpdateModel( params );
-
-    aImagePoint = iModel->AbsoluteToScreen( aWorldCoordinate );
-    return KErrNone;
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-TInt CMnrpCoordConverter::GetWorldCoordinate(
-    const TPoint& aImagePoint,
-    TCoordinate& aWorldCoordinate )
-    {
-    const TMnMapImageParams& params = MapImageParams();
-
-    if ( params.ImageType() == TMnMapImageParams::ETypeSatelliteImage )
-        {
-        return KErrArgument;
-        }
-
-    iModel->UpdateModel( params );
-
-    aWorldCoordinate = iModel->ScreenToAbsolute( aImagePoint  );
-    return KErrNone;
-    }
--- a/locsrv_plat/map_and_navigation_api/tsrc/mapnavproviderrefapp/src/mnrpdocument.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,80 +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:  CMnrpDocument class implementation
-*
-*/
-
-
-#include "mnrpappui.h"
-#include "mnrpengine.h"
-#include "mnrpdocument.h"
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CMnrpDocument::CMnrpDocument(CEikApplication& aApp) 
-    : CAknDocument(aApp) 
-    {
-    }   
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpDocument::ConstructL()
-    {
-    iEngine = CMnrpEngine::NewL();
-    }    
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CMnrpDocument* CMnrpDocument::NewL( CEikApplication& aApp )
-    {
-    CMnrpDocument* self = new (ELeave) CMnrpDocument(aApp);
-    CleanupStack::PushL(self);
-    self->ConstructL();
-    CleanupStack::Pop(self);
-    return self;
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CMnrpDocument::~CMnrpDocument()
-    {
-    delete iEngine;
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CMnrpEngine& CMnrpDocument::Engine()
-    { 
-    return *iEngine; 
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CEikAppUi* CMnrpDocument::CreateAppUiL()
-    {
-    // Create the application user interface, and return a pointer to it,
-    // the framework takes ownership of this object
-    CEikAppUi* appUi = new (ELeave) CMnrpAppUi( *iEngine );
-    return appUi;
-    }
-
-
--- a/locsrv_plat/map_and_navigation_api/tsrc/mapnavproviderrefapp/src/mnrpdocumentback.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,53 +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:  CMnrpDocumentBack class implementation
-*
-*/
-
-
-#include "mnrpappuiback.h"
-#include "mnrpengine.h"
-#include "mnrpdocumentback.h"
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CMnrpDocumentBack::CMnrpDocumentBack(CEikApplication& aApp) 
-    : CAknDocument(aApp) 
-    {
-    }   
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CMnrpDocumentBack* CMnrpDocumentBack::NewL( CEikApplication& aApp )
-    {
-    CMnrpDocumentBack* self = new (ELeave) CMnrpDocumentBack( aApp );
-    return self;
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CEikAppUi* CMnrpDocumentBack::CreateAppUiL()
-    {
-    // Create the application user interface, and return a pointer to it,
-    // the framework takes ownership of this object
-    CEikAppUi* appUi = new (ELeave) CMnrpAppUiBack();
-    return appUi;
-    }
-
-
--- a/locsrv_plat/map_and_navigation_api/tsrc/mapnavproviderrefapp/src/mnrpengine.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,433 +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:  CMnrpEngine class implementation
-*
-*/
-
-
-#include <coemain.h>
-#include <aknlists.h>
-#include <barsread2.h>
-#include <barsc2.h> 
-
-#include <lbsposition.h>
-#include <lbspositioninfo.h>
-
-#include <epos_cposlandmark.h>
-#include <epos_cposlandmarkdatabase.h>
-
-#include <mnrefproviderengine.rsg>
-
-#include "../inc/debug.h"
-#include "mnrpengine.h"
-
-_LIT( KCitiesResourceFile, "\\resource\\mnrefproviderengine.rsc");
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CMnrpEngine::CMnrpEngine()
-    { 
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-EXPORT_C CMnrpEngine::~CMnrpEngine()
-    {
-    iPlaces.ResetAndDestroy();
-    iFileSession.Close();
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-EXPORT_C CMnrpEngine* CMnrpEngine::NewL()
-    {
-    CMnrpEngine* self = new (ELeave) CMnrpEngine();
-    CleanupStack::PushL( self );
-    self->ConstructL();
-    CleanupStack::Pop( self );
-    return self;
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpEngine::ConstructL()
-    {
-    User::LeaveIfError( iFileSession.Connect() );
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-EXPORT_C TArray<CPosLandmark*> CMnrpEngine::KnownPlacesL()
-    {
-    if ( iPlaces.Count() == 0 )
-        {
-        TRAP_IGNORE( LoadKnownPlacesL() );
-        }
-
-    return iPlaces.Array();        
-    }
-    
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-EXPORT_C CPosLandmark* CMnrpEngine::AddressToCoordLC( const CPosLandmark& aAddress )
-    {
-    CPosLandmark* lm = AddressToCoordL( aAddress );
-    if ( lm )
-        {
-        CleanupStack::PushL( lm );
-        return lm;
-        }
-    else
-        {
-        User::Leave( KErrNotFound );
-        return NULL;
-        }
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-EXPORT_C CPosLandmark* CMnrpEngine::AddressToCoordL( const CPosLandmark& aAddress )
-    {
-    TPtrC city, country;
-    aAddress.GetPositionField( EPositionFieldCity, city );
-    
-    TArray<CPosLandmark*> pois = KnownPlacesL();
-    
-    if ( city.Length() )
-        {
-        for ( TInt i = 0; i < pois.Count(); i++ )
-            {
-            TPtrC poiCity;
-            pois[i]->GetPositionField( EPositionFieldCity, poiCity );
-            if ( poiCity.CompareF( city ) == 0 )
-                {
-                return CPosLandmark::NewL( *pois[i] );
-                }
-            }
-        }
-    
-    return NULL;
-    }
-    
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-EXPORT_C CPosLandmark* CMnrpEngine::AddressToCoordLC( const TDesC& aAddress )
-    {
-    CPosLandmark* lm = AddressToCoordL( aAddress );
-    if ( lm )
-        {
-        CleanupStack::PushL( lm );
-        return lm;
-        }
-    else
-        {
-        User::Leave( KErrNotFound );
-        return NULL;
-        }
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-EXPORT_C CPosLandmark* CMnrpEngine::AddressToCoordL( const TDesC& aAddress )
-    {
-    TArray<CPosLandmark*> pois = KnownPlacesL();
-
-    if ( aAddress.Length() )
-        {
-        for ( TInt i = 0; i < pois.Count(); i++ )
-            {
-            TPtrC city, country;
-            pois[i]->GetPositionField( EPositionFieldCity, city );
-            pois[i]->GetPositionField( EPositionFieldCountry, country );
-            
-            if ( aAddress.FindF( city ) >= 0 )
-                {
-                return CPosLandmark::NewL( *pois[i] );
-                }
-            }
-        }
-        
-    return NULL;
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-EXPORT_C TReal32 CMnrpEngine::DistanceBetweenLandmarks( 
-    const CPosLandmark& aFrom,
-    const CPosLandmark& aTo )
-    {
-    TRealX nan;
-    nan.SetNaN();
-    TReal32 distance = nan;
-    
-    TLocality locFrom, locTo;
-
-    if ( aFrom.GetPosition( locFrom ) == KErrNone &&
-         aTo.GetPosition( locTo ) == KErrNone )
-        {
-        TReal32 dist;
-        if ( locFrom.Distance( locTo, dist ) == KErrNone )
-            {
-            distance = dist;
-            }
-        }
-    return distance;
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-EXPORT_C void CMnrpEngine::FindClosestPoisL( 
-    const CPosLandmark& aReference,
-    RArray<CMnrpEngine::TDistanceToPoi>& aNeighbourPois,
-    TInt aMaxMatches )
-    {
-    aNeighbourPois.Reset();
-    TArray<CPosLandmark*> pois = KnownPlacesL();
-
-    // calc distances to known places and find out closest ones
-    for ( TInt i = 0; i < pois.Count(); i++ )
-        {
-        CPosLandmark* poi = pois[i];
-
-        TReal32 distance = DistanceBetweenLandmarks( aReference, *poi );
-        
-        if ( Math::IsNaN( distance ) )
-            {
-            continue;
-            }
-        
-        TDistanceToPoi newDistToPoi;
-        newDistToPoi.iPoiIndex = i;
-        newDistToPoi.iDistance = distance;
-
-        for ( TInt k = 0; k < aNeighbourPois.Count(); k++ )
-            {
-            TDistanceToPoi distToPoi = aNeighbourPois[k];
-            if ( distance < distToPoi.iDistance )
-                {
-                // current POI is closer to reference than current neighbour
-                aNeighbourPois.InsertL( newDistToPoi, k );
-                break;
-                }
-            }
-
-        if ( aNeighbourPois.Count() < aMaxMatches )
-            {
-            aNeighbourPois.AppendL( newDistToPoi );
-            }
-
-        if ( aNeighbourPois.Count() > aMaxMatches )
-            {
-            aNeighbourPois.Remove( aNeighbourPois.Count() - 1 ); // remove last
-            }
-        }
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CPosLandmark* CMnrpEngine::CreateCloseLandmarkLC( 
-    const CPosLandmark& aReference,
-    TReal32 aDistance )
-    {
-    CPosLandmark* lm = CPosLandmark::NewLC( aReference );
-    TPtrC oldName;
-    lm->GetLandmarkName( oldName );
-    
-    // create street in the form of "50 km to <POI name>"
-    const TInt KDistValueLen = 5; // "40000"
-    const TInt KAdditionalChars = 7; // " km to "
-
-    _LIT( KLocationNameFormat, "%d m to %S" );
-    _LIT( KLocationNameFormatKm, "%d km to %S" );
-
-    HBufC* locName = HBufC::NewLC( oldName.Length() + KDistValueLen + KAdditionalChars );
-
-    if ( aDistance < 1000 )
-        {
-        locName->Des().Format( KLocationNameFormat, TInt( aDistance ), &oldName );
-        }
-    else
-        {
-        locName->Des().Format( KLocationNameFormatKm, TInt( aDistance / 1000 ), &oldName );
-        }
-
-    lm->SetPositionFieldL( EPositionFieldLocationName, *locName );
-    lm->SetPositionFieldL( EPositionFieldStreet, *locName );
-   
-    CleanupStack::PopAndDestroy( locName );
-    return lm; // left in stack
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-EXPORT_C CPosLandmark* CMnrpEngine::CoordToAddressLC( const TCoordinate& aLocation )
-    {
-    TArray<CPosLandmark*> pois = KnownPlacesL();
-
-    // find closest POI
-    RArray<TDistanceToPoi> matches;
-	CleanupClosePushL( matches );
-    
-    CPosLandmark* temp = CPosLandmark::NewLC();
-    TLocality loc( aLocation, 0 ); // accuracy is not used by this implementation
-    temp->SetPositionL( loc );
-    FindClosestPoisL( *temp, matches, 1 ); // only one match needed
-    CleanupStack::PopAndDestroy( temp );
-    
-    if ( matches.Count() < 1 )
-		{
-		User::Leave( KErrNotFound );
-		}
-
-    TDistanceToPoi distToPoi = matches[0];
-	CleanupStack::PopAndDestroy( &matches );
-
-    CPosLandmark* lm = CreateCloseLandmarkLC(
-        *pois[distToPoi.iPoiIndex],
-        distToPoi.iDistance );
-
-    return lm; // left in stack
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-EXPORT_C void CMnrpEngine::BestCoordToAddressMatchesL( 
-    const TCoordinate& aLocation,
-    RPointerArray<CPosLandmark>& aMatches,
-    TInt aMaxMatches )
-    {
-    TArray<CPosLandmark*> pois = KnownPlacesL();
-
-    // find closest POIs
-    RArray<TDistanceToPoi> matches;
-    CleanupClosePushL( matches );
-    
-    CPosLandmark* temp = CPosLandmark::NewLC();
-    TLocality loc( aLocation, 0 ); // accuracy is not used by this implementation
-    temp->SetPositionL( loc );
-    FindClosestPoisL( *temp, matches, aMaxMatches );
-    CleanupStack::PopAndDestroy( temp );
-    
-    for ( TInt i = 0; i < matches.Count(); i++ )
-        {
-        TDistanceToPoi distToPoi = matches[i];
-        
-        CPosLandmark* lm = CreateCloseLandmarkLC( 
-            *pois[distToPoi.iPoiIndex], 
-            distToPoi.iDistance );
-            
-        aMatches.AppendL( lm );    
-        CleanupStack::Pop( lm );
-        }
-    CleanupStack::PopAndDestroy( &matches );
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-EXPORT_C void CMnrpEngine::FindResourceFileL( 
-    const TDesC& aFilePathAndName,
-    TFileName& aRscFile )
-    {
-    TParse parse;
-    parse.Set( aFilePathAndName, NULL, NULL );
-    
-    TFindFile finder( iFileSession );
-    if ( finder.FindByDir( parse.NameAndExt(), parse.Path() ) == KErrNone )
-        {
-        aRscFile.Copy( finder.File() );
-        }
-    else
-        {
-        User::Leave( KErrNotFound );
-        }
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-EXPORT_C RFs& CMnrpEngine::Fs() 
-    { 
-    return iFileSession;
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpEngine::LoadKnownPlacesL()
-    {
-    TFileName resourceFile;
-    FindResourceFileL( KCitiesResourceFile(), resourceFile );
-
-    CResourceFile* resFile = CResourceFile::NewLC( iFileSession, resourceFile, 0, 0 );
-    resFile->ConfirmSignatureL( 0 );
-
-    RResourceReader reader;
-
-    reader.OpenLC( resFile, R_MNREFPROVIDERENGINE_PLACES );
-    ReadPlacesResourceL( reader );
-    CleanupStack::PopAndDestroy( &reader );
-    
-    CleanupStack::PopAndDestroy( resFile );
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpEngine::ReadPlacesResourceL( RResourceReader& aReader )
-    {
-    TInt size = aReader.ReadInt16L();
-
-    for ( TInt i = 0; i < size; i++ )
-        {
-        HBufC* city = aReader.ReadHBufCL();
-        CleanupStack::PushL( city );
-        HBufC* country = aReader.ReadHBufCL();
-        CleanupStack::PushL( country );
-
-        TReal64 lat = aReader.ReadReal64L();
-        TReal64 lon = aReader.ReadReal64L();
-        
-        CPosLandmark* lm = CPosLandmark::NewLC();
-        lm->SetLandmarkNameL( *city );
-        
-        lm->SetPositionFieldL( EPositionFieldCity, *city );
-        lm->SetPositionFieldL( EPositionFieldCountry, *country );
-        
-        TLocality coord;
-        coord.SetCoordinate( lat, lon );
-        lm->SetPositionL( coord );
-        
-        iPlaces.AppendL( lm );
-        CleanupStack::Pop( lm );
-        CleanupStack::PopAndDestroy( country );
-        CleanupStack::PopAndDestroy( city );
-        }
-    }
--- a/locsrv_plat/map_and_navigation_api/tsrc/mapnavproviderrefapp/src/mnrpgeocodingservice.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,343 +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:  CMnrpGeocodingService class implementation
-*
-*/
-
-
-#include <e32base.h>
-
-#include <aknnotewrappers.h>
-
-#include <lbsposition.h>
-
-#include <epos_cposlandmark.h>
-#include <epos_poslandmarkserialization.h>
-
-#include <mngeocodingservicebase.h>
-
-#include "debug.h"
-
-#include "mnrpappserverback.h"
-#include "mnrpappuiback.h"
-#include "mnrpdocumentback.h"
-#include "mnrpengine.h"
-
-#include <mnrefproviderback.rsg>
-#include "mnrpgeocodingservice.h"
-
-// ======== LOCAL FUNCTIONS ========
-
-// ---------------------------------------------------------------------------
-//  Cleanup item for RPointerArray<CPosLandmark>
-// ---------------------------------------------------------------------------
-//
-void CleanupLandmarksArray( TAny* aArray )
-    {
-    ( static_cast<RPointerArray<CPosLandmark>*>( aArray ) )->ResetAndDestroy();
-    }
-
-// ---------------------------------------------------------------------------
-//  Cleanup item for moving application fore/background
-// ---------------------------------------------------------------------------
-//
-void CleanupForeground( TAny* aAppUi )
-    {
-    ( static_cast<CMnrpAppUiBack*>( aAppUi ) )->MoveBackground();
-    }
-
-// ======== MEMBER FUNCTIONS ========
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-CMnrpGeocodingService::CMnrpGeocodingService( CMnrpEngine& aEngine )
- :  iEngine( aEngine )
-    {
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-CMnrpGeocodingService* CMnrpGeocodingService::NewL( CMnrpEngine& aEngine )
-    {
-    CMnrpGeocodingService* self = new (ELeave) CMnrpGeocodingService( aEngine );
-    CleanupStack::PushL( self );
-    self->ConstructL();
-    CleanupStack::Pop( self );
-    return self;
-    }
-    
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-CMnrpGeocodingService::~CMnrpGeocodingService()
-    {
-    delete iProcessor;
-    delete iLandmark;
-    delete iPlainAddress;
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-void CMnrpGeocodingService::ConstructL()
-    {
-    BaseConstructL();
-    
-    iProcessor = CIdle::NewL( CActive::EPriorityIdle );
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-void CMnrpGeocodingService::LeaveIfBusyL()
-    {
-    if ( iProcessor->IsActive() )
-        {
-        User::Leave( KErrInUse );
-        }
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-void CMnrpGeocodingService::StartProcessingL()
-    {
-    iProcessor->Start( TCallBack( CMnrpGeocodingService::GeocodingProcessingCallBack, this ) );
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-TInt CMnrpGeocodingService::GeocodingProcessingCallBack( TAny* aPtr )
-    {
-    CMnrpGeocodingService* self =    
-        static_cast<CMnrpGeocodingService*> ( aPtr );
-        
-    self->HandleGeocodingCompleted();
-    return EFalse;
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-void CMnrpGeocodingService::HandleGeocodingCompleted()
-    {
-    TInt err = KErrNone;
-    TRAP( err, FinishProcessingL() );
-    if ( err )
-        {
-        CompleteRequest( err );
-        }
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-void CMnrpGeocodingService::FinishProcessingL()
-    {
-    LOG1("MnRefProvider: FinishProcessingL in, cursvc %d", iCurrentService);
-
-    TLocality loc;
-    CPosLandmark* lm = NULL;
-    
-    switch ( iCurrentService )
-        {
-        case ECoordToAddr:
-                
-            if ( iDialogAllowed )
-                {
-                lm = LetUserSelectBestMatchL( *iLandmark );
-                CleanupStack::PushL( lm );
-                }
-            else
-                {
-                // search and return just best match - closest POI
-                if ( iLandmark->GetPosition( loc ) != KErrNone )
-                    {
-                    User::Leave( KErrArgument );
-                    }
-                lm = iEngine.CoordToAddressLC( loc );
-                }
-            break;
-
-        case EAddrToCoord:
-            lm = iEngine.AddressToCoordLC( *iLandmark );
-            break;
-
-        case EPlainToCoord:
-            lm = iEngine.AddressToCoordLC( *iPlainAddress );
-            break;
-            
-        default:            
-            User::Leave( KErrGeneral );
-        }
-
-    iCurrentService = ENone;    
-    
-    CompleteGeocodingRequestL( *lm );
-    CleanupStack::PopAndDestroy( lm );
-
-    LOG("MnRefProvider: FinishProcessingL out");
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-CPosLandmark* CMnrpGeocodingService::LetUserSelectBestMatchL( const CPosLandmark& aReference )
-    {
-    // 1. Find best matches
-    
-    RPointerArray<CPosLandmark> matches;
-    CleanupStack::PushL( TCleanupItem( CleanupLandmarksArray, &matches ) );
-    
-    TLocality location;
-    if ( aReference.GetPosition( location ) != KErrNone )
-        {
-        User::Leave( KErrArgument );
-        }
-    
-    const TInt KMaxmMatches = 3;
-    iEngine.BestCoordToAddressMatchesL( location, matches, KMaxmMatches );
-    
-    if ( matches.Count() < 1 )
-        {
-        User::Leave( KErrNotFound ); // cannot find any match
-        }
-    
-    // 2. Start selection dialog
-    
-    TInt result = 1, selected = 0;
-    if ( matches.Count() > 1 )
-        {
-        // prepare dialog
-        const TInt KGranularity = 8;
-        CDesCArraySeg *textArray = new (ELeave) CDesCArraySeg( KGranularity );
-        CleanupStack::PushL( textArray );
-        
-        for ( TInt i = 0; i < matches.Count(); i++ )
-            {
-            HBufC* buf = HBufC::NewLC( KPosLmMaxTextFieldLength );
-            TPtrC ptr( buf->Des() );
-            
-            matches[i]->GetPositionField( EPositionFieldLocationName, ptr );
-            textArray->AppendL( ptr );
-
-            CleanupStack::PopAndDestroy( buf );
-            }
-        
-        // bring application foreground
-        CMnrpAppUiBack* ui = (CMnrpAppUiBack*) CEikonEnv::Static()->AppUi();
-        CleanupStack::PushL( TCleanupItem( CleanupForeground, ui ) );
-        ui->MoveForeground();
-
-        CAknListQueryDialog* dialog = new (ELeave) CAknListQueryDialog( &selected );
-        dialog->PrepareLC( R_MNREFGEOCODER_LIST_QUERY );
-
-        dialog->SetItemTextArray( textArray );
-        dialog->SetOwnershipType( ELbmOwnsItemArray );
-
-        // pop up dialog
-        result = dialog->RunLD();
-
-        CleanupStack::PopAndDestroy(); // move background
-        CleanupStack::Pop( textArray );
-        }
-
-    // 3. Return result
-    CPosLandmark* lm = NULL;
-    if ( result )
-        {
-        lm = matches[selected];
-        matches.Remove( selected );
-        }
-    else
-        {
-        User::Leave( KErrCancel ); 
-        // user cancelled geocoding selection dialog
-        // it automatically cancels geocoding request
-        }
-
-    CleanupStack::PopAndDestroy(); // matches
-    return lm;
-    }
-
-// ---------------------------------------------------------------------------
-// From class CMnGeocodingServiceBase
-// ---------------------------------------------------------------------------
-//
-void CMnrpGeocodingService::HandleFindAddressByCoordinateL(
-    const CPosLandmark& aLandmark)
-    {
-    LeaveIfBusyL();
-
-    delete iLandmark;
-    iLandmark = NULL;
-    iLandmark = CPosLandmark::NewL(aLandmark);
-    
-    iCurrentService = ECoordToAddr;
-    iDialogAllowed = !( Options() & CMnGeocoder::EOptionDialogDisabled );
-    StartProcessingL();
-    }
-        
-// ---------------------------------------------------------------------------
-// From class CMnGeocodingServiceBase
-// ---------------------------------------------------------------------------
-//
-void CMnrpGeocodingService::HandleFindCoordinateByAddressL(
-    const CPosLandmark& aLandmark)
-    {
-    LeaveIfBusyL();
-
-    delete iLandmark;
-    iLandmark = NULL;
-    iLandmark = CPosLandmark::NewL( aLandmark );
-    
-    iCurrentService = EAddrToCoord;
-    iDialogAllowed = !( Options() & CMnGeocoder::EOptionDialogDisabled );
-    StartProcessingL();
-    }
-
-// ---------------------------------------------------------------------------
-// From class CMnGeocodingServiceBase
-// ---------------------------------------------------------------------------
-//
-void CMnrpGeocodingService::HandleFindCoordinateByAddressL(
-    const TDesC& aAddress)
-    {
-    LeaveIfBusyL();
-
-    delete iPlainAddress;
-    iPlainAddress = NULL;
-    iPlainAddress = aAddress.AllocL();
-    
-    delete iLandmark;
-    iLandmark = NULL;
-    iLandmark = CPosLandmark::NewL();
-    
-    iCurrentService = EPlainToCoord;
-    iDialogAllowed = !( Options() & CMnGeocoder::EOptionDialogDisabled );
-    StartProcessingL();
-    }
-
-// ---------------------------------------------------------------------------
-// From class CMnServiceBase
-// ---------------------------------------------------------------------------
-//
-void CMnrpGeocodingService::DoCancel()
-    {
-    iProcessor->Cancel();
-    iCurrentService = ENone;
-    }
--- a/locsrv_plat/map_and_navigation_api/tsrc/mapnavproviderrefapp/src/mnrpmapcontrol.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,644 +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:  CMnrpMapControl class implementation
-*
-*/
-
-
-#include <coemain.h>
-#include <aknlists.h>
-#include <barsread.h>
-#include <aknnotewrappers.h>
-
-#include <bitstd.h>
-#include <bitdev.h>
-
-#include <lbsposition.h>
-
-#include "debug.h"
-
-#include "mnrputils.h"
-#include "mnrpmapview.h"
-#include "mnrpmapcontrol.h"
-
-const TInt KCodeKeyLeft = 0x34;
-const TInt KCodeKeyRight = 0x36;
-const TInt KCodeKeyUp = 0x32;
-const TInt KCodeKeyDown = 0x38;
-const TInt KCodeKeyCenter = 0x35;
-
-const TInt KCodeKeySelect = EKeyDevice3;
-const TInt KCodeKeySelect2 = 0x13;
-
-const TInt KCodeKeyZoomIn = 42;
-const TInt KCodeKeyZoomOut = 35;
-const TInt KCodeKeyZoomIn2 = 0x33;
-const TInt KCodeKeyZoomOut2 = 0x39;
-
-const TRgb KCursorColor( 255, 255, 255 );
-const TRgb KGridTextColor( 0, 0, 0 );
-const TRgb KOriginMarkColor( 0, 0, 255 );
-
-const TInt KTextFontHeightInTwips = 100;
-const TInt KItemFontHeightInTwips = 120;
-const TReal KBorderSizeFactor = 2;
-
-const TInt KCursorMarginSize = 20; // pixels
-const TInt KCursorArrowSize = 4; // pixels
-const TInt KCursorCircleRadius = 4; // pixels
-
-const TInt KCursorMove = 10; // pixels
-const TInt KWindowMove = 20; // pixels
-const TReal KJumpFactor = 5;
-const TReal KCrawlFactor = 2.0 / KCursorMove;
-
-const TReal KZoomOutRate = 1.5;
-const TReal KZoomInRate =  1 / KZoomOutRate;
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CMnrpMapControl::CMnrpMapControl( CMnrpMapView& aView )
- :  iView( aView )
-    {
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CMnrpMapControl::~CMnrpMapControl()
-    {
-    delete iModel;
-    delete iOffScreenBitmap;
-    DestroyFonts();
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CMnrpMapControl* CMnrpMapControl::NewL( 
-    CMnrpMapView& aView,
-    const TRect& aRect,
-    CMnrpEngine& aEngine )
-    {
-    CMnrpMapControl* self = new ( ELeave ) CMnrpMapControl( aView );
-    CleanupStack::PushL( self );
-    self->ConstructL( aRect, aEngine );
-    CleanupStack::Pop( self );
-    return self;
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpMapControl::UpdateModelL( CMnrpMapViewService& aService )
-    {
-    iModel->UpdateModelL( aService );
-    }
-    
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpMapControl::SetSelectionModeL( TBool aSelectionMode ) 
-    {
-    iSelectionMode = aSelectionMode;
-    iAbsoluteCursor = iModel->Center();
-    iCursor = iModel->AbsoluteToScreen( iAbsoluteCursor );
-    DrawDeferred();
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-TCoordinate CMnrpMapControl::CurrentLocation()
-    {
-    return iAbsoluteCursor;
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpMapControl::ConstructL( 
-    const TRect& aRect,
-    CMnrpEngine& aEngine )
-    {
-    // Create a window for this application view
-    CreateWindowL();
-
-    iModel = CMnrpMapModel::NewL( *this, aEngine );
-
-    // Set the windows size
-    SetRect( aRect );
-    
-    iAbsoluteCursor = TCoordinate( 0, 0 );
-    iCursor = iModel->AbsoluteToScreen( iAbsoluteCursor );
-    
-    CreateFonts();
-    CreateScreenBufferL( aRect.Size() );
-
-    // Activate the window, which makes it ready to be drawn
-    ActivateL();
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-TKeyResponse CMnrpMapControl::OfferKeyEventL(
-    const TKeyEvent& aKeyEvent, 
-    TEventCode /*aType*/ )
-    {
-    TKeyResponse response = EKeyWasConsumed;
-    
-    TInt step = iSelectionMode ? KCursorMove : KWindowMove;
-    TBool isShift = aKeyEvent.iModifiers & EModifierShift;
-    TReal crawlFactor = isShift ? KCrawlFactor : 1;
-
-    TInt xmove = 0;
-    TInt ymove = 0;
-    
-    TBool redraw = ETrue;
-
-    switch ( aKeyEvent.iCode )
-        {
-        case EKeyLeftArrow:
-            xmove = -step * crawlFactor;
-            break;
-
-        case KCodeKeyLeft:
-            xmove = -step * KJumpFactor;
-            break;
-
-        case EKeyRightArrow:
-            xmove = step * crawlFactor;
-            break;
-
-        case KCodeKeyRight:
-            xmove = step * KJumpFactor;
-            break;
-
-        case EKeyUpArrow:
-            ymove = -step * crawlFactor;
-            break;
-
-        case KCodeKeyUp:
-        case EKeyPageUp:
-            ymove = -step * KJumpFactor;
-            break;
-
-        case EKeyDownArrow:
-            ymove = step * crawlFactor;
-            break;
-            
-        case KCodeKeyDown:
-        case EKeyPageDown:
-            ymove = step * KJumpFactor;
-            break;
-
-        case KCodeKeyZoomIn:
-        case KCodeKeyZoomIn2:
-            Zoom( KZoomInRate );
-            break;
-
-        case KCodeKeyZoomOut:
-        case KCodeKeyZoomOut2:
-            Zoom( KZoomOutRate );
-            break;
-
-        case KCodeKeyCenter:
-            iModel->GoCenter();
-            iCursor = iModel->AbsoluteToScreen( TCoordinate( 0, 0 ) );
-            break;
-
-        case KCodeKeySelect:
-        case KCodeKeySelect2:
-            if ( iSelectionMode )
-                {
-                iView.HandleUserSelectionL( KErrNone );
-                redraw = EFalse;
-                }
-            break;
-
-        default:
-            response = EKeyWasNotConsumed;
-            redraw = EFalse;
-            break;
-        }
-
-    if ( xmove || ymove )
-        {
-        if ( iSelectionMode )
-            {
-            MoveCursor( xmove, ymove );
-            }
-        else
-            {
-            TCoordinate center = iModel->Center();
-            TCoordinate moveTo( 
-                center.Latitude() - iModel->ScreenToAbsolute( ymove ),
-                center.Longitude() + iModel->ScreenToAbsolute( xmove ) );
-            iModel->MoveTo( moveTo );
-            }
-        }
-
-    if ( redraw )
-        {
-        RenderL();
-        DrawDeferred();
-        }
-
-    return response;
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpMapControl::HandleModelUpdateL()
-    {
-    RenderL();
-    DrawDeferred();
-    
-    TInt ignored = iModel->NumIgnoredLandmarks();
-    if ( ignored )
-    	{
-        CAknInformationNote* note = new (ELeave) CAknInformationNote( ETrue );
-        _LIT( KMessageIgnoredLm, "One landmark\nhas no coordinates\nand can't be shown." );
-        _LIT( KMessageIgnoredLms, "%d landmarks\nhave no coordinates\nand can't be shown." );
-        if ( ignored == 1 )
-        	{
-        	note->ExecuteLD( KMessageIgnoredLm() );
-        	}
-        else
-        	{
-            TBuf<64> message;
-        	message.Format( KMessageIgnoredLms, ignored );
-        	note->ExecuteLD( message );
-        	}
-    	}
-    }
-    
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpMapControl::CreateScreenBufferL( const TSize& aSize )
-	{
-	CGraphicsDevice* screenDevice = iEikonEnv->ScreenDevice();
-
-	// create a bitmap to be used off-screen
-	CFbsBitmap* offScreenBitmap = new (ELeave) CFbsBitmap();
-	User::LeaveIfError( offScreenBitmap->Create( aSize, screenDevice->DisplayMode() ) );
-	CleanupStack::PushL( offScreenBitmap );
-
-	if ( iOffScreenBitmap )
-		{
-		delete iOffScreenBitmap;
-		}
-	iOffScreenBitmap = offScreenBitmap;
-
-	CleanupStack::Pop( offScreenBitmap );
-	}
-
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpMapControl::CreateFonts()
-	{
-    CGraphicsDevice* screenDevice = iEikonEnv->ScreenDevice();
-
-    const CFont* denseFont = iEikonEnv->DenseFont();
-    TFontSpec fs = denseFont->FontSpecInTwips();
-
-    fs.iHeight = KTextFontHeightInTwips;
-    screenDevice->GetNearestFontInTwips( iTextFont, fs );
-    
-    fs.iHeight = KItemFontHeightInTwips;
-    screenDevice->GetNearestFontInTwips( iItemFont, fs );
-	}
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpMapControl::DestroyFonts()
-	{
-	CGraphicsDevice* screenDevice = iEikonEnv->ScreenDevice();
-	
-    screenDevice->ReleaseFont( iItemFont );
-    iItemFont = NULL;
-    screenDevice->ReleaseFont( iTextFont );
-    iTextFont = NULL;
-	}
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpMapControl::Draw( const TRect& /*aRect*/ ) const
-    {
-    // Get the standard graphics context
-    CWindowGc& gc = SystemGc();
-
-    TRect rect = Rect();
-    TRect border( rect );
-    border.Shrink( BorderSize() );
-	
-    gc.Clear( TRect( rect.iTl.iX, rect.iTl.iY, rect.iBr.iX, border.iBr.iY ) );
-    gc.Clear( TRect( rect.iTl.iX, border.iBr.iY, rect.iBr.iX, rect.iBr.iY ) );
-    gc.Clear( TRect( rect.iTl.iX, border.iTl.iY, border.iTl.iX, border.iBr.iY ) );
-    gc.Clear( TRect( border.iBr.iX, border.iTl.iY, rect.iBr.iX, border.iBr.iY ) );
-
-    CMnrpMapModel::TGrid grid;
-    iModel->GetGrid( grid );
-    DrawGridText( gc, border, rect, iTextFont, grid );
-
-	if ( iOffScreenBitmap )
-		{
-		gc.BitBlt( border.iTl, iOffScreenBitmap );
-		}
-	else
-		{
-		gc.Clear();	
-		}
-			
-    if ( iSelectionMode )
-        {
-        gc.SetOrigin( border.iTl );
-        DrawCursor( gc );
-        }
-
-    // draw border
-    gc.SetPenColor( KRgbGray );
-    gc.SetPenSize( TSize( 1, 1 ) );
-    gc.SetOrigin( rect.iTl );
-    gc.DrawRect( border );
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpMapControl::DrawGridText( 
-    CWindowGc& aGc, 
-    const TRect& aInnerBox,
-    const TRect& aOuterBox,
-    const CFont* aFont,
-    CMnrpMapModel::TGrid& aGrid ) const
-    {
-    aGc.UseFont( aFont );
-    
-    TBuf<KMaxCoordStrSize> latTopStr, latBottomStr, lonLeftStr, lonRightStr;
-    TBuf<KMaxCoordStrSize> gridMajorStr, latStr, lonStr;
-    
-    MnrpUtils::CoordinateToString( iModel->Left(), lonLeftStr, ETrue );
-    MnrpUtils::CoordinateToString( iModel->Top(), latTopStr, ETrue );
-    MnrpUtils::CoordinateToString( iModel->Right(), lonRightStr, ETrue );
-    MnrpUtils::CoordinateToString( iModel->Bottom(), latBottomStr, ETrue );
-
-    if ( !iSelectionMode )
-        {
-        MnrpUtils::CoordinateToString( ( iModel->Right() + iModel->Left() ) / 2, lonStr, ETrue );
-        MnrpUtils::CoordinateToString( ( iModel->Top() + iModel->Bottom() ) / 2, latStr, ETrue );
-        }
-    else
-        {
-        MnrpUtils::CoordinateToString( iAbsoluteCursor.Longitude(), lonStr, ETrue );
-        MnrpUtils::CoordinateToString( iAbsoluteCursor.Latitude(), latStr, ETrue );
-        }
-
-    MnrpUtils::CoordinateToString( aGrid.iAbsoluteGridStep, gridMajorStr );
-
-    TRect lonBox( aInnerBox.iTl.iX, 0, aInnerBox.iBr.iX, aInnerBox.iBr.iY );
-    TRect latBox( 0, aInnerBox.iTl.iY, aInnerBox.iTl.iX, aInnerBox.iBr.iY );
-    TRect centerBox( aInnerBox.iTl.iX, aInnerBox.iBr.iY, aInnerBox.iBr.iX, aOuterBox.iBr.iY );
-
-    TInt textBaseLine = aFont->AscentInPixels() + KBorderSizeFactor / 2;
-    TInt vertTextBaseLine = aFont->AscentInPixels() + KBorderSizeFactor / 2;
-
-    aGc.SetPenColor( KGridTextColor );
-
-    aGc.DrawText( lonLeftStr, lonBox, textBaseLine, CGraphicsContext::ELeft );
-    aGc.DrawText( lonRightStr, lonBox, textBaseLine, CGraphicsContext::ERight );
-    aGc.DrawTextVertical( latTopStr, latBox, vertTextBaseLine, EFalse, CGraphicsContext::ELeft );
-    aGc.DrawTextVertical( latBottomStr, latBox, vertTextBaseLine, EFalse, CGraphicsContext::ERight );
-
-    aGc.DrawText( gridMajorStr, lonBox, textBaseLine, CGraphicsContext::ECenter );
-
-    aGc.SetPenColor( KOriginMarkColor );
-    aGc.DrawText( latStr, centerBox, textBaseLine, CGraphicsContext::ELeft );
-    aGc.DrawText( lonStr, centerBox, textBaseLine, CGraphicsContext::ERight );
-    
-    aGc.DiscardFont();
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpMapControl::DrawCursor( CWindowGc& aGc ) const
-    {
-    aGc.SetPenColor( KCursorColor );
-    aGc.SetPenSize( TSize( 1, 1 ) );
-    aGc.SetDrawMode( CGraphicsContext::EDrawModeNOTSCREEN );
-    
-    TRect cursorCircleRect( iCursor, TSize( 0, 0 ) );
-    cursorCircleRect.Grow( KCursorCircleRadius, KCursorCircleRadius );
-    aGc.DrawEllipse( cursorCircleRect );
-    
-    // upper vertical line
-    aGc.DrawLine( TPoint( iCursor.iX, cursorCircleRect.iTl.iY ), 
-                  TPoint( iCursor.iX, cursorCircleRect.iTl.iY - KCursorArrowSize ) );
-    // lower vertical line
-    aGc.DrawLine( TPoint( iCursor.iX, cursorCircleRect.iBr.iY ), 
-                  TPoint( iCursor.iX, cursorCircleRect.iBr.iY + KCursorArrowSize ) );
-
-    // left horiz line
-    aGc.DrawLine( TPoint( cursorCircleRect.iTl.iX, iCursor.iY ), 
-                  TPoint( cursorCircleRect.iTl.iX - KCursorArrowSize, iCursor.iY ) );
-    // right horiz line
-    aGc.DrawLine( TPoint( cursorCircleRect.iBr.iX, iCursor.iY ), 
-                  TPoint( cursorCircleRect.iBr.iX + KCursorArrowSize, iCursor.iY ) );
-
-    aGc.SetDrawMode( CGraphicsContext::EDrawModePEN );
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpMapControl::SizeChanged()
-    {
-    TRect rect( Rect() );
-    
-    DestroyFonts();
-    CreateFonts();
-    
-    rect.Shrink( BorderSize() );
-    iViewSize = rect.Size();
-    iModel->SetScreenSize( iViewSize );
-    TRAP_IGNORE( CreateScreenBufferL( rect.Size() ) );
-    TRAP_IGNORE( RenderL() );
-    DrawDeferred();
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpMapControl::HandleResourceChange( TInt aType )
-    {
-    CCoeControl::HandleResourceChange( aType );
-    if ( aType == KEikDynamicLayoutVariantSwitch )
-        {
-        SetFullScreen( iIsFullScreen );
-        }
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpMapControl::ToggleFullScreen()
-    {
-    SetFullScreen( !iIsFullScreen );
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpMapControl::SetFullScreen( TBool aFullScreen )
-    {
-    iIsFullScreen = aFullScreen;
-    if ( iIsFullScreen)
-        {
-        SetExtentToWholeScreen();
-        }
-    else
-        {
-        SetRect( iView.ClientRect() );
-        }
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpMapControl::MoveCursor( TInt aXmove, TInt aYmove )
-    {
-    iCursor += TPoint( aXmove, aYmove );
-
-    iCursor.iX = Max( 0, iCursor.iX );
-    iCursor.iX = Min( iViewSize.iWidth, iCursor.iX );
-
-    iCursor.iY = Max( 0, iCursor.iY );
-    iCursor.iY = Min( iViewSize.iHeight, iCursor.iY );
-
-    // verify cursor margin
-    TRect cursorMargin = CursorMargin();
-    
-    iAbsoluteCursor = iModel->ScreenToAbsolute( iCursor );
-    
-    TReal xcorrection = 0;
-    TReal ycorrection = 0;
-
-    if ( aXmove > 0 ) // moving right
-        {
-        TInt toMargin = iCursor.iX - cursorMargin.iBr.iX;
-        if ( toMargin > 0 ) // cursor went beyond cursor margin, move view
-            {
-            xcorrection = iModel->ScreenToAbsolute( toMargin );
-            }
-        }
-    else if ( aXmove < 0 ) // moving left
-        {
-        TInt toMargin = iCursor.iX - cursorMargin.iTl.iX;
-        if ( toMargin < 0 )
-            {
-            xcorrection = iModel->ScreenToAbsolute( toMargin );
-            }
-        }
-
-    if ( aYmove > 0 ) // moving down
-        {
-        TInt toMargin = iCursor.iY - cursorMargin.iBr.iY;
-        if ( toMargin > 0 )
-            {
-            ycorrection = -iModel->ScreenToAbsolute( toMargin );
-            }
-        }
-    else if ( aYmove < 0 ) // moving up
-        {
-        TInt toMargin = iCursor.iY - cursorMargin.iTl.iY;
-        if ( toMargin < 0 )
-            {
-            ycorrection = -iModel->ScreenToAbsolute( toMargin );
-            }
-        }
-    
-    TCoordinate center = iModel->Center();
-    TCoordinate moveTo( 
-        center.Latitude() + ycorrection,
-        center.Longitude() + xcorrection );
-    iModel->MoveTo( moveTo );
-
-    iCursor = iModel->AbsoluteToScreen( iAbsoluteCursor );
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-TRect CMnrpMapControl::CursorMargin()
-    {
-    TRect rect( iViewSize );
-    rect.Shrink( KCursorMarginSize, KCursorMarginSize );
-    return rect;
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpMapControl::Zoom( TReal aRate )
-    {
-    if ( iSelectionMode )
-        {
-        iModel->MoveTo( iAbsoluteCursor );
-        iModel->Zoom( aRate );
-        iCursor = iModel->AbsoluteToScreen( iAbsoluteCursor );
-        }
-    else
-        {
-        iModel->Zoom( aRate );
-        }
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-TSize CMnrpMapControl::BorderSize() const 
-    {
-	TSize size( 0, 0 );
-	if ( iTextFont )
-		{
-	    TInt fontHeight = iTextFont->HeightInPixels();
-	    
-	    size.iWidth = size.iHeight = TInt( fontHeight + KBorderSizeFactor );
-		}
-    return size;
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpMapControl::RenderL()
-    {
-    TRect rect = Rect();
-    TRect border( rect );
-    border.Shrink( BorderSize() );
-
-    if ( iOffScreenBitmap && iTextFont && iItemFont )
-        {
-        iModel->RenderL( *iOffScreenBitmap, TRect( border.Size() ), iTextFont, iItemFont );
-        }
-    }
--- a/locsrv_plat/map_and_navigation_api/tsrc/mapnavproviderrefapp/src/mnrpmapimageservice.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,243 +0,0 @@
-/*
-* Copyright (c) 2006-2007 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:  ÑMnrpMapImageService class implementation
-*
-*/
-
-
-#include <e32base.h>
-#include <e32math.h>
-#include <e32property.h>
-#include <eikenv.h>
-#include <gdi.h>
-
-#include <lbsposition.h>
-
-#include <epos_cposlandmark.h>
-#include <epos_poslandmarkserialization.h>
-
-#include <mnmapimage.h>
-#include <mnmapimageparams.h>
-#include <mnmapimageservicebase.h>
-
-#include "debug.h"
-#include "mnrpengine.h"
-#include "mnrpappuiback.h"
-#include "mnrpappserverback.h"
-#include "mnrpmapmodel.h"
-#include "mnrpmapimageservice.h"
-
-const TInt KTextFontHeightInTwips = 100;
-const TInt KItemFontHeightInTwips = 120;
-
-const TTimeIntervalMicroSeconds32 KProcessingDelay = 200 * 1000;
-
-// ======== LOCAL FUNCTIONS ========
-
-extern void CoordinateToString( TReal aCoord, TDes& aStr );
-
-// ======== MEMBER FUNCTIONS ========
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-CMnrpMapImageService* CMnrpMapImageService::NewL( CMnrpEngine& aEngine )
-    {
-    CMnrpMapImageService* self = new (ELeave) CMnrpMapImageService( aEngine );
-    CleanupStack::PushL( self );
-    self->ConstructL();
-    CleanupStack::Pop( self );
-    return self;
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-CMnrpMapImageService::CMnrpMapImageService( CMnrpEngine& aEngine )
-  : iEngine( aEngine )
-    {
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-CMnrpMapImageService::~CMnrpMapImageService()
-    {
-	if ( iProcessor )
-		{
-	    iProcessor->Cancel();
-	    delete iProcessor;
-		}
-    delete iModel;
-    DestroyFonts();
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-void CMnrpMapImageService::ConstructL()
-    {
-    BaseConstructL();
-
-    iEikon = CEikonEnv::Static();
-    CreateFonts();
-
-    iModel = CMnrpMapModel::NewL( iEngine );
-    iProcessor = CPeriodic::NewL( CActive::EPriorityIdle );
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-void CMnrpMapImageService::LeaveIfBusyL()
-    {
-    if ( iProcessor->IsActive() )
-        {
-        LOG("CMnRefProviderMapViewService::LeaveIfBusyL BUSY");
-        User::Leave( KErrInUse );
-        }
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-void CMnrpMapImageService::StartProcessingL()
-    {
-    iProcessor->Start( KProcessingDelay, KProcessingDelay,
-        TCallBack( CMnrpMapImageService::MapImageProcessingCallBack, this ) );
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-TInt CMnrpMapImageService::MapImageProcessingCallBack( TAny* aPtr )
-    {
-    CMnrpMapImageService* self =
-        static_cast<CMnrpMapImageService*> ( aPtr );
-
-    TRAP_IGNORE( self->HandleMapImageCompletedL() );
-    return EFalse;
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-void CMnrpMapImageService::HandleMapImageCompletedL()
-    {
-    iProcessor->Cancel();
-    TInt err = KErrNone;
-    TRAP( err, FinishProcessingL() );
-    if ( err )
-        {
-        CompleteRequest( err );
-        }
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-void CMnrpMapImageService::RenderL()
-    {
-    TMnMapImageParams& params = MapImageParams();
-
-    if ( params.Direction() != 0 ||
-         params.ImageType() != TMnMapImageParams::ETypeVectorMap )
-        {
-        User::Leave( KErrNotSupported );
-        }
-
-    CFbsBitmap& bitmap = TargetBitmap();
-
-    iModel->SetScreenSize( params.Size() );
-    iModel->UpdateModelL( *this );
-    iModel->RenderL( bitmap, TRect( params.Size() ), iTextFont, iItemFont );
-
-    // complete request
-    params.SetProjectionId(0);
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpMapImageService::CreateFonts()
-	{
-    CGraphicsDevice* screenDevice = iEikon->ScreenDevice();
-
-    const CFont* denseFont = iEikon->DenseFont();
-    TFontSpec fs = denseFont->FontSpecInTwips();
-
-    fs.iHeight = KTextFontHeightInTwips;
-    screenDevice->GetNearestFontInTwips( iTextFont, fs );
-
-    fs.iHeight = KItemFontHeightInTwips;
-    screenDevice->GetNearestFontInTwips( iItemFont, fs );
-	}
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpMapImageService::DestroyFonts()
-	{
-	CGraphicsDevice* screenDevice = iEikon->ScreenDevice();
-
-    screenDevice->ReleaseFont( iItemFont );
-    screenDevice->ReleaseFont( iTextFont );
-	}
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-void CMnrpMapImageService::FinishProcessingL()
-    {
-    LOG1("FinishProcessingL in, cursvc %d", iCurrentService);
-    TCoordinate coord;
-    switch ( iCurrentService )
-        {
-        case ERender:
-            {
-            RenderL();
-            }
-            break;
-
-        default:
-            User::Leave( KErrGeneral );
-        }
-
-    iCurrentService = ENone;
-    CompleteRendering();
-    LOG("FinishProcessingL out");
-    }
-
-// ---------------------------------------------------------------------------
-// From class CMnMapImageServiceBase
-// ---------------------------------------------------------------------------
-//
-void CMnrpMapImageService::HandleRenderingL()
-    {
-    LeaveIfBusyL();
-
-    iCurrentService = ERender;
-    StartProcessingL();
-    }
-
-// ---------------------------------------------------------------------------
-// From class CMnServiceBase
-// ---------------------------------------------------------------------------
-//
-void CMnrpMapImageService::DoCancel()
-    {
-    iProcessor->Cancel();
-    iCurrentService = ENone;
-    }
-
--- a/locsrv_plat/map_and_navigation_api/tsrc/mapnavproviderrefapp/src/mnrpmapmodel.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1251 +0,0 @@
-/*
-* Copyright (c) 2006-2007 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:  CMnrpMapModel class implementation
-*
-*/
-
-
-
-#include <coemain.h>
-#include <barsread.h>
-#include <bautils.h>
-
-#include <aknlists.h>
-#include <akniconutils.h>
-#include <aknwaitdialog.h>
-
-#include <fbs.h>
-#include <imageconversion.h>
-#include <icl/imagedata.h>
-
-#include <lbs.h>
-#include <lbsposition.h>
-#include <lbspositioninfo.h>
-
-#include <epos_cposlandmark.h>
-#include <epos_cposlandmarkdatabase.h>
-#include <epos_cposlandmarkcategory.h>
-#include <epos_cposlmcategorymanager.h>
-
-#include "debug.h"
-#include "mnrpengine.h"
-#include "mnrputils.h"
-#include "mnrpappserver.h"
-
-#include "mnrpmapviewservice.h"
-#ifdef RD_MAPNAV_BITMAP_ACCESS
-#include "mnrpmapimageservice.h"
-#endif
-#include "mnrpmapmodel.h"
-
-const TInt KUpdateInterval = 1 * 1000 * 1000; // 1 sec
-const TInt KUpdateTimeout = 10 * 1000 * 1000; // 10 sec
-
-const TInt KMaxX = 180;
-const TInt KMinX = -180;
-const TInt KMapWidth = KMaxX - KMinX;
-
-const TInt KMaxY = 90;
-const TInt KMinY = -90;
-const TInt KMapHeight = KMaxY - KMinY;
-
-const TReal KDegree = 1.0;
-const TReal KMinute = KDegree / 60.0;
-const TReal KSecond = KMinute / 60.0;
-const TReal KMilliSecond = KSecond / 1000.0;
-
-const TReal KMaxCell = 60 * KDegree;
-const TReal KMinScale = 10 * KMilliSecond; // 0.01 second / 1 px
-
-const TInt KBigCellsInView = 2;
-
-const TInt KCellDividers[] = { 6, 2, 5 };
-const TInt KNumCellDividers = 3;
-
-const TReal KDefaultRadius = 1; // 1 degree
-const TReal KRadiusBorderFactor = 1.1; // 110%
-
-const TReal KEarthEquator = 40075000;
-//const TReal KEarthRadius = 6371010;
-
-const TInt KLmTextOffset = 3;
-const TInt KLmTextShadowOffset = 1;
-
-const TInt KGridPenSize( 1 );
-
-// ============================ LOCAL FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-TPoint AbsoluteToImage( TRealPoint aAbsolute, TReal aImageToAbsoluteScale )
-    {
-    TInt s = ( KMapWidth / 2 + aAbsolute.iX ) / aImageToAbsoluteScale;
-    TInt t = ( KMapHeight / 2 - aAbsolute.iY ) / aImageToAbsoluteScale;
-
-    return TPoint( s , t );
-    }
-
-// ============================ MEMBER CLASSES' FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-//  TRealPoint implementation
-// -----------------------------------------------------------------------------
-//
-
-TRealPoint::TRealPoint()
-    {
-    TRealX nan;
-    nan.SetNaN();
-
-    iX = nan;
-    iY = nan;
-    }
-
-TRealPoint::TRealPoint( TReal aX, TReal aY )
-    : iX( aX ), iY( aY )
-    {
-    }
-
-TRealPoint::TRealPoint( TCoordinate aCoordinate )
-    : iX( aCoordinate.Longitude() ), iY( aCoordinate.Latitude() )
-    {
-    }
-
-TCoordinate TRealPoint::Coordinate()
-    {
-    return TCoordinate( iY, iX );
-    }
-
-TRealPoint TRealPoint::operator+(
-    const TRealPoint& aRight )
-    {
-    return TRealPoint( this->iX + aRight.iX, this->iY + aRight.iY );
-    }
-
-TRealPoint TRealPoint::operator-(
-    const TRealPoint& aRight )
-    {
-    return TRealPoint( this->iX - aRight.iX, this->iY - aRight.iY );
-    }
-
-TRealPoint TRealPoint::operator*( const TReal& aRight )
-    {
-    return TRealPoint( this->iX * aRight, this->iY * aRight );
-    }
-
-TRealPoint TRealPoint::operator/( const TReal& aRight )
-    {
-    return TRealPoint( this->iX / aRight, this->iY / aRight );
-    }
-
-void TRealPoint::Set( TReal aX, TReal aY )
-    {
-    iX = aX;
-    iY = aY;
-    }
-
-TBool TRealPoint::IsValid()
-    {
-    return ( !Math::IsNaN( iX ) && !Math::IsNaN( iY ) );
-    }
-
-// -----------------------------------------------------------------------------
-//  CDrawItem implementation
-// -----------------------------------------------------------------------------
-//
-CMnrpMapModel::CDrawItem* CMnrpMapModel::CDrawItem::NewLC(
-    const CPosLandmark& aLm )
-    {
-    CDrawItem* self = new (ELeave) CDrawItem;
-    CleanupStack::PushL( self );
-
-    TPtrC name;
-    aLm.GetLandmarkName( name );
-    self->iText = MnrpUtils::PrintableStringLC( name );
-    CleanupStack::Pop( self->iText );
-
-    TLocality loc;
-    if ( KErrNone == aLm.GetPosition( loc ) )
-        {
-        self->SetAbsolutePosition( loc );
-        }
-
-    TPtrC iconFile;
-    TInt iconIndex, maskIndex;
-    if ( KErrNone == aLm.GetIcon( iconFile, iconIndex, maskIndex ) )
-        {
-        AknIconUtils::CreateIconL( self->iBitmap, self->iMask, iconFile, iconIndex, maskIndex );
-        AknIconUtils::PreserveIconData( self->iBitmap );
-        }
-
-    return self;
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CMnrpMapModel::CDrawItem* CMnrpMapModel::CDrawItem::NewLC(
-    const CPosLandmark& aLm,
-    CPosLmCategoryManager& aCatman )
-    {
-    CDrawItem* self = NewLC( aLm );
-
-    if ( !self->iBitmap )
-        {
-        // try icon from category
-        RArray<TPosLmItemId> cats;
-        CleanupClosePushL( cats );
-        aLm.GetCategoriesL( cats );
-
-        if ( cats.Count() == 1 )
-            {
-            CPosLandmarkCategory* cat = aCatman.ReadCategoryLC( cats[0] );
-
-            TPtrC iconFile;
-            TInt iconIndex, maskIndex;
-            if ( KErrNone == cat->GetIcon( iconFile, iconIndex, maskIndex ) )
-                {
-                AknIconUtils::CreateIconL( self->iBitmap, self->iMask, iconFile, iconIndex, maskIndex );
-                AknIconUtils::PreserveIconData( self->iBitmap );
-                }
-
-            CleanupStack::PopAndDestroy( cat );
-            }
-        CleanupStack::PopAndDestroy( &cats );
-        }
-
-    return self;
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpMapModel::CDrawItem::SetAbsolutePosition( const TLocality& aLocality )
-    {
-    iAbsolutePosition = TRealPoint( aLocality.Longitude(), aLocality.Latitude() );
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CMnrpMapModel::CDrawItem::~CDrawItem()
-    {
-    if ( iBitmap )
-        {
-        AknIconUtils::DestroyIconData( iBitmap );
-        }
-    delete iBitmap;
-    delete iMask;
-    delete iText;
-    }
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CMnrpMapModel::CMnrpMapModel(
-    MMapModelObserver& aObserver,
-    CMnrpEngine& aEngine )
-    :
-    iObserver( &aObserver ), iEngine( aEngine )
-    {
-    iScale = 1;
-    iViewOrigin.Set( 0, 0 );
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CMnrpMapModel::CMnrpMapModel( CMnrpEngine& aEngine )
-    : iEngine( aEngine )
-    {
-    iScale = 1;
-    iViewOrigin.Set( 0, 0 );
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CMnrpMapModel::~CMnrpMapModel()
-    {
-    delete iPositionRequest;
-    iDrawItems.ResetAndDestroy();
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-EXPORT_C CMnrpMapModel* CMnrpMapModel::NewL(
-    MMapModelObserver& aObserver,
-    CMnrpEngine& aEngine )
-    {
-    CMnrpMapModel* self = new (ELeave) CMnrpMapModel( aObserver, aEngine );
-    CleanupStack::PushL( self );
-    self->ConstructL();
-    CleanupStack::Pop( self );
-    return self;
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-EXPORT_C CMnrpMapModel* CMnrpMapModel::NewL( CMnrpEngine& aEngine )
-    {
-    CMnrpMapModel* self = new (ELeave) CMnrpMapModel( aEngine );
-    CleanupStack::PushL( self );
-    self->ConstructL();
-    CleanupStack::Pop( self );
-    return self;
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpMapModel::ConstructL()
-    {
-    _LIT( KRequestorName, "MnRefProvider" );
-    iPositionRequest = CMnrpPositionRequest::NewL( KRequestorName, *this );
-
-    TPositionUpdateOptions options;
-    options.SetUpdateInterval( TTimeIntervalMicroSeconds( KUpdateInterval ) );
-    options.SetUpdateTimeOut( TTimeIntervalMicroSeconds( KUpdateTimeout ) );
-    iPositionRequest->SetOptionsL( options );
-
-    AddCitiesL();
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-TBool CMnrpMapModel::CheckDrawItemHasPositionL( CDrawItem& aItem, const CPosLandmark& aLandmark )
-	{
-    if ( !aItem.AbsolutePosition().IsValid() )
-        {
-        // try to find coordinate by address
-        CPosLandmark* poi = iEngine.AddressToCoordL( aLandmark );
-        if ( poi )
-        	{
-            TLocality pos;
-            poi->GetPosition( pos );
-            aItem.SetAbsolutePosition( pos );
-        	}
-    	delete poi;
-        }
-    
-    return aItem.AbsolutePosition().IsValid();
-	}
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-EXPORT_C void CMnrpMapModel::UpdateModelL( CMnrpMapViewService& aService )
-    {
-    ASSERT( iObserver );
-
-    iDrawItems.ResetAndDestroy();
-
-    iShowCurrentLocation =
-        aService.CurrentLocationOption() != CMnMapView::ECurrentLocationDisabled;
-
-    if ( iShowCurrentLocation )
-        {
-        iPositionRequest->FetchNewPosition();
-        }
-
-    // Add client-defined marks
-    
-    iNumIgnoredLandmarks = 0;
-    TRealPoint min, max;
-
-    // add non-linked landmarks
-    for ( TInt i = 0; i < aService.LandmarksToShow().Count(); i++)
-        {
-        const CPosLandmark* lm = aService.LandmarksToShow()[i];
-        
-        CDrawItem* item = CDrawItem::NewLC( *lm );
-        if ( CheckDrawItemHasPositionL( *item, *lm ) )
-        	{
-        	iDrawItems.AppendL( item );
-            CleanupStack::Pop( item );
-            AdjustBoundingBox( *item, min, max );
-        	}
-        else
-        	{
-            CleanupStack::PopAndDestroy( item );
-            iNumIgnoredLandmarks++;
-        	}
-        }
-
-    // add linked landmarks
-    for ( TInt db = 0; db < aService.LandmarksToShowDatabases().Count(); db++ )
-        {
-        const HBufC* uri = aService.LandmarksToShowDatabases()[db];
-
-        LOG1("MnRefProvider::LinkedLandmarks: database (%S)", uri );
-
-        CPosLandmarkDatabase* lmdb = CPosLandmarkDatabase::OpenL( *uri );
-        CleanupStack::PushL( lmdb );
-
-        if ( lmdb->IsInitializingNeeded() )
-            {
-            ExecuteAndDeleteLD( lmdb->InitializeL() );
-            }
-
-        CPosLmCategoryManager* catman = CPosLmCategoryManager::NewL( *lmdb );
-        CleanupStack::PushL( catman );
-
-        for ( TInt i = 0; i < aService.LinkedLandmarksToShow(db).Count(); i++)
-            {
-            TPosLmItemId id = aService.LinkedLandmarksToShow(db)[i];
-            LOG1("MnRefProvider::LinkedLandmarks: id (%d)", id );
-
-            CPosLandmark* lm = lmdb->ReadLandmarkLC( id );
-
-            CDrawItem* item = CDrawItem::NewLC( *lm, *catman );
-            if ( CheckDrawItemHasPositionL( *item, *lm ) )
-            	{
-            	iDrawItems.AppendL( item );
-                CleanupStack::Pop( item );
-                AdjustBoundingBox( *item, min, max );
-            	}
-            else
-            	{
-                CleanupStack::PopAndDestroy( item );
-                iNumIgnoredLandmarks++;
-            	}
-
-            CleanupStack::PopAndDestroy( lm );
-            }
-
-        CleanupStack::PopAndDestroy( catman );
-        CleanupStack::PopAndDestroy( lmdb );
-        }
-
-    // Add predefined places
-    AddCitiesL();
-
-    LOG4("MnRefProvider::BoundingBox: %f, %f, %f, %f", min.iX, min.iY, max.iX, max.iY );
-
-    // set origin
-    iUseCurrentLocationAsOrigin = EFalse;
-    if ( aService.IsAreaCentralPointSet() )
-        {
-        TCoordinate center;
-        aService.GetAreaCentralPoint( center );
-        iViewOrigin.Set( center.Longitude(), center.Latitude() );
-        }
-    else if ( !Math::IsNaN( max.iX ) ) // others are also valid then
-        {
-        iViewOrigin.Set( ( max.iX + min.iX ) / 2, ( max.iY + min.iY ) / 2 );
-        }
-    else if ( iShowCurrentLocation )
-        {
-        // get current location and use it as center point
-        // this implementation defers location acquiring
-        iUseCurrentLocationAsOrigin = ETrue;
-        // FetchCurrentLocation();
-        iViewOrigin.Set( 0, 0 );
-        }
-    else
-        {
-        iViewOrigin.Set( 0, 0 );
-        }
-
-    LOG2("MnRefProvider: viewOrigin (%f, %f)", iViewOrigin.iX, iViewOrigin.iY);
-
-    // set scale
-    TReal desiredScale = 0;
-    TReal radius = 0;
-
-    if ( !Math::IsNaN( aService.AreaRadius() ) )
-        {
-         // Radius setting is easy in this implementation
-         // because map is rectangular just convert meters to degrees
-        radius = Abs( aService.AreaRadius() ) / KEarthEquator * 360;
-        LOG1("MnRefProvider: user radius (%f)", radius );
-        }
-    else if ( !Math::IsNaN( max.iX ) ) // others are also valid then
-        {
-        // get radius from bounding box
-        radius = Max( Abs( max.iX - min.iX ), Abs( max.iY - min.iY ) );
-        LOG2("MnRefProvider: bounding radius (%f), with border (%f)", radius, radius * KRadiusBorderFactor );
-        radius *= KRadiusBorderFactor;
-        }
-    else
-        {
-        // default radius
-        }
-
-    if ( radius <= 0 )
-        {
-        radius = KDefaultRadius;
-        LOG1("MnRefProvider: default radius (%f)", radius );
-        }
-
-    desiredScale = radius / TReal( Max( iScreenSize.iWidth, iScreenSize.iHeight ) );
-
-    LOG3("MnRefProvider: desired scale (%f), min (%f), max(%f)",
-        desiredScale, KMinScale, MaxScale() );
-
-    iScale = Max( Min( desiredScale, MaxScale() ), KMinScale );
-    CheckBorders();
-
-    LOG1("MnRefProvider: scale (%f)", iScale );
-
-    iObserver->HandleModelUpdateL();
-    }
-
-
-#ifdef RD_MAPNAV_BITMAP_ACCESS
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-EXPORT_C void CMnrpMapModel::UpdateModelL( const CMnrpMapImageService& aService )
-    {
-    iDrawItems.ResetAndDestroy();
-
-    iShowCurrentLocation =
-        aService.ShowOptions() & CMnMapImage::EShowOptionCurrentLocation;
-
-    if ( iShowCurrentLocation )
-        {
-        iPositionRequest->FetchNewPosition();
-        }
-
-    if ( aService.ShowOptions() & CMnMapImage::EShowOptionLandmarks)
-        {
-
-        // Add user-defined marks
-        TRealPoint min, max;
-
-        // add default landmarks
-        CPosLandmarkDatabase* lmdb = CPosLandmarkDatabase::OpenL();
-        CleanupStack::PushL( lmdb );
-
-        if ( lmdb->IsInitializingNeeded() )
-            {
-            ExecuteAndDeleteLD( lmdb->InitializeL() );
-            }
-
-        CPosLmCategoryManager* catman = CPosLmCategoryManager::NewL( *lmdb );
-        CleanupStack::PushL( catman );
-
-        CPosLmItemIterator* iter = lmdb->LandmarkIteratorL();
-        CleanupStack::PushL( iter );
-
-        TInt count = iter->NumOfItemsL();
-        for ( TInt i = 0; i < count; i++)
-            {
-            TPosLmItemId id = iter->NextL();
-
-            CPosLandmark* lm = lmdb->ReadLandmarkLC( id );
-
-            CDrawItem* item = CDrawItem::NewLC( *lm, *catman );
-            if ( CheckDrawItemHasPositionL( *item, *lm ) )
-            	{
-            	iDrawItems.AppendL( item );
-                CleanupStack::Pop( item );
-                AdjustBoundingBox( *item, min, max );
-            	}
-            else
-            	{
-                CleanupStack::PopAndDestroy( item );
-            	}
-
-            CleanupStack::PopAndDestroy( lm );
-            }
-        CleanupStack::PopAndDestroy( iter );
-        CleanupStack::PopAndDestroy( catman );
-        CleanupStack::PopAndDestroy( lmdb );
-
-        LOG4("MnRefProvider::BoundingBox: %f, %f, %f, %f", min.iX, min.iY, max.iX, max.iY );
-        }
-
-    if ( aService.ShowOptions() & CMnMapImage::EShowOptionPois )
-        {
-        // Add predefined places
-        AddCitiesL();
-        }
-
-    TMnMapImageParams params = aService.MapImageParams();
-
-    UpdateModel( params );
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-EXPORT_C void CMnrpMapModel::UpdateModel( const TMnMapImageParams& aParams )
-    {
-    SetScreenSize( aParams.Size() );
-
-    TCoordinate center;
-    aParams.GetCenterPoint( center );
-    iViewOrigin.Set( center.Longitude(), center.Latitude() );
-
-    LOG2("MnRefProvider: viewOrigin (%f, %f)", iViewOrigin.iX, iViewOrigin.iY);
-
-    // set scale
-    TReal desiredScale = 0;
-    TReal32 width, height;
-    aParams.GetVisibleArea( width, height );
-    TReal radius = Max( width, height );
-
-    if ( radius <= 0 )
-        {
-        radius = KDefaultRadius;
-        LOG1("MnRefProvider: default radius (%f)", radius );
-        }
-
-    desiredScale = radius / TReal( Max( iScreenSize.iWidth, iScreenSize.iHeight ) );
-
-    LOG3("MnRefProvider: desired scale (%f), min (%f), max(%f)",
-        desiredScale, KMinScale, MaxScale() );
-
-    iScale = Max( Min( desiredScale, MaxScale() ), KMinScale );
-    CheckBorders();
-
-    LOG1("MnRefProvider: scale (%f)", iScale );
-    }
-#endif
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpMapModel::AddCitiesL()
-    {
-    TArray<CPosLandmark*> places = iEngine.KnownPlacesL();
-    for ( TInt i = 0; i < places.Count(); i++)
-        {
-        CPosLandmark* lm = places[i];
-        CDrawItem* item = CDrawItem::NewLC( *lm );
-        item->iOwnPoi = ETrue;
-        iDrawItems.AppendL( item );
-        CleanupStack::Pop( item );
-        }
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-EXPORT_C void CMnrpMapModel::GetGrid( CMnrpMapModel::TGrid& aGrid ) const
-    {
-    TReal angle = Min( Width(), Height() );
-
-    TReal minAngle = Min( iScreenSize.iWidth, iScreenSize.iHeight ) * KMinScale;
-
-    if ( angle > minAngle )
-        {
-        // 1. Find nice grid scale
-
-        TInt dividerIndex = 0;
-        TReal cellSize = KMaxCell;
-
-        while ( cellSize * KBigCellsInView > angle )
-            {
-            cellSize /= KCellDividers[dividerIndex];
-
-            if ( ++dividerIndex == KNumCellDividers )
-                {
-                dividerIndex = 0;
-                }
-            }
-
-        aGrid.iAbsoluteGridStep = cellSize;
-
-        // 2. Find closest grid point
-
-        TReal x = TInt( iViewOrigin.iX / cellSize ) * cellSize;
-        TReal y = TInt( iViewOrigin.iY / cellSize ) * cellSize;
-
-        aGrid.iAbsoluteReference = TRealPoint( x, y ).Coordinate();
-        }
-    else
-        {
-        aGrid.iAbsoluteReference = TCoordinate( 0, 0 );
-        aGrid.iAbsoluteGridStep = minAngle / KBigCellsInView;
-        }
-
-    // convert to screen coordinates
-    aGrid.iReference = AbsoluteToScreen( aGrid.iAbsoluteReference );
-    aGrid.iGridStep = AbsoluteToScreen( aGrid.iAbsoluteGridStep );
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-EXPORT_C void CMnrpMapModel::Zoom( TReal aZoomRate )
-    {
-    iScale *= aZoomRate;
-    CheckBorders();
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-EXPORT_C void CMnrpMapModel::GoCenter()
-    {
-    iViewOrigin.Set( 0, 0 );
-    CheckBorders();
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-EXPORT_C void CMnrpMapModel::MoveTo( TCoordinate aTarget )
-    {
-    iViewOrigin = aTarget;
-    CheckBorders();
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpMapModel::CheckBorders()
-    {
-    if ( Height() > KMapHeight || Width() > KMapWidth )
-        {
-        iScale = MaxScale();
-        }
-    if ( iScale < KMinScale )
-        {
-        iScale = KMinScale;
-        }
-    if ( Left() < KMinX )
-        {
-        iViewOrigin.iX = KMinX + Width() / 2;
-        }
-    if ( Right() > KMaxX )
-        {
-        iViewOrigin.iX = KMaxX - Width() / 2;
-        }
-    if ( Top() > KMaxY )
-        {
-        iViewOrigin.iY = KMaxY - Height() / 2;
-        }
-    if ( Bottom() < KMinY )
-        {
-        iViewOrigin.iY = KMinY + Height() / 2;
-        }
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-EXPORT_C TReal CMnrpMapModel::Left() const
-    {
-    return iViewOrigin.iX - Width() / 2;
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-EXPORT_C TReal CMnrpMapModel::Right() const
-    {
-    return iViewOrigin.iX + Width() / 2;
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-EXPORT_C TReal CMnrpMapModel::Top() const
-    {
-    return iViewOrigin.iY + Height() / 2;
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-EXPORT_C TReal CMnrpMapModel::Bottom() const
-    {
-    return iViewOrigin.iY - Height() / 2;
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-EXPORT_C TReal CMnrpMapModel::Width() const
-    {
-    return TReal( iScreenSize.iWidth ) * iScale;
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-EXPORT_C TReal CMnrpMapModel::Height() const
-    {
-    return TReal( iScreenSize.iHeight ) * iScale;
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-EXPORT_C TCoordinate CMnrpMapModel::Center() const
-    {
-    return TCoordinate( iViewOrigin.iY, iViewOrigin.iX );
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-TArray<CMnrpMapModel::CDrawItem*> CMnrpMapModel::Items() const
-    {
-    // adjust all items to screen coordinates
-    for ( TInt i = 0; i < iDrawItems.Count(); i++ )
-        {
-        iDrawItems[i]->iScreenPosition = AbsoluteToScreen( iDrawItems[i]->iAbsolutePosition );
-        }
-    return iDrawItems.Array();
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CMnrpMapModel::TCurrentLocation CMnrpMapModel::CurrentLocation() const
-    {
-    TCurrentLocation current;
-
-    TPosition pos;
-    iPosInfo.GetPosition( pos );
-
-    current.iAbsoluteLocation = pos;
-
-    if ( !Math::IsNaN( pos.Latitude() ) && !Math::IsNaN( pos.Longitude() ) )
-        {
-        current.iLocation = AbsoluteToScreen( current.iAbsoluteLocation );
-
-        // calculate error radius in degrees and pixels
-        if ( !Math::IsNaN( pos.HorizontalAccuracy() ) )
-            {
-            current.iAbsoluteErrorDegrees = ( pos.HorizontalAccuracy() / KEarthEquator ) * 360;
-            current.iErrorRadius = current.iAbsoluteErrorDegrees / iScale;
-            }
-        else
-            {
-            current.iErrorRadius = 0;
-            current.iAbsoluteErrorDegrees = 0;
-            }
-
-        current.iIsValid = ETrue;
-        }
-    else
-        {
-        current.iIsValid = EFalse;
-        }
-
-    return current;
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-EXPORT_C void CMnrpMapModel::SetScreenSize( TSize aScreenSize )
-    {
-    __ASSERT_DEBUG( aScreenSize.iWidth >= 1 && aScreenSize.iHeight >= 1,
-                    Panic( KErrGeneral ) );
-    iScreenSize = aScreenSize;
-    CheckBorders();
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-TReal CMnrpMapModel::MaxScale() const
-    {
-    TReal scaleByWidth = KMapWidth / TReal( iScreenSize.iWidth );
-    TReal scaleByHeight = KMapHeight / TReal( iScreenSize.iHeight );
-    return Min( scaleByWidth, scaleByHeight );
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-TPoint CMnrpMapModel::AbsoluteToScreen( TRealPoint aAbsolutePoint ) const
-    {
-    TRealPoint realScreen = ( aAbsolutePoint - TRealPoint( Left(), Bottom() ) ) / iScale;
-    return TPoint( realScreen.iX, iScreenSize.iHeight - realScreen.iY );
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-EXPORT_C TPoint CMnrpMapModel::AbsoluteToScreen( TCoordinate aAbsolutePoint ) const
-    {
-    TRealPoint real( aAbsolutePoint.Longitude(), aAbsolutePoint.Latitude() );
-    return AbsoluteToScreen( real );
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-TInt CMnrpMapModel::AbsoluteToScreen( TReal aDistance ) const
-    {
-    return aDistance / iScale;
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-EXPORT_C TCoordinate CMnrpMapModel::ScreenToAbsolute( TPoint aScreenPoint ) const
-    {
-    TReal xdiff = aScreenPoint.iX * iScale;
-    TReal ydiff = aScreenPoint.iY * iScale;
-    return TCoordinate( Top() - ydiff, Left() + xdiff );
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-EXPORT_C TReal CMnrpMapModel::ScreenToAbsolute( TInt aDistance ) const
-    {
-    return aDistance * iScale;
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpMapModel::AdjustBoundingBox(
-    CMnrpMapModel::CDrawItem& aItem,
-    TRealPoint& aMin,
-    TRealPoint& aMax )
-    {
-    // X
-    if ( !Math::IsNaN( aItem.iAbsolutePosition.iX ) )
-        {
-        if ( Math::IsNaN( aMin.iX ) || aItem.iAbsolutePosition.iX < aMin.iX )
-            {
-            aMin.iX = aItem.iAbsolutePosition.iX;
-            }
-        if ( Math::IsNaN( aMax.iX ) || aItem.iAbsolutePosition.iX > aMax.iX )
-            {
-            aMax.iX = aItem.iAbsolutePosition.iX;
-            }
-        }
-
-    // Y
-    if ( !Math::IsNaN( aItem.iAbsolutePosition.iY ) )
-        {
-        if ( Math::IsNaN( aMin.iY ) || aItem.iAbsolutePosition.iY < aMin.iY )
-            {
-            aMin.iY = aItem.iAbsolutePosition.iY;
-            }
-        if ( Math::IsNaN( aMax.iY ) || aItem.iAbsolutePosition.iY > aMax.iY )
-            {
-            aMax.iY = aItem.iAbsolutePosition.iY;
-            }
-        }
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpMapModel::HandlePositionRequestCompletedL( TInt aError )
-    {
-    if ( !aError )
-        {
-        iPositionRequest->GetPosition( iPosInfo );
-        if ( iObserver )
-            {
-            iObserver->HandleModelUpdateL();
-            }
-        }
-    if ( iShowCurrentLocation )
-        {
-        iPositionRequest->FetchNewPosition();
-        }
-    }
-
-// =====================================================
-// DRAWING METHODS
-// =====================================================
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-EXPORT_C void CMnrpMapModel::RenderL(
-    CFbsBitmap& aBitmap,
-    TRect aTargetRect,
-    CFont* aTextFont,
-    CFont* aItemFont ) const
-	{
-	// create an off-screen device and context
-	CFbsBitmapDevice* bitmapDevice = CFbsBitmapDevice::NewL( &aBitmap );
-	CleanupStack::PushL( bitmapDevice );
-
-	CFbsBitGc* gc = NULL;
-	User::LeaveIfError( bitmapDevice->CreateContext( gc ) );
-	CleanupStack::PushL( gc );
-
-    gc->UseFont( aTextFont );
-
-    // get data
-    TGrid grid;
-    GetGrid( grid );
-
-    TBool isBackground = EFalse;
-    // background
-    if ( !isBackground )
-        {
-        // no map background, clear map area
-        gc->Clear( aTargetRect );
-        }
-
-    gc->SetClippingRect( aTargetRect );
-    gc->SetOrigin( aTargetRect.iTl );
-
-    DrawGrid( *gc, aTargetRect.Size(), grid );
-
-    gc->DiscardFont(); // text font
-    gc->UseFont( aItemFont );
-
-    // draw items
-    DrawLandmarks( *gc, *aItemFont, aTargetRect.Size(), isBackground ); // invert shadow and text color
-    DrawCurrentLocation( *gc, aTargetRect.Size() );
-
-    // cleanup
-
-    gc->DiscardFont(); // item font
-
-	CleanupStack::PopAndDestroy( gc );
-	CleanupStack::PopAndDestroy( bitmapDevice );
-	}
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-EXPORT_C TInt CMnrpMapModel::NumIgnoredLandmarks()
-	{
-	return iNumIgnoredLandmarks;
-	}
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpMapModel::DrawGrid(
-    CFbsBitGc& aGc,
-    const TSize& aBoxSize,
-    CMnrpMapModel::TGrid& aGrid ) const
-    {
-    const TRgb KGridLineColor( 128, 128, 128 );
-
-    aGc.SetPenSize( TSize( KGridPenSize, KGridPenSize ) );
-    aGc.SetPenColor( KGridLineColor );
-
-    if ( aGrid.iGridStep > 0 )
-        {
-        // 1. Vertical lines
-        TInt x = aGrid.iReference.iX;
-        // find leftmost vertical line
-        while ( x > 0 )
-        	{
-        	x -= aGrid.iGridStep;
-        	}
-        x += aGrid.iGridStep;
-        // draw lines selecting different line colors for major and minor lines
-        while ( x < aBoxSize.iWidth )
-            {
-            DrawVerticalLine( aGc, x, aBoxSize );
-            x += aGrid.iGridStep;
-            }
-
-        // 2. Horizontal lines
-        TInt y = aGrid.iReference.iY;
-        // find topmost vertical line
-        while ( y > 0 )
-        	{
-        	y -= aGrid.iGridStep;
-        	}
-        y += aGrid.iGridStep;
-        // draw lines selecting different line colors for major and minor lines
-        while ( y < aBoxSize.iHeight )
-            {
-            DrawHorizontalLine( aGc, y, aBoxSize );
-            y += aGrid.iGridStep;
-            }
-        }
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpMapModel::DrawVerticalLine( CFbsBitGc& aGc, TInt aX, TSize aBoxSize ) const
-    {
-    aGc.DrawLine( TPoint( aX, 0 ), TPoint( aX, aBoxSize.iHeight ) );
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpMapModel::DrawHorizontalLine( CFbsBitGc& aGc, TInt aY, TSize aBoxSize ) const
-    {
-    aGc.DrawLine( TPoint( 0, aY ), TPoint( aBoxSize.iWidth, aY ) );
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpMapModel::DrawLandmarks(
-    CFbsBitGc& aGc,
-    CFont& aFont,
-    const TSize& aBoxSize,
-    TBool aSwitchColorAndShadow ) const
-    {
-    const TSize KItemMarkSize( 3, 3 ); // pixels
-    const TSize KItemIconSize( 20, 20 ); // pixels
-
-    const TRgb KPoiColor( 0, 0, 192 );
-    const TRgb KPoiTextColor( 0, 0, 0 );
-    const TRgb KPoiTextShadowColor( 224, 224, 224 );
-    const TRgb KLmColor( 255, 0, 0 );
-    const TRgb KLmTextColor( 255, 0, 0 );
-    const TRgb KLmTextShadowColor( 224, 224, 224 );
-
-    TArray<CMnrpMapModel::CDrawItem*> items = Items();
-
-    RArray<TRect> textBoxes;
-
-    for ( TInt i = 0; i < items.Count(); i++ )
-        {
-        const TPoint& pos = items[i]->Position();
-        if ( pos.iX >= 0 && pos.iX < aBoxSize.iWidth &&
-             pos.iY >= 0 && pos.iY < aBoxSize.iHeight )
-            {
-            CFbsBitmap* icon = items[i]->Bitmap();
-            CFbsBitmap* mask = items[i]->Mask();
-
-            if ( icon && mask )
-                {
-                AknIconUtils::SetSize( icon, KItemIconSize );
-
-                TRect iconBox( pos, KItemIconSize );
-                iconBox.Move( -iconBox.Width() / 2, -iconBox.Height() / 2 );
-
-                aGc.DrawBitmapMasked(
-                    iconBox,
-                    icon,
-                    KItemIconSize,
-                    mask,
-                    EFalse );
-                }
-            else
-                {
-                if ( items[i]->IsPoi() )
-                    {
-                    aGc.SetPenColor( KPoiColor );
-                    }
-                else
-                    {
-                    aGc.SetPenColor( KLmColor );
-                    }
-
-                TRect markBox( pos, KItemMarkSize );
-                markBox.Move( -markBox.Width() / 2, -markBox.Height() / 2 );
-                aGc.SetPenSize( KItemMarkSize );
-                aGc.Plot( pos );
-                }
-
-            if ( items[i]->Text().Length() )
-                {
-                TPoint textPos( pos );
-                textPos.iX += KLmTextOffset;
-
-                TSize textSize( aFont.TextWidthInPixels( items[i]->Text() ), aFont.HeightInPixels() );
-                TRect textBox( textPos, textSize );
-
-                // verify this textbox does not intersect any previous ones
-                TBool overlaps = EFalse;
-                for ( TInt b = 0; b < textBoxes.Count(); b++ )
-                    {
-                    if ( textBox.Intersects( textBoxes[b] ) )
-                        {
-                        overlaps = ETrue;
-                        break;
-                        }
-                    }
-
-                if ( !overlaps )
-                    {
-                    textBoxes.Append( textBox );
-
-                    aGc.SetPenSize( TSize( 1, 1 ) );
-
-                    TRgb textColor, textShadowColor;
-
-	                if ( items[i]->IsPoi() )
-	                    {
-	                    textColor = KPoiTextColor;
-						textShadowColor = KPoiTextShadowColor;
-	                    }
-	                else
-	                    {
-	                    textColor = KLmTextColor;
-						textShadowColor = KLmTextShadowColor;
-	                    }
-
-                    // text shadow
-                    TPoint shadowPos( textPos + TPoint( KLmTextShadowOffset, KLmTextShadowOffset ) );
-                    aGc.SetPenColor( aSwitchColorAndShadow ? textColor : textShadowColor );
-                    aGc.DrawText( items[i]->Text(), shadowPos );
-
-                    // text itself
-                    aGc.SetPenColor( aSwitchColorAndShadow ? textShadowColor : textColor );
-                    aGc.DrawText( items[i]->Text(), textPos );
-                    }
-                }
-            }
-        }
-    textBoxes.Close();
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpMapModel::DrawCurrentLocation(
-    CFbsBitGc& aGc,
-    const TSize& aBoxSize ) const
-    {
-    const TSize KPositionPenSize( 20, 20 );
-    const TSize KPositionErrorPenSize( 1, 1 );
-    const TRgb KPositionColor( 255, 255, 0 );
-
-    // draw current location
-    CMnrpMapModel::TCurrentLocation location = CurrentLocation();
-
-    if ( location.iIsValid )
-        {
-        TPoint& pos = location.iLocation;
-
-        if ( pos.iX >= 0 && pos.iX < aBoxSize.iWidth &&
-             pos.iY >= 0 && pos.iY < aBoxSize.iHeight )
-            {
-            if ( location.iErrorRadius )
-                {
-                TRect circleBox( pos.iX, pos.iY, pos.iX, pos.iY );
-                circleBox.Grow( location.iErrorRadius, location.iErrorRadius );
-
-                aGc.SetPenSize( KPositionErrorPenSize );
-                aGc.SetBrushStyle( CGraphicsContext::EVerticalHatchBrush );
-                aGc.SetBrushColor( KPositionColor );
-                aGc.DrawEllipse( circleBox );
-                }
-
-            aGc.SetPenColor( KPositionColor );
-            aGc.SetPenSize( KPositionPenSize );
-            aGc.Plot( pos );
-            }
-        }
-    }
-
--- a/locsrv_plat/map_and_navigation_api/tsrc/mapnavproviderrefapp/src/mnrpmapview.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,249 +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:  CMnrpMapView class implementation
-*
-*/
-
-
-#include <e32base.h>
-#include <lbsposition.h>
-
-#include <eikmenup.h>
-#include <eikbtgpc.h>
-#include <avkon.rsg>
-
-#include <mnrefprovider.rsg>
-#include "mnrp.hrh"
-
-#include "debug.h"
-
-#include "mnrputils.h"
-#include "mnrpengine.h"
-
-#include "mnrpappui.h"
-#include "mnrpmapview.h"
-#include "mnrpmapcontrol.h"
-#include "mnrpmapviewservice.h"
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CMnrpMapView::CMnrpMapView( CMnrpEngine& aEngine ) 
-: iEngine( aEngine )
-    {
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CMnrpMapView::~CMnrpMapView()
-    {
-    TRAP_IGNORE( HandleUserSelectionL( KErrCancel ) );
-    delete iControl;
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CMnrpMapView* CMnrpMapView::NewL( TBool aChained, CMnrpEngine& aEngine )
-    {
-    CMnrpMapView* self = new (ELeave) CMnrpMapView( aEngine );
-    CleanupStack::PushL( self );
-    self->ConstructL( aChained );
-    CleanupStack::Pop( self );
-    return self;
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpMapView::ConstructL( TBool aChained )
-    {
-    iChained = aChained;
-    if ( aChained )
-        {
-        BaseConstructL( R_MNREFPROVIDER_MAP_VIEW_CHAINED );
-        }
-    else
-        {
-        BaseConstructL( R_MNREFPROVIDER_MAP_VIEW );
-        }
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpMapView::SetMapModeL( CMnrpMapViewService& aService )
-    {
-    iSelectionCallback = NULL;
-    iMapViewService = &aService;
-/*
-    if ( iChained )
-        {
-        Cba()->SetCommandSetL( R_AVKON_SOFTKEYS_OPTIONS_BACK );
-        }
-    else
-        {
-        Cba()->SetCommandSetL( R_AVKON_SOFTKEYS_OPTIONS_EXIT );
-        }
-*/        
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpMapView::SetSelectionModeL( 
-    CMnrpMapViewService& aService,  
-    MMapSelectionCallback& aCallback )
-    {
-    iMapViewService = &aService;
-    iSelectionCallback = &aCallback;
-    Cba()->SetCommandSetL( R_AVKON_SOFTKEYS_OPTIONS_CANCEL );
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpMapView::StopSelection()
-    {
-    iSelectionCallback = NULL;
-    iMapViewService = NULL;
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpMapView::HandleUserSelectionL( TInt aError )
-    {
-    if ( iSelectionCallback && iControl )
-        {
-        if ( !aError )
-            {
-            iSelectionCallback->HandleSelectionL( iControl->CurrentLocation() );
-            }
-        else
-            {
-            iSelectionCallback->HandleSelectionErrorL( aError );
-            }
-        iSelectionCallback = NULL;            
-        }
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-TUid CMnrpMapView::Id() const
-    {
-    return TUid::Uid( EMnrpMapViewId );
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpMapView::HandleCommandL( TInt aCommand )
-    {
-    switch ( aCommand )
-        {
-        case EMnrpCommandFullScreen:
-            if ( iControl ) 
-                {
-                iControl->ToggleFullScreen();
-                }
-            break;
-
-        case EMnrpCommandSelect:
-            HandleUserSelectionL( KErrNone );
-            break;
-
-        case EEikCmdExit:
-        case EAknSoftkeyBack:
-        case EAknSoftkeyExit:
-            HandleUserSelectionL( KErrCancel );
-            AppUi()->HandleCommandL( aCommand );
-            break;
-
-        default:
-            AppUi()->HandleCommandL( aCommand );
-            break;
-        }
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpMapView::DynInitMenuPaneL( TInt aResourceId, CEikMenuPane *aMenuPane )
-    {
-    if ( aResourceId == R_MNREFPROVIDER_MAP_VIEW_MENU )
-        {
-        TBool isSelectionMode = iSelectionCallback != NULL;
-        aMenuPane->SetItemDimmed( EMnrpCommandSelect, !isSelectionMode );
-        }
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpMapView::DoActivateL(
-    const TVwsViewId& /*aPrevViewId*/,
-    TUid /* aCustomMessageId */,
-    const TDesC8& /* aCustomMessage */)
-    {
-    if ( !iControl )
-        {
-        iControl = CMnrpMapControl::NewL( *this, ClientRect(), iEngine );
-        iControl->SetMopParent( this );
-        }
-
-    iControl->SetRect( ClientRect() );
-    if ( iMapViewService )
-        {
-        iControl->UpdateModelL( *iMapViewService );
-        }
-    iControl->SetSelectionModeL( ( iSelectionCallback == NULL ) ? EFalse : ETrue );
-
-    // Enable receiving of keyboard events.
-    CMnrpAppUi* ui = ( CMnrpAppUi* ) AppUi();
-    ui->AddToStackL( *this, iControl );
-
-    if ( iSelectionCallback )
-        {
-        ui->SetNaviPaneTitleL( iMapViewService->SelectionRequestText() );
-        }
-    else
-        {
-        _LIT( KMapView, "MapView" );
-	    ui->SetNaviPaneTitleL( KMapView );
-        }
-
-    // Make view visible.
-    iControl->MakeVisible( ETrue );
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpMapView::DoDeactivate()
-    {
-    if ( iControl )
-        {
-        // Hide view.
-        iControl->MakeVisible( EFalse );
-
-        // Disable receiving keyboard events.
-        AppUi()->RemoveFromStack( iControl );
-        }
-    }
-
--- a/locsrv_plat/map_and_navigation_api/tsrc/mapnavproviderrefapp/src/mnrpmapviewservice.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,245 +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:  CMnrpMapViewService class implementation
-*
-*/
-
-
-#include <e32base.h>
-#include <eikenv.h>
-
-#include <lbsposition.h>
-
-#include <epos_cposlandmark.h>
-#include <epos_cposlandmarkdatabase.h>
-
-#include "debug.h"
-#include <mnmapviewservicebase.h>
-
-#include "mnrpappui.h"
-#include "mnrpmapview.h"
-#include "mnrpengine.h"
-#include "mnrpdocument.h"
-#include "mnrpappserver.h"
-
-#include "mnrpmapviewservice.h"
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-CMnrpMapViewService* CMnrpMapViewService::NewL()
-    {
-    CMnrpMapViewService* self = new (ELeave) CMnrpMapViewService();
-    CleanupStack::PushL( self );
-    self->ConstructL();
-    CleanupStack::Pop( self );
-    return self;
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-CMnrpMapViewService::CMnrpMapViewService()
-    {
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-CMnrpMapViewService::~CMnrpMapViewService()
-    {
-    if ( iSelecting )
-        {
-        DoCancel();
-        CompleteRequest( KErrCancel );
-        }
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-void CMnrpMapViewService::ConstructL()
-    {
-    BaseConstructL();
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-CMnrpAppUi* CMnrpMapViewService::AppUi()
-    {
-    CMnrpAppServer* server = ( CMnrpAppServer* ) Server();
-    if ( server )
-        {
-        return server->AppUi();
-        }
-    return NULL;
-    }
-
-// ---------------------------------------------------------------------------
-// From class CMnMapViewServiceBase
-// ---------------------------------------------------------------------------
-//
-void CMnrpMapViewService::HandleShowMapL()
-    {
-    LOG("MnRefProvider::HandleShowMapL in");
-
-    /** This implementation cannot show map if selection is active */
-    if ( iSelecting )
-        {
-        User::Leave( KErrInUse );
-        }
-
-    if ( AppUi() )
-        {
-        AppUi()->ShowMapL( *this );
-        }
-
-    LOG("MnRefProvider::HandleShowMapL out");
-    }
-
-// ---------------------------------------------------------------------------
-//  From class CMnMapViewServiceBase
-//
-//  This callback differs from HandleShowMapL in a way that central point
-//  setting is ignored and current location is used instead as central point.
-//
-//  The implementation is the example of how to reject unsupported requests 
-// ---------------------------------------------------------------------------
-//
-void CMnrpMapViewService::HandleShowCurrentLocationL()
-    {
-    User::Leave( KErrNotSupported );
-    }
-
-// ---------------------------------------------------------------------------
-//  From class CMnMapViewServiceBase
-// ---------------------------------------------------------------------------
-//
-void CMnrpMapViewService::HandleSelectFromMapL()
-    {
-    LOG("MnRefProvider::HandleSelectFromMapL in");
-
-    /** Only one selection must be active */
-    if ( iSelecting )
-        {
-        User::Leave( KErrInUse );
-        }
-
-    if ( AppUi() )
-        {
-        iSelecting = ETrue;
-        AppUi()->StartSelectionL( *this, *this );
-        }
-
-    LOG("MnRefProvider::HandleSelectFromMapL out");
-    }
-
-// ---------------------------------------------------------------------------
-//  From class CMnServiceBase
-// ---------------------------------------------------------------------------
-//
-void CMnrpMapViewService::DoCancel()
-    {
-    if ( iSelecting )
-        {
-        iSelecting = EFalse;
-        StopSelection();
-        }
-    }
-
-// ---------------------------------------------------------------------------
-//  From class MMapSelectionCallback
-// ---------------------------------------------------------------------------
-//
-void CMnrpMapViewService::HandleSelectionErrorL( TInt aError )
-    {
-    __ASSERT_DEBUG( iSelecting, Panic( KErrGeneral ) );
-
-    iSelecting = EFalse;
-    // selection view dismissed
-    CompleteRequest( aError );
-    }
-
-// ---------------------------------------------------------------------------
-//  From class MMapSelectionCallback
-// ---------------------------------------------------------------------------
-//
-void CMnrpMapViewService::HandleSelectionL( const TCoordinate& aSelection )
-    {
-    __ASSERT_DEBUG( iSelecting, Panic( KErrGeneral ) );
-
-    iSelecting = EFalse;
-    TInt err = KErrNone;
-    TRAP( err, CompleteSelectionL( aSelection ) );
-    if ( err )
-        {
-        CompleteRequest( err );
-        }
-    StopSelection();
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-void CMnrpMapViewService::CompleteSelectionL( const TCoordinate& aSelection )
-    {
-    TLocality loc( aSelection, 0 );
-    CPosLandmark* lm = CPosLandmark::NewLC();
-    lm->SetPositionL( loc );
-
-    // send landmark to client
-    CompleteSelectionRequestL( *lm );
-
-    CleanupStack::PopAndDestroy( lm );
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-void CMnrpMapViewService::StopSelection()
-    {
-    if ( AppUi() )
-        {
-        AppUi()->StopSelection();
-        }
-    }
-    
-// ---------------------------------------------------------------------------
-//  From class MMapSelectionCallback
-// ---------------------------------------------------------------------------
-//
-void CMnrpMapViewService::HandleSelectionL( TInt aLandmarkIndex )
-    {
-    __ASSERT_DEBUG( iSelecting, Panic( KErrGeneral ) );
-
-    iSelecting = EFalse;
-    CompleteSelectionRequest( aLandmarkIndex );
-    StopSelection();
-    }
-    
-// ---------------------------------------------------------------------------
-//  From class MMapSelectionCallback
-// ---------------------------------------------------------------------------
-//
-void CMnrpMapViewService::HandleSelectionL( TPosLmItemId aLandmarkId, TInt aDbIndex )
-    {
-    __ASSERT_DEBUG( iSelecting, Panic( KErrGeneral ) );
-
-    iSelecting = EFalse;
-    CompleteSelectionRequest( aLandmarkId, aDbIndex );
-    StopSelection();
-    }
--- a/locsrv_plat/map_and_navigation_api/tsrc/mapnavproviderrefapp/src/mnrpnavicontrol.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,209 +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:  CMnrpNaviControl class implementation
-*
-*/
-
-
-#include <e32base.h>
-#include <coemain.h>
-#include <aknlists.h>
-#include <barsread.h>
-
-#include <aknlists.h>
-
-#include "mnrpnavimodel.h"
-#include "mnrpnaviview.h"
-#include "mnrpnavicontrol.h"
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CMnrpNaviControl::CMnrpNaviControl( CMnrpNaviView& aView )
- :  iView( aView )
-    { 
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CMnrpNaviControl::~CMnrpNaviControl()
-    {
-    delete iListBox;
-    delete iModel;
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CMnrpNaviControl* CMnrpNaviControl::NewL( 
-    CMnrpNaviView& aView, 
-    const TRect& aRect,
-    CMnrpEngine& aEngine )
-    {
-    CMnrpNaviControl* self = new (ELeave) CMnrpNaviControl( aView );
-    CleanupStack::PushL( self );
-    self->ConstructL( aRect, aEngine );
-    CleanupStack::Pop( self );
-    return self;
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpNaviControl::ConstructL( const TRect& aRect, CMnrpEngine& aEngine )
-    {
-    // Create a window for this application view
-    CreateWindowL();
-    CreateListBoxL();
-    
-    // Set the windows size
-    SetRect( aRect );
-    
-    iModel = CMnrpNaviModel::NewL( *this, aEngine );
-
-    // Activate the window, which makes it ready to be drawn
-    ActivateL();
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpNaviControl::UpdateModelL( CPosLandmark& aDestination )
-    {
-    iModel->SetDestinationL( aDestination );
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpNaviControl::HandleModelUpdateL()
-    {
-    TArray< CMnrpNaviModel::CListItem* > items = iModel->ListItemsL();
-    
-    const TInt KGranularity = 8;
-    CDesCArraySeg* array = new (ELeave) CDesCArraySeg( KGranularity );
-    CleanupStack::PushL( array );
-    
-    _LIT( KItemFormat, "%S\t%S\t\t" );
-    for ( TInt i = 0; i < items.Count(); i++ )
-        {
-        CMnrpNaviModel::CListItem* item = items[i];
-
-        const TInt KNumTabsAndOther = 10;
-        HBufC* text = HBufC::NewLC(
-            item->Header().Length() + item->Value().Length() + KNumTabsAndOther);
-
-        text->Des().Format( KItemFormat, &(item->Header()), &(item->Value()) );
-        
-        array->AppendL( *text );
-        CleanupStack::PopAndDestroy( text );
-        }
-        
-    CleanupStack::Pop( array );
-
-    CTextListBoxModel* model = iListBox->Model();
-    model->SetItemTextArray( array );
-    model->SetOwnershipType( ELbmOwnsItemArray );
-    iListBox->HandleItemAdditionL();
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-TInt CMnrpNaviControl::CountComponentControls() const 
-    { 
-    return 1; 
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CCoeControl* CMnrpNaviControl::ComponentControl(TInt aIndex) const
-    {
-    return (aIndex == 0) ? iListBox : NULL;
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-TKeyResponse CMnrpNaviControl::OfferKeyEventL(
-    const TKeyEvent& aKeyEvent, TEventCode aType)
-    {
-    TKeyResponse response = EKeyWasNotConsumed;
-
-    switch (aKeyEvent.iCode)
-        {
-        case EKeyUpArrow:
-        case EKeyDownArrow:
-            // Scrolling the listbox. Forward to iListBox.
-            response = iListBox->OfferKeyEventL(aKeyEvent, aType);
-            break;
-
-        case EKeyLeftArrow:
-        case EKeyRightArrow:
-            // Eat these to disable switching views
-            response = EKeyWasConsumed;
-            break;
-
-        case EKeyDevice3:
-            response = EKeyWasConsumed;
-            break;
-
-        default:
-            // menu keys should be handled
-            break;
-        }
-
-    return response;
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpNaviControl::CreateListBoxL()
-    {
-    // Create a control to display a list of descriptors
-    iListBox = new (ELeave) CAknSingleHeadingStyleListBox();
-    iListBox->SetContainerWindowL( *this );
-    iListBox->ConstructL(this, CEikListBox::EViewerFlag );
-
-    // Create scrollbars
-    CEikScrollBarFrame* scrollBar = iListBox->CreateScrollBarFrameL();
-    scrollBar->SetScrollBarVisibilityL(
-                CEikScrollBarFrame::EOff, CEikScrollBarFrame::EAuto);
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpNaviControl::SizeChanged()
-    {
-    iListBox->SetRect( Rect() );
-    iListBox->DrawDeferred();
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpNaviControl::HandleResourceChange( TInt aType )
-    {
-    CCoeControl::HandleResourceChange( aType );
-    if ( aType == KEikDynamicLayoutVariantSwitch )
-        {
-        SetRect( iView.ClientRect() );
-        }
-    }
--- a/locsrv_plat/map_and_navigation_api/tsrc/mapnavproviderrefapp/src/mnrpnavigationservice.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,90 +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:  CMnrpNavigationService class implementation
-*
-*/
-
-
-#include <e32base.h>
-#include <eikenv.h>
-
-#include <lbsposition.h>
-
-#include <epos_cposlandmark.h>
-
-#include "debug.h"
-#include <mnnavigationservicebase.h>
-
-#include "mnrpappui.h"
-#include "mnrpnavimodel.h"
-#include "mnrpnaviview.h"
-#include "mnrpappserver.h"
-#include "mnrpnavigationservice.h"
-
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-CMnrpNavigationService* CMnrpNavigationService::NewL()
-    {
-    CMnrpNavigationService* self = new (ELeave) CMnrpNavigationService();
-    CleanupStack::PushL( self );
-    self->ConstructL();
-    CleanupStack::Pop( self );
-    return self;
-    }
-    
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-CMnrpNavigationService::CMnrpNavigationService()
-    {
-    }
-    
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-CMnrpNavigationService::~CMnrpNavigationService()
-    {
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-void CMnrpNavigationService::ConstructL()
-    {
-    BaseConstructL();
-    }
-
-// ---------------------------------------------------------------------------
-// From class CMnNavigationServiceBase
-// ---------------------------------------------------------------------------
-//
-void CMnrpNavigationService::HandleNavigateToL(
-    const CPosLandmark& aLandmark)
-    {
-    CMnrpAppServer* server = ( CMnrpAppServer* ) Server();
-    CMnrpAppUi* ui = server->AppUi();
-    ui->ShowNavigationL( aLandmark );
-    }
-        
-// ---------------------------------------------------------------------------
-// From class CMnServiceBase
-// ---------------------------------------------------------------------------
-//
-void CMnrpNavigationService::DoCancel()
-    {
-    }
--- a/locsrv_plat/map_and_navigation_api/tsrc/mapnavproviderrefapp/src/mnrpnavimodel.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,241 +0,0 @@
-/*
-* Copyright (c) 2006-2007 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:  CMnrpNaviModel class implementation
-*
-*/
-
-
-#include <coemain.h>
-#include <aknlists.h>
-#include <barsread.h>
-
-#include <lbs.h>
-#include <lbsposition.h>
-#include <lbspositioninfo.h>
-
-#include <epos_cposlandmark.h>
-
-#include "mnrputils.h"
-#include "mnrpengine.h"
-#include "mnrpnavimodel.h"
-
-const TInt KUpdateInterval = 1 * 1000 * 1000; // 1 sec
-const TInt KUpdateTimeout = 10 * 1000 * 1000; // 10 sec
-
-_LIT( KNotDefined, "<n/a>" );
-_LIT( KDestination, "destination" );
-_LIT( KPosition, "position" );
-_LIT( KDistance, "distance" );
-_LIT( KBearing, "bearing" );
-_LIT( KDestinationLat, "dest.lat." );
-_LIT( KDestinationLon, "dest.lon." );
-_LIT( KPositionLat, "pos.lat." );
-_LIT( KPositionLon, "pos.lon." );
-_LIT( KSpeed, "speed" );
-_LIT( KHeading, "heading" );
-_LIT( KMagHeading, "m.heading" );
-_LIT( KCourse, "course" );
-_LIT( KMagCourse, "m.course" );
-
-// ========================== MEMBER CLASS' FUNCTIONS ==========================
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CMnrpNaviModel::CListItem* CMnrpNaviModel::CListItem::NewL( 
-    const TDesC& aItemHeader, 
-    const TDesC& aItemValue )
-    {
-    CListItem* self = new (ELeave) CListItem;
-    CleanupStack::PushL( self );
-    self->iHeader = aItemHeader.AllocL();
-    self->iValue = aItemValue.AllocL();
-    CleanupStack::Pop( self );
-    return self;
-    }
-    
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CMnrpNaviModel::CListItem::~CListItem()
-    {
-    delete iHeader;
-    delete iValue;
-    }
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CMnrpNaviModel::CMnrpNaviModel( MNaviModelObserver& aObserver, CMnrpEngine& aEngine )
-    : iEngine( aEngine ), iObserver( aObserver )
-    { 
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CMnrpNaviModel::~CMnrpNaviModel()
-    {
-    delete iPositionRequest;
-    delete iDestination;
-    iListItems.ResetAndDestroy();
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CMnrpNaviModel* CMnrpNaviModel::NewL( MNaviModelObserver& aObserver, CMnrpEngine& aEngine  )
-    {
-    CMnrpNaviModel* self = new (ELeave) CMnrpNaviModel( aObserver, aEngine );
-    CleanupStack::PushL( self );
-    self->ConstructL();
-    CleanupStack::Pop( self );
-    return self;
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpNaviModel::ConstructL()
-    {
-    _LIT( KRequestorName, "MnRefProvider" );
-    iPositionRequest = CMnrpPositionRequest::NewL( KRequestorName, *this );
-    
-    TPositionUpdateOptions options;
-    options.SetUpdateInterval( TTimeIntervalMicroSeconds( KUpdateInterval ) );
-    options.SetUpdateTimeOut( TTimeIntervalMicroSeconds( KUpdateTimeout ) );
-    iPositionRequest->SetOptionsL( options );
-    
-    iPositionRequest->FetchNewPosition();
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpNaviModel::SetDestinationL( const CPosLandmark& aNewDestination )
-    {
-    delete iDestination;
-    iDestination = NULL;
-    iDestination = CPosLandmark::NewL( aNewDestination );
-    
-    iObserver.HandleModelUpdateL();
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-TArray<CMnrpNaviModel::CListItem*> CMnrpNaviModel::ListItemsL()
-    {
-    iListItems.ResetAndDestroy();
-    
-    TBuf<64> buf;
-    TPosition position;
-    TLocality destination;
-
-    iPosInfo.GetPosition( position );
-
-    if ( !iDestination || iDestination->GetPosition( destination ) )
-        {
-        iListItems.AppendL( CListItem::NewL( KDestination, KNotDefined ) );
-        }
-    else
-        {
-        TPtrC name;
-        iDestination->GetLandmarkName( name );
-        HBufC* printableName = MnrpUtils::PrintableStringLC( name );
-        iListItems.AppendL( CListItem::NewL( KDestination, *printableName ) );
-        CleanupStack::PopAndDestroy( printableName );
-
-        TBool validPosition = ( !Math::IsNaN( position.Latitude() ) && 
-                                !Math::IsNaN( position.Longitude() ) );
-
-        if ( validPosition )
-            {
-            TReal32 distance, bearing;
-            if ( position.Distance( destination, distance ) == KErrNone )
-                {
-                MnrpUtils::DistanceToString( distance, buf );
-                iListItems.AppendL( CListItem::NewL( KDistance, buf ) );
-                }
-            else
-                {
-                iListItems.AppendL( CListItem::NewL( KDistance, KNotDefined ) );
-                }
-                
-            if ( position.BearingTo( destination, bearing ) == KErrNone )
-                {
-                MnrpUtils::AngleToString( bearing, buf );
-                iListItems.AppendL( CListItem::NewL( KBearing, buf ) );
-                }
-            else
-                {
-                iListItems.AppendL( CListItem::NewL( KBearing, KNotDefined ) );
-                }
-
-            MnrpUtils::SpeedToString( iPositionRequest->Speed(), buf );
-            iListItems.AppendL( CListItem::NewL( KSpeed, buf ) );
-
-            MnrpUtils::AngleToString( iPositionRequest->Course(), buf );
-            iListItems.AppendL( CListItem::NewL( KCourse, buf ) );
-
-            MnrpUtils::AngleToString( iPositionRequest->Heading(), buf );
-            iListItems.AppendL( CListItem::NewL( KHeading, buf ) );
-
-            MnrpUtils::CoordinateToString( position.Latitude(), buf, ETrue, ETrue );
-            iListItems.AppendL( CListItem::NewL( KPositionLat, buf ) );
-
-            MnrpUtils::CoordinateToString( position.Longitude(), buf, ETrue, ETrue );
-            iListItems.AppendL( CListItem::NewL( KPositionLon, buf ) );
-            }
-        else
-            {
-            iListItems.AppendL( CListItem::NewL( KPosition, KNotDefined ) );
-            }
-
-        MnrpUtils::CoordinateToString( destination.Latitude(), buf, ETrue, ETrue );
-        iListItems.AppendL( CListItem::NewL( KDestinationLat, buf ) );
-
-        MnrpUtils::CoordinateToString( destination.Longitude(), buf, ETrue, ETrue );
-        iListItems.AppendL( CListItem::NewL( KDestinationLon, buf ) );
-
-        if ( validPosition )
-            {
-            MnrpUtils::AngleToString( iPositionRequest->MagneticCourse(), buf );
-            iListItems.AppendL( CListItem::NewL( KMagCourse, buf ) );
-
-            MnrpUtils::AngleToString( iPositionRequest->MagneticHeading(), buf );
-            iListItems.AppendL( CListItem::NewL( KMagHeading, buf ) );
-            }
-        }
-   
-    return iListItems.Array();
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpNaviModel::HandlePositionRequestCompletedL( TInt aError )
-    {
-    if ( !aError )
-        {
-        iPositionRequest->GetPosition( iPosInfo );
-        TPosition position;
-        iPosInfo.GetPosition( position );
-
-        iObserver.HandleModelUpdateL();
-        }
-    iPositionRequest->FetchNewPosition();
-    }
--- a/locsrv_plat/map_and_navigation_api/tsrc/mapnavproviderrefapp/src/mnrpnaviview.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,160 +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:  CMnrpNaviView class implementation
-*
-*/
-
-
-#include <e32base.h>
-#include <lbsposition.h>
-#include <epos_cposlandmark.h>
-
-#include <mnrefprovider.rsg>
-#include "mnrp.hrh"
-
-#include "debug.h"
-#include "mnrputils.h"
-#include "mnrpengine.h"
-
-#include "mnrpappui.h"
-#include "mnrpnavicontrol.h"
-
-#include "mnrpnaviview.h"
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CMnrpNaviView::CMnrpNaviView( CMnrpEngine& aEngine )
- : iEngine( aEngine )
-    {
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CMnrpNaviView::~CMnrpNaviView()
-    {
-    delete iDestination;
-    delete iControl;
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CMnrpNaviView* CMnrpNaviView::NewL( TBool aChained, CMnrpEngine& aEngine )
-    {
-    CMnrpNaviView* self = new (ELeave) CMnrpNaviView( aEngine );
-    CleanupStack::PushL( self );
-    self->ConstructL( aChained );
-    CleanupStack::Pop( self );
-    return self;
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpNaviView::ConstructL( TBool aChained )
-    {
-    if ( aChained )
-        {
-        BaseConstructL( R_MNREFPROVIDER_NAVI_VIEW_CHAINED );
-        }
-    else
-        {
-        BaseConstructL( R_MNREFPROVIDER_NAVI_VIEW );
-        }
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpNaviView::SetDestinationL( const CPosLandmark& aNewDestination )
-    {
-    delete iDestination;
-    iDestination = NULL;
-    iDestination = CPosLandmark::NewL( aNewDestination );
-    if ( iControl )
-        {
-        iControl->UpdateModelL( *iDestination );
-        }
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-TUid CMnrpNaviView::Id() const
-    {
-    return TUid::Uid( EMnrpNavigationViewId );
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpNaviView::HandleCommandL( TInt aCommand )
-    {
-    switch ( aCommand )
-        {
-        default:
-            AppUi()->HandleCommandL( aCommand );
-            break;
-        }
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpNaviView::DoActivateL(
-    const TVwsViewId& /*aPrevViewId*/,
-    TUid /* aCustomMessageId */,
-    const TDesC8& /* aCustomMessage */)
-    {
-    if ( !iControl )
-        {
-        iControl = CMnrpNaviControl::NewL( *this, ClientRect(), iEngine );
-        iControl->SetMopParent( this );
-        }
-
-    if ( iDestination )
-        {
-        iControl->UpdateModelL( *iDestination );
-        }
-
-    // Enable receiving of keyboard events.
-    CMnrpAppUi* ui = ( CMnrpAppUi* ) AppUi();
-    ui->AddToStackL( *this, iControl );
-
-    _LIT( KNavigation, "Navigation" );
-    ui->SetNaviPaneTitleL( KNavigation );
-
-    // Make view visible.
-    iControl->MakeVisible( ETrue );
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpNaviView::DoDeactivate()
-    {
-    if ( iControl )
-        {
-        // Hide view.
-        iControl->MakeVisible( EFalse );
-
-        // Disable receiving keyboard events.
-        AppUi()->RemoveFromStack( iControl );
-        }
-    }
-
--- a/locsrv_plat/map_and_navigation_api/tsrc/mapnavproviderrefapp/src/mnrppositionrequest.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,272 +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:  CMnrpPositionRequest class implementation
-*
-*/
-
-
-#include <aknwaitdialog.h>
-#include <coemain.h>
-#include <aknnotewrappers.h>
-
-#include <lbspositioninfo.h>
-
-#include "mnrppositionrequest.h"
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CMnrpPositionRequest::CMnrpPositionRequest(
-    MMnrpPositionObserver& aObserver )
-    : 
-    CActive( CActive::EPriorityStandard ), 
-    iObserver( aObserver ),
-    iState( EIdle )
-    {
-    TRealX nan;
-    nan.SetNaN();
-    iSpeed = iHeading = iCourse = iMagneticHeading = iMagneticCourse = nan;
-    
-    CActiveScheduler::Add( this );
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpPositionRequest::ConstructL( const TDesC& aRequestorName )
-    {
-    const TInt KBufSize = 8192;
-    iGenericPosition = HPositionGenericInfo::NewL( KBufSize );
-    
-    // Connect to the location server
-    User::LeaveIfError( iLocationServer.Connect() );
-
-    // Open the default positioner
-    User::LeaveIfError( iPositioner.Open( iLocationServer ) );
-
-    // Set this application as location requestor
-    User::LeaveIfError( iPositioner.SetRequestor(
-        CRequestor::ERequestorService,
-        CRequestor::EFormatApplication,
-        aRequestorName ) );
-
-    // Set default options
-    TPositionUpdateOptions updateOptions;
-
-    const TInt K30Seconds = 30000000;
-    TTimeIntervalMicroSeconds timeOut( K30Seconds );
-
-    updateOptions.SetUpdateTimeOut( timeOut );
-    SetOptionsL( updateOptions );
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-EXPORT_C CMnrpPositionRequest* CMnrpPositionRequest::NewL(
-    const TDesC& aAppName, 
-    MMnrpPositionObserver& aObserver )
-    {
-    CMnrpPositionRequest* self =
-        new (ELeave) CMnrpPositionRequest( aObserver );
-    CleanupStack::PushL( self );
-    self->ConstructL( aAppName );
-    CleanupStack::Pop( self );
-    return self;
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-EXPORT_C CMnrpPositionRequest::~CMnrpPositionRequest()
-    {
-    Cancel();
-    iPositioner.Close();
-    iLocationServer.Close();
-    delete iGenericPosition;
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-EXPORT_C void CMnrpPositionRequest::FetchNewPosition( TBool aLastKnownLocationAllowed )
-    {
-    Cancel();
-    // Request location
-    iState = EAcquiringDefaultLocation;
-    iLastKnownLocationAllowed = aLastKnownLocationAllowed;
-    ExecuteNextStep();
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-EXPORT_C void CMnrpPositionRequest::GetPosition( TPositionInfo& aPositionInfo )
-    {
-    aPositionInfo = iPositionInfo;
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-EXPORT_C TReal32 CMnrpPositionRequest::Speed() 
-    { 
-    return iSpeed;
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-EXPORT_C TReal32 CMnrpPositionRequest::Heading() 
-    { 
-    return iHeading; 
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-EXPORT_C TReal32 CMnrpPositionRequest::MagneticHeading() 
-    { 
-    return iMagneticHeading; 
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-EXPORT_C TReal32 CMnrpPositionRequest::Course() 
-    {
-    return iCourse;
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-EXPORT_C TReal32 CMnrpPositionRequest::MagneticCourse()
-    { 
-    return iMagneticCourse;
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpPositionRequest::DoCancel()
-    {
-    // Cancel location request
-    if (iState == EAcquiringDefaultLocation)
-        {
-        iPositioner.CancelRequest( EPositionerNotifyPositionUpdate );
-        }
-    else if (iState == EAcquiringLastKnownLocation)
-        {
-        iPositioner.CancelRequest( EPositionerGetLastKnownPosition );
-        }
-    iState = EIdle;
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpPositionRequest::RunL()
-    {
-    if ( iStatus != KErrNone &&
-         iState == EAcquiringDefaultLocation && 
-         iLastKnownLocationAllowed )
-        {
-        // Fetching current location failed. Try last known location.
-        iState = EAcquiringLastKnownLocation;
-        ExecuteNextStep();
-        }
-    else
-        {
-        // Operation finished, notify observer
-        iState = EIdle;
-        SaveContainer( *iGenericPosition );
-        iObserver.HandlePositionRequestCompletedL( iStatus.Int() );
-        }
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-TInt CMnrpPositionRequest::RunError(TInt /*aError*/)
-    {
-    // Ignore possible errors.
-    return KErrNone;
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpPositionRequest::ExecuteNextStep()
-    {
-    iStatus = KRequestPending;
-
-    switch (iState)
-        {
-        case EAcquiringDefaultLocation:
-            InitContainer( *iGenericPosition );
-            iPositioner.NotifyPositionUpdate( *iGenericPosition, iStatus);
-            break;
-        case EAcquiringLastKnownLocation:
-            iPositioner.GetLastKnownPosition( iPositionInfo, iStatus );
-            break;
-        default:    
-            // this case should never happen, see RunL
-            return;
-        }
-
-    SetActive();
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-EXPORT_C void CMnrpPositionRequest::SetOptionsL( const TPositionUpdateOptionsBase& aOptions )
-    {
-    User::LeaveIfError( iPositioner.SetUpdateOptions( aOptions ) );
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpPositionRequest::InitContainer( HPositionGenericInfo& aGenericInfo )
-    {
-    aGenericInfo.ClearPositionData();
-    
-    aGenericInfo.SetRequestedField( EPositionFieldHorizontalSpeed );
-    aGenericInfo.SetRequestedField( EPositionFieldTrueCourse );
-    aGenericInfo.SetRequestedField( EPositionFieldMagneticCourse );
-    aGenericInfo.SetRequestedField( EPositionFieldHeading );
-    aGenericInfo.SetRequestedField( EPositionFieldMagneticHeading );
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpPositionRequest::SaveContainer( const HPositionGenericInfo& aGenericInfo )
-    {
-    TRealX nan;
-    nan.SetNaN();
-    iSpeed = iHeading = iCourse = iMagneticHeading = iMagneticCourse = nan;
-    
-    aGenericInfo.GetValue( EPositionFieldHorizontalSpeed, iSpeed );
-    aGenericInfo.GetValue( EPositionFieldTrueCourse, iCourse );
-    aGenericInfo.GetValue( EPositionFieldMagneticCourse, iMagneticCourse );
-    aGenericInfo.GetValue( EPositionFieldHeading, iHeading );
-    aGenericInfo.GetValue( EPositionFieldMagneticHeading, iMagneticHeading );
-    
-    iPositionInfo = *iGenericPosition;
-    }
--- a/locsrv_plat/map_and_navigation_api/tsrc/mapnavproviderrefapp/src/mnrputils.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,256 +0,0 @@
-/*
-* Copyright (c) 2006-2007 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:  MnrpUtils class implementation
-*
-*/
-
-
-#include <e32base.h>
-#include <e32math.h>
-#include <lbsposition.h>
-
-#include "mnrputils.h"
-
-_LIT( KNan, "<n/a>" );
-_LIT( KNeg, "<neg>" );
-_LIT( KOutOfBounds, "<inv>" );
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-EXPORT_C void MnrpUtils::CoordinateToString(
-    TReal aCoord,
-    TDes& aStr,
-    TBool aFull,
-    TBool aMillis )
-    {
-    const TChar KDegreeMark = 0xB0;
-    const TChar KMinuteMark = 0x27;
-    const TChar KSecondMark = 0x22;
-    const TChar KMilliSecondMark = 0x2E;
-    const TChar KMinus = '-';
-    const TChar KPlus = '+';
-
-    _LIT( KCoordFormatFull, "%c%d%c%02d%c%02d%c" );
-    _LIT( KCoordFormatPartMseconds, "%c%03d" );
-
-    if ( Math::IsNaN( aCoord ) )
-        {
-        aStr.Copy( KNan );
-        }
-    else if ( Abs( aCoord ) > 360 )
-        {
-        aStr.Copy( KOutOfBounds );
-        }
-    else
-        {
-        TBool negative = aCoord < 0;
-        aCoord = Abs( aCoord );
-
-        TInt degrees = TInt( aCoord );
-        aCoord = ( aCoord - degrees ) * 60;
-        TInt minutes = TInt( aCoord );
-        aCoord = ( aCoord - minutes ) * 60;
-        TInt seconds = TInt( aCoord );
-        aCoord = ( aCoord - seconds ) * 100;
-        TInt mseconds = TInt( aCoord );
-
-        TChar sign = negative ? KMinus : KPlus;
-
-        if ( aFull )
-            {
-            aStr.Format( KCoordFormatFull,
-                            TUint( sign ), degrees, TUint( KDegreeMark ),
-                            minutes, TUint( KMinuteMark ),
-                            seconds, TUint( KSecondMark ) );
-            if ( aMillis )
-                {
-                aStr.AppendFormat( KCoordFormatPartMseconds, TUint( KMilliSecondMark ), mseconds );
-                }
-            }
-        else
-            {
-            aStr.Zero();
-            if ( degrees )
-                {
-                aStr.AppendNum( degrees );
-                aStr.Append( KDegreeMark );
-                }
-            if ( minutes )
-                {
-                aStr.AppendNum( minutes );
-                aStr.Append( KMinuteMark );
-                }
-            if ( seconds )
-                {
-                aStr.AppendNum( seconds );
-                aStr.Append( KSecondMark );
-                }
-            if ( mseconds && aMillis )
-                {
-                if ( !seconds )
-                    {
-                    aStr.AppendNum( 0 );
-                    aStr.Append( KSecondMark );
-                    }
-                aStr.AppendFormat( KCoordFormatPartMseconds, TUint( KMilliSecondMark ), mseconds );
-                }
-
-            if ( !aStr.Length() )
-                {
-                aStr.AppendNum( degrees );
-                aStr.Append( KDegreeMark );
-                }
-            }
-        }
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-EXPORT_C void MnrpUtils::DistanceToString( TReal aDistance, TDes& aStr )
-    {
-    _LIT( KSmall, "< 1 m" );
-    _LIT( KMeters, "%d m" );
-    _LIT( KKiloMeters, "%.1f Km" );
-    _LIT( KThousandsKiloMeters, "%.1f tKm" );
-
-    const TInt KMeter = 1;
-    const TInt KKilometer = KMeter * 1000;
-    const TInt KThousandKilometer = KKilometer * 1000;
-
-    if ( Math::IsNaN( aDistance ) )
-        {
-        aStr.Copy( KNan );
-        }
-    else if ( aDistance < 0 )
-        {
-        aStr.Copy( KNeg );
-        }
-    else if ( aDistance < KMeter )
-        {
-        aStr.Copy( KSmall );
-        }
-    else if ( aDistance < KKilometer )
-        {
-        aStr.Format( KMeters, TInt( aDistance ) );
-        }
-    else if ( aDistance < KThousandKilometer )
-        {
-        aStr.Format( KKiloMeters, aDistance / KKilometer );
-        }
-    else
-        {
-        aStr.Format( KThousandsKiloMeters, aDistance / KThousandKilometer );
-        }
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-EXPORT_C void MnrpUtils::SpeedToString( TReal aSpeed, TDes& aStr )
-    {
-    _LIT( KPerSecond, "/s" );
-
-    if ( Math::IsNaN( aSpeed ) )
-        {
-        aStr.Copy( KNan );
-        }
-    else if ( aSpeed < 0 )
-        {
-        aStr.Copy( KNeg );
-        }
-    else
-        {
-        DistanceToString( aSpeed, aStr );
-        aStr.Append( KPerSecond );
-        }
-    }
-    
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-EXPORT_C void MnrpUtils::AngleToString( TReal aAngle, TDes& aStr )
-    {
-    const TChar KMinus = '-';
-    const TChar KPlus = '+';
-    _LIT( KAngleFormat, "%S%c%.1f\xB0 /  %.1f\xB0" );
-    
-    _LIT( KNorth, "N" );
-    _LIT( KSouth, "S" );
-    _LIT( KWest, "W" );
-    _LIT( KEast, "E" );
-
-    TPtrC side;
-    TReal angle;
-
-    if ( Math::IsNaN( aAngle ) )
-        {
-        aStr.Copy( KNan );
-        }
-    else if ( aAngle > 360 )
-        {
-        aStr.Copy( KOutOfBounds );
-        }
-    else
-        {
-        if ( aAngle > 315 )
-            {
-            side.Set( KNorth );
-            angle = aAngle - 360;
-            }
-        else if ( aAngle > 225 )
-            {
-            side.Set( KWest );
-            angle = aAngle - 270;
-            }
-        else if ( aAngle > 135 )
-            {
-            side.Set( KSouth );
-            angle = aAngle - 180;
-            }
-        else if ( aAngle > 45 )
-            {
-            side.Set( KEast );
-            angle = aAngle - 90;
-            }
-        else // aAngle <= 45
-            {
-            side.Set( KNorth );
-            angle = aAngle;
-            }
-
-        TChar sign = ( angle >= 0 ) ? KPlus : KMinus;
-        aStr.Format( KAngleFormat, &side, TUint( sign ), Abs( angle ), aAngle );
-        }
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-EXPORT_C HBufC* MnrpUtils::PrintableStringLC( const TDesC& aStr )
-    {
-    HBufC* buf = aStr.AllocLC();
-    TPtr string( buf->Des() );
-    for ( TInt i = 0; i < string.Length(); i++ )
-        {
-        if ( !TChar( string[i] ).IsPrint() )
-            {
-            string[i] = ' ';
-            }
-        }
-    return buf;
-    }
--- a/locsrv_plat/map_and_navigation_api/tsrc/src/testcmnmapview.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,734 +0,0 @@
-/*
-* Copyright (c) 2007 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: Provides testing of CMnMapView class methods
-*
-*/
-
-
-
-// INCLUDE FILES
-
-#include <StifParser.h>
-#include <Stiftestinterface.h>
-#include "testcmnmapview.h"
-#include <MnMapView.h>
-#include <MnProviderFinder.h>
-#include <MnProvider.h>
-#include <EPos_CPosLandmark.h>
-#include <EPos_CPosLandmarkDatabase.h>
-#include <EPos_PosLandmarkSerialization.h>
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// CTestMnMapView::CTestMnMapView
-// C++ default constructor can NOT contain any code, that
-// might leave.
-// -----------------------------------------------------------------------------
-//
-CTestMnMapView::CTestMnMapView( CStifLogger* aLog ) :
-				CActive(EPriorityStandard), iLog(aLog)
-	{
-	CActiveScheduler::Add(this);
-	}
-
-// -----------------------------------------------------------------------------
-// CTestMnMapView::NewL
-// 
-// 
-// -----------------------------------------------------------------------------
-//	
-CTestMnMapView* CTestMnMapView::NewL(CStifLogger* aLog)
-	{
-	CTestMnMapView* self = new (ELeave) CTestMnMapView( aLog );
-	CleanupStack::PushL( self );
-    self->ConstructL();
-    CleanupStack::Pop(); 
-    return self; 
-	}
-
-// -----------------------------------------------------------------------------
-// CTestMnMapView::ConstructL
-// 
-// 
-// -----------------------------------------------------------------------------
-//
-void CTestMnMapView::ConstructL()
-	{
-	Cancel();
-	}	
-
-// -----------------------------------------------------------------------------
-// CTestMnMapView::~CTestMnMapView
-// 
-// 
-// -----------------------------------------------------------------------------
-//
-CTestMnMapView::~CTestMnMapView()
-	{
-	
-	}
-	
-// -----------------------------------------------------------------------------
-// CTestMnMapView::CreateMapViewL
-// 
-// 
-// -----------------------------------------------------------------------------
-//
-TInt CTestMnMapView::CreateMapViewL( CStifItemParser& /*aItem*/ )
-	{
-	// Find one provider to be used by mapview
-	RPointerArray<CMnProvider> providerArray;
-	MnProviderFinder::FindProvidersL( providerArray, CMnProvider::EServiceMapView );
-	if( providerArray.Count() < 1 )
-		{
-		// No provider found
-		iLog->Log(_L("Provider not found, CreateNavigatorL fails"));
-		User::Leave( KErrNotFound );
-		}
-	// Use first provider
-	CMnMapView* mapView = CMnMapView::NewL( *providerArray.operator[](0) );
-	delete mapView;
-	providerArray.ResetAndDestroy();
-	return KErrNone;
-	}
-
-// -----------------------------------------------------------------------------
-// CTestMnMapView::CreateChainedMapViewL
-// 
-// 
-// -----------------------------------------------------------------------------
-//
-TInt CTestMnMapView::CreateChainedMapViewL( CStifItemParser& /*aItem*/ )
-	{
-	// Find one provider to be used by mapview
-	RPointerArray<CMnProvider> providerArray;
-	MnProviderFinder::FindProvidersL( providerArray );
-	TUid Uid;
-    Uid.iUid = 0x03132014;
-    TInt i = 0;
-    for( i=0; i<providerArray.Count(); i++ )
-    	{
-    	if((providerArray.operator[](i))->Uid() == Uid)
-    		{
-    		break;
-    		}			
-    	}
-    	
-	if( i >= providerArray.Count() )
-		{
-		// No provider found
-		iLog->Log(_L("Provider not found, CreateNavigatorL fails"));
-		User::Leave( KErrNotFound );
-		}
-	// Use provider
-	CMnMapView* mapView = CMnMapView::NewChainedL( *providerArray.operator[](i) );
-	delete mapView;
-	providerArray.ResetAndDestroy();
-	return KErrNone;
-	}
-	
-// -----------------------------------------------------------------------------
-// CTestMnMapView::AddLinkedLmksToShowL
-// 
-// 
-// -----------------------------------------------------------------------------
-//
-TInt CTestMnMapView::AddLinkedLmksToShowL( CStifItemParser& /*aItem*/ )
-	{
-	// Find one provider to be used by mapview
-	RPointerArray<CMnProvider> providerArray;
-	MnProviderFinder::FindProvidersL( providerArray, CMnProvider::EServiceMapView );
-	if( providerArray.Count() < 1 )
-		{
-		// No provider found
-		iLog->Log(_L("Provider not found, CreateNavigatorL fails"));
-		User::Leave( KErrNotFound );
-		}
-	// Use first provider
-	CMnMapView* mapView = CMnMapView::NewL( *providerArray.operator[](0) );
-	CleanupStack::PushL( mapView );	
-	// Open test database, get landmark ids
-	CPosLandmarkDatabase* lmkDatabase = CPosLandmarkDatabase::OpenL();
-	CleanupStack::PushL( lmkDatabase );	
-	// Get URI
-	HBufC* uri = lmkDatabase->DatabaseUriLC();
-	// Init
-	ExecuteAndDeleteLD( lmkDatabase->InitializeL() );
-	// Get Landmark Iterator
-	CPosLmItemIterator* iterator = lmkDatabase->LandmarkIteratorL();
-	CleanupStack::PushL( iterator );
-	// Get Ids
-	RArray<TPosLmItemId> lmkIdArray;
-	TPosLmItemId id;
-	while( (id = iterator->NextL()) != KPosLmNullItemId )
-		{
-		lmkIdArray.Append( id );
-		}
-	// Add
-	mapView->AddLandmarksToShowL( uri->Des(), lmkIdArray );
-	
-	CleanupStack::PopAndDestroy( 4, mapView );
-	ReleaseLandmarkResources();
-	providerArray.ResetAndDestroy();
-	return KErrNone;
-	}	
-
-// -----------------------------------------------------------------------------
-// CTestMnMapView::AddLmksToShowL
-// 
-// 
-// -----------------------------------------------------------------------------
-//
-TInt CTestMnMapView::AddLmksToShowL( CStifItemParser&  /*aItem*/ )
-	{
-	// Find one provider to be used by mapview
-	RPointerArray<CMnProvider> providerArray;
-	MnProviderFinder::FindProvidersL( providerArray, CMnProvider::EServiceMapView );
-	if( providerArray.Count() < 1 )
-		{
-		// No provider found
-		iLog->Log(_L("Provider not found, CreateNavigatorL fails"));
-		User::Leave( KErrNotFound );
-		}
-	// Use first provider
-	CMnMapView* mapView = CMnMapView::NewL( *providerArray.operator[](0) );
-	CleanupStack::PushL( mapView );	
-	// 
-	RPointerArray<CPosLandmark> lmkArray;
-	// Create two landmarks, append to array
-	// 1
-	CPosLandmark* landmark1 = CPosLandmark::NewL();
-	CleanupStack::PushL( landmark1 );
-	lmkArray.Append( landmark1 );
-	// 2
-	CPosLandmark* landmark2 = CPosLandmark::NewL();
-	CleanupStack::PushL( landmark2 );
-	lmkArray.Append( landmark2 );	
-	// Add
-	mapView->AddLandmarksToShowL( lmkArray );
-	
-	CleanupStack::PopAndDestroy( 3, mapView );
-	ReleaseLandmarkResources();
-	providerArray.ResetAndDestroy();
-	return KErrNone;
-	}
-	
-// -----------------------------------------------------------------------------
-// CTestMnMapView::AddPackedLmksToShowL
-// 
-// 
-// -----------------------------------------------------------------------------
-//
-TInt CTestMnMapView::AddPackedLmksToShowL( CStifItemParser& /*aItem*/ )
-	{
-	// Find one provider to be used by mapview
-	RPointerArray<CMnProvider> providerArray;
-	MnProviderFinder::FindProvidersL( providerArray, CMnProvider::EServiceMapView );
-	if( providerArray.Count() < 1 )
-		{
-		// No provider found
-		iLog->Log(_L("Provider not found, CreateNavigatorL fails"));
-		User::Leave( KErrNotFound );
-		}
-	// Use first provider
-	CMnMapView* mapView = CMnMapView::NewL( *providerArray.operator[](0) );
-	CleanupStack::PushL( mapView );	
-	// 
-	RArray<TPtrC8> packedLmksArray;
-	// Create two landmarks, pack and append to array
-	// 1
-	CPosLandmark* landmark1 = CPosLandmark::NewL();
-	CleanupStack::PushL( landmark1 );
-	HBufC8* lmkBuffer1 = PosLandmarkSerialization::PackL( *landmark1 );
-	packedLmksArray.Append( *lmkBuffer1 );
-	// 2
-	CPosLandmark* landmark2 = CPosLandmark::NewL();
-	CleanupStack::PushL( landmark2 );
-	HBufC8* lmkBuffer2 = PosLandmarkSerialization::PackL( *landmark1 );
-	packedLmksArray.Append( *lmkBuffer2 );
-//	lmkArray.Append( landmark2 );	
-	// Add 
-	mapView->AddLandmarksToShowL( packedLmksArray );
-	
-	CleanupStack::PopAndDestroy( 3, mapView );
-	ReleaseLandmarkResources();
-	providerArray.ResetAndDestroy();
-	return KErrNone;
-	}
-	
-// -----------------------------------------------------------------------------
-// CTestMnMapView::ResetLmksToShowL
-// 
-// 
-// -----------------------------------------------------------------------------
-//
-TInt CTestMnMapView::ResetLmksToShowL( CStifItemParser& /*aItem*/ )
-	{
-	// Find one provider to be used by mapview
-	RPointerArray<CMnProvider> providerArray;
-	MnProviderFinder::FindProvidersL( providerArray, CMnProvider::EServiceMapView );
-	if( providerArray.Count() < 1 )
-		{
-		// No provider found
-		iLog->Log(_L("Provider not found, CreateNavigatorL fails"));
-		User::Leave( KErrNotFound );
-		}
-	// Use first provider
-	CMnMapView* mapView = CMnMapView::NewL( *providerArray.operator[](0) );
-	CleanupStack::PushL( mapView );	
-	// 
-	RArray<TPtrC8> packedLmksArray;
-	// Create two landmarks, pack and append to array
-	// 1
-	CPosLandmark* landmark1 = CPosLandmark::NewL();
-	CleanupStack::PushL( landmark1 );
-	HBufC8* lmkBuffer1 = PosLandmarkSerialization::PackL( *landmark1 );
-	packedLmksArray.Append( *lmkBuffer1 );
-	// 2
-	CPosLandmark* landmark2 = CPosLandmark::NewL();
-	CleanupStack::PushL( landmark2 );
-	HBufC8* lmkBuffer2 = PosLandmarkSerialization::PackL( *landmark1 );
-	packedLmksArray.Append( *lmkBuffer2 );
-//	lmkArray.Append( landmark2 );	
-	// Add 
-	mapView->AddLandmarksToShowL( packedLmksArray );
-	
-	// Reset landmarks to show
-	mapView->ResetLandmarksToShow();
-	CleanupStack::PopAndDestroy( 3, mapView );
-	ReleaseLandmarkResources();
-	providerArray.ResetAndDestroy();
-	return KErrNone;
-	}	
-
-// -----------------------------------------------------------------------------
-// CTestMnMapView::SetMapAreaL
-// 
-// 
-// -----------------------------------------------------------------------------
-//
-TInt CTestMnMapView::SetMapAreaL( CStifItemParser& /*aItem*/ )
-	{
-	// Find one provider to be used by mapview
-	RPointerArray<CMnProvider> providerArray;
-	MnProviderFinder::FindProvidersL( providerArray, CMnProvider::EServiceMapView );
-	if( providerArray.Count() < 1 )
-		{
-		// No provider found
-		iLog->Log(_L("Provider not found, CreateNavigatorL fails"));
-		User::Leave( KErrNotFound );
-		}
-	// Use first provider
-	CMnMapView* mapView = CMnMapView::NewL( *providerArray.operator[](0) );
-	CleanupStack::PushL( mapView );	
-	// Set map area
-	TCoordinate center( 21.22, 56.45 );
-	mapView->SetMapAreaL( center, 7.5 );
-	
-	CleanupStack::PopAndDestroy( mapView );
-	providerArray.ResetAndDestroy();
-	return KErrNone;
-	}
-	
-// -----------------------------------------------------------------------------
-// CTestMnMapView::ResetMapAreaL
-// 
-// 
-// -----------------------------------------------------------------------------
-//
-TInt CTestMnMapView::ResetMapAreaL( CStifItemParser& /*aItem*/ )
-	{
-	// Find one provider to be used by mapview
-	RPointerArray<CMnProvider> providerArray;
-	MnProviderFinder::FindProvidersL( providerArray, CMnProvider::EServiceMapView );
-	if( providerArray.Count() < 1 )
-		{
-		// No provider found
-		iLog->Log(_L("Provider not found, CreateNavigatorL fails"));
-		User::Leave( KErrNotFound );
-		}
-	// Use first provider
-	CMnMapView* mapView = CMnMapView::NewL( *providerArray.operator[](0) );
-	CleanupStack::PushL( mapView );	
-	// Set map area
-	TCoordinate center( 21.22, 56.45 );
-	mapView->SetMapAreaL( center, 7.5 );
-	
-	// Reset map area
-	mapView->ResetMapArea();
-	CleanupStack::PopAndDestroy( mapView );
-	providerArray.ResetAndDestroy();
-	return KErrNone;
-	}
-	
-// -----------------------------------------------------------------------------
-// CTestMnMapView::SetCustomRequestTextL
-// 
-// 
-// -----------------------------------------------------------------------------
-//
-TInt CTestMnMapView::SetCustomRequestTextL( CStifItemParser& aItem )
-	{
-	TPtrC requestText;
-	TInt err = aItem.GetNextString( requestText );
-	// Find one provider to be used by mapview
-	RPointerArray<CMnProvider> providerArray;
-	MnProviderFinder::FindProvidersL( providerArray, CMnProvider::EServiceMapView );
-	if( providerArray.Count() < 1 )
-		{
-		// No provider found
-		iLog->Log(_L("Provider not found, CreateNavigatorL fails"));
-		User::Leave( KErrNotFound );
-		}
-	// Use first provider
-	CMnMapView* mapView = CMnMapView::NewL( *providerArray.operator[](0) );
-	CleanupStack::PushL( mapView );	
-	// Set request text
-	mapView->SetCustomRequestTextL( requestText );
-	CleanupStack::PopAndDestroy( mapView );
-	providerArray.ResetAndDestroy();
-	return KErrNone;
-	}		
-	
-// -----------------------------------------------------------------------------
-// CTestMnMapView::SetUseDefaultRequestTextL
-// 
-// 
-// -----------------------------------------------------------------------------
-//
-TInt CTestMnMapView::SetUseDefaultRequestTextL( CStifItemParser& /*aItem*/ )
-	{
-	// Find one provider to be used by mapview
-	RPointerArray<CMnProvider> providerArray;
-	MnProviderFinder::FindProvidersL( providerArray, CMnProvider::EServiceMapView );
-	if( providerArray.Count() < 1 )
-		{
-		// No provider found
-		iLog->Log(_L("Provider not found, CreateNavigatorL fails"));
-		User::Leave( KErrNotFound );
-		}
-	// Use first provider
-	CMnMapView* mapView = CMnMapView::NewL( *providerArray.operator[](0) );
-	CleanupStack::PushL( mapView );	
-	// Set default request text
-	mapView->SetUseDefaultRequestText();
-	CleanupStack::PopAndDestroy( mapView );
-	providerArray.ResetAndDestroy();
-	return KErrNone;
-	}
-	
-// -----------------------------------------------------------------------------
-// CTestMnMapView::SetCurrentLocationOptionL
-// 
-// 
-// -----------------------------------------------------------------------------
-//
-TInt CTestMnMapView::SetCurrentLocationOptionL( CStifItemParser& /*aItem*/ )
-	{
-	// Find one provider to be used by mapview
-	RPointerArray<CMnProvider> providerArray;
-	MnProviderFinder::FindProvidersL( providerArray, CMnProvider::EServiceMapView );
-	if( providerArray.Count() < 1 )
-		{
-		// No provider found
-		iLog->Log(_L("Provider not found, CreateNavigatorL fails"));
-		User::Leave( KErrNotFound );
-		}
-	// Use first provider
-	CMnMapView* mapView = CMnMapView::NewL( *providerArray.operator[](0) );
-	CleanupStack::PushL( mapView );	
-	// Set current location option
-	
-	mapView->SetCurrentLocationOption( CMnMapView::ECurrentLocationEnabled );
-	CleanupStack::PopAndDestroy( mapView );
-	providerArray.ResetAndDestroy();
-	return KErrNone;
-	}
-	
-// -----------------------------------------------------------------------------
-// CTestMnMapView::GetCurrentLocationOptionL
-// 
-// 
-// -----------------------------------------------------------------------------
-//
-TInt CTestMnMapView::GetCurrentLocationOptionL( CStifItemParser& /*aItem*/ )
-	{
-	// Find one provider to be used by mapview
-	RPointerArray<CMnProvider> providerArray;
-	MnProviderFinder::FindProvidersL( providerArray, CMnProvider::EServiceMapView );
-	if( providerArray.Count() < 1 )
-		{
-		// No provider found
-		iLog->Log(_L("Provider not found, CreateNavigatorL fails"));
-		User::Leave( KErrNotFound );
-		}
-	// Use first provider
-	CMnMapView* mapView = CMnMapView::NewL( *providerArray.operator[](0) );
-	CleanupStack::PushL( mapView );	
-	// Set current location option
-	CMnMapView::TCurrentLocationOption option = mapView->CurrentLocationOption();
-	CleanupStack::PopAndDestroy( mapView );
-	providerArray.ResetAndDestroy();
-	return KErrNone;
-	}
-
-// -----------------------------------------------------------------------------
-// CTestMnMapView::SetAndGetOptionsL
-// 
-// 
-// -----------------------------------------------------------------------------
-//
-TInt CTestMnMapView::SetAndGetOptionsL( CStifItemParser& /*aItem*/ )
-	{
-	// Find one provider to be used by mapview
-	RPointerArray<CMnProvider> providerArray;
-	MnProviderFinder::FindProvidersL( providerArray, CMnProvider::EServiceMapView );
-	if( providerArray.Count() < 1 )
-		{
-		// No provider found
-		iLog->Log(_L("Provider not found, CreateNavigatorL fails"));
-		User::Leave( KErrNotFound );
-		}
-	// Use first provider
-	CMnMapView* mapView = CMnMapView::NewL( *providerArray.operator[](0) );
-	CleanupStack::PushL( mapView );
-	
-	// Set map view option
-	mapView->SetOptions( CMnMapView::EOptionRestrictSelection );
-	// Get map view option
-	CMnMapView::TOptions options = mapView->Options();
-	
-	CleanupStack::PopAndDestroy( mapView );
-	providerArray.ResetAndDestroy();
-	return KErrNone;
-	}
-	
-// -----------------------------------------------------------------------------
-// CTestMnMapView::SelectionResultTypeL
-// 
-// 
-// -----------------------------------------------------------------------------
-//
-TInt CTestMnMapView::SelectionResultTypeL( CStifItemParser& /*aItem*/ )
-	{
-	// Find one provider to be used by mapview
-	RPointerArray<CMnProvider> providerArray;
-	MnProviderFinder::FindProvidersL( providerArray, CMnProvider::EServiceMapView );
-	if( providerArray.Count() < 1 )
-		{
-		// No provider found
-		iLog->Log(_L("Provider not found, CreateNavigatorL fails"));
-		User::Leave( KErrNotFound );
-		}
-	// Use first provider
-	CMnMapView* mapView = CMnMapView::NewL( *providerArray.operator[](0) );
-	CleanupStack::PushL( mapView );
-	
-	
-	// Get Selection Result Type
-	CMnMapView::TSelectionResultType resultType = mapView->SelectionResultType();
-	
-	CleanupStack::PopAndDestroy( mapView );
-	providerArray.ResetAndDestroy();
-	return KErrNone;
-	}			
-	
-// -----------------------------------------------------------------------------
-// CTestMnMapView::ShowMapL
-// 
-// Not being tested, user input is required to close the provider app
-// -----------------------------------------------------------------------------
-//
-TInt CTestMnMapView::ShowMapL( CStifItemParser& /*aItem*/ )
-	{
-	// Find one provider to be used by mapview
-	RPointerArray<CMnProvider> providerArray;
-	MnProviderFinder::FindProvidersL( providerArray, CMnProvider::EServiceMapView );
-	if( providerArray.Count() < 1 )
-		{
-		// No provider found
-		iLog->Log(_L("Provider not found, CreateNavigatorL fails"));
-		User::Leave( KErrNotFound );
-		}
-	// Use first provider
-	CMnMapView* mapView = CMnMapView::NewL( *providerArray.operator[](0) );
-	CleanupStack::PushL( mapView );
-	
-	
-	// Show map
-	mapView->ShowMapL();
-	
-	CleanupStack::PopAndDestroy( mapView );
-	providerArray.ResetAndDestroy();
-	return KErrNone;
-	}				
-	
-// -----------------------------------------------------------------------------
-// CTestMnMapView::ShowCurrentLocationL
-// 
-// Not being tested, user input is required to close the provider app
-// -----------------------------------------------------------------------------
-//
-TInt CTestMnMapView::ShowCurrentLocationL( CStifItemParser& /*aItem*/ )
-	{
-	// Find one provider to be used by mapview
-	RPointerArray<CMnProvider> providerArray;
-	MnProviderFinder::FindProvidersL( providerArray, CMnProvider::EServiceMapView );
-	if( providerArray.Count() < 1 )
-		{
-		// No provider found
-		iLog->Log(_L("Provider not found, CreateNavigatorL fails"));
-		User::Leave( KErrNotFound );
-		}
-	// Use first provider
-	CMnMapView* mapView = CMnMapView::NewL( *providerArray.operator[](0) );
-	CleanupStack::PushL( mapView );
-	
-	
-	// Show Current Location
-	mapView->ShowCurrentLocationL();
-	
-	CleanupStack::PopAndDestroy( mapView );
-	providerArray.ResetAndDestroy();
-	return KErrNone;
-	}					
-	
-// -----------------------------------------------------------------------------
-// CTestMnMapView::SelectFromMapL
-// 
-// 
-// -----------------------------------------------------------------------------
-//
-TInt CTestMnMapView::SelectFromMapL( CStifItemParser& /*aItem*/ )
-	{
-	// Find one provider to be used by mapview
-	RPointerArray<CMnProvider> providerArray;
-	MnProviderFinder::FindProvidersL( providerArray, CMnProvider::EServiceMapView );
-	if( providerArray.Count() < 1 )
-		{
-		// No provider found
-		iLog->Log(_L("Provider not found, CreateNavigatorL fails"));
-		User::Leave( KErrNotFound );
-		}
-	// Use first provider
-	CMnMapView* mapView = CMnMapView::NewL( *providerArray.operator[](0) );
-	CleanupStack::PushL( mapView );
-	
-	// Async request for selecting a position from map
-	mapView->SelectFromMapL( iStatus );
-	SetActive();
-	mapView->Cancel();
-	// Wait
-	CActiveScheduler::Start();
-	
-	CleanupStack::PopAndDestroy( mapView );
-	providerArray.ResetAndDestroy();
-	return KErrNone;
-	}
-	
-// -----------------------------------------------------------------------------
-// CTestMnMapView::SetViewExitObserverL
-// 
-// 
-// -----------------------------------------------------------------------------
-//
-TInt CTestMnMapView::SetViewExitObserverL( CStifItemParser& /*aItem*/ )
-	{
-// Find one provider to be used by mapview
-	RPointerArray<CMnProvider> providerArray;
-	MnProviderFinder::FindProvidersL( providerArray, CMnProvider::EServiceMapView );
-	if( providerArray.Count() < 1 )
-		{
-		// No provider found
-		iLog->Log(_L("Provider not found, CreateNavigatorL fails"));
-		User::Leave( KErrNotFound );
-		}
-	// Use first provider
-	CMnMapView* mapView = CMnMapView::NewL( *providerArray.operator[](0) );
-	CleanupStack::PushL( mapView );
-	
-	// Set exit observer
-	mapView->SetExitObserverL( *this );
-	
-	CleanupStack::PopAndDestroy( mapView );
-	providerArray.ResetAndDestroy();
-	return KErrNone;
-	}
-	
-// -----------------------------------------------------------------------------
-// CTestMnMapView::RemoveViewExitObserverL
-// 
-// 
-// -----------------------------------------------------------------------------
-//
-TInt CTestMnMapView::RemoveViewExitObserverL( CStifItemParser& /*aItem*/ )
-	{
-// Find one provider to be used by mapview
-	RPointerArray<CMnProvider> providerArray;
-	MnProviderFinder::FindProvidersL( providerArray, CMnProvider::EServiceMapView );
-	if( providerArray.Count() < 1 )
-		{
-		// No provider found
-		iLog->Log(_L("Provider not found, CreateNavigatorL fails"));
-		User::Leave( KErrNotFound );
-		}
-	// Use first provider
-	CMnMapView* mapView = CMnMapView::NewL( *providerArray.operator[](0) );
-	CleanupStack::PushL( mapView );
-	
-	// Set exit observer
-	mapView->SetExitObserverL( *this );
-	// Remove exit observer
-	mapView->RemoveExitObserver();
-	
-	CleanupStack::PopAndDestroy( mapView );
-	providerArray.ResetAndDestroy();
-	return KErrNone;
-	}								
-	
-// -----------------------------------------------------------------------------
-// CTestMnMapView::RunL
-// 
-// 
-// -----------------------------------------------------------------------------
-//
-void CTestMnMapView::RunL()
-	{
-	iLog->Log(_L("RunL Called"));
-	CActiveScheduler::Stop();
-	}
-	
-// -----------------------------------------------------------------------------
-// CTestMnMapView::DoCancel
-// 
-// 
-// -----------------------------------------------------------------------------
-//
-void CTestMnMapView::DoCancel()
-	{
-	
-	}	
-	
-// -----------------------------------------------------------------------------
-// CTestMnNavigator::HandleServerAppExit
-// 
-// 
-// -----------------------------------------------------------------------------
-//
-void CTestMnMapView::HandleServerAppExit( TInt /*aReason*/ )
-	{
-	iLog->Log(_L("Provider exits"));
-	}
-
--- a/locsrv_plat/map_and_navigation_api/tsrc/src/testcmnnavigator.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,243 +0,0 @@
-/*
-* Copyright (c) 2007 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: Provides testing of CMnNavigator class methods
-*
-*/
-
-
-
-// INCLUDE FILES
-
-#include "testcmnnavigator.h"
-#include <MnNavigator.h>
-#include <MnProviderFinder.h>
-#include <MnProvider.h>
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// CTestMnNavigator::CTestMnNavigator
-// C++ default constructor can NOT contain any code, that
-// might leave.
-// -----------------------------------------------------------------------------
-//
-CTestMnNavigator::CTestMnNavigator( CStifLogger* aLog ) 
-	{
-	iLog = aLog;
-	}
-
-// -----------------------------------------------------------------------------
-// CTestMnNavigator::NewL
-// 
-// 
-// -----------------------------------------------------------------------------
-//	
-CTestMnNavigator* CTestMnNavigator::NewL(CStifLogger* aLog)
-	{
-	CTestMnNavigator* self = new (ELeave) CTestMnNavigator( aLog );
-	CleanupStack::PushL( self );
-    self->ConstructL();
-    CleanupStack::Pop(); 
-    return self; 
-	}
-
-// -----------------------------------------------------------------------------
-// CTestMnNavigator::ConstructL
-// 
-// 
-// -----------------------------------------------------------------------------
-//
-void CTestMnNavigator::ConstructL()
-	{
-	
-	}	
-
-// -----------------------------------------------------------------------------
-// CTestMnNavigator::~CTestMnNavigator
-// 
-// 
-// -----------------------------------------------------------------------------
-//
-CTestMnNavigator::~CTestMnNavigator()
-	{
-	
-	}
-	
-
-// -----------------------------------------------------------------------------
-// CTestMnNavigator::CreateNavigatorL
-// 
-// 
-// -----------------------------------------------------------------------------
-//
-TInt CTestMnNavigator::CreateNavigatorL( CStifItemParser& /*aItem*/ )
-	{
-	// Find one provider to be used by navigator
-	RPointerArray<CMnProvider> providerArray;
-	MnProviderFinder::FindProvidersL( providerArray, CMnProvider::EServiceNavigation );
-	if( providerArray.Count() < 1 )
-		{
-		// No provider found
-		iLog->Log(_L("Provider not found, CreateNavigatorL fails"));
-		User::Leave( KErrNotFound );
-		}
-	// Use first provider
-	CMnNavigator* navigator = CMnNavigator::NewL( *providerArray.operator[](0) );
-	delete navigator;
-	providerArray.ResetAndDestroy();
-	return KErrNone;
-	}
-
-// -----------------------------------------------------------------------------
-// CTestMnNavigator::CreateChainedNavigatorL
-// 
-// 
-// -----------------------------------------------------------------------------
-//
-TInt CTestMnNavigator::CreateChainedNavigatorL( CStifItemParser& /*aItem*/ )
-	{
-	// Find one provider to be used by navigator
-	RPointerArray<CMnProvider> providerArray;
-	MnProviderFinder::FindProvidersL( providerArray );
-	TUid Uid;
-    Uid.iUid = 0x03132014;
-    TInt i = 0;
-    for( i=0; i<providerArray.Count(); i++ )
-    	{
-    	if((providerArray.operator[](i))->Uid() == Uid)
-    		{
-    		break;
-    		}			
-    	}
-    	
-	if( i >= providerArray.Count() )
-		{
-		// No provider found
-		iLog->Log(_L("Provider not found, CreateNavigatorL fails"));
-		User::Leave( KErrNotFound );
-		}
-	// Use second provider
-	CMnNavigator* navigator = CMnNavigator::NewChainedL( *providerArray.operator[](i) );
-	delete navigator;
-	for( i=0; i < providerArray.Count(); i++ )
-		{
-		iLog->Log(_L("One more"));
-		delete  providerArray.operator[](i);	
-		}
-	return KErrNone;
-	}
-	
-// -----------------------------------------------------------------------------
-// CTestMnNavigator::NavigateToL
-// 
-// Not being tested, user input is required to close the provider app
-// -----------------------------------------------------------------------------
-//
-TInt CTestMnNavigator::NavigateToL( CStifItemParser& /*aItem*/ )
-	{
-	// Find one provider to be used by navigator
-	RPointerArray<CMnProvider> providerArray;
-	MnProviderFinder::FindProvidersL( providerArray, CMnProvider::EServiceNavigation );
-	if( providerArray.Count() < 1 )
-		{
-		// No provider found
-		iLog->Log(_L("Provider not found, CreateNavigatorL fails"));
-		User::Leave( KErrNotFound );
-		}
-	// Use first provider
-	CMnNavigator* navigator = CMnNavigator::NewL( *providerArray.operator[](0) );
-	CleanupStack::PushL( navigator );
-	// Create landmark
-	CPosLandmark* landmark = CPosLandmark::NewL();
-	CleanupStack::PushL( landmark );
-	TLocality position;
-	position.SetCoordinate( 45.56, 78.002 );
-	// Set position
-	landmark->SetPositionL( position );
-	// Navigate
-	navigator->NavigateToL( *landmark );
-	CleanupStack::PopAndDestroy( 2, navigator );
-	providerArray.ResetAndDestroy();
-	return KErrNone;
-	}	
-
-// -----------------------------------------------------------------------------
-// CTestMnNavigator::SetExitObserverL
-// 
-// 
-// -----------------------------------------------------------------------------
-//
-TInt CTestMnNavigator::SetExitObserverL( CStifItemParser& /*aItem*/ )
-	{
-	// Find one provider to be used by navigator
-	RPointerArray<CMnProvider> providerArray;
-	MnProviderFinder::FindProvidersL( providerArray, CMnProvider::EServiceNavigation );
-	if( providerArray.Count() < 1 )
-		{
-		// No provider found
-		iLog->Log(_L("Provider not found, CreateNavigatorL fails"));
-		User::Leave( KErrNotFound );
-		}
-	// Use first provider
-	CMnNavigator* navigator = CMnNavigator::NewL( *providerArray.operator[](0) );
-	CleanupStack::PushL( navigator );
-	// Set exit observer
-	navigator->SetExitObserverL( *this );
-	//
-	CleanupStack::PopAndDestroy( navigator );
-	providerArray.ResetAndDestroy();
-	return KErrNone;
-	}	
-	
-// -----------------------------------------------------------------------------
-// CTestMnNavigator::RemoveExitObserverL
-// 
-// 
-// -----------------------------------------------------------------------------
-//
-TInt CTestMnNavigator::RemoveExitObserverL( CStifItemParser& /*aItem*/ )
-	{
-	// Find one provider to be used by navigator
-	RPointerArray<CMnProvider> providerArray;
-	MnProviderFinder::FindProvidersL( providerArray, CMnProvider::EServiceNavigation );
-	if( providerArray.Count() < 1 )
-		{
-		// No provider found
-		iLog->Log(_L("Provider not found, CreateNavigatorL fails"));
-		User::Leave( KErrNotFound );
-		}
-	// Use first provider
-	CMnNavigator* navigator = CMnNavigator::NewL( *providerArray.operator[](0) );
-	CleanupStack::PushL( navigator );
-	// Set exit observer
-	navigator->SetExitObserverL( *this );
-	// Remove exit observer
-	navigator->RemoveExitObserver();
-	CleanupStack::PopAndDestroy( navigator );
-	providerArray.ResetAndDestroy();
-	return KErrNone;
-	}		
-
-
-// -----------------------------------------------------------------------------
-// CTestMnNavigator::HandleServerAppExit
-// 
-// 
-// -----------------------------------------------------------------------------
-//
-void CTestMnNavigator::HandleServerAppExit( TInt /*aReason*/ )
-	{
-	iLog->Log(_L("Provider exits"));
-	}
-
--- a/locsrv_plat/map_and_navigation_api/tsrc/src/testmapandnavapi.cpp	Mon May 03 12:54:42 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 test class for map_and_navigation_api
-*
-*/
-
-
-
-// INCLUDE FILES
-#include <Stiftestinterface.h>
-#include <swinstapi.h>
-#include "testmapandnavapi.h"
-
-// Literal
-// Provider app sisx path
-_LIT( KProviderSisxPath, "e:\\testing\\data\\mnrefprovider.sisx" ); 
-
-
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// CTestMapAndNavApi::CTestMapAndNavApi
-// C++ default constructor can NOT contain any code, that
-// might leave.
-// -----------------------------------------------------------------------------
-//
-CTestMapAndNavApi::CTestMapAndNavApi( 
-    CTestModuleIf& aTestModuleIf ):
-        CScriptBase( aTestModuleIf )
-    {
-    }
-
-// -----------------------------------------------------------------------------
-// CTestMapAndNavApi::ConstructL
-// Symbian 2nd phase constructor can leave.
-// -----------------------------------------------------------------------------
-//
-void CTestMapAndNavApi::ConstructL()
-    {
-    iLog = CStifLogger::NewL( KtestmapandnavapiLogPath, 
-                          KtestmapandnavapiLogFile,
-                          CStifLogger::ETxt,
-                          CStifLogger::EFile,
-                          EFalse );
-	InstallProvider( KProviderSisxPath );
-    }
-
-// -----------------------------------------------------------------------------
-// CTestMapAndNavApi::NewL
-// Two-phased constructor.
-// -----------------------------------------------------------------------------
-//
-CTestMapAndNavApi* CTestMapAndNavApi::NewL( 
-    CTestModuleIf& aTestModuleIf )
-    {
-    CTestMapAndNavApi* self = new (ELeave) CTestMapAndNavApi( aTestModuleIf );
-
-    CleanupStack::PushL( self );
-    self->ConstructL();
-    CleanupStack::Pop();
-
-    return self;
-
-    }
-
-// Destructor
-CTestMapAndNavApi::~CTestMapAndNavApi()
-    { 
-
-    // Delete resources allocated from test methods
-    Delete();
-
-    // Delete logger
-    delete iLog; 
-
-    }
-
-// ========================== OTHER EXPORTED FUNCTIONS =========================
-
-// -----------------------------------------------------------------------------
-// LibEntryL is a polymorphic Dll entry point.
-// Returns: CScriptBase: New CScriptBase derived object
-// -----------------------------------------------------------------------------
-//
-EXPORT_C CScriptBase* LibEntryL( 
-    CTestModuleIf& aTestModuleIf ) // Backpointer to STIF Test Framework
-    {
-
-    return ( CScriptBase* ) CTestMapAndNavApi::NewL( aTestModuleIf );
-
-    }
-    
-// -----------------------------------------------------------------------------
-// This method will install the provider application
-//
-// -----------------------------------------------------------------------------
-//   
-TInt CTestMapAndNavApi::InstallProvider( const TDesC& aPackagePath )
-    {
-   // iLog->Log("Installing [%S]...", aPackagePath );
-
-    TInt err = KErrNone;
-    SwiUI::RSWInstSilentLauncher installer;
-
-    err = installer.Connect();
-    if( KErrNone != err )
-    	{
-    	iLog->Log(_L("Connection to installer failed"));
-    	return err;
-    	}
-    //CHECK_EQUAL( err, KErrNone, "Connection to installer failed" );
-
-    SwiUI::TInstallOptionsPckg options;
-    options().iUpgrade = SwiUI::EPolicyAllowed;
-    options().iPackageInfo = SwiUI::EPolicyAllowed;
-    options().iOverwrite = SwiUI::EPolicyAllowed;
-    options().iKillApp = SwiUI::EPolicyAllowed;
-
-    err = installer.SilentInstall( aPackagePath, options );
-    if( KErrNone != err )
-    	{
-    	iLog->Log(_L("Provider Installation failed"));
-    	installer.Close();
-    	return err;
-    	}
-    	
-    //CHECK_EQUAL( err, KErrNone, "Installation failed" );
-	iLog->Log(_L("Provider Installation passed"));
-    installer.Close();
-    return err;
-    }
-
-
-//  End of File
--- a/locsrv_plat/map_and_navigation_api/tsrc/src/testmapandnavapiblocks.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,409 +0,0 @@
-/*
-* Copyright (c) 2007 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: Entry point for test cases in stif module
-*
-*/
-
-
-
-// INCLUDE FILES
-#include <e32svr.h>
-#include <StifParser.h>
-#include <Stiftestinterface.h>
-#include "testmapandnavapi.h"
-
-
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// CTestMapAndNavApi::Delete
-// Delete here all resources allocated and opened from test methods. 
-// Called from destructor. 
-// -----------------------------------------------------------------------------
-//
-void CTestMapAndNavApi::Delete() 
-    {
-
-    }
-
-// -----------------------------------------------------------------------------
-// CTestMapAndNavApi::RunMethodL
-// Run specified method. Contains also table of test mothods and their names.
-// -----------------------------------------------------------------------------
-//
-TInt CTestMapAndNavApi::RunMethodL( 
-    CStifItemParser& aItem ) 
-    {
-
-    static TStifFunctionInfo const KFunctions[] =
-        {  
-        // Navigator
-        ENTRY( "CreateNavigator", CTestMapAndNavApi::CreateNavigatorL ),
-        ENTRY( "CreateChainedNavigator", CTestMapAndNavApi::CreateChainedNavigatorL ),
-        ENTRY( "SetNavigatorExitObserver", CTestMapAndNavApi::SetExitObserverL ),
-        ENTRY( "RemoveNavigatorExitObserver", CTestMapAndNavApi::RemoveExitObserverL ),
-        
-        // Map View
-        ENTRY( "CreateMapView", CTestMapAndNavApi::CreateMapViewL ),
-        ENTRY( "CreateChainedMapView", CTestMapAndNavApi::CreateChainedMapViewL ),
-        ENTRY( "AddLinkedLmksToShow", CTestMapAndNavApi::AddLinkedLmksToShowL ),
-        ENTRY( "AddLmksToShow", CTestMapAndNavApi::AddLmksToShowL ),
-        ENTRY( "AddPackedLmksToShow", CTestMapAndNavApi::AddPackedLmksToShowL ),
-        ENTRY( "ResetLmksToShow", CTestMapAndNavApi::ResetLmksToShowL ),
-        ENTRY( "SetMapArea", CTestMapAndNavApi::SetMapAreaL ),
-        ENTRY( "ResetMapArea", CTestMapAndNavApi::ResetMapAreaL ),
-        ENTRY( "SetCustomRequestText", CTestMapAndNavApi::SetCustomRequestTextL ),
-        ENTRY( "SetUseDefaultRequestText", CTestMapAndNavApi::SetUseDefaultRequestTextL ),
-        ENTRY( "SetCurrentLocationOption", CTestMapAndNavApi::SetCurrentLocationOptionL ),
-        ENTRY( "GetCurrentLocationOption", CTestMapAndNavApi::GetCurrentLocationOptionL ),
-        ENTRY( "SetAndGetOptions", CTestMapAndNavApi::SetAndGetOptionsL ),
-        ENTRY( "SelectionResultType", CTestMapAndNavApi::SelectionResultTypeL ),
-        ENTRY( "SelectFromMap", CTestMapAndNavApi::SelectFromMapL ),
-        ENTRY( "SetViewExitObserver", CTestMapAndNavApi::SetViewExitObserverL ),
-        ENTRY( "RemoveViewExitObserver", CTestMapAndNavApi::RemoveViewExitObserverL ),
-        
-        };
-
-    const TInt count = sizeof( KFunctions ) / 
-                        sizeof( TStifFunctionInfo );
-	
-	TInt ret = KErrNone;
-	TRAPD( error, ret = RunInternalL( KFunctions, count, aItem ));
-	if ( error != KErrNone )
-		{
-		return error;
-		}
-	return ret;	
-	    
-    }
-   
-// -----------------------------------------------------------------------------
-// CTestMapAndNavApi::CreateNavigatorL
-// 
-// 
-// -----------------------------------------------------------------------------
-//
-TInt CTestMapAndNavApi::CreateNavigatorL( CStifItemParser& aItem )
-    {
-    CTestMnNavigator* testNavigator = CTestMnNavigator::NewL( iLog );
-	CleanupStack::PushL( testNavigator );
-	TInt err = testNavigator->CreateNavigatorL( aItem );
-	CleanupStack::PopAndDestroy( testNavigator );
-	return err;	
-    }   
-
-// -----------------------------------------------------------------------------
-// CTestMapAndNavApi::CreateChainedNavigatorL
-// 
-// 
-// -----------------------------------------------------------------------------
-//
-TInt CTestMapAndNavApi::CreateChainedNavigatorL( CStifItemParser& aItem )
-    {
-    CTestMnNavigator* testNavigator = CTestMnNavigator::NewL( iLog );
-	CleanupStack::PushL( testNavigator );
-	TInt err = testNavigator->CreateChainedNavigatorL( aItem );
-	CleanupStack::PopAndDestroy( testNavigator );
-	return err;	
-    } 
-    
-// -----------------------------------------------------------------------------
-// CTestMapAndNavApi::SetExitObserverL
-// 
-// 
-// -----------------------------------------------------------------------------
-//
-TInt CTestMapAndNavApi::SetExitObserverL( CStifItemParser& aItem )
-    {
-    CTestMnNavigator* testNavigator = CTestMnNavigator::NewL( iLog );
-	CleanupStack::PushL( testNavigator );
-	TInt err = testNavigator->SetExitObserverL( aItem );
-	CleanupStack::PopAndDestroy( testNavigator );
-	return err;	
-    }     
-
-// -----------------------------------------------------------------------------
-// CTestMapAndNavApi::RemoveExitObserverL
-// 
-// 
-// -----------------------------------------------------------------------------
-//
-TInt CTestMapAndNavApi::RemoveExitObserverL( CStifItemParser& aItem )
-    {
-    CTestMnNavigator* testNavigator = CTestMnNavigator::NewL( iLog );
-	CleanupStack::PushL( testNavigator );
-	TInt err = testNavigator->RemoveExitObserverL( aItem );
-	CleanupStack::PopAndDestroy( testNavigator );
-	return err;	
-    }     
-
-    
-// -----------------------------------------------------------------------------
-// CTestMapAndNavApi::CreateMapViewL
-// 
-// 
-// -----------------------------------------------------------------------------
-//
-TInt CTestMapAndNavApi::CreateMapViewL( CStifItemParser& aItem )
-    {
-    CTestMnMapView* testMapView = CTestMnMapView::NewL( iLog );
-	CleanupStack::PushL( testMapView );
-	TInt err = testMapView->CreateMapViewL( aItem );
-	CleanupStack::PopAndDestroy( testMapView );
-	return err;	
-    }     
-
-// -----------------------------------------------------------------------------
-// CTestMapAndNavApi::CreateChainedMapViewL
-// 
-// 
-// -----------------------------------------------------------------------------
-//
-TInt CTestMapAndNavApi::CreateChainedMapViewL( CStifItemParser& aItem )
-    {
-    CTestMnMapView* testMapView = CTestMnMapView::NewL( iLog );
-	CleanupStack::PushL( testMapView );
-	TInt err = testMapView->CreateChainedMapViewL( aItem );
-	CleanupStack::PopAndDestroy( testMapView );
-	return err;	
-    } 
-    
-// -----------------------------------------------------------------------------
-// CTestMapAndNavApi::AddLinkedLmksToShowL
-// 
-// 
-// -----------------------------------------------------------------------------
-//
-TInt CTestMapAndNavApi::AddLinkedLmksToShowL( CStifItemParser& aItem )
-    {
-    CTestMnMapView* testMapView = CTestMnMapView::NewL( iLog );
-	CleanupStack::PushL( testMapView );
-	TInt err = testMapView->AddLinkedLmksToShowL( aItem );
-	CleanupStack::PopAndDestroy( testMapView );
-	return err;	
-    }   
-    
-// -----------------------------------------------------------------------------
-// CTestMapAndNavApi::AddLmksToShowL
-// 
-// 
-// -----------------------------------------------------------------------------
-//
-TInt CTestMapAndNavApi::AddLmksToShowL( CStifItemParser& aItem )
-    {
-    CTestMnMapView* testMapView = CTestMnMapView::NewL( iLog );
-	CleanupStack::PushL( testMapView );
-	TInt err = testMapView->AddLmksToShowL( aItem );
-	CleanupStack::PopAndDestroy( testMapView );
-	return err;	
-    }
-    
-// -----------------------------------------------------------------------------
-// CTestMapAndNavApi::AddPackedLmksToShowL
-// 
-// 
-// -----------------------------------------------------------------------------
-//
-TInt CTestMapAndNavApi::AddPackedLmksToShowL( CStifItemParser& aItem )
-    {
-    CTestMnMapView* testMapView = CTestMnMapView::NewL( iLog );
-	CleanupStack::PushL( testMapView );
-	TInt err = testMapView->AddPackedLmksToShowL( aItem );
-	CleanupStack::PopAndDestroy( testMapView );
-	return err;	
-    }    
-    
-// -----------------------------------------------------------------------------
-// CTestMapAndNavApi::ResetLmksToShowL
-// 
-// 
-// -----------------------------------------------------------------------------
-//
-TInt CTestMapAndNavApi::ResetLmksToShowL( CStifItemParser& aItem )
-    {
-    CTestMnMapView* testMapView = CTestMnMapView::NewL( iLog );
-	CleanupStack::PushL( testMapView );
-	TInt err = testMapView->ResetLmksToShowL( aItem );
-	CleanupStack::PopAndDestroy( testMapView );
-	return err;	
-    }     
-    
-// -----------------------------------------------------------------------------
-// CTestMapAndNavApi::SetMapAreaL
-// 
-// 
-// -----------------------------------------------------------------------------
-//
-TInt CTestMapAndNavApi::SetMapAreaL( CStifItemParser& aItem )
-    {
-    CTestMnMapView* testMapView = CTestMnMapView::NewL( iLog );
-	CleanupStack::PushL( testMapView );
-	TInt err = testMapView->SetMapAreaL( aItem );
-	CleanupStack::PopAndDestroy( testMapView );
-	return err;	
-    }            
-
-// -----------------------------------------------------------------------------
-// CTestMapAndNavApi::ResetMapAreaL
-// 
-// 
-// -----------------------------------------------------------------------------
-//
-TInt CTestMapAndNavApi::ResetMapAreaL( CStifItemParser& aItem )
-    {
-    CTestMnMapView* testMapView = CTestMnMapView::NewL( iLog );
-	CleanupStack::PushL( testMapView );
-	TInt err = testMapView->ResetMapAreaL( aItem );
-	CleanupStack::PopAndDestroy( testMapView );
-	return err;	
-    }   
-
-
-// -----------------------------------------------------------------------------
-// CTestMapAndNavApi::SetCustomRequestTextL
-// 
-// 
-// -----------------------------------------------------------------------------
-//
-TInt CTestMapAndNavApi::SetCustomRequestTextL( CStifItemParser& aItem )
-    {
-    CTestMnMapView* testMapView = CTestMnMapView::NewL( iLog );
-	CleanupStack::PushL( testMapView );
-	TInt err = testMapView->SetCustomRequestTextL( aItem );
-	CleanupStack::PopAndDestroy( testMapView );
-	return err;	
-    }   
-
-// -----------------------------------------------------------------------------
-// CTestMapAndNavApi::SetUseDefaultRequestTextL
-// 
-// 
-// -----------------------------------------------------------------------------
-//
-TInt CTestMapAndNavApi::SetUseDefaultRequestTextL( CStifItemParser& aItem )
-    {
-    CTestMnMapView* testMapView = CTestMnMapView::NewL( iLog );
-	CleanupStack::PushL( testMapView );
-	TInt err = testMapView->SetUseDefaultRequestTextL( aItem );
-	CleanupStack::PopAndDestroy( testMapView );
-	return err;	
-    }   
-    
-// -----------------------------------------------------------------------------
-// CTestMapAndNavApi::SetCurrentLocationOptionL
-// 
-// 
-// -----------------------------------------------------------------------------
-//
-TInt CTestMapAndNavApi::SetCurrentLocationOptionL( CStifItemParser& aItem )
-    {
-    CTestMnMapView* testMapView = CTestMnMapView::NewL( iLog );
-	CleanupStack::PushL( testMapView );
-	TInt err = testMapView->SetCurrentLocationOptionL( aItem );
-	CleanupStack::PopAndDestroy( testMapView );
-	return err;	
-    } 
-    
-// -----------------------------------------------------------------------------
-// CTestMapAndNavApi::GetCurrentLocationOptionL
-// 
-// 
-// -----------------------------------------------------------------------------
-//
-TInt CTestMapAndNavApi::GetCurrentLocationOptionL( CStifItemParser& aItem )
-    {
-    CTestMnMapView* testMapView = CTestMnMapView::NewL( iLog );
-	CleanupStack::PushL( testMapView );
-	TInt err = testMapView->GetCurrentLocationOptionL( aItem );
-	CleanupStack::PopAndDestroy( testMapView );
-	return err;	
-    } 
-    
-// -----------------------------------------------------------------------------
-// CTestMapAndNavApi::SetAndGetOptionsL
-// 
-// 
-// -----------------------------------------------------------------------------
-//
-TInt CTestMapAndNavApi::SetAndGetOptionsL( CStifItemParser& aItem )
-    {
-    CTestMnMapView* testMapView = CTestMnMapView::NewL( iLog );
-	CleanupStack::PushL( testMapView );
-	TInt err = testMapView->SetAndGetOptionsL( aItem );
-	CleanupStack::PopAndDestroy( testMapView );
-	return err;	
-    }
-    
-// -----------------------------------------------------------------------------
-// CTestMapAndNavApi::SelectionResultTypeL
-// 
-// 
-// -----------------------------------------------------------------------------
-//
-TInt CTestMapAndNavApi::SelectionResultTypeL( CStifItemParser& aItem )
-    {
-    CTestMnMapView* testMapView = CTestMnMapView::NewL( iLog );
-	CleanupStack::PushL( testMapView );
-	TInt err = testMapView->SelectionResultTypeL( aItem );
-	CleanupStack::PopAndDestroy( testMapView );
-	return err;	
-    }           
-
-// -----------------------------------------------------------------------------
-// CTestMapAndNavApi::SelectFromMapL
-// 
-// 
-// -----------------------------------------------------------------------------
-//
-TInt CTestMapAndNavApi::SelectFromMapL( CStifItemParser& aItem )
-    {
-    CTestMnMapView* testMapView = CTestMnMapView::NewL( iLog );
-	CleanupStack::PushL( testMapView );
-	TInt err = testMapView->SelectFromMapL( aItem );
-	CleanupStack::PopAndDestroy( testMapView );
-	return err;	
-    }
-    
-// -----------------------------------------------------------------------------
-// CTestMapAndNavApi::SetViewExitObserverL
-// 
-// 
-// -----------------------------------------------------------------------------
-//
-TInt CTestMapAndNavApi::SetViewExitObserverL( CStifItemParser& aItem )
-    {
-    CTestMnMapView* testMapView = CTestMnMapView::NewL( iLog );
-	CleanupStack::PushL( testMapView );
-	TInt err = testMapView->SetViewExitObserverL( aItem );
-	CleanupStack::PopAndDestroy( testMapView );
-	return err;	
-    }                   
-    
-// -----------------------------------------------------------------------------
-// CTestMapAndNavApi::RemoveViewExitObserverL
-// 
-// 
-// -----------------------------------------------------------------------------
-//
-TInt CTestMapAndNavApi::RemoveViewExitObserverL( CStifItemParser& aItem )
-    {
-    CTestMnMapView* testMapView = CTestMnMapView::NewL( iLog );
-	CleanupStack::PushL( testMapView );
-	TInt err = testMapView->RemoveViewExitObserverL( aItem );
-	CleanupStack::PopAndDestroy( testMapView );
-	return err;	
-    }                   
-
-//  End of File
--- a/locsrv_plat/map_and_navigation_provider_api/group/bld.inf	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,34 +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 
-:                Map and Navigation Provider API
-*
-*/
-
-
-#include <platform_paths.hrh>
-
-PRJ_PLATFORMS
-DEFAULT
-
-PRJ_EXPORTS
-
-../inc/mnservicebase.h     MW_LAYER_PLATFORM_EXPORT_PATH(mnservicebase.h)
-../inc/mnserviceinfo.rh     MW_LAYER_PLATFORM_EXPORT_PATH(mnserviceinfo.rh)
-../inc/mnappservices.hrh     MW_LAYER_PLATFORM_EXPORT_PATH(mnappservices.hrh)
-../inc/mnappserviceuids.hrh     MW_LAYER_PLATFORM_EXPORT_PATH(mnappserviceuids.hrh)
-../inc/mnmapviewservicebase.h     MW_LAYER_PLATFORM_EXPORT_PATH(mnmapviewservicebase.h)
-../inc/mnnavigationservicebase.h     MW_LAYER_PLATFORM_EXPORT_PATH(mnnavigationservicebase.h)
-../inc/mngeocodingservicebase.h     MW_LAYER_PLATFORM_EXPORT_PATH(mngeocodingservicebase.h)
-../inc/mnmapimageservicebase.h      MW_LAYER_PLATFORM_EXPORT_PATH(mnmapimageservicebase.h)
\ No newline at end of file
--- a/locsrv_plat/map_and_navigation_provider_api/inc/mnappservices.hrh	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,120 +0,0 @@
-/*
-* Copyright (c) 2005-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:  Map and Navigation Application Services
-*
-*/
-
-
-#ifndef MN_APP_SERVICES_HRH
-#define MN_APP_SERVICES_HRH
-
-/** /file
- *  @brief Defines constants common for
- *  Map and Navigation FW .H and .RH files.
- *
- *  MapView application service features. Any combination of these can be defined in SERVICE_INFO
- *  for @ref KMnAppMapViewService.
- *  - @ref KMnSvcFeatureShowMap
- *  - @ref KMnSvcFeatureSelectFromMap
- *
- *  Navigation application service features. Any combination of these can be defined in SERVICE_INFO
- *  for @ref KMnAppNavigationService.
- *  - @ref KMnSvcFeatureNavigateTo
- *
- *  Geocoding application service features. Any combination of these can be defined in SERVICE_INFO
- *  for @ref KMnAppGeocodingService.
- *  - @ref KMnSvcFeatureCoordToAddr
- *  - @ref KMnSvcFeatureAddrToCoord
- *  - @ref KMnSvcFeaturePlainAddrToCoord
- *
- *  Map Image application service features. Any combination of these can be defined in SERVICE_INFO
- *  for @ref KMnAppMapImageService.
- *  - @ref KMnSvcFeatureVectorMap
- *  - @ref KMnSvcFeatureSatelliteImage
- */
-
-// ---------------------------------------------------------------------------
-//   MapView application service features. 
-// ---------------------------------------------------------------------------
-//
-
-/** Displaying map with landmarks and current location.
- *  If specified, it means that Provider Application implements:
- *  - CMnMapViewServiceBase::HandleShowMapL()
- *  - CMnMapViewServiceBase::HandleShowCurrentLocationL()
- */
-#define KMnSvcFeatureShowMap            0x01
-
-/** Selecting location from map
- *  If specified, it means that Provider Application implements:
- *  - CMnMapViewServiceBase::HandleSelectFromMapL()
- */
-#define KMnSvcFeatureSelectFromMap      0x02
-
-// ---------------------------------------------------------------------------
-//   Navigation application service features. 
-// ---------------------------------------------------------------------------
-//
-
-/** Basic navigation.
- *  If specified, it means that Provider Application implements:
- *  - CMnNavigationServiceBase::HandleNavigateToL()
- */
-#define KMnSvcFeatureNavigateTo         0x01
-
-// ---------------------------------------------------------------------------
-//   Geocoding application service features. 
-// ---------------------------------------------------------------------------
-//
-
-/** Coordinate to Address conversion.
- *  If specified, it means that Provider Application implements:
- *  - CMnGeocodingServiceBase::HandleFindAddressByCoordinateL()
- */
-#define KMnSvcFeatureCoordToAddr        0x01
-
-/** Address to Coordinate conversion.
- *  If specified, it means that Provider Application implements:
- *  - CMnGeocodingServiceBase::HandleFindCoordinateByAddressL(const CPosLandmark&)
- */
-#define KMnSvcFeatureAddrToCoord        0x02
-
-/** Plain-string-address to Coordinate conversion.
- *  If specified, it means that Provider Application implements:
- *  - CMnGeocodingServiceBase::HandleFindCoordinateByAddressL(const TDesC&)
- */
-#define KMnSvcFeaturePlainAddrToCoord   0x04
-
-// ---------------------------------------------------------------------------
-//   MapImage application service features. 
-// ---------------------------------------------------------------------------
-//
-
-/** Rendering of scalable vector-based map.
- *  If specified, it means that Provider Application implements 
- *  CMnMapImageServiceBase::HandleRenderingL() and supports image type
- *  CMnMapImage::ETypeVectorMap
- */
-#define KMnSvcFeatureVectorMap          0x01
-
-/** Rendering of map image from satellite photos of Earth.
- *  If specified, it means that Provider Application implements 
- *  CMnMapImageServiceBase::HandleRenderingL() and supports image type
- *  CMnMapImage::ETypeSatelliteImage
- */
-#define KMnSvcFeatureSatelliteImage     0x02
-
-#endif // MN_APP_SERVICES_HRH
-
-
--- a/locsrv_plat/map_and_navigation_provider_api/inc/mnappserviceuids.hrh	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,50 +0,0 @@
-/*
-* Copyright (c) 2005-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:  Map and Navigation application service UIDs
-*
-*/
-
-
-#ifndef MN_APP_SERVICE_UIDS_HRH
-#define MN_APP_SERVICE_UIDS_HRH
-
-/** @file 
- *  @brief Map and Navigation application service UIDs 
- */
-
-/** MapView service UID.
- *  This value shall be specified as @p uid field of SERVICE_INFO struct
- *  if application implements @ref CMnMapViewServiceBase.
- */
-#define KMnAppMapViewService 0x10206909
-
-/** Navigation service UID.
- *  This value shall be specified as @p uid field of SERVICE_INFO struct
- *  if application implements @ref CMnNavigationServiceBase.
- */
-#define KMnAppNavigationService 0x1020690A
-
-/** Geocoding service UID.
- *  This value shall be specified as @p uid field of SERVICE_INFO struct
- *  if application implements @ref CMnGeocodingServiceBase.
- */
-#define KMnAppGeocodingService 0x1020690B
-
-/** MapImage service UID.
- *  This value shall be specified as @p uid field of SERVICE_INFO struct
- *  if application implements @ref CMnMapImageServiceBase.
- */
-#define KMnAppMapImageService  0x101FDF7F
-
-#endif // MN_APP_SERVICE_UIDS_HRH
--- a/locsrv_plat/map_and_navigation_provider_api/inc/mngeocodingservicebase.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,174 +0,0 @@
-/*
-* Copyright (c) 2005-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:  CMnGeocodingServiceBase class
-*
-*/
-
-
-#ifndef MN_GEOCODINGSERVICEBASE_H
-#define MN_GEOCODINGSERVICEBASE_H
-
-#include "mnservicebase.h"
-#include "mngeocoder.h"
-
-class CPosLandmark;
-
-/** @brief Base class for geocoding service implementations (KMnAppGeocodingService). 
- *
- *  Provider Application must derive its geocoding service class from this one. 
- *  This base implementation hides IPC communication details and provides 
- *  native methods for accessing various parameters, specified by client.
- *
- *  Provider Application must return pointer to instance of its class, derived
- *  from this class, in response to CAknAppService::CreateServiceL() call, 
- *  if given parameter is KMnAppGeocodingService. 
- *
- *  This class defines handlers of particular requests from client as pure 
- *  virtual methods, which derived class must implement. The parameters, which
- *  client application may specify in @ref CMnGeocoder are accessible via other methods
- *  of this class. Implementation must obey these parameters and use them
- *  as specified in @ref CMnGeocoder.
- *
- *  See parent @ref CMnServiceBase class documentation for 
- *  other details.
- *
- *  @since 3.1
- *  @lib mnservicelib.lib
- *  @ingroup MnProviderAPI
- */
-class CMnGeocodingServiceBase : public CMnServiceBase
-    {
-    public :
-
-        /** @brief Returns geocoding options specified by client application.
-         *
-         *  This options must be utilized in request handlers as specified in 
-         *  @ref CMnGeocoder. 
-         *  
-         *  @return Options specified by client.
-         */
-        IMPORT_C CMnGeocoder::TOptions Options() const;
-
-        /** @brief Completes geocoding request and sends result.
-         *
-         *  Implementation must call this method to signal successful completion
-         *  of conversion request. Result of conversion is supplied as landmark 
-         *  object. It must contain only data, which is part of conversion result,
-         *  any other fields shall be left empty.
-         *
-         *  @param[in] aLandmark Landmark containing result of conversion.
-         */
-        IMPORT_C void CompleteGeocodingRequestL( const CPosLandmark& aLandmark );
-
-    protected :
-    
-        /** C++ constructor */
-        IMPORT_C CMnGeocodingServiceBase();
-        /** Destructor */
-        IMPORT_C ~CMnGeocodingServiceBase();
-
-        /** This method must be called from derived class' ConstructL to
-         *  allow internal initialization of this class. */
-        IMPORT_C void BaseConstructL();
-
-        /** @brief Handles client's request for finding address by given coordinate. 
-         *
-         *  Derived class must implement this method obeying specification of 
-         *  @ref CMnGeocoder::FindAddressByCoordinateL() and if 
-         *  @ref KMnSvcFeatureCoordToAddr feature is specified in SERVICE_INFO.
-         *
-         *  If given landmark coordinates cannot be resolved to address due
-         *  to some ambiguity, then user shall be queried, if allowed by options
-         *  (see @ref Options()). If it is not allowed, the operation
-         *  shall be completed with KErrNotFound (@ref CompleteRequest()).
-         *
-         *  This is asynchronous request.
-         *  Client's request must be completed (when resolving succeeded) with 
-         *  CompleteGeocodingRequest().
-         *
-         *  @param[in] aLandmark Contains coordinate information to be resolved
-         *                       to address.
-         *  
-         *  @leave KErrNotSupported Should leave if this feature is not supported.
-         */
-        virtual void HandleFindAddressByCoordinateL( const CPosLandmark& aLandmark ) =0;
-        
-        /** @brief Handles client's request for finding coordinate by given address. 
-         *
-         *  Derived class must implement this method obeying specification of 
-         *  @ref CMnGeocoder::FindCoordinateByAddressL(const CPosLandmark&, 
-         *  TRequestStatus&) and if @ref KMnSvcFeatureAddrToCoord feature is 
-         *  specified in SERVICE_INFO.
-         *
-         *  If given address cannot be resolved to coordinates due
-         *  to some ambiguity, then user shall be queried, if allowed by options
-         *  (see @ref Options()).If it is not allowed, the result of the operation
-         *  shall be KErrNotFound.
-         *
-         *  This is asynchronous request.
-         *  Client's request must be completed (when resolving succeeded) with 
-         *  CompleteGeocodingRequest().
-         *
-         *  @param[in] aLandmark Contains address information to be resolved
-         *                       to coordinate.
-         *  
-         *  @leave KErrNotSupported Should leave if this feature is not supported.
-         */
-        virtual void HandleFindCoordinateByAddressL( const CPosLandmark& aLandmark ) =0;
-
-        /** @brief Handles client's request for finding coordinate by given address. 
-         *
-         *  This overload is for cases when address is specified as plain string.
-         *  Derived class must implement this method obeying specification of 
-         *  @ref CMnGeocoder::FindCoordinateByAddressL(const TDesC& aAddress, 
-         *  TRequestStatus& aRequest) and if @ref KMnSvcFeaturePlainAddrToCoord feature 
-         *  is specified in SERVICE_INFO.
-         *
-         *  If given address cannot be resolved to coordinates due
-         *  to some ambiguity, then user shall be queried, if allowed by options
-         *  (see @ref Options()).If it is not allowed, the result of the operation
-         *  shall be KErrNotFound.
-         *
-         *  This is asynchronous request.
-         *  Client's request must be completed (when resolving succeeded) with 
-         *  CompleteGeocodingRequest().
-         *
-         *  @param[in] aAddress Address information to be resolved to coordinate.
-         *  
-         *  @leave KErrNotSupported Should leave if this feature is not supported.
-         */
-        virtual void HandleFindCoordinateByAddressL( const TDesC& aAddress ) =0;
-
-    protected: // From CAknAppServiceBase
-
-        /** \internal */
-        IMPORT_C void ServiceL( const RMessage2& aMessage );
-
-    private:
-        void StartAsyncRequestL( const RMessage2& aMessage );
-        void UnpackOptionsL( const RMessage2& aMsg );
-        HBufC* UnpackPlainAddressLC( const RMessage2& aMsg );
-
-        void HandleGetConversionResultL( const RMessage2& aMsg );
-    
-    private:
-        CMnGeocoder::TOptions   iOptions;
-
-        HBufC8*                 iResult;
-        TInt                    iResultType;
-    };
-
-#endif // MN_GEOCODINGSERVICEBASE_H
-
-
--- a/locsrv_plat/map_and_navigation_provider_api/inc/mnmapimageservicebase.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,172 +0,0 @@
-/*
-* Copyright (c) 2007 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:  CMnMapImageServiceBase class
-*
-*/
-
-
-#ifndef MN_MAPIMAGESERVICEBASE_H_
-#define MN_MAPIMAGESERVICEBASE_H_
-
-#include <mnservicebase.h>
-#include <mnmapimage.h>
-#include <mnmapimageparams.h>
-
-class CFbsBitmap;
-
-/** Base class for MapImage service implementations (@p KMnAppMapImageService). 
- *
- *  Provider Application
- *  must derive its MapImage service class from this one. This base implementation
- *  hides IPC communication details and provides native methods for accessing
- *  various parameters, specified by client.
- *
- *  Provider Application must return pointer to instance of its class, derived
- *  from this class, in response to @p CAknAppService::CreateServiceL() call,
- *  if given parameter is KMnAppMapImageService. 
- *
- *  This class defines handlers of particular requests from client as pure 
- *  virtual methods, which derived class must implement (@ref HandleRenderingL). 
- *  The parameters, which client application may specify in CMnMapImage are 
- *  accessible via other methods of this class. Provider Application must obey 
- *  these parameters.
- *
- *  See parent @ref CMnServiceBase class documentation for 
- *  other details.
- *
- *  @since 5.0
- *  @lib mnservicelib.lib
- *  @ingroup MnProviderAPI
- */
-class CMnMapImageServiceBase : public CMnServiceBase
-    {
-    public :
-
-        /** Returns drawing parameters of map image.
-         *  @param aImageParams Parameters of map image. */
-        IMPORT_C const TMnMapImageParams& MapImageParams() const;
-        
-        /** Returns drawing parameters of map image.
-         *  @param aImageParams Parameters of map image. */
-        IMPORT_C TMnMapImageParams& MapImageParams();
-
-        /** @internal */
-        /*  Sets drawing parameters of map image. Implementation can read
-         *  these by calling MapImageParams().
-         *  @param aImageParams Parameters of map image. */
-        void SetMapImageParams( const TMnMapImageParams& aImageParams );
-
-        /** Returns origin and size of needed image in pixels.
-         *  Size part of that rectangle is the same as specified in MapImageParams().
-         *  @return Rectangle within destination bitmap (see @ref TargetBitmap() ), 
-         *          where the map should be drawn to. */
-    	IMPORT_C TRect TargetRect() const;
-    	
-        /** Returns rendering options set by client. Rendering process
-         *  must obey these options. If it is not possible, it should complete
-         *  rendering with KErrNotSupported.
-         *  @returns Options defined in CMnMapImage::TShowOptions. */
-    	IMPORT_C CMnMapImage::TShowOptions ShowOptions() const;
-    	
-        /** Returns reference to target bitmap object. This is the bitmap, 
-         *  which the map image should be rendered to. 
-         *  It is guaranteed that bitmap's size in pixels is sufficient 
-         *  for drawing. 
-         *  This method should be called only during processing of rendering
-         *  request, i.e. not before HandleRenderingL() or after 
-         *  CompleteRendering() */
-        IMPORT_C CFbsBitmap& TargetBitmap() const;
-        
-        /** Must be called by client when rendering is successfully completed. 
-         *  (If there were an error, then CMnServiceBase::CompleteRequest() 
-         *  should be called instead.)
-         * 
-         *  Before completion, actual type of image drawn should be set in 
-         *  MapImageParams() in case original value was TMnMapImageParams::ETypeUnspecified.
-         * 
-         *  @panic "MnPanicServer"-KMnPanicInvalidResult if image type in
-         *                         @p MapImageParams() is TMnMapImageParams::ETypeUnspecified.
-         *  @panic "MnPanicServer"-KMnPanicAttemptToCompleteNoRequest if
-         *         there is no ongoing asynchronous request. */
-    	IMPORT_C void CompleteRendering();
-    
-    protected :
-        /** C++ constructor */
-        IMPORT_C CMnMapImageServiceBase();
-        /** Destructor */
-        IMPORT_C ~CMnMapImageServiceBase();
-
-        /** This method must be called from derived class' ConstructL to
-         *  allow internal initialization of this class. */
-        IMPORT_C void BaseConstructL();
-
-        /** Handles client's request for rendering map image. 
-         *
-         *  Derived class must implement this method if KMnSvcFeatureRender
-         *  feature is specified in SERVICE_INFO.
-         *
-         *  Implementation should draw map image to bitmap object returned by 
-         *  @ref TargetBitmap(). Drawing must be done to the area of the bitmap, 
-         *  specified by @ref TargetRect(). 
-         *  
-         *  Map image parameters are specified in object of TMnMapImageParams and 
-         *  can be accessed via @ref MapImageOptions(). Center of the drawing must correspond
-         *  to world point given by @ref TMnMapImageParams::GetCentralPoint(), 
-         *  scale must be as specified by @ref TMnMapImageParams::Scale(). Image 
-         *  must be oriented as required by @ref TMnMapImageParams::Direction(). 
-         *  Image type requested is defined in @ref TMnMapImageParams::ImageType().
-         *  Additional options defined by @ref ShowOptions() must also be obeyed 
-         *  (if possible).
-         * 
-         *  If any of those requirements can not be satisfied, rendering must be 
-         *  completed with KErrNotSupported. If any of arguments are considered 
-         *  generally invalid, then error code should be KErrArgument.
-         * 
-         *  This is asynchronous request.
-         *  Implementation should complete this request by calling CompleteRendering()
-         *  if rendering ended successfully or by calling CMnServiceBase::CompleteRequest()
-         *  in case of error. 
-         * 
-         *  This request can be canceled by client, in which case base method 
-         *  DoCancel() will be called.
-         * 
-         *  If this function leaves then client's request is automatically
-         *  completed with error.
-         * 
-         *  @leave KErrNotSupported Should leave if this feature is not supported.
-         */
-        virtual void HandleRenderingL() =0;
-
-    protected: // From CAknAppServiceBase
-
-        /** @internal */
-        IMPORT_C virtual void ServiceL( const RMessage2& aMessage );
-        
-    private:
-        void StartAsyncRequestL( const RMessage2& aMessage );
-    
-        void UnpackOptionsL( const RMessage2& aMessage );    
-        void UnpackImageParamsL( const RMessage2& aMessage );
-        void UnpackBitmapHandleL( const RMessage2& aMessage );
-        void HandleCancelRequestL( const RMessage2& aMessage );
-
-    private:    
-        TMnMapImageParams iMapImageParams;
-        CMnMapImage::TShowOptions iShowOptions;
-        TPoint iTargetOrigin;
-        CFbsBitmap* iBitmap;
-    };
-
-
-#endif /*MN_MAPIMAGESERVICEBASE_H_*/
--- a/locsrv_plat/map_and_navigation_provider_api/inc/mnmapviewservicebase.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,302 +0,0 @@
-/*
-* Copyright (c) 2005-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:  CMnMapViewServiceBase class
-*
-*/
-
-
-#ifndef MN_MAPSERVICEBASE_H
-#define MN_MAPSERVICEBASE_H
-
-#include "mnservicebase.h"
-#include "mnmapview.h"
-
-class TMnMapOptions;
-class CPosLandmark;
-
-/** @brief Base class for MapView service implementations (KMnAppMapViewService). 
- *
- *  Provider Application
- *  must derive its MapView service class from this one. This base implementation
- *  hides IPC communication details and provides native methods for accessing
- *  various map parameters, specified by client.
- *
- *  Provider Application must return pointer to instance of its class, derived
- *  from this class, in response to CAknAppService::CreateServiceL() call,
- *  if given parameter is KMnAppMapViewService. 
- *
- *  This class defines handlers of particular requests from client as pure 
- *  virtual methods, which derived class must implement. The parameters, which
- *  client application may specify in CMnMapView are accessible via other methods
- *  of this class. Provider Application must obey these parameters and use them
- *  as specified in @ref CMnMapView.
- *
- *  See parent @ref CMnServiceBase class documentation for 
- *  other details.
- *
- *  @since 3.1
- *  @lib mnservicelib.lib
- *  @ingroup MnProviderAPI
- */
-class CMnMapViewServiceBase : public CMnServiceBase
-    {
-    public :
-
-        /** @brief Returns map displaying options specified by client application.
-         *
-         *  These options must be utilized in request handlers as specified in 
-         *  @ref CMnMapView. 
-         *  
-         *  @return Options specified by client.
-         */
-        IMPORT_C CMnMapView::TOptions Options();
-        
-        /** @brief Returns Current Location option specified by client application.
-         *
-         *  This option must be utilized in request handlers as specified in 
-         *  @ref CMnMapView. 
-         *  
-         *  @return Current Location options specified by client.
-         */
-        IMPORT_C CMnMapView::TCurrentLocationOption CurrentLocationOption();
-
-        /** @brief Returns array of landmarks as set by client to be shown on map.
-         *
-         *  All these landmarks shall be shown on map.
-         *
-         *  @return Reference to array of landmarks.
-         */          
-        IMPORT_C TArray<const CPosLandmark*> LandmarksToShow();
-
-        /** @brief Returns array of linked landmarks from specified database.
-         *
-         *  All these landmarks shall be shown on map.
-         *
-         *  @param[in] aDbIndex Index of landmark database, which contains returned
-         *                    landmarks. Must be valid for array returned from
-         *                    @ref LandmarksToShowDatabases().
-         *  @return Array of IDs of landmarks from database, specified by
-         *          aDbIndex.
-         *
-         *  @panic "MnPanicServer"-KMnPanicArrayIndexOutOfBounds 
-         *      aDbIndex not valid for the list of databases.
-         */          
-        IMPORT_C TArray<TPosLmItemId> LinkedLandmarksToShow( TInt aDbIndex );
-        
-        /** @brief Returns databases, where linked landmarks belong to.
-         *  @return Array of landmark database URIs.
-         */
-        IMPORT_C TArray<const HBufC*> LandmarksToShowDatabases();
-        
-        /** @brief Returns text, which shall be shown in Select From Map 
-         *  request. 
-         *
-         *  This text is used in HandleSelectFromMapL().
-         *  
-         *  @return Selection request text to be shown to user in 
-         *  HandleSelectFromMapL().
-         */
-        IMPORT_C TPtrC SelectionRequestText();
-        
-        /** @brief Determines whether central point is specified by client.
-         *
-         *  If central point is not set, @ref GetAreaCentralPoint returns
-         *  coordinate with latitude and longitude set to NaN.
-         *
-         *  @return ETrue - if central point is set, EFalse - otherwise,
-         *          and during Show Current Location request.
-         */
-        IMPORT_C TBool IsAreaCentralPointSet();
-        
-        /** @brief Returns central point specified by client.
-         *
-         *  If central point is not set, this
-         *  coordinate has latitude and longitude set to NaN.
-         *
-         *  @param[out] aCentralPoint Central point of map view area, 
-         *                            specified by client.
-         */
-        IMPORT_C void GetAreaCentralPoint( TCoordinate& aCentralPoint );
-        
-        /** @brief Returns radius, in meters, of map view area, specified by client.
-         *
-         *  Implementation has to obey this setting as long as this is within
-         *  allowed range. If it is too low and cannot be used, the implementation
-         *  must select lowest possible radius. If this value is KAutomaticRadius, 
-         *  it is considered not set.
-         */
-        IMPORT_C TReal AreaRadius();
-        
-        /** @brief Completes selection request.
-         *
-         *  Implementation must call this method to signal completion
-         *  of Select From Map request. 
-         *  This override is used if free location from map has been selected by user.
-         *
-         *  @param[in] aLandmark Landmark containing information about 
-         *             user-selected location. As much information as possible
-         *             shall be set.
-         *
-         *  @leave KErrArgument CMnMapView::EOptionRestrictSelection was specified
-         *      by client. 
-         *  @see Options().
-         */
-        IMPORT_C void CompleteSelectionRequestL( const CPosLandmark& aLandmark );
-
-        /** @brief Completes selection request.
-         *
-         *  Implementation must call this method to signal completion
-         *  of Select From Map request. 
-         *  This override is used if one of not linked landmarks has been selected by user.
-         *
-         *  @param[in] aLandmarkIndex Index of not linked landmark containing information about 
-         *             user-selected location. As much information as possible
-         *             shall be set.
-         *
-         *  @panic "MnPanicServer"-KMnPanicArrayIndexOutOfBounds
-         *      aLandmarkIndex is negative or greater than LandmarksToShow().Count().
-         */
-        IMPORT_C void CompleteSelectionRequest( TInt aLandmarkIndex );
-
-        /** @brief Completes selection request.
-         *
-         *  Implementation must call this method to signal completion
-         *  of Select From Map request. 
-         *  This override is used if one of linked landmarks, passed by client
-         *  has been selected by user.
-         *
-         *  @param aLandmarkId ID of landmark selected by user.
-         *  @param aDbIndex Index of database where landmark specified by
-         *                      aLandmarkId belongs to.
-         *
-         *  @panic "MnPanicServer"-KMnPanicArrayIndexOutOfBounds
-         *      aDbIndex is negative or greater than LandmarksToShowDatabases().Count().
-         */
-        IMPORT_C void CompleteSelectionRequest( TPosLmItemId aLandmarkId, TInt aDbIndex );
-    
-    protected :
-    
-        /** C++ constructor */
-        IMPORT_C CMnMapViewServiceBase();
-        /** Destructor */
-        IMPORT_C virtual ~CMnMapViewServiceBase();
-
-        /** This method must be called from derived class' ConstructL to
-         *  allow internal initialization of this class. */
-        IMPORT_C void BaseConstructL();
-        
-        /** @brief Handles client's request for showing map. 
-         *
-         *  Derived class must implement this method obeying 
-         *  specification of @ref CMnMapView::ShowMapL and if @ref KMnSvcFeatureShowMap
-         *  feature is specified in its SERVICE_INFO.
-         *
-         *  Landmarks returned by LandmarksToShow and LinkedLandmarksToShow shall be 
-         *  shown on map.
-         *
-         *  This is synchronous request.
-         *  Client's request will be completed when this method exits, therefore
-         *  it should exit immediately after map view is shown.
-         *  
-         *  @leave KErrNotSupported Should leave if this feature is not supported.
-         */
-        virtual void HandleShowMapL() =0;
-
-        /** @brief Handles client's request for showing map from current location. 
-         *
-         *  Derived class must implement this method obeying specification of 
-         *  @ref CMnMapView::ShowCurrentLocationL and if @ref KMnSvcFeatureShowMap
-         *  feature is specified in its SERVICE_INFO.
-         *  
-         *  Landmarks returned by LandmarksToShow and LinkedLandmarksToShow shall be 
-         *  shown on map.
-         *
-         *  This is synchronous request.
-         *  Client's request will be completed when this method exits, therefore
-         *  it should exit immediately after map view is shown.
-         *  
-         *  @leave KErrNotSupported Should leave if this feature is not supported.
-         */
-        virtual void HandleShowCurrentLocationL() =0;
-
-        /** @brief Handles client's request for selecting a location from map. 
-         *
-         *  Derived class must implement this method obeying specification of 
-         *  @ref CMnMapView::SelectFromMapL and if KMnSvcFeatureSelectFromMap
-         *  feature is specified in its SERVICE_INFO.
-         *  
-         *  Landmarks returned by LandmarksToShow and LinkedLandmarksToShow shall be 
-         *  shown on map.
-         *
-         *  This is asynchronous request.
-         *  It must be completed (in successful case) with one of 
-         *  CompleteSelectionRequest overloads.
-         *  
-         *  @leave KErrNotSupported Should leave if this feature is not supported.
-         */
-        virtual void HandleSelectFromMapL() =0;
-
-    protected: // From CAknAppServiceBase
-
-        /** \internal */
-        IMPORT_C void ServiceL( const RMessage2& aMessage );
-
-    private: // Internal methods
-
-        void CleanSelectionResult();
-
-        void HandleAddLandmarkIdsToShowL( const RMessage2& aMessage );
-        void HandleAddLandmarksToShowL( const RMessage2& aMessage );
-        void HandleGetSelectionResultLandmarkL( const RMessage2& aMessage );
-        void HandleGetSelectionResultDbUriL( const RMessage2& aMessage );
-        
-        void ResetLandmarks();        
-        TInt FindDatabase( const TDesC& aUri );
-
-        void UnpackOptionsL( const RMessage2& aMsg );
-        void UnpackSelectionRequestTextL( const RMessage2& aMsg );
-
-        void VerifySelectionRequestL();
-
-    private:
-        class CLinkedLandmarksList : public CBase
-            {
-            public:
-                ~CLinkedLandmarksList();
-                
-                HBufC*                  iDatabaseUri;
-                RArray< TPosLmItemId >  iLandmarkIds;
-            };
-
-    private:
-
-        CMnMapView::TOptions                iOptions;
-        CMnMapView::TCurrentLocationOption  iCurrentLocationOption;
-        
-        TCoordinate                         iCentralPoint;
-        TReal                               iRadius;
-        HBufC*                              iSelectionRequestText;
-        
-        RPointerArray< const CPosLandmark >     iLandmarks;
-        RPointerArray< CLinkedLandmarksList >   iLinkedLandmarksLists;
-
-        RPointerArray< const HBufC >        iTempDatabaseList;
-        
-        HBufC8*                             iResultLandmark;
-        TInt                                iResultDbIndex;
-    };
-
-#endif // MN_MAPSERVICEBASE_H
-
-
--- a/locsrv_plat/map_and_navigation_provider_api/inc/mnnavigationservicebase.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,84 +0,0 @@
-/*
-* Copyright (c) 2005-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:  CMnNavigationServiceBase class
-*
-*/
-
-
-#ifndef MN_NAVIGATIONSERVICEBASE_H
-#define MN_NAVIGATIONSERVICEBASE_H
-
-#include "mnservicebase.h"
-
-class CPosLandmark;
-
-/** @brief Base class for navigation service implementations (KMnAppNavigationService). 
- * 
- *  Provider Application must derive its navigation service 
- *  class from this one. This base implementation
- *  hides IPC communication details.
- *
- *  Provider Application must return pointer to instance of its class, derived
- *  from this class, in response to CAknAppService::CreateServiceL() call,
- *  if given parameter is KMnAppNavigationService. 
- *
- *  This class defines navigation request handler as pure 
- *  virtual method, which derived class must implement. 
- *  Implementation must obey specification of @ref CMnNavigator.
- *
- *  See parent @ref CMnServiceBase class documentation for 
- *  other details.
- *
- *  @since 3.1
- *  @lib mnservicelib.lib
- *  @ingroup MnProviderAPI
- */
-class CMnNavigationServiceBase : public CMnServiceBase
-    {
-    public :
-    protected :
-        /** C++ constructor */
-        IMPORT_C CMnNavigationServiceBase();
-        /** Destructor */
-        IMPORT_C ~CMnNavigationServiceBase();
-
-        /** This method must be called from derived class' ConstructL to
-         *  allow internal initialization of this class. */
-        IMPORT_C void BaseConstructL();
-
-        /** @brief Handles client's request for navigation. 
-         *
-         *  Derived class must implement this method obeying specification of 
-         *  @ref CMnNavigator::NavigateToL() and if KMnSvcFeatureNavigateTo
-         *  feature is specified in SERVICE_INFO.
-         *
-         *  This is synchronous request.
-         *  Client's request will be completed when this method exits, therefore
-         *  it should exit immediately after navigation is started.
-         *
-         *  @param[in] aDestination The landmark, defines destination of the
-         *                      navigation requested.
-         *  
-         *  @leave KErrNotSupported Should leave if this feature is not supported.
-         */
-        virtual void HandleNavigateToL(const CPosLandmark& aDestination) =0;
-
-    protected: // From CAknAppServiceBase
-
-        /** \internal */
-        IMPORT_C virtual void ServiceL(const RMessage2& aMessage);
-    };
-
-#endif // MN_NAVIGATIONSERVICEBASE_H
-
--- a/locsrv_plat/map_and_navigation_provider_api/inc/mnservicebase.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,169 +0,0 @@
-/*
-* Copyright (c) 2005-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:  CMnServiceBase class
-*
-*/
-
-
-#ifndef MN_SERVICEBASE_H
-#define MN_SERVICEBASE_H
-
-#include <aknserverapp.h>
-
-class CPosLandmark;
-
-/** @brief Base class for all Map and Navigation services.
- *
- *  Its only purpose is to provide common base functionality for Map and Navigation
- *  service classes.
- *
- *  There are both synchronous and asynchronous request handlers defined in derived
- *  service base classes. Implementations of handlers shall behave as follows.
- *  <ul>
- *  <li>For Synchronous requests:</li>
- *  <ul>
- *  <li>Exit normally to report successful completion</li>
- *  <li>Leave with error code to report error</li>
- *  </ul>
- *  <li>For Asynchronous requests:</li>
- *  <ul>
- *  <li>Exit normally as soon as possible. Call dedicated Complete method
- *      to report successful completion</li>
- *  <li>Leave with error code to report error found during execution of
- *      Handle method</li>
- *  <li>Call CompleteRequest method with error code to report error
- *      found after execution of Handle method</li>
- *  <li>Call CancelRequest method to report that user has cancelled
- *      execution</li>
- *  </ul>
- *  </ul>
- *
- *  Following error codes shall be used by implementation to report specific cases:
- *  - KErrCancel - If user has cancelled operation.
- *  - KErrArgument - If given argument cannot be used for operation. For example, landmark has
- *          no coordinate or address and cannot be shown on map or address information
- *          is not sufficient for geocoding.
- *  - KErrNotSupported - If service feature is not supported, or cannot be executed with given parameters.
- *          For example, map content not available for specified area etc.
- *
- *  @since 3.1
- *  @lib mnservicelib.lib
- *  @ingroup MnProviderAPI
- */
-class CMnServiceBase : public CAknAppServiceBase
-    {
-    public :
-
-        /** @brief Completes current asynchronous request.
-         *
-         *  Called by implementations to complete client's request. Used
-         *  by service implementations to report errors during execution
-         *  of asynchronous requests. To report successful completion,
-         *  special methods defined by service base classes should be used
-         *  (e.g. @ref CMnMapViewServiceBase::CompleteSelectionRequest)
-         *
-         *  For synchronous requests, handler should
-         *  just leave if error is detected.
-         *
-         *  @param aResult Error code.
-         *
-         *  @panic "MnPanicServer"-KMnPanicAttemptToCompleteNoRequest
-         *      This method called during execution of synchronous request.
-         */
-        IMPORT_C void CompleteRequest( TInt aResult );
-
-    protected :
-        /** C++ constructor */
-        CMnServiceBase();
-        /** Destructor */
-        ~CMnServiceBase();
-
-        /** \internal */
-        void BaseConstructL();
-
-        /** @brief Reports that client cancelled request.
-         *
-         *  Called by framework to report that request was
-         *  cancelled by client application. Service implementations
-         *  must implement this method. It is not needed to call
-         *  @ref CompleteRequest() in this case.
-         */
-        virtual void DoCancel() =0;
-
-    protected: // internal methods
-
-        /** \internal
-         *  Completes client's message
-         */
-        void Complete( const RMessage2& aMsg, TInt aResult );
-
-        /** \internal
-         *  Informs derived implementation (by calling DoCancel())
-         *  that current async request has been cancelled by client and
-         *  completes it with KErrCancel.
-         */
-        void HandleCancelRequestL( const RMessage2& aMsg );
-
-        /** \internal
-        * Copies an 8-bit buffer from the address space of the client and puts
-        * the result in the returned argument.
-        *
-        * @param aMessage the message from the client.
-        * @param aClientBufferParam index of message parameter to read as buffer
-        * @return a copy of the client buffer.
-        */
-        static HBufC8* CopyClientBuffer8LC(
-            const RMessage2& aMessage,
-            const TInt aClientBufferParam );
-
-        /** \internal
-        * Copies a 16-bit buffer from the address space of the client and puts
-        * the result in the returned argument.
-        *
-        * @param aMessage the message from the client.
-        * @param aClientBufferParam index of message parameter to read as buffer
-        * @return a copy of the client buffer.
-        */
-        static HBufC* CopyClientBufferLC(
-            const RMessage2& aMessage,
-            const TInt aClientBufferParam );
-
-        /** \internal
-         *  Unpacks landmark from client's message.
-         *  @param  aMsg client's message
-         *  @param  aParamIndex index of landmark parameter in message
-         *  @return new copy instance of client's landmark
-         */
-        CPosLandmark* UnpackLandmarkLC( const RMessage2& aMsg, TInt aParamIndex );
-
-        /** @internal */
-        TInt CurrentAsyncRequest();
-        /** @internal */
-        TBool IsAsyncRequestActive();
-        /** @internal */
-        void PrepareAsyncRequestL( const RMessage2& aMessage );
-
-    protected:  // from CApaAppServiceBase
-        /** @internal */
-        IMPORT_C void ServiceError( const RMessage2 &aMessage, TInt aError );
-
-    protected:
-        RMessage2   iMessage;
-
-    private:
-        TInt        iCurrentRequest;
-    };
-
-#endif // MN_SERVICEBASE_H
-
--- a/locsrv_plat/map_and_navigation_provider_api/inc/mnserviceinfo.rh	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,59 +0,0 @@
-/*
-* Copyright (c) 2005-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:  Resource structures for Provider Application info
-*  Interface   : Domain/S60, Map and Navigation Provider API
-*
-*/
-
-
-#ifndef MN_SERVICE_INFO_RH
-#define MN_SERVICE_INFO_RH
-
-#include <appinfo.rh>
-
-#include <mnappserviceuids.hrh>
-
-/** @file
- *  Definition of @ref MN_SERVICE_INFO resource structure.
- */
-
- /** @struct MN_SERVICE_INFO
- *  @brief Map and Navigation Provider Application service info structure.
- *
- *  Link to this structure should be put as @p opaque_data field of
- *  application's SERVICE_INFO struct, which declares one of
- *  Map and Navigation services (defined in MnAppServiceUids.hrh).
- *
- *  <HR>
- *
- *  @section flds Fields:
- *
- *  @code LONG service_features =0; \endcode
- *  Bitmap of service feature values, defined in MnAppServices.hrh.
- *  It defines what Map and Navigation service features are supported by this
- *  Provider Application. This information is used by Map and Navigation
- *  AIW Provider to get early service support information without loading
- *  Provider Application.
- *
- *  @ingroup MnProviderAPI
- *  @since 3.1
- *  @lib mnservicelib.lib
- */
-STRUCT MN_SERVICE_INFO
-    {
-    LONG service_features = 0;
-    }
-
-#endif // MN_SERVICE_INFO_RH
-
--- a/locsrv_plat/map_and_navigation_provider_api/map_and_navigation_provider_api.metaxml	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
-<?xml version="1.0" ?>
-<api id="bfb48875f641ca798edc02112dd45bb8" dataversion="2.0">
-  <name>Map and Navigation Provider API</name>
-  <description>This is the server side of server application service API. Provider Applications implement it.</description>
-  <type>c++</type>
-  <collection>locationmapnavfw</collection>
-  <libs>
-    <lib name="mnservicelib.lib" />
-  </libs>
-  <release category="platform"/>
-  <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>no</htmldocprovided>
-     <adaptation>no</adaptation>
-  </attributes>
-</api>
--- a/locsrv_plat/map_and_navigation_provider_discovery_api/group/bld.inf	Mon May 03 12:54:42 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 
-:                Map and Navigation Provider Discovery API
-*
-*/
-
-
-#include <platform_paths.hrh>
-
-PRJ_PLATFORMS
-DEFAULT
-
-PRJ_EXPORTS
-
-../inc/mnprovider.h           MW_LAYER_PLATFORM_EXPORT_PATH(mnprovider.h)
-../inc/mnproviderfinder.h     MW_LAYER_PLATFORM_EXPORT_PATH(mnproviderfinder.h)
--- a/locsrv_plat/map_and_navigation_provider_discovery_api/inc/mnprovider.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,111 +0,0 @@
-/*
-* Copyright (c) 2005-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:  CMnProvider class
-*
-*/
-
-
-#ifndef MN_PROVIDER_H
-#define MN_PROVIDER_H
-
-#include <e32base.h>
-
-/** Represents information about Provider Application.
- *  
- *  Use class @ref MnProviderFinder to find all provider applications.
- *
- *  @since 3.1
- *  @lib mnclientlib.dll
- *  @ingroup MnProviderDiscoveryAPI
- */   
-class CMnProvider : public CBase
-    {
-    public :
-        /** Type for bitmap of @ref TService values. */
-        typedef TUint32 TServices;
-        
-        /** Map and Navigation application services */
-        enum TService
-            {
-            /** Uninitialized value */
-            EServiceNone            = 0x00,
-            /** Defines that Provider Application supports
-             *  CMnMapView */
-            EServiceMapView         = 0x01,
-            /** Defines that Provider Application supports
-             *  CMnNavigator */
-            EServiceNavigation      = 0x02,
-            /** Defines that Provider Application supports
-             *  CMnGeocoder */
-            EServiceGeocoding       = 0x04,
-            /** Defines that Provider Application supports 
-             *  requests for map images */
-            EServiceMapImage        = 0x08
-            };
-    
-        /** Destructor */
-        IMPORT_C ~CMnProvider();
-    
-        /** Returns UID of Provider Application */
-        IMPORT_C TUid Uid() const;
-        
-        /** Returns version information of Provider Application */
-        IMPORT_C TVersion Version() const;
-        
-        /** Returns localized name of this Provider Application.
-         *
-         *  Displayable name is specified in application registration file.
-         *  (See APP_REGISTRATION_INFO for details).
-         *  @param[out] aName Displayable name of Provider Application
-         */
-        IMPORT_C void GetName( TPtrC& aName ) const;
-        
-        /** Returns short localized name of this Provider Application.
-         *
-         *  Short name is specified in its application registration file.
-         *  (See APP_REGISTRATION_INFO for details).
-         *  @param[out] aShortName Short displayable name of Provider Application
-         */
-        IMPORT_C void GetShortName( TPtrC& aShortName ) const;
-        
-        /** Returns localized name of Provider Application's vendor. 
-         *
-         *  @param[out] aVendorName Vendor name of this Provider Application
-         */
-        IMPORT_C void GetVendorName( TPtrC& aVendorName ) const;
-        
-        /** Returns what map and navigation related services 
-         *  are supported by this Provider Application. */
-        IMPORT_C TServices SupportedServices() const;
-
-        /* Returns what service features
-         *  are supported by this Provider Application. 
-         *  Service features are defined in MnAppServices.hrh.
-         */
-        virtual TUint32 SupportedFeatures( TService aService ) const;
-
-    protected :
-        CMnProvider();
-        CMnProvider( CMnProvider& );
-
-    protected :
-        TUid iUid;
-        HBufC* iName;
-        HBufC* iShortName;
-        HBufC* iVendorName;
-        TServices iServices;
-        TVersion iVersion;
-    };
-
-#endif // MN_PROVIDER_H
--- a/locsrv_plat/map_and_navigation_provider_discovery_api/inc/mnproviderfinder.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,61 +0,0 @@
-/*
-* Copyright (c) 2005-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:  MnProviderFinder class
-*
-*/
-
-
-#ifndef MN_PROVIDERFINDER_H
-#define MN_PROVIDERFINDER_H
-
-#include <e32cmn.h>
-#include "mnprovider.h"
-
-/** @brief Provides static methods for discovering
- *  Map and Navigation provider applications available in the system.
- *
- *  @since 3.1
- *  @lib mnclientlib.dll
- *  @ingroup DiscoveryAPI
- */
-class MnProviderFinder
-    {
-    public :
-        /** @brief Finds all Map and Navigation Provider Applications
-         *  in the system.
-         *
-         *  @param[out] aProviders Array of provider applications found. This
-         *                         array is left unchanged, if no providers found.
-         *                         Client takes ownership of objects in the array.
-         */
-        IMPORT_C static void FindProvidersL(
-            RPointerArray<CMnProvider>& aProviders);
-
-        /** @brief Finds all Map and Navigation Provider Applications
-         *  in the system, which are capable of specified features.
-         *
-         *  @param[out] aProviders Array of provider applications found. This
-         *                         array is left unchanged, if no providers found.
-         *                         Client takes ownership of objects in the array.
-         *  @param aRequiredServices Bitmap of map and navigation features. Only
-         *                           those providers, which support all these
-         *                           services are listed on return.
-         */
-        IMPORT_C static void FindProvidersL(
-            RPointerArray<CMnProvider>& aProviders,
-            CMnProvider::TServices aRequiredServices);
-    };
-
-#endif // MN_PROVIDERFINDER_H
-
--- a/locsrv_plat/map_and_navigation_provider_discovery_api/map_and_navigation_provider_discovery_api.metaxml	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
-<?xml version="1.0" ?>
-<api id="f893073def01944f00e035d8d00670fe" dataversion="2.0">
-  <name>Map and Navigation Provider Discovery API</name>
-  <description>This API provides access to information about available Provider Applications.</description>
-  <type>c++</type>
-  <collection>locationmapnavfw</collection>
-  <libs>
-    <lib name="mnclientlib.lib" />
-  </libs>
-  <release category="platform" sinceversion="0"/>
-  <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>no</htmldocprovided>
-     <adaptation>no</adaptation>
-  </attributes>
-</api>
--- a/locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/bmarm/testmnproviderdiscoveryu.def	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-EXPORTS
-	LibEntryL__FR13CTestModuleIf @ 1 NONAME R3UNUSED ; LibEntryL(CTestModuleIf &)
-
--- a/locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/bwins/testmnproviderdiscoveryu.def	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-EXPORTS
-	?LibEntryL@@YAPAVCScriptBase@@AAVCTestModuleIf@@@Z @ 1 NONAME ; class CScriptBase * __cdecl LibEntryL(class CTestModuleIf &)
-
--- a/locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/conf/testmnproviderdiscovery.cfg	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,69 +0,0 @@
-[Test]
-title Find All Providers
-create testmnproviderdiscovery foobar
-foobar FindAllProviders
-delete foobar
-[Endtest] 
-
-[Test]
-title Find Selected Providers
-create testmnproviderdiscovery foobar
-foobar FindSelectedProviders
-delete foobar
-[Endtest]
-
-[Test]
-title Destroy Provider
-create testmnproviderdiscovery foobar
-foobar DestroyProvider
-delete foobar
-[Endtest]  
-
-[Test]
-title Provider Uid
-create testmnproviderdiscovery foobar
-foobar ProviderUid
-delete foobar
-[Endtest]  
-
-[Test]
-title Provider Version
-create testmnproviderdiscovery foobar
-foobar ProviderVersion
-delete foobar
-[Endtest]
-
-[Test]
-title Provider Name
-create testmnproviderdiscovery foobar
-foobar GetProviderName
-delete foobar
-[Endtest]
-
-[Test]
-title Provider Short Name
-create testmnproviderdiscovery foobar
-foobar GetShortName
-delete foobar
-[Endtest]
-
-[Test]
-title Provider Vendor Name
-create testmnproviderdiscovery foobar
-foobar GetVendorName
-delete foobar
-[Endtest]
-
-[Test]
-title Supported Services
-create testmnproviderdiscovery foobar
-foobar SupportedServices
-delete foobar
-[Endtest]
-
-[Test]
-title Supported Features
-create testmnproviderdiscovery foobar
-foobar SupportedFeatures
-delete foobar
-[Endtest]
\ No newline at end of file
Binary file locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/data/armv5/urel/MnRefProvider.mbm has changed
Binary file locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/data/armv5/urel/MnRefProvider.mif has changed
Binary file locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/data/armv5/urel/MnRefProvider.rsc has changed
Binary file locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/data/armv5/urel/MnRefProviderPlugin.dll has changed
--- a/locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/data/armv5/urel/MnRefProviderPlugin.dll.map	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,160 +0,0 @@
-ARM Linker, RVCT2.2 [Build 593]
-
-================================================================================
-
-Image Symbol Table
-
-    Local Symbols
-
-    Symbol Name                              Value     Ov Type        Size  Object(Section)
-
-    [Anonymous Symbol]                       0x00000000   Number         0  drtaeabi{000a0000}-184.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnrefproviderengine{000a0000}-43.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnclientlib{000a0000}-97.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  scppnwdl{000a0000}-3.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnrefproviderengine{000a0000}-44.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnrefproviderengine{000a0000}-12.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  drtaeabi{000a0000}-158.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  drtaeabi{000a0000}-147.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnrefproviderengine{000a0000}-16.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnclientlib{000a0000}-101.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-208.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnrefproviderengine{000a0000}-21.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-654.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-2123.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnclientlib{000a0000}-100.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-205.o ABSOLUTE
-    M:/epoc32/build/compsupp/c_18558cc638e6e874/drtaeabi_dll/armv5/udeb\VtblExports.s 0x00000000   Number         0  VtblExports.o ABSOLUTE
-    M:\\sf\\os\\kernelhwsrv\\kernel\\eka\\compsupp\\rvct2_2\\ucppinit_aeabi.cpp 0x00000000   Number         0  ucppinit_aeabi.o ABSOLUTE
-    M:\sf\os\kernelhwsrv\kernel\eka\compsupp\rvct2_2\ucppinit_aeabi.cpp 0x00000000   Number         0  ucppinit_aeabi.o ABSOLUTE
-    \EPOC32\BUILD\sf\app\location\group\MNREFENGINE\ARMV5\VtblExports.s 0x00000000   Number         0  VtblExports.o ABSOLUTE
-    \EPOC32\BUILD\sf\app\location\mapnavproviderrefapp\group\MNREFPROVIDERPLUGIN\ARMV5\urel\MnRefProviderPlugin{000a0000}.s 0x00000000   Number         0  MnRefProviderPlugin{000a0000}.exp ABSOLUTE
-    \EPOC32\BUILD\sf\mw\locationsrv\group\MNCLIENTLIB\ARMV5\VtblExports.s 0x00000000   Number         0  VtblExports.o ABSOLUTE
-    \EPOC32\BUILD\sf\os\kernelhwsrv\kernel\eka\euser\EDLL\ARMV6_ABIV1\urel\uc_dll_.cpp 0x00000000   Number         0  uc_dll_.o ABSOLUTE
-    \EPOC32\BUILD\sf\os\kernelhwsrv\kernel\eka\euser\EUSER\ARMV5\VtblExports.s 0x00000000   Number         0  VtblExports.o ABSOLUTE
-    \EPOC32\BUILD\sf\os\lbs\locationmgmt\locationadmin\group\LBSAPIVARIANT2\ARMV5\VtblExports.s 0x00000000   Number         0  VtblExports.o ABSOLUTE
-    \\EPOC32\\BUILD\\sf\\os\\kernelhwsrv\\kernel\\eka\\euser\\EDLL\\ARMV6_ABIV1\\urel\\uc_dll_.cpp 0x00000000   Number         0  uc_dll_.o ABSOLUTE
-    \sf\app\location\mapnavproviderrefapp\src\mnrefproviderplugin.cpp 0x00000000   Number         0  MnRefProviderPlugin.in ABSOLUTE
-    \sf\app\location\mapnavproviderrefapp\src\mnrpcoordconverter.cpp 0x00000000   Number         0  MnRefProviderPlugin.in ABSOLUTE
-    \sf\os\kernelhwsrv\kernel\eka\euser\epoc\arm\uc_dll.cpp 0x00000000   Number         0  uc_dll.o ABSOLUTE
-    .emb_text                                0x00008000   Section       40  uc_dll_.o(.emb_text)
-    .emb_text                                0x00008028   Section       72  ucppinit_aeabi.o(.emb_text)
-    skip                                     0x0000803c   ARM Code       0  ucppinit_aeabi.o(.emb_text)
-    loop                                     0x0000804c   ARM Code       0  ucppinit_aeabi.o(.emb_text)
-    fpinit                                   0x00008064   Data           0  ucppinit_aeabi.o(.emb_text)
-    base                                     0x00008068   Data           0  ucppinit_aeabi.o(.emb_text)
-    limit                                    0x0000806c   Data           0  ucppinit_aeabi.o(.emb_text)
-    .text                                    0x00008070   Section       12  MnRefProviderPlugin.in(.text)
-    .text                                    0x0000807c   Section      232  MnRefProviderPlugin.in(.text)
-    .text                                    0x00008164   Section       40  uc_dll.o(.text)
-    .text.clean                              0x0000818c   Section       10  MnRefProviderPlugin.in(.text.clean)
-    ExportTable                              0x00008198   Section       12  MnRefProviderPlugin{000a0000}.exp(ExportTable)
-    StubCode                                 0x000081a4   Section        8  euser{000a0000}-205.o(StubCode)
-    theImportedSymbol                        0x000081a8   Data           0  euser{000a0000}-205.o(StubCode)
-    StubCode                                 0x000081ac   Section        8  euser{000a0000}-208.o(StubCode)
-    theImportedSymbol                        0x000081b0   Data           0  euser{000a0000}-208.o(StubCode)
-    StubCode                                 0x000081b4   Section        8  euser{000a0000}-2123.o(StubCode)
-    theImportedSymbol                        0x000081b8   Data           0  euser{000a0000}-2123.o(StubCode)
-    StubCode                                 0x000081bc   Section        8  euser{000a0000}-654.o(StubCode)
-    theImportedSymbol                        0x000081c0   Data           0  euser{000a0000}-654.o(StubCode)
-    StubCode                                 0x000081c4   Section        8  mnclientlib{000a0000}-100.o(StubCode)
-    theImportedSymbol                        0x000081c8   Data           0  mnclientlib{000a0000}-100.o(StubCode)
-    StubCode                                 0x000081cc   Section        8  mnclientlib{000a0000}-101.o(StubCode)
-    theImportedSymbol                        0x000081d0   Data           0  mnclientlib{000a0000}-101.o(StubCode)
-    StubCode                                 0x000081d4   Section        8  mnclientlib{000a0000}-97.o(StubCode)
-    theImportedSymbol                        0x000081d8   Data           0  mnclientlib{000a0000}-97.o(StubCode)
-    StubCode                                 0x000081dc   Section        8  mnrefproviderengine{000a0000}-12.o(StubCode)
-    theImportedSymbol                        0x000081e0   Data           0  mnrefproviderengine{000a0000}-12.o(StubCode)
-    StubCode                                 0x000081e4   Section        8  mnrefproviderengine{000a0000}-16.o(StubCode)
-    theImportedSymbol                        0x000081e8   Data           0  mnrefproviderengine{000a0000}-16.o(StubCode)
-    StubCode                                 0x000081ec   Section        8  mnrefproviderengine{000a0000}-21.o(StubCode)
-    theImportedSymbol                        0x000081f0   Data           0  mnrefproviderengine{000a0000}-21.o(StubCode)
-    StubCode                                 0x000081f4   Section        8  mnrefproviderengine{000a0000}-43.o(StubCode)
-    theImportedSymbol                        0x000081f8   Data           0  mnrefproviderengine{000a0000}-43.o(StubCode)
-    StubCode                                 0x000081fc   Section        8  mnrefproviderengine{000a0000}-44.o(StubCode)
-    theImportedSymbol                        0x00008200   Data           0  mnrefproviderengine{000a0000}-44.o(StubCode)
-    StubCode                                 0x00008204   Section        8  drtaeabi{000a0000}-147.o(StubCode)
-    theImportedSymbol                        0x00008208   Data           0  drtaeabi{000a0000}-147.o(StubCode)
-    StubCode                                 0x0000820c   Section        8  drtaeabi{000a0000}-158.o(StubCode)
-    theImportedSymbol                        0x00008210   Data           0  drtaeabi{000a0000}-158.o(StubCode)
-    StubCode                                 0x00008214   Section        8  drtaeabi{000a0000}-184.o(StubCode)
-    theImportedSymbol                        0x00008218   Data           0  drtaeabi{000a0000}-184.o(StubCode)
-    StubCode                                 0x0000821c   Section        8  scppnwdl{000a0000}-3.o(StubCode)
-    theImportedSymbol                        0x00008220   Data           0  scppnwdl{000a0000}-3.o(StubCode)
-    .extab._ZN19CMnrpCoordConverterD1Ev      0x00008224   Data           0  MnRefProviderPlugin.in(.ARM.extab)
-    .constdata$1                             0x00008234   Data           0  MnRefProviderPlugin.in(.constdata)
-    ImplementationTable                      0x00008234   Data           8  MnRefProviderPlugin.in(.constdata)
-    .constdata                               0x00008234   Section        8  MnRefProviderPlugin.in(.constdata)
-    .constdata__ZTI19CMnrpCoordConverter     0x0000823c   Section       12  MnRefProviderPlugin.in(.constdata__ZTI19CMnrpCoordConverter)
-    .constdata__ZTS19CMnrpCoordConverter     0x00008248   Section       22  MnRefProviderPlugin.in(.constdata__ZTS19CMnrpCoordConverter)
-    .constdata__ZTV19CMnrpCoordConverter     0x00008260   Section       28  MnRefProviderPlugin.in(.constdata__ZTV19CMnrpCoordConverter)
-    .ARM.exidx                               0x0000827c   Section        8  ucppinit_aeabi.o(.ARM.exidx)
-
-    Global Symbols
-
-    Symbol Name                              Value     Ov Type        Size  Object(Section)
-
-    BuildAttributes$$THUMB_ISAv3$ARM_ISAv6$M$E$P$PE$A:L22$X:L11$S22$IEEE1$IW$USESV6$~STKCKD$USESV7$~SHL$OSPACE$IEEEJ$EBA8$UX$REQ8$PRES8$EABIv2 0x00000000   Number         0  anon$$obj.o ABSOLUTE
-    #<DLL>drtaeabi{000a0000}.dll#<\DLL>93     - Undefined Reference
-    #<DLL>drtaeabi{000a0000}.dll#<\DLL>9e     - Undefined Reference
-    #<DLL>drtaeabi{000a0000}.dll#<\DLL>b8     - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>28e  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>84b  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>cd  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>d0  - Undefined Reference
-    #<DLL>mnclientlib{000a0000}[10206902].dll#<\DLL>61  - Undefined Reference
-    #<DLL>mnclientlib{000a0000}[10206902].dll#<\DLL>64  - Undefined Reference
-    #<DLL>mnclientlib{000a0000}[10206902].dll#<\DLL>65  - Undefined Reference
-    #<DLL>mnrefproviderengine{000a0000}[03132015].dll#<\DLL>10  - Undefined Reference
-    #<DLL>mnrefproviderengine{000a0000}[03132015].dll#<\DLL>15  - Undefined Reference
-    #<DLL>mnrefproviderengine{000a0000}[03132015].dll#<\DLL>2b  - Undefined Reference
-    #<DLL>mnrefproviderengine{000a0000}[03132015].dll#<\DLL>2c  - Undefined Reference
-    #<DLL>mnrefproviderengine{000a0000}[03132015].dll#<\DLL>c  - Undefined Reference
-    #<DLL>scppnwdl{000a0000}.dll#<\DLL>3      - Undefined Reference
-    SHT$$INIT_ARRAY$$Base                     - Undefined Weak Reference
-    SHT$$INIT_ARRAY$$Limit                    - Undefined Weak Reference
-    typeinfo for CMnCoordinateConverterBase   - Undefined Reference
-    vtable for __cxxabiv1::__si_class_type_info  - Undefined Reference
-    _fp_init                                  - Undefined Weak Reference
-    run_static_dtors                          - Undefined Weak Reference
-    Image$$ER_RO$$Base                       0x00008000   Number         0  anon$$obj.o(linker$$defined$$symbols)
-    _E32Dll                                  0x00008000   ARM Code      40  uc_dll_.o(.emb_text)
-    Symbian$$CPP$$Exception$$Descriptor      0x00008014   Data           0  uc_dll_.o(.emb_text)
-    __cpp_initialize__aeabi_                 0x00008028   ARM Code      72  ucppinit_aeabi.o(.emb_text)
-    ImplementationGroupProxy(int&)           0x00008071   Thumb Code     8  MnRefProviderPlugin.in(.text)
-    std::nothrow                             0x00008071   Thumb Code     0  ucppinit_aeabi.o(.emb_text)
-    CMnrpCoordConverter::CMnrpCoordConverter() 0x0000807d   Thumb Code    12  MnRefProviderPlugin.in(.text)
-    CMnrpCoordConverter::CMnrpCoordConverter__sub_object() 0x0000807d   Thumb Code     0  MnRefProviderPlugin.in(.text)
-    CMnrpCoordConverter::NewL()              0x00008089   Thumb Code    38  MnRefProviderPlugin.in(.text)
-    CMnrpCoordConverter::~CMnrpCoordConverter() 0x000080af   Thumb Code    40  MnRefProviderPlugin.in(.text)
-    CMnrpCoordConverter::~CMnrpCoordConverter__sub_object() 0x000080af   Thumb Code     0  MnRefProviderPlugin.in(.text)
-    CMnrpCoordConverter::~CMnrpCoordConverter__deallocating() 0x000080d7   Thumb Code    16  MnRefProviderPlugin.in(.text)
-    CMnrpCoordConverter::GetImageCoordinate(const TCoordinate&, TPoint&) 0x000080e7   Thumb Code    62  MnRefProviderPlugin.in(.text)
-    CMnrpCoordConverter::GetWorldCoordinate(const TPoint&, TCoordinate&) 0x00008125   Thumb Code    60  MnRefProviderPlugin.in(.text)
-    _E32Dll_Body                             0x00008165   Thumb Code    34  uc_dll.o(.text)
-    __DLL_Export_Table__                     0x00008198   ARM Code       0  MnRefProviderPlugin{000a0000}.exp(ExportTable)
-    DLL##ExportTableSize                     0x0000819c   Data           0  MnRefProviderPlugin{000a0000}.exp(ExportTable)
-    DLL##ExportTable                         0x000081a0   Data           0  MnRefProviderPlugin{000a0000}.exp(ExportTable)
-    CleanupStack::Pop()                      0x000081a4   ARM Code       0  euser{000a0000}-205.o(StubCode)
-    CleanupStack::PushL(CBase*)              0x000081ac   ARM Code       0  euser{000a0000}-208.o(StubCode)
-    CBase::Extension_(unsigned, void*&, void*) 0x000081b4   ARM Code       0  euser{000a0000}-2123.o(StubCode)
-    User::AllocZL(int)                       0x000081bc   ARM Code       0  euser{000a0000}-654.o(StubCode)
-    CMnCoordinateConverterBase::~CMnCoordinateConverterBase__sub_object() 0x000081c4   ARM Code       0  mnclientlib{000a0000}-100.o(StubCode)
-    CMnCoordinateConverterBase::MapImageParams() const 0x000081cc   ARM Code       0  mnclientlib{000a0000}-101.o(StubCode)
-    CMnCoordinateConverterBase::CMnCoordinateConverterBase__sub_object() 0x000081d4   ARM Code       0  mnclientlib{000a0000}-97.o(StubCode)
-    CMnrpEngine::NewL()                      0x000081dc   ARM Code       0  mnrefproviderengine{000a0000}-12.o(StubCode)
-    CMnrpMapModel::UpdateModel(const TMnMapImageParams&) 0x000081e4   ARM Code       0  mnrefproviderengine{000a0000}-16.o(StubCode)
-    CMnrpMapModel::NewL(CMnrpEngine&)        0x000081ec   ARM Code       0  mnrefproviderengine{000a0000}-21.o(StubCode)
-    CMnrpMapModel::AbsoluteToScreen(TCoordinate) const 0x000081f4   ARM Code       0  mnrefproviderengine{000a0000}-43.o(StubCode)
-    CMnrpMapModel::ScreenToAbsolute(TPoint) const 0x000081fc   ARM Code       0  mnrefproviderengine{000a0000}-44.o(StubCode)
-    __aeabi_memcpy4                          0x00008204   ARM Code       0  drtaeabi{000a0000}-147.o(StubCode)
-    __aeabi_unwind_cpp_pr0                   0x0000820c   ARM Code       0  drtaeabi{000a0000}-158.o(StubCode)
-    __cxa_end_cleanup                        0x00008214   ARM Code       0  drtaeabi{000a0000}-184.o(StubCode)
-    operator delete (void*)                  0x0000821c   ARM Code       0  scppnwdl{000a0000}-3.o(StubCode)
-    typeinfo for CMnrpCoordConverter         0x0000823c   Data          12  MnRefProviderPlugin.in(.constdata__ZTI19CMnrpCoordConverter)
-    typeinfo name for CMnrpCoordConverter    0x00008248   Data          22  MnRefProviderPlugin.in(.constdata__ZTS19CMnrpCoordConverter)
-    vtable for CMnrpCoordConverter           0x00008260   Data          28  MnRefProviderPlugin.in(.constdata__ZTV19CMnrpCoordConverter)
-    .ARM.exidx$$Base                         0x0000827c   Number         0  ucppinit_aeabi.o(.ARM.exidx)
-    .ARM.exidx$$Limit                        0x000082b4   Number         0  uc_dll.o(.ARM.exidx)
-    Image$$ER_RO$$Limit                      0x000082b4   Number         0  anon$$obj.o(linker$$defined$$symbols)
-
Binary file locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/data/armv5/urel/MnRefProvider_reg.rsc has changed
Binary file locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/data/armv5/urel/mnrefprovider.exe has changed
--- a/locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/data/armv5/urel/mnrefprovider.exe.map	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2589 +0,0 @@
-ARM Linker, RVCT2.2 [Build 593]
-
-================================================================================
-
-Image Symbol Table
-
-    Local Symbols
-
-    Symbol Name                              Value     Ov Type        Size  Object(Section)
-
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-374.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-73.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-29.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-375.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-74.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-291.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-377.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-75.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-293.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-3826.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-76.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-294.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-3831.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-77.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-295.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-3832.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-78.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-296.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-3857.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-79.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-297.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-3860.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcoctl{000a0000}-1376.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-298.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-3861.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcoctl{000a0000}-140.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-299.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-3868.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcoctl{000a0000}-1430.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-30.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-3947.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcoctl{000a0000}-35.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-302.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-3948.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcoctl{000a0000}-46.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-31.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-3949.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcoctl{000a0000}-605.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-315.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-3983.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcoctl{000a0000}-606.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-317.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-4014.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcoctl{000a0000}-660.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-319.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-4030.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcoctl{000a0000}-875.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-352.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  AknIcon{000a0000}-13.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcoctl{000a0000}-880.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-37.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  egul{000a0000}-94.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcoctl{000a0000}-881.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-390.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  egul{000a0000}-95.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikctl{000a0000}-455.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-392.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  gdi{000a0000}-310.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-1132.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-394.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  gdi{000a0000}-311.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-129.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-467.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  gdi{000a0000}-312.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-130.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-472.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  fbscli{000a0000}-26.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-131.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-473.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  fbscli{000a0000}-31.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-1341.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-479.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eposlandmarks{000a0000}-12.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-198.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-490.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eposlandmarks{000a0000}-15.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-199.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-506.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eposlandmarks{000a0000}-4.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-1996.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-523.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eposlandmarks{000a0000}-50.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-201.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-532.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eposlandmarks{000a0000}-65.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-206.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-533.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eposlandmarks{000a0000}-67.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-211.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-534.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eposlandmarks{000a0000}-75.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-213.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-535.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  lbs{000a0000}-152.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-214.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-536.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  lbs{000a0000}-180.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-215.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-537.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  lbs{000a0000}-181.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-216.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-565.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  lbs{000a0000}-205.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-2163.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-61.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  lbs{000a0000}-207.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-217.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-62.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  lbs{000a0000}-21.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-2178.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-63.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  lbs{000a0000}-214.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-220.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-64.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  lbs{000a0000}-223.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-2591.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-67.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  lbs{000a0000}-225.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-2624.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-72.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  lbs{000a0000}-226.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-2632.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnrefproviderengine{000a0000}-39.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  lbs{000a0000}-23.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-2895.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnrefproviderengine{000a0000}-40.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  lbs{000a0000}-28.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-2898.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnrefproviderengine{000a0000}-41.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  lbs{000a0000}-304.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-2899.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnrefproviderengine{000a0000}-42.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  lbs{000a0000}-306.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-2900.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnrefproviderengine{000a0000}-43.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnservicelib{000a0000}-1.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-2901.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnrefproviderengine{000a0000}-44.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnservicelib{000a0000}-10.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-2902.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnrefproviderengine{000a0000}-45.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnservicelib{000a0000}-11.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-2903.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnrefproviderengine{000a0000}-46.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnservicelib{000a0000}-12.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-2904.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnrefproviderengine{000a0000}-47.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnservicelib{000a0000}-13.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-2905.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnrefproviderengine{000a0000}-48.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnservicelib{000a0000}-14.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-2906.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnrefproviderengine{000a0000}-50.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnservicelib{000a0000}-15.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-2907.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnrefproviderengine{000a0000}-51.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnservicelib{000a0000}-16.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-2909.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnrefproviderengine{000a0000}-53.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnservicelib{000a0000}-17.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-2910.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnrefproviderengine{000a0000}-54.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnservicelib{000a0000}-2.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-2912.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  dfpaeabi{000a0000}-12.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnservicelib{000a0000}-20.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-2913.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  dfpaeabi{000a0000}-20.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnservicelib{000a0000}-28.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-2914.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  dfpaeabi{000a0000}-23.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnservicelib{000a0000}-29.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-2917.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  dfpaeabi{000a0000}-24.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnservicelib{000a0000}-30.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-2919.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  dfpaeabi{000a0000}-41.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnservicelib{000a0000}-33.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-2920.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  dfpaeabi{000a0000}-8.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnservicelib{000a0000}-4.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-2922.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  drtaeabi{000a0000}-147.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnservicelib{000a0000}-5.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-2928.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  drtaeabi{000a0000}-158.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnservicelib{000a0000}-7.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-2929.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  drtaeabi{000a0000}-159.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnrefproviderengine{000a0000}-12.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-2930.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  drtaeabi{000a0000}-180.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnrefproviderengine{000a0000}-17.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-2932.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  drtaeabi{000a0000}-182.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnrefproviderengine{000a0000}-19.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-2934.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  drtaeabi{000a0000}-183.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnrefproviderengine{000a0000}-20.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-2936.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  drtaeabi{000a0000}-184.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnrefproviderengine{000a0000}-22.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-2993.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  drtaeabi{000a0000}-189.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnrefproviderengine{000a0000}-23.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-2997.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  scppnwdl{000a0000}-3.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnrefproviderengine{000a0000}-24.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-3417.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-1360.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnrefproviderengine{000a0000}-25.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-3420.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-641.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnrefproviderengine{000a0000}-26.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-1025.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-159.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnrefproviderengine{000a0000}-27.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-1096.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-169.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnrefproviderengine{000a0000}-28.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-1116.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-171.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnrefproviderengine{000a0000}-29.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-1119.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-175.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnrefproviderengine{000a0000}-30.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-1172.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-18.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnrefproviderengine{000a0000}-31.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-1288.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-20.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnrefproviderengine{000a0000}-32.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-1507.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-25.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnrefproviderengine{000a0000}-33.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-1510.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-26.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnrefproviderengine{000a0000}-34.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-1553.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  drtaeabi{000a0000}-204.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnrefproviderengine{000a0000}-38.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-1590.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-28.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-829.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-1593.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-197.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-830.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-1648.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-199.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-838.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-1817.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-203.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-839.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-1995.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-21.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-841.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-1997.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-210.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-842.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-1999.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-211.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-973.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-203.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-212.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  apparc{000a0000}-121.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-204.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-220.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  apparc{000a0000}-132.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-205.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-25.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  apparc{000a0000}-171.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-2060.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-257.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  apparc{000a0000}-191.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-2061.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-26.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  apparc{000a0000}-192.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-207.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-263.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  apparc{000a0000}-194.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-208.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-265.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  apparc{000a0000}-202.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-2082.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-266.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  apparc{000a0000}-222.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-2120.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-270.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  apparc{000a0000}-232.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-2123.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-271.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  apparc{000a0000}-253.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-2125.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-272.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  apparc{000a0000}-273.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-2131.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-275.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  apparc{000a0000}-274.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-245.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-276.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  apparc{000a0000}-275.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-250.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-287.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  apparc{000a0000}-279.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-254.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-288.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  apparc{000a0000}-280.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-257.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-29.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  apparc{000a0000}-284.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-46.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-30.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  apparc{000a0000}-285.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-464.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-351.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  apparc{000a0000}-286.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-470.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-353.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  apparc{000a0000}-287.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-471.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-355.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  apparc{000a0000}-30.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-472.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-36.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  bafl{000a0000}-43.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-476.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-39.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  bafl{000a0000}-98.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-48.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-396.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-100.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-481.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-397.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-101.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-55.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-3421.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-11.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-551.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-3422.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-12.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-593.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-3423.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-127.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-613.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-3424.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-128.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-649.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-367.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-13.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-652.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-368.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-15.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-654.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-369.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-18.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-669.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-370.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-182.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-81.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-372.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-19.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-824.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-373.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-196.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-638.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-50.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-147.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-639.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-502.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-152.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-64.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-51.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-155.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-664.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-514.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-158.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-67.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-56.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-9.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-670.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-57.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-141.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-671.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-580.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-142.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-676.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-581.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-143.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-677.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-582.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-144.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-482.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-583.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-41.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-61.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-584.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-42.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-62.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-27.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-444.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-585.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-477.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-48.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-40.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-478.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-479.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-650.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-474.o ABSOLUTE
-    M:/epoc32/build/apputils/c_da81efa927799d7f/bafl_dll/armv5/udeb\VtblExports.s 0x00000000   Number         0  VtblExports.o ABSOLUTE
-    M:/epoc32/build/compsupp/c_18558cc638e6e874/drtaeabi_dll/armv5/udeb\VtblExports.s 0x00000000   Number         0  VtblExports.o ABSOLUTE
-    M:/epoc32/build/cone/c_17e36feeaf3b2ee8/cone_dll/armv5/udeb\VtblExports.s 0x00000000   Number         0  VtblExports.o ABSOLUTE
-    M:/epoc32/build/fontandbitmapserver/c_7ea974cb4182c047/fbscli_dll/armv5/udeb\VtblExports.s 0x00000000   Number         0  VtblExports.o ABSOLUTE
-    M:/epoc32/build/gdi/c_5dab287815cadb7b/gdi_dll/armv5/udeb\VtblExports.s 0x00000000   Number         0  VtblExports.o ABSOLUTE
-    M:/epoc32/build/imagingfws/c_c0b0915f285c9e63/imageconversion_dll/armv5/udeb\VtblExports.s 0x00000000   Number         0  VtblExports.o ABSOLUTE
-    M:/epoc32/build/store/c_93a13d203e6d3ba7/estor_dll/armv5/udeb\VtblExports.s 0x00000000   Number         0  VtblExports.o ABSOLUTE
-    M:/epoc32/build/uigraphicsutils/c_d265b80414e63acf/egul_dll/armv5/udeb\VtblExports.s 0x00000000   Number         0  VtblExports.o ABSOLUTE
-    M:/epoc32/build/uikon/c_9cf7bef4a7562444/eikcore_dll/armv5/udeb\VtblExports.s 0x00000000   Number         0  VtblExports.o ABSOLUTE
-    M:\\sf\\os\\kernelhwsrv\\kernel\\eka\\compsupp\\rvct2_2\\ucppinit_aeabi.cpp 0x00000000   Number         0  ucppinit_aeabi.o ABSOLUTE
-    M:\sf\os\kernelhwsrv\kernel\eka\compsupp\rvct2_2\dllexp.cpp 0x00000000   Number         0  dllexp.o ABSOLUTE
-    M:\sf\os\kernelhwsrv\kernel\eka\compsupp\rvct2_2\ucppinit_aeabi.cpp 0x00000000   Number         0  ucppinit_aeabi.o ABSOLUTE
-    M:\sf\os\kernelhwsrv\kernel\eka\compsupp\symaehabi\callfirstprocessfn.cpp 0x00000000   Number         0  callfirstprocessfn.o ABSOLUTE
-    \EPOC32\BUILD\sf\app\location\group\MNREFENGINE\ARMV5\VtblExports.s 0x00000000   Number         0  VtblExports.o ABSOLUTE
-    \EPOC32\BUILD\sf\mw\appsupport\appfw\apparchitecture\group\APPARC\ARMV5\VtblExports.s 0x00000000   Number         0  VtblExports.o ABSOLUTE
-    \EPOC32\BUILD\sf\mw\classicui\group\AVKON\ARMV5\VtblExports.s 0x00000000   Number         0  VtblExports.o ABSOLUTE
-    \EPOC32\BUILD\sf\mw\classicui\group\EIKCOCTL\ARMV5\VtblExports.s 0x00000000   Number         0  VtblExports.o ABSOLUTE
-    \EPOC32\BUILD\sf\mw\classicui\group\EIKCTL\ARMV5\VtblExports.s 0x00000000   Number         0  VtblExports.o ABSOLUTE
-    \EPOC32\BUILD\sf\mw\classicui\group\EIKDLG\ARMV5\VtblExports.s 0x00000000   Number         0  VtblExports.o ABSOLUTE
-    \EPOC32\BUILD\sf\mw\locationsrv\group\EPOS_LANDMARKSCLIENTLIBRARY\ARMV5\VtblExports.s 0x00000000   Number         0  VtblExports.o ABSOLUTE
-    \EPOC32\BUILD\sf\mw\locationsrv\group\EPOS_LANDMARKSSEARCHCLIENTLIBRARY\ARMV5\VtblExports.s 0x00000000   Number         0  VtblExports.o ABSOLUTE
-    \EPOC32\BUILD\sf\mw\locationsrv\group\MNSERVICELIB\ARMV5\VtblExports.s 0x00000000   Number         0  VtblExports.o ABSOLUTE
-    \EPOC32\BUILD\sf\mw\uiresources\group\AKNICON\ARMV5\VtblExports.s 0x00000000   Number         0  VtblExports.o ABSOLUTE
-    \EPOC32\BUILD\sf\mw\uiresources\group\AKNSKINS\ARMV5\VtblExports.s 0x00000000   Number         0  VtblExports.o ABSOLUTE
-    \EPOC32\BUILD\sf\os\graphics\windowing\windowserver\group\WS32LIB\ARMV5\VtblExports.s 0x00000000   Number         0  VtblExports.o ABSOLUTE
-    \EPOC32\BUILD\sf\os\kernelhwsrv\kernel\eka\euser\EEXE\ARMV6_ABIV1\urel\uc_exe_.cpp 0x00000000   Number         0  uc_exe_.o ABSOLUTE
-    \EPOC32\BUILD\sf\os\kernelhwsrv\kernel\eka\euser\EUSER\ARMV5\VtblExports.s 0x00000000   Number         0  VtblExports.o ABSOLUTE
-    \EPOC32\BUILD\sf\os\kernelhwsrv\userlibandfileserver\fileserver\group\EFSRV\ARMV5\VtblExports.s 0x00000000   Number         0  VtblExports.o ABSOLUTE
-    \EPOC32\BUILD\sf\os\lbs\locationmgmt\locationadmin\group\LBSAPIVARIANT2\ARMV5\VtblExports.s 0x00000000   Number         0  VtblExports.o ABSOLUTE
-    \\EPOC32\\BUILD\\sf\\os\\kernelhwsrv\\kernel\\eka\\euser\\EEXE\\ARMV6_ABIV1\\urel\\uc_exe_.cpp 0x00000000   Number         0  uc_exe_.o ABSOLUTE
-    \sf\app\location\mapnavproviderrefapp\src\mnrefprovider.cpp 0x00000000   Number         0  mnrefprovider.in ABSOLUTE
-    \sf\app\location\mapnavproviderrefapp\src\mnrpappcontrol.cpp 0x00000000   Number         0  mnrefprovider.in ABSOLUTE
-    \sf\app\location\mapnavproviderrefapp\src\mnrpapplication.cpp 0x00000000   Number         0  mnrefprovider.in ABSOLUTE
-    \sf\app\location\mapnavproviderrefapp\src\mnrpappserver.cpp 0x00000000   Number         0  mnrefprovider.in ABSOLUTE
-    \sf\app\location\mapnavproviderrefapp\src\mnrpappui.cpp 0x00000000   Number         0  mnrefprovider.in ABSOLUTE
-    \sf\app\location\mapnavproviderrefapp\src\mnrpappview.cpp 0x00000000   Number         0  mnrefprovider.in ABSOLUTE
-    \sf\app\location\mapnavproviderrefapp\src\mnrpdocument.cpp 0x00000000   Number         0  mnrefprovider.in ABSOLUTE
-    \sf\app\location\mapnavproviderrefapp\src\mnrpmapcontrol.cpp 0x00000000   Number         0  mnrefprovider.in ABSOLUTE
-    \sf\app\location\mapnavproviderrefapp\src\mnrpmapview.cpp 0x00000000   Number         0  mnrefprovider.in ABSOLUTE
-    \sf\app\location\mapnavproviderrefapp\src\mnrpmapviewservice.cpp 0x00000000   Number         0  mnrefprovider.in ABSOLUTE
-    \sf\app\location\mapnavproviderrefapp\src\mnrpnavicontrol.cpp 0x00000000   Number         0  mnrefprovider.in ABSOLUTE
-    \sf\app\location\mapnavproviderrefapp\src\mnrpnavigationservice.cpp 0x00000000   Number         0  mnrefprovider.in ABSOLUTE
-    \sf\app\location\mapnavproviderrefapp\src\mnrpnavimodel.cpp 0x00000000   Number         0  mnrefprovider.in ABSOLUTE
-    \sf\app\location\mapnavproviderrefapp\src\mnrpnaviview.cpp 0x00000000   Number         0  mnrefprovider.in ABSOLUTE
-    \sf\os\kernelhwsrv\kernel\eka\euser\epoc\arm\uc_exe.cpp 0x00000000   Number         0  uc_exe.o ABSOLUTE
-    .emb_text                                0x00008000   Section      112  uc_exe_.o(.emb_text)
-    .emb_text                                0x00008070   Section       72  ucppinit_aeabi.o(.emb_text)
-    skip                                     0x00008084   ARM Code       0  ucppinit_aeabi.o(.emb_text)
-    loop                                     0x00008094   ARM Code       0  ucppinit_aeabi.o(.emb_text)
-    fpinit                                   0x000080ac   Data           0  ucppinit_aeabi.o(.emb_text)
-    base                                     0x000080b0   Data           0  ucppinit_aeabi.o(.emb_text)
-    limit                                    0x000080b4   Data           0  ucppinit_aeabi.o(.emb_text)
-    .text                                    0x000080c0   Section       16  uc_exe_.o(.text)
-    NewApplication()                         0x000080d1   Thumb Code    30  mnrefprovider.in(.text)
-    .text                                    0x000080d0   Section       60  mnrefprovider.in(.text)
-    .text                                    0x0000810c   Section       44  mnrefprovider.in(.text)
-    .text                                    0x00008138   Section     1688  mnrefprovider.in(.text)
-    .text                                    0x000087d0   Section      140  mnrefprovider.in(.text)
-    .text                                    0x0000885c   Section      128  mnrefprovider.in(.text)
-    .text                                    0x000088dc   Section      244  mnrefprovider.in(.text)
-    .text                                    0x000089d0   Section      196  mnrefprovider.in(.text)
-    .text                                    0x00008a94   Section      612  mnrefprovider.in(.text)
-    .text                                    0x00008cf8   Section     3148  mnrefprovider.in(.text)
-    |L1.1176|                                0x00009190   Data           0  mnrefprovider.in(.text)
-    |L1.1200|                                0x000091a8   Data           0  mnrefprovider.in(.text)
-    __sti___18_mnrpmapcontrol_cpp            0x000098f1   Thumb Code    24  mnrefprovider.in(.text)
-    .text                                    0x00009944   Section      360  mnrefprovider.in(.text)
-    .text                                    0x00009aac   Section     1084  mnrefprovider.in(.text)
-    .text                                    0x00009ee8   Section      580  mnrefprovider.in(.text)
-    .text                                    0x0000a12c   Section      100  mnrefprovider.in(.text)
-    .text                                    0x0000a190   Section      508  mnrefprovider.in(.text)
-    .text                                    0x0000a394   Section       36  uc_exe.o(.text)
-    .text                                    0x0000a3b8   Section      120  callfirstprocessfn.o(.text)
-    .text                                    0x0000a430   Section        4  dllexp.o(.text)
-    .text.clean                              0x0000a434   Section       10  mnrefprovider.in(.text.clean)
-    .text.clean                              0x0000a43e   Section       18  mnrefprovider.in(.text.clean)
-    .text.clean                              0x0000a450   Section       10  mnrefprovider.in(.text.clean)
-    .text.clean                              0x0000a45a   Section       10  mnrefprovider.in(.text.clean)
-    .text.clean                              0x0000a464   Section       14  mnrefprovider.in(.text.clean)
-    .text.clean                              0x0000a472   Section       28  mnrefprovider.in(.text.clean)
-    .text.clean                              0x0000a48e   Section       10  mnrefprovider.in(.text.clean)
-    .text.clean                              0x0000a498   Section       20  mnrefprovider.in(.text.clean)
-    .text.clean                              0x0000a4ac   Section       14  mnrefprovider.in(.text.clean)
-    .text.clean                              0x0000a4ba   Section       22  mnrefprovider.in(.text.clean)
-    .text.clean                              0x0000a4d0   Section        8  callfirstprocessfn.o(.text.clean)
-    StubCode                                 0x0000a4d8   Section        8  euser{000a0000}-1025.o(StubCode)
-    theImportedSymbol                        0x0000a4dc   Data           0  euser{000a0000}-1025.o(StubCode)
-    StubCode                                 0x0000a4e0   Section        8  euser{000a0000}-1096.o(StubCode)
-    theImportedSymbol                        0x0000a4e4   Data           0  euser{000a0000}-1096.o(StubCode)
-    StubCode                                 0x0000a4e8   Section        8  euser{000a0000}-1116.o(StubCode)
-    theImportedSymbol                        0x0000a4ec   Data           0  euser{000a0000}-1116.o(StubCode)
-    StubCode                                 0x0000a4f0   Section        8  euser{000a0000}-1119.o(StubCode)
-    theImportedSymbol                        0x0000a4f4   Data           0  euser{000a0000}-1119.o(StubCode)
-    StubCode                                 0x0000a4f8   Section        8  euser{000a0000}-1172.o(StubCode)
-    theImportedSymbol                        0x0000a4fc   Data           0  euser{000a0000}-1172.o(StubCode)
-    StubCode                                 0x0000a500   Section        8  euser{000a0000}-1288.o(StubCode)
-    theImportedSymbol                        0x0000a504   Data           0  euser{000a0000}-1288.o(StubCode)
-    StubCode                                 0x0000a508   Section        8  euser{000a0000}-1507.o(StubCode)
-    theImportedSymbol                        0x0000a50c   Data           0  euser{000a0000}-1507.o(StubCode)
-    StubCode                                 0x0000a510   Section        8  euser{000a0000}-1510.o(StubCode)
-    theImportedSymbol                        0x0000a514   Data           0  euser{000a0000}-1510.o(StubCode)
-    StubCode                                 0x0000a518   Section        8  euser{000a0000}-1553.o(StubCode)
-    theImportedSymbol                        0x0000a51c   Data           0  euser{000a0000}-1553.o(StubCode)
-    StubCode                                 0x0000a520   Section        8  euser{000a0000}-1590.o(StubCode)
-    theImportedSymbol                        0x0000a524   Data           0  euser{000a0000}-1590.o(StubCode)
-    StubCode                                 0x0000a528   Section        8  euser{000a0000}-1593.o(StubCode)
-    theImportedSymbol                        0x0000a52c   Data           0  euser{000a0000}-1593.o(StubCode)
-    StubCode                                 0x0000a530   Section        8  euser{000a0000}-1648.o(StubCode)
-    theImportedSymbol                        0x0000a534   Data           0  euser{000a0000}-1648.o(StubCode)
-    StubCode                                 0x0000a538   Section        8  euser{000a0000}-1817.o(StubCode)
-    theImportedSymbol                        0x0000a53c   Data           0  euser{000a0000}-1817.o(StubCode)
-    StubCode                                 0x0000a540   Section        8  euser{000a0000}-1995.o(StubCode)
-    theImportedSymbol                        0x0000a544   Data           0  euser{000a0000}-1995.o(StubCode)
-    StubCode                                 0x0000a548   Section        8  euser{000a0000}-1997.o(StubCode)
-    theImportedSymbol                        0x0000a54c   Data           0  euser{000a0000}-1997.o(StubCode)
-    StubCode                                 0x0000a550   Section        8  euser{000a0000}-1999.o(StubCode)
-    theImportedSymbol                        0x0000a554   Data           0  euser{000a0000}-1999.o(StubCode)
-    StubCode                                 0x0000a558   Section        8  euser{000a0000}-203.o(StubCode)
-    theImportedSymbol                        0x0000a55c   Data           0  euser{000a0000}-203.o(StubCode)
-    StubCode                                 0x0000a560   Section        8  euser{000a0000}-204.o(StubCode)
-    theImportedSymbol                        0x0000a564   Data           0  euser{000a0000}-204.o(StubCode)
-    StubCode                                 0x0000a568   Section        8  euser{000a0000}-205.o(StubCode)
-    theImportedSymbol                        0x0000a56c   Data           0  euser{000a0000}-205.o(StubCode)
-    StubCode                                 0x0000a570   Section        8  euser{000a0000}-2060.o(StubCode)
-    theImportedSymbol                        0x0000a574   Data           0  euser{000a0000}-2060.o(StubCode)
-    StubCode                                 0x0000a578   Section        8  euser{000a0000}-2061.o(StubCode)
-    theImportedSymbol                        0x0000a57c   Data           0  euser{000a0000}-2061.o(StubCode)
-    StubCode                                 0x0000a580   Section        8  euser{000a0000}-207.o(StubCode)
-    theImportedSymbol                        0x0000a584   Data           0  euser{000a0000}-207.o(StubCode)
-    StubCode                                 0x0000a588   Section        8  euser{000a0000}-208.o(StubCode)
-    theImportedSymbol                        0x0000a58c   Data           0  euser{000a0000}-208.o(StubCode)
-    StubCode                                 0x0000a590   Section        8  euser{000a0000}-2082.o(StubCode)
-    theImportedSymbol                        0x0000a594   Data           0  euser{000a0000}-2082.o(StubCode)
-    StubCode                                 0x0000a598   Section        8  euser{000a0000}-2120.o(StubCode)
-    theImportedSymbol                        0x0000a59c   Data           0  euser{000a0000}-2120.o(StubCode)
-    StubCode                                 0x0000a5a0   Section        8  euser{000a0000}-2123.o(StubCode)
-    theImportedSymbol                        0x0000a5a4   Data           0  euser{000a0000}-2123.o(StubCode)
-    StubCode                                 0x0000a5a8   Section        8  euser{000a0000}-2125.o(StubCode)
-    theImportedSymbol                        0x0000a5ac   Data           0  euser{000a0000}-2125.o(StubCode)
-    StubCode                                 0x0000a5b0   Section        8  euser{000a0000}-2131.o(StubCode)
-    theImportedSymbol                        0x0000a5b4   Data           0  euser{000a0000}-2131.o(StubCode)
-    StubCode                                 0x0000a5b8   Section        8  euser{000a0000}-245.o(StubCode)
-    theImportedSymbol                        0x0000a5bc   Data           0  euser{000a0000}-245.o(StubCode)
-    StubCode                                 0x0000a5c0   Section        8  euser{000a0000}-250.o(StubCode)
-    theImportedSymbol                        0x0000a5c4   Data           0  euser{000a0000}-250.o(StubCode)
-    StubCode                                 0x0000a5c8   Section        8  euser{000a0000}-254.o(StubCode)
-    theImportedSymbol                        0x0000a5cc   Data           0  euser{000a0000}-254.o(StubCode)
-    StubCode                                 0x0000a5d0   Section        8  euser{000a0000}-257.o(StubCode)
-    theImportedSymbol                        0x0000a5d4   Data           0  euser{000a0000}-257.o(StubCode)
-    StubCode                                 0x0000a5d8   Section        8  euser{000a0000}-46.o(StubCode)
-    theImportedSymbol                        0x0000a5dc   Data           0  euser{000a0000}-46.o(StubCode)
-    StubCode                                 0x0000a5e0   Section        8  euser{000a0000}-464.o(StubCode)
-    theImportedSymbol                        0x0000a5e4   Data           0  euser{000a0000}-464.o(StubCode)
-    StubCode                                 0x0000a5e8   Section        8  euser{000a0000}-470.o(StubCode)
-    theImportedSymbol                        0x0000a5ec   Data           0  euser{000a0000}-470.o(StubCode)
-    StubCode                                 0x0000a5f0   Section        8  euser{000a0000}-471.o(StubCode)
-    theImportedSymbol                        0x0000a5f4   Data           0  euser{000a0000}-471.o(StubCode)
-    StubCode                                 0x0000a5f8   Section        8  euser{000a0000}-472.o(StubCode)
-    theImportedSymbol                        0x0000a5fc   Data           0  euser{000a0000}-472.o(StubCode)
-    StubCode                                 0x0000a600   Section        8  euser{000a0000}-476.o(StubCode)
-    theImportedSymbol                        0x0000a604   Data           0  euser{000a0000}-476.o(StubCode)
-    StubCode                                 0x0000a608   Section        8  euser{000a0000}-48.o(StubCode)
-    theImportedSymbol                        0x0000a60c   Data           0  euser{000a0000}-48.o(StubCode)
-    StubCode                                 0x0000a610   Section        8  euser{000a0000}-481.o(StubCode)
-    theImportedSymbol                        0x0000a614   Data           0  euser{000a0000}-481.o(StubCode)
-    StubCode                                 0x0000a618   Section        8  euser{000a0000}-55.o(StubCode)
-    theImportedSymbol                        0x0000a61c   Data           0  euser{000a0000}-55.o(StubCode)
-    StubCode                                 0x0000a620   Section        8  euser{000a0000}-551.o(StubCode)
-    theImportedSymbol                        0x0000a624   Data           0  euser{000a0000}-551.o(StubCode)
-    StubCode                                 0x0000a628   Section        8  euser{000a0000}-593.o(StubCode)
-    theImportedSymbol                        0x0000a62c   Data           0  euser{000a0000}-593.o(StubCode)
-    StubCode                                 0x0000a630   Section        8  euser{000a0000}-613.o(StubCode)
-    theImportedSymbol                        0x0000a634   Data           0  euser{000a0000}-613.o(StubCode)
-    StubCode                                 0x0000a638   Section        8  euser{000a0000}-649.o(StubCode)
-    theImportedSymbol                        0x0000a63c   Data           0  euser{000a0000}-649.o(StubCode)
-    StubCode                                 0x0000a640   Section        8  euser{000a0000}-652.o(StubCode)
-    theImportedSymbol                        0x0000a644   Data           0  euser{000a0000}-652.o(StubCode)
-    StubCode                                 0x0000a648   Section        8  euser{000a0000}-654.o(StubCode)
-    theImportedSymbol                        0x0000a64c   Data           0  euser{000a0000}-654.o(StubCode)
-    StubCode                                 0x0000a650   Section        8  euser{000a0000}-669.o(StubCode)
-    theImportedSymbol                        0x0000a654   Data           0  euser{000a0000}-669.o(StubCode)
-    StubCode                                 0x0000a658   Section        8  euser{000a0000}-81.o(StubCode)
-    theImportedSymbol                        0x0000a65c   Data           0  euser{000a0000}-81.o(StubCode)
-    StubCode                                 0x0000a660   Section        8  euser{000a0000}-824.o(StubCode)
-    theImportedSymbol                        0x0000a664   Data           0  euser{000a0000}-824.o(StubCode)
-    StubCode                                 0x0000a668   Section        8  euser{000a0000}-829.o(StubCode)
-    theImportedSymbol                        0x0000a66c   Data           0  euser{000a0000}-829.o(StubCode)
-    StubCode                                 0x0000a670   Section        8  euser{000a0000}-830.o(StubCode)
-    theImportedSymbol                        0x0000a674   Data           0  euser{000a0000}-830.o(StubCode)
-    StubCode                                 0x0000a678   Section        8  euser{000a0000}-838.o(StubCode)
-    theImportedSymbol                        0x0000a67c   Data           0  euser{000a0000}-838.o(StubCode)
-    StubCode                                 0x0000a680   Section        8  euser{000a0000}-839.o(StubCode)
-    theImportedSymbol                        0x0000a684   Data           0  euser{000a0000}-839.o(StubCode)
-    StubCode                                 0x0000a688   Section        8  euser{000a0000}-841.o(StubCode)
-    theImportedSymbol                        0x0000a68c   Data           0  euser{000a0000}-841.o(StubCode)
-    StubCode                                 0x0000a690   Section        8  euser{000a0000}-842.o(StubCode)
-    theImportedSymbol                        0x0000a694   Data           0  euser{000a0000}-842.o(StubCode)
-    StubCode                                 0x0000a698   Section        8  euser{000a0000}-973.o(StubCode)
-    theImportedSymbol                        0x0000a69c   Data           0  euser{000a0000}-973.o(StubCode)
-    StubCode                                 0x0000a6a0   Section        8  apparc{000a0000}-121.o(StubCode)
-    theImportedSymbol                        0x0000a6a4   Data           0  apparc{000a0000}-121.o(StubCode)
-    StubCode                                 0x0000a6a8   Section        8  apparc{000a0000}-132.o(StubCode)
-    theImportedSymbol                        0x0000a6ac   Data           0  apparc{000a0000}-132.o(StubCode)
-    StubCode                                 0x0000a6b0   Section        8  apparc{000a0000}-171.o(StubCode)
-    theImportedSymbol                        0x0000a6b4   Data           0  apparc{000a0000}-171.o(StubCode)
-    StubCode                                 0x0000a6b8   Section        8  apparc{000a0000}-191.o(StubCode)
-    theImportedSymbol                        0x0000a6bc   Data           0  apparc{000a0000}-191.o(StubCode)
-    StubCode                                 0x0000a6c0   Section        8  apparc{000a0000}-192.o(StubCode)
-    theImportedSymbol                        0x0000a6c4   Data           0  apparc{000a0000}-192.o(StubCode)
-    StubCode                                 0x0000a6c8   Section        8  apparc{000a0000}-194.o(StubCode)
-    theImportedSymbol                        0x0000a6cc   Data           0  apparc{000a0000}-194.o(StubCode)
-    StubCode                                 0x0000a6d0   Section        8  apparc{000a0000}-202.o(StubCode)
-    theImportedSymbol                        0x0000a6d4   Data           0  apparc{000a0000}-202.o(StubCode)
-    StubCode                                 0x0000a6d8   Section        8  apparc{000a0000}-222.o(StubCode)
-    theImportedSymbol                        0x0000a6dc   Data           0  apparc{000a0000}-222.o(StubCode)
-    StubCode                                 0x0000a6e0   Section        8  apparc{000a0000}-232.o(StubCode)
-    theImportedSymbol                        0x0000a6e4   Data           0  apparc{000a0000}-232.o(StubCode)
-    StubCode                                 0x0000a6e8   Section        8  apparc{000a0000}-253.o(StubCode)
-    theImportedSymbol                        0x0000a6ec   Data           0  apparc{000a0000}-253.o(StubCode)
-    StubCode                                 0x0000a6f0   Section        8  apparc{000a0000}-273.o(StubCode)
-    theImportedSymbol                        0x0000a6f4   Data           0  apparc{000a0000}-273.o(StubCode)
-    StubCode                                 0x0000a6f8   Section        8  apparc{000a0000}-274.o(StubCode)
-    theImportedSymbol                        0x0000a6fc   Data           0  apparc{000a0000}-274.o(StubCode)
-    StubCode                                 0x0000a700   Section        8  apparc{000a0000}-275.o(StubCode)
-    theImportedSymbol                        0x0000a704   Data           0  apparc{000a0000}-275.o(StubCode)
-    StubCode                                 0x0000a708   Section        8  apparc{000a0000}-279.o(StubCode)
-    theImportedSymbol                        0x0000a70c   Data           0  apparc{000a0000}-279.o(StubCode)
-    StubCode                                 0x0000a710   Section        8  apparc{000a0000}-280.o(StubCode)
-    theImportedSymbol                        0x0000a714   Data           0  apparc{000a0000}-280.o(StubCode)
-    StubCode                                 0x0000a718   Section        8  apparc{000a0000}-284.o(StubCode)
-    theImportedSymbol                        0x0000a71c   Data           0  apparc{000a0000}-284.o(StubCode)
-    StubCode                                 0x0000a720   Section        8  apparc{000a0000}-285.o(StubCode)
-    theImportedSymbol                        0x0000a724   Data           0  apparc{000a0000}-285.o(StubCode)
-    StubCode                                 0x0000a728   Section        8  apparc{000a0000}-286.o(StubCode)
-    theImportedSymbol                        0x0000a72c   Data           0  apparc{000a0000}-286.o(StubCode)
-    StubCode                                 0x0000a730   Section        8  apparc{000a0000}-287.o(StubCode)
-    theImportedSymbol                        0x0000a734   Data           0  apparc{000a0000}-287.o(StubCode)
-    StubCode                                 0x0000a738   Section        8  apparc{000a0000}-30.o(StubCode)
-    theImportedSymbol                        0x0000a73c   Data           0  apparc{000a0000}-30.o(StubCode)
-    StubCode                                 0x0000a740   Section        8  bafl{000a0000}-43.o(StubCode)
-    theImportedSymbol                        0x0000a744   Data           0  bafl{000a0000}-43.o(StubCode)
-    StubCode                                 0x0000a748   Section        8  bafl{000a0000}-98.o(StubCode)
-    theImportedSymbol                        0x0000a74c   Data           0  bafl{000a0000}-98.o(StubCode)
-    StubCode                                 0x0000a750   Section        8  cone{000a0000}-100.o(StubCode)
-    theImportedSymbol                        0x0000a754   Data           0  cone{000a0000}-100.o(StubCode)
-    StubCode                                 0x0000a758   Section        8  cone{000a0000}-101.o(StubCode)
-    theImportedSymbol                        0x0000a75c   Data           0  cone{000a0000}-101.o(StubCode)
-    StubCode                                 0x0000a760   Section        8  cone{000a0000}-11.o(StubCode)
-    theImportedSymbol                        0x0000a764   Data           0  cone{000a0000}-11.o(StubCode)
-    StubCode                                 0x0000a768   Section        8  cone{000a0000}-12.o(StubCode)
-    theImportedSymbol                        0x0000a76c   Data           0  cone{000a0000}-12.o(StubCode)
-    StubCode                                 0x0000a770   Section        8  cone{000a0000}-127.o(StubCode)
-    theImportedSymbol                        0x0000a774   Data           0  cone{000a0000}-127.o(StubCode)
-    StubCode                                 0x0000a778   Section        8  cone{000a0000}-128.o(StubCode)
-    theImportedSymbol                        0x0000a77c   Data           0  cone{000a0000}-128.o(StubCode)
-    StubCode                                 0x0000a780   Section        8  cone{000a0000}-13.o(StubCode)
-    theImportedSymbol                        0x0000a784   Data           0  cone{000a0000}-13.o(StubCode)
-    StubCode                                 0x0000a788   Section        8  cone{000a0000}-15.o(StubCode)
-    theImportedSymbol                        0x0000a78c   Data           0  cone{000a0000}-15.o(StubCode)
-    StubCode                                 0x0000a790   Section        8  cone{000a0000}-18.o(StubCode)
-    theImportedSymbol                        0x0000a794   Data           0  cone{000a0000}-18.o(StubCode)
-    StubCode                                 0x0000a798   Section        8  cone{000a0000}-182.o(StubCode)
-    theImportedSymbol                        0x0000a79c   Data           0  cone{000a0000}-182.o(StubCode)
-    StubCode                                 0x0000a7a0   Section        8  cone{000a0000}-19.o(StubCode)
-    theImportedSymbol                        0x0000a7a4   Data           0  cone{000a0000}-19.o(StubCode)
-    StubCode                                 0x0000a7a8   Section        8  cone{000a0000}-196.o(StubCode)
-    theImportedSymbol                        0x0000a7ac   Data           0  cone{000a0000}-196.o(StubCode)
-    StubCode                                 0x0000a7b0   Section        8  cone{000a0000}-197.o(StubCode)
-    theImportedSymbol                        0x0000a7b4   Data           0  cone{000a0000}-197.o(StubCode)
-    StubCode                                 0x0000a7b8   Section        8  cone{000a0000}-199.o(StubCode)
-    theImportedSymbol                        0x0000a7bc   Data           0  cone{000a0000}-199.o(StubCode)
-    StubCode                                 0x0000a7c0   Section        8  cone{000a0000}-203.o(StubCode)
-    theImportedSymbol                        0x0000a7c4   Data           0  cone{000a0000}-203.o(StubCode)
-    StubCode                                 0x0000a7c8   Section        8  cone{000a0000}-21.o(StubCode)
-    theImportedSymbol                        0x0000a7cc   Data           0  cone{000a0000}-21.o(StubCode)
-    StubCode                                 0x0000a7d0   Section        8  cone{000a0000}-210.o(StubCode)
-    theImportedSymbol                        0x0000a7d4   Data           0  cone{000a0000}-210.o(StubCode)
-    StubCode                                 0x0000a7d8   Section        8  cone{000a0000}-211.o(StubCode)
-    theImportedSymbol                        0x0000a7dc   Data           0  cone{000a0000}-211.o(StubCode)
-    StubCode                                 0x0000a7e0   Section        8  cone{000a0000}-212.o(StubCode)
-    theImportedSymbol                        0x0000a7e4   Data           0  cone{000a0000}-212.o(StubCode)
-    StubCode                                 0x0000a7e8   Section        8  cone{000a0000}-220.o(StubCode)
-    theImportedSymbol                        0x0000a7ec   Data           0  cone{000a0000}-220.o(StubCode)
-    StubCode                                 0x0000a7f0   Section        8  cone{000a0000}-25.o(StubCode)
-    theImportedSymbol                        0x0000a7f4   Data           0  cone{000a0000}-25.o(StubCode)
-    StubCode                                 0x0000a7f8   Section        8  cone{000a0000}-257.o(StubCode)
-    theImportedSymbol                        0x0000a7fc   Data           0  cone{000a0000}-257.o(StubCode)
-    StubCode                                 0x0000a800   Section        8  cone{000a0000}-26.o(StubCode)
-    theImportedSymbol                        0x0000a804   Data           0  cone{000a0000}-26.o(StubCode)
-    StubCode                                 0x0000a808   Section        8  cone{000a0000}-263.o(StubCode)
-    theImportedSymbol                        0x0000a80c   Data           0  cone{000a0000}-263.o(StubCode)
-    StubCode                                 0x0000a810   Section        8  cone{000a0000}-265.o(StubCode)
-    theImportedSymbol                        0x0000a814   Data           0  cone{000a0000}-265.o(StubCode)
-    StubCode                                 0x0000a818   Section        8  cone{000a0000}-266.o(StubCode)
-    theImportedSymbol                        0x0000a81c   Data           0  cone{000a0000}-266.o(StubCode)
-    StubCode                                 0x0000a820   Section        8  cone{000a0000}-270.o(StubCode)
-    theImportedSymbol                        0x0000a824   Data           0  cone{000a0000}-270.o(StubCode)
-    StubCode                                 0x0000a828   Section        8  cone{000a0000}-271.o(StubCode)
-    theImportedSymbol                        0x0000a82c   Data           0  cone{000a0000}-271.o(StubCode)
-    StubCode                                 0x0000a830   Section        8  cone{000a0000}-272.o(StubCode)
-    theImportedSymbol                        0x0000a834   Data           0  cone{000a0000}-272.o(StubCode)
-    StubCode                                 0x0000a838   Section        8  cone{000a0000}-275.o(StubCode)
-    theImportedSymbol                        0x0000a83c   Data           0  cone{000a0000}-275.o(StubCode)
-    StubCode                                 0x0000a840   Section        8  cone{000a0000}-276.o(StubCode)
-    theImportedSymbol                        0x0000a844   Data           0  cone{000a0000}-276.o(StubCode)
-    StubCode                                 0x0000a848   Section        8  cone{000a0000}-287.o(StubCode)
-    theImportedSymbol                        0x0000a84c   Data           0  cone{000a0000}-287.o(StubCode)
-    StubCode                                 0x0000a850   Section        8  cone{000a0000}-288.o(StubCode)
-    theImportedSymbol                        0x0000a854   Data           0  cone{000a0000}-288.o(StubCode)
-    StubCode                                 0x0000a858   Section        8  cone{000a0000}-29.o(StubCode)
-    theImportedSymbol                        0x0000a85c   Data           0  cone{000a0000}-29.o(StubCode)
-    StubCode                                 0x0000a860   Section        8  cone{000a0000}-30.o(StubCode)
-    theImportedSymbol                        0x0000a864   Data           0  cone{000a0000}-30.o(StubCode)
-    StubCode                                 0x0000a868   Section        8  cone{000a0000}-351.o(StubCode)
-    theImportedSymbol                        0x0000a86c   Data           0  cone{000a0000}-351.o(StubCode)
-    StubCode                                 0x0000a870   Section        8  cone{000a0000}-353.o(StubCode)
-    theImportedSymbol                        0x0000a874   Data           0  cone{000a0000}-353.o(StubCode)
-    StubCode                                 0x0000a878   Section        8  cone{000a0000}-355.o(StubCode)
-    theImportedSymbol                        0x0000a87c   Data           0  cone{000a0000}-355.o(StubCode)
-    StubCode                                 0x0000a880   Section        8  cone{000a0000}-36.o(StubCode)
-    theImportedSymbol                        0x0000a884   Data           0  cone{000a0000}-36.o(StubCode)
-    StubCode                                 0x0000a888   Section        8  cone{000a0000}-39.o(StubCode)
-    theImportedSymbol                        0x0000a88c   Data           0  cone{000a0000}-39.o(StubCode)
-    StubCode                                 0x0000a890   Section        8  cone{000a0000}-396.o(StubCode)
-    theImportedSymbol                        0x0000a894   Data           0  cone{000a0000}-396.o(StubCode)
-    StubCode                                 0x0000a898   Section        8  cone{000a0000}-397.o(StubCode)
-    theImportedSymbol                        0x0000a89c   Data           0  cone{000a0000}-397.o(StubCode)
-    StubCode                                 0x0000a8a0   Section        8  cone{000a0000}-40.o(StubCode)
-    theImportedSymbol                        0x0000a8a4   Data           0  cone{000a0000}-40.o(StubCode)
-    StubCode                                 0x0000a8a8   Section        8  cone{000a0000}-41.o(StubCode)
-    theImportedSymbol                        0x0000a8ac   Data           0  cone{000a0000}-41.o(StubCode)
-    StubCode                                 0x0000a8b0   Section        8  cone{000a0000}-42.o(StubCode)
-    theImportedSymbol                        0x0000a8b4   Data           0  cone{000a0000}-42.o(StubCode)
-    StubCode                                 0x0000a8b8   Section        8  cone{000a0000}-444.o(StubCode)
-    theImportedSymbol                        0x0000a8bc   Data           0  cone{000a0000}-444.o(StubCode)
-    StubCode                                 0x0000a8c0   Section        8  cone{000a0000}-474.o(StubCode)
-    theImportedSymbol                        0x0000a8c4   Data           0  cone{000a0000}-474.o(StubCode)
-    StubCode                                 0x0000a8c8   Section        8  cone{000a0000}-477.o(StubCode)
-    theImportedSymbol                        0x0000a8cc   Data           0  cone{000a0000}-477.o(StubCode)
-    StubCode                                 0x0000a8d0   Section        8  cone{000a0000}-478.o(StubCode)
-    theImportedSymbol                        0x0000a8d4   Data           0  cone{000a0000}-478.o(StubCode)
-    StubCode                                 0x0000a8d8   Section        8  cone{000a0000}-479.o(StubCode)
-    theImportedSymbol                        0x0000a8dc   Data           0  cone{000a0000}-479.o(StubCode)
-    StubCode                                 0x0000a8e0   Section        8  cone{000a0000}-48.o(StubCode)
-    theImportedSymbol                        0x0000a8e4   Data           0  cone{000a0000}-48.o(StubCode)
-    StubCode                                 0x0000a8e8   Section        8  cone{000a0000}-482.o(StubCode)
-    theImportedSymbol                        0x0000a8ec   Data           0  cone{000a0000}-482.o(StubCode)
-    StubCode                                 0x0000a8f0   Section        8  cone{000a0000}-50.o(StubCode)
-    theImportedSymbol                        0x0000a8f4   Data           0  cone{000a0000}-50.o(StubCode)
-    StubCode                                 0x0000a8f8   Section        8  cone{000a0000}-502.o(StubCode)
-    theImportedSymbol                        0x0000a8fc   Data           0  cone{000a0000}-502.o(StubCode)
-    StubCode                                 0x0000a900   Section        8  cone{000a0000}-51.o(StubCode)
-    theImportedSymbol                        0x0000a904   Data           0  cone{000a0000}-51.o(StubCode)
-    StubCode                                 0x0000a908   Section        8  cone{000a0000}-514.o(StubCode)
-    theImportedSymbol                        0x0000a90c   Data           0  cone{000a0000}-514.o(StubCode)
-    StubCode                                 0x0000a910   Section        8  cone{000a0000}-56.o(StubCode)
-    theImportedSymbol                        0x0000a914   Data           0  cone{000a0000}-56.o(StubCode)
-    StubCode                                 0x0000a918   Section        8  cone{000a0000}-57.o(StubCode)
-    theImportedSymbol                        0x0000a91c   Data           0  cone{000a0000}-57.o(StubCode)
-    StubCode                                 0x0000a920   Section        8  cone{000a0000}-580.o(StubCode)
-    theImportedSymbol                        0x0000a924   Data           0  cone{000a0000}-580.o(StubCode)
-    StubCode                                 0x0000a928   Section        8  cone{000a0000}-581.o(StubCode)
-    theImportedSymbol                        0x0000a92c   Data           0  cone{000a0000}-581.o(StubCode)
-    StubCode                                 0x0000a930   Section        8  cone{000a0000}-582.o(StubCode)
-    theImportedSymbol                        0x0000a934   Data           0  cone{000a0000}-582.o(StubCode)
-    StubCode                                 0x0000a938   Section        8  cone{000a0000}-583.o(StubCode)
-    theImportedSymbol                        0x0000a93c   Data           0  cone{000a0000}-583.o(StubCode)
-    StubCode                                 0x0000a940   Section        8  cone{000a0000}-584.o(StubCode)
-    theImportedSymbol                        0x0000a944   Data           0  cone{000a0000}-584.o(StubCode)
-    StubCode                                 0x0000a948   Section        8  cone{000a0000}-61.o(StubCode)
-    theImportedSymbol                        0x0000a94c   Data           0  cone{000a0000}-61.o(StubCode)
-    StubCode                                 0x0000a950   Section        8  cone{000a0000}-62.o(StubCode)
-    theImportedSymbol                        0x0000a954   Data           0  cone{000a0000}-62.o(StubCode)
-    StubCode                                 0x0000a958   Section        8  cone{000a0000}-638.o(StubCode)
-    theImportedSymbol                        0x0000a95c   Data           0  cone{000a0000}-638.o(StubCode)
-    StubCode                                 0x0000a960   Section        8  cone{000a0000}-639.o(StubCode)
-    theImportedSymbol                        0x0000a964   Data           0  cone{000a0000}-639.o(StubCode)
-    StubCode                                 0x0000a968   Section        8  cone{000a0000}-64.o(StubCode)
-    theImportedSymbol                        0x0000a96c   Data           0  cone{000a0000}-64.o(StubCode)
-    StubCode                                 0x0000a970   Section        8  cone{000a0000}-664.o(StubCode)
-    theImportedSymbol                        0x0000a974   Data           0  cone{000a0000}-664.o(StubCode)
-    StubCode                                 0x0000a978   Section        8  cone{000a0000}-67.o(StubCode)
-    theImportedSymbol                        0x0000a97c   Data           0  cone{000a0000}-67.o(StubCode)
-    StubCode                                 0x0000a980   Section        8  cone{000a0000}-670.o(StubCode)
-    theImportedSymbol                        0x0000a984   Data           0  cone{000a0000}-670.o(StubCode)
-    StubCode                                 0x0000a988   Section        8  cone{000a0000}-671.o(StubCode)
-    theImportedSymbol                        0x0000a98c   Data           0  cone{000a0000}-671.o(StubCode)
-    StubCode                                 0x0000a990   Section        8  cone{000a0000}-676.o(StubCode)
-    theImportedSymbol                        0x0000a994   Data           0  cone{000a0000}-676.o(StubCode)
-    StubCode                                 0x0000a998   Section        8  cone{000a0000}-677.o(StubCode)
-    theImportedSymbol                        0x0000a99c   Data           0  cone{000a0000}-677.o(StubCode)
-    StubCode                                 0x0000a9a0   Section        8  cone{000a0000}-9.o(StubCode)
-    theImportedSymbol                        0x0000a9a4   Data           0  cone{000a0000}-9.o(StubCode)
-    StubCode                                 0x0000a9a8   Section        8  eikcore{000a0000}-141.o(StubCode)
-    theImportedSymbol                        0x0000a9ac   Data           0  eikcore{000a0000}-141.o(StubCode)
-    StubCode                                 0x0000a9b0   Section        8  eikcore{000a0000}-142.o(StubCode)
-    theImportedSymbol                        0x0000a9b4   Data           0  eikcore{000a0000}-142.o(StubCode)
-    StubCode                                 0x0000a9b8   Section        8  eikcore{000a0000}-143.o(StubCode)
-    theImportedSymbol                        0x0000a9bc   Data           0  eikcore{000a0000}-143.o(StubCode)
-    StubCode                                 0x0000a9c0   Section        8  eikcore{000a0000}-144.o(StubCode)
-    theImportedSymbol                        0x0000a9c4   Data           0  eikcore{000a0000}-144.o(StubCode)
-    StubCode                                 0x0000a9c8   Section        8  eikcore{000a0000}-147.o(StubCode)
-    theImportedSymbol                        0x0000a9cc   Data           0  eikcore{000a0000}-147.o(StubCode)
-    StubCode                                 0x0000a9d0   Section        8  eikcore{000a0000}-152.o(StubCode)
-    theImportedSymbol                        0x0000a9d4   Data           0  eikcore{000a0000}-152.o(StubCode)
-    StubCode                                 0x0000a9d8   Section        8  eikcore{000a0000}-155.o(StubCode)
-    theImportedSymbol                        0x0000a9dc   Data           0  eikcore{000a0000}-155.o(StubCode)
-    StubCode                                 0x0000a9e0   Section        8  eikcore{000a0000}-158.o(StubCode)
-    theImportedSymbol                        0x0000a9e4   Data           0  eikcore{000a0000}-158.o(StubCode)
-    StubCode                                 0x0000a9e8   Section        8  eikcore{000a0000}-159.o(StubCode)
-    theImportedSymbol                        0x0000a9ec   Data           0  eikcore{000a0000}-159.o(StubCode)
-    StubCode                                 0x0000a9f0   Section        8  eikcore{000a0000}-169.o(StubCode)
-    theImportedSymbol                        0x0000a9f4   Data           0  eikcore{000a0000}-169.o(StubCode)
-    StubCode                                 0x0000a9f8   Section        8  eikcore{000a0000}-171.o(StubCode)
-    theImportedSymbol                        0x0000a9fc   Data           0  eikcore{000a0000}-171.o(StubCode)
-    StubCode                                 0x0000aa00   Section        8  eikcore{000a0000}-175.o(StubCode)
-    theImportedSymbol                        0x0000aa04   Data           0  eikcore{000a0000}-175.o(StubCode)
-    StubCode                                 0x0000aa08   Section        8  eikcore{000a0000}-18.o(StubCode)
-    theImportedSymbol                        0x0000aa0c   Data           0  eikcore{000a0000}-18.o(StubCode)
-    StubCode                                 0x0000aa10   Section        8  eikcore{000a0000}-20.o(StubCode)
-    theImportedSymbol                        0x0000aa14   Data           0  eikcore{000a0000}-20.o(StubCode)
-    StubCode                                 0x0000aa18   Section        8  eikcore{000a0000}-25.o(StubCode)
-    theImportedSymbol                        0x0000aa1c   Data           0  eikcore{000a0000}-25.o(StubCode)
-    StubCode                                 0x0000aa20   Section        8  eikcore{000a0000}-26.o(StubCode)
-    theImportedSymbol                        0x0000aa24   Data           0  eikcore{000a0000}-26.o(StubCode)
-    StubCode                                 0x0000aa28   Section        8  eikcore{000a0000}-27.o(StubCode)
-    theImportedSymbol                        0x0000aa2c   Data           0  eikcore{000a0000}-27.o(StubCode)
-    StubCode                                 0x0000aa30   Section        8  eikcore{000a0000}-28.o(StubCode)
-    theImportedSymbol                        0x0000aa34   Data           0  eikcore{000a0000}-28.o(StubCode)
-    StubCode                                 0x0000aa38   Section        8  eikcore{000a0000}-29.o(StubCode)
-    theImportedSymbol                        0x0000aa3c   Data           0  eikcore{000a0000}-29.o(StubCode)
-    StubCode                                 0x0000aa40   Section        8  eikcore{000a0000}-291.o(StubCode)
-    theImportedSymbol                        0x0000aa44   Data           0  eikcore{000a0000}-291.o(StubCode)
-    StubCode                                 0x0000aa48   Section        8  eikcore{000a0000}-293.o(StubCode)
-    theImportedSymbol                        0x0000aa4c   Data           0  eikcore{000a0000}-293.o(StubCode)
-    StubCode                                 0x0000aa50   Section        8  eikcore{000a0000}-294.o(StubCode)
-    theImportedSymbol                        0x0000aa54   Data           0  eikcore{000a0000}-294.o(StubCode)
-    StubCode                                 0x0000aa58   Section        8  eikcore{000a0000}-295.o(StubCode)
-    theImportedSymbol                        0x0000aa5c   Data           0  eikcore{000a0000}-295.o(StubCode)
-    StubCode                                 0x0000aa60   Section        8  eikcore{000a0000}-296.o(StubCode)
-    theImportedSymbol                        0x0000aa64   Data           0  eikcore{000a0000}-296.o(StubCode)
-    StubCode                                 0x0000aa68   Section        8  eikcore{000a0000}-297.o(StubCode)
-    theImportedSymbol                        0x0000aa6c   Data           0  eikcore{000a0000}-297.o(StubCode)
-    StubCode                                 0x0000aa70   Section        8  eikcore{000a0000}-298.o(StubCode)
-    theImportedSymbol                        0x0000aa74   Data           0  eikcore{000a0000}-298.o(StubCode)
-    StubCode                                 0x0000aa78   Section        8  eikcore{000a0000}-299.o(StubCode)
-    theImportedSymbol                        0x0000aa7c   Data           0  eikcore{000a0000}-299.o(StubCode)
-    StubCode                                 0x0000aa80   Section        8  eikcore{000a0000}-30.o(StubCode)
-    theImportedSymbol                        0x0000aa84   Data           0  eikcore{000a0000}-30.o(StubCode)
-    StubCode                                 0x0000aa88   Section        8  eikcore{000a0000}-302.o(StubCode)
-    theImportedSymbol                        0x0000aa8c   Data           0  eikcore{000a0000}-302.o(StubCode)
-    StubCode                                 0x0000aa90   Section        8  eikcore{000a0000}-31.o(StubCode)
-    theImportedSymbol                        0x0000aa94   Data           0  eikcore{000a0000}-31.o(StubCode)
-    StubCode                                 0x0000aa98   Section        8  eikcore{000a0000}-315.o(StubCode)
-    theImportedSymbol                        0x0000aa9c   Data           0  eikcore{000a0000}-315.o(StubCode)
-    StubCode                                 0x0000aaa0   Section        8  eikcore{000a0000}-317.o(StubCode)
-    theImportedSymbol                        0x0000aaa4   Data           0  eikcore{000a0000}-317.o(StubCode)
-    StubCode                                 0x0000aaa8   Section        8  eikcore{000a0000}-319.o(StubCode)
-    theImportedSymbol                        0x0000aaac   Data           0  eikcore{000a0000}-319.o(StubCode)
-    StubCode                                 0x0000aab0   Section        8  eikcore{000a0000}-352.o(StubCode)
-    theImportedSymbol                        0x0000aab4   Data           0  eikcore{000a0000}-352.o(StubCode)
-    StubCode                                 0x0000aab8   Section        8  eikcore{000a0000}-37.o(StubCode)
-    theImportedSymbol                        0x0000aabc   Data           0  eikcore{000a0000}-37.o(StubCode)
-    StubCode                                 0x0000aac0   Section        8  eikcore{000a0000}-390.o(StubCode)
-    theImportedSymbol                        0x0000aac4   Data           0  eikcore{000a0000}-390.o(StubCode)
-    StubCode                                 0x0000aac8   Section        8  eikcore{000a0000}-392.o(StubCode)
-    theImportedSymbol                        0x0000aacc   Data           0  eikcore{000a0000}-392.o(StubCode)
-    StubCode                                 0x0000aad0   Section        8  eikcore{000a0000}-394.o(StubCode)
-    theImportedSymbol                        0x0000aad4   Data           0  eikcore{000a0000}-394.o(StubCode)
-    StubCode                                 0x0000aad8   Section        8  eikcore{000a0000}-467.o(StubCode)
-    theImportedSymbol                        0x0000aadc   Data           0  eikcore{000a0000}-467.o(StubCode)
-    StubCode                                 0x0000aae0   Section        8  eikcore{000a0000}-472.o(StubCode)
-    theImportedSymbol                        0x0000aae4   Data           0  eikcore{000a0000}-472.o(StubCode)
-    StubCode                                 0x0000aae8   Section        8  eikcore{000a0000}-473.o(StubCode)
-    theImportedSymbol                        0x0000aaec   Data           0  eikcore{000a0000}-473.o(StubCode)
-    StubCode                                 0x0000aaf0   Section        8  eikcore{000a0000}-479.o(StubCode)
-    theImportedSymbol                        0x0000aaf4   Data           0  eikcore{000a0000}-479.o(StubCode)
-    StubCode                                 0x0000aaf8   Section        8  eikcore{000a0000}-490.o(StubCode)
-    theImportedSymbol                        0x0000aafc   Data           0  eikcore{000a0000}-490.o(StubCode)
-    StubCode                                 0x0000ab00   Section        8  eikcore{000a0000}-506.o(StubCode)
-    theImportedSymbol                        0x0000ab04   Data           0  eikcore{000a0000}-506.o(StubCode)
-    StubCode                                 0x0000ab08   Section        8  eikcore{000a0000}-523.o(StubCode)
-    theImportedSymbol                        0x0000ab0c   Data           0  eikcore{000a0000}-523.o(StubCode)
-    StubCode                                 0x0000ab10   Section        8  eikcore{000a0000}-532.o(StubCode)
-    theImportedSymbol                        0x0000ab14   Data           0  eikcore{000a0000}-532.o(StubCode)
-    StubCode                                 0x0000ab18   Section        8  eikcore{000a0000}-533.o(StubCode)
-    theImportedSymbol                        0x0000ab1c   Data           0  eikcore{000a0000}-533.o(StubCode)
-    StubCode                                 0x0000ab20   Section        8  eikcore{000a0000}-534.o(StubCode)
-    theImportedSymbol                        0x0000ab24   Data           0  eikcore{000a0000}-534.o(StubCode)
-    StubCode                                 0x0000ab28   Section        8  eikcore{000a0000}-535.o(StubCode)
-    theImportedSymbol                        0x0000ab2c   Data           0  eikcore{000a0000}-535.o(StubCode)
-    StubCode                                 0x0000ab30   Section        8  eikcore{000a0000}-536.o(StubCode)
-    theImportedSymbol                        0x0000ab34   Data           0  eikcore{000a0000}-536.o(StubCode)
-    StubCode                                 0x0000ab38   Section        8  eikcore{000a0000}-537.o(StubCode)
-    theImportedSymbol                        0x0000ab3c   Data           0  eikcore{000a0000}-537.o(StubCode)
-    StubCode                                 0x0000ab40   Section        8  eikcore{000a0000}-565.o(StubCode)
-    theImportedSymbol                        0x0000ab44   Data           0  eikcore{000a0000}-565.o(StubCode)
-    StubCode                                 0x0000ab48   Section        8  eikcore{000a0000}-61.o(StubCode)
-    theImportedSymbol                        0x0000ab4c   Data           0  eikcore{000a0000}-61.o(StubCode)
-    StubCode                                 0x0000ab50   Section        8  eikcore{000a0000}-62.o(StubCode)
-    theImportedSymbol                        0x0000ab54   Data           0  eikcore{000a0000}-62.o(StubCode)
-    StubCode                                 0x0000ab58   Section        8  eikcore{000a0000}-63.o(StubCode)
-    theImportedSymbol                        0x0000ab5c   Data           0  eikcore{000a0000}-63.o(StubCode)
-    StubCode                                 0x0000ab60   Section        8  eikcore{000a0000}-64.o(StubCode)
-    theImportedSymbol                        0x0000ab64   Data           0  eikcore{000a0000}-64.o(StubCode)
-    StubCode                                 0x0000ab68   Section        8  eikcore{000a0000}-67.o(StubCode)
-    theImportedSymbol                        0x0000ab6c   Data           0  eikcore{000a0000}-67.o(StubCode)
-    StubCode                                 0x0000ab70   Section        8  eikcore{000a0000}-72.o(StubCode)
-    theImportedSymbol                        0x0000ab74   Data           0  eikcore{000a0000}-72.o(StubCode)
-    StubCode                                 0x0000ab78   Section        8  eikcore{000a0000}-73.o(StubCode)
-    theImportedSymbol                        0x0000ab7c   Data           0  eikcore{000a0000}-73.o(StubCode)
-    StubCode                                 0x0000ab80   Section        8  eikcore{000a0000}-74.o(StubCode)
-    theImportedSymbol                        0x0000ab84   Data           0  eikcore{000a0000}-74.o(StubCode)
-    StubCode                                 0x0000ab88   Section        8  eikcore{000a0000}-75.o(StubCode)
-    theImportedSymbol                        0x0000ab8c   Data           0  eikcore{000a0000}-75.o(StubCode)
-    StubCode                                 0x0000ab90   Section        8  eikcore{000a0000}-76.o(StubCode)
-    theImportedSymbol                        0x0000ab94   Data           0  eikcore{000a0000}-76.o(StubCode)
-    StubCode                                 0x0000ab98   Section        8  eikcore{000a0000}-77.o(StubCode)
-    theImportedSymbol                        0x0000ab9c   Data           0  eikcore{000a0000}-77.o(StubCode)
-    StubCode                                 0x0000aba0   Section        8  eikcore{000a0000}-78.o(StubCode)
-    theImportedSymbol                        0x0000aba4   Data           0  eikcore{000a0000}-78.o(StubCode)
-    StubCode                                 0x0000aba8   Section        8  eikcore{000a0000}-79.o(StubCode)
-    theImportedSymbol                        0x0000abac   Data           0  eikcore{000a0000}-79.o(StubCode)
-    StubCode                                 0x0000abb0   Section        8  eikcoctl{000a0000}-1376.o(StubCode)
-    theImportedSymbol                        0x0000abb4   Data           0  eikcoctl{000a0000}-1376.o(StubCode)
-    StubCode                                 0x0000abb8   Section        8  eikcoctl{000a0000}-140.o(StubCode)
-    theImportedSymbol                        0x0000abbc   Data           0  eikcoctl{000a0000}-140.o(StubCode)
-    StubCode                                 0x0000abc0   Section        8  eikcoctl{000a0000}-1430.o(StubCode)
-    theImportedSymbol                        0x0000abc4   Data           0  eikcoctl{000a0000}-1430.o(StubCode)
-    StubCode                                 0x0000abc8   Section        8  eikcoctl{000a0000}-35.o(StubCode)
-    theImportedSymbol                        0x0000abcc   Data           0  eikcoctl{000a0000}-35.o(StubCode)
-    StubCode                                 0x0000abd0   Section        8  eikcoctl{000a0000}-46.o(StubCode)
-    theImportedSymbol                        0x0000abd4   Data           0  eikcoctl{000a0000}-46.o(StubCode)
-    StubCode                                 0x0000abd8   Section        8  eikcoctl{000a0000}-605.o(StubCode)
-    theImportedSymbol                        0x0000abdc   Data           0  eikcoctl{000a0000}-605.o(StubCode)
-    StubCode                                 0x0000abe0   Section        8  eikcoctl{000a0000}-606.o(StubCode)
-    theImportedSymbol                        0x0000abe4   Data           0  eikcoctl{000a0000}-606.o(StubCode)
-    StubCode                                 0x0000abe8   Section        8  eikcoctl{000a0000}-660.o(StubCode)
-    theImportedSymbol                        0x0000abec   Data           0  eikcoctl{000a0000}-660.o(StubCode)
-    StubCode                                 0x0000abf0   Section        8  eikcoctl{000a0000}-875.o(StubCode)
-    theImportedSymbol                        0x0000abf4   Data           0  eikcoctl{000a0000}-875.o(StubCode)
-    StubCode                                 0x0000abf8   Section        8  eikcoctl{000a0000}-880.o(StubCode)
-    theImportedSymbol                        0x0000abfc   Data           0  eikcoctl{000a0000}-880.o(StubCode)
-    StubCode                                 0x0000ac00   Section        8  eikcoctl{000a0000}-881.o(StubCode)
-    theImportedSymbol                        0x0000ac04   Data           0  eikcoctl{000a0000}-881.o(StubCode)
-    StubCode                                 0x0000ac08   Section        8  eikctl{000a0000}-455.o(StubCode)
-    theImportedSymbol                        0x0000ac0c   Data           0  eikctl{000a0000}-455.o(StubCode)
-    StubCode                                 0x0000ac10   Section        8  avkon{000a0000}-1132.o(StubCode)
-    theImportedSymbol                        0x0000ac14   Data           0  avkon{000a0000}-1132.o(StubCode)
-    StubCode                                 0x0000ac18   Section        8  avkon{000a0000}-129.o(StubCode)
-    theImportedSymbol                        0x0000ac1c   Data           0  avkon{000a0000}-129.o(StubCode)
-    StubCode                                 0x0000ac20   Section        8  avkon{000a0000}-130.o(StubCode)
-    theImportedSymbol                        0x0000ac24   Data           0  avkon{000a0000}-130.o(StubCode)
-    StubCode                                 0x0000ac28   Section        8  avkon{000a0000}-131.o(StubCode)
-    theImportedSymbol                        0x0000ac2c   Data           0  avkon{000a0000}-131.o(StubCode)
-    StubCode                                 0x0000ac30   Section        8  avkon{000a0000}-1341.o(StubCode)
-    theImportedSymbol                        0x0000ac34   Data           0  avkon{000a0000}-1341.o(StubCode)
-    StubCode                                 0x0000ac38   Section        8  avkon{000a0000}-198.o(StubCode)
-    theImportedSymbol                        0x0000ac3c   Data           0  avkon{000a0000}-198.o(StubCode)
-    StubCode                                 0x0000ac40   Section        8  avkon{000a0000}-199.o(StubCode)
-    theImportedSymbol                        0x0000ac44   Data           0  avkon{000a0000}-199.o(StubCode)
-    StubCode                                 0x0000ac48   Section        8  avkon{000a0000}-1996.o(StubCode)
-    theImportedSymbol                        0x0000ac4c   Data           0  avkon{000a0000}-1996.o(StubCode)
-    StubCode                                 0x0000ac50   Section        8  avkon{000a0000}-201.o(StubCode)
-    theImportedSymbol                        0x0000ac54   Data           0  avkon{000a0000}-201.o(StubCode)
-    StubCode                                 0x0000ac58   Section        8  avkon{000a0000}-206.o(StubCode)
-    theImportedSymbol                        0x0000ac5c   Data           0  avkon{000a0000}-206.o(StubCode)
-    StubCode                                 0x0000ac60   Section        8  avkon{000a0000}-211.o(StubCode)
-    theImportedSymbol                        0x0000ac64   Data           0  avkon{000a0000}-211.o(StubCode)
-    StubCode                                 0x0000ac68   Section        8  avkon{000a0000}-213.o(StubCode)
-    theImportedSymbol                        0x0000ac6c   Data           0  avkon{000a0000}-213.o(StubCode)
-    StubCode                                 0x0000ac70   Section        8  avkon{000a0000}-214.o(StubCode)
-    theImportedSymbol                        0x0000ac74   Data           0  avkon{000a0000}-214.o(StubCode)
-    StubCode                                 0x0000ac78   Section        8  avkon{000a0000}-215.o(StubCode)
-    theImportedSymbol                        0x0000ac7c   Data           0  avkon{000a0000}-215.o(StubCode)
-    StubCode                                 0x0000ac80   Section        8  avkon{000a0000}-216.o(StubCode)
-    theImportedSymbol                        0x0000ac84   Data           0  avkon{000a0000}-216.o(StubCode)
-    StubCode                                 0x0000ac88   Section        8  avkon{000a0000}-2163.o(StubCode)
-    theImportedSymbol                        0x0000ac8c   Data           0  avkon{000a0000}-2163.o(StubCode)
-    StubCode                                 0x0000ac90   Section        8  avkon{000a0000}-217.o(StubCode)
-    theImportedSymbol                        0x0000ac94   Data           0  avkon{000a0000}-217.o(StubCode)
-    StubCode                                 0x0000ac98   Section        8  avkon{000a0000}-2178.o(StubCode)
-    theImportedSymbol                        0x0000ac9c   Data           0  avkon{000a0000}-2178.o(StubCode)
-    StubCode                                 0x0000aca0   Section        8  avkon{000a0000}-220.o(StubCode)
-    theImportedSymbol                        0x0000aca4   Data           0  avkon{000a0000}-220.o(StubCode)
-    StubCode                                 0x0000aca8   Section        8  avkon{000a0000}-2591.o(StubCode)
-    theImportedSymbol                        0x0000acac   Data           0  avkon{000a0000}-2591.o(StubCode)
-    StubCode                                 0x0000acb0   Section        8  avkon{000a0000}-2624.o(StubCode)
-    theImportedSymbol                        0x0000acb4   Data           0  avkon{000a0000}-2624.o(StubCode)
-    StubCode                                 0x0000acb8   Section        8  avkon{000a0000}-2632.o(StubCode)
-    theImportedSymbol                        0x0000acbc   Data           0  avkon{000a0000}-2632.o(StubCode)
-    StubCode                                 0x0000acc0   Section        8  avkon{000a0000}-2895.o(StubCode)
-    theImportedSymbol                        0x0000acc4   Data           0  avkon{000a0000}-2895.o(StubCode)
-    StubCode                                 0x0000acc8   Section        8  avkon{000a0000}-2898.o(StubCode)
-    theImportedSymbol                        0x0000accc   Data           0  avkon{000a0000}-2898.o(StubCode)
-    StubCode                                 0x0000acd0   Section        8  avkon{000a0000}-2899.o(StubCode)
-    theImportedSymbol                        0x0000acd4   Data           0  avkon{000a0000}-2899.o(StubCode)
-    StubCode                                 0x0000acd8   Section        8  avkon{000a0000}-2900.o(StubCode)
-    theImportedSymbol                        0x0000acdc   Data           0  avkon{000a0000}-2900.o(StubCode)
-    StubCode                                 0x0000ace0   Section        8  avkon{000a0000}-2901.o(StubCode)
-    theImportedSymbol                        0x0000ace4   Data           0  avkon{000a0000}-2901.o(StubCode)
-    StubCode                                 0x0000ace8   Section        8  avkon{000a0000}-2902.o(StubCode)
-    theImportedSymbol                        0x0000acec   Data           0  avkon{000a0000}-2902.o(StubCode)
-    StubCode                                 0x0000acf0   Section        8  avkon{000a0000}-2903.o(StubCode)
-    theImportedSymbol                        0x0000acf4   Data           0  avkon{000a0000}-2903.o(StubCode)
-    StubCode                                 0x0000acf8   Section        8  avkon{000a0000}-2904.o(StubCode)
-    theImportedSymbol                        0x0000acfc   Data           0  avkon{000a0000}-2904.o(StubCode)
-    StubCode                                 0x0000ad00   Section        8  avkon{000a0000}-2905.o(StubCode)
-    theImportedSymbol                        0x0000ad04   Data           0  avkon{000a0000}-2905.o(StubCode)
-    StubCode                                 0x0000ad08   Section        8  avkon{000a0000}-2906.o(StubCode)
-    theImportedSymbol                        0x0000ad0c   Data           0  avkon{000a0000}-2906.o(StubCode)
-    StubCode                                 0x0000ad10   Section        8  avkon{000a0000}-2907.o(StubCode)
-    theImportedSymbol                        0x0000ad14   Data           0  avkon{000a0000}-2907.o(StubCode)
-    StubCode                                 0x0000ad18   Section        8  avkon{000a0000}-2909.o(StubCode)
-    theImportedSymbol                        0x0000ad1c   Data           0  avkon{000a0000}-2909.o(StubCode)
-    StubCode                                 0x0000ad20   Section        8  avkon{000a0000}-2910.o(StubCode)
-    theImportedSymbol                        0x0000ad24   Data           0  avkon{000a0000}-2910.o(StubCode)
-    StubCode                                 0x0000ad28   Section        8  avkon{000a0000}-2912.o(StubCode)
-    theImportedSymbol                        0x0000ad2c   Data           0  avkon{000a0000}-2912.o(StubCode)
-    StubCode                                 0x0000ad30   Section        8  avkon{000a0000}-2913.o(StubCode)
-    theImportedSymbol                        0x0000ad34   Data           0  avkon{000a0000}-2913.o(StubCode)
-    StubCode                                 0x0000ad38   Section        8  avkon{000a0000}-2914.o(StubCode)
-    theImportedSymbol                        0x0000ad3c   Data           0  avkon{000a0000}-2914.o(StubCode)
-    StubCode                                 0x0000ad40   Section        8  avkon{000a0000}-2917.o(StubCode)
-    theImportedSymbol                        0x0000ad44   Data           0  avkon{000a0000}-2917.o(StubCode)
-    StubCode                                 0x0000ad48   Section        8  avkon{000a0000}-2919.o(StubCode)
-    theImportedSymbol                        0x0000ad4c   Data           0  avkon{000a0000}-2919.o(StubCode)
-    StubCode                                 0x0000ad50   Section        8  avkon{000a0000}-2920.o(StubCode)
-    theImportedSymbol                        0x0000ad54   Data           0  avkon{000a0000}-2920.o(StubCode)
-    StubCode                                 0x0000ad58   Section        8  avkon{000a0000}-2922.o(StubCode)
-    theImportedSymbol                        0x0000ad5c   Data           0  avkon{000a0000}-2922.o(StubCode)
-    StubCode                                 0x0000ad60   Section        8  avkon{000a0000}-2928.o(StubCode)
-    theImportedSymbol                        0x0000ad64   Data           0  avkon{000a0000}-2928.o(StubCode)
-    StubCode                                 0x0000ad68   Section        8  avkon{000a0000}-2929.o(StubCode)
-    theImportedSymbol                        0x0000ad6c   Data           0  avkon{000a0000}-2929.o(StubCode)
-    StubCode                                 0x0000ad70   Section        8  avkon{000a0000}-2930.o(StubCode)
-    theImportedSymbol                        0x0000ad74   Data           0  avkon{000a0000}-2930.o(StubCode)
-    StubCode                                 0x0000ad78   Section        8  avkon{000a0000}-2932.o(StubCode)
-    theImportedSymbol                        0x0000ad7c   Data           0  avkon{000a0000}-2932.o(StubCode)
-    StubCode                                 0x0000ad80   Section        8  avkon{000a0000}-2934.o(StubCode)
-    theImportedSymbol                        0x0000ad84   Data           0  avkon{000a0000}-2934.o(StubCode)
-    StubCode                                 0x0000ad88   Section        8  avkon{000a0000}-2936.o(StubCode)
-    theImportedSymbol                        0x0000ad8c   Data           0  avkon{000a0000}-2936.o(StubCode)
-    StubCode                                 0x0000ad90   Section        8  avkon{000a0000}-2993.o(StubCode)
-    theImportedSymbol                        0x0000ad94   Data           0  avkon{000a0000}-2993.o(StubCode)
-    StubCode                                 0x0000ad98   Section        8  avkon{000a0000}-2997.o(StubCode)
-    theImportedSymbol                        0x0000ad9c   Data           0  avkon{000a0000}-2997.o(StubCode)
-    StubCode                                 0x0000ada0   Section        8  avkon{000a0000}-3417.o(StubCode)
-    theImportedSymbol                        0x0000ada4   Data           0  avkon{000a0000}-3417.o(StubCode)
-    StubCode                                 0x0000ada8   Section        8  avkon{000a0000}-3420.o(StubCode)
-    theImportedSymbol                        0x0000adac   Data           0  avkon{000a0000}-3420.o(StubCode)
-    StubCode                                 0x0000adb0   Section        8  avkon{000a0000}-3421.o(StubCode)
-    theImportedSymbol                        0x0000adb4   Data           0  avkon{000a0000}-3421.o(StubCode)
-    StubCode                                 0x0000adb8   Section        8  avkon{000a0000}-3422.o(StubCode)
-    theImportedSymbol                        0x0000adbc   Data           0  avkon{000a0000}-3422.o(StubCode)
-    StubCode                                 0x0000adc0   Section        8  avkon{000a0000}-3423.o(StubCode)
-    theImportedSymbol                        0x0000adc4   Data           0  avkon{000a0000}-3423.o(StubCode)
-    StubCode                                 0x0000adc8   Section        8  avkon{000a0000}-3424.o(StubCode)
-    theImportedSymbol                        0x0000adcc   Data           0  avkon{000a0000}-3424.o(StubCode)
-    StubCode                                 0x0000add0   Section        8  avkon{000a0000}-367.o(StubCode)
-    theImportedSymbol                        0x0000add4   Data           0  avkon{000a0000}-367.o(StubCode)
-    StubCode                                 0x0000add8   Section        8  avkon{000a0000}-368.o(StubCode)
-    theImportedSymbol                        0x0000addc   Data           0  avkon{000a0000}-368.o(StubCode)
-    StubCode                                 0x0000ade0   Section        8  avkon{000a0000}-369.o(StubCode)
-    theImportedSymbol                        0x0000ade4   Data           0  avkon{000a0000}-369.o(StubCode)
-    StubCode                                 0x0000ade8   Section        8  avkon{000a0000}-370.o(StubCode)
-    theImportedSymbol                        0x0000adec   Data           0  avkon{000a0000}-370.o(StubCode)
-    StubCode                                 0x0000adf0   Section        8  avkon{000a0000}-372.o(StubCode)
-    theImportedSymbol                        0x0000adf4   Data           0  avkon{000a0000}-372.o(StubCode)
-    StubCode                                 0x0000adf8   Section        8  avkon{000a0000}-373.o(StubCode)
-    theImportedSymbol                        0x0000adfc   Data           0  avkon{000a0000}-373.o(StubCode)
-    StubCode                                 0x0000ae00   Section        8  avkon{000a0000}-374.o(StubCode)
-    theImportedSymbol                        0x0000ae04   Data           0  avkon{000a0000}-374.o(StubCode)
-    StubCode                                 0x0000ae08   Section        8  avkon{000a0000}-375.o(StubCode)
-    theImportedSymbol                        0x0000ae0c   Data           0  avkon{000a0000}-375.o(StubCode)
-    StubCode                                 0x0000ae10   Section        8  avkon{000a0000}-377.o(StubCode)
-    theImportedSymbol                        0x0000ae14   Data           0  avkon{000a0000}-377.o(StubCode)
-    StubCode                                 0x0000ae18   Section        8  avkon{000a0000}-3826.o(StubCode)
-    theImportedSymbol                        0x0000ae1c   Data           0  avkon{000a0000}-3826.o(StubCode)
-    StubCode                                 0x0000ae20   Section        8  avkon{000a0000}-3831.o(StubCode)
-    theImportedSymbol                        0x0000ae24   Data           0  avkon{000a0000}-3831.o(StubCode)
-    StubCode                                 0x0000ae28   Section        8  avkon{000a0000}-3832.o(StubCode)
-    theImportedSymbol                        0x0000ae2c   Data           0  avkon{000a0000}-3832.o(StubCode)
-    StubCode                                 0x0000ae30   Section        8  avkon{000a0000}-3857.o(StubCode)
-    theImportedSymbol                        0x0000ae34   Data           0  avkon{000a0000}-3857.o(StubCode)
-    StubCode                                 0x0000ae38   Section        8  avkon{000a0000}-3860.o(StubCode)
-    theImportedSymbol                        0x0000ae3c   Data           0  avkon{000a0000}-3860.o(StubCode)
-    StubCode                                 0x0000ae40   Section        8  avkon{000a0000}-3861.o(StubCode)
-    theImportedSymbol                        0x0000ae44   Data           0  avkon{000a0000}-3861.o(StubCode)
-    StubCode                                 0x0000ae48   Section        8  avkon{000a0000}-3868.o(StubCode)
-    theImportedSymbol                        0x0000ae4c   Data           0  avkon{000a0000}-3868.o(StubCode)
-    StubCode                                 0x0000ae50   Section        8  avkon{000a0000}-3947.o(StubCode)
-    theImportedSymbol                        0x0000ae54   Data           0  avkon{000a0000}-3947.o(StubCode)
-    StubCode                                 0x0000ae58   Section        8  avkon{000a0000}-3948.o(StubCode)
-    theImportedSymbol                        0x0000ae5c   Data           0  avkon{000a0000}-3948.o(StubCode)
-    StubCode                                 0x0000ae60   Section        8  avkon{000a0000}-3949.o(StubCode)
-    theImportedSymbol                        0x0000ae64   Data           0  avkon{000a0000}-3949.o(StubCode)
-    StubCode                                 0x0000ae68   Section        8  avkon{000a0000}-3983.o(StubCode)
-    theImportedSymbol                        0x0000ae6c   Data           0  avkon{000a0000}-3983.o(StubCode)
-    StubCode                                 0x0000ae70   Section        8  avkon{000a0000}-4014.o(StubCode)
-    theImportedSymbol                        0x0000ae74   Data           0  avkon{000a0000}-4014.o(StubCode)
-    StubCode                                 0x0000ae78   Section        8  avkon{000a0000}-4030.o(StubCode)
-    theImportedSymbol                        0x0000ae7c   Data           0  avkon{000a0000}-4030.o(StubCode)
-    StubCode                                 0x0000ae80   Section        8  AknIcon{000a0000}-13.o(StubCode)
-    theImportedSymbol                        0x0000ae84   Data           0  AknIcon{000a0000}-13.o(StubCode)
-    StubCode                                 0x0000ae88   Section        8  egul{000a0000}-94.o(StubCode)
-    theImportedSymbol                        0x0000ae8c   Data           0  egul{000a0000}-94.o(StubCode)
-    StubCode                                 0x0000ae90   Section        8  egul{000a0000}-95.o(StubCode)
-    theImportedSymbol                        0x0000ae94   Data           0  egul{000a0000}-95.o(StubCode)
-    StubCode                                 0x0000ae98   Section        8  gdi{000a0000}-310.o(StubCode)
-    theImportedSymbol                        0x0000ae9c   Data           0  gdi{000a0000}-310.o(StubCode)
-    StubCode                                 0x0000aea0   Section        8  gdi{000a0000}-311.o(StubCode)
-    theImportedSymbol                        0x0000aea4   Data           0  gdi{000a0000}-311.o(StubCode)
-    StubCode                                 0x0000aea8   Section        8  gdi{000a0000}-312.o(StubCode)
-    theImportedSymbol                        0x0000aeac   Data           0  gdi{000a0000}-312.o(StubCode)
-    StubCode                                 0x0000aeb0   Section        8  fbscli{000a0000}-26.o(StubCode)
-    theImportedSymbol                        0x0000aeb4   Data           0  fbscli{000a0000}-26.o(StubCode)
-    StubCode                                 0x0000aeb8   Section        8  fbscli{000a0000}-31.o(StubCode)
-    theImportedSymbol                        0x0000aebc   Data           0  fbscli{000a0000}-31.o(StubCode)
-    StubCode                                 0x0000aec0   Section        8  eposlandmarks{000a0000}-12.o(StubCode)
-    theImportedSymbol                        0x0000aec4   Data           0  eposlandmarks{000a0000}-12.o(StubCode)
-    StubCode                                 0x0000aec8   Section        8  eposlandmarks{000a0000}-15.o(StubCode)
-    theImportedSymbol                        0x0000aecc   Data           0  eposlandmarks{000a0000}-15.o(StubCode)
-    StubCode                                 0x0000aed0   Section        8  eposlandmarks{000a0000}-4.o(StubCode)
-    theImportedSymbol                        0x0000aed4   Data           0  eposlandmarks{000a0000}-4.o(StubCode)
-    StubCode                                 0x0000aed8   Section        8  eposlandmarks{000a0000}-50.o(StubCode)
-    theImportedSymbol                        0x0000aedc   Data           0  eposlandmarks{000a0000}-50.o(StubCode)
-    StubCode                                 0x0000aee0   Section        8  eposlandmarks{000a0000}-65.o(StubCode)
-    theImportedSymbol                        0x0000aee4   Data           0  eposlandmarks{000a0000}-65.o(StubCode)
-    StubCode                                 0x0000aee8   Section        8  eposlandmarks{000a0000}-67.o(StubCode)
-    theImportedSymbol                        0x0000aeec   Data           0  eposlandmarks{000a0000}-67.o(StubCode)
-    StubCode                                 0x0000aef0   Section        8  eposlandmarks{000a0000}-75.o(StubCode)
-    theImportedSymbol                        0x0000aef4   Data           0  eposlandmarks{000a0000}-75.o(StubCode)
-    StubCode                                 0x0000aef8   Section        8  lbs{000a0000}-152.o(StubCode)
-    theImportedSymbol                        0x0000aefc   Data           0  lbs{000a0000}-152.o(StubCode)
-    StubCode                                 0x0000af00   Section        8  lbs{000a0000}-180.o(StubCode)
-    theImportedSymbol                        0x0000af04   Data           0  lbs{000a0000}-180.o(StubCode)
-    StubCode                                 0x0000af08   Section        8  lbs{000a0000}-181.o(StubCode)
-    theImportedSymbol                        0x0000af0c   Data           0  lbs{000a0000}-181.o(StubCode)
-    StubCode                                 0x0000af10   Section        8  lbs{000a0000}-205.o(StubCode)
-    theImportedSymbol                        0x0000af14   Data           0  lbs{000a0000}-205.o(StubCode)
-    StubCode                                 0x0000af18   Section        8  lbs{000a0000}-207.o(StubCode)
-    theImportedSymbol                        0x0000af1c   Data           0  lbs{000a0000}-207.o(StubCode)
-    StubCode                                 0x0000af20   Section        8  lbs{000a0000}-21.o(StubCode)
-    theImportedSymbol                        0x0000af24   Data           0  lbs{000a0000}-21.o(StubCode)
-    StubCode                                 0x0000af28   Section        8  lbs{000a0000}-214.o(StubCode)
-    theImportedSymbol                        0x0000af2c   Data           0  lbs{000a0000}-214.o(StubCode)
-    StubCode                                 0x0000af30   Section        8  lbs{000a0000}-223.o(StubCode)
-    theImportedSymbol                        0x0000af34   Data           0  lbs{000a0000}-223.o(StubCode)
-    StubCode                                 0x0000af38   Section        8  lbs{000a0000}-225.o(StubCode)
-    theImportedSymbol                        0x0000af3c   Data           0  lbs{000a0000}-225.o(StubCode)
-    StubCode                                 0x0000af40   Section        8  lbs{000a0000}-226.o(StubCode)
-    theImportedSymbol                        0x0000af44   Data           0  lbs{000a0000}-226.o(StubCode)
-    StubCode                                 0x0000af48   Section        8  lbs{000a0000}-23.o(StubCode)
-    theImportedSymbol                        0x0000af4c   Data           0  lbs{000a0000}-23.o(StubCode)
-    StubCode                                 0x0000af50   Section        8  lbs{000a0000}-28.o(StubCode)
-    theImportedSymbol                        0x0000af54   Data           0  lbs{000a0000}-28.o(StubCode)
-    StubCode                                 0x0000af58   Section        8  lbs{000a0000}-304.o(StubCode)
-    theImportedSymbol                        0x0000af5c   Data           0  lbs{000a0000}-304.o(StubCode)
-    StubCode                                 0x0000af60   Section        8  lbs{000a0000}-306.o(StubCode)
-    theImportedSymbol                        0x0000af64   Data           0  lbs{000a0000}-306.o(StubCode)
-    StubCode                                 0x0000af68   Section        8  mnservicelib{000a0000}-1.o(StubCode)
-    theImportedSymbol                        0x0000af6c   Data           0  mnservicelib{000a0000}-1.o(StubCode)
-    StubCode                                 0x0000af70   Section        8  mnservicelib{000a0000}-10.o(StubCode)
-    theImportedSymbol                        0x0000af74   Data           0  mnservicelib{000a0000}-10.o(StubCode)
-    StubCode                                 0x0000af78   Section        8  mnservicelib{000a0000}-11.o(StubCode)
-    theImportedSymbol                        0x0000af7c   Data           0  mnservicelib{000a0000}-11.o(StubCode)
-    StubCode                                 0x0000af80   Section        8  mnservicelib{000a0000}-12.o(StubCode)
-    theImportedSymbol                        0x0000af84   Data           0  mnservicelib{000a0000}-12.o(StubCode)
-    StubCode                                 0x0000af88   Section        8  mnservicelib{000a0000}-13.o(StubCode)
-    theImportedSymbol                        0x0000af8c   Data           0  mnservicelib{000a0000}-13.o(StubCode)
-    StubCode                                 0x0000af90   Section        8  mnservicelib{000a0000}-14.o(StubCode)
-    theImportedSymbol                        0x0000af94   Data           0  mnservicelib{000a0000}-14.o(StubCode)
-    StubCode                                 0x0000af98   Section        8  mnservicelib{000a0000}-15.o(StubCode)
-    theImportedSymbol                        0x0000af9c   Data           0  mnservicelib{000a0000}-15.o(StubCode)
-    StubCode                                 0x0000afa0   Section        8  mnservicelib{000a0000}-16.o(StubCode)
-    theImportedSymbol                        0x0000afa4   Data           0  mnservicelib{000a0000}-16.o(StubCode)
-    StubCode                                 0x0000afa8   Section        8  mnservicelib{000a0000}-17.o(StubCode)
-    theImportedSymbol                        0x0000afac   Data           0  mnservicelib{000a0000}-17.o(StubCode)
-    StubCode                                 0x0000afb0   Section        8  mnservicelib{000a0000}-2.o(StubCode)
-    theImportedSymbol                        0x0000afb4   Data           0  mnservicelib{000a0000}-2.o(StubCode)
-    StubCode                                 0x0000afb8   Section        8  mnservicelib{000a0000}-20.o(StubCode)
-    theImportedSymbol                        0x0000afbc   Data           0  mnservicelib{000a0000}-20.o(StubCode)
-    StubCode                                 0x0000afc0   Section        8  mnservicelib{000a0000}-28.o(StubCode)
-    theImportedSymbol                        0x0000afc4   Data           0  mnservicelib{000a0000}-28.o(StubCode)
-    StubCode                                 0x0000afc8   Section        8  mnservicelib{000a0000}-29.o(StubCode)
-    theImportedSymbol                        0x0000afcc   Data           0  mnservicelib{000a0000}-29.o(StubCode)
-    StubCode                                 0x0000afd0   Section        8  mnservicelib{000a0000}-30.o(StubCode)
-    theImportedSymbol                        0x0000afd4   Data           0  mnservicelib{000a0000}-30.o(StubCode)
-    StubCode                                 0x0000afd8   Section        8  mnservicelib{000a0000}-33.o(StubCode)
-    theImportedSymbol                        0x0000afdc   Data           0  mnservicelib{000a0000}-33.o(StubCode)
-    StubCode                                 0x0000afe0   Section        8  mnservicelib{000a0000}-4.o(StubCode)
-    theImportedSymbol                        0x0000afe4   Data           0  mnservicelib{000a0000}-4.o(StubCode)
-    StubCode                                 0x0000afe8   Section        8  mnservicelib{000a0000}-5.o(StubCode)
-    theImportedSymbol                        0x0000afec   Data           0  mnservicelib{000a0000}-5.o(StubCode)
-    StubCode                                 0x0000aff0   Section        8  mnservicelib{000a0000}-7.o(StubCode)
-    theImportedSymbol                        0x0000aff4   Data           0  mnservicelib{000a0000}-7.o(StubCode)
-    StubCode                                 0x0000aff8   Section        8  mnrefproviderengine{000a0000}-12.o(StubCode)
-    theImportedSymbol                        0x0000affc   Data           0  mnrefproviderengine{000a0000}-12.o(StubCode)
-    StubCode                                 0x0000b000   Section        8  mnrefproviderengine{000a0000}-17.o(StubCode)
-    theImportedSymbol                        0x0000b004   Data           0  mnrefproviderengine{000a0000}-17.o(StubCode)
-    StubCode                                 0x0000b008   Section        8  mnrefproviderengine{000a0000}-19.o(StubCode)
-    theImportedSymbol                        0x0000b00c   Data           0  mnrefproviderengine{000a0000}-19.o(StubCode)
-    StubCode                                 0x0000b010   Section        8  mnrefproviderengine{000a0000}-20.o(StubCode)
-    theImportedSymbol                        0x0000b014   Data           0  mnrefproviderengine{000a0000}-20.o(StubCode)
-    StubCode                                 0x0000b018   Section        8  mnrefproviderengine{000a0000}-22.o(StubCode)
-    theImportedSymbol                        0x0000b01c   Data           0  mnrefproviderengine{000a0000}-22.o(StubCode)
-    StubCode                                 0x0000b020   Section        8  mnrefproviderengine{000a0000}-23.o(StubCode)
-    theImportedSymbol                        0x0000b024   Data           0  mnrefproviderengine{000a0000}-23.o(StubCode)
-    StubCode                                 0x0000b028   Section        8  mnrefproviderengine{000a0000}-24.o(StubCode)
-    theImportedSymbol                        0x0000b02c   Data           0  mnrefproviderengine{000a0000}-24.o(StubCode)
-    StubCode                                 0x0000b030   Section        8  mnrefproviderengine{000a0000}-25.o(StubCode)
-    theImportedSymbol                        0x0000b034   Data           0  mnrefproviderengine{000a0000}-25.o(StubCode)
-    StubCode                                 0x0000b038   Section        8  mnrefproviderengine{000a0000}-26.o(StubCode)
-    theImportedSymbol                        0x0000b03c   Data           0  mnrefproviderengine{000a0000}-26.o(StubCode)
-    StubCode                                 0x0000b040   Section        8  mnrefproviderengine{000a0000}-27.o(StubCode)
-    theImportedSymbol                        0x0000b044   Data           0  mnrefproviderengine{000a0000}-27.o(StubCode)
-    StubCode                                 0x0000b048   Section        8  mnrefproviderengine{000a0000}-28.o(StubCode)
-    theImportedSymbol                        0x0000b04c   Data           0  mnrefproviderengine{000a0000}-28.o(StubCode)
-    StubCode                                 0x0000b050   Section        8  mnrefproviderengine{000a0000}-29.o(StubCode)
-    theImportedSymbol                        0x0000b054   Data           0  mnrefproviderengine{000a0000}-29.o(StubCode)
-    StubCode                                 0x0000b058   Section        8  mnrefproviderengine{000a0000}-30.o(StubCode)
-    theImportedSymbol                        0x0000b05c   Data           0  mnrefproviderengine{000a0000}-30.o(StubCode)
-    StubCode                                 0x0000b060   Section        8  mnrefproviderengine{000a0000}-31.o(StubCode)
-    theImportedSymbol                        0x0000b064   Data           0  mnrefproviderengine{000a0000}-31.o(StubCode)
-    StubCode                                 0x0000b068   Section        8  mnrefproviderengine{000a0000}-32.o(StubCode)
-    theImportedSymbol                        0x0000b06c   Data           0  mnrefproviderengine{000a0000}-32.o(StubCode)
-    StubCode                                 0x0000b070   Section        8  mnrefproviderengine{000a0000}-33.o(StubCode)
-    theImportedSymbol                        0x0000b074   Data           0  mnrefproviderengine{000a0000}-33.o(StubCode)
-    StubCode                                 0x0000b078   Section        8  mnrefproviderengine{000a0000}-34.o(StubCode)
-    theImportedSymbol                        0x0000b07c   Data           0  mnrefproviderengine{000a0000}-34.o(StubCode)
-    StubCode                                 0x0000b080   Section        8  mnrefproviderengine{000a0000}-38.o(StubCode)
-    theImportedSymbol                        0x0000b084   Data           0  mnrefproviderengine{000a0000}-38.o(StubCode)
-    StubCode                                 0x0000b088   Section        8  mnrefproviderengine{000a0000}-39.o(StubCode)
-    theImportedSymbol                        0x0000b08c   Data           0  mnrefproviderengine{000a0000}-39.o(StubCode)
-    StubCode                                 0x0000b090   Section        8  mnrefproviderengine{000a0000}-40.o(StubCode)
-    theImportedSymbol                        0x0000b094   Data           0  mnrefproviderengine{000a0000}-40.o(StubCode)
-    StubCode                                 0x0000b098   Section        8  mnrefproviderengine{000a0000}-41.o(StubCode)
-    theImportedSymbol                        0x0000b09c   Data           0  mnrefproviderengine{000a0000}-41.o(StubCode)
-    StubCode                                 0x0000b0a0   Section        8  mnrefproviderengine{000a0000}-42.o(StubCode)
-    theImportedSymbol                        0x0000b0a4   Data           0  mnrefproviderengine{000a0000}-42.o(StubCode)
-    StubCode                                 0x0000b0a8   Section        8  mnrefproviderengine{000a0000}-43.o(StubCode)
-    theImportedSymbol                        0x0000b0ac   Data           0  mnrefproviderengine{000a0000}-43.o(StubCode)
-    StubCode                                 0x0000b0b0   Section        8  mnrefproviderengine{000a0000}-44.o(StubCode)
-    theImportedSymbol                        0x0000b0b4   Data           0  mnrefproviderengine{000a0000}-44.o(StubCode)
-    StubCode                                 0x0000b0b8   Section        8  mnrefproviderengine{000a0000}-45.o(StubCode)
-    theImportedSymbol                        0x0000b0bc   Data           0  mnrefproviderengine{000a0000}-45.o(StubCode)
-    StubCode                                 0x0000b0c0   Section        8  mnrefproviderengine{000a0000}-46.o(StubCode)
-    theImportedSymbol                        0x0000b0c4   Data           0  mnrefproviderengine{000a0000}-46.o(StubCode)
-    StubCode                                 0x0000b0c8   Section        8  mnrefproviderengine{000a0000}-47.o(StubCode)
-    theImportedSymbol                        0x0000b0cc   Data           0  mnrefproviderengine{000a0000}-47.o(StubCode)
-    StubCode                                 0x0000b0d0   Section        8  mnrefproviderengine{000a0000}-48.o(StubCode)
-    theImportedSymbol                        0x0000b0d4   Data           0  mnrefproviderengine{000a0000}-48.o(StubCode)
-    StubCode                                 0x0000b0d8   Section        8  mnrefproviderengine{000a0000}-50.o(StubCode)
-    theImportedSymbol                        0x0000b0dc   Data           0  mnrefproviderengine{000a0000}-50.o(StubCode)
-    StubCode                                 0x0000b0e0   Section        8  mnrefproviderengine{000a0000}-51.o(StubCode)
-    theImportedSymbol                        0x0000b0e4   Data           0  mnrefproviderengine{000a0000}-51.o(StubCode)
-    StubCode                                 0x0000b0e8   Section        8  mnrefproviderengine{000a0000}-53.o(StubCode)
-    theImportedSymbol                        0x0000b0ec   Data           0  mnrefproviderengine{000a0000}-53.o(StubCode)
-    StubCode                                 0x0000b0f0   Section        8  mnrefproviderengine{000a0000}-54.o(StubCode)
-    theImportedSymbol                        0x0000b0f4   Data           0  mnrefproviderengine{000a0000}-54.o(StubCode)
-    StubCode                                 0x0000b0f8   Section        8  dfpaeabi{000a0000}-12.o(StubCode)
-    theImportedSymbol                        0x0000b0fc   Data           0  dfpaeabi{000a0000}-12.o(StubCode)
-    StubCode                                 0x0000b100   Section        8  dfpaeabi{000a0000}-20.o(StubCode)
-    theImportedSymbol                        0x0000b104   Data           0  dfpaeabi{000a0000}-20.o(StubCode)
-    StubCode                                 0x0000b108   Section        8  dfpaeabi{000a0000}-23.o(StubCode)
-    theImportedSymbol                        0x0000b10c   Data           0  dfpaeabi{000a0000}-23.o(StubCode)
-    StubCode                                 0x0000b110   Section        8  dfpaeabi{000a0000}-24.o(StubCode)
-    theImportedSymbol                        0x0000b114   Data           0  dfpaeabi{000a0000}-24.o(StubCode)
-    StubCode                                 0x0000b118   Section        8  dfpaeabi{000a0000}-41.o(StubCode)
-    theImportedSymbol                        0x0000b11c   Data           0  dfpaeabi{000a0000}-41.o(StubCode)
-    StubCode                                 0x0000b120   Section        8  dfpaeabi{000a0000}-8.o(StubCode)
-    theImportedSymbol                        0x0000b124   Data           0  dfpaeabi{000a0000}-8.o(StubCode)
-    StubCode                                 0x0000b128   Section        8  drtaeabi{000a0000}-147.o(StubCode)
-    theImportedSymbol                        0x0000b12c   Data           0  drtaeabi{000a0000}-147.o(StubCode)
-    StubCode                                 0x0000b130   Section        8  drtaeabi{000a0000}-158.o(StubCode)
-    theImportedSymbol                        0x0000b134   Data           0  drtaeabi{000a0000}-158.o(StubCode)
-    StubCode                                 0x0000b138   Section        8  drtaeabi{000a0000}-159.o(StubCode)
-    theImportedSymbol                        0x0000b13c   Data           0  drtaeabi{000a0000}-159.o(StubCode)
-    StubCode                                 0x0000b140   Section        8  drtaeabi{000a0000}-180.o(StubCode)
-    theImportedSymbol                        0x0000b144   Data           0  drtaeabi{000a0000}-180.o(StubCode)
-    StubCode                                 0x0000b148   Section        8  drtaeabi{000a0000}-182.o(StubCode)
-    theImportedSymbol                        0x0000b14c   Data           0  drtaeabi{000a0000}-182.o(StubCode)
-    StubCode                                 0x0000b150   Section        8  drtaeabi{000a0000}-183.o(StubCode)
-    theImportedSymbol                        0x0000b154   Data           0  drtaeabi{000a0000}-183.o(StubCode)
-    StubCode                                 0x0000b158   Section        8  drtaeabi{000a0000}-184.o(StubCode)
-    theImportedSymbol                        0x0000b15c   Data           0  drtaeabi{000a0000}-184.o(StubCode)
-    StubCode                                 0x0000b160   Section        8  drtaeabi{000a0000}-189.o(StubCode)
-    theImportedSymbol                        0x0000b164   Data           0  drtaeabi{000a0000}-189.o(StubCode)
-    StubCode                                 0x0000b168   Section        8  scppnwdl{000a0000}-3.o(StubCode)
-    theImportedSymbol                        0x0000b16c   Data           0  scppnwdl{000a0000}-3.o(StubCode)
-    StubCode                                 0x0000b170   Section        8  euser{000a0000}-1360.o(StubCode)
-    theImportedSymbol                        0x0000b174   Data           0  euser{000a0000}-1360.o(StubCode)
-    StubCode                                 0x0000b178   Section        8  euser{000a0000}-641.o(StubCode)
-    theImportedSymbol                        0x0000b17c   Data           0  euser{000a0000}-641.o(StubCode)
-    StubCode                                 0x0000b180   Section        8  euser{000a0000}-585.o(StubCode)
-    theImportedSymbol                        0x0000b184   Data           0  euser{000a0000}-585.o(StubCode)
-    StubCode                                 0x0000b188   Section        8  euser{000a0000}-650.o(StubCode)
-    theImportedSymbol                        0x0000b18c   Data           0  euser{000a0000}-650.o(StubCode)
-    StubCode                                 0x0000b190   Section        8  drtaeabi{000a0000}-204.o(StubCode)
-    theImportedSymbol                        0x0000b194   Data           0  drtaeabi{000a0000}-204.o(StubCode)
-    i._ZN12CAknDocumentD2Ev                  0x0000b198   Section        8  mnrefprovider.in(i._ZN12CAknDocumentD2Ev)
-    i._ZN12CApaDocument16DetachFromStoreLEN8CPicture7TDetachE 0x0000b1a0   Section        2  mnrefprovider.in(i._ZN12CApaDocument16DetachFromStoreLEN8CPicture7TDetachE)
-    i._ZN12CArrayPtrSegI8CGulIconED0Ev       0x0000b1a2   Section       16  mnrefprovider.in(i._ZN12CArrayPtrSegI8CGulIconED0Ev)
-    i._ZN12CArrayPtrSegI8CGulIconED1Ev       0x0000b1b2   Section        8  mnrefprovider.in(i._ZN12CArrayPtrSegI8CGulIconED1Ev)
-    i._ZN13CAknViewAppUiC1Ev                 0x0000b1bc   Section       60  mnrefprovider.in(i._ZN13CAknViewAppUiC1Ev)
-    i._ZN13CAknViewAppUiC1Ev.clean           0x0000b1f8   Section       10  mnrefprovider.in(i._ZN13CAknViewAppUiC1Ev.clean)
-    i._ZN16CMnrpApplicationD0Ev              0x0000b202   Section       16  mnrefprovider.in(i._ZN16CMnrpApplicationD0Ev)
-    i._ZN16CMnrpApplicationD1Ev              0x0000b212   Section        8  mnrefprovider.in(i._ZN16CMnrpApplicationD1Ev)
-    i._ZN5CBasenwEj                          0x0000b21a   Section        8  mnrefprovider.in(i._ZN5CBasenwEj)
-    i._ZN5TRectC1ERKS_                       0x0000b222   Section       18  mnrefprovider.in(i._ZN5TRectC1ERKS_)
-    i._ZN9CArrayFixIP8CGulIconED1Ev          0x0000b234   Section        8  mnrefprovider.in(i._ZN9CArrayFixIP8CGulIconED1Ev)
-    i._ZN9CArrayPtrI8CGulIconED1Ev           0x0000b23c   Section        8  mnrefprovider.in(i._ZN9CArrayPtrI8CGulIconED1Ev)
-    t._ZN12CleanupCloseI6RArrayIiEE5CloseEPv 0x0000b244   Section        8  mnrefprovider.in(t._ZN12CleanupCloseI6RArrayIiEE5CloseEPv)
-    t._ZN12CleanupCloseI6RArrayImEE5CloseEPv 0x0000b24c   Section        8  mnrefprovider.in(t._ZN12CleanupCloseI6RArrayImEE5CloseEPv)
-    t._ZN13RPointerArrayIN14CMnrpNaviModel9CListItemEE15ResetAndDestroyEv 0x0000b254   Section       48  mnrefprovider.in(t._ZN13RPointerArrayIN14CMnrpNaviModel9CListItemEE15ResetAndDestroyEv)
-    t._ZN13RPointerArrayIN14CMnrpNaviModel9CListItemEE7AppendLEPKS1_ 0x0000b284   Section       12  mnrefprovider.in(t._ZN13RPointerArrayIN14CMnrpNaviModel9CListItemEE7AppendLEPKS1_)
-    t._ZN4TBufILi15EEC1Ev                    0x0000b290   Section       10  mnrefprovider.in(t._ZN4TBufILi15EEC1Ev)
-    .ARM.extab                               0x0000b29c   Section       16  uc_exe_.o(.ARM.extab)
-    .extab._Z14NewApplicationv               0x0000b2ac   Data           0  mnrefprovider.in(.ARM.extab)
-    .extab._ZN5CBasenwEj                     0x0000b2bc   Data           0  mnrefprovider.in(.ARM.extab)
-    .extab._ZN10CMnrpAppUiD1Ev               0x0000b2cc   Data           0  mnrefprovider.in(.ARM.extab)
-    .extab._ZN10CMnrpAppUi13StopSelectionEv  0x0000b2dc   Data           0  mnrefprovider.in(.ARM.extab)
-    .extab._ZN13CAknViewAppUiC1Ev            0x0000b30c   Data           0  mnrefprovider.in(.ARM.extab)
-    .extab._ZN13CMnrpDocumentD1Ev            0x0000b31c   Data           0  mnrefprovider.in(.ARM.extab)
-    .extab._ZN12CMnrpAppViewD1Ev             0x0000b32c   Data           0  mnrefprovider.in(.ARM.extab)
-    .extab._ZN12CMnrpMapViewD1Ev             0x0000b33c   Data           0  mnrefprovider.in(.ARM.extab)
-    .extab._ZN15CMnrpMapControlC1ER12CMnrpMapView 0x0000b36c   Data           0  mnrefprovider.in(.ARM.extab)
-    .extab._ZN15CMnrpMapControlD1Ev          0x0000b37c   Data           0  mnrefprovider.in(.ARM.extab)
-    .extab._ZN15CMnrpMapControl11SizeChangedEv 0x0000b38c   Data           0  mnrefprovider.in(.ARM.extab)
-    .extab._ZN13CMnrpNaviViewD1Ev            0x0000b3d4   Data           0  mnrefprovider.in(.ARM.extab)
-    .extab._ZN14CMnrpNaviModelC1ER18MNaviModelObserverR11CMnrpEngine 0x0000b3e4   Data           0  mnrefprovider.in(.ARM.extab)
-    .extab._ZN14CMnrpNaviModelD1Ev           0x0000b3f4   Data           0  mnrefprovider.in(.ARM.extab)
-    .extab._ZN16CMnrpNaviControlD1Ev         0x0000b404   Data           0  mnrefprovider.in(.ARM.extab)
-    .extab._ZN19CMnrpMapViewServiceD1Ev      0x0000b414   Data           0  mnrefprovider.in(.ARM.extab)
-    .extab._ZN19CMnrpMapViewService16HandleSelectionLERK11TCoordinate 0x0000b424   Data           0  mnrefprovider.in(.ARM.extab)
-    .extab.CallThrdProcEntry                 0x0000b44c   Data           0  callfirstprocessfn.o(.ARM.extab)
-    .constdata$1                             0x0000b468   Data           0  mnrefprovider.in(.constdata)
-    KUidMnRefProviderApp                     0x0000b468   Data           4  mnrefprovider.in(.constdata)
-    .constdata                               0x0000b468   Section        4  mnrefprovider.in(.constdata)
-    .constdata$1                             0x0000b46c   Data           0  mnrefprovider.in(.constdata)
-    KMbmFile                                 0x0000b46c   Data          72  mnrefprovider.in(.constdata)
-    .constdata                               0x0000b46c   Section       92  mnrefprovider.in(.constdata)
-    KListItemFormat@_Z12AddLandmarkLRK12CPosLandmarkR12CDesC16ArrayR9CArrayPtrI8CGulIconE_0 0x0000b4b4   Data          20  mnrefprovider.in(.constdata)
-    .constdata$1                             0x0000b4c8   Data           0  mnrefprovider.in(.constdata)
-    KEmpty@_ZN12CMnrpAppView11DoActivateLERK10TVwsViewId4TUidRK6TDesC8_0 0x0000b4c8   Data           8  mnrefprovider.in(.constdata)
-    .constdata                               0x0000b4c8   Section        8  mnrefprovider.in(.constdata)
-    .constdata$1                             0x0000b4d0   Data           0  mnrefprovider.in(.constdata)
-    KMapView@_ZN12CMnrpMapView11DoActivateLERK10TVwsViewId4TUidRK6TDesC8_0 0x0000b4d0   Data          20  mnrefprovider.in(.constdata)
-    .constdata                               0x0000b4d0   Section       20  mnrefprovider.in(.constdata)
-    .constdata$1                             0x0000b4e4   Data           0  mnrefprovider.in(.constdata)
-    _ZZN15CMnrpMapControl18HandleModelUpdateLEvE17KMessageIgnoredLm@_ZN15CMnrpMapControl18HandleModelUpdateLEv_0 0x0000b4e4   Data         108  mnrefprovider.in(.constdata)
-    .constdata                               0x0000b4e4   Section      220  mnrefprovider.in(.constdata)
-    _ZZN15CMnrpMapControl18HandleModelUpdateLEvE18KMessageIgnoredLms@_ZN15CMnrpMapControl18HandleModelUpdateLEv_1 0x0000b550   Data         112  mnrefprovider.in(.constdata)
-    .constdata$1                             0x0000b5c0   Data           0  mnrefprovider.in(.constdata)
-    KNavigation@_ZN13CMnrpNaviView11DoActivateLERK10TVwsViewId4TUidRK6TDesC8_0 0x0000b5c0   Data          28  mnrefprovider.in(.constdata)
-    .constdata                               0x0000b5c0   Section       28  mnrefprovider.in(.constdata)
-    .constdata$1                             0x0000b5dc   Data           0  mnrefprovider.in(.constdata)
-    KNotDefined                              0x0000b5dc   Data          16  mnrefprovider.in(.constdata)
-    .constdata                               0x0000b5dc   Section      344  mnrefprovider.in(.constdata)
-    KDestination                             0x0000b5ec   Data          28  mnrefprovider.in(.constdata)
-    KPosition                                0x0000b608   Data          24  mnrefprovider.in(.constdata)
-    KDistance                                0x0000b620   Data          24  mnrefprovider.in(.constdata)
-    KBearing                                 0x0000b638   Data          20  mnrefprovider.in(.constdata)
-    KDestinationLat                          0x0000b64c   Data          24  mnrefprovider.in(.constdata)
-    KDestinationLon                          0x0000b664   Data          24  mnrefprovider.in(.constdata)
-    KPositionLat                             0x0000b67c   Data          24  mnrefprovider.in(.constdata)
-    KPositionLon                             0x0000b694   Data          24  mnrefprovider.in(.constdata)
-    KSpeed                                   0x0000b6ac   Data          16  mnrefprovider.in(.constdata)
-    KHeading                                 0x0000b6bc   Data          20  mnrefprovider.in(.constdata)
-    KMagHeading                              0x0000b6d0   Data          24  mnrefprovider.in(.constdata)
-    KCourse                                  0x0000b6e8   Data          20  mnrefprovider.in(.constdata)
-    KMagCourse                               0x0000b6fc   Data          24  mnrefprovider.in(.constdata)
-    KRequestorName@_ZN14CMnrpNaviModel10ConstructLEv_0 0x0000b714   Data          32  mnrefprovider.in(.constdata)
-    .constdata$1                             0x0000b734   Data           0  mnrefprovider.in(.constdata)
-    _ZZN16CMnrpNaviControl18HandleModelUpdateLEvE11KItemFormat@_ZN16CMnrpNaviControl18HandleModelUpdateLEv_0 0x0000b734   Data          20  mnrefprovider.in(.constdata)
-    .constdata                               0x0000b734   Section       20  mnrefprovider.in(.constdata)
-    .constdata$1                             0x0000b748   Data           0  callfirstprocessfn.o(.constdata)
-    KLitUser                                 0x0000b748   Data          16  callfirstprocessfn.o(.constdata)
-    .constdata                               0x0000b748   Section       16  callfirstprocessfn.o(.constdata)
-    .constdata__ZTI10CMnrpAppUi              0x0000b758   Section       12  mnrefprovider.in(.constdata__ZTI10CMnrpAppUi)
-    .constdata__ZTI12CArrayPtrSegI8CGulIconE 0x0000b764   Section       12  mnrefprovider.in(.constdata__ZTI12CArrayPtrSegI8CGulIconE)
-    .constdata__ZTI12CMnrpAppView            0x0000b770   Section       12  mnrefprovider.in(.constdata__ZTI12CMnrpAppView)
-    .constdata__ZTI12CMnrpMapView            0x0000b77c   Section       12  mnrefprovider.in(.constdata__ZTI12CMnrpMapView)
-    .constdata__ZTI13CMnrpDocument           0x0000b788   Section       12  mnrefprovider.in(.constdata__ZTI13CMnrpDocument)
-    .constdata__ZTI13CMnrpNaviView           0x0000b794   Section       12  mnrefprovider.in(.constdata__ZTI13CMnrpNaviView)
-    .constdata__ZTI14CMnrpAppServer          0x0000b7a0   Section       12  mnrefprovider.in(.constdata__ZTI14CMnrpAppServer)
-    .constdata__ZTI14CMnrpNaviModel          0x0000b7ac   Section       32  mnrefprovider.in(.constdata__ZTI14CMnrpNaviModel)
-    .constdata__ZTI15CMnrpAppControl         0x0000b7cc   Section       12  mnrefprovider.in(.constdata__ZTI15CMnrpAppControl)
-    .constdata__ZTI15CMnrpMapControl         0x0000b7d8   Section       32  mnrefprovider.in(.constdata__ZTI15CMnrpMapControl)
-    .constdata__ZTI16CMnrpApplication        0x0000b7f8   Section       12  mnrefprovider.in(.constdata__ZTI16CMnrpApplication)
-    .constdata__ZTI16CMnrpNaviControl        0x0000b804   Section       32  mnrefprovider.in(.constdata__ZTI16CMnrpNaviControl)
-    .constdata__ZTI17MMapModelObserver       0x0000b824   Section        8  mnrefprovider.in(.constdata__ZTI17MMapModelObserver)
-    .constdata__ZTI18MNaviModelObserver      0x0000b82c   Section        8  mnrefprovider.in(.constdata__ZTI18MNaviModelObserver)
-    .constdata__ZTI19CMnrpMapViewService     0x0000b834   Section       32  mnrefprovider.in(.constdata__ZTI19CMnrpMapViewService)
-    .constdata__ZTI21MMapSelectionCallback   0x0000b854   Section        8  mnrefprovider.in(.constdata__ZTI21MMapSelectionCallback)
-    .constdata__ZTI21MMnrpPositionObserver   0x0000b85c   Section        8  mnrefprovider.in(.constdata__ZTI21MMnrpPositionObserver)
-    .constdata__ZTI22CMnrpNavigationService  0x0000b864   Section       12  mnrefprovider.in(.constdata__ZTI22CMnrpNavigationService)
-    .constdata__ZTI22MEikStatusPaneObserver  0x0000b870   Section        8  mnrefprovider.in(.constdata__ZTI22MEikStatusPaneObserver)
-    .constdata__ZTI9CArrayFixIP8CGulIconE    0x0000b878   Section       12  mnrefprovider.in(.constdata__ZTI9CArrayFixIP8CGulIconE)
-    .constdata__ZTI9CArrayPtrI8CGulIconE     0x0000b884   Section       12  mnrefprovider.in(.constdata__ZTI9CArrayPtrI8CGulIconE)
-    .constdata__ZTIN14CMnrpNaviModel9CListItemE 0x0000b890   Section       12  mnrefprovider.in(.constdata__ZTIN14CMnrpNaviModel9CListItemE)
-    .constdata__ZTS10CMnrpAppUi              0x0000b89c   Section       13  mnrefprovider.in(.constdata__ZTS10CMnrpAppUi)
-    .constdata__ZTS12CArrayPtrSegI8CGulIconE 0x0000b8a9   Section       26  mnrefprovider.in(.constdata__ZTS12CArrayPtrSegI8CGulIconE)
-    .constdata__ZTS12CMnrpAppView            0x0000b8c3   Section       15  mnrefprovider.in(.constdata__ZTS12CMnrpAppView)
-    .constdata__ZTS12CMnrpMapView            0x0000b8d2   Section       15  mnrefprovider.in(.constdata__ZTS12CMnrpMapView)
-    .constdata__ZTS13CMnrpDocument           0x0000b8e1   Section       16  mnrefprovider.in(.constdata__ZTS13CMnrpDocument)
-    .constdata__ZTS13CMnrpNaviView           0x0000b8f1   Section       16  mnrefprovider.in(.constdata__ZTS13CMnrpNaviView)
-    .constdata__ZTS14CMnrpAppServer          0x0000b901   Section       17  mnrefprovider.in(.constdata__ZTS14CMnrpAppServer)
-    .constdata__ZTS14CMnrpNaviModel          0x0000b912   Section       17  mnrefprovider.in(.constdata__ZTS14CMnrpNaviModel)
-    .constdata__ZTS15CMnrpAppControl         0x0000b923   Section       18  mnrefprovider.in(.constdata__ZTS15CMnrpAppControl)
-    .constdata__ZTS15CMnrpMapControl         0x0000b935   Section       18  mnrefprovider.in(.constdata__ZTS15CMnrpMapControl)
-    .constdata__ZTS16CMnrpApplication        0x0000b947   Section       19  mnrefprovider.in(.constdata__ZTS16CMnrpApplication)
-    .constdata__ZTS16CMnrpNaviControl        0x0000b95a   Section       19  mnrefprovider.in(.constdata__ZTS16CMnrpNaviControl)
-    .constdata__ZTS17MMapModelObserver       0x0000b96d   Section       20  mnrefprovider.in(.constdata__ZTS17MMapModelObserver)
-    .constdata__ZTS18MNaviModelObserver      0x0000b981   Section       21  mnrefprovider.in(.constdata__ZTS18MNaviModelObserver)
-    .constdata__ZTS19CMnrpMapViewService     0x0000b996   Section       22  mnrefprovider.in(.constdata__ZTS19CMnrpMapViewService)
-    .constdata__ZTS21MMapSelectionCallback   0x0000b9ac   Section       24  mnrefprovider.in(.constdata__ZTS21MMapSelectionCallback)
-    .constdata__ZTS21MMnrpPositionObserver   0x0000b9c4   Section       24  mnrefprovider.in(.constdata__ZTS21MMnrpPositionObserver)
-    .constdata__ZTS22CMnrpNavigationService  0x0000b9dc   Section       25  mnrefprovider.in(.constdata__ZTS22CMnrpNavigationService)
-    .constdata__ZTS22MEikStatusPaneObserver  0x0000b9f5   Section       25  mnrefprovider.in(.constdata__ZTS22MEikStatusPaneObserver)
-    .constdata__ZTS9CArrayFixIP8CGulIconE    0x0000ba0e   Section       23  mnrefprovider.in(.constdata__ZTS9CArrayFixIP8CGulIconE)
-    .constdata__ZTS9CArrayPtrI8CGulIconE     0x0000ba25   Section       22  mnrefprovider.in(.constdata__ZTS9CArrayPtrI8CGulIconE)
-    .constdata__ZTSN14CMnrpNaviModel9CListItemE 0x0000ba3b   Section       29  mnrefprovider.in(.constdata__ZTSN14CMnrpNaviModel9CListItemE)
-    .constdata__ZTV10CMnrpAppUi              0x0000ba58   Section      340  mnrefprovider.in(.constdata__ZTV10CMnrpAppUi)
-    .constdata__ZTV12CArrayPtrSegI8CGulIconE 0x0000bbac   Section       20  mnrefprovider.in(.constdata__ZTV12CArrayPtrSegI8CGulIconE)
-    .constdata__ZTV12CMnrpAppView            0x0000bbc0   Section      232  mnrefprovider.in(.constdata__ZTV12CMnrpAppView)
-    .constdata__ZTV12CMnrpMapView            0x0000bca8   Section      236  mnrefprovider.in(.constdata__ZTV12CMnrpMapView)
-    .constdata__ZTV13CMnrpDocument           0x0000bd94   Section      112  mnrefprovider.in(.constdata__ZTV13CMnrpDocument)
-    .constdata__ZTV13CMnrpNaviView           0x0000be04   Section      232  mnrefprovider.in(.constdata__ZTV13CMnrpNaviView)
-    .constdata__ZTV14CMnrpAppServer          0x0000beec   Section       76  mnrefprovider.in(.constdata__ZTV14CMnrpAppServer)
-    .constdata__ZTV14CMnrpNaviModel          0x0000bf38   Section       36  mnrefprovider.in(.constdata__ZTV14CMnrpNaviModel)
-    .constdata__ZTV15CMnrpAppControl         0x0000bf5c   Section      208  mnrefprovider.in(.constdata__ZTV15CMnrpAppControl)
-    .constdata__ZTV15CMnrpMapControl         0x0000c02c   Section      224  mnrefprovider.in(.constdata__ZTV15CMnrpMapControl)
-    .constdata__ZTV16CMnrpApplication        0x0000c10c   Section       80  mnrefprovider.in(.constdata__ZTV16CMnrpApplication)
-    .constdata__ZTV16CMnrpNaviControl        0x0000c15c   Section      224  mnrefprovider.in(.constdata__ZTV16CMnrpNaviControl)
-    .constdata__ZTV19CMnrpMapViewService     0x0000c23c   Section      112  mnrefprovider.in(.constdata__ZTV19CMnrpMapViewService)
-    .constdata__ZTV22CMnrpNavigationService  0x0000c2ac   Section       64  mnrefprovider.in(.constdata__ZTV22CMnrpNavigationService)
-    .constdata__ZTV22MEikStatusPaneObserver  0x0000c2ec   Section       12  mnrefprovider.in(.constdata__ZTV22MEikStatusPaneObserver)
-    .constdata__ZTVN14CMnrpNaviModel9CListItemE 0x0000c2f8   Section       20  mnrefprovider.in(.constdata__ZTVN14CMnrpNaviModel9CListItemE)
-    .init_array                              0x0000c30c   Section        4  mnrefprovider.in(.init_array)
-    .ARM.exidx                               0x0000c310   Section        8  uc_exe_.o(.ARM.exidx)
-    .ARM.exidx                               0x0000c318   Section        8  ucppinit_aeabi.o(.ARM.exidx)
-    .data$0                                  0x00400000   Data           0  mnrefprovider.in(.data)
-    KCursorColor                             0x00400000   Data           4  mnrefprovider.in(.data)
-    .data                                    0x00400000   Section       12  mnrefprovider.in(.data)
-    KGridTextColor                           0x00400004   Data           4  mnrefprovider.in(.data)
-    KOriginMarkColor                         0x00400008   Data           4  mnrefprovider.in(.data)
-
-    Global Symbols
-
-    Symbol Name                              Value     Ov Type        Size  Object(Section)
-
-    BuildAttributes$$THUMB_ISAv3$ARM_ISAv6$M$E$P$PE$A:L22$X:L11$S22$IEEE1$IW$USESV6$~STKCKD$USESV7$~SHL$OSPACE$IEEEJ$EBA8$UX$REQ8$PRES8$EABIv2 0x00000000   Number         0  anon$$obj.o ABSOLUTE
-    #<DLL>AknIcon{000a0000}[1020735a].dll#<\DLL>d  - Undefined Reference
-    #<DLL>apparc{000a0000}[10003a3d].dll#<\DLL>111  - Undefined Reference
-    #<DLL>apparc{000a0000}[10003a3d].dll#<\DLL>112  - Undefined Reference
-    #<DLL>apparc{000a0000}[10003a3d].dll#<\DLL>113  - Undefined Reference
-    #<DLL>apparc{000a0000}[10003a3d].dll#<\DLL>117  - Undefined Reference
-    #<DLL>apparc{000a0000}[10003a3d].dll#<\DLL>118  - Undefined Reference
-    #<DLL>apparc{000a0000}[10003a3d].dll#<\DLL>11c  - Undefined Reference
-    #<DLL>apparc{000a0000}[10003a3d].dll#<\DLL>11d  - Undefined Reference
-    #<DLL>apparc{000a0000}[10003a3d].dll#<\DLL>11e  - Undefined Reference
-    #<DLL>apparc{000a0000}[10003a3d].dll#<\DLL>11f  - Undefined Reference
-    #<DLL>apparc{000a0000}[10003a3d].dll#<\DLL>1e  - Undefined Reference
-    #<DLL>apparc{000a0000}[10003a3d].dll#<\DLL>79  - Undefined Reference
-    #<DLL>apparc{000a0000}[10003a3d].dll#<\DLL>84  - Undefined Reference
-    #<DLL>apparc{000a0000}[10003a3d].dll#<\DLL>ab  - Undefined Reference
-    #<DLL>apparc{000a0000}[10003a3d].dll#<\DLL>bf  - Undefined Reference
-    #<DLL>apparc{000a0000}[10003a3d].dll#<\DLL>c0  - Undefined Reference
-    #<DLL>apparc{000a0000}[10003a3d].dll#<\DLL>c2  - Undefined Reference
-    #<DLL>apparc{000a0000}[10003a3d].dll#<\DLL>ca  - Undefined Reference
-    #<DLL>apparc{000a0000}[10003a3d].dll#<\DLL>de  - Undefined Reference
-    #<DLL>apparc{000a0000}[10003a3d].dll#<\DLL>e8  - Undefined Reference
-    #<DLL>apparc{000a0000}[10003a3d].dll#<\DLL>fd  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>16f  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>170  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>171  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>172  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>174  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>175  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>176  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>177  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>179  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>46c  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>53d  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>7cc  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>81  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>82  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>83  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>873  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>882  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>a1f  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>a40  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>a48  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>b4f  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>b52  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>b53  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>b54  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>b55  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>b56  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>b57  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>b58  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>b59  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>b5a  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>b5b  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>b5d  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>b5e  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>b60  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>b61  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>b62  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>b65  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>b67  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>b68  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>b6a  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>b70  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>b71  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>b72  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>b74  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>b76  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>b78  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>bb1  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>bb5  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>c6  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>c7  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>c9  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>ce  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>d3  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>d5  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>d59  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>d5c  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>d5d  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>d5e  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>d5f  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>d6  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>d60  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>d7  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>d8  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>d9  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>dc  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>ef2  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>ef7  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>ef8  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>f11  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>f14  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>f15  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>f1c  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>f6b  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>f6c  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>f6d  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>f8f  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>fae  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>fbe  - Undefined Reference
-    #<DLL>bafl{000a0000}[10003a0f].dll#<\DLL>2b  - Undefined Reference
-    #<DLL>bafl{000a0000}[10003a0f].dll#<\DLL>62  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>101  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>107  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>109  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>10a  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>10e  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>10f  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>110  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>113  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>114  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>11f  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>12  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>120  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>13  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>15  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>15f  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>161  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>163  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>18c  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>18d  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>19  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>1a  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>1bc  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>1d  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>1da  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>1dd  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>1de  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>1df  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>1e  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>1e2  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>1f6  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>202  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>24  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>244  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>245  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>246  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>247  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>248  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>27  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>27e  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>27f  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>28  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>29  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>298  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>29e  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>29f  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>2a  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>2a4  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>2a5  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>30  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>32  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>33  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>38  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>39  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>3d  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>3e  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>40  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>43  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>64  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>65  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>7f  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>80  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>9  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>b  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>b6  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>c  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>c4  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>c5  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>c7  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>cb  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>d  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>d2  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>d3  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>d4  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>dc  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>f  - Undefined Reference
-    #<DLL>dfpaeabi{000a0000}.dll#<\DLL>14     - Undefined Reference
-    #<DLL>dfpaeabi{000a0000}.dll#<\DLL>17     - Undefined Reference
-    #<DLL>dfpaeabi{000a0000}.dll#<\DLL>18     - Undefined Reference
-    #<DLL>dfpaeabi{000a0000}.dll#<\DLL>29     - Undefined Reference
-    #<DLL>dfpaeabi{000a0000}.dll#<\DLL>8      - Undefined Reference
-    #<DLL>dfpaeabi{000a0000}.dll#<\DLL>c      - Undefined Reference
-    #<DLL>drtaeabi{000a0000}.dll#<\DLL>93     - Undefined Reference
-    #<DLL>drtaeabi{000a0000}.dll#<\DLL>9e     - Undefined Reference
-    #<DLL>drtaeabi{000a0000}.dll#<\DLL>9f     - Undefined Reference
-    #<DLL>drtaeabi{000a0000}.dll#<\DLL>b4     - Undefined Reference
-    #<DLL>drtaeabi{000a0000}.dll#<\DLL>b6     - Undefined Reference
-    #<DLL>drtaeabi{000a0000}.dll#<\DLL>b7     - Undefined Reference
-    #<DLL>drtaeabi{000a0000}.dll#<\DLL>b8     - Undefined Reference
-    #<DLL>drtaeabi{000a0000}.dll#<\DLL>bd     - Undefined Reference
-    #<DLL>drtaeabi{000a0000}.dll#<\DLL>cc     - Undefined Reference
-    #<DLL>egul{000a0000}[100048a2].dll#<\DLL>5e  - Undefined Reference
-    #<DLL>egul{000a0000}[100048a2].dll#<\DLL>5f  - Undefined Reference
-    #<DLL>eikcoctl{000a0000}[1000489e].dll#<\DLL>23  - Undefined Reference
-    #<DLL>eikcoctl{000a0000}[1000489e].dll#<\DLL>25d  - Undefined Reference
-    #<DLL>eikcoctl{000a0000}[1000489e].dll#<\DLL>25e  - Undefined Reference
-    #<DLL>eikcoctl{000a0000}[1000489e].dll#<\DLL>294  - Undefined Reference
-    #<DLL>eikcoctl{000a0000}[1000489e].dll#<\DLL>2e  - Undefined Reference
-    #<DLL>eikcoctl{000a0000}[1000489e].dll#<\DLL>36b  - Undefined Reference
-    #<DLL>eikcoctl{000a0000}[1000489e].dll#<\DLL>370  - Undefined Reference
-    #<DLL>eikcoctl{000a0000}[1000489e].dll#<\DLL>371  - Undefined Reference
-    #<DLL>eikcoctl{000a0000}[1000489e].dll#<\DLL>560  - Undefined Reference
-    #<DLL>eikcoctl{000a0000}[1000489e].dll#<\DLL>596  - Undefined Reference
-    #<DLL>eikcoctl{000a0000}[1000489e].dll#<\DLL>8c  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>12  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>123  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>125  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>126  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>127  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>128  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>129  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>12a  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>12b  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>12e  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>13b  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>13d  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>13f  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>14  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>160  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>186  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>188  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>18a  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>19  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>1a  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>1b  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>1c  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>1d  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>1d3  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>1d8  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>1d9  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>1df  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>1e  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>1ea  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>1f  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>1fa  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>20b  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>214  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>215  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>216  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>217  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>218  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>219  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>235  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>25  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>3d  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>3e  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>3f  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>40  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>43  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>48  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>49  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>4a  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>4b  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>4c  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>4d  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>4e  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>4f  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>8d  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>8e  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>8f  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>90  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>93  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>98  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>9b  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>9e  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>9f  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>a9  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>ab  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>af  - Undefined Reference
-    #<DLL>eikctl{000a0000}[1000489c].dll#<\DLL>1c7  - Undefined Reference
-    #<DLL>eposlandmarks{000a0000}[101fdf8a].dll#<\DLL>32  - Undefined Reference
-    #<DLL>eposlandmarks{000a0000}[101fdf8a].dll#<\DLL>4  - Undefined Reference
-    #<DLL>eposlandmarks{000a0000}[101fdf8a].dll#<\DLL>41  - Undefined Reference
-    #<DLL>eposlandmarks{000a0000}[101fdf8a].dll#<\DLL>43  - Undefined Reference
-    #<DLL>eposlandmarks{000a0000}[101fdf8a].dll#<\DLL>4b  - Undefined Reference
-    #<DLL>eposlandmarks{000a0000}[101fdf8a].dll#<\DLL>c  - Undefined Reference
-    #<DLL>eposlandmarks{000a0000}[101fdf8a].dll#<\DLL>f  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>101  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>1d0  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>1d6  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>1d7  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>1d8  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>1dc  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>1e1  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>227  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>249  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>251  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>265  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>281  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>289  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>28a  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>28c  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>28e  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>29d  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>2e  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>30  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>338  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>33d  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>33e  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>346  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>347  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>349  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>34a  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>37  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>3cd  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>401  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>448  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>45c  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>45f  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>494  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>508  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>51  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>550  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>5e3  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>5e6  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>611  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>636  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>639  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>670  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>719  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>7cb  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>7cd  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>7cf  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>80c  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>80d  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>822  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>848  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>84b  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>84d  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>853  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>cb  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>cc  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>cd  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>cf  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>d0  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>f5  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>fa  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>fe  - Undefined Reference
-    #<DLL>fbscli{000a0000}[10003a15].dll#<\DLL>1a  - Undefined Reference
-    #<DLL>fbscli{000a0000}[10003a15].dll#<\DLL>1f  - Undefined Reference
-    #<DLL>gdi{000a0000}[10003b15].dll#<\DLL>136  - Undefined Reference
-    #<DLL>gdi{000a0000}[10003b15].dll#<\DLL>137  - Undefined Reference
-    #<DLL>gdi{000a0000}[10003b15].dll#<\DLL>138  - Undefined Reference
-    #<DLL>lbs{000a0000}[101f97b1].dll#<\DLL>130  - Undefined Reference
-    #<DLL>lbs{000a0000}[101f97b1].dll#<\DLL>132  - Undefined Reference
-    #<DLL>lbs{000a0000}[101f97b1].dll#<\DLL>15  - Undefined Reference
-    #<DLL>lbs{000a0000}[101f97b1].dll#<\DLL>17  - Undefined Reference
-    #<DLL>lbs{000a0000}[101f97b1].dll#<\DLL>1c  - Undefined Reference
-    #<DLL>lbs{000a0000}[101f97b1].dll#<\DLL>98  - Undefined Reference
-    #<DLL>lbs{000a0000}[101f97b1].dll#<\DLL>b4  - Undefined Reference
-    #<DLL>lbs{000a0000}[101f97b1].dll#<\DLL>b5  - Undefined Reference
-    #<DLL>lbs{000a0000}[101f97b1].dll#<\DLL>cd  - Undefined Reference
-    #<DLL>lbs{000a0000}[101f97b1].dll#<\DLL>cf  - Undefined Reference
-    #<DLL>lbs{000a0000}[101f97b1].dll#<\DLL>d6  - Undefined Reference
-    #<DLL>lbs{000a0000}[101f97b1].dll#<\DLL>df  - Undefined Reference
-    #<DLL>lbs{000a0000}[101f97b1].dll#<\DLL>e1  - Undefined Reference
-    #<DLL>lbs{000a0000}[101f97b1].dll#<\DLL>e2  - Undefined Reference
-    #<DLL>mnrefproviderengine{000a0000}[03132015].dll#<\DLL>11  - Undefined Reference
-    #<DLL>mnrefproviderengine{000a0000}[03132015].dll#<\DLL>13  - Undefined Reference
-    #<DLL>mnrefproviderengine{000a0000}[03132015].dll#<\DLL>14  - Undefined Reference
-    #<DLL>mnrefproviderengine{000a0000}[03132015].dll#<\DLL>16  - Undefined Reference
-    #<DLL>mnrefproviderengine{000a0000}[03132015].dll#<\DLL>17  - Undefined Reference
-    #<DLL>mnrefproviderengine{000a0000}[03132015].dll#<\DLL>18  - Undefined Reference
-    #<DLL>mnrefproviderengine{000a0000}[03132015].dll#<\DLL>19  - Undefined Reference
-    #<DLL>mnrefproviderengine{000a0000}[03132015].dll#<\DLL>1a  - Undefined Reference
-    #<DLL>mnrefproviderengine{000a0000}[03132015].dll#<\DLL>1b  - Undefined Reference
-    #<DLL>mnrefproviderengine{000a0000}[03132015].dll#<\DLL>1c  - Undefined Reference
-    #<DLL>mnrefproviderengine{000a0000}[03132015].dll#<\DLL>1d  - Undefined Reference
-    #<DLL>mnrefproviderengine{000a0000}[03132015].dll#<\DLL>1e  - Undefined Reference
-    #<DLL>mnrefproviderengine{000a0000}[03132015].dll#<\DLL>1f  - Undefined Reference
-    #<DLL>mnrefproviderengine{000a0000}[03132015].dll#<\DLL>20  - Undefined Reference
-    #<DLL>mnrefproviderengine{000a0000}[03132015].dll#<\DLL>21  - Undefined Reference
-    #<DLL>mnrefproviderengine{000a0000}[03132015].dll#<\DLL>22  - Undefined Reference
-    #<DLL>mnrefproviderengine{000a0000}[03132015].dll#<\DLL>26  - Undefined Reference
-    #<DLL>mnrefproviderengine{000a0000}[03132015].dll#<\DLL>27  - Undefined Reference
-    #<DLL>mnrefproviderengine{000a0000}[03132015].dll#<\DLL>28  - Undefined Reference
-    #<DLL>mnrefproviderengine{000a0000}[03132015].dll#<\DLL>29  - Undefined Reference
-    #<DLL>mnrefproviderengine{000a0000}[03132015].dll#<\DLL>2a  - Undefined Reference
-    #<DLL>mnrefproviderengine{000a0000}[03132015].dll#<\DLL>2b  - Undefined Reference
-    #<DLL>mnrefproviderengine{000a0000}[03132015].dll#<\DLL>2c  - Undefined Reference
-    #<DLL>mnrefproviderengine{000a0000}[03132015].dll#<\DLL>2d  - Undefined Reference
-    #<DLL>mnrefproviderengine{000a0000}[03132015].dll#<\DLL>2e  - Undefined Reference
-    #<DLL>mnrefproviderengine{000a0000}[03132015].dll#<\DLL>2f  - Undefined Reference
-    #<DLL>mnrefproviderengine{000a0000}[03132015].dll#<\DLL>30  - Undefined Reference
-    #<DLL>mnrefproviderengine{000a0000}[03132015].dll#<\DLL>32  - Undefined Reference
-    #<DLL>mnrefproviderengine{000a0000}[03132015].dll#<\DLL>33  - Undefined Reference
-    #<DLL>mnrefproviderengine{000a0000}[03132015].dll#<\DLL>35  - Undefined Reference
-    #<DLL>mnrefproviderengine{000a0000}[03132015].dll#<\DLL>36  - Undefined Reference
-    #<DLL>mnrefproviderengine{000a0000}[03132015].dll#<\DLL>c  - Undefined Reference
-    #<DLL>mnservicelib{000a0000}[10206903].dll#<\DLL>1  - Undefined Reference
-    #<DLL>mnservicelib{000a0000}[10206903].dll#<\DLL>10  - Undefined Reference
-    #<DLL>mnservicelib{000a0000}[10206903].dll#<\DLL>11  - Undefined Reference
-    #<DLL>mnservicelib{000a0000}[10206903].dll#<\DLL>14  - Undefined Reference
-    #<DLL>mnservicelib{000a0000}[10206903].dll#<\DLL>1c  - Undefined Reference
-    #<DLL>mnservicelib{000a0000}[10206903].dll#<\DLL>1d  - Undefined Reference
-    #<DLL>mnservicelib{000a0000}[10206903].dll#<\DLL>1e  - Undefined Reference
-    #<DLL>mnservicelib{000a0000}[10206903].dll#<\DLL>2  - Undefined Reference
-    #<DLL>mnservicelib{000a0000}[10206903].dll#<\DLL>21  - Undefined Reference
-    #<DLL>mnservicelib{000a0000}[10206903].dll#<\DLL>4  - Undefined Reference
-    #<DLL>mnservicelib{000a0000}[10206903].dll#<\DLL>5  - Undefined Reference
-    #<DLL>mnservicelib{000a0000}[10206903].dll#<\DLL>7  - Undefined Reference
-    #<DLL>mnservicelib{000a0000}[10206903].dll#<\DLL>a  - Undefined Reference
-    #<DLL>mnservicelib{000a0000}[10206903].dll#<\DLL>b  - Undefined Reference
-    #<DLL>mnservicelib{000a0000}[10206903].dll#<\DLL>c  - Undefined Reference
-    #<DLL>mnservicelib{000a0000}[10206903].dll#<\DLL>d  - Undefined Reference
-    #<DLL>mnservicelib{000a0000}[10206903].dll#<\DLL>e  - Undefined Reference
-    #<DLL>mnservicelib{000a0000}[10206903].dll#<\DLL>f  - Undefined Reference
-    #<DLL>scppnwdl{000a0000}.dll#<\DLL>3      - Undefined Reference
-    typeinfo for CCoeControl                  - Undefined Reference
-    typeinfo for CAknDocument                 - Undefined Reference
-    typeinfo for CAknAppServer                - Undefined Reference
-    typeinfo for CAknViewAppUi                - Undefined Reference
-    typeinfo for CArrayFixBase                - Undefined Reference
-    typeinfo for CEikApplication              - Undefined Reference
-    typeinfo for XLeaveException              - Undefined Reference
-    typeinfo for CMnMapViewServiceBase        - Undefined Reference
-    typeinfo for CMnNavigationServiceBase     - Undefined Reference
-    typeinfo for CBase                        - Undefined Reference
-    typeinfo for CAknView                     - Undefined Reference
-    vtable for CAknViewAppUi                  - Undefined Reference
-    vtable for __cxxabiv1::__class_type_info  - Undefined Reference
-    vtable for __cxxabiv1::__si_class_type_info  - Undefined Reference
-    vtable for __cxxabiv1::__vmi_class_type_info  - Undefined Reference
-    _fp_init                                  - Undefined Weak Reference
-    Image$$ER_RO$$Base                       0x00008000   Number         0  anon$$obj.o(linker$$defined$$symbols)
-    _E32Startup                              0x00008000   ARM Code     112  uc_exe_.o(.emb_text)
-    Symbian$$CPP$$Exception$$Descriptor      0x0000805c   Data           0  uc_exe_.o(.emb_text)
-    __cpp_initialize__aeabi_                 0x00008070   ARM Code      72  ucppinit_aeabi.o(.emb_text)
-    std::nothrow                             0x000080b8   ARM Code       0  ucppinit_aeabi.o(.emb_text)
-    Inline ARM to Thumb Veneer to _xxxx_call_user_invariant 0x000080b8   ARM Code       0  uc_exe_.o(.text)
-    _xxxx_call_user_invariant                0x000080c1   Thumb Code     8  uc_exe_.o(.text)
-    _xxxx_call_user_handle_exception         0x000080c9   Thumb Code     8  uc_exe_.o(.text)
-    E32Main()                                0x000080ef   Thumb Code    22  mnrefprovider.in(.text)
-    CMnrpApplication::AppDllUid() const      0x0000810d   Thumb Code     6  mnrefprovider.in(.text)
-    CMnrpApplication::CreateDocumentL()      0x00008113   Thumb Code     8  mnrefprovider.in(.text)
-    CMnrpApplication::NewAppServerL(CApaAppServer*&) 0x0000811b   Thumb Code    22  mnrefprovider.in(.text)
-    CleanupIconArray(void*)                  0x00008139   Thumb Code    50  mnrefprovider.in(.text)
-    AddIconL(CArrayPtr<CGulIcon>&, const TDesC16&, int, int) 0x0000816b   Thumb Code    64  mnrefprovider.in(.text)
-    CreateIconListLC(int)                    0x000081ab   Thumb Code    52  mnrefprovider.in(.text)
-    AddLandmarkL(const CPosLandmark&, CDesC16Array&, CArrayPtr<CGulIcon>&) 0x000081df   Thumb Code   130  mnrefprovider.in(.text)
-    CMnrpAppUi::CMnrpAppUi(CMnrpEngine&)     0x00008261   Thumb Code    42  mnrefprovider.in(.text)
-    CMnrpAppUi::CMnrpAppUi__sub_object(CMnrpEngine&) 0x00008261   Thumb Code     0  mnrefprovider.in(.text)
-    CMnrpAppUi::ConstructL()                 0x0000828b   Thumb Code    74  mnrefprovider.in(.text)
-    CMnrpAppUi::~CMnrpAppUi()                0x000082d5   Thumb Code    54  mnrefprovider.in(.text)
-    CMnrpAppUi::~CMnrpAppUi__sub_object()    0x000082d5   Thumb Code     0  mnrefprovider.in(.text)
-    CMnrpAppUi::~CMnrpAppUi__deallocating()  0x0000830b   Thumb Code    16  mnrefprovider.in(.text)
-    CMnrpAppUi::IsChainedMode()              0x0000831b   Thumb Code    16  mnrefprovider.in(.text)
-    CMnrpAppUi::ShowMapL(CMnrpMapViewService&) 0x0000832b   Thumb Code    64  mnrefprovider.in(.text)
-    CMnrpAppUi::SelectFromDialogL(CMnrpMapViewService&, MMapSelectionCallback&) 0x0000836b   Thumb Code   526  mnrefprovider.in(.text)
-    CMnrpAppUi::SetNaviPaneTitleL(const TDesC16&) 0x00008579   Thumb Code   100  mnrefprovider.in(.text)
-    CMnrpAppUi::StartSelectionL(CMnrpMapViewService&, MMapSelectionCallback&) 0x000085dd   Thumb Code   104  mnrefprovider.in(.text)
-    CMnrpAppUi::StopSelection()              0x00008645   Thumb Code    68  mnrefprovider.in(.text)
-    CMnrpAppUi::ShowNavigationL(const CPosLandmark&) 0x00008689   Thumb Code    64  mnrefprovider.in(.text)
-    CMnrpAppUi::IsAnyUserViewActive()        0x000086c9   Thumb Code    38  mnrefprovider.in(.text)
-    CMnrpAppUi::SetRightSoftkeyCommandL(int, const TDesC16&) 0x000086ef   Thumb Code    44  mnrefprovider.in(.text)
-    CMnrpAppUi::HandleCommandL(int)          0x0000871b   Thumb Code    62  mnrefprovider.in(.text)
-    CMnrpAppUi::HandleResourceChangeL(int)   0x00008759   Thumb Code    80  mnrefprovider.in(.text)
-    CMnrpAppUi::ProcessCommandParametersL(CApaCommandLine&) 0x000087a9   Thumb Code    26  mnrefprovider.in(.text)
-    CMnrpDocument::ConstructL()              0x000087d1   Thumb Code    12  mnrefprovider.in(.text)
-    CMnrpDocument::CMnrpDocument(CEikApplication&) 0x000087dd   Thumb Code    16  mnrefprovider.in(.text)
-    CMnrpDocument::CMnrpDocument__sub_object(CEikApplication&) 0x000087dd   Thumb Code     0  mnrefprovider.in(.text)
-    CMnrpDocument::NewL(CEikApplication&)    0x000087ed   Thumb Code    36  mnrefprovider.in(.text)
-    CMnrpDocument::~CMnrpDocument()          0x00008811   Thumb Code    32  mnrefprovider.in(.text)
-    CMnrpDocument::~CMnrpDocument__sub_object() 0x00008811   Thumb Code     0  mnrefprovider.in(.text)
-    CMnrpDocument::~CMnrpDocument__deallocating() 0x00008831   Thumb Code    16  mnrefprovider.in(.text)
-    CMnrpDocument::Engine()                  0x00008841   Thumb Code     4  mnrefprovider.in(.text)
-    CMnrpDocument::CreateAppUiL()            0x00008845   Thumb Code    18  mnrefprovider.in(.text)
-    CMnrpAppServer::~CMnrpAppServer()        0x0000885d   Thumb Code     8  mnrefprovider.in(.text)
-    CMnrpAppServer::~CMnrpAppServer__sub_object() 0x0000885d   Thumb Code     0  mnrefprovider.in(.text)
-    CMnrpAppServer::~CMnrpAppServer__deallocating() 0x00008865   Thumb Code    16  mnrefprovider.in(.text)
-    CMnrpAppServer::AppUi()                  0x00008875   Thumb Code    10  mnrefprovider.in(.text)
-    CMnrpAppServer::CreateNavigationServiceL() const 0x0000887f   Thumb Code     8  mnrefprovider.in(.text)
-    CMnrpAppServer::CreateMapViewServiceL() const 0x00008887   Thumb Code     8  mnrefprovider.in(.text)
-    CMnrpAppServer::CreateServiceL(TUid) const 0x0000888f   Thumb Code    30  mnrefprovider.in(.text)
-    CMnrpAppServer::HandleAllClientsClosed() 0x000088ad   Thumb Code    42  mnrefprovider.in(.text)
-    CMnrpAppView::ConstructL()               0x000088dd   Thumb Code    10  mnrefprovider.in(.text)
-    CMnrpAppView::CMnrpAppView()             0x000088e7   Thumb Code    24  mnrefprovider.in(.text)
-    CMnrpAppView::CMnrpAppView__sub_object() 0x000088e7   Thumb Code     0  mnrefprovider.in(.text)
-    CMnrpAppView::NewL()                     0x000088ff   Thumb Code    32  mnrefprovider.in(.text)
-    CMnrpAppView::~CMnrpAppView()            0x0000891f   Thumb Code    40  mnrefprovider.in(.text)
-    CMnrpAppView::~CMnrpAppView__sub_object() 0x0000891f   Thumb Code     0  mnrefprovider.in(.text)
-    CMnrpAppView::~CMnrpAppView__deallocating() 0x00008947   Thumb Code    16  mnrefprovider.in(.text)
-    CMnrpAppView::Id() const                 0x00008957   Thumb Code     4  mnrefprovider.in(.text)
-    CMnrpAppView::DoActivateL(const TVwsViewId&, TUid, const TDesC8&) 0x0000895b   Thumb Code    78  mnrefprovider.in(.text)
-    CMnrpAppView::DoDeactivate()             0x000089a9   Thumb Code    32  mnrefprovider.in(.text)
-    CMnrpAppControl::ConstructL(const TRect&) 0x000089d1   Thumb Code    28  mnrefprovider.in(.text)
-    CMnrpAppControl::CMnrpAppControl(CMnrpAppView&) 0x000089ed   Thumb Code    20  mnrefprovider.in(.text)
-    CMnrpAppControl::CMnrpAppControl__sub_object(CMnrpAppView&) 0x000089ed   Thumb Code     0  mnrefprovider.in(.text)
-    CMnrpAppControl::NewL(CMnrpAppView&, const TRect&) 0x00008a01   Thumb Code    40  mnrefprovider.in(.text)
-    CMnrpAppControl::~CMnrpAppControl()      0x00008a29   Thumb Code     8  mnrefprovider.in(.text)
-    CMnrpAppControl::~CMnrpAppControl__sub_object() 0x00008a29   Thumb Code     0  mnrefprovider.in(.text)
-    CMnrpAppControl::~CMnrpAppControl__deallocating() 0x00008a31   Thumb Code    16  mnrefprovider.in(.text)
-    CMnrpAppControl::CountComponentControls() const 0x00008a41   Thumb Code     4  mnrefprovider.in(.text)
-    CMnrpAppControl::ComponentControl(int) const 0x00008a45   Thumb Code     4  mnrefprovider.in(.text)
-    CMnrpAppControl::HandleResourceChange(int) 0x00008a49   Thumb Code    34  mnrefprovider.in(.text)
-    CMnrpAppControl::Draw(const TRect&) const 0x00008a6b   Thumb Code    32  mnrefprovider.in(.text)
-    CMnrpMapView::ConstructL(int)            0x00008a95   Thumb Code    22  mnrefprovider.in(.text)
-    CMnrpMapView::CMnrpMapView(CMnrpEngine&) 0x00008aab   Thumb Code    28  mnrefprovider.in(.text)
-    CMnrpMapView::CMnrpMapView__sub_object(CMnrpEngine&) 0x00008aab   Thumb Code     0  mnrefprovider.in(.text)
-    CMnrpMapView::NewL(int, CMnrpEngine&)    0x00008ac7   Thumb Code    40  mnrefprovider.in(.text)
-    CMnrpMapView::HandleUserSelectionL(int)  0x00008aef   Thumb Code    56  mnrefprovider.in(.text)
-    CMnrpMapView::~CMnrpMapView()            0x00008b27   Thumb Code    86  mnrefprovider.in(.text)
-    CMnrpMapView::~CMnrpMapView__sub_object() 0x00008b27   Thumb Code     0  mnrefprovider.in(.text)
-    CMnrpMapView::~CMnrpMapView__deallocating() 0x00008b7d   Thumb Code    16  mnrefprovider.in(.text)
-    CMnrpMapView::SetMapModeL(CMnrpMapViewService&) 0x00008b8d   Thumb Code     8  mnrefprovider.in(.text)
-    CMnrpMapView::SetSelectionModeL(CMnrpMapViewService&, MMapSelectionCallback&) 0x00008b95   Thumb Code    18  mnrefprovider.in(.text)
-    CMnrpMapView::StopSelection()            0x00008ba7   Thumb Code     8  mnrefprovider.in(.text)
-    CMnrpMapView::Id() const                 0x00008baf   Thumb Code     4  mnrefprovider.in(.text)
-    CMnrpMapView::HandleCommandL(int)        0x00008bb3   Thumb Code    84  mnrefprovider.in(.text)
-    CMnrpMapView::DoActivateL(const TVwsViewId&, TUid, const TDesC8&) 0x00008c07   Thumb Code   144  mnrefprovider.in(.text)
-    CMnrpMapView::DoDeactivate()             0x00008c97   Thumb Code    32  mnrefprovider.in(.text)
-    CMnrpMapView::DynInitMenuPaneL(int, CEikMenuPane*) 0x00008cb7   Thumb Code    40  mnrefprovider.in(.text)
-    thunk{-12} to CMnrpMapView::DynInitMenuPaneL(int, CEikMenuPane*) 0x00008cdf   Thumb Code     4  mnrefprovider.in(.text)
-    CMnrpMapControl::CreateScreenBufferL(const TSize&) 0x00008cf9   Thumb Code    70  mnrefprovider.in(.text)
-    CMnrpMapControl::CreateFonts()           0x00008d3f   Thumb Code    62  mnrefprovider.in(.text)
-    CMnrpMapControl::ConstructL(const TRect&, CMnrpEngine&) 0x00008d7d   Thumb Code   134  mnrefprovider.in(.text)
-    CMnrpMapControl::CMnrpMapControl(CMnrpMapView&) 0x00008e03   Thumb Code    46  mnrefprovider.in(.text)
-    CMnrpMapControl::CMnrpMapControl__sub_object(CMnrpMapView&) 0x00008e03   Thumb Code     0  mnrefprovider.in(.text)
-    CMnrpMapControl::NewL(CMnrpMapView&, const TRect&, CMnrpEngine&) 0x00008e31   Thumb Code    44  mnrefprovider.in(.text)
-    CMnrpMapControl::DestroyFonts()          0x00008e5d   Thumb Code    38  mnrefprovider.in(.text)
-    CMnrpMapControl::~CMnrpMapControl()      0x00008e83   Thumb Code    54  mnrefprovider.in(.text)
-    CMnrpMapControl::~CMnrpMapControl__sub_object() 0x00008e83   Thumb Code     0  mnrefprovider.in(.text)
-    CMnrpMapControl::~CMnrpMapControl__deallocating() 0x00008eb9   Thumb Code    16  mnrefprovider.in(.text)
-    CMnrpMapControl::UpdateModelL(CMnrpMapViewService&) 0x00008ec9   Thumb Code    10  mnrefprovider.in(.text)
-    CMnrpMapControl::SetSelectionModeL(int)  0x00008ed3   Thumb Code    66  mnrefprovider.in(.text)
-    CMnrpMapControl::CurrentLocation()       0x00008f15   Thumb Code    12  mnrefprovider.in(.text)
-    CMnrpMapControl::SetFullScreen(int)      0x00008f21   Thumb Code    36  mnrefprovider.in(.text)
-    CMnrpMapControl::ToggleFullScreen()      0x00008f45   Thumb Code    12  mnrefprovider.in(.text)
-    CMnrpMapControl::DrawCursor(CWindowGc&) const 0x00008f51   Thumb Code   224  mnrefprovider.in(.text)
-    CMnrpMapControl::DrawGridText(CWindowGc&, const TRect&, const TRect&, const CFont*, CMnrpMapModel::TGrid&) const 0x00009031   Thumb Code   610  mnrefprovider.in(.text)
-    CMnrpMapControl::BorderSize() const      0x00009293   Thumb Code    44  mnrefprovider.in(.text)
-    CMnrpMapControl::Draw(const TRect&) const 0x000092bf   Thumb Code   306  mnrefprovider.in(.text)
-    CMnrpMapControl::RenderL()               0x000093f1   Thumb Code   106  mnrefprovider.in(.text)
-    CMnrpMapControl::CursorMargin()          0x0000945b   Thumb Code    30  mnrefprovider.in(.text)
-    CMnrpMapControl::MoveCursor(int, int)    0x00009479   Thumb Code   324  mnrefprovider.in(.text)
-    CMnrpMapControl::Zoom(double)            0x000095bd   Thumb Code    90  mnrefprovider.in(.text)
-    CMnrpMapControl::OfferKeyEventL(const TKeyEvent&, TEventCode) 0x00009617   Thumb Code   446  mnrefprovider.in(.text)
-    CMnrpMapControl::SizeChanged()           0x000097d5   Thumb Code   174  mnrefprovider.in(.text)
-    CMnrpMapControl::HandleResourceChange(int) 0x00009883   Thumb Code    26  mnrefprovider.in(.text)
-    CMnrpMapControl::HandleModelUpdateL()    0x0000989d   Thumb Code    80  mnrefprovider.in(.text)
-    thunk{-52} to CMnrpMapControl::HandleModelUpdateL() 0x000098ed   Thumb Code     4  mnrefprovider.in(.text)
-    CMnrpNaviView::ConstructL(int)           0x00009945   Thumb Code    20  mnrefprovider.in(.text)
-    CMnrpNaviView::CMnrpNaviView(CMnrpEngine&) 0x00009959   Thumb Code    28  mnrefprovider.in(.text)
-    CMnrpNaviView::CMnrpNaviView__sub_object(CMnrpEngine&) 0x00009959   Thumb Code     0  mnrefprovider.in(.text)
-    CMnrpNaviView::NewL(int, CMnrpEngine&)   0x00009975   Thumb Code    40  mnrefprovider.in(.text)
-    CMnrpNaviView::~CMnrpNaviView()          0x0000999d   Thumb Code    52  mnrefprovider.in(.text)
-    CMnrpNaviView::~CMnrpNaviView__sub_object() 0x0000999d   Thumb Code     0  mnrefprovider.in(.text)
-    CMnrpNaviView::~CMnrpNaviView__deallocating() 0x000099d1   Thumb Code    16  mnrefprovider.in(.text)
-    CMnrpNaviView::SetDestinationL(const CPosLandmark&) 0x000099e1   Thumb Code    46  mnrefprovider.in(.text)
-    CMnrpNaviView::Id() const                0x00009a0f   Thumb Code     4  mnrefprovider.in(.text)
-    CMnrpNaviView::HandleCommandL(int)       0x00009a13   Thumb Code    18  mnrefprovider.in(.text)
-    CMnrpNaviView::DoActivateL(const TVwsViewId&, TUid, const TDesC8&) 0x00009a25   Thumb Code    92  mnrefprovider.in(.text)
-    CMnrpNaviView::DoDeactivate()            0x00009a81   Thumb Code    32  mnrefprovider.in(.text)
-    CMnrpNaviModel::ConstructL()             0x00009aad   Thumb Code    64  mnrefprovider.in(.text)
-    CMnrpNaviModel::CMnrpNaviModel(MNaviModelObserver&, CMnrpEngine&) 0x00009aed   Thumb Code    44  mnrefprovider.in(.text)
-    CMnrpNaviModel::CMnrpNaviModel__sub_object(MNaviModelObserver&, CMnrpEngine&) 0x00009aed   Thumb Code     0  mnrefprovider.in(.text)
-    CMnrpNaviModel::NewL(MNaviModelObserver&, CMnrpEngine&) 0x00009b19   Thumb Code    40  mnrefprovider.in(.text)
-    CMnrpNaviModel::SetDestinationL(const CPosLandmark&) 0x00009b41   Thumb Code    42  mnrefprovider.in(.text)
-    CMnrpNaviModel::CListItem::NewL(const TDesC16&, const TDesC16&) 0x00009b6b   Thumb Code    48  mnrefprovider.in(.text)
-    CMnrpNaviModel::ListItemsL()             0x00009b9b   Thumb Code   630  mnrefprovider.in(.text)
-    CMnrpNaviModel::~CMnrpNaviModel()        0x00009e11   Thumb Code    56  mnrefprovider.in(.text)
-    CMnrpNaviModel::~CMnrpNaviModel__sub_object() 0x00009e11   Thumb Code     0  mnrefprovider.in(.text)
-    CMnrpNaviModel::~CMnrpNaviModel__deallocating() 0x00009e49   Thumb Code    48  mnrefprovider.in(.text)
-    CMnrpNaviModel::HandlePositionRequestCompletedL(int) 0x00009e79   Thumb Code    60  mnrefprovider.in(.text)
-    thunk{-4} to CMnrpNaviModel::HandlePositionRequestCompletedL(int) 0x00009eb5   Thumb Code     4  mnrefprovider.in(.text)
-    CMnrpNaviModel::CListItem::~CListItem()  0x00009eb9   Thumb Code    28  mnrefprovider.in(.text)
-    CMnrpNaviModel::CListItem::~CListItem__sub_object() 0x00009eb9   Thumb Code     0  mnrefprovider.in(.text)
-    CMnrpNaviModel::CListItem::~CListItem__deallocating() 0x00009ed5   Thumb Code    16  mnrefprovider.in(.text)
-    CMnrpNaviControl::CreateListBoxL()       0x00009ee9   Thumb Code    58  mnrefprovider.in(.text)
-    CMnrpNaviControl::ConstructL(const TRect&, CMnrpEngine&) 0x00009f23   Thumb Code    48  mnrefprovider.in(.text)
-    CMnrpNaviControl::CMnrpNaviControl(CMnrpNaviView&) 0x00009f53   Thumb Code    24  mnrefprovider.in(.text)
-    CMnrpNaviControl::CMnrpNaviControl__sub_object(CMnrpNaviView&) 0x00009f53   Thumb Code     0  mnrefprovider.in(.text)
-    CMnrpNaviControl::NewL(CMnrpNaviView&, const TRect&, CMnrpEngine&) 0x00009f6b   Thumb Code    44  mnrefprovider.in(.text)
-    CMnrpNaviControl::~CMnrpNaviControl()    0x00009f97   Thumb Code    48  mnrefprovider.in(.text)
-    CMnrpNaviControl::~CMnrpNaviControl__sub_object() 0x00009f97   Thumb Code     0  mnrefprovider.in(.text)
-    CMnrpNaviControl::~CMnrpNaviControl__deallocating() 0x00009fc7   Thumb Code    16  mnrefprovider.in(.text)
-    CMnrpNaviControl::UpdateModelL(CPosLandmark&) 0x00009fd7   Thumb Code    10  mnrefprovider.in(.text)
-    CMnrpNaviControl::HandleModelUpdateL()   0x00009fe1   Thumb Code   174  mnrefprovider.in(.text)
-    thunk{-52} to CMnrpNaviControl::HandleModelUpdateL() 0x0000a08f   Thumb Code     4  mnrefprovider.in(.text)
-    CMnrpNaviControl::CountComponentControls() const 0x0000a093   Thumb Code     4  mnrefprovider.in(.text)
-    CMnrpNaviControl::ComponentControl(int) const 0x0000a097   Thumb Code    12  mnrefprovider.in(.text)
-    CMnrpNaviControl::OfferKeyEventL(const TKeyEvent&, TEventCode) 0x0000a0a3   Thumb Code    54  mnrefprovider.in(.text)
-    CMnrpNaviControl::SizeChanged()          0x0000a0d9   Thumb Code    28  mnrefprovider.in(.text)
-    CMnrpNaviControl::HandleResourceChange(int) 0x0000a0f5   Thumb Code    34  mnrefprovider.in(.text)
-    CMnrpNavigationService::ConstructL()     0x0000a12d   Thumb Code     8  mnrefprovider.in(.text)
-    CMnrpNavigationService::CMnrpNavigationService() 0x0000a135   Thumb Code    12  mnrefprovider.in(.text)
-    CMnrpNavigationService::CMnrpNavigationService__sub_object() 0x0000a135   Thumb Code     0  mnrefprovider.in(.text)
-    CMnrpNavigationService::NewL()           0x0000a141   Thumb Code    32  mnrefprovider.in(.text)
-    CMnrpNavigationService::~CMnrpNavigationService() 0x0000a161   Thumb Code     8  mnrefprovider.in(.text)
-    CMnrpNavigationService::~CMnrpNavigationService__sub_object() 0x0000a161   Thumb Code     0  mnrefprovider.in(.text)
-    CMnrpNavigationService::~CMnrpNavigationService__deallocating() 0x0000a169   Thumb Code    16  mnrefprovider.in(.text)
-    CMnrpNavigationService::HandleNavigateToL(const CPosLandmark&) 0x0000a179   Thumb Code    18  mnrefprovider.in(.text)
-    CMnrpNavigationService::DoCancel()       0x0000a18b   Thumb Code     2  mnrefprovider.in(.text)
-    CMnrpMapViewService::ConstructL()        0x0000a191   Thumb Code     8  mnrefprovider.in(.text)
-    CMnrpMapViewService::CMnrpMapViewService() 0x0000a199   Thumb Code    20  mnrefprovider.in(.text)
-    CMnrpMapViewService::CMnrpMapViewService__sub_object() 0x0000a199   Thumb Code     0  mnrefprovider.in(.text)
-    CMnrpMapViewService::NewL()              0x0000a1ad   Thumb Code    32  mnrefprovider.in(.text)
-    CMnrpMapViewService::AppUi()             0x0000a1cd   Thumb Code    18  mnrefprovider.in(.text)
-    CMnrpMapViewService::StopSelection()     0x0000a1df   Thumb Code    24  mnrefprovider.in(.text)
-    CMnrpMapViewService::DoCancel()          0x0000a1f7   Thumb Code    18  mnrefprovider.in(.text)
-    CMnrpMapViewService::~CMnrpMapViewService() 0x0000a209   Thumb Code    48  mnrefprovider.in(.text)
-    CMnrpMapViewService::~CMnrpMapViewService__sub_object() 0x0000a209   Thumb Code     0  mnrefprovider.in(.text)
-    CMnrpMapViewService::~CMnrpMapViewService__deallocating() 0x0000a239   Thumb Code    16  mnrefprovider.in(.text)
-    CMnrpMapViewService::HandleShowMapL()    0x0000a249   Thumb Code    44  mnrefprovider.in(.text)
-    CMnrpMapViewService::HandleShowCurrentLocationL() 0x0000a275   Thumb Code    12  mnrefprovider.in(.text)
-    CMnrpMapViewService::HandleSelectFromMapL() 0x0000a281   Thumb Code    54  mnrefprovider.in(.text)
-    CMnrpMapViewService::CompleteSelectionL(const TCoordinate&) 0x0000a2b7   Thumb Code    42  mnrefprovider.in(.text)
-    CMnrpMapViewService::HandleSelectionL(const TCoordinate&) 0x0000a2e1   Thumb Code    88  mnrefprovider.in(.text)
-    thunk{-212} to CMnrpMapViewService::HandleSelectionL(const TCoordinate&) 0x0000a339   Thumb Code     4  mnrefprovider.in(.text)
-    CMnrpMapViewService::HandleSelectionL(int) 0x0000a33d   Thumb Code    24  mnrefprovider.in(.text)
-    thunk{-212} to CMnrpMapViewService::HandleSelectionL(int) 0x0000a355   Thumb Code     4  mnrefprovider.in(.text)
-    CMnrpMapViewService::HandleSelectionL(unsigned long, int) 0x0000a359   Thumb Code    24  mnrefprovider.in(.text)
-    thunk{-212} to CMnrpMapViewService::HandleSelectionL(unsigned long, int) 0x0000a371   Thumb Code     4  mnrefprovider.in(.text)
-    CMnrpMapViewService::HandleSelectionErrorL(int) 0x0000a375   Thumb Code    16  mnrefprovider.in(.text)
-    thunk{-212} to CMnrpMapViewService::HandleSelectionErrorL(int) 0x0000a385   Thumb Code     4  mnrefprovider.in(.text)
-    Inline ARM to Thumb Veneer to RunThread  0x0000a38c   ARM Code       0  uc_exe.o(.text)
-    RunThread                                0x0000a395   Thumb Code    36  uc_exe.o(.text)
-    CallThrdProcEntry                        0x0000a3b8   ARM Code     116  callfirstprocessfn.o(.text)
-    __DLL_Export_Table__                     0x0000a430   ARM Code       4  dllexp.o(.text)
-    TPoint::operator +=(const TPoint&)       0x0000a4d8   ARM Code       0  euser{000a0000}-1025.o(StubCode)
-    CBufSeg::NewL(int)                       0x0000a4e0   ARM Code       0  euser{000a0000}-1096.o(StubCode)
-    HBufC16::Des()                           0x0000a4e8   ARM Code       0  euser{000a0000}-1116.o(StubCode)
-    HBufC16::NewLC(int)                      0x0000a4f0   ARM Code       0  euser{000a0000}-1119.o(StubCode)
-    TPtrC16::TPtrC16()                       0x0000a4f8   ARM Code       0  euser{000a0000}-1172.o(StubCode)
-    CServer2::DoCancel()                     0x0000a500   ARM Code       0  euser{000a0000}-1288.o(StubCode)
-    RArrayBase::At(int) const                0x0000a508   ARM Code       0  euser{000a0000}-1507.o(StubCode)
-    RArrayBase::Count() const                0x0000a510   ARM Code       0  euser{000a0000}-1510.o(StubCode)
-    CArrayFixBase::At(int) const             0x0000a518   ARM Code       0  euser{000a0000}-1553.o(StubCode)
-    RPointerArrayBase::At(int) const         0x0000a520   ARM Code       0  euser{000a0000}-1590.o(StubCode)
-    RPointerArrayBase::Count() const         0x0000a528   ARM Code       0  euser{000a0000}-1593.o(StubCode)
-    TRect::Size() const                      0x0000a530   ARM Code       0  euser{000a0000}-1648.o(StubCode)
-    TDesC16::AllocL() const                  0x0000a538   ARM Code       0  euser{000a0000}-1817.o(StubCode)
-    CPolicyServer::CustomFailureActionL(const RMessage2&, int, const TSecurityInfo&) 0x0000a540   ARM Code       0  euser{000a0000}-1995.o(StubCode)
-    CPolicyServer::RunL()                    0x0000a548   ARM Code       0  euser{000a0000}-1997.o(StubCode)
-    CPolicyServer::RunError(int)             0x0000a550   ARM Code       0  euser{000a0000}-1999.o(StubCode)
-    CleanupStack::PopAndDestroy()            0x0000a558   ARM Code       0  euser{000a0000}-203.o(StubCode)
-    CleanupStack::Pop(int)                   0x0000a560   ARM Code       0  euser{000a0000}-204.o(StubCode)
-    CleanupStack::Pop()                      0x0000a568   ARM Code       0  euser{000a0000}-205.o(StubCode)
-    User::MarkCleanupStack()                 0x0000a570   ARM Code       0  euser{000a0000}-2060.o(StubCode)
-    User::UnMarkCleanupStack(TTrapHandler*)  0x0000a578   ARM Code       0  euser{000a0000}-2061.o(StubCode)
-    CleanupStack::PushL(TCleanupItem)        0x0000a580   ARM Code       0  euser{000a0000}-207.o(StubCode)
-    CleanupStack::PushL(CBase*)              0x0000a588   ARM Code       0  euser{000a0000}-208.o(StubCode)
-    XLeaveException::GetReason() const       0x0000a590   ARM Code       0  euser{000a0000}-2082.o(StubCode)
-    CPolicyServer::Extension_(unsigned, void*&, void*) 0x0000a598   ARM Code       0  euser{000a0000}-2120.o(StubCode)
-    CBase::Extension_(unsigned, void*&, void*) 0x0000a5a0   ARM Code       0  euser{000a0000}-2123.o(StubCode)
-    CBase::~CBase()                          0x0000a5a8   ARM Code       0  euser{000a0000}-2125.o(StubCode)
-    CSession2::Extension_(unsigned, void*&, void*) 0x0000a5b0   ARM Code       0  euser{000a0000}-2131.o(StubCode)
-    CArrayFixBase::Reset()                   0x0000a5b8   ARM Code       0  euser{000a0000}-245.o(StubCode)
-    CArrayFixBase::InsertL(int, const void*) 0x0000a5c0   ARM Code       0  euser{000a0000}-250.o(StubCode)
-    CArrayFixBase::CArrayFixBase(CBufBase*(*)(int), int, int) 0x0000a5c8   ARM Code       0  euser{000a0000}-254.o(StubCode)
-    CArrayFixBase::~CArrayFixBase()          0x0000a5d0   ARM Code       0  euser{000a0000}-257.o(StubCode)
-    RArrayBase::Close()                      0x0000a5d8   ARM Code       0  euser{000a0000}-46.o(StubCode)
-    RPointerArrayBase::GetElementPtr(const CBase*, int) 0x0000a5e0   ARM Code       0  euser{000a0000}-464.o(StubCode)
-    RPointerArrayBase::Close()               0x0000a5e8   ARM Code       0  euser{000a0000}-470.o(StubCode)
-    RPointerArrayBase::Reset()               0x0000a5f0   ARM Code       0  euser{000a0000}-471.o(StubCode)
-    RPointerArrayBase::Append(const void*)   0x0000a5f8   ARM Code       0  euser{000a0000}-472.o(StubCode)
-    RPointerArrayBase::GetCount(const CBase*) 0x0000a600   ARM Code       0  euser{000a0000}-476.o(StubCode)
-    RArrayBase::Append(const void*)          0x0000a608   ARM Code       0  euser{000a0000}-48.o(StubCode)
-    RPointerArrayBase::RPointerArrayBase()   0x0000a610   ARM Code       0  euser{000a0000}-481.o(StubCode)
-    RArrayBase::RArrayBase(int)              0x0000a618   ARM Code       0  euser{000a0000}-55.o(StubCode)
-    Math::IsNaN(const double&)               0x0000a620   ARM Code       0  euser{000a0000}-551.o(StubCode)
-    User::LeaveIfError(int)                  0x0000a628   ARM Code       0  euser{000a0000}-593.o(StubCode)
-    User::HandleException(void*)             0x0000a630   ARM Code       0  euser{000a0000}-613.o(StubCode)
-    User::Leave(int)                         0x0000a638   ARM Code       0  euser{000a0000}-649.o(StubCode)
-    User::AllocZ(int)                        0x0000a640   ARM Code       0  euser{000a0000}-652.o(StubCode)
-    User::AllocZL(int)                       0x0000a648   ARM Code       0  euser{000a0000}-654.o(StubCode)
-    User::Invariant()                        0x0000a650   ARM Code       0  euser{000a0000}-669.o(StubCode)
-    TBufBase16::TBufBase16(int)              0x0000a658   ARM Code       0  euser{000a0000}-81.o(StubCode)
-    TRect::Grow(int, int)                    0x0000a660   ARM Code       0  euser{000a0000}-824.o(StubCode)
-    TRect::Shrink(const TSize&)              0x0000a668   ARM Code       0  euser{000a0000}-829.o(StubCode)
-    TRect::Shrink(int, int)                  0x0000a670   ARM Code       0  euser{000a0000}-830.o(StubCode)
-    TRect::TRect(const TSize&)               0x0000a678   ARM Code       0  euser{000a0000}-838.o(StubCode)
-    TRect::TRect(const TPoint&, const TSize&) 0x0000a680   ARM Code       0  euser{000a0000}-839.o(StubCode)
-    TRect::TRect(int, int, int, int)         0x0000a688   ARM Code       0  euser{000a0000}-841.o(StubCode)
-    TRect::TRect()                           0x0000a690   ARM Code       0  euser{000a0000}-842.o(StubCode)
-    TDes16::Format(TRefByValue<const TDesC16>, ...) 0x0000a698   ARM Code       0  euser{000a0000}-973.o(StubCode)
-    CApaDocument::Capability() const         0x0000a6a0   ARM Code       0  apparc{000a0000}-121.o(StubCode)
-    CApaApplication::AppFullName() const     0x0000a6a8   ARM Code       0  apparc{000a0000}-132.o(StubCode)
-    TApaApplicationFactory::TApaApplicationFactory(CApaApplication*(*)()) 0x0000a6b0   ARM Code       0  apparc{000a0000}-171.o(StubCode)
-    CApaAppServer::NotifyServerExit(int)     0x0000a6b8   ARM Code       0  apparc{000a0000}-191.o(StubCode)
-    CApaAppServer::CustomSecurityCheckL(const RMessage2&, int&, TSecurityInfo&) 0x0000a6c0   ARM Code       0  apparc{000a0000}-192.o(StubCode)
-    CApaAppServer::CApaAppServer()           0x0000a6c8   ARM Code       0  apparc{000a0000}-194.o(StubCode)
-    CApaAppServiceBase::SecurityCheckL(const RMessage2&, int&, TSecurityInfo&) 0x0000a6d0   ARM Code       0  apparc{000a0000}-202.o(StubCode)
-    CApaAppServer::NewSessionL(const TVersion&, const RMessage2&) const 0x0000a6d8   ARM Code       0  apparc{000a0000}-222.o(StubCode)
-    CApaAppServiceBase::ExtensionInterface(TUid, void*&) 0x0000a6e0   ARM Code       0  apparc{000a0000}-232.o(StubCode)
-    CApaCommandLine::ParentWindowGroupID() const 0x0000a6e8   ARM Code       0  apparc{000a0000}-253.o(StubCode)
-    CApaAppServer::CApaAppServer_Reserved1() 0x0000a6f0   ARM Code       0  apparc{000a0000}-273.o(StubCode)
-    CApaAppServer::CApaAppServer_Reserved2() 0x0000a6f8   ARM Code       0  apparc{000a0000}-274.o(StubCode)
-    CApaAppServer::DoConnect(const RMessage2&) 0x0000a700   ARM Code       0  apparc{000a0000}-275.o(StubCode)
-    CApaApplication::CApaApplication_Reserved1() 0x0000a708   ARM Code       0  apparc{000a0000}-279.o(StubCode)
-    CApaApplication::CApaApplication_Reserved2() 0x0000a710   ARM Code       0  apparc{000a0000}-280.o(StubCode)
-    CApaAppServiceBase::Disconnect(const RMessage2&) 0x0000a718   ARM Code       0  apparc{000a0000}-284.o(StubCode)
-    CApaAppServiceBase::CountResources()     0x0000a720   ARM Code       0  apparc{000a0000}-285.o(StubCode)
-    CApaAppServiceBase::CApaAppServiceBase_Reserved1() 0x0000a728   ARM Code       0  apparc{000a0000}-286.o(StubCode)
-    CApaAppServiceBase::CApaAppServiceBase_Reserved2() 0x0000a730   ARM Code       0  apparc{000a0000}-287.o(StubCode)
-    CApaDocument::GlassPictureL()            0x0000a738   ARM Code       0  apparc{000a0000}-30.o(StubCode)
-    CDesC16Array::AppendL(const TDesC16&)    0x0000a740   ARM Code       0  bafl{000a0000}-43.o(StubCode)
-    CDesC16ArraySeg::CDesC16ArraySeg(int)    0x0000a748   ARM Code       0  bafl{000a0000}-98.o(StubCode)
-    MCoeMessageObserver::MCoeMessageObserver_Reserved_1() 0x0000a750   ARM Code       0  cone{000a0000}-100.o(StubCode)
-    MCoeMessageObserver::MCoeMessageObserver_Reserved_2() 0x0000a758   ARM Code       0  cone{000a0000}-101.o(StubCode)
-    CCoeControl::MakeVisible(int)            0x0000a760   ARM Code       0  cone{000a0000}-11.o(StubCode)
-    CCoeControl::MinimumSize()               0x0000a768   ARM Code       0  cone{000a0000}-12.o(StubCode)
-    MCoeViewDeactivationObserver::MCoeViewDeactivationObserver_Reserved_1() 0x0000a770   ARM Code       0  cone{000a0000}-127.o(StubCode)
-    MCoeViewDeactivationObserver::MCoeViewDeactivationObserver_Reserved_2() 0x0000a778   ARM Code       0  cone{000a0000}-128.o(StubCode)
-    CCoeControl::SetAdjacent(int)            0x0000a780   ARM Code       0  cone{000a0000}-13.o(StubCode)
-    CCoeControl::SetNeighbor(CCoeControl*)   0x0000a788   ARM Code       0  cone{000a0000}-15.o(StubCode)
-    CCoeControl::SizeChanged()               0x0000a790   ARM Code       0  cone{000a0000}-18.o(StubCode)
-    CCoeEnv::Static()                        0x0000a798   ARM Code       0  cone{000a0000}-182.o(StubCode)
-    CCoeControl::FocusChanged(TDrawNow)      0x0000a7a0   ARM Code       0  cone{000a0000}-19.o(StubCode)
-    MCoeView::ViewConstructL()               0x0000a7a8   ARM Code       0  cone{000a0000}-196.o(StubCode)
-    MCoeView::PrepareForViewActivation()     0x0000a7b0   ARM Code       0  cone{000a0000}-197.o(StubCode)
-    MCoeView::ViewScreenModeCompatible(int)  0x0000a7b8   ARM Code       0  cone{000a0000}-199.o(StubCode)
-    CCoeAppUi::AddToStackL(const MCoeView&, CCoeControl*, int, int) 0x0000a7c0   ARM Code       0  cone{000a0000}-203.o(StubCode)
-    CCoeControl::SetMopParent(MObjectProvider*) 0x0000a7c8   ARM Code       0  cone{000a0000}-21.o(StubCode)
-    CCoeAppUi::HandleKeyEventL(const TKeyEvent&, TEventCode) 0x0000a7d0   ARM Code       0  cone{000a0000}-210.o(StubCode)
-    CCoeAppUi::RemoveFromStack(CCoeControl*) 0x0000a7d8   ARM Code       0  cone{000a0000}-211.o(StubCode)
-    CCoeAppUi::SetAndDrawFocus(int)          0x0000a7e0   ARM Code       0  cone{000a0000}-212.o(StubCode)
-    CCoeAppUi::HandleSwitchOnEventL(CCoeControl*) 0x0000a7e8   ARM Code       0  cone{000a0000}-220.o(StubCode)
-    CCoeControl::CreateWindowL()             0x0000a7f0   ARM Code       0  cone{000a0000}-25.o(StubCode)
-    CCoeControl::DrawDeferred() const        0x0000a7f8   ARM Code       0  cone{000a0000}-257.o(StubCode)
-    CCoeControl::OfferKeyEventL(const TKeyEvent&, TEventCode) 0x0000a800   ARM Code       0  cone{000a0000}-26.o(StubCode)
-    CCoeControl::GetHelpContext(TCoeHelpContext&) const 0x0000a808   ARM Code       0  cone{000a0000}-263.o(StubCode)
-    CCoeControl::ComponentControl(int) const 0x0000a810   ARM Code       0  cone{000a0000}-265.o(StubCode)
-    CCoeControl::GetColorUseListL(CArrayFix<TCoeColorUse>&) const 0x0000a818   ARM Code       0  cone{000a0000}-266.o(StubCode)
-    CCoeControl::InputCapabilities() const   0x0000a820   ARM Code       0  cone{000a0000}-270.o(StubCode)
-    CCoeControl::WriteInternalStateL(RWriteStream&) const 0x0000a828   ARM Code       0  cone{000a0000}-271.o(StubCode)
-    CCoeControl::CountComponentControls() const 0x0000a830   ARM Code       0  cone{000a0000}-272.o(StubCode)
-    CCoeControl::Draw(const TRect&) const    0x0000a838   ARM Code       0  cone{000a0000}-275.o(StubCode)
-    CCoeControl::Rect() const                0x0000a840   ARM Code       0  cone{000a0000}-276.o(StubCode)
-    CCoeControl::SystemGc() const            0x0000a848   ARM Code       0  cone{000a0000}-287.o(StubCode)
-    CCoeControl::HasBorder() const           0x0000a850   ARM Code       0  cone{000a0000}-288.o(StubCode)
-    CCoeControl::MopSupplyObject(TTypeUid)   0x0000a858   ARM Code       0  cone{000a0000}-29.o(StubCode)
-    CCoeControl::PositionChanged()           0x0000a860   ARM Code       0  cone{000a0000}-30.o(StubCode)
-    CCoeAppUi::HelpContextL() const          0x0000a868   ARM Code       0  cone{000a0000}-351.o(StubCode)
-    CCoeAppUi::GetActiveViewId(TVwsViewId&) const 0x0000a870   ARM Code       0  cone{000a0000}-353.o(StubCode)
-    CCoeAppUi::InputCapabilities() const     0x0000a878   ARM Code       0  cone{000a0000}-355.o(StubCode)
-    CCoeControl::HandlePointerEventL(const TPointerEvent&) 0x0000a880   ARM Code       0  cone{000a0000}-36.o(StubCode)
-    CCoeControl::SetContainerWindowL(const CCoeControl&) 0x0000a888   ARM Code       0  cone{000a0000}-39.o(StubCode)
-    thunk{-4} to CCoeControl::MopSupplyObject(TTypeUid) 0x0000a890   ARM Code       0  cone{000a0000}-396.o(StubCode)
-    thunk{-4} to CCoeControl::MopNext()      0x0000a898   ARM Code       0  cone{000a0000}-397.o(StubCode)
-    CCoeControl::HandleResourceChange(int)   0x0000a8a0   ARM Code       0  cone{000a0000}-40.o(StubCode)
-    CCoeControl::PrepareForFocusGainL()      0x0000a8a8   ARM Code       0  cone{000a0000}-41.o(StubCode)
-    CCoeControl::PrepareForFocusLossL()      0x0000a8b0   ARM Code       0  cone{000a0000}-42.o(StubCode)
-    CCoeControl::SetParent(CCoeControl*)     0x0000a8b8   ARM Code       0  cone{000a0000}-444.o(StubCode)
-    CCoeControl::SetLayoutManagerL(MCoeLayoutManager*) 0x0000a8c0   ARM Code       0  cone{000a0000}-474.o(StubCode)
-    CCoeControl::GetTextDrawer(CCoeTextDrawerBase*&, const CCoeControl*, int) const 0x0000a8c8   ARM Code       0  cone{000a0000}-477.o(StubCode)
-    CCoeControl::Reserved_CCoeControl_8()    0x0000a8d0   ARM Code       0  cone{000a0000}-478.o(StubCode)
-    CCoeControl::Reserved_CCoeControl_9()    0x0000a8d8   ARM Code       0  cone{000a0000}-479.o(StubCode)
-    CCoeControl::ConstructFromResourceL(TResourceReader&) 0x0000a8e0   ARM Code       0  cone{000a0000}-48.o(StubCode)
-    CCoeControl::RequestRelayout(const CCoeControl*) 0x0000a8e8   ARM Code       0  cone{000a0000}-482.o(StubCode)
-    CCoeControl::SetExtentToWholeScreen()    0x0000a8f0   ARM Code       0  cone{000a0000}-50.o(StubCode)
-    CCoeControl::SetTextBaselineSpacing(int) 0x0000a8f8   ARM Code       0  cone{000a0000}-502.o(StubCode)
-    CCoeControl::HandlePointerBufferReadyL() 0x0000a900   ARM Code       0  cone{000a0000}-51.o(StubCode)
-    CCoeControl::TextBaselineOffset(const TSize&) const 0x0000a908   ARM Code       0  cone{000a0000}-514.o(StubCode)
-    CCoeControl::MopNext()                   0x0000a910   ARM Code       0  cone{000a0000}-56.o(StubCode)
-    CCoeControl::SetRect(const TRect&)       0x0000a918   ARM Code       0  cone{000a0000}-57.o(StubCode)
-    CCoeControl::Reserved_CCoeControl_10()   0x0000a920   ARM Code       0  cone{000a0000}-580.o(StubCode)
-    CCoeControl::Reserved_CCoeControl_11()   0x0000a928   ARM Code       0  cone{000a0000}-581.o(StubCode)
-    CCoeControl::Reserved_CCoeControl_12()   0x0000a930   ARM Code       0  cone{000a0000}-582.o(StubCode)
-    CCoeControl::Reserved_CCoeControl_13()   0x0000a938   ARM Code       0  cone{000a0000}-583.o(StubCode)
-    CCoeControl::HandleControlArrayEventL(CCoeControlArray::TEvent, const CCoeControlArray*, CCoeControl*, int) 0x0000a940   ARM Code       0  cone{000a0000}-584.o(StubCode)
-    CCoeControl::ActivateL()                 0x0000a948   ARM Code       0  cone{000a0000}-61.o(StubCode)
-    CCoeControl::SetDimmed(int)              0x0000a950   ARM Code       0  cone{000a0000}-62.o(StubCode)
-    MObjectProvider::MObjectProvider_Reserved1() 0x0000a958   ARM Code       0  cone{000a0000}-638.o(StubCode)
-    MObjectProvider::MObjectProvider_Reserved2() 0x0000a960   ARM Code       0  cone{000a0000}-639.o(StubCode)
-    CCoeControl::CCoeControl()               0x0000a968   ARM Code       0  cone{000a0000}-64.o(StubCode)
-    MCoeViewDeactivationObserver::MCoeViewDeactivationObserver__sub_object() 0x0000a970   ARM Code       0  cone{000a0000}-664.o(StubCode)
-    CCoeControl::~CCoeControl()              0x0000a978   ARM Code       0  cone{000a0000}-67.o(StubCode)
-    MCoeView::MCoeView_Reserved_2()          0x0000a980   ARM Code       0  cone{000a0000}-670.o(StubCode)
-    MCoeView::MCoeView_Reserved_3()          0x0000a988   ARM Code       0  cone{000a0000}-671.o(StubCode)
-    CCoeAppUi::FrameworkCallsRendezvous() const 0x0000a990   ARM Code       0  cone{000a0000}-676.o(StubCode)
-    CCoeAppUi::CCoeAppUi_Reserved_2()        0x0000a998   ARM Code       0  cone{000a0000}-677.o(StubCode)
-    CCoeControl::Reserved_2()                0x0000a9a0   ARM Code       0  cone{000a0000}-9.o(StubCode)
-    thunk{-20} to CEikDocument::SaveL(MSaveObserver::TSaveType) 0x0000a9a8   ARM Code       0  eikcore{000a0000}-141.o(StubCode)
-    CEikAppUi::Reserved_3()                  0x0000a9b0   ARM Code       0  eikcore{000a0000}-142.o(StubCode)
-    CEikAppUi::Reserved_4()                  0x0000a9b8   ARM Code       0  eikcore{000a0000}-143.o(StubCode)
-    CEikAppUi::CreateFileL(const TDesC16&)   0x0000a9c0   ARM Code       0  eikcore{000a0000}-144.o(StubCode)
-    CEikAppUi::SetEmphasis(CCoeControl*, int) 0x0000a9c8   ARM Code       0  eikcore{000a0000}-147.o(StubCode)
-    CEikAppUi::HandleMessageL(unsigned long, TUid, const TDesC8&) 0x0000a9d0   ARM Code       0  eikcore{000a0000}-152.o(StubCode)
-    CEikAppUi::ProcessMessageL(TUid, const TDesC8&) 0x0000a9d8   ARM Code       0  eikcore{000a0000}-155.o(StubCode)
-    CEikAppUi::HandleModelChangeL()          0x0000a9e0   ARM Code       0  eikcore{000a0000}-158.o(StubCode)
-    CEikAppUi::HandleSideBarMenuL(int, const TPoint&, int, const CEikHotKeyTable*) 0x0000a9e8   ARM Code       0  eikcore{000a0000}-159.o(StubCode)
-    CEikAppUi::ProcessCommandParametersL(TApaCommand, TBuf<(int)256>&, const TDesC8&) 0x0000a9f0   ARM Code       0  eikcore{000a0000}-169.o(StubCode)
-    CEikAppUi::ReportResourceChangedToAppL(int) 0x0000a9f8   ARM Code       0  eikcore{000a0000}-171.o(StubCode)
-    CEikAppUi::OpenFileL(const TDesC16&)     0x0000aa00   ARM Code       0  eikcore{000a0000}-175.o(StubCode)
-    CEikDocument::Reserved_2()               0x0000aa08   ARM Code       0  eikcore{000a0000}-18.o(StubCode)
-    CEikDocument::NewDocumentL()             0x0000aa10   ARM Code       0  eikcore{000a0000}-20.o(StubCode)
-    CEikDocument::UpdateTaskNameL(CApaWindowGroupName*) 0x0000aa18   ARM Code       0  eikcore{000a0000}-25.o(StubCode)
-    CEikDocument::CreateFileStoreLC(RFs&, const TDesC16&) 0x0000aa20   ARM Code       0  eikcore{000a0000}-26.o(StubCode)
-    CEikDocument::EditL(MApaEmbeddedDocObserver*, int) 0x0000aa28   ARM Code       0  eikcore{000a0000}-27.o(StubCode)
-    CEikDocument::SaveL(MSaveObserver::TSaveType) 0x0000aa30   ARM Code       0  eikcore{000a0000}-28.o(StubCode)
-    CEikDocument::SaveL()                    0x0000aa38   ARM Code       0  eikcore{000a0000}-29.o(StubCode)
-    CEikDocument::HasChanged() const         0x0000aa40   ARM Code       0  eikcore{000a0000}-291.o(StubCode)
-    CEikDocument::ExternalizeL(RWriteStream&) const 0x0000aa48   ARM Code       0  eikcore{000a0000}-293.o(StubCode)
-    CEikDocument::StoreL(CStreamStore&, CStreamDictionary&) const 0x0000aa50   ARM Code       0  eikcore{000a0000}-294.o(StubCode)
-    CEikDocument::IsEmpty() const            0x0000aa58   ARM Code       0  eikcore{000a0000}-295.o(StubCode)
-    CEikApplication::Capability(TDes8&) const 0x0000aa60   ARM Code       0  eikcore{000a0000}-296.o(StubCode)
-    CEikApplication::OpenIniFileLC(RFs&) const 0x0000aa68   ARM Code       0  eikcore{000a0000}-297.o(StubCode)
-    CEikApplication::BitmapStoreName() const 0x0000aa70   ARM Code       0  eikcore{000a0000}-298.o(StubCode)
-    CEikApplication::ResourceFileName() const 0x0000aa78   ARM Code       0  eikcore{000a0000}-299.o(StubCode)
-    CEikDocument::PrintL(const CStreamStore&) 0x0000aa80   ARM Code       0  eikcore{000a0000}-30.o(StubCode)
-    CEikApplication::GetDefaultDocumentFileName(TBuf<(int)256>&) const 0x0000aa88   ARM Code       0  eikcore{000a0000}-302.o(StubCode)
-    CEikDocument::RestoreL(const CStreamStore&, const CStreamDictionary&) 0x0000aa90   ARM Code       0  eikcore{000a0000}-31.o(StubCode)
-    CEikAppUi::ClientRect() const            0x0000aa98   ARM Code       0  eikcore{000a0000}-315.o(StubCode)
-    CEikAppUi::ValidFileType(TUid) const     0x0000aaa0   ARM Code       0  eikcore{000a0000}-317.o(StubCode)
-    CEikAppUi::Document() const              0x0000aaa8   ARM Code       0  eikcore{000a0000}-319.o(StubCode)
-    CEikonEnv::DenseFont() const             0x0000aab0   ARM Code       0  eikcore{000a0000}-352.o(StubCode)
-    CEikDocument::~CEikDocument__sub_object() 0x0000aab8   ARM Code       0  eikcore{000a0000}-37.o(StubCode)
-    thunk{-36} to CEikAppUi::HandleMessageL(unsigned long, TUid, const TDesC8&) 0x0000aac0   ARM Code       0  eikcore{000a0000}-390.o(StubCode)
-    thunk{-40} to CEikAppUi::MopNext()       0x0000aac8   ARM Code       0  eikcore{000a0000}-392.o(StubCode)
-    EikStart::RunApplication(TApaApplicationFactory) 0x0000aad0   ARM Code       0  eikcore{000a0000}-394.o(StubCode)
-    CEikAppServer::ExtensionInterface(TUid, void*&) 0x0000aad8   ARM Code       0  eikcore{000a0000}-467.o(StubCode)
-    CEikonEnv::StartedAsServerApp() const    0x0000aae0   ARM Code       0  eikcore{000a0000}-472.o(StubCode)
-    CEikonEnv::AppServer() const             0x0000aae8   ARM Code       0  eikcore{000a0000}-473.o(StubCode)
-    CEikAppUi::MopNext()                     0x0000aaf0   ARM Code       0  eikcore{000a0000}-479.o(StubCode)
-    thunk{-24} to CEikAppUi::HandleSideBarMenuL(int, const TPoint&, int, const CEikHotKeyTable*) 0x0000aaf8   ARM Code       0  eikcore{000a0000}-490.o(StubCode)
-    CEikAppUi::ProcessCommandParametersL(CApaCommandLine&) 0x0000ab00   ARM Code       0  eikcore{000a0000}-506.o(StubCode)
-    CEikAppServer::CreateServiceSecurityCheckL(TUid, const RMessage2&, int&, TSecurityInfo&) 0x0000ab08   ARM Code       0  eikcore{000a0000}-523.o(StubCode)
-    CEikApplication::CEikApplication_Reserved1() 0x0000ab10   ARM Code       0  eikcore{000a0000}-532.o(StubCode)
-    CEikApplication::CEikApplication_Reserved2() 0x0000ab18   ARM Code       0  eikcore{000a0000}-533.o(StubCode)
-    MEikMenuObserver::Reserved_2_MenuObserver() 0x0000ab20   ARM Code       0  eikcore{000a0000}-534.o(StubCode)
-    MEikMenuObserver::CreateCustomCommandControlL(int) 0x0000ab28   ARM Code       0  eikcore{000a0000}-535.o(StubCode)
-    MEikMenuObserver::MEikCommandObserver_Reserved1() 0x0000ab30   ARM Code       0  eikcore{000a0000}-536.o(StubCode)
-    MEikMenuObserver::MEikCommandObserver_Reserved2() 0x0000ab38   ARM Code       0  eikcore{000a0000}-537.o(StubCode)
-    CEikDocument::ValidatePasswordL() const  0x0000ab40   ARM Code       0  eikcore{000a0000}-565.o(StubCode)
-    CEikApplication::CreateDocumentL(CApaProcess*) 0x0000ab48   ARM Code       0  eikcore{000a0000}-61.o(StubCode)
-    CEikApplication::PreDocConstructL()      0x0000ab50   ARM Code       0  eikcore{000a0000}-62.o(StubCode)
-    thunk{-24} to CEikAppUi::SetEmphasis(CCoeControl*, int) 0x0000ab58   ARM Code       0  eikcore{000a0000}-63.o(StubCode)
-    CEikApplication::CEikApplication__sub_object() 0x0000ab60   ARM Code       0  eikcore{000a0000}-64.o(StubCode)
-    CEikApplication::~CEikApplication__sub_object() 0x0000ab68   ARM Code       0  eikcore{000a0000}-67.o(StubCode)
-    MEikMenuObserver::RestoreMenuL(CCoeControl*, int, MEikMenuObserver::TMenuType) 0x0000ab70   ARM Code       0  eikcore{000a0000}-72.o(StubCode)
-    MEikMenuObserver::OfferKeyToAppL(const TKeyEvent&, TEventCode) 0x0000ab78   ARM Code       0  eikcore{000a0000}-73.o(StubCode)
-    MEikMenuObserver::DynInitMenuBarL(int, CEikMenuBar*) 0x0000ab80   ARM Code       0  eikcore{000a0000}-74.o(StubCode)
-    MEikMenuObserver::DynInitMenuPaneL(int, CEikMenuPane*) 0x0000ab88   ARM Code       0  eikcore{000a0000}-75.o(StubCode)
-    MEikMenuObserver::HandleSideBarMenuL(int, const TPoint&, int, const CEikHotKeyTable*) 0x0000ab90   ARM Code       0  eikcore{000a0000}-76.o(StubCode)
-    MEikMenuObserver::CheckHotKeyNotDimmedL(int) 0x0000ab98   ARM Code       0  eikcore{000a0000}-77.o(StubCode)
-    MEikMenuObserver::Reserved_1_MenuObserver() 0x0000aba0   ARM Code       0  eikcore{000a0000}-78.o(StubCode)
-    MEikMenuObserver::HandleAttemptDimmedSelectionL(int) 0x0000aba8   ARM Code       0  eikcore{000a0000}-79.o(StubCode)
-    CEikStatusPaneBase::ControlL(TUid) const 0x0000abb0   ARM Code       0  eikcoctl{000a0000}-1376.o(StubCode)
-    CEikMenuPane::SetItemDimmed(int, int)    0x0000abb8   ARM Code       0  eikcoctl{000a0000}-140.o(StubCode)
-    CEikButtonGroupContainer::ReduceRect(TRect&) const 0x0000abc0   ARM Code       0  eikcoctl{000a0000}-1430.o(StubCode)
-    CEikListBox::HandleItemAdditionL()       0x0000abc8   ARM Code       0  eikcoctl{000a0000}-35.o(StubCode)
-    CEikListBox::CreateScrollBarFrameL(int)  0x0000abd0   ARM Code       0  eikcoctl{000a0000}-46.o(StubCode)
-    CTextListBoxModel::SetItemTextArray(MDesC16Array*) 0x0000abd8   ARM Code       0  eikcoctl{000a0000}-605.o(StubCode)
-    CTextListBoxModel::SetOwnershipType(TListBoxModelItemArrayOwnership) 0x0000abe0   ARM Code       0  eikcoctl{000a0000}-606.o(StubCode)
-    CEikScrollBarFrame::SetScrollBarVisibilityL(CEikScrollBarFrame::TScrollBarVisibility, CEikScrollBarFrame::TScrollBarVisibility) 0x0000abe8   ARM Code       0  eikcoctl{000a0000}-660.o(StubCode)
-    CEikButtonGroupContainer::DoSetCommandL(int, int, const TDesC16*, const CFbsBitmap*, const CFbsBitmap*, CEikButtonGroupContainer::TCommandOp) 0x0000abf0   ARM Code       0  eikcoctl{000a0000}-875.o(StubCode)
-    CEikButtonGroupContainer::SetCommandSetL(int) 0x0000abf8   ARM Code       0  eikcoctl{000a0000}-880.o(StubCode)
-    CEikButtonGroupContainer::SetBoundingRect(const TRect&) 0x0000ac00   ARM Code       0  eikcoctl{000a0000}-881.o(StubCode)
-    CEikColumnListBox::Model() const         0x0000ac08   ARM Code       0  eikctl{000a0000}-455.o(StubCode)
-    CAknAppServiceBase::CreateL()            0x0000ac10   ARM Code       0  avkon{000a0000}-1132.o(StubCode)
-    CAknDocument::OpenFileL(CFileStore*&, RFile&) 0x0000ac18   ARM Code       0  avkon{000a0000}-129.o(StubCode)
-    CAknDocument::OpenFileL(int, const TDesC16&, RFs&) 0x0000ac20   ARM Code       0  avkon{000a0000}-130.o(StubCode)
-    CAknDocument::CAknDocument__sub_object(CEikApplication&) 0x0000ac28   ARM Code       0  avkon{000a0000}-131.o(StubCode)
-    CAknInformationNote::CAknInformationNote(int) 0x0000ac30   ARM Code       0  avkon{000a0000}-1341.o(StubCode)
-    CAknAppServer::ConstructL(const TDesC16&) 0x0000ac38   ARM Code       0  avkon{000a0000}-198.o(StubCode)
-    CAknAppServer::HandleAllClientsClosed()  0x0000ac40   ARM Code       0  avkon{000a0000}-199.o(StubCode)
-    CAknResourceNoteDialog::ExecuteLD(const TDesC16&) 0x0000ac48   ARM Code       0  avkon{000a0000}-1996.o(StubCode)
-    CAknAppServer::~CAknAppServer()          0x0000ac50   ARM Code       0  avkon{000a0000}-201.o(StubCode)
-    CAknAppUiBase::MopSupplyObject(TTypeUid) 0x0000ac58   ARM Code       0  avkon{000a0000}-206.o(StubCode)
-    CAknAppUiBase::HandleResourceChangeL(int) 0x0000ac60   ARM Code       0  avkon{000a0000}-211.o(StubCode)
-    CAknAppUiBase::HandleScreenDeviceChangedL() 0x0000ac68   ARM Code       0  avkon{000a0000}-213.o(StubCode)
-    CAknAppUiBase::HandleApplicationSpecificEventL(int, const TWsEvent&) 0x0000ac70   ARM Code       0  avkon{000a0000}-214.o(StubCode)
-    CAknAppUiBase::Exit()                    0x0000ac78   ARM Code       0  avkon{000a0000}-215.o(StubCode)
-    CAknAppUiBase::SetFadedL(int)            0x0000ac80   ARM Code       0  avkon{000a0000}-216.o(StubCode)
-    CAknSelectionListDialog::SetIconArrayL(CArrayPtr<CGulIcon>*) 0x0000ac88   ARM Code       0  avkon{000a0000}-2163.o(StubCode)
-    CAknAppUiBase::CAknAppUiBase()           0x0000ac90   ARM Code       0  avkon{000a0000}-217.o(StubCode)
-    CAknSelectionListDialog::NewL(int&, MDesC16Array*, int, MEikCommandObserver*) 0x0000ac98   ARM Code       0  avkon{000a0000}-2178.o(StubCode)
-    CAknAppUiBase::~CAknAppUiBase()          0x0000aca0   ARM Code       0  avkon{000a0000}-220.o(StubCode)
-    CAknSingleHeadingStyleListBox::CAknSingleHeadingStyleListBox() 0x0000aca8   ARM Code       0  avkon{000a0000}-2591.o(StubCode)
-    CAknNavigationControlContainer::CreateNavigationLabelL(const TDesC16&) 0x0000acb0   ARM Code       0  avkon{000a0000}-2624.o(StubCode)
-    CAknNavigationControlContainer::ReplaceL(CAknNavigationDecorator&, CAknNavigationDecorator&) 0x0000acb8   ARM Code       0  avkon{000a0000}-2632.o(StubCode)
-    CAknView::SetEmphasis(CCoeControl*, int) 0x0000acc0   ARM Code       0  avkon{000a0000}-2895.o(StubCode)
-    CAknView::BaseConstructL(int)            0x0000acc8   ARM Code       0  avkon{000a0000}-2898.o(StubCode)
-    CAknView::HandleCommandL(int)            0x0000acd0   ARM Code       0  avkon{000a0000}-2899.o(StubCode)
-    CAknView::ViewActivatedL(const TVwsViewId&, TUid, const TDesC8&) 0x0000acd8   ARM Code       0  avkon{000a0000}-2900.o(StubCode)
-    CAknView::MopSupplyObject(TTypeUid)      0x0000ace0   ARM Code       0  avkon{000a0000}-2901.o(StubCode)
-    CAknView::ProcessCommandL(int)           0x0000ace8   ARM Code       0  avkon{000a0000}-2902.o(StubCode)
-    CAknView::ViewDeactivated()              0x0000acf0   ARM Code       0  avkon{000a0000}-2903.o(StubCode)
-    CAknView::AknViewActivatedL(const TVwsViewId&, TUid, const TDesC8&) 0x0000acf8   ARM Code       0  avkon{000a0000}-2904.o(StubCode)
-    CAknView::Reserved_MtsmObject()          0x0000ad00   ARM Code       0  avkon{000a0000}-2905.o(StubCode)
-    CAknView::HandleViewRectChange()         0x0000ad08   ARM Code       0  avkon{000a0000}-2906.o(StubCode)
-    CAknView::Reserved_MtsmPosition()        0x0000ad10   ARM Code       0  avkon{000a0000}-2907.o(StubCode)
-    CAknView::HandleForegroundEventL(int)    0x0000ad18   ARM Code       0  avkon{000a0000}-2909.o(StubCode)
-    CAknView::ViewScreenDeviceChangedL()     0x0000ad20   ARM Code       0  avkon{000a0000}-2910.o(StubCode)
-    CAknView::HandleStatusPaneSizeChange()   0x0000ad28   ARM Code       0  avkon{000a0000}-2912.o(StubCode)
-    CAknView::MopNext()                      0x0000ad30   ARM Code       0  avkon{000a0000}-2913.o(StubCode)
-    CAknView::CAknView__sub_object()         0x0000ad38   ARM Code       0  avkon{000a0000}-2914.o(StubCode)
-    CAknView::~CAknView__sub_object()        0x0000ad40   ARM Code       0  avkon{000a0000}-2917.o(StubCode)
-    CAknAppUi::StatusPane()                  0x0000ad48   ARM Code       0  avkon{000a0000}-2919.o(StubCode)
-    CAknAppUi::HandleError(int, const SExtendedError&, TDes16&, TDes16&) 0x0000ad50   ARM Code       0  avkon{000a0000}-2920.o(StubCode)
-    CAknAppUi::PrepareToExit()               0x0000ad58   ARM Code       0  avkon{000a0000}-2922.o(StubCode)
-    CAknAppUi::HandleSystemEventL(const TWsEvent&) 0x0000ad60   ARM Code       0  avkon{000a0000}-2928.o(StubCode)
-    CAknAppUi::Reserved_MtsmObject()         0x0000ad68   ARM Code       0  avkon{000a0000}-2929.o(StubCode)
-    CAknAppUi::Reserved_MtsmPosition()       0x0000ad70   ARM Code       0  avkon{000a0000}-2930.o(StubCode)
-    CAknAppUi::HandleViewDeactivation(const TVwsViewId&, const TVwsViewId&) 0x0000ad78   ARM Code       0  avkon{000a0000}-2932.o(StubCode)
-    CAknAppUi::HandleTouchPaneSizeChange()   0x0000ad80   ARM Code       0  avkon{000a0000}-2934.o(StubCode)
-    CAknAppUi::Cba()                         0x0000ad88   ARM Code       0  avkon{000a0000}-2936.o(StubCode)
-    CAknAppServer::CreateServiceL(TUid) const 0x0000ad90   ARM Code       0  avkon{000a0000}-2993.o(StubCode)
-    CAknAppUiBase::ApplicationRect() const   0x0000ad98   ARM Code       0  avkon{000a0000}-2997.o(StubCode)
-    CAknView::ClientRect() const             0x0000ada0   ARM Code       0  avkon{000a0000}-3417.o(StubCode)
-    CAknView::Cba() const                    0x0000ada8   ARM Code       0  avkon{000a0000}-3420.o(StubCode)
-    CAknView::AppUi() const                  0x0000adb0   ARM Code       0  avkon{000a0000}-3421.o(StubCode)
-    CAknView::Redraw() const                 0x0000adb8   ARM Code       0  avkon{000a0000}-3422.o(StubCode)
-    CAknView::ViewId() const                 0x0000adc0   ARM Code       0  avkon{000a0000}-3423.o(StubCode)
-    CAknView::MenuBar() const                0x0000adc8   ARM Code       0  avkon{000a0000}-3424.o(StubCode)
-    CAknViewAppUi::BaseConstructL(int)       0x0000add0   ARM Code       0  avkon{000a0000}-367.o(StubCode)
-    CAknViewAppUi::HandleWsEventL(const TWsEvent&, CCoeControl*) 0x0000add8   ARM Code       0  avkon{000a0000}-368.o(StubCode)
-    CAknViewAppUi::ProcessCommandL(int)      0x0000ade0   ARM Code       0  avkon{000a0000}-369.o(StubCode)
-    CAknViewAppUi::ActivateLocalViewL(TUid)  0x0000ade8   ARM Code       0  avkon{000a0000}-370.o(StubCode)
-    CAknViewAppUi::StopDisplayingMenuBar()   0x0000adf0   ARM Code       0  avkon{000a0000}-372.o(StubCode)
-    CAknViewAppUi::HandleForegroundEventL(int) 0x0000adf8   ARM Code       0  avkon{000a0000}-373.o(StubCode)
-    CAknViewAppUi::HandleStatusPaneSizeChange() 0x0000ae00   ARM Code       0  avkon{000a0000}-374.o(StubCode)
-    CAknViewAppUi::AddViewL(CAknView*)       0x0000ae08   ARM Code       0  avkon{000a0000}-375.o(StubCode)
-    CAknViewAppUi::~CAknViewAppUi()          0x0000ae10   ARM Code       0  avkon{000a0000}-377.o(StubCode)
-    thunk{-100} to CAknAppUi::HandleTouchPaneSizeChange() 0x0000ae18   ARM Code       0  avkon{000a0000}-3826.o(StubCode)
-    thunk{-12} to CAknView::SetEmphasis(CCoeControl*, int) 0x0000ae20   ARM Code       0  avkon{000a0000}-3831.o(StubCode)
-    thunk{-12} to CAknView::ProcessCommandL(int) 0x0000ae28   ARM Code       0  avkon{000a0000}-3832.o(StubCode)
-    thunk{-24} to CAknViewAppUi::ProcessCommandL(int) 0x0000ae30   ARM Code       0  avkon{000a0000}-3857.o(StubCode)
-    thunk{-24} to CAknView::MopSupplyObject(TTypeUid) 0x0000ae38   ARM Code       0  avkon{000a0000}-3860.o(StubCode)
-    thunk{-24} to CAknView::MopNext()        0x0000ae40   ARM Code       0  avkon{000a0000}-3861.o(StubCode)
-    thunk{-40} to CAknAppUiBase::MopSupplyObject(TTypeUid) 0x0000ae48   ARM Code       0  avkon{000a0000}-3868.o(StubCode)
-    thunk{-4} to CAknView::ViewActivatedL(const TVwsViewId&, TUid, const TDesC8&) 0x0000ae50   ARM Code       0  avkon{000a0000}-3947.o(StubCode)
-    thunk{-4} to CAknView::ViewDeactivated() 0x0000ae58   ARM Code       0  avkon{000a0000}-3948.o(StubCode)
-    thunk{-4} to CAknView::ViewScreenDeviceChangedL() 0x0000ae60   ARM Code       0  avkon{000a0000}-3949.o(StubCode)
-    thunk{-4} to CAknView::ViewId() const    0x0000ae68   ARM Code       0  avkon{000a0000}-3983.o(StubCode)
-    thunk{-88} to CAknViewAppUi::HandleStatusPaneSizeChange() 0x0000ae70   ARM Code       0  avkon{000a0000}-4014.o(StubCode)
-    thunk{-92} to CAknAppUi::HandleViewDeactivation(const TVwsViewId&, const TVwsViewId&) 0x0000ae78   ARM Code       0  avkon{000a0000}-4030.o(StubCode)
-    AknIconUtils::CreateIconLC(CFbsBitmap*&, CFbsBitmap*&, const TDesC16&, int, int) 0x0000ae80   ARM Code       0  AknIcon{000a0000}-13.o(StubCode)
-    CGulIcon::SetBitmapsOwnedExternally(int) 0x0000ae88   ARM Code       0  egul{000a0000}-94.o(StubCode)
-    CGulIcon::NewL(CFbsBitmap*, CFbsBitmap*) 0x0000ae90   ARM Code       0  egul{000a0000}-95.o(StubCode)
-    CFont::AscentInPixels() const            0x0000ae98   ARM Code       0  gdi{000a0000}-310.o(StubCode)
-    CFont::HeightInPixels() const            0x0000aea0   ARM Code       0  gdi{000a0000}-311.o(StubCode)
-    CFont::FontSpecInTwips() const           0x0000aea8   ARM Code       0  gdi{000a0000}-312.o(StubCode)
-    CFbsBitmap::Create(const TSize&, TDisplayMode) 0x0000aeb0   ARM Code       0  fbscli{000a0000}-26.o(StubCode)
-    CFbsBitmap::CFbsBitmap()                 0x0000aeb8   ARM Code       0  fbscli{000a0000}-31.o(StubCode)
-    CPosLandmark::NewL(const CPosLandmark&)  0x0000aec0   ARM Code       0  eposlandmarks{000a0000}-12.o(StubCode)
-    CPosLandmark::NewLC()                    0x0000aec8   ARM Code       0  eposlandmarks{000a0000}-15.o(StubCode)
-    CPosLandmark::SetPositionL(const TLocality&) 0x0000aed0   ARM Code       0  eposlandmarks{000a0000}-4.o(StubCode)
-    CPosLandmarkDatabase::OpenL(const TDesC16&) 0x0000aed8   ARM Code       0  eposlandmarks{000a0000}-50.o(StubCode)
-    CPosLandmark::GetPosition(TLocality&) const 0x0000aee0   ARM Code       0  eposlandmarks{000a0000}-65.o(StubCode)
-    CPosLandmark::GetLandmarkName(TPtrC16&) const 0x0000aee8   ARM Code       0  eposlandmarks{000a0000}-67.o(StubCode)
-    CPosLandmark::GetIcon(TPtrC16&, int&, int&) const 0x0000aef0   ARM Code       0  eposlandmarks{000a0000}-75.o(StubCode)
-    TPositionUpdateOptions::TPositionUpdateOptions() 0x0000aef8   ARM Code       0  lbs{000a0000}-152.o(StubCode)
-    TPositionUpdateOptionsBase::SetUpdateTimeOut(TTimeIntervalMicroSeconds) 0x0000af00   ARM Code       0  lbs{000a0000}-180.o(StubCode)
-    TPositionUpdateOptionsBase::SetUpdateInterval(TTimeIntervalMicroSeconds) 0x0000af08   ARM Code       0  lbs{000a0000}-181.o(StubCode)
-    TLocality::TLocality(const TCoordinate&, float) 0x0000af10   ARM Code       0  lbs{000a0000}-205.o(StubCode)
-    TLocality::TLocality()                   0x0000af18   ARM Code       0  lbs{000a0000}-207.o(StubCode)
-    TCoordinate::TCoordinate(const double&, const double&) 0x0000af20   ARM Code       0  lbs{000a0000}-21.o(StubCode)
-    TPosition::TPosition()                   0x0000af28   ARM Code       0  lbs{000a0000}-214.o(StubCode)
-    TCoordinate::Latitude() const            0x0000af30   ARM Code       0  lbs{000a0000}-223.o(StubCode)
-    TCoordinate::Longitude() const           0x0000af38   ARM Code       0  lbs{000a0000}-225.o(StubCode)
-    TPositionInfo::GetPosition(TPosition&) const 0x0000af40   ARM Code       0  lbs{000a0000}-226.o(StubCode)
-    TCoordinate::TCoordinate()               0x0000af48   ARM Code       0  lbs{000a0000}-23.o(StubCode)
-    TPositionInfo::TPositionInfo()           0x0000af50   ARM Code       0  lbs{000a0000}-28.o(StubCode)
-    TLocality::Distance(const TCoordinate&, float&) const 0x0000af58   ARM Code       0  lbs{000a0000}-304.o(StubCode)
-    TLocality::BearingTo(const TCoordinate&, float&) const 0x0000af60   ARM Code       0  lbs{000a0000}-306.o(StubCode)
-    CMnServiceBase::ServiceError(const RMessage2&, int) 0x0000af68   ARM Code       0  mnservicelib{000a0000}-1.o(StubCode)
-    CMnMapViewServiceBase::LinkedLandmarksToShow(int) 0x0000af70   ARM Code       0  mnservicelib{000a0000}-10.o(StubCode)
-    CMnMapViewServiceBase::CompleteSelectionRequest(int) 0x0000af78   ARM Code       0  mnservicelib{000a0000}-11.o(StubCode)
-    CMnMapViewServiceBase::CompleteSelectionRequest(unsigned long, int) 0x0000af80   ARM Code       0  mnservicelib{000a0000}-12.o(StubCode)
-    CMnMapViewServiceBase::LandmarksToShowDatabases() 0x0000af88   ARM Code       0  mnservicelib{000a0000}-13.o(StubCode)
-    CMnMapViewServiceBase::CompleteSelectionRequestL(const CPosLandmark&) 0x0000af90   ARM Code       0  mnservicelib{000a0000}-14.o(StubCode)
-    CMnMapViewServiceBase::Options()         0x0000af98   ARM Code       0  mnservicelib{000a0000}-15.o(StubCode)
-    CMnMapViewServiceBase::ServiceL(const RMessage2&) 0x0000afa0   ARM Code       0  mnservicelib{000a0000}-16.o(StubCode)
-    CMnMapViewServiceBase::CMnMapViewServiceBase__sub_object() 0x0000afa8   ARM Code       0  mnservicelib{000a0000}-17.o(StubCode)
-    CMnServiceBase::CompleteRequest(int)     0x0000afb0   ARM Code       0  mnservicelib{000a0000}-2.o(StubCode)
-    CMnMapViewServiceBase::~CMnMapViewServiceBase__sub_object() 0x0000afb8   ARM Code       0  mnservicelib{000a0000}-20.o(StubCode)
-    CMnNavigationServiceBase::BaseConstructL() 0x0000afc0   ARM Code       0  mnservicelib{000a0000}-28.o(StubCode)
-    CMnNavigationServiceBase::ServiceL(const RMessage2&) 0x0000afc8   ARM Code       0  mnservicelib{000a0000}-29.o(StubCode)
-    CMnNavigationServiceBase::CMnNavigationServiceBase__sub_object() 0x0000afd0   ARM Code       0  mnservicelib{000a0000}-30.o(StubCode)
-    CMnNavigationServiceBase::~CMnNavigationServiceBase__sub_object() 0x0000afd8   ARM Code       0  mnservicelib{000a0000}-33.o(StubCode)
-    CMnMapViewServiceBase::BaseConstructL()  0x0000afe0   ARM Code       0  mnservicelib{000a0000}-4.o(StubCode)
-    CMnMapViewServiceBase::LandmarksToShow() 0x0000afe8   ARM Code       0  mnservicelib{000a0000}-5.o(StubCode)
-    CMnMapViewServiceBase::SelectionRequestText() 0x0000aff0   ARM Code       0  mnservicelib{000a0000}-7.o(StubCode)
-    CMnrpEngine::NewL()                      0x0000aff8   ARM Code       0  mnrefproviderengine{000a0000}-12.o(StubCode)
-    CMnrpMapModel::UpdateModelL(CMnrpMapViewService&) 0x0000b000   ARM Code       0  mnrefproviderengine{000a0000}-17.o(StubCode)
-    CMnrpMapModel::SetScreenSize(TSize)      0x0000b008   ARM Code       0  mnrefproviderengine{000a0000}-19.o(StubCode)
-    CMnrpMapModel::NumIgnoredLandmarks()     0x0000b010   ARM Code       0  mnrefproviderengine{000a0000}-20.o(StubCode)
-    CMnrpMapModel::NewL(MMapModelObserver&, CMnrpEngine&) 0x0000b018   ARM Code       0  mnrefproviderengine{000a0000}-22.o(StubCode)
-    CMnrpMapModel::Zoom(double)              0x0000b020   ARM Code       0  mnrefproviderengine{000a0000}-23.o(StubCode)
-    CMnrpMapModel::MoveTo(TCoordinate)       0x0000b028   ARM Code       0  mnrefproviderengine{000a0000}-24.o(StubCode)
-    CMnrpMapModel::GoCenter()                0x0000b030   ARM Code       0  mnrefproviderengine{000a0000}-25.o(StubCode)
-    CMnrpPositionRequest::GetPosition(TPositionInfo&) 0x0000b038   ARM Code       0  mnrefproviderengine{000a0000}-26.o(StubCode)
-    CMnrpPositionRequest::SetOptionsL(const TPositionUpdateOptionsBase&) 0x0000b040   ARM Code       0  mnrefproviderengine{000a0000}-27.o(StubCode)
-    CMnrpPositionRequest::MagneticCourse()   0x0000b048   ARM Code       0  mnrefproviderengine{000a0000}-28.o(StubCode)
-    CMnrpPositionRequest::MagneticHeading()  0x0000b050   ARM Code       0  mnrefproviderengine{000a0000}-29.o(StubCode)
-    CMnrpPositionRequest::FetchNewPosition(int) 0x0000b058   ARM Code       0  mnrefproviderengine{000a0000}-30.o(StubCode)
-    CMnrpPositionRequest::NewL(const TDesC16&, MMnrpPositionObserver&) 0x0000b060   ARM Code       0  mnrefproviderengine{000a0000}-31.o(StubCode)
-    CMnrpPositionRequest::Speed()            0x0000b068   ARM Code       0  mnrefproviderengine{000a0000}-32.o(StubCode)
-    CMnrpPositionRequest::Course()           0x0000b070   ARM Code       0  mnrefproviderengine{000a0000}-33.o(StubCode)
-    CMnrpPositionRequest::Heading()          0x0000b078   ARM Code       0  mnrefproviderengine{000a0000}-34.o(StubCode)
-    MnrpUtils::AngleToString(double, TDes16&) 0x0000b080   ARM Code       0  mnrefproviderengine{000a0000}-38.o(StubCode)
-    MnrpUtils::SpeedToString(double, TDes16&) 0x0000b088   ARM Code       0  mnrefproviderengine{000a0000}-39.o(StubCode)
-    MnrpUtils::DistanceToString(double, TDes16&) 0x0000b090   ARM Code       0  mnrefproviderengine{000a0000}-40.o(StubCode)
-    MnrpUtils::PrintableStringLC(const TDesC16&) 0x0000b098   ARM Code       0  mnrefproviderengine{000a0000}-41.o(StubCode)
-    MnrpUtils::CoordinateToString(double, TDes16&, int, int) 0x0000b0a0   ARM Code       0  mnrefproviderengine{000a0000}-42.o(StubCode)
-    CMnrpMapModel::AbsoluteToScreen(TCoordinate) const 0x0000b0a8   ARM Code       0  mnrefproviderengine{000a0000}-43.o(StubCode)
-    CMnrpMapModel::ScreenToAbsolute(TPoint) const 0x0000b0b0   ARM Code       0  mnrefproviderengine{000a0000}-44.o(StubCode)
-    CMnrpMapModel::ScreenToAbsolute(int) const 0x0000b0b8   ARM Code       0  mnrefproviderengine{000a0000}-45.o(StubCode)
-    CMnrpMapModel::Top() const               0x0000b0c0   ARM Code       0  mnrefproviderengine{000a0000}-46.o(StubCode)
-    CMnrpMapModel::Left() const              0x0000b0c8   ARM Code       0  mnrefproviderengine{000a0000}-47.o(StubCode)
-    CMnrpMapModel::Right() const             0x0000b0d0   ARM Code       0  mnrefproviderengine{000a0000}-48.o(StubCode)
-    CMnrpMapModel::Bottom() const            0x0000b0d8   ARM Code       0  mnrefproviderengine{000a0000}-50.o(StubCode)
-    CMnrpMapModel::Center() const            0x0000b0e0   ARM Code       0  mnrefproviderengine{000a0000}-51.o(StubCode)
-    CMnrpMapModel::GetGrid(CMnrpMapModel::TGrid&) const 0x0000b0e8   ARM Code       0  mnrefproviderengine{000a0000}-53.o(StubCode)
-    CMnrpMapModel::RenderL(CFbsBitmap&, TRect, CFont*, CFont*) const 0x0000b0f0   ARM Code       0  mnrefproviderengine{000a0000}-54.o(StubCode)
-    __aeabi_dadd                             0x0000b0f8   ARM Code       0  dfpaeabi{000a0000}-12.o(StubCode)
-    __aeabi_dmul                             0x0000b100   ARM Code       0  dfpaeabi{000a0000}-20.o(StubCode)
-    __aeabi_dsub                             0x0000b108   ARM Code       0  dfpaeabi{000a0000}-23.o(StubCode)
-    __aeabi_f2d                              0x0000b110   ARM Code       0  dfpaeabi{000a0000}-24.o(StubCode)
-    __aeabi_i2d                              0x0000b118   ARM Code       0  dfpaeabi{000a0000}-41.o(StubCode)
-    __aeabi_d2iz                             0x0000b120   ARM Code       0  dfpaeabi{000a0000}-8.o(StubCode)
-    __aeabi_memcpy4                          0x0000b128   ARM Code       0  drtaeabi{000a0000}-147.o(StubCode)
-    __aeabi_unwind_cpp_pr0                   0x0000b130   ARM Code       0  drtaeabi{000a0000}-158.o(StubCode)
-    __aeabi_unwind_cpp_pr1                   0x0000b138   ARM Code       0  drtaeabi{000a0000}-159.o(StubCode)
-    __cxa_begin_catch                        0x0000b140   ARM Code       0  drtaeabi{000a0000}-180.o(StubCode)
-    __cxa_call_unexpected                    0x0000b148   ARM Code       0  drtaeabi{000a0000}-182.o(StubCode)
-    __cxa_end_catch                          0x0000b150   ARM Code       0  drtaeabi{000a0000}-183.o(StubCode)
-    __cxa_end_cleanup                        0x0000b158   ARM Code       0  drtaeabi{000a0000}-184.o(StubCode)
-    __cxa_pure_virtual                       0x0000b160   ARM Code       0  drtaeabi{000a0000}-189.o(StubCode)
-    operator delete (void*)                  0x0000b168   ARM Code       0  scppnwdl{000a0000}-3.o(StubCode)
-    UserHeap::SetupThreadHeap(int, SStdEpocThreadCreateInfo&) 0x0000b170   ARM Code       0  euser{000a0000}-1360.o(StubCode)
-    User::Exit(int)                          0x0000b178   ARM Code       0  euser{000a0000}-641.o(StubCode)
-    User::InitProcess()                      0x0000b180   ARM Code       0  euser{000a0000}-585.o(StubCode)
-    User::Panic(const TDesC16&, int)         0x0000b188   ARM Code       0  euser{000a0000}-650.o(StubCode)
-    TCppRTExceptionsGlobals::TCppRTExceptionsGlobals() 0x0000b190   ARM Code       0  drtaeabi{000a0000}-204.o(StubCode)
-    CAknDocument::~CAknDocument()            0x0000b199   Thumb Code     0  mnrefprovider.in(i._ZN12CAknDocumentD2Ev)
-    CAknDocument::~CAknDocument__sub_object() 0x0000b199   Thumb Code     8  mnrefprovider.in(i._ZN12CAknDocumentD2Ev)
-    CApaDocument::DetachFromStoreL(CPicture::TDetach) 0x0000b1a1   Thumb Code     2  mnrefprovider.in(i._ZN12CApaDocument16DetachFromStoreLEN8CPicture7TDetachE)
-    CArrayPtrSeg<CGulIcon>::~CArrayPtrSeg__deallocating() 0x0000b1a3   Thumb Code    16  mnrefprovider.in(i._ZN12CArrayPtrSegI8CGulIconED0Ev)
-    CArrayPtrSeg<CGulIcon>::~CArrayPtrSeg()  0x0000b1b3   Thumb Code     8  mnrefprovider.in(i._ZN12CArrayPtrSegI8CGulIconED1Ev)
-    CArrayPtrSeg<CGulIcon>::~CArrayPtrSeg__sub_object() 0x0000b1b3   Thumb Code     0  mnrefprovider.in(i._ZN12CArrayPtrSegI8CGulIconED1Ev)
-    CAknViewAppUi::CAknViewAppUi()           0x0000b1bd   Thumb Code    50  mnrefprovider.in(i._ZN13CAknViewAppUiC1Ev)
-    CAknViewAppUi::CAknViewAppUi__sub_object() 0x0000b1bd   Thumb Code     0  mnrefprovider.in(i._ZN13CAknViewAppUiC1Ev)
-    CMnrpApplication::~CMnrpApplication__deallocating() 0x0000b203   Thumb Code    16  mnrefprovider.in(i._ZN16CMnrpApplicationD0Ev)
-    CMnrpApplication::~CMnrpApplication()    0x0000b213   Thumb Code     8  mnrefprovider.in(i._ZN16CMnrpApplicationD1Ev)
-    CMnrpApplication::~CMnrpApplication__sub_object() 0x0000b213   Thumb Code     0  mnrefprovider.in(i._ZN16CMnrpApplicationD1Ev)
-    CBase::operator new(unsigned)            0x0000b21b   Thumb Code     8  mnrefprovider.in(i._ZN5CBasenwEj)
-    TRect::TRect(const TRect&)               0x0000b223   Thumb Code    18  mnrefprovider.in(i._ZN5TRectC1ERKS_)
-    TRect::TRect__sub_object(const TRect&)   0x0000b223   Thumb Code     0  mnrefprovider.in(i._ZN5TRectC1ERKS_)
-    CArrayFix<CGulIcon*>::~CArrayFix()       0x0000b235   Thumb Code     8  mnrefprovider.in(i._ZN9CArrayFixIP8CGulIconED1Ev)
-    CArrayFix<CGulIcon*>::~CArrayFix__sub_object() 0x0000b235   Thumb Code     0  mnrefprovider.in(i._ZN9CArrayFixIP8CGulIconED1Ev)
-    CArrayPtr<CGulIcon>::~CArrayPtr()        0x0000b23d   Thumb Code     8  mnrefprovider.in(i._ZN9CArrayPtrI8CGulIconED1Ev)
-    CArrayPtr<CGulIcon>::~CArrayPtr__sub_object() 0x0000b23d   Thumb Code     0  mnrefprovider.in(i._ZN9CArrayPtrI8CGulIconED1Ev)
-    CleanupClose<RArray<int>>::Close(void*)  0x0000b245   Thumb Code     8  mnrefprovider.in(t._ZN12CleanupCloseI6RArrayIiEE5CloseEPv)
-    CleanupClose<RArray<unsigned long>>::Close(void*) 0x0000b24d   Thumb Code     8  mnrefprovider.in(t._ZN12CleanupCloseI6RArrayImEE5CloseEPv)
-    RPointerArray<CMnrpNaviModel::CListItem>::ResetAndDestroy() 0x0000b255   Thumb Code    48  mnrefprovider.in(t._ZN13RPointerArrayIN14CMnrpNaviModel9CListItemEE15ResetAndDestroyEv)
-    RPointerArray<CMnrpNaviModel::CListItem>::AppendL(const CMnrpNaviModel::CListItem*) 0x0000b285   Thumb Code    12  mnrefprovider.in(t._ZN13RPointerArrayIN14CMnrpNaviModel9CListItemEE7AppendLEPKS1_)
-    TBuf<(int)15>::TBuf()                    0x0000b291   Thumb Code    10  mnrefprovider.in(t._ZN4TBufILi15EEC1Ev)
-    TBuf<(int)15>::TBuf__sub_object()        0x0000b291   Thumb Code     0  mnrefprovider.in(t._ZN4TBufILi15EEC1Ev)
-    typeinfo for CMnrpAppUi                  0x0000b758   Data          12  mnrefprovider.in(.constdata__ZTI10CMnrpAppUi)
-    typeinfo for CArrayPtrSeg<CGulIcon>      0x0000b764   Data          12  mnrefprovider.in(.constdata__ZTI12CArrayPtrSegI8CGulIconE)
-    typeinfo for CMnrpAppView                0x0000b770   Data          12  mnrefprovider.in(.constdata__ZTI12CMnrpAppView)
-    typeinfo for CMnrpMapView                0x0000b77c   Data          12  mnrefprovider.in(.constdata__ZTI12CMnrpMapView)
-    typeinfo for CMnrpDocument               0x0000b788   Data          12  mnrefprovider.in(.constdata__ZTI13CMnrpDocument)
-    typeinfo for CMnrpNaviView               0x0000b794   Data          12  mnrefprovider.in(.constdata__ZTI13CMnrpNaviView)
-    typeinfo for CMnrpAppServer              0x0000b7a0   Data          12  mnrefprovider.in(.constdata__ZTI14CMnrpAppServer)
-    typeinfo for CMnrpNaviModel              0x0000b7ac   Data          32  mnrefprovider.in(.constdata__ZTI14CMnrpNaviModel)
-    typeinfo for CMnrpAppControl             0x0000b7cc   Data          12  mnrefprovider.in(.constdata__ZTI15CMnrpAppControl)
-    typeinfo for CMnrpMapControl             0x0000b7d8   Data          32  mnrefprovider.in(.constdata__ZTI15CMnrpMapControl)
-    typeinfo for CMnrpApplication            0x0000b7f8   Data          12  mnrefprovider.in(.constdata__ZTI16CMnrpApplication)
-    typeinfo for CMnrpNaviControl            0x0000b804   Data          32  mnrefprovider.in(.constdata__ZTI16CMnrpNaviControl)
-    typeinfo for MMapModelObserver           0x0000b824   Data           8  mnrefprovider.in(.constdata__ZTI17MMapModelObserver)
-    typeinfo for MNaviModelObserver          0x0000b82c   Data           8  mnrefprovider.in(.constdata__ZTI18MNaviModelObserver)
-    typeinfo for CMnrpMapViewService         0x0000b834   Data          32  mnrefprovider.in(.constdata__ZTI19CMnrpMapViewService)
-    typeinfo for MMapSelectionCallback       0x0000b854   Data           8  mnrefprovider.in(.constdata__ZTI21MMapSelectionCallback)
-    typeinfo for MMnrpPositionObserver       0x0000b85c   Data           8  mnrefprovider.in(.constdata__ZTI21MMnrpPositionObserver)
-    typeinfo for CMnrpNavigationService      0x0000b864   Data          12  mnrefprovider.in(.constdata__ZTI22CMnrpNavigationService)
-    typeinfo for MEikStatusPaneObserver      0x0000b870   Data           8  mnrefprovider.in(.constdata__ZTI22MEikStatusPaneObserver)
-    typeinfo for CArrayFix<CGulIcon*>        0x0000b878   Data          12  mnrefprovider.in(.constdata__ZTI9CArrayFixIP8CGulIconE)
-    typeinfo for CArrayPtr<CGulIcon>         0x0000b884   Data          12  mnrefprovider.in(.constdata__ZTI9CArrayPtrI8CGulIconE)
-    typeinfo for CMnrpNaviModel::CListItem   0x0000b890   Data          12  mnrefprovider.in(.constdata__ZTIN14CMnrpNaviModel9CListItemE)
-    typeinfo name for CMnrpAppUi             0x0000b89c   Data          13  mnrefprovider.in(.constdata__ZTS10CMnrpAppUi)
-    typeinfo name for CArrayPtrSeg<CGulIcon> 0x0000b8a9   Data          26  mnrefprovider.in(.constdata__ZTS12CArrayPtrSegI8CGulIconE)
-    typeinfo name for CMnrpAppView           0x0000b8c3   Data          15  mnrefprovider.in(.constdata__ZTS12CMnrpAppView)
-    typeinfo name for CMnrpMapView           0x0000b8d2   Data          15  mnrefprovider.in(.constdata__ZTS12CMnrpMapView)
-    typeinfo name for CMnrpDocument          0x0000b8e1   Data          16  mnrefprovider.in(.constdata__ZTS13CMnrpDocument)
-    typeinfo name for CMnrpNaviView          0x0000b8f1   Data          16  mnrefprovider.in(.constdata__ZTS13CMnrpNaviView)
-    typeinfo name for CMnrpAppServer         0x0000b901   Data          17  mnrefprovider.in(.constdata__ZTS14CMnrpAppServer)
-    typeinfo name for CMnrpNaviModel         0x0000b912   Data          17  mnrefprovider.in(.constdata__ZTS14CMnrpNaviModel)
-    typeinfo name for CMnrpAppControl        0x0000b923   Data          18  mnrefprovider.in(.constdata__ZTS15CMnrpAppControl)
-    typeinfo name for CMnrpMapControl        0x0000b935   Data          18  mnrefprovider.in(.constdata__ZTS15CMnrpMapControl)
-    typeinfo name for CMnrpApplication       0x0000b947   Data          19  mnrefprovider.in(.constdata__ZTS16CMnrpApplication)
-    typeinfo name for CMnrpNaviControl       0x0000b95a   Data          19  mnrefprovider.in(.constdata__ZTS16CMnrpNaviControl)
-    typeinfo name for MMapModelObserver      0x0000b96d   Data          20  mnrefprovider.in(.constdata__ZTS17MMapModelObserver)
-    typeinfo name for MNaviModelObserver     0x0000b981   Data          21  mnrefprovider.in(.constdata__ZTS18MNaviModelObserver)
-    typeinfo name for CMnrpMapViewService    0x0000b996   Data          22  mnrefprovider.in(.constdata__ZTS19CMnrpMapViewService)
-    typeinfo name for MMapSelectionCallback  0x0000b9ac   Data          24  mnrefprovider.in(.constdata__ZTS21MMapSelectionCallback)
-    typeinfo name for MMnrpPositionObserver  0x0000b9c4   Data          24  mnrefprovider.in(.constdata__ZTS21MMnrpPositionObserver)
-    typeinfo name for CMnrpNavigationService 0x0000b9dc   Data          25  mnrefprovider.in(.constdata__ZTS22CMnrpNavigationService)
-    typeinfo name for MEikStatusPaneObserver 0x0000b9f5   Data          25  mnrefprovider.in(.constdata__ZTS22MEikStatusPaneObserver)
-    typeinfo name for CArrayFix<CGulIcon*>   0x0000ba0e   Data          23  mnrefprovider.in(.constdata__ZTS9CArrayFixIP8CGulIconE)
-    typeinfo name for CArrayPtr<CGulIcon>    0x0000ba25   Data          22  mnrefprovider.in(.constdata__ZTS9CArrayPtrI8CGulIconE)
-    typeinfo name for CMnrpNaviModel::CListItem 0x0000ba3b   Data          29  mnrefprovider.in(.constdata__ZTSN14CMnrpNaviModel9CListItemE)
-    vtable for CMnrpAppUi                    0x0000ba58   Data         340  mnrefprovider.in(.constdata__ZTV10CMnrpAppUi)
-    vtable for CArrayPtrSeg<CGulIcon>        0x0000bbac   Data          20  mnrefprovider.in(.constdata__ZTV12CArrayPtrSegI8CGulIconE)
-    vtable for CMnrpAppView                  0x0000bbc0   Data         232  mnrefprovider.in(.constdata__ZTV12CMnrpAppView)
-    vtable for CMnrpMapView                  0x0000bca8   Data         236  mnrefprovider.in(.constdata__ZTV12CMnrpMapView)
-    vtable for CMnrpDocument                 0x0000bd94   Data         112  mnrefprovider.in(.constdata__ZTV13CMnrpDocument)
-    vtable for CMnrpNaviView                 0x0000be04   Data         232  mnrefprovider.in(.constdata__ZTV13CMnrpNaviView)
-    vtable for CMnrpAppServer                0x0000beec   Data          76  mnrefprovider.in(.constdata__ZTV14CMnrpAppServer)
-    vtable for CMnrpNaviModel                0x0000bf38   Data          36  mnrefprovider.in(.constdata__ZTV14CMnrpNaviModel)
-    vtable for CMnrpAppControl               0x0000bf5c   Data         208  mnrefprovider.in(.constdata__ZTV15CMnrpAppControl)
-    vtable for CMnrpMapControl               0x0000c02c   Data         224  mnrefprovider.in(.constdata__ZTV15CMnrpMapControl)
-    vtable for CMnrpApplication              0x0000c10c   Data          80  mnrefprovider.in(.constdata__ZTV16CMnrpApplication)
-    vtable for CMnrpNaviControl              0x0000c15c   Data         224  mnrefprovider.in(.constdata__ZTV16CMnrpNaviControl)
-    vtable for CMnrpMapViewService           0x0000c23c   Data         112  mnrefprovider.in(.constdata__ZTV19CMnrpMapViewService)
-    vtable for CMnrpNavigationService        0x0000c2ac   Data          64  mnrefprovider.in(.constdata__ZTV22CMnrpNavigationService)
-    vtable for MEikStatusPaneObserver        0x0000c2ec   Data          12  mnrefprovider.in(.constdata__ZTV22MEikStatusPaneObserver)
-    vtable for CMnrpNaviModel::CListItem     0x0000c2f8   Data          20  mnrefprovider.in(.constdata__ZTVN14CMnrpNaviModel9CListItemE)
-    SHT$$INIT_ARRAY$$Base                    0x0000c30c   Number         0  mnrefprovider.in(.init_array)
-    .ARM.exidx$$Base                         0x0000c310   Number         0  uc_exe_.o(.ARM.exidx)
-    SHT$$INIT_ARRAY$$Limit                   0x0000c310   Data           0  mnrefprovider.in(.init_array)
-    .ARM.exidx$$Limit                        0x0000c6a0   Number         0  mnrefprovider.in(.ARM.exidx)
-    Image$$ER_RO$$Limit                      0x0000c6a0   Number         0  anon$$obj.o(linker$$defined$$symbols)
-
Binary file locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/data/armv5/urel/mnrefproviderback.exe has changed
--- a/locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/data/armv5/urel/mnrefproviderback.exe.map	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1319 +0,0 @@
-ARM Linker, RVCT2.2 [Build 593]
-
-================================================================================
-
-Image Symbol Table
-
-    Local Symbols
-
-    Symbol Name                              Value     Ov Type        Size  Object(Section)
-
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-293.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eposlandmarks{000a0000}-13.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-1995.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-294.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eposlandmarks{000a0000}-65.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-1997.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-295.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eposlandmarks{000a0000}-68.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-1999.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-296.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  lbs{000a0000}-207.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-203.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-297.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  lbs{000a0000}-23.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-205.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-298.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnservicelib{000a0000}-1.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-2060.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-299.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnservicelib{000a0000}-2.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-2061.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-30.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnservicelib{000a0000}-21.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  drtaeabi{000a0000}-204.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-302.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnservicelib{000a0000}-22.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-208.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-31.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnservicelib{000a0000}-23.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-2082.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-317.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnservicelib{000a0000}-24.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-2120.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-352.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnservicelib{000a0000}-27.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-2123.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-37.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnservicelib{000a0000}-34.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-2125.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-390.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnservicelib{000a0000}-45.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-213.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-392.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnservicelib{000a0000}-46.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-214.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-394.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnservicelib{000a0000}-47.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-215.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-467.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnservicelib{000a0000}-49.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-216.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-479.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnservicelib{000a0000}-50.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-217.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-490.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnservicelib{000a0000}-53.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-220.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-506.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnservicelib{000a0000}-56.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-2920.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-523.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnrefproviderengine{000a0000}-10.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-2922.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-532.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnrefproviderengine{000a0000}-12.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-2924.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-533.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnrefproviderengine{000a0000}-18.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-2925.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-534.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnrefproviderengine{000a0000}-19.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-2926.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-535.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnrefproviderengine{000a0000}-21.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-2928.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-536.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnrefproviderengine{000a0000}-4.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-2929.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-537.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnrefproviderengine{000a0000}-5.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-2930.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-565.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnrefproviderengine{000a0000}-54.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-2931.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-61.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnrefproviderengine{000a0000}-6.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-2932.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-62.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  drtaeabi{000a0000}-144.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-2934.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-63.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  drtaeabi{000a0000}-158.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-2935.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-1088.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  drtaeabi{000a0000}-159.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-2938.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-1116.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  drtaeabi{000a0000}-180.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-2993.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-1119.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  drtaeabi{000a0000}-182.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-2997.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-1171.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  drtaeabi{000a0000}-183.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-3826.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-1288.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  drtaeabi{000a0000}-184.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-3862.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-1379.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  drtaeabi{000a0000}-189.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-3868.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-1381.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  scppnwdl{000a0000}-3.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-4021.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-1590.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-1360.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-4030.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-1593.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-641.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eposlandmarks{000a0000}-12.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-1817.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  ws32{000a0000}-211.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  apparc{000a0000}-280.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-677.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  gdi{000a0000}-312.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  apparc{000a0000}-284.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  apparc{000a0000}-121.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-1132.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-585.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  apparc{000a0000}-132.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-129.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-650.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  apparc{000a0000}-171.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-130.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  apparc{000a0000}-287.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  apparc{000a0000}-192.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-131.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  apparc{000a0000}-30.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  apparc{000a0000}-194.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-1350.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-141.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  apparc{000a0000}-202.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-1351.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-142.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-207.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-1366.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-143.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  apparc{000a0000}-232.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-198.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-144.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  apparc{000a0000}-273.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-199.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-147.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  apparc{000a0000}-274.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-201.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-152.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  apparc{000a0000}-275.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-206.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-155.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  apparc{000a0000}-279.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-2131.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-158.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-100.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-471.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-159.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-101.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-474.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-166.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  apparc{000a0000}-285.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-481.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-169.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  apparc{000a0000}-286.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-613.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-171.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-182.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-649.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-175.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-210.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-652.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-18.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-212.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-654.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-20.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-220.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-669.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-25.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-351.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-679.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-26.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-355.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-681.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-27.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-638.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-838.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-28.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-639.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  bafl{000a0000}-43.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-29.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-664.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  bafl{000a0000}-98.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-291.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-676.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-64.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-77.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-75.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-67.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-78.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-128.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-127.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-79.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-74.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-211.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  apparc{000a0000}-222.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-72.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-73.o ABSOLUTE
-    M:/epoc32/build/apputils/c_da81efa927799d7f/bafl_dll/armv5/udeb\VtblExports.s 0x00000000   Number         0  VtblExports.o ABSOLUTE
-    M:/epoc32/build/compsupp/c_18558cc638e6e874/drtaeabi_dll/armv5/udeb\VtblExports.s 0x00000000   Number         0  VtblExports.o ABSOLUTE
-    M:/epoc32/build/cone/c_17e36feeaf3b2ee8/cone_dll/armv5/udeb\VtblExports.s 0x00000000   Number         0  VtblExports.o ABSOLUTE
-    M:/epoc32/build/gdi/c_5dab287815cadb7b/gdi_dll/armv5/udeb\VtblExports.s 0x00000000   Number         0  VtblExports.o ABSOLUTE
-    M:/epoc32/build/store/c_93a13d203e6d3ba7/estor_dll/armv5/udeb\VtblExports.s 0x00000000   Number         0  VtblExports.o ABSOLUTE
-    M:/epoc32/build/uikon/c_9cf7bef4a7562444/eikcore_dll/armv5/udeb\VtblExports.s 0x00000000   Number         0  VtblExports.o ABSOLUTE
-    M:\\sf\\os\\kernelhwsrv\\kernel\\eka\\compsupp\\rvct2_2\\ucppinit_aeabi.cpp 0x00000000   Number         0  ucppinit_aeabi.o ABSOLUTE
-    M:\sf\os\kernelhwsrv\kernel\eka\compsupp\rvct2_2\dllexp.cpp 0x00000000   Number         0  dllexp.o ABSOLUTE
-    M:\sf\os\kernelhwsrv\kernel\eka\compsupp\rvct2_2\ucppinit_aeabi.cpp 0x00000000   Number         0  ucppinit_aeabi.o ABSOLUTE
-    M:\sf\os\kernelhwsrv\kernel\eka\compsupp\symaehabi\callfirstprocessfn.cpp 0x00000000   Number         0  callfirstprocessfn.o ABSOLUTE
-    \EPOC32\BUILD\sf\app\location\group\MNREFENGINE\ARMV5\VtblExports.s 0x00000000   Number         0  VtblExports.o ABSOLUTE
-    \EPOC32\BUILD\sf\mw\appsupport\appfw\apparchitecture\group\APPARC\ARMV5\VtblExports.s 0x00000000   Number         0  VtblExports.o ABSOLUTE
-    \EPOC32\BUILD\sf\mw\classicui\group\AVKON\ARMV5\VtblExports.s 0x00000000   Number         0  VtblExports.o ABSOLUTE
-    \EPOC32\BUILD\sf\mw\classicui\group\EIKCOCTL\ARMV5\VtblExports.s 0x00000000   Number         0  VtblExports.o ABSOLUTE
-    \EPOC32\BUILD\sf\mw\locationsrv\group\EPOS_LANDMARKSCLIENTLIBRARY\ARMV5\VtblExports.s 0x00000000   Number         0  VtblExports.o ABSOLUTE
-    \EPOC32\BUILD\sf\mw\locationsrv\group\MNSERVICELIB\ARMV5\VtblExports.s 0x00000000   Number         0  VtblExports.o ABSOLUTE
-    \EPOC32\BUILD\sf\mw\uiresources\group\AKNSKINS\ARMV5\VtblExports.s 0x00000000   Number         0  VtblExports.o ABSOLUTE
-    \EPOC32\BUILD\sf\os\graphics\windowing\windowserver\group\WS32LIB\ARMV5\VtblExports.s 0x00000000   Number         0  VtblExports.o ABSOLUTE
-    \EPOC32\BUILD\sf\os\kernelhwsrv\kernel\eka\euser\EEXE\ARMV6_ABIV1\urel\uc_exe_.cpp 0x00000000   Number         0  uc_exe_.o ABSOLUTE
-    \EPOC32\BUILD\sf\os\kernelhwsrv\kernel\eka\euser\EUSER\ARMV5\VtblExports.s 0x00000000   Number         0  VtblExports.o ABSOLUTE
-    \EPOC32\BUILD\sf\os\kernelhwsrv\userlibandfileserver\fileserver\group\EFSRV\ARMV5\VtblExports.s 0x00000000   Number         0  VtblExports.o ABSOLUTE
-    \EPOC32\BUILD\sf\os\lbs\locationmgmt\locationadmin\group\LBSAPIVARIANT2\ARMV5\VtblExports.s 0x00000000   Number         0  VtblExports.o ABSOLUTE
-    \\EPOC32\\BUILD\\sf\\os\\kernelhwsrv\\kernel\\eka\\euser\\EEXE\\ARMV6_ABIV1\\urel\\uc_exe_.cpp 0x00000000   Number         0  uc_exe_.o ABSOLUTE
-    \sf\app\location\mapnavproviderrefapp\src\mnrefproviderback.cpp 0x00000000   Number         0  mnrefproviderback.in ABSOLUTE
-    \sf\app\location\mapnavproviderrefapp\src\mnrpapplicationback.cpp 0x00000000   Number         0  mnrefproviderback.in ABSOLUTE
-    \sf\app\location\mapnavproviderrefapp\src\mnrpappserverback.cpp 0x00000000   Number         0  mnrefproviderback.in ABSOLUTE
-    \sf\app\location\mapnavproviderrefapp\src\mnrpappuiback.cpp 0x00000000   Number         0  mnrefproviderback.in ABSOLUTE
-    \sf\app\location\mapnavproviderrefapp\src\mnrpdocumentback.cpp 0x00000000   Number         0  mnrefproviderback.in ABSOLUTE
-    \sf\app\location\mapnavproviderrefapp\src\mnrpgeocodingservice.cpp 0x00000000   Number         0  mnrefproviderback.in ABSOLUTE
-    \sf\app\location\mapnavproviderrefapp\src\mnrpmapimageservice.cpp 0x00000000   Number         0  mnrefproviderback.in ABSOLUTE
-    \sf\os\kernelhwsrv\kernel\eka\euser\epoc\arm\uc_exe.cpp 0x00000000   Number         0  uc_exe.o ABSOLUTE
-    .emb_text                                0x00008000   Section      112  uc_exe_.o(.emb_text)
-    .emb_text                                0x00008070   Section       72  ucppinit_aeabi.o(.emb_text)
-    skip                                     0x00008084   ARM Code       0  ucppinit_aeabi.o(.emb_text)
-    loop                                     0x00008094   ARM Code       0  ucppinit_aeabi.o(.emb_text)
-    fpinit                                   0x000080ac   Data           0  ucppinit_aeabi.o(.emb_text)
-    base                                     0x000080b0   Data           0  ucppinit_aeabi.o(.emb_text)
-    limit                                    0x000080b4   Data           0  ucppinit_aeabi.o(.emb_text)
-    .text                                    0x000080c0   Section       16  uc_exe_.o(.text)
-    NewApplication()                         0x000080d1   Thumb Code    30  mnrefproviderback.in(.text)
-    .text                                    0x000080d0   Section       60  mnrefproviderback.in(.text)
-    .text                                    0x0000810c   Section       32  mnrefproviderback.in(.text)
-    .text                                    0x0000812c   Section       68  mnrefproviderback.in(.text)
-    .text                                    0x00008170   Section       64  mnrefproviderback.in(.text)
-    .text                                    0x000081b0   Section      168  mnrefproviderback.in(.text)
-    .text                                    0x00008258   Section      988  mnrefproviderback.in(.text)
-    .text                                    0x00008634   Section      684  mnrefproviderback.in(.text)
-    __sti___23_mnrpmapimageservice_cpp       0x000088c7   Thumb Code     8  mnrefproviderback.in(.text)
-    .text                                    0x000088e8   Section       36  uc_exe.o(.text)
-    .text                                    0x0000890c   Section      120  callfirstprocessfn.o(.text)
-    .text                                    0x00008984   Section        4  dllexp.o(.text)
-    .text.clean                              0x00008988   Section       10  mnrefproviderback.in(.text.clean)
-    .text.clean                              0x00008992   Section       10  mnrefproviderback.in(.text.clean)
-    .text.clean                              0x0000899c   Section       18  mnrefproviderback.in(.text.clean)
-    .text.clean                              0x000089ae   Section       26  mnrefproviderback.in(.text.clean)
-    .text.clean                              0x000089c8   Section        8  callfirstprocessfn.o(.text.clean)
-    StubCode                                 0x000089d0   Section        8  euser{000a0000}-1088.o(StubCode)
-    theImportedSymbol                        0x000089d4   Data           0  euser{000a0000}-1088.o(StubCode)
-    StubCode                                 0x000089d8   Section        8  euser{000a0000}-1116.o(StubCode)
-    theImportedSymbol                        0x000089dc   Data           0  euser{000a0000}-1116.o(StubCode)
-    StubCode                                 0x000089e0   Section        8  euser{000a0000}-1119.o(StubCode)
-    theImportedSymbol                        0x000089e4   Data           0  euser{000a0000}-1119.o(StubCode)
-    StubCode                                 0x000089e8   Section        8  euser{000a0000}-1171.o(StubCode)
-    theImportedSymbol                        0x000089ec   Data           0  euser{000a0000}-1171.o(StubCode)
-    StubCode                                 0x000089f0   Section        8  euser{000a0000}-1288.o(StubCode)
-    theImportedSymbol                        0x000089f4   Data           0  euser{000a0000}-1288.o(StubCode)
-    StubCode                                 0x000089f8   Section        8  euser{000a0000}-1379.o(StubCode)
-    theImportedSymbol                        0x000089fc   Data           0  euser{000a0000}-1379.o(StubCode)
-    StubCode                                 0x00008a00   Section        8  euser{000a0000}-1381.o(StubCode)
-    theImportedSymbol                        0x00008a04   Data           0  euser{000a0000}-1381.o(StubCode)
-    StubCode                                 0x00008a08   Section        8  euser{000a0000}-1590.o(StubCode)
-    theImportedSymbol                        0x00008a0c   Data           0  euser{000a0000}-1590.o(StubCode)
-    StubCode                                 0x00008a10   Section        8  euser{000a0000}-1593.o(StubCode)
-    theImportedSymbol                        0x00008a14   Data           0  euser{000a0000}-1593.o(StubCode)
-    StubCode                                 0x00008a18   Section        8  euser{000a0000}-1817.o(StubCode)
-    theImportedSymbol                        0x00008a1c   Data           0  euser{000a0000}-1817.o(StubCode)
-    StubCode                                 0x00008a20   Section        8  euser{000a0000}-1995.o(StubCode)
-    theImportedSymbol                        0x00008a24   Data           0  euser{000a0000}-1995.o(StubCode)
-    StubCode                                 0x00008a28   Section        8  euser{000a0000}-1997.o(StubCode)
-    theImportedSymbol                        0x00008a2c   Data           0  euser{000a0000}-1997.o(StubCode)
-    StubCode                                 0x00008a30   Section        8  euser{000a0000}-1999.o(StubCode)
-    theImportedSymbol                        0x00008a34   Data           0  euser{000a0000}-1999.o(StubCode)
-    StubCode                                 0x00008a38   Section        8  euser{000a0000}-203.o(StubCode)
-    theImportedSymbol                        0x00008a3c   Data           0  euser{000a0000}-203.o(StubCode)
-    StubCode                                 0x00008a40   Section        8  euser{000a0000}-205.o(StubCode)
-    theImportedSymbol                        0x00008a44   Data           0  euser{000a0000}-205.o(StubCode)
-    StubCode                                 0x00008a48   Section        8  euser{000a0000}-2060.o(StubCode)
-    theImportedSymbol                        0x00008a4c   Data           0  euser{000a0000}-2060.o(StubCode)
-    StubCode                                 0x00008a50   Section        8  euser{000a0000}-2061.o(StubCode)
-    theImportedSymbol                        0x00008a54   Data           0  euser{000a0000}-2061.o(StubCode)
-    StubCode                                 0x00008a58   Section        8  euser{000a0000}-207.o(StubCode)
-    theImportedSymbol                        0x00008a5c   Data           0  euser{000a0000}-207.o(StubCode)
-    StubCode                                 0x00008a60   Section        8  euser{000a0000}-208.o(StubCode)
-    theImportedSymbol                        0x00008a64   Data           0  euser{000a0000}-208.o(StubCode)
-    StubCode                                 0x00008a68   Section        8  euser{000a0000}-2082.o(StubCode)
-    theImportedSymbol                        0x00008a6c   Data           0  euser{000a0000}-2082.o(StubCode)
-    StubCode                                 0x00008a70   Section        8  euser{000a0000}-2120.o(StubCode)
-    theImportedSymbol                        0x00008a74   Data           0  euser{000a0000}-2120.o(StubCode)
-    StubCode                                 0x00008a78   Section        8  euser{000a0000}-2123.o(StubCode)
-    theImportedSymbol                        0x00008a7c   Data           0  euser{000a0000}-2123.o(StubCode)
-    StubCode                                 0x00008a80   Section        8  euser{000a0000}-2131.o(StubCode)
-    theImportedSymbol                        0x00008a84   Data           0  euser{000a0000}-2131.o(StubCode)
-    StubCode                                 0x00008a88   Section        8  euser{000a0000}-471.o(StubCode)
-    theImportedSymbol                        0x00008a8c   Data           0  euser{000a0000}-471.o(StubCode)
-    StubCode                                 0x00008a90   Section        8  euser{000a0000}-474.o(StubCode)
-    theImportedSymbol                        0x00008a94   Data           0  euser{000a0000}-474.o(StubCode)
-    StubCode                                 0x00008a98   Section        8  euser{000a0000}-481.o(StubCode)
-    theImportedSymbol                        0x00008a9c   Data           0  euser{000a0000}-481.o(StubCode)
-    StubCode                                 0x00008aa0   Section        8  euser{000a0000}-613.o(StubCode)
-    theImportedSymbol                        0x00008aa4   Data           0  euser{000a0000}-613.o(StubCode)
-    StubCode                                 0x00008aa8   Section        8  euser{000a0000}-649.o(StubCode)
-    theImportedSymbol                        0x00008aac   Data           0  euser{000a0000}-649.o(StubCode)
-    StubCode                                 0x00008ab0   Section        8  euser{000a0000}-652.o(StubCode)
-    theImportedSymbol                        0x00008ab4   Data           0  euser{000a0000}-652.o(StubCode)
-    StubCode                                 0x00008ab8   Section        8  euser{000a0000}-654.o(StubCode)
-    theImportedSymbol                        0x00008abc   Data           0  euser{000a0000}-654.o(StubCode)
-    StubCode                                 0x00008ac0   Section        8  euser{000a0000}-669.o(StubCode)
-    theImportedSymbol                        0x00008ac4   Data           0  euser{000a0000}-669.o(StubCode)
-    StubCode                                 0x00008ac8   Section        8  euser{000a0000}-679.o(StubCode)
-    theImportedSymbol                        0x00008acc   Data           0  euser{000a0000}-679.o(StubCode)
-    StubCode                                 0x00008ad0   Section        8  euser{000a0000}-681.o(StubCode)
-    theImportedSymbol                        0x00008ad4   Data           0  euser{000a0000}-681.o(StubCode)
-    StubCode                                 0x00008ad8   Section        8  euser{000a0000}-838.o(StubCode)
-    theImportedSymbol                        0x00008adc   Data           0  euser{000a0000}-838.o(StubCode)
-    StubCode                                 0x00008ae0   Section        8  bafl{000a0000}-43.o(StubCode)
-    theImportedSymbol                        0x00008ae4   Data           0  bafl{000a0000}-43.o(StubCode)
-    StubCode                                 0x00008ae8   Section        8  bafl{000a0000}-98.o(StubCode)
-    theImportedSymbol                        0x00008aec   Data           0  bafl{000a0000}-98.o(StubCode)
-    StubCode                                 0x00008af0   Section        8  cone{000a0000}-100.o(StubCode)
-    theImportedSymbol                        0x00008af4   Data           0  cone{000a0000}-100.o(StubCode)
-    StubCode                                 0x00008af8   Section        8  cone{000a0000}-101.o(StubCode)
-    theImportedSymbol                        0x00008afc   Data           0  cone{000a0000}-101.o(StubCode)
-    StubCode                                 0x00008b00   Section        8  cone{000a0000}-127.o(StubCode)
-    theImportedSymbol                        0x00008b04   Data           0  cone{000a0000}-127.o(StubCode)
-    StubCode                                 0x00008b08   Section        8  cone{000a0000}-128.o(StubCode)
-    theImportedSymbol                        0x00008b0c   Data           0  cone{000a0000}-128.o(StubCode)
-    StubCode                                 0x00008b10   Section        8  cone{000a0000}-182.o(StubCode)
-    theImportedSymbol                        0x00008b14   Data           0  cone{000a0000}-182.o(StubCode)
-    StubCode                                 0x00008b18   Section        8  cone{000a0000}-210.o(StubCode)
-    theImportedSymbol                        0x00008b1c   Data           0  cone{000a0000}-210.o(StubCode)
-    StubCode                                 0x00008b20   Section        8  cone{000a0000}-212.o(StubCode)
-    theImportedSymbol                        0x00008b24   Data           0  cone{000a0000}-212.o(StubCode)
-    StubCode                                 0x00008b28   Section        8  cone{000a0000}-220.o(StubCode)
-    theImportedSymbol                        0x00008b2c   Data           0  cone{000a0000}-220.o(StubCode)
-    StubCode                                 0x00008b30   Section        8  cone{000a0000}-351.o(StubCode)
-    theImportedSymbol                        0x00008b34   Data           0  cone{000a0000}-351.o(StubCode)
-    StubCode                                 0x00008b38   Section        8  cone{000a0000}-355.o(StubCode)
-    theImportedSymbol                        0x00008b3c   Data           0  cone{000a0000}-355.o(StubCode)
-    StubCode                                 0x00008b40   Section        8  cone{000a0000}-638.o(StubCode)
-    theImportedSymbol                        0x00008b44   Data           0  cone{000a0000}-638.o(StubCode)
-    StubCode                                 0x00008b48   Section        8  cone{000a0000}-639.o(StubCode)
-    theImportedSymbol                        0x00008b4c   Data           0  cone{000a0000}-639.o(StubCode)
-    StubCode                                 0x00008b50   Section        8  cone{000a0000}-664.o(StubCode)
-    theImportedSymbol                        0x00008b54   Data           0  cone{000a0000}-664.o(StubCode)
-    StubCode                                 0x00008b58   Section        8  cone{000a0000}-676.o(StubCode)
-    theImportedSymbol                        0x00008b5c   Data           0  cone{000a0000}-676.o(StubCode)
-    StubCode                                 0x00008b60   Section        8  cone{000a0000}-677.o(StubCode)
-    theImportedSymbol                        0x00008b64   Data           0  cone{000a0000}-677.o(StubCode)
-    StubCode                                 0x00008b68   Section        8  apparc{000a0000}-121.o(StubCode)
-    theImportedSymbol                        0x00008b6c   Data           0  apparc{000a0000}-121.o(StubCode)
-    StubCode                                 0x00008b70   Section        8  apparc{000a0000}-132.o(StubCode)
-    theImportedSymbol                        0x00008b74   Data           0  apparc{000a0000}-132.o(StubCode)
-    StubCode                                 0x00008b78   Section        8  apparc{000a0000}-171.o(StubCode)
-    theImportedSymbol                        0x00008b7c   Data           0  apparc{000a0000}-171.o(StubCode)
-    StubCode                                 0x00008b80   Section        8  apparc{000a0000}-192.o(StubCode)
-    theImportedSymbol                        0x00008b84   Data           0  apparc{000a0000}-192.o(StubCode)
-    StubCode                                 0x00008b88   Section        8  apparc{000a0000}-194.o(StubCode)
-    theImportedSymbol                        0x00008b8c   Data           0  apparc{000a0000}-194.o(StubCode)
-    StubCode                                 0x00008b90   Section        8  apparc{000a0000}-202.o(StubCode)
-    theImportedSymbol                        0x00008b94   Data           0  apparc{000a0000}-202.o(StubCode)
-    StubCode                                 0x00008b98   Section        8  apparc{000a0000}-222.o(StubCode)
-    theImportedSymbol                        0x00008b9c   Data           0  apparc{000a0000}-222.o(StubCode)
-    StubCode                                 0x00008ba0   Section        8  apparc{000a0000}-232.o(StubCode)
-    theImportedSymbol                        0x00008ba4   Data           0  apparc{000a0000}-232.o(StubCode)
-    StubCode                                 0x00008ba8   Section        8  apparc{000a0000}-273.o(StubCode)
-    theImportedSymbol                        0x00008bac   Data           0  apparc{000a0000}-273.o(StubCode)
-    StubCode                                 0x00008bb0   Section        8  apparc{000a0000}-274.o(StubCode)
-    theImportedSymbol                        0x00008bb4   Data           0  apparc{000a0000}-274.o(StubCode)
-    StubCode                                 0x00008bb8   Section        8  apparc{000a0000}-275.o(StubCode)
-    theImportedSymbol                        0x00008bbc   Data           0  apparc{000a0000}-275.o(StubCode)
-    StubCode                                 0x00008bc0   Section        8  apparc{000a0000}-279.o(StubCode)
-    theImportedSymbol                        0x00008bc4   Data           0  apparc{000a0000}-279.o(StubCode)
-    StubCode                                 0x00008bc8   Section        8  apparc{000a0000}-280.o(StubCode)
-    theImportedSymbol                        0x00008bcc   Data           0  apparc{000a0000}-280.o(StubCode)
-    StubCode                                 0x00008bd0   Section        8  apparc{000a0000}-284.o(StubCode)
-    theImportedSymbol                        0x00008bd4   Data           0  apparc{000a0000}-284.o(StubCode)
-    StubCode                                 0x00008bd8   Section        8  apparc{000a0000}-285.o(StubCode)
-    theImportedSymbol                        0x00008bdc   Data           0  apparc{000a0000}-285.o(StubCode)
-    StubCode                                 0x00008be0   Section        8  apparc{000a0000}-286.o(StubCode)
-    theImportedSymbol                        0x00008be4   Data           0  apparc{000a0000}-286.o(StubCode)
-    StubCode                                 0x00008be8   Section        8  apparc{000a0000}-287.o(StubCode)
-    theImportedSymbol                        0x00008bec   Data           0  apparc{000a0000}-287.o(StubCode)
-    StubCode                                 0x00008bf0   Section        8  apparc{000a0000}-30.o(StubCode)
-    theImportedSymbol                        0x00008bf4   Data           0  apparc{000a0000}-30.o(StubCode)
-    StubCode                                 0x00008bf8   Section        8  eikcore{000a0000}-141.o(StubCode)
-    theImportedSymbol                        0x00008bfc   Data           0  eikcore{000a0000}-141.o(StubCode)
-    StubCode                                 0x00008c00   Section        8  eikcore{000a0000}-142.o(StubCode)
-    theImportedSymbol                        0x00008c04   Data           0  eikcore{000a0000}-142.o(StubCode)
-    StubCode                                 0x00008c08   Section        8  eikcore{000a0000}-143.o(StubCode)
-    theImportedSymbol                        0x00008c0c   Data           0  eikcore{000a0000}-143.o(StubCode)
-    StubCode                                 0x00008c10   Section        8  eikcore{000a0000}-144.o(StubCode)
-    theImportedSymbol                        0x00008c14   Data           0  eikcore{000a0000}-144.o(StubCode)
-    StubCode                                 0x00008c18   Section        8  eikcore{000a0000}-147.o(StubCode)
-    theImportedSymbol                        0x00008c1c   Data           0  eikcore{000a0000}-147.o(StubCode)
-    StubCode                                 0x00008c20   Section        8  eikcore{000a0000}-152.o(StubCode)
-    theImportedSymbol                        0x00008c24   Data           0  eikcore{000a0000}-152.o(StubCode)
-    StubCode                                 0x00008c28   Section        8  eikcore{000a0000}-155.o(StubCode)
-    theImportedSymbol                        0x00008c2c   Data           0  eikcore{000a0000}-155.o(StubCode)
-    StubCode                                 0x00008c30   Section        8  eikcore{000a0000}-158.o(StubCode)
-    theImportedSymbol                        0x00008c34   Data           0  eikcore{000a0000}-158.o(StubCode)
-    StubCode                                 0x00008c38   Section        8  eikcore{000a0000}-159.o(StubCode)
-    theImportedSymbol                        0x00008c3c   Data           0  eikcore{000a0000}-159.o(StubCode)
-    StubCode                                 0x00008c40   Section        8  eikcore{000a0000}-166.o(StubCode)
-    theImportedSymbol                        0x00008c44   Data           0  eikcore{000a0000}-166.o(StubCode)
-    StubCode                                 0x00008c48   Section        8  eikcore{000a0000}-169.o(StubCode)
-    theImportedSymbol                        0x00008c4c   Data           0  eikcore{000a0000}-169.o(StubCode)
-    StubCode                                 0x00008c50   Section        8  eikcore{000a0000}-171.o(StubCode)
-    theImportedSymbol                        0x00008c54   Data           0  eikcore{000a0000}-171.o(StubCode)
-    StubCode                                 0x00008c58   Section        8  eikcore{000a0000}-175.o(StubCode)
-    theImportedSymbol                        0x00008c5c   Data           0  eikcore{000a0000}-175.o(StubCode)
-    StubCode                                 0x00008c60   Section        8  eikcore{000a0000}-18.o(StubCode)
-    theImportedSymbol                        0x00008c64   Data           0  eikcore{000a0000}-18.o(StubCode)
-    StubCode                                 0x00008c68   Section        8  eikcore{000a0000}-20.o(StubCode)
-    theImportedSymbol                        0x00008c6c   Data           0  eikcore{000a0000}-20.o(StubCode)
-    StubCode                                 0x00008c70   Section        8  eikcore{000a0000}-25.o(StubCode)
-    theImportedSymbol                        0x00008c74   Data           0  eikcore{000a0000}-25.o(StubCode)
-    StubCode                                 0x00008c78   Section        8  eikcore{000a0000}-26.o(StubCode)
-    theImportedSymbol                        0x00008c7c   Data           0  eikcore{000a0000}-26.o(StubCode)
-    StubCode                                 0x00008c80   Section        8  eikcore{000a0000}-27.o(StubCode)
-    theImportedSymbol                        0x00008c84   Data           0  eikcore{000a0000}-27.o(StubCode)
-    StubCode                                 0x00008c88   Section        8  eikcore{000a0000}-28.o(StubCode)
-    theImportedSymbol                        0x00008c8c   Data           0  eikcore{000a0000}-28.o(StubCode)
-    StubCode                                 0x00008c90   Section        8  eikcore{000a0000}-29.o(StubCode)
-    theImportedSymbol                        0x00008c94   Data           0  eikcore{000a0000}-29.o(StubCode)
-    StubCode                                 0x00008c98   Section        8  eikcore{000a0000}-291.o(StubCode)
-    theImportedSymbol                        0x00008c9c   Data           0  eikcore{000a0000}-291.o(StubCode)
-    StubCode                                 0x00008ca0   Section        8  eikcore{000a0000}-293.o(StubCode)
-    theImportedSymbol                        0x00008ca4   Data           0  eikcore{000a0000}-293.o(StubCode)
-    StubCode                                 0x00008ca8   Section        8  eikcore{000a0000}-294.o(StubCode)
-    theImportedSymbol                        0x00008cac   Data           0  eikcore{000a0000}-294.o(StubCode)
-    StubCode                                 0x00008cb0   Section        8  eikcore{000a0000}-295.o(StubCode)
-    theImportedSymbol                        0x00008cb4   Data           0  eikcore{000a0000}-295.o(StubCode)
-    StubCode                                 0x00008cb8   Section        8  eikcore{000a0000}-296.o(StubCode)
-    theImportedSymbol                        0x00008cbc   Data           0  eikcore{000a0000}-296.o(StubCode)
-    StubCode                                 0x00008cc0   Section        8  eikcore{000a0000}-297.o(StubCode)
-    theImportedSymbol                        0x00008cc4   Data           0  eikcore{000a0000}-297.o(StubCode)
-    StubCode                                 0x00008cc8   Section        8  eikcore{000a0000}-298.o(StubCode)
-    theImportedSymbol                        0x00008ccc   Data           0  eikcore{000a0000}-298.o(StubCode)
-    StubCode                                 0x00008cd0   Section        8  eikcore{000a0000}-299.o(StubCode)
-    theImportedSymbol                        0x00008cd4   Data           0  eikcore{000a0000}-299.o(StubCode)
-    StubCode                                 0x00008cd8   Section        8  eikcore{000a0000}-30.o(StubCode)
-    theImportedSymbol                        0x00008cdc   Data           0  eikcore{000a0000}-30.o(StubCode)
-    StubCode                                 0x00008ce0   Section        8  eikcore{000a0000}-302.o(StubCode)
-    theImportedSymbol                        0x00008ce4   Data           0  eikcore{000a0000}-302.o(StubCode)
-    StubCode                                 0x00008ce8   Section        8  eikcore{000a0000}-31.o(StubCode)
-    theImportedSymbol                        0x00008cec   Data           0  eikcore{000a0000}-31.o(StubCode)
-    StubCode                                 0x00008cf0   Section        8  eikcore{000a0000}-317.o(StubCode)
-    theImportedSymbol                        0x00008cf4   Data           0  eikcore{000a0000}-317.o(StubCode)
-    StubCode                                 0x00008cf8   Section        8  eikcore{000a0000}-352.o(StubCode)
-    theImportedSymbol                        0x00008cfc   Data           0  eikcore{000a0000}-352.o(StubCode)
-    StubCode                                 0x00008d00   Section        8  eikcore{000a0000}-37.o(StubCode)
-    theImportedSymbol                        0x00008d04   Data           0  eikcore{000a0000}-37.o(StubCode)
-    StubCode                                 0x00008d08   Section        8  eikcore{000a0000}-390.o(StubCode)
-    theImportedSymbol                        0x00008d0c   Data           0  eikcore{000a0000}-390.o(StubCode)
-    StubCode                                 0x00008d10   Section        8  eikcore{000a0000}-392.o(StubCode)
-    theImportedSymbol                        0x00008d14   Data           0  eikcore{000a0000}-392.o(StubCode)
-    StubCode                                 0x00008d18   Section        8  eikcore{000a0000}-394.o(StubCode)
-    theImportedSymbol                        0x00008d1c   Data           0  eikcore{000a0000}-394.o(StubCode)
-    StubCode                                 0x00008d20   Section        8  eikcore{000a0000}-467.o(StubCode)
-    theImportedSymbol                        0x00008d24   Data           0  eikcore{000a0000}-467.o(StubCode)
-    StubCode                                 0x00008d28   Section        8  eikcore{000a0000}-479.o(StubCode)
-    theImportedSymbol                        0x00008d2c   Data           0  eikcore{000a0000}-479.o(StubCode)
-    StubCode                                 0x00008d30   Section        8  eikcore{000a0000}-490.o(StubCode)
-    theImportedSymbol                        0x00008d34   Data           0  eikcore{000a0000}-490.o(StubCode)
-    StubCode                                 0x00008d38   Section        8  eikcore{000a0000}-506.o(StubCode)
-    theImportedSymbol                        0x00008d3c   Data           0  eikcore{000a0000}-506.o(StubCode)
-    StubCode                                 0x00008d40   Section        8  eikcore{000a0000}-523.o(StubCode)
-    theImportedSymbol                        0x00008d44   Data           0  eikcore{000a0000}-523.o(StubCode)
-    StubCode                                 0x00008d48   Section        8  eikcore{000a0000}-532.o(StubCode)
-    theImportedSymbol                        0x00008d4c   Data           0  eikcore{000a0000}-532.o(StubCode)
-    StubCode                                 0x00008d50   Section        8  eikcore{000a0000}-533.o(StubCode)
-    theImportedSymbol                        0x00008d54   Data           0  eikcore{000a0000}-533.o(StubCode)
-    StubCode                                 0x00008d58   Section        8  eikcore{000a0000}-534.o(StubCode)
-    theImportedSymbol                        0x00008d5c   Data           0  eikcore{000a0000}-534.o(StubCode)
-    StubCode                                 0x00008d60   Section        8  eikcore{000a0000}-535.o(StubCode)
-    theImportedSymbol                        0x00008d64   Data           0  eikcore{000a0000}-535.o(StubCode)
-    StubCode                                 0x00008d68   Section        8  eikcore{000a0000}-536.o(StubCode)
-    theImportedSymbol                        0x00008d6c   Data           0  eikcore{000a0000}-536.o(StubCode)
-    StubCode                                 0x00008d70   Section        8  eikcore{000a0000}-537.o(StubCode)
-    theImportedSymbol                        0x00008d74   Data           0  eikcore{000a0000}-537.o(StubCode)
-    StubCode                                 0x00008d78   Section        8  eikcore{000a0000}-565.o(StubCode)
-    theImportedSymbol                        0x00008d7c   Data           0  eikcore{000a0000}-565.o(StubCode)
-    StubCode                                 0x00008d80   Section        8  eikcore{000a0000}-61.o(StubCode)
-    theImportedSymbol                        0x00008d84   Data           0  eikcore{000a0000}-61.o(StubCode)
-    StubCode                                 0x00008d88   Section        8  eikcore{000a0000}-62.o(StubCode)
-    theImportedSymbol                        0x00008d8c   Data           0  eikcore{000a0000}-62.o(StubCode)
-    StubCode                                 0x00008d90   Section        8  eikcore{000a0000}-63.o(StubCode)
-    theImportedSymbol                        0x00008d94   Data           0  eikcore{000a0000}-63.o(StubCode)
-    StubCode                                 0x00008d98   Section        8  eikcore{000a0000}-64.o(StubCode)
-    theImportedSymbol                        0x00008d9c   Data           0  eikcore{000a0000}-64.o(StubCode)
-    StubCode                                 0x00008da0   Section        8  eikcore{000a0000}-67.o(StubCode)
-    theImportedSymbol                        0x00008da4   Data           0  eikcore{000a0000}-67.o(StubCode)
-    StubCode                                 0x00008da8   Section        8  eikcore{000a0000}-72.o(StubCode)
-    theImportedSymbol                        0x00008dac   Data           0  eikcore{000a0000}-72.o(StubCode)
-    StubCode                                 0x00008db0   Section        8  eikcore{000a0000}-73.o(StubCode)
-    theImportedSymbol                        0x00008db4   Data           0  eikcore{000a0000}-73.o(StubCode)
-    StubCode                                 0x00008db8   Section        8  eikcore{000a0000}-74.o(StubCode)
-    theImportedSymbol                        0x00008dbc   Data           0  eikcore{000a0000}-74.o(StubCode)
-    StubCode                                 0x00008dc0   Section        8  eikcore{000a0000}-75.o(StubCode)
-    theImportedSymbol                        0x00008dc4   Data           0  eikcore{000a0000}-75.o(StubCode)
-    StubCode                                 0x00008dc8   Section        8  eikcore{000a0000}-77.o(StubCode)
-    theImportedSymbol                        0x00008dcc   Data           0  eikcore{000a0000}-77.o(StubCode)
-    StubCode                                 0x00008dd0   Section        8  eikcore{000a0000}-78.o(StubCode)
-    theImportedSymbol                        0x00008dd4   Data           0  eikcore{000a0000}-78.o(StubCode)
-    StubCode                                 0x00008dd8   Section        8  eikcore{000a0000}-79.o(StubCode)
-    theImportedSymbol                        0x00008ddc   Data           0  eikcore{000a0000}-79.o(StubCode)
-    StubCode                                 0x00008de0   Section        8  ws32{000a0000}-211.o(StubCode)
-    theImportedSymbol                        0x00008de4   Data           0  ws32{000a0000}-211.o(StubCode)
-    StubCode                                 0x00008de8   Section        8  gdi{000a0000}-312.o(StubCode)
-    theImportedSymbol                        0x00008dec   Data           0  gdi{000a0000}-312.o(StubCode)
-    StubCode                                 0x00008df0   Section        8  avkon{000a0000}-1132.o(StubCode)
-    theImportedSymbol                        0x00008df4   Data           0  avkon{000a0000}-1132.o(StubCode)
-    StubCode                                 0x00008df8   Section        8  avkon{000a0000}-129.o(StubCode)
-    theImportedSymbol                        0x00008dfc   Data           0  avkon{000a0000}-129.o(StubCode)
-    StubCode                                 0x00008e00   Section        8  avkon{000a0000}-130.o(StubCode)
-    theImportedSymbol                        0x00008e04   Data           0  avkon{000a0000}-130.o(StubCode)
-    StubCode                                 0x00008e08   Section        8  avkon{000a0000}-131.o(StubCode)
-    theImportedSymbol                        0x00008e0c   Data           0  avkon{000a0000}-131.o(StubCode)
-    StubCode                                 0x00008e10   Section        8  avkon{000a0000}-1350.o(StubCode)
-    theImportedSymbol                        0x00008e14   Data           0  avkon{000a0000}-1350.o(StubCode)
-    StubCode                                 0x00008e18   Section        8  avkon{000a0000}-1351.o(StubCode)
-    theImportedSymbol                        0x00008e1c   Data           0  avkon{000a0000}-1351.o(StubCode)
-    StubCode                                 0x00008e20   Section        8  avkon{000a0000}-1366.o(StubCode)
-    theImportedSymbol                        0x00008e24   Data           0  avkon{000a0000}-1366.o(StubCode)
-    StubCode                                 0x00008e28   Section        8  avkon{000a0000}-198.o(StubCode)
-    theImportedSymbol                        0x00008e2c   Data           0  avkon{000a0000}-198.o(StubCode)
-    StubCode                                 0x00008e30   Section        8  avkon{000a0000}-199.o(StubCode)
-    theImportedSymbol                        0x00008e34   Data           0  avkon{000a0000}-199.o(StubCode)
-    StubCode                                 0x00008e38   Section        8  avkon{000a0000}-201.o(StubCode)
-    theImportedSymbol                        0x00008e3c   Data           0  avkon{000a0000}-201.o(StubCode)
-    StubCode                                 0x00008e40   Section        8  avkon{000a0000}-206.o(StubCode)
-    theImportedSymbol                        0x00008e44   Data           0  avkon{000a0000}-206.o(StubCode)
-    StubCode                                 0x00008e48   Section        8  avkon{000a0000}-211.o(StubCode)
-    theImportedSymbol                        0x00008e4c   Data           0  avkon{000a0000}-211.o(StubCode)
-    StubCode                                 0x00008e50   Section        8  avkon{000a0000}-213.o(StubCode)
-    theImportedSymbol                        0x00008e54   Data           0  avkon{000a0000}-213.o(StubCode)
-    StubCode                                 0x00008e58   Section        8  avkon{000a0000}-214.o(StubCode)
-    theImportedSymbol                        0x00008e5c   Data           0  avkon{000a0000}-214.o(StubCode)
-    StubCode                                 0x00008e60   Section        8  avkon{000a0000}-215.o(StubCode)
-    theImportedSymbol                        0x00008e64   Data           0  avkon{000a0000}-215.o(StubCode)
-    StubCode                                 0x00008e68   Section        8  avkon{000a0000}-216.o(StubCode)
-    theImportedSymbol                        0x00008e6c   Data           0  avkon{000a0000}-216.o(StubCode)
-    StubCode                                 0x00008e70   Section        8  avkon{000a0000}-217.o(StubCode)
-    theImportedSymbol                        0x00008e74   Data           0  avkon{000a0000}-217.o(StubCode)
-    StubCode                                 0x00008e78   Section        8  avkon{000a0000}-220.o(StubCode)
-    theImportedSymbol                        0x00008e7c   Data           0  avkon{000a0000}-220.o(StubCode)
-    StubCode                                 0x00008e80   Section        8  avkon{000a0000}-2920.o(StubCode)
-    theImportedSymbol                        0x00008e84   Data           0  avkon{000a0000}-2920.o(StubCode)
-    StubCode                                 0x00008e88   Section        8  avkon{000a0000}-2922.o(StubCode)
-    theImportedSymbol                        0x00008e8c   Data           0  avkon{000a0000}-2922.o(StubCode)
-    StubCode                                 0x00008e90   Section        8  avkon{000a0000}-2924.o(StubCode)
-    theImportedSymbol                        0x00008e94   Data           0  avkon{000a0000}-2924.o(StubCode)
-    StubCode                                 0x00008e98   Section        8  avkon{000a0000}-2925.o(StubCode)
-    theImportedSymbol                        0x00008e9c   Data           0  avkon{000a0000}-2925.o(StubCode)
-    StubCode                                 0x00008ea0   Section        8  avkon{000a0000}-2926.o(StubCode)
-    theImportedSymbol                        0x00008ea4   Data           0  avkon{000a0000}-2926.o(StubCode)
-    StubCode                                 0x00008ea8   Section        8  avkon{000a0000}-2928.o(StubCode)
-    theImportedSymbol                        0x00008eac   Data           0  avkon{000a0000}-2928.o(StubCode)
-    StubCode                                 0x00008eb0   Section        8  avkon{000a0000}-2929.o(StubCode)
-    theImportedSymbol                        0x00008eb4   Data           0  avkon{000a0000}-2929.o(StubCode)
-    StubCode                                 0x00008eb8   Section        8  avkon{000a0000}-2930.o(StubCode)
-    theImportedSymbol                        0x00008ebc   Data           0  avkon{000a0000}-2930.o(StubCode)
-    StubCode                                 0x00008ec0   Section        8  avkon{000a0000}-2931.o(StubCode)
-    theImportedSymbol                        0x00008ec4   Data           0  avkon{000a0000}-2931.o(StubCode)
-    StubCode                                 0x00008ec8   Section        8  avkon{000a0000}-2932.o(StubCode)
-    theImportedSymbol                        0x00008ecc   Data           0  avkon{000a0000}-2932.o(StubCode)
-    StubCode                                 0x00008ed0   Section        8  avkon{000a0000}-2934.o(StubCode)
-    theImportedSymbol                        0x00008ed4   Data           0  avkon{000a0000}-2934.o(StubCode)
-    StubCode                                 0x00008ed8   Section        8  avkon{000a0000}-2935.o(StubCode)
-    theImportedSymbol                        0x00008edc   Data           0  avkon{000a0000}-2935.o(StubCode)
-    StubCode                                 0x00008ee0   Section        8  avkon{000a0000}-2938.o(StubCode)
-    theImportedSymbol                        0x00008ee4   Data           0  avkon{000a0000}-2938.o(StubCode)
-    StubCode                                 0x00008ee8   Section        8  avkon{000a0000}-2993.o(StubCode)
-    theImportedSymbol                        0x00008eec   Data           0  avkon{000a0000}-2993.o(StubCode)
-    StubCode                                 0x00008ef0   Section        8  avkon{000a0000}-2997.o(StubCode)
-    theImportedSymbol                        0x00008ef4   Data           0  avkon{000a0000}-2997.o(StubCode)
-    StubCode                                 0x00008ef8   Section        8  avkon{000a0000}-3826.o(StubCode)
-    theImportedSymbol                        0x00008efc   Data           0  avkon{000a0000}-3826.o(StubCode)
-    StubCode                                 0x00008f00   Section        8  avkon{000a0000}-3862.o(StubCode)
-    theImportedSymbol                        0x00008f04   Data           0  avkon{000a0000}-3862.o(StubCode)
-    StubCode                                 0x00008f08   Section        8  avkon{000a0000}-3868.o(StubCode)
-    theImportedSymbol                        0x00008f0c   Data           0  avkon{000a0000}-3868.o(StubCode)
-    StubCode                                 0x00008f10   Section        8  avkon{000a0000}-4021.o(StubCode)
-    theImportedSymbol                        0x00008f14   Data           0  avkon{000a0000}-4021.o(StubCode)
-    StubCode                                 0x00008f18   Section        8  avkon{000a0000}-4030.o(StubCode)
-    theImportedSymbol                        0x00008f1c   Data           0  avkon{000a0000}-4030.o(StubCode)
-    StubCode                                 0x00008f20   Section        8  eposlandmarks{000a0000}-12.o(StubCode)
-    theImportedSymbol                        0x00008f24   Data           0  eposlandmarks{000a0000}-12.o(StubCode)
-    StubCode                                 0x00008f28   Section        8  eposlandmarks{000a0000}-13.o(StubCode)
-    theImportedSymbol                        0x00008f2c   Data           0  eposlandmarks{000a0000}-13.o(StubCode)
-    StubCode                                 0x00008f30   Section        8  eposlandmarks{000a0000}-65.o(StubCode)
-    theImportedSymbol                        0x00008f34   Data           0  eposlandmarks{000a0000}-65.o(StubCode)
-    StubCode                                 0x00008f38   Section        8  eposlandmarks{000a0000}-68.o(StubCode)
-    theImportedSymbol                        0x00008f3c   Data           0  eposlandmarks{000a0000}-68.o(StubCode)
-    StubCode                                 0x00008f40   Section        8  lbs{000a0000}-207.o(StubCode)
-    theImportedSymbol                        0x00008f44   Data           0  lbs{000a0000}-207.o(StubCode)
-    StubCode                                 0x00008f48   Section        8  lbs{000a0000}-23.o(StubCode)
-    theImportedSymbol                        0x00008f4c   Data           0  lbs{000a0000}-23.o(StubCode)
-    StubCode                                 0x00008f50   Section        8  mnservicelib{000a0000}-1.o(StubCode)
-    theImportedSymbol                        0x00008f54   Data           0  mnservicelib{000a0000}-1.o(StubCode)
-    StubCode                                 0x00008f58   Section        8  mnservicelib{000a0000}-2.o(StubCode)
-    theImportedSymbol                        0x00008f5c   Data           0  mnservicelib{000a0000}-2.o(StubCode)
-    StubCode                                 0x00008f60   Section        8  mnservicelib{000a0000}-21.o(StubCode)
-    theImportedSymbol                        0x00008f64   Data           0  mnservicelib{000a0000}-21.o(StubCode)
-    StubCode                                 0x00008f68   Section        8  mnservicelib{000a0000}-22.o(StubCode)
-    theImportedSymbol                        0x00008f6c   Data           0  mnservicelib{000a0000}-22.o(StubCode)
-    StubCode                                 0x00008f70   Section        8  mnservicelib{000a0000}-23.o(StubCode)
-    theImportedSymbol                        0x00008f74   Data           0  mnservicelib{000a0000}-23.o(StubCode)
-    StubCode                                 0x00008f78   Section        8  mnservicelib{000a0000}-24.o(StubCode)
-    theImportedSymbol                        0x00008f7c   Data           0  mnservicelib{000a0000}-24.o(StubCode)
-    StubCode                                 0x00008f80   Section        8  mnservicelib{000a0000}-27.o(StubCode)
-    theImportedSymbol                        0x00008f84   Data           0  mnservicelib{000a0000}-27.o(StubCode)
-    StubCode                                 0x00008f88   Section        8  mnservicelib{000a0000}-34.o(StubCode)
-    theImportedSymbol                        0x00008f8c   Data           0  mnservicelib{000a0000}-34.o(StubCode)
-    StubCode                                 0x00008f90   Section        8  mnservicelib{000a0000}-45.o(StubCode)
-    theImportedSymbol                        0x00008f94   Data           0  mnservicelib{000a0000}-45.o(StubCode)
-    StubCode                                 0x00008f98   Section        8  mnservicelib{000a0000}-46.o(StubCode)
-    theImportedSymbol                        0x00008f9c   Data           0  mnservicelib{000a0000}-46.o(StubCode)
-    StubCode                                 0x00008fa0   Section        8  mnservicelib{000a0000}-47.o(StubCode)
-    theImportedSymbol                        0x00008fa4   Data           0  mnservicelib{000a0000}-47.o(StubCode)
-    StubCode                                 0x00008fa8   Section        8  mnservicelib{000a0000}-49.o(StubCode)
-    theImportedSymbol                        0x00008fac   Data           0  mnservicelib{000a0000}-49.o(StubCode)
-    StubCode                                 0x00008fb0   Section        8  mnservicelib{000a0000}-50.o(StubCode)
-    theImportedSymbol                        0x00008fb4   Data           0  mnservicelib{000a0000}-50.o(StubCode)
-    StubCode                                 0x00008fb8   Section        8  mnservicelib{000a0000}-53.o(StubCode)
-    theImportedSymbol                        0x00008fbc   Data           0  mnservicelib{000a0000}-53.o(StubCode)
-    StubCode                                 0x00008fc0   Section        8  mnservicelib{000a0000}-56.o(StubCode)
-    theImportedSymbol                        0x00008fc4   Data           0  mnservicelib{000a0000}-56.o(StubCode)
-    StubCode                                 0x00008fc8   Section        8  mnrefproviderengine{000a0000}-10.o(StubCode)
-    theImportedSymbol                        0x00008fcc   Data           0  mnrefproviderengine{000a0000}-10.o(StubCode)
-    StubCode                                 0x00008fd0   Section        8  mnrefproviderengine{000a0000}-12.o(StubCode)
-    theImportedSymbol                        0x00008fd4   Data           0  mnrefproviderengine{000a0000}-12.o(StubCode)
-    StubCode                                 0x00008fd8   Section        8  mnrefproviderengine{000a0000}-18.o(StubCode)
-    theImportedSymbol                        0x00008fdc   Data           0  mnrefproviderengine{000a0000}-18.o(StubCode)
-    StubCode                                 0x00008fe0   Section        8  mnrefproviderengine{000a0000}-19.o(StubCode)
-    theImportedSymbol                        0x00008fe4   Data           0  mnrefproviderengine{000a0000}-19.o(StubCode)
-    StubCode                                 0x00008fe8   Section        8  mnrefproviderengine{000a0000}-21.o(StubCode)
-    theImportedSymbol                        0x00008fec   Data           0  mnrefproviderengine{000a0000}-21.o(StubCode)
-    StubCode                                 0x00008ff0   Section        8  mnrefproviderengine{000a0000}-4.o(StubCode)
-    theImportedSymbol                        0x00008ff4   Data           0  mnrefproviderengine{000a0000}-4.o(StubCode)
-    StubCode                                 0x00008ff8   Section        8  mnrefproviderengine{000a0000}-5.o(StubCode)
-    theImportedSymbol                        0x00008ffc   Data           0  mnrefproviderengine{000a0000}-5.o(StubCode)
-    StubCode                                 0x00009000   Section        8  mnrefproviderengine{000a0000}-54.o(StubCode)
-    theImportedSymbol                        0x00009004   Data           0  mnrefproviderengine{000a0000}-54.o(StubCode)
-    StubCode                                 0x00009008   Section        8  mnrefproviderengine{000a0000}-6.o(StubCode)
-    theImportedSymbol                        0x0000900c   Data           0  mnrefproviderengine{000a0000}-6.o(StubCode)
-    StubCode                                 0x00009010   Section        8  drtaeabi{000a0000}-144.o(StubCode)
-    theImportedSymbol                        0x00009014   Data           0  drtaeabi{000a0000}-144.o(StubCode)
-    StubCode                                 0x00009018   Section        8  drtaeabi{000a0000}-158.o(StubCode)
-    theImportedSymbol                        0x0000901c   Data           0  drtaeabi{000a0000}-158.o(StubCode)
-    StubCode                                 0x00009020   Section        8  drtaeabi{000a0000}-159.o(StubCode)
-    theImportedSymbol                        0x00009024   Data           0  drtaeabi{000a0000}-159.o(StubCode)
-    StubCode                                 0x00009028   Section        8  drtaeabi{000a0000}-180.o(StubCode)
-    theImportedSymbol                        0x0000902c   Data           0  drtaeabi{000a0000}-180.o(StubCode)
-    StubCode                                 0x00009030   Section        8  drtaeabi{000a0000}-182.o(StubCode)
-    theImportedSymbol                        0x00009034   Data           0  drtaeabi{000a0000}-182.o(StubCode)
-    StubCode                                 0x00009038   Section        8  drtaeabi{000a0000}-183.o(StubCode)
-    theImportedSymbol                        0x0000903c   Data           0  drtaeabi{000a0000}-183.o(StubCode)
-    StubCode                                 0x00009040   Section        8  drtaeabi{000a0000}-184.o(StubCode)
-    theImportedSymbol                        0x00009044   Data           0  drtaeabi{000a0000}-184.o(StubCode)
-    StubCode                                 0x00009048   Section        8  drtaeabi{000a0000}-189.o(StubCode)
-    theImportedSymbol                        0x0000904c   Data           0  drtaeabi{000a0000}-189.o(StubCode)
-    StubCode                                 0x00009050   Section        8  scppnwdl{000a0000}-3.o(StubCode)
-    theImportedSymbol                        0x00009054   Data           0  scppnwdl{000a0000}-3.o(StubCode)
-    StubCode                                 0x00009058   Section        8  euser{000a0000}-1360.o(StubCode)
-    theImportedSymbol                        0x0000905c   Data           0  euser{000a0000}-1360.o(StubCode)
-    StubCode                                 0x00009060   Section        8  euser{000a0000}-641.o(StubCode)
-    theImportedSymbol                        0x00009064   Data           0  euser{000a0000}-641.o(StubCode)
-    StubCode                                 0x00009068   Section        8  euser{000a0000}-585.o(StubCode)
-    theImportedSymbol                        0x0000906c   Data           0  euser{000a0000}-585.o(StubCode)
-    StubCode                                 0x00009070   Section        8  euser{000a0000}-650.o(StubCode)
-    theImportedSymbol                        0x00009074   Data           0  euser{000a0000}-650.o(StubCode)
-    StubCode                                 0x00009078   Section        8  drtaeabi{000a0000}-204.o(StubCode)
-    theImportedSymbol                        0x0000907c   Data           0  drtaeabi{000a0000}-204.o(StubCode)
-    i._ZN12CApaDocument16DetachFromStoreLEN8CPicture7TDetachE 0x00009080   Section        2  mnrefproviderback.in(i._ZN12CApaDocument16DetachFromStoreLEN8CPicture7TDetachE)
-    i._ZN14CMnrpAppUiBackC1Ev                0x00009084   Section       60  mnrefproviderback.in(i._ZN14CMnrpAppUiBackC1Ev)
-    i._ZN14CMnrpAppUiBackC1Ev.clean          0x000090c0   Section       10  mnrefproviderback.in(i._ZN14CMnrpAppUiBackC1Ev.clean)
-    i._ZN14CMnrpAppUiBackD0Ev                0x000090ca   Section       16  mnrefproviderback.in(i._ZN14CMnrpAppUiBackD0Ev)
-    i._ZN14CMnrpAppUiBackD1Ev                0x000090da   Section        8  mnrefproviderback.in(i._ZN14CMnrpAppUiBackD1Ev)
-    i._ZN17CMnrpDocumentBackD0Ev             0x000090e2   Section       16  mnrefproviderback.in(i._ZN17CMnrpDocumentBackD0Ev)
-    i._ZN17CMnrpDocumentBackD1Ev             0x000090f2   Section        8  mnrefproviderback.in(i._ZN17CMnrpDocumentBackD1Ev)
-    i._ZN20CMnrpApplicationBackD0Ev          0x000090fa   Section       16  mnrefproviderback.in(i._ZN20CMnrpApplicationBackD0Ev)
-    i._ZN20CMnrpApplicationBackD1Ev          0x0000910a   Section        8  mnrefproviderback.in(i._ZN20CMnrpApplicationBackD1Ev)
-    i._ZN5CBasenwEj                          0x00009112   Section        8  mnrefproviderback.in(i._ZN5CBasenwEj)
-    t._ZNK13RPointerArrayI12CPosLandmarkE5CountEv 0x0000911a   Section        8  mnrefproviderback.in(t._ZNK13RPointerArrayI12CPosLandmarkE5CountEv)
-    .ARM.extab                               0x00009124   Section       16  uc_exe_.o(.ARM.extab)
-    .extab._Z14NewApplicationv               0x00009134   Data           0  mnrefproviderback.in(.ARM.extab)
-    .extab._ZN5CBasenwEj                     0x00009144   Data           0  mnrefproviderback.in(.ARM.extab)
-    .extab._ZN14CMnrpAppUiBackC1Ev           0x00009154   Data           0  mnrefproviderback.in(.ARM.extab)
-    .extab._ZN18CMnrpAppServerBackD1Ev       0x00009164   Data           0  mnrefproviderback.in(.ARM.extab)
-    .extab._ZN21CMnrpGeocodingServiceD1Ev    0x00009174   Data           0  mnrefproviderback.in(.ARM.extab)
-    .extab._ZN21CMnrpGeocodingService24HandleGeocodingCompletedEv 0x00009184   Data           0  mnrefproviderback.in(.ARM.extab)
-    .extab._ZN20CMnrpMapImageServiceD1Ev     0x000091ac   Data           0  mnrefproviderback.in(.ARM.extab)
-    .extab._ZN20CMnrpMapImageService24HandleMapImageCompletedLEv 0x000091bc   Data           0  mnrefproviderback.in(.ARM.extab)
-    .extab._ZN20CMnrpMapImageService26MapImageProcessingCallBackEPv 0x000091e4   Data           0  mnrefproviderback.in(.ARM.extab)
-    .extab.CallThrdProcEntry                 0x0000920c   Data           0  callfirstprocessfn.o(.ARM.extab)
-    .constdata$1                             0x00009228   Data           0  mnrefproviderback.in(.constdata)
-    KUidMnRefProviderBackApp                 0x00009228   Data           4  mnrefproviderback.in(.constdata)
-    .constdata                               0x00009228   Section        4  mnrefproviderback.in(.constdata)
-    .constdata$1                             0x0000922c   Data           0  callfirstprocessfn.o(.constdata)
-    KLitUser                                 0x0000922c   Data          16  callfirstprocessfn.o(.constdata)
-    .constdata                               0x0000922c   Section       16  callfirstprocessfn.o(.constdata)
-    .constdata__ZTI14CMnrpAppUiBack          0x0000923c   Section       12  mnrefproviderback.in(.constdata__ZTI14CMnrpAppUiBack)
-    .constdata__ZTI17CMnrpDocumentBack       0x00009248   Section       12  mnrefproviderback.in(.constdata__ZTI17CMnrpDocumentBack)
-    .constdata__ZTI18CMnrpAppServerBack      0x00009254   Section       12  mnrefproviderback.in(.constdata__ZTI18CMnrpAppServerBack)
-    .constdata__ZTI20CMnrpApplicationBack    0x00009260   Section       12  mnrefproviderback.in(.constdata__ZTI20CMnrpApplicationBack)
-    .constdata__ZTI20CMnrpMapImageService    0x0000926c   Section       12  mnrefproviderback.in(.constdata__ZTI20CMnrpMapImageService)
-    .constdata__ZTI21CMnrpGeocodingService   0x00009278   Section       12  mnrefproviderback.in(.constdata__ZTI21CMnrpGeocodingService)
-    .constdata__ZTI22MEikStatusPaneObserver  0x00009284   Section        8  mnrefproviderback.in(.constdata__ZTI22MEikStatusPaneObserver)
-    .constdata__ZTS14CMnrpAppUiBack          0x0000928c   Section       17  mnrefproviderback.in(.constdata__ZTS14CMnrpAppUiBack)
-    .constdata__ZTS17CMnrpDocumentBack       0x0000929d   Section       20  mnrefproviderback.in(.constdata__ZTS17CMnrpDocumentBack)
-    .constdata__ZTS18CMnrpAppServerBack      0x000092b1   Section       21  mnrefproviderback.in(.constdata__ZTS18CMnrpAppServerBack)
-    .constdata__ZTS20CMnrpApplicationBack    0x000092c6   Section       23  mnrefproviderback.in(.constdata__ZTS20CMnrpApplicationBack)
-    .constdata__ZTS20CMnrpMapImageService    0x000092dd   Section       23  mnrefproviderback.in(.constdata__ZTS20CMnrpMapImageService)
-    .constdata__ZTS21CMnrpGeocodingService   0x000092f4   Section       24  mnrefproviderback.in(.constdata__ZTS21CMnrpGeocodingService)
-    .constdata__ZTS22MEikStatusPaneObserver  0x0000930c   Section       25  mnrefproviderback.in(.constdata__ZTS22MEikStatusPaneObserver)
-    .constdata__ZTV14CMnrpAppUiBack          0x00009328   Section      340  mnrefproviderback.in(.constdata__ZTV14CMnrpAppUiBack)
-    .constdata__ZTV17CMnrpDocumentBack       0x0000947c   Section      112  mnrefproviderback.in(.constdata__ZTV17CMnrpDocumentBack)
-    .constdata__ZTV18CMnrpAppServerBack      0x000094ec   Section       76  mnrefproviderback.in(.constdata__ZTV18CMnrpAppServerBack)
-    .constdata__ZTV20CMnrpApplicationBack    0x00009538   Section       80  mnrefproviderback.in(.constdata__ZTV20CMnrpApplicationBack)
-    .constdata__ZTV20CMnrpMapImageService    0x00009588   Section       64  mnrefproviderback.in(.constdata__ZTV20CMnrpMapImageService)
-    .constdata__ZTV21CMnrpGeocodingService   0x000095c8   Section       72  mnrefproviderback.in(.constdata__ZTV21CMnrpGeocodingService)
-    .constdata__ZTV22MEikStatusPaneObserver  0x00009610   Section       12  mnrefproviderback.in(.constdata__ZTV22MEikStatusPaneObserver)
-    .init_array                              0x0000961c   Section        4  mnrefproviderback.in(.init_array)
-    .ARM.exidx                               0x00009620   Section        8  uc_exe_.o(.ARM.exidx)
-    .ARM.exidx                               0x00009628   Section        8  ucppinit_aeabi.o(.ARM.exidx)
-    .data$0                                  0x00400000   Data           0  mnrefproviderback.in(.data)
-    KProcessingDelay                         0x00400000   Data           4  mnrefproviderback.in(.data)
-    .data                                    0x00400000   Section        4  mnrefproviderback.in(.data)
-
-    Global Symbols
-
-    Symbol Name                              Value     Ov Type        Size  Object(Section)
-
-    BuildAttributes$$THUMB_ISAv3$ARM_ISAv6$M$E$P$PE$A:L22$X:L11$S22$IEEE1$IW$USESV6$~STKCKD$USESV7$~SHL$OSPACE$IEEEJ$EBA8$UX$REQ8$PRES8$EABIv2 0x00000000   Number         0  anon$$obj.o ABSOLUTE
-    #<DLL>apparc{000a0000}[10003a3d].dll#<\DLL>111  - Undefined Reference
-    #<DLL>apparc{000a0000}[10003a3d].dll#<\DLL>112  - Undefined Reference
-    #<DLL>apparc{000a0000}[10003a3d].dll#<\DLL>113  - Undefined Reference
-    #<DLL>apparc{000a0000}[10003a3d].dll#<\DLL>117  - Undefined Reference
-    #<DLL>apparc{000a0000}[10003a3d].dll#<\DLL>118  - Undefined Reference
-    #<DLL>apparc{000a0000}[10003a3d].dll#<\DLL>11c  - Undefined Reference
-    #<DLL>apparc{000a0000}[10003a3d].dll#<\DLL>11d  - Undefined Reference
-    #<DLL>apparc{000a0000}[10003a3d].dll#<\DLL>11e  - Undefined Reference
-    #<DLL>apparc{000a0000}[10003a3d].dll#<\DLL>11f  - Undefined Reference
-    #<DLL>apparc{000a0000}[10003a3d].dll#<\DLL>1e  - Undefined Reference
-    #<DLL>apparc{000a0000}[10003a3d].dll#<\DLL>79  - Undefined Reference
-    #<DLL>apparc{000a0000}[10003a3d].dll#<\DLL>84  - Undefined Reference
-    #<DLL>apparc{000a0000}[10003a3d].dll#<\DLL>ab  - Undefined Reference
-    #<DLL>apparc{000a0000}[10003a3d].dll#<\DLL>c0  - Undefined Reference
-    #<DLL>apparc{000a0000}[10003a3d].dll#<\DLL>c2  - Undefined Reference
-    #<DLL>apparc{000a0000}[10003a3d].dll#<\DLL>ca  - Undefined Reference
-    #<DLL>apparc{000a0000}[10003a3d].dll#<\DLL>de  - Undefined Reference
-    #<DLL>apparc{000a0000}[10003a3d].dll#<\DLL>e8  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>46c  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>546  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>547  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>556  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>81  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>82  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>83  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>b68  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>b6a  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>b6c  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>b6d  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>b6e  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>b70  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>b71  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>b72  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>b73  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>b74  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>b76  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>b77  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>b7a  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>bb1  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>bb5  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>c6  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>c7  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>c9  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>ce  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>d3  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>d5  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>d6  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>d7  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>d8  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>d9  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>dc  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>ef2  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>f16  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>f1c  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>fb5  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>fbe  - Undefined Reference
-    #<DLL>bafl{000a0000}[10003a0f].dll#<\DLL>2b  - Undefined Reference
-    #<DLL>bafl{000a0000}[10003a0f].dll#<\DLL>62  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>15f  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>163  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>27e  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>27f  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>298  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>2a4  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>2a5  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>64  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>65  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>7f  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>80  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>b6  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>d2  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>d4  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>dc  - Undefined Reference
-    #<DLL>drtaeabi{000a0000}.dll#<\DLL>90     - Undefined Reference
-    #<DLL>drtaeabi{000a0000}.dll#<\DLL>9e     - Undefined Reference
-    #<DLL>drtaeabi{000a0000}.dll#<\DLL>9f     - Undefined Reference
-    #<DLL>drtaeabi{000a0000}.dll#<\DLL>b4     - Undefined Reference
-    #<DLL>drtaeabi{000a0000}.dll#<\DLL>b6     - Undefined Reference
-    #<DLL>drtaeabi{000a0000}.dll#<\DLL>b7     - Undefined Reference
-    #<DLL>drtaeabi{000a0000}.dll#<\DLL>b8     - Undefined Reference
-    #<DLL>drtaeabi{000a0000}.dll#<\DLL>bd     - Undefined Reference
-    #<DLL>drtaeabi{000a0000}.dll#<\DLL>cc     - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>12  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>123  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>125  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>126  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>127  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>128  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>129  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>12a  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>12b  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>12e  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>13d  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>14  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>160  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>186  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>188  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>18a  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>19  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>1a  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>1b  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>1c  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>1d  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>1d3  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>1df  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>1e  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>1ea  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>1f  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>1fa  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>20b  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>214  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>215  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>216  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>217  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>218  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>219  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>235  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>25  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>3d  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>3e  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>3f  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>40  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>43  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>48  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>49  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>4a  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>4b  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>4d  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>4e  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>4f  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>8d  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>8e  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>8f  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>90  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>93  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>98  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>9b  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>9e  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>9f  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>a6  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>a9  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>ab  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>af  - Undefined Reference
-    #<DLL>eposlandmarks{000a0000}[101fdf8a].dll#<\DLL>41  - Undefined Reference
-    #<DLL>eposlandmarks{000a0000}[101fdf8a].dll#<\DLL>44  - Undefined Reference
-    #<DLL>eposlandmarks{000a0000}[101fdf8a].dll#<\DLL>c  - Undefined Reference
-    #<DLL>eposlandmarks{000a0000}[101fdf8a].dll#<\DLL>d  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>1d7  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>1da  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>1e1  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>249  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>265  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>281  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>289  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>28a  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>28c  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>28e  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>29d  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>2a7  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>2a9  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>346  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>440  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>45c  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>45f  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>493  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>508  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>550  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>563  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>565  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>636  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>639  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>719  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>7cb  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>7cd  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>7cf  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>80c  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>80d  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>822  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>848  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>84b  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>84d  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>853  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>cb  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>cd  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>cf  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>d0  - Undefined Reference
-    #<DLL>gdi{000a0000}[10003b15].dll#<\DLL>138  - Undefined Reference
-    #<DLL>lbs{000a0000}[101f97b1].dll#<\DLL>17  - Undefined Reference
-    #<DLL>lbs{000a0000}[101f97b1].dll#<\DLL>cf  - Undefined Reference
-    #<DLL>mnrefproviderengine{000a0000}[03132015].dll#<\DLL>12  - Undefined Reference
-    #<DLL>mnrefproviderengine{000a0000}[03132015].dll#<\DLL>13  - Undefined Reference
-    #<DLL>mnrefproviderengine{000a0000}[03132015].dll#<\DLL>15  - Undefined Reference
-    #<DLL>mnrefproviderengine{000a0000}[03132015].dll#<\DLL>36  - Undefined Reference
-    #<DLL>mnrefproviderengine{000a0000}[03132015].dll#<\DLL>4  - Undefined Reference
-    #<DLL>mnrefproviderengine{000a0000}[03132015].dll#<\DLL>5  - Undefined Reference
-    #<DLL>mnrefproviderengine{000a0000}[03132015].dll#<\DLL>6  - Undefined Reference
-    #<DLL>mnrefproviderengine{000a0000}[03132015].dll#<\DLL>a  - Undefined Reference
-    #<DLL>mnrefproviderengine{000a0000}[03132015].dll#<\DLL>c  - Undefined Reference
-    #<DLL>mnservicelib{000a0000}[10206903].dll#<\DLL>1  - Undefined Reference
-    #<DLL>mnservicelib{000a0000}[10206903].dll#<\DLL>15  - Undefined Reference
-    #<DLL>mnservicelib{000a0000}[10206903].dll#<\DLL>16  - Undefined Reference
-    #<DLL>mnservicelib{000a0000}[10206903].dll#<\DLL>17  - Undefined Reference
-    #<DLL>mnservicelib{000a0000}[10206903].dll#<\DLL>18  - Undefined Reference
-    #<DLL>mnservicelib{000a0000}[10206903].dll#<\DLL>1b  - Undefined Reference
-    #<DLL>mnservicelib{000a0000}[10206903].dll#<\DLL>2  - Undefined Reference
-    #<DLL>mnservicelib{000a0000}[10206903].dll#<\DLL>22  - Undefined Reference
-    #<DLL>mnservicelib{000a0000}[10206903].dll#<\DLL>2d  - Undefined Reference
-    #<DLL>mnservicelib{000a0000}[10206903].dll#<\DLL>2e  - Undefined Reference
-    #<DLL>mnservicelib{000a0000}[10206903].dll#<\DLL>2f  - Undefined Reference
-    #<DLL>mnservicelib{000a0000}[10206903].dll#<\DLL>31  - Undefined Reference
-    #<DLL>mnservicelib{000a0000}[10206903].dll#<\DLL>32  - Undefined Reference
-    #<DLL>mnservicelib{000a0000}[10206903].dll#<\DLL>35  - Undefined Reference
-    #<DLL>mnservicelib{000a0000}[10206903].dll#<\DLL>38  - Undefined Reference
-    #<DLL>scppnwdl{000a0000}.dll#<\DLL>3      - Undefined Reference
-    #<DLL>ws32{000a0000}[10003b21].dll#<\DLL>d3  - Undefined Reference
-    typeinfo for CAknDocument                 - Undefined Reference
-    typeinfo for CAknAppServer                - Undefined Reference
-    typeinfo for CEikApplication              - Undefined Reference
-    typeinfo for XLeaveException              - Undefined Reference
-    typeinfo for CMnMapImageServiceBase       - Undefined Reference
-    typeinfo for CMnGeocodingServiceBase      - Undefined Reference
-    typeinfo for CBase                        - Undefined Reference
-    typeinfo for CAknAppUi                    - Undefined Reference
-    vtable for __cxxabiv1::__class_type_info  - Undefined Reference
-    vtable for __cxxabiv1::__si_class_type_info  - Undefined Reference
-    _fp_init                                  - Undefined Weak Reference
-    Image$$ER_RO$$Base                       0x00008000   Number         0  anon$$obj.o(linker$$defined$$symbols)
-    _E32Startup                              0x00008000   ARM Code     112  uc_exe_.o(.emb_text)
-    Symbian$$CPP$$Exception$$Descriptor      0x0000805c   Data           0  uc_exe_.o(.emb_text)
-    __cpp_initialize__aeabi_                 0x00008070   ARM Code      72  ucppinit_aeabi.o(.emb_text)
-    std::nothrow                             0x000080b8   ARM Code       0  ucppinit_aeabi.o(.emb_text)
-    Inline ARM to Thumb Veneer to _xxxx_call_user_invariant 0x000080b8   ARM Code       0  uc_exe_.o(.text)
-    _xxxx_call_user_invariant                0x000080c1   Thumb Code     8  uc_exe_.o(.text)
-    _xxxx_call_user_handle_exception         0x000080c9   Thumb Code     8  uc_exe_.o(.text)
-    E32Main()                                0x000080ef   Thumb Code    22  mnrefproviderback.in(.text)
-    CMnrpApplicationBack::AppDllUid() const  0x0000810d   Thumb Code     6  mnrefproviderback.in(.text)
-    CMnrpApplicationBack::CreateDocumentL()  0x00008113   Thumb Code     8  mnrefproviderback.in(.text)
-    CMnrpApplicationBack::NewAppServerL(CApaAppServer*&) 0x0000811b   Thumb Code    12  mnrefproviderback.in(.text)
-    CMnrpAppUiBack::ConstructL()             0x0000812d   Thumb Code    12  mnrefproviderback.in(.text)
-    CMnrpAppUiBack::MoveForeground()         0x00008139   Thumb Code    14  mnrefproviderback.in(.text)
-    CMnrpAppUiBack::MoveBackground()         0x00008147   Thumb Code    16  mnrefproviderback.in(.text)
-    CMnrpAppUiBack::HandleCommandL(int)      0x00008157   Thumb Code    20  mnrefproviderback.in(.text)
-    CMnrpDocumentBack::CMnrpDocumentBack(CEikApplication&) 0x00008171   Thumb Code    16  mnrefproviderback.in(.text)
-    CMnrpDocumentBack::CMnrpDocumentBack__sub_object(CEikApplication&) 0x00008171   Thumb Code     0  mnrefproviderback.in(.text)
-    CMnrpDocumentBack::NewL(CEikApplication&) 0x00008181   Thumb Code    18  mnrefproviderback.in(.text)
-    CMnrpDocumentBack::CreateAppUiL()        0x00008193   Thumb Code    24  mnrefproviderback.in(.text)
-    CMnrpAppServerBack::ConstructL()         0x000081b1   Thumb Code    12  mnrefproviderback.in(.text)
-    CMnrpAppServerBack::NewL()               0x000081bd   Thumb Code    48  mnrefproviderback.in(.text)
-    CMnrpAppServerBack::~CMnrpAppServerBack() 0x000081ed   Thumb Code    28  mnrefproviderback.in(.text)
-    CMnrpAppServerBack::~CMnrpAppServerBack__sub_object() 0x000081ed   Thumb Code     0  mnrefproviderback.in(.text)
-    CMnrpAppServerBack::~CMnrpAppServerBack__deallocating() 0x00008209   Thumb Code    16  mnrefproviderback.in(.text)
-    CMnrpAppServerBack::CreateMapImageServiceL() const 0x00008219   Thumb Code    10  mnrefproviderback.in(.text)
-    CMnrpAppServerBack::CreateGeocodingServiceL() const 0x00008223   Thumb Code    10  mnrefproviderback.in(.text)
-    CMnrpAppServerBack::CreateServiceL(TUid) const 0x0000822d   Thumb Code    32  mnrefproviderback.in(.text)
-    CleanupLandmarksArray(void*)             0x00008259   Thumb Code    48  mnrefproviderback.in(.text)
-    CleanupForeground(void*)                 0x00008289   Thumb Code     8  mnrefproviderback.in(.text)
-    CMnrpGeocodingService::ConstructL()      0x00008291   Thumb Code    20  mnrefproviderback.in(.text)
-    CMnrpGeocodingService::CMnrpGeocodingService(CMnrpEngine&) 0x000082a5   Thumb Code    16  mnrefproviderback.in(.text)
-    CMnrpGeocodingService::CMnrpGeocodingService__sub_object(CMnrpEngine&) 0x000082a5   Thumb Code     0  mnrefproviderback.in(.text)
-    CMnrpGeocodingService::NewL(CMnrpEngine&) 0x000082b5   Thumb Code    36  mnrefproviderback.in(.text)
-    CMnrpGeocodingService::~CMnrpGeocodingService() 0x000082d9   Thumb Code    46  mnrefproviderback.in(.text)
-    CMnrpGeocodingService::~CMnrpGeocodingService__sub_object() 0x000082d9   Thumb Code     0  mnrefproviderback.in(.text)
-    CMnrpGeocodingService::~CMnrpGeocodingService__deallocating() 0x00008307   Thumb Code    16  mnrefproviderback.in(.text)
-    CMnrpGeocodingService::LeaveIfBusyL()    0x00008317   Thumb Code    22  mnrefproviderback.in(.text)
-    CMnrpGeocodingService::LetUserSelectBestMatchL(const CPosLandmark&) 0x0000832d   Thumb Code   318  mnrefproviderback.in(.text)
-    CMnrpGeocodingService::FinishProcessingL() 0x0000846b   Thumb Code   130  mnrefproviderback.in(.text)
-    CMnrpGeocodingService::HandleGeocodingCompleted() 0x000084ed   Thumb Code    72  mnrefproviderback.in(.text)
-    CMnrpGeocodingService::GeocodingProcessingCallBack(void*) 0x00008535   Thumb Code    10  mnrefproviderback.in(.text)
-    CMnrpGeocodingService::StartProcessingL() 0x0000853f   Thumb Code    14  mnrefproviderback.in(.text)
-    CMnrpGeocodingService::HandleFindAddressByCoordinateL(const CPosLandmark&) 0x0000854d   Thumb Code    60  mnrefproviderback.in(.text)
-    CMnrpGeocodingService::HandleFindCoordinateByAddressL(const CPosLandmark&) 0x00008589   Thumb Code    60  mnrefproviderback.in(.text)
-    CMnrpGeocodingService::HandleFindCoordinateByAddressL(const TDesC16&) 0x000085c5   Thumb Code    74  mnrefproviderback.in(.text)
-    CMnrpGeocodingService::DoCancel()        0x0000860f   Thumb Code    16  mnrefproviderback.in(.text)
-    CMnrpMapImageService::CreateFonts()      0x00008635   Thumb Code    64  mnrefproviderback.in(.text)
-    CMnrpMapImageService::ConstructL()       0x00008675   Thumb Code    44  mnrefproviderback.in(.text)
-    CMnrpMapImageService::CMnrpMapImageService(CMnrpEngine&) 0x000086a1   Thumb Code    20  mnrefproviderback.in(.text)
-    CMnrpMapImageService::CMnrpMapImageService__sub_object(CMnrpEngine&) 0x000086a1   Thumb Code     0  mnrefproviderback.in(.text)
-    CMnrpMapImageService::NewL(CMnrpEngine&) 0x000086b5   Thumb Code    36  mnrefproviderback.in(.text)
-    CMnrpMapImageService::DestroyFonts()     0x000086d9   Thumb Code    32  mnrefproviderback.in(.text)
-    CMnrpMapImageService::~CMnrpMapImageService() 0x000086f9   Thumb Code    60  mnrefproviderback.in(.text)
-    CMnrpMapImageService::~CMnrpMapImageService__sub_object() 0x000086f9   Thumb Code     0  mnrefproviderback.in(.text)
-    CMnrpMapImageService::~CMnrpMapImageService__deallocating() 0x00008735   Thumb Code    16  mnrefproviderback.in(.text)
-    CMnrpMapImageService::LeaveIfBusyL()     0x00008745   Thumb Code    24  mnrefproviderback.in(.text)
-    CMnrpMapImageService::RenderL()          0x0000875d   Thumb Code   116  mnrefproviderback.in(.text)
-    CMnrpMapImageService::FinishProcessingL() 0x000087d1   Thumb Code    52  mnrefproviderback.in(.text)
-    CMnrpMapImageService::HandleMapImageCompletedL() 0x00008805   Thumb Code    80  mnrefproviderback.in(.text)
-    CMnrpMapImageService::MapImageProcessingCallBack(void*) 0x00008855   Thumb Code    50  mnrefproviderback.in(.text)
-    CMnrpMapImageService::StartProcessingL() 0x00008887   Thumb Code    22  mnrefproviderback.in(.text)
-    CMnrpMapImageService::HandleRenderingL() 0x0000889d   Thumb Code    24  mnrefproviderback.in(.text)
-    CMnrpMapImageService::DoCancel()         0x000088b5   Thumb Code    18  mnrefproviderback.in(.text)
-    Inline ARM to Thumb Veneer to RunThread  0x000088e0   ARM Code       0  uc_exe.o(.text)
-    RunThread                                0x000088e9   Thumb Code    36  uc_exe.o(.text)
-    CallThrdProcEntry                        0x0000890c   ARM Code     116  callfirstprocessfn.o(.text)
-    __DLL_Export_Table__                     0x00008984   ARM Code       4  dllexp.o(.text)
-    CActive::Cancel()                        0x000089d0   ARM Code       0  euser{000a0000}-1088.o(StubCode)
-    HBufC16::Des()                           0x000089d8   ARM Code       0  euser{000a0000}-1116.o(StubCode)
-    HBufC16::NewLC(int)                      0x000089e0   ARM Code       0  euser{000a0000}-1119.o(StubCode)
-    TPtrC16::TPtrC16(const TDesC16&)         0x000089e8   ARM Code       0  euser{000a0000}-1171.o(StubCode)
-    CServer2::DoCancel()                     0x000089f0   ARM Code       0  euser{000a0000}-1288.o(StubCode)
-    CPeriodic::NewL(int)                     0x000089f8   ARM Code       0  euser{000a0000}-1379.o(StubCode)
-    CPeriodic::Start(TTimeIntervalMicroSeconds32, TTimeIntervalMicroSeconds32, TCallBack) 0x00008a00   ARM Code       0  euser{000a0000}-1381.o(StubCode)
-    RPointerArrayBase::At(int) const         0x00008a08   ARM Code       0  euser{000a0000}-1590.o(StubCode)
-    RPointerArrayBase::Count() const         0x00008a10   ARM Code       0  euser{000a0000}-1593.o(StubCode)
-    TDesC16::AllocL() const                  0x00008a18   ARM Code       0  euser{000a0000}-1817.o(StubCode)
-    CPolicyServer::CustomFailureActionL(const RMessage2&, int, const TSecurityInfo&) 0x00008a20   ARM Code       0  euser{000a0000}-1995.o(StubCode)
-    CPolicyServer::RunL()                    0x00008a28   ARM Code       0  euser{000a0000}-1997.o(StubCode)
-    CPolicyServer::RunError(int)             0x00008a30   ARM Code       0  euser{000a0000}-1999.o(StubCode)
-    CleanupStack::PopAndDestroy()            0x00008a38   ARM Code       0  euser{000a0000}-203.o(StubCode)
-    CleanupStack::Pop()                      0x00008a40   ARM Code       0  euser{000a0000}-205.o(StubCode)
-    User::MarkCleanupStack()                 0x00008a48   ARM Code       0  euser{000a0000}-2060.o(StubCode)
-    User::UnMarkCleanupStack(TTrapHandler*)  0x00008a50   ARM Code       0  euser{000a0000}-2061.o(StubCode)
-    CleanupStack::PushL(TCleanupItem)        0x00008a58   ARM Code       0  euser{000a0000}-207.o(StubCode)
-    CleanupStack::PushL(CBase*)              0x00008a60   ARM Code       0  euser{000a0000}-208.o(StubCode)
-    XLeaveException::GetReason() const       0x00008a68   ARM Code       0  euser{000a0000}-2082.o(StubCode)
-    CPolicyServer::Extension_(unsigned, void*&, void*) 0x00008a70   ARM Code       0  euser{000a0000}-2120.o(StubCode)
-    CBase::Extension_(unsigned, void*&, void*) 0x00008a78   ARM Code       0  euser{000a0000}-2123.o(StubCode)
-    CSession2::Extension_(unsigned, void*&, void*) 0x00008a80   ARM Code       0  euser{000a0000}-2131.o(StubCode)
-    RPointerArrayBase::Reset()               0x00008a88   ARM Code       0  euser{000a0000}-471.o(StubCode)
-    RPointerArrayBase::Remove(int)           0x00008a90   ARM Code       0  euser{000a0000}-474.o(StubCode)
-    RPointerArrayBase::RPointerArrayBase()   0x00008a98   ARM Code       0  euser{000a0000}-481.o(StubCode)
-    User::HandleException(void*)             0x00008aa0   ARM Code       0  euser{000a0000}-613.o(StubCode)
-    User::Leave(int)                         0x00008aa8   ARM Code       0  euser{000a0000}-649.o(StubCode)
-    User::AllocZ(int)                        0x00008ab0   ARM Code       0  euser{000a0000}-652.o(StubCode)
-    User::AllocZL(int)                       0x00008ab8   ARM Code       0  euser{000a0000}-654.o(StubCode)
-    User::Invariant()                        0x00008ac0   ARM Code       0  euser{000a0000}-669.o(StubCode)
-    CIdle::NewL(int)                         0x00008ac8   ARM Code       0  euser{000a0000}-679.o(StubCode)
-    CIdle::Start(TCallBack)                  0x00008ad0   ARM Code       0  euser{000a0000}-681.o(StubCode)
-    TRect::TRect(const TSize&)               0x00008ad8   ARM Code       0  euser{000a0000}-838.o(StubCode)
-    CDesC16Array::AppendL(const TDesC16&)    0x00008ae0   ARM Code       0  bafl{000a0000}-43.o(StubCode)
-    CDesC16ArraySeg::CDesC16ArraySeg(int)    0x00008ae8   ARM Code       0  bafl{000a0000}-98.o(StubCode)
-    MCoeMessageObserver::MCoeMessageObserver_Reserved_1() 0x00008af0   ARM Code       0  cone{000a0000}-100.o(StubCode)
-    MCoeMessageObserver::MCoeMessageObserver_Reserved_2() 0x00008af8   ARM Code       0  cone{000a0000}-101.o(StubCode)
-    MCoeViewDeactivationObserver::MCoeViewDeactivationObserver_Reserved_1() 0x00008b00   ARM Code       0  cone{000a0000}-127.o(StubCode)
-    MCoeViewDeactivationObserver::MCoeViewDeactivationObserver_Reserved_2() 0x00008b08   ARM Code       0  cone{000a0000}-128.o(StubCode)
-    CCoeEnv::Static()                        0x00008b10   ARM Code       0  cone{000a0000}-182.o(StubCode)
-    CCoeAppUi::HandleKeyEventL(const TKeyEvent&, TEventCode) 0x00008b18   ARM Code       0  cone{000a0000}-210.o(StubCode)
-    CCoeAppUi::SetAndDrawFocus(int)          0x00008b20   ARM Code       0  cone{000a0000}-212.o(StubCode)
-    CCoeAppUi::HandleSwitchOnEventL(CCoeControl*) 0x00008b28   ARM Code       0  cone{000a0000}-220.o(StubCode)
-    CCoeAppUi::HelpContextL() const          0x00008b30   ARM Code       0  cone{000a0000}-351.o(StubCode)
-    CCoeAppUi::InputCapabilities() const     0x00008b38   ARM Code       0  cone{000a0000}-355.o(StubCode)
-    MObjectProvider::MObjectProvider_Reserved1() 0x00008b40   ARM Code       0  cone{000a0000}-638.o(StubCode)
-    MObjectProvider::MObjectProvider_Reserved2() 0x00008b48   ARM Code       0  cone{000a0000}-639.o(StubCode)
-    MCoeViewDeactivationObserver::MCoeViewDeactivationObserver__sub_object() 0x00008b50   ARM Code       0  cone{000a0000}-664.o(StubCode)
-    CCoeAppUi::FrameworkCallsRendezvous() const 0x00008b58   ARM Code       0  cone{000a0000}-676.o(StubCode)
-    CCoeAppUi::CCoeAppUi_Reserved_2()        0x00008b60   ARM Code       0  cone{000a0000}-677.o(StubCode)
-    CApaDocument::Capability() const         0x00008b68   ARM Code       0  apparc{000a0000}-121.o(StubCode)
-    CApaApplication::AppFullName() const     0x00008b70   ARM Code       0  apparc{000a0000}-132.o(StubCode)
-    TApaApplicationFactory::TApaApplicationFactory(CApaApplication*(*)()) 0x00008b78   ARM Code       0  apparc{000a0000}-171.o(StubCode)
-    CApaAppServer::CustomSecurityCheckL(const RMessage2&, int&, TSecurityInfo&) 0x00008b80   ARM Code       0  apparc{000a0000}-192.o(StubCode)
-    CApaAppServer::CApaAppServer()           0x00008b88   ARM Code       0  apparc{000a0000}-194.o(StubCode)
-    CApaAppServiceBase::SecurityCheckL(const RMessage2&, int&, TSecurityInfo&) 0x00008b90   ARM Code       0  apparc{000a0000}-202.o(StubCode)
-    CApaAppServer::NewSessionL(const TVersion&, const RMessage2&) const 0x00008b98   ARM Code       0  apparc{000a0000}-222.o(StubCode)
-    CApaAppServiceBase::ExtensionInterface(TUid, void*&) 0x00008ba0   ARM Code       0  apparc{000a0000}-232.o(StubCode)
-    CApaAppServer::CApaAppServer_Reserved1() 0x00008ba8   ARM Code       0  apparc{000a0000}-273.o(StubCode)
-    CApaAppServer::CApaAppServer_Reserved2() 0x00008bb0   ARM Code       0  apparc{000a0000}-274.o(StubCode)
-    CApaAppServer::DoConnect(const RMessage2&) 0x00008bb8   ARM Code       0  apparc{000a0000}-275.o(StubCode)
-    CApaApplication::CApaApplication_Reserved1() 0x00008bc0   ARM Code       0  apparc{000a0000}-279.o(StubCode)
-    CApaApplication::CApaApplication_Reserved2() 0x00008bc8   ARM Code       0  apparc{000a0000}-280.o(StubCode)
-    CApaAppServiceBase::Disconnect(const RMessage2&) 0x00008bd0   ARM Code       0  apparc{000a0000}-284.o(StubCode)
-    CApaAppServiceBase::CountResources()     0x00008bd8   ARM Code       0  apparc{000a0000}-285.o(StubCode)
-    CApaAppServiceBase::CApaAppServiceBase_Reserved1() 0x00008be0   ARM Code       0  apparc{000a0000}-286.o(StubCode)
-    CApaAppServiceBase::CApaAppServiceBase_Reserved2() 0x00008be8   ARM Code       0  apparc{000a0000}-287.o(StubCode)
-    CApaDocument::GlassPictureL()            0x00008bf0   ARM Code       0  apparc{000a0000}-30.o(StubCode)
-    thunk{-20} to CEikDocument::SaveL(MSaveObserver::TSaveType) 0x00008bf8   ARM Code       0  eikcore{000a0000}-141.o(StubCode)
-    CEikAppUi::Reserved_3()                  0x00008c00   ARM Code       0  eikcore{000a0000}-142.o(StubCode)
-    CEikAppUi::Reserved_4()                  0x00008c08   ARM Code       0  eikcore{000a0000}-143.o(StubCode)
-    CEikAppUi::CreateFileL(const TDesC16&)   0x00008c10   ARM Code       0  eikcore{000a0000}-144.o(StubCode)
-    CEikAppUi::SetEmphasis(CCoeControl*, int) 0x00008c18   ARM Code       0  eikcore{000a0000}-147.o(StubCode)
-    CEikAppUi::HandleMessageL(unsigned long, TUid, const TDesC8&) 0x00008c20   ARM Code       0  eikcore{000a0000}-152.o(StubCode)
-    CEikAppUi::ProcessMessageL(TUid, const TDesC8&) 0x00008c28   ARM Code       0  eikcore{000a0000}-155.o(StubCode)
-    CEikAppUi::HandleModelChangeL()          0x00008c30   ARM Code       0  eikcore{000a0000}-158.o(StubCode)
-    CEikAppUi::HandleSideBarMenuL(int, const TPoint&, int, const CEikHotKeyTable*) 0x00008c38   ARM Code       0  eikcore{000a0000}-159.o(StubCode)
-    CEikAppUi::StopDisplayingMenuBar()       0x00008c40   ARM Code       0  eikcore{000a0000}-166.o(StubCode)
-    CEikAppUi::ProcessCommandParametersL(TApaCommand, TBuf<(int)256>&, const TDesC8&) 0x00008c48   ARM Code       0  eikcore{000a0000}-169.o(StubCode)
-    CEikAppUi::ReportResourceChangedToAppL(int) 0x00008c50   ARM Code       0  eikcore{000a0000}-171.o(StubCode)
-    CEikAppUi::OpenFileL(const TDesC16&)     0x00008c58   ARM Code       0  eikcore{000a0000}-175.o(StubCode)
-    CEikDocument::Reserved_2()               0x00008c60   ARM Code       0  eikcore{000a0000}-18.o(StubCode)
-    CEikDocument::NewDocumentL()             0x00008c68   ARM Code       0  eikcore{000a0000}-20.o(StubCode)
-    CEikDocument::UpdateTaskNameL(CApaWindowGroupName*) 0x00008c70   ARM Code       0  eikcore{000a0000}-25.o(StubCode)
-    CEikDocument::CreateFileStoreLC(RFs&, const TDesC16&) 0x00008c78   ARM Code       0  eikcore{000a0000}-26.o(StubCode)
-    CEikDocument::EditL(MApaEmbeddedDocObserver*, int) 0x00008c80   ARM Code       0  eikcore{000a0000}-27.o(StubCode)
-    CEikDocument::SaveL(MSaveObserver::TSaveType) 0x00008c88   ARM Code       0  eikcore{000a0000}-28.o(StubCode)
-    CEikDocument::SaveL()                    0x00008c90   ARM Code       0  eikcore{000a0000}-29.o(StubCode)
-    CEikDocument::HasChanged() const         0x00008c98   ARM Code       0  eikcore{000a0000}-291.o(StubCode)
-    CEikDocument::ExternalizeL(RWriteStream&) const 0x00008ca0   ARM Code       0  eikcore{000a0000}-293.o(StubCode)
-    CEikDocument::StoreL(CStreamStore&, CStreamDictionary&) const 0x00008ca8   ARM Code       0  eikcore{000a0000}-294.o(StubCode)
-    CEikDocument::IsEmpty() const            0x00008cb0   ARM Code       0  eikcore{000a0000}-295.o(StubCode)
-    CEikApplication::Capability(TDes8&) const 0x00008cb8   ARM Code       0  eikcore{000a0000}-296.o(StubCode)
-    CEikApplication::OpenIniFileLC(RFs&) const 0x00008cc0   ARM Code       0  eikcore{000a0000}-297.o(StubCode)
-    CEikApplication::BitmapStoreName() const 0x00008cc8   ARM Code       0  eikcore{000a0000}-298.o(StubCode)
-    CEikApplication::ResourceFileName() const 0x00008cd0   ARM Code       0  eikcore{000a0000}-299.o(StubCode)
-    CEikDocument::PrintL(const CStreamStore&) 0x00008cd8   ARM Code       0  eikcore{000a0000}-30.o(StubCode)
-    CEikApplication::GetDefaultDocumentFileName(TBuf<(int)256>&) const 0x00008ce0   ARM Code       0  eikcore{000a0000}-302.o(StubCode)
-    CEikDocument::RestoreL(const CStreamStore&, const CStreamDictionary&) 0x00008ce8   ARM Code       0  eikcore{000a0000}-31.o(StubCode)
-    CEikAppUi::ValidFileType(TUid) const     0x00008cf0   ARM Code       0  eikcore{000a0000}-317.o(StubCode)
-    CEikonEnv::DenseFont() const             0x00008cf8   ARM Code       0  eikcore{000a0000}-352.o(StubCode)
-    CEikDocument::~CEikDocument__sub_object() 0x00008d00   ARM Code       0  eikcore{000a0000}-37.o(StubCode)
-    thunk{-36} to CEikAppUi::HandleMessageL(unsigned long, TUid, const TDesC8&) 0x00008d08   ARM Code       0  eikcore{000a0000}-390.o(StubCode)
-    thunk{-40} to CEikAppUi::MopNext()       0x00008d10   ARM Code       0  eikcore{000a0000}-392.o(StubCode)
-    EikStart::RunApplication(TApaApplicationFactory) 0x00008d18   ARM Code       0  eikcore{000a0000}-394.o(StubCode)
-    CEikAppServer::ExtensionInterface(TUid, void*&) 0x00008d20   ARM Code       0  eikcore{000a0000}-467.o(StubCode)
-    CEikAppUi::MopNext()                     0x00008d28   ARM Code       0  eikcore{000a0000}-479.o(StubCode)
-    thunk{-24} to CEikAppUi::HandleSideBarMenuL(int, const TPoint&, int, const CEikHotKeyTable*) 0x00008d30   ARM Code       0  eikcore{000a0000}-490.o(StubCode)
-    CEikAppUi::ProcessCommandParametersL(CApaCommandLine&) 0x00008d38   ARM Code       0  eikcore{000a0000}-506.o(StubCode)
-    CEikAppServer::CreateServiceSecurityCheckL(TUid, const RMessage2&, int&, TSecurityInfo&) 0x00008d40   ARM Code       0  eikcore{000a0000}-523.o(StubCode)
-    CEikApplication::CEikApplication_Reserved1() 0x00008d48   ARM Code       0  eikcore{000a0000}-532.o(StubCode)
-    CEikApplication::CEikApplication_Reserved2() 0x00008d50   ARM Code       0  eikcore{000a0000}-533.o(StubCode)
-    MEikMenuObserver::Reserved_2_MenuObserver() 0x00008d58   ARM Code       0  eikcore{000a0000}-534.o(StubCode)
-    MEikMenuObserver::CreateCustomCommandControlL(int) 0x00008d60   ARM Code       0  eikcore{000a0000}-535.o(StubCode)
-    MEikMenuObserver::MEikCommandObserver_Reserved1() 0x00008d68   ARM Code       0  eikcore{000a0000}-536.o(StubCode)
-    MEikMenuObserver::MEikCommandObserver_Reserved2() 0x00008d70   ARM Code       0  eikcore{000a0000}-537.o(StubCode)
-    CEikDocument::ValidatePasswordL() const  0x00008d78   ARM Code       0  eikcore{000a0000}-565.o(StubCode)
-    CEikApplication::CreateDocumentL(CApaProcess*) 0x00008d80   ARM Code       0  eikcore{000a0000}-61.o(StubCode)
-    CEikApplication::PreDocConstructL()      0x00008d88   ARM Code       0  eikcore{000a0000}-62.o(StubCode)
-    thunk{-24} to CEikAppUi::SetEmphasis(CCoeControl*, int) 0x00008d90   ARM Code       0  eikcore{000a0000}-63.o(StubCode)
-    CEikApplication::CEikApplication__sub_object() 0x00008d98   ARM Code       0  eikcore{000a0000}-64.o(StubCode)
-    CEikApplication::~CEikApplication__sub_object() 0x00008da0   ARM Code       0  eikcore{000a0000}-67.o(StubCode)
-    MEikMenuObserver::RestoreMenuL(CCoeControl*, int, MEikMenuObserver::TMenuType) 0x00008da8   ARM Code       0  eikcore{000a0000}-72.o(StubCode)
-    MEikMenuObserver::OfferKeyToAppL(const TKeyEvent&, TEventCode) 0x00008db0   ARM Code       0  eikcore{000a0000}-73.o(StubCode)
-    MEikMenuObserver::DynInitMenuBarL(int, CEikMenuBar*) 0x00008db8   ARM Code       0  eikcore{000a0000}-74.o(StubCode)
-    MEikMenuObserver::DynInitMenuPaneL(int, CEikMenuPane*) 0x00008dc0   ARM Code       0  eikcore{000a0000}-75.o(StubCode)
-    MEikMenuObserver::CheckHotKeyNotDimmedL(int) 0x00008dc8   ARM Code       0  eikcore{000a0000}-77.o(StubCode)
-    MEikMenuObserver::Reserved_1_MenuObserver() 0x00008dd0   ARM Code       0  eikcore{000a0000}-78.o(StubCode)
-    MEikMenuObserver::HandleAttemptDimmedSelectionL(int) 0x00008dd8   ARM Code       0  eikcore{000a0000}-79.o(StubCode)
-    RWindowTreeNode::SetOrdinalPosition(int) 0x00008de0   ARM Code       0  ws32{000a0000}-211.o(StubCode)
-    CFont::FontSpecInTwips() const           0x00008de8   ARM Code       0  gdi{000a0000}-312.o(StubCode)
-    CAknAppServiceBase::CreateL()            0x00008df0   ARM Code       0  avkon{000a0000}-1132.o(StubCode)
-    CAknDocument::OpenFileL(CFileStore*&, RFile&) 0x00008df8   ARM Code       0  avkon{000a0000}-129.o(StubCode)
-    CAknDocument::OpenFileL(int, const TDesC16&, RFs&) 0x00008e00   ARM Code       0  avkon{000a0000}-130.o(StubCode)
-    CAknDocument::CAknDocument__sub_object(CEikApplication&) 0x00008e08   ARM Code       0  avkon{000a0000}-131.o(StubCode)
-    CAknListQueryDialog::SetItemTextArray(MDesC16Array*) 0x00008e10   ARM Code       0  avkon{000a0000}-1350.o(StubCode)
-    CAknListQueryDialog::SetOwnershipType(TListBoxModelItemArrayOwnership) 0x00008e18   ARM Code       0  avkon{000a0000}-1351.o(StubCode)
-    CAknListQueryDialog::CAknListQueryDialog(int*) 0x00008e20   ARM Code       0  avkon{000a0000}-1366.o(StubCode)
-    CAknAppServer::ConstructL(const TDesC16&) 0x00008e28   ARM Code       0  avkon{000a0000}-198.o(StubCode)
-    CAknAppServer::HandleAllClientsClosed()  0x00008e30   ARM Code       0  avkon{000a0000}-199.o(StubCode)
-    CAknAppServer::~CAknAppServer()          0x00008e38   ARM Code       0  avkon{000a0000}-201.o(StubCode)
-    CAknAppUiBase::MopSupplyObject(TTypeUid) 0x00008e40   ARM Code       0  avkon{000a0000}-206.o(StubCode)
-    CAknAppUiBase::HandleResourceChangeL(int) 0x00008e48   ARM Code       0  avkon{000a0000}-211.o(StubCode)
-    CAknAppUiBase::HandleScreenDeviceChangedL() 0x00008e50   ARM Code       0  avkon{000a0000}-213.o(StubCode)
-    CAknAppUiBase::HandleApplicationSpecificEventL(int, const TWsEvent&) 0x00008e58   ARM Code       0  avkon{000a0000}-214.o(StubCode)
-    CAknAppUiBase::Exit()                    0x00008e60   ARM Code       0  avkon{000a0000}-215.o(StubCode)
-    CAknAppUiBase::SetFadedL(int)            0x00008e68   ARM Code       0  avkon{000a0000}-216.o(StubCode)
-    CAknAppUiBase::CAknAppUiBase()           0x00008e70   ARM Code       0  avkon{000a0000}-217.o(StubCode)
-    CAknAppUiBase::~CAknAppUiBase()          0x00008e78   ARM Code       0  avkon{000a0000}-220.o(StubCode)
-    CAknAppUi::HandleError(int, const SExtendedError&, TDes16&, TDes16&) 0x00008e80   ARM Code       0  avkon{000a0000}-2920.o(StubCode)
-    CAknAppUi::PrepareToExit()               0x00008e88   ARM Code       0  avkon{000a0000}-2922.o(StubCode)
-    CAknAppUi::BaseConstructL(int)           0x00008e90   ARM Code       0  avkon{000a0000}-2924.o(StubCode)
-    CAknAppUi::HandleWsEventL(const TWsEvent&, CCoeControl*) 0x00008e98   ARM Code       0  avkon{000a0000}-2925.o(StubCode)
-    CAknAppUi::ProcessCommandL(int)          0x00008ea0   ARM Code       0  avkon{000a0000}-2926.o(StubCode)
-    CAknAppUi::HandleSystemEventL(const TWsEvent&) 0x00008ea8   ARM Code       0  avkon{000a0000}-2928.o(StubCode)
-    CAknAppUi::Reserved_MtsmObject()         0x00008eb0   ARM Code       0  avkon{000a0000}-2929.o(StubCode)
-    CAknAppUi::Reserved_MtsmPosition()       0x00008eb8   ARM Code       0  avkon{000a0000}-2930.o(StubCode)
-    CAknAppUi::HandleForegroundEventL(int)   0x00008ec0   ARM Code       0  avkon{000a0000}-2931.o(StubCode)
-    CAknAppUi::HandleViewDeactivation(const TVwsViewId&, const TVwsViewId&) 0x00008ec8   ARM Code       0  avkon{000a0000}-2932.o(StubCode)
-    CAknAppUi::HandleTouchPaneSizeChange()   0x00008ed0   ARM Code       0  avkon{000a0000}-2934.o(StubCode)
-    CAknAppUi::HandleStatusPaneSizeChange()  0x00008ed8   ARM Code       0  avkon{000a0000}-2935.o(StubCode)
-    CAknAppUi::~CAknAppUi()                  0x00008ee0   ARM Code       0  avkon{000a0000}-2938.o(StubCode)
-    CAknAppServer::CreateServiceL(TUid) const 0x00008ee8   ARM Code       0  avkon{000a0000}-2993.o(StubCode)
-    CAknAppUiBase::ApplicationRect() const   0x00008ef0   ARM Code       0  avkon{000a0000}-2997.o(StubCode)
-    thunk{-100} to CAknAppUi::HandleTouchPaneSizeChange() 0x00008ef8   ARM Code       0  avkon{000a0000}-3826.o(StubCode)
-    thunk{-24} to CAknAppUi::ProcessCommandL(int) 0x00008f00   ARM Code       0  avkon{000a0000}-3862.o(StubCode)
-    thunk{-40} to CAknAppUiBase::MopSupplyObject(TTypeUid) 0x00008f08   ARM Code       0  avkon{000a0000}-3868.o(StubCode)
-    thunk{-88} to CAknAppUi::HandleStatusPaneSizeChange() 0x00008f10   ARM Code       0  avkon{000a0000}-4021.o(StubCode)
-    thunk{-92} to CAknAppUi::HandleViewDeactivation(const TVwsViewId&, const TVwsViewId&) 0x00008f18   ARM Code       0  avkon{000a0000}-4030.o(StubCode)
-    CPosLandmark::NewL(const CPosLandmark&)  0x00008f20   ARM Code       0  eposlandmarks{000a0000}-12.o(StubCode)
-    CPosLandmark::NewL()                     0x00008f28   ARM Code       0  eposlandmarks{000a0000}-13.o(StubCode)
-    CPosLandmark::GetPosition(TLocality&) const 0x00008f30   ARM Code       0  eposlandmarks{000a0000}-65.o(StubCode)
-    CPosLandmark::GetPositionField(unsigned short, TPtrC16&) const 0x00008f38   ARM Code       0  eposlandmarks{000a0000}-68.o(StubCode)
-    TLocality::TLocality()                   0x00008f40   ARM Code       0  lbs{000a0000}-207.o(StubCode)
-    TCoordinate::TCoordinate()               0x00008f48   ARM Code       0  lbs{000a0000}-23.o(StubCode)
-    CMnServiceBase::ServiceError(const RMessage2&, int) 0x00008f50   ARM Code       0  mnservicelib{000a0000}-1.o(StubCode)
-    CMnServiceBase::CompleteRequest(int)     0x00008f58   ARM Code       0  mnservicelib{000a0000}-2.o(StubCode)
-    CMnGeocodingServiceBase::BaseConstructL() 0x00008f60   ARM Code       0  mnservicelib{000a0000}-21.o(StubCode)
-    CMnGeocodingServiceBase::CompleteGeocodingRequestL(const CPosLandmark&) 0x00008f68   ARM Code       0  mnservicelib{000a0000}-22.o(StubCode)
-    CMnGeocodingServiceBase::ServiceL(const RMessage2&) 0x00008f70   ARM Code       0  mnservicelib{000a0000}-23.o(StubCode)
-    CMnGeocodingServiceBase::CMnGeocodingServiceBase__sub_object() 0x00008f78   ARM Code       0  mnservicelib{000a0000}-24.o(StubCode)
-    CMnGeocodingServiceBase::~CMnGeocodingServiceBase__sub_object() 0x00008f80   ARM Code       0  mnservicelib{000a0000}-27.o(StubCode)
-    CMnGeocodingServiceBase::Options() const 0x00008f88   ARM Code       0  mnservicelib{000a0000}-34.o(StubCode)
-    CMnMapImageServiceBase::BaseConstructL() 0x00008f90   ARM Code       0  mnservicelib{000a0000}-45.o(StubCode)
-    CMnMapImageServiceBase::MapImageParams() 0x00008f98   ARM Code       0  mnservicelib{000a0000}-46.o(StubCode)
-    CMnMapImageServiceBase::CompleteRendering() 0x00008fa0   ARM Code       0  mnservicelib{000a0000}-47.o(StubCode)
-    CMnMapImageServiceBase::ServiceL(const RMessage2&) 0x00008fa8   ARM Code       0  mnservicelib{000a0000}-49.o(StubCode)
-    CMnMapImageServiceBase::CMnMapImageServiceBase__sub_object() 0x00008fb0   ARM Code       0  mnservicelib{000a0000}-50.o(StubCode)
-    CMnMapImageServiceBase::~CMnMapImageServiceBase__sub_object() 0x00008fb8   ARM Code       0  mnservicelib{000a0000}-53.o(StubCode)
-    CMnMapImageServiceBase::TargetBitmap() const 0x00008fc0   ARM Code       0  mnservicelib{000a0000}-56.o(StubCode)
-    CMnrpEngine::BestCoordToAddressMatchesL(const TCoordinate&, RPointerArray<CPosLandmark>&, int) 0x00008fc8   ARM Code       0  mnrefproviderengine{000a0000}-10.o(StubCode)
-    CMnrpEngine::NewL()                      0x00008fd0   ARM Code       0  mnrefproviderengine{000a0000}-12.o(StubCode)
-    CMnrpMapModel::UpdateModelL(const CMnrpMapImageService&) 0x00008fd8   ARM Code       0  mnrefproviderengine{000a0000}-18.o(StubCode)
-    CMnrpMapModel::SetScreenSize(TSize)      0x00008fe0   ARM Code       0  mnrefproviderengine{000a0000}-19.o(StubCode)
-    CMnrpMapModel::NewL(CMnrpEngine&)        0x00008fe8   ARM Code       0  mnrefproviderengine{000a0000}-21.o(StubCode)
-    CMnrpEngine::AddressToCoordLC(const CPosLandmark&) 0x00008ff0   ARM Code       0  mnrefproviderengine{000a0000}-4.o(StubCode)
-    CMnrpEngine::AddressToCoordLC(const TDesC16&) 0x00008ff8   ARM Code       0  mnrefproviderengine{000a0000}-5.o(StubCode)
-    CMnrpMapModel::RenderL(CFbsBitmap&, TRect, CFont*, CFont*) const 0x00009000   ARM Code       0  mnrefproviderengine{000a0000}-54.o(StubCode)
-    CMnrpEngine::CoordToAddressLC(const TCoordinate&) 0x00009008   ARM Code       0  mnrefproviderengine{000a0000}-6.o(StubCode)
-    __aeabi_memclr4                          0x00009010   ARM Code       0  drtaeabi{000a0000}-144.o(StubCode)
-    __aeabi_unwind_cpp_pr0                   0x00009018   ARM Code       0  drtaeabi{000a0000}-158.o(StubCode)
-    __aeabi_unwind_cpp_pr1                   0x00009020   ARM Code       0  drtaeabi{000a0000}-159.o(StubCode)
-    __cxa_begin_catch                        0x00009028   ARM Code       0  drtaeabi{000a0000}-180.o(StubCode)
-    __cxa_call_unexpected                    0x00009030   ARM Code       0  drtaeabi{000a0000}-182.o(StubCode)
-    __cxa_end_catch                          0x00009038   ARM Code       0  drtaeabi{000a0000}-183.o(StubCode)
-    __cxa_end_cleanup                        0x00009040   ARM Code       0  drtaeabi{000a0000}-184.o(StubCode)
-    __cxa_pure_virtual                       0x00009048   ARM Code       0  drtaeabi{000a0000}-189.o(StubCode)
-    operator delete (void*)                  0x00009050   ARM Code       0  scppnwdl{000a0000}-3.o(StubCode)
-    UserHeap::SetupThreadHeap(int, SStdEpocThreadCreateInfo&) 0x00009058   ARM Code       0  euser{000a0000}-1360.o(StubCode)
-    User::Exit(int)                          0x00009060   ARM Code       0  euser{000a0000}-641.o(StubCode)
-    User::InitProcess()                      0x00009068   ARM Code       0  euser{000a0000}-585.o(StubCode)
-    User::Panic(const TDesC16&, int)         0x00009070   ARM Code       0  euser{000a0000}-650.o(StubCode)
-    TCppRTExceptionsGlobals::TCppRTExceptionsGlobals() 0x00009078   ARM Code       0  drtaeabi{000a0000}-204.o(StubCode)
-    CApaDocument::DetachFromStoreL(CPicture::TDetach) 0x00009081   Thumb Code     2  mnrefproviderback.in(i._ZN12CApaDocument16DetachFromStoreLEN8CPicture7TDetachE)
-    CMnrpAppUiBack::CMnrpAppUiBack()         0x00009085   Thumb Code    50  mnrefproviderback.in(i._ZN14CMnrpAppUiBackC1Ev)
-    CMnrpAppUiBack::CMnrpAppUiBack__sub_object() 0x00009085   Thumb Code     0  mnrefproviderback.in(i._ZN14CMnrpAppUiBackC1Ev)
-    CMnrpAppUiBack::~CMnrpAppUiBack__deallocating() 0x000090cb   Thumb Code    16  mnrefproviderback.in(i._ZN14CMnrpAppUiBackD0Ev)
-    CMnrpAppUiBack::~CMnrpAppUiBack()        0x000090db   Thumb Code     8  mnrefproviderback.in(i._ZN14CMnrpAppUiBackD1Ev)
-    CMnrpAppUiBack::~CMnrpAppUiBack__sub_object() 0x000090db   Thumb Code     0  mnrefproviderback.in(i._ZN14CMnrpAppUiBackD1Ev)
-    CMnrpDocumentBack::~CMnrpDocumentBack__deallocating() 0x000090e3   Thumb Code    16  mnrefproviderback.in(i._ZN17CMnrpDocumentBackD0Ev)
-    CMnrpDocumentBack::~CMnrpDocumentBack()  0x000090f3   Thumb Code     8  mnrefproviderback.in(i._ZN17CMnrpDocumentBackD1Ev)
-    CMnrpDocumentBack::~CMnrpDocumentBack__sub_object() 0x000090f3   Thumb Code     0  mnrefproviderback.in(i._ZN17CMnrpDocumentBackD1Ev)
-    CMnrpApplicationBack::~CMnrpApplicationBack__deallocating() 0x000090fb   Thumb Code    16  mnrefproviderback.in(i._ZN20CMnrpApplicationBackD0Ev)
-    CMnrpApplicationBack::~CMnrpApplicationBack() 0x0000910b   Thumb Code     8  mnrefproviderback.in(i._ZN20CMnrpApplicationBackD1Ev)
-    CMnrpApplicationBack::~CMnrpApplicationBack__sub_object() 0x0000910b   Thumb Code     0  mnrefproviderback.in(i._ZN20CMnrpApplicationBackD1Ev)
-    CBase::operator new(unsigned)            0x00009113   Thumb Code     8  mnrefproviderback.in(i._ZN5CBasenwEj)
-    RPointerArray<CPosLandmark>::Count() const 0x0000911b   Thumb Code     8  mnrefproviderback.in(t._ZNK13RPointerArrayI12CPosLandmarkE5CountEv)
-    typeinfo for CMnrpAppUiBack              0x0000923c   Data          12  mnrefproviderback.in(.constdata__ZTI14CMnrpAppUiBack)
-    typeinfo for CMnrpDocumentBack           0x00009248   Data          12  mnrefproviderback.in(.constdata__ZTI17CMnrpDocumentBack)
-    typeinfo for CMnrpAppServerBack          0x00009254   Data          12  mnrefproviderback.in(.constdata__ZTI18CMnrpAppServerBack)
-    typeinfo for CMnrpApplicationBack        0x00009260   Data          12  mnrefproviderback.in(.constdata__ZTI20CMnrpApplicationBack)
-    typeinfo for CMnrpMapImageService        0x0000926c   Data          12  mnrefproviderback.in(.constdata__ZTI20CMnrpMapImageService)
-    typeinfo for CMnrpGeocodingService       0x00009278   Data          12  mnrefproviderback.in(.constdata__ZTI21CMnrpGeocodingService)
-    typeinfo for MEikStatusPaneObserver      0x00009284   Data           8  mnrefproviderback.in(.constdata__ZTI22MEikStatusPaneObserver)
-    typeinfo name for CMnrpAppUiBack         0x0000928c   Data          17  mnrefproviderback.in(.constdata__ZTS14CMnrpAppUiBack)
-    typeinfo name for CMnrpDocumentBack      0x0000929d   Data          20  mnrefproviderback.in(.constdata__ZTS17CMnrpDocumentBack)
-    typeinfo name for CMnrpAppServerBack     0x000092b1   Data          21  mnrefproviderback.in(.constdata__ZTS18CMnrpAppServerBack)
-    typeinfo name for CMnrpApplicationBack   0x000092c6   Data          23  mnrefproviderback.in(.constdata__ZTS20CMnrpApplicationBack)
-    typeinfo name for CMnrpMapImageService   0x000092dd   Data          23  mnrefproviderback.in(.constdata__ZTS20CMnrpMapImageService)
-    typeinfo name for CMnrpGeocodingService  0x000092f4   Data          24  mnrefproviderback.in(.constdata__ZTS21CMnrpGeocodingService)
-    typeinfo name for MEikStatusPaneObserver 0x0000930c   Data          25  mnrefproviderback.in(.constdata__ZTS22MEikStatusPaneObserver)
-    vtable for CMnrpAppUiBack                0x00009328   Data         340  mnrefproviderback.in(.constdata__ZTV14CMnrpAppUiBack)
-    vtable for CMnrpDocumentBack             0x0000947c   Data         112  mnrefproviderback.in(.constdata__ZTV17CMnrpDocumentBack)
-    vtable for CMnrpAppServerBack            0x000094ec   Data          76  mnrefproviderback.in(.constdata__ZTV18CMnrpAppServerBack)
-    vtable for CMnrpApplicationBack          0x00009538   Data          80  mnrefproviderback.in(.constdata__ZTV20CMnrpApplicationBack)
-    vtable for CMnrpMapImageService          0x00009588   Data          64  mnrefproviderback.in(.constdata__ZTV20CMnrpMapImageService)
-    vtable for CMnrpGeocodingService         0x000095c8   Data          72  mnrefproviderback.in(.constdata__ZTV21CMnrpGeocodingService)
-    vtable for MEikStatusPaneObserver        0x00009610   Data          12  mnrefproviderback.in(.constdata__ZTV22MEikStatusPaneObserver)
-    SHT$$INIT_ARRAY$$Base                    0x0000961c   Number         0  mnrefproviderback.in(.init_array)
-    .ARM.exidx$$Base                         0x00009620   Number         0  uc_exe_.o(.ARM.exidx)
-    SHT$$INIT_ARRAY$$Limit                   0x00009620   Data           0  mnrefproviderback.in(.init_array)
-    .ARM.exidx$$Limit                        0x00009750   Number         0  mnrefproviderback.in(.ARM.exidx)
-    Image$$ER_RO$$Limit                      0x00009750   Number         0  anon$$obj.o(linker$$defined$$symbols)
-
Binary file locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/data/armv5/urel/mnrefproviderback.rsc has changed
Binary file locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/data/armv5/urel/mnrefproviderback_reg.rsc has changed
Binary file locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/data/armv5/urel/mnrefproviderengine.dll has changed
--- a/locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/data/armv5/urel/mnrefproviderengine.dll.map	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1138 +0,0 @@
-ARM Linker, RVCT2.2 [Build 593]
-
-================================================================================
-
-Image Symbol Table
-
-    Local Symbols
-
-    Symbol Name                              Value     Ov Type        Size  Object(Section)
-
-    [Anonymous Symbol]                       0x00000000   Number         0  drtaeabi{000a0000}-184.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  lbs{000a0000}-28.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  AknIcon{000a0000}-15.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  scppnwdl{000a0000}-3.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  lbs{000a0000}-303.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  AknIcon{000a0000}-16.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnservicelib{000a0000}-5.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  lbs{000a0000}-304.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  AknIcon{000a0000}-21.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnservicelib{000a0000}-55.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  lbs{000a0000}-47.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  gdi{000a0000}-311.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnservicelib{000a0000}-57.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  lbs{000a0000}-48.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  gdi{000a0000}-314.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnservicelib{000a0000}-6.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  lbs{000a0000}-49.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  bitgdi{000a0000}-14.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnservicelib{000a0000}-8.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  lbs{000a0000}-7.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  bitgdi{000a0000}-44.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnservicelib{000a0000}-9.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  lbs{000a0000}-8.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eposlandmarks{000a0000}-12.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  dfpaeabi{000a0000}-12.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  lbs{000a0000}-82.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eposlandmarks{000a0000}-14.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  dfpaeabi{000a0000}-19.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  lbs{000a0000}-83.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eposlandmarks{000a0000}-15.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  dfpaeabi{000a0000}-2.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  lbs{000a0000}-87.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eposlandmarks{000a0000}-4.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  dfpaeabi{000a0000}-20.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  lbs{000a0000}-97.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eposlandmarks{000a0000}-50.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  dfpaeabi{000a0000}-22.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnservicelib{000a0000}-10.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eposlandmarks{000a0000}-51.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  dfpaeabi{000a0000}-23.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnservicelib{000a0000}-13.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eposlandmarks{000a0000}-56.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  dfpaeabi{000a0000}-24.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnservicelib{000a0000}-3.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eposlandmarks{000a0000}-6.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  dfpaeabi{000a0000}-25.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  lbs{000a0000}-180.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eposlandmarks{000a0000}-65.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  dfpaeabi{000a0000}-3.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  lbs{000a0000}-181.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eposlandmarks{000a0000}-66.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  dfpaeabi{000a0000}-36.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  lbs{000a0000}-205.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eposlandmarks{000a0000}-67.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  dfpaeabi{000a0000}-41.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  lbs{000a0000}-207.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eposlandmarks{000a0000}-68.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  dfpaeabi{000a0000}-5.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  lbs{000a0000}-21.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eposlandmarks{000a0000}-75.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  dfpaeabi{000a0000}-8.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  lbs{000a0000}-214.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eposlandmarks{000a0000}-8.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  drtaeabi{000a0000}-135.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  lbs{000a0000}-218.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eposlandmarks{000a0000}-82.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  drtaeabi{000a0000}-147.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  lbs{000a0000}-219.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  lbs{000a0000}-10.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  drtaeabi{000a0000}-158.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  lbs{000a0000}-223.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  lbs{000a0000}-13.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  drtaeabi{000a0000}-159.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  lbs{000a0000}-225.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  lbs{000a0000}-15.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  drtaeabi{000a0000}-180.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  lbs{000a0000}-226.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  lbs{000a0000}-152.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  drtaeabi{000a0000}-183.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  lbs{000a0000}-23.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  lbs{000a0000}-167.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  AknIcon{000a0000}-11.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-476.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  lbs{000a0000}-17.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-838.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-48.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-1090.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-839.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-481.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-1091.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-841.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-49.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-1094.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-936.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-50.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-1116.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-953.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-55.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-1119.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-960.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-551.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-1171.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-966.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-593.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-1172.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-968.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-649.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-120.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-973.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-654.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-1507.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-1051.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-669.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-1510.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-1059.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-81.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-1590.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-1073.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-824.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-1593.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-1074.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-826.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-1625.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-1088.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-207.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-1646.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  efsrv{000a0000}-190.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-208.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-1648.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  efsrv{000a0000}-200.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-2082.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-1649.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  efsrv{000a0000}-204.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-209.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-1651.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  efsrv{000a0000}-68.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-2123.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-1753.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  bafl{000a0000}-123.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-2125.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-1806.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  bafl{000a0000}-124.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-2128.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-1815.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  bafl{000a0000}-129.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-424.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-1821.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  bafl{000a0000}-141.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-46.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-1826.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  bafl{000a0000}-145.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-984.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-203.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  bafl{000a0000}-147.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  efsrv{000a0000}-115.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-205.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  bafl{000a0000}-59.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  efsrv{000a0000}-118.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-2060.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  bafl{000a0000}-62.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  efsrv{000a0000}-181.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-2061.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-472.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  efsrv{000a0000}-182.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-47.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-464.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-471.o ABSOLUTE
-    M:/epoc32/build/apputils/c_da81efa927799d7f/bafl_dll/armv5/udeb\VtblExports.s 0x00000000   Number         0  VtblExports.o ABSOLUTE
-    M:/epoc32/build/bitgdi/c_92c016796215bf55/bitgdi_lib/armv5/udeb\VtblExports.s 0x00000000   Number         0  VtblExports.o ABSOLUTE
-    M:/epoc32/build/compsupp/c_18558cc638e6e874/drtaeabi_dll/armv5/udeb\VtblExports.s 0x00000000   Number         0  VtblExports.o ABSOLUTE
-    M:/epoc32/build/gdi/c_5dab287815cadb7b/gdi_dll/armv5/udeb\VtblExports.s 0x00000000   Number         0  VtblExports.o ABSOLUTE
-    M:/epoc32/build/store/c_93a13d203e6d3ba7/estor_dll/armv5/udeb\VtblExports.s 0x00000000   Number         0  VtblExports.o ABSOLUTE
-    M:/epoc32/build/uigraphicsutils/c_d265b80414e63acf/egul_dll/armv5/udeb\VtblExports.s 0x00000000   Number         0  VtblExports.o ABSOLUTE
-    M:/epoc32/build/uikon/c_9cf7bef4a7562444/eikcore_dll/armv5/udeb\VtblExports.s 0x00000000   Number         0  VtblExports.o ABSOLUTE
-    M:\\sf\\os\\kernelhwsrv\\kernel\\eka\\compsupp\\rvct2_2\\ucppinit_aeabi.cpp 0x00000000   Number         0  ucppinit_aeabi.o ABSOLUTE
-    M:\sf\os\kernelhwsrv\kernel\eka\compsupp\rvct2_2\ucppinit_aeabi.cpp 0x00000000   Number         0  ucppinit_aeabi.o ABSOLUTE
-    \EPOC32\BUILD\sf\app\location\mapnavproviderrefapp\group\MNREFENGINE\ARMV5\urel\mnrefproviderengine{000a0000}.s 0x00000000   Number         0  mnrefproviderengine{000a0000}.exp ABSOLUTE
-    \EPOC32\BUILD\sf\mw\locationsrv\group\EPOS_LANDMARKSCLIENTLIBRARY\ARMV5\VtblExports.s 0x00000000   Number         0  VtblExports.o ABSOLUTE
-    \EPOC32\BUILD\sf\mw\locationsrv\group\MNCLIENTLIB\ARMV5\VtblExports.s 0x00000000   Number         0  VtblExports.o ABSOLUTE
-    \EPOC32\BUILD\sf\mw\locationsrv\group\MNSERVICELIB\ARMV5\VtblExports.s 0x00000000   Number         0  VtblExports.o ABSOLUTE
-    \EPOC32\BUILD\sf\mw\uiresources\group\AKNICON\ARMV5\VtblExports.s 0x00000000   Number         0  VtblExports.o ABSOLUTE
-    \EPOC32\BUILD\sf\os\kernelhwsrv\kernel\eka\euser\EDLL\ARMV6_ABIV1\urel\uc_dll_.cpp 0x00000000   Number         0  uc_dll_.o ABSOLUTE
-    \EPOC32\BUILD\sf\os\kernelhwsrv\kernel\eka\euser\EUSER\ARMV5\VtblExports.s 0x00000000   Number         0  VtblExports.o ABSOLUTE
-    \EPOC32\BUILD\sf\os\kernelhwsrv\userlibandfileserver\fileserver\group\EFSRV\ARMV5\VtblExports.s 0x00000000   Number         0  VtblExports.o ABSOLUTE
-    \EPOC32\BUILD\sf\os\lbs\locationmgmt\locationadmin\group\LBSAPIVARIANT2\ARMV5\VtblExports.s 0x00000000   Number         0  VtblExports.o ABSOLUTE
-    \\EPOC32\\BUILD\\sf\\os\\kernelhwsrv\\kernel\\eka\\euser\\EDLL\\ARMV6_ABIV1\\urel\\uc_dll_.cpp 0x00000000   Number         0  uc_dll_.o ABSOLUTE
-    \sf\app\location\mapnavproviderrefapp\src\mnrpengine.cpp 0x00000000   Number         0  mnrefproviderengine.in ABSOLUTE
-    \sf\app\location\mapnavproviderrefapp\src\mnrpmapmodel.cpp 0x00000000   Number         0  mnrefproviderengine.in ABSOLUTE
-    \sf\app\location\mapnavproviderrefapp\src\mnrppositionrequest.cpp 0x00000000   Number         0  mnrefproviderengine.in ABSOLUTE
-    \sf\app\location\mapnavproviderrefapp\src\mnrputils.cpp 0x00000000   Number         0  mnrefproviderengine.in ABSOLUTE
-    \sf\os\kernelhwsrv\kernel\eka\euser\epoc\arm\uc_dll.cpp 0x00000000   Number         0  uc_dll.o ABSOLUTE
-    .emb_text                                0x00008000   Section       40  uc_dll_.o(.emb_text)
-    .emb_text                                0x00008028   Section       72  ucppinit_aeabi.o(.emb_text)
-    skip                                     0x0000803c   ARM Code       0  ucppinit_aeabi.o(.emb_text)
-    loop                                     0x0000804c   ARM Code       0  ucppinit_aeabi.o(.emb_text)
-    fpinit                                   0x00008064   Data           0  ucppinit_aeabi.o(.emb_text)
-    base                                     0x00008068   Data           0  ucppinit_aeabi.o(.emb_text)
-    limit                                    0x0000806c   Data           0  ucppinit_aeabi.o(.emb_text)
-    .text                                    0x00008070   Section     1622  mnrefproviderengine.in(.text)
-    .text                                    0x000086c8   Section     5840  mnrefproviderengine.in(.text)
-    |L1.1020|                                0x00008ac4   Data           0  mnrefproviderengine.in(.text)
-    |L1.1028|                                0x00008acc   Data           0  mnrefproviderengine.in(.text)
-    |L1.1056|                                0x00008ae8   Data           0  mnrefproviderengine.in(.text)
-    |L1.1064|                                0x00008af0   Data           0  mnrefproviderengine.in(.text)
-    |L1.2128|                                0x00008f18   Data           0  mnrefproviderengine.in(.text)
-    |L1.2136|                                0x00008f20   Data           0  mnrefproviderengine.in(.text)
-    |L1.2148|                                0x00008f2c   Data           0  mnrefproviderengine.in(.text)
-    |L1.3444|                                0x0000943c   Data           0  mnrefproviderengine.in(.text)
-    .text                                    0x00009d98   Section      756  mnrefproviderengine.in(.text)
-    .text                                    0x0000a08c   Section     1120  mnrefproviderengine.in(.text)
-    .text                                    0x0000a4ec   Section       40  uc_dll.o(.text)
-    .text.clean                              0x0000a514   Section       38  mnrefproviderengine.in(.text.clean)
-    .text.clean                              0x0000a53a   Section       50  mnrefproviderengine.in(.text.clean)
-    .text.clean                              0x0000a56c   Section       20  mnrefproviderengine.in(.text.clean)
-    ExportTable                              0x0000a580   Section      256  mnrefproviderengine{000a0000}.exp(ExportTable)
-    StubCode                                 0x0000a680   Section        8  euser{000a0000}-1051.o(StubCode)
-    theImportedSymbol                        0x0000a684   Data           0  euser{000a0000}-1051.o(StubCode)
-    StubCode                                 0x0000a688   Section        8  euser{000a0000}-1059.o(StubCode)
-    theImportedSymbol                        0x0000a68c   Data           0  euser{000a0000}-1059.o(StubCode)
-    StubCode                                 0x0000a690   Section        8  euser{000a0000}-1073.o(StubCode)
-    theImportedSymbol                        0x0000a694   Data           0  euser{000a0000}-1073.o(StubCode)
-    StubCode                                 0x0000a698   Section        8  euser{000a0000}-1074.o(StubCode)
-    theImportedSymbol                        0x0000a69c   Data           0  euser{000a0000}-1074.o(StubCode)
-    StubCode                                 0x0000a6a0   Section        8  euser{000a0000}-1088.o(StubCode)
-    theImportedSymbol                        0x0000a6a4   Data           0  euser{000a0000}-1088.o(StubCode)
-    StubCode                                 0x0000a6a8   Section        8  euser{000a0000}-1090.o(StubCode)
-    theImportedSymbol                        0x0000a6ac   Data           0  euser{000a0000}-1090.o(StubCode)
-    StubCode                                 0x0000a6b0   Section        8  euser{000a0000}-1091.o(StubCode)
-    theImportedSymbol                        0x0000a6b4   Data           0  euser{000a0000}-1091.o(StubCode)
-    StubCode                                 0x0000a6b8   Section        8  euser{000a0000}-1094.o(StubCode)
-    theImportedSymbol                        0x0000a6bc   Data           0  euser{000a0000}-1094.o(StubCode)
-    StubCode                                 0x0000a6c0   Section        8  euser{000a0000}-1116.o(StubCode)
-    theImportedSymbol                        0x0000a6c4   Data           0  euser{000a0000}-1116.o(StubCode)
-    StubCode                                 0x0000a6c8   Section        8  euser{000a0000}-1119.o(StubCode)
-    theImportedSymbol                        0x0000a6cc   Data           0  euser{000a0000}-1119.o(StubCode)
-    StubCode                                 0x0000a6d0   Section        8  euser{000a0000}-1171.o(StubCode)
-    theImportedSymbol                        0x0000a6d4   Data           0  euser{000a0000}-1171.o(StubCode)
-    StubCode                                 0x0000a6d8   Section        8  euser{000a0000}-1172.o(StubCode)
-    theImportedSymbol                        0x0000a6dc   Data           0  euser{000a0000}-1172.o(StubCode)
-    StubCode                                 0x0000a6e0   Section        8  euser{000a0000}-120.o(StubCode)
-    theImportedSymbol                        0x0000a6e4   Data           0  euser{000a0000}-120.o(StubCode)
-    StubCode                                 0x0000a6e8   Section        8  euser{000a0000}-1507.o(StubCode)
-    theImportedSymbol                        0x0000a6ec   Data           0  euser{000a0000}-1507.o(StubCode)
-    StubCode                                 0x0000a6f0   Section        8  euser{000a0000}-1510.o(StubCode)
-    theImportedSymbol                        0x0000a6f4   Data           0  euser{000a0000}-1510.o(StubCode)
-    StubCode                                 0x0000a6f8   Section        8  euser{000a0000}-1590.o(StubCode)
-    theImportedSymbol                        0x0000a6fc   Data           0  euser{000a0000}-1590.o(StubCode)
-    StubCode                                 0x0000a700   Section        8  euser{000a0000}-1593.o(StubCode)
-    theImportedSymbol                        0x0000a704   Data           0  euser{000a0000}-1593.o(StubCode)
-    StubCode                                 0x0000a708   Section        8  euser{000a0000}-1625.o(StubCode)
-    theImportedSymbol                        0x0000a70c   Data           0  euser{000a0000}-1625.o(StubCode)
-    StubCode                                 0x0000a710   Section        8  euser{000a0000}-1646.o(StubCode)
-    theImportedSymbol                        0x0000a714   Data           0  euser{000a0000}-1646.o(StubCode)
-    StubCode                                 0x0000a718   Section        8  euser{000a0000}-1648.o(StubCode)
-    theImportedSymbol                        0x0000a71c   Data           0  euser{000a0000}-1648.o(StubCode)
-    StubCode                                 0x0000a720   Section        8  euser{000a0000}-1649.o(StubCode)
-    theImportedSymbol                        0x0000a724   Data           0  euser{000a0000}-1649.o(StubCode)
-    StubCode                                 0x0000a728   Section        8  euser{000a0000}-1651.o(StubCode)
-    theImportedSymbol                        0x0000a72c   Data           0  euser{000a0000}-1651.o(StubCode)
-    StubCode                                 0x0000a730   Section        8  euser{000a0000}-1753.o(StubCode)
-    theImportedSymbol                        0x0000a734   Data           0  euser{000a0000}-1753.o(StubCode)
-    StubCode                                 0x0000a738   Section        8  euser{000a0000}-1806.o(StubCode)
-    theImportedSymbol                        0x0000a73c   Data           0  euser{000a0000}-1806.o(StubCode)
-    StubCode                                 0x0000a740   Section        8  euser{000a0000}-1815.o(StubCode)
-    theImportedSymbol                        0x0000a744   Data           0  euser{000a0000}-1815.o(StubCode)
-    StubCode                                 0x0000a748   Section        8  euser{000a0000}-1821.o(StubCode)
-    theImportedSymbol                        0x0000a74c   Data           0  euser{000a0000}-1821.o(StubCode)
-    StubCode                                 0x0000a750   Section        8  euser{000a0000}-1826.o(StubCode)
-    theImportedSymbol                        0x0000a754   Data           0  euser{000a0000}-1826.o(StubCode)
-    StubCode                                 0x0000a758   Section        8  euser{000a0000}-203.o(StubCode)
-    theImportedSymbol                        0x0000a75c   Data           0  euser{000a0000}-203.o(StubCode)
-    StubCode                                 0x0000a760   Section        8  euser{000a0000}-205.o(StubCode)
-    theImportedSymbol                        0x0000a764   Data           0  euser{000a0000}-205.o(StubCode)
-    StubCode                                 0x0000a768   Section        8  euser{000a0000}-2060.o(StubCode)
-    theImportedSymbol                        0x0000a76c   Data           0  euser{000a0000}-2060.o(StubCode)
-    StubCode                                 0x0000a770   Section        8  euser{000a0000}-2061.o(StubCode)
-    theImportedSymbol                        0x0000a774   Data           0  euser{000a0000}-2061.o(StubCode)
-    StubCode                                 0x0000a778   Section        8  euser{000a0000}-207.o(StubCode)
-    theImportedSymbol                        0x0000a77c   Data           0  euser{000a0000}-207.o(StubCode)
-    StubCode                                 0x0000a780   Section        8  euser{000a0000}-208.o(StubCode)
-    theImportedSymbol                        0x0000a784   Data           0  euser{000a0000}-208.o(StubCode)
-    StubCode                                 0x0000a788   Section        8  euser{000a0000}-2082.o(StubCode)
-    theImportedSymbol                        0x0000a78c   Data           0  euser{000a0000}-2082.o(StubCode)
-    StubCode                                 0x0000a790   Section        8  euser{000a0000}-209.o(StubCode)
-    theImportedSymbol                        0x0000a794   Data           0  euser{000a0000}-209.o(StubCode)
-    StubCode                                 0x0000a798   Section        8  euser{000a0000}-2123.o(StubCode)
-    theImportedSymbol                        0x0000a79c   Data           0  euser{000a0000}-2123.o(StubCode)
-    StubCode                                 0x0000a7a0   Section        8  euser{000a0000}-2125.o(StubCode)
-    theImportedSymbol                        0x0000a7a4   Data           0  euser{000a0000}-2125.o(StubCode)
-    StubCode                                 0x0000a7a8   Section        8  euser{000a0000}-2128.o(StubCode)
-    theImportedSymbol                        0x0000a7ac   Data           0  euser{000a0000}-2128.o(StubCode)
-    StubCode                                 0x0000a7b0   Section        8  euser{000a0000}-424.o(StubCode)
-    theImportedSymbol                        0x0000a7b4   Data           0  euser{000a0000}-424.o(StubCode)
-    StubCode                                 0x0000a7b8   Section        8  euser{000a0000}-46.o(StubCode)
-    theImportedSymbol                        0x0000a7bc   Data           0  euser{000a0000}-46.o(StubCode)
-    StubCode                                 0x0000a7c0   Section        8  euser{000a0000}-464.o(StubCode)
-    theImportedSymbol                        0x0000a7c4   Data           0  euser{000a0000}-464.o(StubCode)
-    StubCode                                 0x0000a7c8   Section        8  euser{000a0000}-47.o(StubCode)
-    theImportedSymbol                        0x0000a7cc   Data           0  euser{000a0000}-47.o(StubCode)
-    StubCode                                 0x0000a7d0   Section        8  euser{000a0000}-471.o(StubCode)
-    theImportedSymbol                        0x0000a7d4   Data           0  euser{000a0000}-471.o(StubCode)
-    StubCode                                 0x0000a7d8   Section        8  euser{000a0000}-472.o(StubCode)
-    theImportedSymbol                        0x0000a7dc   Data           0  euser{000a0000}-472.o(StubCode)
-    StubCode                                 0x0000a7e0   Section        8  euser{000a0000}-476.o(StubCode)
-    theImportedSymbol                        0x0000a7e4   Data           0  euser{000a0000}-476.o(StubCode)
-    StubCode                                 0x0000a7e8   Section        8  euser{000a0000}-48.o(StubCode)
-    theImportedSymbol                        0x0000a7ec   Data           0  euser{000a0000}-48.o(StubCode)
-    StubCode                                 0x0000a7f0   Section        8  euser{000a0000}-481.o(StubCode)
-    theImportedSymbol                        0x0000a7f4   Data           0  euser{000a0000}-481.o(StubCode)
-    StubCode                                 0x0000a7f8   Section        8  euser{000a0000}-49.o(StubCode)
-    theImportedSymbol                        0x0000a7fc   Data           0  euser{000a0000}-49.o(StubCode)
-    StubCode                                 0x0000a800   Section        8  euser{000a0000}-50.o(StubCode)
-    theImportedSymbol                        0x0000a804   Data           0  euser{000a0000}-50.o(StubCode)
-    StubCode                                 0x0000a808   Section        8  euser{000a0000}-55.o(StubCode)
-    theImportedSymbol                        0x0000a80c   Data           0  euser{000a0000}-55.o(StubCode)
-    StubCode                                 0x0000a810   Section        8  euser{000a0000}-551.o(StubCode)
-    theImportedSymbol                        0x0000a814   Data           0  euser{000a0000}-551.o(StubCode)
-    StubCode                                 0x0000a818   Section        8  euser{000a0000}-593.o(StubCode)
-    theImportedSymbol                        0x0000a81c   Data           0  euser{000a0000}-593.o(StubCode)
-    StubCode                                 0x0000a820   Section        8  euser{000a0000}-649.o(StubCode)
-    theImportedSymbol                        0x0000a824   Data           0  euser{000a0000}-649.o(StubCode)
-    StubCode                                 0x0000a828   Section        8  euser{000a0000}-654.o(StubCode)
-    theImportedSymbol                        0x0000a82c   Data           0  euser{000a0000}-654.o(StubCode)
-    StubCode                                 0x0000a830   Section        8  euser{000a0000}-669.o(StubCode)
-    theImportedSymbol                        0x0000a834   Data           0  euser{000a0000}-669.o(StubCode)
-    StubCode                                 0x0000a838   Section        8  euser{000a0000}-81.o(StubCode)
-    theImportedSymbol                        0x0000a83c   Data           0  euser{000a0000}-81.o(StubCode)
-    StubCode                                 0x0000a840   Section        8  euser{000a0000}-824.o(StubCode)
-    theImportedSymbol                        0x0000a844   Data           0  euser{000a0000}-824.o(StubCode)
-    StubCode                                 0x0000a848   Section        8  euser{000a0000}-826.o(StubCode)
-    theImportedSymbol                        0x0000a84c   Data           0  euser{000a0000}-826.o(StubCode)
-    StubCode                                 0x0000a850   Section        8  euser{000a0000}-838.o(StubCode)
-    theImportedSymbol                        0x0000a854   Data           0  euser{000a0000}-838.o(StubCode)
-    StubCode                                 0x0000a858   Section        8  euser{000a0000}-839.o(StubCode)
-    theImportedSymbol                        0x0000a85c   Data           0  euser{000a0000}-839.o(StubCode)
-    StubCode                                 0x0000a860   Section        8  euser{000a0000}-841.o(StubCode)
-    theImportedSymbol                        0x0000a864   Data           0  euser{000a0000}-841.o(StubCode)
-    StubCode                                 0x0000a868   Section        8  euser{000a0000}-936.o(StubCode)
-    theImportedSymbol                        0x0000a86c   Data           0  euser{000a0000}-936.o(StubCode)
-    StubCode                                 0x0000a870   Section        8  euser{000a0000}-953.o(StubCode)
-    theImportedSymbol                        0x0000a874   Data           0  euser{000a0000}-953.o(StubCode)
-    StubCode                                 0x0000a878   Section        8  euser{000a0000}-960.o(StubCode)
-    theImportedSymbol                        0x0000a87c   Data           0  euser{000a0000}-960.o(StubCode)
-    StubCode                                 0x0000a880   Section        8  euser{000a0000}-966.o(StubCode)
-    theImportedSymbol                        0x0000a884   Data           0  euser{000a0000}-966.o(StubCode)
-    StubCode                                 0x0000a888   Section        8  euser{000a0000}-968.o(StubCode)
-    theImportedSymbol                        0x0000a88c   Data           0  euser{000a0000}-968.o(StubCode)
-    StubCode                                 0x0000a890   Section        8  euser{000a0000}-973.o(StubCode)
-    theImportedSymbol                        0x0000a894   Data           0  euser{000a0000}-973.o(StubCode)
-    StubCode                                 0x0000a898   Section        8  euser{000a0000}-984.o(StubCode)
-    theImportedSymbol                        0x0000a89c   Data           0  euser{000a0000}-984.o(StubCode)
-    StubCode                                 0x0000a8a0   Section        8  efsrv{000a0000}-115.o(StubCode)
-    theImportedSymbol                        0x0000a8a4   Data           0  efsrv{000a0000}-115.o(StubCode)
-    StubCode                                 0x0000a8a8   Section        8  efsrv{000a0000}-118.o(StubCode)
-    theImportedSymbol                        0x0000a8ac   Data           0  efsrv{000a0000}-118.o(StubCode)
-    StubCode                                 0x0000a8b0   Section        8  efsrv{000a0000}-181.o(StubCode)
-    theImportedSymbol                        0x0000a8b4   Data           0  efsrv{000a0000}-181.o(StubCode)
-    StubCode                                 0x0000a8b8   Section        8  efsrv{000a0000}-182.o(StubCode)
-    theImportedSymbol                        0x0000a8bc   Data           0  efsrv{000a0000}-182.o(StubCode)
-    StubCode                                 0x0000a8c0   Section        8  efsrv{000a0000}-190.o(StubCode)
-    theImportedSymbol                        0x0000a8c4   Data           0  efsrv{000a0000}-190.o(StubCode)
-    StubCode                                 0x0000a8c8   Section        8  efsrv{000a0000}-200.o(StubCode)
-    theImportedSymbol                        0x0000a8cc   Data           0  efsrv{000a0000}-200.o(StubCode)
-    StubCode                                 0x0000a8d0   Section        8  efsrv{000a0000}-204.o(StubCode)
-    theImportedSymbol                        0x0000a8d4   Data           0  efsrv{000a0000}-204.o(StubCode)
-    StubCode                                 0x0000a8d8   Section        8  efsrv{000a0000}-68.o(StubCode)
-    theImportedSymbol                        0x0000a8dc   Data           0  efsrv{000a0000}-68.o(StubCode)
-    StubCode                                 0x0000a8e0   Section        8  bafl{000a0000}-123.o(StubCode)
-    theImportedSymbol                        0x0000a8e4   Data           0  bafl{000a0000}-123.o(StubCode)
-    StubCode                                 0x0000a8e8   Section        8  bafl{000a0000}-124.o(StubCode)
-    theImportedSymbol                        0x0000a8ec   Data           0  bafl{000a0000}-124.o(StubCode)
-    StubCode                                 0x0000a8f0   Section        8  bafl{000a0000}-129.o(StubCode)
-    theImportedSymbol                        0x0000a8f4   Data           0  bafl{000a0000}-129.o(StubCode)
-    StubCode                                 0x0000a8f8   Section        8  bafl{000a0000}-141.o(StubCode)
-    theImportedSymbol                        0x0000a8fc   Data           0  bafl{000a0000}-141.o(StubCode)
-    StubCode                                 0x0000a900   Section        8  bafl{000a0000}-145.o(StubCode)
-    theImportedSymbol                        0x0000a904   Data           0  bafl{000a0000}-145.o(StubCode)
-    StubCode                                 0x0000a908   Section        8  bafl{000a0000}-147.o(StubCode)
-    theImportedSymbol                        0x0000a90c   Data           0  bafl{000a0000}-147.o(StubCode)
-    StubCode                                 0x0000a910   Section        8  bafl{000a0000}-59.o(StubCode)
-    theImportedSymbol                        0x0000a914   Data           0  bafl{000a0000}-59.o(StubCode)
-    StubCode                                 0x0000a918   Section        8  bafl{000a0000}-62.o(StubCode)
-    theImportedSymbol                        0x0000a91c   Data           0  bafl{000a0000}-62.o(StubCode)
-    StubCode                                 0x0000a920   Section        8  AknIcon{000a0000}-11.o(StubCode)
-    theImportedSymbol                        0x0000a924   Data           0  AknIcon{000a0000}-11.o(StubCode)
-    StubCode                                 0x0000a928   Section        8  AknIcon{000a0000}-15.o(StubCode)
-    theImportedSymbol                        0x0000a92c   Data           0  AknIcon{000a0000}-15.o(StubCode)
-    StubCode                                 0x0000a930   Section        8  AknIcon{000a0000}-16.o(StubCode)
-    theImportedSymbol                        0x0000a934   Data           0  AknIcon{000a0000}-16.o(StubCode)
-    StubCode                                 0x0000a938   Section        8  AknIcon{000a0000}-21.o(StubCode)
-    theImportedSymbol                        0x0000a93c   Data           0  AknIcon{000a0000}-21.o(StubCode)
-    StubCode                                 0x0000a940   Section        8  gdi{000a0000}-311.o(StubCode)
-    theImportedSymbol                        0x0000a944   Data           0  gdi{000a0000}-311.o(StubCode)
-    StubCode                                 0x0000a948   Section        8  gdi{000a0000}-314.o(StubCode)
-    theImportedSymbol                        0x0000a94c   Data           0  gdi{000a0000}-314.o(StubCode)
-    StubCode                                 0x0000a950   Section        8  bitgdi{000a0000}-14.o(StubCode)
-    theImportedSymbol                        0x0000a954   Data           0  bitgdi{000a0000}-14.o(StubCode)
-    StubCode                                 0x0000a958   Section        8  bitgdi{000a0000}-44.o(StubCode)
-    theImportedSymbol                        0x0000a95c   Data           0  bitgdi{000a0000}-44.o(StubCode)
-    StubCode                                 0x0000a960   Section        8  eposlandmarks{000a0000}-12.o(StubCode)
-    theImportedSymbol                        0x0000a964   Data           0  eposlandmarks{000a0000}-12.o(StubCode)
-    StubCode                                 0x0000a968   Section        8  eposlandmarks{000a0000}-14.o(StubCode)
-    theImportedSymbol                        0x0000a96c   Data           0  eposlandmarks{000a0000}-14.o(StubCode)
-    StubCode                                 0x0000a970   Section        8  eposlandmarks{000a0000}-15.o(StubCode)
-    theImportedSymbol                        0x0000a974   Data           0  eposlandmarks{000a0000}-15.o(StubCode)
-    StubCode                                 0x0000a978   Section        8  eposlandmarks{000a0000}-4.o(StubCode)
-    theImportedSymbol                        0x0000a97c   Data           0  eposlandmarks{000a0000}-4.o(StubCode)
-    StubCode                                 0x0000a980   Section        8  eposlandmarks{000a0000}-50.o(StubCode)
-    theImportedSymbol                        0x0000a984   Data           0  eposlandmarks{000a0000}-50.o(StubCode)
-    StubCode                                 0x0000a988   Section        8  eposlandmarks{000a0000}-51.o(StubCode)
-    theImportedSymbol                        0x0000a98c   Data           0  eposlandmarks{000a0000}-51.o(StubCode)
-    StubCode                                 0x0000a990   Section        8  eposlandmarks{000a0000}-56.o(StubCode)
-    theImportedSymbol                        0x0000a994   Data           0  eposlandmarks{000a0000}-56.o(StubCode)
-    StubCode                                 0x0000a998   Section        8  eposlandmarks{000a0000}-6.o(StubCode)
-    theImportedSymbol                        0x0000a99c   Data           0  eposlandmarks{000a0000}-6.o(StubCode)
-    StubCode                                 0x0000a9a0   Section        8  eposlandmarks{000a0000}-65.o(StubCode)
-    theImportedSymbol                        0x0000a9a4   Data           0  eposlandmarks{000a0000}-65.o(StubCode)
-    StubCode                                 0x0000a9a8   Section        8  eposlandmarks{000a0000}-66.o(StubCode)
-    theImportedSymbol                        0x0000a9ac   Data           0  eposlandmarks{000a0000}-66.o(StubCode)
-    StubCode                                 0x0000a9b0   Section        8  eposlandmarks{000a0000}-67.o(StubCode)
-    theImportedSymbol                        0x0000a9b4   Data           0  eposlandmarks{000a0000}-67.o(StubCode)
-    StubCode                                 0x0000a9b8   Section        8  eposlandmarks{000a0000}-68.o(StubCode)
-    theImportedSymbol                        0x0000a9bc   Data           0  eposlandmarks{000a0000}-68.o(StubCode)
-    StubCode                                 0x0000a9c0   Section        8  eposlandmarks{000a0000}-75.o(StubCode)
-    theImportedSymbol                        0x0000a9c4   Data           0  eposlandmarks{000a0000}-75.o(StubCode)
-    StubCode                                 0x0000a9c8   Section        8  eposlandmarks{000a0000}-8.o(StubCode)
-    theImportedSymbol                        0x0000a9cc   Data           0  eposlandmarks{000a0000}-8.o(StubCode)
-    StubCode                                 0x0000a9d0   Section        8  eposlandmarks{000a0000}-82.o(StubCode)
-    theImportedSymbol                        0x0000a9d4   Data           0  eposlandmarks{000a0000}-82.o(StubCode)
-    StubCode                                 0x0000a9d8   Section        8  lbs{000a0000}-10.o(StubCode)
-    theImportedSymbol                        0x0000a9dc   Data           0  lbs{000a0000}-10.o(StubCode)
-    StubCode                                 0x0000a9e0   Section        8  lbs{000a0000}-13.o(StubCode)
-    theImportedSymbol                        0x0000a9e4   Data           0  lbs{000a0000}-13.o(StubCode)
-    StubCode                                 0x0000a9e8   Section        8  lbs{000a0000}-15.o(StubCode)
-    theImportedSymbol                        0x0000a9ec   Data           0  lbs{000a0000}-15.o(StubCode)
-    StubCode                                 0x0000a9f0   Section        8  lbs{000a0000}-152.o(StubCode)
-    theImportedSymbol                        0x0000a9f4   Data           0  lbs{000a0000}-152.o(StubCode)
-    StubCode                                 0x0000a9f8   Section        8  lbs{000a0000}-167.o(StubCode)
-    theImportedSymbol                        0x0000a9fc   Data           0  lbs{000a0000}-167.o(StubCode)
-    StubCode                                 0x0000aa00   Section        8  lbs{000a0000}-17.o(StubCode)
-    theImportedSymbol                        0x0000aa04   Data           0  lbs{000a0000}-17.o(StubCode)
-    StubCode                                 0x0000aa08   Section        8  lbs{000a0000}-180.o(StubCode)
-    theImportedSymbol                        0x0000aa0c   Data           0  lbs{000a0000}-180.o(StubCode)
-    StubCode                                 0x0000aa10   Section        8  lbs{000a0000}-181.o(StubCode)
-    theImportedSymbol                        0x0000aa14   Data           0  lbs{000a0000}-181.o(StubCode)
-    StubCode                                 0x0000aa18   Section        8  lbs{000a0000}-205.o(StubCode)
-    theImportedSymbol                        0x0000aa1c   Data           0  lbs{000a0000}-205.o(StubCode)
-    StubCode                                 0x0000aa20   Section        8  lbs{000a0000}-207.o(StubCode)
-    theImportedSymbol                        0x0000aa24   Data           0  lbs{000a0000}-207.o(StubCode)
-    StubCode                                 0x0000aa28   Section        8  lbs{000a0000}-21.o(StubCode)
-    theImportedSymbol                        0x0000aa2c   Data           0  lbs{000a0000}-21.o(StubCode)
-    StubCode                                 0x0000aa30   Section        8  lbs{000a0000}-214.o(StubCode)
-    theImportedSymbol                        0x0000aa34   Data           0  lbs{000a0000}-214.o(StubCode)
-    StubCode                                 0x0000aa38   Section        8  lbs{000a0000}-218.o(StubCode)
-    theImportedSymbol                        0x0000aa3c   Data           0  lbs{000a0000}-218.o(StubCode)
-    StubCode                                 0x0000aa40   Section        8  lbs{000a0000}-219.o(StubCode)
-    theImportedSymbol                        0x0000aa44   Data           0  lbs{000a0000}-219.o(StubCode)
-    StubCode                                 0x0000aa48   Section        8  lbs{000a0000}-223.o(StubCode)
-    theImportedSymbol                        0x0000aa4c   Data           0  lbs{000a0000}-223.o(StubCode)
-    StubCode                                 0x0000aa50   Section        8  lbs{000a0000}-225.o(StubCode)
-    theImportedSymbol                        0x0000aa54   Data           0  lbs{000a0000}-225.o(StubCode)
-    StubCode                                 0x0000aa58   Section        8  lbs{000a0000}-226.o(StubCode)
-    theImportedSymbol                        0x0000aa5c   Data           0  lbs{000a0000}-226.o(StubCode)
-    StubCode                                 0x0000aa60   Section        8  lbs{000a0000}-23.o(StubCode)
-    theImportedSymbol                        0x0000aa64   Data           0  lbs{000a0000}-23.o(StubCode)
-    StubCode                                 0x0000aa68   Section        8  lbs{000a0000}-28.o(StubCode)
-    theImportedSymbol                        0x0000aa6c   Data           0  lbs{000a0000}-28.o(StubCode)
-    StubCode                                 0x0000aa70   Section        8  lbs{000a0000}-303.o(StubCode)
-    theImportedSymbol                        0x0000aa74   Data           0  lbs{000a0000}-303.o(StubCode)
-    StubCode                                 0x0000aa78   Section        8  lbs{000a0000}-304.o(StubCode)
-    theImportedSymbol                        0x0000aa7c   Data           0  lbs{000a0000}-304.o(StubCode)
-    StubCode                                 0x0000aa80   Section        8  lbs{000a0000}-47.o(StubCode)
-    theImportedSymbol                        0x0000aa84   Data           0  lbs{000a0000}-47.o(StubCode)
-    StubCode                                 0x0000aa88   Section        8  lbs{000a0000}-48.o(StubCode)
-    theImportedSymbol                        0x0000aa8c   Data           0  lbs{000a0000}-48.o(StubCode)
-    StubCode                                 0x0000aa90   Section        8  lbs{000a0000}-49.o(StubCode)
-    theImportedSymbol                        0x0000aa94   Data           0  lbs{000a0000}-49.o(StubCode)
-    StubCode                                 0x0000aa98   Section        8  lbs{000a0000}-7.o(StubCode)
-    theImportedSymbol                        0x0000aa9c   Data           0  lbs{000a0000}-7.o(StubCode)
-    StubCode                                 0x0000aaa0   Section        8  lbs{000a0000}-8.o(StubCode)
-    theImportedSymbol                        0x0000aaa4   Data           0  lbs{000a0000}-8.o(StubCode)
-    StubCode                                 0x0000aaa8   Section        8  lbs{000a0000}-82.o(StubCode)
-    theImportedSymbol                        0x0000aaac   Data           0  lbs{000a0000}-82.o(StubCode)
-    StubCode                                 0x0000aab0   Section        8  lbs{000a0000}-83.o(StubCode)
-    theImportedSymbol                        0x0000aab4   Data           0  lbs{000a0000}-83.o(StubCode)
-    StubCode                                 0x0000aab8   Section        8  lbs{000a0000}-87.o(StubCode)
-    theImportedSymbol                        0x0000aabc   Data           0  lbs{000a0000}-87.o(StubCode)
-    StubCode                                 0x0000aac0   Section        8  lbs{000a0000}-97.o(StubCode)
-    theImportedSymbol                        0x0000aac4   Data           0  lbs{000a0000}-97.o(StubCode)
-    StubCode                                 0x0000aac8   Section        8  mnservicelib{000a0000}-10.o(StubCode)
-    theImportedSymbol                        0x0000aacc   Data           0  mnservicelib{000a0000}-10.o(StubCode)
-    StubCode                                 0x0000aad0   Section        8  mnservicelib{000a0000}-13.o(StubCode)
-    theImportedSymbol                        0x0000aad4   Data           0  mnservicelib{000a0000}-13.o(StubCode)
-    StubCode                                 0x0000aad8   Section        8  mnservicelib{000a0000}-3.o(StubCode)
-    theImportedSymbol                        0x0000aadc   Data           0  mnservicelib{000a0000}-3.o(StubCode)
-    StubCode                                 0x0000aae0   Section        8  mnservicelib{000a0000}-5.o(StubCode)
-    theImportedSymbol                        0x0000aae4   Data           0  mnservicelib{000a0000}-5.o(StubCode)
-    StubCode                                 0x0000aae8   Section        8  mnservicelib{000a0000}-55.o(StubCode)
-    theImportedSymbol                        0x0000aaec   Data           0  mnservicelib{000a0000}-55.o(StubCode)
-    StubCode                                 0x0000aaf0   Section        8  mnservicelib{000a0000}-57.o(StubCode)
-    theImportedSymbol                        0x0000aaf4   Data           0  mnservicelib{000a0000}-57.o(StubCode)
-    StubCode                                 0x0000aaf8   Section        8  mnservicelib{000a0000}-6.o(StubCode)
-    theImportedSymbol                        0x0000aafc   Data           0  mnservicelib{000a0000}-6.o(StubCode)
-    StubCode                                 0x0000ab00   Section        8  mnservicelib{000a0000}-8.o(StubCode)
-    theImportedSymbol                        0x0000ab04   Data           0  mnservicelib{000a0000}-8.o(StubCode)
-    StubCode                                 0x0000ab08   Section        8  mnservicelib{000a0000}-9.o(StubCode)
-    theImportedSymbol                        0x0000ab0c   Data           0  mnservicelib{000a0000}-9.o(StubCode)
-    StubCode                                 0x0000ab10   Section        8  dfpaeabi{000a0000}-12.o(StubCode)
-    theImportedSymbol                        0x0000ab14   Data           0  dfpaeabi{000a0000}-12.o(StubCode)
-    StubCode                                 0x0000ab18   Section        8  dfpaeabi{000a0000}-19.o(StubCode)
-    theImportedSymbol                        0x0000ab1c   Data           0  dfpaeabi{000a0000}-19.o(StubCode)
-    StubCode                                 0x0000ab20   Section        8  dfpaeabi{000a0000}-2.o(StubCode)
-    theImportedSymbol                        0x0000ab24   Data           0  dfpaeabi{000a0000}-2.o(StubCode)
-    StubCode                                 0x0000ab28   Section        8  dfpaeabi{000a0000}-20.o(StubCode)
-    theImportedSymbol                        0x0000ab2c   Data           0  dfpaeabi{000a0000}-20.o(StubCode)
-    StubCode                                 0x0000ab30   Section        8  dfpaeabi{000a0000}-22.o(StubCode)
-    theImportedSymbol                        0x0000ab34   Data           0  dfpaeabi{000a0000}-22.o(StubCode)
-    StubCode                                 0x0000ab38   Section        8  dfpaeabi{000a0000}-23.o(StubCode)
-    theImportedSymbol                        0x0000ab3c   Data           0  dfpaeabi{000a0000}-23.o(StubCode)
-    StubCode                                 0x0000ab40   Section        8  dfpaeabi{000a0000}-24.o(StubCode)
-    theImportedSymbol                        0x0000ab44   Data           0  dfpaeabi{000a0000}-24.o(StubCode)
-    StubCode                                 0x0000ab48   Section        8  dfpaeabi{000a0000}-25.o(StubCode)
-    theImportedSymbol                        0x0000ab4c   Data           0  dfpaeabi{000a0000}-25.o(StubCode)
-    StubCode                                 0x0000ab50   Section        8  dfpaeabi{000a0000}-3.o(StubCode)
-    theImportedSymbol                        0x0000ab54   Data           0  dfpaeabi{000a0000}-3.o(StubCode)
-    StubCode                                 0x0000ab58   Section        8  dfpaeabi{000a0000}-36.o(StubCode)
-    theImportedSymbol                        0x0000ab5c   Data           0  dfpaeabi{000a0000}-36.o(StubCode)
-    StubCode                                 0x0000ab60   Section        8  dfpaeabi{000a0000}-41.o(StubCode)
-    theImportedSymbol                        0x0000ab64   Data           0  dfpaeabi{000a0000}-41.o(StubCode)
-    StubCode                                 0x0000ab68   Section        8  dfpaeabi{000a0000}-5.o(StubCode)
-    theImportedSymbol                        0x0000ab6c   Data           0  dfpaeabi{000a0000}-5.o(StubCode)
-    StubCode                                 0x0000ab70   Section        8  dfpaeabi{000a0000}-8.o(StubCode)
-    theImportedSymbol                        0x0000ab74   Data           0  dfpaeabi{000a0000}-8.o(StubCode)
-    StubCode                                 0x0000ab78   Section        8  drtaeabi{000a0000}-135.o(StubCode)
-    theImportedSymbol                        0x0000ab7c   Data           0  drtaeabi{000a0000}-135.o(StubCode)
-    StubCode                                 0x0000ab80   Section        8  drtaeabi{000a0000}-147.o(StubCode)
-    theImportedSymbol                        0x0000ab84   Data           0  drtaeabi{000a0000}-147.o(StubCode)
-    StubCode                                 0x0000ab88   Section        8  drtaeabi{000a0000}-158.o(StubCode)
-    theImportedSymbol                        0x0000ab8c   Data           0  drtaeabi{000a0000}-158.o(StubCode)
-    StubCode                                 0x0000ab90   Section        8  drtaeabi{000a0000}-159.o(StubCode)
-    theImportedSymbol                        0x0000ab94   Data           0  drtaeabi{000a0000}-159.o(StubCode)
-    StubCode                                 0x0000ab98   Section        8  drtaeabi{000a0000}-180.o(StubCode)
-    theImportedSymbol                        0x0000ab9c   Data           0  drtaeabi{000a0000}-180.o(StubCode)
-    StubCode                                 0x0000aba0   Section        8  drtaeabi{000a0000}-183.o(StubCode)
-    theImportedSymbol                        0x0000aba4   Data           0  drtaeabi{000a0000}-183.o(StubCode)
-    StubCode                                 0x0000aba8   Section        8  drtaeabi{000a0000}-184.o(StubCode)
-    theImportedSymbol                        0x0000abac   Data           0  drtaeabi{000a0000}-184.o(StubCode)
-    StubCode                                 0x0000abb0   Section        8  scppnwdl{000a0000}-3.o(StubCode)
-    theImportedSymbol                        0x0000abb4   Data           0  scppnwdl{000a0000}-3.o(StubCode)
-    i._Z18ExecuteAndDeleteLDP15CPosLmOperation 0x0000abb8   Section       22  mnrefproviderengine.in(i._Z18ExecuteAndDeleteLDP15CPosLmOperation)
-    i._ZN7TPtrC163SetERK7TDesC16             0x0000abce   Section       28  mnrefproviderengine.in(i._ZN7TPtrC163SetERK7TDesC16)
-    i._ZN7TPtrC163SetERK7TDesC16.clean       0x0000abea   Section       12  mnrefproviderengine.in(i._ZN7TPtrC163SetERK7TDesC16.clean)
-    i._ZdlPvS_                               0x0000abf6   Section        2  mnrefproviderengine.in(i._ZdlPvS_)
-    i._ZnwjPv                                0x0000abf8   Section        4  mnrefproviderengine.in(i._ZnwjPv)
-    t._Z17CleanupClosePushLI6RArrayIN11CMnrpEngine14TDistanceToPoiEEEvRT_ 0x0000abfc   Section       16  mnrefproviderengine.in(t._Z17CleanupClosePushLI6RArrayIN11CMnrpEngine14TDistanceToPoiEEEvRT_)
-    t._Z3AbsIdET_S0_                         0x0000ac0c   Section       44  mnrefproviderengine.in(t._Z3AbsIdET_S0_)
-    t._Z3MaxIdET_S0_S0_                      0x0000ac38   Section       28  mnrefproviderengine.in(t._Z3MaxIdET_S0_S0_)
-    t._Z3MinIdET_S0_S0_                      0x0000ac54   Section       28  mnrefproviderengine.in(t._Z3MinIdET_S0_S0_)
-    t._ZN12CleanupCloseI6RArrayIN11CMnrpEngine14TDistanceToPoiEEE5CloseEPv 0x0000ac70   Section        8  mnrefproviderengine.in(t._ZN12CleanupCloseI6RArrayIN11CMnrpEngine14TDistanceToPoiEEE5CloseEPv)
-    t._ZN12CleanupCloseI6RArrayImEE5CloseEPv 0x0000ac78   Section        8  mnrefproviderengine.in(t._ZN12CleanupCloseI6RArrayImEE5CloseEPv)
-    t._ZN13RPointerArrayI12CPosLandmarkE7AppendLEPKS0_ 0x0000ac80   Section       12  mnrefproviderengine.in(t._ZN13RPointerArrayI12CPosLandmarkE7AppendLEPKS0_)
-    t._ZN13RPointerArrayIN13CMnrpMapModel9CDrawItemEE15ResetAndDestroyEv 0x0000ac8c   Section       48  mnrefproviderengine.in(t._ZN13RPointerArrayIN13CMnrpMapModel9CDrawItemEE15ResetAndDestroyEv)
-    t._ZN13RPointerArrayIN13CMnrpMapModel9CDrawItemEE7AppendLEPKS1_ 0x0000acbc   Section       12  mnrefproviderengine.in(t._ZN13RPointerArrayIN13CMnrpMapModel9CDrawItemEE7AppendLEPKS1_)
-    t._ZNK20HPositionGenericInfo8GetValueIfEEitRT_ 0x0000acc8   Section       16  mnrefproviderengine.in(t._ZNK20HPositionGenericInfo8GetValueIfEEitRT_)
-    t._ZNK6RArrayIN11CMnrpEngine14TDistanceToPoiEE5CountEv 0x0000acd8   Section        8  mnrefproviderengine.in(t._ZNK6RArrayIN11CMnrpEngine14TDistanceToPoiEE5CountEv)
-    t._ZNK6TArrayIP12CPosLandmarkEixEi       0x0000ace0   Section        8  mnrefproviderengine.in(t._ZNK6TArrayIP12CPosLandmarkEixEi)
-    t._ZNK6TArrayIPN13CMnrpMapModel9CDrawItemEEixEi 0x0000ace8   Section        8  mnrefproviderengine.in(t._ZNK6TArrayIPN13CMnrpMapModel9CDrawItemEEixEi)
-    .extab._ZN11CMnrpEngineC1Ev              0x0000acf0   Data           0  mnrefproviderengine.in(.ARM.extab)
-    .extab._ZN11CMnrpEngineD1Ev              0x0000ad00   Data           0  mnrefproviderengine.in(.ARM.extab)
-    .extab._ZN11CMnrpEngine17FindResourceFileLERK7TDesC16R4TBufILi256EE 0x0000ad10   Data           0  mnrefproviderengine.in(.ARM.extab)
-    .extab._ZN11CMnrpEngine16LoadKnownPlacesLEv 0x0000ad1c   Data           0  mnrefproviderengine.in(.ARM.extab)
-    .extab._ZN11CMnrpEngine12KnownPlacesLEv  0x0000ad2c   Data           0  mnrefproviderengine.in(.ARM.extab)
-    .extab._ZN13CMnrpMapModel9CDrawItem5NewLCERK12CPosLandmark 0x0000ad54   Data           0  mnrefproviderengine.in(.ARM.extab)
-    .extab._ZN13CMnrpMapModelC1ER17MMapModelObserverR11CMnrpEngine 0x0000ad64   Data           0  mnrefproviderengine.in(.ARM.extab)
-    .extab._ZN13CMnrpMapModelC1ER11CMnrpEngine 0x0000ad74   Data           0  mnrefproviderengine.in(.ARM.extab)
-    .extab._ZN13CMnrpMapModelD1Ev            0x0000ad84   Data           0  mnrefproviderengine.in(.ARM.extab)
-    .extab._ZN13CMnrpMapModel9CDrawItemD1Ev  0x0000ad94   Data           0  mnrefproviderengine.in(.ARM.extab)
-    .extab._ZN20CMnrpPositionRequestC1ER21MMnrpPositionObserver 0x0000ada4   Data           0  mnrefproviderengine.in(.ARM.extab)
-    .extab._ZN20CMnrpPositionRequestD1Ev     0x0000adb4   Data           0  mnrefproviderengine.in(.ARM.extab)
-    .extab._ZN7TPtrC163SetERK7TDesC16        0x0000adc4   Data           0  mnrefproviderengine.in(.ARM.extab)
-    .constdata$1                             0x0000add4   Data           0  mnrefproviderengine.in(.constdata)
-    KCitiesResourceFile                      0x0000add4   Data          72  mnrefproviderengine.in(.constdata)
-    .constdata                               0x0000add4   Section      128  mnrefproviderengine.in(.constdata)
-    KLocationNameFormat@_ZN11CMnrpEngine21CreateCloseLandmarkLCERK12CPosLandmarkf_0 0x0000ae1c   Data          28  mnrefproviderengine.in(.constdata)
-    KLocationNameFormatKm@_ZN11CMnrpEngine21CreateCloseLandmarkLCERK12CPosLandmarkf_1 0x0000ae38   Data          28  mnrefproviderengine.in(.constdata)
-    .constdata$1                             0x0000ae54   Data           0  mnrefproviderengine.in(.constdata)
-    KCellDividers                            0x0000ae54   Data          12  mnrefproviderengine.in(.constdata)
-    .constdata                               0x0000ae54   Section       44  mnrefproviderengine.in(.constdata)
-    KRequestorName@_ZN13CMnrpMapModel10ConstructLEv_0 0x0000ae60   Data          32  mnrefproviderengine.in(.constdata)
-    .constdata$1                             0x0000ae80   Data           0  mnrefproviderengine.in(.constdata)
-    KNorth@_ZN9MnrpUtils13AngleToStringEdR6TDes16_1 0x0000ae80   Data           8  mnrefproviderengine.in(.constdata)
-    .constdata                               0x0000ae80   Section      276  mnrefproviderengine.in(.constdata)
-    KSouth@_ZN9MnrpUtils13AngleToStringEdR6TDes16_2 0x0000ae88   Data           8  mnrefproviderengine.in(.constdata)
-    KWest@_ZN9MnrpUtils13AngleToStringEdR6TDes16_3 0x0000ae90   Data           8  mnrefproviderengine.in(.constdata)
-    KEast@_ZN9MnrpUtils13AngleToStringEdR6TDes16_4 0x0000ae98   Data           8  mnrefproviderengine.in(.constdata)
-    KNan                                     0x0000aea0   Data          16  mnrefproviderengine.in(.constdata)
-    KNeg                                     0x0000aeb0   Data          16  mnrefproviderengine.in(.constdata)
-    KOutOfBounds                             0x0000aec0   Data          16  mnrefproviderengine.in(.constdata)
-    KCoordFormatFull@_ZN9MnrpUtils18CoordinateToStringEdR6TDes16ii_0 0x0000aed0   Data          44  mnrefproviderengine.in(.constdata)
-    KCoordFormatPartMseconds@_ZN9MnrpUtils18CoordinateToStringEdR6TDes16ii_1 0x0000aefc   Data          20  mnrefproviderengine.in(.constdata)
-    KSmall@_ZN9MnrpUtils16DistanceToStringEdR6TDes16_0 0x0000af10   Data          16  mnrefproviderengine.in(.constdata)
-    KMeters@_ZN9MnrpUtils16DistanceToStringEdR6TDes16_1 0x0000af20   Data          16  mnrefproviderengine.in(.constdata)
-    KKiloMeters@_ZN9MnrpUtils16DistanceToStringEdR6TDes16_2 0x0000af30   Data          20  mnrefproviderengine.in(.constdata)
-    KThousandsKiloMeters@_ZN9MnrpUtils16DistanceToStringEdR6TDes16_3 0x0000af44   Data          24  mnrefproviderengine.in(.constdata)
-    KAngleFormat@_ZN9MnrpUtils13AngleToStringEdR6TDes16_0 0x0000af5c   Data          44  mnrefproviderengine.in(.constdata)
-    KPerSecond@_ZN9MnrpUtils13SpeedToStringEdR6TDes16_0 0x0000af88   Data          12  mnrefproviderengine.in(.constdata)
-    .constdata__ZTI11CMnrpEngine             0x0000af94   Section       12  mnrefproviderengine.in(.constdata__ZTI11CMnrpEngine)
-    .constdata__ZTI13CMnrpMapModel           0x0000afa0   Section       32  mnrefproviderengine.in(.constdata__ZTI13CMnrpMapModel)
-    .constdata__ZTI20CMnrpPositionRequest    0x0000afc0   Section       12  mnrefproviderengine.in(.constdata__ZTI20CMnrpPositionRequest)
-    .constdata__ZTI21MMnrpPositionObserver   0x0000afcc   Section        8  mnrefproviderengine.in(.constdata__ZTI21MMnrpPositionObserver)
-    .constdata__ZTIN13CMnrpMapModel9CDrawItemE 0x0000afd4   Section       12  mnrefproviderengine.in(.constdata__ZTIN13CMnrpMapModel9CDrawItemE)
-    .constdata__ZTS11CMnrpEngine             0x0000afe0   Section       14  mnrefproviderengine.in(.constdata__ZTS11CMnrpEngine)
-    .constdata__ZTS13CMnrpMapModel           0x0000afee   Section       16  mnrefproviderengine.in(.constdata__ZTS13CMnrpMapModel)
-    .constdata__ZTS20CMnrpPositionRequest    0x0000affe   Section       23  mnrefproviderengine.in(.constdata__ZTS20CMnrpPositionRequest)
-    .constdata__ZTS21MMnrpPositionObserver   0x0000b015   Section       24  mnrefproviderengine.in(.constdata__ZTS21MMnrpPositionObserver)
-    .constdata__ZTSN13CMnrpMapModel9CDrawItemE 0x0000b02d   Section       28  mnrefproviderengine.in(.constdata__ZTSN13CMnrpMapModel9CDrawItemE)
-    .constdata__ZTV11CMnrpEngine             0x0000b04c   Section       20  mnrefproviderengine.in(.constdata__ZTV11CMnrpEngine)
-    .constdata__ZTV13CMnrpMapModel           0x0000b060   Section       36  mnrefproviderengine.in(.constdata__ZTV13CMnrpMapModel)
-    .constdata__ZTV20CMnrpPositionRequest    0x0000b084   Section       32  mnrefproviderengine.in(.constdata__ZTV20CMnrpPositionRequest)
-    .constdata__ZTVN13CMnrpMapModel9CDrawItemE 0x0000b0a4   Section       20  mnrefproviderengine.in(.constdata__ZTVN13CMnrpMapModel9CDrawItemE)
-    .ARM.exidx                               0x0000b0b8   Section        8  ucppinit_aeabi.o(.ARM.exidx)
-
-    Global Symbols
-
-    Symbol Name                              Value     Ov Type        Size  Object(Section)
-
-    BuildAttributes$$THUMB_ISAv3$ARM_ISAv6$M$E$P$PE$A:L22$X:L11$S22$IEEE1$IW$USESV6$~STKCKD$USESV7$~SHL$OSPACE$IEEEJ$EBA8$UX$REQ8$PRES8$EABIv2 0x00000000   Number         0  anon$$obj.o ABSOLUTE
-    #<DLL>AknIcon{000a0000}[1020735a].dll#<\DLL>10  - Undefined Reference
-    #<DLL>AknIcon{000a0000}[1020735a].dll#<\DLL>15  - Undefined Reference
-    #<DLL>AknIcon{000a0000}[1020735a].dll#<\DLL>b  - Undefined Reference
-    #<DLL>AknIcon{000a0000}[1020735a].dll#<\DLL>f  - Undefined Reference
-    #<DLL>bafl{000a0000}[10003a0f].dll#<\DLL>3b  - Undefined Reference
-    #<DLL>bafl{000a0000}[10003a0f].dll#<\DLL>3e  - Undefined Reference
-    #<DLL>bafl{000a0000}[10003a0f].dll#<\DLL>7b  - Undefined Reference
-    #<DLL>bafl{000a0000}[10003a0f].dll#<\DLL>7c  - Undefined Reference
-    #<DLL>bafl{000a0000}[10003a0f].dll#<\DLL>81  - Undefined Reference
-    #<DLL>bafl{000a0000}[10003a0f].dll#<\DLL>8d  - Undefined Reference
-    #<DLL>bafl{000a0000}[10003a0f].dll#<\DLL>91  - Undefined Reference
-    #<DLL>bafl{000a0000}[10003a0f].dll#<\DLL>93  - Undefined Reference
-    #<DLL>bitgdi{000a0000}[10003b18].dll#<\DLL>2c  - Undefined Reference
-    #<DLL>bitgdi{000a0000}[10003b18].dll#<\DLL>e  - Undefined Reference
-    #<DLL>dfpaeabi{000a0000}.dll#<\DLL>13     - Undefined Reference
-    #<DLL>dfpaeabi{000a0000}.dll#<\DLL>14     - Undefined Reference
-    #<DLL>dfpaeabi{000a0000}.dll#<\DLL>16     - Undefined Reference
-    #<DLL>dfpaeabi{000a0000}.dll#<\DLL>17     - Undefined Reference
-    #<DLL>dfpaeabi{000a0000}.dll#<\DLL>18     - Undefined Reference
-    #<DLL>dfpaeabi{000a0000}.dll#<\DLL>19     - Undefined Reference
-    #<DLL>dfpaeabi{000a0000}.dll#<\DLL>2      - Undefined Reference
-    #<DLL>dfpaeabi{000a0000}.dll#<\DLL>24     - Undefined Reference
-    #<DLL>dfpaeabi{000a0000}.dll#<\DLL>29     - Undefined Reference
-    #<DLL>dfpaeabi{000a0000}.dll#<\DLL>3      - Undefined Reference
-    #<DLL>dfpaeabi{000a0000}.dll#<\DLL>5      - Undefined Reference
-    #<DLL>dfpaeabi{000a0000}.dll#<\DLL>8      - Undefined Reference
-    #<DLL>dfpaeabi{000a0000}.dll#<\DLL>c      - Undefined Reference
-    #<DLL>drtaeabi{000a0000}.dll#<\DLL>87     - Undefined Reference
-    #<DLL>drtaeabi{000a0000}.dll#<\DLL>93     - Undefined Reference
-    #<DLL>drtaeabi{000a0000}.dll#<\DLL>9e     - Undefined Reference
-    #<DLL>drtaeabi{000a0000}.dll#<\DLL>9f     - Undefined Reference
-    #<DLL>drtaeabi{000a0000}.dll#<\DLL>b4     - Undefined Reference
-    #<DLL>drtaeabi{000a0000}.dll#<\DLL>b7     - Undefined Reference
-    #<DLL>drtaeabi{000a0000}.dll#<\DLL>b8     - Undefined Reference
-    #<DLL>efsrv{000a0000}[100039e4].dll#<\DLL>44  - Undefined Reference
-    #<DLL>efsrv{000a0000}[100039e4].dll#<\DLL>73  - Undefined Reference
-    #<DLL>efsrv{000a0000}[100039e4].dll#<\DLL>76  - Undefined Reference
-    #<DLL>efsrv{000a0000}[100039e4].dll#<\DLL>b5  - Undefined Reference
-    #<DLL>efsrv{000a0000}[100039e4].dll#<\DLL>b6  - Undefined Reference
-    #<DLL>efsrv{000a0000}[100039e4].dll#<\DLL>be  - Undefined Reference
-    #<DLL>efsrv{000a0000}[100039e4].dll#<\DLL>c8  - Undefined Reference
-    #<DLL>efsrv{000a0000}[100039e4].dll#<\DLL>cc  - Undefined Reference
-    #<DLL>eposlandmarks{000a0000}[101fdf8a].dll#<\DLL>32  - Undefined Reference
-    #<DLL>eposlandmarks{000a0000}[101fdf8a].dll#<\DLL>33  - Undefined Reference
-    #<DLL>eposlandmarks{000a0000}[101fdf8a].dll#<\DLL>38  - Undefined Reference
-    #<DLL>eposlandmarks{000a0000}[101fdf8a].dll#<\DLL>4  - Undefined Reference
-    #<DLL>eposlandmarks{000a0000}[101fdf8a].dll#<\DLL>41  - Undefined Reference
-    #<DLL>eposlandmarks{000a0000}[101fdf8a].dll#<\DLL>42  - Undefined Reference
-    #<DLL>eposlandmarks{000a0000}[101fdf8a].dll#<\DLL>43  - Undefined Reference
-    #<DLL>eposlandmarks{000a0000}[101fdf8a].dll#<\DLL>44  - Undefined Reference
-    #<DLL>eposlandmarks{000a0000}[101fdf8a].dll#<\DLL>4b  - Undefined Reference
-    #<DLL>eposlandmarks{000a0000}[101fdf8a].dll#<\DLL>52  - Undefined Reference
-    #<DLL>eposlandmarks{000a0000}[101fdf8a].dll#<\DLL>6  - Undefined Reference
-    #<DLL>eposlandmarks{000a0000}[101fdf8a].dll#<\DLL>8  - Undefined Reference
-    #<DLL>eposlandmarks{000a0000}[101fdf8a].dll#<\DLL>c  - Undefined Reference
-    #<DLL>eposlandmarks{000a0000}[101fdf8a].dll#<\DLL>e  - Undefined Reference
-    #<DLL>eposlandmarks{000a0000}[101fdf8a].dll#<\DLL>f  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>1a8  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>1d0  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>1d7  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>1d8  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>1dc  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>1e1  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>227  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>251  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>289  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>28e  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>29d  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>2e  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>2f  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>30  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>31  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>32  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>338  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>33a  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>346  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>347  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>349  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>37  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>3a8  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>3b9  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>3c0  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>3c6  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>3c8  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>3cd  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>3d8  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>41b  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>423  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>431  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>432  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>440  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>442  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>443  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>446  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>45c  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>45f  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>493  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>494  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>51  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>5e3  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>5e6  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>636  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>639  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>659  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>66e  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>670  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>671  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>673  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>6d9  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>70e  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>717  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>71d  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>722  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>78  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>80c  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>80d  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>822  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>84b  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>84d  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>850  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>cb  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>cd  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>cf  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>d0  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>d1  - Undefined Reference
-    #<DLL>gdi{000a0000}[10003b15].dll#<\DLL>137  - Undefined Reference
-    #<DLL>gdi{000a0000}[10003b15].dll#<\DLL>13a  - Undefined Reference
-    #<DLL>lbs{000a0000}[101f97b1].dll#<\DLL>11  - Undefined Reference
-    #<DLL>lbs{000a0000}[101f97b1].dll#<\DLL>12f  - Undefined Reference
-    #<DLL>lbs{000a0000}[101f97b1].dll#<\DLL>130  - Undefined Reference
-    #<DLL>lbs{000a0000}[101f97b1].dll#<\DLL>15  - Undefined Reference
-    #<DLL>lbs{000a0000}[101f97b1].dll#<\DLL>17  - Undefined Reference
-    #<DLL>lbs{000a0000}[101f97b1].dll#<\DLL>1c  - Undefined Reference
-    #<DLL>lbs{000a0000}[101f97b1].dll#<\DLL>2f  - Undefined Reference
-    #<DLL>lbs{000a0000}[101f97b1].dll#<\DLL>30  - Undefined Reference
-    #<DLL>lbs{000a0000}[101f97b1].dll#<\DLL>31  - Undefined Reference
-    #<DLL>lbs{000a0000}[101f97b1].dll#<\DLL>52  - Undefined Reference
-    #<DLL>lbs{000a0000}[101f97b1].dll#<\DLL>53  - Undefined Reference
-    #<DLL>lbs{000a0000}[101f97b1].dll#<\DLL>57  - Undefined Reference
-    #<DLL>lbs{000a0000}[101f97b1].dll#<\DLL>61  - Undefined Reference
-    #<DLL>lbs{000a0000}[101f97b1].dll#<\DLL>7  - Undefined Reference
-    #<DLL>lbs{000a0000}[101f97b1].dll#<\DLL>8  - Undefined Reference
-    #<DLL>lbs{000a0000}[101f97b1].dll#<\DLL>98  - Undefined Reference
-    #<DLL>lbs{000a0000}[101f97b1].dll#<\DLL>a  - Undefined Reference
-    #<DLL>lbs{000a0000}[101f97b1].dll#<\DLL>a7  - Undefined Reference
-    #<DLL>lbs{000a0000}[101f97b1].dll#<\DLL>b4  - Undefined Reference
-    #<DLL>lbs{000a0000}[101f97b1].dll#<\DLL>b5  - Undefined Reference
-    #<DLL>lbs{000a0000}[101f97b1].dll#<\DLL>cd  - Undefined Reference
-    #<DLL>lbs{000a0000}[101f97b1].dll#<\DLL>cf  - Undefined Reference
-    #<DLL>lbs{000a0000}[101f97b1].dll#<\DLL>d  - Undefined Reference
-    #<DLL>lbs{000a0000}[101f97b1].dll#<\DLL>d6  - Undefined Reference
-    #<DLL>lbs{000a0000}[101f97b1].dll#<\DLL>da  - Undefined Reference
-    #<DLL>lbs{000a0000}[101f97b1].dll#<\DLL>db  - Undefined Reference
-    #<DLL>lbs{000a0000}[101f97b1].dll#<\DLL>df  - Undefined Reference
-    #<DLL>lbs{000a0000}[101f97b1].dll#<\DLL>e1  - Undefined Reference
-    #<DLL>lbs{000a0000}[101f97b1].dll#<\DLL>e2  - Undefined Reference
-    #<DLL>lbs{000a0000}[101f97b1].dll#<\DLL>f  - Undefined Reference
-    #<DLL>mnservicelib{000a0000}[10206903].dll#<\DLL>3  - Undefined Reference
-    #<DLL>mnservicelib{000a0000}[10206903].dll#<\DLL>37  - Undefined Reference
-    #<DLL>mnservicelib{000a0000}[10206903].dll#<\DLL>39  - Undefined Reference
-    #<DLL>mnservicelib{000a0000}[10206903].dll#<\DLL>5  - Undefined Reference
-    #<DLL>mnservicelib{000a0000}[10206903].dll#<\DLL>6  - Undefined Reference
-    #<DLL>mnservicelib{000a0000}[10206903].dll#<\DLL>8  - Undefined Reference
-    #<DLL>mnservicelib{000a0000}[10206903].dll#<\DLL>9  - Undefined Reference
-    #<DLL>mnservicelib{000a0000}[10206903].dll#<\DLL>a  - Undefined Reference
-    #<DLL>mnservicelib{000a0000}[10206903].dll#<\DLL>d  - Undefined Reference
-    #<DLL>scppnwdl{000a0000}.dll#<\DLL>3      - Undefined Reference
-    SHT$$INIT_ARRAY$$Base                     - Undefined Weak Reference
-    SHT$$INIT_ARRAY$$Limit                    - Undefined Weak Reference
-    typeinfo for XLeaveException              - Undefined Reference
-    typeinfo for CBase                        - Undefined Reference
-    typeinfo for CActive                      - Undefined Reference
-    vtable for __cxxabiv1::__class_type_info  - Undefined Reference
-    vtable for __cxxabiv1::__si_class_type_info  - Undefined Reference
-    vtable for __cxxabiv1::__vmi_class_type_info  - Undefined Reference
-    _fp_init                                  - Undefined Weak Reference
-    run_static_dtors                          - Undefined Weak Reference
-    Image$$ER_RO$$Base                       0x00008000   Number         0  anon$$obj.o(linker$$defined$$symbols)
-    _E32Dll                                  0x00008000   ARM Code      40  uc_dll_.o(.emb_text)
-    Symbian$$CPP$$Exception$$Descriptor      0x00008014   Data           0  uc_dll_.o(.emb_text)
-    __cpp_initialize__aeabi_                 0x00008028   ARM Code      72  ucppinit_aeabi.o(.emb_text)
-    CMnrpEngine::ConstructL()                0x00008071   Thumb Code    18  mnrefproviderengine.in(.text)
-    std::nothrow                             0x00008071   Thumb Code     0  ucppinit_aeabi.o(.emb_text)
-    CMnrpEngine::CMnrpEngine()               0x00008083   Thumb Code    22  mnrefproviderengine.in(.text)
-    CMnrpEngine::CMnrpEngine__sub_object()   0x00008083   Thumb Code     0  mnrefproviderengine.in(.text)
-    CMnrpEngine::NewL()                      0x00008099   Thumb Code    32  mnrefproviderengine.in(.text)
-    CMnrpEngine::~CMnrpEngine()              0x000080b9   Thumb Code    74  mnrefproviderengine.in(.text)
-    CMnrpEngine::~CMnrpEngine__sub_object()  0x000080b9   Thumb Code     0  mnrefproviderengine.in(.text)
-    CMnrpEngine::~CMnrpEngine__deallocating() 0x00008103   Thumb Code    16  mnrefproviderengine.in(.text)
-    CMnrpEngine::ReadPlacesResourceL(RResourceReader&) 0x00008113   Thumb Code   154  mnrefproviderengine.in(.text)
-    CMnrpEngine::FindResourceFileL(const TDesC16&, TBuf<(int)256>&) 0x000081ad   Thumb Code   118  mnrefproviderengine.in(.text)
-    CMnrpEngine::LoadKnownPlacesL()          0x00008223   Thumb Code    94  mnrefproviderengine.in(.text)
-    CMnrpEngine::KnownPlacesL()              0x00008281   Thumb Code    76  mnrefproviderengine.in(.text)
-    CMnrpEngine::AddressToCoordL(const CPosLandmark&) 0x000082cd   Thumb Code   124  mnrefproviderengine.in(.text)
-    CMnrpEngine::AddressToCoordLC(const CPosLandmark&) 0x00008349   Thumb Code    32  mnrefproviderengine.in(.text)
-    CMnrpEngine::AddressToCoordL(const TDesC16&) 0x00008369   Thumb Code   124  mnrefproviderengine.in(.text)
-    CMnrpEngine::AddressToCoordLC(const TDesC16&) 0x000083e5   Thumb Code    32  mnrefproviderengine.in(.text)
-    CMnrpEngine::CreateCloseLandmarkLC(const CPosLandmark&, float) 0x00008405   Thumb Code   178  mnrefproviderengine.in(.text)
-    CMnrpEngine::DistanceBetweenLandmarks(const CPosLandmark&, const CPosLandmark&) 0x000084b7   Thumb Code    86  mnrefproviderengine.in(.text)
-    CMnrpEngine::FindClosestPoisL(const CPosLandmark&, RArray<CMnrpEngine::TDistanceToPoi>&, int) 0x0000850d   Thumb Code   178  mnrefproviderengine.in(.text)
-    CMnrpEngine::CoordToAddressLC(const TCoordinate&) 0x000085bf   Thumb Code   124  mnrefproviderengine.in(.text)
-    CMnrpEngine::Fs()                        0x0000863b   Thumb Code     4  mnrefproviderengine.in(.text)
-    CMnrpEngine::BestCoordToAddressMatchesL(const TCoordinate&, RPointerArray<CPosLandmark>&, int) 0x0000863f   Thumb Code   136  mnrefproviderengine.in(.text)
-    AbsoluteToImage(TRealPoint, double)      0x000086c9   Thumb Code    74  mnrefproviderengine.in(.text)
-    TRealPoint::TRealPoint()                 0x00008713   Thumb Code    40  mnrefproviderengine.in(.text)
-    TRealPoint::TRealPoint__sub_object()     0x00008713   Thumb Code     0  mnrefproviderengine.in(.text)
-    TRealPoint::TRealPoint(double, double)   0x0000873b   Thumb Code    16  mnrefproviderengine.in(.text)
-    TRealPoint::TRealPoint__sub_object(double, double) 0x0000873b   Thumb Code     0  mnrefproviderengine.in(.text)
-    TRealPoint::TRealPoint(TCoordinate)      0x0000874b   Thumb Code    36  mnrefproviderengine.in(.text)
-    TRealPoint::TRealPoint__sub_object(TCoordinate) 0x0000874b   Thumb Code     0  mnrefproviderengine.in(.text)
-    TRealPoint::operator +(const TRealPoint&) 0x0000876f   Thumb Code    54  mnrefproviderengine.in(.text)
-    TRealPoint::operator -(const TRealPoint&) 0x000087a5   Thumb Code    52  mnrefproviderengine.in(.text)
-    TRealPoint::operator *(const double&)    0x000087d9   Thumb Code    58  mnrefproviderengine.in(.text)
-    TRealPoint::operator /(const double&)    0x00008813   Thumb Code    56  mnrefproviderengine.in(.text)
-    TRealPoint::Set(double, double)          0x0000884b   Thumb Code    16  mnrefproviderengine.in(.text)
-    TRealPoint::Coordinate()                 0x0000885b   Thumb Code    30  mnrefproviderengine.in(.text)
-    TRealPoint::IsValid()                    0x00008879   Thumb Code    32  mnrefproviderengine.in(.text)
-    CMnrpMapModel::CDrawItem::SetAbsolutePosition(const TLocality&) 0x00008899   Thumb Code    44  mnrefproviderengine.in(.text)
-    CMnrpMapModel::CDrawItem::NewLC(const CPosLandmark&) 0x000088c5   Thumb Code   146  mnrefproviderengine.in(.text)
-    CMnrpMapModel::AddCitiesL()              0x00008957   Thumb Code    64  mnrefproviderengine.in(.text)
-    CMnrpMapModel::ConstructL()              0x00008997   Thumb Code    62  mnrefproviderengine.in(.text)
-    CMnrpMapModel::CMnrpMapModel(MMapModelObserver&, CMnrpEngine&) 0x000089d5   Thumb Code   102  mnrefproviderengine.in(.text)
-    CMnrpMapModel::CMnrpMapModel__sub_object(MMapModelObserver&, CMnrpEngine&) 0x000089d5   Thumb Code     0  mnrefproviderengine.in(.text)
-    CMnrpMapModel::NewL(MMapModelObserver&, CMnrpEngine&) 0x00008a3b   Thumb Code    40  mnrefproviderengine.in(.text)
-    CMnrpMapModel::CMnrpMapModel(CMnrpEngine&) 0x00008a63   Thumb Code   150  mnrefproviderengine.in(.text)
-    CMnrpMapModel::CMnrpMapModel__sub_object(CMnrpEngine&) 0x00008a63   Thumb Code     0  mnrefproviderengine.in(.text)
-    CMnrpMapModel::NewL(CMnrpEngine&)        0x00008af9   Thumb Code    36  mnrefproviderengine.in(.text)
-    CMnrpMapModel::~CMnrpMapModel()          0x00008b1d   Thumb Code    40  mnrefproviderengine.in(.text)
-    CMnrpMapModel::~CMnrpMapModel__sub_object() 0x00008b1d   Thumb Code     0  mnrefproviderengine.in(.text)
-    CMnrpMapModel::~CMnrpMapModel__deallocating() 0x00008b45   Thumb Code    16  mnrefproviderengine.in(.text)
-    CMnrpMapModel::Height() const            0x00008b55   Thumb Code    22  mnrefproviderengine.in(.text)
-    CMnrpMapModel::Bottom() const            0x00008b6b   Thumb Code    28  mnrefproviderengine.in(.text)
-    CMnrpMapModel::Top() const               0x00008b87   Thumb Code    28  mnrefproviderengine.in(.text)
-    CMnrpMapModel::Width() const             0x00008ba3   Thumb Code    22  mnrefproviderengine.in(.text)
-    CMnrpMapModel::Right() const             0x00008bb9   Thumb Code    28  mnrefproviderengine.in(.text)
-    CMnrpMapModel::Left() const              0x00008bd5   Thumb Code    28  mnrefproviderengine.in(.text)
-    CMnrpMapModel::MaxScale() const          0x00008bf1   Thumb Code    60  mnrefproviderengine.in(.text)
-    CMnrpMapModel::CheckBorders()            0x00008c2d   Thumb Code   240  mnrefproviderengine.in(.text)
-    CMnrpMapModel::AdjustBoundingBox(CMnrpMapModel::CDrawItem&, TRealPoint&, TRealPoint&) 0x00008d1d   Thumb Code   166  mnrefproviderengine.in(.text)
-    CMnrpMapModel::CheckDrawItemHasPositionL(CMnrpMapModel::CDrawItem&, const CPosLandmark&) 0x00008dc3   Thumb Code    90  mnrefproviderengine.in(.text)
-    CMnrpMapModel::CDrawItem::NewLC(const CPosLandmark&, CPosLmCategoryManager&) 0x00008e1d   Thumb Code   134  mnrefproviderengine.in(.text)
-    CMnrpMapModel::UpdateModelL(CMnrpMapViewService&) 0x00008ea3   Thumb Code   802  mnrefproviderengine.in(.text)
-    CMnrpMapModel::SetScreenSize(TSize)      0x000091c5   Thumb Code    14  mnrefproviderengine.in(.text)
-    CMnrpMapModel::UpdateModel(const TMnMapImageParams&) 0x000091d3   Thumb Code   178  mnrefproviderengine.in(.text)
-    CMnrpMapModel::UpdateModelL(const CMnrpMapImageService&) 0x00009285   Thumb Code   278  mnrefproviderengine.in(.text)
-    CMnrpMapModel::AbsoluteToScreen(TRealPoint) const 0x0000939b   Thumb Code   106  mnrefproviderengine.in(.text)
-    CMnrpMapModel::AbsoluteToScreen(TCoordinate) const 0x00009405   Thumb Code    84  mnrefproviderengine.in(.text)
-    CMnrpMapModel::CurrentLocation() const   0x00009459   Thumb Code   216  mnrefproviderengine.in(.text)
-    CMnrpMapModel::DrawCurrentLocation(CFbsBitGc&, const TSize&) const 0x00009531   Thumb Code   176  mnrefproviderengine.in(.text)
-    CMnrpMapModel::Items() const             0x000095e1   Thumb Code    88  mnrefproviderengine.in(.text)
-    CMnrpMapModel::DrawLandmarks(CFbsBitGc&, CFont&, const TSize&, int) const 0x00009639   Thumb Code   672  mnrefproviderengine.in(.text)
-    CMnrpMapModel::DrawHorizontalLine(CFbsBitGc&, int, TSize) const 0x000098d9   Thumb Code    28  mnrefproviderengine.in(.text)
-    CMnrpMapModel::DrawVerticalLine(CFbsBitGc&, int, TSize) const 0x000098f5   Thumb Code    30  mnrefproviderengine.in(.text)
-    CMnrpMapModel::DrawGrid(CFbsBitGc&, const TSize&, CMnrpMapModel::TGrid&) const 0x00009913   Thumb Code   128  mnrefproviderengine.in(.text)
-    CMnrpMapModel::AbsoluteToScreen(double) const 0x00009993   Thumb Code    24  mnrefproviderengine.in(.text)
-    CMnrpMapModel::GetGrid(CMnrpMapModel::TGrid&) const 0x000099ab   Thumb Code   348  mnrefproviderengine.in(.text)
-    CMnrpMapModel::RenderL(CFbsBitmap&, TRect, CFont*, CFont*) const 0x00009b07   Thumb Code   204  mnrefproviderengine.in(.text)
-    CMnrpMapModel::NumIgnoredLandmarks()     0x00009bd3   Thumb Code     6  mnrefproviderengine.in(.text)
-    CMnrpMapModel::Zoom(double)              0x00009bd9   Thumb Code    28  mnrefproviderengine.in(.text)
-    CMnrpMapModel::MoveTo(TCoordinate)       0x00009bf5   Thumb Code    54  mnrefproviderengine.in(.text)
-    CMnrpMapModel::GoCenter()                0x00009c2b   Thumb Code    32  mnrefproviderengine.in(.text)
-    CMnrpMapModel::ScreenToAbsolute(TPoint) const 0x00009c4b   Thumb Code   108  mnrefproviderengine.in(.text)
-    CMnrpMapModel::ScreenToAbsolute(int) const 0x00009cb7   Thumb Code    58  mnrefproviderengine.in(.text)
-    CMnrpMapModel::Center() const            0x00009cf1   Thumb Code    32  mnrefproviderengine.in(.text)
-    CMnrpMapModel::HandlePositionRequestCompletedL(int) 0x00009d11   Thumb Code    54  mnrefproviderengine.in(.text)
-    thunk{-4} to CMnrpMapModel::HandlePositionRequestCompletedL(int) 0x00009d47   Thumb Code     4  mnrefproviderengine.in(.text)
-    CMnrpMapModel::CDrawItem::~CDrawItem()   0x00009d4b   Thumb Code    56  mnrefproviderengine.in(.text)
-    CMnrpMapModel::CDrawItem::~CDrawItem__sub_object() 0x00009d4b   Thumb Code     0  mnrefproviderengine.in(.text)
-    CMnrpMapModel::CDrawItem::~CDrawItem__deallocating() 0x00009d83   Thumb Code    16  mnrefproviderengine.in(.text)
-    CMnrpPositionRequest::SetOptionsL(const TPositionUpdateOptionsBase&) 0x00009d99   Thumb Code    14  mnrefproviderengine.in(.text)
-    CMnrpPositionRequest::ConstructL(const TDesC16&) 0x00009da7   Thumb Code    94  mnrefproviderengine.in(.text)
-    CMnrpPositionRequest::CMnrpPositionRequest(MMnrpPositionObserver&) 0x00009e05   Thumb Code   106  mnrefproviderengine.in(.text)
-    CMnrpPositionRequest::CMnrpPositionRequest__sub_object(MMnrpPositionObserver&) 0x00009e05   Thumb Code     0  mnrefproviderengine.in(.text)
-    CMnrpPositionRequest::NewL(const TDesC16&, MMnrpPositionObserver&) 0x00009e6f   Thumb Code    40  mnrefproviderengine.in(.text)
-    CMnrpPositionRequest::~CMnrpPositionRequest() 0x00009e97   Thumb Code    44  mnrefproviderengine.in(.text)
-    CMnrpPositionRequest::~CMnrpPositionRequest__sub_object() 0x00009e97   Thumb Code     0  mnrefproviderengine.in(.text)
-    CMnrpPositionRequest::~CMnrpPositionRequest__deallocating() 0x00009ec3   Thumb Code    16  mnrefproviderengine.in(.text)
-    CMnrpPositionRequest::InitContainer(HPositionGenericInfo&) 0x00009ed3   Thumb Code    56  mnrefproviderengine.in(.text)
-    CMnrpPositionRequest::ExecuteNextStep()  0x00009f0b   Thumb Code    74  mnrefproviderengine.in(.text)
-    CMnrpPositionRequest::FetchNewPosition(int) 0x00009f55   Thumb Code    28  mnrefproviderengine.in(.text)
-    CMnrpPositionRequest::GetPosition(TPositionInfo&) 0x00009f71   Thumb Code    18  mnrefproviderengine.in(.text)
-    CMnrpPositionRequest::Speed()            0x00009f83   Thumb Code     6  mnrefproviderengine.in(.text)
-    CMnrpPositionRequest::Heading()          0x00009f89   Thumb Code     6  mnrefproviderengine.in(.text)
-    CMnrpPositionRequest::MagneticHeading()  0x00009f8f   Thumb Code     6  mnrefproviderengine.in(.text)
-    CMnrpPositionRequest::Course()           0x00009f95   Thumb Code     6  mnrefproviderengine.in(.text)
-    CMnrpPositionRequest::MagneticCourse()   0x00009f9b   Thumb Code     6  mnrefproviderengine.in(.text)
-    CMnrpPositionRequest::DoCancel()         0x00009fa1   Thumb Code    36  mnrefproviderengine.in(.text)
-    CMnrpPositionRequest::SaveContainer(const HPositionGenericInfo&) 0x00009fc5   Thumb Code   116  mnrefproviderengine.in(.text)
-    CMnrpPositionRequest::RunL()             0x0000a039   Thumb Code    64  mnrefproviderengine.in(.text)
-    CMnrpPositionRequest::RunError(int)      0x0000a079   Thumb Code     4  mnrefproviderengine.in(.text)
-    MnrpUtils::CoordinateToString(double, TDes16&, int, int) 0x0000a08d   Thumb Code   426  mnrefproviderengine.in(.text)
-    MnrpUtils::DistanceToString(double, TDes16&) 0x0000a237   Thumb Code   164  mnrefproviderengine.in(.text)
-    MnrpUtils::AngleToString(double, TDes16&) 0x0000a2db   Thumb Code   260  mnrefproviderengine.in(.text)
-    MnrpUtils::SpeedToString(double, TDes16&) 0x0000a3df   Thumb Code    66  mnrefproviderengine.in(.text)
-    MnrpUtils::PrintableStringLC(const TDesC16&) 0x0000a421   Thumb Code   204  mnrefproviderengine.in(.text)
-    _E32Dll_Body                             0x0000a4ed   Thumb Code    34  uc_dll.o(.text)
-    __DLL_Export_Table__                     0x0000a580   ARM Code       0  mnrefproviderengine{000a0000}.exp(ExportTable)
-    DLL##ExportTableSize                     0x0000a584   Data           0  mnrefproviderengine{000a0000}.exp(ExportTable)
-    DLL##ExportTable                         0x0000a588   Data           0  mnrefproviderengine{000a0000}.exp(ExportTable)
-    TRealX::SetNaN()                         0x0000a680   ARM Code       0  euser{000a0000}-1051.o(StubCode)
-    TRealX::TRealX()                         0x0000a688   ARM Code       0  euser{000a0000}-1059.o(StubCode)
-    TRealX::operator double() const          0x0000a690   ARM Code       0  euser{000a0000}-1073.o(StubCode)
-    TRealX::operator float() const           0x0000a698   ARM Code       0  euser{000a0000}-1074.o(StubCode)
-    CActive::Cancel()                        0x0000a6a0   ARM Code       0  euser{000a0000}-1088.o(StubCode)
-    CActive::SetActive()                     0x0000a6a8   ARM Code       0  euser{000a0000}-1090.o(StubCode)
-    CActive::CActive__sub_object(int)        0x0000a6b0   ARM Code       0  euser{000a0000}-1091.o(StubCode)
-    CActive::~CActive__sub_object()          0x0000a6b8   ARM Code       0  euser{000a0000}-1094.o(StubCode)
-    HBufC16::Des()                           0x0000a6c0   ARM Code       0  euser{000a0000}-1116.o(StubCode)
-    HBufC16::NewLC(int)                      0x0000a6c8   ARM Code       0  euser{000a0000}-1119.o(StubCode)
-    TPtrC16::TPtrC16(const TDesC16&)         0x0000a6d0   ARM Code       0  euser{000a0000}-1171.o(StubCode)
-    TPtrC16::TPtrC16()                       0x0000a6d8   ARM Code       0  euser{000a0000}-1172.o(StubCode)
-    RHandleBase::Close()                     0x0000a6e0   ARM Code       0  euser{000a0000}-120.o(StubCode)
-    RArrayBase::At(int) const                0x0000a6e8   ARM Code       0  euser{000a0000}-1507.o(StubCode)
-    RArrayBase::Count() const                0x0000a6f0   ARM Code       0  euser{000a0000}-1510.o(StubCode)
-    RPointerArrayBase::At(int) const         0x0000a6f8   ARM Code       0  euser{000a0000}-1590.o(StubCode)
-    RPointerArrayBase::Count() const         0x0000a700   ARM Code       0  euser{000a0000}-1593.o(StubCode)
-    TChar::IsPrint() const                   0x0000a708   ARM Code       0  euser{000a0000}-1625.o(StubCode)
-    TRect::Intersects(const TRect&) const    0x0000a710   ARM Code       0  euser{000a0000}-1646.o(StubCode)
-    TRect::Size() const                      0x0000a718   ARM Code       0  euser{000a0000}-1648.o(StubCode)
-    TRect::Width() const                     0x0000a720   ARM Code       0  euser{000a0000}-1649.o(StubCode)
-    TRect::Height() const                    0x0000a728   ARM Code       0  euser{000a0000}-1651.o(StubCode)
-    TPoint::operator +(const TPoint&) const  0x0000a730   ARM Code       0  euser{000a0000}-1753.o(StubCode)
-    TDesC16::AtC(int) const                  0x0000a738   ARM Code       0  euser{000a0000}-1806.o(StubCode)
-    TDesC16::FindF(const TDesC16&) const     0x0000a740   ARM Code       0  euser{000a0000}-1815.o(StubCode)
-    TDesC16::AllocLC() const                 0x0000a748   ARM Code       0  euser{000a0000}-1821.o(StubCode)
-    TDesC16::CompareF(const TDesC16&) const  0x0000a750   ARM Code       0  euser{000a0000}-1826.o(StubCode)
-    CleanupStack::PopAndDestroy()            0x0000a758   ARM Code       0  euser{000a0000}-203.o(StubCode)
-    CleanupStack::Pop()                      0x0000a760   ARM Code       0  euser{000a0000}-205.o(StubCode)
-    User::MarkCleanupStack()                 0x0000a768   ARM Code       0  euser{000a0000}-2060.o(StubCode)
-    User::UnMarkCleanupStack(TTrapHandler*)  0x0000a770   ARM Code       0  euser{000a0000}-2061.o(StubCode)
-    CleanupStack::PushL(TCleanupItem)        0x0000a778   ARM Code       0  euser{000a0000}-207.o(StubCode)
-    CleanupStack::PushL(CBase*)              0x0000a780   ARM Code       0  euser{000a0000}-208.o(StubCode)
-    XLeaveException::GetReason() const       0x0000a788   ARM Code       0  euser{000a0000}-2082.o(StubCode)
-    CleanupStack::PushL(void*)               0x0000a790   ARM Code       0  euser{000a0000}-209.o(StubCode)
-    CBase::Extension_(unsigned, void*&, void*) 0x0000a798   ARM Code       0  euser{000a0000}-2123.o(StubCode)
-    CBase::~CBase()                          0x0000a7a0   ARM Code       0  euser{000a0000}-2125.o(StubCode)
-    CActive::Extension_(unsigned, void*&, void*) 0x0000a7a8   ARM Code       0  euser{000a0000}-2128.o(StubCode)
-    CActiveScheduler::Add(CActive*)          0x0000a7b0   ARM Code       0  euser{000a0000}-424.o(StubCode)
-    RArrayBase::Close()                      0x0000a7b8   ARM Code       0  euser{000a0000}-46.o(StubCode)
-    RPointerArrayBase::GetElementPtr(const CBase*, int) 0x0000a7c0   ARM Code       0  euser{000a0000}-464.o(StubCode)
-    RArrayBase::Reset()                      0x0000a7c8   ARM Code       0  euser{000a0000}-47.o(StubCode)
-    RPointerArrayBase::Reset()               0x0000a7d0   ARM Code       0  euser{000a0000}-471.o(StubCode)
-    RPointerArrayBase::Append(const void*)   0x0000a7d8   ARM Code       0  euser{000a0000}-472.o(StubCode)
-    RPointerArrayBase::GetCount(const CBase*) 0x0000a7e0   ARM Code       0  euser{000a0000}-476.o(StubCode)
-    RArrayBase::Append(const void*)          0x0000a7e8   ARM Code       0  euser{000a0000}-48.o(StubCode)
-    RPointerArrayBase::RPointerArrayBase()   0x0000a7f0   ARM Code       0  euser{000a0000}-481.o(StubCode)
-    RArrayBase::Insert(const void*, int)     0x0000a7f8   ARM Code       0  euser{000a0000}-49.o(StubCode)
-    RArrayBase::Remove(int)                  0x0000a800   ARM Code       0  euser{000a0000}-50.o(StubCode)
-    RArrayBase::RArrayBase(int)              0x0000a808   ARM Code       0  euser{000a0000}-55.o(StubCode)
-    Math::IsNaN(const double&)               0x0000a810   ARM Code       0  euser{000a0000}-551.o(StubCode)
-    User::LeaveIfError(int)                  0x0000a818   ARM Code       0  euser{000a0000}-593.o(StubCode)
-    User::Leave(int)                         0x0000a820   ARM Code       0  euser{000a0000}-649.o(StubCode)
-    User::AllocZL(int)                       0x0000a828   ARM Code       0  euser{000a0000}-654.o(StubCode)
-    User::Invariant()                        0x0000a830   ARM Code       0  euser{000a0000}-669.o(StubCode)
-    TBufBase16::TBufBase16(int)              0x0000a838   ARM Code       0  euser{000a0000}-81.o(StubCode)
-    TRect::Grow(int, int)                    0x0000a840   ARM Code       0  euser{000a0000}-824.o(StubCode)
-    TRect::Move(int, int)                    0x0000a848   ARM Code       0  euser{000a0000}-826.o(StubCode)
-    TRect::TRect(const TSize&)               0x0000a850   ARM Code       0  euser{000a0000}-838.o(StubCode)
-    TRect::TRect(const TPoint&, const TSize&) 0x0000a858   ARM Code       0  euser{000a0000}-839.o(StubCode)
-    TRect::TRect(int, int, int, int)         0x0000a860   ARM Code       0  euser{000a0000}-841.o(StubCode)
-    TDes16::AppendFormat(TRefByValue<const TDesC16>, ...) 0x0000a868   ARM Code       0  euser{000a0000}-936.o(StubCode)
-    TDes16::Copy(const TDesC16&)             0x0000a870   ARM Code       0  euser{000a0000}-953.o(StubCode)
-    TDes16::Zero()                           0x0000a878   ARM Code       0  euser{000a0000}-960.o(StubCode)
-    TDes16::Append(TChar)                    0x0000a880   ARM Code       0  euser{000a0000}-966.o(StubCode)
-    TDes16::Append(const TDesC16&)           0x0000a888   ARM Code       0  euser{000a0000}-968.o(StubCode)
-    TDes16::Format(TRefByValue<const TDesC16>, ...) 0x0000a890   ARM Code       0  euser{000a0000}-973.o(StubCode)
-    TDes16::AppendNum(long long)             0x0000a898   ARM Code       0  euser{000a0000}-984.o(StubCode)
-    TParse::Set(const TDesC16&, const TDesC16*, const TDesC16*) 0x0000a8a0   ARM Code       0  efsrv{000a0000}-115.o(StubCode)
-    TParse::TParse()                         0x0000a8a8   ARM Code       0  efsrv{000a0000}-118.o(StubCode)
-    TFindFile::FindByDir(const TDesC16&, const TDesC16&) 0x0000a8b0   ARM Code       0  efsrv{000a0000}-181.o(StubCode)
-    TFindFile::TFindFile(RFs&)               0x0000a8b8   ARM Code       0  efsrv{000a0000}-182.o(StubCode)
-    TParseBase::NameAndExt() const           0x0000a8c0   ARM Code       0  efsrv{000a0000}-190.o(StubCode)
-    TParseBase::Path() const                 0x0000a8c8   ARM Code       0  efsrv{000a0000}-200.o(StubCode)
-    TParseBase::FullName() const             0x0000a8d0   ARM Code       0  efsrv{000a0000}-204.o(StubCode)
-    RFs::Connect(int)                        0x0000a8d8   ARM Code       0  efsrv{000a0000}-68.o(StubCode)
-    RResourceReader::ReadHBufCL()            0x0000a8e0   ARM Code       0  bafl{000a0000}-123.o(StubCode)
-    RResourceReader::ReadInt16L()            0x0000a8e8   ARM Code       0  bafl{000a0000}-124.o(StubCode)
-    RResourceReader::ReadReal64L()           0x0000a8f0   ARM Code       0  bafl{000a0000}-129.o(StubCode)
-    RResourceReader::OpenLC(const CResourceFile*, int) 0x0000a8f8   ARM Code       0  bafl{000a0000}-141.o(StubCode)
-    RResourceReader::RResourceReader()       0x0000a900   ARM Code       0  bafl{000a0000}-145.o(StubCode)
-    RResourceReader::~RResourceReader()      0x0000a908   ARM Code       0  bafl{000a0000}-147.o(StubCode)
-    CResourceFile::ConfirmSignatureL(int)    0x0000a910   ARM Code       0  bafl{000a0000}-59.o(StubCode)
-    CResourceFile::NewLC(RFs&, const TDesC16&, unsigned, int) 0x0000a918   ARM Code       0  bafl{000a0000}-62.o(StubCode)
-    AknIconUtils::CreateIconL(CFbsBitmap*&, CFbsBitmap*&, const TDesC16&, int, int) 0x0000a920   ARM Code       0  AknIcon{000a0000}-11.o(StubCode)
-    AknIconUtils::DestroyIconData(CFbsBitmap*) 0x0000a928   ARM Code       0  AknIcon{000a0000}-15.o(StubCode)
-    AknIconUtils::PreserveIconData(CFbsBitmap*) 0x0000a930   ARM Code       0  AknIcon{000a0000}-16.o(StubCode)
-    AknIconUtils::SetSize(CFbsBitmap*, const TSize&, TScaleMode) 0x0000a938   ARM Code       0  AknIcon{000a0000}-21.o(StubCode)
-    CFont::HeightInPixels() const            0x0000a940   ARM Code       0  gdi{000a0000}-311.o(StubCode)
-    CFont::TextWidthInPixels(const TDesC16&) const 0x0000a948   ARM Code       0  gdi{000a0000}-314.o(StubCode)
-    CFbsDevice::CreateContext(CFbsBitGc*&)   0x0000a950   ARM Code       0  bitgdi{000a0000}-14.o(StubCode)
-    CFbsBitmapDevice::NewL(CFbsBitmap*)      0x0000a958   ARM Code       0  bitgdi{000a0000}-44.o(StubCode)
-    CPosLandmark::NewL(const CPosLandmark&)  0x0000a960   ARM Code       0  eposlandmarks{000a0000}-12.o(StubCode)
-    CPosLandmark::NewLC(const CPosLandmark&) 0x0000a968   ARM Code       0  eposlandmarks{000a0000}-14.o(StubCode)
-    CPosLandmark::NewLC()                    0x0000a970   ARM Code       0  eposlandmarks{000a0000}-15.o(StubCode)
-    CPosLandmark::SetPositionL(const TLocality&) 0x0000a978   ARM Code       0  eposlandmarks{000a0000}-4.o(StubCode)
-    CPosLandmarkDatabase::OpenL(const TDesC16&) 0x0000a980   ARM Code       0  eposlandmarks{000a0000}-50.o(StubCode)
-    CPosLandmarkDatabase::OpenL()            0x0000a988   ARM Code       0  eposlandmarks{000a0000}-51.o(StubCode)
-    CPosLmCategoryManager::NewL(CPosLandmarkDatabase&) 0x0000a990   ARM Code       0  eposlandmarks{000a0000}-56.o(StubCode)
-    CPosLandmark::SetLandmarkNameL(const TDesC16&) 0x0000a998   ARM Code       0  eposlandmarks{000a0000}-6.o(StubCode)
-    CPosLandmark::GetPosition(TLocality&) const 0x0000a9a0   ARM Code       0  eposlandmarks{000a0000}-65.o(StubCode)
-    CPosLandmark::GetCategoriesL(RArray<unsigned long>&) const 0x0000a9a8   ARM Code       0  eposlandmarks{000a0000}-66.o(StubCode)
-    CPosLandmark::GetLandmarkName(TPtrC16&) const 0x0000a9b0   ARM Code       0  eposlandmarks{000a0000}-67.o(StubCode)
-    CPosLandmark::GetPositionField(unsigned short, TPtrC16&) const 0x0000a9b8   ARM Code       0  eposlandmarks{000a0000}-68.o(StubCode)
-    CPosLandmark::GetIcon(TPtrC16&, int&, int&) const 0x0000a9c0   ARM Code       0  eposlandmarks{000a0000}-75.o(StubCode)
-    CPosLandmark::SetPositionFieldL(unsigned short, const TDesC16&) 0x0000a9c8   ARM Code       0  eposlandmarks{000a0000}-8.o(StubCode)
-    CPosLandmarkCategory::GetIcon(TPtrC16&, int&, int&) const 0x0000a9d0   ARM Code       0  eposlandmarks{000a0000}-82.o(StubCode)
-    RPositioner::Open(RPositionServer&)      0x0000a9d8   ARM Code       0  lbs{000a0000}-10.o(StubCode)
-    RPositioner::Close()                     0x0000a9e0   ARM Code       0  lbs{000a0000}-13.o(StubCode)
-    RPositioner::RPositioner()               0x0000a9e8   ARM Code       0  lbs{000a0000}-15.o(StubCode)
-    TPositionUpdateOptions::TPositionUpdateOptions() 0x0000a9f0   ARM Code       0  lbs{000a0000}-152.o(StubCode)
-    RPositionerSubSessionBase::CancelRequest(int) 0x0000a9f8   ARM Code       0  lbs{000a0000}-167.o(StubCode)
-    TCoordinate::SetCoordinate(const double&, const double&) 0x0000aa00   ARM Code       0  lbs{000a0000}-17.o(StubCode)
-    TPositionUpdateOptionsBase::SetUpdateTimeOut(TTimeIntervalMicroSeconds) 0x0000aa08   ARM Code       0  lbs{000a0000}-180.o(StubCode)
-    TPositionUpdateOptionsBase::SetUpdateInterval(TTimeIntervalMicroSeconds) 0x0000aa10   ARM Code       0  lbs{000a0000}-181.o(StubCode)
-    TLocality::TLocality(const TCoordinate&, float) 0x0000aa18   ARM Code       0  lbs{000a0000}-205.o(StubCode)
-    TLocality::TLocality()                   0x0000aa20   ARM Code       0  lbs{000a0000}-207.o(StubCode)
-    TCoordinate::TCoordinate(const double&, const double&) 0x0000aa28   ARM Code       0  lbs{000a0000}-21.o(StubCode)
-    TPosition::TPosition()                   0x0000aa30   ARM Code       0  lbs{000a0000}-214.o(StubCode)
-    RPositioner::GetLastKnownPosition(TPositionInfoBase&, TRequestStatus&) const 0x0000aa38   ARM Code       0  lbs{000a0000}-218.o(StubCode)
-    RPositioner::NotifyPositionUpdate(TPositionInfoBase&, TRequestStatus&) const 0x0000aa40   ARM Code       0  lbs{000a0000}-219.o(StubCode)
-    TCoordinate::Latitude() const            0x0000aa48   ARM Code       0  lbs{000a0000}-223.o(StubCode)
-    TCoordinate::Longitude() const           0x0000aa50   ARM Code       0  lbs{000a0000}-225.o(StubCode)
-    TPositionInfo::GetPosition(TPosition&) const 0x0000aa58   ARM Code       0  lbs{000a0000}-226.o(StubCode)
-    TCoordinate::TCoordinate()               0x0000aa60   ARM Code       0  lbs{000a0000}-23.o(StubCode)
-    TPositionInfo::TPositionInfo()           0x0000aa68   ARM Code       0  lbs{000a0000}-28.o(StubCode)
-    TLocality::HorizontalAccuracy() const    0x0000aa70   ARM Code       0  lbs{000a0000}-303.o(StubCode)
-    TLocality::Distance(const TCoordinate&, float&) const 0x0000aa78   ARM Code       0  lbs{000a0000}-304.o(StubCode)
-    RPositionServer::Close()                 0x0000aa80   ARM Code       0  lbs{000a0000}-47.o(StubCode)
-    RPositionServer::Connect()               0x0000aa88   ARM Code       0  lbs{000a0000}-48.o(StubCode)
-    RPositionServer::RPositionServer()       0x0000aa90   ARM Code       0  lbs{000a0000}-49.o(StubCode)
-    RPositioner::SetRequestor(int, int, const TDesC16&) 0x0000aa98   ARM Code       0  lbs{000a0000}-7.o(StubCode)
-    RPositioner::SetUpdateOptions(const TPositionUpdateOptionsBase&) 0x0000aaa0   ARM Code       0  lbs{000a0000}-8.o(StubCode)
-    HPositionGenericInfo::ClearPositionData() 0x0000aaa8   ARM Code       0  lbs{000a0000}-82.o(StubCode)
-    HPositionGenericInfo::SetRequestedField(unsigned short) 0x0000aab0   ARM Code       0  lbs{000a0000}-83.o(StubCode)
-    HPositionGenericInfo::NewL(int, int)     0x0000aab8   ARM Code       0  lbs{000a0000}-87.o(StubCode)
-    PositionFieldManager::GetValue(unsigned short, float&, const HPositionGenericInfo&) 0x0000aac0   ARM Code       0  lbs{000a0000}-97.o(StubCode)
-    CMnMapViewServiceBase::LinkedLandmarksToShow(int) 0x0000aac8   ARM Code       0  mnservicelib{000a0000}-10.o(StubCode)
-    CMnMapViewServiceBase::LandmarksToShowDatabases() 0x0000aad0   ARM Code       0  mnservicelib{000a0000}-13.o(StubCode)
-    CMnMapViewServiceBase::AreaRadius()      0x0000aad8   ARM Code       0  mnservicelib{000a0000}-3.o(StubCode)
-    CMnMapViewServiceBase::LandmarksToShow() 0x0000aae0   ARM Code       0  mnservicelib{000a0000}-5.o(StubCode)
-    CMnMapImageServiceBase::ShowOptions() const 0x0000aae8   ARM Code       0  mnservicelib{000a0000}-55.o(StubCode)
-    CMnMapImageServiceBase::MapImageParams() const 0x0000aaf0   ARM Code       0  mnservicelib{000a0000}-57.o(StubCode)
-    CMnMapViewServiceBase::GetAreaCentralPoint(TCoordinate&) 0x0000aaf8   ARM Code       0  mnservicelib{000a0000}-6.o(StubCode)
-    CMnMapViewServiceBase::CurrentLocationOption() 0x0000ab00   ARM Code       0  mnservicelib{000a0000}-8.o(StubCode)
-    CMnMapViewServiceBase::IsAreaCentralPointSet() 0x0000ab08   ARM Code       0  mnservicelib{000a0000}-9.o(StubCode)
-    __aeabi_dadd                             0x0000ab10   ARM Code       0  dfpaeabi{000a0000}-12.o(StubCode)
-    __aeabi_ddiv                             0x0000ab18   ARM Code       0  dfpaeabi{000a0000}-19.o(StubCode)
-    __aeabi_cdcmple                          0x0000ab20   ARM Code       0  dfpaeabi{000a0000}-2.o(StubCode)
-    __aeabi_dmul                             0x0000ab28   ARM Code       0  dfpaeabi{000a0000}-20.o(StubCode)
-    __aeabi_drsub                            0x0000ab30   ARM Code       0  dfpaeabi{000a0000}-22.o(StubCode)
-    __aeabi_dsub                             0x0000ab38   ARM Code       0  dfpaeabi{000a0000}-23.o(StubCode)
-    __aeabi_f2d                              0x0000ab40   ARM Code       0  dfpaeabi{000a0000}-24.o(StubCode)
-    __aeabi_f2iz                             0x0000ab48   ARM Code       0  dfpaeabi{000a0000}-25.o(StubCode)
-    __aeabi_cdrcmple                         0x0000ab50   ARM Code       0  dfpaeabi{000a0000}-3.o(StubCode)
-    __aeabi_fdiv                             0x0000ab58   ARM Code       0  dfpaeabi{000a0000}-36.o(StubCode)
-    __aeabi_i2d                              0x0000ab60   ARM Code       0  dfpaeabi{000a0000}-41.o(StubCode)
-    __aeabi_cfcmple                          0x0000ab68   ARM Code       0  dfpaeabi{000a0000}-5.o(StubCode)
-    __aeabi_d2iz                             0x0000ab70   ARM Code       0  dfpaeabi{000a0000}-8.o(StubCode)
-    __aeabi_idivmod                          0x0000ab78   ARM Code       0  drtaeabi{000a0000}-135.o(StubCode)
-    __aeabi_memcpy4                          0x0000ab80   ARM Code       0  drtaeabi{000a0000}-147.o(StubCode)
-    __aeabi_unwind_cpp_pr0                   0x0000ab88   ARM Code       0  drtaeabi{000a0000}-158.o(StubCode)
-    __aeabi_unwind_cpp_pr1                   0x0000ab90   ARM Code       0  drtaeabi{000a0000}-159.o(StubCode)
-    __cxa_begin_catch                        0x0000ab98   ARM Code       0  drtaeabi{000a0000}-180.o(StubCode)
-    __cxa_end_catch                          0x0000aba0   ARM Code       0  drtaeabi{000a0000}-183.o(StubCode)
-    __cxa_end_cleanup                        0x0000aba8   ARM Code       0  drtaeabi{000a0000}-184.o(StubCode)
-    operator delete (void*)                  0x0000abb0   ARM Code       0  scppnwdl{000a0000}-3.o(StubCode)
-    ExecuteAndDeleteLD(CPosLmOperation*)     0x0000abb9   Thumb Code    22  mnrefproviderengine.in(i._Z18ExecuteAndDeleteLDP15CPosLmOperation)
-    TPtrC16::Set(const TDesC16&)             0x0000abcf   Thumb Code    28  mnrefproviderengine.in(i._ZN7TPtrC163SetERK7TDesC16)
-    operator delete (void*, void*)           0x0000abf7   Thumb Code     2  mnrefproviderengine.in(i._ZdlPvS_)
-    operator new(unsigned, void*)            0x0000abf9   Thumb Code     4  mnrefproviderengine.in(i._ZnwjPv)
-    CleanupClosePushL<RArray<CMnrpEngine::TDistanceToPoi>>(T1&) 0x0000abfd   Thumb Code    12  mnrefproviderengine.in(t._Z17CleanupClosePushLI6RArrayIN11CMnrpEngine14TDistanceToPoiEEEvRT_)
-    Abs<double>(T1)                          0x0000ac0d   Thumb Code    36  mnrefproviderengine.in(t._Z3AbsIdET_S0_)
-    Max<double>(T1, T1)                      0x0000ac39   Thumb Code    28  mnrefproviderengine.in(t._Z3MaxIdET_S0_S0_)
-    Min<double>(T1, T1)                      0x0000ac55   Thumb Code    28  mnrefproviderengine.in(t._Z3MinIdET_S0_S0_)
-    CleanupClose<RArray<CMnrpEngine::TDistanceToPoi>>::Close(void*) 0x0000ac71   Thumb Code     8  mnrefproviderengine.in(t._ZN12CleanupCloseI6RArrayIN11CMnrpEngine14TDistanceToPoiEEE5CloseEPv)
-    CleanupClose<RArray<unsigned long>>::Close(void*) 0x0000ac79   Thumb Code     8  mnrefproviderengine.in(t._ZN12CleanupCloseI6RArrayImEE5CloseEPv)
-    RPointerArray<CPosLandmark>::AppendL(const CPosLandmark*) 0x0000ac81   Thumb Code    12  mnrefproviderengine.in(t._ZN13RPointerArrayI12CPosLandmarkE7AppendLEPKS0_)
-    RPointerArray<CMnrpMapModel::CDrawItem>::ResetAndDestroy() 0x0000ac8d   Thumb Code    48  mnrefproviderengine.in(t._ZN13RPointerArrayIN13CMnrpMapModel9CDrawItemEE15ResetAndDestroyEv)
-    RPointerArray<CMnrpMapModel::CDrawItem>::AppendL(const CMnrpMapModel::CDrawItem*) 0x0000acbd   Thumb Code    12  mnrefproviderengine.in(t._ZN13RPointerArrayIN13CMnrpMapModel9CDrawItemEE7AppendLEPKS1_)
-    HPositionGenericInfo::GetValue<float>(unsigned short, T1&) const 0x0000acc9   Thumb Code    16  mnrefproviderengine.in(t._ZNK20HPositionGenericInfo8GetValueIfEEitRT_)
-    RArray<CMnrpEngine::TDistanceToPoi>::Count() const 0x0000acd9   Thumb Code     8  mnrefproviderengine.in(t._ZNK6RArrayIN11CMnrpEngine14TDistanceToPoiEE5CountEv)
-    TArray<CPosLandmark*>::operator [](int) const 0x0000ace1   Thumb Code     8  mnrefproviderengine.in(t._ZNK6TArrayIP12CPosLandmarkEixEi)
-    TArray<CMnrpMapModel::CDrawItem*>::operator [](int) const 0x0000ace9   Thumb Code     8  mnrefproviderengine.in(t._ZNK6TArrayIPN13CMnrpMapModel9CDrawItemEEixEi)
-    typeinfo for CMnrpEngine                 0x0000af94   Data          12  mnrefproviderengine.in(.constdata__ZTI11CMnrpEngine)
-    typeinfo for CMnrpMapModel               0x0000afa0   Data          32  mnrefproviderengine.in(.constdata__ZTI13CMnrpMapModel)
-    typeinfo for CMnrpPositionRequest        0x0000afc0   Data          12  mnrefproviderengine.in(.constdata__ZTI20CMnrpPositionRequest)
-    typeinfo for MMnrpPositionObserver       0x0000afcc   Data           8  mnrefproviderengine.in(.constdata__ZTI21MMnrpPositionObserver)
-    typeinfo for CMnrpMapModel::CDrawItem    0x0000afd4   Data          12  mnrefproviderengine.in(.constdata__ZTIN13CMnrpMapModel9CDrawItemE)
-    typeinfo name for CMnrpEngine            0x0000afe0   Data          14  mnrefproviderengine.in(.constdata__ZTS11CMnrpEngine)
-    typeinfo name for CMnrpMapModel          0x0000afee   Data          16  mnrefproviderengine.in(.constdata__ZTS13CMnrpMapModel)
-    typeinfo name for CMnrpPositionRequest   0x0000affe   Data          23  mnrefproviderengine.in(.constdata__ZTS20CMnrpPositionRequest)
-    typeinfo name for MMnrpPositionObserver  0x0000b015   Data          24  mnrefproviderengine.in(.constdata__ZTS21MMnrpPositionObserver)
-    typeinfo name for CMnrpMapModel::CDrawItem 0x0000b02d   Data          28  mnrefproviderengine.in(.constdata__ZTSN13CMnrpMapModel9CDrawItemE)
-    vtable for CMnrpEngine                   0x0000b04c   Data          20  mnrefproviderengine.in(.constdata__ZTV11CMnrpEngine)
-    vtable for CMnrpMapModel                 0x0000b060   Data          36  mnrefproviderengine.in(.constdata__ZTV13CMnrpMapModel)
-    vtable for CMnrpPositionRequest          0x0000b084   Data          32  mnrefproviderengine.in(.constdata__ZTV20CMnrpPositionRequest)
-    vtable for CMnrpMapModel::CDrawItem      0x0000b0a4   Data          20  mnrefproviderengine.in(.constdata__ZTVN13CMnrpMapModel9CDrawItemE)
-    .ARM.exidx$$Base                         0x0000b0b8   Number         0  ucppinit_aeabi.o(.ARM.exidx)
-    .ARM.exidx$$Limit                        0x0000b358   Number         0  mnrefproviderengine.in(.ARM.exidx)
-    Image$$ER_RO$$Limit                      0x0000b358   Number         0  anon$$obj.o(linker$$defined$$symbols)
-
Binary file locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/data/armv5/urel/mnrefproviderengine.rsc has changed
Binary file locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/data/winscw/udeb/MnRefProviderPlugin.dll has changed
Binary file locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/data/winscw/udeb/mnrefprovider.exe has changed
Binary file locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/data/winscw/udeb/mnrefproviderback.exe has changed
Binary file locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/data/winscw/udeb/mnrefproviderengine.dll has changed
--- a/locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/eabi/testmnproviderdiscoveryu.def	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-EXPORTS
-	_Z9LibEntryLR13CTestModuleIf @ 1 NONAME
-
--- a/locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/group/bld.inf	Mon May 03 12:54:42 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: Build information file for test code of Map and Navigation Provider Discovery API
-*
-*/
-
-
-
-PRJ_PLATFORMS
-// specify the platforms your component needs to be built for here
-// defaults to WINS MARM so you can ignore this if you just build these
-DEFAULT
-
-PRJ_TESTEXPORTS
-// NOTE: If using ARS requirements all export operations should be done under this.
-// 'abld test export'
-
-PRJ_EXPORTS
-// Specify the source file followed by its destination here
-// copy will be used to copy the source file to its destination
-// If there's no destination then the source file will be copied
-// to the same name in /epoc32/include
-// Example: 
-/*
-/agnmodel/inc/AGMCOMON.H
-*/
-
-PRJ_TESTMMPFILES
-// NOTE: If using ARS requirements .mmp file operation should be done under this.
-// 'abld test build'
-
-#ifdef RD_MAPNAV_BITMAP_ACCESS
-#endif
-
-testmnproviderdiscovery.mmp
-
-PRJ_MMPFILES
-// Specify the .mmp files required for building the important component
-// releasables.
-//
-// Specify "tidy" if the component you need to build doesn't need to be
-// released. Specify "ignore" if the MMP file exists but should be
-// ignored.
-// Example:
-/*
-/agnmodel/group/agnmodel.mmp
-#if defined(MARM)
-/agnmodel/group/agsvexe.mmp
-#endif
-*/
-
-//  End of File
\ No newline at end of file
--- a/locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/group/map_and_navigation_provider_discovery_api_test.pkg	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,58 +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: Package file for test code of Map and Navigation Provider Discovery API
-;
-;
-; Installation file for map_and_navigation_provider_discovery_api_test application
-;
-;Languages
-&EN
-;
-; UID is the app's UID
-;
-#{"map_and_navigation_provider_discovery_api_test"},(0x101FB3E3),2,0,0,TYPE=SA
-;
-; Localised Vendor name
-%{"Nokia-EN"}
-
-; Unique Vendor name
-:"Nokia"
-
-;Supports Series 60 v 3.0
-;This line indicates that this installation is for the Series 60 platform v0.9
-;This line must appear _exactly_ as shown below in the sis file
-;If this line is missing or incorrect, the sis file will not be able
-;to be installed on Series 60 v3.0 platforms
-;(0x101F7961), 0, 0, 0, {"Series60ProductID"}
-;
-;
-; Files to install
-"\epoc32\release\armv5\urel\testmnproviderdiscovery.dll"-"C:\sys\bin\testmnproviderdiscovery.dll"
-
-;refapp dlls
-"..\data\armv5\urel\mnrefprovider.exe"-"C:\sys\bin\mnrefprovider.exe"
-"..\data\armv5\urel\mnrefprovider.rsc"-"C:\resource\apps\mnrefprovider.rsc"
-"..\data\armv5\urel\mnrefprovider.mbm"-"C:\resource\apps\mnrefprovider.mbm"
-"..\data\armv5\urel\mnrefprovider.mif"-"C:\resource\apps\mnrefprovider.mif"
-"..\data\armv5\urel\mnrefprovider_reg.rsc"-"C:\private\10003a3f\import\apps\mnrefprovider_reg.rsc"
-
-"..\data\armv5\urel\mnrefproviderback.exe"-"C:\sys\bin\mnrefproviderback.exe"
-"..\data\armv5\urel\mnrefproviderback.rsc"-"C:\resource\apps\mnrefproviderback.rsc"
-"..\data\armv5\urel\mnrefproviderback_reg.rsc"-"C:\private\10003a3f\import\apps\mnrefproviderback_reg.rsc"
-
-"..\data\armv5\urel\mnrefproviderengine.dll"-"C:\sys\bin\mnrefproviderengine.dll"
-"..\data\armv5\urel\mnrefproviderengine.rsc"-"C:\resource\mnrefproviderengine.rsc"
-
-"..\conf\testmnproviderdiscovery.cfg"-"C:\testframework\testmnproviderdiscovery.cfg"
-"..\init\testframework.ini"-"C:\testframework\testframework.ini"
\ No newline at end of file
--- a/locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/group/testmnproviderdiscovery.mmp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,80 +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: Project definition file for test code of Map and Navigation Provider Discovery API
-*
-*/
-
-
-
-#include <platform_paths.hrh>
-
-TARGET          testmnproviderdiscovery.dll
-TARGETTYPE      dll
-UID             0x1000008D 0x101FB3E3
-
-CAPABILITY      ALL -TCB
-/* Remove comments and replace 0x00000000 with correct vendor id */
-// VENDORID     0x00000000
-/* Remove comments and replace 0x00000000 with correct secure id */
-// SECUREID     0x00000000
-
-//TARGETPATH      ?target_path
-DEFFILE         testmnproviderdiscovery.def
-
-SOURCEPATH      ../src
-SOURCE          testmnproviderdiscovery.cpp
-SOURCE          testmnproviderdiscoveryblocks.cpp
-SOURCE          testmnproviderfinder.cpp
-SOURCE          testcmnprovider.cpp
-
-//RESOURCE        resource_file
-//RESOURCE        resource_file2
-
-USERINCLUDE     ../inc 
-
-MW_LAYER_SYSTEMINCLUDE
-
-LIBRARY         euser.lib
-LIBRARY         stiftestinterface.lib
-LIBRARY         mnclientlib.lib
-LIBRARY			swinstcli.lib
-
-LANG            SC
-
-/*
-START WINS      
-?wins_specific_information
-END
-
-START MARM
-?marm_specific_information
-END
-*/
-// Other possible keywords:
- 
-// DOCUMENT     ?file, that is not compiled, but added to MSVC project workspace (i.e. release notes)
-/*
-START BITMAP ?target
-TARGETPATH   ?emulated_path_on_target_machine
-HEADER
-SOURCE       ?color_depth ?source_bitmap
-END
-*/
-// DEFFILE ?filename
-// AIF ?filename
-
-
-SMPSAFE
-
-// End of File
--- a/locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/inc/testcmnprovider.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,99 +0,0 @@
-/*
-* Copyright (c) 2007 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: Provides testing of CMnProvider class methods
-*
-*/
-
-
-
-#ifndef CTESTMNPROVIDER_H
-#define CTESTMNPROVIDER_H
-
-//  INCLUDES
-#include <StifLogger.h>
-#include <TestScripterInternal.h>
-#include <StifTestModule.h>
-
-
-
-// CLASS 
-
-class CTestMnProvider
-	{
-	public:	//Public constructor of class
-	
-		/**
-		*
-		*/
-		CTestMnProvider(CStifLogger* aLog);
-		
-		static CTestMnProvider* NewL(CStifLogger* aLog);
-		
-		void ConstructL();
-		
-		~CTestMnProvider();
-		
-	public:	//Public methods
-		
-	public:	//Public methods
-	
-		/**
-		*
-		*/
-		TInt DestroyProviderL( CStifItemParser& aItem );
-		
-		/**
-		*
-		*/
-		TInt ProviderUidL( CStifItemParser& aItem );
-		
-		/**
-		*
-		*/
-		TInt ProviderVersionL( CStifItemParser& aItem );
-		
-		/**
-		*
-		*/
-		TInt GetProviderNameL( CStifItemParser& aItem );
-		
-		/**
-		*
-		*/
-		TInt GetShortNameL( CStifItemParser& aItem );
-		
-		/**
-		*
-		*/
-		TInt GetVendorNameL( CStifItemParser& aItem );
-		
-		/**
-		*
-		*/
-		TInt SupportedServicesL( CStifItemParser& aItem );
-		
-		/**
-		*
-		*/
-		TInt SupportedFeaturesL( CStifItemParser& aItem );
-		
-				
-	private:
-		
-		// Private members
-		CStifLogger* iLog;	//Log		
-	};
-	
-#endif // CTESTMNPROVIDER_H
-	
\ No newline at end of file
--- a/locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/inc/testmnproviderdiscovery.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,196 +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 test class for map_and_navigation_provider_discovery_api
-*
-*/
-
-
-
-#ifndef TESTMNPROVIDERDISCOVERY_H
-#define TESTMNPROVIDERDISCOVERY_H
-
-//  INCLUDES
-#include <StifLogger.h>
-#include <TestScripterInternal.h>
-#include <StifTestModule.h>
-#include "testmnproviderfinder.h"
-#include "testcmnprovider.h"
-
-
-// Logging path
-_LIT( KtestmnproviderdiscoveryLogPath, "\\logs\\testframework\\testmnproviderdiscovery\\" ); 
-// Log file
-_LIT( KtestmnproviderdiscoveryLogFile, "testmnproviderdiscovery.txt" ); 
-
-
-// FORWARD DECLARATIONS
-class CTestMnProviderDiscovery;
-
-
-// CLASS DECLARATION
-
-/**
-*  Ctestmnproviderdiscovery test class for STIF Test Framework TestScripter.
-*  ?other_description_lines
-*
-*  @lib ?library
-*  @since ?Series60_version
-*/
-NONSHARABLE_CLASS(CTestMnProviderDiscovery) : public CScriptBase
-    {
-    public:  // Constructors and destructor
-
-        /**
-        * Two-phased constructor.
-        */
-        static CTestMnProviderDiscovery* NewL( CTestModuleIf& aTestModuleIf );
-
-        /**
-        * Destructor.
-        */
-        virtual ~CTestMnProviderDiscovery();
-
-   
-    public: // Functions from base classes
-
-        /**
-        * From CScriptBase Runs a script line.
-        * @since ?Series60_version
-        * @param aItem Script line containing method name and parameters
-        * @return Symbian OS error code
-        */
-        virtual TInt RunMethodL( CStifItemParser& aItem );
-
-    protected:  // New functions
-
-        
-    protected:  // Functions from base classes
-
-        
-    private:
-
-        /**
-        * C++ default constructor.
-        */
-        CTestMnProviderDiscovery( CTestModuleIf& aTestModuleIf );
-
-        /**
-        * By default Symbian 2nd phase constructor is private.
-        */
-        void ConstructL();
-
-        
-        /**
-        * Frees all resources allocated from test methods.
-        * @since ?Series60_version
-        */
-        void Delete();
-
-        /**
-        * Test methods are listed below. 
-        */
-		
-		/**
-      	* Installs provider application
-      	*
-      	*/
-		TInt InstallProvider( const TDesC& aPackagePath );
-                
-        /**
-        * FindAllProvidersL test method.
-        * @since ?Series60_version
-        * @param aItem Script line containing parameters.
-        * @return Symbian OS error code.
-        */
-        virtual TInt FindAllProvidersL( CStifItemParser& aItem );
-        
-        /**
-        * FindSelectedProvidersL test method.
-        * @since ?Series60_version
-        * @param aItem Script line containing parameters.
-        * @return Symbian OS error code.
-        */
-        virtual TInt FindSelectedProvidersL( CStifItemParser& aItem );
-        
-        /**
-        * DestroyProviderL test method.
-        * @since ?Series60_version
-        * @param aItem Script line containing parameters.
-        * @return Symbian OS error code.
-        */
-        virtual TInt DestroyProviderL( CStifItemParser& aItem );
-        
-        /**
-        * ProviderUidL test method.
-        * @since ?Series60_version
-        * @param aItem Script line containing parameters.
-        * @return Symbian OS error code.
-        */
-        virtual TInt ProviderUidL( CStifItemParser& aItem );
-        
-        /**
-        * ProviderVersionL test method.
-        * @since ?Series60_version
-        * @param aItem Script line containing parameters.
-        * @return Symbian OS error code.
-        */
-        virtual TInt ProviderVersionL( CStifItemParser& aItem );
-        
-        /**
-        * GetProviderNameL test method.
-        * @since ?Series60_version
-        * @param aItem Script line containing parameters.
-        * @return Symbian OS error code.
-        */
-        virtual TInt GetProviderNameL( CStifItemParser& aItem );
-        
-        /**
-        * GetShortNameL test method.
-        * @since ?Series60_version
-        * @param aItem Script line containing parameters.
-        * @return Symbian OS error code.
-        */
-        virtual TInt GetShortNameL( CStifItemParser& aItem );
-        
-        /**
-        * GetVendorNameL test method.
-        * @since ?Series60_version
-        * @param aItem Script line containing parameters.
-        * @return Symbian OS error code.
-        */
-        virtual TInt GetVendorNameL( CStifItemParser& aItem );
-        
-        /**
-        * SupportedServicesL test method.
-        * @since ?Series60_version
-        * @param aItem Script line containing parameters.
-        * @return Symbian OS error code.
-        */
-        virtual TInt SupportedServicesL( CStifItemParser& aItem );
-        
-        /**
-        * SupportedFeaturesL test method.
-        * @since ?Series60_version
-        * @param aItem Script line containing parameters.
-        * @return Symbian OS error code.
-        */
-        virtual TInt SupportedFeaturesL( CStifItemParser& aItem );
-        
-        //ADD NEW METHOD DEC HERE
-
-    };
-
-#endif      // TESTMNPROVIDERDISCOVERY_H
-
-// End of File
--- a/locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/inc/testmnproviderfinder.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,83 +0,0 @@
-/*
-* Copyright (c) 2007 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: Provides testing of MnProviderFinder class methods
-*
-*/
-
-
-
-#ifndef TESTMNNPROVIDERFINDER_H
-#define TESTMNNPROVIDERFINDER_H
-
-//  INCLUDES
-#include <StifLogger.h>
-#include <TestScripterInternal.h>
-#include <StifTestModule.h>
-
-
-// CLASS 
-
-class TestMnProviderFinder
-	{
-	public:	//Public constructor of class
-	
-		/**
-		*
-		*/
-		TestMnProviderFinder(CStifLogger* aLog);
-		
-		static TestMnProviderFinder* NewL(CStifLogger* aLog);
-		
-		void ConstructL();
-		
-		~TestMnProviderFinder();
-		
-	public:	//Public methods
-		
-	public:	//Public methods
-	
-		/**
-		*
-		*/
-		TInt FindAllProvidersL( CStifItemParser& aItem );
-		
-		/**
-		*
-		*/
-		TInt FindSelectedProvidersL( CStifItemParser& aItem );
-		
-		/**
-		*
-		*/
-		//TInt NavigateToL( CStifItemParser& aItem );
-		
-		/**
-		*
-		*/
-		//TInt SetExitObserverL( CStifItemParser& aItem );
-		
-		/**
-		*
-		*/
-		//TInt RemoveExitObserverL( CStifItemParser& aItem );
-		
-				
-	private:
-		
-		// Private members
-		CStifLogger* iLog;	//Log		
-	};
-	
-#endif // TESTMNNPROVIDERFINDER_H
-	
\ No newline at end of file
--- a/locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/init/testframework.ini	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,182 +0,0 @@
-#
-# This is STIFTestFramework initialization file
-# Comment lines start with '#'-character.
-# See STIF TestFramework users guide.doc for instructions
-
-# -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
-# Set following test engine settings:
-#	- Set Test Reporting mode. TestReportMode's possible values are:
-#		+ 'Summary': Summary of the tested test cases.
-#		+ 'Environment': Hardware and software info.
-#		+ 'TestCases': Test case report.
-#		+ 'FullReport': Set of all above ones.
-#		+ Example 'TestReportMode= Summary TestCases'
-#
-# 	- CreateTestReport setting controls report creation mode
-#		+ YES, Test report will created.
-#		+ NO, No Test report.
-#
-# 	- File path indicates the base path of the test report.
-# 	- File name indicates the name of the test report.
-#
-# 	- File format indicates the type of the test report.
-#		+ TXT, Test report file will be txt type, for example 'TestReport.txt'.
-#		+ HTML, Test report will be html type, for example 'TestReport.html'.
-#
-# 	- File output indicates output source of the test report.
-#		+ FILE, Test report logging to file.
-#		+ RDEBUG, Test report logging to using rdebug.
-#
-# 	- File Creation Mode indicates test report overwriting if file exist.
-#		+ OVERWRITE, Overwrites if the Test report file exist.
-#		+ APPEND, Continue logging after the old Test report information if 
-#                 report exist.
-# 	- Sets a device reset module's dll name(Reboot).
-#		+ If Nokia specific reset module is not available or it is not correct one
-#		  StifHWResetStub module may use as a template for user specific reset
-#		  module. 
-
-[Engine_Defaults]
-
-TestReportMode= FullReport		# Possible values are: 'Empty', 'Summary', 'Environment',
-                                                               'TestCases' or 'FullReport'
-
-CreateTestReport= YES			# Possible values: YES or NO
-
-TestReportFilePath= C:\LOGS\TestFramework\
-TestReportFileName= TestReport
-
-TestReportFormat= TXT			# Possible values: TXT or HTML
-TestReportOutput= FILE			# Possible values: FILE or RDEBUG
-TestReportFileCreationMode= OVERWRITE	# Possible values: OVERWRITE or APPEND
-
-DeviceResetDllName= StifResetForNokia.dll # e.g. 'StifHWResetStub.dll' for user specific reseting
-
-[End_Defaults]
-# -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
-
-
-
-# -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
-# Module configurations start
-# Modules are added between module tags
-# tags. Module name is specified after ModuleName= tag, like
-# ModuleName= XXXXXXXXX
-# Modules might have initialisation file, specified as
-# IniFile= c:\testframework\YYYYYY
-# Modules might have several configuration files, like
-# TestCaseFile= c:\testframework\NormalCases.txt
-# TestCaseFile= c:\testframework\SmokeCases.txt
-# TestCaseFile= c:\testframework\ManualCases.txt
-
-# (TestCaseFile is synonym for old term ConfigFile)
-
-# Following case specifies demo module settings. Demo module
-# does not read any settings from file, so tags 
-# IniFile and TestCaseFile are not used.
-# In the simplest case it is enough to specify only the
-# name of the test module when adding new test module
-
-#[New_Module]
-#ModuleName= demomodule
-#[End_Module]
-
-[New_Module]
-ModuleName= TestScripter
-TestCaseFile= C:\Testframework\testmnproviderdiscovery.cfg
-[End_Module]
-
-# Load testmoduleXXX, optionally with initialization file and/or test case files
-#[New_Module]
-#ModuleName= testmodulexxx
-
-#TestModuleXXX used initialization file
-#IniFile= c:\testframework\init.txt
-
-#TestModuleXXX used configuration file(s)
-#TestCaseFile= c:\testframework\testcases1.cfg
-#TestCaseFile= c:\testframework\testcases2.cfg
-#TestCaseFile= c:\testframework\manualtestcases.cfg
-
-#[End_Module]
-# -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
-
-
-
-# -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
-# Set STIFTestFramework logging overwrite parameters for Logger.
-# 	Hardware and emulator environment logging path and styles can
-# 	be configured from here to overwrite the Logger's implemented values.
-#	
-#	Settings description:
-#	- Indicates option for creation log directory/directories. If log directory/directories
-#         is/are not created by user they will make by software.
-#		+ YES, Create log directory/directories if not allready exist.
-#		+ NO, Log directory/directories not created. Only created one is used.
-#
-#	- Overwrite emulator path setting.
-#		+ Example: If 'EmulatorBasePath= C:\LOGS\TestFramework\' and in code is defined 
-#		           Logger's path 'D:\\LOGS\\Module\\' with those definition the path
-#		           will be 'C:\LOGS\TestFramework\LOGS\Module\'
-#
-#	- Overwrite emulator's logging format.
-#		+ TXT, Log file(s) will be txt type(s), for example 'Module.txt'.
-#		+ HTML, Log file(s) will be html type(s), for example 'Module.html'.
-#
-#	- Overwrited emulator logging output source.
-#		+ FILE, Logging to file(s).
-#		+ RDEBUG, Logging to using rdebug(s).
-#
-#	- Overwrite hardware path setting (Same description as above in emulator path).
-#	- Overwrite hardware's logging format(Same description as above in emulator format).
-#	- Overwrite hardware's logging output source(Same description as above in emulator output).
-#
-#	- File Creation Mode indicates file overwriting if file exist.
-#		+ OVERWRITE, Overwrites if file(s) exist.
-#		+ APPEND, Continue logging after the old logging information if file(s) exist.
-#
-#	- Will thread id include to the log filename.
-#		+ YES, Thread id to log file(s) name, Example filename 'Module_b9.txt'.
-#		+ NO, No thread id to log file(s), Example filename 'Module.txt'.
-#
-#	- Will time stamps include the to log file.
-#		+ YES, Time stamp added to each line in log file(s). Time stamp is 
-#                 for example'12.Nov.2003 115958    LOGGING INFO'
-#		+ NO, No time stamp(s).
-#
-#	- Will line breaks include to the log file.
-#		+ YES, Each logging event includes line break and next log event is in own line.
-#		+ NO, No line break(s).
-#
-#	- Will event ranking include to the log file.
-#		+ YES, Event ranking number added to each line in log file(s). Ranking number 
-#                 depends on environment's tics, for example(includes time stamp also)
-#                 '012   12.Nov.2003 115958    LOGGING INFO'
-#		+ NO, No event ranking.
-#
-
-[Logger_Defaults]
-
-#NOTE: If you want to set Logger using next setting(s) remove comment(s)'#' 
-
-#CreateLogDirectories= YES		# Possible values: YES or NO
-
-#EmulatorBasePath= C:\LOGS\TestFramework\
-#EmulatorFormat= HTML			# Possible values: TXT or HTML
-#EmulatorOutput= FILE			# Possible values: FILE or RDEBUG
-
-#HardwareBasePath= D:\LOGS\TestFramework\
-#HardwareFormat= HTML			# Possible values: TXT or HTML
-#HardwareOutput= FILE			# Possible values: FILE or RDEBUG
-
-#FileCreationMode= OVERWRITE		# Possible values: OVERWRITE or APPEND
-
-#ThreadIdToLogFile= YES			# Possible values: YES or NO
-#WithTimeStamp= YES			# Possible values: YES or NO
-#WithLineBreak= YES			# Possible values: YES or NO
-#WithEventRanking= YES			# Possible values: YES or NO
-
-[End_Logger_Defaults]
-# -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
-
-# End of file
--- a/locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/mapnavproviderrefapp/BWINS/mnrefproviderengine.50u.def	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,55 +0,0 @@
-EXPORTS
-	?FindResourceFileL@CMnrpEngine@@QAEXABVTDesC16@@AAV?$TBuf@$0BAA@@@@Z @ 1 NONAME ; void CMnrpEngine::FindResourceFileL(class TDesC16 const &, class TBuf<256> &)
-	?Center@CMnrpMapModel@@QBE?AVTCoordinate@@XZ @ 2 NONAME ; class TCoordinate CMnrpMapModel::Center(void) const
-	?ScreenToAbsolute@CMnrpMapModel@@QBENH@Z @ 3 NONAME ; double CMnrpMapModel::ScreenToAbsolute(int) const
-	?NewL@CMnrpMapModel@@SAPAV1@AAVMMapModelObserver@@AAVCMnrpEngine@@@Z @ 4 NONAME ; class CMnrpMapModel * CMnrpMapModel::NewL(class MMapModelObserver &, class CMnrpEngine &)
-	?Width@CMnrpMapModel@@QBENXZ @ 5 NONAME ; double CMnrpMapModel::Width(void) const
-	?GetPosition@CMnrpPositionRequest@@QAEXAAVTPositionInfo@@@Z @ 6 NONAME ; void CMnrpPositionRequest::GetPosition(class TPositionInfo &)
-	?NewL@CMnrpMapModel@@SAPAV1@AAVCMnrpEngine@@@Z @ 7 NONAME ; class CMnrpMapModel * CMnrpMapModel::NewL(class CMnrpEngine &)
-	?SetOptionsL@CMnrpPositionRequest@@QAEXABVTPositionUpdateOptionsBase@@@Z @ 8 NONAME ; void CMnrpPositionRequest::SetOptionsL(class TPositionUpdateOptionsBase const &)
-	?GoCenter@CMnrpMapModel@@QAEXXZ @ 9 NONAME ; void CMnrpMapModel::GoCenter(void)
-	?FetchNewPosition@CMnrpPositionRequest@@QAEXH@Z @ 10 NONAME ; void CMnrpPositionRequest::FetchNewPosition(int)
-	?Course@CMnrpPositionRequest@@QAEMXZ @ 11 NONAME ; float CMnrpPositionRequest::Course(void)
-	?CoordinateToString@MnrpUtils@@SAXNAAVTDes16@@HH@Z @ 12 NONAME ; void MnrpUtils::CoordinateToString(double, class TDes16 &, int, int)
-	?CurrentLocation@CMnrpMapModel@@QBE?AVTCurrentLocation@1@XZ @ 13 NONAME ; class CMnrpMapModel::TCurrentLocation CMnrpMapModel::CurrentLocation(void) const
-	?AddressToCoordL@CMnrpEngine@@QAEPAVCPosLandmark@@ABV2@@Z @ 14 NONAME ; class CPosLandmark * CMnrpEngine::AddressToCoordL(class CPosLandmark const &)
-	?MoveTo@CMnrpMapModel@@QAEXVTCoordinate@@@Z @ 15 NONAME ; void CMnrpMapModel::MoveTo(class TCoordinate)
-	?AbsoluteToScreen@CMnrpMapModel@@QBEHN@Z @ 16 NONAME ; int CMnrpMapModel::AbsoluteToScreen(double) const
-	?Zoom@CMnrpMapModel@@QAEXN@Z @ 17 NONAME ; void CMnrpMapModel::Zoom(double)
-	?NewL@CMnrpPositionRequest@@SAPAV1@ABVTDesC16@@AAVMMnrpPositionObserver@@@Z @ 18 NONAME ; class CMnrpPositionRequest * CMnrpPositionRequest::NewL(class TDesC16 const &, class MMnrpPositionObserver &)
-	?Right@CMnrpMapModel@@QBENXZ @ 19 NONAME ; double CMnrpMapModel::Right(void) const
-	?Height@CMnrpMapModel@@QBENXZ @ 20 NONAME ; double CMnrpMapModel::Height(void) const
-	?Left@CMnrpMapModel@@QBENXZ @ 21 NONAME ; double CMnrpMapModel::Left(void) const
-	?Heading@CMnrpPositionRequest@@QAEMXZ @ 22 NONAME ; float CMnrpPositionRequest::Heading(void)
-	?AbsoluteToScreen@CMnrpMapModel@@QBE?AVTPoint@@VTCoordinate@@@Z @ 23 NONAME ; class TPoint CMnrpMapModel::AbsoluteToScreen(class TCoordinate) const
-	?GetGrid@CMnrpMapModel@@QBEXAAVTGrid@1@@Z @ 24 NONAME ; void CMnrpMapModel::GetGrid(class CMnrpMapModel::TGrid &) const
-	?UpdateModelL@CMnrpMapModel@@QAEXABVCMnrpMapImageService@@@Z @ 25 NONAME ; void CMnrpMapModel::UpdateModelL(class CMnrpMapImageService const &)
-	?UpdateModel@CMnrpMapModel@@QAEXABVTMnMapImageParams@@@Z @ 26 NONAME ; void CMnrpMapModel::UpdateModel(class TMnMapImageParams const &)
-	?FindClosestPoisL@CMnrpEngine@@QAEXABVCPosLandmark@@AAV?$RArray@UTDistanceToPoi@CMnrpEngine@@@@H@Z @ 27 NONAME ; void CMnrpEngine::FindClosestPoisL(class CPosLandmark const &, class RArray<struct CMnrpEngine::TDistanceToPoi> &, int)
-	?Fs@CMnrpEngine@@QAEAAVRFs@@XZ @ 28 NONAME ; class RFs & CMnrpEngine::Fs(void)
-	?AddressToCoordL@CMnrpEngine@@QAEPAVCPosLandmark@@ABVTDesC16@@@Z @ 29 NONAME ; class CPosLandmark * CMnrpEngine::AddressToCoordL(class TDesC16 const &)
-	?AddressToCoordLC@CMnrpEngine@@QAEPAVCPosLandmark@@ABVTDesC16@@@Z @ 30 NONAME ; class CPosLandmark * CMnrpEngine::AddressToCoordLC(class TDesC16 const &)
-	?DistanceToString@MnrpUtils@@SAXNAAVTDes16@@@Z @ 31 NONAME ; void MnrpUtils::DistanceToString(double, class TDes16 &)
-	?Speed@CMnrpPositionRequest@@QAEMXZ @ 32 NONAME ; float CMnrpPositionRequest::Speed(void)
-	??1CMnrpMapModel@@UAE@XZ @ 33 NONAME ; CMnrpMapModel::~CMnrpMapModel(void)
-	?Bottom@CMnrpMapModel@@QBENXZ @ 34 NONAME ; double CMnrpMapModel::Bottom(void) const
-	?CoordToAddressLC@CMnrpEngine@@QAEPAVCPosLandmark@@ABVTCoordinate@@@Z @ 35 NONAME ; class CPosLandmark * CMnrpEngine::CoordToAddressLC(class TCoordinate const &)
-	?SpeedToString@MnrpUtils@@SAXNAAVTDes16@@@Z @ 36 NONAME ; void MnrpUtils::SpeedToString(double, class TDes16 &)
-	?NumIgnoredLandmarks@CMnrpMapModel@@QAEHXZ @ 37 NONAME ; int CMnrpMapModel::NumIgnoredLandmarks(void)
-	??1CMnrpEngine@@UAE@XZ @ 38 NONAME ; CMnrpEngine::~CMnrpEngine(void)
-	?AngleToString@MnrpUtils@@SAXNAAVTDes16@@@Z @ 39 NONAME ; void MnrpUtils::AngleToString(double, class TDes16 &)
-	?PrintableStringLC@MnrpUtils@@SAPAVHBufC16@@ABVTDesC16@@@Z @ 40 NONAME ; class HBufC16 * MnrpUtils::PrintableStringLC(class TDesC16 const &)
-	?MagneticCourse@CMnrpPositionRequest@@QAEMXZ @ 41 NONAME ; float CMnrpPositionRequest::MagneticCourse(void)
-	?SetScreenSize@CMnrpMapModel@@QAEXVTSize@@@Z @ 42 NONAME ; void CMnrpMapModel::SetScreenSize(class TSize)
-	?BestCoordToAddressMatchesL@CMnrpEngine@@QAEXABVTCoordinate@@AAV?$RPointerArray@VCPosLandmark@@@@H@Z @ 43 NONAME ; void CMnrpEngine::BestCoordToAddressMatchesL(class TCoordinate const &, class RPointerArray<class CPosLandmark> &, int)
-	?AddressToCoordLC@CMnrpEngine@@QAEPAVCPosLandmark@@ABV2@@Z @ 44 NONAME ; class CPosLandmark * CMnrpEngine::AddressToCoordLC(class CPosLandmark const &)
-	?MagneticHeading@CMnrpPositionRequest@@QAEMXZ @ 45 NONAME ; float CMnrpPositionRequest::MagneticHeading(void)
-	?Top@CMnrpMapModel@@QBENXZ @ 46 NONAME ; double CMnrpMapModel::Top(void) const
-	??1CMnrpPositionRequest@@UAE@XZ @ 47 NONAME ; CMnrpPositionRequest::~CMnrpPositionRequest(void)
-	?ScreenToAbsolute@CMnrpMapModel@@QBE?AVTCoordinate@@VTPoint@@@Z @ 48 NONAME ; class TCoordinate CMnrpMapModel::ScreenToAbsolute(class TPoint) const
-	?DistanceBetweenLandmarks@CMnrpEngine@@QAEMABVCPosLandmark@@0@Z @ 49 NONAME ; float CMnrpEngine::DistanceBetweenLandmarks(class CPosLandmark const &, class CPosLandmark const &)
-	?KnownPlacesL@CMnrpEngine@@QAE?AV?$TArray@PAVCPosLandmark@@@@XZ @ 50 NONAME ; class TArray<class CPosLandmark *> CMnrpEngine::KnownPlacesL(void)
-	?UpdateModelL@CMnrpMapModel@@QAEXAAVCMnrpMapViewService@@@Z @ 51 NONAME ; void CMnrpMapModel::UpdateModelL(class CMnrpMapViewService &)
-	?NewL@CMnrpEngine@@SAPAV1@XZ @ 52 NONAME ; class CMnrpEngine * CMnrpEngine::NewL(void)
-	?RenderL@CMnrpMapModel@@QBEXAAVCFbsBitmap@@VTRect@@PAVCFont@@2@Z @ 53 NONAME ; void CMnrpMapModel::RenderL(class CFbsBitmap &, class TRect, class CFont *, class CFont *) const
-
--- a/locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/mapnavproviderrefapp/BWINS/mnrefproviderengineu.def	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,53 +0,0 @@
-EXPORTS
-	??1CMnrpEngine@@UAE@XZ @ 1 NONAME ; CMnrpEngine::~CMnrpEngine(void)
-	??1CMnrpMapModel@@UAE@XZ @ 2 NONAME ; CMnrpMapModel::~CMnrpMapModel(void)
-	??1CMnrpPositionRequest@@UAE@XZ @ 3 NONAME ; CMnrpPositionRequest::~CMnrpPositionRequest(void)
-	?AbsoluteToScreen@CMnrpMapModel@@QBE?AVTPoint@@VTCoordinate@@@Z @ 4 NONAME ; class TPoint CMnrpMapModel::AbsoluteToScreen(class TCoordinate) const
-	?AbsoluteToScreen@CMnrpMapModel@@QBEHN@Z @ 5 NONAME ; int CMnrpMapModel::AbsoluteToScreen(double) const
-	?AddressToCoordLC@CMnrpEngine@@QAEPAVCPosLandmark@@ABV2@@Z @ 6 NONAME ; class CPosLandmark * CMnrpEngine::AddressToCoordLC(class CPosLandmark const &)
-	?AddressToCoordLC@CMnrpEngine@@QAEPAVCPosLandmark@@ABVTDesC16@@@Z @ 7 NONAME ; class CPosLandmark * CMnrpEngine::AddressToCoordLC(class TDesC16 const &)
-	?AngleToString@MnrpUtils@@SAXNAAVTDes16@@@Z @ 8 NONAME ; void MnrpUtils::AngleToString(double, class TDes16 &)
-	?BestCoordToAddressMatchesL@CMnrpEngine@@QAEXABVTCoordinate@@AAV?$RPointerArray@VCPosLandmark@@@@H@Z @ 9 NONAME ; void CMnrpEngine::BestCoordToAddressMatchesL(class TCoordinate const &, class RPointerArray<class CPosLandmark> &, int)
-	?Bottom@CMnrpMapModel@@QBENXZ @ 10 NONAME ; double CMnrpMapModel::Bottom(void) const
-	?Center@CMnrpMapModel@@QBE?AVTCoordinate@@XZ @ 11 NONAME ; class TCoordinate CMnrpMapModel::Center(void) const
-	?CoordToAddressLC@CMnrpEngine@@QAEPAVCPosLandmark@@ABVTCoordinate@@@Z @ 12 NONAME ; class CPosLandmark * CMnrpEngine::CoordToAddressLC(class TCoordinate const &)
-	?CoordinateToString@MnrpUtils@@SAXNAAVTDes16@@HH@Z @ 13 NONAME ; void MnrpUtils::CoordinateToString(double, class TDes16 &, int, int)
-	?Course@CMnrpPositionRequest@@QAEMXZ @ 14 NONAME ; float CMnrpPositionRequest::Course(void)
-	?CurrentLocation@CMnrpMapModel@@QBE?AVTCurrentLocation@1@XZ @ 15 NONAME ; class CMnrpMapModel::TCurrentLocation CMnrpMapModel::CurrentLocation(void) const
-	?DistanceBetweenLandmarks@CMnrpEngine@@QAEMABVCPosLandmark@@0@Z @ 16 NONAME ; float CMnrpEngine::DistanceBetweenLandmarks(class CPosLandmark const &, class CPosLandmark const &)
-	?DistanceToString@MnrpUtils@@SAXNAAVTDes16@@@Z @ 17 NONAME ; void MnrpUtils::DistanceToString(double, class TDes16 &)
-	?FetchNewPosition@CMnrpPositionRequest@@QAEXH@Z @ 18 NONAME ; void CMnrpPositionRequest::FetchNewPosition(int)
-	?FindClosestPoisL@CMnrpEngine@@QAEXABVCPosLandmark@@AAV?$RArray@UTDistanceToPoi@CMnrpEngine@@@@H@Z @ 19 NONAME ; void CMnrpEngine::FindClosestPoisL(class CPosLandmark const &, class RArray<struct CMnrpEngine::TDistanceToPoi> &, int)
-	?FindResourceFileL@CMnrpEngine@@QAEXABVTDesC16@@AAV?$TBuf@$0BAA@@@@Z @ 20 NONAME ; void CMnrpEngine::FindResourceFileL(class TDesC16 const &, class TBuf<256> &)
-	?Fs@CMnrpEngine@@QAEAAVRFs@@XZ @ 21 NONAME ; class RFs & CMnrpEngine::Fs(void)
-	?GetGrid@CMnrpMapModel@@QBEXAAVTGrid@1@@Z @ 22 NONAME ; void CMnrpMapModel::GetGrid(class CMnrpMapModel::TGrid &) const
-	?GetPosition@CMnrpPositionRequest@@QAEXAAVTPositionInfo@@@Z @ 23 NONAME ; void CMnrpPositionRequest::GetPosition(class TPositionInfo &)
-	?GoCenter@CMnrpMapModel@@QAEXXZ @ 24 NONAME ; void CMnrpMapModel::GoCenter(void)
-	?Heading@CMnrpPositionRequest@@QAEMXZ @ 25 NONAME ; float CMnrpPositionRequest::Heading(void)
-	?Height@CMnrpMapModel@@QBENXZ @ 26 NONAME ; double CMnrpMapModel::Height(void) const
-	?KnownPlacesL@CMnrpEngine@@QAE?AV?$TArray@PAVCPosLandmark@@@@XZ @ 27 NONAME ; class TArray<class CPosLandmark *> CMnrpEngine::KnownPlacesL(void)
-	?Left@CMnrpMapModel@@QBENXZ @ 28 NONAME ; double CMnrpMapModel::Left(void) const
-	?MagneticCourse@CMnrpPositionRequest@@QAEMXZ @ 29 NONAME ; float CMnrpPositionRequest::MagneticCourse(void)
-	?MagneticHeading@CMnrpPositionRequest@@QAEMXZ @ 30 NONAME ; float CMnrpPositionRequest::MagneticHeading(void)
-	?MoveTo@CMnrpMapModel@@QAEXVTCoordinate@@@Z @ 31 NONAME ; void CMnrpMapModel::MoveTo(class TCoordinate)
-	?NewL@CMnrpEngine@@SAPAV1@XZ @ 32 NONAME ; class CMnrpEngine * CMnrpEngine::NewL(void)
-	?NewL@CMnrpMapModel@@SAPAV1@AAVCMnrpEngine@@@Z @ 33 NONAME ; class CMnrpMapModel * CMnrpMapModel::NewL(class CMnrpEngine &)
-	?NewL@CMnrpMapModel@@SAPAV1@AAVMMapModelObserver@@AAVCMnrpEngine@@@Z @ 34 NONAME ; class CMnrpMapModel * CMnrpMapModel::NewL(class MMapModelObserver &, class CMnrpEngine &)
-	?NewL@CMnrpPositionRequest@@SAPAV1@ABVTDesC16@@AAVMMnrpPositionObserver@@@Z @ 35 NONAME ; class CMnrpPositionRequest * CMnrpPositionRequest::NewL(class TDesC16 const &, class MMnrpPositionObserver &)
-	?RenderL@CMnrpMapModel@@QBEXAAVCFbsBitmap@@VTRect@@PAVCFont@@2@Z @ 36 NONAME ; void CMnrpMapModel::RenderL(class CFbsBitmap &, class TRect, class CFont *, class CFont *) const
-	?Right@CMnrpMapModel@@QBENXZ @ 37 NONAME ; double CMnrpMapModel::Right(void) const
-	?ScreenToAbsolute@CMnrpMapModel@@QBE?AVTCoordinate@@VTPoint@@@Z @ 38 NONAME ; class TCoordinate CMnrpMapModel::ScreenToAbsolute(class TPoint) const
-	?ScreenToAbsolute@CMnrpMapModel@@QBENH@Z @ 39 NONAME ; double CMnrpMapModel::ScreenToAbsolute(int) const
-	?SetOptionsL@CMnrpPositionRequest@@QAEXABVTPositionUpdateOptionsBase@@@Z @ 40 NONAME ; void CMnrpPositionRequest::SetOptionsL(class TPositionUpdateOptionsBase const &)
-	?SetScreenSize@CMnrpMapModel@@QAEXVTSize@@@Z @ 41 NONAME ; void CMnrpMapModel::SetScreenSize(class TSize)
-	?Speed@CMnrpPositionRequest@@QAEMXZ @ 42 NONAME ; float CMnrpPositionRequest::Speed(void)
-	?SpeedToString@MnrpUtils@@SAXNAAVTDes16@@@Z @ 43 NONAME ; void MnrpUtils::SpeedToString(double, class TDes16 &)
-	?Top@CMnrpMapModel@@QBENXZ @ 44 NONAME ; double CMnrpMapModel::Top(void) const
-	?UpdateModelL@CMnrpMapModel@@QAEXAAVCMnrpMapViewService@@@Z @ 45 NONAME ; void CMnrpMapModel::UpdateModelL(class CMnrpMapViewService &)
-	?Width@CMnrpMapModel@@QBENXZ @ 46 NONAME ; double CMnrpMapModel::Width(void) const
-	?Zoom@CMnrpMapModel@@QAEXN@Z @ 47 NONAME ; void CMnrpMapModel::Zoom(double)
-	?PrintableStringLC@MnrpUtils@@SAPAVHBufC16@@ABVTDesC16@@@Z @ 48 NONAME ; class HBufC16 * MnrpUtils::PrintableStringLC(class TDesC16 const &)
-	?AddressToCoord@CMnrpEngine@@QAEPAVCPosLandmark@@ABV2@@Z @ 49 NONAME ; class CPosLandmark * CMnrpEngine::AddressToCoord(class CPosLandmark const &)
-	?AddressToCoord@CMnrpEngine@@QAEPAVCPosLandmark@@ABVTDesC16@@@Z @ 50 NONAME ; class CPosLandmark * CMnrpEngine::AddressToCoord(class TDesC16 const &)
-	?NumIgnoredLandmarks@CMnrpMapModel@@QAEHXZ @ 51 NONAME ; int CMnrpMapModel::NumIgnoredLandmarks(void)
-
Binary file locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/mapnavproviderrefapp/data/default_lm.bmp has changed
Binary file locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/mapnavproviderrefapp/data/default_lm_mask_soft.bmp has changed
--- a/locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/mapnavproviderrefapp/data/mnrefprovider.rss	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,156 +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:  Resource definition file for MnRefProvider
-*
-*/
-
-
-NAME MNTP
-
-#include <eikon.rsg>
-#include <eikon.rh>
-#include <avkon.rsg>
-#include <avkon.mbg>
-#include <avkon.rh>
-
-#include <appinfo.rh>
-#include "mnrp.hrh"
-
-RESOURCE RSS_SIGNATURE {  }
-
-RESOURCE TBUF { buf="MnRefProvider"; }
-
-RESOURCE EIK_APP_INFO
-    {
-    menubar = r_mnrefprovider_menubar;
-    cba = R_AVKON_SOFTKEYS_OPTIONS_EXIT;
-    }
-
-RESOURCE LOCALISABLE_APP_INFO r_mnrefprovider_localisable_app_info
-    {
-    short_caption = "MnRefProvider";
-    caption_and_icon =
-        CAPTION_AND_ICON_INFO
-            {
-            caption = "MnRefProvider";
-            };
-    view_list = {};
-    }
-
-RESOURCE CONTEXT_PANE r_mnrefprovider_app_icon
-    {
-    }
-
-RESOURCE MENU_BAR r_mnrefprovider_menubar
-    {
-    titles =
-        {
-        MENU_TITLE
-            {
-            menu_pane = r_mnrefprovider_menu;
-            }
-        };
-    }
-
-RESOURCE MENU_PANE r_mnrefprovider_menu
-    {
-    items =
-        {
-        MENU_ITEM
-            {
-            command = EAknSoftkeyExit;
-            txt = "Exit";
-            }
-        };
-    }
-
-RESOURCE DIALOG r_mnrefprovider_selection_dialog
-    {
-    flags = EAknDialogSelectionList;
-    buttons = R_AVKON_SOFTKEYS_OK_CANCEL;
-    items =
-        {
-        DLG_LINE
-            {
-            type = EAknCtSingleGraphicListBox;
-            id = ESelectionListControl;
-            control = LISTBOX
-                {
-                flags = EAknListBoxSelectionList;
-                };
-            },
-        // the next dlg line is optional.
-        DLG_LINE
-            {
-            itemflags = EEikDlgItemNonFocusing;
-            id = EFindControl;
-            type = EAknCtSelectionListFixedFind;
-            }
-        };
-    }
-
-RESOURCE AVKON_VIEW r_mnrefprovider_map_view
-    {
-    menubar = r_mnrefprovider_map_view_menubar;
-    cba = R_AVKON_SOFTKEYS_OPTIONS_EXIT;
-    }
-
-RESOURCE AVKON_VIEW r_mnrefprovider_map_view_chained
-    {
-    menubar = r_mnrefprovider_map_view_menubar;
-    cba = R_AVKON_SOFTKEYS_OPTIONS_BACK;
-    }
-
-RESOURCE MENU_BAR r_mnrefprovider_map_view_menubar
-    {
-    titles =
-        {
-        MENU_TITLE
-            {
-            menu_pane = r_mnrefprovider_map_view_menu;
-            }
-        };
-    }
-
-RESOURCE MENU_PANE r_mnrefprovider_map_view_menu
-    {
-    items =
-        {
-        MENU_ITEM
-            {
-            command = EMnrpCommandSelect;
-            txt = "Select";
-            },
-        MENU_ITEM
-            {
-            command = EMnrpCommandFullScreen;
-            txt = "Toggle Fullscreen";
-            },
-        MENU_ITEM
-            {
-            command = EAknSoftkeyExit;
-            txt = "Exit";
-            }
-        };
-    }
-
-RESOURCE AVKON_VIEW r_mnrefprovider_navi_view
-    {
-    cba = R_AVKON_SOFTKEYS_EXIT;
-    }
-
-RESOURCE AVKON_VIEW r_mnrefprovider_navi_view_chained
-    {
-    cba = R_AVKON_SOFTKEYS_BACK;
-    }
--- a/locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/mapnavproviderrefapp/data/mnrefprovider_reg.rss	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,66 +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:  Registration file for MnRefProvider
-*
-*/
-
-
-#include <appinfo.rh>
-
-#include "mnappserviceuids.hrh"
-#include "mnappservices.hrh"
-#include "mnserviceinfo.rh"
-
-#include <MnRefProvider.rsg>
-
-UID2 KUidAppRegistrationResourceFile
-UID3 0x03132013
-
-RESOURCE APP_REGISTRATION_INFO
-    {
-    app_file = "MnRefProvider";
-    localisable_resource_file = "\\resource\\apps\\MnRefProvider";
-    localisable_resource_id = R_MNREFPROVIDER_LOCALISABLE_APP_INFO;
-    
-    launch = KAppLaunchInForeground;
-    hidden = KAppNotHidden;
-        
-    datatype_list = {};
-    file_ownership_list = {};
-    service_list =
-        {
-        SERVICE_INFO
-            {
-            uid = KMnAppMapViewService;
-            datatype_list = {};
-            opaque_data = r_mnrefprovider_mapview_opaquedata;
-            },
-        SERVICE_INFO
-            {
-            uid = KMnAppNavigationService;
-            datatype_list = {};
-            opaque_data = r_mnrefprovider_navigation_opaquedata;
-            }
-        };
-    }
-
-RESOURCE MN_SERVICE_INFO r_mnrefprovider_mapview_opaquedata
-    {
-    service_features = KMnSvcFeatureShowMap | KMnSvcFeatureSelectFromMap;
-    }
-
-RESOURCE MN_SERVICE_INFO r_mnrefprovider_navigation_opaquedata
-    {
-    service_features = KMnSvcFeatureNavigateTo;
-    }
--- a/locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/mapnavproviderrefapp/data/mnrefproviderback.rss	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,95 +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:  Resource definition file for MnRefProviderBack
-*
-*/
-
-
-NAME MNRG
-
-#include <eikon.rsg>
-#include <eikon.rh>
-#include <avkon.rsg>
-#include <avkon.mbg>
-#include <avkon.rh>
-
-#include <appinfo.rh>
-
-RESOURCE RSS_SIGNATURE {  }
-
-RESOURCE TBUF { buf="MnRefProviderBack"; }
-
-RESOURCE EIK_APP_INFO
-    {
-    menubar = r_mnrefgeocoder_menubar;
-    cba = R_AVKON_SOFTKEYS_OPTIONS_EXIT;
-    }
-
-RESOURCE LOCALISABLE_APP_INFO r_mnrefgeocoder_localisable_app_info
-    {
-    short_caption = "MnRefProvider";
-    caption_and_icon =
-        CAPTION_AND_ICON_INFO
-            {
-            caption = "MnRefProvider";
-            };
-    view_list = {};
-    }
-
-RESOURCE CONTEXT_PANE r_mnrefgeocoder_app_icon
-    {
-    }
-
-RESOURCE MENU_BAR r_mnrefgeocoder_menubar
-    {
-    titles =
-        {
-        MENU_TITLE
-            {
-            menu_pane = r_mnrefgeocoder_menu;
-            }
-        };
-    }
-
-RESOURCE MENU_PANE r_mnrefgeocoder_menu
-    {
-    items =
-        {
-        MENU_ITEM
-            {
-            command = EAknSoftkeyExit;
-            txt = "Exit";
-            }
-        };
-    }
-
-RESOURCE AVKON_LIST_QUERY r_mnrefgeocoder_list_query
-    {
-    flags = EGeneralQueryFlags;
-    softkeys = R_AVKON_SOFTKEYS_OK_CANCEL;
-    items =
-        {
-        AVKON_LIST_QUERY_DLG_LINE
-            {
-            control = AVKON_LIST_QUERY_CONTROL
-                {
-                listtype = EAknCtSinglePopupMenuListBox;
-                listbox = AVKON_LIST_QUERY_LIST
-                    {
-                    };
-                heading = "Select best match";
-                };
-            }
-        };
-    }
--- a/locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/mapnavproviderrefapp/data/mnrefproviderback_reg.rss	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,75 +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:  Registration file for MnRefProviderBack
-*
-*/
-
-
-#include <appinfo.rh>
-
-#include "mnappserviceuids.hrh"
-#include "mnappservices.hrh"
-#include "mnserviceinfo.rh"
-
-#include <mnrefproviderback.rsg>
-
-UID2 KUidAppRegistrationResourceFile
-UID3 0x03132014
-
-RESOURCE APP_REGISTRATION_INFO
-    {
-    app_file = "mnrefproviderback";
-    localisable_resource_file = "\\resource\\apps\\mnrefproviderback";
-    localisable_resource_id = R_MNREFGEOCODER_LOCALISABLE_APP_INFO;
-
-    launch = KAppLaunchInBackground;
-    hidden = KAppIsHidden;
-
-    datatype_list = {};
-    file_ownership_list = {};
-    service_list =
-        {
-        SERVICE_INFO
-            {
-            uid = KMnAppGeocodingService;
-            datatype_list = {};
-            opaque_data = r_mnrefgeocoder_geocoding_opaquedata;
-            }
-#ifdef RD_MAPNAV_BITMAP_ACCESS
-        ,
-        SERVICE_INFO
-            {
-            uid = KMnAppMapImageService;
-            datatype_list = {};
-            opaque_data = r_mnrefprovider_mapimage_opaquedata;
-            }
-#endif
-        };
-    }
-
-RESOURCE MN_SERVICE_INFO r_mnrefgeocoder_geocoding_opaquedata
-    {
-    service_features =
-        KMnSvcFeatureCoordToAddr |
-        KMnSvcFeatureAddrToCoord |
-        KMnSvcFeaturePlainAddrToCoord;
-    }
-
-#ifdef RD_MAPNAV_BITMAP_ACCESS
-RESOURCE MN_SERVICE_INFO r_mnrefprovider_mapimage_opaquedata
-    {
-    service_features = KMnSvcFeatureVectorMap;
-    }
-#endif
-	 
--- a/locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/mapnavproviderrefapp/data/mnrefproviderengine.rss	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,205 +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:  Resource definition file for MnRefProviderEngine
-*
-*/
-
-
-NAME MNRE
-
-#include <eikon.rsg>
-#include <eikon.rh>
-#include <avkon.rsg>
-#include <avkon.mbg>
-#include <avkon.rh>
-
-#include <appinfo.rh>
-
-RESOURCE RSS_SIGNATURE {  }
-
-RESOURCE TBUF { buf=""; }
-
-STRUCT PLACE
-    {
-    LTEXT city;
-    LTEXT country;
-    DOUBLE lat;
-    DOUBLE lon;
-    }
-
-STRUCT PLACES
-    {
-    STRUCT places[];
-    }
-
-RESOURCE PLACES r_mnrefproviderengine_places
-    {
-    places =
-        {
-        PLACE { city="Tampere"; country="Finland"; lat=61.50; lon=23.83; }, 
-        PLACE { city="Turku"; country="Finland"; lat=60.45; lon=22.28; }, 
-        PLACE { city="Oulu"; country="Finland"; lat=65.02; lon=28.47; }, 
-        PLACE { city="Saint-Petersburg"; country="Russia"; lat=59.92; lon=30.42; }, 
-        PLACE { city="Göteborg"; country="Sweden"; lat=57.72; lon=11.97; }, 
-        PLACE { city="Kabul"; country="Afghanistan"; lat=35.10; lon=68.55; },
-        PLACE { city="Tirana"; country="Albania"; lat=41.74; lon=19.38; },
-        PLACE { city="Algiers"; country="Algeria"; lat=37.55; lon=2.29; },
-        PLACE { city="Luanda"; country="Angola"; lat=-8.35; lon=12.76; },
-        PLACE { city="Yerevan"; country="Armenia"; lat=40.47; lon=44.21; },
-        PLACE { city="Oranjestad"; country="Aruba"; lat=13.12; lon=-70.76; },
-        PLACE { city="Canberra"; country="Australia"; lat=-35.15; lon=149.04; },
-        PLACE { city="Vienna"; country="Austria"; lat=48.75; lon=15.82; },
-        PLACE { city="Baku"; country="Azerbaijan"; lat=40.79; lon=49.50; },
-        PLACE { city="Nassau"; country="Bahamas"; lat=25.74; lon=-77.99; },
-        PLACE { city="Dhaka"; country="Bangladesh"; lat=24.10; lon=90.05; },
-        PLACE { city="Bridgetown"; country="Barbados"; lat=13.68; lon=-60.20; },
-        PLACE { city="Minsk"; country="Belarus"; lat=54.08; lon=27.43; },
-        PLACE { city="Brussels"; country="Belgium"; lat=51.64; lon=3.56; },
-        PLACE { city="Belmopan"; country="Belize"; lat=17.32; lon=-88.52; },
-        PLACE { city="Hamilton"; country="Bermuda"; lat=-37.75; lon=175.28; },
-        PLACE { city="Thimphu"; country="Bhutan"; lat=28.07; lon=89.05; },
-        PLACE { city="Gaborone"; country="Botswana"; lat=-24.36; lon=25.56; },
-        PLACE { city="Brasilia"; country="Brazil"; lat=-15.48; lon=-48.22; },
-        PLACE { city="Sofia"; country="Bulgaria"; lat=43.08; lon=23.00; },
-        PLACE { city="Bujumbura"; country="Burundi"; lat=-3.19; lon=29.17; },
-        PLACE { city="Yaounde"; country="Cameroon"; lat=4.52; lon=10.90; },
-        PLACE { city="Ottawa"; country="Canada"; lat=46.28; lon=-76.53; },
-        PLACE { city="Santiago"; country="Chile"; lat=-33.07; lon=-70.99; },
-        PLACE { city="Beijing"; country="China"; lat=40.13; lon=116.12; },
-        PLACE { city="Bogota"; country="Colombia"; lat=4.78; lon=-74.21; },
-        PLACE { city="Moroni"; country="Comoros"; lat=-11.10; lon=42.69; },
-        PLACE { city="Brazzaville"; country="Congo"; lat=-3.48; lon=14.50; },
-        PLACE { city="Zagreb"; country="Croatia"; lat=45.95; lon=15.88; },
-        PLACE { city="Havana"; country="Cuba"; lat=23.82; lon=-83.05; },
-        PLACE { city="Nicosia"; country="Cyprus"; lat=35.79; lon=32.73; },
-        PLACE { city="Copenhagen"; country="Denmark"; lat=56.32; lon=11.93; },
-        PLACE { city="Djibouti"; country="Djibouti"; lat=12.24; lon=42.35; },
-        PLACE { city="Roseau"; country="Dominica"; lat=15.85; lon=-61.91; },
-        PLACE { city="Quito"; country="Ecuador"; lat=-0.20; lon=-78.55; },
-        PLACE { city="Cairo"; country="Egypt"; lat=30.38; lon=30.87; },
-        PLACE { city="Asmara"; country="Eritrea"; lat=15.40; lon=38.83; },
-        PLACE { city="Tallinn"; country="Estonia"; lat=60.28; lon=23.90; },
-        PLACE { city="Suva"; country="Fiji"; lat=-18.07; lon=178.47; },
-        PLACE { city="Helsinki"; country="Finland"; lat=60.32; lon=24.98; },
-        PLACE { city="Paris"; country="France"; lat=49.86; lon=1.34; },
-        PLACE { city="Libreville"; country="Gabon"; lat=1.11; lon=8.74; },
-        PLACE { city="Banjul"; country="Gambia"; lat=14.07; lon=-17.27; },
-        PLACE { city="Tbilisi"; country="Georgia"; lat=42.63; lon=43.90; },
-        PLACE { city="Berlin"; country="Germany"; lat=52.67; lon=13.23; },
-        PLACE { city="Accra"; country="Ghana"; lat=6.16; lon=-0.79; },
-        PLACE { city="Gibraltar"; country="Gibraltar"; lat=36.14; lon=-5.39; },
-        PLACE { city="Athens"; country="Greece"; lat=38.94; lon=22.74; },
-        PLACE { city="Godthabsfjord"; country="Greenland"; lat=64.47; lon=-52.05; },
-        PLACE { city="Agana"; country="Guam"; lat=14.05; lon=144.17; },
-        PLACE { city="Guatemala"; country="Guatemala"; lat=14.69; lon=-90.39; },
-        PLACE { city="Conakry"; country="Guinea"; lat=9.87; lon=-14.20; },
-        PLACE { city="Georgetown"; country="Guyana"; lat=6.90; lon=-58.26; },
-        PLACE { city="Tegucigalpa"; country="Honduras"; lat=14.40; lon=-87.55; },
-        PLACE { city="Budapest"; country="Hungary"; lat=47.53; lon=19.04; },
-        PLACE { city="Reykjavik"; country="Iceland"; lat=64.58; lon=-22.36; },
-        PLACE { city="Delhi"; country="India"; lat=29.56; lon=76.29; },
-        PLACE { city="Jakarta"; country="Indonesia"; lat=-5.99; lon=106.66; },
-        PLACE { city="Tehran"; country="Iran"; lat=35.91; lon=51.24; },
-        PLACE { city="Baghdad"; country="Iraq"; lat=33.40; lon=44.35; },
-        PLACE { city="Jerusalem"; country="Israel"; lat=31.98; lon=34.97; },
-        PLACE { city="Rome"; country="Italy"; lat=42.78; lon=11.60; },
-        PLACE { city="Kingston"; country="Jamaica"; lat=29.30; lon=167.80; },
-        PLACE { city="Tokyo"; country="Japan"; lat=36.39; lon=139.04; },
-        PLACE { city="Amman"; country="Jordan"; lat=32.28; lon=35.54; },
-        PLACE { city="Almaty"; country="Kazakhstan"; lat=43.45; lon=76.75; },
-        PLACE { city="Nairobi"; country="Kenya"; lat=-0.91; lon=36.43; },
-        PLACE { city="Bairiki"; country="Kiribati"; lat=1.87; lon=172.55; },
-        PLACE { city="Bishkek"; country="Kyrgyzstan"; lat=43.45; lon=74.02; },
-        PLACE { city="Vientiane"; country="Laos"; lat=18.51; lon=102.05; },
-        PLACE { city="Riga"; country="Latvia"; lat=57.18; lon=23.92; },
-        PLACE { city="Beirut"; country="Lebanon"; lat=34.19; lon=35.21; },
-        PLACE { city="Maseru"; country="Lesotho"; lat=-28.58; lon=26.78; },
-        PLACE { city="Monrovia"; country="Liberia"; lat=7.24; lon=-11.72; },
-        PLACE { city="Tripoli"; country="Libya"; lat=33.21; lon=12.87; },
-        PLACE { city="Vaduz"; country="Liechtenstein"; lat=48.11; lon=8.54; },
-        PLACE { city="Vilnius"; country="Lithuania"; lat=54.97; lon=25.00; },
-        PLACE { city="Luxembourg"; country="Luxembourg"; lat=50.55; lon=5.22; },
-        PLACE { city="Macau"; country="Macau"; lat=22.49; lon=113.33; },
-        PLACE { city="Antananarivo"; country="Madagascar"; lat=-18.61; lon=47.21; },
-        PLACE { city="Lilongwe"; country="Malawi"; lat=-13.42; lon=33.22; },
-        PLACE { city="Male"; country="Maldives"; lat=4.90; lon=72.77; },
-        PLACE { city="Bamako"; country="Mali"; lat=13.47; lon=-8.82; },
-        PLACE { city="Valletta"; country="Malta"; lat=36.43; lon=13.97; },
-        PLACE { city="Nouakchott"; country="Mauritania"; lat=18.32; lon=-16.14; },
-        PLACE { city="Dzaoudzi"; country="Mayotte"; lat=-12.34; lon=44.84; },
-        PLACE { city="Palikir"; country="Micronesia"; lat=7.51; lon=157.56; },
-        PLACE { city="Chisinau"; country="Moldova"; lat=47.92; lon=27.95; },
-        PLACE { city="Monaco"; country="Monaco"; lat=44.41; lon=6.67; },
-        PLACE { city="Plymouth"; country="Montserrat"; lat=50.65; lon=-4.42; },
-        PLACE { city="Rabat"; country="Morocco"; lat=34.81; lon=-7.57; },
-        PLACE { city="Maputo"; country="Mozambique"; lat=-25.66; lon=32.23; },
-        PLACE { city="Yangon"; country="Myanmar"; lat=16.84; lon=96.08; },
-        PLACE { city="Windhoek"; country="Namibia"; lat=-21.94; lon=16.42; },
-        PLACE { city="Domaneab"; country="Nauru"; lat=0.31; lon=166.07; },
-        PLACE { city="Kathmandu"; country="Nepal"; lat=28.43; lon=84.66; },
-        PLACE { city="Amsterdam"; country="Netherlands"; lat=53.17; lon=4.01; },
-        PLACE { city="Managua"; country="Nicaragua"; lat=12.61; lon=-86.84; },
-        PLACE { city="Niamey"; country="Niger"; lat=13.73; lon=1.89; },
-        PLACE { city="Lagos"; country="Nigeria"; lat=38.00; lon=-9.60; },
-        PLACE { city="Alofi"; country="Niue"; lat=-18.95; lon=-170.02; },
-        PLACE { city="Oslo"; country="Norway"; lat=60.46; lon=10.20; },
-        PLACE { city="Muscat"; country="Oman"; lat=24.48; lon=57.74; },
-        PLACE { city="Islamabad"; country="Pakistan"; lat=34.43; lon=72.40; },
-        PLACE { city="Koror"; country="Palau"; lat=7.77; lon=134.06; },
-        PLACE { city="Panama"; country="Panama"; lat=9.97; lon=-80.52; },
-        PLACE { city="Asuncion"; country="Paraguay"; lat=-25.26; lon=-57.67; },
-        PLACE { city="Lima"; country="Peru"; lat=-11.31; lon=-77.79; },
-        PLACE { city="Manila"; country="Philippines"; lat=14.80; lon=120.75; },
-        PLACE { city="Adamstown"; country="Pitcairn"; lat=-24.53; lon=-130.62; },
-        PLACE { city="Warsaw"; country="Poland"; lat=52.94; lon=20.28; },
-        PLACE { city="Lisbon"; country="Portugal"; lat=38.72; lon=-9.20; },
-        PLACE { city="Doha"; country="Qatar"; lat=25.95; lon=50.93; },
-        PLACE { city="Bucharest"; country="Romania"; lat=45.34; lon=25.21; },
-        PLACE { city="Moscow"; country="Russia"; lat=55.88; lon=37.50; },
-        PLACE { city="Kigali"; country="Rwanda"; lat=-1.70; lon=29.78; },
-        PLACE { city="Dakar"; country="Senegal"; lat=15.06; lon=-17.87; },
-        PLACE { city="Victoria"; country="Seychelles"; lat=-3.71; lon=54.53; },
-        PLACE { city="Singapore"; country="Singapore"; lat=1.28; lon=103.85; },
-        PLACE { city="Ljubljana"; country="Slovenia"; lat=46.83; lon=13.79; },
-        PLACE { city="Mogadishu"; country="Somalia"; lat=2.60; lon=44.85; },
-        PLACE { city="Madrid"; country="Spain"; lat=41.49; lon=-4.74; },
-        PLACE { city="Khartoum"; country="Sudan"; lat=15.56; lon=32.54; },
-        PLACE { city="Paramaribo"; country="Surinam"; lat=5.85; lon=-55.18; },
-        PLACE { city="Mbabane"; country="Swaziland"; lat=-25.92; lon=30.72; },
-        PLACE { city="Stockholm"; country="Sweden"; lat=59.67; lon=17.71; },
-        PLACE { city="Berne"; country="Switzerland"; lat=47.49; lon=6.92; },
-        PLACE { city="Damascus"; country="Syria"; lat=33.89; lon=35.91; },
-        PLACE { city="Taipei"; country="Taiwan"; lat=25.93; lon=120.62; },
-        PLACE { city="Dushanbe"; country="Tajikistan"; lat=39.48; lon=67.88; },
-        PLACE { city="Dodoma"; country="Tanzania"; lat=-5.16; lon=34.78; },
-        PLACE { city="Bangkok"; country="Thailand"; lat=14.36; lon=99.90; },
-        PLACE { city="Lhasa"; country="Tibet"; lat=30.60; lon=90.17; },
-        PLACE { city="Lome"; country="Togo"; lat=6.63; lon=0.73; },
-        PLACE { city="Tunis"; country="Tunisia"; lat=36.85; lon=10.17; },
-        PLACE { city="Ankara"; country="Turkey"; lat=40.34; lon=32.56; },
-        PLACE { city="Ashkhabad"; country="Turkmenistan"; lat=38.22; lon=58.11; },
-        PLACE { city="Funafuti"; country="Tuvalu"; lat=-8.30; lon=178.96; },
-        PLACE { city="Kampala"; country="Uganda"; lat=1.20; lon=31.64; },
-        PLACE { city="Kiev"; country="Ukraine"; lat=50.92; lon=30.06; },
-        PLACE { city="Montevideo"; country="Uruguay"; lat=-34.21; lon=-56.81; },
-        PLACE { city="Tashkent"; country="Uzbekistan"; lat=41.40; lon=69.24; },
-        PLACE { city="Caracas"; country="Venezuela"; lat=11.16; lon=-67.58; },
-        PLACE { city="Hanoi"; country="Vietnam"; lat=21.33; lon=105.67; },
-        PLACE { city="Sanaa"; country="Yemen"; lat=16.39; lon=43.26; },
-        PLACE { city="Belgrade"; country="Yugoslavia"; lat=45.56; lon=19.77; },
-        PLACE { city="Lusaka"; country="Zambia"; lat=-15.00; lon=27.80; },
-        PLACE { city="Harare"; country="Zimbabwe"; lat=-17.30; lon=30.61; }
-		};
-	}
-
--- a/locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/mapnavproviderrefapp/data/mnrefproviderplugin.rss	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,51 +0,0 @@
-/*
-* Copyright (c) 2007 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 ECom registration resource for TestProviderPlugin.
-*
-*/
-
-
-//  RESOURCE IDENTIFIER
-NAME MNTP
-
-#include <ecom/registryinfov2.rh>
-#include <mnpluginuids.hrh> // defines interface UID
-
-RESOURCE REGISTRY_INFO r_mycoordconverterplugin_reginfo
-	{
-	resource_format_version = RESOURCE_FORMAT_VERSION_2;
-	// DLL UID of the DLL
-	dll_uid = 0x03133037;
-	interfaces =
-	    {
-	    INTERFACE_INFO
-	        {
-	        // UID of coordinate converter interface,
-	        // defined in mnpluginuids.hrh
-	        interface_uid = KMnMapImageConverterIf;
-	        implementations =
-	            {
-	            IMPLEMENTATION_INFO
-	                {
-	                // The licensee needs to allocate this UID from Symbian
-	                implementation_uid = 0x03133038;
-	                version_no = 1;
-	                display_name = "MnRefProviderCoordConverter";
-	                // SID of provider application executable
-	                default_data = "03132014";
-	                }
-	            };
-	        }
-	    };
-	}
--- a/locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/mapnavproviderrefapp/eabi/mnrefproviderengine.50u.def	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,64 +0,0 @@
-EXPORTS
-	_ZN11CMnrpEngine12KnownPlacesLEv @ 1 NONAME
-	_ZN11CMnrpEngine15AddressToCoordLERK12CPosLandmark @ 2 NONAME
-	_ZN11CMnrpEngine15AddressToCoordLERK7TDesC16 @ 3 NONAME
-	_ZN11CMnrpEngine16AddressToCoordLCERK12CPosLandmark @ 4 NONAME
-	_ZN11CMnrpEngine16AddressToCoordLCERK7TDesC16 @ 5 NONAME
-	_ZN11CMnrpEngine16CoordToAddressLCERK11TCoordinate @ 6 NONAME
-	_ZN11CMnrpEngine16FindClosestPoisLERK12CPosLandmarkR6RArrayINS_14TDistanceToPoiEEi @ 7 NONAME
-	_ZN11CMnrpEngine17FindResourceFileLERK7TDesC16R4TBufILi256EE @ 8 NONAME
-	_ZN11CMnrpEngine24DistanceBetweenLandmarksERK12CPosLandmarkS2_ @ 9 NONAME
-	_ZN11CMnrpEngine26BestCoordToAddressMatchesLERK11TCoordinateR13RPointerArrayI12CPosLandmarkEi @ 10 NONAME
-	_ZN11CMnrpEngine2FsEv @ 11 NONAME
-	_ZN11CMnrpEngine4NewLEv @ 12 NONAME
-	_ZN11CMnrpEngineD0Ev @ 13 NONAME
-	_ZN11CMnrpEngineD1Ev @ 14 NONAME
-	_ZN11CMnrpEngineD2Ev @ 15 NONAME
-	_ZN13CMnrpMapModel11UpdateModelERK17TMnMapImageParams @ 16 NONAME
-	_ZN13CMnrpMapModel12UpdateModelLER19CMnrpMapViewService @ 17 NONAME
-	_ZN13CMnrpMapModel12UpdateModelLERK20CMnrpMapImageService @ 18 NONAME
-	_ZN13CMnrpMapModel13SetScreenSizeE5TSize @ 19 NONAME
-	_ZN13CMnrpMapModel19NumIgnoredLandmarksEv @ 20 NONAME
-	_ZN13CMnrpMapModel4NewLER11CMnrpEngine @ 21 NONAME
-	_ZN13CMnrpMapModel4NewLER17MMapModelObserverR11CMnrpEngine @ 22 NONAME
-	_ZN13CMnrpMapModel4ZoomEd @ 23 NONAME
-	_ZN13CMnrpMapModel6MoveToE11TCoordinate @ 24 NONAME
-	_ZN13CMnrpMapModel8GoCenterEv @ 25 NONAME
-	_ZN20CMnrpPositionRequest11GetPositionER13TPositionInfo @ 26 NONAME
-	_ZN20CMnrpPositionRequest11SetOptionsLERK26TPositionUpdateOptionsBase @ 27 NONAME
-	_ZN20CMnrpPositionRequest14MagneticCourseEv @ 28 NONAME
-	_ZN20CMnrpPositionRequest15MagneticHeadingEv @ 29 NONAME
-	_ZN20CMnrpPositionRequest16FetchNewPositionEi @ 30 NONAME
-	_ZN20CMnrpPositionRequest4NewLERK7TDesC16R21MMnrpPositionObserver @ 31 NONAME
-	_ZN20CMnrpPositionRequest5SpeedEv @ 32 NONAME
-	_ZN20CMnrpPositionRequest6CourseEv @ 33 NONAME
-	_ZN20CMnrpPositionRequest7HeadingEv @ 34 NONAME
-	_ZN20CMnrpPositionRequestD0Ev @ 35 NONAME
-	_ZN20CMnrpPositionRequestD1Ev @ 36 NONAME
-	_ZN20CMnrpPositionRequestD2Ev @ 37 NONAME
-	_ZN9MnrpUtils13AngleToStringEdR6TDes16 @ 38 NONAME
-	_ZN9MnrpUtils13SpeedToStringEdR6TDes16 @ 39 NONAME
-	_ZN9MnrpUtils16DistanceToStringEdR6TDes16 @ 40 NONAME
-	_ZN9MnrpUtils17PrintableStringLCERK7TDesC16 @ 41 NONAME
-	_ZN9MnrpUtils18CoordinateToStringEdR6TDes16ii @ 42 NONAME
-	_ZNK13CMnrpMapModel16AbsoluteToScreenE11TCoordinate @ 43 NONAME
-	_ZNK13CMnrpMapModel16ScreenToAbsoluteE6TPoint @ 44 NONAME
-	_ZNK13CMnrpMapModel16ScreenToAbsoluteEi @ 45 NONAME
-	_ZNK13CMnrpMapModel3TopEv @ 46 NONAME
-	_ZNK13CMnrpMapModel4LeftEv @ 47 NONAME
-	_ZNK13CMnrpMapModel5RightEv @ 48 NONAME
-	_ZNK13CMnrpMapModel5WidthEv @ 49 NONAME
-	_ZNK13CMnrpMapModel6BottomEv @ 50 NONAME
-	_ZNK13CMnrpMapModel6CenterEv @ 51 NONAME
-	_ZNK13CMnrpMapModel6HeightEv @ 52 NONAME
-	_ZNK13CMnrpMapModel7GetGridERNS_5TGridE @ 53 NONAME
-	_ZNK13CMnrpMapModel7RenderLER10CFbsBitmap5TRectP5CFontS4_ @ 54 NONAME
-	_ZTI11CMnrpEngine @ 55 NONAME ; #<TI>#
-	_ZTI13CMnrpMapModel @ 56 NONAME ; #<TI>#
-	_ZTI20CMnrpPositionRequest @ 57 NONAME ; #<TI>#
-	_ZTIN13CMnrpMapModel9CDrawItemE @ 58 NONAME ; #<TI>#
-	_ZTV11CMnrpEngine @ 59 NONAME ; #<VT>#
-	_ZTV13CMnrpMapModel @ 60 NONAME ; #<VT>#
-	_ZTV20CMnrpPositionRequest @ 61 NONAME ; #<VT>#
-	_ZTVN13CMnrpMapModel9CDrawItemE @ 62 NONAME ; #<VT>#
-
--- a/locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/mapnavproviderrefapp/eabi/mnrefproviderengineu.def	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,62 +0,0 @@
-EXPORTS
-	_ZN11CMnrpEngine12KnownPlacesLEv @ 1 NONAME
-	_ZN11CMnrpEngine16AddressToCoordLCERK12CPosLandmark @ 2 NONAME
-	_ZN11CMnrpEngine16AddressToCoordLCERK7TDesC16 @ 3 NONAME
-	_ZN11CMnrpEngine16CoordToAddressLCERK11TCoordinate @ 4 NONAME
-	_ZN11CMnrpEngine16FindClosestPoisLERK12CPosLandmarkR6RArrayINS_14TDistanceToPoiEEi @ 5 NONAME
-	_ZN11CMnrpEngine17FindResourceFileLERK7TDesC16R4TBufILi256EE @ 6 NONAME
-	_ZN11CMnrpEngine24DistanceBetweenLandmarksERK12CPosLandmarkS2_ @ 7 NONAME
-	_ZN11CMnrpEngine26BestCoordToAddressMatchesLERK11TCoordinateR13RPointerArrayI12CPosLandmarkEi @ 8 NONAME
-	_ZN11CMnrpEngine2FsEv @ 9 NONAME
-	_ZN11CMnrpEngine4NewLEv @ 10 NONAME
-	_ZN11CMnrpEngineD0Ev @ 11 NONAME
-	_ZN11CMnrpEngineD1Ev @ 12 NONAME
-	_ZN11CMnrpEngineD2Ev @ 13 NONAME
-	_ZN13CMnrpMapModel12UpdateModelLER19CMnrpMapViewService @ 14 NONAME
-	_ZN13CMnrpMapModel13SetScreenSizeE5TSize @ 15 NONAME
-	_ZN13CMnrpMapModel4NewLER11CMnrpEngine @ 16 NONAME
-	_ZN13CMnrpMapModel4NewLER17MMapModelObserverR11CMnrpEngine @ 17 NONAME
-	_ZN13CMnrpMapModel4ZoomEd @ 18 NONAME
-	_ZN13CMnrpMapModel6MoveToE11TCoordinate @ 19 NONAME
-	_ZN13CMnrpMapModel8GoCenterEv @ 20 NONAME
-	_ZN20CMnrpPositionRequest11GetPositionER13TPositionInfo @ 21 NONAME
-	_ZN20CMnrpPositionRequest11SetOptionsLERK26TPositionUpdateOptionsBase @ 22 NONAME
-	_ZN20CMnrpPositionRequest14MagneticCourseEv @ 23 NONAME
-	_ZN20CMnrpPositionRequest15MagneticHeadingEv @ 24 NONAME
-	_ZN20CMnrpPositionRequest16FetchNewPositionEi @ 25 NONAME
-	_ZN20CMnrpPositionRequest4NewLERK7TDesC16R21MMnrpPositionObserver @ 26 NONAME
-	_ZN20CMnrpPositionRequest5SpeedEv @ 27 NONAME
-	_ZN20CMnrpPositionRequest6CourseEv @ 28 NONAME
-	_ZN20CMnrpPositionRequest7HeadingEv @ 29 NONAME
-	_ZN20CMnrpPositionRequestD0Ev @ 30 NONAME
-	_ZN20CMnrpPositionRequestD1Ev @ 31 NONAME
-	_ZN20CMnrpPositionRequestD2Ev @ 32 NONAME
-	_ZN9MnrpUtils13AngleToStringEdR6TDes16 @ 33 NONAME
-	_ZN9MnrpUtils13SpeedToStringEdR6TDes16 @ 34 NONAME
-	_ZN9MnrpUtils16DistanceToStringEdR6TDes16 @ 35 NONAME
-	_ZN9MnrpUtils18CoordinateToStringEdR6TDes16ii @ 36 NONAME
-	_ZNK13CMnrpMapModel16AbsoluteToScreenE11TCoordinate @ 37 NONAME
-	_ZNK13CMnrpMapModel16ScreenToAbsoluteE6TPoint @ 38 NONAME
-	_ZNK13CMnrpMapModel16ScreenToAbsoluteEi @ 39 NONAME
-	_ZNK13CMnrpMapModel3TopEv @ 40 NONAME
-	_ZNK13CMnrpMapModel4LeftEv @ 41 NONAME
-	_ZNK13CMnrpMapModel5RightEv @ 42 NONAME
-	_ZNK13CMnrpMapModel5WidthEv @ 43 NONAME
-	_ZNK13CMnrpMapModel6BottomEv @ 44 NONAME
-	_ZNK13CMnrpMapModel6CenterEv @ 45 NONAME
-	_ZNK13CMnrpMapModel6HeightEv @ 46 NONAME
-	_ZNK13CMnrpMapModel7GetGridERNS_5TGridE @ 47 NONAME
-	_ZNK13CMnrpMapModel7RenderLER10CFbsBitmap5TRectP5CFontS4_ @ 48 NONAME
-	_ZTI11CMnrpEngine @ 49 NONAME ; #<TI>#
-	_ZTI13CMnrpMapModel @ 50 NONAME ; #<TI>#
-	_ZTI20CMnrpPositionRequest @ 51 NONAME ; #<TI>#
-	_ZTIN13CMnrpMapModel9CDrawItemE @ 52 NONAME ; #<TI>#
-	_ZTV11CMnrpEngine @ 53 NONAME ; #<VT>#
-	_ZTV13CMnrpMapModel @ 54 NONAME ; #<VT>#
-	_ZTV20CMnrpPositionRequest @ 55 NONAME ; #<VT>#
-	_ZTVN13CMnrpMapModel9CDrawItemE @ 56 NONAME ; #<VT>#
-	_ZN9MnrpUtils17PrintableStringLCERK7TDesC16 @ 57 NONAME
-	_ZN11CMnrpEngine14AddressToCoordERK12CPosLandmark @ 58 NONAME
-	_ZN11CMnrpEngine14AddressToCoordERK7TDesC16 @ 59 NONAME
-	_ZN13CMnrpMapModel19NumIgnoredLandmarksEv @ 60 NONAME
-
--- a/locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/mapnavproviderrefapp/group/bld.inf	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,40 +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:  Build information file for project MapNavRefProviderApp
-*
-*/
-
-
-#include <bldvariant.hrh>
-#include <platform_paths.hrh>
-
-PRJ_PLATFORMS
-DEFAULT
-
-PRJ_EXTENSIONS
-START EXTENSION s60/mifconv
-OPTION TARGETFILE MnRefProvider.mif  // this will also generate .mbm;
-OPTION HEADERFILE MnRefProvider.mbg
-OPTION SOURCES -c8,8 default_lm.bmp
-OPTION SOURCEDIR ../data
-END
-PRJ_MMPFILES
-PRJ_TESTMMPFILES
-mnprovdiscrefengine.mmp
-mnprovdiscrefprovider.mmp
-mnprovdiscrefproviderback.mmp
-
-#ifdef RD_MAPNAV_BITMAP_ACCESS
-mnprovdiscrefproviderplugin.mmp
-#endif
\ No newline at end of file
--- a/locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/mapnavproviderrefapp/group/mnprovdiscrefengine.mmp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,64 +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:  Project definition file for MnRefProviderEngine
-*
-*/
-
-
-#include <platform_paths.hrh>
-
-TARGET              mnrefproviderengine.dll
-TARGETTYPE          dll
-UID                 0x1000008D 0x03132015
-
-VENDORID            VID_DEFAULT
-CAPABILITY          ReadUserData WriteUserData Location
-
-SOURCEPATH          ../src
-
-SOURCE              mnrpengine.cpp
-SOURCE              mnrpmapmodel.cpp
-SOURCE              mnrppositionrequest.cpp
-SOURCE              mnrputils.cpp
-
-USERINCLUDE         ../inc
-MW_LAYER_SYSTEMINCLUDE
-
-LIBRARY             euser.lib efsrv.lib estor.lib bafl.lib
-LIBRARY             eikcore.lib
-LIBRARY             aknicon.lib egul.lib gdi.lib bitgdi.lib
-
-LIBRARY             eposlandmarks.lib
-LIBRARY             lbs.lib
-LIBRARY             mnclientlib.lib mnservicelib.lib
-
-DEBUGLIBRARY        flogger.lib
-
-START RESOURCE      ../data/mnrefproviderengine.rss
-HEADER
-TARGETPATH          /resource
-END
-
-#ifdef RD_MAPNAV_BITMAP_ACCESS
-#ifdef WINS
-DEFFILE         ../bwins/mnrefproviderengine.50.def
-#else
-DEFFILE         ../eabi/mnrefproviderengine.50.def
-#endif
-#endif
-
-SMPSAFE
-
-// END OF FILE
-
--- a/locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/mapnavproviderrefapp/group/mnprovdiscrefprovider.mmp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,82 +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:  Project definition file for MnRefProvider
-*
-*/
-
-
-#include <platform_paths.hrh>
-
-TARGET              mnrefprovider.exe
-TARGETTYPE          exe
-EPOCSTACKSIZE       0x5000
-UID                 0x100039CE 0x03132013
-
-VENDORID            VID_DEFAULT
-CAPABILITY          ReadUserData WriteUserData Location
-
-SOURCEPATH          ../src
-
-SOURCE              mnrefprovider.cpp
-SOURCE              mnrpapplication.cpp
-SOURCE              mnrpappui.cpp
-SOURCE              mnrpdocument.cpp
-SOURCE              mnrpappserver.cpp
-
-SOURCE              mnrpappview.cpp
-SOURCE              mnrpappcontrol.cpp
-
-SOURCE              mnrpmapview.cpp
-SOURCE              mnrpmapcontrol.cpp
-
-SOURCE              mnrpnaviview.cpp
-SOURCE              mnrpnavimodel.cpp
-SOURCE              mnrpnavicontrol.cpp
-
-SOURCE              mnrpnavigationservice.cpp
-SOURCE              mnrpmapviewservice.cpp
-
-USERINCLUDE         ../inc
-
-MW_LAYER_SYSTEMINCLUDE
-
-LIBRARY             euser.lib efsrv.lib estor.lib apparc.lib bafl.lib
-LIBRARY             cone.lib eikcore.lib eikcoctl.lib eikctl.lib eikdlg.lib
-
-LIBRARY             avkon.lib aknskins.lib aknicon.lib
-LIBRARY             egul.lib gdi.lib ws32.lib fbscli.lib
-LIBRARY             imageconversion.lib
-
-LIBRARY             eposlandmarks.lib eposlmsearchlib.lib
-LIBRARY             lbs.lib
-LIBRARY             mnservicelib.lib
-
-LIBRARY             mnrefproviderengine.lib
-
-DEBUGLIBRARY        flogger.lib
-
-START RESOURCE      ../data/MnRefProvider.rss
-HEADER
-TARGETPATH          /resource/apps
-END
-
-START RESOURCE      ../data/MnRefProvider_reg.rss
-DEPENDS mnrefprovider.rsg
-TARGETPATH          /private/10003a3f/apps
-END
-
-SMPSAFE
-
-// END OF FILE
-
--- a/locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/mapnavproviderrefapp/group/mnprovdiscrefproviderback.mmp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,72 +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:  Project definition file for MnRefGeocoder
-*
-*/
-
-
-#include <platform_paths.hrh>
-
-TARGET              mnrefproviderback.exe
-TARGETTYPE          exe
-EPOCSTACKSIZE       0x5000
-UID                 0x100039CE 0x03132014
-
-VENDORID            VID_DEFAULT
-CAPABILITY          ReadUserData WriteUserData Location
-
-SOURCEPATH          ../src
-
-SOURCE              mnrefproviderback.cpp
-SOURCE              mnrpapplicationback.cpp
-SOURCE              mnrpappuiback.cpp
-SOURCE              mnrpdocumentback.cpp
-SOURCE              mnrpappserverback.cpp
-
-SOURCE              mnrpgeocodingservice.cpp
-#ifdef RD_MAPNAV_BITMAP_ACCESS
-SOURCE              mnrpmapimageservice.cpp
-#endif
-
-USERINCLUDE         ../inc
-MW_LAYER_SYSTEMINCLUDE
-
-LIBRARY             euser.lib efsrv.lib estor.lib bafl.lib
-LIBRARY             cone.lib apparc.lib eikcore.lib eikcoctl.lib
-LIBRARY             ws32.lib gdi.lib
-
-LIBRARY             avkon.lib aknskins.lib
-
-LIBRARY             eposlandmarks.lib
-LIBRARY             lbs.lib
-LIBRARY             mnservicelib.lib
-
-LIBRARY             mnrefproviderengine.lib
-
-DEBUGLIBRARY        flogger.lib
-
-START RESOURCE      ../data/mnrefproviderback.rss
-HEADER
-TARGETPATH          /resource/apps
-END
-
-START RESOURCE      ../data/mnrefproviderback_reg.rss
-DEPENDS mnrefproviderback.rsg
-TARGETPATH          /private/10003a3f/apps
-END
-
-SMPSAFE
-
-// END OF FILE
-
--- a/locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/mapnavproviderrefapp/group/mnprovdiscrefproviderplugin.mmp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,50 +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:  Project definition file for MnRefProviderPlugin
-*
-*/
-
-
-#include <platform_paths.hrh>
-
-TARGET              MnRefProviderPlugin.dll
-TARGETTYPE          PLUGIN
-UID                 0x10009D8D 0x03133037
-
-VENDORID            VID_DEFAULT
-CAPABILITY          ReadUserData WriteUserData Location
-
-SOURCEPATH          ../src
-
-SOURCE              mnrefproviderplugin.cpp
-SOURCE				mnrpcoordconverter.cpp
-
-USERINCLUDE         ../inc
-MW_LAYER_SYSTEMINCLUDE
-
-LIBRARY             euser.lib
-LIBRARY             lbs.lib
-LIBRARY             mnclientlib.lib
-LIBRARY             mnrefproviderengine.lib
-DEBUGLIBRARY        flogger.lib
-
-START RESOURCE      ../data/mnrefproviderplugin.rss
-TARGET			    mnrefproviderplugin.rsc
-TARGETPATH          /resource/plugins
-END
-
-SMPSAFE
-
-// END OF FILE
-
--- a/locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/mapnavproviderrefapp/inc/debug.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,86 +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:  Debug macros
-*
-*/
-
-
-#ifndef MNRP_DEBUG_H
-#define MNRP_DEBUG_H
-
-#include <e32base.h>
-
-#ifdef _DEBUG
-
-#include <e32svr.h>
-#include <e32std.h>
-#include <f32file.h>
-#include <flogger.h>
-
-_LIT(KLogFile, "mnlog.txt");
-_LIT(KLogDirFullName, "c:\\logs\\");
-_LIT(KLogDir, "mn");
-
-inline void Prefix( TDes& aMessage )
-    {
-    RProcess process;
-    _LIT( KPrefix, "[MnRefProvider/%ld]: ");
-    aMessage.Format( KPrefix, process.Id().Id() );
-    }
-
-inline void Log( TRefByValue<const TDesC> aFmt, ... )
-    {
-    VA_LIST list;
-    VA_START( list, aFmt );
-
-    HBufC* buf = HBufC::New(512);
-    if ( buf )
-    	{
-    	TPtr ptr( buf->Des() );
-	    Prefix( ptr );
-	    ptr.AppendFormatList( aFmt, list );
-
-	    RDebug::RawPrint( ptr );
-	    RFileLogger::Write( KLogDir, KLogFile, EFileLoggingModeAppend, ptr );
-
-	    delete buf;
-    	}
-    }
-
-#define LOG( a )             { Log( _L( a ) ); }
-#define LOG1( a, b )         { Log( _L( a ), b ); }
-#define LOG2( a, b, c )      { Log( _L( a ), b, c ); }
-#define LOG3( a, b, c, d )   { Log( _L( a ), b, c, d ); }
-#define LOG4( a, b, c, d, e )   { Log( _L( a ), b, c, d, e ); }
-
-#else // _DEBUG
-
-// Release version - no logging
-#define LOG( a)
-#define LOG1( a, b )
-#define LOG2( a, b, c )
-#define LOG3( a, b, c, d )
-#define LOG4( a, b, c, d, e )
-
-#endif // _DEBUG
-
-inline void Panic( TInt aReason )
-    {
-    _LIT( KPanicCategory, "MnRefProvider" );
-    LOG1("Panicking: %1", aReason);
-    User::Panic( KPanicCategory, aReason );
-    }
-
-#endif // MNRP_DEBUG_H
-
--- a/locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/mapnavproviderrefapp/inc/mnrp.hrh	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,35 +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:  Common source and resource constants
-*
-*/
-
-
-#ifndef __MNRP_HRH__
-#define __MNRP_HRH__
-
-enum TMnrpCommandIds
-    {
-	EMnrpCommandFullScreen = 100,
-	EMnrpCommandSelect
-    };
-
-enum TMnrpViewIds
-    {
-    EMnrpAppViewId = 1,
-    EMnrpMapViewId,
-    EMnrpNavigationViewId
-    };
-
-#endif // __MNRP_HRH__
--- a/locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/mapnavproviderrefapp/inc/mnrpappcontrol.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,53 +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:  CMnrpAppControl class definition 
-*
-*/
-
-
-#ifndef MNRP_APPCONTROL_H
-#define MNRP_APPCONTROL_H
-
-#include <coecntrl.h>
-class CMnrpAppView;
-
-/** Empty view for the case when application is started
- *	from menu */
-class CMnrpAppControl : public CCoeControl
-    {
-    public:
-
-        static CMnrpAppControl* NewL( CMnrpAppView& aView, const TRect& aRect );
-
-        virtual ~CMnrpAppControl();
-
-    public:  // From CCoeControl
-
-        TInt CountComponentControls() const;
-        CCoeControl* ComponentControl( TInt aIndex ) const;
-        void HandleResourceChange( TInt aType );
-
-        void Draw( const TRect& aRect ) const;
-        
-    private:
-
-        void ConstructL( const TRect& aRect );
-        CMnrpAppControl( CMnrpAppView& aView );
-        
-    private:
-        CMnrpAppView&   iView;
-    };
-
-#endif // MNRP_APPCONTROL_H
-
--- a/locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/mapnavproviderrefapp/inc/mnrpapplication.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,55 +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:  CMnrpApplication class definition 
-*
-*/
-
-
-#ifndef MNRP_APPLICATION_H
-#define MNRP_APPLICATION_H
-
-#include <eikapp.h>
-
-/**
- *  An instance of CMnrpApplication is the application part of the Eikon
- *  application framework for the MnRefProvider.
- *	MnRefProvider is an Application Server, which implements MapView and Navigation
- *	services of M&N FW.
- */
-class CMnrpApplication : public CEikApplication
-    {
-    public:  // from CEikApplication
-
-        /** 
-        * AppDllUid returns the application DLL UID value.
-        *
-        *  @return the UID of this Application/Dll
-        */
-        TUid AppDllUid() const;
-
-    protected: // from CEikApplication
-
-        /** 
-        * CreateDocumentL creates a CApaDocument object and return a pointer to it
-        *
-        * @return a pointer to the created document
-        */
-        CApaDocument* CreateDocumentL();
-        
-        void NewAppServerL(CApaAppServer *&aAppServer);
-
-    };
-
-#endif // MNRP_APPLICATION_H
-
--- a/locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/mapnavproviderrefapp/inc/mnrpapplicationback.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,56 +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:  CMnrpApplicationBack class definition
-*
-*/
-
-
-#ifndef MNRP_APPLICATIONBACK_H
-#define MNRP_APPLICATIONBACK_H
-
-#include <eikapp.h>
-
-/**
- *  An instance of CMnrpApplicationBack is the application part of the Eikon
- *  application framework for the MnRefGeocoder.
- *	MnRefGeocoder is a hidden application and works only as geocoder server.
- *	It accepts geocoding requests from M&N FW, serves them and exits, when 
- *	all clients are disconnected.
- */
-class CMnrpApplicationBack : public CEikApplication
-    {
-    public:  // from CEikApplication
-
-        /** 
-        * AppDllUid returns the application DLL UID value.
-        *
-        *  @return the UID of this Application/Dll
-        */
-        TUid AppDllUid() const;
-
-    protected: // from CEikApplication
-
-        /** 
-        * CreateDocumentL creates a CApaDocument object and return a pointer to it
-        *
-        * @return a pointer to the created document
-        */
-        CApaDocument* CreateDocumentL();
-        
-        void NewAppServerL(CApaAppServer *&aAppServer);
-
-    };
-
-#endif // MNRP_APPLICATIONBACK_H
-
--- a/locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/mapnavproviderrefapp/inc/mnrpappserver.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,55 +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:  CMnrpAppServer class definition
-*
-*/
-
-
-#ifndef MNRP_APPSERVER_H
-#define MNRP_APPSERVER_H
-
-#include <aknserverapp.h>
-
-class CMnrpAppUi;
-class CMnrpNavigationService;
-class CMnrpMapViewService;
-
-/** Application Server class of MnRefProvider component */
-class CMnrpAppServer : public CAknAppServer
-    {
-    public:
-        ~CMnrpAppServer();
-        
-        CMnrpAppUi* AppUi();
-
-    public: // from CAknAppServer
-    	/** Creates new service class and returns pointer to it */
-        IMPORT_C CApaAppServiceBase* CreateServiceL(TUid aServiceType) const;
-        
-        /** Overrides base function. Doesn't close application evenb if all
-         *	clients have disconnected until user closes it herself. 
-         *	It is important for standalone execution, when calling application
-         *	may be closed, but user still wants to continue with Map or Navigation.
-         */
-        IMPORT_C void HandleAllClientsClosed();
-        
-    protected:        
-    	/** Creates new navigation service class and returns pointer to it */
-        CMnrpNavigationService* CreateNavigationServiceL() const;
-    	/** Creates new map view service class and returns pointer to it */
-        CMnrpMapViewService* CreateMapViewServiceL() const;
-    };
-
-#endif // MNRP_APPSERVER_H
-
--- a/locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/mapnavproviderrefapp/inc/mnrpappserverback.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,60 +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:  CMnrpAppServerBack class definition
-*
-*/
-
-
-#ifndef MNRP_APPSERVERBACK_H
-#define MNRP_APPSERVERBACK_H
-
-#include <aknserverapp.h>
-
-class CMnrpGeocodingService;
-class CMnrpEngine;
-
-#ifdef RD_MAPNAV_BITMAP_ACCESS
-class CMnrpMapImageService;
-#endif
-
-/** Application Server class of MnRefGeocoder component
- *	It ows Engine instance.
- */
-class CMnrpAppServerBack : public CAknAppServer
-    {
-    public:
-        static CMnrpAppServerBack* NewL();
-        ~CMnrpAppServerBack();
-
-    public: // from CAknAppServer
-    	/** Creates new geocoding service class and returns pointer to it */
-        IMPORT_C CApaAppServiceBase* CreateServiceL( TUid aServiceType ) const;
-
-    protected:
-        void ConstructL();
-
-    	/** Creates new geocoding service class and returns pointer to it */
-        CMnrpGeocodingService* CreateGeocodingServiceL() const;
-
-#ifdef RD_MAPNAV_BITMAP_ACCESS
-    	/** Creates new map image service class and returns pointer to it */
-        CMnrpMapImageService* CreateMapImageServiceL() const;
-#endif
-
-    private:
-        CMnrpEngine* iEngine;
-    };
-
-#endif // MNRP_APPSERVERBACK_H
-
--- a/locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/mapnavproviderrefapp/inc/mnrpappui.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,120 +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:  CMnrpAppUi class definition
-*
-*/
-
-
-#ifndef MNRP_APPUI_H
-#define MNRP_APPUI_H
-
-#include <aknviewappui.h>
-#include <epos_landmarks.h>
-
-class TCoordinate;
-class CPosLandmark;
-
-class CMnrpAppView;
-class CMnrpNaviView;
-class CMnrpMapView;
-
-class CMnrpMapViewService;
-
-class CAknNavigationDecorator;
-class CAknNavigationControlContainer;
-
-class CMnrpEngine;
-
-/** Map selection callback class */
-class MMapSelectionCallback
-    {
-    public:
-        /** Called when user selects location from map */
-        virtual void HandleSelectionL( const TCoordinate& aSelection ) = 0;
-
-        /** Called when user selects landmark from dialog list */
-        virtual void HandleSelectionL( TInt aLandmarkIndex ) = 0;
-        virtual void HandleSelectionL( TPosLmItemId aLandmarkId, TInt aDbIndex ) = 0;
-        
-        /** Called when user refuses selection */
-        virtual void HandleSelectionErrorL( TInt aError ) = 0;
-    };
-
-/** Simple App UI for MnRefProvider component.
- *	It manages application views.
- */
-class CMnrpAppUi : public CAknViewAppUi
-    {
-    public:
-
-        CMnrpAppUi( CMnrpEngine& aEngine );
-        void ConstructL();
-        ~CMnrpAppUi();
-
-        void ShowMapL( CMnrpMapViewService& aService );
-
-        void StartSelectionL( 
-            CMnrpMapViewService& aService,  
-            MMapSelectionCallback& aCallback );
-
-        void StopSelection();
-
-        void ShowNavigationL( const CPosLandmark& aDestination );
-
-		/** Returns ETrue if Map or Navigaton view is still open */
-        TBool IsAnyUserViewActive();
-        
-		/** Returns ETrue if application was started embedded */
-        TBool IsChainedMode();
-
-        void SetNaviPaneTitleL( const TDesC& aPaneTitle );
-        void SetRightSoftkeyCommandL( TInt aCommand, const TDesC& aButtonTitle );
-        
-    protected: // from CAknAppUi
-    
-        void HandleCommandL(TInt aCommand);
-        void HandleResourceChangeL( TInt aType );
-        TBool ProcessCommandParametersL( CApaCommandLine &aCommandLine );
-
-    private:
-
-        void PostConstructL();
-
-        void SelectFromDialogL(
-            CMnrpMapViewService& aService,
-            MMapSelectionCallback& aCallback );
-
-    private:
-    	/** Empty view */
-        CMnrpAppView* iAppView;
-
-		/** Navigation view */
-        CMnrpNaviView* iNaviView;
-		/** Map view */
-        CMnrpMapView* iMapView;
-
-        //Own:
-        CAknNavigationDecorator* iNaviPaneLabel;
-
-        //Ref:
-        CAknNavigationControlContainer* iNaviPane;
-        
-        TInt iParentWg;
-
-        /** Reference to engine */
-        CMnrpEngine& iEngine;
-    };
-
-#endif // MNRP_APPUI_H
-
--- a/locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/mapnavproviderrefapp/inc/mnrpappuiback.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,42 +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:   class definition
-*
-*/
-
-
-#ifndef MNRP_APPUIBACK_H
-#define MNRP_APPUIBACK_H
-
-#include <aknviewappui.h>
-
-/** Simple App UI class of the MnRefGeocoder component */
-class CMnrpAppUiBack : public CAknAppUi
-    {
-    public:
-        void ConstructL();
-
-        /**  Moves application to foreground */
-        void MoveForeground();
-        
-        /**  Moves application to background */
-        void MoveBackground();
-
-    public: // from CEikAppUi
-
-        void HandleCommandL(TInt aCommand);
-    };
-
-#endif // MNRP_APPUIBACK_H
-
--- a/locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/mapnavproviderrefapp/inc/mnrpappview.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,59 +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:  CMnrpAppView class definition 
-*
-*/
-
-
-#ifndef MNRP_APPVIEW_H
-#define MNRP_APPVIEW_H
-
-#include <aknview.h>
-
-class CMnrpAppControl;
-
-/** Empty view for the case when application is started
- *	from menu*/
-class CMnrpAppView : public CAknView
-    {
-    public:
-
-        static CMnrpAppView* NewL();
-        virtual ~CMnrpAppView();
-
-    public: // from CAknView
-
-        TUid Id() const;
-
-        void DoActivateL(
-            const TVwsViewId& aPrevViewId,
-            TUid aCustomMessageId,
-            const TDesC8& aCustomMessage);
-
-        void DoDeactivate();
-
-    private:
-
-        CMnrpAppView();
-        void ConstructL();
-        
-    private:
-    
-    	/** UI control */
-        CMnrpAppControl* iControl;    
-
-    };
-
-#endif // MNRP_APPVIEW_H
-
--- a/locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/mapnavproviderrefapp/inc/mnrpcoordconverter.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,53 +0,0 @@
-/*
-* Copyright (c) 2007 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:  CMnrpCoordConverter class definition
-*
-*/
-
-
-#ifndef MNRP_COORDINATECONVERTER_H
-#define MNRP_COORDINATECONVERTER_H
-
-#include <mncoordinateconverterbase.h>
-
-class CMnrpEngine;
-class CMnrpMapModel;
-
-class CMnrpCoordConverter : public CMnCoordinateConverterBase
-    {
-    public:
-        static CMnrpCoordConverter* NewL();
-
-        ~CMnrpCoordConverter();
-
-    protected: // From CMnCoordinateConverterBase
-
-        TInt GetImageCoordinate(
-            const TCoordinate& aWorldCoordinate,
-            TPoint& aImagePoint );
-
-        TInt GetWorldCoordinate(
-            const TPoint& aImagePoint,
-            TCoordinate& aWorldCoordinate );
-
-    protected:
-        CMnrpCoordConverter();
-
-    private:
-
-        CMnrpEngine*            iEngine;
-        CMnrpMapModel*          iModel;
-    };
-
-#endif /*MNTP_COORDINATECONVERTER_H*/
--- a/locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/mapnavproviderrefapp/inc/mnrpdocument.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,54 +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:  CMnrpDocument class definition
-*
-*/
-
-
-#ifndef MNRP_DOCUMENT_H
-#define MNRP_DOCUMENT_H
-
-#include <akndoc.h>
-
-class CMnrpEngine;
-class CEikApplication;
-
-/** Document class of MnRefProvider component.
- *	It creates and owns Engine instance
- */
-class CMnrpDocument : public CAknDocument
-    {
-    public:
-
-        static CMnrpDocument* NewL( CEikApplication& aApp );
-        ~CMnrpDocument();
-
-		/** Returns reference to Engine instance */        
-        CMnrpEngine& Engine();
-
-    public: // from CAknDocument
-
-        CEikAppUi* CreateAppUiL();
-
-    private:
-
-        CMnrpDocument( CEikApplication& aApp );
-        void ConstructL();
-    
-    private:
-        CMnrpEngine* iEngine;        
-    };
-
-#endif // MNRP_DOCUMENT_H
-
--- a/locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/mapnavproviderrefapp/inc/mnrpdocumentback.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,43 +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:  CMnrpDocumentBack class definition
-*
-*/
-
-
-#ifndef MNRP_DOCUMENTGEO_H
-#define MNRP_DOCUMENTGEO_H
-
-#include <akndoc.h>
-
-class CEikApplication;
-
-/** Document class of MnRefGeocoder component */
-class CMnrpDocumentBack : public CAknDocument
-    {
-    public:
-
-        static CMnrpDocumentBack* NewL( CEikApplication& aApp );
-
-    public: // from CAknDocument
-
-        CEikAppUi* CreateAppUiL();
-
-    private:
-
-        CMnrpDocumentBack( CEikApplication& aApp );
-    };
-
-#endif // MNRP_DOCUMENTGEO_H
-
--- a/locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/mapnavproviderrefapp/inc/mnrpengine.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,147 +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:  CMnrpEngine class definition
-*
-*/
-
-
-#ifndef MNRP_ENGINE_H
-#define MNRP_ENGINE_H
-
-#include <e32base.h>
-#include <f32file.h>
-
-class CPosLandmark;
-class TCoordinate;
-class RResourceReader;
-
-/** Engine class used both by MnRefProvider and MnRefGeocoder 
- *	components. Provides access to POIs database ( resource file,
- *	some cities ) and geocoding services. 
- */
-class CMnrpEngine : public CBase
-    {
-    public:
-    
-        struct TDistanceToPoi
-            {
-            TInt iPoiIndex; // index to KnownPlaces
-            TReal32 iDistance; // distance to Poi of iPoiIndex
-            };
-    
-    public:
-        IMPORT_C static CMnrpEngine* NewL();
-        IMPORT_C ~CMnrpEngine();
-
-		/** Gives access to set of POIs */
-        IMPORT_C TArray<CPosLandmark*> KnownPlacesL();
-        
-        /** Returns coordinate of given address:
-		 *	Find a POI, which country or city matches given address
-		 *	and returns its coordinates.
-		 *	@param aAddress landmark, containing address
-		 *	@return landmark, containg coordinates
-		 *	@leave KErrNotFound if can't find POI matching given address
- 		 */
-        IMPORT_C CPosLandmark* AddressToCoordLC( const CPosLandmark& aAddress );
-
-        /** @overload
-         *  @return landmark, containg coordinates, or NULL
-         */
-        IMPORT_C CPosLandmark* AddressToCoordL( const CPosLandmark& aAddress );
-        
-        /** @overload
-		 *	@param aAddress string containing address
-		 *	@return landmark, containg coordinates
-		 *	@leave KErrNotFound if can't find POI matching given address
- 		 */
-        IMPORT_C CPosLandmark* AddressToCoordLC( const TDesC& aAddress );
-
-        /** @overload
-         *  @param aAddress string containing address
-         *  @return landmark, containg coordinates, or NULL
-         */
-        IMPORT_C CPosLandmark* AddressToCoordL( const TDesC& aAddress );
-
-        /** Returns address for given coordinate:
-		 *	Find a closest POI and return its city and country and
- 		 *	fill street with "%d[m,Km,tKm] from <city>" string, like "5 km to Tampere"
-		 *	@param aLocation coordinate
-		 *	@return landmark, containg address
-		 *	@leave KErrNotFound if can't find any POI
- 		 */
-        IMPORT_C CPosLandmark* CoordToAddressLC( const TCoordinate& aLocation );
-        
-        /** Finds a resource file in the system. 
-         *	It looks on all the drives for the file and folder given as parameter
-         *	@param[in] aFilePathAndName path and name of the file to search for. Drive
-         *							info is ignored
-         *	@param[out] aRscFile full name of found resource file
-         *	@leave KErrNotFound if file is not found.
-         */
-        IMPORT_C void FindResourceFileL( 
-            const TDesC& aFilePathAndName,
-            TFileName& aRscFile );
-
-        /** Returns reference to open file session, given at construction */
-        IMPORT_C RFs& Fs();
-
-        /** Calculates distance between two landmarks.
-         *  @param aFrom Source landmark
-         *  @param aTo Destination landmark
-         *  @return Distance, or NaN, if distance cannot be calculated
-         */
-        IMPORT_C TReal32 DistanceBetweenLandmarks( 
-            const CPosLandmark& aFrom, 
-            const CPosLandmark& aTo );
-
-        /** Finds POIs closest to given reference landmark. 
-         *  @param[in] aReference reference landmark
-         *  @param[out] aNeighbourPois List of closest POIs. 
-         *  @param[in] aMaxMatches Maximum number of results needed
-         */
-        IMPORT_C void FindClosestPoisL( 
-            const CPosLandmark& aReference,
-            RArray<CMnrpEngine::TDistanceToPoi>& aNeighbourPois,
-            TInt aMaxMatches );
-
-        /** Finds POIs closest to given location. 
-         *  @param[in] aReference reference location
-         *  @param[out] aNeighbourPois List of landmarks of closest POIs. 
-         *  @param[in] aMaxMatches Maximum number of results needed
-         */
-        IMPORT_C void BestCoordToAddressMatchesL( 
-            const TCoordinate& aLocation,
-            RPointerArray<CPosLandmark>& aMatches,
-            TInt aMaxMatches );
-
-    protected:
-
-        void ConstructL();
-        CMnrpEngine();
-
-		/** Loads POIs from database ( resource file ) */
-        void LoadKnownPlacesL();
-        /** Reads array of PLACES resource structures */
-        void ReadPlacesResourceL( RResourceReader& aReader );
-        
-        CPosLandmark* CreateCloseLandmarkLC( const CPosLandmark& aReference, TReal32 aDistance );
-
-    private:
-        RPointerArray<CPosLandmark> iPlaces;
-        RFs                         iFileSession;
-    };
-
-#endif // MNRP_ENGINE_H
-
--- a/locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/mapnavproviderrefapp/inc/mnrpgeocodingservice.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,102 +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:  CMnrpGeocodingService class definition
-*
-*/
-
-
-#ifndef MNRP_GEOCODINGSERVICE_H
-#define MNRP_GEOCODINGSERVICE_H
-
-#include "mngeocodingservicebase.h"
-
-class CPosLandmark;
-class CMnrpEngine;
-
-/** Implementation of geocoding service (KMnAppGeocodingService). 
- *	It uses CIdle to simulate asynchronous processing. All the geocoding
- *	job is done using the CMnrpEngine class.
- */
-class CMnrpGeocodingService : public CMnGeocodingServiceBase
-    {
-    public :
-        static CMnrpGeocodingService* NewL( CMnrpEngine& aEngine );
-        
-    protected :
-        CMnrpGeocodingService( CMnrpEngine& aEngine );
-        virtual ~CMnrpGeocodingService();
-
-        void ConstructL();
-
-		/** Prevents parallel asynchronous requests */
-        void LeaveIfBusyL();
-        /** Starts processing of new request by starting CIdle.*/
-        void StartProcessingL();
-        /** Callback for CIdle. Parameter is the pointer to this. */
-        static TInt GeocodingProcessingCallBack( TAny* aPtr );
-        /** Non-leaving part of geocoding. Calls FinishProcessingL and if
-         *	it leaves, completes client's request with error.*/
-        void HandleGeocodingCompleted();
-        /** Does the geocoding and completes user's request.*/
-        void FinishProcessingL();
-
-        /** Asks user to select one of best Coord to Addr matches */
-        CPosLandmark* LetUserSelectBestMatchL( const CPosLandmark& aReference );
-
-    protected: // from CMnGeocodingServiceBase
-    
-        /** Handles client's request for finding address by given coordinate. */
-        void HandleFindAddressByCoordinateL( const CPosLandmark& aLandmark );
-        
-        /** Handles client's request for finding coordinate by given address. */
-        void HandleFindCoordinateByAddressL( const CPosLandmark& aLandmark );
-
-        /** Handles client's request for finding coordinate by given address. */
-        void HandleFindCoordinateByAddressL( const TDesC& aAddress );
-        
-    protected: // from CMnServiceBase
-
-        /** Reports that client cancelled request */
-        void DoCancel();
-
-    private:
-        CMnrpEngine&            iEngine;
-    
-        enum TServiceType
-            {
-            ENone,
-            ECoordToAddr,
-            EAddrToCoord,
-            EPlainToCoord
-            };
-        
-        /** Type of last received request to make correct request to Engine */    
-        TServiceType            iCurrentService;
-    
-    	/** Keeps client's data */
-        CPosLandmark*           iLandmark;
-    	/** Keeps client's data */
-        HBufC*                  iPlainAddress;
-
-        /** Keeps client's option */
-        TBool                   iDialogAllowed;
-
-		/** Asynchronous geocoding processor */        
-        CIdle*                  iProcessor;
-        
-    };
-
-#endif // MNRP_GEOCODINGSERVICE_H
-
-
--- a/locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/mapnavproviderrefapp/inc/mnrpmapcontrol.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,117 +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:  CMnrpMapControl class definition
-*
-*/
-
-
-#ifndef MNRP_MAPCONTROL_H
-#define MNRP_MAPCONTROL_H
-
-#include <coecntrl.h>
-#include "mnrpmapmodel.h"
-
-class CMnrpEngine;
-class CMnrpMapView;
-
-/** Map view. Draws map on screen using information from 
- 	CMnrpMapModel.
- */
-class CMnrpMapControl : public CCoeControl, public MMapModelObserver
-    {
-    public: 
-
-        static CMnrpMapControl* NewL( CMnrpMapView& aView, const TRect& aRect, CMnrpEngine& aEngine );
-        virtual ~CMnrpMapControl();
-        
-        void UpdateModelL( CMnrpMapViewService& aService );
-        void SetSelectionModeL( TBool aSelectionMode );
-        
-        /** Returns current cursor location in selection mode */
-        TCoordinate CurrentLocation();
-
-        void ToggleFullScreen();
-
-    public:  // from CCoeControl
-
-        void Draw( const TRect& aRect ) const;
-        TKeyResponse OfferKeyEventL( const TKeyEvent& aKeyEvent, TEventCode aType );
-        void SizeChanged();
-        void HandleResourceChange( TInt aType );
-
-    public:  // from MMapModelObserver
-
-		/** Redraws itself when model is updated */
-        void HandleModelUpdateL();
-
-    private:
-
-        CMnrpMapControl( CMnrpMapView& aView );
-        void ConstructL( const TRect& aRect, CMnrpEngine& aEngine );
-        
-        void DrawCursor( CWindowGc& aGc ) const;
-
-		/** Draws text around map
-		 *	Top area - left longitude, cell size, right longitude
-		 *	Left area - top latitude, bottom latitude
-		 *	Bottom area - center coordinates
-		 */
-        void DrawGridText( 
-            CWindowGc& aGc, 
-            const TRect& aInnerBox,
-            const TRect& aOuterBox,
-            const CFont* aFont,
-            CMnrpMapModel::TGrid& aGrid ) const;
-
-        /** Helper to find out border size based on font dimensions */
-        TSize BorderSize() const;
-
-		/** Returns specifications of used font */
-        TFontSpec SmallFontSpec( TInt aFontHeightInTwips ) const;
-        
-        void MoveCursor( TInt aXmove, TInt aYmove );
-        TRect CursorMargin();
-
-        void Zoom( TReal aRate );
-
-        void SetFullScreen( TBool aFullScreen );
-
-		void CreateFonts();
-		void DestroyFonts();
-
-		void CreateScreenBufferL( const TSize& aSize );
-        void RenderL();
-
-    private:
-        /** Parent view */
-        CMnrpMapView& iView;
-        
-    	/** Model */
-        CMnrpMapModel* iModel;
-        TSize iViewSize;
-        
-        TBool iSelectionMode;
-        TPoint iCursor;
-        TCoordinate iAbsoluteCursor;
-
-        /** Whether fullscreen mode on or off*/
-        TBool iIsFullScreen;
-        
-        mutable CFbsBitmap* iOffScreenBitmap;
-        CFont* iTextFont;
-        CFont* iItemFont;
-    };
-
-#endif // MNRP_MAPVIEW_H
-
--- a/locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/mapnavproviderrefapp/inc/mnrpmapimageservice.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,92 +0,0 @@
-/*
-* Copyright (c) 2005-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:  CMnrpMapImageService class
-*
-*/
-
-
-#ifndef MN_TPMAPIMAGESERVICE_H
-#define MN_TPMAPIMAGESERVICE_H
-
-#include "mnmapimageservicebase.h"
-
-class CPosLandmark;
-class CEikonEnv;
-class CFont;
-class CMnrpMapModel;
-
-/** Implementation of geocoding service (KMnAppMapImageService). 
- */
-class CMnrpMapImageService : public CMnMapImageServiceBase
-    {
-    public :
-        static CMnrpMapImageService* NewL( CMnrpEngine& aEngine );
-        
-        void HandleTestCommandL( TInt aCommand );
-
-    protected :
-        /** C++ constructor */
-        CMnrpMapImageService( CMnrpEngine& aEngine );
-        /** Destructor */
-        virtual ~CMnrpMapImageService();
-
-        void ConstructL();
-
-        void LeaveIfBusyL();
-        void LeaveIfInstructedL();
-        void StartProcessingL();
-        static TInt MapImageProcessingCallBack( TAny* aPtr );
-        void HandleMapImageCompletedL();
-        void FinishProcessingL();
-
-        TInt GetTestCommand();
-
-        void RenderL();
-
-    private:
-        void DumpDataL();
-        
-        void CreateFonts();
-        void DestroyFonts();
-
-    protected: // from CMnMapImageServiceBase
-    
-        /** Handles client's request for finding address by given coordinate. */
-        void HandleRenderingL();
-        
-    protected: // from CMnServiceBase
-
-        /** Reports that client cancelled request */
-        void DoCancel();
-
-    private:
-    
-        enum TServiceType
-            {
-            ENone,
-            ERender,
-            };
-            
-        TServiceType            iCurrentService;
-        CMnrpEngine&            iEngine;
-        CMnrpMapModel*          iModel;
-        CPeriodic*              iProcessor;
-        CEikonEnv*              iEikon;
-        CFont*                  iItemFont;
-        CFont*                  iTextFont;
-    };
-
-#endif // MN_TPMAPIMAGESERVICE_H
-
-
--- a/locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/mapnavproviderrefapp/inc/mnrpmapmodel.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,301 +0,0 @@
-/*
-* Copyright (c) 2006-2007 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:  CMnrpMapModel class definition
-*
-*/
-
-
-#ifndef MNRP_MAPMODEL_H
-#define MNRP_MAPMODEL_H
-
-#include <coecntrl.h>
-#include "mnrppositionrequest.h"
-#include "epos_landmarks.h"
-
-class CFbsBitmap;
-class CImageDecoder;
-
-class CPosLandmark;
-class CPosLandmarkDatabase;
-class CPosLmCategoryManager;
-
-class CMnrpMapViewService;
-#ifdef RD_MAPNAV_BITMAP_ACCESS
-class CMnrpMapImageService;
-class TMnMapImageParams;
-#endif
-class CMnrpEngine;
-
-class MImageLoaderObserver;
-
-/** Point with real coordinates */
-class TRealPoint
-    {
-    public:
-        TRealPoint();
-        TRealPoint( TReal aX, TReal aY );
-        TRealPoint( TCoordinate aCoordinate );
-
-        TRealPoint operator+( const TRealPoint& aRight );
-        TRealPoint operator-( const TRealPoint& aRight );
-        TRealPoint operator*( const TReal& aRight );
-        TRealPoint operator/( const TReal& aRight );
-
-        void Set( TReal aX, TReal aY );
-        TCoordinate Coordinate();
-        TBool IsValid();
-
-        TReal iX; // matches longitude in this model
-        TReal iY; // matches latitude in this model
-    };
-
-/** Model observer class */
-class MMapModelObserver
-    {
-    public:
-        virtual void HandleModelUpdateL() =0;
-    };
-
-/** Data model for MapView.
- *  This implementation shows map as rectangle and does not support
- *  passing its borders. It displays POIs from Engine and client's
- *	landmarks, which define view area, if not specified by client.
- */
-class CMnrpMapModel : public CBase, public MMnrpPositionObserver
-    {
-    public:
-        IMPORT_C static CMnrpMapModel* NewL(
-            MMapModelObserver& aObserver,
-            CMnrpEngine& aEngine );
-
-        IMPORT_C static CMnrpMapModel* NewL(
-            CMnrpEngine& aEngine );
-
-        IMPORT_C ~CMnrpMapModel();
-
-		/** Service calls it when new ShowOnMap request comes
-		 *	from client */
-        IMPORT_C void UpdateModelL( CMnrpMapViewService& aService );
-
-#ifdef RD_MAPNAV_BITMAP_ACCESS
-		/** Service calls it when new RenderImage request comes
-		 *	from client */
-        IMPORT_C void UpdateModelL( const CMnrpMapImageService& aService );
-
-		/** Plugin calls it when new CoordinateConversion request comes
-		 *	from client */
-        IMPORT_C void UpdateModel( const TMnMapImageParams& aParams );
-#endif
-		/** Defines dimensions of view used for map display.
-		 *	this information is used to convert absolute coordinates
-		 *	to screen coordinates. Absolute coordinates are plain
-		 *	latitude and longitude degrees.
-		 */
-        IMPORT_C void SetScreenSize( TSize aScreenSize );
-
-        IMPORT_C void RenderL(
-            CFbsBitmap& aBitmap,
-            TRect aTargetRect,
-            CFont* aTextFont,
-            CFont* aItemFont ) const;
-        
-        IMPORT_C TInt NumIgnoredLandmarks();
-
-		/** Draw item.
-		 *	It is a POI or client's landmark, holds coordinates
-		 *	and associated text and icon.
-		 */
-        class CDrawItem : public CBase
-            {
-            public:
-            	/** Constructs from landmark instance */
-                static CDrawItem* NewLC( const CPosLandmark& );
-            	/** Constructs from linked landmark. If landmark
-            	 *	does not have icon, it tries to get icon of its
-            	 *	category, if only single category is assigned.
-            	 */
-                static CDrawItem* NewLC(
-                    const CPosLandmark& aLm,
-                    CPosLmCategoryManager& aCatman );
-
-                ~CDrawItem();
-
-                const TDesC& Text() { return *iText; };
-                TPoint& Position() { return iScreenPosition; };
-                TRealPoint AbsolutePosition() { return iAbsolutePosition; };
-                CFbsBitmap* Bitmap() { return iBitmap; };
-                CFbsBitmap* Mask() { return iMask; };
-                TBool IsPoi() { return iOwnPoi; };
-                
-                void SetAbsolutePosition( const TLocality& aLocality );
-
-            private:
-                HBufC*      iText;
-               	/** Absolute coordinates - lat,lon */
-                TRealPoint  iAbsolutePosition;
-                /** Coordinates on screen (pixels) */
-                TPoint      iScreenPosition;
-                CFbsBitmap* iBitmap;
-                CFbsBitmap* iMask;
-                /** Whether it is client's landmark or internal POI */
-                TBool       iOwnPoi;
-
-            friend class CMnrpMapModel;
-            };
-		/** Returns all items, that can be shown on screen. Screen
-		 *	coordinates are updated according to current scale and viewport */
-        TArray<CDrawItem*> Items() const;
-
-		/** Describes grid to show */
-        class TGrid
-            {
-            public:
-            	/** Reference grid point (screen) */
-                TPoint iReference;
-                /** Distance between grid lines (screen)*/
-                TInt iGridStep;
-
-            	/** Coordinate of reference grid point (absolute) */
-                TCoordinate iAbsoluteReference;
-                /** Distance between grid lines (absolute) */
-                TReal iAbsoluteGridStep;
-            };
-
-        /** Returns grid for current viewport and scale */
-        void GetGrid( TGrid& aGrid ) const;
-
-        /** Information about current location */
-        class TCurrentLocation
-            {
-            public:
-            	/** Screen coordinates */
-                TPoint  iLocation;
-            	/** Error radius in screen units - pixels */
-                TInt    iErrorRadius;
-
-                /** Absolute coordinates */
-                TCoordinate iAbsoluteLocation;
-            	/** Error radius in degrees */
-                TReal       iAbsoluteErrorDegrees;
-
-                TBool       iIsValid;
-            };
-
-        /** Returns current location */
-        IMPORT_C TCurrentLocation CurrentLocation() const;
-
-		// Zooming
-        IMPORT_C void Zoom( TReal aZoomRate );
-
-		// View movement
-        IMPORT_C void MoveTo( TCoordinate aTarget );
-
-        // Reset-kind of action, moves to world center
-        IMPORT_C void GoCenter();
-
-		/** Converts absolute units to screen */
-        IMPORT_C TPoint AbsoluteToScreen( TCoordinate aAbsolutePoint ) const;
-        IMPORT_C TInt AbsoluteToScreen( TReal aDistance ) const;
-
-		/** Converts screen coords to absolute */
-        IMPORT_C TCoordinate ScreenToAbsolute( TPoint aScreenPoint ) const;
-        IMPORT_C TReal ScreenToAbsolute( TInt aDistance ) const;
-
-		// Viewport in absolute units - degrees
-        IMPORT_C TReal Left() const;
-        IMPORT_C TReal Top() const;
-        IMPORT_C TReal Right() const;
-        IMPORT_C TReal Bottom() const;
-        IMPORT_C TReal Width() const;
-        IMPORT_C TReal Height() const;
-        IMPORT_C TCoordinate Center() const;
-
-    protected:
-		/** Converts absolute coords to screen */
-        TPoint AbsoluteToScreen( TRealPoint aAbsolutePoint ) const;
-
-    protected:  // from MMnrpPositionObserver
-
-		/** Forces map view update when new position comes */
-        void HandlePositionRequestCompletedL( TInt aError );
-
-    private:
-
-        void ConstructL();
-        CMnrpMapModel( MMapModelObserver& aObserver, CMnrpEngine& aEngine );
-        CMnrpMapModel( CMnrpEngine& aEngine );
-
-        void AddCitiesL();
-
-		/** Includes given draw item into bounding box */
-        void AdjustBoundingBox( CDrawItem& aItem, TRealPoint& aMin, TRealPoint& aMax );
-        
-        /** Verifies if draw item has position. If not, tries geocoding.
-         *  Updates the item if position is found from geocoding.
-         *  @return ETrue if position is found (possibly from geocoding), EFalse otherwise */
-        TBool CheckDrawItemHasPositionL( CDrawItem& aItem, const CPosLandmark& aLandmark );
-
-		/** Adjusts viewport if movement or zooming goes beyond the borders */
-        void CheckBorders();
-
-        TReal MaxScale() const;
-        TRect CursorMargin();
-
-		// Grid drawing
-        void DrawGrid(
-            CFbsBitGc& aGc,
-            const TSize& aBoxSize,
-            CMnrpMapModel::TGrid& aGrid ) const;
-
-        void DrawVerticalLine( CFbsBitGc& aGc, TInt aX, TSize aBoxSize ) const;
-        void DrawHorizontalLine( CFbsBitGc& aGc, TInt aY, TSize aBoxSize ) const;
-
-		/** Draws drawable items */
-        void DrawLandmarks(
-            CFbsBitGc& aGc,
-            CFont& aFont,
-            const TSize& aBoxSize,
-            TBool aSwitchColorAndShadow ) const;
-
-		/** Draws current location */
-        void DrawCurrentLocation(
-            CFbsBitGc& aGc,
-            const TSize& aBoxSize ) const;
-
-    private:
-        CMnrpPositionRequest*           iPositionRequest;
-        TPositionInfo                   iPosInfo;
-
-        TSize                           iScreenSize;
-        TRealPoint                      iViewOrigin;
-
-        TReal                           iScale; // 1 == 1 degree per pixel
-
-        MMapModelObserver*              iObserver;
-
-        mutable RPointerArray<CDrawItem> iDrawItems;
-
-        CMnrpEngine&            		iEngine;
-
-        TBool                           iUseCurrentLocationAsOrigin;
-        TBool                           iShowCurrentLocation;
-
-        CFont*                          iTextFont;
-        CFont*                          iItemFont;
-        
-        TInt 							iNumIgnoredLandmarks; 
-    };
-
-#endif // MNRP_MAPMODEL_H
-
--- a/locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/mapnavproviderrefapp/inc/mnrpmapview.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,95 +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:  CMnrpMapView class definition
-*
-*/
-
-
-#ifndef MNRP_MAPVIEW_H
-#define MNRP_MAPVIEW_H
-
-#include <aknview.h>
-
-class CMnrpEngine;
-class CMnrpMapModel;
-class CMnrpMapControl;
-
-class CMnrpMapViewService;
-class MMapSelectionCallback;
-
-/** Map view. Draws map on screen using information from 
- 	CMnrpMapModel.
- */
-class CMnrpMapView : public CAknView
-    {
-    public: 
-
-        static CMnrpMapView* NewL( TBool aChained, CMnrpEngine& aEngine );
-        virtual ~CMnrpMapView();
-        
-        /** Shows map view in browser mode 
-         *  @param aService Object to get map view options from
-         */
-        void SetMapModeL( CMnrpMapViewService& aService );
-
-        /** Shows map view in selection mode 
-         *  @param aService Object to get map view options from
-         *  @param aCallback Object to inform about selection
-         */
-        void SetSelectionModeL( 
-            CMnrpMapViewService& aService,  
-            MMapSelectionCallback& aCallback );
-
-        void HandleUserSelectionL( TInt aError );
-
-        void StopSelection();
-		
-    public: // from CAknView
-
-        TUid Id() const;
-
-        void HandleCommandL( TInt aCommand );
-
-        void DoActivateL(
-            const TVwsViewId& aPrevViewId,
-            TUid aCustomMessageId,
-            const TDesC8& aCustomMessage);
-
-        void DoDeactivate();
-        
-        void DynInitMenuPaneL( TInt aResourceId, CEikMenuPane *aMenuPane );
-
-    private:
-
-        CMnrpMapView( CMnrpEngine& aEngine );
-        void ConstructL( TBool aChained );
-        
-    private:
-        /** Application engine */
-        CMnrpEngine& iEngine;
-    	
-    	/** UI control */
-        CMnrpMapControl* iControl;    
-
-        /** Map view data */
-        CMnrpMapViewService* iMapViewService;
-
-        /** Selection callback listener */        
-        MMapSelectionCallback* iSelectionCallback;
-        
-        TBool iChained;
-    };
-
-#endif // MNRP_MAPVIEW_H
-
--- a/locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/mapnavproviderrefapp/inc/mnrpmapviewservice.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,80 +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:  CMnrpMapViewService class definition
-*
-*/
-
-
-#ifndef MNRP_MAPVIEWSERVICE_H
-#define MNRP_MAPVIEWSERVICE_H
-
-#include <mnmapviewservicebase.h>
-
-#include "mnrpappui.h"
-
-class CPosLandmark;
-
-/** Implementation of MapView service (KMnAppMapViewService). 
- */
-class CMnrpMapViewService : public CMnMapViewServiceBase, public MMapSelectionCallback
-    {
-    public :
-        static CMnrpMapViewService* NewL();
-        
-    protected :
-        CMnrpMapViewService();
-        virtual ~CMnrpMapViewService();
-        void ConstructL();
-
-        CMnrpAppUi* AppUi();
-
-    protected: // from CMnMapViewServiceBase
-    
-        /** Handles client's request for showing map */
-        void HandleShowMapL();
-
-        /** Handles client's request for showing map from current location */
-        void HandleShowCurrentLocationL();
-
-        /** Handles client's request for selecting a location from map */
-        void HandleSelectFromMapL();
-
-    protected: // from CMnServiceBase
-
-        /** Reports that client cancelled request */
-        void DoCancel();
-
-        void CompleteSelectionL( const TCoordinate& aSelection );
-
-    protected: // from MMapSelectionCallback
-            
-        void HandleSelectionL( const TCoordinate& aSelection );
-
-        void HandleSelectionL( TInt aLandmarkIndex );
-        void HandleSelectionL( TPosLmItemId aLandmarkId, TInt aDbIndex );
-
-        void HandleSelectionErrorL( TInt aError );
-
-    private:
-        void StopSelection();
-
-    private:
-
-        /** Flag shows that selection is ongoing */
-        TBool                   iSelecting;
-    };
-
-#endif // MNRP_MAPVIEWSERVICE_H
-
-
--- a/locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/mapnavproviderrefapp/inc/mnrpnavicontrol.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,69 +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:  CMnrpNaviControl class definition
-*
-*/
-
-
-#ifndef MNRP_NAVICONTROL_H
-#define MNRP_NAVICONTROL_H
-
-#include <coecntrl.h>
-#include "mnrpnavimodel.h"
-
-class CAknSingleHeadingStyleListBox;
-class CMnrpNaviView;
-
-/** Navigation view.
- *	Shows list box with navigation information items: 
- *	destination name and coordinates, current position coordinates
- *	distance and bearing to destination.
- */	
-class CMnrpNaviControl : public CCoeControl, public MNaviModelObserver
-    {
-    public:
-
-        static CMnrpNaviControl* NewL( CMnrpNaviView& aView, const TRect& aRect, CMnrpEngine& aEngine );
-        virtual ~CMnrpNaviControl();
-
-        void UpdateModelL( CPosLandmark& aDestination );
-        
-    protected:    
-    	/** Creates list box */
-        void CreateListBoxL();
-
-    public: // from MNaviModelObserver
-        void HandleModelUpdateL();
-
-    protected:  // from CCoeControl
-        TInt CountComponentControls() const;
-        CCoeControl* ComponentControl( TInt aIndex ) const;
-        TKeyResponse OfferKeyEventL( const TKeyEvent& aKeyEvent, TEventCode aType );
-        void SizeChanged();
-        void HandleResourceChange( TInt aType );
-
-    private:
-
-        void ConstructL( const TRect& aRect, CMnrpEngine& aEngine );
-        CMnrpNaviControl( CMnrpNaviView& aView );
-    
-    private:
-        CMnrpNaviView&                  iView;
-    
-        CAknSingleHeadingStyleListBox*  iListBox;
-        CMnrpNaviModel*         		iModel;
-    };
-
-#endif // MNRP_NAVICONTROL_H
-
--- a/locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/mapnavproviderrefapp/inc/mnrpnavigationservice.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,51 +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:  CMnrpNavigationService class definition
-*
-*/
-
-
-#ifndef MNRP_NAVIGATIONSERVICE_H
-#define MNRP_NAVIGATIONSERVICE_H
-
-#include "mnnavigationservicebase.h"
-
-class CPosLandmark;
-
-/** Implementation of Navigation service (KMnAppNavigationService). 
- */
-class CMnrpNavigationService : public CMnNavigationServiceBase
-    {
-    public :
-        static CMnrpNavigationService* NewL();
-        
-    protected :
-        CMnrpNavigationService();
-        virtual ~CMnrpNavigationService();
-        void ConstructL();
-
-    public: // from CMnNavigationServiceBase
-    
-        /** Handles client's request for navigation. */
-        void HandleNavigateToL( const CPosLandmark& aDestination );
-    
-    protected: // from CMnServiceBase
-
-        /** Empty implementation, as the only request is sychcronous */
-        void DoCancel();
-    };
-
-#endif // MNRP_NAVIGATIONSERVICE_H
-
-
--- a/locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/mapnavproviderrefapp/inc/mnrpnavimodel.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,96 +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:  CMnrpNaviModel class definition
-*
-*/
-
-
-#ifndef MNRP_NAVIMODEL_H
-#define MNRP_NAVIMODEL_H
-
-#include <coecntrl.h>
-#include "mnrppositionrequest.h"
-
-class CMnrpEngine;
-class CPosLandmark;
-
-/** Model observer class */
-class MNaviModelObserver
-    {
-    public:
-        virtual void HandleModelUpdateL() =0;
-    };
-
-/** Navigation view model. 
- *	Prepares data to be shown on navigation view
- */
-class CMnrpNaviModel : public CBase, public MMnrpPositionObserver
-    {
-    public:
-        static CMnrpNaviModel* NewL( MNaviModelObserver& aObserver, CMnrpEngine& aEngine );
-
-		/** Called by service class to inform that client has changed 
-		 *	navigation target */
-        void SetDestinationL( const CPosLandmark& aNewDestination );
-
-		/** List item information */
-        class CListItem : public CBase
-            {
-            public:
-                static CListItem* NewL( 
-                	const TDesC& aItemHeader, 
-                	const TDesC& aItemValue );
-            
-                ~CListItem();
-                
-                const TDesC& Header() { return *iHeader; };
-                const TDesC& Value() { return *iValue; };
-                
-            private:
-            	/** List item header */
-                HBufC* iHeader;
-            	/** List item text */
-                HBufC* iValue;                
-            };
-
-		/** Returns list items to be shown on Navigation view */
-        TArray<CListItem*> ListItemsL();
-
-        ~CMnrpNaviModel();
-        
-    public:  // from MMnrpPositionObserver
-
-		/** Informs navigation view that data has been changed */
-        void HandlePositionRequestCompletedL( TInt aError );
-        
-    private: 
-
-        void ConstructL();
-        CMnrpNaviModel( MNaviModelObserver& aObserver, CMnrpEngine& aEngine );
-    
-    private:
-        CMnrpEngine&                    iEngine;
-    
-        CMnrpPositionRequest*   		iPositionRequest;
-        TPositionInfo                   iPosInfo;
-
-        CPosLandmark*                   iDestination;
-        
-        MNaviModelObserver&             iObserver;
-        
-        RPointerArray<CListItem>        iListItems;
-    };
-
-#endif // MNRP_NAVIMODEL_H
-
--- a/locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/mapnavproviderrefapp/inc/mnrpnaviview.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,74 +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:  CMnrpNaviView class definition
-*
-*/
-
-
-#ifndef MNRP_NAVIVIEW_H
-#define MNRP_NAVIVIEW_H
-
-#include <aknview.h>
-
-class CMnrpEngine;
-class CMnrpNaviModel;
-class CMnrpNaviControl;
-class CPosLandmark;
-
-/** Map view. Draws map on screen using information from 
- 	CMnrpMapModel.
- */
-class CMnrpNaviView : public CAknView
-    {
-    public: 
-
-        static CMnrpNaviView* NewL( TBool aChained, CMnrpEngine& aEngine );
-        virtual ~CMnrpNaviView();
-        
-        /** Shows map view in browser mode 
-         *  @param aService Object to get map view options from
-         */
-        void SetDestinationL( const CPosLandmark& aDestination );
-        
-    public: // from CAknView
-
-        TUid Id() const;
-
-        void HandleCommandL( TInt aCommand );
-
-        void DoActivateL(
-            const TVwsViewId& aPrevViewId,
-            TUid aCustomMessageId,
-            const TDesC8& aCustomMessage);
-
-        void DoDeactivate();
-
-    private:
-
-        CMnrpNaviView( CMnrpEngine& aEngine );
-        void ConstructL( TBool aChained );
-        
-    private:
-        /** Application engine */
-        CMnrpEngine& iEngine;
-    	
-    	/** UI control */
-        CMnrpNaviControl* iControl;    
-        
-        /** Destination */
-        CPosLandmark* iDestination;
-    };
-
-#endif // MNRP_NAVIVIEW_H
-
--- a/locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/mapnavproviderrefapp/inc/mnrppositionrequest.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,141 +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:  CMnrpPositionRequest class definition
-*
-*/
-
-
-#ifndef MNRP_POSITION_REQUEST_H_
-#define MNRP_POSITION_REQUEST_H_
-
-#include <e32base.h>
-#include <lbs.h>
-
-class TPositionUpdateOptions;
-
-/** Position observer */
-class MMnrpPositionObserver
-    {
-    public:
-        virtual void HandlePositionRequestCompletedL( TInt aError ) =0;
-    };
-
-/** Provides an interface for retrieving the current location.
- */
-class CMnrpPositionRequest: public CActive
-    {
-    public: 
-
-        /** Creates new instance of request
-        * @param aAppName the name of this application
-        * @param aObserver observer to callback when locations are retrieved
-        */
-        IMPORT_C static CMnrpPositionRequest* NewL(
-            const TDesC& aRequestorName,
-            MMnrpPositionObserver& aObserver);
-
-        IMPORT_C ~CMnrpPositionRequest();
-
-    public: 
-
-        /**
-         * Starts the fetching of a location. In the first place the default 
-         * proxy is used for retrieving a location. If fetching default location
-         * fails the last known location is fetched. If fetching last known 
-         * location fails, an error code is returned to the observer.
-         *
-         * @param aLastKnownLocationAllowed whether last know location is allowed
-         */
-        IMPORT_C void FetchNewPosition( TBool aLastKnownLocationAllowed = EFalse );
-
- 		/** Returns current location */
-        IMPORT_C void GetPosition( TPositionInfo& aPosition );
-
- 		/** Returns current speed info */
-        IMPORT_C TReal32 Speed();
-
- 		/** Returns current heading info */
-        IMPORT_C TReal32 Heading();
-
- 		/** Returns current magnetic heading info */
-        IMPORT_C TReal32 MagneticHeading();
-
- 		/** Returns current course info */
-        IMPORT_C TReal32 Course();
-
- 		/** Returns current magnetic course info */
-        IMPORT_C TReal32 MagneticCourse();
-
-		/** Modifies options for the next request */
-        IMPORT_C void SetOptionsL( const TPositionUpdateOptionsBase& aOptions );
-
-    protected: // from CActive
-
-        void DoCancel();
-        void RunL();
-        TInt RunError(TInt aError);
-
-    private:
-
-        CMnrpPositionRequest( MMnrpPositionObserver& aObserver );
-        void ConstructL( const TDesC& aAppName );
-
-        /** Issues new request for location retrieval. */
-        void ExecuteNextStep();
-
-        void InitContainer( HPositionGenericInfo& aGenericInfo );
-        void SaveContainer( const HPositionGenericInfo& aGenericInfo );
-
-    private:
-
-        /**
-        * TState defines the different states this object may enter.
-        */
-        enum TState 
-            {
-            EIdle,
-            EAcquiringDefaultLocation,
-            EAcquiringLastKnownLocation
-            };
-
-    private: 
-
-        //! Contains the location
-        HPositionGenericInfo* iGenericPosition;
-        
-        //! Local storage for last location info
-        TPositionInfo iPositionInfo;
-        TReal32 iSpeed;
-        TReal32 iHeading;
-        TReal32 iMagneticHeading;
-        TReal32 iCourse;
-        TReal32 iMagneticCourse;
-
-        //! The observer to callback when location retieval is ready
-        MMnrpPositionObserver& iObserver;
-
-        //! Reference to the Location Server session
-        RPositionServer iLocationServer;
-
-        //! Reference to the Location Server subsession
-        RPositioner iPositioner;
-        
-        TBool iLastKnownLocationAllowed;
-
-        //! The current state this object has entered
-        TState iState;
-    };
-
-#endif // MNRP_POSITION_REQUEST_H_
-
--- a/locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/mapnavproviderrefapp/inc/mnrputils.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,67 +0,0 @@
-/*
-* Copyright (c) 2006-2007 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:  MnrpUtils class definition
-*
-*/
-
-
-#ifndef MNRP_UTILS_H
-#define MNRP_UTILS_H
-
-const TInt KMaxCoordStrSize = 15;
-
-class MnrpUtils
-    {
-    public:
-    
-        /** Converts given coordinate into a string 
-         *  \param aCoord coordinate
-         *  \param aStr target string of KMaxCoordStrSize length (at least)
-         *  \param aFull if EFalse, will omit higher parts if they are 0,
-         *               if ETrue, outputs degrees, minutes, seconds and milliseconds
-         *  \param aMillis whether milliseconds should be included or not
-         */
-        IMPORT_C static void CoordinateToString( 
-            TReal aCoord, 
-            TDes& aStr, 
-            TBool aFull = EFalse,
-            TBool aMillis = EFalse );
-            
-        /** Converts given distance value to a string with units
-         *  \param aDistance distance in meters 
-         *  \param aStr target string
-         */
-        IMPORT_C static void DistanceToString( TReal aDistance, TDes& aStr );
-
-        /** Converts given angle value to a string
-         *  \param aAngle angle in degrees (angle form North Pole) 
-         *  \param aStr target string
-         */
-        IMPORT_C static void AngleToString( TReal aAngle, TDes& aStr );
-
-        /** Converts given speed value to a string with units
-         *  \param aSpeed speed in meters per second
-         *  \param aStr target string
-         */
-        IMPORT_C static void SpeedToString( TReal aSpeed, TDes& aStr );
-
-        /** Replaces unprintable characters in a string with spaces
-         *  \param aStr string to work with
-         *  \return pointer to new string buffer with ownership
-         */
-        IMPORT_C static HBufC* PrintableStringLC( const TDesC& aStr );
-    };
-
-#endif // MNRP_UTILS_H
-
--- a/locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/mapnavproviderrefapp/sis/mnrefprovider_armv5.pkg	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,85 +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: Installation file for MN ref provider
-;
-
-ÿþ;   I n s t a l l a t i o n   f i l e   f o r   M & N   R e f e r e n c e   P r o v i d e r   A p p 
- 
- 
- 
- ;   L a n g u a g e s 
- 
- & E N , R U 
- 
- 
- 
- ;   s t a n d a r d   S I S   f i l e   h e a d e r 
- 
- # { " M n R e f P r o v i d e r E N " , " M n R e f P r o v i d e r R U " } , ( 0 x 0 3 1 3 2 0 1 3 ) , 1 , 2 , 4 
- 
- 
- 
- ;   L o c a l i s e d   V e n d o r   n a m e 
- 
- % { " V e n d o r - E N " , " V e n d o r - R U " } 
- 
- 
- 
- ;   U n i q u e   V e n d o r   n a m e 
- 
- : " V e n d o r " 
- 
- 
- 
- ;   S u p p o r t s   S 6 0   v   3 . 0 
- 
- [ 0 x 1 0 1 F 7 9 6 1 ] ,   0 ,   0 ,   0 ,   { " S 6 0 P r o d u c t I D " , " S 6 0 P r o d u c t I D " } 
- 
- 
- 
- ;   F i l e s   t o   i n s t a l l 
- 
- " \ e p o c 3 2 \ r e l e a s e \ a r m v 5 \ u r e l \ m n r e f p r o v i d e r . e x e " - " ! : \ s y s \ b i n \ m n r e f p r o v i d e r . e x e " 
- 
- " \ e p o c 3 2 \ d a t a \ z \ r e s o u r c e \ a p p s \ m n r e f p r o v i d e r . r s c " - " ! : \ r e s o u r c e \ a p p s \ m n r e f p r o v i d e r . r s c " 
- 
- " \ e p o c 3 2 \ d a t a \ z \ r e s o u r c e \ a p p s \ m n r e f p r o v i d e r . m b m " - " ! : \ r e s o u r c e \ a p p s \ m n r e f p r o v i d e r . m b m " 
- 
- " \ e p o c 3 2 \ d a t a \ z \ r e s o u r c e \ a p p s \ m n r e f p r o v i d e r . m i f " - " ! : \ r e s o u r c e \ a p p s \ m n r e f p r o v i d e r . m i f " 
- 
- " \ e p o c 3 2 \ d a t a \ z \ p r i v a t e \ 1 0 0 0 3 a 3 f \ a p p s \ m n r e f p r o v i d e r _ r e g . r s c " - " ! : \ p r i v a t e \ 1 0 0 0 3 a 3 f \ i m p o r t \ a p p s \ m n r e f p r o v i d e r _ r e g . r s c " 
- 
- 
- 
- " \ e p o c 3 2 \ r e l e a s e \ a r m v 5 \ u r e l \ m n r e f p r o v i d e r b a c k . e x e " - " ! : \ s y s \ b i n \ m n r e f p r o v i d e r b a c k . e x e " 
- 
- " \ e p o c 3 2 \ d a t a \ z \ r e s o u r c e \ a p p s \ m n r e f p r o v i d e r b a c k . r s c " - " ! : \ r e s o u r c e \ a p p s \ m n r e f p r o v i d e r b a c k . r s c " 
- 
- " \ e p o c 3 2 \ d a t a \ z \ p r i v a t e \ 1 0 0 0 3 a 3 f \ a p p s \ m n r e f p r o v i d e r b a c k _ r e g . r s c " - " ! : \ p r i v a t e \ 1 0 0 0 3 a 3 f \ i m p o r t \ a p p s \ m n r e f p r o v i d e r b a c k _ r e g . r s c " 
- 
- 
- 
- " \ e p o c 3 2 \ r e l e a s e \ a r m v 5 \ u r e l \ m n r e f p r o v i d e r e n g i n e . d l l " - " ! : \ s y s \ b i n \ m n r e f p r o v i d e r e n g i n e . d l l " 
- 
- " \ e p o c 3 2 \ d a t a \ z \ r e s o u r c e \ m n r e f p r o v i d e r e n g i n e . r s c " - " ! : \ r e s o u r c e \ m n r e f p r o v i d e r e n g i n e . r s c " 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
\ No newline at end of file
Binary file locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/mapnavproviderrefapp/sis/mnrefprovider_armv5.sis has changed
--- a/locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/mapnavproviderrefapp/sis/mnrefprovider_bitmap_armv5.pkg	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,89 +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: Installation file for MN ref provider ( includes map image service)
-;
-
-ÿþ;   I n s t a l l a t i o n   f i l e   f o r   M & N   R e f e r e n c e   P r o v i d e r   A p p 
- 
- 
- 
- ;   L a n g u a g e s 
- 
- & E N , R U 
- 
- 
- 
- ;   s t a n d a r d   S I S   f i l e   h e a d e r 
- 
- # { " M n R e f P r o v i d e r E N " , " M n R e f P r o v i d e r R U " } , ( 0 x 0 3 1 3 2 0 1 3 ) , 1 , 2 , 4 
- 
- 
- 
- ;   L o c a l i s e d   V e n d o r   n a m e 
- 
- % { " V e n d o r - E N " , " V e n d o r - R U " } 
- 
- 
- 
- ;   U n i q u e   V e n d o r   n a m e 
- 
- : " V e n d o r " 
- 
- 
- 
- ;   S u p p o r t s   S 6 0   v   3 . 0 
- 
- [ 0 x 1 0 1 F 7 9 6 1 ] ,   0 ,   0 ,   0 ,   { " S 6 0 P r o d u c t I D " , " S 6 0 P r o d u c t I D " } 
- 
- 
- 
- ;   F i l e s   t o   i n s t a l l 
- 
- " \ e p o c 3 2 \ r e l e a s e \ a r m v 5 \ u r e l \ m n r e f p r o v i d e r . e x e " - " ! : \ s y s \ b i n \ m n r e f p r o v i d e r . e x e " 
- 
- " \ e p o c 3 2 \ d a t a \ z \ r e s o u r c e \ a p p s \ m n r e f p r o v i d e r . r s c " - " ! : \ r e s o u r c e \ a p p s \ m n r e f p r o v i d e r . r s c " 
- 
- " \ e p o c 3 2 \ d a t a \ z \ r e s o u r c e \ a p p s \ m n r e f p r o v i d e r . m b m " - " ! : \ r e s o u r c e \ a p p s \ m n r e f p r o v i d e r . m b m " 
- 
- " \ e p o c 3 2 \ d a t a \ z \ r e s o u r c e \ a p p s \ m n r e f p r o v i d e r . m i f " - " ! : \ r e s o u r c e \ a p p s \ m n r e f p r o v i d e r . m i f " 
- 
- " \ e p o c 3 2 \ d a t a \ z \ p r i v a t e \ 1 0 0 0 3 a 3 f \ a p p s \ m n r e f p r o v i d e r _ r e g . r s c " - " ! : \ p r i v a t e \ 1 0 0 0 3 a 3 f \ i m p o r t \ a p p s \ m n r e f p r o v i d e r _ r e g . r s c " 
- 
- 
- 
- " \ e p o c 3 2 \ r e l e a s e \ a r m v 5 \ u r e l \ m n r e f p r o v i d e r b a c k . e x e " - " ! : \ s y s \ b i n \ m n r e f p r o v i d e r b a c k . e x e " 
- 
- " \ e p o c 3 2 \ d a t a \ z \ r e s o u r c e \ a p p s \ m n r e f p r o v i d e r b a c k . r s c " - " ! : \ r e s o u r c e \ a p p s \ m n r e f p r o v i d e r b a c k . r s c " 
- 
- " \ e p o c 3 2 \ d a t a \ z \ p r i v a t e \ 1 0 0 0 3 a 3 f \ a p p s \ m n r e f p r o v i d e r b a c k _ r e g . r s c " - " ! : \ p r i v a t e \ 1 0 0 0 3 a 3 f \ i m p o r t \ a p p s \ m n r e f p r o v i d e r b a c k _ r e g . r s c " 
- 
- 
- 
- " \ e p o c 3 2 \ r e l e a s e \ a r m v 5 \ u r e l \ m n r e f p r o v i d e r e n g i n e . d l l " - " ! : \ s y s \ b i n \ m n r e f p r o v i d e r e n g i n e . d l l " 
- 
- " \ e p o c 3 2 \ d a t a \ z \ r e s o u r c e \ m n r e f p r o v i d e r e n g i n e . r s c " - " ! : \ r e s o u r c e \ m n r e f p r o v i d e r e n g i n e . r s c " 
- 
- 
- 
- " \ e p o c 3 2 \ r e l e a s e \ a r m v 5 \ u r e l \ m n r e f p r o v i d e r p l u g i n . d l l " - " ! : \ s y s \ b i n \ m n r e f p r o v i d e r p l u g i n . d l l " 
- 
- " \ e p o c 3 2 \ d a t a \ z \ r e s o u r c e \ p l u g i n s \ m n r e f p r o v i d e r p l u g i n . r s c " - " ! : \ r e s o u r c e \ p l u g i n s \ m n r e f p r o v i d e r p l u g i n . r s c " 
- 
- 
- 
- 
- 
- 
- 
- 
\ No newline at end of file
Binary file locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/mapnavproviderrefapp/sis/mnrefprovider_bitmap_armv5.sis has changed
Binary file locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/mapnavproviderrefapp/sis/mnrefprovider_bitmap_armv5.sisx has changed
--- a/locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/mapnavproviderrefapp/sis/rd-key.pem	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-MIICXAIBAAKBgQDLRF+r1FGGkCwTrb420kbnAps7gi1yYUcXYUdWeFTuBeQe5eW4
-6Y+LWaA8HMlDdoHRB0FgASisYcFagwno9+oFf4AJka4H1gWEs5XTGwAA1s0d8XGh
-7W7Dt9F5FZij8F7/9Pi6+FhhxZFIf1DD+yry9D7+Sp+BgdNALe4XOpf25QIBAwKB
-gQCHgupyjYuvCsgNHn7PNtnvVxInrB5MQNoPli+O+uNJWUK/Q+57Rl+yO8AoEzDX
-pFaLWiuVVhsdloDnAgabT/FXzYncs6uOHyEUV+dSXb78vtLPJqAX+Fg2i3hOXreB
-yskcZ13/OsKVOu5wgrJkx2baZufkqMwOSytf5y9nwjEIKwJBAP+inobagVNrN62j
-KQva3cC+UN/6XnKdTc0CA6bHyLOaJoH1xiMwG/VS2PGjHI0tiSMNtLn/QPpHJ003
-iabGhdUCQQDLjp/9UjFT6K6CF66Chqf30pZXhx+GTSQZmv/gvZiMly7X9fX9BGX3
-2MbJohBC4yI21XKTbisWywkF73Hwh+TRAkEAqmxprzxWN5zPyRdwspHpKymLP/w+
-9xOJM1atGdqFzRFvAU6EF3Vn+OHl9my9s3OwwgkjJqorUYTE3iUGby8D4wJBAIe0
-aqjhdjfwdFa6dFcEb/qMZDpaFQQzbWZnVUB+ZbMPdI/5TqitmU/l2dvBYCyXbCSO
-TGJJcg8yBgP09qBamIsCQFL7j1tM0XPVQJQ89WpKCld7O9ORxRGVj1eG0tWijrH8
-mGbYh8SGCVoWV3vrKSS8GBrFVgQnqUaHuEdtM7tpCAQ=
------END RSA PRIVATE KEY-----
--- a/locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/mapnavproviderrefapp/sis/rd.cer	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
------BEGIN CERTIFICATE-----
-MIICzDCCAjWgAwIBAgIBADANBgkqhkiG9w0BAQUFADArMRAwDgYDVQQKEwdSRCBD
-ZXJ0MRcwFQYDVQQDEw5SRCBDZXJ0aWZpY2F0ZTAeFw0wNDExMTUxMjQyMDZaFw0z
-NzA5MjMxMjQyMDZaMCsxEDAOBgNVBAoTB1JEIENlcnQxFzAVBgNVBAMTDlJEIENl
-cnRpZmljYXRlMIGdMA0GCSqGSIb3DQEBAQUAA4GLADCBhwKBgQDLRF+r1FGGkCwT
-rb420kbnAps7gi1yYUcXYUdWeFTuBeQe5eW46Y+LWaA8HMlDdoHRB0FgASisYcFa
-gwno9+oFf4AJka4H1gWEs5XTGwAA1s0d8XGh7W7Dt9F5FZij8F7/9Pi6+FhhxZFI
-f1DD+yry9D7+Sp+BgdNALe4XOpf25QIBA6OCAQAwgf0wDAYDVR0TBAUwAwEB/zAL
-BgNVHQ8EBAMCAoQwHQYDVR0OBBYEFFi/kuGzxhVpjGxe9ZwlxC3fH9jFMFMGA1Ud
-IwRMMEqAFFi/kuGzxhVpjGxe9ZwlxC3fH9jFoS+kLTArMRAwDgYDVQQKEwdSRCBD
-ZXJ0MRcwFQYDVQQDEw5SRCBDZXJ0aWZpY2F0ZYIBADBsBgNVHSAEZTBjMGEGBFUd
-IAAwWTATBggrBgEFBQcCARYHaHR0cDovLzBCBggrBgEFBQcCAjA2GjRGb3IgUiZE
-IHVzYWdlIG9ubHkuIFRoaXMgY2VydGlmaWNhdGUgaXMgbm90IHRydXN0ZWQuMA0G
-CSqGSIb3DQEBBQUAA4GBAHGB4RQMAgBdeT2hxfOr6f2nA/dZm+M5yX5daUtZnET9
-Ed0A9sazLawfN2G1KFQT9kxEParAyoAkpbMAsRrnRz/9cM3OHgFm/NiKRnf50DpT
-7oCx0I/65mVD2kt+xXE62/Ii5KPnTufIkPi2uLvURCia1tTS8JmJ8dtxDGyQt8BR
------END CERTIFICATE-----
--- a/locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/mapnavproviderrefapp/src/mnrefprovider.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,31 +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:  CApaApplication class implementation
-*
-*/
-
-
-#include <eikstart.h>
-#include "mnrpapplication.h"
-
-LOCAL_C CApaApplication* NewApplication()
-{
-    return new CMnrpApplication;
-}
-
-TInt E32Main()
-{
-    return EikStart::RunApplication( NewApplication );
-}
-
--- a/locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/mapnavproviderrefapp/src/mnrefproviderback.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,31 +0,0 @@
-/*
-* Copyright (c) 2006-2007 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:  Main application methods
-*
-*/
-
-
-#include <eikstart.h>
-#include "mnrpapplicationback.h"
-
-LOCAL_C CApaApplication* NewApplication()
-{
-    return new CMnrpApplicationBack;
-}
-
-TInt E32Main()
-{
-    return EikStart::RunApplication( NewApplication );
-}
-
--- a/locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/mapnavproviderrefapp/src/mnrefproviderplugin.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +0,0 @@
-/*
-* Copyright (c) 2007 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:  Main application methods
-*
-*/
-
-
-#include <e32base.h>
-#include <ecom/ecom.h>
-#include <ecom/implementationproxy.h>
-
-#include "debug.h"
-#include "mnrpcoordconverter.h"
-
-// ========================== GLOBAL FUNCTIONS ===============================
-
-// ---------------------------------------------------------------------------
-// Table of implementations
-// ---------------------------------------------------------------------------
-//
-const TImplementationProxy ImplementationTable[] =
-    {
-    // Note! UID below is implementation UID, not DLL UID.
-    IMPLEMENTATION_PROXY_ENTRY( 0x03133038, CMnrpCoordConverter::NewL ),
-    };
-
-// ---------------------------------------------------------------------------
-// Note this function must be exported at ordinal 1
-// ---------------------------------------------------------------------------
-//
-EXPORT_C const TImplementationProxy* ImplementationGroupProxy(
-    TInt& aTableCount)
-    {
-    aTableCount = 1;
-    return ImplementationTable;
-    }
--- a/locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/mapnavproviderrefapp/src/mnrpappcontrol.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,109 +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:  CMnrpAppControlclass implementation
-*
-*/
-
-
-#include <coemain.h>
-#include <akndef.h>
-#include "mnrpappview.h"
-#include "mnrpappcontrol.h"
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CMnrpAppControl::CMnrpAppControl( CMnrpAppView& aView )
-: iView( aView )
-    {
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CMnrpAppControl::~CMnrpAppControl()
-    {
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CMnrpAppControl* CMnrpAppControl::NewL( CMnrpAppView& aView, const TRect& aRect)
-    {
-    CMnrpAppControl* self = new (ELeave) CMnrpAppControl( aView );
-    CleanupStack::PushL( self );
-    self->ConstructL( aRect );
-    CleanupStack::Pop( self );
-    return self;
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-TInt CMnrpAppControl::CountComponentControls() const 
-    { 
-    return 0; 
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CCoeControl* CMnrpAppControl::ComponentControl( TInt /*aIndex*/ ) const
-    {
-    return NULL;
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpAppControl::ConstructL( const TRect& aRect )
-    {
-    // Create a window for this application view
-    CreateWindowL();
-
-    // Set the windows size
-    SetRect( aRect );
-
-    // Activate the window, which makes it ready to be drawn
-    ActivateL();
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpAppControl::Draw( const TRect& /*aRect*/ ) const
-    {
-    // Get the standard graphics context
-    CWindowGc& gc = SystemGc();
-
-    // Gets the control's extent
-    TRect rect = Rect();
-
-    // Clears the screen
-    gc.Clear( rect );
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpAppControl::HandleResourceChange( TInt aType )
-    {
-    CCoeControl::HandleResourceChange( aType );
-    if ( aType == KEikDynamicLayoutVariantSwitch )
-        {
-        SetRect( iView.ClientRect() );
-        }
-    }
--- a/locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/mapnavproviderrefapp/src/mnrpapplication.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,56 +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:  CMnrpApplication class implementation
-*
-*/
-
-
-#include "debug.h"
-
-#include "mnrpdocument.h"
-#include "mnrpappserver.h"
-#include "mnrpapplication.h"
-
-// UID for the application, this should match the uid defined in the mmp file.
-static const TUid KUidMnRefProviderApp = {0x03132013};
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CApaDocument* CMnrpApplication::CreateDocumentL()
-    {  
-    LOG( "MnRefProvider: CreateDocumentL" );
-    CApaDocument* document = CMnrpDocument::NewL( *this );
-    return document;
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-TUid CMnrpApplication::AppDllUid() const
-    {
-    // Return the UID for the MnRefProvider application
-    return KUidMnRefProviderApp;
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpApplication::NewAppServerL( CApaAppServer*& aAppServer )
-    {
-    LOG( "MnRefProvider: NewAppServerL" );
-    aAppServer = new (ELeave) CMnrpAppServer;
-    }
--- a/locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/mapnavproviderrefapp/src/mnrpapplicationback.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,56 +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:  CMnrpApplicationGeoGeo class implementation
-*
-*/
-
-
-#include "debug.h"
-
-#include "mnrpdocumentback.h"
-#include "mnrpappserverback.h"
-#include "mnrpapplicationback.h"
-
-// UID for the application, this should match the uid defined in the mmp file.
-static const TUid KUidMnRefProviderBackApp = {0x03132014};
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CApaDocument* CMnrpApplicationBack::CreateDocumentL()
-    {  
-    LOG( "MnRefProviderBack: CreateDocumentL" );
-    CApaDocument* document = CMnrpDocumentBack::NewL( *this );
-    return document;
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-TUid CMnrpApplicationBack::AppDllUid() const
-    {
-    // Return the UID for the MnRefProvider application
-    return KUidMnRefProviderBackApp;
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpApplicationBack::NewAppServerL( CApaAppServer*& aAppServer )
-    {
-    LOG( "MnRefProviderBack: NewAppServerL" );
-    aAppServer = CMnrpAppServerBack::NewL();
-    }
--- a/locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/mapnavproviderrefapp/src/mnrpappserver.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,125 +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:  CMnrpAppServer class implementation
-*
-*/
-
-
-#include <mnappserviceuids.hrh>
-#include "debug.h"
-
-#include <lbsposition.h>
-#include <epos_cposlandmark.h>
-
-#include "mnrpnavigationservice.h"
-#include "mnrpmapviewservice.h"
-
-#include <MnRefProvider.rsg>
-#include "mnrpappui.h"
-#include "mnrpengine.h"
-#include "mnrpappserver.h"
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CMnrpAppServer::~CMnrpAppServer()
-    {
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-EXPORT_C CApaAppServiceBase* CMnrpAppServer::CreateServiceL(TUid aServiceType) const
-    {  
-    LOG1("MnRefProvider::CreateServiceL, svcUid = %X", aServiceType.iUid);
-    switch ( aServiceType.iUid )
-        {
-        case KMnAppMapViewService:
-            return CreateMapViewServiceL();
-
-        case KMnAppNavigationService:
-            return CreateNavigationServiceL();
-            
-        default:
-            return CAknAppServer::CreateServiceL( aServiceType );
-        }
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-EXPORT_C void CMnrpAppServer::HandleAllClientsClosed()
-    {
-    LOG( "MnRefProvider: HandleAllClientsClosed" );
-    CMnrpAppUi* appUi = AppUi();
-    if ( appUi )
-    	{
-    	if ( appUi->IsChainedMode() ) 
-    		{
-    		// close
-    		CAknAppServer::HandleAllClientsClosed();
-    		}
-    	else // standalone mode
-    		{
-    		if ( !appUi->IsAnyUserViewActive() )
-    			{
-	    		// close
-	    		CAknAppServer::HandleAllClientsClosed();
-    			}
-    		else
-    			{	
-    			// "remain active until user closes me"
-    			}
-    		}	
-    	}
-	else
-        {
-        CAknAppServer::HandleAllClientsClosed();
-        }
-    }
-    
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CMnrpNavigationService* CMnrpAppServer::CreateNavigationServiceL() const
-    {
-    LOG( "MnRefProvider: CreateNavigationServiceL" );
-    CMnrpNavigationService* svc = CMnrpNavigationService::NewL();
-    return svc;
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CMnrpMapViewService* CMnrpAppServer::CreateMapViewServiceL() const
-    {
-    LOG( "MnRefProvider: CreateMapViewServiceL" );
-    CMnrpMapViewService* svc = CMnrpMapViewService::NewL();
-    return svc;
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CMnrpAppUi* CMnrpAppServer::AppUi()
-    {
-    CMnrpAppUi* ui = (CMnrpAppUi*) CEikonEnv::Static()->AppUi();
-    if ( !ui )
-        {
-        LOG("MnRefProvider: UI not found!");
-        }
-    return ui;
-    }
--- a/locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/mapnavproviderrefapp/src/mnrpappserverback.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,107 +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:  CMnrpAppServerBack class implementation
-*
-*/
-
-
-#include <mnappserviceuids.hrh>
-#include "debug.h"
-
-#include <lbsposition.h>
-#include <epos_cposlandmark.h>
-
-#include "mnrpgeocodingservice.h"
-
-#ifdef RD_MAPNAV_BITMAP_ACCESS
-#include "mnrpmapimageservice.h"
-#endif
-
-#include "mnrpappuiback.h"
-#include "mnrpengine.h"
-#include "mnrpappserverback.h"
-
-// ============================ LOCAL FUNCTIONS ===============================
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CMnrpAppServerBack::~CMnrpAppServerBack()
-    {
-    delete iEngine;
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CMnrpAppServerBack* CMnrpAppServerBack::NewL()
-    {
-    CMnrpAppServerBack* self = new (ELeave) CMnrpAppServerBack();
-    CleanupStack::PushL( self );
-    self->ConstructL();
-    CleanupStack::Pop( self );
-    return self;
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpAppServerBack::ConstructL()
-    {
-    iEngine = CMnrpEngine::NewL();
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-EXPORT_C CApaAppServiceBase* CMnrpAppServerBack::CreateServiceL(TUid aServiceType) const
-    {
-    LOG1("MnRefProviderBack::CreateServiceL, svcUid = %X", aServiceType.iUid);
-    switch ( aServiceType.iUid )
-        {
-        case KMnAppGeocodingService:
-            return CreateGeocodingServiceL();
-
-#ifdef RD_MAPNAV_BITMAP_ACCESS
-        case KMnAppMapImageService:
-            return CreateMapImageServiceL();
-#endif
-        default:
-            return CAknAppServer::CreateServiceL( aServiceType );
-        }
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CMnrpGeocodingService* CMnrpAppServerBack::CreateGeocodingServiceL() const
-    {
-    LOG( "MnRefProviderBack: CreateGeocodingServiceL" );
-    CMnrpGeocodingService* svc = CMnrpGeocodingService::NewL( *iEngine );
-    return svc;
-    }
-
-#ifdef RD_MAPNAV_BITMAP_ACCESS
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CMnrpMapImageService* CMnrpAppServerBack::CreateMapImageServiceL() const
-    {
-    LOG( "MnRefProviderBack: CreateGeocodingServiceL" );
-    CMnrpMapImageService* svc = CMnrpMapImageService::NewL( *iEngine );
-    return svc;
-    }
-#endif
--- a/locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/mapnavproviderrefapp/src/mnrpappui.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,492 +0,0 @@
-/*
-* Copyright (c) 2006-2007 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:  CMnrpAppUi class implementation
-*
-*/
-
-
-#include <aknnavi.h>
-#include <aknnavide.h>
-#include <eikbtgpc.h>
-
-#include <akniconutils.h>
-#include <aknselectionlist.h>
-#include <gulicon.h>
-
-#include <MnRefProvider.rsg>
-#include <MnRefProvider.mbg>
-#include "mnrp.hrh"
-
-#include <epos_cposlandmark.h>
-#include <epos_cposlandmarkdatabase.h>
-
-#include "mnrpappview.h"
-#include "mnrpnaviview.h"
-#include "mnrpmapview.h"
-
-#include "mnrpmapviewservice.h"
-#include "mnrpnavigationservice.h"
-
-#include "mnrpdocument.h"
-#include "mnrpengine.h"
-#include "mnrpappui.h"
-#include "mnrputils.h"
-#include "debug.h"
-
-const TInt KDefaultLmIconIndex = 0;
-_LIT( KMbmFile, "\\resource\\apps\\MnRefProvider.mbm");
-
-// ============================ LOCAL FUNCTIONS ===============================
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-void CleanupIconArray( TAny* aArray )
-    {
-    LOG("MnRefProvider::CleanupIconArray in");
-    ( ( CArrayPtrSeg<CGulIcon>* ) aArray)->ResetAndDestroy();
-    delete aArray;
-    LOG("MnRefProvider::CleanupIconArray out");
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-void AddIconL(
-    CArrayPtr<CGulIcon>& aIconArray,
-    const TDesC& aFileName,
-    TInt aIconIndex,
-    TInt aMaskIndex )
-    {
-    LOG("MnRefProvider::AddIconL in");
-    CFbsBitmap* icon = NULL;
-    CFbsBitmap* mask = NULL;
-
-    AknIconUtils::CreateIconLC( icon, mask, aFileName, aIconIndex, aMaskIndex );
-    CGulIcon* gul = CGulIcon::NewL( icon, mask );
-
-    gul->SetBitmapsOwnedExternally( EFalse );
-    CleanupStack::PushL( gul );
-    aIconArray.AppendL( gul );
-    CleanupStack::Pop( 3 ); // gul, icon & mask
-    LOG("MnRefProvider::AddIconL out");
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-CArrayPtrSeg<CGulIcon>* CreateIconListLC( TInt aGranularity )
-    {
-    CArrayPtrSeg<CGulIcon>* iconList =
-        new (ELeave) CArrayPtrSeg<CGulIcon>( aGranularity );
-    CleanupStack::PushL( TCleanupItem( CleanupIconArray, iconList ) );
-
-    AddIconL(
-        *iconList,
-        KMbmFile,
-        EMbmMnrefproviderDefault_lm,
-        EMbmMnrefproviderDefault_lm_mask);
-
-    return iconList;
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-void AddLandmarkL(
-    const CPosLandmark& aLandmark,
-    CDesCArray& aTextArray,
-    CArrayPtr<CGulIcon>& aIconArray )
-    {
-    TPtrC name;
-    aLandmark.GetLandmarkName( name );
-
-    HBufC* printableName = MnrpUtils::PrintableStringLC( name );
-    
-    TPtrC iconFile;
-    TInt iconIndex, maskIndex, iconArrayIndex;
-
-    if ( aLandmark.GetIcon( iconFile, iconIndex, maskIndex ) == KErrNone )
-        {
-        AddIconL( aIconArray, iconFile, iconIndex, maskIndex );
-        iconArrayIndex = aIconArray.Count() - 1;
-        }
-    else
-        {
-        iconArrayIndex = KDefaultLmIconIndex;
-        }
-
-    _LIT(KListItemFormat, "%d\t%S\t\t");
-    const TInt KListItemMinSize = 20;
-
-    HBufC* item = HBufC::NewLC( printableName->Size() + KListItemMinSize );
-    item->Des().Format( KListItemFormat, iconArrayIndex, printableName );
-
-    aTextArray.AppendL( *item );
-
-    CleanupStack::PopAndDestroy( item );
-    CleanupStack::PopAndDestroy( printableName );
-    }
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CMnrpAppUi::CMnrpAppUi( CMnrpEngine& aEngine )
-  : iEngine( aEngine )
-    {
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpAppUi::ConstructL()
-    {
-    BaseConstructL( EAknEnableSkin );
-    
-    // This is empty view, it will be shown by UI framework,
-    // when application starts
-    iAppView = CMnrpAppView::NewL();
-    AddViewL( iAppView );
-
-    if ( !iEikonEnv->StartedAsServerApp() )
-        {
-        // switch to map view if started normally
-        iMapView = CMnrpMapView::NewL( EFalse, iEngine );
-        AddViewL( iMapView );
-        ActivateLocalViewL( iMapView->Id() );
-        }
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CMnrpAppUi::~CMnrpAppUi()
-    {
-    delete iNaviPaneLabel;
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpAppUi::HandleCommandL( TInt aCommand )
-    {
-    switch(aCommand)
-        {
-        case EAknSoftkeyBack:
-        	{
-    	    CEikAppServer* server = iEikonEnv->AppServer();
-		    if ( server )
-		    	{
-		        server->NotifyServerExit( EEikCmdExit );
-		    	}
-		    Exit();	
-        	break;
-        	}
-        	
-        case EEikCmdExit:
-        case EAknSoftkeyExit:
-            {
-    	    CEikAppServer* server = iEikonEnv->AppServer();
-		    if ( server )
-		    	{
-		        server->NotifyServerExit( EAknCmdExit ); // this will close client also
-		    	}
-		    Exit();	
-        	break;
-            }
-        default:
-            break;
-        }
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-TBool CMnrpAppUi::IsChainedMode()
-    {
-    return ( iParentWg != 0 );
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-TBool CMnrpAppUi::IsAnyUserViewActive()
-    {
-    TVwsViewId viewId;
-    if ( ( GetActiveViewId( viewId ) == KErrNotFound ) ||
-         ( viewId.iViewUid.iUid != EMnrpMapViewId && 
-           viewId.iViewUid.iUid != EMnrpNavigationViewId ) )
-        {
-        return EFalse;
-        }
-    else
-        {
-        return ETrue;
-        }
-    }
-
-// ----------------------------------------------------------------------------
-// ----------------------------------------------------------------------------
-//
-void CMnrpAppUi::SetNaviPaneTitleL( const TDesC& aPaneTitle )
-    {
-    if ( !iNaviPane )
-        {
-        iNaviPane = static_cast<CAknNavigationControlContainer*>(
-                StatusPane()->ControlL( TUid::Uid( EEikStatusPaneUidNavi ) ) );
-        }
-
-    if ( iNaviPaneLabel )
-        {
-        CAknNavigationDecorator* naviLabel = iNaviPane->CreateNavigationLabelL( aPaneTitle );
-        CleanupStack::PushL( naviLabel );
-
-        iNaviPane->ReplaceL( *iNaviPaneLabel, *naviLabel );
-
-        delete iNaviPaneLabel;
-        iNaviPaneLabel = naviLabel;
-
-        CleanupStack::Pop( naviLabel );
-        }
-    else
-        {
-        iNaviPaneLabel = iNaviPane->CreateNavigationLabelL( aPaneTitle );
-        iNaviPane->PushL( *iNaviPaneLabel );
-        }
-    }    
-
-// ----------------------------------------------------------------------------
-// ----------------------------------------------------------------------------
-//
-void CMnrpAppUi::SetRightSoftkeyCommandL( TInt aCommand, const TDesC& aButtonTitle )
-    {
-    if ( Cba() )
-        {
-        Cba()->SetCommandL( 1, aCommand, aButtonTitle );
-        }
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-TBool CMnrpAppUi::ProcessCommandParametersL( CApaCommandLine &aCommandLine )
-    {
-    iParentWg = aCommandLine.ParentWindowGroupID();
-    LOG1("parent window group id %d", iParentWg );
-    
-    return CAknAppUi::ProcessCommandParametersL( aCommandLine );
-    }
-
-// ----------------------------------------------------------------------------
-// ----------------------------------------------------------------------------
-//
-void CMnrpAppUi::HandleResourceChangeL( TInt aType )
-    {
-    CAknAppUi::HandleResourceChangeL( aType );
-    
-    TRect rect( ClientRect() );
-    if ( Cba() )
-        {
-		Cba()->SetBoundingRect( TRect() );
-		Cba()->ReduceRect( rect );
-        }
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpAppUi::ShowMapL( CMnrpMapViewService& aService )
-    {
-    if ( !iMapView )
-        {
-        iMapView = CMnrpMapView::NewL( IsChainedMode(), iEngine );
-        AddViewL( iMapView );
-        }
-        
-    iMapView->SetMapModeL( aService );
-    ActivateLocalViewL( iMapView->Id() );
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpAppUi::ShowNavigationL( const CPosLandmark& aDestination )
-    {
-    if ( !iNaviView )
-        {
-        iNaviView = CMnrpNaviView::NewL( IsChainedMode(), iEngine );
-        AddViewL( iNaviView );
-        }
-        
-    iNaviView->SetDestinationL( aDestination );
-    ActivateLocalViewL( iNaviView->Id() );
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpAppUi::StartSelectionL( 
-    CMnrpMapViewService& aService,  
-    MMapSelectionCallback& aCallback )
-    {
-	SetNaviPaneTitleL( aService.SelectionRequestText() );
-
-    if ( aService.Options() & CMnMapView::EOptionRestrictSelection )
-        {
-        // select from dialog 
-        SelectFromDialogL( aService, aCallback );
-        }
-    else
-        {
-        // select from map
-        if ( !iMapView )
-            {
-            iMapView = CMnrpMapView::NewL( IsChainedMode(), iEngine );
-            AddViewL( iMapView );
-            }
-
-        iMapView->SetSelectionModeL( aService, aCallback );
-        ActivateLocalViewL( iMapView->Id() );
-        }
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpAppUi::StopSelection()
-    {
-    __ASSERT_DEBUG( iMapView, Panic( KErrGeneral ) );
-    iMapView->StopSelection();
-
-    // Selection is done - close selection view
-    TRAP_IGNORE( ActivateLocalViewL( iAppView->Id() ) );
-    }
-    
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpAppUi::SelectFromDialogL(
-    CMnrpMapViewService& aService,
-    MMapSelectionCallback& aCallback )
-    {
-    LOG("MnRefProvider::SelectFromDialogL in");
-
-    const TInt KGranularity = 8;
-
-    CDesCArraySeg *textArray = new (ELeave) CDesCArraySeg( KGranularity );
-    CleanupStack::PushL( textArray );
-    CArrayPtrSeg<CGulIcon>* iconArray = CreateIconListLC( KGranularity );
-
-    TInt linkedLmsOffset = 0;
-
-    CMnrpDocument* doc = ( CMnrpDocument* ) Document();
-    CMnrpEngine& engine = doc->Engine();
-
-    // add non-linked landmarks
-    LOG("MnRefProvider::DoSelectionDialogL adding non-linked landmarks");
-    for ( TInt i = 0; i < aService.LandmarksToShow().Count(); i++)
-        {
-        const CPosLandmark* lm = aService.LandmarksToShow()[i];
-        AddLandmarkL( *lm, *textArray, *iconArray );
-        }
-
-    // add linked landmarks
-    LOG("MnRefProvider::DoSelectionDialogL adding linked landmarks");
-
-    // create dictionary of linked landmarks
-    // in order to ease searching for return values
-    // when completing request
-    RArray<TInt> dbIndices;
-    RArray<TPosLmItemId> lmIds;
-
-    CleanupClosePushL( dbIndices );
-    CleanupClosePushL( lmIds );
-
-    linkedLmsOffset = textArray->Count();
-    for ( TInt db = 0; db < aService.LandmarksToShowDatabases().Count(); db++ )
-        {
-        const HBufC* uri = aService.LandmarksToShowDatabases()[db];
-
-        CPosLandmarkDatabase* lmdb = CPosLandmarkDatabase::OpenL( *uri );
-        CleanupStack::PushL( lmdb );
-
-        if ( lmdb->IsInitializingNeeded() )
-            {
-            ExecuteAndDeleteLD( lmdb->InitializeL() );
-            }
-
-        for ( TInt i = 0; i < aService.LinkedLandmarksToShow(db).Count(); i++)
-            {
-            TPosLmItemId id = aService.LinkedLandmarksToShow(db)[i];
-
-            CPosLandmark* lm = lmdb->ReadLandmarkLC( id );
-            AddLandmarkL( *lm, *textArray, *iconArray );
-            
-            dbIndices.AppendL( db );
-            lmIds.AppendL( id );
-
-            CleanupStack::PopAndDestroy( lm );
-            }
-
-        CleanupStack::PopAndDestroy( lmdb );
-        }
-
-    TInt selected = 0;
-    CAknSelectionListDialog *dialog =
-        CAknSelectionListDialog::NewL( selected, textArray, R_MNREFPROVIDER_MENUBAR );
-
-    dialog->PrepareLC( R_MNREFPROVIDER_SELECTION_DIALOG );
-
-    dialog->SetIconArrayL( iconArray );
-    CleanupStack::Pop(); // iconArray cleanup
-
-    LOG1("MnRefProvider::SelectFromDialogL launching dialog with %d items", textArray->Count() );
-    TInt result = dialog->RunLD();
-    if ( result )
-        {
-        LOG("MnRefProvider::SelectFromDialogL approved");
-        if ( selected < linkedLmsOffset )
-            {
-            aCallback.HandleSelectionL( selected );
-            }
-        else
-            {
-            TInt linkedLmIndex = selected - linkedLmsOffset;
-            if ( linkedLmIndex < dbIndices.Count() && 
-                 linkedLmIndex < lmIds.Count() )
-                {
-                aCallback.HandleSelectionL( lmIds[linkedLmIndex], dbIndices[linkedLmIndex] );
-                }
-            else
-                {
-                // never happens
-                LOG("MnRefProvider::SelectFromDialogL selection out of range, out");
-                aCallback.HandleSelectionErrorL( KErrGeneral );
-                }
-            }
-        }
-    else
-        {
-        LOG("MnRefProvider::SelectFromDialogL cancelled, out");
-        aCallback.HandleSelectionErrorL( KErrCancel );
-        }
-
-    CleanupStack::PopAndDestroy( &lmIds );
-    CleanupStack::PopAndDestroy( &dbIndices );
-
-    CleanupStack::PopAndDestroy( textArray );
-    LOG("MnRefProvider::SelectFromDialogL out");
-}    
--- a/locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/mapnavproviderrefapp/src/mnrpappuiback.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,69 +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:  CMnrpAppUiBack classimplementation
-*
-*/
-
-
-#include <aknnavi.h>
-#include <aknnavide.h>
-
-#include "mnrpengine.h"
-#include "mnrpappuiback.h"
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpAppUiBack::ConstructL()
-    {
-    BaseConstructL( EAknEnableSkin );
-    // no view is created as this application is intended to be run
-    // only as hidden server
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpAppUiBack::HandleCommandL(TInt aCommand)
-    {
-    switch(aCommand)
-        {
-        case EEikCmdExit:
-        case EAknSoftkeyExit:
-            Exit();
-            break;
-        default:
-            break;
-        }
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-void CMnrpAppUiBack::MoveForeground()
-    {
-    RWindowGroup& window = iEikonEnv->RootWin();
-    window.SetOrdinalPosition( 0 );
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-void CMnrpAppUiBack::MoveBackground()
-    {
-    RWindowGroup& window = iEikonEnv->RootWin();
-    window.SetOrdinalPosition( -1 );
-    }
--- a/locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/mapnavproviderrefapp/src/mnrpappview.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,107 +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:  CMnrpAppView class implementation
-*
-*/
-
-
-#include "mnrp.hrh"
-#include "mnrpappui.h"
-#include "mnrpappcontrol.h"
-#include "mnrpappview.h"
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CMnrpAppView::CMnrpAppView()
-    {
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CMnrpAppView::~CMnrpAppView()
-    {
-    delete iControl;
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CMnrpAppView* CMnrpAppView::NewL()
-    {
-    CMnrpAppView* self = new ( ELeave ) CMnrpAppView();
-    CleanupStack::PushL( self );
-    self->ConstructL();
-    CleanupStack::Pop( self );
-    return self;
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpAppView::ConstructL()
-    {
-    BaseConstructL();
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-TUid CMnrpAppView::Id() const
-    {
-    return TUid::Uid( EMnrpAppViewId );
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpAppView::DoActivateL(
-    const TVwsViewId& /*aPrevViewId*/,
-    TUid /* aCustomMessageId */,
-    const TDesC8& /* aCustomMessage */)
-    {
-    if ( !iControl )
-        {
-        iControl = CMnrpAppControl::NewL( *this, ClientRect() );
-        iControl->SetMopParent( this );
-        }
-
-    // Enable receiving of keyboard events.
-    CMnrpAppUi* ui = ( CMnrpAppUi* ) AppUi();
-    ui->AddToStackL( *this, iControl );
-
-    _LIT( KEmpty, "" );
-    ui->SetNaviPaneTitleL( KEmpty );
-
-    // Make view visible.
-    iControl->MakeVisible( ETrue );
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpAppView::DoDeactivate()
-    {
-    if ( iControl )
-        {
-        // Hide view.
-        iControl->MakeVisible( EFalse );
-
-        // Disable receiving keyboard events.
-        AppUi()->RemoveFromStack( iControl );
-        }
-    }
--- a/locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/mapnavproviderrefapp/src/mnrpcoordconverter.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,97 +0,0 @@
-/*
-* Copyright (c) 2007 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:  CMnrpCoordConverter implementation
-*
-*/
-
-
-#include <e32base.h>
-
-#include "debug.h"
-#include "mnrpengine.h"
-#include "mnrpmapmodel.h"
-#include "mnrpcoordconverter.h"
-
-// ========================== MEMBER FUNCTIONS ===============================
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-CMnrpCoordConverter* CMnrpCoordConverter::NewL()
-    {
-    CMnrpCoordConverter* self = new (ELeave) CMnrpCoordConverter;
-    CleanupStack::PushL( self );
-
-    self->iEngine = CMnrpEngine::NewL();
-    self->iModel = CMnrpMapModel::NewL( *self->iEngine );
-
-    CleanupStack::Pop( self );
-    return self;
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-CMnrpCoordConverter::CMnrpCoordConverter()
-    {
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-CMnrpCoordConverter::~CMnrpCoordConverter()
-    {
-    delete iModel;
-    delete iEngine;
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-TInt CMnrpCoordConverter::GetImageCoordinate(
-    const TCoordinate& aWorldCoordinate,
-    TPoint& aImagePoint )
-    {
-    const TMnMapImageParams& params = MapImageParams();
-
-    if ( params.ImageType() == TMnMapImageParams::ETypeSatelliteImage )
-        {
-        return KErrArgument;
-        }
-
-    iModel->UpdateModel( params );
-
-    aImagePoint = iModel->AbsoluteToScreen( aWorldCoordinate );
-    return KErrNone;
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-TInt CMnrpCoordConverter::GetWorldCoordinate(
-    const TPoint& aImagePoint,
-    TCoordinate& aWorldCoordinate )
-    {
-    const TMnMapImageParams& params = MapImageParams();
-
-    if ( params.ImageType() == TMnMapImageParams::ETypeSatelliteImage )
-        {
-        return KErrArgument;
-        }
-
-    iModel->UpdateModel( params );
-
-    aWorldCoordinate = iModel->ScreenToAbsolute( aImagePoint  );
-    return KErrNone;
-    }
--- a/locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/mapnavproviderrefapp/src/mnrpdocument.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,80 +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:  CMnrpDocument class implementation
-*
-*/
-
-
-#include "mnrpappui.h"
-#include "mnrpengine.h"
-#include "mnrpdocument.h"
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CMnrpDocument::CMnrpDocument(CEikApplication& aApp) 
-    : CAknDocument(aApp) 
-    {
-    }   
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpDocument::ConstructL()
-    {
-    iEngine = CMnrpEngine::NewL();
-    }    
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CMnrpDocument* CMnrpDocument::NewL( CEikApplication& aApp )
-    {
-    CMnrpDocument* self = new (ELeave) CMnrpDocument(aApp);
-    CleanupStack::PushL(self);
-    self->ConstructL();
-    CleanupStack::Pop(self);
-    return self;
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CMnrpDocument::~CMnrpDocument()
-    {
-    delete iEngine;
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CMnrpEngine& CMnrpDocument::Engine()
-    { 
-    return *iEngine; 
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CEikAppUi* CMnrpDocument::CreateAppUiL()
-    {
-    // Create the application user interface, and return a pointer to it,
-    // the framework takes ownership of this object
-    CEikAppUi* appUi = new (ELeave) CMnrpAppUi( *iEngine );
-    return appUi;
-    }
-
-
--- a/locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/mapnavproviderrefapp/src/mnrpdocumentback.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,53 +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:  CMnrpDocumentBack class implementation
-*
-*/
-
-
-#include "mnrpappuiback.h"
-#include "mnrpengine.h"
-#include "mnrpdocumentback.h"
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CMnrpDocumentBack::CMnrpDocumentBack(CEikApplication& aApp) 
-    : CAknDocument(aApp) 
-    {
-    }   
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CMnrpDocumentBack* CMnrpDocumentBack::NewL( CEikApplication& aApp )
-    {
-    CMnrpDocumentBack* self = new (ELeave) CMnrpDocumentBack( aApp );
-    return self;
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CEikAppUi* CMnrpDocumentBack::CreateAppUiL()
-    {
-    // Create the application user interface, and return a pointer to it,
-    // the framework takes ownership of this object
-    CEikAppUi* appUi = new (ELeave) CMnrpAppUiBack();
-    return appUi;
-    }
-
-
--- a/locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/mapnavproviderrefapp/src/mnrpengine.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,433 +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:  CMnrpEngine class implementation
-*
-*/
-
-
-#include <coemain.h>
-#include <aknlists.h>
-#include <barsread2.h>
-#include <barsc2.h> 
-
-#include <lbsposition.h>
-#include <lbspositioninfo.h>
-
-#include <epos_cposlandmark.h>
-#include <epos_cposlandmarkdatabase.h>
-
-#include <mnrefproviderengine.rsg>
-
-#include "../inc/debug.h"
-#include "mnrpengine.h"
-
-_LIT( KCitiesResourceFile, "\\resource\\mnrefproviderengine.rsc");
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CMnrpEngine::CMnrpEngine()
-    { 
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-EXPORT_C CMnrpEngine::~CMnrpEngine()
-    {
-    iPlaces.ResetAndDestroy();
-    iFileSession.Close();
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-EXPORT_C CMnrpEngine* CMnrpEngine::NewL()
-    {
-    CMnrpEngine* self = new (ELeave) CMnrpEngine();
-    CleanupStack::PushL( self );
-    self->ConstructL();
-    CleanupStack::Pop( self );
-    return self;
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpEngine::ConstructL()
-    {
-    User::LeaveIfError( iFileSession.Connect() );
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-EXPORT_C TArray<CPosLandmark*> CMnrpEngine::KnownPlacesL()
-    {
-    if ( iPlaces.Count() == 0 )
-        {
-        TRAP_IGNORE( LoadKnownPlacesL() );
-        }
-
-    return iPlaces.Array();        
-    }
-    
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-EXPORT_C CPosLandmark* CMnrpEngine::AddressToCoordLC( const CPosLandmark& aAddress )
-    {
-    CPosLandmark* lm = AddressToCoordL( aAddress );
-    if ( lm )
-        {
-        CleanupStack::PushL( lm );
-        return lm;
-        }
-    else
-        {
-        User::Leave( KErrNotFound );
-        return NULL;
-        }
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-EXPORT_C CPosLandmark* CMnrpEngine::AddressToCoordL( const CPosLandmark& aAddress )
-    {
-    TPtrC city, country;
-    aAddress.GetPositionField( EPositionFieldCity, city );
-    
-    TArray<CPosLandmark*> pois = KnownPlacesL();
-    
-    if ( city.Length() )
-        {
-        for ( TInt i = 0; i < pois.Count(); i++ )
-            {
-            TPtrC poiCity;
-            pois[i]->GetPositionField( EPositionFieldCity, poiCity );
-            if ( poiCity.CompareF( city ) == 0 )
-                {
-                return CPosLandmark::NewL( *pois[i] );
-                }
-            }
-        }
-    
-    return NULL;
-    }
-    
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-EXPORT_C CPosLandmark* CMnrpEngine::AddressToCoordLC( const TDesC& aAddress )
-    {
-    CPosLandmark* lm = AddressToCoordL( aAddress );
-    if ( lm )
-        {
-        CleanupStack::PushL( lm );
-        return lm;
-        }
-    else
-        {
-        User::Leave( KErrNotFound );
-        return NULL;
-        }
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-EXPORT_C CPosLandmark* CMnrpEngine::AddressToCoordL( const TDesC& aAddress )
-    {
-    TArray<CPosLandmark*> pois = KnownPlacesL();
-
-    if ( aAddress.Length() )
-        {
-        for ( TInt i = 0; i < pois.Count(); i++ )
-            {
-            TPtrC city, country;
-            pois[i]->GetPositionField( EPositionFieldCity, city );
-            pois[i]->GetPositionField( EPositionFieldCountry, country );
-            
-            if ( aAddress.FindF( city ) >= 0 )
-                {
-                return CPosLandmark::NewL( *pois[i] );
-                }
-            }
-        }
-        
-    return NULL;
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-EXPORT_C TReal32 CMnrpEngine::DistanceBetweenLandmarks( 
-    const CPosLandmark& aFrom,
-    const CPosLandmark& aTo )
-    {
-    TRealX nan;
-    nan.SetNaN();
-    TReal32 distance = nan;
-    
-    TLocality locFrom, locTo;
-
-    if ( aFrom.GetPosition( locFrom ) == KErrNone &&
-         aTo.GetPosition( locTo ) == KErrNone )
-        {
-        TReal32 dist;
-        if ( locFrom.Distance( locTo, dist ) == KErrNone )
-            {
-            distance = dist;
-            }
-        }
-    return distance;
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-EXPORT_C void CMnrpEngine::FindClosestPoisL( 
-    const CPosLandmark& aReference,
-    RArray<CMnrpEngine::TDistanceToPoi>& aNeighbourPois,
-    TInt aMaxMatches )
-    {
-    aNeighbourPois.Reset();
-    TArray<CPosLandmark*> pois = KnownPlacesL();
-
-    // calc distances to known places and find out closest ones
-    for ( TInt i = 0; i < pois.Count(); i++ )
-        {
-        CPosLandmark* poi = pois[i];
-
-        TReal32 distance = DistanceBetweenLandmarks( aReference, *poi );
-        
-        if ( Math::IsNaN( distance ) )
-            {
-            continue;
-            }
-        
-        TDistanceToPoi newDistToPoi;
-        newDistToPoi.iPoiIndex = i;
-        newDistToPoi.iDistance = distance;
-
-        for ( TInt k = 0; k < aNeighbourPois.Count(); k++ )
-            {
-            TDistanceToPoi distToPoi = aNeighbourPois[k];
-            if ( distance < distToPoi.iDistance )
-                {
-                // current POI is closer to reference than current neighbour
-                aNeighbourPois.InsertL( newDistToPoi, k );
-                break;
-                }
-            }
-
-        if ( aNeighbourPois.Count() < aMaxMatches )
-            {
-            aNeighbourPois.AppendL( newDistToPoi );
-            }
-
-        if ( aNeighbourPois.Count() > aMaxMatches )
-            {
-            aNeighbourPois.Remove( aNeighbourPois.Count() - 1 ); // remove last
-            }
-        }
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CPosLandmark* CMnrpEngine::CreateCloseLandmarkLC( 
-    const CPosLandmark& aReference,
-    TReal32 aDistance )
-    {
-    CPosLandmark* lm = CPosLandmark::NewLC( aReference );
-    TPtrC oldName;
-    lm->GetLandmarkName( oldName );
-    
-    // create street in the form of "50 km to <POI name>"
-    const TInt KDistValueLen = 5; // "40000"
-    const TInt KAdditionalChars = 7; // " km to "
-
-    _LIT( KLocationNameFormat, "%d m to %S" );
-    _LIT( KLocationNameFormatKm, "%d km to %S" );
-
-    HBufC* locName = HBufC::NewLC( oldName.Length() + KDistValueLen + KAdditionalChars );
-
-    if ( aDistance < 1000 )
-        {
-        locName->Des().Format( KLocationNameFormat, TInt( aDistance ), &oldName );
-        }
-    else
-        {
-        locName->Des().Format( KLocationNameFormatKm, TInt( aDistance / 1000 ), &oldName );
-        }
-
-    lm->SetPositionFieldL( EPositionFieldLocationName, *locName );
-    lm->SetPositionFieldL( EPositionFieldStreet, *locName );
-   
-    CleanupStack::PopAndDestroy( locName );
-    return lm; // left in stack
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-EXPORT_C CPosLandmark* CMnrpEngine::CoordToAddressLC( const TCoordinate& aLocation )
-    {
-    TArray<CPosLandmark*> pois = KnownPlacesL();
-
-    // find closest POI
-    RArray<TDistanceToPoi> matches;
-	CleanupClosePushL( matches );
-    
-    CPosLandmark* temp = CPosLandmark::NewLC();
-    TLocality loc( aLocation, 0 ); // accuracy is not used by this implementation
-    temp->SetPositionL( loc );
-    FindClosestPoisL( *temp, matches, 1 ); // only one match needed
-    CleanupStack::PopAndDestroy( temp );
-    
-    if ( matches.Count() < 1 )
-		{
-		User::Leave( KErrNotFound );
-		}
-
-    TDistanceToPoi distToPoi = matches[0];
-	CleanupStack::PopAndDestroy( &matches );
-
-    CPosLandmark* lm = CreateCloseLandmarkLC(
-        *pois[distToPoi.iPoiIndex],
-        distToPoi.iDistance );
-
-    return lm; // left in stack
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-EXPORT_C void CMnrpEngine::BestCoordToAddressMatchesL( 
-    const TCoordinate& aLocation,
-    RPointerArray<CPosLandmark>& aMatches,
-    TInt aMaxMatches )
-    {
-    TArray<CPosLandmark*> pois = KnownPlacesL();
-
-    // find closest POIs
-    RArray<TDistanceToPoi> matches;
-    CleanupClosePushL( matches );
-    
-    CPosLandmark* temp = CPosLandmark::NewLC();
-    TLocality loc( aLocation, 0 ); // accuracy is not used by this implementation
-    temp->SetPositionL( loc );
-    FindClosestPoisL( *temp, matches, aMaxMatches );
-    CleanupStack::PopAndDestroy( temp );
-    
-    for ( TInt i = 0; i < matches.Count(); i++ )
-        {
-        TDistanceToPoi distToPoi = matches[i];
-        
-        CPosLandmark* lm = CreateCloseLandmarkLC( 
-            *pois[distToPoi.iPoiIndex], 
-            distToPoi.iDistance );
-            
-        aMatches.AppendL( lm );    
-        CleanupStack::Pop( lm );
-        }
-    CleanupStack::PopAndDestroy( &matches );
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-EXPORT_C void CMnrpEngine::FindResourceFileL( 
-    const TDesC& aFilePathAndName,
-    TFileName& aRscFile )
-    {
-    TParse parse;
-    parse.Set( aFilePathAndName, NULL, NULL );
-    
-    TFindFile finder( iFileSession );
-    if ( finder.FindByDir( parse.NameAndExt(), parse.Path() ) == KErrNone )
-        {
-        aRscFile.Copy( finder.File() );
-        }
-    else
-        {
-        User::Leave( KErrNotFound );
-        }
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-EXPORT_C RFs& CMnrpEngine::Fs() 
-    { 
-    return iFileSession;
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpEngine::LoadKnownPlacesL()
-    {
-    TFileName resourceFile;
-    FindResourceFileL( KCitiesResourceFile(), resourceFile );
-
-    CResourceFile* resFile = CResourceFile::NewLC( iFileSession, resourceFile, 0, 0 );
-    resFile->ConfirmSignatureL( 0 );
-
-    RResourceReader reader;
-
-    reader.OpenLC( resFile, R_MNREFPROVIDERENGINE_PLACES );
-    ReadPlacesResourceL( reader );
-    CleanupStack::PopAndDestroy( &reader );
-    
-    CleanupStack::PopAndDestroy( resFile );
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpEngine::ReadPlacesResourceL( RResourceReader& aReader )
-    {
-    TInt size = aReader.ReadInt16L();
-
-    for ( TInt i = 0; i < size; i++ )
-        {
-        HBufC* city = aReader.ReadHBufCL();
-        CleanupStack::PushL( city );
-        HBufC* country = aReader.ReadHBufCL();
-        CleanupStack::PushL( country );
-
-        TReal64 lat = aReader.ReadReal64L();
-        TReal64 lon = aReader.ReadReal64L();
-        
-        CPosLandmark* lm = CPosLandmark::NewLC();
-        lm->SetLandmarkNameL( *city );
-        
-        lm->SetPositionFieldL( EPositionFieldCity, *city );
-        lm->SetPositionFieldL( EPositionFieldCountry, *country );
-        
-        TLocality coord;
-        coord.SetCoordinate( lat, lon );
-        lm->SetPositionL( coord );
-        
-        iPlaces.AppendL( lm );
-        CleanupStack::Pop( lm );
-        CleanupStack::PopAndDestroy( country );
-        CleanupStack::PopAndDestroy( city );
-        }
-    }
--- a/locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/mapnavproviderrefapp/src/mnrpgeocodingservice.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,343 +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:  CMnrpGeocodingService class implementation
-*
-*/
-
-
-#include <e32base.h>
-
-#include <aknnotewrappers.h>
-
-#include <lbsposition.h>
-
-#include <epos_cposlandmark.h>
-#include <epos_poslandmarkserialization.h>
-
-#include <mngeocodingservicebase.h>
-
-#include "debug.h"
-
-#include "mnrpappserverback.h"
-#include "mnrpappuiback.h"
-#include "mnrpdocumentback.h"
-#include "mnrpengine.h"
-
-#include <mnrefproviderback.rsg>
-#include "mnrpgeocodingservice.h"
-
-// ======== LOCAL FUNCTIONS ========
-
-// ---------------------------------------------------------------------------
-//  Cleanup item for RPointerArray<CPosLandmark>
-// ---------------------------------------------------------------------------
-//
-void CleanupLandmarksArray( TAny* aArray )
-    {
-    ( static_cast<RPointerArray<CPosLandmark>*>( aArray ) )->ResetAndDestroy();
-    }
-
-// ---------------------------------------------------------------------------
-//  Cleanup item for moving application fore/background
-// ---------------------------------------------------------------------------
-//
-void CleanupForeground( TAny* aAppUi )
-    {
-    ( static_cast<CMnrpAppUiBack*>( aAppUi ) )->MoveBackground();
-    }
-
-// ======== MEMBER FUNCTIONS ========
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-CMnrpGeocodingService::CMnrpGeocodingService( CMnrpEngine& aEngine )
- :  iEngine( aEngine )
-    {
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-CMnrpGeocodingService* CMnrpGeocodingService::NewL( CMnrpEngine& aEngine )
-    {
-    CMnrpGeocodingService* self = new (ELeave) CMnrpGeocodingService( aEngine );
-    CleanupStack::PushL( self );
-    self->ConstructL();
-    CleanupStack::Pop( self );
-    return self;
-    }
-    
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-CMnrpGeocodingService::~CMnrpGeocodingService()
-    {
-    delete iProcessor;
-    delete iLandmark;
-    delete iPlainAddress;
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-void CMnrpGeocodingService::ConstructL()
-    {
-    BaseConstructL();
-    
-    iProcessor = CIdle::NewL( CActive::EPriorityIdle );
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-void CMnrpGeocodingService::LeaveIfBusyL()
-    {
-    if ( iProcessor->IsActive() )
-        {
-        User::Leave( KErrInUse );
-        }
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-void CMnrpGeocodingService::StartProcessingL()
-    {
-    iProcessor->Start( TCallBack( CMnrpGeocodingService::GeocodingProcessingCallBack, this ) );
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-TInt CMnrpGeocodingService::GeocodingProcessingCallBack( TAny* aPtr )
-    {
-    CMnrpGeocodingService* self =    
-        static_cast<CMnrpGeocodingService*> ( aPtr );
-        
-    self->HandleGeocodingCompleted();
-    return EFalse;
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-void CMnrpGeocodingService::HandleGeocodingCompleted()
-    {
-    TInt err = KErrNone;
-    TRAP( err, FinishProcessingL() );
-    if ( err )
-        {
-        CompleteRequest( err );
-        }
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-void CMnrpGeocodingService::FinishProcessingL()
-    {
-    LOG1("MnRefProvider: FinishProcessingL in, cursvc %d", iCurrentService);
-
-    TLocality loc;
-    CPosLandmark* lm = NULL;
-    
-    switch ( iCurrentService )
-        {
-        case ECoordToAddr:
-                
-            if ( iDialogAllowed )
-                {
-                lm = LetUserSelectBestMatchL( *iLandmark );
-                CleanupStack::PushL( lm );
-                }
-            else
-                {
-                // search and return just best match - closest POI
-                if ( iLandmark->GetPosition( loc ) != KErrNone )
-                    {
-                    User::Leave( KErrArgument );
-                    }
-                lm = iEngine.CoordToAddressLC( loc );
-                }
-            break;
-
-        case EAddrToCoord:
-            lm = iEngine.AddressToCoordLC( *iLandmark );
-            break;
-
-        case EPlainToCoord:
-            lm = iEngine.AddressToCoordLC( *iPlainAddress );
-            break;
-            
-        default:            
-            User::Leave( KErrGeneral );
-        }
-
-    iCurrentService = ENone;    
-    
-    CompleteGeocodingRequestL( *lm );
-    CleanupStack::PopAndDestroy( lm );
-
-    LOG("MnRefProvider: FinishProcessingL out");
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-CPosLandmark* CMnrpGeocodingService::LetUserSelectBestMatchL( const CPosLandmark& aReference )
-    {
-    // 1. Find best matches
-    
-    RPointerArray<CPosLandmark> matches;
-    CleanupStack::PushL( TCleanupItem( CleanupLandmarksArray, &matches ) );
-    
-    TLocality location;
-    if ( aReference.GetPosition( location ) != KErrNone )
-        {
-        User::Leave( KErrArgument );
-        }
-    
-    const TInt KMaxmMatches = 3;
-    iEngine.BestCoordToAddressMatchesL( location, matches, KMaxmMatches );
-    
-    if ( matches.Count() < 1 )
-        {
-        User::Leave( KErrNotFound ); // cannot find any match
-        }
-    
-    // 2. Start selection dialog
-    
-    TInt result = 1, selected = 0;
-    if ( matches.Count() > 1 )
-        {
-        // prepare dialog
-        const TInt KGranularity = 8;
-        CDesCArraySeg *textArray = new (ELeave) CDesCArraySeg( KGranularity );
-        CleanupStack::PushL( textArray );
-        
-        for ( TInt i = 0; i < matches.Count(); i++ )
-            {
-            HBufC* buf = HBufC::NewLC( KPosLmMaxTextFieldLength );
-            TPtrC ptr( buf->Des() );
-            
-            matches[i]->GetPositionField( EPositionFieldLocationName, ptr );
-            textArray->AppendL( ptr );
-
-            CleanupStack::PopAndDestroy( buf );
-            }
-        
-        // bring application foreground
-        CMnrpAppUiBack* ui = (CMnrpAppUiBack*) CEikonEnv::Static()->AppUi();
-        CleanupStack::PushL( TCleanupItem( CleanupForeground, ui ) );
-        ui->MoveForeground();
-
-        CAknListQueryDialog* dialog = new (ELeave) CAknListQueryDialog( &selected );
-        dialog->PrepareLC( R_MNREFGEOCODER_LIST_QUERY );
-
-        dialog->SetItemTextArray( textArray );
-        dialog->SetOwnershipType( ELbmOwnsItemArray );
-
-        // pop up dialog
-        result = dialog->RunLD();
-
-        CleanupStack::PopAndDestroy(); // move background
-        CleanupStack::Pop( textArray );
-        }
-
-    // 3. Return result
-    CPosLandmark* lm = NULL;
-    if ( result )
-        {
-        lm = matches[selected];
-        matches.Remove( selected );
-        }
-    else
-        {
-        User::Leave( KErrCancel ); 
-        // user cancelled geocoding selection dialog
-        // it automatically cancels geocoding request
-        }
-
-    CleanupStack::PopAndDestroy(); // matches
-    return lm;
-    }
-
-// ---------------------------------------------------------------------------
-// From class CMnGeocodingServiceBase
-// ---------------------------------------------------------------------------
-//
-void CMnrpGeocodingService::HandleFindAddressByCoordinateL(
-    const CPosLandmark& aLandmark)
-    {
-    LeaveIfBusyL();
-
-    delete iLandmark;
-    iLandmark = NULL;
-    iLandmark = CPosLandmark::NewL(aLandmark);
-    
-    iCurrentService = ECoordToAddr;
-    iDialogAllowed = !( Options() & CMnGeocoder::EOptionDialogDisabled );
-    StartProcessingL();
-    }
-        
-// ---------------------------------------------------------------------------
-// From class CMnGeocodingServiceBase
-// ---------------------------------------------------------------------------
-//
-void CMnrpGeocodingService::HandleFindCoordinateByAddressL(
-    const CPosLandmark& aLandmark)
-    {
-    LeaveIfBusyL();
-
-    delete iLandmark;
-    iLandmark = NULL;
-    iLandmark = CPosLandmark::NewL( aLandmark );
-    
-    iCurrentService = EAddrToCoord;
-    iDialogAllowed = !( Options() & CMnGeocoder::EOptionDialogDisabled );
-    StartProcessingL();
-    }
-
-// ---------------------------------------------------------------------------
-// From class CMnGeocodingServiceBase
-// ---------------------------------------------------------------------------
-//
-void CMnrpGeocodingService::HandleFindCoordinateByAddressL(
-    const TDesC& aAddress)
-    {
-    LeaveIfBusyL();
-
-    delete iPlainAddress;
-    iPlainAddress = NULL;
-    iPlainAddress = aAddress.AllocL();
-    
-    delete iLandmark;
-    iLandmark = NULL;
-    iLandmark = CPosLandmark::NewL();
-    
-    iCurrentService = EPlainToCoord;
-    iDialogAllowed = !( Options() & CMnGeocoder::EOptionDialogDisabled );
-    StartProcessingL();
-    }
-
-// ---------------------------------------------------------------------------
-// From class CMnServiceBase
-// ---------------------------------------------------------------------------
-//
-void CMnrpGeocodingService::DoCancel()
-    {
-    iProcessor->Cancel();
-    iCurrentService = ENone;
-    }
--- a/locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/mapnavproviderrefapp/src/mnrpmapcontrol.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,644 +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:  CMnrpMapControl class implementation
-*
-*/
-
-
-#include <coemain.h>
-#include <aknlists.h>
-#include <barsread.h>
-#include <aknnotewrappers.h>
-
-#include <bitstd.h>
-#include <bitdev.h>
-
-#include <lbsposition.h>
-
-#include "debug.h"
-
-#include "mnrputils.h"
-#include "mnrpmapview.h"
-#include "mnrpmapcontrol.h"
-
-const TInt KCodeKeyLeft = 0x34;
-const TInt KCodeKeyRight = 0x36;
-const TInt KCodeKeyUp = 0x32;
-const TInt KCodeKeyDown = 0x38;
-const TInt KCodeKeyCenter = 0x35;
-
-const TInt KCodeKeySelect = EKeyDevice3;
-const TInt KCodeKeySelect2 = 0x13;
-
-const TInt KCodeKeyZoomIn = 42;
-const TInt KCodeKeyZoomOut = 35;
-const TInt KCodeKeyZoomIn2 = 0x33;
-const TInt KCodeKeyZoomOut2 = 0x39;
-
-const TRgb KCursorColor( 255, 255, 255 );
-const TRgb KGridTextColor( 0, 0, 0 );
-const TRgb KOriginMarkColor( 0, 0, 255 );
-
-const TInt KTextFontHeightInTwips = 100;
-const TInt KItemFontHeightInTwips = 120;
-const TReal KBorderSizeFactor = 2;
-
-const TInt KCursorMarginSize = 20; // pixels
-const TInt KCursorArrowSize = 4; // pixels
-const TInt KCursorCircleRadius = 4; // pixels
-
-const TInt KCursorMove = 10; // pixels
-const TInt KWindowMove = 20; // pixels
-const TReal KJumpFactor = 5;
-const TReal KCrawlFactor = 2.0 / KCursorMove;
-
-const TReal KZoomOutRate = 1.5;
-const TReal KZoomInRate =  1 / KZoomOutRate;
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CMnrpMapControl::CMnrpMapControl( CMnrpMapView& aView )
- :  iView( aView )
-    {
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CMnrpMapControl::~CMnrpMapControl()
-    {
-    delete iModel;
-    delete iOffScreenBitmap;
-    DestroyFonts();
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CMnrpMapControl* CMnrpMapControl::NewL( 
-    CMnrpMapView& aView,
-    const TRect& aRect,
-    CMnrpEngine& aEngine )
-    {
-    CMnrpMapControl* self = new ( ELeave ) CMnrpMapControl( aView );
-    CleanupStack::PushL( self );
-    self->ConstructL( aRect, aEngine );
-    CleanupStack::Pop( self );
-    return self;
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpMapControl::UpdateModelL( CMnrpMapViewService& aService )
-    {
-    iModel->UpdateModelL( aService );
-    }
-    
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpMapControl::SetSelectionModeL( TBool aSelectionMode ) 
-    {
-    iSelectionMode = aSelectionMode;
-    iAbsoluteCursor = iModel->Center();
-    iCursor = iModel->AbsoluteToScreen( iAbsoluteCursor );
-    DrawDeferred();
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-TCoordinate CMnrpMapControl::CurrentLocation()
-    {
-    return iAbsoluteCursor;
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpMapControl::ConstructL( 
-    const TRect& aRect,
-    CMnrpEngine& aEngine )
-    {
-    // Create a window for this application view
-    CreateWindowL();
-
-    iModel = CMnrpMapModel::NewL( *this, aEngine );
-
-    // Set the windows size
-    SetRect( aRect );
-    
-    iAbsoluteCursor = TCoordinate( 0, 0 );
-    iCursor = iModel->AbsoluteToScreen( iAbsoluteCursor );
-    
-    CreateFonts();
-    CreateScreenBufferL( aRect.Size() );
-
-    // Activate the window, which makes it ready to be drawn
-    ActivateL();
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-TKeyResponse CMnrpMapControl::OfferKeyEventL(
-    const TKeyEvent& aKeyEvent, 
-    TEventCode /*aType*/ )
-    {
-    TKeyResponse response = EKeyWasConsumed;
-    
-    TInt step = iSelectionMode ? KCursorMove : KWindowMove;
-    TBool isShift = aKeyEvent.iModifiers & EModifierShift;
-    TReal crawlFactor = isShift ? KCrawlFactor : 1;
-
-    TInt xmove = 0;
-    TInt ymove = 0;
-    
-    TBool redraw = ETrue;
-
-    switch ( aKeyEvent.iCode )
-        {
-        case EKeyLeftArrow:
-            xmove = -step * crawlFactor;
-            break;
-
-        case KCodeKeyLeft:
-            xmove = -step * KJumpFactor;
-            break;
-
-        case EKeyRightArrow:
-            xmove = step * crawlFactor;
-            break;
-
-        case KCodeKeyRight:
-            xmove = step * KJumpFactor;
-            break;
-
-        case EKeyUpArrow:
-            ymove = -step * crawlFactor;
-            break;
-
-        case KCodeKeyUp:
-        case EKeyPageUp:
-            ymove = -step * KJumpFactor;
-            break;
-
-        case EKeyDownArrow:
-            ymove = step * crawlFactor;
-            break;
-            
-        case KCodeKeyDown:
-        case EKeyPageDown:
-            ymove = step * KJumpFactor;
-            break;
-
-        case KCodeKeyZoomIn:
-        case KCodeKeyZoomIn2:
-            Zoom( KZoomInRate );
-            break;
-
-        case KCodeKeyZoomOut:
-        case KCodeKeyZoomOut2:
-            Zoom( KZoomOutRate );
-            break;
-
-        case KCodeKeyCenter:
-            iModel->GoCenter();
-            iCursor = iModel->AbsoluteToScreen( TCoordinate( 0, 0 ) );
-            break;
-
-        case KCodeKeySelect:
-        case KCodeKeySelect2:
-            if ( iSelectionMode )
-                {
-                iView.HandleUserSelectionL( KErrNone );
-                redraw = EFalse;
-                }
-            break;
-
-        default:
-            response = EKeyWasNotConsumed;
-            redraw = EFalse;
-            break;
-        }
-
-    if ( xmove || ymove )
-        {
-        if ( iSelectionMode )
-            {
-            MoveCursor( xmove, ymove );
-            }
-        else
-            {
-            TCoordinate center = iModel->Center();
-            TCoordinate moveTo( 
-                center.Latitude() - iModel->ScreenToAbsolute( ymove ),
-                center.Longitude() + iModel->ScreenToAbsolute( xmove ) );
-            iModel->MoveTo( moveTo );
-            }
-        }
-
-    if ( redraw )
-        {
-        RenderL();
-        DrawDeferred();
-        }
-
-    return response;
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpMapControl::HandleModelUpdateL()
-    {
-    RenderL();
-    DrawDeferred();
-    
-    TInt ignored = iModel->NumIgnoredLandmarks();
-    if ( ignored )
-    	{
-        CAknInformationNote* note = new (ELeave) CAknInformationNote( ETrue );
-        _LIT( KMessageIgnoredLm, "One landmark\nhas no coordinates\nand can't be shown." );
-        _LIT( KMessageIgnoredLms, "%d landmarks\nhave no coordinates\nand can't be shown." );
-        if ( ignored == 1 )
-        	{
-        	note->ExecuteLD( KMessageIgnoredLm() );
-        	}
-        else
-        	{
-            TBuf<64> message;
-        	message.Format( KMessageIgnoredLms, ignored );
-        	note->ExecuteLD( message );
-        	}
-    	}
-    }
-    
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpMapControl::CreateScreenBufferL( const TSize& aSize )
-	{
-	CGraphicsDevice* screenDevice = iEikonEnv->ScreenDevice();
-
-	// create a bitmap to be used off-screen
-	CFbsBitmap* offScreenBitmap = new (ELeave) CFbsBitmap();
-	User::LeaveIfError( offScreenBitmap->Create( aSize, screenDevice->DisplayMode() ) );
-	CleanupStack::PushL( offScreenBitmap );
-
-	if ( iOffScreenBitmap )
-		{
-		delete iOffScreenBitmap;
-		}
-	iOffScreenBitmap = offScreenBitmap;
-
-	CleanupStack::Pop( offScreenBitmap );
-	}
-
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpMapControl::CreateFonts()
-	{
-    CGraphicsDevice* screenDevice = iEikonEnv->ScreenDevice();
-
-    const CFont* denseFont = iEikonEnv->DenseFont();
-    TFontSpec fs = denseFont->FontSpecInTwips();
-
-    fs.iHeight = KTextFontHeightInTwips;
-    screenDevice->GetNearestFontInTwips( iTextFont, fs );
-    
-    fs.iHeight = KItemFontHeightInTwips;
-    screenDevice->GetNearestFontInTwips( iItemFont, fs );
-	}
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpMapControl::DestroyFonts()
-	{
-	CGraphicsDevice* screenDevice = iEikonEnv->ScreenDevice();
-	
-    screenDevice->ReleaseFont( iItemFont );
-    iItemFont = NULL;
-    screenDevice->ReleaseFont( iTextFont );
-    iTextFont = NULL;
-	}
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpMapControl::Draw( const TRect& /*aRect*/ ) const
-    {
-    // Get the standard graphics context
-    CWindowGc& gc = SystemGc();
-
-    TRect rect = Rect();
-    TRect border( rect );
-    border.Shrink( BorderSize() );
-	
-    gc.Clear( TRect( rect.iTl.iX, rect.iTl.iY, rect.iBr.iX, border.iBr.iY ) );
-    gc.Clear( TRect( rect.iTl.iX, border.iBr.iY, rect.iBr.iX, rect.iBr.iY ) );
-    gc.Clear( TRect( rect.iTl.iX, border.iTl.iY, border.iTl.iX, border.iBr.iY ) );
-    gc.Clear( TRect( border.iBr.iX, border.iTl.iY, rect.iBr.iX, border.iBr.iY ) );
-
-    CMnrpMapModel::TGrid grid;
-    iModel->GetGrid( grid );
-    DrawGridText( gc, border, rect, iTextFont, grid );
-
-	if ( iOffScreenBitmap )
-		{
-		gc.BitBlt( border.iTl, iOffScreenBitmap );
-		}
-	else
-		{
-		gc.Clear();	
-		}
-			
-    if ( iSelectionMode )
-        {
-        gc.SetOrigin( border.iTl );
-        DrawCursor( gc );
-        }
-
-    // draw border
-    gc.SetPenColor( KRgbGray );
-    gc.SetPenSize( TSize( 1, 1 ) );
-    gc.SetOrigin( rect.iTl );
-    gc.DrawRect( border );
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpMapControl::DrawGridText( 
-    CWindowGc& aGc, 
-    const TRect& aInnerBox,
-    const TRect& aOuterBox,
-    const CFont* aFont,
-    CMnrpMapModel::TGrid& aGrid ) const
-    {
-    aGc.UseFont( aFont );
-    
-    TBuf<KMaxCoordStrSize> latTopStr, latBottomStr, lonLeftStr, lonRightStr;
-    TBuf<KMaxCoordStrSize> gridMajorStr, latStr, lonStr;
-    
-    MnrpUtils::CoordinateToString( iModel->Left(), lonLeftStr, ETrue );
-    MnrpUtils::CoordinateToString( iModel->Top(), latTopStr, ETrue );
-    MnrpUtils::CoordinateToString( iModel->Right(), lonRightStr, ETrue );
-    MnrpUtils::CoordinateToString( iModel->Bottom(), latBottomStr, ETrue );
-
-    if ( !iSelectionMode )
-        {
-        MnrpUtils::CoordinateToString( ( iModel->Right() + iModel->Left() ) / 2, lonStr, ETrue );
-        MnrpUtils::CoordinateToString( ( iModel->Top() + iModel->Bottom() ) / 2, latStr, ETrue );
-        }
-    else
-        {
-        MnrpUtils::CoordinateToString( iAbsoluteCursor.Longitude(), lonStr, ETrue );
-        MnrpUtils::CoordinateToString( iAbsoluteCursor.Latitude(), latStr, ETrue );
-        }
-
-    MnrpUtils::CoordinateToString( aGrid.iAbsoluteGridStep, gridMajorStr );
-
-    TRect lonBox( aInnerBox.iTl.iX, 0, aInnerBox.iBr.iX, aInnerBox.iBr.iY );
-    TRect latBox( 0, aInnerBox.iTl.iY, aInnerBox.iTl.iX, aInnerBox.iBr.iY );
-    TRect centerBox( aInnerBox.iTl.iX, aInnerBox.iBr.iY, aInnerBox.iBr.iX, aOuterBox.iBr.iY );
-
-    TInt textBaseLine = aFont->AscentInPixels() + KBorderSizeFactor / 2;
-    TInt vertTextBaseLine = aFont->AscentInPixels() + KBorderSizeFactor / 2;
-
-    aGc.SetPenColor( KGridTextColor );
-
-    aGc.DrawText( lonLeftStr, lonBox, textBaseLine, CGraphicsContext::ELeft );
-    aGc.DrawText( lonRightStr, lonBox, textBaseLine, CGraphicsContext::ERight );
-    aGc.DrawTextVertical( latTopStr, latBox, vertTextBaseLine, EFalse, CGraphicsContext::ELeft );
-    aGc.DrawTextVertical( latBottomStr, latBox, vertTextBaseLine, EFalse, CGraphicsContext::ERight );
-
-    aGc.DrawText( gridMajorStr, lonBox, textBaseLine, CGraphicsContext::ECenter );
-
-    aGc.SetPenColor( KOriginMarkColor );
-    aGc.DrawText( latStr, centerBox, textBaseLine, CGraphicsContext::ELeft );
-    aGc.DrawText( lonStr, centerBox, textBaseLine, CGraphicsContext::ERight );
-    
-    aGc.DiscardFont();
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpMapControl::DrawCursor( CWindowGc& aGc ) const
-    {
-    aGc.SetPenColor( KCursorColor );
-    aGc.SetPenSize( TSize( 1, 1 ) );
-    aGc.SetDrawMode( CGraphicsContext::EDrawModeNOTSCREEN );
-    
-    TRect cursorCircleRect( iCursor, TSize( 0, 0 ) );
-    cursorCircleRect.Grow( KCursorCircleRadius, KCursorCircleRadius );
-    aGc.DrawEllipse( cursorCircleRect );
-    
-    // upper vertical line
-    aGc.DrawLine( TPoint( iCursor.iX, cursorCircleRect.iTl.iY ), 
-                  TPoint( iCursor.iX, cursorCircleRect.iTl.iY - KCursorArrowSize ) );
-    // lower vertical line
-    aGc.DrawLine( TPoint( iCursor.iX, cursorCircleRect.iBr.iY ), 
-                  TPoint( iCursor.iX, cursorCircleRect.iBr.iY + KCursorArrowSize ) );
-
-    // left horiz line
-    aGc.DrawLine( TPoint( cursorCircleRect.iTl.iX, iCursor.iY ), 
-                  TPoint( cursorCircleRect.iTl.iX - KCursorArrowSize, iCursor.iY ) );
-    // right horiz line
-    aGc.DrawLine( TPoint( cursorCircleRect.iBr.iX, iCursor.iY ), 
-                  TPoint( cursorCircleRect.iBr.iX + KCursorArrowSize, iCursor.iY ) );
-
-    aGc.SetDrawMode( CGraphicsContext::EDrawModePEN );
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpMapControl::SizeChanged()
-    {
-    TRect rect( Rect() );
-    
-    DestroyFonts();
-    CreateFonts();
-    
-    rect.Shrink( BorderSize() );
-    iViewSize = rect.Size();
-    iModel->SetScreenSize( iViewSize );
-    TRAP_IGNORE( CreateScreenBufferL( rect.Size() ) );
-    TRAP_IGNORE( RenderL() );
-    DrawDeferred();
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpMapControl::HandleResourceChange( TInt aType )
-    {
-    CCoeControl::HandleResourceChange( aType );
-    if ( aType == KEikDynamicLayoutVariantSwitch )
-        {
-        SetFullScreen( iIsFullScreen );
-        }
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpMapControl::ToggleFullScreen()
-    {
-    SetFullScreen( !iIsFullScreen );
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpMapControl::SetFullScreen( TBool aFullScreen )
-    {
-    iIsFullScreen = aFullScreen;
-    if ( iIsFullScreen)
-        {
-        SetExtentToWholeScreen();
-        }
-    else
-        {
-        SetRect( iView.ClientRect() );
-        }
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpMapControl::MoveCursor( TInt aXmove, TInt aYmove )
-    {
-    iCursor += TPoint( aXmove, aYmove );
-
-    iCursor.iX = Max( 0, iCursor.iX );
-    iCursor.iX = Min( iViewSize.iWidth, iCursor.iX );
-
-    iCursor.iY = Max( 0, iCursor.iY );
-    iCursor.iY = Min( iViewSize.iHeight, iCursor.iY );
-
-    // verify cursor margin
-    TRect cursorMargin = CursorMargin();
-    
-    iAbsoluteCursor = iModel->ScreenToAbsolute( iCursor );
-    
-    TReal xcorrection = 0;
-    TReal ycorrection = 0;
-
-    if ( aXmove > 0 ) // moving right
-        {
-        TInt toMargin = iCursor.iX - cursorMargin.iBr.iX;
-        if ( toMargin > 0 ) // cursor went beyond cursor margin, move view
-            {
-            xcorrection = iModel->ScreenToAbsolute( toMargin );
-            }
-        }
-    else if ( aXmove < 0 ) // moving left
-        {
-        TInt toMargin = iCursor.iX - cursorMargin.iTl.iX;
-        if ( toMargin < 0 )
-            {
-            xcorrection = iModel->ScreenToAbsolute( toMargin );
-            }
-        }
-
-    if ( aYmove > 0 ) // moving down
-        {
-        TInt toMargin = iCursor.iY - cursorMargin.iBr.iY;
-        if ( toMargin > 0 )
-            {
-            ycorrection = -iModel->ScreenToAbsolute( toMargin );
-            }
-        }
-    else if ( aYmove < 0 ) // moving up
-        {
-        TInt toMargin = iCursor.iY - cursorMargin.iTl.iY;
-        if ( toMargin < 0 )
-            {
-            ycorrection = -iModel->ScreenToAbsolute( toMargin );
-            }
-        }
-    
-    TCoordinate center = iModel->Center();
-    TCoordinate moveTo( 
-        center.Latitude() + ycorrection,
-        center.Longitude() + xcorrection );
-    iModel->MoveTo( moveTo );
-
-    iCursor = iModel->AbsoluteToScreen( iAbsoluteCursor );
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-TRect CMnrpMapControl::CursorMargin()
-    {
-    TRect rect( iViewSize );
-    rect.Shrink( KCursorMarginSize, KCursorMarginSize );
-    return rect;
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpMapControl::Zoom( TReal aRate )
-    {
-    if ( iSelectionMode )
-        {
-        iModel->MoveTo( iAbsoluteCursor );
-        iModel->Zoom( aRate );
-        iCursor = iModel->AbsoluteToScreen( iAbsoluteCursor );
-        }
-    else
-        {
-        iModel->Zoom( aRate );
-        }
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-TSize CMnrpMapControl::BorderSize() const 
-    {
-	TSize size( 0, 0 );
-	if ( iTextFont )
-		{
-	    TInt fontHeight = iTextFont->HeightInPixels();
-	    
-	    size.iWidth = size.iHeight = TInt( fontHeight + KBorderSizeFactor );
-		}
-    return size;
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpMapControl::RenderL()
-    {
-    TRect rect = Rect();
-    TRect border( rect );
-    border.Shrink( BorderSize() );
-
-    if ( iOffScreenBitmap && iTextFont && iItemFont )
-        {
-        iModel->RenderL( *iOffScreenBitmap, TRect( border.Size() ), iTextFont, iItemFont );
-        }
-    }
--- a/locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/mapnavproviderrefapp/src/mnrpmapimageservice.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,243 +0,0 @@
-/*
-* Copyright (c) 2006-2007 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:  ÑMnrpMapImageService class implementation
-*
-*/
-
-
-#include <e32base.h>
-#include <e32math.h>
-#include <e32property.h>
-#include <eikenv.h>
-#include <gdi.h>
-
-#include <lbsposition.h>
-
-#include <epos_cposlandmark.h>
-#include <epos_poslandmarkserialization.h>
-
-#include <mnmapimage.h>
-#include <mnmapimageparams.h>
-#include <mnmapimageservicebase.h>
-
-#include "debug.h"
-#include "mnrpengine.h"
-#include "mnrpappuiback.h"
-#include "mnrpappserverback.h"
-#include "mnrpmapmodel.h"
-#include "mnrpmapimageservice.h"
-
-const TInt KTextFontHeightInTwips = 100;
-const TInt KItemFontHeightInTwips = 120;
-
-const TTimeIntervalMicroSeconds32 KProcessingDelay = 200 * 1000;
-
-// ======== LOCAL FUNCTIONS ========
-
-extern void CoordinateToString( TReal aCoord, TDes& aStr );
-
-// ======== MEMBER FUNCTIONS ========
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-CMnrpMapImageService* CMnrpMapImageService::NewL( CMnrpEngine& aEngine )
-    {
-    CMnrpMapImageService* self = new (ELeave) CMnrpMapImageService( aEngine );
-    CleanupStack::PushL( self );
-    self->ConstructL();
-    CleanupStack::Pop( self );
-    return self;
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-CMnrpMapImageService::CMnrpMapImageService( CMnrpEngine& aEngine )
-  : iEngine( aEngine )
-    {
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-CMnrpMapImageService::~CMnrpMapImageService()
-    {
-	if ( iProcessor )
-		{
-	    iProcessor->Cancel();
-	    delete iProcessor;
-		}
-    delete iModel;
-    DestroyFonts();
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-void CMnrpMapImageService::ConstructL()
-    {
-    BaseConstructL();
-
-    iEikon = CEikonEnv::Static();
-    CreateFonts();
-
-    iModel = CMnrpMapModel::NewL( iEngine );
-    iProcessor = CPeriodic::NewL( CActive::EPriorityIdle );
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-void CMnrpMapImageService::LeaveIfBusyL()
-    {
-    if ( iProcessor->IsActive() )
-        {
-        LOG("CMnRefProviderMapViewService::LeaveIfBusyL BUSY");
-        User::Leave( KErrInUse );
-        }
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-void CMnrpMapImageService::StartProcessingL()
-    {
-    iProcessor->Start( KProcessingDelay, KProcessingDelay,
-        TCallBack( CMnrpMapImageService::MapImageProcessingCallBack, this ) );
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-TInt CMnrpMapImageService::MapImageProcessingCallBack( TAny* aPtr )
-    {
-    CMnrpMapImageService* self =
-        static_cast<CMnrpMapImageService*> ( aPtr );
-
-    TRAP_IGNORE( self->HandleMapImageCompletedL() );
-    return EFalse;
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-void CMnrpMapImageService::HandleMapImageCompletedL()
-    {
-    iProcessor->Cancel();
-    TInt err = KErrNone;
-    TRAP( err, FinishProcessingL() );
-    if ( err )
-        {
-        CompleteRequest( err );
-        }
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-void CMnrpMapImageService::RenderL()
-    {
-    TMnMapImageParams& params = MapImageParams();
-
-    if ( params.Direction() != 0 ||
-         params.ImageType() != TMnMapImageParams::ETypeVectorMap )
-        {
-        User::Leave( KErrNotSupported );
-        }
-
-    CFbsBitmap& bitmap = TargetBitmap();
-
-    iModel->SetScreenSize( params.Size() );
-    iModel->UpdateModelL( *this );
-    iModel->RenderL( bitmap, TRect( params.Size() ), iTextFont, iItemFont );
-
-    // complete request
-    params.SetProjectionId(0);
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpMapImageService::CreateFonts()
-	{
-    CGraphicsDevice* screenDevice = iEikon->ScreenDevice();
-
-    const CFont* denseFont = iEikon->DenseFont();
-    TFontSpec fs = denseFont->FontSpecInTwips();
-
-    fs.iHeight = KTextFontHeightInTwips;
-    screenDevice->GetNearestFontInTwips( iTextFont, fs );
-
-    fs.iHeight = KItemFontHeightInTwips;
-    screenDevice->GetNearestFontInTwips( iItemFont, fs );
-	}
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpMapImageService::DestroyFonts()
-	{
-	CGraphicsDevice* screenDevice = iEikon->ScreenDevice();
-
-    screenDevice->ReleaseFont( iItemFont );
-    screenDevice->ReleaseFont( iTextFont );
-	}
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-void CMnrpMapImageService::FinishProcessingL()
-    {
-    LOG1("FinishProcessingL in, cursvc %d", iCurrentService);
-    TCoordinate coord;
-    switch ( iCurrentService )
-        {
-        case ERender:
-            {
-            RenderL();
-            }
-            break;
-
-        default:
-            User::Leave( KErrGeneral );
-        }
-
-    iCurrentService = ENone;
-    CompleteRendering();
-    LOG("FinishProcessingL out");
-    }
-
-// ---------------------------------------------------------------------------
-// From class CMnMapImageServiceBase
-// ---------------------------------------------------------------------------
-//
-void CMnrpMapImageService::HandleRenderingL()
-    {
-    LeaveIfBusyL();
-
-    iCurrentService = ERender;
-    StartProcessingL();
-    }
-
-// ---------------------------------------------------------------------------
-// From class CMnServiceBase
-// ---------------------------------------------------------------------------
-//
-void CMnrpMapImageService::DoCancel()
-    {
-    iProcessor->Cancel();
-    iCurrentService = ENone;
-    }
-
--- a/locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/mapnavproviderrefapp/src/mnrpmapmodel.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1251 +0,0 @@
-/*
-* Copyright (c) 2006-2007 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:  CMnrpMapModel class implementation
-*
-*/
-
-
-
-#include <coemain.h>
-#include <barsread.h>
-#include <bautils.h>
-
-#include <aknlists.h>
-#include <akniconutils.h>
-#include <aknwaitdialog.h>
-
-#include <fbs.h>
-#include <imageconversion.h>
-#include <icl/imagedata.h>
-
-#include <lbs.h>
-#include <lbsposition.h>
-#include <lbspositioninfo.h>
-
-#include <epos_cposlandmark.h>
-#include <epos_cposlandmarkdatabase.h>
-#include <epos_cposlandmarkcategory.h>
-#include <epos_cposlmcategorymanager.h>
-
-#include "debug.h"
-#include "mnrpengine.h"
-#include "mnrputils.h"
-#include "mnrpappserver.h"
-
-#include "mnrpmapviewservice.h"
-#ifdef RD_MAPNAV_BITMAP_ACCESS
-#include "mnrpmapimageservice.h"
-#endif
-#include "mnrpmapmodel.h"
-
-const TInt KUpdateInterval = 1 * 1000 * 1000; // 1 sec
-const TInt KUpdateTimeout = 10 * 1000 * 1000; // 10 sec
-
-const TInt KMaxX = 180;
-const TInt KMinX = -180;
-const TInt KMapWidth = KMaxX - KMinX;
-
-const TInt KMaxY = 90;
-const TInt KMinY = -90;
-const TInt KMapHeight = KMaxY - KMinY;
-
-const TReal KDegree = 1.0;
-const TReal KMinute = KDegree / 60.0;
-const TReal KSecond = KMinute / 60.0;
-const TReal KMilliSecond = KSecond / 1000.0;
-
-const TReal KMaxCell = 60 * KDegree;
-const TReal KMinScale = 10 * KMilliSecond; // 0.01 second / 1 px
-
-const TInt KBigCellsInView = 2;
-
-const TInt KCellDividers[] = { 6, 2, 5 };
-const TInt KNumCellDividers = 3;
-
-const TReal KDefaultRadius = 1; // 1 degree
-const TReal KRadiusBorderFactor = 1.1; // 110%
-
-const TReal KEarthEquator = 40075000;
-//const TReal KEarthRadius = 6371010;
-
-const TInt KLmTextOffset = 3;
-const TInt KLmTextShadowOffset = 1;
-
-const TInt KGridPenSize( 1 );
-
-// ============================ LOCAL FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-TPoint AbsoluteToImage( TRealPoint aAbsolute, TReal aImageToAbsoluteScale )
-    {
-    TInt s = ( KMapWidth / 2 + aAbsolute.iX ) / aImageToAbsoluteScale;
-    TInt t = ( KMapHeight / 2 - aAbsolute.iY ) / aImageToAbsoluteScale;
-
-    return TPoint( s , t );
-    }
-
-// ============================ MEMBER CLASSES' FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-//  TRealPoint implementation
-// -----------------------------------------------------------------------------
-//
-
-TRealPoint::TRealPoint()
-    {
-    TRealX nan;
-    nan.SetNaN();
-
-    iX = nan;
-    iY = nan;
-    }
-
-TRealPoint::TRealPoint( TReal aX, TReal aY )
-    : iX( aX ), iY( aY )
-    {
-    }
-
-TRealPoint::TRealPoint( TCoordinate aCoordinate )
-    : iX( aCoordinate.Longitude() ), iY( aCoordinate.Latitude() )
-    {
-    }
-
-TCoordinate TRealPoint::Coordinate()
-    {
-    return TCoordinate( iY, iX );
-    }
-
-TRealPoint TRealPoint::operator+(
-    const TRealPoint& aRight )
-    {
-    return TRealPoint( this->iX + aRight.iX, this->iY + aRight.iY );
-    }
-
-TRealPoint TRealPoint::operator-(
-    const TRealPoint& aRight )
-    {
-    return TRealPoint( this->iX - aRight.iX, this->iY - aRight.iY );
-    }
-
-TRealPoint TRealPoint::operator*( const TReal& aRight )
-    {
-    return TRealPoint( this->iX * aRight, this->iY * aRight );
-    }
-
-TRealPoint TRealPoint::operator/( const TReal& aRight )
-    {
-    return TRealPoint( this->iX / aRight, this->iY / aRight );
-    }
-
-void TRealPoint::Set( TReal aX, TReal aY )
-    {
-    iX = aX;
-    iY = aY;
-    }
-
-TBool TRealPoint::IsValid()
-    {
-    return ( !Math::IsNaN( iX ) && !Math::IsNaN( iY ) );
-    }
-
-// -----------------------------------------------------------------------------
-//  CDrawItem implementation
-// -----------------------------------------------------------------------------
-//
-CMnrpMapModel::CDrawItem* CMnrpMapModel::CDrawItem::NewLC(
-    const CPosLandmark& aLm )
-    {
-    CDrawItem* self = new (ELeave) CDrawItem;
-    CleanupStack::PushL( self );
-
-    TPtrC name;
-    aLm.GetLandmarkName( name );
-    self->iText = MnrpUtils::PrintableStringLC( name );
-    CleanupStack::Pop( self->iText );
-
-    TLocality loc;
-    if ( KErrNone == aLm.GetPosition( loc ) )
-        {
-        self->SetAbsolutePosition( loc );
-        }
-
-    TPtrC iconFile;
-    TInt iconIndex, maskIndex;
-    if ( KErrNone == aLm.GetIcon( iconFile, iconIndex, maskIndex ) )
-        {
-        AknIconUtils::CreateIconL( self->iBitmap, self->iMask, iconFile, iconIndex, maskIndex );
-        AknIconUtils::PreserveIconData( self->iBitmap );
-        }
-
-    return self;
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CMnrpMapModel::CDrawItem* CMnrpMapModel::CDrawItem::NewLC(
-    const CPosLandmark& aLm,
-    CPosLmCategoryManager& aCatman )
-    {
-    CDrawItem* self = NewLC( aLm );
-
-    if ( !self->iBitmap )
-        {
-        // try icon from category
-        RArray<TPosLmItemId> cats;
-        CleanupClosePushL( cats );
-        aLm.GetCategoriesL( cats );
-
-        if ( cats.Count() == 1 )
-            {
-            CPosLandmarkCategory* cat = aCatman.ReadCategoryLC( cats[0] );
-
-            TPtrC iconFile;
-            TInt iconIndex, maskIndex;
-            if ( KErrNone == cat->GetIcon( iconFile, iconIndex, maskIndex ) )
-                {
-                AknIconUtils::CreateIconL( self->iBitmap, self->iMask, iconFile, iconIndex, maskIndex );
-                AknIconUtils::PreserveIconData( self->iBitmap );
-                }
-
-            CleanupStack::PopAndDestroy( cat );
-            }
-        CleanupStack::PopAndDestroy( &cats );
-        }
-
-    return self;
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpMapModel::CDrawItem::SetAbsolutePosition( const TLocality& aLocality )
-    {
-    iAbsolutePosition = TRealPoint( aLocality.Longitude(), aLocality.Latitude() );
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CMnrpMapModel::CDrawItem::~CDrawItem()
-    {
-    if ( iBitmap )
-        {
-        AknIconUtils::DestroyIconData( iBitmap );
-        }
-    delete iBitmap;
-    delete iMask;
-    delete iText;
-    }
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CMnrpMapModel::CMnrpMapModel(
-    MMapModelObserver& aObserver,
-    CMnrpEngine& aEngine )
-    :
-    iObserver( &aObserver ), iEngine( aEngine )
-    {
-    iScale = 1;
-    iViewOrigin.Set( 0, 0 );
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CMnrpMapModel::CMnrpMapModel( CMnrpEngine& aEngine )
-    : iEngine( aEngine )
-    {
-    iScale = 1;
-    iViewOrigin.Set( 0, 0 );
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CMnrpMapModel::~CMnrpMapModel()
-    {
-    delete iPositionRequest;
-    iDrawItems.ResetAndDestroy();
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-EXPORT_C CMnrpMapModel* CMnrpMapModel::NewL(
-    MMapModelObserver& aObserver,
-    CMnrpEngine& aEngine )
-    {
-    CMnrpMapModel* self = new (ELeave) CMnrpMapModel( aObserver, aEngine );
-    CleanupStack::PushL( self );
-    self->ConstructL();
-    CleanupStack::Pop( self );
-    return self;
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-EXPORT_C CMnrpMapModel* CMnrpMapModel::NewL( CMnrpEngine& aEngine )
-    {
-    CMnrpMapModel* self = new (ELeave) CMnrpMapModel( aEngine );
-    CleanupStack::PushL( self );
-    self->ConstructL();
-    CleanupStack::Pop( self );
-    return self;
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpMapModel::ConstructL()
-    {
-    _LIT( KRequestorName, "MnRefProvider" );
-    iPositionRequest = CMnrpPositionRequest::NewL( KRequestorName, *this );
-
-    TPositionUpdateOptions options;
-    options.SetUpdateInterval( TTimeIntervalMicroSeconds( KUpdateInterval ) );
-    options.SetUpdateTimeOut( TTimeIntervalMicroSeconds( KUpdateTimeout ) );
-    iPositionRequest->SetOptionsL( options );
-
-    AddCitiesL();
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-TBool CMnrpMapModel::CheckDrawItemHasPositionL( CDrawItem& aItem, const CPosLandmark& aLandmark )
-	{
-    if ( !aItem.AbsolutePosition().IsValid() )
-        {
-        // try to find coordinate by address
-        CPosLandmark* poi = iEngine.AddressToCoordL( aLandmark );
-        if ( poi )
-        	{
-            TLocality pos;
-            poi->GetPosition( pos );
-            aItem.SetAbsolutePosition( pos );
-        	}
-    	delete poi;
-        }
-    
-    return aItem.AbsolutePosition().IsValid();
-	}
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-EXPORT_C void CMnrpMapModel::UpdateModelL( CMnrpMapViewService& aService )
-    {
-    ASSERT( iObserver );
-
-    iDrawItems.ResetAndDestroy();
-
-    iShowCurrentLocation =
-        aService.CurrentLocationOption() != CMnMapView::ECurrentLocationDisabled;
-
-    if ( iShowCurrentLocation )
-        {
-        iPositionRequest->FetchNewPosition();
-        }
-
-    // Add client-defined marks
-    
-    iNumIgnoredLandmarks = 0;
-    TRealPoint min, max;
-
-    // add non-linked landmarks
-    for ( TInt i = 0; i < aService.LandmarksToShow().Count(); i++)
-        {
-        const CPosLandmark* lm = aService.LandmarksToShow()[i];
-        
-        CDrawItem* item = CDrawItem::NewLC( *lm );
-        if ( CheckDrawItemHasPositionL( *item, *lm ) )
-        	{
-        	iDrawItems.AppendL( item );
-            CleanupStack::Pop( item );
-            AdjustBoundingBox( *item, min, max );
-        	}
-        else
-        	{
-            CleanupStack::PopAndDestroy( item );
-            iNumIgnoredLandmarks++;
-        	}
-        }
-
-    // add linked landmarks
-    for ( TInt db = 0; db < aService.LandmarksToShowDatabases().Count(); db++ )
-        {
-        const HBufC* uri = aService.LandmarksToShowDatabases()[db];
-
-        LOG1("MnRefProvider::LinkedLandmarks: database (%S)", uri );
-
-        CPosLandmarkDatabase* lmdb = CPosLandmarkDatabase::OpenL( *uri );
-        CleanupStack::PushL( lmdb );
-
-        if ( lmdb->IsInitializingNeeded() )
-            {
-            ExecuteAndDeleteLD( lmdb->InitializeL() );
-            }
-
-        CPosLmCategoryManager* catman = CPosLmCategoryManager::NewL( *lmdb );
-        CleanupStack::PushL( catman );
-
-        for ( TInt i = 0; i < aService.LinkedLandmarksToShow(db).Count(); i++)
-            {
-            TPosLmItemId id = aService.LinkedLandmarksToShow(db)[i];
-            LOG1("MnRefProvider::LinkedLandmarks: id (%d)", id );
-
-            CPosLandmark* lm = lmdb->ReadLandmarkLC( id );
-
-            CDrawItem* item = CDrawItem::NewLC( *lm, *catman );
-            if ( CheckDrawItemHasPositionL( *item, *lm ) )
-            	{
-            	iDrawItems.AppendL( item );
-                CleanupStack::Pop( item );
-                AdjustBoundingBox( *item, min, max );
-            	}
-            else
-            	{
-                CleanupStack::PopAndDestroy( item );
-                iNumIgnoredLandmarks++;
-            	}
-
-            CleanupStack::PopAndDestroy( lm );
-            }
-
-        CleanupStack::PopAndDestroy( catman );
-        CleanupStack::PopAndDestroy( lmdb );
-        }
-
-    // Add predefined places
-    AddCitiesL();
-
-    LOG4("MnRefProvider::BoundingBox: %f, %f, %f, %f", min.iX, min.iY, max.iX, max.iY );
-
-    // set origin
-    iUseCurrentLocationAsOrigin = EFalse;
-    if ( aService.IsAreaCentralPointSet() )
-        {
-        TCoordinate center;
-        aService.GetAreaCentralPoint( center );
-        iViewOrigin.Set( center.Longitude(), center.Latitude() );
-        }
-    else if ( !Math::IsNaN( max.iX ) ) // others are also valid then
-        {
-        iViewOrigin.Set( ( max.iX + min.iX ) / 2, ( max.iY + min.iY ) / 2 );
-        }
-    else if ( iShowCurrentLocation )
-        {
-        // get current location and use it as center point
-        // this implementation defers location acquiring
-        iUseCurrentLocationAsOrigin = ETrue;
-        // FetchCurrentLocation();
-        iViewOrigin.Set( 0, 0 );
-        }
-    else
-        {
-        iViewOrigin.Set( 0, 0 );
-        }
-
-    LOG2("MnRefProvider: viewOrigin (%f, %f)", iViewOrigin.iX, iViewOrigin.iY);
-
-    // set scale
-    TReal desiredScale = 0;
-    TReal radius = 0;
-
-    if ( !Math::IsNaN( aService.AreaRadius() ) )
-        {
-         // Radius setting is easy in this implementation
-         // because map is rectangular just convert meters to degrees
-        radius = Abs( aService.AreaRadius() ) / KEarthEquator * 360;
-        LOG1("MnRefProvider: user radius (%f)", radius );
-        }
-    else if ( !Math::IsNaN( max.iX ) ) // others are also valid then
-        {
-        // get radius from bounding box
-        radius = Max( Abs( max.iX - min.iX ), Abs( max.iY - min.iY ) );
-        LOG2("MnRefProvider: bounding radius (%f), with border (%f)", radius, radius * KRadiusBorderFactor );
-        radius *= KRadiusBorderFactor;
-        }
-    else
-        {
-        // default radius
-        }
-
-    if ( radius <= 0 )
-        {
-        radius = KDefaultRadius;
-        LOG1("MnRefProvider: default radius (%f)", radius );
-        }
-
-    desiredScale = radius / TReal( Max( iScreenSize.iWidth, iScreenSize.iHeight ) );
-
-    LOG3("MnRefProvider: desired scale (%f), min (%f), max(%f)",
-        desiredScale, KMinScale, MaxScale() );
-
-    iScale = Max( Min( desiredScale, MaxScale() ), KMinScale );
-    CheckBorders();
-
-    LOG1("MnRefProvider: scale (%f)", iScale );
-
-    iObserver->HandleModelUpdateL();
-    }
-
-
-#ifdef RD_MAPNAV_BITMAP_ACCESS
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-EXPORT_C void CMnrpMapModel::UpdateModelL( const CMnrpMapImageService& aService )
-    {
-    iDrawItems.ResetAndDestroy();
-
-    iShowCurrentLocation =
-        aService.ShowOptions() & CMnMapImage::EShowOptionCurrentLocation;
-
-    if ( iShowCurrentLocation )
-        {
-        iPositionRequest->FetchNewPosition();
-        }
-
-    if ( aService.ShowOptions() & CMnMapImage::EShowOptionLandmarks)
-        {
-
-        // Add user-defined marks
-        TRealPoint min, max;
-
-        // add default landmarks
-        CPosLandmarkDatabase* lmdb = CPosLandmarkDatabase::OpenL();
-        CleanupStack::PushL( lmdb );
-
-        if ( lmdb->IsInitializingNeeded() )
-            {
-            ExecuteAndDeleteLD( lmdb->InitializeL() );
-            }
-
-        CPosLmCategoryManager* catman = CPosLmCategoryManager::NewL( *lmdb );
-        CleanupStack::PushL( catman );
-
-        CPosLmItemIterator* iter = lmdb->LandmarkIteratorL();
-        CleanupStack::PushL( iter );
-
-        TInt count = iter->NumOfItemsL();
-        for ( TInt i = 0; i < count; i++)
-            {
-            TPosLmItemId id = iter->NextL();
-
-            CPosLandmark* lm = lmdb->ReadLandmarkLC( id );
-
-            CDrawItem* item = CDrawItem::NewLC( *lm, *catman );
-            if ( CheckDrawItemHasPositionL( *item, *lm ) )
-            	{
-            	iDrawItems.AppendL( item );
-                CleanupStack::Pop( item );
-                AdjustBoundingBox( *item, min, max );
-            	}
-            else
-            	{
-                CleanupStack::PopAndDestroy( item );
-            	}
-
-            CleanupStack::PopAndDestroy( lm );
-            }
-        CleanupStack::PopAndDestroy( iter );
-        CleanupStack::PopAndDestroy( catman );
-        CleanupStack::PopAndDestroy( lmdb );
-
-        LOG4("MnRefProvider::BoundingBox: %f, %f, %f, %f", min.iX, min.iY, max.iX, max.iY );
-        }
-
-    if ( aService.ShowOptions() & CMnMapImage::EShowOptionPois )
-        {
-        // Add predefined places
-        AddCitiesL();
-        }
-
-    TMnMapImageParams params = aService.MapImageParams();
-
-    UpdateModel( params );
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-EXPORT_C void CMnrpMapModel::UpdateModel( const TMnMapImageParams& aParams )
-    {
-    SetScreenSize( aParams.Size() );
-
-    TCoordinate center;
-    aParams.GetCenterPoint( center );
-    iViewOrigin.Set( center.Longitude(), center.Latitude() );
-
-    LOG2("MnRefProvider: viewOrigin (%f, %f)", iViewOrigin.iX, iViewOrigin.iY);
-
-    // set scale
-    TReal desiredScale = 0;
-    TReal32 width, height;
-    aParams.GetVisibleArea( width, height );
-    TReal radius = Max( width, height );
-
-    if ( radius <= 0 )
-        {
-        radius = KDefaultRadius;
-        LOG1("MnRefProvider: default radius (%f)", radius );
-        }
-
-    desiredScale = radius / TReal( Max( iScreenSize.iWidth, iScreenSize.iHeight ) );
-
-    LOG3("MnRefProvider: desired scale (%f), min (%f), max(%f)",
-        desiredScale, KMinScale, MaxScale() );
-
-    iScale = Max( Min( desiredScale, MaxScale() ), KMinScale );
-    CheckBorders();
-
-    LOG1("MnRefProvider: scale (%f)", iScale );
-    }
-#endif
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpMapModel::AddCitiesL()
-    {
-    TArray<CPosLandmark*> places = iEngine.KnownPlacesL();
-    for ( TInt i = 0; i < places.Count(); i++)
-        {
-        CPosLandmark* lm = places[i];
-        CDrawItem* item = CDrawItem::NewLC( *lm );
-        item->iOwnPoi = ETrue;
-        iDrawItems.AppendL( item );
-        CleanupStack::Pop( item );
-        }
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-EXPORT_C void CMnrpMapModel::GetGrid( CMnrpMapModel::TGrid& aGrid ) const
-    {
-    TReal angle = Min( Width(), Height() );
-
-    TReal minAngle = Min( iScreenSize.iWidth, iScreenSize.iHeight ) * KMinScale;
-
-    if ( angle > minAngle )
-        {
-        // 1. Find nice grid scale
-
-        TInt dividerIndex = 0;
-        TReal cellSize = KMaxCell;
-
-        while ( cellSize * KBigCellsInView > angle )
-            {
-            cellSize /= KCellDividers[dividerIndex];
-
-            if ( ++dividerIndex == KNumCellDividers )
-                {
-                dividerIndex = 0;
-                }
-            }
-
-        aGrid.iAbsoluteGridStep = cellSize;
-
-        // 2. Find closest grid point
-
-        TReal x = TInt( iViewOrigin.iX / cellSize ) * cellSize;
-        TReal y = TInt( iViewOrigin.iY / cellSize ) * cellSize;
-
-        aGrid.iAbsoluteReference = TRealPoint( x, y ).Coordinate();
-        }
-    else
-        {
-        aGrid.iAbsoluteReference = TCoordinate( 0, 0 );
-        aGrid.iAbsoluteGridStep = minAngle / KBigCellsInView;
-        }
-
-    // convert to screen coordinates
-    aGrid.iReference = AbsoluteToScreen( aGrid.iAbsoluteReference );
-    aGrid.iGridStep = AbsoluteToScreen( aGrid.iAbsoluteGridStep );
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-EXPORT_C void CMnrpMapModel::Zoom( TReal aZoomRate )
-    {
-    iScale *= aZoomRate;
-    CheckBorders();
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-EXPORT_C void CMnrpMapModel::GoCenter()
-    {
-    iViewOrigin.Set( 0, 0 );
-    CheckBorders();
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-EXPORT_C void CMnrpMapModel::MoveTo( TCoordinate aTarget )
-    {
-    iViewOrigin = aTarget;
-    CheckBorders();
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpMapModel::CheckBorders()
-    {
-    if ( Height() > KMapHeight || Width() > KMapWidth )
-        {
-        iScale = MaxScale();
-        }
-    if ( iScale < KMinScale )
-        {
-        iScale = KMinScale;
-        }
-    if ( Left() < KMinX )
-        {
-        iViewOrigin.iX = KMinX + Width() / 2;
-        }
-    if ( Right() > KMaxX )
-        {
-        iViewOrigin.iX = KMaxX - Width() / 2;
-        }
-    if ( Top() > KMaxY )
-        {
-        iViewOrigin.iY = KMaxY - Height() / 2;
-        }
-    if ( Bottom() < KMinY )
-        {
-        iViewOrigin.iY = KMinY + Height() / 2;
-        }
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-EXPORT_C TReal CMnrpMapModel::Left() const
-    {
-    return iViewOrigin.iX - Width() / 2;
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-EXPORT_C TReal CMnrpMapModel::Right() const
-    {
-    return iViewOrigin.iX + Width() / 2;
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-EXPORT_C TReal CMnrpMapModel::Top() const
-    {
-    return iViewOrigin.iY + Height() / 2;
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-EXPORT_C TReal CMnrpMapModel::Bottom() const
-    {
-    return iViewOrigin.iY - Height() / 2;
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-EXPORT_C TReal CMnrpMapModel::Width() const
-    {
-    return TReal( iScreenSize.iWidth ) * iScale;
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-EXPORT_C TReal CMnrpMapModel::Height() const
-    {
-    return TReal( iScreenSize.iHeight ) * iScale;
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-EXPORT_C TCoordinate CMnrpMapModel::Center() const
-    {
-    return TCoordinate( iViewOrigin.iY, iViewOrigin.iX );
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-TArray<CMnrpMapModel::CDrawItem*> CMnrpMapModel::Items() const
-    {
-    // adjust all items to screen coordinates
-    for ( TInt i = 0; i < iDrawItems.Count(); i++ )
-        {
-        iDrawItems[i]->iScreenPosition = AbsoluteToScreen( iDrawItems[i]->iAbsolutePosition );
-        }
-    return iDrawItems.Array();
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CMnrpMapModel::TCurrentLocation CMnrpMapModel::CurrentLocation() const
-    {
-    TCurrentLocation current;
-
-    TPosition pos;
-    iPosInfo.GetPosition( pos );
-
-    current.iAbsoluteLocation = pos;
-
-    if ( !Math::IsNaN( pos.Latitude() ) && !Math::IsNaN( pos.Longitude() ) )
-        {
-        current.iLocation = AbsoluteToScreen( current.iAbsoluteLocation );
-
-        // calculate error radius in degrees and pixels
-        if ( !Math::IsNaN( pos.HorizontalAccuracy() ) )
-            {
-            current.iAbsoluteErrorDegrees = ( pos.HorizontalAccuracy() / KEarthEquator ) * 360;
-            current.iErrorRadius = current.iAbsoluteErrorDegrees / iScale;
-            }
-        else
-            {
-            current.iErrorRadius = 0;
-            current.iAbsoluteErrorDegrees = 0;
-            }
-
-        current.iIsValid = ETrue;
-        }
-    else
-        {
-        current.iIsValid = EFalse;
-        }
-
-    return current;
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-EXPORT_C void CMnrpMapModel::SetScreenSize( TSize aScreenSize )
-    {
-    __ASSERT_DEBUG( aScreenSize.iWidth >= 1 && aScreenSize.iHeight >= 1,
-                    Panic( KErrGeneral ) );
-    iScreenSize = aScreenSize;
-    CheckBorders();
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-TReal CMnrpMapModel::MaxScale() const
-    {
-    TReal scaleByWidth = KMapWidth / TReal( iScreenSize.iWidth );
-    TReal scaleByHeight = KMapHeight / TReal( iScreenSize.iHeight );
-    return Min( scaleByWidth, scaleByHeight );
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-TPoint CMnrpMapModel::AbsoluteToScreen( TRealPoint aAbsolutePoint ) const
-    {
-    TRealPoint realScreen = ( aAbsolutePoint - TRealPoint( Left(), Bottom() ) ) / iScale;
-    return TPoint( realScreen.iX, iScreenSize.iHeight - realScreen.iY );
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-EXPORT_C TPoint CMnrpMapModel::AbsoluteToScreen( TCoordinate aAbsolutePoint ) const
-    {
-    TRealPoint real( aAbsolutePoint.Longitude(), aAbsolutePoint.Latitude() );
-    return AbsoluteToScreen( real );
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-TInt CMnrpMapModel::AbsoluteToScreen( TReal aDistance ) const
-    {
-    return aDistance / iScale;
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-EXPORT_C TCoordinate CMnrpMapModel::ScreenToAbsolute( TPoint aScreenPoint ) const
-    {
-    TReal xdiff = aScreenPoint.iX * iScale;
-    TReal ydiff = aScreenPoint.iY * iScale;
-    return TCoordinate( Top() - ydiff, Left() + xdiff );
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-EXPORT_C TReal CMnrpMapModel::ScreenToAbsolute( TInt aDistance ) const
-    {
-    return aDistance * iScale;
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpMapModel::AdjustBoundingBox(
-    CMnrpMapModel::CDrawItem& aItem,
-    TRealPoint& aMin,
-    TRealPoint& aMax )
-    {
-    // X
-    if ( !Math::IsNaN( aItem.iAbsolutePosition.iX ) )
-        {
-        if ( Math::IsNaN( aMin.iX ) || aItem.iAbsolutePosition.iX < aMin.iX )
-            {
-            aMin.iX = aItem.iAbsolutePosition.iX;
-            }
-        if ( Math::IsNaN( aMax.iX ) || aItem.iAbsolutePosition.iX > aMax.iX )
-            {
-            aMax.iX = aItem.iAbsolutePosition.iX;
-            }
-        }
-
-    // Y
-    if ( !Math::IsNaN( aItem.iAbsolutePosition.iY ) )
-        {
-        if ( Math::IsNaN( aMin.iY ) || aItem.iAbsolutePosition.iY < aMin.iY )
-            {
-            aMin.iY = aItem.iAbsolutePosition.iY;
-            }
-        if ( Math::IsNaN( aMax.iY ) || aItem.iAbsolutePosition.iY > aMax.iY )
-            {
-            aMax.iY = aItem.iAbsolutePosition.iY;
-            }
-        }
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpMapModel::HandlePositionRequestCompletedL( TInt aError )
-    {
-    if ( !aError )
-        {
-        iPositionRequest->GetPosition( iPosInfo );
-        if ( iObserver )
-            {
-            iObserver->HandleModelUpdateL();
-            }
-        }
-    if ( iShowCurrentLocation )
-        {
-        iPositionRequest->FetchNewPosition();
-        }
-    }
-
-// =====================================================
-// DRAWING METHODS
-// =====================================================
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-EXPORT_C void CMnrpMapModel::RenderL(
-    CFbsBitmap& aBitmap,
-    TRect aTargetRect,
-    CFont* aTextFont,
-    CFont* aItemFont ) const
-	{
-	// create an off-screen device and context
-	CFbsBitmapDevice* bitmapDevice = CFbsBitmapDevice::NewL( &aBitmap );
-	CleanupStack::PushL( bitmapDevice );
-
-	CFbsBitGc* gc = NULL;
-	User::LeaveIfError( bitmapDevice->CreateContext( gc ) );
-	CleanupStack::PushL( gc );
-
-    gc->UseFont( aTextFont );
-
-    // get data
-    TGrid grid;
-    GetGrid( grid );
-
-    TBool isBackground = EFalse;
-    // background
-    if ( !isBackground )
-        {
-        // no map background, clear map area
-        gc->Clear( aTargetRect );
-        }
-
-    gc->SetClippingRect( aTargetRect );
-    gc->SetOrigin( aTargetRect.iTl );
-
-    DrawGrid( *gc, aTargetRect.Size(), grid );
-
-    gc->DiscardFont(); // text font
-    gc->UseFont( aItemFont );
-
-    // draw items
-    DrawLandmarks( *gc, *aItemFont, aTargetRect.Size(), isBackground ); // invert shadow and text color
-    DrawCurrentLocation( *gc, aTargetRect.Size() );
-
-    // cleanup
-
-    gc->DiscardFont(); // item font
-
-	CleanupStack::PopAndDestroy( gc );
-	CleanupStack::PopAndDestroy( bitmapDevice );
-	}
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-EXPORT_C TInt CMnrpMapModel::NumIgnoredLandmarks()
-	{
-	return iNumIgnoredLandmarks;
-	}
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpMapModel::DrawGrid(
-    CFbsBitGc& aGc,
-    const TSize& aBoxSize,
-    CMnrpMapModel::TGrid& aGrid ) const
-    {
-    const TRgb KGridLineColor( 128, 128, 128 );
-
-    aGc.SetPenSize( TSize( KGridPenSize, KGridPenSize ) );
-    aGc.SetPenColor( KGridLineColor );
-
-    if ( aGrid.iGridStep > 0 )
-        {
-        // 1. Vertical lines
-        TInt x = aGrid.iReference.iX;
-        // find leftmost vertical line
-        while ( x > 0 )
-        	{
-        	x -= aGrid.iGridStep;
-        	}
-        x += aGrid.iGridStep;
-        // draw lines selecting different line colors for major and minor lines
-        while ( x < aBoxSize.iWidth )
-            {
-            DrawVerticalLine( aGc, x, aBoxSize );
-            x += aGrid.iGridStep;
-            }
-
-        // 2. Horizontal lines
-        TInt y = aGrid.iReference.iY;
-        // find topmost vertical line
-        while ( y > 0 )
-        	{
-        	y -= aGrid.iGridStep;
-        	}
-        y += aGrid.iGridStep;
-        // draw lines selecting different line colors for major and minor lines
-        while ( y < aBoxSize.iHeight )
-            {
-            DrawHorizontalLine( aGc, y, aBoxSize );
-            y += aGrid.iGridStep;
-            }
-        }
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpMapModel::DrawVerticalLine( CFbsBitGc& aGc, TInt aX, TSize aBoxSize ) const
-    {
-    aGc.DrawLine( TPoint( aX, 0 ), TPoint( aX, aBoxSize.iHeight ) );
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpMapModel::DrawHorizontalLine( CFbsBitGc& aGc, TInt aY, TSize aBoxSize ) const
-    {
-    aGc.DrawLine( TPoint( 0, aY ), TPoint( aBoxSize.iWidth, aY ) );
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpMapModel::DrawLandmarks(
-    CFbsBitGc& aGc,
-    CFont& aFont,
-    const TSize& aBoxSize,
-    TBool aSwitchColorAndShadow ) const
-    {
-    const TSize KItemMarkSize( 3, 3 ); // pixels
-    const TSize KItemIconSize( 20, 20 ); // pixels
-
-    const TRgb KPoiColor( 0, 0, 192 );
-    const TRgb KPoiTextColor( 0, 0, 0 );
-    const TRgb KPoiTextShadowColor( 224, 224, 224 );
-    const TRgb KLmColor( 255, 0, 0 );
-    const TRgb KLmTextColor( 255, 0, 0 );
-    const TRgb KLmTextShadowColor( 224, 224, 224 );
-
-    TArray<CMnrpMapModel::CDrawItem*> items = Items();
-
-    RArray<TRect> textBoxes;
-
-    for ( TInt i = 0; i < items.Count(); i++ )
-        {
-        const TPoint& pos = items[i]->Position();
-        if ( pos.iX >= 0 && pos.iX < aBoxSize.iWidth &&
-             pos.iY >= 0 && pos.iY < aBoxSize.iHeight )
-            {
-            CFbsBitmap* icon = items[i]->Bitmap();
-            CFbsBitmap* mask = items[i]->Mask();
-
-            if ( icon && mask )
-                {
-                AknIconUtils::SetSize( icon, KItemIconSize );
-
-                TRect iconBox( pos, KItemIconSize );
-                iconBox.Move( -iconBox.Width() / 2, -iconBox.Height() / 2 );
-
-                aGc.DrawBitmapMasked(
-                    iconBox,
-                    icon,
-                    KItemIconSize,
-                    mask,
-                    EFalse );
-                }
-            else
-                {
-                if ( items[i]->IsPoi() )
-                    {
-                    aGc.SetPenColor( KPoiColor );
-                    }
-                else
-                    {
-                    aGc.SetPenColor( KLmColor );
-                    }
-
-                TRect markBox( pos, KItemMarkSize );
-                markBox.Move( -markBox.Width() / 2, -markBox.Height() / 2 );
-                aGc.SetPenSize( KItemMarkSize );
-                aGc.Plot( pos );
-                }
-
-            if ( items[i]->Text().Length() )
-                {
-                TPoint textPos( pos );
-                textPos.iX += KLmTextOffset;
-
-                TSize textSize( aFont.TextWidthInPixels( items[i]->Text() ), aFont.HeightInPixels() );
-                TRect textBox( textPos, textSize );
-
-                // verify this textbox does not intersect any previous ones
-                TBool overlaps = EFalse;
-                for ( TInt b = 0; b < textBoxes.Count(); b++ )
-                    {
-                    if ( textBox.Intersects( textBoxes[b] ) )
-                        {
-                        overlaps = ETrue;
-                        break;
-                        }
-                    }
-
-                if ( !overlaps )
-                    {
-                    textBoxes.Append( textBox );
-
-                    aGc.SetPenSize( TSize( 1, 1 ) );
-
-                    TRgb textColor, textShadowColor;
-
-	                if ( items[i]->IsPoi() )
-	                    {
-	                    textColor = KPoiTextColor;
-						textShadowColor = KPoiTextShadowColor;
-	                    }
-	                else
-	                    {
-	                    textColor = KLmTextColor;
-						textShadowColor = KLmTextShadowColor;
-	                    }
-
-                    // text shadow
-                    TPoint shadowPos( textPos + TPoint( KLmTextShadowOffset, KLmTextShadowOffset ) );
-                    aGc.SetPenColor( aSwitchColorAndShadow ? textColor : textShadowColor );
-                    aGc.DrawText( items[i]->Text(), shadowPos );
-
-                    // text itself
-                    aGc.SetPenColor( aSwitchColorAndShadow ? textShadowColor : textColor );
-                    aGc.DrawText( items[i]->Text(), textPos );
-                    }
-                }
-            }
-        }
-    textBoxes.Close();
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpMapModel::DrawCurrentLocation(
-    CFbsBitGc& aGc,
-    const TSize& aBoxSize ) const
-    {
-    const TSize KPositionPenSize( 20, 20 );
-    const TSize KPositionErrorPenSize( 1, 1 );
-    const TRgb KPositionColor( 255, 255, 0 );
-
-    // draw current location
-    CMnrpMapModel::TCurrentLocation location = CurrentLocation();
-
-    if ( location.iIsValid )
-        {
-        TPoint& pos = location.iLocation;
-
-        if ( pos.iX >= 0 && pos.iX < aBoxSize.iWidth &&
-             pos.iY >= 0 && pos.iY < aBoxSize.iHeight )
-            {
-            if ( location.iErrorRadius )
-                {
-                TRect circleBox( pos.iX, pos.iY, pos.iX, pos.iY );
-                circleBox.Grow( location.iErrorRadius, location.iErrorRadius );
-
-                aGc.SetPenSize( KPositionErrorPenSize );
-                aGc.SetBrushStyle( CGraphicsContext::EVerticalHatchBrush );
-                aGc.SetBrushColor( KPositionColor );
-                aGc.DrawEllipse( circleBox );
-                }
-
-            aGc.SetPenColor( KPositionColor );
-            aGc.SetPenSize( KPositionPenSize );
-            aGc.Plot( pos );
-            }
-        }
-    }
-
--- a/locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/mapnavproviderrefapp/src/mnrpmapview.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,249 +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:  CMnrpMapView class implementation
-*
-*/
-
-
-#include <e32base.h>
-#include <lbsposition.h>
-
-#include <eikmenup.h>
-#include <eikbtgpc.h>
-#include <avkon.rsg>
-
-#include <mnrefprovider.rsg>
-#include "mnrp.hrh"
-
-#include "debug.h"
-
-#include "mnrputils.h"
-#include "mnrpengine.h"
-
-#include "mnrpappui.h"
-#include "mnrpmapview.h"
-#include "mnrpmapcontrol.h"
-#include "mnrpmapviewservice.h"
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CMnrpMapView::CMnrpMapView( CMnrpEngine& aEngine ) 
-: iEngine( aEngine )
-    {
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CMnrpMapView::~CMnrpMapView()
-    {
-    TRAP_IGNORE( HandleUserSelectionL( KErrCancel ) );
-    delete iControl;
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CMnrpMapView* CMnrpMapView::NewL( TBool aChained, CMnrpEngine& aEngine )
-    {
-    CMnrpMapView* self = new (ELeave) CMnrpMapView( aEngine );
-    CleanupStack::PushL( self );
-    self->ConstructL( aChained );
-    CleanupStack::Pop( self );
-    return self;
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpMapView::ConstructL( TBool aChained )
-    {
-    iChained = aChained;
-    if ( aChained )
-        {
-        BaseConstructL( R_MNREFPROVIDER_MAP_VIEW_CHAINED );
-        }
-    else
-        {
-        BaseConstructL( R_MNREFPROVIDER_MAP_VIEW );
-        }
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpMapView::SetMapModeL( CMnrpMapViewService& aService )
-    {
-    iSelectionCallback = NULL;
-    iMapViewService = &aService;
-/*
-    if ( iChained )
-        {
-        Cba()->SetCommandSetL( R_AVKON_SOFTKEYS_OPTIONS_BACK );
-        }
-    else
-        {
-        Cba()->SetCommandSetL( R_AVKON_SOFTKEYS_OPTIONS_EXIT );
-        }
-*/        
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpMapView::SetSelectionModeL( 
-    CMnrpMapViewService& aService,  
-    MMapSelectionCallback& aCallback )
-    {
-    iMapViewService = &aService;
-    iSelectionCallback = &aCallback;
-    Cba()->SetCommandSetL( R_AVKON_SOFTKEYS_OPTIONS_CANCEL );
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpMapView::StopSelection()
-    {
-    iSelectionCallback = NULL;
-    iMapViewService = NULL;
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpMapView::HandleUserSelectionL( TInt aError )
-    {
-    if ( iSelectionCallback && iControl )
-        {
-        if ( !aError )
-            {
-            iSelectionCallback->HandleSelectionL( iControl->CurrentLocation() );
-            }
-        else
-            {
-            iSelectionCallback->HandleSelectionErrorL( aError );
-            }
-        iSelectionCallback = NULL;            
-        }
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-TUid CMnrpMapView::Id() const
-    {
-    return TUid::Uid( EMnrpMapViewId );
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpMapView::HandleCommandL( TInt aCommand )
-    {
-    switch ( aCommand )
-        {
-        case EMnrpCommandFullScreen:
-            if ( iControl ) 
-                {
-                iControl->ToggleFullScreen();
-                }
-            break;
-
-        case EMnrpCommandSelect:
-            HandleUserSelectionL( KErrNone );
-            break;
-
-        case EEikCmdExit:
-        case EAknSoftkeyBack:
-        case EAknSoftkeyExit:
-            HandleUserSelectionL( KErrCancel );
-            AppUi()->HandleCommandL( aCommand );
-            break;
-
-        default:
-            AppUi()->HandleCommandL( aCommand );
-            break;
-        }
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpMapView::DynInitMenuPaneL( TInt aResourceId, CEikMenuPane *aMenuPane )
-    {
-    if ( aResourceId == R_MNREFPROVIDER_MAP_VIEW_MENU )
-        {
-        TBool isSelectionMode = iSelectionCallback != NULL;
-        aMenuPane->SetItemDimmed( EMnrpCommandSelect, !isSelectionMode );
-        }
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpMapView::DoActivateL(
-    const TVwsViewId& /*aPrevViewId*/,
-    TUid /* aCustomMessageId */,
-    const TDesC8& /* aCustomMessage */)
-    {
-    if ( !iControl )
-        {
-        iControl = CMnrpMapControl::NewL( *this, ClientRect(), iEngine );
-        iControl->SetMopParent( this );
-        }
-
-    iControl->SetRect( ClientRect() );
-    if ( iMapViewService )
-        {
-        iControl->UpdateModelL( *iMapViewService );
-        }
-    iControl->SetSelectionModeL( ( iSelectionCallback == NULL ) ? EFalse : ETrue );
-
-    // Enable receiving of keyboard events.
-    CMnrpAppUi* ui = ( CMnrpAppUi* ) AppUi();
-    ui->AddToStackL( *this, iControl );
-
-    if ( iSelectionCallback )
-        {
-        ui->SetNaviPaneTitleL( iMapViewService->SelectionRequestText() );
-        }
-    else
-        {
-        _LIT( KMapView, "MapView" );
-	    ui->SetNaviPaneTitleL( KMapView );
-        }
-
-    // Make view visible.
-    iControl->MakeVisible( ETrue );
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpMapView::DoDeactivate()
-    {
-    if ( iControl )
-        {
-        // Hide view.
-        iControl->MakeVisible( EFalse );
-
-        // Disable receiving keyboard events.
-        AppUi()->RemoveFromStack( iControl );
-        }
-    }
-
--- a/locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/mapnavproviderrefapp/src/mnrpmapviewservice.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,245 +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:  CMnrpMapViewService class implementation
-*
-*/
-
-
-#include <e32base.h>
-#include <eikenv.h>
-
-#include <lbsposition.h>
-
-#include <epos_cposlandmark.h>
-#include <epos_cposlandmarkdatabase.h>
-
-#include "debug.h"
-#include <mnmapviewservicebase.h>
-
-#include "mnrpappui.h"
-#include "mnrpmapview.h"
-#include "mnrpengine.h"
-#include "mnrpdocument.h"
-#include "mnrpappserver.h"
-
-#include "mnrpmapviewservice.h"
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-CMnrpMapViewService* CMnrpMapViewService::NewL()
-    {
-    CMnrpMapViewService* self = new (ELeave) CMnrpMapViewService();
-    CleanupStack::PushL( self );
-    self->ConstructL();
-    CleanupStack::Pop( self );
-    return self;
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-CMnrpMapViewService::CMnrpMapViewService()
-    {
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-CMnrpMapViewService::~CMnrpMapViewService()
-    {
-    if ( iSelecting )
-        {
-        DoCancel();
-        CompleteRequest( KErrCancel );
-        }
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-void CMnrpMapViewService::ConstructL()
-    {
-    BaseConstructL();
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-CMnrpAppUi* CMnrpMapViewService::AppUi()
-    {
-    CMnrpAppServer* server = ( CMnrpAppServer* ) Server();
-    if ( server )
-        {
-        return server->AppUi();
-        }
-    return NULL;
-    }
-
-// ---------------------------------------------------------------------------
-// From class CMnMapViewServiceBase
-// ---------------------------------------------------------------------------
-//
-void CMnrpMapViewService::HandleShowMapL()
-    {
-    LOG("MnRefProvider::HandleShowMapL in");
-
-    /** This implementation cannot show map if selection is active */
-    if ( iSelecting )
-        {
-        User::Leave( KErrInUse );
-        }
-
-    if ( AppUi() )
-        {
-        AppUi()->ShowMapL( *this );
-        }
-
-    LOG("MnRefProvider::HandleShowMapL out");
-    }
-
-// ---------------------------------------------------------------------------
-//  From class CMnMapViewServiceBase
-//
-//  This callback differs from HandleShowMapL in a way that central point
-//  setting is ignored and current location is used instead as central point.
-//
-//  The implementation is the example of how to reject unsupported requests 
-// ---------------------------------------------------------------------------
-//
-void CMnrpMapViewService::HandleShowCurrentLocationL()
-    {
-    User::Leave( KErrNotSupported );
-    }
-
-// ---------------------------------------------------------------------------
-//  From class CMnMapViewServiceBase
-// ---------------------------------------------------------------------------
-//
-void CMnrpMapViewService::HandleSelectFromMapL()
-    {
-    LOG("MnRefProvider::HandleSelectFromMapL in");
-
-    /** Only one selection must be active */
-    if ( iSelecting )
-        {
-        User::Leave( KErrInUse );
-        }
-
-    if ( AppUi() )
-        {
-        iSelecting = ETrue;
-        AppUi()->StartSelectionL( *this, *this );
-        }
-
-    LOG("MnRefProvider::HandleSelectFromMapL out");
-    }
-
-// ---------------------------------------------------------------------------
-//  From class CMnServiceBase
-// ---------------------------------------------------------------------------
-//
-void CMnrpMapViewService::DoCancel()
-    {
-    if ( iSelecting )
-        {
-        iSelecting = EFalse;
-        StopSelection();
-        }
-    }
-
-// ---------------------------------------------------------------------------
-//  From class MMapSelectionCallback
-// ---------------------------------------------------------------------------
-//
-void CMnrpMapViewService::HandleSelectionErrorL( TInt aError )
-    {
-    __ASSERT_DEBUG( iSelecting, Panic( KErrGeneral ) );
-
-    iSelecting = EFalse;
-    // selection view dismissed
-    CompleteRequest( aError );
-    }
-
-// ---------------------------------------------------------------------------
-//  From class MMapSelectionCallback
-// ---------------------------------------------------------------------------
-//
-void CMnrpMapViewService::HandleSelectionL( const TCoordinate& aSelection )
-    {
-    __ASSERT_DEBUG( iSelecting, Panic( KErrGeneral ) );
-
-    iSelecting = EFalse;
-    TInt err = KErrNone;
-    TRAP( err, CompleteSelectionL( aSelection ) );
-    if ( err )
-        {
-        CompleteRequest( err );
-        }
-    StopSelection();
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-void CMnrpMapViewService::CompleteSelectionL( const TCoordinate& aSelection )
-    {
-    TLocality loc( aSelection, 0 );
-    CPosLandmark* lm = CPosLandmark::NewLC();
-    lm->SetPositionL( loc );
-
-    // send landmark to client
-    CompleteSelectionRequestL( *lm );
-
-    CleanupStack::PopAndDestroy( lm );
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-void CMnrpMapViewService::StopSelection()
-    {
-    if ( AppUi() )
-        {
-        AppUi()->StopSelection();
-        }
-    }
-    
-// ---------------------------------------------------------------------------
-//  From class MMapSelectionCallback
-// ---------------------------------------------------------------------------
-//
-void CMnrpMapViewService::HandleSelectionL( TInt aLandmarkIndex )
-    {
-    __ASSERT_DEBUG( iSelecting, Panic( KErrGeneral ) );
-
-    iSelecting = EFalse;
-    CompleteSelectionRequest( aLandmarkIndex );
-    StopSelection();
-    }
-    
-// ---------------------------------------------------------------------------
-//  From class MMapSelectionCallback
-// ---------------------------------------------------------------------------
-//
-void CMnrpMapViewService::HandleSelectionL( TPosLmItemId aLandmarkId, TInt aDbIndex )
-    {
-    __ASSERT_DEBUG( iSelecting, Panic( KErrGeneral ) );
-
-    iSelecting = EFalse;
-    CompleteSelectionRequest( aLandmarkId, aDbIndex );
-    StopSelection();
-    }
--- a/locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/mapnavproviderrefapp/src/mnrpnavicontrol.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,209 +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:  CMnrpNaviControl class implementation
-*
-*/
-
-
-#include <e32base.h>
-#include <coemain.h>
-#include <aknlists.h>
-#include <barsread.h>
-
-#include <aknlists.h>
-
-#include "mnrpnavimodel.h"
-#include "mnrpnaviview.h"
-#include "mnrpnavicontrol.h"
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CMnrpNaviControl::CMnrpNaviControl( CMnrpNaviView& aView )
- :  iView( aView )
-    { 
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CMnrpNaviControl::~CMnrpNaviControl()
-    {
-    delete iListBox;
-    delete iModel;
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CMnrpNaviControl* CMnrpNaviControl::NewL( 
-    CMnrpNaviView& aView, 
-    const TRect& aRect,
-    CMnrpEngine& aEngine )
-    {
-    CMnrpNaviControl* self = new (ELeave) CMnrpNaviControl( aView );
-    CleanupStack::PushL( self );
-    self->ConstructL( aRect, aEngine );
-    CleanupStack::Pop( self );
-    return self;
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpNaviControl::ConstructL( const TRect& aRect, CMnrpEngine& aEngine )
-    {
-    // Create a window for this application view
-    CreateWindowL();
-    CreateListBoxL();
-    
-    // Set the windows size
-    SetRect( aRect );
-    
-    iModel = CMnrpNaviModel::NewL( *this, aEngine );
-
-    // Activate the window, which makes it ready to be drawn
-    ActivateL();
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpNaviControl::UpdateModelL( CPosLandmark& aDestination )
-    {
-    iModel->SetDestinationL( aDestination );
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpNaviControl::HandleModelUpdateL()
-    {
-    TArray< CMnrpNaviModel::CListItem* > items = iModel->ListItemsL();
-    
-    const TInt KGranularity = 8;
-    CDesCArraySeg* array = new (ELeave) CDesCArraySeg( KGranularity );
-    CleanupStack::PushL( array );
-    
-    _LIT( KItemFormat, "%S\t%S\t\t" );
-    for ( TInt i = 0; i < items.Count(); i++ )
-        {
-        CMnrpNaviModel::CListItem* item = items[i];
-
-        const TInt KNumTabsAndOther = 10;
-        HBufC* text = HBufC::NewLC(
-            item->Header().Length() + item->Value().Length() + KNumTabsAndOther);
-
-        text->Des().Format( KItemFormat, &(item->Header()), &(item->Value()) );
-        
-        array->AppendL( *text );
-        CleanupStack::PopAndDestroy( text );
-        }
-        
-    CleanupStack::Pop( array );
-
-    CTextListBoxModel* model = iListBox->Model();
-    model->SetItemTextArray( array );
-    model->SetOwnershipType( ELbmOwnsItemArray );
-    iListBox->HandleItemAdditionL();
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-TInt CMnrpNaviControl::CountComponentControls() const 
-    { 
-    return 1; 
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CCoeControl* CMnrpNaviControl::ComponentControl(TInt aIndex) const
-    {
-    return (aIndex == 0) ? iListBox : NULL;
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-TKeyResponse CMnrpNaviControl::OfferKeyEventL(
-    const TKeyEvent& aKeyEvent, TEventCode aType)
-    {
-    TKeyResponse response = EKeyWasNotConsumed;
-
-    switch (aKeyEvent.iCode)
-        {
-        case EKeyUpArrow:
-        case EKeyDownArrow:
-            // Scrolling the listbox. Forward to iListBox.
-            response = iListBox->OfferKeyEventL(aKeyEvent, aType);
-            break;
-
-        case EKeyLeftArrow:
-        case EKeyRightArrow:
-            // Eat these to disable switching views
-            response = EKeyWasConsumed;
-            break;
-
-        case EKeyDevice3:
-            response = EKeyWasConsumed;
-            break;
-
-        default:
-            // menu keys should be handled
-            break;
-        }
-
-    return response;
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpNaviControl::CreateListBoxL()
-    {
-    // Create a control to display a list of descriptors
-    iListBox = new (ELeave) CAknSingleHeadingStyleListBox();
-    iListBox->SetContainerWindowL( *this );
-    iListBox->ConstructL(this, CEikListBox::EViewerFlag );
-
-    // Create scrollbars
-    CEikScrollBarFrame* scrollBar = iListBox->CreateScrollBarFrameL();
-    scrollBar->SetScrollBarVisibilityL(
-                CEikScrollBarFrame::EOff, CEikScrollBarFrame::EAuto);
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpNaviControl::SizeChanged()
-    {
-    iListBox->SetRect( Rect() );
-    iListBox->DrawDeferred();
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpNaviControl::HandleResourceChange( TInt aType )
-    {
-    CCoeControl::HandleResourceChange( aType );
-    if ( aType == KEikDynamicLayoutVariantSwitch )
-        {
-        SetRect( iView.ClientRect() );
-        }
-    }
--- a/locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/mapnavproviderrefapp/src/mnrpnavigationservice.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,90 +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:  CMnrpNavigationService class implementation
-*
-*/
-
-
-#include <e32base.h>
-#include <eikenv.h>
-
-#include <lbsposition.h>
-
-#include <epos_cposlandmark.h>
-
-#include "debug.h"
-#include <mnnavigationservicebase.h>
-
-#include "mnrpappui.h"
-#include "mnrpnavimodel.h"
-#include "mnrpnaviview.h"
-#include "mnrpappserver.h"
-#include "mnrpnavigationservice.h"
-
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-CMnrpNavigationService* CMnrpNavigationService::NewL()
-    {
-    CMnrpNavigationService* self = new (ELeave) CMnrpNavigationService();
-    CleanupStack::PushL( self );
-    self->ConstructL();
-    CleanupStack::Pop( self );
-    return self;
-    }
-    
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-CMnrpNavigationService::CMnrpNavigationService()
-    {
-    }
-    
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-CMnrpNavigationService::~CMnrpNavigationService()
-    {
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-void CMnrpNavigationService::ConstructL()
-    {
-    BaseConstructL();
-    }
-
-// ---------------------------------------------------------------------------
-// From class CMnNavigationServiceBase
-// ---------------------------------------------------------------------------
-//
-void CMnrpNavigationService::HandleNavigateToL(
-    const CPosLandmark& aLandmark)
-    {
-    CMnrpAppServer* server = ( CMnrpAppServer* ) Server();
-    CMnrpAppUi* ui = server->AppUi();
-    ui->ShowNavigationL( aLandmark );
-    }
-        
-// ---------------------------------------------------------------------------
-// From class CMnServiceBase
-// ---------------------------------------------------------------------------
-//
-void CMnrpNavigationService::DoCancel()
-    {
-    }
--- a/locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/mapnavproviderrefapp/src/mnrpnavimodel.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,241 +0,0 @@
-/*
-* Copyright (c) 2006-2007 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:  CMnrpNaviModel class implementation
-*
-*/
-
-
-#include <coemain.h>
-#include <aknlists.h>
-#include <barsread.h>
-
-#include <lbs.h>
-#include <lbsposition.h>
-#include <lbspositioninfo.h>
-
-#include <epos_cposlandmark.h>
-
-#include "mnrputils.h"
-#include "mnrpengine.h"
-#include "mnrpnavimodel.h"
-
-const TInt KUpdateInterval = 1 * 1000 * 1000; // 1 sec
-const TInt KUpdateTimeout = 10 * 1000 * 1000; // 10 sec
-
-_LIT( KNotDefined, "<n/a>" );
-_LIT( KDestination, "destination" );
-_LIT( KPosition, "position" );
-_LIT( KDistance, "distance" );
-_LIT( KBearing, "bearing" );
-_LIT( KDestinationLat, "dest.lat." );
-_LIT( KDestinationLon, "dest.lon." );
-_LIT( KPositionLat, "pos.lat." );
-_LIT( KPositionLon, "pos.lon." );
-_LIT( KSpeed, "speed" );
-_LIT( KHeading, "heading" );
-_LIT( KMagHeading, "m.heading" );
-_LIT( KCourse, "course" );
-_LIT( KMagCourse, "m.course" );
-
-// ========================== MEMBER CLASS' FUNCTIONS ==========================
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CMnrpNaviModel::CListItem* CMnrpNaviModel::CListItem::NewL( 
-    const TDesC& aItemHeader, 
-    const TDesC& aItemValue )
-    {
-    CListItem* self = new (ELeave) CListItem;
-    CleanupStack::PushL( self );
-    self->iHeader = aItemHeader.AllocL();
-    self->iValue = aItemValue.AllocL();
-    CleanupStack::Pop( self );
-    return self;
-    }
-    
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CMnrpNaviModel::CListItem::~CListItem()
-    {
-    delete iHeader;
-    delete iValue;
-    }
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CMnrpNaviModel::CMnrpNaviModel( MNaviModelObserver& aObserver, CMnrpEngine& aEngine )
-    : iEngine( aEngine ), iObserver( aObserver )
-    { 
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CMnrpNaviModel::~CMnrpNaviModel()
-    {
-    delete iPositionRequest;
-    delete iDestination;
-    iListItems.ResetAndDestroy();
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CMnrpNaviModel* CMnrpNaviModel::NewL( MNaviModelObserver& aObserver, CMnrpEngine& aEngine  )
-    {
-    CMnrpNaviModel* self = new (ELeave) CMnrpNaviModel( aObserver, aEngine );
-    CleanupStack::PushL( self );
-    self->ConstructL();
-    CleanupStack::Pop( self );
-    return self;
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpNaviModel::ConstructL()
-    {
-    _LIT( KRequestorName, "MnRefProvider" );
-    iPositionRequest = CMnrpPositionRequest::NewL( KRequestorName, *this );
-    
-    TPositionUpdateOptions options;
-    options.SetUpdateInterval( TTimeIntervalMicroSeconds( KUpdateInterval ) );
-    options.SetUpdateTimeOut( TTimeIntervalMicroSeconds( KUpdateTimeout ) );
-    iPositionRequest->SetOptionsL( options );
-    
-    iPositionRequest->FetchNewPosition();
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpNaviModel::SetDestinationL( const CPosLandmark& aNewDestination )
-    {
-    delete iDestination;
-    iDestination = NULL;
-    iDestination = CPosLandmark::NewL( aNewDestination );
-    
-    iObserver.HandleModelUpdateL();
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-TArray<CMnrpNaviModel::CListItem*> CMnrpNaviModel::ListItemsL()
-    {
-    iListItems.ResetAndDestroy();
-    
-    TBuf<64> buf;
-    TPosition position;
-    TLocality destination;
-
-    iPosInfo.GetPosition( position );
-
-    if ( !iDestination || iDestination->GetPosition( destination ) )
-        {
-        iListItems.AppendL( CListItem::NewL( KDestination, KNotDefined ) );
-        }
-    else
-        {
-        TPtrC name;
-        iDestination->GetLandmarkName( name );
-        HBufC* printableName = MnrpUtils::PrintableStringLC( name );
-        iListItems.AppendL( CListItem::NewL( KDestination, *printableName ) );
-        CleanupStack::PopAndDestroy( printableName );
-
-        TBool validPosition = ( !Math::IsNaN( position.Latitude() ) && 
-                                !Math::IsNaN( position.Longitude() ) );
-
-        if ( validPosition )
-            {
-            TReal32 distance, bearing;
-            if ( position.Distance( destination, distance ) == KErrNone )
-                {
-                MnrpUtils::DistanceToString( distance, buf );
-                iListItems.AppendL( CListItem::NewL( KDistance, buf ) );
-                }
-            else
-                {
-                iListItems.AppendL( CListItem::NewL( KDistance, KNotDefined ) );
-                }
-                
-            if ( position.BearingTo( destination, bearing ) == KErrNone )
-                {
-                MnrpUtils::AngleToString( bearing, buf );
-                iListItems.AppendL( CListItem::NewL( KBearing, buf ) );
-                }
-            else
-                {
-                iListItems.AppendL( CListItem::NewL( KBearing, KNotDefined ) );
-                }
-
-            MnrpUtils::SpeedToString( iPositionRequest->Speed(), buf );
-            iListItems.AppendL( CListItem::NewL( KSpeed, buf ) );
-
-            MnrpUtils::AngleToString( iPositionRequest->Course(), buf );
-            iListItems.AppendL( CListItem::NewL( KCourse, buf ) );
-
-            MnrpUtils::AngleToString( iPositionRequest->Heading(), buf );
-            iListItems.AppendL( CListItem::NewL( KHeading, buf ) );
-
-            MnrpUtils::CoordinateToString( position.Latitude(), buf, ETrue, ETrue );
-            iListItems.AppendL( CListItem::NewL( KPositionLat, buf ) );
-
-            MnrpUtils::CoordinateToString( position.Longitude(), buf, ETrue, ETrue );
-            iListItems.AppendL( CListItem::NewL( KPositionLon, buf ) );
-            }
-        else
-            {
-            iListItems.AppendL( CListItem::NewL( KPosition, KNotDefined ) );
-            }
-
-        MnrpUtils::CoordinateToString( destination.Latitude(), buf, ETrue, ETrue );
-        iListItems.AppendL( CListItem::NewL( KDestinationLat, buf ) );
-
-        MnrpUtils::CoordinateToString( destination.Longitude(), buf, ETrue, ETrue );
-        iListItems.AppendL( CListItem::NewL( KDestinationLon, buf ) );
-
-        if ( validPosition )
-            {
-            MnrpUtils::AngleToString( iPositionRequest->MagneticCourse(), buf );
-            iListItems.AppendL( CListItem::NewL( KMagCourse, buf ) );
-
-            MnrpUtils::AngleToString( iPositionRequest->MagneticHeading(), buf );
-            iListItems.AppendL( CListItem::NewL( KMagHeading, buf ) );
-            }
-        }
-   
-    return iListItems.Array();
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpNaviModel::HandlePositionRequestCompletedL( TInt aError )
-    {
-    if ( !aError )
-        {
-        iPositionRequest->GetPosition( iPosInfo );
-        TPosition position;
-        iPosInfo.GetPosition( position );
-
-        iObserver.HandleModelUpdateL();
-        }
-    iPositionRequest->FetchNewPosition();
-    }
--- a/locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/mapnavproviderrefapp/src/mnrpnaviview.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,160 +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:  CMnrpNaviView class implementation
-*
-*/
-
-
-#include <e32base.h>
-#include <lbsposition.h>
-#include <epos_cposlandmark.h>
-
-#include <mnrefprovider.rsg>
-#include "mnrp.hrh"
-
-#include "debug.h"
-#include "mnrputils.h"
-#include "mnrpengine.h"
-
-#include "mnrpappui.h"
-#include "mnrpnavicontrol.h"
-
-#include "mnrpnaviview.h"
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CMnrpNaviView::CMnrpNaviView( CMnrpEngine& aEngine )
- : iEngine( aEngine )
-    {
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CMnrpNaviView::~CMnrpNaviView()
-    {
-    delete iDestination;
-    delete iControl;
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CMnrpNaviView* CMnrpNaviView::NewL( TBool aChained, CMnrpEngine& aEngine )
-    {
-    CMnrpNaviView* self = new (ELeave) CMnrpNaviView( aEngine );
-    CleanupStack::PushL( self );
-    self->ConstructL( aChained );
-    CleanupStack::Pop( self );
-    return self;
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpNaviView::ConstructL( TBool aChained )
-    {
-    if ( aChained )
-        {
-        BaseConstructL( R_MNREFPROVIDER_NAVI_VIEW_CHAINED );
-        }
-    else
-        {
-        BaseConstructL( R_MNREFPROVIDER_NAVI_VIEW );
-        }
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpNaviView::SetDestinationL( const CPosLandmark& aNewDestination )
-    {
-    delete iDestination;
-    iDestination = NULL;
-    iDestination = CPosLandmark::NewL( aNewDestination );
-    if ( iControl )
-        {
-        iControl->UpdateModelL( *iDestination );
-        }
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-TUid CMnrpNaviView::Id() const
-    {
-    return TUid::Uid( EMnrpNavigationViewId );
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpNaviView::HandleCommandL( TInt aCommand )
-    {
-    switch ( aCommand )
-        {
-        default:
-            AppUi()->HandleCommandL( aCommand );
-            break;
-        }
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpNaviView::DoActivateL(
-    const TVwsViewId& /*aPrevViewId*/,
-    TUid /* aCustomMessageId */,
-    const TDesC8& /* aCustomMessage */)
-    {
-    if ( !iControl )
-        {
-        iControl = CMnrpNaviControl::NewL( *this, ClientRect(), iEngine );
-        iControl->SetMopParent( this );
-        }
-
-    if ( iDestination )
-        {
-        iControl->UpdateModelL( *iDestination );
-        }
-
-    // Enable receiving of keyboard events.
-    CMnrpAppUi* ui = ( CMnrpAppUi* ) AppUi();
-    ui->AddToStackL( *this, iControl );
-
-    _LIT( KNavigation, "Navigation" );
-    ui->SetNaviPaneTitleL( KNavigation );
-
-    // Make view visible.
-    iControl->MakeVisible( ETrue );
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpNaviView::DoDeactivate()
-    {
-    if ( iControl )
-        {
-        // Hide view.
-        iControl->MakeVisible( EFalse );
-
-        // Disable receiving keyboard events.
-        AppUi()->RemoveFromStack( iControl );
-        }
-    }
-
--- a/locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/mapnavproviderrefapp/src/mnrppositionrequest.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,272 +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:  CMnrpPositionRequest class implementation
-*
-*/
-
-
-#include <aknwaitdialog.h>
-#include <coemain.h>
-#include <aknnotewrappers.h>
-
-#include <lbspositioninfo.h>
-
-#include "mnrppositionrequest.h"
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CMnrpPositionRequest::CMnrpPositionRequest(
-    MMnrpPositionObserver& aObserver )
-    : 
-    CActive( CActive::EPriorityStandard ), 
-    iObserver( aObserver ),
-    iState( EIdle )
-    {
-    TRealX nan;
-    nan.SetNaN();
-    iSpeed = iHeading = iCourse = iMagneticHeading = iMagneticCourse = nan;
-    
-    CActiveScheduler::Add( this );
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpPositionRequest::ConstructL( const TDesC& aRequestorName )
-    {
-    const TInt KBufSize = 8192;
-    iGenericPosition = HPositionGenericInfo::NewL( KBufSize );
-    
-    // Connect to the location server
-    User::LeaveIfError( iLocationServer.Connect() );
-
-    // Open the default positioner
-    User::LeaveIfError( iPositioner.Open( iLocationServer ) );
-
-    // Set this application as location requestor
-    User::LeaveIfError( iPositioner.SetRequestor(
-        CRequestor::ERequestorService,
-        CRequestor::EFormatApplication,
-        aRequestorName ) );
-
-    // Set default options
-    TPositionUpdateOptions updateOptions;
-
-    const TInt K30Seconds = 30000000;
-    TTimeIntervalMicroSeconds timeOut( K30Seconds );
-
-    updateOptions.SetUpdateTimeOut( timeOut );
-    SetOptionsL( updateOptions );
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-EXPORT_C CMnrpPositionRequest* CMnrpPositionRequest::NewL(
-    const TDesC& aAppName, 
-    MMnrpPositionObserver& aObserver )
-    {
-    CMnrpPositionRequest* self =
-        new (ELeave) CMnrpPositionRequest( aObserver );
-    CleanupStack::PushL( self );
-    self->ConstructL( aAppName );
-    CleanupStack::Pop( self );
-    return self;
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-EXPORT_C CMnrpPositionRequest::~CMnrpPositionRequest()
-    {
-    Cancel();
-    iPositioner.Close();
-    iLocationServer.Close();
-    delete iGenericPosition;
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-EXPORT_C void CMnrpPositionRequest::FetchNewPosition( TBool aLastKnownLocationAllowed )
-    {
-    Cancel();
-    // Request location
-    iState = EAcquiringDefaultLocation;
-    iLastKnownLocationAllowed = aLastKnownLocationAllowed;
-    ExecuteNextStep();
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-EXPORT_C void CMnrpPositionRequest::GetPosition( TPositionInfo& aPositionInfo )
-    {
-    aPositionInfo = iPositionInfo;
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-EXPORT_C TReal32 CMnrpPositionRequest::Speed() 
-    { 
-    return iSpeed;
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-EXPORT_C TReal32 CMnrpPositionRequest::Heading() 
-    { 
-    return iHeading; 
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-EXPORT_C TReal32 CMnrpPositionRequest::MagneticHeading() 
-    { 
-    return iMagneticHeading; 
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-EXPORT_C TReal32 CMnrpPositionRequest::Course() 
-    {
-    return iCourse;
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-EXPORT_C TReal32 CMnrpPositionRequest::MagneticCourse()
-    { 
-    return iMagneticCourse;
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpPositionRequest::DoCancel()
-    {
-    // Cancel location request
-    if (iState == EAcquiringDefaultLocation)
-        {
-        iPositioner.CancelRequest( EPositionerNotifyPositionUpdate );
-        }
-    else if (iState == EAcquiringLastKnownLocation)
-        {
-        iPositioner.CancelRequest( EPositionerGetLastKnownPosition );
-        }
-    iState = EIdle;
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpPositionRequest::RunL()
-    {
-    if ( iStatus != KErrNone &&
-         iState == EAcquiringDefaultLocation && 
-         iLastKnownLocationAllowed )
-        {
-        // Fetching current location failed. Try last known location.
-        iState = EAcquiringLastKnownLocation;
-        ExecuteNextStep();
-        }
-    else
-        {
-        // Operation finished, notify observer
-        iState = EIdle;
-        SaveContainer( *iGenericPosition );
-        iObserver.HandlePositionRequestCompletedL( iStatus.Int() );
-        }
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-TInt CMnrpPositionRequest::RunError(TInt /*aError*/)
-    {
-    // Ignore possible errors.
-    return KErrNone;
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpPositionRequest::ExecuteNextStep()
-    {
-    iStatus = KRequestPending;
-
-    switch (iState)
-        {
-        case EAcquiringDefaultLocation:
-            InitContainer( *iGenericPosition );
-            iPositioner.NotifyPositionUpdate( *iGenericPosition, iStatus);
-            break;
-        case EAcquiringLastKnownLocation:
-            iPositioner.GetLastKnownPosition( iPositionInfo, iStatus );
-            break;
-        default:    
-            // this case should never happen, see RunL
-            return;
-        }
-
-    SetActive();
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-EXPORT_C void CMnrpPositionRequest::SetOptionsL( const TPositionUpdateOptionsBase& aOptions )
-    {
-    User::LeaveIfError( iPositioner.SetUpdateOptions( aOptions ) );
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpPositionRequest::InitContainer( HPositionGenericInfo& aGenericInfo )
-    {
-    aGenericInfo.ClearPositionData();
-    
-    aGenericInfo.SetRequestedField( EPositionFieldHorizontalSpeed );
-    aGenericInfo.SetRequestedField( EPositionFieldTrueCourse );
-    aGenericInfo.SetRequestedField( EPositionFieldMagneticCourse );
-    aGenericInfo.SetRequestedField( EPositionFieldHeading );
-    aGenericInfo.SetRequestedField( EPositionFieldMagneticHeading );
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpPositionRequest::SaveContainer( const HPositionGenericInfo& aGenericInfo )
-    {
-    TRealX nan;
-    nan.SetNaN();
-    iSpeed = iHeading = iCourse = iMagneticHeading = iMagneticCourse = nan;
-    
-    aGenericInfo.GetValue( EPositionFieldHorizontalSpeed, iSpeed );
-    aGenericInfo.GetValue( EPositionFieldTrueCourse, iCourse );
-    aGenericInfo.GetValue( EPositionFieldMagneticCourse, iMagneticCourse );
-    aGenericInfo.GetValue( EPositionFieldHeading, iHeading );
-    aGenericInfo.GetValue( EPositionFieldMagneticHeading, iMagneticHeading );
-    
-    iPositionInfo = *iGenericPosition;
-    }
--- a/locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/mapnavproviderrefapp/src/mnrputils.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,256 +0,0 @@
-/*
-* Copyright (c) 2006-2007 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:  MnrpUtils class implementation
-*
-*/
-
-
-#include <e32base.h>
-#include <e32math.h>
-#include <lbsposition.h>
-
-#include "mnrputils.h"
-
-_LIT( KNan, "<n/a>" );
-_LIT( KNeg, "<neg>" );
-_LIT( KOutOfBounds, "<inv>" );
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-EXPORT_C void MnrpUtils::CoordinateToString(
-    TReal aCoord,
-    TDes& aStr,
-    TBool aFull,
-    TBool aMillis )
-    {
-    const TChar KDegreeMark = 0xB0;
-    const TChar KMinuteMark = 0x27;
-    const TChar KSecondMark = 0x22;
-    const TChar KMilliSecondMark = 0x2E;
-    const TChar KMinus = '-';
-    const TChar KPlus = '+';
-
-    _LIT( KCoordFormatFull, "%c%d%c%02d%c%02d%c" );
-    _LIT( KCoordFormatPartMseconds, "%c%03d" );
-
-    if ( Math::IsNaN( aCoord ) )
-        {
-        aStr.Copy( KNan );
-        }
-    else if ( Abs( aCoord ) > 360 )
-        {
-        aStr.Copy( KOutOfBounds );
-        }
-    else
-        {
-        TBool negative = aCoord < 0;
-        aCoord = Abs( aCoord );
-
-        TInt degrees = TInt( aCoord );
-        aCoord = ( aCoord - degrees ) * 60;
-        TInt minutes = TInt( aCoord );
-        aCoord = ( aCoord - minutes ) * 60;
-        TInt seconds = TInt( aCoord );
-        aCoord = ( aCoord - seconds ) * 100;
-        TInt mseconds = TInt( aCoord );
-
-        TChar sign = negative ? KMinus : KPlus;
-
-        if ( aFull )
-            {
-            aStr.Format( KCoordFormatFull,
-                            TUint( sign ), degrees, TUint( KDegreeMark ),
-                            minutes, TUint( KMinuteMark ),
-                            seconds, TUint( KSecondMark ) );
-            if ( aMillis )
-                {
-                aStr.AppendFormat( KCoordFormatPartMseconds, TUint( KMilliSecondMark ), mseconds );
-                }
-            }
-        else
-            {
-            aStr.Zero();
-            if ( degrees )
-                {
-                aStr.AppendNum( degrees );
-                aStr.Append( KDegreeMark );
-                }
-            if ( minutes )
-                {
-                aStr.AppendNum( minutes );
-                aStr.Append( KMinuteMark );
-                }
-            if ( seconds )
-                {
-                aStr.AppendNum( seconds );
-                aStr.Append( KSecondMark );
-                }
-            if ( mseconds && aMillis )
-                {
-                if ( !seconds )
-                    {
-                    aStr.AppendNum( 0 );
-                    aStr.Append( KSecondMark );
-                    }
-                aStr.AppendFormat( KCoordFormatPartMseconds, TUint( KMilliSecondMark ), mseconds );
-                }
-
-            if ( !aStr.Length() )
-                {
-                aStr.AppendNum( degrees );
-                aStr.Append( KDegreeMark );
-                }
-            }
-        }
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-EXPORT_C void MnrpUtils::DistanceToString( TReal aDistance, TDes& aStr )
-    {
-    _LIT( KSmall, "< 1 m" );
-    _LIT( KMeters, "%d m" );
-    _LIT( KKiloMeters, "%.1f Km" );
-    _LIT( KThousandsKiloMeters, "%.1f tKm" );
-
-    const TInt KMeter = 1;
-    const TInt KKilometer = KMeter * 1000;
-    const TInt KThousandKilometer = KKilometer * 1000;
-
-    if ( Math::IsNaN( aDistance ) )
-        {
-        aStr.Copy( KNan );
-        }
-    else if ( aDistance < 0 )
-        {
-        aStr.Copy( KNeg );
-        }
-    else if ( aDistance < KMeter )
-        {
-        aStr.Copy( KSmall );
-        }
-    else if ( aDistance < KKilometer )
-        {
-        aStr.Format( KMeters, TInt( aDistance ) );
-        }
-    else if ( aDistance < KThousandKilometer )
-        {
-        aStr.Format( KKiloMeters, aDistance / KKilometer );
-        }
-    else
-        {
-        aStr.Format( KThousandsKiloMeters, aDistance / KThousandKilometer );
-        }
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-EXPORT_C void MnrpUtils::SpeedToString( TReal aSpeed, TDes& aStr )
-    {
-    _LIT( KPerSecond, "/s" );
-
-    if ( Math::IsNaN( aSpeed ) )
-        {
-        aStr.Copy( KNan );
-        }
-    else if ( aSpeed < 0 )
-        {
-        aStr.Copy( KNeg );
-        }
-    else
-        {
-        DistanceToString( aSpeed, aStr );
-        aStr.Append( KPerSecond );
-        }
-    }
-    
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-EXPORT_C void MnrpUtils::AngleToString( TReal aAngle, TDes& aStr )
-    {
-    const TChar KMinus = '-';
-    const TChar KPlus = '+';
-    _LIT( KAngleFormat, "%S%c%.1f\xB0 /  %.1f\xB0" );
-    
-    _LIT( KNorth, "N" );
-    _LIT( KSouth, "S" );
-    _LIT( KWest, "W" );
-    _LIT( KEast, "E" );
-
-    TPtrC side;
-    TReal angle;
-
-    if ( Math::IsNaN( aAngle ) )
-        {
-        aStr.Copy( KNan );
-        }
-    else if ( aAngle > 360 )
-        {
-        aStr.Copy( KOutOfBounds );
-        }
-    else
-        {
-        if ( aAngle > 315 )
-            {
-            side.Set( KNorth );
-            angle = aAngle - 360;
-            }
-        else if ( aAngle > 225 )
-            {
-            side.Set( KWest );
-            angle = aAngle - 270;
-            }
-        else if ( aAngle > 135 )
-            {
-            side.Set( KSouth );
-            angle = aAngle - 180;
-            }
-        else if ( aAngle > 45 )
-            {
-            side.Set( KEast );
-            angle = aAngle - 90;
-            }
-        else // aAngle <= 45
-            {
-            side.Set( KNorth );
-            angle = aAngle;
-            }
-
-        TChar sign = ( angle >= 0 ) ? KPlus : KMinus;
-        aStr.Format( KAngleFormat, &side, TUint( sign ), Abs( angle ), aAngle );
-        }
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-EXPORT_C HBufC* MnrpUtils::PrintableStringLC( const TDesC& aStr )
-    {
-    HBufC* buf = aStr.AllocLC();
-    TPtr string( buf->Des() );
-    for ( TInt i = 0; i < string.Length(); i++ )
-        {
-        if ( !TChar( string[i] ).IsPrint() )
-            {
-            string[i] = ' ';
-            }
-        }
-    return buf;
-    }
--- a/locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/src/testcmnprovider.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,263 +0,0 @@
-/*
-* Copyright (c) 2007 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: Provides testing of CMnProvider class methods
-*
-*/
-
-
-
-// INCLUDE FILES
-
-#include "testcmnprovider.h"
-#include <MnProviderFinder.h>
-#include <MnProvider.h>
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// CTestMnProvider::CTestMnNavigator
-// C++ default constructor can NOT contain any code, that
-// might leave.
-// -----------------------------------------------------------------------------
-//
-CTestMnProvider::CTestMnProvider( CStifLogger* aLog ) 
-	{
-	iLog = aLog;
-	}
-
-// -----------------------------------------------------------------------------
-// CTestMnProvider::NewL
-// 
-// 
-// -----------------------------------------------------------------------------
-//	
-CTestMnProvider* CTestMnProvider::NewL(CStifLogger* aLog)
-	{
-	CTestMnProvider* self = new (ELeave) CTestMnProvider( aLog );
-	CleanupStack::PushL( self );
-    self->ConstructL();
-    CleanupStack::Pop(); 
-    return self; 
-	}
-
-// -----------------------------------------------------------------------------
-// CTestMnProvider::ConstructL
-// 
-// 
-// -----------------------------------------------------------------------------
-//
-void CTestMnProvider::ConstructL()
-	{
-	
-	}	
-
-// -----------------------------------------------------------------------------
-// CTestMnProvider::~CTestMnNavigator
-// 
-// 
-// -----------------------------------------------------------------------------
-//
-CTestMnProvider::~CTestMnProvider()
-	{
-	
-	}
-	
-// -----------------------------------------------------------------------------
-// CTestMnProvider::DestroyProviderL
-// 
-// 
-// -----------------------------------------------------------------------------
-//
-TInt CTestMnProvider::DestroyProviderL( CStifItemParser& /*aItem*/ )
-	{
-	// Find Providers
-	RPointerArray<CMnProvider> providerArray;
-	MnProviderFinder::FindProvidersL( providerArray );
-	if( providerArray.Count() < 1 )
-		{
-		iLog->Log(_L("No Provider Found, can't test DestroyProviderL"));
-		User::Leave( KErrNotFound );
-		}
-	// Will delete all the provider objects	
-	providerArray.ResetAndDestroy();
-	return KErrNone;
-	}
-
-// -----------------------------------------------------------------------------
-// CTestMnProvider::ProviderUidL
-// 
-// 
-// -----------------------------------------------------------------------------
-//
-TInt CTestMnProvider::ProviderUidL( CStifItemParser& /*aItem*/ )
-	{
-	// Find Providers
-	RPointerArray<CMnProvider> providerArray;
-	MnProviderFinder::FindProvidersL( providerArray );
-	if( providerArray.Count() < 1 )
-		{
-		iLog->Log(_L("No Provider Found, can't test ProviderUidL"));
-		User::Leave( KErrNotFound );
-		}
-	// Get Uid of first provider
-	TUid providerUid = providerArray.operator[](0)->Uid();
-	providerArray.ResetAndDestroy();
-	return KErrNone;
-	}
-	
-// -----------------------------------------------------------------------------
-// CTestMnProvider::ProviderVersionL
-// 
-// 
-// -----------------------------------------------------------------------------
-//
-TInt CTestMnProvider::ProviderVersionL( CStifItemParser& /*aItem*/ )
-	{
-	// Find Providers
-	RPointerArray<CMnProvider> providerArray;
-	MnProviderFinder::FindProvidersL( providerArray );
-	if( providerArray.Count() < 1 )
-		{
-		iLog->Log(_L("No Provider Found, can't test ProviderVersionL"));
-		User::Leave( KErrNotFound );
-		}
-	// Get Version of first provider
-	TVersion providerVersion = providerArray.operator[](0)->Version();
-	providerArray.ResetAndDestroy();
-	return KErrNone;
-	}	
-	
-// -----------------------------------------------------------------------------
-// CTestMnProvider::GetProviderNameL
-// 
-// 
-// -----------------------------------------------------------------------------
-//
-TInt CTestMnProvider::GetProviderNameL( CStifItemParser& /*aItem*/ )
-	{
-	// Find Providers
-	RPointerArray<CMnProvider> providerArray;
-	MnProviderFinder::FindProvidersL( providerArray );
-	if( providerArray.Count() < 1 )
-		{
-		iLog->Log(_L("No Provider Found, can't test GetProviderNameL"));
-		User::Leave( KErrNotFound );
-		}
-	// Get name of first provider
-	TPtrC providerName;
-	providerArray.operator[](0)->GetName( providerName );
-	iLog->Log( providerName );
-	providerArray.ResetAndDestroy();
-	return KErrNone;
-	}		
-
-// -----------------------------------------------------------------------------
-// CTestMnProvider::GetShortNameL
-// 
-// 
-// -----------------------------------------------------------------------------
-//
-TInt CTestMnProvider::GetShortNameL( CStifItemParser& /*aItem*/ )
-	{
-	// Find Providers
-	RPointerArray<CMnProvider> providerArray;
-	MnProviderFinder::FindProvidersL( providerArray );
-	if( providerArray.Count() < 1 )
-		{
-		iLog->Log(_L("No Provider Found, can't test GetShortNameL"));
-		User::Leave( KErrNotFound );
-		}
-	// Get short name of first provider
-	TPtrC shortName;
-	providerArray.operator[](0)->GetShortName( shortName );
-	iLog->Log( shortName );
-	providerArray.ResetAndDestroy();
-	return KErrNone;
-	}
-
-// -----------------------------------------------------------------------------
-// CTestMnProvider::GetVendorNameL
-// 
-// 
-// -----------------------------------------------------------------------------
-//
-TInt CTestMnProvider::GetVendorNameL( CStifItemParser& /*aItem*/ )
-	{
-	// Find Providers
-	RPointerArray<CMnProvider> providerArray;
-	MnProviderFinder::FindProvidersL( providerArray );
-	if( providerArray.Count() < 1 )
-		{
-		iLog->Log(_L("No Provider Found, can't test GetVendorNameL"));
-		User::Leave( KErrNotFound );
-		}
-	// Get vendor name of first provider
-	TPtrC vendorName;
-	providerArray.operator[](0)->GetVendorName( vendorName );
-	iLog->Log( vendorName );
-	providerArray.ResetAndDestroy();
-	return KErrNone;
-	}
-	
-// -----------------------------------------------------------------------------
-// CTestMnProvider::SupportedServicesL
-// 
-// 
-// -----------------------------------------------------------------------------
-//
-TInt CTestMnProvider::SupportedServicesL( CStifItemParser& /*aItem*/ )
-	{
-	// Find provider
-	RPointerArray<CMnProvider> providerArray;
-	MnProviderFinder::FindProvidersL( providerArray );
-	if( providerArray.Count() < 1 )
-		{
-		iLog->Log(_L("No Provider Found, can't test SupportedServicesL"));
-		User::Leave( KErrNotFound );
-		}
-	// Get services supported by first provider
-	CMnProvider::TServices supportedServices = providerArray.operator[](0)->SupportedServices();
-	providerArray.ResetAndDestroy();
-	return KErrNone;
-	}	
-
-// -----------------------------------------------------------------------------
-// CTestMnProvider::SupportedFeaturesL
-// 
-// 
-// -----------------------------------------------------------------------------
-//
-TInt CTestMnProvider::SupportedFeaturesL( CStifItemParser& /*aItem*/ )
-	{
-	// Find provider
-	RPointerArray<CMnProvider> providerArray;
-	MnProviderFinder::FindProvidersL( providerArray );
-	TInt prvCount = providerArray.Count();
-	if( prvCount < 1 )
-		{
-		iLog->Log(_L("No Provider Found, can't test SupportedFeaturesL"));
-		User::Leave( KErrNotFound );
-		}
-	// Get features supported by providers
-	for (TInt i=0; i<prvCount; i++)
-		{
-		CMnProvider::TServices supportedServices = providerArray.operator[](i)->SupportedServices();
-		TInt navFeatures = providerArray.operator[](i)->SupportedFeatures( CMnProvider::EServiceNavigation );
-		TInt mapFeatures = providerArray.operator[](i)->SupportedFeatures( CMnProvider::EServiceMapView );
-		TInt geoFeatures = providerArray.operator[](i)->SupportedFeatures( CMnProvider::EServiceGeocoding );
-		}
-	
-	providerArray.ResetAndDestroy();
-	return KErrNone;
-	}	
--- a/locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/src/testmnproviderdiscovery.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,143 +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 test class for map_and_navigation_provider_discovery_api
-*
-*/
-
-
-
-// INCLUDE FILES
-#include <Stiftestinterface.h>
-#include <swinstapi.h>
-#include "testmnproviderdiscovery.h"
-
-// Literal
-// Provider app sisx path
-_LIT( KProviderSisxPath, "e:\\testing\\data\\mnrefprovider.sisx" ); 
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// CTestMnProviderDiscovery::Ctestmnproviderdiscovery
-// C++ default constructor can NOT contain any code, that
-// might leave.
-// -----------------------------------------------------------------------------
-//
-CTestMnProviderDiscovery::CTestMnProviderDiscovery( 
-    CTestModuleIf& aTestModuleIf ):
-        CScriptBase( aTestModuleIf )
-    {
-    }
-
-// -----------------------------------------------------------------------------
-// CTestMnProviderDiscovery::ConstructL
-// Symbian 2nd phase constructor can leave.
-// -----------------------------------------------------------------------------
-//
-void CTestMnProviderDiscovery::ConstructL()
-    {
-    iLog = CStifLogger::NewL( KtestmnproviderdiscoveryLogPath, 
-                          KtestmnproviderdiscoveryLogFile,
-                          CStifLogger::ETxt,
-                          CStifLogger::EFile,
-                          EFalse );
-	InstallProvider( KProviderSisxPath );
-    }
-
-// -----------------------------------------------------------------------------
-// CTestMnProviderDiscovery::NewL
-// Two-phased constructor.
-// -----------------------------------------------------------------------------
-//
-CTestMnProviderDiscovery* CTestMnProviderDiscovery::NewL( 
-    CTestModuleIf& aTestModuleIf )
-    {
-    CTestMnProviderDiscovery* self = new (ELeave) CTestMnProviderDiscovery( aTestModuleIf );
-
-    CleanupStack::PushL( self );
-    self->ConstructL();
-    CleanupStack::Pop();
-
-    return self;
-
-    }
-
-// Destructor
-CTestMnProviderDiscovery::~CTestMnProviderDiscovery()
-    { 
-
-    // Delete resources allocated from test methods
-    Delete();
-
-    // Delete logger
-    delete iLog; 
-
-    }
-
-// ========================== OTHER EXPORTED FUNCTIONS =========================
-
-// -----------------------------------------------------------------------------
-// LibEntryL is a polymorphic Dll entry point.
-// Returns: CScriptBase: New CScriptBase derived object
-// -----------------------------------------------------------------------------
-//
-EXPORT_C CScriptBase* LibEntryL( 
-    CTestModuleIf& aTestModuleIf ) // Backpointer to STIF Test Framework
-    {
-
-    return ( CScriptBase* ) CTestMnProviderDiscovery::NewL( aTestModuleIf );
-
-    }
-
-// -----------------------------------------------------------------------------
-// This method will install the provider application
-//
-// -----------------------------------------------------------------------------
-//   
-TInt CTestMnProviderDiscovery::InstallProvider( const TDesC& aPackagePath )
-    {
-   // iLog->Log("Installing [%S]...", aPackagePath );
-
-    TInt err = KErrNone;
-    SwiUI::RSWInstSilentLauncher installer;
-
-    err = installer.Connect();
-    if( KErrNone != err )
-    	{
-    	iLog->Log(_L("Connection to installer failed"));
-    	return err;
-    	}
-    //CHECK_EQUAL( err, KErrNone, "Connection to installer failed" );
-
-    SwiUI::TInstallOptionsPckg options;
-    options().iUpgrade = SwiUI::EPolicyAllowed;
-    options().iPackageInfo = SwiUI::EPolicyAllowed;
-    options().iOverwrite = SwiUI::EPolicyAllowed;
-    options().iKillApp = SwiUI::EPolicyAllowed;
-
-    err = installer.SilentInstall( aPackagePath, options );
-    if( KErrNone != err )
-    	{
-    	iLog->Log(_L("Provider Installation failed"));
-    	installer.Close();
-    	return err;
-    	}
-    	
-    //CHECK_EQUAL( err, KErrNone, "Installation failed" );
-	iLog->Log(_L("Provider Installation passed"));
-    installer.Close();
-    return err;
-    }
-    
-//  End of File
--- a/locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/src/testmnproviderdiscoveryblocks.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,230 +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: Entry point for test cases in stif module
-*
-*/
-
-
-
-// INCLUDE FILES
-#include <e32svr.h>
-#include <StifParser.h>
-#include <Stiftestinterface.h>
-#include "testmnproviderdiscovery.h"
-
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// CTestMnProviderDiscovery::Delete
-// Delete here all resources allocated and opened from test methods. 
-// Called from destructor. 
-// -----------------------------------------------------------------------------
-//
-void CTestMnProviderDiscovery::Delete() 
-    {
-
-    }
-
-// -----------------------------------------------------------------------------
-// CTestMnProviderDiscovery::RunMethodL
-// Run specified method. Contains also table of test mothods and their names.
-// -----------------------------------------------------------------------------
-//
-TInt CTestMnProviderDiscovery::RunMethodL( 
-    CStifItemParser& aItem ) 
-    {
-
-    static TStifFunctionInfo const KFunctions[] =
-        {  
-        // Provider Discovery
-        ENTRY( "FindAllProviders", CTestMnProviderDiscovery::FindAllProvidersL ),
-        ENTRY( "FindSelectedProviders", CTestMnProviderDiscovery::FindSelectedProvidersL ),
-        // Provider
-        ENTRY( "DestroyProvider", CTestMnProviderDiscovery::DestroyProviderL ),
-        ENTRY( "ProviderUid", CTestMnProviderDiscovery::ProviderUidL ),
-        ENTRY( "ProviderVersion", CTestMnProviderDiscovery::ProviderVersionL ),
-        ENTRY( "GetProviderName", CTestMnProviderDiscovery::GetProviderNameL ),
-        ENTRY( "GetShortName", CTestMnProviderDiscovery::GetShortNameL ),
-        ENTRY( "GetVendorName", CTestMnProviderDiscovery::GetVendorNameL ),
-        ENTRY( "SupportedServices", CTestMnProviderDiscovery::SupportedServicesL ),
-        ENTRY( "SupportedFeatures", CTestMnProviderDiscovery::SupportedFeaturesL ),
-        
-        //ADD NEW ENTRY HERE
-
-        };
-
-    const TInt count = sizeof( KFunctions ) / 
-                        sizeof( TStifFunctionInfo );
-	
-	TInt ret = KErrNone;
-	TRAPD( error, ret = RunInternalL( KFunctions, count, aItem ));
-	if ( error != KErrNone )
-		{
-		return error;
-		}
-	return ret;	
-	    
-    }
-
-// -----------------------------------------------------------------------------
-// CTestMnProviderDiscovery::FindAllProvidersL
-// 
-// 
-// -----------------------------------------------------------------------------
-//
-TInt CTestMnProviderDiscovery::FindAllProvidersL( CStifItemParser& aItem )
-    {
-    TestMnProviderFinder* providerFinder = TestMnProviderFinder::NewL( iLog );
-	CleanupStack::PushL( providerFinder );
-	TInt err = providerFinder->FindAllProvidersL( aItem );
-	CleanupStack::PopAndDestroy( providerFinder );
-	return err;	
-    }
-    
-// -----------------------------------------------------------------------------
-// CTestMnProviderDiscovery::FindSelectedProvidersL
-// 
-// 
-// -----------------------------------------------------------------------------
-//
-TInt CTestMnProviderDiscovery::FindSelectedProvidersL( CStifItemParser& aItem )
-    {
-    TestMnProviderFinder* providerFinder = TestMnProviderFinder::NewL( iLog );
-	CleanupStack::PushL( providerFinder );
-	TInt err = providerFinder->FindSelectedProvidersL( aItem );
-	CleanupStack::PopAndDestroy( providerFinder );
-	return err;	
-    }    
-
-// -----------------------------------------------------------------------------
-// CTestMnProviderDiscovery::DestroyProviderL
-// 
-// 
-// -----------------------------------------------------------------------------
-//
-TInt CTestMnProviderDiscovery::DestroyProviderL( CStifItemParser& aItem )
-    {
-    CTestMnProvider* testProvider = CTestMnProvider::NewL( iLog );
-	CleanupStack::PushL( testProvider );
-	TInt err = testProvider->DestroyProviderL( aItem );
-	CleanupStack::PopAndDestroy( testProvider );
-	return err;	
-    }    
-
-// -----------------------------------------------------------------------------
-// CTestMnProviderDiscovery::ProviderUidL
-// 
-// 
-// -----------------------------------------------------------------------------
-//
-TInt CTestMnProviderDiscovery::ProviderUidL( CStifItemParser& aItem )
-    {
-    CTestMnProvider* testProvider = CTestMnProvider::NewL( iLog );
-	CleanupStack::PushL( testProvider );
-	TInt err = testProvider->ProviderUidL( aItem );
-	CleanupStack::PopAndDestroy( testProvider );
-	return err;	
-    }
-    
-// -----------------------------------------------------------------------------
-// CTestMnProviderDiscovery::ProviderVersionL
-// 
-// 
-// -----------------------------------------------------------------------------
-//
-TInt CTestMnProviderDiscovery::ProviderVersionL( CStifItemParser& aItem )
-    {
-    CTestMnProvider* testProvider = CTestMnProvider::NewL( iLog );
-	CleanupStack::PushL( testProvider );
-	TInt err = testProvider->ProviderVersionL( aItem );
-	CleanupStack::PopAndDestroy( testProvider );
-	return err;	
-    }  
-    
-// -----------------------------------------------------------------------------
-// CTestMnProviderDiscovery::GetProviderNameL
-// 
-// 
-// -----------------------------------------------------------------------------
-//
-TInt CTestMnProviderDiscovery::GetProviderNameL( CStifItemParser& aItem )
-    {
-    CTestMnProvider* testProvider = CTestMnProvider::NewL( iLog );
-	CleanupStack::PushL( testProvider );
-	TInt err = testProvider->GetProviderNameL( aItem );
-	CleanupStack::PopAndDestroy( testProvider );
-	return err;	
-    }      
-// -----------------------------------------------------------------------------
-// CTestMnProviderDiscovery::GetShortNameL
-// 
-// 
-// -----------------------------------------------------------------------------
-//
-TInt CTestMnProviderDiscovery::GetShortNameL( CStifItemParser& aItem )
-    {
-    CTestMnProvider* testProvider = CTestMnProvider::NewL( iLog );
-	CleanupStack::PushL( testProvider );
-	TInt err = testProvider->GetShortNameL( aItem );
-	CleanupStack::PopAndDestroy( testProvider );
-	return err;	
-    }
-    
-// -----------------------------------------------------------------------------
-// CTestMnProviderDiscovery::GetVendorNameL
-// 
-// 
-// -----------------------------------------------------------------------------
-//
-TInt CTestMnProviderDiscovery::GetVendorNameL( CStifItemParser& aItem )
-    {
-    CTestMnProvider* testProvider = CTestMnProvider::NewL( iLog );
-	CleanupStack::PushL( testProvider );
-	TInt err = testProvider->GetVendorNameL( aItem );
-	CleanupStack::PopAndDestroy( testProvider );
-	return err;	
-    }          
-
-// -----------------------------------------------------------------------------
-// CTestMnProviderDiscovery::SupportedServicesL
-// 
-// 
-// -----------------------------------------------------------------------------
-//
-TInt CTestMnProviderDiscovery::SupportedServicesL( CStifItemParser& aItem )
-    {
-    CTestMnProvider* testProvider = CTestMnProvider::NewL( iLog );
-	CleanupStack::PushL( testProvider );
-	TInt err = testProvider->SupportedServicesL( aItem );
-	CleanupStack::PopAndDestroy( testProvider );
-	return err;	
-    }          
-
-// -----------------------------------------------------------------------------
-// CTestMnProviderDiscovery::SupportedFeaturesL
-// 
-// 
-// -----------------------------------------------------------------------------
-//
-TInt CTestMnProviderDiscovery::SupportedFeaturesL( CStifItemParser& aItem )
-    {
-    CTestMnProvider* testProvider = CTestMnProvider::NewL( iLog );
-	CleanupStack::PushL( testProvider );
-	TInt err = testProvider->SupportedFeaturesL( aItem );
-	CleanupStack::PopAndDestroy( testProvider );
-	return err;	
-    }          
-
-//  End of File
--- a/locsrv_plat/map_and_navigation_provider_discovery_api/tsrc/src/testmnproviderfinder.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,107 +0,0 @@
-/*
-* Copyright (c) 2007 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: Provides testing of MnProviderFinder class methods
-*
-*/
-
-
-
-// INCLUDE FILES
-
-#include "testmnproviderfinder.h"
-#include <MnProviderFinder.h>
-#include <MnProvider.h>
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// TestMnProviderFinder::TestMnProviderFinder
-// C++ default constructor can NOT contain any code, that
-// might leave.
-// -----------------------------------------------------------------------------
-//
-TestMnProviderFinder::TestMnProviderFinder( CStifLogger* aLog ) 
-	{
-	iLog = aLog;
-	}
-
-// -----------------------------------------------------------------------------
-// TestMnProviderFinder::NewL
-// 
-// 
-// -----------------------------------------------------------------------------
-//	
-TestMnProviderFinder* TestMnProviderFinder::NewL(CStifLogger* aLog)
-	{
-	TestMnProviderFinder* self = new (ELeave) TestMnProviderFinder( aLog );
-	CleanupStack::PushL( self );
-    self->ConstructL();
-    CleanupStack::Pop(); 
-    return self; 
-	}
-
-// -----------------------------------------------------------------------------
-// TestMnProviderFinder::ConstructL
-// 
-// 
-// -----------------------------------------------------------------------------
-//
-void TestMnProviderFinder::ConstructL()
-	{
-	
-	}	
-
-// -----------------------------------------------------------------------------
-// TestMnProviderFinder::~TestMnProviderFinder
-// 
-// 
-// -----------------------------------------------------------------------------
-//
-TestMnProviderFinder::~TestMnProviderFinder()
-	{
-	
-	}
-	
-
-// -----------------------------------------------------------------------------
-// TestMnProviderFinder::FindAllProvidersL
-// 
-// 
-// -----------------------------------------------------------------------------
-//
-TInt TestMnProviderFinder::FindAllProvidersL( CStifItemParser& /*aItem*/ )
-	{
-	RPointerArray<CMnProvider> providerArray;
-	MnProviderFinder::FindProvidersL( providerArray );
-	
-	providerArray.ResetAndDestroy();
-	return KErrNone;
-	}
-	
-// -----------------------------------------------------------------------------
-// TestMnProviderFinder::FindSelectedProvidersL
-// 
-// 
-// -----------------------------------------------------------------------------
-//
-TInt TestMnProviderFinder::FindSelectedProvidersL( CStifItemParser& /*aItem*/ )
-	{
-	
-	RPointerArray<CMnProvider> providerArray;
-	MnProviderFinder::FindProvidersL( providerArray, CMnProvider::EServiceNavigation | CMnProvider::EServiceMapView );
-	
-	providerArray.ResetAndDestroy();
-	return KErrNone;
-	}	
-
--- a/locsrv_plat/map_image_api/group/bld.inf	Mon May 03 12:54:42 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 
-:                Map Image API
-*
-*/
-
-
-#include <platform_paths.hrh>
-
-PRJ_PLATFORMS
-DEFAULT
-
-PRJ_EXPORTS
-
-../inc/mnmapimageparams.inl     MW_LAYER_PLATFORM_EXPORT_PATH(mnmapimageparams.inl)
-../inc/mnmapimage.h             MW_LAYER_PLATFORM_EXPORT_PATH(mnmapimage.h)
-../inc/mnmapimageparams.h       MW_LAYER_PLATFORM_EXPORT_PATH(mnmapimageparams.h)
--- a/locsrv_plat/map_image_api/inc/mnmapimage.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,298 +0,0 @@
-/*
-* Copyright (c) 2007 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:  CMnMapImage class
-*
-*/
-
-
-#ifndef MN_MAPIMAGE_H_
-#define MN_MAPIMAGE_H_
-
-#include <e32base.h>
-#include <lbsposition.h>
-#include <mnmapimageparams.h>
-
-class CApaServerAppExitMonitor;
-class MAknServerAppExitObserver;
-class CMnProvider;
-class RMnMapImageServiceClient;
-class CMnMapImage;
-class CFbsBitmap;
-class CMnCoordinateConverterBase;
-
-/** Abstract class to be inherited by classes, which want to receive
- *  notification, when image rendering is completed.
- *  @see CMnMapImage 
- *  @since 5.0 */
-class MMnMapImageRenderCallback
-    {
-    public:
-        /** This callback is called when CMnMapImage has completed rendering
-         *  map image. It is not called if rendering was cancelled by client.
-         *  @param aStatus Result of the rendering operation:
-         *                      - @p KErrNone - rendering was completed successfully.
-         *                      - @p KErrNotSupported - rendering is not possible in specified area
-         *                           or one of mandatory options are not supported (see @ref TShowOption).
-         *                      - Other system-wide error codes also possible.
-         *  @param aMapImage Instance of CMnMapImage, through which the request has
-         *                   been issued. */
-        virtual void HandleRenderingCompletedL( TInt aStatus, CMnMapImage& aMapImage ) = 0;
-    };
-
-/** Provides access to map image rendering features.
- *
- *  The RenderL() method allows to get bitmap image of some area, which is specified
- *  by SetCenterPoint() and SetScale(). Size of the bitmap is defined by SetSize().
- *
- *  To create an instance of the class, use @ref NewL method. It
- *  requires instance of CMnProvider, defined in Map and Navigation Provider Discovery API.
- *
- *  Only one asynchronous request can be issued at a time, otherwise client
- *  will be panicked with KMnPanicDuplicateRequest.
- *
- *  @since 5.0
- *  @lib mnclientlib.dll
- *  @ingroup MapNavAPI
- */
-class CMnMapImage : public CBase
-	{
-	public:
-
-        /** Creates new instance of the class. Provider Application
-         *  will be executed standalone.
-         *
-         *  @param[in] aProvider Provider Application to be used for map rendering.
-         *  @return Pointer to new instance of the class.
-         *
-         *  @leave KErrNotSupported Selected Provider Application does not support
-         *      map image services (@ref CMnProvider::EServiceMapImage). */
-		IMPORT_C static CMnMapImage* NewL( CMnProvider& aProvider );
-
-        /** Destructor */
-        virtual ~CMnMapImage();
-
-		enum TShowOption
-			{
-            /** No options set, just plain image is requested. */
-            EShowOptionNone             = 0x00,
-
-            /** Texts such as street, city, country names should be drawn */
-            EShowOptionText             = 0x01,
-
-            /** POIs should be marked on the map */
-            EShowOptionPois             = 0x02,
-
-            /** Landmarks should be marked on the map */
-            EShowOptionLandmarks        = 0x04,
-
-            /** Current location should be marked on the map.
-             *  Client must have Location capability, otherwise
-             *  this option will be ignored. */
-            EShowOptionCurrentLocation  = 0x08,
-
-            /** Country borders should be shown */
-            EShowOptionCountryBorders   = 0x10,
-
-            /** If this flag is set, it is required to draw
-             *  items specified by other flags, otherwise all
-             *  of them are optional. */
-            EShowOptionsMandatory       = 0xF000
-			};
-
-        /** Type for bitmap of options defined in @ref TShowOption */
-		typedef TUint32 TShowOptions;
-
-        /** Returns what types of map images are supported by provider
-         *  application given at construction (see NewL()).
-         *  @return Bitmap of values defined by @ref TMapImageType. */
-		IMPORT_C TMnMapImageParams::TMapImageTypes SupportedImageTypes();
-
-        /** Returns map image parameters object.
-         *  Client can modify it, but all modification will be
-         *  applied only for next and following RenderL requests.
-         *  @return Modifiable map image parameters object */
-        IMPORT_C TMnMapImageParams& MapImageParams();
-
-        /** @overload
-         *  @return Non-modifiable map image parameters object */
-        IMPORT_C const TMnMapImageParams& MapImageParams() const;
-
-        /** Sets all map image drawing parameters at once.
-         *  New options will be applied only for next and following
-         *  RenderL requests.
-         *  @param aImageParams Image parameters to take into use for
-         *                      following RenderL requests */
-        IMPORT_C void SetMapImageParams( TMnMapImageParams& aImageParams );
-
-        /** Specifies the origin of image in the target bitmap, see
-         *  RenderL(). By default it is TPoint( 0, 0 ), i.e. left top
-         *  corner of the bitmap.
-         *  This setting takes effect only from next RenderL request.
-         *  @param[in] aOrigin Origin of the map in the target bitmap.*/
-		IMPORT_C void SetTargetOrigin( const TPoint& aOrigin );
-
-        /** Returns current setting of map image origin in target bitmap.
-         *  @returns Origin of map image in the target bitmap.*/
-		IMPORT_C TPoint TargetOrigin();
-
-        /** Sets additional options to be used in rendering. Renderer will
-         *  take them into account if possible.
-         *  This setting takes effect only from next RenderL request.
-         *  @param[in] aOptions Bitmap of options defined in @ref TOption. */
-		IMPORT_C void SetShowOptions( const TShowOptions& aOptions );
-
-        /** Returns additional options set to be used in rendering.
-         *  @return Bitmap of options defined in @ref TShowOption. */
-		IMPORT_C TShowOptions ShowOptions() const;
-
-        /** Intiates rendering of map image.
-         *  This is asynchronous request, which completion is informed via
-         *  aStatus parameter. Client should use active object to wait for completion.
-         *
-         *  This function may leave if some error occurs during initiating of the request.
-         *  If so, then no asynchronous request will be left ongoing.
-         *
-         *  @param[in,out] aBitmap Bitmap object, which the map image will be drawn into.
-         *                 Its size in pixels must be sufficient to fit the image
-         *                 defined by @ref SetSize() taking @ref SetTargetOrigin()
-         *                 into account as well.
-         *  @param[out] aStatus This status will be completed, when rendering is finished.
-         *                      - @p KErrNone - rendering was completed successfully.
-         *                      - @p KErrNotSupported - rendering is not possible in specified area
-         *                           or one of mandatory options are not supported (see @ref TShowOption).
-         *                      - Other system-wide error codes also possible.
-         *
-         *  @leave KErrArgument
-         *      - If target bitmap size is too small.
-         *      - If requested image type is not supported by provider application
-         *
-         *  @panic "MnPanicClient"-KMnPanicDuplicateRequest if request is already
-         *         ongoing. */
-		IMPORT_C void RenderL( CFbsBitmap& aBitmap, TRequestStatus& aStatus );
-
-        /** Intiates rendering of map image.
-         *  This is asynchronous request, which completion is informed via aCallback.
-         *
-         *  Client must provide callback as class derived from MMnMapImageRenderCallback.
-         *  This is asynchronous request also. An active object will be executed to handle
-         *  completion of rendering request, so client must have active scheduler installed.
-         *
-         *  This function may leave if some error occurs during initiating of the request.
-         *  If so, then no asynchronous request will be left ongoing.
-         *
-         *  @param[in,out] aBitmap Bitmap object, which the map image will be drawn into.
-         *                 Its size in pixels must be sufficient to fit the image
-         *                 defined by @ref SetSize() taking @ref SetTargetOrigin()
-         *                 into account as well.
-         *  @param[in] aCallback Callback object to call when rendering is completed.
-         *                 See @ref MMnMapImageRenderCallback::HandleRenderingCompletedL for details
-         *                 on possible operation result error codes.
-         *
-         *  @leave KErrArgument
-         *      - If target bitmap size is too small.
-         *      - If requested image type is not supported by provider application
-         *
-         *  @panic "MnPanicClient"-KMnPanicDuplicateRequest if request is already
-         *         ongoing. */
-        IMPORT_C void RenderL( CFbsBitmap& aBitmap, MMnMapImageRenderCallback& aCallback );
-
-        /** Cancels current ongoing asynchronous rendering request.
-         *  Note that callback, set in @ref RenderL(CFbsBitmap&, MMnMapImageRenderCallback&)
-         *  is <i>not</i> called, if request is cancelled. */
-		IMPORT_C void CancelRendering();
-
-        /** Calculates coordinate in pixels of the point corresponding to given
-         *  world coordinate.
-         *
-         *  Given world coordinate is allowed to be beyond
-         *  image borders. In that case negative values in result value
-         *  describe point to the left of left border and/or above top border of the
-         *  image and values bigger than width or height describe point to the right
-         *  of right image border or below its bottom border.
-         *
-         *  Sometimes such calculation is not possible (e.e given world coordinate
-         *  is not part of the image) and this function returns @c KErrUnknown.
-         *
-         *  Map image parameters are necessary be set in order for this function
-         *  to operate successfully. Default values are not sufficient, so client
-         *  is responsible to override them before calling this method. Note though,
-         *  that it is not required to call RenderL before calling this method.
-         *
-         *  @param[in] aWorldCoordinate World coordinate (in WGS-84)
-         *  @param[out] aImagePoint On successful return, coordinate of corresponding
-         *                          pixel in image relative to image top left corner.
-         *  @return Error code of the operation:
-         *      - @c KErrNone if calculation is successful
-         *      - @c KErrArgument if map image parameters in are invalid.
-         *      - @c KErrUnknown if calculation is not possible */
-		IMPORT_C TInt GetImageCoordinate(
-            const TCoordinate& aWorldCoordinate,
-            TPoint& aImagePoint ) const;
-
-        /** Calculates world coordinate of the given image point.
-         *
-         *  Given image point coordinate must be within the rectangle
-         *  ( TPoint( 0, 0 ), @ref Size() ).
-         *
-         *  Map image parameters are necessary be set in order for this function
-         *  to operate successfully. Default values are not sufficient, so client
-         *  is responsible to override them before calling this method. Note though,
-         *  that it is not required to call RenderL before calling this method.
-         *
-         *  Sometimes such calculation is not possible (e.g. given image coordinate
-         *  does not match any world coordinate) and this function returns @c KErrUnknown.
-         *
-         *  @param[in] aImagePoint Coordinate of a point on map image in pixels,
-         *             relative to image top left corner.
-         *  @param[out] aWorldCoordinate On successful return, corresponding
-         *                               world coordinate (in WGS-84).
-         *  @return Error code of the operation:
-         *      - @c KErrNone if calculation is successful
-         *      - @c KErrArgument if image coordinate is out of bounds
-         *      - @c KErrArgument if map image parameters in are invalid.
-         *      - @c KErrUnknown if calculation is not possible */
-		IMPORT_C TInt GetWorldCoordinate(
-            const TPoint& aImagePoint,
-            TCoordinate& aWorldCoordinate ) const;
-         
-        /** Sets observer of provider application lifetime.
-         *  Client will receive exit event from provider application.
-         *  By default exit events from provider application are not monitored.
-         *  @param[in] aObserver Exit observer.
-         *  @leave KErrAlreadyExists if observer is already set. 
-         */
-        IMPORT_C void SetExitObserverL( MAknServerAppExitObserver& aObserver );
-
-        /** Removes observer of provider application lifetime. */
-        IMPORT_C void RemoveExitObserver();
-
-	protected:
-		CMnMapImage();
-		void ConstructL( CMnProvider& aProvider );
-        
-    private:
-        TUint32 iProviderFeatures;
-    
-        TPoint iTargetOrigin;    
-        TMnMapImageParams iMapImageParams;
-        TShowOptions iShowOptions;
-        
-        RMnMapImageServiceClient* iSession;
-        CApaServerAppExitMonitor* iExitMonitor;
-        CActive* iActiveCallback;
-        
-        CMnCoordinateConverterBase* iCoordConverter;
-	};
-
-#endif /*MN_MAPIMAGE_H_*/
--- a/locsrv_plat/map_image_api/inc/mnmapimageparams.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,146 +0,0 @@
-/*
-* Copyright (c) 2007 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:  TMnMapImageParams class
-*
-*/
-
-
-#ifndef MNMAPIMAGEPARAMS_H_
-#define MNMAPIMAGEPARAMS_H_
-
-#include <lbsposition.h>
-
-/** Container class for map image rendering parameters.
- *  It stores following parameters:
- *   - center coordinate of map image,
- *   - size of the image,
- *   - image scale
- *   - image direction
- *   - type of image 
- *  @since 5.0 */
-class TMnMapImageParams
-    {
-    public:
-
-        /** Types of map images */
-        enum TMapImageType
-            {
-            /** Type is unknown or unspecified */
-            ETypeUnspecified        = 0x00,
-            /** Scalable graphical maps (e.g. street maps) */
-            ETypeVectorMap          = 0x01,
-            /** Image built of satellite photographs of Earth */
-            ETypeSatelliteImage     = 0x02
-            };
-            
-        /** Type for bitmap of image types defined in @ref TMapImageType */
-        typedef TUint32 TMapImageTypes;
-
-    public:
-        IMPORT_C TMnMapImageParams();
-
-        /** Sets a world coordinate as a center of desired image.
-         *  @param[in] aCoordinate World location to be center of rendered map.*/
-        inline void SetCenterPoint( const TCoordinate& aCoordinate );
-
-        /** Returns world location, selected by client as the map center.
-         *  @param aCoordinate Coordinate of map's center. */
-        inline void GetCenterPoint( TCoordinate& aCoordinate ) const;
-
-        /** Sets the width and heigth of the world area to be covered by the map image.
-         *  These two parameters define an ellipse, covering the world area, 
-         *  which is <i>required</i> to be visible on the map. Actual visible area
-         *  can be larger, if given image size and area have different aspect ratios.
-         *  @param[in] aWidth The length in meters of the line, orthogonal to the image 
-         *      direction and going through center point
-         *  @param[in] aHeight The length in meters of the line, parallel to the image 
-         *      direction and going through center point */
-        inline void SetVisibleArea( TReal32 aWidth, TReal32 aHeight );
-        
-        /** Returns the width and heigth of the world area to be covered by the map image.
-         *  These two parameters define an ellipse, covering the world area, 
-         *  which is <i>required</i> to be visible on the map. Actual visible area
-         *  can be larger, if given image size and area have different aspect ratios.
-         *  @param[out] aWidth The length in meters of the line, orthogonal to the image 
-         *      direction and going through center point
-         *  @param[out] aHeight The length in meters of the line, parallel to the image 
-         *      direction and going through center point */
-        inline void GetVisibleArea( TReal32& aWidth, TReal32& aHeight ) const;
-
-        /** Sets size of desired map image in pixels.
-         *  @param aImageSize Width and height of the map image. */
-        inline void SetSize( const TSize& aImageSize );
-
-        /** Returns size of desired map image in pixels.
-         *  @return Width and height of the map image. */
-        inline TSize Size() const;
-
-        /** Sets required direction of the map.
-         *  Image direction is defined as clockwise angle between two vectors:
-         *  - a.  vector from center point towards true North Pole parallel to center’s longitude.
-         *        If center is positioned at North Pole, then this vector is directed
-         *        towards South Pole parallel to center’s longitude.
-         *  - b.  vector from center point (see @ref SetCenterPoint()) towards center of image’s top side.
-         * 
-         *  This direction parameter can be thought of as "true heading" of the image.
-         *
-         * @param aDirection Direction in degrees. */
-        inline void SetDirection( TReal32 aDirection );
-
-        /** Returns selected direction of the map. For details of direction definition,
-         *  see @ref SetDirection().
-         *  @return Direction in degrees.*/
-        inline TReal32 Direction() const;
-
-        /** Sets desired type of map image. If set, then rendering will
-         *  provide (if supported) maps of specified type. Default value is
-         *  ETypeUnspecified, which allows provider to select best suitable image
-         *  for given scale, center etc.*/
-        inline void SetImageType( TMapImageType aImageType );
-
-        /** Returns type of last rendered map image. (It always matches the value
-         *  specified by client in @ref SetImageType except if ETypeUnspecified
-         *  is given by client.) */
-        inline TMapImageType ImageType() const;
-
-        /** Sets internal ID of a projection used by renderer.
-         *  It is useful if provider supports several projections.
-         *  Currently must not be used by clients, only for internal purposes
-         *  of provider application.
-         *  @param aProjectionId Renderer'd internal id of used projection */
-        inline void SetProjectionId( TInt aProjectionId );
-
-        /** Sets internal ID of a projection used by renderer.
-         *  It is meaningful if provider supports several projections.
-         *  Currently must not be used by clients, only for internal purposes
-         *  of provider application.
-         *  @return Renderer'd internal id of used projection. */
-        inline TInt ProjectionId();
-
-    private:
-        TCoordinate     iCenterPoint;
-        TReal32         iAreaWidth;
-        TReal32         iAreaHeight;
-        TSize           iSize;
-        TReal32         iDirection;
-
-        TMapImageType   iImageType;
-        TInt            iProjectionId;
-
-        TInt8           reserved[32];
-    };
-
-#include <mnmapimageparams.inl>
-
-#endif /*MNMAPIMAGEPARAMS_H_*/
--- a/locsrv_plat/map_image_api/inc/mnmapimageparams.inl	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,121 +0,0 @@
-/*
-* Copyright (c) 2007 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:  TMnMapImageParams class implementation
-*
-*/
-
-
-
-#ifndef MNMAPIMAGEPARAMS_INL_
-#define MNMAPIMAGEPARAMS_INL_
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-void TMnMapImageParams::SetCenterPoint( const TCoordinate& aCoordinate )
-    {
-    iCenterPoint = aCoordinate;
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-void TMnMapImageParams::GetCenterPoint( TCoordinate& aCoordinate ) const
-    {
-    aCoordinate = iCenterPoint;
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-void TMnMapImageParams::SetVisibleArea( TReal32 aWidth, TReal32 aHeight )
-    {
-    iAreaWidth = aWidth;
-    iAreaHeight = aHeight;
-    }
-        
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-void TMnMapImageParams::GetVisibleArea( TReal32& aWidth, TReal32& aHeight ) const
-    {
-    aWidth = iAreaWidth;
-    aHeight = iAreaHeight;
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-void TMnMapImageParams::SetSize( const TSize& aImageSize )
-    {
-    iSize = aImageSize;
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-TSize TMnMapImageParams::Size() const
-    {
-    return iSize;
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-void TMnMapImageParams::SetDirection( TReal32 aDirection )
-    {
-    iDirection = aDirection;
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-TReal32 TMnMapImageParams::Direction() const
-    {
-    return iDirection;
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-void TMnMapImageParams::SetImageType( TMapImageType aImageType )
-    {
-    iImageType = aImageType;
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-TMnMapImageParams::TMapImageType TMnMapImageParams::ImageType() const
-    {
-    return iImageType;
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-void TMnMapImageParams::SetProjectionId( TInt aProjectionId )
-    {
-    iProjectionId = aProjectionId;
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-TInt TMnMapImageParams::ProjectionId()
-    {
-    return iProjectionId;
-    }
-
-#endif /*MNMAPIMAGEPARAMS_INL_*/
--- a/locsrv_plat/map_image_api/map_image_api.metaxml	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
-<?xml version="1.0" ?>
-<api id="16b4650ac7f0578cfbb4796e8337338b" dataversion="2.0">
-  <name>Map Image API</name>
-  <description>This API provides map image rendering features.</description>
-  <type>c++</type>
-  <collection>locationmapnavfw</collection>
-  <libs>
-    <lib name="mnclientlib.lib" />
-  </libs>
-  <release category="platform" sinceversion="0"/>
-  <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>no</htmldocprovided>
-     <adaptation>no</adaptation>
-  </attributes>
-</api>
--- a/locsrv_plat/map_image_api/tsrc/bmarm/testmapimageu.def	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-EXPORTS
-	LibEntryL__FR13CTestModuleIf @ 1 NONAME R3UNUSED ; LibEntryL(CTestModuleIf &)
-
--- a/locsrv_plat/map_image_api/tsrc/bwins/testmapimageu.def	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-EXPORTS
-	?LibEntryL@@YAPAVCScriptBase@@AAVCTestModuleIf@@@Z @ 1 NONAME ; class CScriptBase * __cdecl LibEntryL(class CTestModuleIf &)
-
--- a/locsrv_plat/map_image_api/tsrc/conf/testmapimage.cfg	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,138 +0,0 @@
-[Define]
-EShowOptionNone		0
-EShowOptionText		1
-EShowOptionPois		2
-EShowOptionLandmarks	3
-EShowOptionCurrentLocation 4
-EShowOptionCountryBorders		5
-EShowOptionsMandatory				6
-KErrCancel 									-3
-[Enddefine]
-
-
-[Test]
-title TCMAPIMAGE0001
-create testmapimage obj
-obj CMnMapImageNewL 
-delete obj
-[Endtest] 
-
-[Test]
-title TCMAPIMAGE0002
-create testmapimage obj
-obj TestSetMapImageParams 
-delete obj
-[Endtest] 
-
-[Test]
-title TCMAPIMAGE0003
-create testmapimage obj
-obj TestSetShowOptions		 EShowOptionText
-delete obj
-[Endtest] 
-
-[Test]
-title TCMAPIMAGE0004
-create testmapimage obj
-obj TestSetTargetOrigin		 
-delete obj
-[Endtest] 
-
-[Test]
-title TCMAPIMAGE0005
-create testmapimage obj
-obj TestGetImageCoordinate		 
-delete obj
-[Endtest] 
-
-[Test]
-title TCMAPIMAGE0006
-create testmapimage obj
-obj TestSupportedImageTypes		 
-delete obj
-[Endtest] 
-
-[Test]
-title TCMAPIMAGE0007
-create testmapimage obj
-obj TestGetWorldCoordinate		 
-delete obj
-[Endtest] 
-
-[Test]
-title TCMAPIMAGE0008
-create testmapimage obj
-obj TestSetExitObserverL		 
-delete obj
-[Endtest] 
-
-[Test]
-title TCMAPIMAGE0009
-create testmapimage obj
-obj TestRender1L		 
-delete obj
-[Endtest] 
-
-[Test]
-title TCMAPIMAGE0010
-create testmapimage obj
-obj TestRender2L		 
-delete obj
-[Endtest] 
-
-[Test]
-title TCMAPIMAGE0011
-create testmapimage obj
-allownextresult 		KErrCancel
-obj TestCancelRendering		 
-delete obj
-[Endtest] 
-
-[Test]
-title TCMAPIMAGE0012
-create testmapimage obj
-obj TestTMnMapImageParams		 
-delete obj
-[Endtest] 
-
-[Test]
-title TCMAPIMAGE0013
-create testmapimage obj
-obj TestSetGetCenterPoint		 
-delete obj
-[Endtest] 
-
-[Test]
-title TCMAPIMAGE0014
-create testmapimage obj
-obj TestSetGetVisibleArea		 
-delete obj
-[Endtest] 
-
-[Test]
-title TCMAPIMAGE0015
-create testmapimage obj
-obj TestSetGetSize	 
-delete obj
-[Endtest] 
-
-[Test]
-title TCMAPIMAGE0016
-create testmapimage obj
-obj TestSetGetDirection	 
-delete obj
-[Endtest] 
-
-[Test]
-title TCMAPIMAGE0017
-create testmapimage obj
-obj TestSetGetImageType
-delete obj
-[Endtest] 
-
-[Test]
-title TCMAPIMAGE0018
-create testmapimage obj
-obj TestSetGetProjectionId
-delete obj
-[Endtest] 
\ No newline at end of file
--- a/locsrv_plat/map_image_api/tsrc/eabi/testmapimageu.def	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-EXPORTS
-	_Z9LibEntryLR13CTestModuleIf @ 1 NONAME
-
--- a/locsrv_plat/map_image_api/tsrc/group/bld.inf	Mon May 03 12:54:42 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: Build information file for test code of Map Image API
-*
-*/
-
-
-
-PRJ_PLATFORMS
-// specify the platforms your component needs to be built for here
-// defaults to WINS MARM so you can ignore this if you just build these
-DEFAULT
-
-PRJ_TESTEXPORTS
-// NOTE: If using ARS requirements all export operations should be done under this.
-// 'abld test export'
-
-PRJ_EXPORTS
-// Specify the source file followed by its destination here
-// copy will be used to copy the source file to its destination
-// If there's no destination then the source file will be copied
-// to the same name in /epoc32/include
-// Example: 
-/*
-/agnmodel/inc/AGMCOMON.H
-*/
-
-PRJ_TESTMMPFILES
-// NOTE: If using ARS requirements .mmp file operation should be done under this.
-// 'abld test build'
-
-../testprovider/group/testprovider.mmp
-../testprovider/group/testproviderplugin.mmp
-
-testmapimage.mmp
-
-PRJ_MMPFILES
-// Specify the .mmp files required for building the important component
-// releasables.
-//
-// Specify "tidy" if the component you need to build doesn't need to be
-// released. Specify "ignore" if the MMP file exists but should be
-// ignored.
-// Example:
-/*
-/agnmodel/group/agnmodel.mmp
-#if defined(MARM)
-/agnmodel/group/agsvexe.mmp
-#endif
-*/
-
-//  End of File
\ No newline at end of file
--- a/locsrv_plat/map_image_api/tsrc/group/map_image_api_test.pkg	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,50 +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: Package file for test code of Map Image API
-;
-;
-; Installation file for map_image_api_test application
-;
-;Languages
-&EN
-;
-; UID is the app's UID
-;
-#{"map_image_api_test"},(0x101FB3E3),2,0,0,TYPE=SA
-;
-; Localised Vendor name
-%{"Nokia"}
-
-; Unique Vendor name
-:"Nokia"
-
-;Supports Series 60 v 3.0
-;This line indicates that this installation is for the Series 60 platform v0.9
-;This line must appear _exactly_ as shown below in the sis file
-;If this line is missing or incorrect, the sis file will not be able
-;to be installed on Series 60 v3.0 platforms
-;(0x101F7961), 0, 0, 0, {"Series60ProductID"}
-;
-;
-; Files to install
-"\epoc32\release\armv5\urel\testmapimage.dll"-"C:\sys\bin\testmapimage.dll"
-
-"\epoc32\release\ARMV5\urel\mntestprovider.exe"-"C:\sys\bin\mntestprovider.exe"
-"\epoc32\release\ARMV5\urel\MnTestProviderPlugin.dll"-"!:\sys\bin\MnTestProviderPlugin.dll"
-"\epoc32\data\z\resource\apps\mntestprovider.rsc"-"C:\resource\apps\mntestprovider.rsc"
-"\epoc32\data\z\private\10003a3f\apps\mntestprovider_reg.rsc"-"C:\private\10003a3f\import\apps\mntestprovider_reg.rsc"
-"\epoc32\data\z\resource\plugins\mntestproviderplugin.rsc"-"!:\resource\plugins\mntestproviderplugin.rsc"
-
-"..\conf\testmapimage.cfg"-"C:\testframework\testmapimage.cfg"
-"..\init\testframework.ini"-"C:\testframework\testframework.ini"
--- a/locsrv_plat/map_image_api/tsrc/group/testmapimage.mmp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,87 +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: Project definition file for test code of Map Image API
-*
-*/
-
-
-
-#include <platform_paths.hrh>
-
-
-TARGET          testmapimage.dll
-TARGETTYPE      dll
-UID             0x1000008D 0x101FB3E3
-
-CAPABILITY      ALL -TCB
-/* Remove comments and replace 0x00000000 with correct vendor id */
-// VENDORID     0x00000000
-/* Remove comments and replace 0x00000000 with correct secure id */
-// SECUREID     0x00000000
-
-//TARGETPATH      ?target_path
-DEFFILE         testmapimage.def
-
-SOURCEPATH      ../src
-SOURCE          testmapimage.cpp
-SOURCE          testmapimageBlocks.cpp
-SOURCE          testmnmapimage.cpp
-SOURCE          testmnmapimageparams.cpp
-
-//RESOURCE        resource_file
-//RESOURCE        resource_file2
-
-USERINCLUDE     ../inc 
-
-
-APP_LAYER_SYSTEMINCLUDE
-
-
-LIBRARY         euser.lib
-LIBRARY         stiftestinterface.lib
-LIBRARY         stiftestengine.lib
-LIBRARY         mnclientlib.lib
-LIBRARY         swinstcli.lib
-LIBRARY         lbs.lib
-LIBRARY         avkon.lib
-LIBRARY         apparc.lib
-LIBRARY         fbscli.lib 
-LANG            SC
-
-/*
-START WINS      
-?wins_specific_information
-END
-
-START MARM
-?marm_specific_information
-END
-*/
-// Other possible keywords:
- 
-// DOCUMENT     ?file, that is not compiled, but added to MSVC project workspace (i.e. release notes)
-/*
-START BITMAP ?target
-TARGETPATH   ?emulated_path_on_target_machine
-HEADER
-SOURCE       ?color_depth ?source_bitmap
-END
-*/
-// DEFFILE ?filename
-// AIF ?filename
-
-
-SMPSAFE
-
-// End of File
--- a/locsrv_plat/map_image_api/tsrc/inc/testmapimage.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,305 +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 test class for map image api
-*
-*/
-
-
-
-#ifndef TESTMAPIMAGE_H
-#define TESTMAPIMAGE_H
-
-//  INCLUDES
-#include <StifLogger.h>
-#include <TestScripterInternal.h>
-#include <StifTestModule.h>
-
-
-// CONSTANTS
-//const ?type ?constant_var = ?constant;
-
-// MACROS
-//#define ?macro ?macro_def
-// Logging path
-_LIT( KtestmapimageLogPath, "\\logs\\testframework\\testmapimage\\" ); 
-// Log file
-_LIT( KtestmapimageLogFile, "testmapimage.txt" ); 
-_LIT( KtestmapimageLogFileWithTitle, "testmapimage_[%S].txt" );
-
-// FUNCTION PROTOTYPES
-//?type ?function_name(?arg_list);
-
-// FORWARD DECLARATIONS
-//class ?FORWARD_CLASSNAME;
-class Ctestmapimage;
-
-// DATA TYPES
-//enum ?declaration
-//typedef ?declaration
-//extern ?data_type;
-
-// CLASS DECLARATION
-
-/**
-*  Ctestmapimage test class for STIF Test Framework TestScripter.
-*  ?other_description_lines
-*
-*  @lib ?library
-*  @since ?Series60_version
-*/
-NONSHARABLE_CLASS(Ctestmapimage) : public CScriptBase
-    {
-    public:  // Constructors and destructor
-
-        /**
-        * Two-phased constructor.
-        */
-        static Ctestmapimage* NewL( CTestModuleIf& aTestModuleIf );
-
-        /**
-        * Destructor.
-        */
-        virtual ~Ctestmapimage();
-
-    public: // New functions
-
-        /**
-        * ?member_description.
-        * @since ?Series60_version
-        * @param ?arg1 ?description
-        * @return ?description
-        */
-        //?type ?member_function( ?type ?arg1 );
-
-    public: // Functions from base classes
-
-        /**
-        * From CScriptBase Runs a script line.
-        * @since ?Series60_version
-        * @param aItem Script line containing method name and parameters
-        * @return Symbian OS error code
-        */
-        virtual TInt RunMethodL( CStifItemParser& aItem );
-
-    protected:  // New functions
-
-        /**
-        * ?member_description.
-        * @since ?Series60_version
-        * @param ?arg1 ?description
-        * @return ?description
-        */
-        //?type ?member_function( ?type ?arg1 );
-
-    protected:  // Functions from base classes
-
-        /**
-        * From ?base_class ?member_description
-        */
-        //?type ?member_function();
-
-    private:
-
-        /**
-        * C++ default constructor.
-        */
-        Ctestmapimage( CTestModuleIf& aTestModuleIf );
-
-        /**
-        * By default Symbian 2nd phase constructor is private.
-        */
-        void ConstructL();
-
-        // Prohibit copy constructor if not deriving from CBase.
-        // ?classname( const ?classname& );
-        // Prohibit assigment operator if not deriving from CBase.
-        // ?classname& operator=( const ?classname& );
-
-        /**
-        * Frees all resources allocated from test methods.
-        * @since ?Series60_version
-        */
-        void Delete();
-
-        /**
-        * Test methods are listed below. 
-        */
-        /**
-        * This method will install the provider application
-        */
-        TInt InstallProvider( CStifItemParser& /*aItem*/  );
-        /**
-        * Test case for CMnMapImage::NewL
-        * @since ?Series60_version
-        * @param aItem Script line containing parameters.
-        * @return Symbian OS error code.
-        */
-        virtual TInt TestMapImageNewLL( CStifItemParser& aItem );
-        /**
-        * Test case for CMnMapImage::SetMapImageParams & CMnMapImage::MapImageParams
-        * @since ?Series60_version
-        * @param aItem Script line containing parameters.
-        * @return Symbian OS error code.
-        */
-        virtual TInt TestSetMapImageParams( CStifItemParser& aItem );
-         /**
-        * Test case for CMnMapImage::SetShowOptions & CMnMapImage::ShowOptions
-        * @since ?Series60_version
-        * @param aItem Script line containing parameters.
-        * @return Symbian OS error code.
-        */
-        virtual TInt TestSetShowOptions( CStifItemParser& aItem );
-        /**
-        * Test case for CMnMapImage::SetTargetOrigin & CMnMapImage::TargetOrigin
-        * @since ?Series60_version
-        * @param aItem Script line containing parameters.
-        * @return Symbian OS error code.
-        */
-        virtual TInt TestSetTargetOrigin( CStifItemParser& aItem );
-        /**
-        * Test case for CMnMapImage::GetImageCoordinate
-        * @since ?Series60_version
-        * @param aItem Script line containing parameters.
-        * @return Symbian OS error code.
-        */
-        virtual TInt TestGetImageCoordinate( CStifItemParser& aItem );
-        /**
-        * Test case for CMnMapImage::SupportedImageTypes
-        * @since ?Series60_version
-        * @param aItem Script line containing parameters.
-        * @return Symbian OS error code.
-        */
-        virtual TInt TestSupportedImageTypes( CStifItemParser& aItem );
-        /**
-        * Test case for CMnMapImage::GetWorldCoordinate
-        * @since ?Series60_version
-        * @param aItem Script line containing parameters.
-        * @return Symbian OS error code.
-        */
-        virtual TInt TestGetWorldCoordinate( CStifItemParser& aItem );
-        /**
-        * Test case for CMnMapImage::SetExitObserverL & CMnMapImage::RemoveExitObserver
-        * @since ?Series60_version
-        * @param aItem Script line containing parameters.
-        * @return Symbian OS error code.
-        */
-        virtual TInt TestSetExitObserverL( CStifItemParser& aItem );
-         /**
-        * Test case for CMnMapImage::RenderL whose completion is informed via aStatus parameter.
-        * @since ?Series60_version
-        * @param aItem Script line containing parameters.
-        * @return Symbian OS error code.
-        */
-        virtual TInt TestRender1L( CStifItemParser& aItem );
-        /**
-        * Test case for CMnMapImage::RenderL whose completion is informed via aCallback
-        * @since ?Series60_version
-        * @param aItem Script line containing parameters.
-        * @return Symbian OS error code.
-        */
-        virtual TInt TestRender2L( CStifItemParser& aItem );
-        /**
-        * Test case for CMnMapImage::CancelRendering 
-        * @since ?Series60_version
-        * @param aItem Script line containing parameters.
-        * @return Symbian OS error code.
-        */
-        virtual TInt TestCancelRendering( CStifItemParser& aItem );
-        /**
-        * Test case for constructor of TMnMapImageParams 
-        * @since ?Series60_version
-        * @param aItem Script line containing parameters.
-        * @return Symbian OS error code.
-        */
-        virtual TInt TestTMnMapImageParams( CStifItemParser& aItem );
-        /**
-        * Test case for TMnMapImageParams::SetCenterPoint &
-        * TMnMapImageParams::GetCenterPoint
-        * @since ?Series60_version
-        * @param aItem Script line containing parameters.
-        * @return Symbian OS error code.
-        */
-        virtual TInt TestSetGetCenterPoint( CStifItemParser& aItem );
-        /**
-        * Test case for TMnMapImageParams::SetVisibleArea &
-        * TMnMapImageParams::GetVisibleArea
-        * @since ?Series60_version
-        * @param aItem Script line containing parameters.
-        * @return Symbian OS error code.
-        */
-        virtual TInt TestSetGetVisibleArea( CStifItemParser& aItem );
-        /**
-        * Test case for TMnMapImageParams::SetSize &
-        * TMnMapImageParams::Size
-        * @since ?Series60_version
-        * @param aItem Script line containing parameters.
-        * @return Symbian OS error code.
-        */
-        virtual TInt TestSetGetSize( CStifItemParser& aItem );
-        /**
-        * Test case for TMnMapImageParams::SetDirection &
-        * TMnMapImageParams::Direction
-        * @since ?Series60_version
-        * @param aItem Script line containing parameters.
-        * @return Symbian OS error code.
-        */
-        virtual TInt TestSetGetDirection( CStifItemParser& aItem );
-        /**
-        * Test case for TMnMapImageParams::SetImageType &
-        * TMnMapImageParams::ImageType
-        * @since ?Series60_version
-        * @param aItem Script line containing parameters.
-        * @return Symbian OS error code.
-        */
-        virtual TInt TestSetGetImageType( CStifItemParser& aItem );
-        /**
-        * Test case for TMnMapImageParams::SetProjectionId &
-        * TMnMapImageParams::ProjectionId
-        * @since ?Series60_version
-        * @param aItem Script line containing parameters.
-        * @return Symbian OS error code.
-        */
-        virtual TInt TestSetGetProjectionId( CStifItemParser& aItem );
-        
-        
-        
-        
-        
-        //ADD NEW METHOD DEC HERE
-        //[TestMethods] - Do not remove
-
-    public:     // Data
-        // ?one_line_short_description_of_data
-        //?data_declaration;
-
-    protected:  // Data
-        // ?one_line_short_description_of_data
-        //?data_declaration;
-
-    private:    // Data
-        
-    //    CTestMapImage * iMapImage;
-
-    public:     // Friend classes
-        //?friend_class_declaration;
-    protected:  // Friend classes
-        //?friend_class_declaration;
-    private:    // Friend classes
-        //?friend_class_declaration;
-
-    };
-
-#endif      // TESTMAPIMAGE_H
-
-// End of File
--- a/locsrv_plat/map_image_api/tsrc/inc/testmnmapimage.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,140 +0,0 @@
-/*
-* Copyright (c) 2007 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:  Helper class for CMnMapImage class
-*
-*/
-
-
-#ifndef CTESTMNMAPIMAGE_H
-#define CTESTMNMAPIMAGE_H
-
-// System Includes
-#include <StifLogger.h>
-#include <StifParser.h>
-#include <StifParser.h>
-#include <AknServerApp.h>
-#include <mnmapimage.h>
-#include <fbs.h>
-
-
-
-// CLASS DECLARATION
-/**
- *  
- *
- *  This class is a helper class used to handle the functions of CMnMapImage
- *  class. 
- *
- *  @lib testmapimage.lib
- *  @since S60 v5.0
- */
-
-class CTestMapImage:public MAknServerAppExitObserver,public CActive,public MMnMapImageRenderCallback
-    {
-    public:  // Constructors and destructor
-
-        /**
-        * C++ default constructor.
-        */
-        CTestMapImage(CStifLogger* aLog);
-
-        /**
-        * Destructor. 
-        */
-        ~CTestMapImage();
-
-    public:         
-        
-                   
-		  
-        // New functions  
-        /**
-        * Test case for CMnMapImage::NewL
-        */
-        TInt TestNewLL();
-        /**
-        * Test case for CMnMapImage::SetMapImageParams & CMnMapImage::MapImageParams
-        */
-        TInt CheckSetMapImageParams() const;
-        /**
-        * Test case for CMnMapImage::SetShowOptions & CMnMapImage::ShowOptions
-        */
-        TInt CheckSetShowOptions(CStifItemParser& aItem);
-         /**
-        * Test case for CMnMapImage::SetTargetOrigin & CMnMapImage::TargetOrigin
-        */
-        TInt CheckSetTargetOrigin();
-        /**
-        * Test case for CMnMapImage::TestGetImageCoordinate
-        */
-        TInt CheckGetImageCoordinate();
-	    /**
-        * Test case for CMnMapImage::SupportedImageTypes
-        */
-        TInt CheckSupportedImageTypes();
-        /**
-        * Test case for CMnMapImage::GetWorldCoordinate
-        */
-        TInt CheckGetWorldCoordinate();
-        /**
-        * From MAknServerAppExitObserver
-        */
-        void HandleServerAppExit  (  TInt  aReason   );
-        /**
-        * Test case for CMnMapImage::SetExitObserverL & CMnMapImage::RemoveExitObserver
-        */
-        TInt CheckSetExitObserverL(); 
-        /**
-        * From CActive
-        */
-        void RunL();
-        void DoCancel();
-        /**
-        * Test case for CMnMapImage::RenderL whose completion is informed via aStatus parameter.
-        */
-        TInt CheckRender1L(); 
-        /**
-        * Test case for CMnMapImage::RenderL whose completion is informed via aCallback
-        */
-        TInt CheckRender2L(); 
-        /**
-        * From MMnMapImageRenderCallback
-        */
-        void HandleRenderingCompletedL( TInt aStatus, CMnMapImage& /*aMapImage*/ );
-        /**
-        * Test case for CMnMapImage::CancelRendering 
-        */
-        TInt CheckCancelRendering(); 
-        
-	
-		  
-	private:
-	    
-	   
-	   
-	    
-    private:  //data
-	   
-	    /**
-	     * Pointer to Stif Logger - Does not Own
-	     */           
-        CStifLogger* 			iLog;
-        TInt iError;
-        CMnMapImage* iMapImage ;
-        
-     };     
-
-#endif      //  CTESTMNMAPIMAGE_H
-
-// End of File
--- a/locsrv_plat/map_image_api/tsrc/inc/testmnmapimageparams.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,116 +0,0 @@
-/*
-* Copyright (c) 2007 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:  Helper class for TMnMapImageParams class
-*
-*/
-
-
-#ifndef CTESTMNMAPIMAGEPARAMS_H
-#define CTESTMNMAPIMAGEPARAMS_H
-
-// System Includes
-#include <StifLogger.h>
-#include <StifParser.h>
-#include <StifParser.h>
-#include <mnmapimageparams.h>
-
-
-
-
-// CLASS DECLARATION
-/**
- *  
- *
- *  This class is a helper class used to handle the functions of TMnMapImageParams
- *  class. 
- *
- *  @lib testmapimage.lib
- *  @since S60 v5.0
- */
-
-class CTestMapImageParams
-    {
-    public:  // Constructors and destructor
-
-        /**
-        * C++ default constructor.
-        */
-        CTestMapImageParams(CStifLogger* aLog);
-
-        /**
-        * Destructor. 
-        */
-        ~CTestMapImageParams();
-
-    public:         
-        
-                   
-		  
-        // New functions  
-        /**
-        * Test case for constructor of TMnMapImageParams
-        */
-        TInt CheckTMnMapImageParams();
-        /**
-        * Test case for TMnMapImageParams::SetCenterPoint &
-        * TMnMapImageParams::GetCenterPoint
-        */
-        TInt CheckSetGetCenterPoint();
-        /**
-        * Test case for TMnMapImageParams::SetVisibleArea &
-        * TMnMapImageParams::GetVisibleArea
-        */
-        TInt CheckSetGetVisibleArea();
-        /**
-        * Test case for TMnMapImageParams::SetSize &
-        * TMnMapImageParams::Size
-        */
-        TInt CheckSetGetSize();
-        /**
-        * Test case for TMnMapImageParams::SetDirection &
-        * TMnMapImageParams::Direction
-        */
-        TInt CheckSetGetDirection();
-        /**
-        * Test case for TMnMapImageParams::SetImageType &
-        * TMnMapImageParams::ImageType
-        */
-        TInt CheckSetGetImageType();
-        /**
-        * Test case for TMnMapImageParams::SetProjectionId &
-        * TMnMapImageParams::ProjectionId
-        */
-        TInt CheckSetGetProjectionId();
-        
-        
-        
-		 
-		  
-	private:
-	    
-	   
-	   
-	    
-    private:  //data
-	   
-	    /**
-	     * Pointer to Stif Logger - Does not Own
-	     */           
-        CStifLogger* 			iLog;
-        
-     };     
-
-#endif      //  CTESTMNMAPIMAGEPARAMS_H
-
-// End of File
--- a/locsrv_plat/map_image_api/tsrc/init/testframework.ini	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,182 +0,0 @@
-#
-# This is STIFTestFramework initialization file
-# Comment lines start with '#'-character.
-# See STIF TestFramework users guide.doc for instructions
-
-# -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
-# Set following test engine settings:
-#	- Set Test Reporting mode. TestReportMode's possible values are:
-#		+ 'Summary': Summary of the tested test cases.
-#		+ 'Environment': Hardware and software info.
-#		+ 'TestCases': Test case report.
-#		+ 'FullReport': Set of all above ones.
-#		+ Example 'TestReportMode= Summary TestCases'
-#
-# 	- CreateTestReport setting controls report creation mode
-#		+ YES, Test report will created.
-#		+ NO, No Test report.
-#
-# 	- File path indicates the base path of the test report.
-# 	- File name indicates the name of the test report.
-#
-# 	- File format indicates the type of the test report.
-#		+ TXT, Test report file will be txt type, for example 'TestReport.txt'.
-#		+ HTML, Test report will be html type, for example 'TestReport.html'.
-#
-# 	- File output indicates output source of the test report.
-#		+ FILE, Test report logging to file.
-#		+ RDEBUG, Test report logging to using rdebug.
-#
-# 	- File Creation Mode indicates test report overwriting if file exist.
-#		+ OVERWRITE, Overwrites if the Test report file exist.
-#		+ APPEND, Continue logging after the old Test report information if 
-#                 report exist.
-# 	- Sets a device reset module's dll name(Reboot).
-#		+ If Nokia specific reset module is not available or it is not correct one
-#		  StifHWResetStub module may use as a template for user specific reset
-#		  module. 
-
-[Engine_Defaults]
-
-TestReportMode= FullReport		# Possible values are: 'Empty', 'Summary', 'Environment',
-                                                               'TestCases' or 'FullReport'
-
-CreateTestReport= YES			# Possible values: YES or NO
-
-TestReportFilePath= C:\LOGS\TestFramework\
-TestReportFileName= TestReport
-
-TestReportFormat= TXT			# Possible values: TXT or HTML
-TestReportOutput= FILE			# Possible values: FILE or RDEBUG
-TestReportFileCreationMode= OVERWRITE	# Possible values: OVERWRITE or APPEND
-
-DeviceResetDllName= StifResetForNokia.dll # e.g. 'StifHWResetStub.dll' for user specific reseting
-
-[End_Defaults]
-# -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
-
-
-
-# -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
-# Module configurations start
-# Modules are added between module tags
-# tags. Module name is specified after ModuleName= tag, like
-# ModuleName= XXXXXXXXX
-# Modules might have initialisation file, specified as
-# IniFile= c:\testframework\YYYYYY
-# Modules might have several configuration files, like
-# TestCaseFile= c:\testframework\NormalCases.txt
-# TestCaseFile= c:\testframework\SmokeCases.txt
-# TestCaseFile= c:\testframework\ManualCases.txt
-
-# (TestCaseFile is synonym for old term ConfigFile)
-
-# Following case specifies demo module settings. Demo module
-# does not read any settings from file, so tags 
-# IniFile and TestCaseFile are not used.
-# In the simplest case it is enough to specify only the
-# name of the test module when adding new test module
-
-#[New_Module]
-#ModuleName= demomodule
-#[End_Module]
-
-[New_Module]
-ModuleName= TestScripter
-TestCaseFile= C:\Testframework\testmapimage.cfg
-[End_Module]
-
-# Load testmoduleXXX, optionally with initialization file and/or test case files
-#[New_Module]
-#ModuleName= testmodulexxx
-
-#TestModuleXXX used initialization file
-#IniFile= c:\testframework\init.txt
-
-#TestModuleXXX used configuration file(s)
-#TestCaseFile= c:\testframework\testcases1.cfg
-#TestCaseFile= c:\testframework\testcases2.cfg
-#TestCaseFile= c:\testframework\manualtestcases.cfg
-
-#[End_Module]
-# -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
-
-
-
-# -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
-# Set STIFTestFramework logging overwrite parameters for Logger.
-# 	Hardware and emulator environment logging path and styles can
-# 	be configured from here to overwrite the Logger's implemented values.
-#	
-#	Settings description:
-#	- Indicates option for creation log directory/directories. If log directory/directories
-#         is/are not created by user they will make by software.
-#		+ YES, Create log directory/directories if not allready exist.
-#		+ NO, Log directory/directories not created. Only created one is used.
-#
-#	- Overwrite emulator path setting.
-#		+ Example: If 'EmulatorBasePath= C:\LOGS\TestFramework\' and in code is defined 
-#		           Logger's path 'D:\\LOGS\\Module\\' with those definition the path
-#		           will be 'C:\LOGS\TestFramework\LOGS\Module\'
-#
-#	- Overwrite emulator's logging format.
-#		+ TXT, Log file(s) will be txt type(s), for example 'Module.txt'.
-#		+ HTML, Log file(s) will be html type(s), for example 'Module.html'.
-#
-#	- Overwrited emulator logging output source.
-#		+ FILE, Logging to file(s).
-#		+ RDEBUG, Logging to using rdebug(s).
-#
-#	- Overwrite hardware path setting (Same description as above in emulator path).
-#	- Overwrite hardware's logging format(Same description as above in emulator format).
-#	- Overwrite hardware's logging output source(Same description as above in emulator output).
-#
-#	- File Creation Mode indicates file overwriting if file exist.
-#		+ OVERWRITE, Overwrites if file(s) exist.
-#		+ APPEND, Continue logging after the old logging information if file(s) exist.
-#
-#	- Will thread id include to the log filename.
-#		+ YES, Thread id to log file(s) name, Example filename 'Module_b9.txt'.
-#		+ NO, No thread id to log file(s), Example filename 'Module.txt'.
-#
-#	- Will time stamps include the to log file.
-#		+ YES, Time stamp added to each line in log file(s). Time stamp is 
-#                 for example'12.Nov.2003 115958    LOGGING INFO'
-#		+ NO, No time stamp(s).
-#
-#	- Will line breaks include to the log file.
-#		+ YES, Each logging event includes line break and next log event is in own line.
-#		+ NO, No line break(s).
-#
-#	- Will event ranking include to the log file.
-#		+ YES, Event ranking number added to each line in log file(s). Ranking number 
-#                 depends on environment's tics, for example(includes time stamp also)
-#                 '012   12.Nov.2003 115958    LOGGING INFO'
-#		+ NO, No event ranking.
-#
-
-[Logger_Defaults]
-
-#NOTE: If you want to set Logger using next setting(s) remove comment(s)'#' 
-
-#CreateLogDirectories= YES		# Possible values: YES or NO
-
-#EmulatorBasePath= C:\LOGS\TestFramework\
-#EmulatorFormat= HTML			# Possible values: TXT or HTML
-#EmulatorOutput= FILE			# Possible values: FILE or RDEBUG
-
-#HardwareBasePath= D:\LOGS\TestFramework\
-#HardwareFormat= HTML			# Possible values: TXT or HTML
-#HardwareOutput= FILE			# Possible values: FILE or RDEBUG
-
-#FileCreationMode= OVERWRITE		# Possible values: OVERWRITE or APPEND
-
-#ThreadIdToLogFile= YES			# Possible values: YES or NO
-#WithTimeStamp= YES			# Possible values: YES or NO
-#WithLineBreak= YES			# Possible values: YES or NO
-#WithEventRanking= YES			# Possible values: YES or NO
-
-[End_Logger_Defaults]
-# -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
-
-# End of file
--- a/locsrv_plat/map_image_api/tsrc/src/testmapimage.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,186 +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 test class for map image api
-*
-*/
-
-
-
-// INCLUDE FILES
-#include <Stiftestinterface.h>
-#include "testmapimage.h"
-#include <SettingServerClient.h>
-#include <swinstapi.h>
-
-
-// EXTERNAL DATA STRUCTURES
-//extern  ?external_data;
-
-// EXTERNAL FUNCTION PROTOTYPES  
-//extern ?external_function( ?arg_type,?arg_type );
-
-// CONSTANTS
-//const ?type ?constant_var = ?constant;
-
-// MACROS
-//#define ?macro ?macro_def
-
-// LOCAL CONSTANTS AND MACROS
-//const ?type ?constant_var = ?constant;
-//#define ?macro_name ?macro_def
-
-// MODULE DATA STRUCTURES
-//enum ?declaration
-//typedef ?declaration
-
-// LOCAL FUNCTION PROTOTYPES
-//?type ?function_name( ?arg_type, ?arg_type );
-
-// FORWARD DECLARATIONS
-//class ?FORWARD_CLASSNAME;
-
-// ============================= LOCAL FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// ?function_name ?description.
-// ?description
-// Returns: ?value_1: ?description
-//          ?value_n: ?description_line1
-//                    ?description_line2
-// -----------------------------------------------------------------------------
-//
-/*
-?type ?function_name(
-    ?arg_type arg,  // ?description
-    ?arg_type arg)  // ?description
-    {
-
-    ?code  // ?comment
-
-    // ?comment
-    ?code
-    }
-*/
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// Ctestmapimage::Ctestmapimage
-// C++ default constructor can NOT contain any code, that
-// might leave.
-// -----------------------------------------------------------------------------
-//
-Ctestmapimage::Ctestmapimage( 
-    CTestModuleIf& aTestModuleIf ):
-        CScriptBase( aTestModuleIf )
-    {
-    }
-
-// -----------------------------------------------------------------------------
-// Ctestmapimage::ConstructL
-// Symbian 2nd phase constructor can leave.
-// -----------------------------------------------------------------------------
-//
-void Ctestmapimage::ConstructL()
-    {
-    //Read logger settings to check whether test case name is to be
-    //appended to log file name.
-    RSettingServer settingServer;
-    TInt ret = settingServer.Connect();
-    if(ret != KErrNone)
-        {
-        User::Leave(ret);
-        }
-    // Struct to StifLogger settigs.
-    TLoggerSettings loggerSettings; 
-    // Parse StifLogger defaults from STIF initialization file.
-    ret = settingServer.GetLoggerSettings(loggerSettings);
-    if(ret != KErrNone)
-        {
-        User::Leave(ret);
-        } 
-    // Close Setting server session
-    settingServer.Close();
-
-    TFileName logFileName;
-    
-    if(loggerSettings.iAddTestCaseTitle)
-        {
-        TName title;
-        TestModuleIf().GetTestCaseTitleL(title);
-        logFileName.Format(KtestmapimageLogFileWithTitle, &title);
-        }
-    else
-        {
-        logFileName.Copy(KtestmapimageLogFile);
-        }
-
-    iLog = CStifLogger::NewL( KtestmapimageLogPath, 
-                          logFileName,
-                          CStifLogger::ETxt,
-                          CStifLogger::EFile,
-                          EFalse );
-   // InstallProvider( KProviderSisxPath );
-
-    }
-
-// -----------------------------------------------------------------------------
-// Ctestmapimage::NewL
-// Two-phased constructor.
-// -----------------------------------------------------------------------------
-//
-Ctestmapimage* Ctestmapimage::NewL( 
-    CTestModuleIf& aTestModuleIf )
-    {
-    Ctestmapimage* self = new (ELeave) Ctestmapimage( aTestModuleIf );
-
-    CleanupStack::PushL( self );
-    self->ConstructL();
-    CleanupStack::Pop();
-
-    return self;
-
-    }
-
-// Destructor
-Ctestmapimage::~Ctestmapimage()
-    { 
-
-    // Delete resources allocated from test methods
-    Delete();
-
-    // Delete logger
-    delete iLog; 
-
-    }
-    
-    
-
-// ========================== OTHER EXPORTED FUNCTIONS =========================
-
-// -----------------------------------------------------------------------------
-// LibEntryL is a polymorphic Dll entry point.
-// Returns: CScriptBase: New CScriptBase derived object
-// -----------------------------------------------------------------------------
-//
-EXPORT_C CScriptBase* LibEntryL( 
-    CTestModuleIf& aTestModuleIf ) // Backpointer to STIF Test Framework
-    {
-
-    return ( CScriptBase* ) Ctestmapimage::NewL( aTestModuleIf );
-
-    }
-
-
-//  End of File
--- a/locsrv_plat/map_image_api/tsrc/src/testmapimageBlocks.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,453 +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: Entry point for test cases in stif module
-*
-*/
-
-
-
-// [INCLUDE FILES] - do not remove
-#include <e32svr.h>
-#include <StifParser.h>
-#include <Stiftestinterface.h>
-#include "testmapimage.h"
-#include "testmnmapimage.h"
-#include "testmnmapimageparams.h"
-#include <swinstapi.h>
-
-_LIT( KProviderSisxPath, "e:\\testing\\data\\MnTestProvider.sisx" );
-
-// EXTERNAL DATA STRUCTURES
-//extern  ?external_data;
-
-// EXTERNAL FUNCTION PROTOTYPES  
-//extern ?external_function( ?arg_type,?arg_type );
-
-// CONSTANTS
-//const ?type ?constant_var = ?constant;
-
-// MACROS
-//#define ?macro ?macro_def
-
-// LOCAL CONSTANTS AND MACROS
-//const ?type ?constant_var = ?constant;
-//#define ?macro_name ?macro_def
-
-// MODULE DATA STRUCTURES
-//enum ?declaration
-//typedef ?declaration
-
-// LOCAL FUNCTION PROTOTYPES
-//?type ?function_name( ?arg_type, ?arg_type );
-
-// FORWARD DECLARATIONS
-//class ?FORWARD_CLASSNAME;
-
-// ============================= LOCAL FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// ?function_name ?description.
-// ?description
-// Returns: ?value_1: ?description
-//          ?value_n: ?description_line1
-//                    ?description_line2
-// -----------------------------------------------------------------------------
-//
-/*
-?type ?function_name(
-    ?arg_type arg,  // ?description
-    ?arg_type arg)  // ?description
-    {
-
-    ?code  // ?comment
-
-    // ?comment
-    ?code
-    }
-*/
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// Ctestmapimage::Delete
-// Delete here all resources allocated and opened from test methods. 
-// Called from destructor. 
-// -----------------------------------------------------------------------------
-//
-void Ctestmapimage::Delete() 
-    {
-
-    }
-
-// -----------------------------------------------------------------------------
-// Ctestmapimage::RunMethodL
-// Run specified method. Contains also table of test mothods and their names.
-// -----------------------------------------------------------------------------
-//
-TInt Ctestmapimage::RunMethodL( 
-    CStifItemParser& aItem ) 
-    {
-
-    static TStifFunctionInfo const KFunctions[] =
-        {  
-        // Copy this line for every implemented function.
-        // First string is the function name used in TestScripter script file.
-        // Second is the actual implementation member function. 
-        ENTRY( "CMnMapImageNewL", Ctestmapimage::TestMapImageNewLL ),
-        ENTRY( "TestSetMapImageParams", Ctestmapimage::TestSetMapImageParams ),
-        ENTRY( "TestSetShowOptions", Ctestmapimage::TestSetShowOptions ),
-        ENTRY( "TestSetTargetOrigin", Ctestmapimage::TestSetTargetOrigin ),
-        ENTRY( "TestGetImageCoordinate", Ctestmapimage::TestGetImageCoordinate ),
-        ENTRY( "TestSupportedImageTypes", Ctestmapimage::TestSupportedImageTypes ),
-        ENTRY( "TestGetWorldCoordinate", Ctestmapimage::TestGetWorldCoordinate ),
-        ENTRY( "TestSetExitObserverL", Ctestmapimage::TestSetExitObserverL ),
-        ENTRY( "TestRender1L", Ctestmapimage::TestRender1L ),
-        ENTRY( "TestRender2L", Ctestmapimage::TestRender2L ),
-        ENTRY( "TestCancelRendering", Ctestmapimage::TestCancelRendering ),
-        
-        ENTRY( "TestTMnMapImageParams", Ctestmapimage::TestTMnMapImageParams ),
-        ENTRY( "TestSetGetCenterPoint", Ctestmapimage::TestSetGetCenterPoint ),
-        ENTRY( "TestSetGetVisibleArea", Ctestmapimage::TestSetGetVisibleArea ),
-        ENTRY( "TestSetGetSize", Ctestmapimage::TestSetGetSize ),
-        ENTRY( "TestSetGetDirection", Ctestmapimage::TestSetGetDirection ),
-        ENTRY( "TestSetGetImageType", Ctestmapimage::TestSetGetImageType ),
-        ENTRY( "TestSetGetProjectionId", Ctestmapimage::TestSetGetProjectionId ),
-        //ADD NEW ENTRY HERE
-        // [test cases entries] - Do not remove
-
-        };
-
-    const TInt count = sizeof( KFunctions ) / 
-                        sizeof( TStifFunctionInfo );
-
-    return RunInternalL( KFunctions, count, aItem );
-
-    }
-
-// -----------------------------------------------------------------------------
-// This method will install the provider application
-//
-// -----------------------------------------------------------------------------
-//   
-TInt Ctestmapimage::InstallProvider( CStifItemParser& /*aItem*/  )
-    {
-   // iLog->Log("Installing [%S]...", aPackagePath );
-
-    TInt err = KErrNone;
-    SwiUI::RSWInstSilentLauncher installer;
-
-    err = installer.Connect();
-    if( KErrNone != err )
-    	{
-    	iLog->Log(_L("Connection to installer failed"));
-    	return err;
-    	}
-    //CHECK_EQUAL( err, KErrNone, "Connection to installer failed" );
-
-    SwiUI::TInstallOptionsPckg options;
-    options().iUpgrade = SwiUI::EPolicyAllowed;
-    options().iPackageInfo = SwiUI::EPolicyAllowed;
-    options().iOverwrite = SwiUI::EPolicyAllowed;
-    options().iKillApp = SwiUI::EPolicyAllowed;
-
-    err = installer.SilentInstall( KProviderSisxPath, options );
-    if( KErrNone != err )
-    	{
-    	iLog->Log(_L("Provider Installation failed"));
-    	installer.Close();
-    	return err;
-    	}
-
-    //CHECK_EQUAL( err, KErrNone, "Installation failed" );
-	iLog->Log(_L("Provider Installation passed"));
-    installer.Close();
-    return err;
-    }
-
-
-// -----------------------------------------------------------------------------
-// Ctestmapimage::TestMapImageNewLL
-// Test case for CMnMapImage::NewL
-// -----------------------------------------------------------------------------
-//
-
-TInt Ctestmapimage::TestMapImageNewLL(
-   CStifItemParser& /*aItem*/ )
-   {
-
-        CTestMapImage image(iLog);
-        return image.TestNewLL();
-
-   }
-
-// -----------------------------------------------------------------------------
-// Ctestmapimage::TestSetMapImageParams
-// Test case for CMnMapImage::SetMapImageParams & CMnMapImage::MapImageParams
-// -----------------------------------------------------------------------------
-//
-
-TInt Ctestmapimage::TestSetMapImageParams(
-   CStifItemParser& /*aItem*/ )
-   {
-
-        CTestMapImage image(iLog);
-        return image.CheckSetMapImageParams();
-
-   }
-   
-   
-// -----------------------------------------------------------------------------
-// Ctestmapimage::TestSetShowOptions
-// Test case for CMnMapImage::SetShowOptions & CMnMapImage::ShowOptions
-// -----------------------------------------------------------------------------
-//
-
-TInt Ctestmapimage::TestSetShowOptions(
-   CStifItemParser& aItem )
-   {
-
-       CTestMapImage image(iLog);
-        return image.CheckSetShowOptions(aItem);
-
-   }
-
-// -----------------------------------------------------------------------------
-// Ctestmapimage::TestSetTargetOrigin
-// Test case for CMnMapImage::SetTargetOrigin & CMnMapImage::TargetOrigin
-// -----------------------------------------------------------------------------
-//
-
-TInt Ctestmapimage::TestSetTargetOrigin(
-   CStifItemParser& /*aItem*/ )
-   {
-
-        CTestMapImage image(iLog);
-        return image.CheckSetTargetOrigin();
-
-   }
-   
-// -----------------------------------------------------------------------------
-// Ctestmapimage::TestGetImageCoordinate
-// Test case for CMnMapImage::GetImageCoordinate
-// -----------------------------------------------------------------------------
-//
-
-TInt Ctestmapimage::TestGetImageCoordinate(
-   CStifItemParser& /*aItem*/ )
-   {
-
-        CTestMapImage image(iLog);
-        return image.CheckGetImageCoordinate();
-
-   }
-   
-// -----------------------------------------------------------------------------
-// Ctestmapimage::TestSupportedImageTypes
-// Test case for CMnMapImage::SupportedImageTypes
-// -----------------------------------------------------------------------------
-//
-
-TInt Ctestmapimage::TestSupportedImageTypes(
-   CStifItemParser& /*aItem*/ )
-   {
-
-        CTestMapImage image(iLog);
-        return image.CheckSupportedImageTypes();
-
-   }
-   
-// -----------------------------------------------------------------------------
-// Ctestmapimage::TestGetWorldCoordinate
-// Test case for CMnMapImage::GetWorldCoordinate
-// -----------------------------------------------------------------------------
-//
-
-TInt Ctestmapimage::TestGetWorldCoordinate(
-   CStifItemParser& /*aItem*/ )
-   {
-
-        CTestMapImage image(iLog);
-        return image.CheckGetWorldCoordinate();
-
-   }
-   
-// -----------------------------------------------------------------------------
-// Ctestmapimage::TestSetExitObserverL
-// Test case for CMnMapImage::SetExitObserverL & CMnMapImage::RemoveExitObserver
-// -----------------------------------------------------------------------------
-//
-
-TInt Ctestmapimage::TestSetExitObserverL(
-   CStifItemParser& /*aItem*/ )
-   {
-
-        CTestMapImage image(iLog);
-        return image.CheckSetExitObserverL();
-
-   }
-   
-// -----------------------------------------------------------------------------
-// Ctestmapimage::TestRender1L
-// Test case for CMnMapImage::RenderL whose completion is informed via aStatus parameter.
-// -----------------------------------------------------------------------------
-//
-
-TInt Ctestmapimage::TestRender1L(
-   CStifItemParser& /*aItem*/ )
-   {
-
-        CTestMapImage image(iLog);
-        return image.CheckRender1L();
-
-   }
-   
-// -----------------------------------------------------------------------------
-// Ctestmapimage::TestRender2L
-// Test case for CMnMapImage::RenderL whose completion is informed via aCallback
-// -----------------------------------------------------------------------------
-//
-
-TInt Ctestmapimage::TestRender2L(
-   CStifItemParser& /*aItem*/ )
-   {
-
-        CTestMapImage image(iLog);
-        return image.CheckRender2L();
-
-   }
-   
-// -----------------------------------------------------------------------------
-// Ctestmapimage::TestCancelRendering
-// Test case for CMnMapImage::CancelRendering 
-// -----------------------------------------------------------------------------
-//
-
-TInt Ctestmapimage::TestCancelRendering(
-   CStifItemParser& /*aItem*/ )
-   {
-
-        CTestMapImage image(iLog);
-        return image.CheckCancelRendering();
-
-   }
-   
-// -----------------------------------------------------------------------------
-// Ctestmapimage::TestTMnMapImageParams
-// Test case for constructor of TMnMapImageParams 
-// -----------------------------------------------------------------------------
-//
-
-TInt Ctestmapimage::TestTMnMapImageParams(
-   CStifItemParser& /*aItem*/ )
-   {
-
-        CTestMapImageParams imageParams(iLog);
-        return imageParams.CheckTMnMapImageParams();
-
-   }
-   
-// -----------------------------------------------------------------------------
-// Ctestmapimage::TestSetGetCenterPoint
-// Test case for TMnMapImageParams::SetCenterPoint & TMnMapImageParams::GetCenterPoint
-// -----------------------------------------------------------------------------
-//
-
-TInt Ctestmapimage::TestSetGetCenterPoint(
-   CStifItemParser& /*aItem*/ )
-   {
-
-        CTestMapImageParams imageParams(iLog);
-        return imageParams.CheckSetGetCenterPoint();
-
-   }
-   
-// -----------------------------------------------------------------------------
-// Ctestmapimage::TestSetGetVisibleArea
-// Test case for TMnMapImageParams::SetVisibleArea & TMnMapImageParams::GetVisibleArea
-// -----------------------------------------------------------------------------
-//
-
-TInt Ctestmapimage::TestSetGetVisibleArea(
-   CStifItemParser& /*aItem*/ )
-   {
-
-        CTestMapImageParams imageParams(iLog);
-        return imageParams.CheckSetGetVisibleArea();
-
-   }
-   
-// -----------------------------------------------------------------------------
-// Ctestmapimage::TestSetGetSize
-// Test case for TMnMapImageParams::SetSize & TMnMapImageParams::Size
-// -----------------------------------------------------------------------------
-//
-
-TInt Ctestmapimage::TestSetGetSize(
-   CStifItemParser& /*aItem*/ )
-   {
-
-        CTestMapImageParams imageParams(iLog);
-        return imageParams.CheckSetGetSize();
-
-   }
-
-// -----------------------------------------------------------------------------
-// Ctestmapimage::TestSetGetDirection
-// Test case for TMnMapImageParams::SetDirection & TMnMapImageParams::Direction
-// -----------------------------------------------------------------------------
-//
-
-TInt Ctestmapimage::TestSetGetDirection(
-   CStifItemParser& /*aItem*/ )
-   {
-
-        CTestMapImageParams imageParams(iLog);
-        return imageParams.CheckSetGetDirection();
-
-   }
-   
-// -----------------------------------------------------------------------------
-// Ctestmapimage::TestSetGetImageType
-// Test case for TMnMapImageParams::SetImageType & TMnMapImageParams::ImageType
-// -----------------------------------------------------------------------------
-//
-
-TInt Ctestmapimage::TestSetGetImageType(
-   CStifItemParser& /*aItem*/ )
-   {
-
-        CTestMapImageParams imageParams(iLog);
-        return imageParams.CheckSetGetImageType();
-
-   }
-   
-// -----------------------------------------------------------------------------
-// Ctestmapimage::TestSetGetProjectionId
-// Test case for TMnMapImageParams::SetProjectionId & TMnMapImageParams::ProjectionId
-// -----------------------------------------------------------------------------
-//
-
-TInt Ctestmapimage::TestSetGetProjectionId(
-   CStifItemParser& /*aItem*/ )
-   {
-
-        CTestMapImageParams imageParams(iLog);
-        return imageParams.CheckSetGetProjectionId();
-
-   }
-
-// ========================== OTHER EXPORTED FUNCTIONS =========================
-// None
-
-//  [End of File] - Do not remove
--- a/locsrv_plat/map_image_api/tsrc/src/testmnmapimage.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,487 +0,0 @@
-/*
-* Copyright (c) 2007 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:  Helper class for CMnMapImage class
-*
-*/
-
-
-// System Includes
-
-
-// User Includes
-#include "testmnmapimage.h"
-#include <e32std.h>
-#include <e32const.h>
-#include <mnmapimage.h>
-#include <mnproviderfinder.h>
-#include <mnprovider.h>
-#include <mnmapimageparams.h>
-#include <LbsPosition.h>
-#include <fbs.h>
-
-// Constant Declarations
-
-
-
-// ======== MEMBER FUNCTIONS ========
-
-// ---------------------------------------------------------------------------
-// C++ Default Constructor
-// ---------------------------------------------------------------------------
-//
-CTestMapImage ::CTestMapImage (CStifLogger* aLog):iLog(aLog),CActive(0)
-    {
-        CActiveScheduler::Add(this);
-    }
-
-// ---------------------------------------------------------------------------
-// C++ Destructor
-// ---------------------------------------------------------------------------
-//
-CTestMapImage ::~CTestMapImage ()
-    {
-        if(IsActive())
-            {
-                Cancel();
-            }
-        
-    }
-
-// ---------------------------------------------------------------------------
-// Test case for CMnMapImage::NewL
-// ---------------------------------------------------------------------------
-
-    TInt CTestMapImage::TestNewLL()
-        {
-            RPointerArray<CMnProvider> providerArray;
-	        MnProviderFinder::FindProvidersL( providerArray,CMnProvider::EServiceMapImage );
-	       // TBool flag = EFalse;
-	        /*TUid KTestProviderUid = TUid::Uid( 0x0313200B );
-	        for( TInt i = 0; i < providerArray.Count(); i++ )
-	            {
-	            if( providerArray.operator[](i)->Uid() == KTestProviderUid )
-	                {
-	                flag = ETrue;
-	                break;
-	                }
-	            }
-	         */
-	         CMnMapImage* mapImage = CMnMapImage::NewL( *providerArray.operator[](0));
-             delete mapImage;
-	            
-	        
-	        return KErrNone;
-        }
-        
-// ---------------------------------------------------------------------------
-//Test case for CMnMapImage::SetMapImageParams & CMnMapImage::MapImageParams
-// ---------------------------------------------------------------------------
-
-    TInt CTestMapImage::CheckSetMapImageParams() const
-        {
-            RPointerArray<CMnProvider> providerArray;
-            TMnMapImageParams setMapImageParams;
-            TInt error = KErrNone;
-            
-	        MnProviderFinder::FindProvidersL( providerArray,CMnProvider::EServiceMapImage );
-	        
-	      /*  TUid KTestProviderUid = TUid::Uid( 0x0313200B );
-	        for( TInt i = 0; i < providerArray.Count(); i++ )
-	            {
-	            if( providerArray.operator[](i)->Uid() == KTestProviderUid )
-	                {
-	                    break;
-	                    
-	                }
-	            }
-	        */    
-	        CMnMapImage* mapImage = CMnMapImage::NewL( *providerArray.operator[](0));   
-	        
-	        
-            TCoordinate coordinate(31.6,62.3);
-            setMapImageParams.SetCenterPoint(coordinate);
-            setMapImageParams.SetVisibleArea(20,30);
-            
-            TSize size(1,2);
-            setMapImageParams.SetSize(size);
-            
-            setMapImageParams.SetDirection(15.0);
-            setMapImageParams.SetImageType(TMnMapImageParams::ETypeSatelliteImage);
-            setMapImageParams.SetProjectionId(5);
-            
-            mapImage->SetMapImageParams(setMapImageParams);
-            TMnMapImageParams mapImageParams = mapImage->MapImageParams();
-            
-            const CMnMapImage* mapImage1 = mapImage;
-            
-            const TMnMapImageParams param2( mapImage1->MapImageParams());
-            
-            TCoordinate coordinate1;
-            mapImageParams.GetCenterPoint(coordinate1);
-            if((coordinate1.Latitude()!=coordinate.Latitude())||
-           			(coordinate1.Longitude()!=coordinate.Longitude()))
-               {
-                
-          		error = KErrGeneral; 	
-               }
-
-            TReal32 width,height;
-            mapImageParams.GetVisibleArea(width,height);
-            if(width!=20||height!=30)
-           	   {
-        		error = KErrGeneral; 	
-           	   }
-            
-            if((mapImageParams.Size()!=size)||(mapImageParams.Direction()!=15.0)||
-           	   (mapImageParams.ImageType()!=TMnMapImageParams::ETypeSatelliteImage)||
-           	    (mapImageParams.ProjectionId()!=5))
-           	   {
-        		error = KErrGeneral;  	
-           	   }
-            
-            delete mapImage;
-            return error;
-            
-        }
-                        
-      
-// ---------------------------------------------------------------------------
-// Test case for CMnMapImage::SetShowOptions & CMnMapImage::ShowOptions
-// ---------------------------------------------------------------------------
-
-TInt CTestMapImage::CheckSetShowOptions(CStifItemParser& aItem)
-    {
-        TInt showOption = 0;
-        TInt err = aItem.GetNextInt(showOption);
-        CMnMapImage::TShowOptions setOption = CMnMapImage::EShowOptionNone;
-        CMnMapImage::TShowOptions option = CMnMapImage::EShowOptionNone;
-        TInt error = KErrNone;
-        
-        RPointerArray<CMnProvider> providerArray;
-        MnProviderFinder::FindProvidersL( providerArray,CMnProvider::EServiceMapImage );
-        CMnMapImage* mapImage = CMnMapImage::NewL( *providerArray.operator[](0));   
-        
-        if(!err)
-            {
-                switch(showOption)
-                    {
-                    case 0: setOption = CMnMapImage::EShowOptionNone;
-                            break;
-                    case 1: setOption = CMnMapImage::EShowOptionText;
-                            break;
-                    case 2: setOption = CMnMapImage::EShowOptionPois;
-                            break;
-                    case 3: setOption = CMnMapImage::EShowOptionLandmarks;
-                            break;
-                    case 4: setOption = CMnMapImage::EShowOptionCurrentLocation;
-                            break;
-                    case 5: setOption = CMnMapImage::EShowOptionCountryBorders;
-                            break;
-                    case 6: setOption = CMnMapImage::EShowOptionsMandatory;
-                            break;
-                    default: break;
-                    
-                    }
-                    
-                 mapImage->SetShowOptions(setOption);
-                 option = mapImage->ShowOptions();
-                 if(option == setOption)
-                    {
-                        
-                        error = KErrNone;
-                    }
-                  else
-                    error = KErrGeneral;
-                 
-                    
-                    
-            }
-          else
-                error = KErrGeneral;
-          
-          delete mapImage;
-          return error;
-    }
-    
-// ---------------------------------------------------------------------------
-// Test case for CMnMapImage::SetTargetOrigin & CMnMapImage::TargetOrigin
-// ---------------------------------------------------------------------------
-TInt CTestMapImage::CheckSetTargetOrigin()
-    {
-        TPoint setOrigin(10,10);
-        TPoint origin;
-        TInt error = KErrNone;
-        
-        RPointerArray<CMnProvider> providerArray;
-        MnProviderFinder::FindProvidersL( providerArray,CMnProvider::EServiceMapImage );
-        CMnMapImage* mapImage = CMnMapImage::NewL( *providerArray.operator[](0)); 
-        
-        mapImage->SetTargetOrigin(setOrigin);
-        origin = mapImage->TargetOrigin();
-        
-        if(origin == setOrigin)
-            {
-                error = KErrNone;
-            }
-        else
-                error = KErrGeneral;
-        
-        delete mapImage;
-        return error;
-        
-        
-        
-        
-    }
-    
- // ---------------------------------------------------------------------------
-// Test case for CMnMapImage::GetImageCoordinate
-// ---------------------------------------------------------------------------
-TInt CTestMapImage::CheckGetImageCoordinate()
-    {
-        TCoordinate coordinate(10,20);
-        TPoint point;
-        TInt error = KErrNone;
-        TMnMapImageParams setMapImageParams;
-        
-        RPointerArray<CMnProvider> providerArray;
-        MnProviderFinder::FindProvidersL( providerArray,CMnProvider::EServiceMapImage );
-        CMnMapImage* mapImage = CMnMapImage::NewL( *providerArray.operator[](0));
-        
-        setMapImageParams.SetImageType(TMnMapImageParams::ETypeSatelliteImage);
-        TSize size(20,30);
-        setMapImageParams.SetSize(size);
-        mapImage->SetMapImageParams(setMapImageParams); 
-        
-        error = mapImage->GetImageCoordinate(coordinate,point);
-        
-        delete mapImage;
-        return error;
-    }
-    
-  // ---------------------------------------------------------------------------
-// Test case for CMnMapImage::SupportedImageTypes
-// ---------------------------------------------------------------------------
-TInt CTestMapImage::CheckSupportedImageTypes()
-    {
-        RPointerArray<CMnProvider> providerArray;
-        MnProviderFinder::FindProvidersL( providerArray,CMnProvider::EServiceMapImage );
-        CMnMapImage* mapImage = CMnMapImage::NewL( *providerArray.operator[](0));
-      
-        TInt error = KErrNone;
-                
-        if(mapImage->SupportedImageTypes())
-         
-            {
-                error = KErrNone;
-            }
-        else
-            error = KErrGeneral;
-        
-        delete mapImage;
-        return error;
-        
-    }
-  
-// ---------------------------------------------------------------------------
-// Test case for CMnMapImage::GetWorldCoordinate
-// ---------------------------------------------------------------------------
-TInt CTestMapImage::CheckGetWorldCoordinate()
-    {
-        TCoordinate coordinate;
-        TPoint point(10,10);
-        TInt error = KErrNone;
-        TMnMapImageParams setMapImageParams;
-        
-        RPointerArray<CMnProvider> providerArray;
-        MnProviderFinder::FindProvidersL( providerArray ,CMnProvider::EServiceMapImage);
-        CMnMapImage* mapImage = CMnMapImage::NewL( *providerArray.operator[](0));
-        
-        setMapImageParams.SetImageType(TMnMapImageParams::ETypeSatelliteImage);
-        TSize size(20,30);
-        setMapImageParams.SetSize(size);
-        mapImage->SetMapImageParams(setMapImageParams); 
-        
-        error = mapImage->GetWorldCoordinate(point,coordinate);
-        
-        delete mapImage;
-        return error;
-    }
- 
- // ---------------------------------------------------------------------------
-// From MAknServerAppExitObserver
-// ---------------------------------------------------------------------------
- 
- void CTestMapImage::HandleServerAppExit(TInt /*aReason*/)
-    {
-        //no implementation
-    }
-    
-// ---------------------------------------------------------------------------
-// Test case for CMnMapImage::SetExitObserverL & CMnMapImage::RemoveExitObserver
-// ---------------------------------------------------------------------------
-TInt CTestMapImage::CheckSetExitObserverL()
-    {
-        RPointerArray<CMnProvider> providerArray;
-        MnProviderFinder::FindProvidersL( providerArray,CMnProvider::EServiceMapImage );
-        CMnMapImage* mapImage = CMnMapImage::NewL( *providerArray.operator[](0));
-        
-        mapImage->SetExitObserverL(*this);
-        mapImage->RemoveExitObserver();
-        
-        delete mapImage;
-        return KErrNone;
-    }
-
-// ---------------------------------------------------------------------------
-// From CActive
-// ---------------------------------------------------------------------------
-void CTestMapImage::RunL()
-    {
-        if(iStatus != KErrCancel)
-            {
-                CActiveScheduler::Stop();	
-            }
-    }
-// ---------------------------------------------------------------------------
-// From CActive
-// ---------------------------------------------------------------------------
-  void CTestMapImage::DoCancel()
-    {
-
-        iMapImage->CancelRendering();
-    
-        
-    }  
-// ---------------------------------------------------------------------------
-// Test case for CMnMapImage::RenderL whose completion is informed via aStatus parameter.
-// ---------------------------------------------------------------------------
-TInt CTestMapImage::CheckRender1L()
-    {
-        RPointerArray<CMnProvider> providerArray;
-        MnProviderFinder::FindProvidersL( providerArray ,CMnProvider::EServiceMapImage);
-        iMapImage = CMnMapImage::NewL( *providerArray.operator[](0));
-      
-        RFbsSession fbs;
-        fbs.Connect();
-        
-        TSize size1(10, 20);
-        CFbsBitmap* bitmap = new (ELeave) CFbsBitmap();
-        CleanupStack::PushL(bitmap);
-        bitmap->Create( size1, EColor16M );
-        
-        TMnMapImageParams params;
-        TSize size2(5,10);
-        params.SetCenterPoint( TCoordinate( 0, 0 ) );
-        params.SetSize( size2 );
-        params.SetVisibleArea( 5, 10 );
-        iMapImage->SetMapImageParams(params);
-        iMapImage->RenderL(*bitmap, iStatus);
-        SetActive();
-        CActiveScheduler::Start();
-        
-        CleanupStack::PopAndDestroy(bitmap);
-        delete iMapImage;
-        fbs.Disconnect();
-        
-        return iStatus.Int();
-        
-    }
-    
-  
-// ---------------------------------------------------------------------------
-// Test case for CMnMapImage::RenderL whose completion is informed via aCallback
-// ---------------------------------------------------------------------------
-TInt CTestMapImage::CheckRender2L()
-    {
-        RPointerArray<CMnProvider> providerArray;
-        MnProviderFinder::FindProvidersL( providerArray,CMnProvider::EServiceMapImage );
-        CMnMapImage* mapImage = CMnMapImage::NewL( *providerArray.operator[](0));
-        CleanupStack::PushL(mapImage);
-        RFbsSession fbs;
-        fbs.Connect();
-        
-        TSize size1(10, 20);
-        CFbsBitmap* bitmap = new (ELeave) CFbsBitmap();
-        CleanupStack::PushL(bitmap);
-        bitmap->Create( size1, EColor16M );
-        
-        TMnMapImageParams params;
-        TSize size2(5,10);
-        params.SetCenterPoint( TCoordinate( 0, 0 ) );
-        params.SetSize( size2 );
-        params.SetVisibleArea( 5, 10 );
-        mapImage->SetMapImageParams(params);
-        
-        mapImage->RenderL(*bitmap, *this);
-        iError = KRequestPending;
-        //SetActive();
-        CActiveScheduler::Start();
-        
-        CleanupStack::PopAndDestroy(bitmap);
-        CleanupStack::PopAndDestroy(mapImage);
-        fbs.Disconnect();
-        
-        return iError;
-        
-    }  
-    
-// ---------------------------------------------------------------------------
-// From MMnMapImageRenderCallback
-// ---------------------------------------------------------------------------
-void CTestMapImage::HandleRenderingCompletedL( TInt aStatus, CMnMapImage& /*aMapImage*/ )
-    {
-            iError = aStatus;
-            CActiveScheduler::Stop();
-    }
-    
-    
-    
-    
-    
-// ---------------------------------------------------------------------------
-// Test case for CMnMapImage::CancelRendering 
-// ---------------------------------------------------------------------------
-TInt CTestMapImage::CheckCancelRendering()
-    {
-        RPointerArray<CMnProvider> providerArray;
-        MnProviderFinder::FindProvidersL( providerArray,CMnProvider::EServiceMapImage );
-        iMapImage = CMnMapImage::NewL( *providerArray.operator[](0));
-      
-        RFbsSession fbs;
-        fbs.Connect();
-        
-        TSize size1(10, 20);
-        CFbsBitmap* bitmap = new (ELeave) CFbsBitmap();
-        CleanupStack::PushL(bitmap);
-        bitmap->Create( size1, EColor16M );
-        
-        TMnMapImageParams params;
-        TSize size2(5,10);
-        params.SetCenterPoint( TCoordinate( 0, 0 ) );
-        params.SetSize( size2 );
-        params.SetVisibleArea( 5, 10 );
-        iMapImage->SetMapImageParams(params);
-        iMapImage->RenderL(*bitmap, iStatus);
-        SetActive();
-        Cancel();
-              
-        CleanupStack::PopAndDestroy(bitmap);
-        delete iMapImage;
-        fbs.Disconnect();
-        
-        return iStatus.Int();
-        
-    }
-    
\ No newline at end of file
--- a/locsrv_plat/map_image_api/tsrc/src/testmnmapimageparams.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,194 +0,0 @@
-/*
-* Copyright (c) 2007 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:  Helper class for TMnMapImageParams class
-*
-*/
-
-
-// System Includes
-
-
-// User Includes
-#include "testmnmapimage.h"
-#include <e32std.h>
-#include <e32const.h>
-#include <mnmapimage.h>
-#include <mnproviderfinder.h>
-#include <mnprovider.h>
-#include <mnmapimageparams.h>
-#include <LbsPosition.h>
-#include "testmnmapimageparams.h"
-
-// Constant Declarations
-
-    
-// ======== MEMBER FUNCTIONS ========
-
-// ---------------------------------------------------------------------------
-// C++ Default Constructor
-// ---------------------------------------------------------------------------
-//
-CTestMapImageParams ::CTestMapImageParams (CStifLogger* aLog):iLog(aLog)
-    {
-        
-    }
-
-// ---------------------------------------------------------------------------
-// C++ Destructor
-// ---------------------------------------------------------------------------
-//
-CTestMapImageParams ::~CTestMapImageParams ()
-    {
-        
-        
-    }
-
-// ---------------------------------------------------------------------------
-// Test case for constructor of TMnMapImageParams
-// ---------------------------------------------------------------------------
-TInt CTestMapImageParams ::CheckTMnMapImageParams()
-    {
-        TMnMapImageParams params;
-                
-        return KErrNone;
-    }
-    
-// ---------------------------------------------------------------------------
-// Test case for TMnMapImageParams::SetCenterPoint & TMnMapImageParams::GetCenterPoint
-// ---------------------------------------------------------------------------
-TInt CTestMapImageParams ::CheckSetGetCenterPoint()
-    {
-        TMnMapImageParams params;
-        TInt error = KErrNone;
-        TCoordinate coordinate(31.6,62.3);
-        params.SetCenterPoint(coordinate);
-        
-        TCoordinate coordinate1;
-        params.GetCenterPoint(coordinate1);
-        
-        if((coordinate1.Latitude()!=coordinate.Latitude())||
-        			(coordinate1.Longitude()!=coordinate.Longitude()))
-               {
-                
-          		error = KErrGeneral; 	
-               }        
-        else 
-            error = KErrNone;
-        
-        return error;
-    }
-    
-// ---------------------------------------------------------------------------
-// Test case for TMnMapImageParams::SetVisibleArea & TMnMapImageParams::GetVisibleArea
-// ---------------------------------------------------------------------------
-TInt CTestMapImageParams ::CheckSetGetVisibleArea()
-    {
-        TMnMapImageParams params;
-        TInt error = KErrNone;
-        params.SetVisibleArea(20,30);
-        
-        TReal32 width,height;
-        params.GetVisibleArea(width,height);
-        if(width!=20||height!=30)
-           	   {
-        		error = KErrGeneral; 	
-           	   }
-        else
-             error = KErrNone;
-        
-        return error;
-        
-    }
-
-// ---------------------------------------------------------------------------
-// Test case for TMnMapImageParams::SetSize & TMnMapImageParams::Size
-// ---------------------------------------------------------------------------
-TInt CTestMapImageParams ::CheckSetGetSize()
-    {
-        TMnMapImageParams params;
-        TInt error = KErrNone;
-        
-        TSize size(1,2);
-        params.SetSize(size);
-        
-        if(params.Size()!=size)
-            {
-                error = KErrGeneral;
-            }
-        else
-            error = KErrNone;
-        
-        return error;
-    }
-
-// ---------------------------------------------------------------------------
-// Test case for TMnMapImageParams::SetDirection & TMnMapImageParams::Direction
-// ---------------------------------------------------------------------------
-TInt CTestMapImageParams ::CheckSetGetDirection()
-    {
-        TMnMapImageParams params;
-        TInt error = KErrNone;
-        
-        TReal32 direction = 20.0;
-        params.SetDirection(direction);
-                
-        if(params.Direction() != direction)
-            {
-                error = KErrGeneral;
-            }
-        else
-            error = KErrNone;
-       
-        return error;        
-    }
-
-// ---------------------------------------------------------------------------
-// Test case for TMnMapImageParams::SetImageType& TMnMapImageParams::ImageType
-// ---------------------------------------------------------------------------
-TInt CTestMapImageParams ::CheckSetGetImageType()
-    {
-        TMnMapImageParams params;
-        TInt error = KErrNone;
-        
-        params.SetImageType(TMnMapImageParams::ETypeSatelliteImage);
-        
-        if(params.ImageType()!=TMnMapImageParams::ETypeSatelliteImage)
-            {
-                error = KErrGeneral;
-            }
-        else
-            error = KErrNone;
-        
-        return error;
-    }
-    
-// ---------------------------------------------------------------------------
-// Test case for TMnMapImageParams::SetProjectionId & TMnMapImageParams::ProjectionId
-// ---------------------------------------------------------------------------
-TInt CTestMapImageParams ::CheckSetGetProjectionId()
-    {
-        TMnMapImageParams params;
-        TInt error = KErrNone;
-        
-        params.SetProjectionId(15);
-        
-        if(params.ProjectionId() != 15)
-            {
-                error = KErrGeneral;
-            }
-        else
-            error = KErrNone;
-        
-        return error;
-    }
\ No newline at end of file
--- a/locsrv_plat/map_image_api/tsrc/testprovider/data/mntestprovider.rss	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,79 +0,0 @@
-/*
-* Copyright (c) 2004-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:  Defines the resources used by the TestProvider.
-*
-*/
-
-
-//  RESOURCE IDENTIFIER
-NAME MNTP
-
-//  INCLUDES
-#include <eikon.rsg>
-#include <eikon.rh>
-#include <avkon.rsg>
-#include <avkon.mbg>
-#include <avkon.rh>
-#include <avkon.loc>
-
-#include <appinfo.rh>
-
-RESOURCE RSS_SIGNATURE {  }
-
-RESOURCE TBUF { buf="MnTestProvider"; }
-
-RESOURCE EIK_APP_INFO
-    {
-    menubar = r_testprovider_menubar;
-    cba = R_AVKON_SOFTKEYS_OPTIONS_BACK;
-    }
-
-RESOURCE LOCALISABLE_APP_INFO r_testprovider_localisable_app_info
-    {
-    short_caption = "MnTestProvider";
-    caption_and_icon =
-        CAPTION_AND_ICON_INFO
-            {
-            caption = "MnTestProvider";
-            };
-    view_list = {};            
-    }
-
-RESOURCE CONTEXT_PANE r_testprovider_app_icon
-    {
-    }
-
-RESOURCE MENU_BAR r_testprovider_menubar
-    {
-    titles =
-        {
-        MENU_TITLE
-            {
-            menu_pane = r_testprovider_menu;
-            }
-        };
-    }
-
-RESOURCE MENU_PANE r_testprovider_menu
-    {
-    items =
-        {
-        MENU_ITEM
-            {
-            command = EAknCmdExit;
-            txt = "Exit";
-            }
-        };
-    }
-
--- a/locsrv_plat/map_image_api/tsrc/testprovider/data/mntestprovider_reg.rss	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,102 +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: Resource file definition for map and navigation test provider
-*
-*/
-/*
-* ============================================================================
-*  Name       : Consumer_reg.rss
-*  Part of    : Landmarks Reference Application
-*  Description:
-*  Version:
-*
-* ============================================================================
-*/
-
-#include <appinfo.rh>
-
-#include <mnappserviceuids.hrh>
-#include <mnappservices.hrh>
-#include <mnserviceinfo.rh>
-
-#include <mntestprovider.rsg>
-
-UID2 KUidAppRegistrationResourceFile
-UID3 0x0313200B
-
-RESOURCE APP_REGISTRATION_INFO
-    {
-    app_file = "MnTestProvider";
-    localisable_resource_file = "\\resource\\apps\\mntestprovider";
-    localisable_resource_id = R_TESTPROVIDER_LOCALISABLE_APP_INFO;
-    service_list =
-        {
-        SERVICE_INFO 
-            {
-            uid = KMnAppMapViewService;
-            datatype_list = 
-                {
-                };
-            opaque_data = r_testprovider_mapview_opaquedata;
-            },
-        SERVICE_INFO 
-            {
-            uid = KMnAppNavigationService;
-            datatype_list = 
-                {
-                };
-            opaque_data = r_testprovider_navigation_opaquedata;
-            },
-        SERVICE_INFO 
-            {
-            uid = KMnAppGeocodingService;
-            datatype_list = 
-                {
-                };
-            opaque_data = r_testprovider_geocoding_opaquedata;
-            },
-        SERVICE_INFO 
-            {
-            uid = KMnAppMapImageService;
-            datatype_list = 
-                {
-                };
-            opaque_data = r_testprovider_mapimage_opaquedata;
-            }
-        };
-    }
-
-RESOURCE MN_SERVICE_INFO r_testprovider_mapview_opaquedata
-    {
-    service_features = KMnSvcFeatureShowMap | KMnSvcFeatureSelectFromMap;
-    }
-    
-RESOURCE MN_SERVICE_INFO r_testprovider_navigation_opaquedata
-    {
-    service_features = KMnSvcFeatureNavigateTo;
-    }
-    
-RESOURCE MN_SERVICE_INFO r_testprovider_geocoding_opaquedata
-    {
-    service_features = 
-        KMnSvcFeatureCoordToAddr | 
-        KMnSvcFeatureAddrToCoord |
-        KMnSvcFeaturePlainAddrToCoord;
-    }
-
-RESOURCE MN_SERVICE_INFO r_testprovider_mapimage_opaquedata
-    {
-    service_features = KMnSvcFeatureVectorMap | KMnSvcFeatureSatelliteImage;
-    }
-        
\ No newline at end of file
--- a/locsrv_plat/map_image_api/tsrc/testprovider/data/mntestproviderplugin.rss	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,51 +0,0 @@
-/*
-* Copyright (c) 2007 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 ECom registration resource for TestProviderPlugin.
-*
-*/
-
-
-//  RESOURCE IDENTIFIER
-NAME MNTP
-
-#include <registryinfov2.rh>
-#include <mnpluginuids.hrh> // defines interface UID
-
-RESOURCE REGISTRY_INFO r_mycoordconverterplugin_reginfo
-	{
-	resource_format_version = RESOURCE_FORMAT_VERSION_2;
-	// DLL UID of the DLL
-	dll_uid = 0x03133035;
-	interfaces =
-	    {
-	    INTERFACE_INFO
-	        {
-	        // UID of coordinate converter interface,
-	        // defined in mnpluginuids.hrh
-	        interface_uid = KMnMapImageConverterIf;
-	        implementations =
-	            {
-	            IMPLEMENTATION_INFO
-	                {
-	                // The licensee needs to allocate this UID from Symbian
-	                implementation_uid = 0x03133036;
-	                version_no = 1;
-	                display_name = "TestProviderCoordConverter";
-	                // SID of provider application executable
-	                default_data = "0313200B";
-	                }
-	            };
-	        }
-	    };
-	}
--- a/locsrv_plat/map_image_api/tsrc/testprovider/group/bld.inf	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +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: Build information file for map and navigation test provider
-*
-*/
-
-#include <bldvariant.hrh>
-
-PRJ_PLATFORMS
-DEFAULT
-
-PRJ_MMPFILES
-
-PRJ_TESTMMPFILES
-testprovider.mmp
-testproviderplugin.mmp
--- a/locsrv_plat/map_image_api/tsrc/testprovider/group/testprovider.mmp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,97 +0,0 @@
-/*
-* Copyright (c) 2005-2007 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 definition file for map and navigation test provider
-*
-*/
-
-
-#include <bldvariant.hrh>
-#include <platform_paths.hrh>
-
-TARGET              MnTestProvider.exe
-TARGETTYPE          exe
-EPOCSTACKSIZE       0x5000
-UID                 0x100039CE 0x0313200B
-
-VENDORID            VID_DEFAULT
-CAPABILITY          CAP_APPLICATION
-
-SOURCEPATH          ../src
-
-// Application mandatory classes
-SOURCE              testprovider.cpp
-SOURCE              testproviderapplication.cpp
-SOURCE              testproviderappui.cpp
-SOURCE              testproviderappview.cpp
-SOURCE              testproviderdocument.cpp
-SOURCE              testprovidermapview.cpp
-SOURCE              testprovidernaviview.cpp
-
-SOURCE              testproviderappserver.cpp
-SOURCE              testprovidergeocodingservice.cpp
-SOURCE              testprovidernavigationservice.cpp
-SOURCE              testprovidermapviewservice.cpp
-
-
-SOURCE              testprovidermapimageservice.cpp
-
-
-SOURCE              testproviderdump.cpp
-
-USERINCLUDE         ../inc
-
-MW_LAYER_SYSTEMINCLUDE
-
-LIBRARY             euser.lib
-LIBRARY             efsrv.lib
-LIBRARY             estor.lib
-LIBRARY             cone.lib
-LIBRARY             apparc.lib
-LIBRARY             bafl.lib
-LIBRARY             eikcore.lib
-LIBRARY             eikcoctl.lib
-LIBRARY             eikctl.lib
-LIBRARY             eikdlg.lib
-LIBRARY             ws32.lib
-LIBRARY             bitgdi.lib
-LIBRARY             fbscli.lib
-
-LIBRARY             avkon.lib
-LIBRARY             aknskins.lib
-
-LIBRARY             eposlandmarks.lib
-LIBRARY             eposlmsearchlib.lib
-LIBRARY             lbs.lib
-
-LIBRARY             mnclientlib.lib
-LIBRARY             mnservicelib.lib
-
-LIBRARY             servicehandler.lib // AIW
-
-DEBUGLIBRARY        flogger.lib
-
-START RESOURCE      ../data/mntestprovider.rss
-HEADER
-TARGETPATH          /resource/apps
-END
-
-START RESOURCE      ../data/mntestprovider_reg.rss
-DEPENDS mntestprovider.rsg
-TARGETPATH          /private/10003a3f/apps
-END
-
-SMPSAFE
-
-// END OF FILE
-
--- a/locsrv_plat/map_image_api/tsrc/testprovider/group/testprovider.pkg	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,45 +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: Package file for map and navigation test provider
-;
-;
-; Installation file for mntestprovider application
-;
-;Languages
-&EN
-;
-; UID is the app's UID
-;
-#{"mntestprovider"},(0x0313200B),2,0,0,TYPE=SA
-;
-; Localised Vendor name
-%{"Nokia"}
-
-; Unique Vendor name
-:"Nokia"
-
-;Supports Series 60 v 3.0
-;This line indicates that this installation is for the Series 60 platform v0.9
-;This line must appear _exactly_ as shown below in the sis file
-;If this line is missing or incorrect, the sis file will not be able
-;to be installed on Series 60 v3.0 platforms
-;(0x101F7961), 0, 0, 0, {"Series60ProductID"}
-;
-;
-; Files to install
-"\epoc32\release\ARMV5\urel\mntestprovider.exe"-"C:\sys\bin\mntestprovider.exe"
-"\epoc32\data\z\resource\apps\mntestprovider.rsc"-"C:\resource\apps\mntestprovider.rsc"
-"\epoc32\data\z\private\10003a3f\apps\mntestprovider_reg.rsc"-"C:\private\10003a3f\import\apps\mntestprovider_reg.rsc"
-
-
--- a/locsrv_plat/map_image_api/tsrc/testprovider/group/testproviderplugin.mmp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,53 +0,0 @@
-/*
-* Copyright (c) 2004-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: Project definition file for map and navigation test provider
-*
-*/
-
-
-#include <platform_paths.hrh>
-
-TARGET              MnTestProviderPlugin.dll
-TARGETTYPE          PLUGIN
-UID                 0x10009D8D 0x03133035
-
-VENDORID            VID_DEFAULT
-CAPABILITY          CAP_GENERAL_DLL
-
-SOURCEPATH          ../src
-
-// Application mandatory classes
-SOURCE              testproviderplugin.cpp
-SOURCE				testprovidercoordconverter.cpp
-
-USERINCLUDE         ../inc
-
-MW_LAYER_SYSTEMINCLUDE
-SYSTEMINCLUDE       /epoc32/include/ecom
-
-LIBRARY             euser.lib
-LIBRARY             lbs.lib
-LIBRARY             mnclientlib.lib
-
-DEBUGLIBRARY        flogger.lib
-
-START RESOURCE      ../data/mntestproviderplugin.rss
-TARGET			    mntestproviderplugin.rsc
-TARGETPATH          /resource/plugins
-END
-
-SMPSAFE
-
-// END OF FILE
-
--- a/locsrv_plat/map_image_api/tsrc/testprovider/inc/debug.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,85 +0,0 @@
-/*
-* Copyright (c) 2005-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:  Debug macros
-*
-*/
-
-
-#ifndef MNTP_DEBUG_H
-#define MNTP_DEBUG_H
-
-#include <e32base.h>
-
-inline void Panic( TInt aReason )
-    {
-    _LIT( KPanicCategory, "MnTestProvider" );
-    User::Panic( KPanicCategory, aReason );
-    }
-
-#ifdef _DEBUG
-
-#include <e32svr.h>
-#include <e32std.h>
-#include <f32file.h>
-#include <flogger.h>
-
-_LIT(KLogFile, "mnlog.txt");
-_LIT(KLogDirFullName, "c:\\logs\\");
-_LIT(KLogDir, "mn");
-
-inline void Prefix( TDes& aMessage )
-    {
-    RProcess process;
-    _LIT( KPrefix, "[MnTestProvider/%ld]: ");
-    aMessage.Format( KPrefix, process.Id().Id() );
-    }
-
-inline void Log( TRefByValue<const TDesC> aFmt, ... )
-    {
-    VA_LIST list;
-    VA_START( list, aFmt );
-
-    HBufC* buf = HBufC::New(512);
-    if ( buf )
-    	{
-    	TPtr ptr( buf->Des() );
-	    Prefix( ptr );
-	    ptr.AppendFormatList( aFmt, list );
-	
-	    RDebug::RawPrint( ptr );
-	    RFileLogger::Write( KLogDir, KLogFile, EFileLoggingModeAppend, ptr );
-
-	    delete buf;
-    	}
-    }
-
-#define LOG( a )             { Log( _L( a ) ); }
-#define LOG1( a, b )         { Log( _L( a ), b ); }
-#define LOG2( a, b, c )      { Log( _L( a ), b, c ); }
-#define LOG3( a, b, c, d )   { Log( _L( a ), b, c, d ); }
-#define LOG4( a, b, c, d, e )   { Log( _L( a ), b, c, d, e ); }
-
-#else // _DEBUG
-
-// Release version - no logging
-#define LOG( a )
-#define LOG1( a, b )
-#define LOG2( a, b, c )
-#define LOG3( a, b, c, d )
-#define LOG4( a, b, c, d, e )
-
-#endif // _DEBUG
-
-#endif // MNTP_DEBUG_H
-
--- a/locsrv_plat/map_image_api/tsrc/testprovider/inc/testproviderapplication.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,57 +0,0 @@
-/*
-* Copyright (c) 2004-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:  
-*     See class description below
-*
-*/
-
-
-#ifndef __TESTPROVIDER_APPLICATION_H_
-#define __TESTPROVIDER_APPLICATION_H_
-
-#include <eikapp.h>
-
-class CTestProviderAppServer;
-
-/**
-*  An instance of CTestProviderApplication is the application part of the Eikon
-*  application framework for the MapNav TestProvider
-*/
-class CTestProviderApplication : public CEikApplication
-    {
-    public:  // from CEikApplication
-
-        /** 
-        * AppDllUid returns the application DLL UID value.
-        *
-        *  @return the UID of this Application/Dll
-        */
-        TUid AppDllUid() const;
-        
-        ~CTestProviderApplication();
-
-    protected: // from CEikApplication
-
-        /** 
-        * CreateDocumentL creates a CApaDocument object and return a pointer to it
-        *
-        * @return a pointer to the created document
-        */
-        CApaDocument* CreateDocumentL();
-        
-        void NewAppServerL(CApaAppServer *&aAppServer);
-    };
-
-#endif // __TESTPROVIDER_APPLICATION_H_
-
--- a/locsrv_plat/map_image_api/tsrc/testprovider/inc/testproviderappserver.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,85 +0,0 @@
-/*
-* Copyright (c) 2004-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:  
-*     See class description below
-*
-*/
-
-
-#ifndef MNTP_APPSERVER_H
-#define MNTP_APPSERVER_H
-
-#include <aknserverapp.h>
-#include <e32property.h> 
-
-class CTestProviderNavigationService;
-class CTestProviderMapViewService;
-class CTestProviderGeocodingService;
-
-#ifdef RD_MAPNAV_BITMAP_ACCESS
-class CTestProviderMapImageService;
-#endif
-
-class CTestProviderAppUi;
-class CTestCommandListener;
-
-/**
-*  An instance of CTestProviderAppServer is the application part of the Eikon
-*  application framework for the MapNav TestProvider
-*/
-class CTestProviderAppServer : public CAknAppServer
-    {
-    public:
-        CTestProviderAppUi* AppUi() const;
-        ~CTestProviderAppServer();
-        
-        void ConstructL( const TDesC& aFixedServerName );
-        
-        TBool IsFree();
-        
-        void HandleTestCommandL();
-        TInt GetTestCommand() 
-            {
-            return iTestCommand;
-            };
-
-    public: // from CAknAppServer
-        IMPORT_C CApaAppServiceBase* CreateServiceL(TUid aServiceType) const;
-        IMPORT_C void HandleAllClientsClosed();
-
-    protected:        
-        CTestProviderGeocodingService* CreateGeocodingServiceL() const;
-        CTestProviderNavigationService* CreateNavigationServiceL() const;
-        CTestProviderMapViewService* CreateMapViewServiceL() const;
-#ifdef RD_MAPNAV_BITMAP_ACCESS
-        CTestProviderMapImageService* CreateMapImageServiceL() const;
-#endif        
-        void DumpEmptyL() const;
-        
-        static TInt TestCommandCallback( TAny* aPtr );
-        
-    private:
-        mutable TBool iBusy;
-        mutable CTestProviderGeocodingService* iGeocodingService;
-        mutable CTestProviderNavigationService* iNavigationService;
-        mutable CTestProviderMapViewService* iMapViewService;
-#ifdef RD_MAPNAV_BITMAP_ACCESS
-        mutable CTestProviderMapImageService* iMapImageService;
-#endif        
-        CTestCommandListener*   iListener;
-        TInt iTestCommand;
-    };
-
-#endif // MNTP_APPSERVER_H
-
--- a/locsrv_plat/map_image_api/tsrc/testprovider/inc/testproviderappui.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,125 +0,0 @@
-/*
-* Copyright (c) 2004-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: 
-*     See class description below
-*
-*/
-
-
-#ifndef __TESTPROVIDER_APPUI_H_
-#define __TESTPROVIDER_APPUI_H_
-
-#include <aknviewappui.h>
-
-class CTestProviderAppView;
-class CTestProviderNaviView;
-class CTestProviderMapView;
-
-class CAknNavigationDecorator;
-class CAknNavigationControlContainer;
-
-/**
-*  An instance of class CTestProviderAppUi is the UserInterface part of the Eikon
-*  application framework for the TestProvider reference application
-*/
-class CTestProviderAppUi : public CAknAppUi
-    {
-    public: // Constructors and destructor
-
-        /**
-        * C++ default constructor. This needs to be public due to the way
-        * the framework constructs the AppUi.
-        */
-        CTestProviderAppUi();
-
-        /**
-        * Symbian 2nd phase constructor. This needs to be public due to the way
-        * the framework constructs the AppUi.
-        */
-        void ConstructL();
-
-        /**
-        * Destructor.
-        */
-        ~CTestProviderAppUi();
-
-        CTestProviderNaviView& ShowNaviViewL();
-        CTestProviderMapView& ShowMapViewL();
-        TBool IsAnyViewOpen();
-        TBool IsChainedMode();
-        void Exit( TInt aReason );
-        
-    public: // from CEikAppUi
-
-        /**
-        * HandleCommandL handles user menu selections.
-        *
-        * @param aCommand the enumerated code for the option selected
-        */
-        void HandleCommandL(TInt aCommand);
-        
-        TBool ProcessCommandParametersL( CApaCommandLine &aCommandLine );
-
-    public: // from MEikMenuObserver
-
-        void DynInitMenuPaneL(TInt aResourceId, CEikMenuPane *aMenuPane);
-
-    private:
-
-        /**
-        * Performs the construction phase of this object that is dependent
-        * that the application engine is initialized.
-        */
-        void PostConstructL();
-
-        CEikStatusPane* StatusPane();
-
-        void SetNaviPaneTitleL( const TDesC& aPaneTitle );
-        
-    private: // Data
-        CTestProviderAppView* iAppView;
-        CTestProviderNaviView* iNaviView;
-        CTestProviderMapView* iMapView;
-
-        //Own:
-        CAknNavigationDecorator* iNaviLabel;
-
-        //Ref:
-        CAknNavigationControlContainer* iNaviPane;
-        
-        TInt iParentWg;
-/*
-    private:
-        class CShutter : public CTimer
-            {
-            public:
-                CShutter( 
-                    CTestProviderAppServer& aServer,
-                    CTestProviderAppUi& aAppUi );
-                void ConstructL();                
-                void RunL();
-                void Go();
-
-            protected:
-                CTestProviderAppServer& iServer;                
-                CTestProviderAppUi& iAppUi;
-            };
-            
-    private:            
-        CShutter* iShutter;
-*/        
-    };
-
-#endif // __TESTPROVIDER_APPUI_H_
-
--- a/locsrv_plat/map_image_api/tsrc/testprovider/inc/testproviderappview.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,94 +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: Application View for map and navigation test provider
-*
-*/
-
-
-
-#ifndef __MNTP_APPVIEW_H_
-#define __MNTP_APPVIEW_H_
-
-#include <coecntrl.h>
-
-class CTestProviderAppView : public CCoeControl
-    {
-    public: // New methods
-
-        /**
-        * NewL.
-        * Two-phased constructor.
-        * Create a CTestProviderAppView object, which will draw itself to aRect.
-        * @param aRect The rectangle this view will be drawn to.
-        * @return a pointer to the created instance of CTestProviderAppView.
-        */
-        static CTestProviderAppView* NewL( const TRect& aRect );
-
-        /**
-        * NewLC.
-        * Two-phased constructor.
-        * Create a CTestProviderAppView object, which will draw itself
-        * to aRect.
-        * @param aRect Rectangle this view will be drawn to.
-        * @return A pointer to the created instance of CTestProviderAppView.
-        */
-        static CTestProviderAppView* NewLC( const TRect& aRect );
-
-        /**
-        * ~CTestProviderAppView
-        * Virtual Destructor.
-        */
-        virtual ~CTestProviderAppView();
-
-    public:  // Functions from base classes
-
-        /**
-        * From CCoeControl, Draw
-        * Draw this CAnimationAppView to the screen.
-        * @param aRect the rectangle of this view that needs updating
-        */
-        void Draw( const TRect& aRect ) const;
-        
-        //TInt CountComponentControls() const { return 1;};
-        
-    protected:
-        /*
-        CCoeControl* ComponentControl(TInt aIndex) const
-            {
-                return (aIndex == 0) ? iList : NULL;
-            };
-        */
-    private: // Constructors
-
-        /**
-        * ConstructL
-        * 2nd phase constructor.
-        * Perform the second phase construction of a
-        * CTestProviderAppView object.
-        * @param aRect The rectangle this view will be drawn to.
-        */
-        void ConstructL(const TRect& aRect);
-
-        /**
-        * CTestProviderAppView.
-        * C++ default constructor.
-        */
-        CTestProviderAppView();
-    
-    private:
-
-    };
-
-#endif // __MNTP_APPVIEW_H_
-
--- a/locsrv_plat/map_image_api/tsrc/testprovider/inc/testprovidercoordconverter.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,45 +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: Co ordinate converter for map and navigation test provider
-*
-*/
-#ifndef MNTP_COORDINATECONVERTER_H
-#define MNTP_COORDINATECONVERTER_H
-
-#include <mncoordinateconverterbase.h>
-
-class CTestProviderCoordConverter : public CMnCoordinateConverterBase
-    {
-    public:
-        static CTestProviderCoordConverter* NewL();
-
-        ~CTestProviderCoordConverter();
-
-    protected: // From CMnCoordinateConverterBase
-
-        TInt GetImageCoordinate( 
-            const TCoordinate& aWorldCoordinate, 
-            TPoint& aImagePoint );
-        
-        TInt GetWorldCoordinate( 
-            const TPoint& aImagePoint, 
-            TCoordinate& aWorldCoordinate );
-                    
-    protected:    
-        CTestProviderCoordConverter();
-        
-    private:
-    };
-
-#endif /*MNTP_COORDINATECONVERTER_H*/
--- a/locsrv_plat/map_image_api/tsrc/testprovider/inc/testproviderdocument.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,73 +0,0 @@
-/*
-* Copyright (c) 2004-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:  
-*     See class description below
-*
-*/
-
-
-#ifndef MNTP_DOCUMENT_H
-#define MNTP_DOCUMENT_H
-
-#include <akndoc.h>
-
-class CTestProviderAppUi;
-class CEikApplication;
-
-/**
-*  An instance of CTestProviderDocument is the application part of the Avkon
-*  application framework for the TestProvider reference application
-*/
-class CTestProviderDocument : public CAknDocument
-    {
-    public: // Constructors and destructor
-
-        /**
-        * Two-phased constructor.
-        *
-        * @param aApp an eikon application instance
-        */
-        static CTestProviderDocument* NewL( CEikApplication& aApp );
-
-        /**
-        * Destructor.
-        */
-        ~CTestProviderDocument();
-
-    public: // from CAknDocument
-
-        /**
-        * CreateAppUiL creates a CTestProviderAppUi object and return a pointer 
-        * to it.
-        *
-        * @return a pointer to the created instance of the AppUi created
-        */
-        CEikAppUi* CreateAppUiL();
-
-    private:
-
-        /**
-        * C++ constructor.
-        */
-        CTestProviderDocument(CEikApplication& aApp);
-
-        /**
-        * By default Symbian 2nd phase constructor is private.
-        */
-        void ConstructL();
-
-    };
-
-#endif // MNTP_DOCUMENT_H
-
--- a/locsrv_plat/map_image_api/tsrc/testprovider/inc/testproviderdump.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,148 +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: Utility class for map and navigation test provider
-*
-*/
-
-#ifndef MNTP_DUMP_H
-#define MNTP_DUMP_H
-
-#include <e32base.h>
-#include <e32property.h>
-
-#include <epos_landmarks.h>
-
-#ifdef RD_MAPNAV_BITMAP_ACCESS
-#include <mnmapimage.h>
-#endif
-
-const TInt KPropCategoryUid = 0x0313200B;
-const TInt KPropKeyErrorCode = 1;
-const TInt KPropKeyAction = 2;
-const TInt KPropKeyProcessId = 3;
-
-enum 
-    {
-    EServerActionNone,
-    EServerActionBaseComplete,
-    EServerActionCompleteGeocoding,
-    EServerActionCompleteSelectionFree,
-    EServerActionCompleteSelectionIndex,
-    EServerActionCompleteSelectionNegativeIndex,
-    EServerActionCompleteSelectionLinked,
-    EServerActionCompleteSelectionWrongLinked,
-    EServerActionCompleteSelectionNegativeDbIndex,
-    EServerActionDelayCompletion,
-    EServerActionExit,
-    EServerActionDisableDump,
-    EServerActionCompleteRendering,
-    };
-
-class CPosLandmark;
-class CAiwGenericParamList;
-class RProperty;
-
-#ifdef RD_MAPNAV_BITMAP_ACCESS
-struct TMapImageOptions
-    {
-    TMnMapImageParams iParams;
-    CMnMapImage::TShowOptions iShowOptions;
-    TPoint iTargetOrigin;
-    TSize iBitmapSize;
-    TInt iBitmapHandle;
-    };     
-#endif
-
-class CTestProviderDump : public CBase
-    {
-    public:
-        static CTestProviderDump* NewLC();
-
-        void AddTimeStampL();
-        void AddRunModeL( TBool aIsChainedMode );
-
-        void AddLandmarkL( const CPosLandmark& aLandmark );
-        void AddLandmarkL( const TDesC& aUri, TPosLmItemId aId );
-        void AddLandmarkListL( const TDesC& aUri, TArray<TPosLmItemId> aItemIds );
-        
-        void AddGeocodingOptionsL( TUint32 aOptions );
-        void AddMapViewOptionsL( 
-            TUint32 aOptions,
-            TUint32 aCurrentLocationOption,
-            TReal aRadius,
-            TCoordinate iCenterPoint );
-
-#ifdef RD_MAPNAV_BITMAP_ACCESS
-        void AddMapImageOptionsL( TMapImageOptions& aOptions );
-#endif
-        void AddRequestTextL( const TDesC& aText );
-        void AddAddressL( const TDesC& aAddress );
-
-        void CommitL();
-       
-        ~CTestProviderDump();
-
-    protected:
-
-        void ConstructL();
-        CTestProviderDump();
-
-    private:
-        CAiwGenericParamList* iList;
-    };
-    
-class CTestCommandListener : public CActive
-    {
-    public:
-        CTestCommandListener( TCallBack aCallback ) : CActive ( CActive::EPriorityStandard )
-            {
-            iCallback = aCallback;
-            iProperty.Attach( TUid::Uid( KPropCategoryUid ), KPropKeyAction );
-            CActiveScheduler::Add( this );
-            };
-            
-        ~CTestCommandListener()
-            {
-            iProperty.Close();
-            };
-          
-        void Start()
-            {
-            iProperty.Subscribe( iStatus );
-            SetActive();
-            };
-            
-        void RunL()
-            {
-            Start();
-            iCallback.CallBack();
-            };
-            
-        void DoCancel()
-            {
-            iProperty.Cancel();
-            };
-            
-        RProperty& Property()
-            {
-            return iProperty;
-            };
-            
-    protected:
-        RProperty iProperty;
-        TCallBack iCallback;
-    };
-
-#endif // MNTP_DUMP_H
-
--- a/locsrv_plat/map_image_api/tsrc/testprovider/inc/testprovidergeocodingservice.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,94 +0,0 @@
-/*
-* Copyright (c) 2005-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:  CTestProviderGeocodingService class
-*
-*/
-
-
-#ifndef MN_TPGEOCODINGSERVICE_H
-#define MN_TPGEOCODINGSERVICE_H
-
-#include "mngeocodingservicebase.h"
-
-class CPosLandmark;
-class CTestCommandListener;
-
-/** Implementation of geocoding service (KMnAppGeocodingService). 
- */
-class CTestProviderGeocodingService : public CMnGeocodingServiceBase
-    {
-    public :
-        static CTestProviderGeocodingService* NewL();
-        
-        void HandleTestCommandL( TInt aCommand );
-
-    protected :
-        /** C++ constructor */
-        CTestProviderGeocodingService();
-        /** Destructor */
-        virtual ~CTestProviderGeocodingService();
-
-        void ConstructL();
-
-        void LeaveIfBusyL();
-        void LeaveIfInstructedL();
-        void StartProcessingL();
-        static TInt GeocodingProcessingCallBack( TAny* aPtr );
-        void HandleGeocodingCompletedL();
-        void FinishProcessingL();
-
-        TInt GetTestCommand();
-
-    private:
-        void DumpDataL( const TDesC& aAddress );
-        void DumpDataL( const CPosLandmark& aLandmark );
-        
-
-    protected: // from CMnGeocodingServiceBase
-    
-        /** Handles client's request for finding address by given coordinate. */
-        void HandleFindAddressByCoordinateL( const CPosLandmark& aLandmark );
-        
-        /** Handles client's request for finding coordinate by given address. */
-        void HandleFindCoordinateByAddressL( const CPosLandmark& aLandmark );
-
-        /** Handles client's request for finding coordinate by given address. */
-        void HandleFindCoordinateByAddressL( const TDesC& aAddress );
-        
-    protected: // from CMnServiceBase
-
-        /** Reports that client cancelled request */
-        void DoCancel();
-
-    private:
-    
-        enum TServiceType
-            {
-            ENone,
-            ECoordToAddr,
-            EAddrToCoord,
-            EPlainToCoord
-            };
-            
-        TServiceType            iCurrentService;
-    
-        CPosLandmark*           iLandmark;
-        HBufC*                  iPlainAddress;
-        
-        CPeriodic*              iProcessor;
-    };
-
-#endif // MN_TPGEOCODINGSERVICE_H
-
-
--- a/locsrv_plat/map_image_api/tsrc/testprovider/inc/testprovidermapimageservice.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,83 +0,0 @@
-/*
-* Copyright (c) 2005-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:  CTestProviderMapImageService class
-*
-*/
-
-
-#ifndef MN_TPMAPIMAGESERVICE_H
-#define MN_TPMAPIMAGESERVICE_H
-
-#include "mnmapimageservicebase.h"
-
-class CPosLandmark;
-class CTestCommandListener;
-
-/** Implementation of geocoding service (KMnAppMapImageService). 
- */
-class CTestProviderMapImageService : public CMnMapImageServiceBase
-    {
-    public :
-        static CTestProviderMapImageService* NewL();
-        
-        void HandleTestCommandL( TInt aCommand );
-
-    protected :
-        /** C++ constructor */
-        CTestProviderMapImageService();
-        /** Destructor */
-        virtual ~CTestProviderMapImageService();
-
-        void ConstructL();
-
-        void LeaveIfBusyL();
-        void LeaveIfInstructedL();
-        void StartProcessingL();
-        static TInt MapImageProcessingCallBack( TAny* aPtr );
-        void HandleMapImageCompletedL();
-        void FinishProcessingL();
-
-        TInt GetTestCommand();
-
-        void RenderL();
-
-    private:
-        void DumpDataL();
-
-    protected: // from CMnMapImageServiceBase
-    
-        /** Handles client's request for finding address by given coordinate. */
-        void HandleRenderingL();
-        
-    protected: // from CMnServiceBase
-
-        /** Reports that client cancelled request */
-        void DoCancel();
-
-    private:
-    
-        enum TServiceType
-            {
-            ENone,
-            ERender,
-            };
-            
-        TServiceType            iCurrentService;
-    
-        CPeriodic*              iProcessor;
-    };
-
-#endif // MN_TPMAPIMAGESERVICE_H
-
-
--- a/locsrv_plat/map_image_api/tsrc/testprovider/inc/testprovidermapview.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,49 +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: Map View for map and navigation test provider
-*
-*/
-
-
-
-#ifndef __MNTP_MAPVIEW_H_
-#define __MNTP_MAPVIEW_H_
-
-#include <coecntrl.h>
-
-class CTestProviderMapView : public CCoeControl
-    {
-    public: // New methods
-
-        static CTestProviderMapView* NewL( const TRect& aRect );
-        static CTestProviderMapView* NewLC( const TRect& aRect );
-
-        virtual ~CTestProviderMapView();
-
-    public:  // Functions from base classes
-
-        void Draw( const TRect& aRect ) const;
-        
-    private: // Constructors
-
-        void ConstructL(const TRect& aRect);
-
-        CTestProviderMapView();
-    
-    private:
-
-    };
-
-#endif // __MNTP_MAPVIEW_H_
-
--- a/locsrv_plat/map_image_api/tsrc/testprovider/inc/testprovidermapviewservice.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,77 +0,0 @@
-/*
-* Copyright (c) 2005-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:  CTestProviderMapViewService class
-*
-*/
-
-
-#ifndef MNTP_MAPVIEWSERVICE_H
-#define MNTP_MAPVIEWSERVICE_H
-
-#include "mnmapviewservicebase.h"
-
-class CPosLandmark;
-class CTestCommandListener;
-
-/** Implementation of MapView service (KMnAppMapViewService). 
- */
-class CTestProviderMapViewService : public CMnMapViewServiceBase
-    {
-    public :
-        static CTestProviderMapViewService* NewL();
-        void HandleTestCommandL( TInt aCommand );
-        
-    protected :
-        /** C++ constructor */
-        CTestProviderMapViewService();
-        /** Destructor */
-        virtual ~CTestProviderMapViewService();
-
-        void ConstructL();
-
-        void LeaveIfBusyL();
-        void LeaveIfInstructedL();
-        void StartProcessingL();
-        static TInt SelectionIdleCallBack( TAny* aPtr );
-        void HandleSelectionL();
-        void DoSelectionL();
-
-        void DumpDataL();
-        TInt GetTestCommand();
-
-    protected: // from CMnMapViewServiceBase
-    
-        /** Handles client's request for showing map */
-        void HandleShowMapL();
-
-        /** Handles client's request for showing map from current location */
-        void HandleShowCurrentLocationL();
-
-        /** Handles client's request for selecting a location from map */
-        void HandleSelectFromMapL();
-
-    protected: // from CMnServiceBase
-
-        /** Reports that client cancelled request */
-        void DoCancel();
-
-    private:
-    
-        CPosLandmark*           iLandmark;
-        CPeriodic*              iProcessor;
-    };
-
-#endif // MNTP_MAPVIEWSERVICE_H
-
-
--- a/locsrv_plat/map_image_api/tsrc/testprovider/inc/testprovidernavigationservice.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,59 +0,0 @@
-/*
-* Copyright (c) 2005-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:  CTestProviderNavigationService class
-*
-*/
-
-
-#ifndef MNTP_NAVIGATIONSERVICE_H
-#define MNTP_NAVIGATIONSERVICE_H
-
-#include "mnnavigationservicebase.h"
-
-class CPosLandmark;
-
-/** Implementation of Navigation service (KMnAppNavigationService). 
- */
-class CTestProviderNavigationService : public CMnNavigationServiceBase
-    {
-    public :
-        static CTestProviderNavigationService* NewL();
-        
-        void HandleTestCommandL( TInt aCommand );
-
-    protected :
-        /** C++ constructor */
-        CTestProviderNavigationService();
-        /** Destructor */
-        virtual ~CTestProviderNavigationService();
-
-        void ConstructL();
-
-    public: // from CMnNavigationServiceBase
-    
-        /** Handles client's request for navigation. */
-        void HandleNavigateToL(const CPosLandmark& aDestination);
-    
-    protected: // from CMnServiceBase
-
-        /** Reports that client cancelled request */
-        void DoCancel();
-
-    private:
-    
-    };
-
-#endif // MNTP_NAVIGATIONSERVICE_H
-
-
--- a/locsrv_plat/map_image_api/tsrc/testprovider/inc/testprovidernaviview.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,46 +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: Main View for map and navigation test provider
-*
-*/
-
-
-
-#ifndef __MNTP_NAVIVIEW_H_
-#define __MNTP_NAVIVIEW_H_
-
-#include <coecntrl.h>
-
-class CTestProviderNaviView : public CCoeControl
-    {
-    public: // New methods
-
-        static CTestProviderNaviView* NewL( const TRect& aRect );
-        static CTestProviderNaviView* NewLC( const TRect& aRect );
-        virtual ~CTestProviderNaviView();
-
-    public:  // Functions from base classes
-
-        void Draw( const TRect& aRect ) const;
-    private: // Constructors
-
-        void ConstructL(const TRect& aRect);
-        CTestProviderNaviView();
-    
-    private:
-
-    };
-
-#endif // __MNTP_NAVIVIEW_H_
-
--- a/locsrv_plat/map_image_api/tsrc/testprovider/rom/MnTestProvider.iby	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +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: IBY file for map and navigation test provider
-*
-*/
-
-S60_APP_EXE(MnTestProvider)
-S60_APP_RESOURCE(MnTestProvider)
-S60_APP_AIF_RSC(MnTestProvider)
-data=DATAZ_\system\install\MnTestProviderStub.sis \system\install\MnTestProviderStub.sis
--- a/locsrv_plat/map_image_api/tsrc/testprovider/sis/MnTestProvider.pkg	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,37 +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: Package file for map and navigation test provider
-;
-;
-; Stub Installation file for M&N Test Provider App
-;Language - standard language definitions
-&EN
-
-; standard SIS file header
-#{"MnTestProvider"},(0x0313200B),1,2,4
-
-; Localised Vendor name
-%{"Vendor-EN"}
-
-; Unique Vendor name
-:"Vendor"
-
-; Supports S60 v 3.0
-[0x101F7961], 0, 0, 0, {"S60ProductID"}
-
-; Files to install
-"\epoc32\release\ARMV5\UDEB\mntestprovider.exe"-"C:\sys\bin\mntestprovider.exe"
-"\epoc32\data\z\resource\apps\mntestprovider.rsc"-"C:\resource\apps\mntestprovider.rsc"
-"\epoc32\data\z\private\10003a3f\apps\mntestprovider_reg.rsc"-"C:\private\10003a3f\import\apps\mntestprovider_reg.rsc"
-
--- a/locsrv_plat/map_image_api/tsrc/testprovider/src/testprovider.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,37 +0,0 @@
-/*
-* Copyright (c) 2004-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: Entry Point for map and navigation test provider
-*
-*/
-
-
-#include <e32base.h>
-#include <eikstart.h>
-
-#include "debug.h"
-
-#include "testproviderapplication.h"
-
-
-LOCAL_C CApaApplication* NewApplication()
-{
-    LOG( "NewApplication" );
-    return new CTestProviderApplication;
-}
-
-TInt E32Main()
-{
-    return EikStart::RunApplication( NewApplication );
-}
-
--- a/locsrv_plat/map_image_api/tsrc/testprovider/src/testproviderapplication.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,66 +0,0 @@
-/*
-* Copyright (c) 2004-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:  Implementation of CTestProviderApplication
-*
-*/
-
-
-#include "debug.h"
-
-#include "testproviderdocument.h"
-#include "testproviderappserver.h"
-#include "testproviderapplication.h"
-
-// UID for the application, this should match the uid defined in the mmp file.
-static const TUid KUidTestProviderApp = {0x0313200B};
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CApaDocument* CTestProviderApplication::CreateDocumentL()
-    {  
-    LOG( "CreateDocumentL" );
-    CApaDocument* document = CTestProviderDocument::NewL( *this );
-    return document;
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-TUid CTestProviderApplication::AppDllUid() const
-    {
-    // Return the UID for the TestProvider application
-    return KUidTestProviderApp;
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CTestProviderApplication::NewAppServerL( CApaAppServer*& aAppServer )
-    {
-    LOG( "NewAppServerL" );
-    
-    CTestProviderAppServer* server = new (ELeave) CTestProviderAppServer;
-    aAppServer = server;
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CTestProviderApplication::~CTestProviderApplication()
-    {
-    }
-
--- a/locsrv_plat/map_image_api/tsrc/testprovider/src/testproviderappserver.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,250 +0,0 @@
-/*
-* Copyright (c) 2004-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:  Implementation of CTestProviderAppServer
-*
-*/
-
-
-#include <mnappserviceuids.hrh>
-#include "debug.h"
-
-#include <e32property.h>
-#include <lbsposition.h>
-#include <epos_cposlandmark.h>
-
-#include "testprovidergeocodingservice.h"
-#include "testprovidernavigationservice.h"
-#include "testprovidermapviewservice.h"
-
-#ifdef RD_MAPNAV_BITMAP_ACCESS
-#include "testprovidermapimageservice.h"
-#endif
-
-#include "testproviderappui.h"
-#include "testproviderappserver.h"
-
-#include "testproviderdump.h"
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CTestProviderAppServer::~CTestProviderAppServer()
-    {
-    if ( iListener )
-        {
-        iListener->Cancel();
-        delete iListener;
-        }
-
-    LOG("server destroyed");
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CTestProviderAppServer::ConstructL( const TDesC& aFixedServerName )
-    {
-    CAknAppServer::ConstructL( aFixedServerName );
-    
-    iListener = new (ELeave) CTestCommandListener( TCallBack( TestCommandCallback, this ) );
-    iListener->Start();
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-TInt CTestProviderAppServer::TestCommandCallback( TAny* aPtr )
-    {
-    CTestProviderAppServer* self =    
-        static_cast<CTestProviderAppServer*> ( aPtr );
-        
-    TRAP_IGNORE( self->HandleTestCommandL() );
-    return EFalse;
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-void CTestProviderAppServer::HandleTestCommandL()
-    {
-    iListener->Property().Get( iTestCommand );
-    LOG1("test command changed %d ", iTestCommand );
-    
-    if ( iTestCommand == EServerActionExit )
-        {
-        AppUi()->ProcessCommandL( EAknCmdExit );
-        }
-    else
-    if ( iMapViewService )
-        {
-        iMapViewService->HandleTestCommandL( iTestCommand );
-        }
-    else 
-    if ( iNavigationService )
-        {
-        iNavigationService->HandleTestCommandL( iTestCommand );
-        }
-    else 
-    if ( iGeocodingService )
-        {
-        iGeocodingService->HandleTestCommandL( iTestCommand );
-        }
-    else
-#ifdef RD_MAPNAV_BITMAP_ACCESS
-    if ( iMapImageService )
-        {
-        iMapImageService->HandleTestCommandL( iTestCommand );
-        }
-    else
-#endif
-        {
-        }
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-EXPORT_C CApaAppServiceBase* CTestProviderAppServer::CreateServiceL(TUid aServiceType) const
-    {
-    RProcess process;
-    RProperty property;
-    
-    TProcessId id = process.Id();
-    TPckg<TProcessId> packId( id );
-
-    property.Define( TUid::Uid( KPropCategoryUid ), KPropKeyProcessId, RProperty::EByteArray );
-    property.Set( TUid::Uid( KPropCategoryUid ), KPropKeyProcessId, packId );
-
-    LOG1("CreateServiceL, svcUid = %X", aServiceType.iUid);
-    switch ( aServiceType.iUid )
-        {
-        case KMnAppGeocodingService:
-            return CreateGeocodingServiceL();
-            
-        case KMnAppNavigationService:
-            return CreateNavigationServiceL();
-            
-        case KMnAppMapViewService:
-            return CreateMapViewServiceL();
-            
-#ifdef RD_MAPNAV_BITMAP_ACCESS
-        case KMnAppMapImageService:
-            return CreateMapImageServiceL();
-#endif
-
-        default:
-            return CAknAppServer::CreateServiceL( aServiceType );
-        }
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-EXPORT_C void CTestProviderAppServer::HandleAllClientsClosed()
-    {
-    LOG( "HandleAllClientsClosed" );
-
-    // create fresh dump to signal successful exit
-    // TRAP_IGNORE( DumpEmptyL() );
-    iBusy = EFalse;
-    CAknAppServer::HandleAllClientsClosed();
-    }
-    
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CTestProviderGeocodingService* CTestProviderAppServer::CreateGeocodingServiceL() const
-    {
-    LOG( "CreateGeocodingServiceL" );
-    __ASSERT_DEBUG( !iGeocodingService, Panic( KErrAlreadyExists ) );
-    iGeocodingService = CTestProviderGeocodingService::NewL();
-    TRAP_IGNORE( DumpEmptyL() );
-    iBusy = ETrue;
-    return iGeocodingService;
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CTestProviderNavigationService* CTestProviderAppServer::CreateNavigationServiceL() const
-    {
-    LOG( "CreateNavigationServiceL" );
-    __ASSERT_DEBUG( !iNavigationService, Panic( KErrAlreadyExists ) );
-    iNavigationService = CTestProviderNavigationService::NewL();
-    TRAP_IGNORE( DumpEmptyL() );
-    iBusy = ETrue;
-    return iNavigationService;
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CTestProviderMapViewService* CTestProviderAppServer::CreateMapViewServiceL() const
-    {
-    LOG( "CreateMapViewServiceL" );
-    __ASSERT_DEBUG( !iMapViewService, Panic( KErrAlreadyExists ) );
-    iMapViewService = CTestProviderMapViewService::NewL();
-    TRAP_IGNORE( DumpEmptyL() );
-    iBusy = ETrue;
-    return iMapViewService;
-    }
-
-#ifdef RD_MAPNAV_BITMAP_ACCESS
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CTestProviderMapImageService* CTestProviderAppServer::CreateMapImageServiceL() const
-    {
-    LOG( "CreateMapImageServiceL" );
-    __ASSERT_DEBUG( !iMapImageService, Panic( KErrAlreadyExists ) );
-    iMapImageService = CTestProviderMapImageService::NewL();
-    TRAP_IGNORE( DumpEmptyL() );
-    iBusy = ETrue;
-    return iMapImageService;
-    }
-#endif
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CTestProviderAppUi* CTestProviderAppServer::AppUi() const
-    {
-    CTestProviderAppUi* ui = (CTestProviderAppUi*) CEikonEnv::Static()->AppUi();
-    if ( !ui )
-        {
-        LOG("UI not found!");
-        }
-    return ui;
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CTestProviderAppServer::DumpEmptyL() const
-    {
-    CTestProviderDump* dump = CTestProviderDump::NewLC();
-    dump->AddRunModeL( AppUi()->IsChainedMode() );
-    dump->CommitL();
-    CleanupStack::PopAndDestroy( dump );
-    }
-    
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-TBool CTestProviderAppServer::IsFree()
-    {
-    return !iBusy;
-    }
--- a/locsrv_plat/map_image_api/tsrc/testprovider/src/testproviderappui.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,291 +0,0 @@
-/*
-* Copyright (c) 2004-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:  Implements the CTestProviderAppUi class
-*
-*/
-
-
-#include <aknnavi.h>
-#include <aknnavide.h>
-#include <w32std.h>
-#include <EikServerApp.h>
-
-#include "debug.h"
-
-#include "testproviderappview.h"
-#include "testprovidernaviview.h"
-#include "testprovidermapview.h"
-
-#include "testproviderappui.h"
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CTestProviderAppUi::CTestProviderAppUi()
-    {
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CTestProviderAppUi::ConstructL()
-    {
-    BaseConstructL(EAknEnableSkin);
-
-    if ( !iEikonEnv->StartedAsServerApp() )
-        {
-        CAknAppUi::Exit();	
-        }
-/*
-    CEikAppServer* server = iEikonEnv->AppServer();
-    if ( server )
-        {
-        iShutter = new ( ELeave ) CShutter( *server );
-        iShutter->ConstructL();
-        
-        const TTimeIntervalMicroSeconds32 KShutdownDelay = 2 * 1000 * 1000;
-        iShutter->Go();After( KShutdownDelay );
-        }
-*/        
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CTestProviderAppUi::~CTestProviderAppUi()
-    {
-    delete iNaviLabel;
-    
-    delete iAppView;
-    if ( iNaviView )
-        {
-        RemoveFromStack( iNaviView );
-        }
-    delete iNaviView;
-    if ( iMapView )
-        {
-        RemoveFromStack( iMapView );
-        }
-    delete iMapView;
-/*
-    if ( iShutter )
-        {
-        iShutter->Cancel();
-        delete iShutter;
-        }
-*/        
-    LOG("application destroyed");
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CTestProviderAppUi::HandleCommandL( TInt aCommand )
-    {
-    switch(aCommand)
-        {
-        case EAknSoftkeyBack:
-            {
-    	    Exit( EEikCmdExit ); 
-        	break;
-            }
-            
-        case EEikCmdExit:
-        case EAknSoftkeyExit:
-            {
-            Exit( EAknCmdExit ); // this will close client also
-        	break;
-            }
-        default:
-            break;
-        }
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CTestProviderAppUi::Exit( TInt aReason )
-    {
-    CEikAppServer* server = iEikonEnv->AppServer();
-    if ( server )
-    	{
-        server->NotifyServerExit( aReason );
-    	}
-    CAknAppUi::Exit();	
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-TBool CTestProviderAppUi::ProcessCommandParametersL( CApaCommandLine &aCommandLine )
-    {
-    iParentWg = aCommandLine.ParentWindowGroupID();
-    LOG1("parent window group id %d", iParentWg );
-    
-    return CAknAppUi::ProcessCommandParametersL( aCommandLine );
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CTestProviderAppUi::DynInitMenuPaneL(TInt /*aResourceId*/, CEikMenuPane* /*aMenuPane*/)
-    {
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CTestProviderAppUi::PostConstructL()
-    {
-/*
-    // Create TestProvider view
-    CTestProviderAppView* TestProviderAppView = CTestProviderAppView::NewLC();
-    AddViewL(TestProviderView); // Transfer ownership to base class
-    CleanupStack::Pop(TestProviderView);
-
-    // Activate TestProvider view
-    TestProviderView->ActivateViewL(TestProviderView->ViewId());
-*/
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CTestProviderNaviView& CTestProviderAppUi::ShowNaviViewL()
-    {
-    if ( !iNaviView )
-        {
-        _LIT( KNavigation, "Navigation" );
-        SetNaviPaneTitleL( KNavigation );
-        
-        iNaviView = CTestProviderNaviView::NewL( ClientRect() );
-        AddToStackL( iNaviView );
-        }
-    return *iNaviView;    
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CTestProviderMapView& CTestProviderAppUi::ShowMapViewL()
-    {
-    if ( !iMapView )
-        {
-        _LIT( KMapView, "MapView" );
-        SetNaviPaneTitleL( KMapView );
-        
-        iMapView = CTestProviderMapView::NewL( ClientRect() );
-        AddToStackL( iMapView );
-        }
-    return *iMapView;
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-TBool CTestProviderAppUi::IsChainedMode()
-    {
-    return ( iParentWg != 0 );
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-TBool CTestProviderAppUi::IsAnyViewOpen()
-    {
-    return iMapView || iNaviView;
-    }
-
-// ----------------------------------------------------------------------------
-// ----------------------------------------------------------------------------
-//
-CEikStatusPane* CTestProviderAppUi::StatusPane()
-    {
-    return CEikonEnv::Static()->AppUiFactory()->StatusPane();
-    }
-    
-// ----------------------------------------------------------------------------
-// ----------------------------------------------------------------------------
-//
-void CTestProviderAppUi::SetNaviPaneTitleL( const TDesC& aPaneTitle )
-    {
-    if ( !iNaviPane )
-        {
-        iNaviPane = static_cast<CAknNavigationControlContainer*>(
-                StatusPane()->ControlL( TUid::Uid( EEikStatusPaneUidNavi ) ) );
-        }
-
-    if ( iNaviLabel )
-        {
-        CAknNavigationDecorator* naviLabel = iNaviPane->CreateNavigationLabelL( aPaneTitle );
-        CleanupStack::PushL( naviLabel );
-
-        iNaviPane->ReplaceL( *iNaviLabel, *naviLabel );
-
-        delete iNaviLabel;
-        iNaviLabel = naviLabel;
-
-        CleanupStack::Pop( naviLabel );
-        }
-    else
-        {
-        iNaviLabel = iNaviPane->CreateNavigationLabelL( aPaneTitle );
-        iNaviPane->PushL( *iNaviLabel );
-        }
-    }    
-/*
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CTestProviderAppUi::CShutter::CShutter( CTestProviderAppServer& aServer ) 
-: CTimer( CActive::EPriorityIdle ),
-  iServer( aServer )
-    {
-    CActiveScheduler::Add( this );
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CTestProviderAppUi::CShutter::ConstructL()
-    {
-    CTimer::ConstructL();
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CTestProviderAppUi::CShutter::RunL()
-    {
-    if ( iServer.IsFree() )
-        {
-        iAppUi.Exit( EAknCmdExit );
-        }
-    else
-        {
-        Go();
-        }
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CTestProviderAppUi::CShutter::Go()
-    {
-    const TTimeIntervalMicroSeconds32 KShutdownDelay = 2 * 1000 * 1000;
-    iShutter->After( KShutdownDelay );
-    }
-*/    
\ No newline at end of file
--- a/locsrv_plat/map_image_api/tsrc/testprovider/src/testproviderappview.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,108 +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: Application View for map and navigation test provider
-*
-*/
-
-
-#include <coemain.h>
-#include <aknlists.h>
-#include <barsread.h>
-
-#include "testproviderappview.h"
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// CTestProviderAppView::NewL()
-// Two-phased constructor.
-// -----------------------------------------------------------------------------
-//
-CTestProviderAppView* CTestProviderAppView::NewL( const TRect& aRect )
-    {
-    CTestProviderAppView* self = CTestProviderAppView::NewLC( aRect );
-    CleanupStack::Pop( self );
-    return self;
-    }
-
-// -----------------------------------------------------------------------------
-// CTestProviderAppView::NewLC()
-// Two-phased constructor.
-// -----------------------------------------------------------------------------
-//
-CTestProviderAppView* CTestProviderAppView::NewLC( const TRect& aRect )
-    {
-    CTestProviderAppView* self = new ( ELeave ) CTestProviderAppView;
-    CleanupStack::PushL( self );
-    self->ConstructL( aRect );
-    return self;
-    }
-
-// -----------------------------------------------------------------------------
-// CTestProviderAppView::ConstructL()
-// Symbian 2nd phase constructor can leave.
-// -----------------------------------------------------------------------------
-//
-void CTestProviderAppView::ConstructL( const TRect& aRect )
-    {
-    // Create a window for this application view
-    CreateWindowL();
-
-    // Set the windows size
-    SetRect( aRect );
-
-    // Activate the window, which makes it ready to be drawn
-    ActivateL();
-    }
-
-// -----------------------------------------------------------------------------
-// CTestProviderAppView::CTestProviderAppView()
-// C++ default constructor can NOT contain any code, that might leave.
-// -----------------------------------------------------------------------------
-//
-CTestProviderAppView::CTestProviderAppView()
-    {
-    // No implementation required
-    }
-
-
-// -----------------------------------------------------------------------------
-// CTestProviderAppView::~CTestProviderAppView()
-// Destructor.
-// -----------------------------------------------------------------------------
-//
-CTestProviderAppView::~CTestProviderAppView()
-    {
-    //delete iList;
-    //iList = NULL;
-    }
-
-
-// -----------------------------------------------------------------------------
-// CTestProviderAppView::Draw()
-// Draws the display.
-// -----------------------------------------------------------------------------
-//
-void CTestProviderAppView::Draw( const TRect& /*aRect*/ ) const
-    {
-    // Get the standard graphics context
-    CWindowGc& gc = SystemGc();
-
-    // Gets the control's extent
-    TRect rect = Rect();
-
-    // Clears the screen
-    gc.Clear( rect );
-    }
-
--- a/locsrv_plat/map_image_api/tsrc/testprovider/src/testprovidercoordconverter.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,105 +0,0 @@
-/*
-* Copyright (c) 2004-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:  CTestProviderCoordConverter class implementation
-*
-*/
-
-
-#include <e32base.h>
-
-#include "debug.h"
-#include "testprovidercoordconverter.h"
-
-// ========================== MEMBER FUNCTIONS ===============================
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-CTestProviderCoordConverter* CTestProviderCoordConverter::NewL()
-    {
-    CTestProviderCoordConverter* self = new (ELeave) CTestProviderCoordConverter;
-    return self;
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-CTestProviderCoordConverter::CTestProviderCoordConverter()
-    {
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-CTestProviderCoordConverter::~CTestProviderCoordConverter()
-    {
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-TInt CTestProviderCoordConverter::GetImageCoordinate( 
-    const TCoordinate& aWorldCoordinate, 
-    TPoint& aImagePoint )
-    {
-    const TMnMapImageParams& params = MapImageParams();
-    TReal lat = aWorldCoordinate.Latitude();
-    TReal lon = aWorldCoordinate.Longitude();
-    
-    switch ( params.ImageType() )
-        {
-        case TMnMapImageParams::ETypeVectorMap:
-        case TMnMapImageParams::ETypeSatelliteImage:
-            {
-            if ( lat < 0 || lat > params.Size().iWidth ||
-                 lon < 0 || lon > params.Size().iHeight )
-                {
-                return KErrUnknown;
-                }
-            break;
-            }
-        default:
-            return KErrArgument;
-        }
-    aImagePoint.iX = aWorldCoordinate.Latitude();
-    aImagePoint.iY = aWorldCoordinate.Longitude();
-    return KErrNone;    
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-TInt CTestProviderCoordConverter::GetWorldCoordinate( 
-    const TPoint& aImagePoint, 
-    TCoordinate& aWorldCoordinate )
-    {
-    const TMnMapImageParams& params = MapImageParams();
-    switch ( params.ImageType() )
-        {
-        case TMnMapImageParams::ETypeVectorMap:
-        case TMnMapImageParams::ETypeSatelliteImage:
-            {
-            if ( aImagePoint.iX < -180 || aImagePoint.iX > 180 ||
-                 aImagePoint.iY < -90  || aImagePoint.iY > 90 )
-                {
-                return KErrUnknown;
-                }
-            break;
-            }
-        default:
-            return KErrArgument;
-        }
-    aWorldCoordinate.SetCoordinate( aImagePoint.iX, aImagePoint.iY );
-    return KErrNone;    
-    }
--- a/locsrv_plat/map_image_api/tsrc/testprovider/src/testproviderdocument.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,69 +0,0 @@
-/*
-* Copyright (c) 2004-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:  Implementation of CTestProviderDocument
-*
-*/
-
-
-#include "testproviderappui.h"
-#include "testproviderdocument.h"
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CTestProviderDocument::CTestProviderDocument(CEikApplication& aApp) 
-    : CAknDocument(aApp) 
-    {
-    }   
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CTestProviderDocument::ConstructL()
-    {
-    }    
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CTestProviderDocument* CTestProviderDocument::NewL( CEikApplication& aApp )
-    {
-    CTestProviderDocument* self = new (ELeave) CTestProviderDocument(aApp);
-    CleanupStack::PushL(self);
-    self->ConstructL();
-    CleanupStack::Pop(self);
-    return self;
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CTestProviderDocument::~CTestProviderDocument()
-    {
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CEikAppUi* CTestProviderDocument::CreateAppUiL()
-    {
-    // Create the application user interface, and return a pointer to it,
-    // the framework takes ownership of this object
-    CEikAppUi* appUi = new (ELeave) CTestProviderAppUi;
-    return appUi;
-    }
-
-
--- a/locsrv_plat/map_image_api/tsrc/testprovider/src/testproviderdump.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,246 +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: Utility class for map and navigation test provider
-*
-*/
-
-
-#include <s32file.h> 
-#include <e32property.h> 
-
-#include <coemain.h>
-#include <aknlists.h>
-#include <barsread2.h>
-#include <barsc2.h> 
-
-#include <lbsposition.h>
-#include <lbspositioninfo.h>
-
-#include <aiwgenericparam.h>
-
-#include <epos_cposlandmark.h>
-#include <epos_cposlandmarkdatabase.h>
-#include <epos_poslandmarkserialization.h>
-
-#include <mngeocoder.h>
-#include <mnmapview.h>
-#include <mnnavigator.h>
-
-#include <mnaiwservices.h>
-
-#include <mntestprovider.rsg>
-
-#include "debug.h"
-#include "testproviderdump.h"
-
-_LIT( KDumpFileName, "c:\\mntestprovider.dump");
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CTestProviderDump::CTestProviderDump()
-    { 
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CTestProviderDump::~CTestProviderDump()
-    {
-    delete iList;
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CTestProviderDump* CTestProviderDump::NewLC()
-    {
-    CTestProviderDump* self = new (ELeave) CTestProviderDump();
-    CleanupStack::PushL( self );
-    self->ConstructL();
-    return self;
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CTestProviderDump::ConstructL()
-    {
-    iList = CAiwGenericParamList::NewL();
-    AddTimeStampL();    
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CTestProviderDump::AddTimeStampL()
-    {
-    TTime now;
-    now.UniversalTime();
-
-    TAiwGenericParam param( EGenericParamDateTime, TAiwVariant( now ) );
-    iList->AppendL( param );
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CTestProviderDump::AddRunModeL( TBool aIsChainedMode )
-    {
-    TMnAiwCommonOptionsParam options;
-    options.iRunChained = aIsChainedMode;
-
-    TPckg<TMnAiwCommonOptionsParam> pack( options );
-    
-    TAiwGenericParam param( EGenericParamMnCommonOptions, TAiwVariant( pack ) );
-    iList->AppendL( param );
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CTestProviderDump::AddLandmarkL( const CPosLandmark& aLandmark )
-    {
-    HBufC8* lmBuf = PosLandmarkSerialization::PackL( aLandmark );
-    CleanupStack::PushL( lmBuf );
-
-    TAiwGenericParam param( EGenericParamLandmark, TAiwVariant( *lmBuf ) );
-    iList->AppendL( param );
-
-    CleanupStack::PopAndDestroy( lmBuf );
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CTestProviderDump::AddLandmarkL( const TDesC& aUri, TPosLmItemId aId )
-    {
-    TAiwGenericParam uri( EGenericParamLandmarkDatabase, TAiwVariant( aUri ) );
-    iList->AppendL( uri );
-
-    TAiwGenericParam id( EGenericParamLandmarkId, TAiwVariant( aId ) );
-    iList->AppendL( id );
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CTestProviderDump::AddLandmarkListL( const TDesC& aUri, TArray<TPosLmItemId> aItemIds )
-    {
-    TAiwGenericParam param( EGenericParamLandmarkDatabase, TAiwVariant( aUri ) );
-    iList->AppendL( param );
-
-    for ( TInt i = 0; i < aItemIds.Count(); i++ )
-        {
-        TAiwGenericParam param( EGenericParamLandmarkId, TAiwVariant( aItemIds[i] ) );
-        iList->AppendL( param );
-        }
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CTestProviderDump::AddMapViewOptionsL( 
-    TUint32 aOptions,
-    TUint32 aCurrentLocationOption,
-    TReal aRadius,
-    TCoordinate aCenterPoint )
-    {
-    TMnAiwMapViewOptionsParam options;
-    options.iOptions = aOptions;
-    options.iCurrentLocationOption = aCurrentLocationOption;
-    options.iRadius = aRadius;
-    options.iCenterPoint = aCenterPoint;
-    
-    TPckg<TMnAiwMapViewOptionsParam> pack( options );
-    
-    TAiwGenericParam param( EGenericParamMnMapViewOptions, TAiwVariant( pack ) );
-    iList->AppendL( param );
-    }
-    
-#ifdef RD_MAPNAV_BITMAP_ACCESS
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CTestProviderDump::AddMapImageOptionsL( TMapImageOptions& aOptions )
-    {
-    TPckg<TMapImageOptions> pack( aOptions );
-    TAiwGenericParam param( EGenericParamUnspecified, TAiwVariant( pack ) );
-    iList->AppendL( param );
-    }    
-#endif
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CTestProviderDump::AddRequestTextL( const TDesC& aText )
-    {
-    TAiwGenericParam text( EGenericParamRequestText, TAiwVariant( aText ) );
-    iList->AppendL( text );
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CTestProviderDump::AddGeocodingOptionsL( TUint32 aOptions )
-    {
-    TMnAiwGeocodingOptionsParam options;
-    options.iOptions = aOptions;
-    
-    TPckg<TMnAiwGeocodingOptionsParam> pack( options );
-    
-    TAiwGenericParam param( EGenericParamMnGeocodingOptions, TAiwVariant( pack ) );
-    iList->AppendL( param );
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CTestProviderDump::AddAddressL( const TDesC& aAddress )
-    {
-    TAiwGenericParam address( EGenericParamRequestText, TAiwVariant( aAddress ) );
-    iList->AppendL( address );
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CTestProviderDump::CommitL()
-    {
-    RFs& fs = CEikonEnv::Static()->FsSession();
-    
-    RFileWriteStream stream;
-    TInt err = KErrInUse; 
-    TInt attempts = 5;
-    while ( err == KErrInUse && --attempts >= 0 )
-        {
-        err = stream.Replace( fs, KDumpFileName, EFileStream | EFileWrite );
-        if ( err && attempts >= 0 )
-            {
-            User::After( 100*1000 ); // 0.1 sec
-            }
-        }
-    if ( err )
-        {
-        LOG1("Couldn't open dump file, error %d", err);
-        User::Leave( err );
-        }
-    CleanupClosePushL( stream );
-    
-    iList->ExternalizeL( stream );
-    
-    CleanupStack::PopAndDestroy( &stream );
-    }
--- a/locsrv_plat/map_image_api/tsrc/testprovider/src/testprovidergeocodingservice.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,392 +0,0 @@
-/*
-* Copyright (c) 2005-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:  ÑTestProviderGeocodingServiceBase class implementation
-*
-*/
-
-
-#include <e32base.h>
-#include <e32math.h>
-#include <e32property.h>
-
-#include <lbsposition.h>
-
-#include <epos_cposlandmark.h>
-#include <epos_poslandmarkserialization.h>
-
-#include <mngeocodingservicebase.h>
-#include "debug.h"
-#include "testproviderdump.h"
-#include "testproviderappui.h"
-#include "testproviderappserver.h"
-#include "testprovidergeocodingservice.h"
-
-const TInt KMaxCoordStrSize = KMaxPrecision + 5;
-const TTimeIntervalMicroSeconds32 KProcessingDelay = 200 * 1000;
-
-// ======== LOCAL FUNCTIONS ========
-
-void CoordinateToString(
-    TReal aCoord,
-    TDes& aStr )
-    {
-    _LIT( KNan, "<NaN>" );
-    _LIT( KOutOfBounds, "<oob>" );
-    _LIT( KCoordFormat, "%.1f" );
-
-    if ( Math::IsNaN( aCoord ) )
-        {
-        aStr.Copy( KNan );
-        }
-    else if ( Abs( aCoord ) > 360 )
-        {
-        aStr.Copy( KOutOfBounds );
-        }
-    else
-        {
-        aStr.Format( KCoordFormat, aCoord );
-        }
-    }
-    
-// ======== MEMBER FUNCTIONS ========
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-CTestProviderGeocodingService* CTestProviderGeocodingService::NewL()
-    {
-    CTestProviderGeocodingService* self = new (ELeave) CTestProviderGeocodingService();
-    CleanupStack::PushL( self );
-    self->ConstructL();
-    CleanupStack::Pop( self );
-    return self;
-    }
-    
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-CTestProviderGeocodingService::CTestProviderGeocodingService()
-    {
-    }
-    
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-CTestProviderGeocodingService::~CTestProviderGeocodingService()
-    {
-    iProcessor->Cancel();
-    delete iProcessor;
-
-    delete iLandmark;
-    delete iPlainAddress;
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-void CTestProviderGeocodingService::ConstructL()
-    {
-    BaseConstructL();
-    
-    iProcessor = CPeriodic::NewL( CActive::EPriorityIdle );
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-void CTestProviderGeocodingService::LeaveIfBusyL()
-    {
-    if ( iProcessor->IsActive() )
-        {
-        LOG("CTestProviderMapViewService::LeaveIfBusyL BUSY");
-        User::Leave( KErrInUse );
-        }
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-void CTestProviderGeocodingService::LeaveIfInstructedL()
-    {
-    RProperty property;
-    TInt code = KErrNone;
-    TInt err = property.Get( TUid::Uid( KPropCategoryUid ), KPropKeyErrorCode, code );
-    if ( err == KErrNone )
-        {
-        User::LeaveIfError( code );
-        }
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-void CTestProviderGeocodingService::StartProcessingL()
-    {
-    iProcessor->Start( KProcessingDelay, KProcessingDelay,
-        TCallBack( CTestProviderGeocodingService::GeocodingProcessingCallBack, this ) );
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-TInt CTestProviderGeocodingService::GeocodingProcessingCallBack( TAny* aPtr )
-    {
-    CTestProviderGeocodingService* self =    
-        static_cast<CTestProviderGeocodingService*> ( aPtr );
-        
-    TRAP_IGNORE( self->HandleGeocodingCompletedL() );
-    return EFalse;
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-void CTestProviderGeocodingService::HandleGeocodingCompletedL()
-    {
-    if ( GetTestCommand() != EServerActionDelayCompletion )
-        {
-        iProcessor->Cancel();
-        TInt err = KErrNone;
-        TRAP( err, FinishProcessingL() );
-        if ( err )
-            {
-            CompleteRequest( err );
-            }
-        }
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-TInt CTestProviderGeocodingService::GetTestCommand()
-    {
-    CTestProviderAppServer* server = (CTestProviderAppServer*) Server();
-    TInt command = server->GetTestCommand();
-    return command;
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-void CTestProviderGeocodingService::FinishProcessingL()
-    {
-    LOG1("FinishProcessingL in, cursvc %d", iCurrentService);
-    TCoordinate coord;
-    switch ( iCurrentService )
-        {
-        case ECoordToAddr:
-            {
-            TBuf<KMaxCoordStrSize> coordStr;
-            
-            TLocality loc;
-            iLandmark->GetPosition( loc );
-            
-            CoordinateToString( loc.Latitude(), coordStr );
-            iLandmark->SetPositionFieldL( EPositionFieldCountry, coordStr );
-
-            CoordinateToString( loc.Longitude(), coordStr );
-            iLandmark->SetPositionFieldL( EPositionFieldCity, coordStr );
-            }
-            break;
-
-        case EAddrToCoord:
-            coord.SetCoordinate( 90, 0 ); // North
-            iLandmark->SetPositionL( TLocality( coord, 0 ) );
-            break;
-
-        case EPlainToCoord:
-            coord.SetCoordinate( -90, 0 ); // South
-            iLandmark->SetPositionL( TLocality( coord, 0 ) );
-            break;
-            
-        default:            
-            User::Leave( KErrGeneral );
-        }
-
-    iCurrentService = ENone;        
-    CompleteGeocodingRequestL( *iLandmark );
-    LOG("FinishProcessingL out");
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-void CTestProviderGeocodingService::HandleTestCommandL( TInt aCommand )
-    {
-    LOG1("CTestProviderGeocodingService::HandleTestCommandL in, %d", aCommand );
-    switch ( aCommand )
-        {
-        case EServerActionCompleteGeocoding:
-            {
-            CPosLandmark* lm = CPosLandmark::NewLC();
-            CompleteGeocodingRequestL( *lm );
-            CleanupStack::PopAndDestroy( lm );
-            }
-            break;
-            
-        case EServerActionBaseComplete:
-            {
-            CompleteRequest( KErrCompletion );
-            }
-            break;
-
-        default:
-            break;    
-        }
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-void CTestProviderGeocodingService::DumpDataL(
-    const CPosLandmark& aLandmark )
-    {
-    CTestProviderDump* dump = CTestProviderDump::NewLC();
-
-    CTestProviderAppServer* server = ( CTestProviderAppServer* ) Server();
-    CTestProviderAppUi* ui = server->AppUi();
-    dump->AddRunModeL( ui->IsChainedMode() );
-
-    dump->AddGeocodingOptionsL( Options() );
-    dump->AddLandmarkL( aLandmark );
-    dump->CommitL();
-    CleanupStack::PopAndDestroy( dump );
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-void CTestProviderGeocodingService::DumpDataL(
-    const TDesC& aAddress )
-    {
-    CTestProviderDump* dump = CTestProviderDump::NewLC();
-
-    CTestProviderAppServer* server = ( CTestProviderAppServer* ) Server();
-    CTestProviderAppUi* ui = server->AppUi();
-    dump->AddRunModeL( ui->IsChainedMode() );
-
-    dump->AddGeocodingOptionsL( Options() );
-    dump->AddAddressL( aAddress );
-    dump->CommitL();
-    CleanupStack::PopAndDestroy( dump );
-    }
-
-// ---------------------------------------------------------------------------
-// From class CMnGeocodingServiceBase
-// ---------------------------------------------------------------------------
-//
-void CTestProviderGeocodingService::HandleFindAddressByCoordinateL(
-    const CPosLandmark& aLandmark)
-    {
-    LeaveIfInstructedL();
-    LeaveIfBusyL();
-
-    DumpDataL( aLandmark );
-
-    TLocality loc;
-    if ( aLandmark.GetPosition( loc ) != KErrNone )
-        {
-        User::Leave( KErrArgument );
-        }
-
-    delete iLandmark;
-    iLandmark = NULL;
-    iLandmark = CPosLandmark::NewL(aLandmark);
-    
-    iCurrentService = ECoordToAddr;
-    StartProcessingL();
-    }
-        
-// ---------------------------------------------------------------------------
-// From class CMnGeocodingServiceBase
-// ---------------------------------------------------------------------------
-//
-void CTestProviderGeocodingService::HandleFindCoordinateByAddressL(
-    const CPosLandmark& aLandmark)
-    {
-    LeaveIfInstructedL();
-    LeaveIfBusyL();
-
-    DumpDataL( aLandmark );
-
-    // verify that landmark has address info
-    TBool valid = EFalse;
-    TPositionFieldId fieldId = aLandmark.FirstPositionFieldId();
-    while ( fieldId != EPositionFieldNone )
-        {
-        if ( fieldId > EPositionFieldAddressCapabilitiesBegin &&
-             fieldId < EPositionFieldNMEACapabilitiesBegin)
-            {
-            TPtrC field;
-            aLandmark.GetPositionField( fieldId, field );
-            if ( field.Length() )
-                {
-                valid = ETrue;
-                break;
-                }
-            }
-        fieldId = aLandmark.NextPositionFieldId( fieldId );
-        }
-        
-    if ( !valid )
-        {
-        User::Leave( KErrArgument );
-        }
-  
-    delete iLandmark;
-    iLandmark = NULL;
-    iLandmark = CPosLandmark::NewL( aLandmark );
-    
-    iCurrentService = EAddrToCoord;
-    StartProcessingL();
-    }
-
-// ---------------------------------------------------------------------------
-// From class CMnGeocodingServiceBase
-// ---------------------------------------------------------------------------
-//
-void CTestProviderGeocodingService::HandleFindCoordinateByAddressL(
-    const TDesC& aAddress)
-    {
-    LeaveIfInstructedL();
-    LeaveIfBusyL();
-
-    DumpDataL( aAddress );
-
-    if ( aAddress.Length() == 0 )
-        {
-        User::Leave( KErrArgument );
-        }
-
-    delete iPlainAddress;
-    iPlainAddress = NULL;
-    iPlainAddress = aAddress.AllocL();
-    
-    delete iLandmark;
-    iLandmark = NULL;
-    iLandmark = CPosLandmark::NewL();
-    
-    iCurrentService = EPlainToCoord;
-    StartProcessingL();
-    }
-
-// ---------------------------------------------------------------------------
-// From class CMnServiceBase
-// ---------------------------------------------------------------------------
-//
-void CTestProviderGeocodingService::DoCancel()
-    {
-    iProcessor->Cancel();
-    iCurrentService = ENone;
-    }
--- a/locsrv_plat/map_image_api/tsrc/testprovider/src/testprovidermapimageservice.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,310 +0,0 @@
-/*
-* Copyright (c) 2005-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:  ÑTestProviderMapImageServiceBase class implementation
-*
-*/
-
-
-#include <e32base.h>
-#include <e32math.h>
-#include <e32property.h>
-
-#include <lbsposition.h>
-
-#include <epos_cposlandmark.h>
-#include <epos_poslandmarkserialization.h>
-
-#include <mnmapimage.h>
-#include <mnmapimageparams.h>
-#include <mnmapimageservicebase.h>
-
-#include "debug.h"
-#include "testproviderdump.h"
-#include "testproviderappui.h"
-#include "testproviderappserver.h"
-#include "testprovidermapimageservice.h"
-
-const TInt KMaxCoordStrSize = KMaxPrecision + 5;
-const TTimeIntervalMicroSeconds32 KProcessingDelay = 200 * 1000;
-
-// ======== LOCAL FUNCTIONS ========
-
-extern void CoordinateToString( TReal aCoord, TDes& aStr );
-    
-// ======== MEMBER FUNCTIONS ========
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-CTestProviderMapImageService* CTestProviderMapImageService::NewL()
-    {
-    CTestProviderMapImageService* self = new (ELeave) CTestProviderMapImageService();
-    CleanupStack::PushL( self );
-    self->ConstructL();
-    CleanupStack::Pop( self );
-    return self;
-    }
-    
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-CTestProviderMapImageService::CTestProviderMapImageService()
-    {
-    }
-    
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-CTestProviderMapImageService::~CTestProviderMapImageService()
-    {
-    iProcessor->Cancel();
-    delete iProcessor;
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-void CTestProviderMapImageService::ConstructL()
-    {
-    BaseConstructL();
-    
-    iProcessor = CPeriodic::NewL( CActive::EPriorityIdle );
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-void CTestProviderMapImageService::LeaveIfBusyL()
-    {
-    if ( iProcessor->IsActive() )
-        {
-        LOG("CTestProviderMapViewService::LeaveIfBusyL BUSY");
-        User::Leave( KErrInUse );
-        }
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-void CTestProviderMapImageService::LeaveIfInstructedL()
-    {
-    RProperty property;
-    TInt code = KErrNone;
-    TInt err = property.Get( TUid::Uid( KPropCategoryUid ), KPropKeyErrorCode, code );
-    if ( err == KErrNone )
-        {
-        User::LeaveIfError( code );
-        }
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-void CTestProviderMapImageService::StartProcessingL()
-    {
-    iProcessor->Start( KProcessingDelay, KProcessingDelay,
-        TCallBack( CTestProviderMapImageService::MapImageProcessingCallBack, this ) );
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-TInt CTestProviderMapImageService::MapImageProcessingCallBack( TAny* aPtr )
-    {
-    CTestProviderMapImageService* self =    
-        static_cast<CTestProviderMapImageService*> ( aPtr );
-        
-    TRAP_IGNORE( self->HandleMapImageCompletedL() );
-    return EFalse;
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-void CTestProviderMapImageService::HandleMapImageCompletedL()
-    {
-    if ( GetTestCommand() != EServerActionDelayCompletion )
-        {
-        iProcessor->Cancel();
-        TInt err = KErrNone;
-        TRAP( err, FinishProcessingL() );
-        if ( err )
-            {
-            CompleteRequest( err );
-            }
-        }
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-TInt CTestProviderMapImageService::GetTestCommand()
-    {
-    CTestProviderAppServer* server = (CTestProviderAppServer*) Server();
-    return server->GetTestCommand();
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-void CTestProviderMapImageService::RenderL()
-    {
-    TMnMapImageParams& params = MapImageParams();
-
-    if ( params.Direction() != 0 )
-        {
-        User::Leave( KErrNotSupported );
-        }
-
-    CFbsBitmap& bitmap = TargetBitmap();
-
-    CFbsBitmapDevice* bitmapDevice = 
-      CFbsBitmapDevice::NewL( &( bitmap ) );
-    CleanupStack::PushL( bitmapDevice );
-
-    CFbsBitGc* gc = NULL;
-    User::LeaveIfError( bitmapDevice->CreateContext( gc ) );
-    CleanupStack::PushL( gc );
-
-    switch ( params.ImageType() ) 
-        {
-        case TMnMapImageParams::ETypeSatelliteImage:
-            gc->SetBrushColor( KRgbGreen );
-            break;  
-        default:
-            params.SetImageType( TMnMapImageParams::ETypeVectorMap );
-        case TMnMapImageParams::ETypeVectorMap:
-            gc->SetBrushColor( KRgbYellow );
-            break;
-        }
-        
-    // Very simple map example
-    gc->Clear( TargetRect() ); // clear the area
-
-    // cleanup
-    CleanupStack::PopAndDestroy( gc );
-    CleanupStack::PopAndDestroy( bitmapDevice );
-
-    // complete request
-    params.SetProjectionId(0);
-    }
-    
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-void CTestProviderMapImageService::FinishProcessingL()
-    {
-    LOG1("FinishProcessingL in, cursvc %d", iCurrentService);
-    TCoordinate coord;
-    switch ( iCurrentService )
-        {
-        case ERender:
-            {
-            RenderL();
-            //TargetBitmap().Clear();
-            }
-            break;
-
-        default:            
-            User::Leave( KErrGeneral );
-        }
-
-    iCurrentService = ENone;        
-    CompleteRendering();
-    LOG("FinishProcessingL out");
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-void CTestProviderMapImageService::HandleTestCommandL( TInt aCommand )
-    {
-    LOG1("CTestProviderMapImageService::HandleTestCommandL in, %d", aCommand );
-    switch ( aCommand )
-        {
-        case EServerActionCompleteRendering:
-            {
-            MapImageParams().SetImageType( TMnMapImageParams::ETypeVectorMap );
-            CompleteRendering();
-            }
-            break;
-            
-        case EServerActionBaseComplete:
-            {
-            CompleteRequest( KErrCompletion );
-            }
-            break;
-
-        default:
-            break;    
-        }
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-void CTestProviderMapImageService::DumpDataL()
-    {
-    LOG("DumpDataL in");
-    if ( GetTestCommand() == EServerActionDisableDump )
-        {
-        LOG("DumpDataL disabled, out");
-        return;
-        }
-
-    CTestProviderDump* dump = CTestProviderDump::NewLC();
-    
-    CTestProviderAppServer* server = ( CTestProviderAppServer* ) Server();
-    CTestProviderAppUi* ui = server->AppUi();
-    dump->AddRunModeL( ui->IsChainedMode() );
-
-    TMapImageOptions options;
-    options.iParams = MapImageParams();
-    options.iBitmapHandle = TargetBitmap().Handle();
-    options.iBitmapSize = TargetBitmap().SizeInPixels();
-    options.iTargetOrigin = TargetRect().iTl;
-    options.iShowOptions = ShowOptions();
-
-    dump->AddMapImageOptionsL( options );
-
-    dump->CommitL();
-    CleanupStack::PopAndDestroy( dump );
-    LOG("DumpDataL out");
-    }
-    
-// ---------------------------------------------------------------------------
-// From class CMnMapImageServiceBase
-// ---------------------------------------------------------------------------
-//
-void CTestProviderMapImageService::HandleRenderingL()
-    {
-    LeaveIfInstructedL();
-    LeaveIfBusyL();
-
-    DumpDataL();
-
-    iCurrentService = ERender;
-    StartProcessingL();
-    }
-        
-// ---------------------------------------------------------------------------
-// From class CMnServiceBase
-// ---------------------------------------------------------------------------
-//
-void CTestProviderMapImageService::DoCancel()
-    {
-    iProcessor->Cancel();
-    iCurrentService = ENone;
-    }
-
--- a/locsrv_plat/map_image_api/tsrc/testprovider/src/testprovidermapview.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,99 +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: Map View for map and navigation test provider
-*
-*/
-
-
-
-#include <coemain.h>
-#include <aknlists.h>
-#include <barsread.h>
-
-#include "debug.h"
-#include "testprovidermapview.h"
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CTestProviderMapView* CTestProviderMapView::NewL( const TRect& aRect )
-    {
-    CTestProviderMapView* self = CTestProviderMapView::NewLC( aRect );
-    CleanupStack::Pop( self );
-    return self;
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CTestProviderMapView* CTestProviderMapView::NewLC( const TRect& aRect )
-    {
-    CTestProviderMapView* self = new ( ELeave ) CTestProviderMapView;
-    CleanupStack::PushL( self );
-    self->ConstructL( aRect );
-    return self;
-    }
-
-// -----------------------------------------------------------------------------
-// CTestProviderMapView::ConstructL()
-// Symbian 2nd phase constructor can leave.
-// -----------------------------------------------------------------------------
-//
-void CTestProviderMapView::ConstructL( const TRect& aRect )
-    {
-    // Create a window for this application view
-    CreateWindowL();
-
-    // Set the windows size
-    SetRect( aRect );
-
-    // Activate the window, which makes it ready to be drawn
-    ActivateL();
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CTestProviderMapView::CTestProviderMapView()
-    {
-    }
-
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CTestProviderMapView::~CTestProviderMapView()
-    {
-    }
-
-
-// -----------------------------------------------------------------------------
-// CTestProviderMapView::Draw()
-// Draws the display.
-// -----------------------------------------------------------------------------
-//
-void CTestProviderMapView::Draw( const TRect& /*aRect*/ ) const
-    {
-    // Get the standard graphics context
-    CWindowGc& gc = SystemGc();
-
-    // Gets the control's extent
-    TRect rect = Rect();
-
-    // Clears the screen
-    gc.Clear( rect );
-    }
-
--- a/locsrv_plat/map_image_api/tsrc/testprovider/src/testprovidermapviewservice.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,355 +0,0 @@
-/*
-* Copyright (c) 2005-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:  ÑTestProviderMapViewServiceBase class implementation
-*
-*/
-
-
-#include <e32base.h>
-#include <eikenv.h>
-#include <w32std.h>
-#include <e32property.h>
-
-#include <lbsposition.h>
-
-#include <epos_cposlandmark.h>
-#include <epos_cposlandmarkdatabase.h>
-
-#include "debug.h"
-#include <mnmapviewservicebase.h>
-
-#include "testproviderappui.h"
-#include "testprovidermapview.h"
-#include "testproviderappserver.h"
-#include "testproviderdump.h"
-
-#include "testprovidermapviewservice.h"
-
-const TTimeIntervalMicroSeconds32 KProcessingDelay = 200 * 1000;
-
-// ======== MEMBER FUNCTIONS ========
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-CTestProviderMapViewService* CTestProviderMapViewService::NewL()
-    {
-    CTestProviderMapViewService* self = new (ELeave) CTestProviderMapViewService();
-    CleanupStack::PushL( self );
-    self->ConstructL();
-    CleanupStack::Pop( self );
-    return self;
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-CTestProviderMapViewService::CTestProviderMapViewService()
-    {
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-CTestProviderMapViewService::~CTestProviderMapViewService()
-    {
-    delete iLandmark;
-    if ( iProcessor )
-        {
-        iProcessor->Cancel();
-        delete iProcessor;
-        }
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-void CTestProviderMapViewService::ConstructL()
-    {
-    BaseConstructL();
-    iProcessor = CPeriodic::NewL( CActive::EPriorityIdle );
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-void CTestProviderMapViewService::LeaveIfBusyL()
-    {
-    if ( iProcessor->IsActive() )
-        {
-        LOG("CTestProviderMapViewService::LeaveIfBusyL BUSY");
-        User::Leave( KErrInUse );
-        }
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-void CTestProviderMapViewService::LeaveIfInstructedL()
-    {
-    RProperty property;
-    TInt code = KErrNone;
-    TInt err = property.Get( TUid::Uid( KPropCategoryUid ), KPropKeyErrorCode, code );
-    if ( err == KErrNone )
-        {
-        User::LeaveIfError( code );
-        }
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-void CTestProviderMapViewService::StartProcessingL()
-    {
-    iProcessor->Start( KProcessingDelay, KProcessingDelay,
-        TCallBack( CTestProviderMapViewService::SelectionIdleCallBack, this ) );
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-TInt CTestProviderMapViewService::SelectionIdleCallBack( TAny* aPtr )
-    {
-    CTestProviderMapViewService* self =
-        static_cast<CTestProviderMapViewService*> ( aPtr );
-
-    TRAP_IGNORE( self->HandleSelectionL() );
-    return EFalse;
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-void CTestProviderMapViewService::HandleSelectionL()
-    {
-    if ( GetTestCommand() != EServerActionDelayCompletion )
-        {
-        iProcessor->Cancel();
-        TInt err = KErrNone;
-        TRAP( err, DoSelectionL() );
-        if ( err )
-            {
-            CompleteRequest( err );
-            }
-        }
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-TInt CTestProviderMapViewService::GetTestCommand()
-    {
-    CTestProviderAppServer* server = (CTestProviderAppServer*) Server();
-    TInt command = server->GetTestCommand();
-    return command;
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-void CTestProviderMapViewService::HandleTestCommandL( TInt aCommand )
-    {
-    LOG1("CTestProviderMapViewService::HandleTestCommandL in, %d", aCommand );
-    switch ( aCommand )
-        {
-        case EServerActionBaseComplete:
-            CompleteRequest( KErrCompletion );
-            break;
-            
-        case EServerActionCompleteSelectionFree:
-            {
-            CPosLandmark* lm = CPosLandmark::NewLC();
-            CompleteSelectionRequestL( *lm );
-            CleanupStack::PopAndDestroy( lm );
-            }
-            break;
-            
-        case EServerActionCompleteSelectionIndex:
-            CompleteSelectionRequest( 0 );
-            break;
-
-        case EServerActionCompleteSelectionNegativeIndex:
-            CompleteSelectionRequest( -1 );
-            break;
-            
-        case EServerActionCompleteSelectionLinked:
-            CompleteSelectionRequest( 0, 1 );
-            break;
-            
-        case EServerActionCompleteSelectionWrongLinked:
-            CompleteSelectionRequest( 0, 1000 );
-            break;
-            
-        case EServerActionCompleteSelectionNegativeDbIndex:
-            CompleteSelectionRequest( 0, -1 );
-            break;
-            
-        default:
-            break;
-        }
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-void CTestProviderMapViewService::DoSelectionL()
-    {
-    LOG("DoSelectionL in");
-    
-    HandleTestCommandL( GetTestCommand() );
-    
-    if ( Options() & CMnMapView::EOptionRestrictSelection )
-        {
-        LOG("MnTestProvider::HandleSelectFromMapL restricted");
-        if ( LandmarksToShowDatabases().Count() &&
-             LinkedLandmarksToShow( 0 ).Count() ) 
-            {
-            LOG("HandleSelectFromMapL taking first linked");
-            
-            // take first linked landmark from first database
-            TInt dbIndex = 0;
-            TPosLmItemId lmId = LinkedLandmarksToShow( dbIndex )[0];
-            CompleteSelectionRequest( lmId, dbIndex );
-            }
-        else if ( LandmarksToShow().Count() )
-            {
-            LOG("HandleSelectFromMapL taking first not linked");
-            // take first not linked landmark
-            CompleteSelectionRequest( 0 );
-            }
-        else
-            {
-            LOG("HandleSelectFromMapL restricted, but no landmarks");
-            // this shall never happen, because base implementation
-            // will check that landmarks are given if selection is restricted
-            User::Leave( KErrArgument );
-            }
-        }
-    else
-        {
-        // return random landmark
-        LOG("HandleSelectFromMapL returning random");
-        CPosLandmark* lm = CPosLandmark::NewLC();
-        
-        _LIT( KSelected, "RandomLandmark" );
-        lm->SetLandmarkNameL( KSelected );
-        
-        // north pole
-        lm->SetPositionL( TLocality( TCoordinate( -90, 0 ), 0 ) );
-        
-        CompleteSelectionRequestL( *lm );
-        CleanupStack::PopAndDestroy( lm );
-        }
-    LOG("DoSelectionL out");
-    }
-    
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-void CTestProviderMapViewService::DumpDataL()
-    {
-    LOG("DumpDataL in");
-    if ( GetTestCommand() == EServerActionDisableDump )
-        {
-        LOG("DumpDataL disabled, out");
-        return;
-        }
-
-    CTestProviderDump* dump = CTestProviderDump::NewLC();
-    
-    CTestProviderAppServer* server = ( CTestProviderAppServer* ) Server();
-    CTestProviderAppUi* ui = server->AppUi();
-    dump->AddRunModeL( ui->IsChainedMode() );
-
-    TCoordinate center;
-    GetAreaCentralPoint( center );
-    dump->AddMapViewOptionsL( Options(), CurrentLocationOption(), AreaRadius(), center );
-    
-    dump->AddRequestTextL( SelectionRequestText() );
-    
-    // free landmarks
-    TArray<const CPosLandmark*> landmarks = LandmarksToShow();
-    for ( TInt i = 0; i < landmarks.Count(); i++ )
-        {
-        dump->AddLandmarkL( *(landmarks[i]) );
-        }
-    
-    // linked landmarks
-    TArray<const HBufC*> lmdbs = LandmarksToShowDatabases();
-    for ( TInt i = 0; i < lmdbs.Count(); i++ )
-        {
-        dump->AddLandmarkListL( *( lmdbs[i] ), LinkedLandmarksToShow( i ) );
-        }
-
-    dump->CommitL();
-    CleanupStack::PopAndDestroy( dump );
-    LOG("DumpDataL out");
-    }
-
-// ---------------------------------------------------------------------------
-// From class CMnMapViewServiceBase
-// ---------------------------------------------------------------------------
-//
-void CTestProviderMapViewService::HandleShowMapL()
-    {
-    LOG("HandleShowMapL in");
-    LeaveIfInstructedL();
-    DumpDataL();
-    
-    CTestProviderAppServer* server = ( CTestProviderAppServer* ) Server();
-    CTestProviderAppUi* ui = server->AppUi();
-    ui->ShowMapViewL();
-
-    LOG("HandleShowMapL out");
-    }
-        
-// ---------------------------------------------------------------------------
-// From class CMnMapViewServiceBase
-//
-//  Implementation differs from HandleShowMapL in a way that central point
-//  setting is ignored and current location is used instead as central point.
-// ---------------------------------------------------------------------------
-//
-void CTestProviderMapViewService::HandleShowCurrentLocationL()
-    {
-    LOG("HandleShowCurrentLocationL in");
-    LeaveIfInstructedL();
-    DumpDataL();
-    LOG("HandleShowCurrentLocationL out");
-    }
-
-// ---------------------------------------------------------------------------
-// From class CMnMapViewServiceBase
-// ---------------------------------------------------------------------------
-//
-void CTestProviderMapViewService::HandleSelectFromMapL()
-    {
-    LOG("HandleSelectFromMapL in");
-    LeaveIfInstructedL();
-    LeaveIfBusyL();
-
-    DumpDataL();
-
-    StartProcessingL();
-    LOG("HandleSelectFromMapL out");
-    }
-
-// ---------------------------------------------------------------------------
-// From class CMnServiceBase
-// ---------------------------------------------------------------------------
-//
-void CTestProviderMapViewService::DoCancel()
-    {
-    iProcessor->Cancel();
-    }
--- a/locsrv_plat/map_image_api/tsrc/testprovider/src/testprovidernavigationservice.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,116 +0,0 @@
-/*
-* Copyright (c) 2005-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:  ÑTestProviderNavigationServiceBase class implementation
-*
-*/
-
-
-#include <e32base.h>
-#include <eikenv.h>
-
-#include <lbsposition.h>
-
-#include <epos_cposlandmark.h>
-
-#include "debug.h"
-#include <mnnavigationservicebase.h>
-
-#include "testproviderappui.h"
-#include "testprovidernaviview.h"
-#include "testproviderappserver.h"
-#include "testproviderdump.h"
-
-#include "testprovidernavigationservice.h"
-
-extern CTestProviderAppUi* AppUi();
-
-// ======== LOCAL FUNCTIONS ========
-
-// ======== MEMBER FUNCTIONS ========
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-CTestProviderNavigationService* CTestProviderNavigationService::NewL()
-    {
-    CTestProviderNavigationService* self = new (ELeave) CTestProviderNavigationService();
-    CleanupStack::PushL( self );
-    self->ConstructL();
-    CleanupStack::Pop( self );
-    return self;
-    }
-    
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-CTestProviderNavigationService::CTestProviderNavigationService()
-    {
-    }
-    
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-CTestProviderNavigationService::~CTestProviderNavigationService()
-    {
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-void CTestProviderNavigationService::ConstructL()
-    {
-    BaseConstructL();
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-void CTestProviderNavigationService::HandleTestCommandL( TInt aCommand )
-    {
-    LOG1("CTestProviderNavigationService::HandleTestCommandL in, %d", aCommand );
-    }
-
-// ---------------------------------------------------------------------------
-// From class CMnNavigationServiceBase
-// ---------------------------------------------------------------------------
-//
-void CTestProviderNavigationService::HandleNavigateToL(
-    const CPosLandmark& aLandmark)
-    {
-    LOG("CTestProviderNavigationService::HandleNavigateToL in ");
-
-    CTestProviderAppServer* server = ( CTestProviderAppServer* ) Server();
-    CTestProviderAppUi* ui = server->AppUi();
-
-    CTestProviderDump* dump = CTestProviderDump::NewLC();
-    dump->AddRunModeL( ui->IsChainedMode() );
-    dump->AddLandmarkL( aLandmark );
-    dump->CommitL();
-    CleanupStack::PopAndDestroy( dump );
-    
-    ui->ShowNaviViewL();
-
-    CEikAppUi* parentUi = ui->ContainerAppUi();
-    LOG1("container UI: %d", parentUi );
-
-    LOG("CTestProviderNavigationService::HandleNavigateToL out");
-    }
-        
-// ---------------------------------------------------------------------------
-// From class CMnServiceBase
-// ---------------------------------------------------------------------------
-//
-void CTestProviderNavigationService::DoCancel()
-    {
-    }
--- a/locsrv_plat/map_image_api/tsrc/testprovider/src/testprovidernaviview.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,96 +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: Main View for map and navigation test provider
-*
-*/
-
-
-
-#include <coemain.h>
-#include <aknlists.h>
-#include <barsread.h>
-
-#include "testprovidernaviview.h"
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CTestProviderNaviView* CTestProviderNaviView::NewL( const TRect& aRect )
-    {
-    CTestProviderNaviView* self = CTestProviderNaviView::NewLC( aRect );
-    CleanupStack::Pop( self );
-    return self;
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CTestProviderNaviView* CTestProviderNaviView::NewLC( const TRect& aRect )
-    {
-    CTestProviderNaviView* self = new ( ELeave ) CTestProviderNaviView;
-    CleanupStack::PushL( self );
-    self->ConstructL( aRect );
-    return self;
-    }
-
-// -----------------------------------------------------------------------------
-// CTestProviderNaviView::ConstructL()
-// Symbian 2nd phase constructor can leave.
-// -----------------------------------------------------------------------------
-//
-void CTestProviderNaviView::ConstructL( const TRect& aRect )
-    {
-    // Create a window for this application view
-    CreateWindowL();
-
-    // Set the windows size
-    SetRect( aRect );
-
-    // Activate the window, which makes it ready to be drawn
-    ActivateL();
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CTestProviderNaviView::CTestProviderNaviView()
-    { 
-    }
-
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CTestProviderNaviView::~CTestProviderNaviView()
-    {
-    }
-
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CTestProviderNaviView::Draw( const TRect& /*aRect*/ ) const
-    {
-    // Get the standard graphics context
-    CWindowGc& gc = SystemGc();
-
-    // Gets the control's extent
-    TRect rect = Rect();
-
-    // Clears the screen
-    gc.Clear( rect );
-    }
-
--- a/locsrv_plat/map_image_api/tsrc/testprovider/src/testproviderplugin.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +0,0 @@
-/*
-* Copyright (c) 2004-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: map and navigation test provider plugin
-*
-*/
-
-
-#include <e32base.h>
-#include <ecom.h>
-#include <implementationproxy.h>
-
-#include "debug.h"
-#include "testprovidercoordconverter.h"
-
-// ========================== GLOBAL FUNCTIONS ===============================
-
-// ---------------------------------------------------------------------------
-// Table of implementations
-// ---------------------------------------------------------------------------
-//
-const TImplementationProxy ImplementationTable[] =
-    {
-    // Note! UID below is implementation UID, not DLL UID.
-    IMPLEMENTATION_PROXY_ENTRY( 0x03133036, CTestProviderCoordConverter::NewL ),
-    };
-
-// ---------------------------------------------------------------------------
-// Note this function must be exported at ordinal 1
-// ---------------------------------------------------------------------------
-//
-EXPORT_C const TImplementationProxy* ImplementationGroupProxy(
-    TInt& aTableCount)
-    {
-    aTableCount = 1;
-    return ImplementationTable;
-    }
--- a/locsrv_plat/map_image_conversion_plugin_api/group/bld.inf	Mon May 03 12:54:42 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 
-:                Map Image Conversion Plug-In API
-*
-*/
-
-
-#include <platform_paths.hrh>
-
-PRJ_PLATFORMS
-DEFAULT
-
-PRJ_EXPORTS
-
-../inc/mnpluginuids.hrh     MW_LAYER_PLATFORM_EXPORT_PATH(mnpluginuids.hrh)
-../inc/mncoordinateconverterbase.h     MW_LAYER_PLATFORM_EXPORT_PATH(mncoordinateconverterbase.h)
--- a/locsrv_plat/map_image_conversion_plugin_api/inc/mncoordinateconverterbase.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,102 +0,0 @@
-/*
-* Copyright (c) 2007 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:  CMnCoordinateConverterBase class
-*
-*/
-
-
-#ifndef MN_COORDINATECONVERTERBASE_H
-#define MN_COORDINATECONVERTERBASE_H
-
-#include <mnmapimageparams.h>
-
-/** This is the base service interface to access coordinate conversion 
- *  functionality of MapImage service capable provider applications.
- *
- *  This interface must be implemented by Map and Navigation provider applications,
- *  which support @c KMnAppServiceMapImage service.
- *
- *  @lib mnclientlib.lib
- *  @since 5.0 */
-class CMnCoordinateConverterBase : public CBase
-    {
-    public:
-        static CMnCoordinateConverterBase* NewL( TUid aProviderUid );
-
-        /** Base destructor */
-        IMPORT_C ~CMnCoordinateConverterBase();
-        
-        /** Returns drawing parameters of map image.
-         *  @param aImageParams Parameters of map image. */
-        IMPORT_C const TMnMapImageParams& MapImageParams() const;
-        
-        /** @internal */
-        /*  Sets drawing parameters of map image. Implementation can read
-         *  these by calling MapImageParams().
-         *  @param aImageParams Parameters of map image. */
-        void SetMapImageParams( const TMnMapImageParams& aImageParams );
-
-        /** Calculates coordinate in pixels of the point corresponding to given
-         *  world coordinate. 
-         * 
-         *  Given world coordinate is allowed to be beyond 
-         *  image borders. In that case negative values in result value
-         *  describe point to the left of left border and/or above top border of the
-         *  image and values bigger than width or height describe point to the right
-         *  of right image border or below its bottom border.
-         * 
-         *  If such calculation is not possible (e.e given world coordinate is not 
-         *  part of the image) this function must return @c KErrUnknown.
-         * 
-         *  @param[in] aWorldCoordinate World coordinate (in WGS-84) 
-         *  @param[out] aImagePoint Coordinate of corresponding pixel in image 
-         *                          relative to image top left corner. 
-         *  @return Error code of the operation:
-         *      - @c KErrNone if calculation is successful
-         *      - @c KErrArgument if map image parameters in are invalid.
-         *      - @c KErrUnknown if calculation is not possible */
-        virtual TInt GetImageCoordinate( 
-            const TCoordinate& aWorldCoordinate, 
-            TPoint& aImagePoint ) = 0;
-        
-        /** Calculates world coordinate of the given image point. 
-         * 
-         *  Given image point coordinate must be within the rectangle 
-         *  ( TPoint( 0, 0 ), @ref Size() ).
-         * 
-         *  If such calculation is not possible (e.g. given image coordinate does not 
-         *  match any world coordinate) this function must return @c KErrUnknown.
-         * 
-         *  @param[in] aImagePoint Coordinate of a point on map image in pixels, 
-         *             relative to image top left corner. 
-         *  @param[out] aWorldCoordinate On successful return, corresponding
-         *                               world coordinate (in WGS-84).
-         *  @return Error code of the operation:
-         *      - @c KErrNone if calculation is successful
-         *      - @c KErrArgument if image coordinate is out of bounds
-         *      - @c KErrArgument if map image parameters in are invalid.
-         *      - @c KErrUnknown if calculation is not possible  */
-        virtual TInt GetWorldCoordinate( 
-            const TPoint& aImagePoint, 
-            TCoordinate& aWorldCoordinate ) = 0;
-                    
-    protected:    
-        IMPORT_C CMnCoordinateConverterBase();
-        
-    private:
-        TUid                iDtorIdKey;
-        TMnMapImageParams   iImageParams;
-    };
-
-#endif /*MN_COORDINATECONVERTERBASE_H*/
--- a/locsrv_plat/map_image_conversion_plugin_api/inc/mnpluginuids.hrh	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,31 +0,0 @@
-/*
-* Copyright (c) 2005-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:  Map and Navigation application service UIDs
-*
-*/
-
-#ifndef MNPLUGINUIDS_HRH_
-#define MNPLUGINUIDS_HRH_
-
-/** @file
- *  @brief Map and Navigation FW plugin UIDs
- */
-
-/** Map Image Conversion Plug-In interface.
- *  This value shall be specified as @p uid field of SERVICE_INFO struct
- *  if application implements @ref CMnMapViewServiceBase.
- */
-#define KMnMapImageConverterIf 0x101FDF84
-
-#endif /*MNPLUGINUIDS_HRH_*/
--- a/locsrv_plat/map_image_conversion_plugin_api/map_image_conversion_plugin_api.metaxml	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
-<?xml version="1.0" ?>
-<api id="5b7cfa5635c14177ccac9df68671b400" dataversion="2.0">
-  <name>Map Image Conversion Plug-In API</name>
-  <description>This API defines ECom interface to be implemented by Provider Applications, which support MapImage services. Its functionality allows to convert image coordinates to world coordinates and vice versa.</description>
-  <type>c++</type>
-  <collection>locationmapnavfw</collection>
-  <libs>
-    <lib name="mnclientlib.lib" />
-  </libs>
-  <release category="platform"/>
-  <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>no</htmldocprovided>
-     <adaptation>no</adaptation>
-  </attributes>
-</api>
--- a/locsrv_plat/map_image_conversion_plugin_api/tsrc/bmarm/testmapimgconpluginapiu.def	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-EXPORTS
-	LibEntryL__FR13CTestModuleIf @ 1 NONAME R3UNUSED ; LibEntryL(CTestModuleIf &)
-
--- a/locsrv_plat/map_image_conversion_plugin_api/tsrc/bwins/testmapimgconpluginapiu.def	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-EXPORTS
-	?LibEntryL@@YAPAVCScriptBase@@AAVCTestModuleIf@@@Z @ 1 NONAME ; class CScriptBase * __cdecl LibEntryL(class CTestModuleIf &)
-
--- a/locsrv_plat/map_image_conversion_plugin_api/tsrc/conf/testmapimgconpluginapi.cfg	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-[Test]
-title TCMapImgConPluginApi1
-create testmapimgconpluginapi foobar
-foobar CMnCoordinateConverterBase_MapImageParams
-delete foobar
-[Endtest] 
-
-
-[Test]
-title TCMapImgConPluginApi2
-create testmapimgconpluginapi foobar
-foobar CMnCoordinateConverterBase_GetImageCoordinate
-delete foobar
-[Endtest] 
-
-[Test]
-title TCMapImgConPluginApi3
-create testmapimgconpluginapi foobar
-foobar CMnCoordinateConverterBase_GetWorldCoordinate
-delete foobar
-[Endtest]
\ No newline at end of file
Binary file locsrv_plat/map_image_conversion_plugin_api/tsrc/data/armv5/urel/MnRefProvider.mbm has changed
Binary file locsrv_plat/map_image_conversion_plugin_api/tsrc/data/armv5/urel/MnRefProvider.mif has changed
Binary file locsrv_plat/map_image_conversion_plugin_api/tsrc/data/armv5/urel/MnRefProvider.rsc has changed
Binary file locsrv_plat/map_image_conversion_plugin_api/tsrc/data/armv5/urel/MnRefProviderPlugin.dll has changed
--- a/locsrv_plat/map_image_conversion_plugin_api/tsrc/data/armv5/urel/MnRefProviderPlugin.dll.map	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,160 +0,0 @@
-ARM Linker, RVCT2.2 [Build 593]
-
-================================================================================
-
-Image Symbol Table
-
-    Local Symbols
-
-    Symbol Name                              Value     Ov Type        Size  Object(Section)
-
-    [Anonymous Symbol]                       0x00000000   Number         0  drtaeabi{000a0000}-184.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnrefproviderengine{000a0000}-43.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnclientlib{000a0000}-97.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  scppnwdl{000a0000}-3.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnrefproviderengine{000a0000}-44.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnrefproviderengine{000a0000}-12.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  drtaeabi{000a0000}-158.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  drtaeabi{000a0000}-147.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnrefproviderengine{000a0000}-16.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnclientlib{000a0000}-101.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-208.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnrefproviderengine{000a0000}-21.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-654.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-2123.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnclientlib{000a0000}-100.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-205.o ABSOLUTE
-    M:/epoc32/build/compsupp/c_18558cc638e6e874/drtaeabi_dll/armv5/udeb\VtblExports.s 0x00000000   Number         0  VtblExports.o ABSOLUTE
-    M:\\sf\\os\\kernelhwsrv\\kernel\\eka\\compsupp\\rvct2_2\\ucppinit_aeabi.cpp 0x00000000   Number         0  ucppinit_aeabi.o ABSOLUTE
-    M:\sf\os\kernelhwsrv\kernel\eka\compsupp\rvct2_2\ucppinit_aeabi.cpp 0x00000000   Number         0  ucppinit_aeabi.o ABSOLUTE
-    \EPOC32\BUILD\sf\app\location\group\MNREFENGINE\ARMV5\VtblExports.s 0x00000000   Number         0  VtblExports.o ABSOLUTE
-    \EPOC32\BUILD\sf\app\location\mapnavproviderrefapp\group\MNREFPROVIDERPLUGIN\ARMV5\urel\MnRefProviderPlugin{000a0000}.s 0x00000000   Number         0  MnRefProviderPlugin{000a0000}.exp ABSOLUTE
-    \EPOC32\BUILD\sf\mw\locationsrv\group\MNCLIENTLIB\ARMV5\VtblExports.s 0x00000000   Number         0  VtblExports.o ABSOLUTE
-    \EPOC32\BUILD\sf\os\kernelhwsrv\kernel\eka\euser\EDLL\ARMV6_ABIV1\urel\uc_dll_.cpp 0x00000000   Number         0  uc_dll_.o ABSOLUTE
-    \EPOC32\BUILD\sf\os\kernelhwsrv\kernel\eka\euser\EUSER\ARMV5\VtblExports.s 0x00000000   Number         0  VtblExports.o ABSOLUTE
-    \EPOC32\BUILD\sf\os\lbs\locationmgmt\locationadmin\group\LBSAPIVARIANT2\ARMV5\VtblExports.s 0x00000000   Number         0  VtblExports.o ABSOLUTE
-    \\EPOC32\\BUILD\\sf\\os\\kernelhwsrv\\kernel\\eka\\euser\\EDLL\\ARMV6_ABIV1\\urel\\uc_dll_.cpp 0x00000000   Number         0  uc_dll_.o ABSOLUTE
-    \sf\app\location\mapnavproviderrefapp\src\mnrefproviderplugin.cpp 0x00000000   Number         0  MnRefProviderPlugin.in ABSOLUTE
-    \sf\app\location\mapnavproviderrefapp\src\mnrpcoordconverter.cpp 0x00000000   Number         0  MnRefProviderPlugin.in ABSOLUTE
-    \sf\os\kernelhwsrv\kernel\eka\euser\epoc\arm\uc_dll.cpp 0x00000000   Number         0  uc_dll.o ABSOLUTE
-    .emb_text                                0x00008000   Section       40  uc_dll_.o(.emb_text)
-    .emb_text                                0x00008028   Section       72  ucppinit_aeabi.o(.emb_text)
-    skip                                     0x0000803c   ARM Code       0  ucppinit_aeabi.o(.emb_text)
-    loop                                     0x0000804c   ARM Code       0  ucppinit_aeabi.o(.emb_text)
-    fpinit                                   0x00008064   Data           0  ucppinit_aeabi.o(.emb_text)
-    base                                     0x00008068   Data           0  ucppinit_aeabi.o(.emb_text)
-    limit                                    0x0000806c   Data           0  ucppinit_aeabi.o(.emb_text)
-    .text                                    0x00008070   Section       12  MnRefProviderPlugin.in(.text)
-    .text                                    0x0000807c   Section      232  MnRefProviderPlugin.in(.text)
-    .text                                    0x00008164   Section       40  uc_dll.o(.text)
-    .text.clean                              0x0000818c   Section       10  MnRefProviderPlugin.in(.text.clean)
-    ExportTable                              0x00008198   Section       12  MnRefProviderPlugin{000a0000}.exp(ExportTable)
-    StubCode                                 0x000081a4   Section        8  euser{000a0000}-205.o(StubCode)
-    theImportedSymbol                        0x000081a8   Data           0  euser{000a0000}-205.o(StubCode)
-    StubCode                                 0x000081ac   Section        8  euser{000a0000}-208.o(StubCode)
-    theImportedSymbol                        0x000081b0   Data           0  euser{000a0000}-208.o(StubCode)
-    StubCode                                 0x000081b4   Section        8  euser{000a0000}-2123.o(StubCode)
-    theImportedSymbol                        0x000081b8   Data           0  euser{000a0000}-2123.o(StubCode)
-    StubCode                                 0x000081bc   Section        8  euser{000a0000}-654.o(StubCode)
-    theImportedSymbol                        0x000081c0   Data           0  euser{000a0000}-654.o(StubCode)
-    StubCode                                 0x000081c4   Section        8  mnclientlib{000a0000}-100.o(StubCode)
-    theImportedSymbol                        0x000081c8   Data           0  mnclientlib{000a0000}-100.o(StubCode)
-    StubCode                                 0x000081cc   Section        8  mnclientlib{000a0000}-101.o(StubCode)
-    theImportedSymbol                        0x000081d0   Data           0  mnclientlib{000a0000}-101.o(StubCode)
-    StubCode                                 0x000081d4   Section        8  mnclientlib{000a0000}-97.o(StubCode)
-    theImportedSymbol                        0x000081d8   Data           0  mnclientlib{000a0000}-97.o(StubCode)
-    StubCode                                 0x000081dc   Section        8  mnrefproviderengine{000a0000}-12.o(StubCode)
-    theImportedSymbol                        0x000081e0   Data           0  mnrefproviderengine{000a0000}-12.o(StubCode)
-    StubCode                                 0x000081e4   Section        8  mnrefproviderengine{000a0000}-16.o(StubCode)
-    theImportedSymbol                        0x000081e8   Data           0  mnrefproviderengine{000a0000}-16.o(StubCode)
-    StubCode                                 0x000081ec   Section        8  mnrefproviderengine{000a0000}-21.o(StubCode)
-    theImportedSymbol                        0x000081f0   Data           0  mnrefproviderengine{000a0000}-21.o(StubCode)
-    StubCode                                 0x000081f4   Section        8  mnrefproviderengine{000a0000}-43.o(StubCode)
-    theImportedSymbol                        0x000081f8   Data           0  mnrefproviderengine{000a0000}-43.o(StubCode)
-    StubCode                                 0x000081fc   Section        8  mnrefproviderengine{000a0000}-44.o(StubCode)
-    theImportedSymbol                        0x00008200   Data           0  mnrefproviderengine{000a0000}-44.o(StubCode)
-    StubCode                                 0x00008204   Section        8  drtaeabi{000a0000}-147.o(StubCode)
-    theImportedSymbol                        0x00008208   Data           0  drtaeabi{000a0000}-147.o(StubCode)
-    StubCode                                 0x0000820c   Section        8  drtaeabi{000a0000}-158.o(StubCode)
-    theImportedSymbol                        0x00008210   Data           0  drtaeabi{000a0000}-158.o(StubCode)
-    StubCode                                 0x00008214   Section        8  drtaeabi{000a0000}-184.o(StubCode)
-    theImportedSymbol                        0x00008218   Data           0  drtaeabi{000a0000}-184.o(StubCode)
-    StubCode                                 0x0000821c   Section        8  scppnwdl{000a0000}-3.o(StubCode)
-    theImportedSymbol                        0x00008220   Data           0  scppnwdl{000a0000}-3.o(StubCode)
-    .extab._ZN19CMnrpCoordConverterD1Ev      0x00008224   Data           0  MnRefProviderPlugin.in(.ARM.extab)
-    .constdata$1                             0x00008234   Data           0  MnRefProviderPlugin.in(.constdata)
-    ImplementationTable                      0x00008234   Data           8  MnRefProviderPlugin.in(.constdata)
-    .constdata                               0x00008234   Section        8  MnRefProviderPlugin.in(.constdata)
-    .constdata__ZTI19CMnrpCoordConverter     0x0000823c   Section       12  MnRefProviderPlugin.in(.constdata__ZTI19CMnrpCoordConverter)
-    .constdata__ZTS19CMnrpCoordConverter     0x00008248   Section       22  MnRefProviderPlugin.in(.constdata__ZTS19CMnrpCoordConverter)
-    .constdata__ZTV19CMnrpCoordConverter     0x00008260   Section       28  MnRefProviderPlugin.in(.constdata__ZTV19CMnrpCoordConverter)
-    .ARM.exidx                               0x0000827c   Section        8  ucppinit_aeabi.o(.ARM.exidx)
-
-    Global Symbols
-
-    Symbol Name                              Value     Ov Type        Size  Object(Section)
-
-    BuildAttributes$$THUMB_ISAv3$ARM_ISAv6$M$E$P$PE$A:L22$X:L11$S22$IEEE1$IW$USESV6$~STKCKD$USESV7$~SHL$OSPACE$IEEEJ$EBA8$UX$REQ8$PRES8$EABIv2 0x00000000   Number         0  anon$$obj.o ABSOLUTE
-    #<DLL>drtaeabi{000a0000}.dll#<\DLL>93     - Undefined Reference
-    #<DLL>drtaeabi{000a0000}.dll#<\DLL>9e     - Undefined Reference
-    #<DLL>drtaeabi{000a0000}.dll#<\DLL>b8     - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>28e  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>84b  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>cd  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>d0  - Undefined Reference
-    #<DLL>mnclientlib{000a0000}[10206902].dll#<\DLL>61  - Undefined Reference
-    #<DLL>mnclientlib{000a0000}[10206902].dll#<\DLL>64  - Undefined Reference
-    #<DLL>mnclientlib{000a0000}[10206902].dll#<\DLL>65  - Undefined Reference
-    #<DLL>mnrefproviderengine{000a0000}[03132015].dll#<\DLL>10  - Undefined Reference
-    #<DLL>mnrefproviderengine{000a0000}[03132015].dll#<\DLL>15  - Undefined Reference
-    #<DLL>mnrefproviderengine{000a0000}[03132015].dll#<\DLL>2b  - Undefined Reference
-    #<DLL>mnrefproviderengine{000a0000}[03132015].dll#<\DLL>2c  - Undefined Reference
-    #<DLL>mnrefproviderengine{000a0000}[03132015].dll#<\DLL>c  - Undefined Reference
-    #<DLL>scppnwdl{000a0000}.dll#<\DLL>3      - Undefined Reference
-    SHT$$INIT_ARRAY$$Base                     - Undefined Weak Reference
-    SHT$$INIT_ARRAY$$Limit                    - Undefined Weak Reference
-    typeinfo for CMnCoordinateConverterBase   - Undefined Reference
-    vtable for __cxxabiv1::__si_class_type_info  - Undefined Reference
-    _fp_init                                  - Undefined Weak Reference
-    run_static_dtors                          - Undefined Weak Reference
-    Image$$ER_RO$$Base                       0x00008000   Number         0  anon$$obj.o(linker$$defined$$symbols)
-    _E32Dll                                  0x00008000   ARM Code      40  uc_dll_.o(.emb_text)
-    Symbian$$CPP$$Exception$$Descriptor      0x00008014   Data           0  uc_dll_.o(.emb_text)
-    __cpp_initialize__aeabi_                 0x00008028   ARM Code      72  ucppinit_aeabi.o(.emb_text)
-    ImplementationGroupProxy(int&)           0x00008071   Thumb Code     8  MnRefProviderPlugin.in(.text)
-    std::nothrow                             0x00008071   Thumb Code     0  ucppinit_aeabi.o(.emb_text)
-    CMnrpCoordConverter::CMnrpCoordConverter() 0x0000807d   Thumb Code    12  MnRefProviderPlugin.in(.text)
-    CMnrpCoordConverter::CMnrpCoordConverter__sub_object() 0x0000807d   Thumb Code     0  MnRefProviderPlugin.in(.text)
-    CMnrpCoordConverter::NewL()              0x00008089   Thumb Code    38  MnRefProviderPlugin.in(.text)
-    CMnrpCoordConverter::~CMnrpCoordConverter() 0x000080af   Thumb Code    40  MnRefProviderPlugin.in(.text)
-    CMnrpCoordConverter::~CMnrpCoordConverter__sub_object() 0x000080af   Thumb Code     0  MnRefProviderPlugin.in(.text)
-    CMnrpCoordConverter::~CMnrpCoordConverter__deallocating() 0x000080d7   Thumb Code    16  MnRefProviderPlugin.in(.text)
-    CMnrpCoordConverter::GetImageCoordinate(const TCoordinate&, TPoint&) 0x000080e7   Thumb Code    62  MnRefProviderPlugin.in(.text)
-    CMnrpCoordConverter::GetWorldCoordinate(const TPoint&, TCoordinate&) 0x00008125   Thumb Code    60  MnRefProviderPlugin.in(.text)
-    _E32Dll_Body                             0x00008165   Thumb Code    34  uc_dll.o(.text)
-    __DLL_Export_Table__                     0x00008198   ARM Code       0  MnRefProviderPlugin{000a0000}.exp(ExportTable)
-    DLL##ExportTableSize                     0x0000819c   Data           0  MnRefProviderPlugin{000a0000}.exp(ExportTable)
-    DLL##ExportTable                         0x000081a0   Data           0  MnRefProviderPlugin{000a0000}.exp(ExportTable)
-    CleanupStack::Pop()                      0x000081a4   ARM Code       0  euser{000a0000}-205.o(StubCode)
-    CleanupStack::PushL(CBase*)              0x000081ac   ARM Code       0  euser{000a0000}-208.o(StubCode)
-    CBase::Extension_(unsigned, void*&, void*) 0x000081b4   ARM Code       0  euser{000a0000}-2123.o(StubCode)
-    User::AllocZL(int)                       0x000081bc   ARM Code       0  euser{000a0000}-654.o(StubCode)
-    CMnCoordinateConverterBase::~CMnCoordinateConverterBase__sub_object() 0x000081c4   ARM Code       0  mnclientlib{000a0000}-100.o(StubCode)
-    CMnCoordinateConverterBase::MapImageParams() const 0x000081cc   ARM Code       0  mnclientlib{000a0000}-101.o(StubCode)
-    CMnCoordinateConverterBase::CMnCoordinateConverterBase__sub_object() 0x000081d4   ARM Code       0  mnclientlib{000a0000}-97.o(StubCode)
-    CMnrpEngine::NewL()                      0x000081dc   ARM Code       0  mnrefproviderengine{000a0000}-12.o(StubCode)
-    CMnrpMapModel::UpdateModel(const TMnMapImageParams&) 0x000081e4   ARM Code       0  mnrefproviderengine{000a0000}-16.o(StubCode)
-    CMnrpMapModel::NewL(CMnrpEngine&)        0x000081ec   ARM Code       0  mnrefproviderengine{000a0000}-21.o(StubCode)
-    CMnrpMapModel::AbsoluteToScreen(TCoordinate) const 0x000081f4   ARM Code       0  mnrefproviderengine{000a0000}-43.o(StubCode)
-    CMnrpMapModel::ScreenToAbsolute(TPoint) const 0x000081fc   ARM Code       0  mnrefproviderengine{000a0000}-44.o(StubCode)
-    __aeabi_memcpy4                          0x00008204   ARM Code       0  drtaeabi{000a0000}-147.o(StubCode)
-    __aeabi_unwind_cpp_pr0                   0x0000820c   ARM Code       0  drtaeabi{000a0000}-158.o(StubCode)
-    __cxa_end_cleanup                        0x00008214   ARM Code       0  drtaeabi{000a0000}-184.o(StubCode)
-    operator delete (void*)                  0x0000821c   ARM Code       0  scppnwdl{000a0000}-3.o(StubCode)
-    typeinfo for CMnrpCoordConverter         0x0000823c   Data          12  MnRefProviderPlugin.in(.constdata__ZTI19CMnrpCoordConverter)
-    typeinfo name for CMnrpCoordConverter    0x00008248   Data          22  MnRefProviderPlugin.in(.constdata__ZTS19CMnrpCoordConverter)
-    vtable for CMnrpCoordConverter           0x00008260   Data          28  MnRefProviderPlugin.in(.constdata__ZTV19CMnrpCoordConverter)
-    .ARM.exidx$$Base                         0x0000827c   Number         0  ucppinit_aeabi.o(.ARM.exidx)
-    .ARM.exidx$$Limit                        0x000082b4   Number         0  uc_dll.o(.ARM.exidx)
-    Image$$ER_RO$$Limit                      0x000082b4   Number         0  anon$$obj.o(linker$$defined$$symbols)
-
Binary file locsrv_plat/map_image_conversion_plugin_api/tsrc/data/armv5/urel/MnRefProvider_reg.rsc has changed
Binary file locsrv_plat/map_image_conversion_plugin_api/tsrc/data/armv5/urel/mnrefprovider.exe has changed
--- a/locsrv_plat/map_image_conversion_plugin_api/tsrc/data/armv5/urel/mnrefprovider.exe.map	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,2589 +0,0 @@
-ARM Linker, RVCT2.2 [Build 593]
-
-================================================================================
-
-Image Symbol Table
-
-    Local Symbols
-
-    Symbol Name                              Value     Ov Type        Size  Object(Section)
-
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-374.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-73.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-29.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-375.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-74.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-291.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-377.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-75.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-293.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-3826.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-76.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-294.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-3831.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-77.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-295.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-3832.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-78.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-296.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-3857.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-79.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-297.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-3860.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcoctl{000a0000}-1376.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-298.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-3861.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcoctl{000a0000}-140.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-299.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-3868.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcoctl{000a0000}-1430.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-30.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-3947.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcoctl{000a0000}-35.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-302.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-3948.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcoctl{000a0000}-46.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-31.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-3949.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcoctl{000a0000}-605.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-315.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-3983.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcoctl{000a0000}-606.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-317.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-4014.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcoctl{000a0000}-660.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-319.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-4030.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcoctl{000a0000}-875.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-352.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  AknIcon{000a0000}-13.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcoctl{000a0000}-880.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-37.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  egul{000a0000}-94.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcoctl{000a0000}-881.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-390.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  egul{000a0000}-95.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikctl{000a0000}-455.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-392.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  gdi{000a0000}-310.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-1132.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-394.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  gdi{000a0000}-311.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-129.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-467.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  gdi{000a0000}-312.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-130.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-472.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  fbscli{000a0000}-26.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-131.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-473.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  fbscli{000a0000}-31.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-1341.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-479.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eposlandmarks{000a0000}-12.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-198.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-490.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eposlandmarks{000a0000}-15.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-199.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-506.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eposlandmarks{000a0000}-4.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-1996.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-523.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eposlandmarks{000a0000}-50.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-201.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-532.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eposlandmarks{000a0000}-65.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-206.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-533.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eposlandmarks{000a0000}-67.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-211.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-534.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eposlandmarks{000a0000}-75.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-213.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-535.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  lbs{000a0000}-152.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-214.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-536.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  lbs{000a0000}-180.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-215.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-537.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  lbs{000a0000}-181.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-216.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-565.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  lbs{000a0000}-205.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-2163.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-61.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  lbs{000a0000}-207.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-217.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-62.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  lbs{000a0000}-21.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-2178.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-63.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  lbs{000a0000}-214.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-220.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-64.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  lbs{000a0000}-223.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-2591.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-67.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  lbs{000a0000}-225.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-2624.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-72.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  lbs{000a0000}-226.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-2632.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnrefproviderengine{000a0000}-39.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  lbs{000a0000}-23.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-2895.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnrefproviderengine{000a0000}-40.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  lbs{000a0000}-28.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-2898.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnrefproviderengine{000a0000}-41.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  lbs{000a0000}-304.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-2899.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnrefproviderengine{000a0000}-42.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  lbs{000a0000}-306.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-2900.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnrefproviderengine{000a0000}-43.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnservicelib{000a0000}-1.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-2901.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnrefproviderengine{000a0000}-44.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnservicelib{000a0000}-10.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-2902.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnrefproviderengine{000a0000}-45.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnservicelib{000a0000}-11.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-2903.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnrefproviderengine{000a0000}-46.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnservicelib{000a0000}-12.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-2904.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnrefproviderengine{000a0000}-47.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnservicelib{000a0000}-13.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-2905.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnrefproviderengine{000a0000}-48.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnservicelib{000a0000}-14.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-2906.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnrefproviderengine{000a0000}-50.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnservicelib{000a0000}-15.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-2907.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnrefproviderengine{000a0000}-51.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnservicelib{000a0000}-16.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-2909.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnrefproviderengine{000a0000}-53.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnservicelib{000a0000}-17.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-2910.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnrefproviderengine{000a0000}-54.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnservicelib{000a0000}-2.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-2912.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  dfpaeabi{000a0000}-12.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnservicelib{000a0000}-20.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-2913.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  dfpaeabi{000a0000}-20.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnservicelib{000a0000}-28.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-2914.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  dfpaeabi{000a0000}-23.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnservicelib{000a0000}-29.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-2917.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  dfpaeabi{000a0000}-24.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnservicelib{000a0000}-30.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-2919.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  dfpaeabi{000a0000}-41.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnservicelib{000a0000}-33.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-2920.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  dfpaeabi{000a0000}-8.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnservicelib{000a0000}-4.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-2922.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  drtaeabi{000a0000}-147.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnservicelib{000a0000}-5.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-2928.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  drtaeabi{000a0000}-158.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnservicelib{000a0000}-7.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-2929.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  drtaeabi{000a0000}-159.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnrefproviderengine{000a0000}-12.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-2930.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  drtaeabi{000a0000}-180.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnrefproviderengine{000a0000}-17.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-2932.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  drtaeabi{000a0000}-182.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnrefproviderengine{000a0000}-19.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-2934.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  drtaeabi{000a0000}-183.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnrefproviderengine{000a0000}-20.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-2936.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  drtaeabi{000a0000}-184.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnrefproviderengine{000a0000}-22.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-2993.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  drtaeabi{000a0000}-189.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnrefproviderengine{000a0000}-23.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-2997.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  scppnwdl{000a0000}-3.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnrefproviderengine{000a0000}-24.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-3417.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-1360.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnrefproviderengine{000a0000}-25.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-3420.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-641.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnrefproviderengine{000a0000}-26.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-1025.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-159.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnrefproviderengine{000a0000}-27.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-1096.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-169.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnrefproviderengine{000a0000}-28.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-1116.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-171.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnrefproviderengine{000a0000}-29.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-1119.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-175.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnrefproviderengine{000a0000}-30.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-1172.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-18.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnrefproviderengine{000a0000}-31.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-1288.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-20.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnrefproviderengine{000a0000}-32.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-1507.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-25.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnrefproviderengine{000a0000}-33.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-1510.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-26.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnrefproviderengine{000a0000}-34.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-1553.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  drtaeabi{000a0000}-204.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnrefproviderengine{000a0000}-38.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-1590.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-28.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-829.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-1593.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-197.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-830.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-1648.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-199.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-838.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-1817.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-203.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-839.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-1995.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-21.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-841.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-1997.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-210.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-842.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-1999.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-211.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-973.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-203.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-212.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  apparc{000a0000}-121.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-204.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-220.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  apparc{000a0000}-132.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-205.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-25.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  apparc{000a0000}-171.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-2060.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-257.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  apparc{000a0000}-191.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-2061.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-26.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  apparc{000a0000}-192.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-207.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-263.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  apparc{000a0000}-194.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-208.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-265.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  apparc{000a0000}-202.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-2082.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-266.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  apparc{000a0000}-222.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-2120.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-270.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  apparc{000a0000}-232.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-2123.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-271.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  apparc{000a0000}-253.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-2125.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-272.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  apparc{000a0000}-273.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-2131.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-275.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  apparc{000a0000}-274.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-245.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-276.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  apparc{000a0000}-275.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-250.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-287.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  apparc{000a0000}-279.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-254.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-288.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  apparc{000a0000}-280.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-257.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-29.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  apparc{000a0000}-284.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-46.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-30.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  apparc{000a0000}-285.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-464.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-351.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  apparc{000a0000}-286.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-470.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-353.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  apparc{000a0000}-287.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-471.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-355.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  apparc{000a0000}-30.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-472.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-36.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  bafl{000a0000}-43.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-476.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-39.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  bafl{000a0000}-98.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-48.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-396.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-100.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-481.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-397.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-101.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-55.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-3421.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-11.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-551.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-3422.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-12.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-593.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-3423.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-127.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-613.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-3424.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-128.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-649.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-367.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-13.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-652.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-368.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-15.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-654.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-369.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-18.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-669.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-370.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-182.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-81.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-372.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-19.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-824.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-373.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-196.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-638.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-50.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-147.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-639.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-502.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-152.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-64.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-51.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-155.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-664.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-514.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-158.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-67.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-56.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-9.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-670.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-57.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-141.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-671.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-580.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-142.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-676.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-581.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-143.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-677.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-582.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-144.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-482.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-583.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-41.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-61.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-584.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-42.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-62.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-27.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-444.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-585.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-477.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-48.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-40.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-478.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-479.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-650.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-474.o ABSOLUTE
-    M:/epoc32/build/apputils/c_da81efa927799d7f/bafl_dll/armv5/udeb\VtblExports.s 0x00000000   Number         0  VtblExports.o ABSOLUTE
-    M:/epoc32/build/compsupp/c_18558cc638e6e874/drtaeabi_dll/armv5/udeb\VtblExports.s 0x00000000   Number         0  VtblExports.o ABSOLUTE
-    M:/epoc32/build/cone/c_17e36feeaf3b2ee8/cone_dll/armv5/udeb\VtblExports.s 0x00000000   Number         0  VtblExports.o ABSOLUTE
-    M:/epoc32/build/fontandbitmapserver/c_7ea974cb4182c047/fbscli_dll/armv5/udeb\VtblExports.s 0x00000000   Number         0  VtblExports.o ABSOLUTE
-    M:/epoc32/build/gdi/c_5dab287815cadb7b/gdi_dll/armv5/udeb\VtblExports.s 0x00000000   Number         0  VtblExports.o ABSOLUTE
-    M:/epoc32/build/imagingfws/c_c0b0915f285c9e63/imageconversion_dll/armv5/udeb\VtblExports.s 0x00000000   Number         0  VtblExports.o ABSOLUTE
-    M:/epoc32/build/store/c_93a13d203e6d3ba7/estor_dll/armv5/udeb\VtblExports.s 0x00000000   Number         0  VtblExports.o ABSOLUTE
-    M:/epoc32/build/uigraphicsutils/c_d265b80414e63acf/egul_dll/armv5/udeb\VtblExports.s 0x00000000   Number         0  VtblExports.o ABSOLUTE
-    M:/epoc32/build/uikon/c_9cf7bef4a7562444/eikcore_dll/armv5/udeb\VtblExports.s 0x00000000   Number         0  VtblExports.o ABSOLUTE
-    M:\\sf\\os\\kernelhwsrv\\kernel\\eka\\compsupp\\rvct2_2\\ucppinit_aeabi.cpp 0x00000000   Number         0  ucppinit_aeabi.o ABSOLUTE
-    M:\sf\os\kernelhwsrv\kernel\eka\compsupp\rvct2_2\dllexp.cpp 0x00000000   Number         0  dllexp.o ABSOLUTE
-    M:\sf\os\kernelhwsrv\kernel\eka\compsupp\rvct2_2\ucppinit_aeabi.cpp 0x00000000   Number         0  ucppinit_aeabi.o ABSOLUTE
-    M:\sf\os\kernelhwsrv\kernel\eka\compsupp\symaehabi\callfirstprocessfn.cpp 0x00000000   Number         0  callfirstprocessfn.o ABSOLUTE
-    \EPOC32\BUILD\sf\app\location\group\MNREFENGINE\ARMV5\VtblExports.s 0x00000000   Number         0  VtblExports.o ABSOLUTE
-    \EPOC32\BUILD\sf\mw\appsupport\appfw\apparchitecture\group\APPARC\ARMV5\VtblExports.s 0x00000000   Number         0  VtblExports.o ABSOLUTE
-    \EPOC32\BUILD\sf\mw\classicui\group\AVKON\ARMV5\VtblExports.s 0x00000000   Number         0  VtblExports.o ABSOLUTE
-    \EPOC32\BUILD\sf\mw\classicui\group\EIKCOCTL\ARMV5\VtblExports.s 0x00000000   Number         0  VtblExports.o ABSOLUTE
-    \EPOC32\BUILD\sf\mw\classicui\group\EIKCTL\ARMV5\VtblExports.s 0x00000000   Number         0  VtblExports.o ABSOLUTE
-    \EPOC32\BUILD\sf\mw\classicui\group\EIKDLG\ARMV5\VtblExports.s 0x00000000   Number         0  VtblExports.o ABSOLUTE
-    \EPOC32\BUILD\sf\mw\locationsrv\group\EPOS_LANDMARKSCLIENTLIBRARY\ARMV5\VtblExports.s 0x00000000   Number         0  VtblExports.o ABSOLUTE
-    \EPOC32\BUILD\sf\mw\locationsrv\group\EPOS_LANDMARKSSEARCHCLIENTLIBRARY\ARMV5\VtblExports.s 0x00000000   Number         0  VtblExports.o ABSOLUTE
-    \EPOC32\BUILD\sf\mw\locationsrv\group\MNSERVICELIB\ARMV5\VtblExports.s 0x00000000   Number         0  VtblExports.o ABSOLUTE
-    \EPOC32\BUILD\sf\mw\uiresources\group\AKNICON\ARMV5\VtblExports.s 0x00000000   Number         0  VtblExports.o ABSOLUTE
-    \EPOC32\BUILD\sf\mw\uiresources\group\AKNSKINS\ARMV5\VtblExports.s 0x00000000   Number         0  VtblExports.o ABSOLUTE
-    \EPOC32\BUILD\sf\os\graphics\windowing\windowserver\group\WS32LIB\ARMV5\VtblExports.s 0x00000000   Number         0  VtblExports.o ABSOLUTE
-    \EPOC32\BUILD\sf\os\kernelhwsrv\kernel\eka\euser\EEXE\ARMV6_ABIV1\urel\uc_exe_.cpp 0x00000000   Number         0  uc_exe_.o ABSOLUTE
-    \EPOC32\BUILD\sf\os\kernelhwsrv\kernel\eka\euser\EUSER\ARMV5\VtblExports.s 0x00000000   Number         0  VtblExports.o ABSOLUTE
-    \EPOC32\BUILD\sf\os\kernelhwsrv\userlibandfileserver\fileserver\group\EFSRV\ARMV5\VtblExports.s 0x00000000   Number         0  VtblExports.o ABSOLUTE
-    \EPOC32\BUILD\sf\os\lbs\locationmgmt\locationadmin\group\LBSAPIVARIANT2\ARMV5\VtblExports.s 0x00000000   Number         0  VtblExports.o ABSOLUTE
-    \\EPOC32\\BUILD\\sf\\os\\kernelhwsrv\\kernel\\eka\\euser\\EEXE\\ARMV6_ABIV1\\urel\\uc_exe_.cpp 0x00000000   Number         0  uc_exe_.o ABSOLUTE
-    \sf\app\location\mapnavproviderrefapp\src\mnrefprovider.cpp 0x00000000   Number         0  mnrefprovider.in ABSOLUTE
-    \sf\app\location\mapnavproviderrefapp\src\mnrpappcontrol.cpp 0x00000000   Number         0  mnrefprovider.in ABSOLUTE
-    \sf\app\location\mapnavproviderrefapp\src\mnrpapplication.cpp 0x00000000   Number         0  mnrefprovider.in ABSOLUTE
-    \sf\app\location\mapnavproviderrefapp\src\mnrpappserver.cpp 0x00000000   Number         0  mnrefprovider.in ABSOLUTE
-    \sf\app\location\mapnavproviderrefapp\src\mnrpappui.cpp 0x00000000   Number         0  mnrefprovider.in ABSOLUTE
-    \sf\app\location\mapnavproviderrefapp\src\mnrpappview.cpp 0x00000000   Number         0  mnrefprovider.in ABSOLUTE
-    \sf\app\location\mapnavproviderrefapp\src\mnrpdocument.cpp 0x00000000   Number         0  mnrefprovider.in ABSOLUTE
-    \sf\app\location\mapnavproviderrefapp\src\mnrpmapcontrol.cpp 0x00000000   Number         0  mnrefprovider.in ABSOLUTE
-    \sf\app\location\mapnavproviderrefapp\src\mnrpmapview.cpp 0x00000000   Number         0  mnrefprovider.in ABSOLUTE
-    \sf\app\location\mapnavproviderrefapp\src\mnrpmapviewservice.cpp 0x00000000   Number         0  mnrefprovider.in ABSOLUTE
-    \sf\app\location\mapnavproviderrefapp\src\mnrpnavicontrol.cpp 0x00000000   Number         0  mnrefprovider.in ABSOLUTE
-    \sf\app\location\mapnavproviderrefapp\src\mnrpnavigationservice.cpp 0x00000000   Number         0  mnrefprovider.in ABSOLUTE
-    \sf\app\location\mapnavproviderrefapp\src\mnrpnavimodel.cpp 0x00000000   Number         0  mnrefprovider.in ABSOLUTE
-    \sf\app\location\mapnavproviderrefapp\src\mnrpnaviview.cpp 0x00000000   Number         0  mnrefprovider.in ABSOLUTE
-    \sf\os\kernelhwsrv\kernel\eka\euser\epoc\arm\uc_exe.cpp 0x00000000   Number         0  uc_exe.o ABSOLUTE
-    .emb_text                                0x00008000   Section      112  uc_exe_.o(.emb_text)
-    .emb_text                                0x00008070   Section       72  ucppinit_aeabi.o(.emb_text)
-    skip                                     0x00008084   ARM Code       0  ucppinit_aeabi.o(.emb_text)
-    loop                                     0x00008094   ARM Code       0  ucppinit_aeabi.o(.emb_text)
-    fpinit                                   0x000080ac   Data           0  ucppinit_aeabi.o(.emb_text)
-    base                                     0x000080b0   Data           0  ucppinit_aeabi.o(.emb_text)
-    limit                                    0x000080b4   Data           0  ucppinit_aeabi.o(.emb_text)
-    .text                                    0x000080c0   Section       16  uc_exe_.o(.text)
-    NewApplication()                         0x000080d1   Thumb Code    30  mnrefprovider.in(.text)
-    .text                                    0x000080d0   Section       60  mnrefprovider.in(.text)
-    .text                                    0x0000810c   Section       44  mnrefprovider.in(.text)
-    .text                                    0x00008138   Section     1688  mnrefprovider.in(.text)
-    .text                                    0x000087d0   Section      140  mnrefprovider.in(.text)
-    .text                                    0x0000885c   Section      128  mnrefprovider.in(.text)
-    .text                                    0x000088dc   Section      244  mnrefprovider.in(.text)
-    .text                                    0x000089d0   Section      196  mnrefprovider.in(.text)
-    .text                                    0x00008a94   Section      612  mnrefprovider.in(.text)
-    .text                                    0x00008cf8   Section     3148  mnrefprovider.in(.text)
-    |L1.1176|                                0x00009190   Data           0  mnrefprovider.in(.text)
-    |L1.1200|                                0x000091a8   Data           0  mnrefprovider.in(.text)
-    __sti___18_mnrpmapcontrol_cpp            0x000098f1   Thumb Code    24  mnrefprovider.in(.text)
-    .text                                    0x00009944   Section      360  mnrefprovider.in(.text)
-    .text                                    0x00009aac   Section     1084  mnrefprovider.in(.text)
-    .text                                    0x00009ee8   Section      580  mnrefprovider.in(.text)
-    .text                                    0x0000a12c   Section      100  mnrefprovider.in(.text)
-    .text                                    0x0000a190   Section      508  mnrefprovider.in(.text)
-    .text                                    0x0000a394   Section       36  uc_exe.o(.text)
-    .text                                    0x0000a3b8   Section      120  callfirstprocessfn.o(.text)
-    .text                                    0x0000a430   Section        4  dllexp.o(.text)
-    .text.clean                              0x0000a434   Section       10  mnrefprovider.in(.text.clean)
-    .text.clean                              0x0000a43e   Section       18  mnrefprovider.in(.text.clean)
-    .text.clean                              0x0000a450   Section       10  mnrefprovider.in(.text.clean)
-    .text.clean                              0x0000a45a   Section       10  mnrefprovider.in(.text.clean)
-    .text.clean                              0x0000a464   Section       14  mnrefprovider.in(.text.clean)
-    .text.clean                              0x0000a472   Section       28  mnrefprovider.in(.text.clean)
-    .text.clean                              0x0000a48e   Section       10  mnrefprovider.in(.text.clean)
-    .text.clean                              0x0000a498   Section       20  mnrefprovider.in(.text.clean)
-    .text.clean                              0x0000a4ac   Section       14  mnrefprovider.in(.text.clean)
-    .text.clean                              0x0000a4ba   Section       22  mnrefprovider.in(.text.clean)
-    .text.clean                              0x0000a4d0   Section        8  callfirstprocessfn.o(.text.clean)
-    StubCode                                 0x0000a4d8   Section        8  euser{000a0000}-1025.o(StubCode)
-    theImportedSymbol                        0x0000a4dc   Data           0  euser{000a0000}-1025.o(StubCode)
-    StubCode                                 0x0000a4e0   Section        8  euser{000a0000}-1096.o(StubCode)
-    theImportedSymbol                        0x0000a4e4   Data           0  euser{000a0000}-1096.o(StubCode)
-    StubCode                                 0x0000a4e8   Section        8  euser{000a0000}-1116.o(StubCode)
-    theImportedSymbol                        0x0000a4ec   Data           0  euser{000a0000}-1116.o(StubCode)
-    StubCode                                 0x0000a4f0   Section        8  euser{000a0000}-1119.o(StubCode)
-    theImportedSymbol                        0x0000a4f4   Data           0  euser{000a0000}-1119.o(StubCode)
-    StubCode                                 0x0000a4f8   Section        8  euser{000a0000}-1172.o(StubCode)
-    theImportedSymbol                        0x0000a4fc   Data           0  euser{000a0000}-1172.o(StubCode)
-    StubCode                                 0x0000a500   Section        8  euser{000a0000}-1288.o(StubCode)
-    theImportedSymbol                        0x0000a504   Data           0  euser{000a0000}-1288.o(StubCode)
-    StubCode                                 0x0000a508   Section        8  euser{000a0000}-1507.o(StubCode)
-    theImportedSymbol                        0x0000a50c   Data           0  euser{000a0000}-1507.o(StubCode)
-    StubCode                                 0x0000a510   Section        8  euser{000a0000}-1510.o(StubCode)
-    theImportedSymbol                        0x0000a514   Data           0  euser{000a0000}-1510.o(StubCode)
-    StubCode                                 0x0000a518   Section        8  euser{000a0000}-1553.o(StubCode)
-    theImportedSymbol                        0x0000a51c   Data           0  euser{000a0000}-1553.o(StubCode)
-    StubCode                                 0x0000a520   Section        8  euser{000a0000}-1590.o(StubCode)
-    theImportedSymbol                        0x0000a524   Data           0  euser{000a0000}-1590.o(StubCode)
-    StubCode                                 0x0000a528   Section        8  euser{000a0000}-1593.o(StubCode)
-    theImportedSymbol                        0x0000a52c   Data           0  euser{000a0000}-1593.o(StubCode)
-    StubCode                                 0x0000a530   Section        8  euser{000a0000}-1648.o(StubCode)
-    theImportedSymbol                        0x0000a534   Data           0  euser{000a0000}-1648.o(StubCode)
-    StubCode                                 0x0000a538   Section        8  euser{000a0000}-1817.o(StubCode)
-    theImportedSymbol                        0x0000a53c   Data           0  euser{000a0000}-1817.o(StubCode)
-    StubCode                                 0x0000a540   Section        8  euser{000a0000}-1995.o(StubCode)
-    theImportedSymbol                        0x0000a544   Data           0  euser{000a0000}-1995.o(StubCode)
-    StubCode                                 0x0000a548   Section        8  euser{000a0000}-1997.o(StubCode)
-    theImportedSymbol                        0x0000a54c   Data           0  euser{000a0000}-1997.o(StubCode)
-    StubCode                                 0x0000a550   Section        8  euser{000a0000}-1999.o(StubCode)
-    theImportedSymbol                        0x0000a554   Data           0  euser{000a0000}-1999.o(StubCode)
-    StubCode                                 0x0000a558   Section        8  euser{000a0000}-203.o(StubCode)
-    theImportedSymbol                        0x0000a55c   Data           0  euser{000a0000}-203.o(StubCode)
-    StubCode                                 0x0000a560   Section        8  euser{000a0000}-204.o(StubCode)
-    theImportedSymbol                        0x0000a564   Data           0  euser{000a0000}-204.o(StubCode)
-    StubCode                                 0x0000a568   Section        8  euser{000a0000}-205.o(StubCode)
-    theImportedSymbol                        0x0000a56c   Data           0  euser{000a0000}-205.o(StubCode)
-    StubCode                                 0x0000a570   Section        8  euser{000a0000}-2060.o(StubCode)
-    theImportedSymbol                        0x0000a574   Data           0  euser{000a0000}-2060.o(StubCode)
-    StubCode                                 0x0000a578   Section        8  euser{000a0000}-2061.o(StubCode)
-    theImportedSymbol                        0x0000a57c   Data           0  euser{000a0000}-2061.o(StubCode)
-    StubCode                                 0x0000a580   Section        8  euser{000a0000}-207.o(StubCode)
-    theImportedSymbol                        0x0000a584   Data           0  euser{000a0000}-207.o(StubCode)
-    StubCode                                 0x0000a588   Section        8  euser{000a0000}-208.o(StubCode)
-    theImportedSymbol                        0x0000a58c   Data           0  euser{000a0000}-208.o(StubCode)
-    StubCode                                 0x0000a590   Section        8  euser{000a0000}-2082.o(StubCode)
-    theImportedSymbol                        0x0000a594   Data           0  euser{000a0000}-2082.o(StubCode)
-    StubCode                                 0x0000a598   Section        8  euser{000a0000}-2120.o(StubCode)
-    theImportedSymbol                        0x0000a59c   Data           0  euser{000a0000}-2120.o(StubCode)
-    StubCode                                 0x0000a5a0   Section        8  euser{000a0000}-2123.o(StubCode)
-    theImportedSymbol                        0x0000a5a4   Data           0  euser{000a0000}-2123.o(StubCode)
-    StubCode                                 0x0000a5a8   Section        8  euser{000a0000}-2125.o(StubCode)
-    theImportedSymbol                        0x0000a5ac   Data           0  euser{000a0000}-2125.o(StubCode)
-    StubCode                                 0x0000a5b0   Section        8  euser{000a0000}-2131.o(StubCode)
-    theImportedSymbol                        0x0000a5b4   Data           0  euser{000a0000}-2131.o(StubCode)
-    StubCode                                 0x0000a5b8   Section        8  euser{000a0000}-245.o(StubCode)
-    theImportedSymbol                        0x0000a5bc   Data           0  euser{000a0000}-245.o(StubCode)
-    StubCode                                 0x0000a5c0   Section        8  euser{000a0000}-250.o(StubCode)
-    theImportedSymbol                        0x0000a5c4   Data           0  euser{000a0000}-250.o(StubCode)
-    StubCode                                 0x0000a5c8   Section        8  euser{000a0000}-254.o(StubCode)
-    theImportedSymbol                        0x0000a5cc   Data           0  euser{000a0000}-254.o(StubCode)
-    StubCode                                 0x0000a5d0   Section        8  euser{000a0000}-257.o(StubCode)
-    theImportedSymbol                        0x0000a5d4   Data           0  euser{000a0000}-257.o(StubCode)
-    StubCode                                 0x0000a5d8   Section        8  euser{000a0000}-46.o(StubCode)
-    theImportedSymbol                        0x0000a5dc   Data           0  euser{000a0000}-46.o(StubCode)
-    StubCode                                 0x0000a5e0   Section        8  euser{000a0000}-464.o(StubCode)
-    theImportedSymbol                        0x0000a5e4   Data           0  euser{000a0000}-464.o(StubCode)
-    StubCode                                 0x0000a5e8   Section        8  euser{000a0000}-470.o(StubCode)
-    theImportedSymbol                        0x0000a5ec   Data           0  euser{000a0000}-470.o(StubCode)
-    StubCode                                 0x0000a5f0   Section        8  euser{000a0000}-471.o(StubCode)
-    theImportedSymbol                        0x0000a5f4   Data           0  euser{000a0000}-471.o(StubCode)
-    StubCode                                 0x0000a5f8   Section        8  euser{000a0000}-472.o(StubCode)
-    theImportedSymbol                        0x0000a5fc   Data           0  euser{000a0000}-472.o(StubCode)
-    StubCode                                 0x0000a600   Section        8  euser{000a0000}-476.o(StubCode)
-    theImportedSymbol                        0x0000a604   Data           0  euser{000a0000}-476.o(StubCode)
-    StubCode                                 0x0000a608   Section        8  euser{000a0000}-48.o(StubCode)
-    theImportedSymbol                        0x0000a60c   Data           0  euser{000a0000}-48.o(StubCode)
-    StubCode                                 0x0000a610   Section        8  euser{000a0000}-481.o(StubCode)
-    theImportedSymbol                        0x0000a614   Data           0  euser{000a0000}-481.o(StubCode)
-    StubCode                                 0x0000a618   Section        8  euser{000a0000}-55.o(StubCode)
-    theImportedSymbol                        0x0000a61c   Data           0  euser{000a0000}-55.o(StubCode)
-    StubCode                                 0x0000a620   Section        8  euser{000a0000}-551.o(StubCode)
-    theImportedSymbol                        0x0000a624   Data           0  euser{000a0000}-551.o(StubCode)
-    StubCode                                 0x0000a628   Section        8  euser{000a0000}-593.o(StubCode)
-    theImportedSymbol                        0x0000a62c   Data           0  euser{000a0000}-593.o(StubCode)
-    StubCode                                 0x0000a630   Section        8  euser{000a0000}-613.o(StubCode)
-    theImportedSymbol                        0x0000a634   Data           0  euser{000a0000}-613.o(StubCode)
-    StubCode                                 0x0000a638   Section        8  euser{000a0000}-649.o(StubCode)
-    theImportedSymbol                        0x0000a63c   Data           0  euser{000a0000}-649.o(StubCode)
-    StubCode                                 0x0000a640   Section        8  euser{000a0000}-652.o(StubCode)
-    theImportedSymbol                        0x0000a644   Data           0  euser{000a0000}-652.o(StubCode)
-    StubCode                                 0x0000a648   Section        8  euser{000a0000}-654.o(StubCode)
-    theImportedSymbol                        0x0000a64c   Data           0  euser{000a0000}-654.o(StubCode)
-    StubCode                                 0x0000a650   Section        8  euser{000a0000}-669.o(StubCode)
-    theImportedSymbol                        0x0000a654   Data           0  euser{000a0000}-669.o(StubCode)
-    StubCode                                 0x0000a658   Section        8  euser{000a0000}-81.o(StubCode)
-    theImportedSymbol                        0x0000a65c   Data           0  euser{000a0000}-81.o(StubCode)
-    StubCode                                 0x0000a660   Section        8  euser{000a0000}-824.o(StubCode)
-    theImportedSymbol                        0x0000a664   Data           0  euser{000a0000}-824.o(StubCode)
-    StubCode                                 0x0000a668   Section        8  euser{000a0000}-829.o(StubCode)
-    theImportedSymbol                        0x0000a66c   Data           0  euser{000a0000}-829.o(StubCode)
-    StubCode                                 0x0000a670   Section        8  euser{000a0000}-830.o(StubCode)
-    theImportedSymbol                        0x0000a674   Data           0  euser{000a0000}-830.o(StubCode)
-    StubCode                                 0x0000a678   Section        8  euser{000a0000}-838.o(StubCode)
-    theImportedSymbol                        0x0000a67c   Data           0  euser{000a0000}-838.o(StubCode)
-    StubCode                                 0x0000a680   Section        8  euser{000a0000}-839.o(StubCode)
-    theImportedSymbol                        0x0000a684   Data           0  euser{000a0000}-839.o(StubCode)
-    StubCode                                 0x0000a688   Section        8  euser{000a0000}-841.o(StubCode)
-    theImportedSymbol                        0x0000a68c   Data           0  euser{000a0000}-841.o(StubCode)
-    StubCode                                 0x0000a690   Section        8  euser{000a0000}-842.o(StubCode)
-    theImportedSymbol                        0x0000a694   Data           0  euser{000a0000}-842.o(StubCode)
-    StubCode                                 0x0000a698   Section        8  euser{000a0000}-973.o(StubCode)
-    theImportedSymbol                        0x0000a69c   Data           0  euser{000a0000}-973.o(StubCode)
-    StubCode                                 0x0000a6a0   Section        8  apparc{000a0000}-121.o(StubCode)
-    theImportedSymbol                        0x0000a6a4   Data           0  apparc{000a0000}-121.o(StubCode)
-    StubCode                                 0x0000a6a8   Section        8  apparc{000a0000}-132.o(StubCode)
-    theImportedSymbol                        0x0000a6ac   Data           0  apparc{000a0000}-132.o(StubCode)
-    StubCode                                 0x0000a6b0   Section        8  apparc{000a0000}-171.o(StubCode)
-    theImportedSymbol                        0x0000a6b4   Data           0  apparc{000a0000}-171.o(StubCode)
-    StubCode                                 0x0000a6b8   Section        8  apparc{000a0000}-191.o(StubCode)
-    theImportedSymbol                        0x0000a6bc   Data           0  apparc{000a0000}-191.o(StubCode)
-    StubCode                                 0x0000a6c0   Section        8  apparc{000a0000}-192.o(StubCode)
-    theImportedSymbol                        0x0000a6c4   Data           0  apparc{000a0000}-192.o(StubCode)
-    StubCode                                 0x0000a6c8   Section        8  apparc{000a0000}-194.o(StubCode)
-    theImportedSymbol                        0x0000a6cc   Data           0  apparc{000a0000}-194.o(StubCode)
-    StubCode                                 0x0000a6d0   Section        8  apparc{000a0000}-202.o(StubCode)
-    theImportedSymbol                        0x0000a6d4   Data           0  apparc{000a0000}-202.o(StubCode)
-    StubCode                                 0x0000a6d8   Section        8  apparc{000a0000}-222.o(StubCode)
-    theImportedSymbol                        0x0000a6dc   Data           0  apparc{000a0000}-222.o(StubCode)
-    StubCode                                 0x0000a6e0   Section        8  apparc{000a0000}-232.o(StubCode)
-    theImportedSymbol                        0x0000a6e4   Data           0  apparc{000a0000}-232.o(StubCode)
-    StubCode                                 0x0000a6e8   Section        8  apparc{000a0000}-253.o(StubCode)
-    theImportedSymbol                        0x0000a6ec   Data           0  apparc{000a0000}-253.o(StubCode)
-    StubCode                                 0x0000a6f0   Section        8  apparc{000a0000}-273.o(StubCode)
-    theImportedSymbol                        0x0000a6f4   Data           0  apparc{000a0000}-273.o(StubCode)
-    StubCode                                 0x0000a6f8   Section        8  apparc{000a0000}-274.o(StubCode)
-    theImportedSymbol                        0x0000a6fc   Data           0  apparc{000a0000}-274.o(StubCode)
-    StubCode                                 0x0000a700   Section        8  apparc{000a0000}-275.o(StubCode)
-    theImportedSymbol                        0x0000a704   Data           0  apparc{000a0000}-275.o(StubCode)
-    StubCode                                 0x0000a708   Section        8  apparc{000a0000}-279.o(StubCode)
-    theImportedSymbol                        0x0000a70c   Data           0  apparc{000a0000}-279.o(StubCode)
-    StubCode                                 0x0000a710   Section        8  apparc{000a0000}-280.o(StubCode)
-    theImportedSymbol                        0x0000a714   Data           0  apparc{000a0000}-280.o(StubCode)
-    StubCode                                 0x0000a718   Section        8  apparc{000a0000}-284.o(StubCode)
-    theImportedSymbol                        0x0000a71c   Data           0  apparc{000a0000}-284.o(StubCode)
-    StubCode                                 0x0000a720   Section        8  apparc{000a0000}-285.o(StubCode)
-    theImportedSymbol                        0x0000a724   Data           0  apparc{000a0000}-285.o(StubCode)
-    StubCode                                 0x0000a728   Section        8  apparc{000a0000}-286.o(StubCode)
-    theImportedSymbol                        0x0000a72c   Data           0  apparc{000a0000}-286.o(StubCode)
-    StubCode                                 0x0000a730   Section        8  apparc{000a0000}-287.o(StubCode)
-    theImportedSymbol                        0x0000a734   Data           0  apparc{000a0000}-287.o(StubCode)
-    StubCode                                 0x0000a738   Section        8  apparc{000a0000}-30.o(StubCode)
-    theImportedSymbol                        0x0000a73c   Data           0  apparc{000a0000}-30.o(StubCode)
-    StubCode                                 0x0000a740   Section        8  bafl{000a0000}-43.o(StubCode)
-    theImportedSymbol                        0x0000a744   Data           0  bafl{000a0000}-43.o(StubCode)
-    StubCode                                 0x0000a748   Section        8  bafl{000a0000}-98.o(StubCode)
-    theImportedSymbol                        0x0000a74c   Data           0  bafl{000a0000}-98.o(StubCode)
-    StubCode                                 0x0000a750   Section        8  cone{000a0000}-100.o(StubCode)
-    theImportedSymbol                        0x0000a754   Data           0  cone{000a0000}-100.o(StubCode)
-    StubCode                                 0x0000a758   Section        8  cone{000a0000}-101.o(StubCode)
-    theImportedSymbol                        0x0000a75c   Data           0  cone{000a0000}-101.o(StubCode)
-    StubCode                                 0x0000a760   Section        8  cone{000a0000}-11.o(StubCode)
-    theImportedSymbol                        0x0000a764   Data           0  cone{000a0000}-11.o(StubCode)
-    StubCode                                 0x0000a768   Section        8  cone{000a0000}-12.o(StubCode)
-    theImportedSymbol                        0x0000a76c   Data           0  cone{000a0000}-12.o(StubCode)
-    StubCode                                 0x0000a770   Section        8  cone{000a0000}-127.o(StubCode)
-    theImportedSymbol                        0x0000a774   Data           0  cone{000a0000}-127.o(StubCode)
-    StubCode                                 0x0000a778   Section        8  cone{000a0000}-128.o(StubCode)
-    theImportedSymbol                        0x0000a77c   Data           0  cone{000a0000}-128.o(StubCode)
-    StubCode                                 0x0000a780   Section        8  cone{000a0000}-13.o(StubCode)
-    theImportedSymbol                        0x0000a784   Data           0  cone{000a0000}-13.o(StubCode)
-    StubCode                                 0x0000a788   Section        8  cone{000a0000}-15.o(StubCode)
-    theImportedSymbol                        0x0000a78c   Data           0  cone{000a0000}-15.o(StubCode)
-    StubCode                                 0x0000a790   Section        8  cone{000a0000}-18.o(StubCode)
-    theImportedSymbol                        0x0000a794   Data           0  cone{000a0000}-18.o(StubCode)
-    StubCode                                 0x0000a798   Section        8  cone{000a0000}-182.o(StubCode)
-    theImportedSymbol                        0x0000a79c   Data           0  cone{000a0000}-182.o(StubCode)
-    StubCode                                 0x0000a7a0   Section        8  cone{000a0000}-19.o(StubCode)
-    theImportedSymbol                        0x0000a7a4   Data           0  cone{000a0000}-19.o(StubCode)
-    StubCode                                 0x0000a7a8   Section        8  cone{000a0000}-196.o(StubCode)
-    theImportedSymbol                        0x0000a7ac   Data           0  cone{000a0000}-196.o(StubCode)
-    StubCode                                 0x0000a7b0   Section        8  cone{000a0000}-197.o(StubCode)
-    theImportedSymbol                        0x0000a7b4   Data           0  cone{000a0000}-197.o(StubCode)
-    StubCode                                 0x0000a7b8   Section        8  cone{000a0000}-199.o(StubCode)
-    theImportedSymbol                        0x0000a7bc   Data           0  cone{000a0000}-199.o(StubCode)
-    StubCode                                 0x0000a7c0   Section        8  cone{000a0000}-203.o(StubCode)
-    theImportedSymbol                        0x0000a7c4   Data           0  cone{000a0000}-203.o(StubCode)
-    StubCode                                 0x0000a7c8   Section        8  cone{000a0000}-21.o(StubCode)
-    theImportedSymbol                        0x0000a7cc   Data           0  cone{000a0000}-21.o(StubCode)
-    StubCode                                 0x0000a7d0   Section        8  cone{000a0000}-210.o(StubCode)
-    theImportedSymbol                        0x0000a7d4   Data           0  cone{000a0000}-210.o(StubCode)
-    StubCode                                 0x0000a7d8   Section        8  cone{000a0000}-211.o(StubCode)
-    theImportedSymbol                        0x0000a7dc   Data           0  cone{000a0000}-211.o(StubCode)
-    StubCode                                 0x0000a7e0   Section        8  cone{000a0000}-212.o(StubCode)
-    theImportedSymbol                        0x0000a7e4   Data           0  cone{000a0000}-212.o(StubCode)
-    StubCode                                 0x0000a7e8   Section        8  cone{000a0000}-220.o(StubCode)
-    theImportedSymbol                        0x0000a7ec   Data           0  cone{000a0000}-220.o(StubCode)
-    StubCode                                 0x0000a7f0   Section        8  cone{000a0000}-25.o(StubCode)
-    theImportedSymbol                        0x0000a7f4   Data           0  cone{000a0000}-25.o(StubCode)
-    StubCode                                 0x0000a7f8   Section        8  cone{000a0000}-257.o(StubCode)
-    theImportedSymbol                        0x0000a7fc   Data           0  cone{000a0000}-257.o(StubCode)
-    StubCode                                 0x0000a800   Section        8  cone{000a0000}-26.o(StubCode)
-    theImportedSymbol                        0x0000a804   Data           0  cone{000a0000}-26.o(StubCode)
-    StubCode                                 0x0000a808   Section        8  cone{000a0000}-263.o(StubCode)
-    theImportedSymbol                        0x0000a80c   Data           0  cone{000a0000}-263.o(StubCode)
-    StubCode                                 0x0000a810   Section        8  cone{000a0000}-265.o(StubCode)
-    theImportedSymbol                        0x0000a814   Data           0  cone{000a0000}-265.o(StubCode)
-    StubCode                                 0x0000a818   Section        8  cone{000a0000}-266.o(StubCode)
-    theImportedSymbol                        0x0000a81c   Data           0  cone{000a0000}-266.o(StubCode)
-    StubCode                                 0x0000a820   Section        8  cone{000a0000}-270.o(StubCode)
-    theImportedSymbol                        0x0000a824   Data           0  cone{000a0000}-270.o(StubCode)
-    StubCode                                 0x0000a828   Section        8  cone{000a0000}-271.o(StubCode)
-    theImportedSymbol                        0x0000a82c   Data           0  cone{000a0000}-271.o(StubCode)
-    StubCode                                 0x0000a830   Section        8  cone{000a0000}-272.o(StubCode)
-    theImportedSymbol                        0x0000a834   Data           0  cone{000a0000}-272.o(StubCode)
-    StubCode                                 0x0000a838   Section        8  cone{000a0000}-275.o(StubCode)
-    theImportedSymbol                        0x0000a83c   Data           0  cone{000a0000}-275.o(StubCode)
-    StubCode                                 0x0000a840   Section        8  cone{000a0000}-276.o(StubCode)
-    theImportedSymbol                        0x0000a844   Data           0  cone{000a0000}-276.o(StubCode)
-    StubCode                                 0x0000a848   Section        8  cone{000a0000}-287.o(StubCode)
-    theImportedSymbol                        0x0000a84c   Data           0  cone{000a0000}-287.o(StubCode)
-    StubCode                                 0x0000a850   Section        8  cone{000a0000}-288.o(StubCode)
-    theImportedSymbol                        0x0000a854   Data           0  cone{000a0000}-288.o(StubCode)
-    StubCode                                 0x0000a858   Section        8  cone{000a0000}-29.o(StubCode)
-    theImportedSymbol                        0x0000a85c   Data           0  cone{000a0000}-29.o(StubCode)
-    StubCode                                 0x0000a860   Section        8  cone{000a0000}-30.o(StubCode)
-    theImportedSymbol                        0x0000a864   Data           0  cone{000a0000}-30.o(StubCode)
-    StubCode                                 0x0000a868   Section        8  cone{000a0000}-351.o(StubCode)
-    theImportedSymbol                        0x0000a86c   Data           0  cone{000a0000}-351.o(StubCode)
-    StubCode                                 0x0000a870   Section        8  cone{000a0000}-353.o(StubCode)
-    theImportedSymbol                        0x0000a874   Data           0  cone{000a0000}-353.o(StubCode)
-    StubCode                                 0x0000a878   Section        8  cone{000a0000}-355.o(StubCode)
-    theImportedSymbol                        0x0000a87c   Data           0  cone{000a0000}-355.o(StubCode)
-    StubCode                                 0x0000a880   Section        8  cone{000a0000}-36.o(StubCode)
-    theImportedSymbol                        0x0000a884   Data           0  cone{000a0000}-36.o(StubCode)
-    StubCode                                 0x0000a888   Section        8  cone{000a0000}-39.o(StubCode)
-    theImportedSymbol                        0x0000a88c   Data           0  cone{000a0000}-39.o(StubCode)
-    StubCode                                 0x0000a890   Section        8  cone{000a0000}-396.o(StubCode)
-    theImportedSymbol                        0x0000a894   Data           0  cone{000a0000}-396.o(StubCode)
-    StubCode                                 0x0000a898   Section        8  cone{000a0000}-397.o(StubCode)
-    theImportedSymbol                        0x0000a89c   Data           0  cone{000a0000}-397.o(StubCode)
-    StubCode                                 0x0000a8a0   Section        8  cone{000a0000}-40.o(StubCode)
-    theImportedSymbol                        0x0000a8a4   Data           0  cone{000a0000}-40.o(StubCode)
-    StubCode                                 0x0000a8a8   Section        8  cone{000a0000}-41.o(StubCode)
-    theImportedSymbol                        0x0000a8ac   Data           0  cone{000a0000}-41.o(StubCode)
-    StubCode                                 0x0000a8b0   Section        8  cone{000a0000}-42.o(StubCode)
-    theImportedSymbol                        0x0000a8b4   Data           0  cone{000a0000}-42.o(StubCode)
-    StubCode                                 0x0000a8b8   Section        8  cone{000a0000}-444.o(StubCode)
-    theImportedSymbol                        0x0000a8bc   Data           0  cone{000a0000}-444.o(StubCode)
-    StubCode                                 0x0000a8c0   Section        8  cone{000a0000}-474.o(StubCode)
-    theImportedSymbol                        0x0000a8c4   Data           0  cone{000a0000}-474.o(StubCode)
-    StubCode                                 0x0000a8c8   Section        8  cone{000a0000}-477.o(StubCode)
-    theImportedSymbol                        0x0000a8cc   Data           0  cone{000a0000}-477.o(StubCode)
-    StubCode                                 0x0000a8d0   Section        8  cone{000a0000}-478.o(StubCode)
-    theImportedSymbol                        0x0000a8d4   Data           0  cone{000a0000}-478.o(StubCode)
-    StubCode                                 0x0000a8d8   Section        8  cone{000a0000}-479.o(StubCode)
-    theImportedSymbol                        0x0000a8dc   Data           0  cone{000a0000}-479.o(StubCode)
-    StubCode                                 0x0000a8e0   Section        8  cone{000a0000}-48.o(StubCode)
-    theImportedSymbol                        0x0000a8e4   Data           0  cone{000a0000}-48.o(StubCode)
-    StubCode                                 0x0000a8e8   Section        8  cone{000a0000}-482.o(StubCode)
-    theImportedSymbol                        0x0000a8ec   Data           0  cone{000a0000}-482.o(StubCode)
-    StubCode                                 0x0000a8f0   Section        8  cone{000a0000}-50.o(StubCode)
-    theImportedSymbol                        0x0000a8f4   Data           0  cone{000a0000}-50.o(StubCode)
-    StubCode                                 0x0000a8f8   Section        8  cone{000a0000}-502.o(StubCode)
-    theImportedSymbol                        0x0000a8fc   Data           0  cone{000a0000}-502.o(StubCode)
-    StubCode                                 0x0000a900   Section        8  cone{000a0000}-51.o(StubCode)
-    theImportedSymbol                        0x0000a904   Data           0  cone{000a0000}-51.o(StubCode)
-    StubCode                                 0x0000a908   Section        8  cone{000a0000}-514.o(StubCode)
-    theImportedSymbol                        0x0000a90c   Data           0  cone{000a0000}-514.o(StubCode)
-    StubCode                                 0x0000a910   Section        8  cone{000a0000}-56.o(StubCode)
-    theImportedSymbol                        0x0000a914   Data           0  cone{000a0000}-56.o(StubCode)
-    StubCode                                 0x0000a918   Section        8  cone{000a0000}-57.o(StubCode)
-    theImportedSymbol                        0x0000a91c   Data           0  cone{000a0000}-57.o(StubCode)
-    StubCode                                 0x0000a920   Section        8  cone{000a0000}-580.o(StubCode)
-    theImportedSymbol                        0x0000a924   Data           0  cone{000a0000}-580.o(StubCode)
-    StubCode                                 0x0000a928   Section        8  cone{000a0000}-581.o(StubCode)
-    theImportedSymbol                        0x0000a92c   Data           0  cone{000a0000}-581.o(StubCode)
-    StubCode                                 0x0000a930   Section        8  cone{000a0000}-582.o(StubCode)
-    theImportedSymbol                        0x0000a934   Data           0  cone{000a0000}-582.o(StubCode)
-    StubCode                                 0x0000a938   Section        8  cone{000a0000}-583.o(StubCode)
-    theImportedSymbol                        0x0000a93c   Data           0  cone{000a0000}-583.o(StubCode)
-    StubCode                                 0x0000a940   Section        8  cone{000a0000}-584.o(StubCode)
-    theImportedSymbol                        0x0000a944   Data           0  cone{000a0000}-584.o(StubCode)
-    StubCode                                 0x0000a948   Section        8  cone{000a0000}-61.o(StubCode)
-    theImportedSymbol                        0x0000a94c   Data           0  cone{000a0000}-61.o(StubCode)
-    StubCode                                 0x0000a950   Section        8  cone{000a0000}-62.o(StubCode)
-    theImportedSymbol                        0x0000a954   Data           0  cone{000a0000}-62.o(StubCode)
-    StubCode                                 0x0000a958   Section        8  cone{000a0000}-638.o(StubCode)
-    theImportedSymbol                        0x0000a95c   Data           0  cone{000a0000}-638.o(StubCode)
-    StubCode                                 0x0000a960   Section        8  cone{000a0000}-639.o(StubCode)
-    theImportedSymbol                        0x0000a964   Data           0  cone{000a0000}-639.o(StubCode)
-    StubCode                                 0x0000a968   Section        8  cone{000a0000}-64.o(StubCode)
-    theImportedSymbol                        0x0000a96c   Data           0  cone{000a0000}-64.o(StubCode)
-    StubCode                                 0x0000a970   Section        8  cone{000a0000}-664.o(StubCode)
-    theImportedSymbol                        0x0000a974   Data           0  cone{000a0000}-664.o(StubCode)
-    StubCode                                 0x0000a978   Section        8  cone{000a0000}-67.o(StubCode)
-    theImportedSymbol                        0x0000a97c   Data           0  cone{000a0000}-67.o(StubCode)
-    StubCode                                 0x0000a980   Section        8  cone{000a0000}-670.o(StubCode)
-    theImportedSymbol                        0x0000a984   Data           0  cone{000a0000}-670.o(StubCode)
-    StubCode                                 0x0000a988   Section        8  cone{000a0000}-671.o(StubCode)
-    theImportedSymbol                        0x0000a98c   Data           0  cone{000a0000}-671.o(StubCode)
-    StubCode                                 0x0000a990   Section        8  cone{000a0000}-676.o(StubCode)
-    theImportedSymbol                        0x0000a994   Data           0  cone{000a0000}-676.o(StubCode)
-    StubCode                                 0x0000a998   Section        8  cone{000a0000}-677.o(StubCode)
-    theImportedSymbol                        0x0000a99c   Data           0  cone{000a0000}-677.o(StubCode)
-    StubCode                                 0x0000a9a0   Section        8  cone{000a0000}-9.o(StubCode)
-    theImportedSymbol                        0x0000a9a4   Data           0  cone{000a0000}-9.o(StubCode)
-    StubCode                                 0x0000a9a8   Section        8  eikcore{000a0000}-141.o(StubCode)
-    theImportedSymbol                        0x0000a9ac   Data           0  eikcore{000a0000}-141.o(StubCode)
-    StubCode                                 0x0000a9b0   Section        8  eikcore{000a0000}-142.o(StubCode)
-    theImportedSymbol                        0x0000a9b4   Data           0  eikcore{000a0000}-142.o(StubCode)
-    StubCode                                 0x0000a9b8   Section        8  eikcore{000a0000}-143.o(StubCode)
-    theImportedSymbol                        0x0000a9bc   Data           0  eikcore{000a0000}-143.o(StubCode)
-    StubCode                                 0x0000a9c0   Section        8  eikcore{000a0000}-144.o(StubCode)
-    theImportedSymbol                        0x0000a9c4   Data           0  eikcore{000a0000}-144.o(StubCode)
-    StubCode                                 0x0000a9c8   Section        8  eikcore{000a0000}-147.o(StubCode)
-    theImportedSymbol                        0x0000a9cc   Data           0  eikcore{000a0000}-147.o(StubCode)
-    StubCode                                 0x0000a9d0   Section        8  eikcore{000a0000}-152.o(StubCode)
-    theImportedSymbol                        0x0000a9d4   Data           0  eikcore{000a0000}-152.o(StubCode)
-    StubCode                                 0x0000a9d8   Section        8  eikcore{000a0000}-155.o(StubCode)
-    theImportedSymbol                        0x0000a9dc   Data           0  eikcore{000a0000}-155.o(StubCode)
-    StubCode                                 0x0000a9e0   Section        8  eikcore{000a0000}-158.o(StubCode)
-    theImportedSymbol                        0x0000a9e4   Data           0  eikcore{000a0000}-158.o(StubCode)
-    StubCode                                 0x0000a9e8   Section        8  eikcore{000a0000}-159.o(StubCode)
-    theImportedSymbol                        0x0000a9ec   Data           0  eikcore{000a0000}-159.o(StubCode)
-    StubCode                                 0x0000a9f0   Section        8  eikcore{000a0000}-169.o(StubCode)
-    theImportedSymbol                        0x0000a9f4   Data           0  eikcore{000a0000}-169.o(StubCode)
-    StubCode                                 0x0000a9f8   Section        8  eikcore{000a0000}-171.o(StubCode)
-    theImportedSymbol                        0x0000a9fc   Data           0  eikcore{000a0000}-171.o(StubCode)
-    StubCode                                 0x0000aa00   Section        8  eikcore{000a0000}-175.o(StubCode)
-    theImportedSymbol                        0x0000aa04   Data           0  eikcore{000a0000}-175.o(StubCode)
-    StubCode                                 0x0000aa08   Section        8  eikcore{000a0000}-18.o(StubCode)
-    theImportedSymbol                        0x0000aa0c   Data           0  eikcore{000a0000}-18.o(StubCode)
-    StubCode                                 0x0000aa10   Section        8  eikcore{000a0000}-20.o(StubCode)
-    theImportedSymbol                        0x0000aa14   Data           0  eikcore{000a0000}-20.o(StubCode)
-    StubCode                                 0x0000aa18   Section        8  eikcore{000a0000}-25.o(StubCode)
-    theImportedSymbol                        0x0000aa1c   Data           0  eikcore{000a0000}-25.o(StubCode)
-    StubCode                                 0x0000aa20   Section        8  eikcore{000a0000}-26.o(StubCode)
-    theImportedSymbol                        0x0000aa24   Data           0  eikcore{000a0000}-26.o(StubCode)
-    StubCode                                 0x0000aa28   Section        8  eikcore{000a0000}-27.o(StubCode)
-    theImportedSymbol                        0x0000aa2c   Data           0  eikcore{000a0000}-27.o(StubCode)
-    StubCode                                 0x0000aa30   Section        8  eikcore{000a0000}-28.o(StubCode)
-    theImportedSymbol                        0x0000aa34   Data           0  eikcore{000a0000}-28.o(StubCode)
-    StubCode                                 0x0000aa38   Section        8  eikcore{000a0000}-29.o(StubCode)
-    theImportedSymbol                        0x0000aa3c   Data           0  eikcore{000a0000}-29.o(StubCode)
-    StubCode                                 0x0000aa40   Section        8  eikcore{000a0000}-291.o(StubCode)
-    theImportedSymbol                        0x0000aa44   Data           0  eikcore{000a0000}-291.o(StubCode)
-    StubCode                                 0x0000aa48   Section        8  eikcore{000a0000}-293.o(StubCode)
-    theImportedSymbol                        0x0000aa4c   Data           0  eikcore{000a0000}-293.o(StubCode)
-    StubCode                                 0x0000aa50   Section        8  eikcore{000a0000}-294.o(StubCode)
-    theImportedSymbol                        0x0000aa54   Data           0  eikcore{000a0000}-294.o(StubCode)
-    StubCode                                 0x0000aa58   Section        8  eikcore{000a0000}-295.o(StubCode)
-    theImportedSymbol                        0x0000aa5c   Data           0  eikcore{000a0000}-295.o(StubCode)
-    StubCode                                 0x0000aa60   Section        8  eikcore{000a0000}-296.o(StubCode)
-    theImportedSymbol                        0x0000aa64   Data           0  eikcore{000a0000}-296.o(StubCode)
-    StubCode                                 0x0000aa68   Section        8  eikcore{000a0000}-297.o(StubCode)
-    theImportedSymbol                        0x0000aa6c   Data           0  eikcore{000a0000}-297.o(StubCode)
-    StubCode                                 0x0000aa70   Section        8  eikcore{000a0000}-298.o(StubCode)
-    theImportedSymbol                        0x0000aa74   Data           0  eikcore{000a0000}-298.o(StubCode)
-    StubCode                                 0x0000aa78   Section        8  eikcore{000a0000}-299.o(StubCode)
-    theImportedSymbol                        0x0000aa7c   Data           0  eikcore{000a0000}-299.o(StubCode)
-    StubCode                                 0x0000aa80   Section        8  eikcore{000a0000}-30.o(StubCode)
-    theImportedSymbol                        0x0000aa84   Data           0  eikcore{000a0000}-30.o(StubCode)
-    StubCode                                 0x0000aa88   Section        8  eikcore{000a0000}-302.o(StubCode)
-    theImportedSymbol                        0x0000aa8c   Data           0  eikcore{000a0000}-302.o(StubCode)
-    StubCode                                 0x0000aa90   Section        8  eikcore{000a0000}-31.o(StubCode)
-    theImportedSymbol                        0x0000aa94   Data           0  eikcore{000a0000}-31.o(StubCode)
-    StubCode                                 0x0000aa98   Section        8  eikcore{000a0000}-315.o(StubCode)
-    theImportedSymbol                        0x0000aa9c   Data           0  eikcore{000a0000}-315.o(StubCode)
-    StubCode                                 0x0000aaa0   Section        8  eikcore{000a0000}-317.o(StubCode)
-    theImportedSymbol                        0x0000aaa4   Data           0  eikcore{000a0000}-317.o(StubCode)
-    StubCode                                 0x0000aaa8   Section        8  eikcore{000a0000}-319.o(StubCode)
-    theImportedSymbol                        0x0000aaac   Data           0  eikcore{000a0000}-319.o(StubCode)
-    StubCode                                 0x0000aab0   Section        8  eikcore{000a0000}-352.o(StubCode)
-    theImportedSymbol                        0x0000aab4   Data           0  eikcore{000a0000}-352.o(StubCode)
-    StubCode                                 0x0000aab8   Section        8  eikcore{000a0000}-37.o(StubCode)
-    theImportedSymbol                        0x0000aabc   Data           0  eikcore{000a0000}-37.o(StubCode)
-    StubCode                                 0x0000aac0   Section        8  eikcore{000a0000}-390.o(StubCode)
-    theImportedSymbol                        0x0000aac4   Data           0  eikcore{000a0000}-390.o(StubCode)
-    StubCode                                 0x0000aac8   Section        8  eikcore{000a0000}-392.o(StubCode)
-    theImportedSymbol                        0x0000aacc   Data           0  eikcore{000a0000}-392.o(StubCode)
-    StubCode                                 0x0000aad0   Section        8  eikcore{000a0000}-394.o(StubCode)
-    theImportedSymbol                        0x0000aad4   Data           0  eikcore{000a0000}-394.o(StubCode)
-    StubCode                                 0x0000aad8   Section        8  eikcore{000a0000}-467.o(StubCode)
-    theImportedSymbol                        0x0000aadc   Data           0  eikcore{000a0000}-467.o(StubCode)
-    StubCode                                 0x0000aae0   Section        8  eikcore{000a0000}-472.o(StubCode)
-    theImportedSymbol                        0x0000aae4   Data           0  eikcore{000a0000}-472.o(StubCode)
-    StubCode                                 0x0000aae8   Section        8  eikcore{000a0000}-473.o(StubCode)
-    theImportedSymbol                        0x0000aaec   Data           0  eikcore{000a0000}-473.o(StubCode)
-    StubCode                                 0x0000aaf0   Section        8  eikcore{000a0000}-479.o(StubCode)
-    theImportedSymbol                        0x0000aaf4   Data           0  eikcore{000a0000}-479.o(StubCode)
-    StubCode                                 0x0000aaf8   Section        8  eikcore{000a0000}-490.o(StubCode)
-    theImportedSymbol                        0x0000aafc   Data           0  eikcore{000a0000}-490.o(StubCode)
-    StubCode                                 0x0000ab00   Section        8  eikcore{000a0000}-506.o(StubCode)
-    theImportedSymbol                        0x0000ab04   Data           0  eikcore{000a0000}-506.o(StubCode)
-    StubCode                                 0x0000ab08   Section        8  eikcore{000a0000}-523.o(StubCode)
-    theImportedSymbol                        0x0000ab0c   Data           0  eikcore{000a0000}-523.o(StubCode)
-    StubCode                                 0x0000ab10   Section        8  eikcore{000a0000}-532.o(StubCode)
-    theImportedSymbol                        0x0000ab14   Data           0  eikcore{000a0000}-532.o(StubCode)
-    StubCode                                 0x0000ab18   Section        8  eikcore{000a0000}-533.o(StubCode)
-    theImportedSymbol                        0x0000ab1c   Data           0  eikcore{000a0000}-533.o(StubCode)
-    StubCode                                 0x0000ab20   Section        8  eikcore{000a0000}-534.o(StubCode)
-    theImportedSymbol                        0x0000ab24   Data           0  eikcore{000a0000}-534.o(StubCode)
-    StubCode                                 0x0000ab28   Section        8  eikcore{000a0000}-535.o(StubCode)
-    theImportedSymbol                        0x0000ab2c   Data           0  eikcore{000a0000}-535.o(StubCode)
-    StubCode                                 0x0000ab30   Section        8  eikcore{000a0000}-536.o(StubCode)
-    theImportedSymbol                        0x0000ab34   Data           0  eikcore{000a0000}-536.o(StubCode)
-    StubCode                                 0x0000ab38   Section        8  eikcore{000a0000}-537.o(StubCode)
-    theImportedSymbol                        0x0000ab3c   Data           0  eikcore{000a0000}-537.o(StubCode)
-    StubCode                                 0x0000ab40   Section        8  eikcore{000a0000}-565.o(StubCode)
-    theImportedSymbol                        0x0000ab44   Data           0  eikcore{000a0000}-565.o(StubCode)
-    StubCode                                 0x0000ab48   Section        8  eikcore{000a0000}-61.o(StubCode)
-    theImportedSymbol                        0x0000ab4c   Data           0  eikcore{000a0000}-61.o(StubCode)
-    StubCode                                 0x0000ab50   Section        8  eikcore{000a0000}-62.o(StubCode)
-    theImportedSymbol                        0x0000ab54   Data           0  eikcore{000a0000}-62.o(StubCode)
-    StubCode                                 0x0000ab58   Section        8  eikcore{000a0000}-63.o(StubCode)
-    theImportedSymbol                        0x0000ab5c   Data           0  eikcore{000a0000}-63.o(StubCode)
-    StubCode                                 0x0000ab60   Section        8  eikcore{000a0000}-64.o(StubCode)
-    theImportedSymbol                        0x0000ab64   Data           0  eikcore{000a0000}-64.o(StubCode)
-    StubCode                                 0x0000ab68   Section        8  eikcore{000a0000}-67.o(StubCode)
-    theImportedSymbol                        0x0000ab6c   Data           0  eikcore{000a0000}-67.o(StubCode)
-    StubCode                                 0x0000ab70   Section        8  eikcore{000a0000}-72.o(StubCode)
-    theImportedSymbol                        0x0000ab74   Data           0  eikcore{000a0000}-72.o(StubCode)
-    StubCode                                 0x0000ab78   Section        8  eikcore{000a0000}-73.o(StubCode)
-    theImportedSymbol                        0x0000ab7c   Data           0  eikcore{000a0000}-73.o(StubCode)
-    StubCode                                 0x0000ab80   Section        8  eikcore{000a0000}-74.o(StubCode)
-    theImportedSymbol                        0x0000ab84   Data           0  eikcore{000a0000}-74.o(StubCode)
-    StubCode                                 0x0000ab88   Section        8  eikcore{000a0000}-75.o(StubCode)
-    theImportedSymbol                        0x0000ab8c   Data           0  eikcore{000a0000}-75.o(StubCode)
-    StubCode                                 0x0000ab90   Section        8  eikcore{000a0000}-76.o(StubCode)
-    theImportedSymbol                        0x0000ab94   Data           0  eikcore{000a0000}-76.o(StubCode)
-    StubCode                                 0x0000ab98   Section        8  eikcore{000a0000}-77.o(StubCode)
-    theImportedSymbol                        0x0000ab9c   Data           0  eikcore{000a0000}-77.o(StubCode)
-    StubCode                                 0x0000aba0   Section        8  eikcore{000a0000}-78.o(StubCode)
-    theImportedSymbol                        0x0000aba4   Data           0  eikcore{000a0000}-78.o(StubCode)
-    StubCode                                 0x0000aba8   Section        8  eikcore{000a0000}-79.o(StubCode)
-    theImportedSymbol                        0x0000abac   Data           0  eikcore{000a0000}-79.o(StubCode)
-    StubCode                                 0x0000abb0   Section        8  eikcoctl{000a0000}-1376.o(StubCode)
-    theImportedSymbol                        0x0000abb4   Data           0  eikcoctl{000a0000}-1376.o(StubCode)
-    StubCode                                 0x0000abb8   Section        8  eikcoctl{000a0000}-140.o(StubCode)
-    theImportedSymbol                        0x0000abbc   Data           0  eikcoctl{000a0000}-140.o(StubCode)
-    StubCode                                 0x0000abc0   Section        8  eikcoctl{000a0000}-1430.o(StubCode)
-    theImportedSymbol                        0x0000abc4   Data           0  eikcoctl{000a0000}-1430.o(StubCode)
-    StubCode                                 0x0000abc8   Section        8  eikcoctl{000a0000}-35.o(StubCode)
-    theImportedSymbol                        0x0000abcc   Data           0  eikcoctl{000a0000}-35.o(StubCode)
-    StubCode                                 0x0000abd0   Section        8  eikcoctl{000a0000}-46.o(StubCode)
-    theImportedSymbol                        0x0000abd4   Data           0  eikcoctl{000a0000}-46.o(StubCode)
-    StubCode                                 0x0000abd8   Section        8  eikcoctl{000a0000}-605.o(StubCode)
-    theImportedSymbol                        0x0000abdc   Data           0  eikcoctl{000a0000}-605.o(StubCode)
-    StubCode                                 0x0000abe0   Section        8  eikcoctl{000a0000}-606.o(StubCode)
-    theImportedSymbol                        0x0000abe4   Data           0  eikcoctl{000a0000}-606.o(StubCode)
-    StubCode                                 0x0000abe8   Section        8  eikcoctl{000a0000}-660.o(StubCode)
-    theImportedSymbol                        0x0000abec   Data           0  eikcoctl{000a0000}-660.o(StubCode)
-    StubCode                                 0x0000abf0   Section        8  eikcoctl{000a0000}-875.o(StubCode)
-    theImportedSymbol                        0x0000abf4   Data           0  eikcoctl{000a0000}-875.o(StubCode)
-    StubCode                                 0x0000abf8   Section        8  eikcoctl{000a0000}-880.o(StubCode)
-    theImportedSymbol                        0x0000abfc   Data           0  eikcoctl{000a0000}-880.o(StubCode)
-    StubCode                                 0x0000ac00   Section        8  eikcoctl{000a0000}-881.o(StubCode)
-    theImportedSymbol                        0x0000ac04   Data           0  eikcoctl{000a0000}-881.o(StubCode)
-    StubCode                                 0x0000ac08   Section        8  eikctl{000a0000}-455.o(StubCode)
-    theImportedSymbol                        0x0000ac0c   Data           0  eikctl{000a0000}-455.o(StubCode)
-    StubCode                                 0x0000ac10   Section        8  avkon{000a0000}-1132.o(StubCode)
-    theImportedSymbol                        0x0000ac14   Data           0  avkon{000a0000}-1132.o(StubCode)
-    StubCode                                 0x0000ac18   Section        8  avkon{000a0000}-129.o(StubCode)
-    theImportedSymbol                        0x0000ac1c   Data           0  avkon{000a0000}-129.o(StubCode)
-    StubCode                                 0x0000ac20   Section        8  avkon{000a0000}-130.o(StubCode)
-    theImportedSymbol                        0x0000ac24   Data           0  avkon{000a0000}-130.o(StubCode)
-    StubCode                                 0x0000ac28   Section        8  avkon{000a0000}-131.o(StubCode)
-    theImportedSymbol                        0x0000ac2c   Data           0  avkon{000a0000}-131.o(StubCode)
-    StubCode                                 0x0000ac30   Section        8  avkon{000a0000}-1341.o(StubCode)
-    theImportedSymbol                        0x0000ac34   Data           0  avkon{000a0000}-1341.o(StubCode)
-    StubCode                                 0x0000ac38   Section        8  avkon{000a0000}-198.o(StubCode)
-    theImportedSymbol                        0x0000ac3c   Data           0  avkon{000a0000}-198.o(StubCode)
-    StubCode                                 0x0000ac40   Section        8  avkon{000a0000}-199.o(StubCode)
-    theImportedSymbol                        0x0000ac44   Data           0  avkon{000a0000}-199.o(StubCode)
-    StubCode                                 0x0000ac48   Section        8  avkon{000a0000}-1996.o(StubCode)
-    theImportedSymbol                        0x0000ac4c   Data           0  avkon{000a0000}-1996.o(StubCode)
-    StubCode                                 0x0000ac50   Section        8  avkon{000a0000}-201.o(StubCode)
-    theImportedSymbol                        0x0000ac54   Data           0  avkon{000a0000}-201.o(StubCode)
-    StubCode                                 0x0000ac58   Section        8  avkon{000a0000}-206.o(StubCode)
-    theImportedSymbol                        0x0000ac5c   Data           0  avkon{000a0000}-206.o(StubCode)
-    StubCode                                 0x0000ac60   Section        8  avkon{000a0000}-211.o(StubCode)
-    theImportedSymbol                        0x0000ac64   Data           0  avkon{000a0000}-211.o(StubCode)
-    StubCode                                 0x0000ac68   Section        8  avkon{000a0000}-213.o(StubCode)
-    theImportedSymbol                        0x0000ac6c   Data           0  avkon{000a0000}-213.o(StubCode)
-    StubCode                                 0x0000ac70   Section        8  avkon{000a0000}-214.o(StubCode)
-    theImportedSymbol                        0x0000ac74   Data           0  avkon{000a0000}-214.o(StubCode)
-    StubCode                                 0x0000ac78   Section        8  avkon{000a0000}-215.o(StubCode)
-    theImportedSymbol                        0x0000ac7c   Data           0  avkon{000a0000}-215.o(StubCode)
-    StubCode                                 0x0000ac80   Section        8  avkon{000a0000}-216.o(StubCode)
-    theImportedSymbol                        0x0000ac84   Data           0  avkon{000a0000}-216.o(StubCode)
-    StubCode                                 0x0000ac88   Section        8  avkon{000a0000}-2163.o(StubCode)
-    theImportedSymbol                        0x0000ac8c   Data           0  avkon{000a0000}-2163.o(StubCode)
-    StubCode                                 0x0000ac90   Section        8  avkon{000a0000}-217.o(StubCode)
-    theImportedSymbol                        0x0000ac94   Data           0  avkon{000a0000}-217.o(StubCode)
-    StubCode                                 0x0000ac98   Section        8  avkon{000a0000}-2178.o(StubCode)
-    theImportedSymbol                        0x0000ac9c   Data           0  avkon{000a0000}-2178.o(StubCode)
-    StubCode                                 0x0000aca0   Section        8  avkon{000a0000}-220.o(StubCode)
-    theImportedSymbol                        0x0000aca4   Data           0  avkon{000a0000}-220.o(StubCode)
-    StubCode                                 0x0000aca8   Section        8  avkon{000a0000}-2591.o(StubCode)
-    theImportedSymbol                        0x0000acac   Data           0  avkon{000a0000}-2591.o(StubCode)
-    StubCode                                 0x0000acb0   Section        8  avkon{000a0000}-2624.o(StubCode)
-    theImportedSymbol                        0x0000acb4   Data           0  avkon{000a0000}-2624.o(StubCode)
-    StubCode                                 0x0000acb8   Section        8  avkon{000a0000}-2632.o(StubCode)
-    theImportedSymbol                        0x0000acbc   Data           0  avkon{000a0000}-2632.o(StubCode)
-    StubCode                                 0x0000acc0   Section        8  avkon{000a0000}-2895.o(StubCode)
-    theImportedSymbol                        0x0000acc4   Data           0  avkon{000a0000}-2895.o(StubCode)
-    StubCode                                 0x0000acc8   Section        8  avkon{000a0000}-2898.o(StubCode)
-    theImportedSymbol                        0x0000accc   Data           0  avkon{000a0000}-2898.o(StubCode)
-    StubCode                                 0x0000acd0   Section        8  avkon{000a0000}-2899.o(StubCode)
-    theImportedSymbol                        0x0000acd4   Data           0  avkon{000a0000}-2899.o(StubCode)
-    StubCode                                 0x0000acd8   Section        8  avkon{000a0000}-2900.o(StubCode)
-    theImportedSymbol                        0x0000acdc   Data           0  avkon{000a0000}-2900.o(StubCode)
-    StubCode                                 0x0000ace0   Section        8  avkon{000a0000}-2901.o(StubCode)
-    theImportedSymbol                        0x0000ace4   Data           0  avkon{000a0000}-2901.o(StubCode)
-    StubCode                                 0x0000ace8   Section        8  avkon{000a0000}-2902.o(StubCode)
-    theImportedSymbol                        0x0000acec   Data           0  avkon{000a0000}-2902.o(StubCode)
-    StubCode                                 0x0000acf0   Section        8  avkon{000a0000}-2903.o(StubCode)
-    theImportedSymbol                        0x0000acf4   Data           0  avkon{000a0000}-2903.o(StubCode)
-    StubCode                                 0x0000acf8   Section        8  avkon{000a0000}-2904.o(StubCode)
-    theImportedSymbol                        0x0000acfc   Data           0  avkon{000a0000}-2904.o(StubCode)
-    StubCode                                 0x0000ad00   Section        8  avkon{000a0000}-2905.o(StubCode)
-    theImportedSymbol                        0x0000ad04   Data           0  avkon{000a0000}-2905.o(StubCode)
-    StubCode                                 0x0000ad08   Section        8  avkon{000a0000}-2906.o(StubCode)
-    theImportedSymbol                        0x0000ad0c   Data           0  avkon{000a0000}-2906.o(StubCode)
-    StubCode                                 0x0000ad10   Section        8  avkon{000a0000}-2907.o(StubCode)
-    theImportedSymbol                        0x0000ad14   Data           0  avkon{000a0000}-2907.o(StubCode)
-    StubCode                                 0x0000ad18   Section        8  avkon{000a0000}-2909.o(StubCode)
-    theImportedSymbol                        0x0000ad1c   Data           0  avkon{000a0000}-2909.o(StubCode)
-    StubCode                                 0x0000ad20   Section        8  avkon{000a0000}-2910.o(StubCode)
-    theImportedSymbol                        0x0000ad24   Data           0  avkon{000a0000}-2910.o(StubCode)
-    StubCode                                 0x0000ad28   Section        8  avkon{000a0000}-2912.o(StubCode)
-    theImportedSymbol                        0x0000ad2c   Data           0  avkon{000a0000}-2912.o(StubCode)
-    StubCode                                 0x0000ad30   Section        8  avkon{000a0000}-2913.o(StubCode)
-    theImportedSymbol                        0x0000ad34   Data           0  avkon{000a0000}-2913.o(StubCode)
-    StubCode                                 0x0000ad38   Section        8  avkon{000a0000}-2914.o(StubCode)
-    theImportedSymbol                        0x0000ad3c   Data           0  avkon{000a0000}-2914.o(StubCode)
-    StubCode                                 0x0000ad40   Section        8  avkon{000a0000}-2917.o(StubCode)
-    theImportedSymbol                        0x0000ad44   Data           0  avkon{000a0000}-2917.o(StubCode)
-    StubCode                                 0x0000ad48   Section        8  avkon{000a0000}-2919.o(StubCode)
-    theImportedSymbol                        0x0000ad4c   Data           0  avkon{000a0000}-2919.o(StubCode)
-    StubCode                                 0x0000ad50   Section        8  avkon{000a0000}-2920.o(StubCode)
-    theImportedSymbol                        0x0000ad54   Data           0  avkon{000a0000}-2920.o(StubCode)
-    StubCode                                 0x0000ad58   Section        8  avkon{000a0000}-2922.o(StubCode)
-    theImportedSymbol                        0x0000ad5c   Data           0  avkon{000a0000}-2922.o(StubCode)
-    StubCode                                 0x0000ad60   Section        8  avkon{000a0000}-2928.o(StubCode)
-    theImportedSymbol                        0x0000ad64   Data           0  avkon{000a0000}-2928.o(StubCode)
-    StubCode                                 0x0000ad68   Section        8  avkon{000a0000}-2929.o(StubCode)
-    theImportedSymbol                        0x0000ad6c   Data           0  avkon{000a0000}-2929.o(StubCode)
-    StubCode                                 0x0000ad70   Section        8  avkon{000a0000}-2930.o(StubCode)
-    theImportedSymbol                        0x0000ad74   Data           0  avkon{000a0000}-2930.o(StubCode)
-    StubCode                                 0x0000ad78   Section        8  avkon{000a0000}-2932.o(StubCode)
-    theImportedSymbol                        0x0000ad7c   Data           0  avkon{000a0000}-2932.o(StubCode)
-    StubCode                                 0x0000ad80   Section        8  avkon{000a0000}-2934.o(StubCode)
-    theImportedSymbol                        0x0000ad84   Data           0  avkon{000a0000}-2934.o(StubCode)
-    StubCode                                 0x0000ad88   Section        8  avkon{000a0000}-2936.o(StubCode)
-    theImportedSymbol                        0x0000ad8c   Data           0  avkon{000a0000}-2936.o(StubCode)
-    StubCode                                 0x0000ad90   Section        8  avkon{000a0000}-2993.o(StubCode)
-    theImportedSymbol                        0x0000ad94   Data           0  avkon{000a0000}-2993.o(StubCode)
-    StubCode                                 0x0000ad98   Section        8  avkon{000a0000}-2997.o(StubCode)
-    theImportedSymbol                        0x0000ad9c   Data           0  avkon{000a0000}-2997.o(StubCode)
-    StubCode                                 0x0000ada0   Section        8  avkon{000a0000}-3417.o(StubCode)
-    theImportedSymbol                        0x0000ada4   Data           0  avkon{000a0000}-3417.o(StubCode)
-    StubCode                                 0x0000ada8   Section        8  avkon{000a0000}-3420.o(StubCode)
-    theImportedSymbol                        0x0000adac   Data           0  avkon{000a0000}-3420.o(StubCode)
-    StubCode                                 0x0000adb0   Section        8  avkon{000a0000}-3421.o(StubCode)
-    theImportedSymbol                        0x0000adb4   Data           0  avkon{000a0000}-3421.o(StubCode)
-    StubCode                                 0x0000adb8   Section        8  avkon{000a0000}-3422.o(StubCode)
-    theImportedSymbol                        0x0000adbc   Data           0  avkon{000a0000}-3422.o(StubCode)
-    StubCode                                 0x0000adc0   Section        8  avkon{000a0000}-3423.o(StubCode)
-    theImportedSymbol                        0x0000adc4   Data           0  avkon{000a0000}-3423.o(StubCode)
-    StubCode                                 0x0000adc8   Section        8  avkon{000a0000}-3424.o(StubCode)
-    theImportedSymbol                        0x0000adcc   Data           0  avkon{000a0000}-3424.o(StubCode)
-    StubCode                                 0x0000add0   Section        8  avkon{000a0000}-367.o(StubCode)
-    theImportedSymbol                        0x0000add4   Data           0  avkon{000a0000}-367.o(StubCode)
-    StubCode                                 0x0000add8   Section        8  avkon{000a0000}-368.o(StubCode)
-    theImportedSymbol                        0x0000addc   Data           0  avkon{000a0000}-368.o(StubCode)
-    StubCode                                 0x0000ade0   Section        8  avkon{000a0000}-369.o(StubCode)
-    theImportedSymbol                        0x0000ade4   Data           0  avkon{000a0000}-369.o(StubCode)
-    StubCode                                 0x0000ade8   Section        8  avkon{000a0000}-370.o(StubCode)
-    theImportedSymbol                        0x0000adec   Data           0  avkon{000a0000}-370.o(StubCode)
-    StubCode                                 0x0000adf0   Section        8  avkon{000a0000}-372.o(StubCode)
-    theImportedSymbol                        0x0000adf4   Data           0  avkon{000a0000}-372.o(StubCode)
-    StubCode                                 0x0000adf8   Section        8  avkon{000a0000}-373.o(StubCode)
-    theImportedSymbol                        0x0000adfc   Data           0  avkon{000a0000}-373.o(StubCode)
-    StubCode                                 0x0000ae00   Section        8  avkon{000a0000}-374.o(StubCode)
-    theImportedSymbol                        0x0000ae04   Data           0  avkon{000a0000}-374.o(StubCode)
-    StubCode                                 0x0000ae08   Section        8  avkon{000a0000}-375.o(StubCode)
-    theImportedSymbol                        0x0000ae0c   Data           0  avkon{000a0000}-375.o(StubCode)
-    StubCode                                 0x0000ae10   Section        8  avkon{000a0000}-377.o(StubCode)
-    theImportedSymbol                        0x0000ae14   Data           0  avkon{000a0000}-377.o(StubCode)
-    StubCode                                 0x0000ae18   Section        8  avkon{000a0000}-3826.o(StubCode)
-    theImportedSymbol                        0x0000ae1c   Data           0  avkon{000a0000}-3826.o(StubCode)
-    StubCode                                 0x0000ae20   Section        8  avkon{000a0000}-3831.o(StubCode)
-    theImportedSymbol                        0x0000ae24   Data           0  avkon{000a0000}-3831.o(StubCode)
-    StubCode                                 0x0000ae28   Section        8  avkon{000a0000}-3832.o(StubCode)
-    theImportedSymbol                        0x0000ae2c   Data           0  avkon{000a0000}-3832.o(StubCode)
-    StubCode                                 0x0000ae30   Section        8  avkon{000a0000}-3857.o(StubCode)
-    theImportedSymbol                        0x0000ae34   Data           0  avkon{000a0000}-3857.o(StubCode)
-    StubCode                                 0x0000ae38   Section        8  avkon{000a0000}-3860.o(StubCode)
-    theImportedSymbol                        0x0000ae3c   Data           0  avkon{000a0000}-3860.o(StubCode)
-    StubCode                                 0x0000ae40   Section        8  avkon{000a0000}-3861.o(StubCode)
-    theImportedSymbol                        0x0000ae44   Data           0  avkon{000a0000}-3861.o(StubCode)
-    StubCode                                 0x0000ae48   Section        8  avkon{000a0000}-3868.o(StubCode)
-    theImportedSymbol                        0x0000ae4c   Data           0  avkon{000a0000}-3868.o(StubCode)
-    StubCode                                 0x0000ae50   Section        8  avkon{000a0000}-3947.o(StubCode)
-    theImportedSymbol                        0x0000ae54   Data           0  avkon{000a0000}-3947.o(StubCode)
-    StubCode                                 0x0000ae58   Section        8  avkon{000a0000}-3948.o(StubCode)
-    theImportedSymbol                        0x0000ae5c   Data           0  avkon{000a0000}-3948.o(StubCode)
-    StubCode                                 0x0000ae60   Section        8  avkon{000a0000}-3949.o(StubCode)
-    theImportedSymbol                        0x0000ae64   Data           0  avkon{000a0000}-3949.o(StubCode)
-    StubCode                                 0x0000ae68   Section        8  avkon{000a0000}-3983.o(StubCode)
-    theImportedSymbol                        0x0000ae6c   Data           0  avkon{000a0000}-3983.o(StubCode)
-    StubCode                                 0x0000ae70   Section        8  avkon{000a0000}-4014.o(StubCode)
-    theImportedSymbol                        0x0000ae74   Data           0  avkon{000a0000}-4014.o(StubCode)
-    StubCode                                 0x0000ae78   Section        8  avkon{000a0000}-4030.o(StubCode)
-    theImportedSymbol                        0x0000ae7c   Data           0  avkon{000a0000}-4030.o(StubCode)
-    StubCode                                 0x0000ae80   Section        8  AknIcon{000a0000}-13.o(StubCode)
-    theImportedSymbol                        0x0000ae84   Data           0  AknIcon{000a0000}-13.o(StubCode)
-    StubCode                                 0x0000ae88   Section        8  egul{000a0000}-94.o(StubCode)
-    theImportedSymbol                        0x0000ae8c   Data           0  egul{000a0000}-94.o(StubCode)
-    StubCode                                 0x0000ae90   Section        8  egul{000a0000}-95.o(StubCode)
-    theImportedSymbol                        0x0000ae94   Data           0  egul{000a0000}-95.o(StubCode)
-    StubCode                                 0x0000ae98   Section        8  gdi{000a0000}-310.o(StubCode)
-    theImportedSymbol                        0x0000ae9c   Data           0  gdi{000a0000}-310.o(StubCode)
-    StubCode                                 0x0000aea0   Section        8  gdi{000a0000}-311.o(StubCode)
-    theImportedSymbol                        0x0000aea4   Data           0  gdi{000a0000}-311.o(StubCode)
-    StubCode                                 0x0000aea8   Section        8  gdi{000a0000}-312.o(StubCode)
-    theImportedSymbol                        0x0000aeac   Data           0  gdi{000a0000}-312.o(StubCode)
-    StubCode                                 0x0000aeb0   Section        8  fbscli{000a0000}-26.o(StubCode)
-    theImportedSymbol                        0x0000aeb4   Data           0  fbscli{000a0000}-26.o(StubCode)
-    StubCode                                 0x0000aeb8   Section        8  fbscli{000a0000}-31.o(StubCode)
-    theImportedSymbol                        0x0000aebc   Data           0  fbscli{000a0000}-31.o(StubCode)
-    StubCode                                 0x0000aec0   Section        8  eposlandmarks{000a0000}-12.o(StubCode)
-    theImportedSymbol                        0x0000aec4   Data           0  eposlandmarks{000a0000}-12.o(StubCode)
-    StubCode                                 0x0000aec8   Section        8  eposlandmarks{000a0000}-15.o(StubCode)
-    theImportedSymbol                        0x0000aecc   Data           0  eposlandmarks{000a0000}-15.o(StubCode)
-    StubCode                                 0x0000aed0   Section        8  eposlandmarks{000a0000}-4.o(StubCode)
-    theImportedSymbol                        0x0000aed4   Data           0  eposlandmarks{000a0000}-4.o(StubCode)
-    StubCode                                 0x0000aed8   Section        8  eposlandmarks{000a0000}-50.o(StubCode)
-    theImportedSymbol                        0x0000aedc   Data           0  eposlandmarks{000a0000}-50.o(StubCode)
-    StubCode                                 0x0000aee0   Section        8  eposlandmarks{000a0000}-65.o(StubCode)
-    theImportedSymbol                        0x0000aee4   Data           0  eposlandmarks{000a0000}-65.o(StubCode)
-    StubCode                                 0x0000aee8   Section        8  eposlandmarks{000a0000}-67.o(StubCode)
-    theImportedSymbol                        0x0000aeec   Data           0  eposlandmarks{000a0000}-67.o(StubCode)
-    StubCode                                 0x0000aef0   Section        8  eposlandmarks{000a0000}-75.o(StubCode)
-    theImportedSymbol                        0x0000aef4   Data           0  eposlandmarks{000a0000}-75.o(StubCode)
-    StubCode                                 0x0000aef8   Section        8  lbs{000a0000}-152.o(StubCode)
-    theImportedSymbol                        0x0000aefc   Data           0  lbs{000a0000}-152.o(StubCode)
-    StubCode                                 0x0000af00   Section        8  lbs{000a0000}-180.o(StubCode)
-    theImportedSymbol                        0x0000af04   Data           0  lbs{000a0000}-180.o(StubCode)
-    StubCode                                 0x0000af08   Section        8  lbs{000a0000}-181.o(StubCode)
-    theImportedSymbol                        0x0000af0c   Data           0  lbs{000a0000}-181.o(StubCode)
-    StubCode                                 0x0000af10   Section        8  lbs{000a0000}-205.o(StubCode)
-    theImportedSymbol                        0x0000af14   Data           0  lbs{000a0000}-205.o(StubCode)
-    StubCode                                 0x0000af18   Section        8  lbs{000a0000}-207.o(StubCode)
-    theImportedSymbol                        0x0000af1c   Data           0  lbs{000a0000}-207.o(StubCode)
-    StubCode                                 0x0000af20   Section        8  lbs{000a0000}-21.o(StubCode)
-    theImportedSymbol                        0x0000af24   Data           0  lbs{000a0000}-21.o(StubCode)
-    StubCode                                 0x0000af28   Section        8  lbs{000a0000}-214.o(StubCode)
-    theImportedSymbol                        0x0000af2c   Data           0  lbs{000a0000}-214.o(StubCode)
-    StubCode                                 0x0000af30   Section        8  lbs{000a0000}-223.o(StubCode)
-    theImportedSymbol                        0x0000af34   Data           0  lbs{000a0000}-223.o(StubCode)
-    StubCode                                 0x0000af38   Section        8  lbs{000a0000}-225.o(StubCode)
-    theImportedSymbol                        0x0000af3c   Data           0  lbs{000a0000}-225.o(StubCode)
-    StubCode                                 0x0000af40   Section        8  lbs{000a0000}-226.o(StubCode)
-    theImportedSymbol                        0x0000af44   Data           0  lbs{000a0000}-226.o(StubCode)
-    StubCode                                 0x0000af48   Section        8  lbs{000a0000}-23.o(StubCode)
-    theImportedSymbol                        0x0000af4c   Data           0  lbs{000a0000}-23.o(StubCode)
-    StubCode                                 0x0000af50   Section        8  lbs{000a0000}-28.o(StubCode)
-    theImportedSymbol                        0x0000af54   Data           0  lbs{000a0000}-28.o(StubCode)
-    StubCode                                 0x0000af58   Section        8  lbs{000a0000}-304.o(StubCode)
-    theImportedSymbol                        0x0000af5c   Data           0  lbs{000a0000}-304.o(StubCode)
-    StubCode                                 0x0000af60   Section        8  lbs{000a0000}-306.o(StubCode)
-    theImportedSymbol                        0x0000af64   Data           0  lbs{000a0000}-306.o(StubCode)
-    StubCode                                 0x0000af68   Section        8  mnservicelib{000a0000}-1.o(StubCode)
-    theImportedSymbol                        0x0000af6c   Data           0  mnservicelib{000a0000}-1.o(StubCode)
-    StubCode                                 0x0000af70   Section        8  mnservicelib{000a0000}-10.o(StubCode)
-    theImportedSymbol                        0x0000af74   Data           0  mnservicelib{000a0000}-10.o(StubCode)
-    StubCode                                 0x0000af78   Section        8  mnservicelib{000a0000}-11.o(StubCode)
-    theImportedSymbol                        0x0000af7c   Data           0  mnservicelib{000a0000}-11.o(StubCode)
-    StubCode                                 0x0000af80   Section        8  mnservicelib{000a0000}-12.o(StubCode)
-    theImportedSymbol                        0x0000af84   Data           0  mnservicelib{000a0000}-12.o(StubCode)
-    StubCode                                 0x0000af88   Section        8  mnservicelib{000a0000}-13.o(StubCode)
-    theImportedSymbol                        0x0000af8c   Data           0  mnservicelib{000a0000}-13.o(StubCode)
-    StubCode                                 0x0000af90   Section        8  mnservicelib{000a0000}-14.o(StubCode)
-    theImportedSymbol                        0x0000af94   Data           0  mnservicelib{000a0000}-14.o(StubCode)
-    StubCode                                 0x0000af98   Section        8  mnservicelib{000a0000}-15.o(StubCode)
-    theImportedSymbol                        0x0000af9c   Data           0  mnservicelib{000a0000}-15.o(StubCode)
-    StubCode                                 0x0000afa0   Section        8  mnservicelib{000a0000}-16.o(StubCode)
-    theImportedSymbol                        0x0000afa4   Data           0  mnservicelib{000a0000}-16.o(StubCode)
-    StubCode                                 0x0000afa8   Section        8  mnservicelib{000a0000}-17.o(StubCode)
-    theImportedSymbol                        0x0000afac   Data           0  mnservicelib{000a0000}-17.o(StubCode)
-    StubCode                                 0x0000afb0   Section        8  mnservicelib{000a0000}-2.o(StubCode)
-    theImportedSymbol                        0x0000afb4   Data           0  mnservicelib{000a0000}-2.o(StubCode)
-    StubCode                                 0x0000afb8   Section        8  mnservicelib{000a0000}-20.o(StubCode)
-    theImportedSymbol                        0x0000afbc   Data           0  mnservicelib{000a0000}-20.o(StubCode)
-    StubCode                                 0x0000afc0   Section        8  mnservicelib{000a0000}-28.o(StubCode)
-    theImportedSymbol                        0x0000afc4   Data           0  mnservicelib{000a0000}-28.o(StubCode)
-    StubCode                                 0x0000afc8   Section        8  mnservicelib{000a0000}-29.o(StubCode)
-    theImportedSymbol                        0x0000afcc   Data           0  mnservicelib{000a0000}-29.o(StubCode)
-    StubCode                                 0x0000afd0   Section        8  mnservicelib{000a0000}-30.o(StubCode)
-    theImportedSymbol                        0x0000afd4   Data           0  mnservicelib{000a0000}-30.o(StubCode)
-    StubCode                                 0x0000afd8   Section        8  mnservicelib{000a0000}-33.o(StubCode)
-    theImportedSymbol                        0x0000afdc   Data           0  mnservicelib{000a0000}-33.o(StubCode)
-    StubCode                                 0x0000afe0   Section        8  mnservicelib{000a0000}-4.o(StubCode)
-    theImportedSymbol                        0x0000afe4   Data           0  mnservicelib{000a0000}-4.o(StubCode)
-    StubCode                                 0x0000afe8   Section        8  mnservicelib{000a0000}-5.o(StubCode)
-    theImportedSymbol                        0x0000afec   Data           0  mnservicelib{000a0000}-5.o(StubCode)
-    StubCode                                 0x0000aff0   Section        8  mnservicelib{000a0000}-7.o(StubCode)
-    theImportedSymbol                        0x0000aff4   Data           0  mnservicelib{000a0000}-7.o(StubCode)
-    StubCode                                 0x0000aff8   Section        8  mnrefproviderengine{000a0000}-12.o(StubCode)
-    theImportedSymbol                        0x0000affc   Data           0  mnrefproviderengine{000a0000}-12.o(StubCode)
-    StubCode                                 0x0000b000   Section        8  mnrefproviderengine{000a0000}-17.o(StubCode)
-    theImportedSymbol                        0x0000b004   Data           0  mnrefproviderengine{000a0000}-17.o(StubCode)
-    StubCode                                 0x0000b008   Section        8  mnrefproviderengine{000a0000}-19.o(StubCode)
-    theImportedSymbol                        0x0000b00c   Data           0  mnrefproviderengine{000a0000}-19.o(StubCode)
-    StubCode                                 0x0000b010   Section        8  mnrefproviderengine{000a0000}-20.o(StubCode)
-    theImportedSymbol                        0x0000b014   Data           0  mnrefproviderengine{000a0000}-20.o(StubCode)
-    StubCode                                 0x0000b018   Section        8  mnrefproviderengine{000a0000}-22.o(StubCode)
-    theImportedSymbol                        0x0000b01c   Data           0  mnrefproviderengine{000a0000}-22.o(StubCode)
-    StubCode                                 0x0000b020   Section        8  mnrefproviderengine{000a0000}-23.o(StubCode)
-    theImportedSymbol                        0x0000b024   Data           0  mnrefproviderengine{000a0000}-23.o(StubCode)
-    StubCode                                 0x0000b028   Section        8  mnrefproviderengine{000a0000}-24.o(StubCode)
-    theImportedSymbol                        0x0000b02c   Data           0  mnrefproviderengine{000a0000}-24.o(StubCode)
-    StubCode                                 0x0000b030   Section        8  mnrefproviderengine{000a0000}-25.o(StubCode)
-    theImportedSymbol                        0x0000b034   Data           0  mnrefproviderengine{000a0000}-25.o(StubCode)
-    StubCode                                 0x0000b038   Section        8  mnrefproviderengine{000a0000}-26.o(StubCode)
-    theImportedSymbol                        0x0000b03c   Data           0  mnrefproviderengine{000a0000}-26.o(StubCode)
-    StubCode                                 0x0000b040   Section        8  mnrefproviderengine{000a0000}-27.o(StubCode)
-    theImportedSymbol                        0x0000b044   Data           0  mnrefproviderengine{000a0000}-27.o(StubCode)
-    StubCode                                 0x0000b048   Section        8  mnrefproviderengine{000a0000}-28.o(StubCode)
-    theImportedSymbol                        0x0000b04c   Data           0  mnrefproviderengine{000a0000}-28.o(StubCode)
-    StubCode                                 0x0000b050   Section        8  mnrefproviderengine{000a0000}-29.o(StubCode)
-    theImportedSymbol                        0x0000b054   Data           0  mnrefproviderengine{000a0000}-29.o(StubCode)
-    StubCode                                 0x0000b058   Section        8  mnrefproviderengine{000a0000}-30.o(StubCode)
-    theImportedSymbol                        0x0000b05c   Data           0  mnrefproviderengine{000a0000}-30.o(StubCode)
-    StubCode                                 0x0000b060   Section        8  mnrefproviderengine{000a0000}-31.o(StubCode)
-    theImportedSymbol                        0x0000b064   Data           0  mnrefproviderengine{000a0000}-31.o(StubCode)
-    StubCode                                 0x0000b068   Section        8  mnrefproviderengine{000a0000}-32.o(StubCode)
-    theImportedSymbol                        0x0000b06c   Data           0  mnrefproviderengine{000a0000}-32.o(StubCode)
-    StubCode                                 0x0000b070   Section        8  mnrefproviderengine{000a0000}-33.o(StubCode)
-    theImportedSymbol                        0x0000b074   Data           0  mnrefproviderengine{000a0000}-33.o(StubCode)
-    StubCode                                 0x0000b078   Section        8  mnrefproviderengine{000a0000}-34.o(StubCode)
-    theImportedSymbol                        0x0000b07c   Data           0  mnrefproviderengine{000a0000}-34.o(StubCode)
-    StubCode                                 0x0000b080   Section        8  mnrefproviderengine{000a0000}-38.o(StubCode)
-    theImportedSymbol                        0x0000b084   Data           0  mnrefproviderengine{000a0000}-38.o(StubCode)
-    StubCode                                 0x0000b088   Section        8  mnrefproviderengine{000a0000}-39.o(StubCode)
-    theImportedSymbol                        0x0000b08c   Data           0  mnrefproviderengine{000a0000}-39.o(StubCode)
-    StubCode                                 0x0000b090   Section        8  mnrefproviderengine{000a0000}-40.o(StubCode)
-    theImportedSymbol                        0x0000b094   Data           0  mnrefproviderengine{000a0000}-40.o(StubCode)
-    StubCode                                 0x0000b098   Section        8  mnrefproviderengine{000a0000}-41.o(StubCode)
-    theImportedSymbol                        0x0000b09c   Data           0  mnrefproviderengine{000a0000}-41.o(StubCode)
-    StubCode                                 0x0000b0a0   Section        8  mnrefproviderengine{000a0000}-42.o(StubCode)
-    theImportedSymbol                        0x0000b0a4   Data           0  mnrefproviderengine{000a0000}-42.o(StubCode)
-    StubCode                                 0x0000b0a8   Section        8  mnrefproviderengine{000a0000}-43.o(StubCode)
-    theImportedSymbol                        0x0000b0ac   Data           0  mnrefproviderengine{000a0000}-43.o(StubCode)
-    StubCode                                 0x0000b0b0   Section        8  mnrefproviderengine{000a0000}-44.o(StubCode)
-    theImportedSymbol                        0x0000b0b4   Data           0  mnrefproviderengine{000a0000}-44.o(StubCode)
-    StubCode                                 0x0000b0b8   Section        8  mnrefproviderengine{000a0000}-45.o(StubCode)
-    theImportedSymbol                        0x0000b0bc   Data           0  mnrefproviderengine{000a0000}-45.o(StubCode)
-    StubCode                                 0x0000b0c0   Section        8  mnrefproviderengine{000a0000}-46.o(StubCode)
-    theImportedSymbol                        0x0000b0c4   Data           0  mnrefproviderengine{000a0000}-46.o(StubCode)
-    StubCode                                 0x0000b0c8   Section        8  mnrefproviderengine{000a0000}-47.o(StubCode)
-    theImportedSymbol                        0x0000b0cc   Data           0  mnrefproviderengine{000a0000}-47.o(StubCode)
-    StubCode                                 0x0000b0d0   Section        8  mnrefproviderengine{000a0000}-48.o(StubCode)
-    theImportedSymbol                        0x0000b0d4   Data           0  mnrefproviderengine{000a0000}-48.o(StubCode)
-    StubCode                                 0x0000b0d8   Section        8  mnrefproviderengine{000a0000}-50.o(StubCode)
-    theImportedSymbol                        0x0000b0dc   Data           0  mnrefproviderengine{000a0000}-50.o(StubCode)
-    StubCode                                 0x0000b0e0   Section        8  mnrefproviderengine{000a0000}-51.o(StubCode)
-    theImportedSymbol                        0x0000b0e4   Data           0  mnrefproviderengine{000a0000}-51.o(StubCode)
-    StubCode                                 0x0000b0e8   Section        8  mnrefproviderengine{000a0000}-53.o(StubCode)
-    theImportedSymbol                        0x0000b0ec   Data           0  mnrefproviderengine{000a0000}-53.o(StubCode)
-    StubCode                                 0x0000b0f0   Section        8  mnrefproviderengine{000a0000}-54.o(StubCode)
-    theImportedSymbol                        0x0000b0f4   Data           0  mnrefproviderengine{000a0000}-54.o(StubCode)
-    StubCode                                 0x0000b0f8   Section        8  dfpaeabi{000a0000}-12.o(StubCode)
-    theImportedSymbol                        0x0000b0fc   Data           0  dfpaeabi{000a0000}-12.o(StubCode)
-    StubCode                                 0x0000b100   Section        8  dfpaeabi{000a0000}-20.o(StubCode)
-    theImportedSymbol                        0x0000b104   Data           0  dfpaeabi{000a0000}-20.o(StubCode)
-    StubCode                                 0x0000b108   Section        8  dfpaeabi{000a0000}-23.o(StubCode)
-    theImportedSymbol                        0x0000b10c   Data           0  dfpaeabi{000a0000}-23.o(StubCode)
-    StubCode                                 0x0000b110   Section        8  dfpaeabi{000a0000}-24.o(StubCode)
-    theImportedSymbol                        0x0000b114   Data           0  dfpaeabi{000a0000}-24.o(StubCode)
-    StubCode                                 0x0000b118   Section        8  dfpaeabi{000a0000}-41.o(StubCode)
-    theImportedSymbol                        0x0000b11c   Data           0  dfpaeabi{000a0000}-41.o(StubCode)
-    StubCode                                 0x0000b120   Section        8  dfpaeabi{000a0000}-8.o(StubCode)
-    theImportedSymbol                        0x0000b124   Data           0  dfpaeabi{000a0000}-8.o(StubCode)
-    StubCode                                 0x0000b128   Section        8  drtaeabi{000a0000}-147.o(StubCode)
-    theImportedSymbol                        0x0000b12c   Data           0  drtaeabi{000a0000}-147.o(StubCode)
-    StubCode                                 0x0000b130   Section        8  drtaeabi{000a0000}-158.o(StubCode)
-    theImportedSymbol                        0x0000b134   Data           0  drtaeabi{000a0000}-158.o(StubCode)
-    StubCode                                 0x0000b138   Section        8  drtaeabi{000a0000}-159.o(StubCode)
-    theImportedSymbol                        0x0000b13c   Data           0  drtaeabi{000a0000}-159.o(StubCode)
-    StubCode                                 0x0000b140   Section        8  drtaeabi{000a0000}-180.o(StubCode)
-    theImportedSymbol                        0x0000b144   Data           0  drtaeabi{000a0000}-180.o(StubCode)
-    StubCode                                 0x0000b148   Section        8  drtaeabi{000a0000}-182.o(StubCode)
-    theImportedSymbol                        0x0000b14c   Data           0  drtaeabi{000a0000}-182.o(StubCode)
-    StubCode                                 0x0000b150   Section        8  drtaeabi{000a0000}-183.o(StubCode)
-    theImportedSymbol                        0x0000b154   Data           0  drtaeabi{000a0000}-183.o(StubCode)
-    StubCode                                 0x0000b158   Section        8  drtaeabi{000a0000}-184.o(StubCode)
-    theImportedSymbol                        0x0000b15c   Data           0  drtaeabi{000a0000}-184.o(StubCode)
-    StubCode                                 0x0000b160   Section        8  drtaeabi{000a0000}-189.o(StubCode)
-    theImportedSymbol                        0x0000b164   Data           0  drtaeabi{000a0000}-189.o(StubCode)
-    StubCode                                 0x0000b168   Section        8  scppnwdl{000a0000}-3.o(StubCode)
-    theImportedSymbol                        0x0000b16c   Data           0  scppnwdl{000a0000}-3.o(StubCode)
-    StubCode                                 0x0000b170   Section        8  euser{000a0000}-1360.o(StubCode)
-    theImportedSymbol                        0x0000b174   Data           0  euser{000a0000}-1360.o(StubCode)
-    StubCode                                 0x0000b178   Section        8  euser{000a0000}-641.o(StubCode)
-    theImportedSymbol                        0x0000b17c   Data           0  euser{000a0000}-641.o(StubCode)
-    StubCode                                 0x0000b180   Section        8  euser{000a0000}-585.o(StubCode)
-    theImportedSymbol                        0x0000b184   Data           0  euser{000a0000}-585.o(StubCode)
-    StubCode                                 0x0000b188   Section        8  euser{000a0000}-650.o(StubCode)
-    theImportedSymbol                        0x0000b18c   Data           0  euser{000a0000}-650.o(StubCode)
-    StubCode                                 0x0000b190   Section        8  drtaeabi{000a0000}-204.o(StubCode)
-    theImportedSymbol                        0x0000b194   Data           0  drtaeabi{000a0000}-204.o(StubCode)
-    i._ZN12CAknDocumentD2Ev                  0x0000b198   Section        8  mnrefprovider.in(i._ZN12CAknDocumentD2Ev)
-    i._ZN12CApaDocument16DetachFromStoreLEN8CPicture7TDetachE 0x0000b1a0   Section        2  mnrefprovider.in(i._ZN12CApaDocument16DetachFromStoreLEN8CPicture7TDetachE)
-    i._ZN12CArrayPtrSegI8CGulIconED0Ev       0x0000b1a2   Section       16  mnrefprovider.in(i._ZN12CArrayPtrSegI8CGulIconED0Ev)
-    i._ZN12CArrayPtrSegI8CGulIconED1Ev       0x0000b1b2   Section        8  mnrefprovider.in(i._ZN12CArrayPtrSegI8CGulIconED1Ev)
-    i._ZN13CAknViewAppUiC1Ev                 0x0000b1bc   Section       60  mnrefprovider.in(i._ZN13CAknViewAppUiC1Ev)
-    i._ZN13CAknViewAppUiC1Ev.clean           0x0000b1f8   Section       10  mnrefprovider.in(i._ZN13CAknViewAppUiC1Ev.clean)
-    i._ZN16CMnrpApplicationD0Ev              0x0000b202   Section       16  mnrefprovider.in(i._ZN16CMnrpApplicationD0Ev)
-    i._ZN16CMnrpApplicationD1Ev              0x0000b212   Section        8  mnrefprovider.in(i._ZN16CMnrpApplicationD1Ev)
-    i._ZN5CBasenwEj                          0x0000b21a   Section        8  mnrefprovider.in(i._ZN5CBasenwEj)
-    i._ZN5TRectC1ERKS_                       0x0000b222   Section       18  mnrefprovider.in(i._ZN5TRectC1ERKS_)
-    i._ZN9CArrayFixIP8CGulIconED1Ev          0x0000b234   Section        8  mnrefprovider.in(i._ZN9CArrayFixIP8CGulIconED1Ev)
-    i._ZN9CArrayPtrI8CGulIconED1Ev           0x0000b23c   Section        8  mnrefprovider.in(i._ZN9CArrayPtrI8CGulIconED1Ev)
-    t._ZN12CleanupCloseI6RArrayIiEE5CloseEPv 0x0000b244   Section        8  mnrefprovider.in(t._ZN12CleanupCloseI6RArrayIiEE5CloseEPv)
-    t._ZN12CleanupCloseI6RArrayImEE5CloseEPv 0x0000b24c   Section        8  mnrefprovider.in(t._ZN12CleanupCloseI6RArrayImEE5CloseEPv)
-    t._ZN13RPointerArrayIN14CMnrpNaviModel9CListItemEE15ResetAndDestroyEv 0x0000b254   Section       48  mnrefprovider.in(t._ZN13RPointerArrayIN14CMnrpNaviModel9CListItemEE15ResetAndDestroyEv)
-    t._ZN13RPointerArrayIN14CMnrpNaviModel9CListItemEE7AppendLEPKS1_ 0x0000b284   Section       12  mnrefprovider.in(t._ZN13RPointerArrayIN14CMnrpNaviModel9CListItemEE7AppendLEPKS1_)
-    t._ZN4TBufILi15EEC1Ev                    0x0000b290   Section       10  mnrefprovider.in(t._ZN4TBufILi15EEC1Ev)
-    .ARM.extab                               0x0000b29c   Section       16  uc_exe_.o(.ARM.extab)
-    .extab._Z14NewApplicationv               0x0000b2ac   Data           0  mnrefprovider.in(.ARM.extab)
-    .extab._ZN5CBasenwEj                     0x0000b2bc   Data           0  mnrefprovider.in(.ARM.extab)
-    .extab._ZN10CMnrpAppUiD1Ev               0x0000b2cc   Data           0  mnrefprovider.in(.ARM.extab)
-    .extab._ZN10CMnrpAppUi13StopSelectionEv  0x0000b2dc   Data           0  mnrefprovider.in(.ARM.extab)
-    .extab._ZN13CAknViewAppUiC1Ev            0x0000b30c   Data           0  mnrefprovider.in(.ARM.extab)
-    .extab._ZN13CMnrpDocumentD1Ev            0x0000b31c   Data           0  mnrefprovider.in(.ARM.extab)
-    .extab._ZN12CMnrpAppViewD1Ev             0x0000b32c   Data           0  mnrefprovider.in(.ARM.extab)
-    .extab._ZN12CMnrpMapViewD1Ev             0x0000b33c   Data           0  mnrefprovider.in(.ARM.extab)
-    .extab._ZN15CMnrpMapControlC1ER12CMnrpMapView 0x0000b36c   Data           0  mnrefprovider.in(.ARM.extab)
-    .extab._ZN15CMnrpMapControlD1Ev          0x0000b37c   Data           0  mnrefprovider.in(.ARM.extab)
-    .extab._ZN15CMnrpMapControl11SizeChangedEv 0x0000b38c   Data           0  mnrefprovider.in(.ARM.extab)
-    .extab._ZN13CMnrpNaviViewD1Ev            0x0000b3d4   Data           0  mnrefprovider.in(.ARM.extab)
-    .extab._ZN14CMnrpNaviModelC1ER18MNaviModelObserverR11CMnrpEngine 0x0000b3e4   Data           0  mnrefprovider.in(.ARM.extab)
-    .extab._ZN14CMnrpNaviModelD1Ev           0x0000b3f4   Data           0  mnrefprovider.in(.ARM.extab)
-    .extab._ZN16CMnrpNaviControlD1Ev         0x0000b404   Data           0  mnrefprovider.in(.ARM.extab)
-    .extab._ZN19CMnrpMapViewServiceD1Ev      0x0000b414   Data           0  mnrefprovider.in(.ARM.extab)
-    .extab._ZN19CMnrpMapViewService16HandleSelectionLERK11TCoordinate 0x0000b424   Data           0  mnrefprovider.in(.ARM.extab)
-    .extab.CallThrdProcEntry                 0x0000b44c   Data           0  callfirstprocessfn.o(.ARM.extab)
-    .constdata$1                             0x0000b468   Data           0  mnrefprovider.in(.constdata)
-    KUidMnRefProviderApp                     0x0000b468   Data           4  mnrefprovider.in(.constdata)
-    .constdata                               0x0000b468   Section        4  mnrefprovider.in(.constdata)
-    .constdata$1                             0x0000b46c   Data           0  mnrefprovider.in(.constdata)
-    KMbmFile                                 0x0000b46c   Data          72  mnrefprovider.in(.constdata)
-    .constdata                               0x0000b46c   Section       92  mnrefprovider.in(.constdata)
-    KListItemFormat@_Z12AddLandmarkLRK12CPosLandmarkR12CDesC16ArrayR9CArrayPtrI8CGulIconE_0 0x0000b4b4   Data          20  mnrefprovider.in(.constdata)
-    .constdata$1                             0x0000b4c8   Data           0  mnrefprovider.in(.constdata)
-    KEmpty@_ZN12CMnrpAppView11DoActivateLERK10TVwsViewId4TUidRK6TDesC8_0 0x0000b4c8   Data           8  mnrefprovider.in(.constdata)
-    .constdata                               0x0000b4c8   Section        8  mnrefprovider.in(.constdata)
-    .constdata$1                             0x0000b4d0   Data           0  mnrefprovider.in(.constdata)
-    KMapView@_ZN12CMnrpMapView11DoActivateLERK10TVwsViewId4TUidRK6TDesC8_0 0x0000b4d0   Data          20  mnrefprovider.in(.constdata)
-    .constdata                               0x0000b4d0   Section       20  mnrefprovider.in(.constdata)
-    .constdata$1                             0x0000b4e4   Data           0  mnrefprovider.in(.constdata)
-    _ZZN15CMnrpMapControl18HandleModelUpdateLEvE17KMessageIgnoredLm@_ZN15CMnrpMapControl18HandleModelUpdateLEv_0 0x0000b4e4   Data         108  mnrefprovider.in(.constdata)
-    .constdata                               0x0000b4e4   Section      220  mnrefprovider.in(.constdata)
-    _ZZN15CMnrpMapControl18HandleModelUpdateLEvE18KMessageIgnoredLms@_ZN15CMnrpMapControl18HandleModelUpdateLEv_1 0x0000b550   Data         112  mnrefprovider.in(.constdata)
-    .constdata$1                             0x0000b5c0   Data           0  mnrefprovider.in(.constdata)
-    KNavigation@_ZN13CMnrpNaviView11DoActivateLERK10TVwsViewId4TUidRK6TDesC8_0 0x0000b5c0   Data          28  mnrefprovider.in(.constdata)
-    .constdata                               0x0000b5c0   Section       28  mnrefprovider.in(.constdata)
-    .constdata$1                             0x0000b5dc   Data           0  mnrefprovider.in(.constdata)
-    KNotDefined                              0x0000b5dc   Data          16  mnrefprovider.in(.constdata)
-    .constdata                               0x0000b5dc   Section      344  mnrefprovider.in(.constdata)
-    KDestination                             0x0000b5ec   Data          28  mnrefprovider.in(.constdata)
-    KPosition                                0x0000b608   Data          24  mnrefprovider.in(.constdata)
-    KDistance                                0x0000b620   Data          24  mnrefprovider.in(.constdata)
-    KBearing                                 0x0000b638   Data          20  mnrefprovider.in(.constdata)
-    KDestinationLat                          0x0000b64c   Data          24  mnrefprovider.in(.constdata)
-    KDestinationLon                          0x0000b664   Data          24  mnrefprovider.in(.constdata)
-    KPositionLat                             0x0000b67c   Data          24  mnrefprovider.in(.constdata)
-    KPositionLon                             0x0000b694   Data          24  mnrefprovider.in(.constdata)
-    KSpeed                                   0x0000b6ac   Data          16  mnrefprovider.in(.constdata)
-    KHeading                                 0x0000b6bc   Data          20  mnrefprovider.in(.constdata)
-    KMagHeading                              0x0000b6d0   Data          24  mnrefprovider.in(.constdata)
-    KCourse                                  0x0000b6e8   Data          20  mnrefprovider.in(.constdata)
-    KMagCourse                               0x0000b6fc   Data          24  mnrefprovider.in(.constdata)
-    KRequestorName@_ZN14CMnrpNaviModel10ConstructLEv_0 0x0000b714   Data          32  mnrefprovider.in(.constdata)
-    .constdata$1                             0x0000b734   Data           0  mnrefprovider.in(.constdata)
-    _ZZN16CMnrpNaviControl18HandleModelUpdateLEvE11KItemFormat@_ZN16CMnrpNaviControl18HandleModelUpdateLEv_0 0x0000b734   Data          20  mnrefprovider.in(.constdata)
-    .constdata                               0x0000b734   Section       20  mnrefprovider.in(.constdata)
-    .constdata$1                             0x0000b748   Data           0  callfirstprocessfn.o(.constdata)
-    KLitUser                                 0x0000b748   Data          16  callfirstprocessfn.o(.constdata)
-    .constdata                               0x0000b748   Section       16  callfirstprocessfn.o(.constdata)
-    .constdata__ZTI10CMnrpAppUi              0x0000b758   Section       12  mnrefprovider.in(.constdata__ZTI10CMnrpAppUi)
-    .constdata__ZTI12CArrayPtrSegI8CGulIconE 0x0000b764   Section       12  mnrefprovider.in(.constdata__ZTI12CArrayPtrSegI8CGulIconE)
-    .constdata__ZTI12CMnrpAppView            0x0000b770   Section       12  mnrefprovider.in(.constdata__ZTI12CMnrpAppView)
-    .constdata__ZTI12CMnrpMapView            0x0000b77c   Section       12  mnrefprovider.in(.constdata__ZTI12CMnrpMapView)
-    .constdata__ZTI13CMnrpDocument           0x0000b788   Section       12  mnrefprovider.in(.constdata__ZTI13CMnrpDocument)
-    .constdata__ZTI13CMnrpNaviView           0x0000b794   Section       12  mnrefprovider.in(.constdata__ZTI13CMnrpNaviView)
-    .constdata__ZTI14CMnrpAppServer          0x0000b7a0   Section       12  mnrefprovider.in(.constdata__ZTI14CMnrpAppServer)
-    .constdata__ZTI14CMnrpNaviModel          0x0000b7ac   Section       32  mnrefprovider.in(.constdata__ZTI14CMnrpNaviModel)
-    .constdata__ZTI15CMnrpAppControl         0x0000b7cc   Section       12  mnrefprovider.in(.constdata__ZTI15CMnrpAppControl)
-    .constdata__ZTI15CMnrpMapControl         0x0000b7d8   Section       32  mnrefprovider.in(.constdata__ZTI15CMnrpMapControl)
-    .constdata__ZTI16CMnrpApplication        0x0000b7f8   Section       12  mnrefprovider.in(.constdata__ZTI16CMnrpApplication)
-    .constdata__ZTI16CMnrpNaviControl        0x0000b804   Section       32  mnrefprovider.in(.constdata__ZTI16CMnrpNaviControl)
-    .constdata__ZTI17MMapModelObserver       0x0000b824   Section        8  mnrefprovider.in(.constdata__ZTI17MMapModelObserver)
-    .constdata__ZTI18MNaviModelObserver      0x0000b82c   Section        8  mnrefprovider.in(.constdata__ZTI18MNaviModelObserver)
-    .constdata__ZTI19CMnrpMapViewService     0x0000b834   Section       32  mnrefprovider.in(.constdata__ZTI19CMnrpMapViewService)
-    .constdata__ZTI21MMapSelectionCallback   0x0000b854   Section        8  mnrefprovider.in(.constdata__ZTI21MMapSelectionCallback)
-    .constdata__ZTI21MMnrpPositionObserver   0x0000b85c   Section        8  mnrefprovider.in(.constdata__ZTI21MMnrpPositionObserver)
-    .constdata__ZTI22CMnrpNavigationService  0x0000b864   Section       12  mnrefprovider.in(.constdata__ZTI22CMnrpNavigationService)
-    .constdata__ZTI22MEikStatusPaneObserver  0x0000b870   Section        8  mnrefprovider.in(.constdata__ZTI22MEikStatusPaneObserver)
-    .constdata__ZTI9CArrayFixIP8CGulIconE    0x0000b878   Section       12  mnrefprovider.in(.constdata__ZTI9CArrayFixIP8CGulIconE)
-    .constdata__ZTI9CArrayPtrI8CGulIconE     0x0000b884   Section       12  mnrefprovider.in(.constdata__ZTI9CArrayPtrI8CGulIconE)
-    .constdata__ZTIN14CMnrpNaviModel9CListItemE 0x0000b890   Section       12  mnrefprovider.in(.constdata__ZTIN14CMnrpNaviModel9CListItemE)
-    .constdata__ZTS10CMnrpAppUi              0x0000b89c   Section       13  mnrefprovider.in(.constdata__ZTS10CMnrpAppUi)
-    .constdata__ZTS12CArrayPtrSegI8CGulIconE 0x0000b8a9   Section       26  mnrefprovider.in(.constdata__ZTS12CArrayPtrSegI8CGulIconE)
-    .constdata__ZTS12CMnrpAppView            0x0000b8c3   Section       15  mnrefprovider.in(.constdata__ZTS12CMnrpAppView)
-    .constdata__ZTS12CMnrpMapView            0x0000b8d2   Section       15  mnrefprovider.in(.constdata__ZTS12CMnrpMapView)
-    .constdata__ZTS13CMnrpDocument           0x0000b8e1   Section       16  mnrefprovider.in(.constdata__ZTS13CMnrpDocument)
-    .constdata__ZTS13CMnrpNaviView           0x0000b8f1   Section       16  mnrefprovider.in(.constdata__ZTS13CMnrpNaviView)
-    .constdata__ZTS14CMnrpAppServer          0x0000b901   Section       17  mnrefprovider.in(.constdata__ZTS14CMnrpAppServer)
-    .constdata__ZTS14CMnrpNaviModel          0x0000b912   Section       17  mnrefprovider.in(.constdata__ZTS14CMnrpNaviModel)
-    .constdata__ZTS15CMnrpAppControl         0x0000b923   Section       18  mnrefprovider.in(.constdata__ZTS15CMnrpAppControl)
-    .constdata__ZTS15CMnrpMapControl         0x0000b935   Section       18  mnrefprovider.in(.constdata__ZTS15CMnrpMapControl)
-    .constdata__ZTS16CMnrpApplication        0x0000b947   Section       19  mnrefprovider.in(.constdata__ZTS16CMnrpApplication)
-    .constdata__ZTS16CMnrpNaviControl        0x0000b95a   Section       19  mnrefprovider.in(.constdata__ZTS16CMnrpNaviControl)
-    .constdata__ZTS17MMapModelObserver       0x0000b96d   Section       20  mnrefprovider.in(.constdata__ZTS17MMapModelObserver)
-    .constdata__ZTS18MNaviModelObserver      0x0000b981   Section       21  mnrefprovider.in(.constdata__ZTS18MNaviModelObserver)
-    .constdata__ZTS19CMnrpMapViewService     0x0000b996   Section       22  mnrefprovider.in(.constdata__ZTS19CMnrpMapViewService)
-    .constdata__ZTS21MMapSelectionCallback   0x0000b9ac   Section       24  mnrefprovider.in(.constdata__ZTS21MMapSelectionCallback)
-    .constdata__ZTS21MMnrpPositionObserver   0x0000b9c4   Section       24  mnrefprovider.in(.constdata__ZTS21MMnrpPositionObserver)
-    .constdata__ZTS22CMnrpNavigationService  0x0000b9dc   Section       25  mnrefprovider.in(.constdata__ZTS22CMnrpNavigationService)
-    .constdata__ZTS22MEikStatusPaneObserver  0x0000b9f5   Section       25  mnrefprovider.in(.constdata__ZTS22MEikStatusPaneObserver)
-    .constdata__ZTS9CArrayFixIP8CGulIconE    0x0000ba0e   Section       23  mnrefprovider.in(.constdata__ZTS9CArrayFixIP8CGulIconE)
-    .constdata__ZTS9CArrayPtrI8CGulIconE     0x0000ba25   Section       22  mnrefprovider.in(.constdata__ZTS9CArrayPtrI8CGulIconE)
-    .constdata__ZTSN14CMnrpNaviModel9CListItemE 0x0000ba3b   Section       29  mnrefprovider.in(.constdata__ZTSN14CMnrpNaviModel9CListItemE)
-    .constdata__ZTV10CMnrpAppUi              0x0000ba58   Section      340  mnrefprovider.in(.constdata__ZTV10CMnrpAppUi)
-    .constdata__ZTV12CArrayPtrSegI8CGulIconE 0x0000bbac   Section       20  mnrefprovider.in(.constdata__ZTV12CArrayPtrSegI8CGulIconE)
-    .constdata__ZTV12CMnrpAppView            0x0000bbc0   Section      232  mnrefprovider.in(.constdata__ZTV12CMnrpAppView)
-    .constdata__ZTV12CMnrpMapView            0x0000bca8   Section      236  mnrefprovider.in(.constdata__ZTV12CMnrpMapView)
-    .constdata__ZTV13CMnrpDocument           0x0000bd94   Section      112  mnrefprovider.in(.constdata__ZTV13CMnrpDocument)
-    .constdata__ZTV13CMnrpNaviView           0x0000be04   Section      232  mnrefprovider.in(.constdata__ZTV13CMnrpNaviView)
-    .constdata__ZTV14CMnrpAppServer          0x0000beec   Section       76  mnrefprovider.in(.constdata__ZTV14CMnrpAppServer)
-    .constdata__ZTV14CMnrpNaviModel          0x0000bf38   Section       36  mnrefprovider.in(.constdata__ZTV14CMnrpNaviModel)
-    .constdata__ZTV15CMnrpAppControl         0x0000bf5c   Section      208  mnrefprovider.in(.constdata__ZTV15CMnrpAppControl)
-    .constdata__ZTV15CMnrpMapControl         0x0000c02c   Section      224  mnrefprovider.in(.constdata__ZTV15CMnrpMapControl)
-    .constdata__ZTV16CMnrpApplication        0x0000c10c   Section       80  mnrefprovider.in(.constdata__ZTV16CMnrpApplication)
-    .constdata__ZTV16CMnrpNaviControl        0x0000c15c   Section      224  mnrefprovider.in(.constdata__ZTV16CMnrpNaviControl)
-    .constdata__ZTV19CMnrpMapViewService     0x0000c23c   Section      112  mnrefprovider.in(.constdata__ZTV19CMnrpMapViewService)
-    .constdata__ZTV22CMnrpNavigationService  0x0000c2ac   Section       64  mnrefprovider.in(.constdata__ZTV22CMnrpNavigationService)
-    .constdata__ZTV22MEikStatusPaneObserver  0x0000c2ec   Section       12  mnrefprovider.in(.constdata__ZTV22MEikStatusPaneObserver)
-    .constdata__ZTVN14CMnrpNaviModel9CListItemE 0x0000c2f8   Section       20  mnrefprovider.in(.constdata__ZTVN14CMnrpNaviModel9CListItemE)
-    .init_array                              0x0000c30c   Section        4  mnrefprovider.in(.init_array)
-    .ARM.exidx                               0x0000c310   Section        8  uc_exe_.o(.ARM.exidx)
-    .ARM.exidx                               0x0000c318   Section        8  ucppinit_aeabi.o(.ARM.exidx)
-    .data$0                                  0x00400000   Data           0  mnrefprovider.in(.data)
-    KCursorColor                             0x00400000   Data           4  mnrefprovider.in(.data)
-    .data                                    0x00400000   Section       12  mnrefprovider.in(.data)
-    KGridTextColor                           0x00400004   Data           4  mnrefprovider.in(.data)
-    KOriginMarkColor                         0x00400008   Data           4  mnrefprovider.in(.data)
-
-    Global Symbols
-
-    Symbol Name                              Value     Ov Type        Size  Object(Section)
-
-    BuildAttributes$$THUMB_ISAv3$ARM_ISAv6$M$E$P$PE$A:L22$X:L11$S22$IEEE1$IW$USESV6$~STKCKD$USESV7$~SHL$OSPACE$IEEEJ$EBA8$UX$REQ8$PRES8$EABIv2 0x00000000   Number         0  anon$$obj.o ABSOLUTE
-    #<DLL>AknIcon{000a0000}[1020735a].dll#<\DLL>d  - Undefined Reference
-    #<DLL>apparc{000a0000}[10003a3d].dll#<\DLL>111  - Undefined Reference
-    #<DLL>apparc{000a0000}[10003a3d].dll#<\DLL>112  - Undefined Reference
-    #<DLL>apparc{000a0000}[10003a3d].dll#<\DLL>113  - Undefined Reference
-    #<DLL>apparc{000a0000}[10003a3d].dll#<\DLL>117  - Undefined Reference
-    #<DLL>apparc{000a0000}[10003a3d].dll#<\DLL>118  - Undefined Reference
-    #<DLL>apparc{000a0000}[10003a3d].dll#<\DLL>11c  - Undefined Reference
-    #<DLL>apparc{000a0000}[10003a3d].dll#<\DLL>11d  - Undefined Reference
-    #<DLL>apparc{000a0000}[10003a3d].dll#<\DLL>11e  - Undefined Reference
-    #<DLL>apparc{000a0000}[10003a3d].dll#<\DLL>11f  - Undefined Reference
-    #<DLL>apparc{000a0000}[10003a3d].dll#<\DLL>1e  - Undefined Reference
-    #<DLL>apparc{000a0000}[10003a3d].dll#<\DLL>79  - Undefined Reference
-    #<DLL>apparc{000a0000}[10003a3d].dll#<\DLL>84  - Undefined Reference
-    #<DLL>apparc{000a0000}[10003a3d].dll#<\DLL>ab  - Undefined Reference
-    #<DLL>apparc{000a0000}[10003a3d].dll#<\DLL>bf  - Undefined Reference
-    #<DLL>apparc{000a0000}[10003a3d].dll#<\DLL>c0  - Undefined Reference
-    #<DLL>apparc{000a0000}[10003a3d].dll#<\DLL>c2  - Undefined Reference
-    #<DLL>apparc{000a0000}[10003a3d].dll#<\DLL>ca  - Undefined Reference
-    #<DLL>apparc{000a0000}[10003a3d].dll#<\DLL>de  - Undefined Reference
-    #<DLL>apparc{000a0000}[10003a3d].dll#<\DLL>e8  - Undefined Reference
-    #<DLL>apparc{000a0000}[10003a3d].dll#<\DLL>fd  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>16f  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>170  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>171  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>172  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>174  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>175  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>176  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>177  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>179  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>46c  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>53d  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>7cc  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>81  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>82  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>83  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>873  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>882  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>a1f  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>a40  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>a48  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>b4f  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>b52  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>b53  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>b54  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>b55  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>b56  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>b57  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>b58  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>b59  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>b5a  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>b5b  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>b5d  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>b5e  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>b60  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>b61  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>b62  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>b65  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>b67  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>b68  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>b6a  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>b70  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>b71  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>b72  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>b74  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>b76  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>b78  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>bb1  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>bb5  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>c6  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>c7  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>c9  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>ce  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>d3  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>d5  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>d59  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>d5c  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>d5d  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>d5e  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>d5f  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>d6  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>d60  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>d7  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>d8  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>d9  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>dc  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>ef2  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>ef7  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>ef8  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>f11  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>f14  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>f15  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>f1c  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>f6b  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>f6c  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>f6d  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>f8f  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>fae  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>fbe  - Undefined Reference
-    #<DLL>bafl{000a0000}[10003a0f].dll#<\DLL>2b  - Undefined Reference
-    #<DLL>bafl{000a0000}[10003a0f].dll#<\DLL>62  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>101  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>107  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>109  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>10a  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>10e  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>10f  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>110  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>113  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>114  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>11f  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>12  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>120  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>13  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>15  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>15f  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>161  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>163  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>18c  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>18d  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>19  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>1a  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>1bc  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>1d  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>1da  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>1dd  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>1de  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>1df  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>1e  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>1e2  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>1f6  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>202  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>24  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>244  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>245  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>246  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>247  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>248  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>27  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>27e  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>27f  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>28  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>29  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>298  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>29e  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>29f  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>2a  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>2a4  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>2a5  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>30  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>32  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>33  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>38  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>39  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>3d  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>3e  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>40  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>43  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>64  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>65  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>7f  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>80  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>9  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>b  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>b6  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>c  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>c4  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>c5  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>c7  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>cb  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>d  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>d2  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>d3  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>d4  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>dc  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>f  - Undefined Reference
-    #<DLL>dfpaeabi{000a0000}.dll#<\DLL>14     - Undefined Reference
-    #<DLL>dfpaeabi{000a0000}.dll#<\DLL>17     - Undefined Reference
-    #<DLL>dfpaeabi{000a0000}.dll#<\DLL>18     - Undefined Reference
-    #<DLL>dfpaeabi{000a0000}.dll#<\DLL>29     - Undefined Reference
-    #<DLL>dfpaeabi{000a0000}.dll#<\DLL>8      - Undefined Reference
-    #<DLL>dfpaeabi{000a0000}.dll#<\DLL>c      - Undefined Reference
-    #<DLL>drtaeabi{000a0000}.dll#<\DLL>93     - Undefined Reference
-    #<DLL>drtaeabi{000a0000}.dll#<\DLL>9e     - Undefined Reference
-    #<DLL>drtaeabi{000a0000}.dll#<\DLL>9f     - Undefined Reference
-    #<DLL>drtaeabi{000a0000}.dll#<\DLL>b4     - Undefined Reference
-    #<DLL>drtaeabi{000a0000}.dll#<\DLL>b6     - Undefined Reference
-    #<DLL>drtaeabi{000a0000}.dll#<\DLL>b7     - Undefined Reference
-    #<DLL>drtaeabi{000a0000}.dll#<\DLL>b8     - Undefined Reference
-    #<DLL>drtaeabi{000a0000}.dll#<\DLL>bd     - Undefined Reference
-    #<DLL>drtaeabi{000a0000}.dll#<\DLL>cc     - Undefined Reference
-    #<DLL>egul{000a0000}[100048a2].dll#<\DLL>5e  - Undefined Reference
-    #<DLL>egul{000a0000}[100048a2].dll#<\DLL>5f  - Undefined Reference
-    #<DLL>eikcoctl{000a0000}[1000489e].dll#<\DLL>23  - Undefined Reference
-    #<DLL>eikcoctl{000a0000}[1000489e].dll#<\DLL>25d  - Undefined Reference
-    #<DLL>eikcoctl{000a0000}[1000489e].dll#<\DLL>25e  - Undefined Reference
-    #<DLL>eikcoctl{000a0000}[1000489e].dll#<\DLL>294  - Undefined Reference
-    #<DLL>eikcoctl{000a0000}[1000489e].dll#<\DLL>2e  - Undefined Reference
-    #<DLL>eikcoctl{000a0000}[1000489e].dll#<\DLL>36b  - Undefined Reference
-    #<DLL>eikcoctl{000a0000}[1000489e].dll#<\DLL>370  - Undefined Reference
-    #<DLL>eikcoctl{000a0000}[1000489e].dll#<\DLL>371  - Undefined Reference
-    #<DLL>eikcoctl{000a0000}[1000489e].dll#<\DLL>560  - Undefined Reference
-    #<DLL>eikcoctl{000a0000}[1000489e].dll#<\DLL>596  - Undefined Reference
-    #<DLL>eikcoctl{000a0000}[1000489e].dll#<\DLL>8c  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>12  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>123  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>125  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>126  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>127  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>128  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>129  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>12a  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>12b  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>12e  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>13b  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>13d  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>13f  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>14  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>160  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>186  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>188  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>18a  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>19  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>1a  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>1b  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>1c  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>1d  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>1d3  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>1d8  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>1d9  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>1df  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>1e  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>1ea  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>1f  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>1fa  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>20b  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>214  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>215  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>216  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>217  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>218  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>219  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>235  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>25  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>3d  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>3e  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>3f  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>40  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>43  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>48  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>49  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>4a  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>4b  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>4c  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>4d  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>4e  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>4f  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>8d  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>8e  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>8f  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>90  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>93  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>98  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>9b  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>9e  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>9f  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>a9  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>ab  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>af  - Undefined Reference
-    #<DLL>eikctl{000a0000}[1000489c].dll#<\DLL>1c7  - Undefined Reference
-    #<DLL>eposlandmarks{000a0000}[101fdf8a].dll#<\DLL>32  - Undefined Reference
-    #<DLL>eposlandmarks{000a0000}[101fdf8a].dll#<\DLL>4  - Undefined Reference
-    #<DLL>eposlandmarks{000a0000}[101fdf8a].dll#<\DLL>41  - Undefined Reference
-    #<DLL>eposlandmarks{000a0000}[101fdf8a].dll#<\DLL>43  - Undefined Reference
-    #<DLL>eposlandmarks{000a0000}[101fdf8a].dll#<\DLL>4b  - Undefined Reference
-    #<DLL>eposlandmarks{000a0000}[101fdf8a].dll#<\DLL>c  - Undefined Reference
-    #<DLL>eposlandmarks{000a0000}[101fdf8a].dll#<\DLL>f  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>101  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>1d0  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>1d6  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>1d7  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>1d8  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>1dc  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>1e1  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>227  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>249  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>251  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>265  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>281  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>289  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>28a  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>28c  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>28e  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>29d  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>2e  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>30  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>338  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>33d  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>33e  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>346  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>347  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>349  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>34a  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>37  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>3cd  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>401  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>448  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>45c  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>45f  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>494  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>508  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>51  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>550  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>5e3  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>5e6  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>611  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>636  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>639  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>670  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>719  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>7cb  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>7cd  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>7cf  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>80c  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>80d  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>822  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>848  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>84b  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>84d  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>853  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>cb  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>cc  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>cd  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>cf  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>d0  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>f5  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>fa  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>fe  - Undefined Reference
-    #<DLL>fbscli{000a0000}[10003a15].dll#<\DLL>1a  - Undefined Reference
-    #<DLL>fbscli{000a0000}[10003a15].dll#<\DLL>1f  - Undefined Reference
-    #<DLL>gdi{000a0000}[10003b15].dll#<\DLL>136  - Undefined Reference
-    #<DLL>gdi{000a0000}[10003b15].dll#<\DLL>137  - Undefined Reference
-    #<DLL>gdi{000a0000}[10003b15].dll#<\DLL>138  - Undefined Reference
-    #<DLL>lbs{000a0000}[101f97b1].dll#<\DLL>130  - Undefined Reference
-    #<DLL>lbs{000a0000}[101f97b1].dll#<\DLL>132  - Undefined Reference
-    #<DLL>lbs{000a0000}[101f97b1].dll#<\DLL>15  - Undefined Reference
-    #<DLL>lbs{000a0000}[101f97b1].dll#<\DLL>17  - Undefined Reference
-    #<DLL>lbs{000a0000}[101f97b1].dll#<\DLL>1c  - Undefined Reference
-    #<DLL>lbs{000a0000}[101f97b1].dll#<\DLL>98  - Undefined Reference
-    #<DLL>lbs{000a0000}[101f97b1].dll#<\DLL>b4  - Undefined Reference
-    #<DLL>lbs{000a0000}[101f97b1].dll#<\DLL>b5  - Undefined Reference
-    #<DLL>lbs{000a0000}[101f97b1].dll#<\DLL>cd  - Undefined Reference
-    #<DLL>lbs{000a0000}[101f97b1].dll#<\DLL>cf  - Undefined Reference
-    #<DLL>lbs{000a0000}[101f97b1].dll#<\DLL>d6  - Undefined Reference
-    #<DLL>lbs{000a0000}[101f97b1].dll#<\DLL>df  - Undefined Reference
-    #<DLL>lbs{000a0000}[101f97b1].dll#<\DLL>e1  - Undefined Reference
-    #<DLL>lbs{000a0000}[101f97b1].dll#<\DLL>e2  - Undefined Reference
-    #<DLL>mnrefproviderengine{000a0000}[03132015].dll#<\DLL>11  - Undefined Reference
-    #<DLL>mnrefproviderengine{000a0000}[03132015].dll#<\DLL>13  - Undefined Reference
-    #<DLL>mnrefproviderengine{000a0000}[03132015].dll#<\DLL>14  - Undefined Reference
-    #<DLL>mnrefproviderengine{000a0000}[03132015].dll#<\DLL>16  - Undefined Reference
-    #<DLL>mnrefproviderengine{000a0000}[03132015].dll#<\DLL>17  - Undefined Reference
-    #<DLL>mnrefproviderengine{000a0000}[03132015].dll#<\DLL>18  - Undefined Reference
-    #<DLL>mnrefproviderengine{000a0000}[03132015].dll#<\DLL>19  - Undefined Reference
-    #<DLL>mnrefproviderengine{000a0000}[03132015].dll#<\DLL>1a  - Undefined Reference
-    #<DLL>mnrefproviderengine{000a0000}[03132015].dll#<\DLL>1b  - Undefined Reference
-    #<DLL>mnrefproviderengine{000a0000}[03132015].dll#<\DLL>1c  - Undefined Reference
-    #<DLL>mnrefproviderengine{000a0000}[03132015].dll#<\DLL>1d  - Undefined Reference
-    #<DLL>mnrefproviderengine{000a0000}[03132015].dll#<\DLL>1e  - Undefined Reference
-    #<DLL>mnrefproviderengine{000a0000}[03132015].dll#<\DLL>1f  - Undefined Reference
-    #<DLL>mnrefproviderengine{000a0000}[03132015].dll#<\DLL>20  - Undefined Reference
-    #<DLL>mnrefproviderengine{000a0000}[03132015].dll#<\DLL>21  - Undefined Reference
-    #<DLL>mnrefproviderengine{000a0000}[03132015].dll#<\DLL>22  - Undefined Reference
-    #<DLL>mnrefproviderengine{000a0000}[03132015].dll#<\DLL>26  - Undefined Reference
-    #<DLL>mnrefproviderengine{000a0000}[03132015].dll#<\DLL>27  - Undefined Reference
-    #<DLL>mnrefproviderengine{000a0000}[03132015].dll#<\DLL>28  - Undefined Reference
-    #<DLL>mnrefproviderengine{000a0000}[03132015].dll#<\DLL>29  - Undefined Reference
-    #<DLL>mnrefproviderengine{000a0000}[03132015].dll#<\DLL>2a  - Undefined Reference
-    #<DLL>mnrefproviderengine{000a0000}[03132015].dll#<\DLL>2b  - Undefined Reference
-    #<DLL>mnrefproviderengine{000a0000}[03132015].dll#<\DLL>2c  - Undefined Reference
-    #<DLL>mnrefproviderengine{000a0000}[03132015].dll#<\DLL>2d  - Undefined Reference
-    #<DLL>mnrefproviderengine{000a0000}[03132015].dll#<\DLL>2e  - Undefined Reference
-    #<DLL>mnrefproviderengine{000a0000}[03132015].dll#<\DLL>2f  - Undefined Reference
-    #<DLL>mnrefproviderengine{000a0000}[03132015].dll#<\DLL>30  - Undefined Reference
-    #<DLL>mnrefproviderengine{000a0000}[03132015].dll#<\DLL>32  - Undefined Reference
-    #<DLL>mnrefproviderengine{000a0000}[03132015].dll#<\DLL>33  - Undefined Reference
-    #<DLL>mnrefproviderengine{000a0000}[03132015].dll#<\DLL>35  - Undefined Reference
-    #<DLL>mnrefproviderengine{000a0000}[03132015].dll#<\DLL>36  - Undefined Reference
-    #<DLL>mnrefproviderengine{000a0000}[03132015].dll#<\DLL>c  - Undefined Reference
-    #<DLL>mnservicelib{000a0000}[10206903].dll#<\DLL>1  - Undefined Reference
-    #<DLL>mnservicelib{000a0000}[10206903].dll#<\DLL>10  - Undefined Reference
-    #<DLL>mnservicelib{000a0000}[10206903].dll#<\DLL>11  - Undefined Reference
-    #<DLL>mnservicelib{000a0000}[10206903].dll#<\DLL>14  - Undefined Reference
-    #<DLL>mnservicelib{000a0000}[10206903].dll#<\DLL>1c  - Undefined Reference
-    #<DLL>mnservicelib{000a0000}[10206903].dll#<\DLL>1d  - Undefined Reference
-    #<DLL>mnservicelib{000a0000}[10206903].dll#<\DLL>1e  - Undefined Reference
-    #<DLL>mnservicelib{000a0000}[10206903].dll#<\DLL>2  - Undefined Reference
-    #<DLL>mnservicelib{000a0000}[10206903].dll#<\DLL>21  - Undefined Reference
-    #<DLL>mnservicelib{000a0000}[10206903].dll#<\DLL>4  - Undefined Reference
-    #<DLL>mnservicelib{000a0000}[10206903].dll#<\DLL>5  - Undefined Reference
-    #<DLL>mnservicelib{000a0000}[10206903].dll#<\DLL>7  - Undefined Reference
-    #<DLL>mnservicelib{000a0000}[10206903].dll#<\DLL>a  - Undefined Reference
-    #<DLL>mnservicelib{000a0000}[10206903].dll#<\DLL>b  - Undefined Reference
-    #<DLL>mnservicelib{000a0000}[10206903].dll#<\DLL>c  - Undefined Reference
-    #<DLL>mnservicelib{000a0000}[10206903].dll#<\DLL>d  - Undefined Reference
-    #<DLL>mnservicelib{000a0000}[10206903].dll#<\DLL>e  - Undefined Reference
-    #<DLL>mnservicelib{000a0000}[10206903].dll#<\DLL>f  - Undefined Reference
-    #<DLL>scppnwdl{000a0000}.dll#<\DLL>3      - Undefined Reference
-    typeinfo for CCoeControl                  - Undefined Reference
-    typeinfo for CAknDocument                 - Undefined Reference
-    typeinfo for CAknAppServer                - Undefined Reference
-    typeinfo for CAknViewAppUi                - Undefined Reference
-    typeinfo for CArrayFixBase                - Undefined Reference
-    typeinfo for CEikApplication              - Undefined Reference
-    typeinfo for XLeaveException              - Undefined Reference
-    typeinfo for CMnMapViewServiceBase        - Undefined Reference
-    typeinfo for CMnNavigationServiceBase     - Undefined Reference
-    typeinfo for CBase                        - Undefined Reference
-    typeinfo for CAknView                     - Undefined Reference
-    vtable for CAknViewAppUi                  - Undefined Reference
-    vtable for __cxxabiv1::__class_type_info  - Undefined Reference
-    vtable for __cxxabiv1::__si_class_type_info  - Undefined Reference
-    vtable for __cxxabiv1::__vmi_class_type_info  - Undefined Reference
-    _fp_init                                  - Undefined Weak Reference
-    Image$$ER_RO$$Base                       0x00008000   Number         0  anon$$obj.o(linker$$defined$$symbols)
-    _E32Startup                              0x00008000   ARM Code     112  uc_exe_.o(.emb_text)
-    Symbian$$CPP$$Exception$$Descriptor      0x0000805c   Data           0  uc_exe_.o(.emb_text)
-    __cpp_initialize__aeabi_                 0x00008070   ARM Code      72  ucppinit_aeabi.o(.emb_text)
-    std::nothrow                             0x000080b8   ARM Code       0  ucppinit_aeabi.o(.emb_text)
-    Inline ARM to Thumb Veneer to _xxxx_call_user_invariant 0x000080b8   ARM Code       0  uc_exe_.o(.text)
-    _xxxx_call_user_invariant                0x000080c1   Thumb Code     8  uc_exe_.o(.text)
-    _xxxx_call_user_handle_exception         0x000080c9   Thumb Code     8  uc_exe_.o(.text)
-    E32Main()                                0x000080ef   Thumb Code    22  mnrefprovider.in(.text)
-    CMnrpApplication::AppDllUid() const      0x0000810d   Thumb Code     6  mnrefprovider.in(.text)
-    CMnrpApplication::CreateDocumentL()      0x00008113   Thumb Code     8  mnrefprovider.in(.text)
-    CMnrpApplication::NewAppServerL(CApaAppServer*&) 0x0000811b   Thumb Code    22  mnrefprovider.in(.text)
-    CleanupIconArray(void*)                  0x00008139   Thumb Code    50  mnrefprovider.in(.text)
-    AddIconL(CArrayPtr<CGulIcon>&, const TDesC16&, int, int) 0x0000816b   Thumb Code    64  mnrefprovider.in(.text)
-    CreateIconListLC(int)                    0x000081ab   Thumb Code    52  mnrefprovider.in(.text)
-    AddLandmarkL(const CPosLandmark&, CDesC16Array&, CArrayPtr<CGulIcon>&) 0x000081df   Thumb Code   130  mnrefprovider.in(.text)
-    CMnrpAppUi::CMnrpAppUi(CMnrpEngine&)     0x00008261   Thumb Code    42  mnrefprovider.in(.text)
-    CMnrpAppUi::CMnrpAppUi__sub_object(CMnrpEngine&) 0x00008261   Thumb Code     0  mnrefprovider.in(.text)
-    CMnrpAppUi::ConstructL()                 0x0000828b   Thumb Code    74  mnrefprovider.in(.text)
-    CMnrpAppUi::~CMnrpAppUi()                0x000082d5   Thumb Code    54  mnrefprovider.in(.text)
-    CMnrpAppUi::~CMnrpAppUi__sub_object()    0x000082d5   Thumb Code     0  mnrefprovider.in(.text)
-    CMnrpAppUi::~CMnrpAppUi__deallocating()  0x0000830b   Thumb Code    16  mnrefprovider.in(.text)
-    CMnrpAppUi::IsChainedMode()              0x0000831b   Thumb Code    16  mnrefprovider.in(.text)
-    CMnrpAppUi::ShowMapL(CMnrpMapViewService&) 0x0000832b   Thumb Code    64  mnrefprovider.in(.text)
-    CMnrpAppUi::SelectFromDialogL(CMnrpMapViewService&, MMapSelectionCallback&) 0x0000836b   Thumb Code   526  mnrefprovider.in(.text)
-    CMnrpAppUi::SetNaviPaneTitleL(const TDesC16&) 0x00008579   Thumb Code   100  mnrefprovider.in(.text)
-    CMnrpAppUi::StartSelectionL(CMnrpMapViewService&, MMapSelectionCallback&) 0x000085dd   Thumb Code   104  mnrefprovider.in(.text)
-    CMnrpAppUi::StopSelection()              0x00008645   Thumb Code    68  mnrefprovider.in(.text)
-    CMnrpAppUi::ShowNavigationL(const CPosLandmark&) 0x00008689   Thumb Code    64  mnrefprovider.in(.text)
-    CMnrpAppUi::IsAnyUserViewActive()        0x000086c9   Thumb Code    38  mnrefprovider.in(.text)
-    CMnrpAppUi::SetRightSoftkeyCommandL(int, const TDesC16&) 0x000086ef   Thumb Code    44  mnrefprovider.in(.text)
-    CMnrpAppUi::HandleCommandL(int)          0x0000871b   Thumb Code    62  mnrefprovider.in(.text)
-    CMnrpAppUi::HandleResourceChangeL(int)   0x00008759   Thumb Code    80  mnrefprovider.in(.text)
-    CMnrpAppUi::ProcessCommandParametersL(CApaCommandLine&) 0x000087a9   Thumb Code    26  mnrefprovider.in(.text)
-    CMnrpDocument::ConstructL()              0x000087d1   Thumb Code    12  mnrefprovider.in(.text)
-    CMnrpDocument::CMnrpDocument(CEikApplication&) 0x000087dd   Thumb Code    16  mnrefprovider.in(.text)
-    CMnrpDocument::CMnrpDocument__sub_object(CEikApplication&) 0x000087dd   Thumb Code     0  mnrefprovider.in(.text)
-    CMnrpDocument::NewL(CEikApplication&)    0x000087ed   Thumb Code    36  mnrefprovider.in(.text)
-    CMnrpDocument::~CMnrpDocument()          0x00008811   Thumb Code    32  mnrefprovider.in(.text)
-    CMnrpDocument::~CMnrpDocument__sub_object() 0x00008811   Thumb Code     0  mnrefprovider.in(.text)
-    CMnrpDocument::~CMnrpDocument__deallocating() 0x00008831   Thumb Code    16  mnrefprovider.in(.text)
-    CMnrpDocument::Engine()                  0x00008841   Thumb Code     4  mnrefprovider.in(.text)
-    CMnrpDocument::CreateAppUiL()            0x00008845   Thumb Code    18  mnrefprovider.in(.text)
-    CMnrpAppServer::~CMnrpAppServer()        0x0000885d   Thumb Code     8  mnrefprovider.in(.text)
-    CMnrpAppServer::~CMnrpAppServer__sub_object() 0x0000885d   Thumb Code     0  mnrefprovider.in(.text)
-    CMnrpAppServer::~CMnrpAppServer__deallocating() 0x00008865   Thumb Code    16  mnrefprovider.in(.text)
-    CMnrpAppServer::AppUi()                  0x00008875   Thumb Code    10  mnrefprovider.in(.text)
-    CMnrpAppServer::CreateNavigationServiceL() const 0x0000887f   Thumb Code     8  mnrefprovider.in(.text)
-    CMnrpAppServer::CreateMapViewServiceL() const 0x00008887   Thumb Code     8  mnrefprovider.in(.text)
-    CMnrpAppServer::CreateServiceL(TUid) const 0x0000888f   Thumb Code    30  mnrefprovider.in(.text)
-    CMnrpAppServer::HandleAllClientsClosed() 0x000088ad   Thumb Code    42  mnrefprovider.in(.text)
-    CMnrpAppView::ConstructL()               0x000088dd   Thumb Code    10  mnrefprovider.in(.text)
-    CMnrpAppView::CMnrpAppView()             0x000088e7   Thumb Code    24  mnrefprovider.in(.text)
-    CMnrpAppView::CMnrpAppView__sub_object() 0x000088e7   Thumb Code     0  mnrefprovider.in(.text)
-    CMnrpAppView::NewL()                     0x000088ff   Thumb Code    32  mnrefprovider.in(.text)
-    CMnrpAppView::~CMnrpAppView()            0x0000891f   Thumb Code    40  mnrefprovider.in(.text)
-    CMnrpAppView::~CMnrpAppView__sub_object() 0x0000891f   Thumb Code     0  mnrefprovider.in(.text)
-    CMnrpAppView::~CMnrpAppView__deallocating() 0x00008947   Thumb Code    16  mnrefprovider.in(.text)
-    CMnrpAppView::Id() const                 0x00008957   Thumb Code     4  mnrefprovider.in(.text)
-    CMnrpAppView::DoActivateL(const TVwsViewId&, TUid, const TDesC8&) 0x0000895b   Thumb Code    78  mnrefprovider.in(.text)
-    CMnrpAppView::DoDeactivate()             0x000089a9   Thumb Code    32  mnrefprovider.in(.text)
-    CMnrpAppControl::ConstructL(const TRect&) 0x000089d1   Thumb Code    28  mnrefprovider.in(.text)
-    CMnrpAppControl::CMnrpAppControl(CMnrpAppView&) 0x000089ed   Thumb Code    20  mnrefprovider.in(.text)
-    CMnrpAppControl::CMnrpAppControl__sub_object(CMnrpAppView&) 0x000089ed   Thumb Code     0  mnrefprovider.in(.text)
-    CMnrpAppControl::NewL(CMnrpAppView&, const TRect&) 0x00008a01   Thumb Code    40  mnrefprovider.in(.text)
-    CMnrpAppControl::~CMnrpAppControl()      0x00008a29   Thumb Code     8  mnrefprovider.in(.text)
-    CMnrpAppControl::~CMnrpAppControl__sub_object() 0x00008a29   Thumb Code     0  mnrefprovider.in(.text)
-    CMnrpAppControl::~CMnrpAppControl__deallocating() 0x00008a31   Thumb Code    16  mnrefprovider.in(.text)
-    CMnrpAppControl::CountComponentControls() const 0x00008a41   Thumb Code     4  mnrefprovider.in(.text)
-    CMnrpAppControl::ComponentControl(int) const 0x00008a45   Thumb Code     4  mnrefprovider.in(.text)
-    CMnrpAppControl::HandleResourceChange(int) 0x00008a49   Thumb Code    34  mnrefprovider.in(.text)
-    CMnrpAppControl::Draw(const TRect&) const 0x00008a6b   Thumb Code    32  mnrefprovider.in(.text)
-    CMnrpMapView::ConstructL(int)            0x00008a95   Thumb Code    22  mnrefprovider.in(.text)
-    CMnrpMapView::CMnrpMapView(CMnrpEngine&) 0x00008aab   Thumb Code    28  mnrefprovider.in(.text)
-    CMnrpMapView::CMnrpMapView__sub_object(CMnrpEngine&) 0x00008aab   Thumb Code     0  mnrefprovider.in(.text)
-    CMnrpMapView::NewL(int, CMnrpEngine&)    0x00008ac7   Thumb Code    40  mnrefprovider.in(.text)
-    CMnrpMapView::HandleUserSelectionL(int)  0x00008aef   Thumb Code    56  mnrefprovider.in(.text)
-    CMnrpMapView::~CMnrpMapView()            0x00008b27   Thumb Code    86  mnrefprovider.in(.text)
-    CMnrpMapView::~CMnrpMapView__sub_object() 0x00008b27   Thumb Code     0  mnrefprovider.in(.text)
-    CMnrpMapView::~CMnrpMapView__deallocating() 0x00008b7d   Thumb Code    16  mnrefprovider.in(.text)
-    CMnrpMapView::SetMapModeL(CMnrpMapViewService&) 0x00008b8d   Thumb Code     8  mnrefprovider.in(.text)
-    CMnrpMapView::SetSelectionModeL(CMnrpMapViewService&, MMapSelectionCallback&) 0x00008b95   Thumb Code    18  mnrefprovider.in(.text)
-    CMnrpMapView::StopSelection()            0x00008ba7   Thumb Code     8  mnrefprovider.in(.text)
-    CMnrpMapView::Id() const                 0x00008baf   Thumb Code     4  mnrefprovider.in(.text)
-    CMnrpMapView::HandleCommandL(int)        0x00008bb3   Thumb Code    84  mnrefprovider.in(.text)
-    CMnrpMapView::DoActivateL(const TVwsViewId&, TUid, const TDesC8&) 0x00008c07   Thumb Code   144  mnrefprovider.in(.text)
-    CMnrpMapView::DoDeactivate()             0x00008c97   Thumb Code    32  mnrefprovider.in(.text)
-    CMnrpMapView::DynInitMenuPaneL(int, CEikMenuPane*) 0x00008cb7   Thumb Code    40  mnrefprovider.in(.text)
-    thunk{-12} to CMnrpMapView::DynInitMenuPaneL(int, CEikMenuPane*) 0x00008cdf   Thumb Code     4  mnrefprovider.in(.text)
-    CMnrpMapControl::CreateScreenBufferL(const TSize&) 0x00008cf9   Thumb Code    70  mnrefprovider.in(.text)
-    CMnrpMapControl::CreateFonts()           0x00008d3f   Thumb Code    62  mnrefprovider.in(.text)
-    CMnrpMapControl::ConstructL(const TRect&, CMnrpEngine&) 0x00008d7d   Thumb Code   134  mnrefprovider.in(.text)
-    CMnrpMapControl::CMnrpMapControl(CMnrpMapView&) 0x00008e03   Thumb Code    46  mnrefprovider.in(.text)
-    CMnrpMapControl::CMnrpMapControl__sub_object(CMnrpMapView&) 0x00008e03   Thumb Code     0  mnrefprovider.in(.text)
-    CMnrpMapControl::NewL(CMnrpMapView&, const TRect&, CMnrpEngine&) 0x00008e31   Thumb Code    44  mnrefprovider.in(.text)
-    CMnrpMapControl::DestroyFonts()          0x00008e5d   Thumb Code    38  mnrefprovider.in(.text)
-    CMnrpMapControl::~CMnrpMapControl()      0x00008e83   Thumb Code    54  mnrefprovider.in(.text)
-    CMnrpMapControl::~CMnrpMapControl__sub_object() 0x00008e83   Thumb Code     0  mnrefprovider.in(.text)
-    CMnrpMapControl::~CMnrpMapControl__deallocating() 0x00008eb9   Thumb Code    16  mnrefprovider.in(.text)
-    CMnrpMapControl::UpdateModelL(CMnrpMapViewService&) 0x00008ec9   Thumb Code    10  mnrefprovider.in(.text)
-    CMnrpMapControl::SetSelectionModeL(int)  0x00008ed3   Thumb Code    66  mnrefprovider.in(.text)
-    CMnrpMapControl::CurrentLocation()       0x00008f15   Thumb Code    12  mnrefprovider.in(.text)
-    CMnrpMapControl::SetFullScreen(int)      0x00008f21   Thumb Code    36  mnrefprovider.in(.text)
-    CMnrpMapControl::ToggleFullScreen()      0x00008f45   Thumb Code    12  mnrefprovider.in(.text)
-    CMnrpMapControl::DrawCursor(CWindowGc&) const 0x00008f51   Thumb Code   224  mnrefprovider.in(.text)
-    CMnrpMapControl::DrawGridText(CWindowGc&, const TRect&, const TRect&, const CFont*, CMnrpMapModel::TGrid&) const 0x00009031   Thumb Code   610  mnrefprovider.in(.text)
-    CMnrpMapControl::BorderSize() const      0x00009293   Thumb Code    44  mnrefprovider.in(.text)
-    CMnrpMapControl::Draw(const TRect&) const 0x000092bf   Thumb Code   306  mnrefprovider.in(.text)
-    CMnrpMapControl::RenderL()               0x000093f1   Thumb Code   106  mnrefprovider.in(.text)
-    CMnrpMapControl::CursorMargin()          0x0000945b   Thumb Code    30  mnrefprovider.in(.text)
-    CMnrpMapControl::MoveCursor(int, int)    0x00009479   Thumb Code   324  mnrefprovider.in(.text)
-    CMnrpMapControl::Zoom(double)            0x000095bd   Thumb Code    90  mnrefprovider.in(.text)
-    CMnrpMapControl::OfferKeyEventL(const TKeyEvent&, TEventCode) 0x00009617   Thumb Code   446  mnrefprovider.in(.text)
-    CMnrpMapControl::SizeChanged()           0x000097d5   Thumb Code   174  mnrefprovider.in(.text)
-    CMnrpMapControl::HandleResourceChange(int) 0x00009883   Thumb Code    26  mnrefprovider.in(.text)
-    CMnrpMapControl::HandleModelUpdateL()    0x0000989d   Thumb Code    80  mnrefprovider.in(.text)
-    thunk{-52} to CMnrpMapControl::HandleModelUpdateL() 0x000098ed   Thumb Code     4  mnrefprovider.in(.text)
-    CMnrpNaviView::ConstructL(int)           0x00009945   Thumb Code    20  mnrefprovider.in(.text)
-    CMnrpNaviView::CMnrpNaviView(CMnrpEngine&) 0x00009959   Thumb Code    28  mnrefprovider.in(.text)
-    CMnrpNaviView::CMnrpNaviView__sub_object(CMnrpEngine&) 0x00009959   Thumb Code     0  mnrefprovider.in(.text)
-    CMnrpNaviView::NewL(int, CMnrpEngine&)   0x00009975   Thumb Code    40  mnrefprovider.in(.text)
-    CMnrpNaviView::~CMnrpNaviView()          0x0000999d   Thumb Code    52  mnrefprovider.in(.text)
-    CMnrpNaviView::~CMnrpNaviView__sub_object() 0x0000999d   Thumb Code     0  mnrefprovider.in(.text)
-    CMnrpNaviView::~CMnrpNaviView__deallocating() 0x000099d1   Thumb Code    16  mnrefprovider.in(.text)
-    CMnrpNaviView::SetDestinationL(const CPosLandmark&) 0x000099e1   Thumb Code    46  mnrefprovider.in(.text)
-    CMnrpNaviView::Id() const                0x00009a0f   Thumb Code     4  mnrefprovider.in(.text)
-    CMnrpNaviView::HandleCommandL(int)       0x00009a13   Thumb Code    18  mnrefprovider.in(.text)
-    CMnrpNaviView::DoActivateL(const TVwsViewId&, TUid, const TDesC8&) 0x00009a25   Thumb Code    92  mnrefprovider.in(.text)
-    CMnrpNaviView::DoDeactivate()            0x00009a81   Thumb Code    32  mnrefprovider.in(.text)
-    CMnrpNaviModel::ConstructL()             0x00009aad   Thumb Code    64  mnrefprovider.in(.text)
-    CMnrpNaviModel::CMnrpNaviModel(MNaviModelObserver&, CMnrpEngine&) 0x00009aed   Thumb Code    44  mnrefprovider.in(.text)
-    CMnrpNaviModel::CMnrpNaviModel__sub_object(MNaviModelObserver&, CMnrpEngine&) 0x00009aed   Thumb Code     0  mnrefprovider.in(.text)
-    CMnrpNaviModel::NewL(MNaviModelObserver&, CMnrpEngine&) 0x00009b19   Thumb Code    40  mnrefprovider.in(.text)
-    CMnrpNaviModel::SetDestinationL(const CPosLandmark&) 0x00009b41   Thumb Code    42  mnrefprovider.in(.text)
-    CMnrpNaviModel::CListItem::NewL(const TDesC16&, const TDesC16&) 0x00009b6b   Thumb Code    48  mnrefprovider.in(.text)
-    CMnrpNaviModel::ListItemsL()             0x00009b9b   Thumb Code   630  mnrefprovider.in(.text)
-    CMnrpNaviModel::~CMnrpNaviModel()        0x00009e11   Thumb Code    56  mnrefprovider.in(.text)
-    CMnrpNaviModel::~CMnrpNaviModel__sub_object() 0x00009e11   Thumb Code     0  mnrefprovider.in(.text)
-    CMnrpNaviModel::~CMnrpNaviModel__deallocating() 0x00009e49   Thumb Code    48  mnrefprovider.in(.text)
-    CMnrpNaviModel::HandlePositionRequestCompletedL(int) 0x00009e79   Thumb Code    60  mnrefprovider.in(.text)
-    thunk{-4} to CMnrpNaviModel::HandlePositionRequestCompletedL(int) 0x00009eb5   Thumb Code     4  mnrefprovider.in(.text)
-    CMnrpNaviModel::CListItem::~CListItem()  0x00009eb9   Thumb Code    28  mnrefprovider.in(.text)
-    CMnrpNaviModel::CListItem::~CListItem__sub_object() 0x00009eb9   Thumb Code     0  mnrefprovider.in(.text)
-    CMnrpNaviModel::CListItem::~CListItem__deallocating() 0x00009ed5   Thumb Code    16  mnrefprovider.in(.text)
-    CMnrpNaviControl::CreateListBoxL()       0x00009ee9   Thumb Code    58  mnrefprovider.in(.text)
-    CMnrpNaviControl::ConstructL(const TRect&, CMnrpEngine&) 0x00009f23   Thumb Code    48  mnrefprovider.in(.text)
-    CMnrpNaviControl::CMnrpNaviControl(CMnrpNaviView&) 0x00009f53   Thumb Code    24  mnrefprovider.in(.text)
-    CMnrpNaviControl::CMnrpNaviControl__sub_object(CMnrpNaviView&) 0x00009f53   Thumb Code     0  mnrefprovider.in(.text)
-    CMnrpNaviControl::NewL(CMnrpNaviView&, const TRect&, CMnrpEngine&) 0x00009f6b   Thumb Code    44  mnrefprovider.in(.text)
-    CMnrpNaviControl::~CMnrpNaviControl()    0x00009f97   Thumb Code    48  mnrefprovider.in(.text)
-    CMnrpNaviControl::~CMnrpNaviControl__sub_object() 0x00009f97   Thumb Code     0  mnrefprovider.in(.text)
-    CMnrpNaviControl::~CMnrpNaviControl__deallocating() 0x00009fc7   Thumb Code    16  mnrefprovider.in(.text)
-    CMnrpNaviControl::UpdateModelL(CPosLandmark&) 0x00009fd7   Thumb Code    10  mnrefprovider.in(.text)
-    CMnrpNaviControl::HandleModelUpdateL()   0x00009fe1   Thumb Code   174  mnrefprovider.in(.text)
-    thunk{-52} to CMnrpNaviControl::HandleModelUpdateL() 0x0000a08f   Thumb Code     4  mnrefprovider.in(.text)
-    CMnrpNaviControl::CountComponentControls() const 0x0000a093   Thumb Code     4  mnrefprovider.in(.text)
-    CMnrpNaviControl::ComponentControl(int) const 0x0000a097   Thumb Code    12  mnrefprovider.in(.text)
-    CMnrpNaviControl::OfferKeyEventL(const TKeyEvent&, TEventCode) 0x0000a0a3   Thumb Code    54  mnrefprovider.in(.text)
-    CMnrpNaviControl::SizeChanged()          0x0000a0d9   Thumb Code    28  mnrefprovider.in(.text)
-    CMnrpNaviControl::HandleResourceChange(int) 0x0000a0f5   Thumb Code    34  mnrefprovider.in(.text)
-    CMnrpNavigationService::ConstructL()     0x0000a12d   Thumb Code     8  mnrefprovider.in(.text)
-    CMnrpNavigationService::CMnrpNavigationService() 0x0000a135   Thumb Code    12  mnrefprovider.in(.text)
-    CMnrpNavigationService::CMnrpNavigationService__sub_object() 0x0000a135   Thumb Code     0  mnrefprovider.in(.text)
-    CMnrpNavigationService::NewL()           0x0000a141   Thumb Code    32  mnrefprovider.in(.text)
-    CMnrpNavigationService::~CMnrpNavigationService() 0x0000a161   Thumb Code     8  mnrefprovider.in(.text)
-    CMnrpNavigationService::~CMnrpNavigationService__sub_object() 0x0000a161   Thumb Code     0  mnrefprovider.in(.text)
-    CMnrpNavigationService::~CMnrpNavigationService__deallocating() 0x0000a169   Thumb Code    16  mnrefprovider.in(.text)
-    CMnrpNavigationService::HandleNavigateToL(const CPosLandmark&) 0x0000a179   Thumb Code    18  mnrefprovider.in(.text)
-    CMnrpNavigationService::DoCancel()       0x0000a18b   Thumb Code     2  mnrefprovider.in(.text)
-    CMnrpMapViewService::ConstructL()        0x0000a191   Thumb Code     8  mnrefprovider.in(.text)
-    CMnrpMapViewService::CMnrpMapViewService() 0x0000a199   Thumb Code    20  mnrefprovider.in(.text)
-    CMnrpMapViewService::CMnrpMapViewService__sub_object() 0x0000a199   Thumb Code     0  mnrefprovider.in(.text)
-    CMnrpMapViewService::NewL()              0x0000a1ad   Thumb Code    32  mnrefprovider.in(.text)
-    CMnrpMapViewService::AppUi()             0x0000a1cd   Thumb Code    18  mnrefprovider.in(.text)
-    CMnrpMapViewService::StopSelection()     0x0000a1df   Thumb Code    24  mnrefprovider.in(.text)
-    CMnrpMapViewService::DoCancel()          0x0000a1f7   Thumb Code    18  mnrefprovider.in(.text)
-    CMnrpMapViewService::~CMnrpMapViewService() 0x0000a209   Thumb Code    48  mnrefprovider.in(.text)
-    CMnrpMapViewService::~CMnrpMapViewService__sub_object() 0x0000a209   Thumb Code     0  mnrefprovider.in(.text)
-    CMnrpMapViewService::~CMnrpMapViewService__deallocating() 0x0000a239   Thumb Code    16  mnrefprovider.in(.text)
-    CMnrpMapViewService::HandleShowMapL()    0x0000a249   Thumb Code    44  mnrefprovider.in(.text)
-    CMnrpMapViewService::HandleShowCurrentLocationL() 0x0000a275   Thumb Code    12  mnrefprovider.in(.text)
-    CMnrpMapViewService::HandleSelectFromMapL() 0x0000a281   Thumb Code    54  mnrefprovider.in(.text)
-    CMnrpMapViewService::CompleteSelectionL(const TCoordinate&) 0x0000a2b7   Thumb Code    42  mnrefprovider.in(.text)
-    CMnrpMapViewService::HandleSelectionL(const TCoordinate&) 0x0000a2e1   Thumb Code    88  mnrefprovider.in(.text)
-    thunk{-212} to CMnrpMapViewService::HandleSelectionL(const TCoordinate&) 0x0000a339   Thumb Code     4  mnrefprovider.in(.text)
-    CMnrpMapViewService::HandleSelectionL(int) 0x0000a33d   Thumb Code    24  mnrefprovider.in(.text)
-    thunk{-212} to CMnrpMapViewService::HandleSelectionL(int) 0x0000a355   Thumb Code     4  mnrefprovider.in(.text)
-    CMnrpMapViewService::HandleSelectionL(unsigned long, int) 0x0000a359   Thumb Code    24  mnrefprovider.in(.text)
-    thunk{-212} to CMnrpMapViewService::HandleSelectionL(unsigned long, int) 0x0000a371   Thumb Code     4  mnrefprovider.in(.text)
-    CMnrpMapViewService::HandleSelectionErrorL(int) 0x0000a375   Thumb Code    16  mnrefprovider.in(.text)
-    thunk{-212} to CMnrpMapViewService::HandleSelectionErrorL(int) 0x0000a385   Thumb Code     4  mnrefprovider.in(.text)
-    Inline ARM to Thumb Veneer to RunThread  0x0000a38c   ARM Code       0  uc_exe.o(.text)
-    RunThread                                0x0000a395   Thumb Code    36  uc_exe.o(.text)
-    CallThrdProcEntry                        0x0000a3b8   ARM Code     116  callfirstprocessfn.o(.text)
-    __DLL_Export_Table__                     0x0000a430   ARM Code       4  dllexp.o(.text)
-    TPoint::operator +=(const TPoint&)       0x0000a4d8   ARM Code       0  euser{000a0000}-1025.o(StubCode)
-    CBufSeg::NewL(int)                       0x0000a4e0   ARM Code       0  euser{000a0000}-1096.o(StubCode)
-    HBufC16::Des()                           0x0000a4e8   ARM Code       0  euser{000a0000}-1116.o(StubCode)
-    HBufC16::NewLC(int)                      0x0000a4f0   ARM Code       0  euser{000a0000}-1119.o(StubCode)
-    TPtrC16::TPtrC16()                       0x0000a4f8   ARM Code       0  euser{000a0000}-1172.o(StubCode)
-    CServer2::DoCancel()                     0x0000a500   ARM Code       0  euser{000a0000}-1288.o(StubCode)
-    RArrayBase::At(int) const                0x0000a508   ARM Code       0  euser{000a0000}-1507.o(StubCode)
-    RArrayBase::Count() const                0x0000a510   ARM Code       0  euser{000a0000}-1510.o(StubCode)
-    CArrayFixBase::At(int) const             0x0000a518   ARM Code       0  euser{000a0000}-1553.o(StubCode)
-    RPointerArrayBase::At(int) const         0x0000a520   ARM Code       0  euser{000a0000}-1590.o(StubCode)
-    RPointerArrayBase::Count() const         0x0000a528   ARM Code       0  euser{000a0000}-1593.o(StubCode)
-    TRect::Size() const                      0x0000a530   ARM Code       0  euser{000a0000}-1648.o(StubCode)
-    TDesC16::AllocL() const                  0x0000a538   ARM Code       0  euser{000a0000}-1817.o(StubCode)
-    CPolicyServer::CustomFailureActionL(const RMessage2&, int, const TSecurityInfo&) 0x0000a540   ARM Code       0  euser{000a0000}-1995.o(StubCode)
-    CPolicyServer::RunL()                    0x0000a548   ARM Code       0  euser{000a0000}-1997.o(StubCode)
-    CPolicyServer::RunError(int)             0x0000a550   ARM Code       0  euser{000a0000}-1999.o(StubCode)
-    CleanupStack::PopAndDestroy()            0x0000a558   ARM Code       0  euser{000a0000}-203.o(StubCode)
-    CleanupStack::Pop(int)                   0x0000a560   ARM Code       0  euser{000a0000}-204.o(StubCode)
-    CleanupStack::Pop()                      0x0000a568   ARM Code       0  euser{000a0000}-205.o(StubCode)
-    User::MarkCleanupStack()                 0x0000a570   ARM Code       0  euser{000a0000}-2060.o(StubCode)
-    User::UnMarkCleanupStack(TTrapHandler*)  0x0000a578   ARM Code       0  euser{000a0000}-2061.o(StubCode)
-    CleanupStack::PushL(TCleanupItem)        0x0000a580   ARM Code       0  euser{000a0000}-207.o(StubCode)
-    CleanupStack::PushL(CBase*)              0x0000a588   ARM Code       0  euser{000a0000}-208.o(StubCode)
-    XLeaveException::GetReason() const       0x0000a590   ARM Code       0  euser{000a0000}-2082.o(StubCode)
-    CPolicyServer::Extension_(unsigned, void*&, void*) 0x0000a598   ARM Code       0  euser{000a0000}-2120.o(StubCode)
-    CBase::Extension_(unsigned, void*&, void*) 0x0000a5a0   ARM Code       0  euser{000a0000}-2123.o(StubCode)
-    CBase::~CBase()                          0x0000a5a8   ARM Code       0  euser{000a0000}-2125.o(StubCode)
-    CSession2::Extension_(unsigned, void*&, void*) 0x0000a5b0   ARM Code       0  euser{000a0000}-2131.o(StubCode)
-    CArrayFixBase::Reset()                   0x0000a5b8   ARM Code       0  euser{000a0000}-245.o(StubCode)
-    CArrayFixBase::InsertL(int, const void*) 0x0000a5c0   ARM Code       0  euser{000a0000}-250.o(StubCode)
-    CArrayFixBase::CArrayFixBase(CBufBase*(*)(int), int, int) 0x0000a5c8   ARM Code       0  euser{000a0000}-254.o(StubCode)
-    CArrayFixBase::~CArrayFixBase()          0x0000a5d0   ARM Code       0  euser{000a0000}-257.o(StubCode)
-    RArrayBase::Close()                      0x0000a5d8   ARM Code       0  euser{000a0000}-46.o(StubCode)
-    RPointerArrayBase::GetElementPtr(const CBase*, int) 0x0000a5e0   ARM Code       0  euser{000a0000}-464.o(StubCode)
-    RPointerArrayBase::Close()               0x0000a5e8   ARM Code       0  euser{000a0000}-470.o(StubCode)
-    RPointerArrayBase::Reset()               0x0000a5f0   ARM Code       0  euser{000a0000}-471.o(StubCode)
-    RPointerArrayBase::Append(const void*)   0x0000a5f8   ARM Code       0  euser{000a0000}-472.o(StubCode)
-    RPointerArrayBase::GetCount(const CBase*) 0x0000a600   ARM Code       0  euser{000a0000}-476.o(StubCode)
-    RArrayBase::Append(const void*)          0x0000a608   ARM Code       0  euser{000a0000}-48.o(StubCode)
-    RPointerArrayBase::RPointerArrayBase()   0x0000a610   ARM Code       0  euser{000a0000}-481.o(StubCode)
-    RArrayBase::RArrayBase(int)              0x0000a618   ARM Code       0  euser{000a0000}-55.o(StubCode)
-    Math::IsNaN(const double&)               0x0000a620   ARM Code       0  euser{000a0000}-551.o(StubCode)
-    User::LeaveIfError(int)                  0x0000a628   ARM Code       0  euser{000a0000}-593.o(StubCode)
-    User::HandleException(void*)             0x0000a630   ARM Code       0  euser{000a0000}-613.o(StubCode)
-    User::Leave(int)                         0x0000a638   ARM Code       0  euser{000a0000}-649.o(StubCode)
-    User::AllocZ(int)                        0x0000a640   ARM Code       0  euser{000a0000}-652.o(StubCode)
-    User::AllocZL(int)                       0x0000a648   ARM Code       0  euser{000a0000}-654.o(StubCode)
-    User::Invariant()                        0x0000a650   ARM Code       0  euser{000a0000}-669.o(StubCode)
-    TBufBase16::TBufBase16(int)              0x0000a658   ARM Code       0  euser{000a0000}-81.o(StubCode)
-    TRect::Grow(int, int)                    0x0000a660   ARM Code       0  euser{000a0000}-824.o(StubCode)
-    TRect::Shrink(const TSize&)              0x0000a668   ARM Code       0  euser{000a0000}-829.o(StubCode)
-    TRect::Shrink(int, int)                  0x0000a670   ARM Code       0  euser{000a0000}-830.o(StubCode)
-    TRect::TRect(const TSize&)               0x0000a678   ARM Code       0  euser{000a0000}-838.o(StubCode)
-    TRect::TRect(const TPoint&, const TSize&) 0x0000a680   ARM Code       0  euser{000a0000}-839.o(StubCode)
-    TRect::TRect(int, int, int, int)         0x0000a688   ARM Code       0  euser{000a0000}-841.o(StubCode)
-    TRect::TRect()                           0x0000a690   ARM Code       0  euser{000a0000}-842.o(StubCode)
-    TDes16::Format(TRefByValue<const TDesC16>, ...) 0x0000a698   ARM Code       0  euser{000a0000}-973.o(StubCode)
-    CApaDocument::Capability() const         0x0000a6a0   ARM Code       0  apparc{000a0000}-121.o(StubCode)
-    CApaApplication::AppFullName() const     0x0000a6a8   ARM Code       0  apparc{000a0000}-132.o(StubCode)
-    TApaApplicationFactory::TApaApplicationFactory(CApaApplication*(*)()) 0x0000a6b0   ARM Code       0  apparc{000a0000}-171.o(StubCode)
-    CApaAppServer::NotifyServerExit(int)     0x0000a6b8   ARM Code       0  apparc{000a0000}-191.o(StubCode)
-    CApaAppServer::CustomSecurityCheckL(const RMessage2&, int&, TSecurityInfo&) 0x0000a6c0   ARM Code       0  apparc{000a0000}-192.o(StubCode)
-    CApaAppServer::CApaAppServer()           0x0000a6c8   ARM Code       0  apparc{000a0000}-194.o(StubCode)
-    CApaAppServiceBase::SecurityCheckL(const RMessage2&, int&, TSecurityInfo&) 0x0000a6d0   ARM Code       0  apparc{000a0000}-202.o(StubCode)
-    CApaAppServer::NewSessionL(const TVersion&, const RMessage2&) const 0x0000a6d8   ARM Code       0  apparc{000a0000}-222.o(StubCode)
-    CApaAppServiceBase::ExtensionInterface(TUid, void*&) 0x0000a6e0   ARM Code       0  apparc{000a0000}-232.o(StubCode)
-    CApaCommandLine::ParentWindowGroupID() const 0x0000a6e8   ARM Code       0  apparc{000a0000}-253.o(StubCode)
-    CApaAppServer::CApaAppServer_Reserved1() 0x0000a6f0   ARM Code       0  apparc{000a0000}-273.o(StubCode)
-    CApaAppServer::CApaAppServer_Reserved2() 0x0000a6f8   ARM Code       0  apparc{000a0000}-274.o(StubCode)
-    CApaAppServer::DoConnect(const RMessage2&) 0x0000a700   ARM Code       0  apparc{000a0000}-275.o(StubCode)
-    CApaApplication::CApaApplication_Reserved1() 0x0000a708   ARM Code       0  apparc{000a0000}-279.o(StubCode)
-    CApaApplication::CApaApplication_Reserved2() 0x0000a710   ARM Code       0  apparc{000a0000}-280.o(StubCode)
-    CApaAppServiceBase::Disconnect(const RMessage2&) 0x0000a718   ARM Code       0  apparc{000a0000}-284.o(StubCode)
-    CApaAppServiceBase::CountResources()     0x0000a720   ARM Code       0  apparc{000a0000}-285.o(StubCode)
-    CApaAppServiceBase::CApaAppServiceBase_Reserved1() 0x0000a728   ARM Code       0  apparc{000a0000}-286.o(StubCode)
-    CApaAppServiceBase::CApaAppServiceBase_Reserved2() 0x0000a730   ARM Code       0  apparc{000a0000}-287.o(StubCode)
-    CApaDocument::GlassPictureL()            0x0000a738   ARM Code       0  apparc{000a0000}-30.o(StubCode)
-    CDesC16Array::AppendL(const TDesC16&)    0x0000a740   ARM Code       0  bafl{000a0000}-43.o(StubCode)
-    CDesC16ArraySeg::CDesC16ArraySeg(int)    0x0000a748   ARM Code       0  bafl{000a0000}-98.o(StubCode)
-    MCoeMessageObserver::MCoeMessageObserver_Reserved_1() 0x0000a750   ARM Code       0  cone{000a0000}-100.o(StubCode)
-    MCoeMessageObserver::MCoeMessageObserver_Reserved_2() 0x0000a758   ARM Code       0  cone{000a0000}-101.o(StubCode)
-    CCoeControl::MakeVisible(int)            0x0000a760   ARM Code       0  cone{000a0000}-11.o(StubCode)
-    CCoeControl::MinimumSize()               0x0000a768   ARM Code       0  cone{000a0000}-12.o(StubCode)
-    MCoeViewDeactivationObserver::MCoeViewDeactivationObserver_Reserved_1() 0x0000a770   ARM Code       0  cone{000a0000}-127.o(StubCode)
-    MCoeViewDeactivationObserver::MCoeViewDeactivationObserver_Reserved_2() 0x0000a778   ARM Code       0  cone{000a0000}-128.o(StubCode)
-    CCoeControl::SetAdjacent(int)            0x0000a780   ARM Code       0  cone{000a0000}-13.o(StubCode)
-    CCoeControl::SetNeighbor(CCoeControl*)   0x0000a788   ARM Code       0  cone{000a0000}-15.o(StubCode)
-    CCoeControl::SizeChanged()               0x0000a790   ARM Code       0  cone{000a0000}-18.o(StubCode)
-    CCoeEnv::Static()                        0x0000a798   ARM Code       0  cone{000a0000}-182.o(StubCode)
-    CCoeControl::FocusChanged(TDrawNow)      0x0000a7a0   ARM Code       0  cone{000a0000}-19.o(StubCode)
-    MCoeView::ViewConstructL()               0x0000a7a8   ARM Code       0  cone{000a0000}-196.o(StubCode)
-    MCoeView::PrepareForViewActivation()     0x0000a7b0   ARM Code       0  cone{000a0000}-197.o(StubCode)
-    MCoeView::ViewScreenModeCompatible(int)  0x0000a7b8   ARM Code       0  cone{000a0000}-199.o(StubCode)
-    CCoeAppUi::AddToStackL(const MCoeView&, CCoeControl*, int, int) 0x0000a7c0   ARM Code       0  cone{000a0000}-203.o(StubCode)
-    CCoeControl::SetMopParent(MObjectProvider*) 0x0000a7c8   ARM Code       0  cone{000a0000}-21.o(StubCode)
-    CCoeAppUi::HandleKeyEventL(const TKeyEvent&, TEventCode) 0x0000a7d0   ARM Code       0  cone{000a0000}-210.o(StubCode)
-    CCoeAppUi::RemoveFromStack(CCoeControl*) 0x0000a7d8   ARM Code       0  cone{000a0000}-211.o(StubCode)
-    CCoeAppUi::SetAndDrawFocus(int)          0x0000a7e0   ARM Code       0  cone{000a0000}-212.o(StubCode)
-    CCoeAppUi::HandleSwitchOnEventL(CCoeControl*) 0x0000a7e8   ARM Code       0  cone{000a0000}-220.o(StubCode)
-    CCoeControl::CreateWindowL()             0x0000a7f0   ARM Code       0  cone{000a0000}-25.o(StubCode)
-    CCoeControl::DrawDeferred() const        0x0000a7f8   ARM Code       0  cone{000a0000}-257.o(StubCode)
-    CCoeControl::OfferKeyEventL(const TKeyEvent&, TEventCode) 0x0000a800   ARM Code       0  cone{000a0000}-26.o(StubCode)
-    CCoeControl::GetHelpContext(TCoeHelpContext&) const 0x0000a808   ARM Code       0  cone{000a0000}-263.o(StubCode)
-    CCoeControl::ComponentControl(int) const 0x0000a810   ARM Code       0  cone{000a0000}-265.o(StubCode)
-    CCoeControl::GetColorUseListL(CArrayFix<TCoeColorUse>&) const 0x0000a818   ARM Code       0  cone{000a0000}-266.o(StubCode)
-    CCoeControl::InputCapabilities() const   0x0000a820   ARM Code       0  cone{000a0000}-270.o(StubCode)
-    CCoeControl::WriteInternalStateL(RWriteStream&) const 0x0000a828   ARM Code       0  cone{000a0000}-271.o(StubCode)
-    CCoeControl::CountComponentControls() const 0x0000a830   ARM Code       0  cone{000a0000}-272.o(StubCode)
-    CCoeControl::Draw(const TRect&) const    0x0000a838   ARM Code       0  cone{000a0000}-275.o(StubCode)
-    CCoeControl::Rect() const                0x0000a840   ARM Code       0  cone{000a0000}-276.o(StubCode)
-    CCoeControl::SystemGc() const            0x0000a848   ARM Code       0  cone{000a0000}-287.o(StubCode)
-    CCoeControl::HasBorder() const           0x0000a850   ARM Code       0  cone{000a0000}-288.o(StubCode)
-    CCoeControl::MopSupplyObject(TTypeUid)   0x0000a858   ARM Code       0  cone{000a0000}-29.o(StubCode)
-    CCoeControl::PositionChanged()           0x0000a860   ARM Code       0  cone{000a0000}-30.o(StubCode)
-    CCoeAppUi::HelpContextL() const          0x0000a868   ARM Code       0  cone{000a0000}-351.o(StubCode)
-    CCoeAppUi::GetActiveViewId(TVwsViewId&) const 0x0000a870   ARM Code       0  cone{000a0000}-353.o(StubCode)
-    CCoeAppUi::InputCapabilities() const     0x0000a878   ARM Code       0  cone{000a0000}-355.o(StubCode)
-    CCoeControl::HandlePointerEventL(const TPointerEvent&) 0x0000a880   ARM Code       0  cone{000a0000}-36.o(StubCode)
-    CCoeControl::SetContainerWindowL(const CCoeControl&) 0x0000a888   ARM Code       0  cone{000a0000}-39.o(StubCode)
-    thunk{-4} to CCoeControl::MopSupplyObject(TTypeUid) 0x0000a890   ARM Code       0  cone{000a0000}-396.o(StubCode)
-    thunk{-4} to CCoeControl::MopNext()      0x0000a898   ARM Code       0  cone{000a0000}-397.o(StubCode)
-    CCoeControl::HandleResourceChange(int)   0x0000a8a0   ARM Code       0  cone{000a0000}-40.o(StubCode)
-    CCoeControl::PrepareForFocusGainL()      0x0000a8a8   ARM Code       0  cone{000a0000}-41.o(StubCode)
-    CCoeControl::PrepareForFocusLossL()      0x0000a8b0   ARM Code       0  cone{000a0000}-42.o(StubCode)
-    CCoeControl::SetParent(CCoeControl*)     0x0000a8b8   ARM Code       0  cone{000a0000}-444.o(StubCode)
-    CCoeControl::SetLayoutManagerL(MCoeLayoutManager*) 0x0000a8c0   ARM Code       0  cone{000a0000}-474.o(StubCode)
-    CCoeControl::GetTextDrawer(CCoeTextDrawerBase*&, const CCoeControl*, int) const 0x0000a8c8   ARM Code       0  cone{000a0000}-477.o(StubCode)
-    CCoeControl::Reserved_CCoeControl_8()    0x0000a8d0   ARM Code       0  cone{000a0000}-478.o(StubCode)
-    CCoeControl::Reserved_CCoeControl_9()    0x0000a8d8   ARM Code       0  cone{000a0000}-479.o(StubCode)
-    CCoeControl::ConstructFromResourceL(TResourceReader&) 0x0000a8e0   ARM Code       0  cone{000a0000}-48.o(StubCode)
-    CCoeControl::RequestRelayout(const CCoeControl*) 0x0000a8e8   ARM Code       0  cone{000a0000}-482.o(StubCode)
-    CCoeControl::SetExtentToWholeScreen()    0x0000a8f0   ARM Code       0  cone{000a0000}-50.o(StubCode)
-    CCoeControl::SetTextBaselineSpacing(int) 0x0000a8f8   ARM Code       0  cone{000a0000}-502.o(StubCode)
-    CCoeControl::HandlePointerBufferReadyL() 0x0000a900   ARM Code       0  cone{000a0000}-51.o(StubCode)
-    CCoeControl::TextBaselineOffset(const TSize&) const 0x0000a908   ARM Code       0  cone{000a0000}-514.o(StubCode)
-    CCoeControl::MopNext()                   0x0000a910   ARM Code       0  cone{000a0000}-56.o(StubCode)
-    CCoeControl::SetRect(const TRect&)       0x0000a918   ARM Code       0  cone{000a0000}-57.o(StubCode)
-    CCoeControl::Reserved_CCoeControl_10()   0x0000a920   ARM Code       0  cone{000a0000}-580.o(StubCode)
-    CCoeControl::Reserved_CCoeControl_11()   0x0000a928   ARM Code       0  cone{000a0000}-581.o(StubCode)
-    CCoeControl::Reserved_CCoeControl_12()   0x0000a930   ARM Code       0  cone{000a0000}-582.o(StubCode)
-    CCoeControl::Reserved_CCoeControl_13()   0x0000a938   ARM Code       0  cone{000a0000}-583.o(StubCode)
-    CCoeControl::HandleControlArrayEventL(CCoeControlArray::TEvent, const CCoeControlArray*, CCoeControl*, int) 0x0000a940   ARM Code       0  cone{000a0000}-584.o(StubCode)
-    CCoeControl::ActivateL()                 0x0000a948   ARM Code       0  cone{000a0000}-61.o(StubCode)
-    CCoeControl::SetDimmed(int)              0x0000a950   ARM Code       0  cone{000a0000}-62.o(StubCode)
-    MObjectProvider::MObjectProvider_Reserved1() 0x0000a958   ARM Code       0  cone{000a0000}-638.o(StubCode)
-    MObjectProvider::MObjectProvider_Reserved2() 0x0000a960   ARM Code       0  cone{000a0000}-639.o(StubCode)
-    CCoeControl::CCoeControl()               0x0000a968   ARM Code       0  cone{000a0000}-64.o(StubCode)
-    MCoeViewDeactivationObserver::MCoeViewDeactivationObserver__sub_object() 0x0000a970   ARM Code       0  cone{000a0000}-664.o(StubCode)
-    CCoeControl::~CCoeControl()              0x0000a978   ARM Code       0  cone{000a0000}-67.o(StubCode)
-    MCoeView::MCoeView_Reserved_2()          0x0000a980   ARM Code       0  cone{000a0000}-670.o(StubCode)
-    MCoeView::MCoeView_Reserved_3()          0x0000a988   ARM Code       0  cone{000a0000}-671.o(StubCode)
-    CCoeAppUi::FrameworkCallsRendezvous() const 0x0000a990   ARM Code       0  cone{000a0000}-676.o(StubCode)
-    CCoeAppUi::CCoeAppUi_Reserved_2()        0x0000a998   ARM Code       0  cone{000a0000}-677.o(StubCode)
-    CCoeControl::Reserved_2()                0x0000a9a0   ARM Code       0  cone{000a0000}-9.o(StubCode)
-    thunk{-20} to CEikDocument::SaveL(MSaveObserver::TSaveType) 0x0000a9a8   ARM Code       0  eikcore{000a0000}-141.o(StubCode)
-    CEikAppUi::Reserved_3()                  0x0000a9b0   ARM Code       0  eikcore{000a0000}-142.o(StubCode)
-    CEikAppUi::Reserved_4()                  0x0000a9b8   ARM Code       0  eikcore{000a0000}-143.o(StubCode)
-    CEikAppUi::CreateFileL(const TDesC16&)   0x0000a9c0   ARM Code       0  eikcore{000a0000}-144.o(StubCode)
-    CEikAppUi::SetEmphasis(CCoeControl*, int) 0x0000a9c8   ARM Code       0  eikcore{000a0000}-147.o(StubCode)
-    CEikAppUi::HandleMessageL(unsigned long, TUid, const TDesC8&) 0x0000a9d0   ARM Code       0  eikcore{000a0000}-152.o(StubCode)
-    CEikAppUi::ProcessMessageL(TUid, const TDesC8&) 0x0000a9d8   ARM Code       0  eikcore{000a0000}-155.o(StubCode)
-    CEikAppUi::HandleModelChangeL()          0x0000a9e0   ARM Code       0  eikcore{000a0000}-158.o(StubCode)
-    CEikAppUi::HandleSideBarMenuL(int, const TPoint&, int, const CEikHotKeyTable*) 0x0000a9e8   ARM Code       0  eikcore{000a0000}-159.o(StubCode)
-    CEikAppUi::ProcessCommandParametersL(TApaCommand, TBuf<(int)256>&, const TDesC8&) 0x0000a9f0   ARM Code       0  eikcore{000a0000}-169.o(StubCode)
-    CEikAppUi::ReportResourceChangedToAppL(int) 0x0000a9f8   ARM Code       0  eikcore{000a0000}-171.o(StubCode)
-    CEikAppUi::OpenFileL(const TDesC16&)     0x0000aa00   ARM Code       0  eikcore{000a0000}-175.o(StubCode)
-    CEikDocument::Reserved_2()               0x0000aa08   ARM Code       0  eikcore{000a0000}-18.o(StubCode)
-    CEikDocument::NewDocumentL()             0x0000aa10   ARM Code       0  eikcore{000a0000}-20.o(StubCode)
-    CEikDocument::UpdateTaskNameL(CApaWindowGroupName*) 0x0000aa18   ARM Code       0  eikcore{000a0000}-25.o(StubCode)
-    CEikDocument::CreateFileStoreLC(RFs&, const TDesC16&) 0x0000aa20   ARM Code       0  eikcore{000a0000}-26.o(StubCode)
-    CEikDocument::EditL(MApaEmbeddedDocObserver*, int) 0x0000aa28   ARM Code       0  eikcore{000a0000}-27.o(StubCode)
-    CEikDocument::SaveL(MSaveObserver::TSaveType) 0x0000aa30   ARM Code       0  eikcore{000a0000}-28.o(StubCode)
-    CEikDocument::SaveL()                    0x0000aa38   ARM Code       0  eikcore{000a0000}-29.o(StubCode)
-    CEikDocument::HasChanged() const         0x0000aa40   ARM Code       0  eikcore{000a0000}-291.o(StubCode)
-    CEikDocument::ExternalizeL(RWriteStream&) const 0x0000aa48   ARM Code       0  eikcore{000a0000}-293.o(StubCode)
-    CEikDocument::StoreL(CStreamStore&, CStreamDictionary&) const 0x0000aa50   ARM Code       0  eikcore{000a0000}-294.o(StubCode)
-    CEikDocument::IsEmpty() const            0x0000aa58   ARM Code       0  eikcore{000a0000}-295.o(StubCode)
-    CEikApplication::Capability(TDes8&) const 0x0000aa60   ARM Code       0  eikcore{000a0000}-296.o(StubCode)
-    CEikApplication::OpenIniFileLC(RFs&) const 0x0000aa68   ARM Code       0  eikcore{000a0000}-297.o(StubCode)
-    CEikApplication::BitmapStoreName() const 0x0000aa70   ARM Code       0  eikcore{000a0000}-298.o(StubCode)
-    CEikApplication::ResourceFileName() const 0x0000aa78   ARM Code       0  eikcore{000a0000}-299.o(StubCode)
-    CEikDocument::PrintL(const CStreamStore&) 0x0000aa80   ARM Code       0  eikcore{000a0000}-30.o(StubCode)
-    CEikApplication::GetDefaultDocumentFileName(TBuf<(int)256>&) const 0x0000aa88   ARM Code       0  eikcore{000a0000}-302.o(StubCode)
-    CEikDocument::RestoreL(const CStreamStore&, const CStreamDictionary&) 0x0000aa90   ARM Code       0  eikcore{000a0000}-31.o(StubCode)
-    CEikAppUi::ClientRect() const            0x0000aa98   ARM Code       0  eikcore{000a0000}-315.o(StubCode)
-    CEikAppUi::ValidFileType(TUid) const     0x0000aaa0   ARM Code       0  eikcore{000a0000}-317.o(StubCode)
-    CEikAppUi::Document() const              0x0000aaa8   ARM Code       0  eikcore{000a0000}-319.o(StubCode)
-    CEikonEnv::DenseFont() const             0x0000aab0   ARM Code       0  eikcore{000a0000}-352.o(StubCode)
-    CEikDocument::~CEikDocument__sub_object() 0x0000aab8   ARM Code       0  eikcore{000a0000}-37.o(StubCode)
-    thunk{-36} to CEikAppUi::HandleMessageL(unsigned long, TUid, const TDesC8&) 0x0000aac0   ARM Code       0  eikcore{000a0000}-390.o(StubCode)
-    thunk{-40} to CEikAppUi::MopNext()       0x0000aac8   ARM Code       0  eikcore{000a0000}-392.o(StubCode)
-    EikStart::RunApplication(TApaApplicationFactory) 0x0000aad0   ARM Code       0  eikcore{000a0000}-394.o(StubCode)
-    CEikAppServer::ExtensionInterface(TUid, void*&) 0x0000aad8   ARM Code       0  eikcore{000a0000}-467.o(StubCode)
-    CEikonEnv::StartedAsServerApp() const    0x0000aae0   ARM Code       0  eikcore{000a0000}-472.o(StubCode)
-    CEikonEnv::AppServer() const             0x0000aae8   ARM Code       0  eikcore{000a0000}-473.o(StubCode)
-    CEikAppUi::MopNext()                     0x0000aaf0   ARM Code       0  eikcore{000a0000}-479.o(StubCode)
-    thunk{-24} to CEikAppUi::HandleSideBarMenuL(int, const TPoint&, int, const CEikHotKeyTable*) 0x0000aaf8   ARM Code       0  eikcore{000a0000}-490.o(StubCode)
-    CEikAppUi::ProcessCommandParametersL(CApaCommandLine&) 0x0000ab00   ARM Code       0  eikcore{000a0000}-506.o(StubCode)
-    CEikAppServer::CreateServiceSecurityCheckL(TUid, const RMessage2&, int&, TSecurityInfo&) 0x0000ab08   ARM Code       0  eikcore{000a0000}-523.o(StubCode)
-    CEikApplication::CEikApplication_Reserved1() 0x0000ab10   ARM Code       0  eikcore{000a0000}-532.o(StubCode)
-    CEikApplication::CEikApplication_Reserved2() 0x0000ab18   ARM Code       0  eikcore{000a0000}-533.o(StubCode)
-    MEikMenuObserver::Reserved_2_MenuObserver() 0x0000ab20   ARM Code       0  eikcore{000a0000}-534.o(StubCode)
-    MEikMenuObserver::CreateCustomCommandControlL(int) 0x0000ab28   ARM Code       0  eikcore{000a0000}-535.o(StubCode)
-    MEikMenuObserver::MEikCommandObserver_Reserved1() 0x0000ab30   ARM Code       0  eikcore{000a0000}-536.o(StubCode)
-    MEikMenuObserver::MEikCommandObserver_Reserved2() 0x0000ab38   ARM Code       0  eikcore{000a0000}-537.o(StubCode)
-    CEikDocument::ValidatePasswordL() const  0x0000ab40   ARM Code       0  eikcore{000a0000}-565.o(StubCode)
-    CEikApplication::CreateDocumentL(CApaProcess*) 0x0000ab48   ARM Code       0  eikcore{000a0000}-61.o(StubCode)
-    CEikApplication::PreDocConstructL()      0x0000ab50   ARM Code       0  eikcore{000a0000}-62.o(StubCode)
-    thunk{-24} to CEikAppUi::SetEmphasis(CCoeControl*, int) 0x0000ab58   ARM Code       0  eikcore{000a0000}-63.o(StubCode)
-    CEikApplication::CEikApplication__sub_object() 0x0000ab60   ARM Code       0  eikcore{000a0000}-64.o(StubCode)
-    CEikApplication::~CEikApplication__sub_object() 0x0000ab68   ARM Code       0  eikcore{000a0000}-67.o(StubCode)
-    MEikMenuObserver::RestoreMenuL(CCoeControl*, int, MEikMenuObserver::TMenuType) 0x0000ab70   ARM Code       0  eikcore{000a0000}-72.o(StubCode)
-    MEikMenuObserver::OfferKeyToAppL(const TKeyEvent&, TEventCode) 0x0000ab78   ARM Code       0  eikcore{000a0000}-73.o(StubCode)
-    MEikMenuObserver::DynInitMenuBarL(int, CEikMenuBar*) 0x0000ab80   ARM Code       0  eikcore{000a0000}-74.o(StubCode)
-    MEikMenuObserver::DynInitMenuPaneL(int, CEikMenuPane*) 0x0000ab88   ARM Code       0  eikcore{000a0000}-75.o(StubCode)
-    MEikMenuObserver::HandleSideBarMenuL(int, const TPoint&, int, const CEikHotKeyTable*) 0x0000ab90   ARM Code       0  eikcore{000a0000}-76.o(StubCode)
-    MEikMenuObserver::CheckHotKeyNotDimmedL(int) 0x0000ab98   ARM Code       0  eikcore{000a0000}-77.o(StubCode)
-    MEikMenuObserver::Reserved_1_MenuObserver() 0x0000aba0   ARM Code       0  eikcore{000a0000}-78.o(StubCode)
-    MEikMenuObserver::HandleAttemptDimmedSelectionL(int) 0x0000aba8   ARM Code       0  eikcore{000a0000}-79.o(StubCode)
-    CEikStatusPaneBase::ControlL(TUid) const 0x0000abb0   ARM Code       0  eikcoctl{000a0000}-1376.o(StubCode)
-    CEikMenuPane::SetItemDimmed(int, int)    0x0000abb8   ARM Code       0  eikcoctl{000a0000}-140.o(StubCode)
-    CEikButtonGroupContainer::ReduceRect(TRect&) const 0x0000abc0   ARM Code       0  eikcoctl{000a0000}-1430.o(StubCode)
-    CEikListBox::HandleItemAdditionL()       0x0000abc8   ARM Code       0  eikcoctl{000a0000}-35.o(StubCode)
-    CEikListBox::CreateScrollBarFrameL(int)  0x0000abd0   ARM Code       0  eikcoctl{000a0000}-46.o(StubCode)
-    CTextListBoxModel::SetItemTextArray(MDesC16Array*) 0x0000abd8   ARM Code       0  eikcoctl{000a0000}-605.o(StubCode)
-    CTextListBoxModel::SetOwnershipType(TListBoxModelItemArrayOwnership) 0x0000abe0   ARM Code       0  eikcoctl{000a0000}-606.o(StubCode)
-    CEikScrollBarFrame::SetScrollBarVisibilityL(CEikScrollBarFrame::TScrollBarVisibility, CEikScrollBarFrame::TScrollBarVisibility) 0x0000abe8   ARM Code       0  eikcoctl{000a0000}-660.o(StubCode)
-    CEikButtonGroupContainer::DoSetCommandL(int, int, const TDesC16*, const CFbsBitmap*, const CFbsBitmap*, CEikButtonGroupContainer::TCommandOp) 0x0000abf0   ARM Code       0  eikcoctl{000a0000}-875.o(StubCode)
-    CEikButtonGroupContainer::SetCommandSetL(int) 0x0000abf8   ARM Code       0  eikcoctl{000a0000}-880.o(StubCode)
-    CEikButtonGroupContainer::SetBoundingRect(const TRect&) 0x0000ac00   ARM Code       0  eikcoctl{000a0000}-881.o(StubCode)
-    CEikColumnListBox::Model() const         0x0000ac08   ARM Code       0  eikctl{000a0000}-455.o(StubCode)
-    CAknAppServiceBase::CreateL()            0x0000ac10   ARM Code       0  avkon{000a0000}-1132.o(StubCode)
-    CAknDocument::OpenFileL(CFileStore*&, RFile&) 0x0000ac18   ARM Code       0  avkon{000a0000}-129.o(StubCode)
-    CAknDocument::OpenFileL(int, const TDesC16&, RFs&) 0x0000ac20   ARM Code       0  avkon{000a0000}-130.o(StubCode)
-    CAknDocument::CAknDocument__sub_object(CEikApplication&) 0x0000ac28   ARM Code       0  avkon{000a0000}-131.o(StubCode)
-    CAknInformationNote::CAknInformationNote(int) 0x0000ac30   ARM Code       0  avkon{000a0000}-1341.o(StubCode)
-    CAknAppServer::ConstructL(const TDesC16&) 0x0000ac38   ARM Code       0  avkon{000a0000}-198.o(StubCode)
-    CAknAppServer::HandleAllClientsClosed()  0x0000ac40   ARM Code       0  avkon{000a0000}-199.o(StubCode)
-    CAknResourceNoteDialog::ExecuteLD(const TDesC16&) 0x0000ac48   ARM Code       0  avkon{000a0000}-1996.o(StubCode)
-    CAknAppServer::~CAknAppServer()          0x0000ac50   ARM Code       0  avkon{000a0000}-201.o(StubCode)
-    CAknAppUiBase::MopSupplyObject(TTypeUid) 0x0000ac58   ARM Code       0  avkon{000a0000}-206.o(StubCode)
-    CAknAppUiBase::HandleResourceChangeL(int) 0x0000ac60   ARM Code       0  avkon{000a0000}-211.o(StubCode)
-    CAknAppUiBase::HandleScreenDeviceChangedL() 0x0000ac68   ARM Code       0  avkon{000a0000}-213.o(StubCode)
-    CAknAppUiBase::HandleApplicationSpecificEventL(int, const TWsEvent&) 0x0000ac70   ARM Code       0  avkon{000a0000}-214.o(StubCode)
-    CAknAppUiBase::Exit()                    0x0000ac78   ARM Code       0  avkon{000a0000}-215.o(StubCode)
-    CAknAppUiBase::SetFadedL(int)            0x0000ac80   ARM Code       0  avkon{000a0000}-216.o(StubCode)
-    CAknSelectionListDialog::SetIconArrayL(CArrayPtr<CGulIcon>*) 0x0000ac88   ARM Code       0  avkon{000a0000}-2163.o(StubCode)
-    CAknAppUiBase::CAknAppUiBase()           0x0000ac90   ARM Code       0  avkon{000a0000}-217.o(StubCode)
-    CAknSelectionListDialog::NewL(int&, MDesC16Array*, int, MEikCommandObserver*) 0x0000ac98   ARM Code       0  avkon{000a0000}-2178.o(StubCode)
-    CAknAppUiBase::~CAknAppUiBase()          0x0000aca0   ARM Code       0  avkon{000a0000}-220.o(StubCode)
-    CAknSingleHeadingStyleListBox::CAknSingleHeadingStyleListBox() 0x0000aca8   ARM Code       0  avkon{000a0000}-2591.o(StubCode)
-    CAknNavigationControlContainer::CreateNavigationLabelL(const TDesC16&) 0x0000acb0   ARM Code       0  avkon{000a0000}-2624.o(StubCode)
-    CAknNavigationControlContainer::ReplaceL(CAknNavigationDecorator&, CAknNavigationDecorator&) 0x0000acb8   ARM Code       0  avkon{000a0000}-2632.o(StubCode)
-    CAknView::SetEmphasis(CCoeControl*, int) 0x0000acc0   ARM Code       0  avkon{000a0000}-2895.o(StubCode)
-    CAknView::BaseConstructL(int)            0x0000acc8   ARM Code       0  avkon{000a0000}-2898.o(StubCode)
-    CAknView::HandleCommandL(int)            0x0000acd0   ARM Code       0  avkon{000a0000}-2899.o(StubCode)
-    CAknView::ViewActivatedL(const TVwsViewId&, TUid, const TDesC8&) 0x0000acd8   ARM Code       0  avkon{000a0000}-2900.o(StubCode)
-    CAknView::MopSupplyObject(TTypeUid)      0x0000ace0   ARM Code       0  avkon{000a0000}-2901.o(StubCode)
-    CAknView::ProcessCommandL(int)           0x0000ace8   ARM Code       0  avkon{000a0000}-2902.o(StubCode)
-    CAknView::ViewDeactivated()              0x0000acf0   ARM Code       0  avkon{000a0000}-2903.o(StubCode)
-    CAknView::AknViewActivatedL(const TVwsViewId&, TUid, const TDesC8&) 0x0000acf8   ARM Code       0  avkon{000a0000}-2904.o(StubCode)
-    CAknView::Reserved_MtsmObject()          0x0000ad00   ARM Code       0  avkon{000a0000}-2905.o(StubCode)
-    CAknView::HandleViewRectChange()         0x0000ad08   ARM Code       0  avkon{000a0000}-2906.o(StubCode)
-    CAknView::Reserved_MtsmPosition()        0x0000ad10   ARM Code       0  avkon{000a0000}-2907.o(StubCode)
-    CAknView::HandleForegroundEventL(int)    0x0000ad18   ARM Code       0  avkon{000a0000}-2909.o(StubCode)
-    CAknView::ViewScreenDeviceChangedL()     0x0000ad20   ARM Code       0  avkon{000a0000}-2910.o(StubCode)
-    CAknView::HandleStatusPaneSizeChange()   0x0000ad28   ARM Code       0  avkon{000a0000}-2912.o(StubCode)
-    CAknView::MopNext()                      0x0000ad30   ARM Code       0  avkon{000a0000}-2913.o(StubCode)
-    CAknView::CAknView__sub_object()         0x0000ad38   ARM Code       0  avkon{000a0000}-2914.o(StubCode)
-    CAknView::~CAknView__sub_object()        0x0000ad40   ARM Code       0  avkon{000a0000}-2917.o(StubCode)
-    CAknAppUi::StatusPane()                  0x0000ad48   ARM Code       0  avkon{000a0000}-2919.o(StubCode)
-    CAknAppUi::HandleError(int, const SExtendedError&, TDes16&, TDes16&) 0x0000ad50   ARM Code       0  avkon{000a0000}-2920.o(StubCode)
-    CAknAppUi::PrepareToExit()               0x0000ad58   ARM Code       0  avkon{000a0000}-2922.o(StubCode)
-    CAknAppUi::HandleSystemEventL(const TWsEvent&) 0x0000ad60   ARM Code       0  avkon{000a0000}-2928.o(StubCode)
-    CAknAppUi::Reserved_MtsmObject()         0x0000ad68   ARM Code       0  avkon{000a0000}-2929.o(StubCode)
-    CAknAppUi::Reserved_MtsmPosition()       0x0000ad70   ARM Code       0  avkon{000a0000}-2930.o(StubCode)
-    CAknAppUi::HandleViewDeactivation(const TVwsViewId&, const TVwsViewId&) 0x0000ad78   ARM Code       0  avkon{000a0000}-2932.o(StubCode)
-    CAknAppUi::HandleTouchPaneSizeChange()   0x0000ad80   ARM Code       0  avkon{000a0000}-2934.o(StubCode)
-    CAknAppUi::Cba()                         0x0000ad88   ARM Code       0  avkon{000a0000}-2936.o(StubCode)
-    CAknAppServer::CreateServiceL(TUid) const 0x0000ad90   ARM Code       0  avkon{000a0000}-2993.o(StubCode)
-    CAknAppUiBase::ApplicationRect() const   0x0000ad98   ARM Code       0  avkon{000a0000}-2997.o(StubCode)
-    CAknView::ClientRect() const             0x0000ada0   ARM Code       0  avkon{000a0000}-3417.o(StubCode)
-    CAknView::Cba() const                    0x0000ada8   ARM Code       0  avkon{000a0000}-3420.o(StubCode)
-    CAknView::AppUi() const                  0x0000adb0   ARM Code       0  avkon{000a0000}-3421.o(StubCode)
-    CAknView::Redraw() const                 0x0000adb8   ARM Code       0  avkon{000a0000}-3422.o(StubCode)
-    CAknView::ViewId() const                 0x0000adc0   ARM Code       0  avkon{000a0000}-3423.o(StubCode)
-    CAknView::MenuBar() const                0x0000adc8   ARM Code       0  avkon{000a0000}-3424.o(StubCode)
-    CAknViewAppUi::BaseConstructL(int)       0x0000add0   ARM Code       0  avkon{000a0000}-367.o(StubCode)
-    CAknViewAppUi::HandleWsEventL(const TWsEvent&, CCoeControl*) 0x0000add8   ARM Code       0  avkon{000a0000}-368.o(StubCode)
-    CAknViewAppUi::ProcessCommandL(int)      0x0000ade0   ARM Code       0  avkon{000a0000}-369.o(StubCode)
-    CAknViewAppUi::ActivateLocalViewL(TUid)  0x0000ade8   ARM Code       0  avkon{000a0000}-370.o(StubCode)
-    CAknViewAppUi::StopDisplayingMenuBar()   0x0000adf0   ARM Code       0  avkon{000a0000}-372.o(StubCode)
-    CAknViewAppUi::HandleForegroundEventL(int) 0x0000adf8   ARM Code       0  avkon{000a0000}-373.o(StubCode)
-    CAknViewAppUi::HandleStatusPaneSizeChange() 0x0000ae00   ARM Code       0  avkon{000a0000}-374.o(StubCode)
-    CAknViewAppUi::AddViewL(CAknView*)       0x0000ae08   ARM Code       0  avkon{000a0000}-375.o(StubCode)
-    CAknViewAppUi::~CAknViewAppUi()          0x0000ae10   ARM Code       0  avkon{000a0000}-377.o(StubCode)
-    thunk{-100} to CAknAppUi::HandleTouchPaneSizeChange() 0x0000ae18   ARM Code       0  avkon{000a0000}-3826.o(StubCode)
-    thunk{-12} to CAknView::SetEmphasis(CCoeControl*, int) 0x0000ae20   ARM Code       0  avkon{000a0000}-3831.o(StubCode)
-    thunk{-12} to CAknView::ProcessCommandL(int) 0x0000ae28   ARM Code       0  avkon{000a0000}-3832.o(StubCode)
-    thunk{-24} to CAknViewAppUi::ProcessCommandL(int) 0x0000ae30   ARM Code       0  avkon{000a0000}-3857.o(StubCode)
-    thunk{-24} to CAknView::MopSupplyObject(TTypeUid) 0x0000ae38   ARM Code       0  avkon{000a0000}-3860.o(StubCode)
-    thunk{-24} to CAknView::MopNext()        0x0000ae40   ARM Code       0  avkon{000a0000}-3861.o(StubCode)
-    thunk{-40} to CAknAppUiBase::MopSupplyObject(TTypeUid) 0x0000ae48   ARM Code       0  avkon{000a0000}-3868.o(StubCode)
-    thunk{-4} to CAknView::ViewActivatedL(const TVwsViewId&, TUid, const TDesC8&) 0x0000ae50   ARM Code       0  avkon{000a0000}-3947.o(StubCode)
-    thunk{-4} to CAknView::ViewDeactivated() 0x0000ae58   ARM Code       0  avkon{000a0000}-3948.o(StubCode)
-    thunk{-4} to CAknView::ViewScreenDeviceChangedL() 0x0000ae60   ARM Code       0  avkon{000a0000}-3949.o(StubCode)
-    thunk{-4} to CAknView::ViewId() const    0x0000ae68   ARM Code       0  avkon{000a0000}-3983.o(StubCode)
-    thunk{-88} to CAknViewAppUi::HandleStatusPaneSizeChange() 0x0000ae70   ARM Code       0  avkon{000a0000}-4014.o(StubCode)
-    thunk{-92} to CAknAppUi::HandleViewDeactivation(const TVwsViewId&, const TVwsViewId&) 0x0000ae78   ARM Code       0  avkon{000a0000}-4030.o(StubCode)
-    AknIconUtils::CreateIconLC(CFbsBitmap*&, CFbsBitmap*&, const TDesC16&, int, int) 0x0000ae80   ARM Code       0  AknIcon{000a0000}-13.o(StubCode)
-    CGulIcon::SetBitmapsOwnedExternally(int) 0x0000ae88   ARM Code       0  egul{000a0000}-94.o(StubCode)
-    CGulIcon::NewL(CFbsBitmap*, CFbsBitmap*) 0x0000ae90   ARM Code       0  egul{000a0000}-95.o(StubCode)
-    CFont::AscentInPixels() const            0x0000ae98   ARM Code       0  gdi{000a0000}-310.o(StubCode)
-    CFont::HeightInPixels() const            0x0000aea0   ARM Code       0  gdi{000a0000}-311.o(StubCode)
-    CFont::FontSpecInTwips() const           0x0000aea8   ARM Code       0  gdi{000a0000}-312.o(StubCode)
-    CFbsBitmap::Create(const TSize&, TDisplayMode) 0x0000aeb0   ARM Code       0  fbscli{000a0000}-26.o(StubCode)
-    CFbsBitmap::CFbsBitmap()                 0x0000aeb8   ARM Code       0  fbscli{000a0000}-31.o(StubCode)
-    CPosLandmark::NewL(const CPosLandmark&)  0x0000aec0   ARM Code       0  eposlandmarks{000a0000}-12.o(StubCode)
-    CPosLandmark::NewLC()                    0x0000aec8   ARM Code       0  eposlandmarks{000a0000}-15.o(StubCode)
-    CPosLandmark::SetPositionL(const TLocality&) 0x0000aed0   ARM Code       0  eposlandmarks{000a0000}-4.o(StubCode)
-    CPosLandmarkDatabase::OpenL(const TDesC16&) 0x0000aed8   ARM Code       0  eposlandmarks{000a0000}-50.o(StubCode)
-    CPosLandmark::GetPosition(TLocality&) const 0x0000aee0   ARM Code       0  eposlandmarks{000a0000}-65.o(StubCode)
-    CPosLandmark::GetLandmarkName(TPtrC16&) const 0x0000aee8   ARM Code       0  eposlandmarks{000a0000}-67.o(StubCode)
-    CPosLandmark::GetIcon(TPtrC16&, int&, int&) const 0x0000aef0   ARM Code       0  eposlandmarks{000a0000}-75.o(StubCode)
-    TPositionUpdateOptions::TPositionUpdateOptions() 0x0000aef8   ARM Code       0  lbs{000a0000}-152.o(StubCode)
-    TPositionUpdateOptionsBase::SetUpdateTimeOut(TTimeIntervalMicroSeconds) 0x0000af00   ARM Code       0  lbs{000a0000}-180.o(StubCode)
-    TPositionUpdateOptionsBase::SetUpdateInterval(TTimeIntervalMicroSeconds) 0x0000af08   ARM Code       0  lbs{000a0000}-181.o(StubCode)
-    TLocality::TLocality(const TCoordinate&, float) 0x0000af10   ARM Code       0  lbs{000a0000}-205.o(StubCode)
-    TLocality::TLocality()                   0x0000af18   ARM Code       0  lbs{000a0000}-207.o(StubCode)
-    TCoordinate::TCoordinate(const double&, const double&) 0x0000af20   ARM Code       0  lbs{000a0000}-21.o(StubCode)
-    TPosition::TPosition()                   0x0000af28   ARM Code       0  lbs{000a0000}-214.o(StubCode)
-    TCoordinate::Latitude() const            0x0000af30   ARM Code       0  lbs{000a0000}-223.o(StubCode)
-    TCoordinate::Longitude() const           0x0000af38   ARM Code       0  lbs{000a0000}-225.o(StubCode)
-    TPositionInfo::GetPosition(TPosition&) const 0x0000af40   ARM Code       0  lbs{000a0000}-226.o(StubCode)
-    TCoordinate::TCoordinate()               0x0000af48   ARM Code       0  lbs{000a0000}-23.o(StubCode)
-    TPositionInfo::TPositionInfo()           0x0000af50   ARM Code       0  lbs{000a0000}-28.o(StubCode)
-    TLocality::Distance(const TCoordinate&, float&) const 0x0000af58   ARM Code       0  lbs{000a0000}-304.o(StubCode)
-    TLocality::BearingTo(const TCoordinate&, float&) const 0x0000af60   ARM Code       0  lbs{000a0000}-306.o(StubCode)
-    CMnServiceBase::ServiceError(const RMessage2&, int) 0x0000af68   ARM Code       0  mnservicelib{000a0000}-1.o(StubCode)
-    CMnMapViewServiceBase::LinkedLandmarksToShow(int) 0x0000af70   ARM Code       0  mnservicelib{000a0000}-10.o(StubCode)
-    CMnMapViewServiceBase::CompleteSelectionRequest(int) 0x0000af78   ARM Code       0  mnservicelib{000a0000}-11.o(StubCode)
-    CMnMapViewServiceBase::CompleteSelectionRequest(unsigned long, int) 0x0000af80   ARM Code       0  mnservicelib{000a0000}-12.o(StubCode)
-    CMnMapViewServiceBase::LandmarksToShowDatabases() 0x0000af88   ARM Code       0  mnservicelib{000a0000}-13.o(StubCode)
-    CMnMapViewServiceBase::CompleteSelectionRequestL(const CPosLandmark&) 0x0000af90   ARM Code       0  mnservicelib{000a0000}-14.o(StubCode)
-    CMnMapViewServiceBase::Options()         0x0000af98   ARM Code       0  mnservicelib{000a0000}-15.o(StubCode)
-    CMnMapViewServiceBase::ServiceL(const RMessage2&) 0x0000afa0   ARM Code       0  mnservicelib{000a0000}-16.o(StubCode)
-    CMnMapViewServiceBase::CMnMapViewServiceBase__sub_object() 0x0000afa8   ARM Code       0  mnservicelib{000a0000}-17.o(StubCode)
-    CMnServiceBase::CompleteRequest(int)     0x0000afb0   ARM Code       0  mnservicelib{000a0000}-2.o(StubCode)
-    CMnMapViewServiceBase::~CMnMapViewServiceBase__sub_object() 0x0000afb8   ARM Code       0  mnservicelib{000a0000}-20.o(StubCode)
-    CMnNavigationServiceBase::BaseConstructL() 0x0000afc0   ARM Code       0  mnservicelib{000a0000}-28.o(StubCode)
-    CMnNavigationServiceBase::ServiceL(const RMessage2&) 0x0000afc8   ARM Code       0  mnservicelib{000a0000}-29.o(StubCode)
-    CMnNavigationServiceBase::CMnNavigationServiceBase__sub_object() 0x0000afd0   ARM Code       0  mnservicelib{000a0000}-30.o(StubCode)
-    CMnNavigationServiceBase::~CMnNavigationServiceBase__sub_object() 0x0000afd8   ARM Code       0  mnservicelib{000a0000}-33.o(StubCode)
-    CMnMapViewServiceBase::BaseConstructL()  0x0000afe0   ARM Code       0  mnservicelib{000a0000}-4.o(StubCode)
-    CMnMapViewServiceBase::LandmarksToShow() 0x0000afe8   ARM Code       0  mnservicelib{000a0000}-5.o(StubCode)
-    CMnMapViewServiceBase::SelectionRequestText() 0x0000aff0   ARM Code       0  mnservicelib{000a0000}-7.o(StubCode)
-    CMnrpEngine::NewL()                      0x0000aff8   ARM Code       0  mnrefproviderengine{000a0000}-12.o(StubCode)
-    CMnrpMapModel::UpdateModelL(CMnrpMapViewService&) 0x0000b000   ARM Code       0  mnrefproviderengine{000a0000}-17.o(StubCode)
-    CMnrpMapModel::SetScreenSize(TSize)      0x0000b008   ARM Code       0  mnrefproviderengine{000a0000}-19.o(StubCode)
-    CMnrpMapModel::NumIgnoredLandmarks()     0x0000b010   ARM Code       0  mnrefproviderengine{000a0000}-20.o(StubCode)
-    CMnrpMapModel::NewL(MMapModelObserver&, CMnrpEngine&) 0x0000b018   ARM Code       0  mnrefproviderengine{000a0000}-22.o(StubCode)
-    CMnrpMapModel::Zoom(double)              0x0000b020   ARM Code       0  mnrefproviderengine{000a0000}-23.o(StubCode)
-    CMnrpMapModel::MoveTo(TCoordinate)       0x0000b028   ARM Code       0  mnrefproviderengine{000a0000}-24.o(StubCode)
-    CMnrpMapModel::GoCenter()                0x0000b030   ARM Code       0  mnrefproviderengine{000a0000}-25.o(StubCode)
-    CMnrpPositionRequest::GetPosition(TPositionInfo&) 0x0000b038   ARM Code       0  mnrefproviderengine{000a0000}-26.o(StubCode)
-    CMnrpPositionRequest::SetOptionsL(const TPositionUpdateOptionsBase&) 0x0000b040   ARM Code       0  mnrefproviderengine{000a0000}-27.o(StubCode)
-    CMnrpPositionRequest::MagneticCourse()   0x0000b048   ARM Code       0  mnrefproviderengine{000a0000}-28.o(StubCode)
-    CMnrpPositionRequest::MagneticHeading()  0x0000b050   ARM Code       0  mnrefproviderengine{000a0000}-29.o(StubCode)
-    CMnrpPositionRequest::FetchNewPosition(int) 0x0000b058   ARM Code       0  mnrefproviderengine{000a0000}-30.o(StubCode)
-    CMnrpPositionRequest::NewL(const TDesC16&, MMnrpPositionObserver&) 0x0000b060   ARM Code       0  mnrefproviderengine{000a0000}-31.o(StubCode)
-    CMnrpPositionRequest::Speed()            0x0000b068   ARM Code       0  mnrefproviderengine{000a0000}-32.o(StubCode)
-    CMnrpPositionRequest::Course()           0x0000b070   ARM Code       0  mnrefproviderengine{000a0000}-33.o(StubCode)
-    CMnrpPositionRequest::Heading()          0x0000b078   ARM Code       0  mnrefproviderengine{000a0000}-34.o(StubCode)
-    MnrpUtils::AngleToString(double, TDes16&) 0x0000b080   ARM Code       0  mnrefproviderengine{000a0000}-38.o(StubCode)
-    MnrpUtils::SpeedToString(double, TDes16&) 0x0000b088   ARM Code       0  mnrefproviderengine{000a0000}-39.o(StubCode)
-    MnrpUtils::DistanceToString(double, TDes16&) 0x0000b090   ARM Code       0  mnrefproviderengine{000a0000}-40.o(StubCode)
-    MnrpUtils::PrintableStringLC(const TDesC16&) 0x0000b098   ARM Code       0  mnrefproviderengine{000a0000}-41.o(StubCode)
-    MnrpUtils::CoordinateToString(double, TDes16&, int, int) 0x0000b0a0   ARM Code       0  mnrefproviderengine{000a0000}-42.o(StubCode)
-    CMnrpMapModel::AbsoluteToScreen(TCoordinate) const 0x0000b0a8   ARM Code       0  mnrefproviderengine{000a0000}-43.o(StubCode)
-    CMnrpMapModel::ScreenToAbsolute(TPoint) const 0x0000b0b0   ARM Code       0  mnrefproviderengine{000a0000}-44.o(StubCode)
-    CMnrpMapModel::ScreenToAbsolute(int) const 0x0000b0b8   ARM Code       0  mnrefproviderengine{000a0000}-45.o(StubCode)
-    CMnrpMapModel::Top() const               0x0000b0c0   ARM Code       0  mnrefproviderengine{000a0000}-46.o(StubCode)
-    CMnrpMapModel::Left() const              0x0000b0c8   ARM Code       0  mnrefproviderengine{000a0000}-47.o(StubCode)
-    CMnrpMapModel::Right() const             0x0000b0d0   ARM Code       0  mnrefproviderengine{000a0000}-48.o(StubCode)
-    CMnrpMapModel::Bottom() const            0x0000b0d8   ARM Code       0  mnrefproviderengine{000a0000}-50.o(StubCode)
-    CMnrpMapModel::Center() const            0x0000b0e0   ARM Code       0  mnrefproviderengine{000a0000}-51.o(StubCode)
-    CMnrpMapModel::GetGrid(CMnrpMapModel::TGrid&) const 0x0000b0e8   ARM Code       0  mnrefproviderengine{000a0000}-53.o(StubCode)
-    CMnrpMapModel::RenderL(CFbsBitmap&, TRect, CFont*, CFont*) const 0x0000b0f0   ARM Code       0  mnrefproviderengine{000a0000}-54.o(StubCode)
-    __aeabi_dadd                             0x0000b0f8   ARM Code       0  dfpaeabi{000a0000}-12.o(StubCode)
-    __aeabi_dmul                             0x0000b100   ARM Code       0  dfpaeabi{000a0000}-20.o(StubCode)
-    __aeabi_dsub                             0x0000b108   ARM Code       0  dfpaeabi{000a0000}-23.o(StubCode)
-    __aeabi_f2d                              0x0000b110   ARM Code       0  dfpaeabi{000a0000}-24.o(StubCode)
-    __aeabi_i2d                              0x0000b118   ARM Code       0  dfpaeabi{000a0000}-41.o(StubCode)
-    __aeabi_d2iz                             0x0000b120   ARM Code       0  dfpaeabi{000a0000}-8.o(StubCode)
-    __aeabi_memcpy4                          0x0000b128   ARM Code       0  drtaeabi{000a0000}-147.o(StubCode)
-    __aeabi_unwind_cpp_pr0                   0x0000b130   ARM Code       0  drtaeabi{000a0000}-158.o(StubCode)
-    __aeabi_unwind_cpp_pr1                   0x0000b138   ARM Code       0  drtaeabi{000a0000}-159.o(StubCode)
-    __cxa_begin_catch                        0x0000b140   ARM Code       0  drtaeabi{000a0000}-180.o(StubCode)
-    __cxa_call_unexpected                    0x0000b148   ARM Code       0  drtaeabi{000a0000}-182.o(StubCode)
-    __cxa_end_catch                          0x0000b150   ARM Code       0  drtaeabi{000a0000}-183.o(StubCode)
-    __cxa_end_cleanup                        0x0000b158   ARM Code       0  drtaeabi{000a0000}-184.o(StubCode)
-    __cxa_pure_virtual                       0x0000b160   ARM Code       0  drtaeabi{000a0000}-189.o(StubCode)
-    operator delete (void*)                  0x0000b168   ARM Code       0  scppnwdl{000a0000}-3.o(StubCode)
-    UserHeap::SetupThreadHeap(int, SStdEpocThreadCreateInfo&) 0x0000b170   ARM Code       0  euser{000a0000}-1360.o(StubCode)
-    User::Exit(int)                          0x0000b178   ARM Code       0  euser{000a0000}-641.o(StubCode)
-    User::InitProcess()                      0x0000b180   ARM Code       0  euser{000a0000}-585.o(StubCode)
-    User::Panic(const TDesC16&, int)         0x0000b188   ARM Code       0  euser{000a0000}-650.o(StubCode)
-    TCppRTExceptionsGlobals::TCppRTExceptionsGlobals() 0x0000b190   ARM Code       0  drtaeabi{000a0000}-204.o(StubCode)
-    CAknDocument::~CAknDocument()            0x0000b199   Thumb Code     0  mnrefprovider.in(i._ZN12CAknDocumentD2Ev)
-    CAknDocument::~CAknDocument__sub_object() 0x0000b199   Thumb Code     8  mnrefprovider.in(i._ZN12CAknDocumentD2Ev)
-    CApaDocument::DetachFromStoreL(CPicture::TDetach) 0x0000b1a1   Thumb Code     2  mnrefprovider.in(i._ZN12CApaDocument16DetachFromStoreLEN8CPicture7TDetachE)
-    CArrayPtrSeg<CGulIcon>::~CArrayPtrSeg__deallocating() 0x0000b1a3   Thumb Code    16  mnrefprovider.in(i._ZN12CArrayPtrSegI8CGulIconED0Ev)
-    CArrayPtrSeg<CGulIcon>::~CArrayPtrSeg()  0x0000b1b3   Thumb Code     8  mnrefprovider.in(i._ZN12CArrayPtrSegI8CGulIconED1Ev)
-    CArrayPtrSeg<CGulIcon>::~CArrayPtrSeg__sub_object() 0x0000b1b3   Thumb Code     0  mnrefprovider.in(i._ZN12CArrayPtrSegI8CGulIconED1Ev)
-    CAknViewAppUi::CAknViewAppUi()           0x0000b1bd   Thumb Code    50  mnrefprovider.in(i._ZN13CAknViewAppUiC1Ev)
-    CAknViewAppUi::CAknViewAppUi__sub_object() 0x0000b1bd   Thumb Code     0  mnrefprovider.in(i._ZN13CAknViewAppUiC1Ev)
-    CMnrpApplication::~CMnrpApplication__deallocating() 0x0000b203   Thumb Code    16  mnrefprovider.in(i._ZN16CMnrpApplicationD0Ev)
-    CMnrpApplication::~CMnrpApplication()    0x0000b213   Thumb Code     8  mnrefprovider.in(i._ZN16CMnrpApplicationD1Ev)
-    CMnrpApplication::~CMnrpApplication__sub_object() 0x0000b213   Thumb Code     0  mnrefprovider.in(i._ZN16CMnrpApplicationD1Ev)
-    CBase::operator new(unsigned)            0x0000b21b   Thumb Code     8  mnrefprovider.in(i._ZN5CBasenwEj)
-    TRect::TRect(const TRect&)               0x0000b223   Thumb Code    18  mnrefprovider.in(i._ZN5TRectC1ERKS_)
-    TRect::TRect__sub_object(const TRect&)   0x0000b223   Thumb Code     0  mnrefprovider.in(i._ZN5TRectC1ERKS_)
-    CArrayFix<CGulIcon*>::~CArrayFix()       0x0000b235   Thumb Code     8  mnrefprovider.in(i._ZN9CArrayFixIP8CGulIconED1Ev)
-    CArrayFix<CGulIcon*>::~CArrayFix__sub_object() 0x0000b235   Thumb Code     0  mnrefprovider.in(i._ZN9CArrayFixIP8CGulIconED1Ev)
-    CArrayPtr<CGulIcon>::~CArrayPtr()        0x0000b23d   Thumb Code     8  mnrefprovider.in(i._ZN9CArrayPtrI8CGulIconED1Ev)
-    CArrayPtr<CGulIcon>::~CArrayPtr__sub_object() 0x0000b23d   Thumb Code     0  mnrefprovider.in(i._ZN9CArrayPtrI8CGulIconED1Ev)
-    CleanupClose<RArray<int>>::Close(void*)  0x0000b245   Thumb Code     8  mnrefprovider.in(t._ZN12CleanupCloseI6RArrayIiEE5CloseEPv)
-    CleanupClose<RArray<unsigned long>>::Close(void*) 0x0000b24d   Thumb Code     8  mnrefprovider.in(t._ZN12CleanupCloseI6RArrayImEE5CloseEPv)
-    RPointerArray<CMnrpNaviModel::CListItem>::ResetAndDestroy() 0x0000b255   Thumb Code    48  mnrefprovider.in(t._ZN13RPointerArrayIN14CMnrpNaviModel9CListItemEE15ResetAndDestroyEv)
-    RPointerArray<CMnrpNaviModel::CListItem>::AppendL(const CMnrpNaviModel::CListItem*) 0x0000b285   Thumb Code    12  mnrefprovider.in(t._ZN13RPointerArrayIN14CMnrpNaviModel9CListItemEE7AppendLEPKS1_)
-    TBuf<(int)15>::TBuf()                    0x0000b291   Thumb Code    10  mnrefprovider.in(t._ZN4TBufILi15EEC1Ev)
-    TBuf<(int)15>::TBuf__sub_object()        0x0000b291   Thumb Code     0  mnrefprovider.in(t._ZN4TBufILi15EEC1Ev)
-    typeinfo for CMnrpAppUi                  0x0000b758   Data          12  mnrefprovider.in(.constdata__ZTI10CMnrpAppUi)
-    typeinfo for CArrayPtrSeg<CGulIcon>      0x0000b764   Data          12  mnrefprovider.in(.constdata__ZTI12CArrayPtrSegI8CGulIconE)
-    typeinfo for CMnrpAppView                0x0000b770   Data          12  mnrefprovider.in(.constdata__ZTI12CMnrpAppView)
-    typeinfo for CMnrpMapView                0x0000b77c   Data          12  mnrefprovider.in(.constdata__ZTI12CMnrpMapView)
-    typeinfo for CMnrpDocument               0x0000b788   Data          12  mnrefprovider.in(.constdata__ZTI13CMnrpDocument)
-    typeinfo for CMnrpNaviView               0x0000b794   Data          12  mnrefprovider.in(.constdata__ZTI13CMnrpNaviView)
-    typeinfo for CMnrpAppServer              0x0000b7a0   Data          12  mnrefprovider.in(.constdata__ZTI14CMnrpAppServer)
-    typeinfo for CMnrpNaviModel              0x0000b7ac   Data          32  mnrefprovider.in(.constdata__ZTI14CMnrpNaviModel)
-    typeinfo for CMnrpAppControl             0x0000b7cc   Data          12  mnrefprovider.in(.constdata__ZTI15CMnrpAppControl)
-    typeinfo for CMnrpMapControl             0x0000b7d8   Data          32  mnrefprovider.in(.constdata__ZTI15CMnrpMapControl)
-    typeinfo for CMnrpApplication            0x0000b7f8   Data          12  mnrefprovider.in(.constdata__ZTI16CMnrpApplication)
-    typeinfo for CMnrpNaviControl            0x0000b804   Data          32  mnrefprovider.in(.constdata__ZTI16CMnrpNaviControl)
-    typeinfo for MMapModelObserver           0x0000b824   Data           8  mnrefprovider.in(.constdata__ZTI17MMapModelObserver)
-    typeinfo for MNaviModelObserver          0x0000b82c   Data           8  mnrefprovider.in(.constdata__ZTI18MNaviModelObserver)
-    typeinfo for CMnrpMapViewService         0x0000b834   Data          32  mnrefprovider.in(.constdata__ZTI19CMnrpMapViewService)
-    typeinfo for MMapSelectionCallback       0x0000b854   Data           8  mnrefprovider.in(.constdata__ZTI21MMapSelectionCallback)
-    typeinfo for MMnrpPositionObserver       0x0000b85c   Data           8  mnrefprovider.in(.constdata__ZTI21MMnrpPositionObserver)
-    typeinfo for CMnrpNavigationService      0x0000b864   Data          12  mnrefprovider.in(.constdata__ZTI22CMnrpNavigationService)
-    typeinfo for MEikStatusPaneObserver      0x0000b870   Data           8  mnrefprovider.in(.constdata__ZTI22MEikStatusPaneObserver)
-    typeinfo for CArrayFix<CGulIcon*>        0x0000b878   Data          12  mnrefprovider.in(.constdata__ZTI9CArrayFixIP8CGulIconE)
-    typeinfo for CArrayPtr<CGulIcon>         0x0000b884   Data          12  mnrefprovider.in(.constdata__ZTI9CArrayPtrI8CGulIconE)
-    typeinfo for CMnrpNaviModel::CListItem   0x0000b890   Data          12  mnrefprovider.in(.constdata__ZTIN14CMnrpNaviModel9CListItemE)
-    typeinfo name for CMnrpAppUi             0x0000b89c   Data          13  mnrefprovider.in(.constdata__ZTS10CMnrpAppUi)
-    typeinfo name for CArrayPtrSeg<CGulIcon> 0x0000b8a9   Data          26  mnrefprovider.in(.constdata__ZTS12CArrayPtrSegI8CGulIconE)
-    typeinfo name for CMnrpAppView           0x0000b8c3   Data          15  mnrefprovider.in(.constdata__ZTS12CMnrpAppView)
-    typeinfo name for CMnrpMapView           0x0000b8d2   Data          15  mnrefprovider.in(.constdata__ZTS12CMnrpMapView)
-    typeinfo name for CMnrpDocument          0x0000b8e1   Data          16  mnrefprovider.in(.constdata__ZTS13CMnrpDocument)
-    typeinfo name for CMnrpNaviView          0x0000b8f1   Data          16  mnrefprovider.in(.constdata__ZTS13CMnrpNaviView)
-    typeinfo name for CMnrpAppServer         0x0000b901   Data          17  mnrefprovider.in(.constdata__ZTS14CMnrpAppServer)
-    typeinfo name for CMnrpNaviModel         0x0000b912   Data          17  mnrefprovider.in(.constdata__ZTS14CMnrpNaviModel)
-    typeinfo name for CMnrpAppControl        0x0000b923   Data          18  mnrefprovider.in(.constdata__ZTS15CMnrpAppControl)
-    typeinfo name for CMnrpMapControl        0x0000b935   Data          18  mnrefprovider.in(.constdata__ZTS15CMnrpMapControl)
-    typeinfo name for CMnrpApplication       0x0000b947   Data          19  mnrefprovider.in(.constdata__ZTS16CMnrpApplication)
-    typeinfo name for CMnrpNaviControl       0x0000b95a   Data          19  mnrefprovider.in(.constdata__ZTS16CMnrpNaviControl)
-    typeinfo name for MMapModelObserver      0x0000b96d   Data          20  mnrefprovider.in(.constdata__ZTS17MMapModelObserver)
-    typeinfo name for MNaviModelObserver     0x0000b981   Data          21  mnrefprovider.in(.constdata__ZTS18MNaviModelObserver)
-    typeinfo name for CMnrpMapViewService    0x0000b996   Data          22  mnrefprovider.in(.constdata__ZTS19CMnrpMapViewService)
-    typeinfo name for MMapSelectionCallback  0x0000b9ac   Data          24  mnrefprovider.in(.constdata__ZTS21MMapSelectionCallback)
-    typeinfo name for MMnrpPositionObserver  0x0000b9c4   Data          24  mnrefprovider.in(.constdata__ZTS21MMnrpPositionObserver)
-    typeinfo name for CMnrpNavigationService 0x0000b9dc   Data          25  mnrefprovider.in(.constdata__ZTS22CMnrpNavigationService)
-    typeinfo name for MEikStatusPaneObserver 0x0000b9f5   Data          25  mnrefprovider.in(.constdata__ZTS22MEikStatusPaneObserver)
-    typeinfo name for CArrayFix<CGulIcon*>   0x0000ba0e   Data          23  mnrefprovider.in(.constdata__ZTS9CArrayFixIP8CGulIconE)
-    typeinfo name for CArrayPtr<CGulIcon>    0x0000ba25   Data          22  mnrefprovider.in(.constdata__ZTS9CArrayPtrI8CGulIconE)
-    typeinfo name for CMnrpNaviModel::CListItem 0x0000ba3b   Data          29  mnrefprovider.in(.constdata__ZTSN14CMnrpNaviModel9CListItemE)
-    vtable for CMnrpAppUi                    0x0000ba58   Data         340  mnrefprovider.in(.constdata__ZTV10CMnrpAppUi)
-    vtable for CArrayPtrSeg<CGulIcon>        0x0000bbac   Data          20  mnrefprovider.in(.constdata__ZTV12CArrayPtrSegI8CGulIconE)
-    vtable for CMnrpAppView                  0x0000bbc0   Data         232  mnrefprovider.in(.constdata__ZTV12CMnrpAppView)
-    vtable for CMnrpMapView                  0x0000bca8   Data         236  mnrefprovider.in(.constdata__ZTV12CMnrpMapView)
-    vtable for CMnrpDocument                 0x0000bd94   Data         112  mnrefprovider.in(.constdata__ZTV13CMnrpDocument)
-    vtable for CMnrpNaviView                 0x0000be04   Data         232  mnrefprovider.in(.constdata__ZTV13CMnrpNaviView)
-    vtable for CMnrpAppServer                0x0000beec   Data          76  mnrefprovider.in(.constdata__ZTV14CMnrpAppServer)
-    vtable for CMnrpNaviModel                0x0000bf38   Data          36  mnrefprovider.in(.constdata__ZTV14CMnrpNaviModel)
-    vtable for CMnrpAppControl               0x0000bf5c   Data         208  mnrefprovider.in(.constdata__ZTV15CMnrpAppControl)
-    vtable for CMnrpMapControl               0x0000c02c   Data         224  mnrefprovider.in(.constdata__ZTV15CMnrpMapControl)
-    vtable for CMnrpApplication              0x0000c10c   Data          80  mnrefprovider.in(.constdata__ZTV16CMnrpApplication)
-    vtable for CMnrpNaviControl              0x0000c15c   Data         224  mnrefprovider.in(.constdata__ZTV16CMnrpNaviControl)
-    vtable for CMnrpMapViewService           0x0000c23c   Data         112  mnrefprovider.in(.constdata__ZTV19CMnrpMapViewService)
-    vtable for CMnrpNavigationService        0x0000c2ac   Data          64  mnrefprovider.in(.constdata__ZTV22CMnrpNavigationService)
-    vtable for MEikStatusPaneObserver        0x0000c2ec   Data          12  mnrefprovider.in(.constdata__ZTV22MEikStatusPaneObserver)
-    vtable for CMnrpNaviModel::CListItem     0x0000c2f8   Data          20  mnrefprovider.in(.constdata__ZTVN14CMnrpNaviModel9CListItemE)
-    SHT$$INIT_ARRAY$$Base                    0x0000c30c   Number         0  mnrefprovider.in(.init_array)
-    .ARM.exidx$$Base                         0x0000c310   Number         0  uc_exe_.o(.ARM.exidx)
-    SHT$$INIT_ARRAY$$Limit                   0x0000c310   Data           0  mnrefprovider.in(.init_array)
-    .ARM.exidx$$Limit                        0x0000c6a0   Number         0  mnrefprovider.in(.ARM.exidx)
-    Image$$ER_RO$$Limit                      0x0000c6a0   Number         0  anon$$obj.o(linker$$defined$$symbols)
-
Binary file locsrv_plat/map_image_conversion_plugin_api/tsrc/data/armv5/urel/mnrefproviderback.exe has changed
--- a/locsrv_plat/map_image_conversion_plugin_api/tsrc/data/armv5/urel/mnrefproviderback.exe.map	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1319 +0,0 @@
-ARM Linker, RVCT2.2 [Build 593]
-
-================================================================================
-
-Image Symbol Table
-
-    Local Symbols
-
-    Symbol Name                              Value     Ov Type        Size  Object(Section)
-
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-293.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eposlandmarks{000a0000}-13.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-1995.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-294.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eposlandmarks{000a0000}-65.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-1997.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-295.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eposlandmarks{000a0000}-68.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-1999.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-296.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  lbs{000a0000}-207.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-203.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-297.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  lbs{000a0000}-23.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-205.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-298.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnservicelib{000a0000}-1.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-2060.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-299.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnservicelib{000a0000}-2.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-2061.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-30.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnservicelib{000a0000}-21.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  drtaeabi{000a0000}-204.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-302.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnservicelib{000a0000}-22.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-208.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-31.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnservicelib{000a0000}-23.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-2082.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-317.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnservicelib{000a0000}-24.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-2120.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-352.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnservicelib{000a0000}-27.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-2123.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-37.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnservicelib{000a0000}-34.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-2125.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-390.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnservicelib{000a0000}-45.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-213.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-392.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnservicelib{000a0000}-46.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-214.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-394.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnservicelib{000a0000}-47.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-215.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-467.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnservicelib{000a0000}-49.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-216.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-479.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnservicelib{000a0000}-50.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-217.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-490.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnservicelib{000a0000}-53.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-220.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-506.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnservicelib{000a0000}-56.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-2920.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-523.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnrefproviderengine{000a0000}-10.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-2922.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-532.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnrefproviderengine{000a0000}-12.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-2924.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-533.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnrefproviderengine{000a0000}-18.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-2925.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-534.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnrefproviderengine{000a0000}-19.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-2926.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-535.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnrefproviderengine{000a0000}-21.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-2928.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-536.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnrefproviderengine{000a0000}-4.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-2929.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-537.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnrefproviderengine{000a0000}-5.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-2930.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-565.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnrefproviderengine{000a0000}-54.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-2931.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-61.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnrefproviderengine{000a0000}-6.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-2932.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-62.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  drtaeabi{000a0000}-144.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-2934.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-63.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  drtaeabi{000a0000}-158.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-2935.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-1088.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  drtaeabi{000a0000}-159.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-2938.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-1116.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  drtaeabi{000a0000}-180.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-2993.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-1119.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  drtaeabi{000a0000}-182.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-2997.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-1171.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  drtaeabi{000a0000}-183.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-3826.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-1288.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  drtaeabi{000a0000}-184.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-3862.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-1379.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  drtaeabi{000a0000}-189.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-3868.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-1381.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  scppnwdl{000a0000}-3.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-4021.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-1590.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-1360.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-4030.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-1593.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-641.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eposlandmarks{000a0000}-12.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-1817.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  ws32{000a0000}-211.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  apparc{000a0000}-280.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-677.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  gdi{000a0000}-312.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  apparc{000a0000}-284.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  apparc{000a0000}-121.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-1132.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-585.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  apparc{000a0000}-132.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-129.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-650.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  apparc{000a0000}-171.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-130.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  apparc{000a0000}-287.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  apparc{000a0000}-192.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-131.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  apparc{000a0000}-30.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  apparc{000a0000}-194.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-1350.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-141.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  apparc{000a0000}-202.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-1351.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-142.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-207.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-1366.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-143.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  apparc{000a0000}-232.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-198.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-144.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  apparc{000a0000}-273.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-199.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-147.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  apparc{000a0000}-274.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-201.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-152.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  apparc{000a0000}-275.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-206.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-155.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  apparc{000a0000}-279.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-2131.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-158.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-100.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-471.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-159.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-101.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-474.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-166.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  apparc{000a0000}-285.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-481.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-169.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  apparc{000a0000}-286.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-613.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-171.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-182.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-649.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-175.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-210.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-652.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-18.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-212.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-654.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-20.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-220.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-669.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-25.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-351.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-679.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-26.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-355.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-681.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-27.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-638.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-838.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-28.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-639.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  bafl{000a0000}-43.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-29.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-664.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  bafl{000a0000}-98.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-291.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-676.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-64.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-77.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-75.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-67.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-78.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-128.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  cone{000a0000}-127.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-79.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-74.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  avkon{000a0000}-211.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  apparc{000a0000}-222.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-72.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eikcore{000a0000}-73.o ABSOLUTE
-    M:/epoc32/build/apputils/c_da81efa927799d7f/bafl_dll/armv5/udeb\VtblExports.s 0x00000000   Number         0  VtblExports.o ABSOLUTE
-    M:/epoc32/build/compsupp/c_18558cc638e6e874/drtaeabi_dll/armv5/udeb\VtblExports.s 0x00000000   Number         0  VtblExports.o ABSOLUTE
-    M:/epoc32/build/cone/c_17e36feeaf3b2ee8/cone_dll/armv5/udeb\VtblExports.s 0x00000000   Number         0  VtblExports.o ABSOLUTE
-    M:/epoc32/build/gdi/c_5dab287815cadb7b/gdi_dll/armv5/udeb\VtblExports.s 0x00000000   Number         0  VtblExports.o ABSOLUTE
-    M:/epoc32/build/store/c_93a13d203e6d3ba7/estor_dll/armv5/udeb\VtblExports.s 0x00000000   Number         0  VtblExports.o ABSOLUTE
-    M:/epoc32/build/uikon/c_9cf7bef4a7562444/eikcore_dll/armv5/udeb\VtblExports.s 0x00000000   Number         0  VtblExports.o ABSOLUTE
-    M:\\sf\\os\\kernelhwsrv\\kernel\\eka\\compsupp\\rvct2_2\\ucppinit_aeabi.cpp 0x00000000   Number         0  ucppinit_aeabi.o ABSOLUTE
-    M:\sf\os\kernelhwsrv\kernel\eka\compsupp\rvct2_2\dllexp.cpp 0x00000000   Number         0  dllexp.o ABSOLUTE
-    M:\sf\os\kernelhwsrv\kernel\eka\compsupp\rvct2_2\ucppinit_aeabi.cpp 0x00000000   Number         0  ucppinit_aeabi.o ABSOLUTE
-    M:\sf\os\kernelhwsrv\kernel\eka\compsupp\symaehabi\callfirstprocessfn.cpp 0x00000000   Number         0  callfirstprocessfn.o ABSOLUTE
-    \EPOC32\BUILD\sf\app\location\group\MNREFENGINE\ARMV5\VtblExports.s 0x00000000   Number         0  VtblExports.o ABSOLUTE
-    \EPOC32\BUILD\sf\mw\appsupport\appfw\apparchitecture\group\APPARC\ARMV5\VtblExports.s 0x00000000   Number         0  VtblExports.o ABSOLUTE
-    \EPOC32\BUILD\sf\mw\classicui\group\AVKON\ARMV5\VtblExports.s 0x00000000   Number         0  VtblExports.o ABSOLUTE
-    \EPOC32\BUILD\sf\mw\classicui\group\EIKCOCTL\ARMV5\VtblExports.s 0x00000000   Number         0  VtblExports.o ABSOLUTE
-    \EPOC32\BUILD\sf\mw\locationsrv\group\EPOS_LANDMARKSCLIENTLIBRARY\ARMV5\VtblExports.s 0x00000000   Number         0  VtblExports.o ABSOLUTE
-    \EPOC32\BUILD\sf\mw\locationsrv\group\MNSERVICELIB\ARMV5\VtblExports.s 0x00000000   Number         0  VtblExports.o ABSOLUTE
-    \EPOC32\BUILD\sf\mw\uiresources\group\AKNSKINS\ARMV5\VtblExports.s 0x00000000   Number         0  VtblExports.o ABSOLUTE
-    \EPOC32\BUILD\sf\os\graphics\windowing\windowserver\group\WS32LIB\ARMV5\VtblExports.s 0x00000000   Number         0  VtblExports.o ABSOLUTE
-    \EPOC32\BUILD\sf\os\kernelhwsrv\kernel\eka\euser\EEXE\ARMV6_ABIV1\urel\uc_exe_.cpp 0x00000000   Number         0  uc_exe_.o ABSOLUTE
-    \EPOC32\BUILD\sf\os\kernelhwsrv\kernel\eka\euser\EUSER\ARMV5\VtblExports.s 0x00000000   Number         0  VtblExports.o ABSOLUTE
-    \EPOC32\BUILD\sf\os\kernelhwsrv\userlibandfileserver\fileserver\group\EFSRV\ARMV5\VtblExports.s 0x00000000   Number         0  VtblExports.o ABSOLUTE
-    \EPOC32\BUILD\sf\os\lbs\locationmgmt\locationadmin\group\LBSAPIVARIANT2\ARMV5\VtblExports.s 0x00000000   Number         0  VtblExports.o ABSOLUTE
-    \\EPOC32\\BUILD\\sf\\os\\kernelhwsrv\\kernel\\eka\\euser\\EEXE\\ARMV6_ABIV1\\urel\\uc_exe_.cpp 0x00000000   Number         0  uc_exe_.o ABSOLUTE
-    \sf\app\location\mapnavproviderrefapp\src\mnrefproviderback.cpp 0x00000000   Number         0  mnrefproviderback.in ABSOLUTE
-    \sf\app\location\mapnavproviderrefapp\src\mnrpapplicationback.cpp 0x00000000   Number         0  mnrefproviderback.in ABSOLUTE
-    \sf\app\location\mapnavproviderrefapp\src\mnrpappserverback.cpp 0x00000000   Number         0  mnrefproviderback.in ABSOLUTE
-    \sf\app\location\mapnavproviderrefapp\src\mnrpappuiback.cpp 0x00000000   Number         0  mnrefproviderback.in ABSOLUTE
-    \sf\app\location\mapnavproviderrefapp\src\mnrpdocumentback.cpp 0x00000000   Number         0  mnrefproviderback.in ABSOLUTE
-    \sf\app\location\mapnavproviderrefapp\src\mnrpgeocodingservice.cpp 0x00000000   Number         0  mnrefproviderback.in ABSOLUTE
-    \sf\app\location\mapnavproviderrefapp\src\mnrpmapimageservice.cpp 0x00000000   Number         0  mnrefproviderback.in ABSOLUTE
-    \sf\os\kernelhwsrv\kernel\eka\euser\epoc\arm\uc_exe.cpp 0x00000000   Number         0  uc_exe.o ABSOLUTE
-    .emb_text                                0x00008000   Section      112  uc_exe_.o(.emb_text)
-    .emb_text                                0x00008070   Section       72  ucppinit_aeabi.o(.emb_text)
-    skip                                     0x00008084   ARM Code       0  ucppinit_aeabi.o(.emb_text)
-    loop                                     0x00008094   ARM Code       0  ucppinit_aeabi.o(.emb_text)
-    fpinit                                   0x000080ac   Data           0  ucppinit_aeabi.o(.emb_text)
-    base                                     0x000080b0   Data           0  ucppinit_aeabi.o(.emb_text)
-    limit                                    0x000080b4   Data           0  ucppinit_aeabi.o(.emb_text)
-    .text                                    0x000080c0   Section       16  uc_exe_.o(.text)
-    NewApplication()                         0x000080d1   Thumb Code    30  mnrefproviderback.in(.text)
-    .text                                    0x000080d0   Section       60  mnrefproviderback.in(.text)
-    .text                                    0x0000810c   Section       32  mnrefproviderback.in(.text)
-    .text                                    0x0000812c   Section       68  mnrefproviderback.in(.text)
-    .text                                    0x00008170   Section       64  mnrefproviderback.in(.text)
-    .text                                    0x000081b0   Section      168  mnrefproviderback.in(.text)
-    .text                                    0x00008258   Section      988  mnrefproviderback.in(.text)
-    .text                                    0x00008634   Section      684  mnrefproviderback.in(.text)
-    __sti___23_mnrpmapimageservice_cpp       0x000088c7   Thumb Code     8  mnrefproviderback.in(.text)
-    .text                                    0x000088e8   Section       36  uc_exe.o(.text)
-    .text                                    0x0000890c   Section      120  callfirstprocessfn.o(.text)
-    .text                                    0x00008984   Section        4  dllexp.o(.text)
-    .text.clean                              0x00008988   Section       10  mnrefproviderback.in(.text.clean)
-    .text.clean                              0x00008992   Section       10  mnrefproviderback.in(.text.clean)
-    .text.clean                              0x0000899c   Section       18  mnrefproviderback.in(.text.clean)
-    .text.clean                              0x000089ae   Section       26  mnrefproviderback.in(.text.clean)
-    .text.clean                              0x000089c8   Section        8  callfirstprocessfn.o(.text.clean)
-    StubCode                                 0x000089d0   Section        8  euser{000a0000}-1088.o(StubCode)
-    theImportedSymbol                        0x000089d4   Data           0  euser{000a0000}-1088.o(StubCode)
-    StubCode                                 0x000089d8   Section        8  euser{000a0000}-1116.o(StubCode)
-    theImportedSymbol                        0x000089dc   Data           0  euser{000a0000}-1116.o(StubCode)
-    StubCode                                 0x000089e0   Section        8  euser{000a0000}-1119.o(StubCode)
-    theImportedSymbol                        0x000089e4   Data           0  euser{000a0000}-1119.o(StubCode)
-    StubCode                                 0x000089e8   Section        8  euser{000a0000}-1171.o(StubCode)
-    theImportedSymbol                        0x000089ec   Data           0  euser{000a0000}-1171.o(StubCode)
-    StubCode                                 0x000089f0   Section        8  euser{000a0000}-1288.o(StubCode)
-    theImportedSymbol                        0x000089f4   Data           0  euser{000a0000}-1288.o(StubCode)
-    StubCode                                 0x000089f8   Section        8  euser{000a0000}-1379.o(StubCode)
-    theImportedSymbol                        0x000089fc   Data           0  euser{000a0000}-1379.o(StubCode)
-    StubCode                                 0x00008a00   Section        8  euser{000a0000}-1381.o(StubCode)
-    theImportedSymbol                        0x00008a04   Data           0  euser{000a0000}-1381.o(StubCode)
-    StubCode                                 0x00008a08   Section        8  euser{000a0000}-1590.o(StubCode)
-    theImportedSymbol                        0x00008a0c   Data           0  euser{000a0000}-1590.o(StubCode)
-    StubCode                                 0x00008a10   Section        8  euser{000a0000}-1593.o(StubCode)
-    theImportedSymbol                        0x00008a14   Data           0  euser{000a0000}-1593.o(StubCode)
-    StubCode                                 0x00008a18   Section        8  euser{000a0000}-1817.o(StubCode)
-    theImportedSymbol                        0x00008a1c   Data           0  euser{000a0000}-1817.o(StubCode)
-    StubCode                                 0x00008a20   Section        8  euser{000a0000}-1995.o(StubCode)
-    theImportedSymbol                        0x00008a24   Data           0  euser{000a0000}-1995.o(StubCode)
-    StubCode                                 0x00008a28   Section        8  euser{000a0000}-1997.o(StubCode)
-    theImportedSymbol                        0x00008a2c   Data           0  euser{000a0000}-1997.o(StubCode)
-    StubCode                                 0x00008a30   Section        8  euser{000a0000}-1999.o(StubCode)
-    theImportedSymbol                        0x00008a34   Data           0  euser{000a0000}-1999.o(StubCode)
-    StubCode                                 0x00008a38   Section        8  euser{000a0000}-203.o(StubCode)
-    theImportedSymbol                        0x00008a3c   Data           0  euser{000a0000}-203.o(StubCode)
-    StubCode                                 0x00008a40   Section        8  euser{000a0000}-205.o(StubCode)
-    theImportedSymbol                        0x00008a44   Data           0  euser{000a0000}-205.o(StubCode)
-    StubCode                                 0x00008a48   Section        8  euser{000a0000}-2060.o(StubCode)
-    theImportedSymbol                        0x00008a4c   Data           0  euser{000a0000}-2060.o(StubCode)
-    StubCode                                 0x00008a50   Section        8  euser{000a0000}-2061.o(StubCode)
-    theImportedSymbol                        0x00008a54   Data           0  euser{000a0000}-2061.o(StubCode)
-    StubCode                                 0x00008a58   Section        8  euser{000a0000}-207.o(StubCode)
-    theImportedSymbol                        0x00008a5c   Data           0  euser{000a0000}-207.o(StubCode)
-    StubCode                                 0x00008a60   Section        8  euser{000a0000}-208.o(StubCode)
-    theImportedSymbol                        0x00008a64   Data           0  euser{000a0000}-208.o(StubCode)
-    StubCode                                 0x00008a68   Section        8  euser{000a0000}-2082.o(StubCode)
-    theImportedSymbol                        0x00008a6c   Data           0  euser{000a0000}-2082.o(StubCode)
-    StubCode                                 0x00008a70   Section        8  euser{000a0000}-2120.o(StubCode)
-    theImportedSymbol                        0x00008a74   Data           0  euser{000a0000}-2120.o(StubCode)
-    StubCode                                 0x00008a78   Section        8  euser{000a0000}-2123.o(StubCode)
-    theImportedSymbol                        0x00008a7c   Data           0  euser{000a0000}-2123.o(StubCode)
-    StubCode                                 0x00008a80   Section        8  euser{000a0000}-2131.o(StubCode)
-    theImportedSymbol                        0x00008a84   Data           0  euser{000a0000}-2131.o(StubCode)
-    StubCode                                 0x00008a88   Section        8  euser{000a0000}-471.o(StubCode)
-    theImportedSymbol                        0x00008a8c   Data           0  euser{000a0000}-471.o(StubCode)
-    StubCode                                 0x00008a90   Section        8  euser{000a0000}-474.o(StubCode)
-    theImportedSymbol                        0x00008a94   Data           0  euser{000a0000}-474.o(StubCode)
-    StubCode                                 0x00008a98   Section        8  euser{000a0000}-481.o(StubCode)
-    theImportedSymbol                        0x00008a9c   Data           0  euser{000a0000}-481.o(StubCode)
-    StubCode                                 0x00008aa0   Section        8  euser{000a0000}-613.o(StubCode)
-    theImportedSymbol                        0x00008aa4   Data           0  euser{000a0000}-613.o(StubCode)
-    StubCode                                 0x00008aa8   Section        8  euser{000a0000}-649.o(StubCode)
-    theImportedSymbol                        0x00008aac   Data           0  euser{000a0000}-649.o(StubCode)
-    StubCode                                 0x00008ab0   Section        8  euser{000a0000}-652.o(StubCode)
-    theImportedSymbol                        0x00008ab4   Data           0  euser{000a0000}-652.o(StubCode)
-    StubCode                                 0x00008ab8   Section        8  euser{000a0000}-654.o(StubCode)
-    theImportedSymbol                        0x00008abc   Data           0  euser{000a0000}-654.o(StubCode)
-    StubCode                                 0x00008ac0   Section        8  euser{000a0000}-669.o(StubCode)
-    theImportedSymbol                        0x00008ac4   Data           0  euser{000a0000}-669.o(StubCode)
-    StubCode                                 0x00008ac8   Section        8  euser{000a0000}-679.o(StubCode)
-    theImportedSymbol                        0x00008acc   Data           0  euser{000a0000}-679.o(StubCode)
-    StubCode                                 0x00008ad0   Section        8  euser{000a0000}-681.o(StubCode)
-    theImportedSymbol                        0x00008ad4   Data           0  euser{000a0000}-681.o(StubCode)
-    StubCode                                 0x00008ad8   Section        8  euser{000a0000}-838.o(StubCode)
-    theImportedSymbol                        0x00008adc   Data           0  euser{000a0000}-838.o(StubCode)
-    StubCode                                 0x00008ae0   Section        8  bafl{000a0000}-43.o(StubCode)
-    theImportedSymbol                        0x00008ae4   Data           0  bafl{000a0000}-43.o(StubCode)
-    StubCode                                 0x00008ae8   Section        8  bafl{000a0000}-98.o(StubCode)
-    theImportedSymbol                        0x00008aec   Data           0  bafl{000a0000}-98.o(StubCode)
-    StubCode                                 0x00008af0   Section        8  cone{000a0000}-100.o(StubCode)
-    theImportedSymbol                        0x00008af4   Data           0  cone{000a0000}-100.o(StubCode)
-    StubCode                                 0x00008af8   Section        8  cone{000a0000}-101.o(StubCode)
-    theImportedSymbol                        0x00008afc   Data           0  cone{000a0000}-101.o(StubCode)
-    StubCode                                 0x00008b00   Section        8  cone{000a0000}-127.o(StubCode)
-    theImportedSymbol                        0x00008b04   Data           0  cone{000a0000}-127.o(StubCode)
-    StubCode                                 0x00008b08   Section        8  cone{000a0000}-128.o(StubCode)
-    theImportedSymbol                        0x00008b0c   Data           0  cone{000a0000}-128.o(StubCode)
-    StubCode                                 0x00008b10   Section        8  cone{000a0000}-182.o(StubCode)
-    theImportedSymbol                        0x00008b14   Data           0  cone{000a0000}-182.o(StubCode)
-    StubCode                                 0x00008b18   Section        8  cone{000a0000}-210.o(StubCode)
-    theImportedSymbol                        0x00008b1c   Data           0  cone{000a0000}-210.o(StubCode)
-    StubCode                                 0x00008b20   Section        8  cone{000a0000}-212.o(StubCode)
-    theImportedSymbol                        0x00008b24   Data           0  cone{000a0000}-212.o(StubCode)
-    StubCode                                 0x00008b28   Section        8  cone{000a0000}-220.o(StubCode)
-    theImportedSymbol                        0x00008b2c   Data           0  cone{000a0000}-220.o(StubCode)
-    StubCode                                 0x00008b30   Section        8  cone{000a0000}-351.o(StubCode)
-    theImportedSymbol                        0x00008b34   Data           0  cone{000a0000}-351.o(StubCode)
-    StubCode                                 0x00008b38   Section        8  cone{000a0000}-355.o(StubCode)
-    theImportedSymbol                        0x00008b3c   Data           0  cone{000a0000}-355.o(StubCode)
-    StubCode                                 0x00008b40   Section        8  cone{000a0000}-638.o(StubCode)
-    theImportedSymbol                        0x00008b44   Data           0  cone{000a0000}-638.o(StubCode)
-    StubCode                                 0x00008b48   Section        8  cone{000a0000}-639.o(StubCode)
-    theImportedSymbol                        0x00008b4c   Data           0  cone{000a0000}-639.o(StubCode)
-    StubCode                                 0x00008b50   Section        8  cone{000a0000}-664.o(StubCode)
-    theImportedSymbol                        0x00008b54   Data           0  cone{000a0000}-664.o(StubCode)
-    StubCode                                 0x00008b58   Section        8  cone{000a0000}-676.o(StubCode)
-    theImportedSymbol                        0x00008b5c   Data           0  cone{000a0000}-676.o(StubCode)
-    StubCode                                 0x00008b60   Section        8  cone{000a0000}-677.o(StubCode)
-    theImportedSymbol                        0x00008b64   Data           0  cone{000a0000}-677.o(StubCode)
-    StubCode                                 0x00008b68   Section        8  apparc{000a0000}-121.o(StubCode)
-    theImportedSymbol                        0x00008b6c   Data           0  apparc{000a0000}-121.o(StubCode)
-    StubCode                                 0x00008b70   Section        8  apparc{000a0000}-132.o(StubCode)
-    theImportedSymbol                        0x00008b74   Data           0  apparc{000a0000}-132.o(StubCode)
-    StubCode                                 0x00008b78   Section        8  apparc{000a0000}-171.o(StubCode)
-    theImportedSymbol                        0x00008b7c   Data           0  apparc{000a0000}-171.o(StubCode)
-    StubCode                                 0x00008b80   Section        8  apparc{000a0000}-192.o(StubCode)
-    theImportedSymbol                        0x00008b84   Data           0  apparc{000a0000}-192.o(StubCode)
-    StubCode                                 0x00008b88   Section        8  apparc{000a0000}-194.o(StubCode)
-    theImportedSymbol                        0x00008b8c   Data           0  apparc{000a0000}-194.o(StubCode)
-    StubCode                                 0x00008b90   Section        8  apparc{000a0000}-202.o(StubCode)
-    theImportedSymbol                        0x00008b94   Data           0  apparc{000a0000}-202.o(StubCode)
-    StubCode                                 0x00008b98   Section        8  apparc{000a0000}-222.o(StubCode)
-    theImportedSymbol                        0x00008b9c   Data           0  apparc{000a0000}-222.o(StubCode)
-    StubCode                                 0x00008ba0   Section        8  apparc{000a0000}-232.o(StubCode)
-    theImportedSymbol                        0x00008ba4   Data           0  apparc{000a0000}-232.o(StubCode)
-    StubCode                                 0x00008ba8   Section        8  apparc{000a0000}-273.o(StubCode)
-    theImportedSymbol                        0x00008bac   Data           0  apparc{000a0000}-273.o(StubCode)
-    StubCode                                 0x00008bb0   Section        8  apparc{000a0000}-274.o(StubCode)
-    theImportedSymbol                        0x00008bb4   Data           0  apparc{000a0000}-274.o(StubCode)
-    StubCode                                 0x00008bb8   Section        8  apparc{000a0000}-275.o(StubCode)
-    theImportedSymbol                        0x00008bbc   Data           0  apparc{000a0000}-275.o(StubCode)
-    StubCode                                 0x00008bc0   Section        8  apparc{000a0000}-279.o(StubCode)
-    theImportedSymbol                        0x00008bc4   Data           0  apparc{000a0000}-279.o(StubCode)
-    StubCode                                 0x00008bc8   Section        8  apparc{000a0000}-280.o(StubCode)
-    theImportedSymbol                        0x00008bcc   Data           0  apparc{000a0000}-280.o(StubCode)
-    StubCode                                 0x00008bd0   Section        8  apparc{000a0000}-284.o(StubCode)
-    theImportedSymbol                        0x00008bd4   Data           0  apparc{000a0000}-284.o(StubCode)
-    StubCode                                 0x00008bd8   Section        8  apparc{000a0000}-285.o(StubCode)
-    theImportedSymbol                        0x00008bdc   Data           0  apparc{000a0000}-285.o(StubCode)
-    StubCode                                 0x00008be0   Section        8  apparc{000a0000}-286.o(StubCode)
-    theImportedSymbol                        0x00008be4   Data           0  apparc{000a0000}-286.o(StubCode)
-    StubCode                                 0x00008be8   Section        8  apparc{000a0000}-287.o(StubCode)
-    theImportedSymbol                        0x00008bec   Data           0  apparc{000a0000}-287.o(StubCode)
-    StubCode                                 0x00008bf0   Section        8  apparc{000a0000}-30.o(StubCode)
-    theImportedSymbol                        0x00008bf4   Data           0  apparc{000a0000}-30.o(StubCode)
-    StubCode                                 0x00008bf8   Section        8  eikcore{000a0000}-141.o(StubCode)
-    theImportedSymbol                        0x00008bfc   Data           0  eikcore{000a0000}-141.o(StubCode)
-    StubCode                                 0x00008c00   Section        8  eikcore{000a0000}-142.o(StubCode)
-    theImportedSymbol                        0x00008c04   Data           0  eikcore{000a0000}-142.o(StubCode)
-    StubCode                                 0x00008c08   Section        8  eikcore{000a0000}-143.o(StubCode)
-    theImportedSymbol                        0x00008c0c   Data           0  eikcore{000a0000}-143.o(StubCode)
-    StubCode                                 0x00008c10   Section        8  eikcore{000a0000}-144.o(StubCode)
-    theImportedSymbol                        0x00008c14   Data           0  eikcore{000a0000}-144.o(StubCode)
-    StubCode                                 0x00008c18   Section        8  eikcore{000a0000}-147.o(StubCode)
-    theImportedSymbol                        0x00008c1c   Data           0  eikcore{000a0000}-147.o(StubCode)
-    StubCode                                 0x00008c20   Section        8  eikcore{000a0000}-152.o(StubCode)
-    theImportedSymbol                        0x00008c24   Data           0  eikcore{000a0000}-152.o(StubCode)
-    StubCode                                 0x00008c28   Section        8  eikcore{000a0000}-155.o(StubCode)
-    theImportedSymbol                        0x00008c2c   Data           0  eikcore{000a0000}-155.o(StubCode)
-    StubCode                                 0x00008c30   Section        8  eikcore{000a0000}-158.o(StubCode)
-    theImportedSymbol                        0x00008c34   Data           0  eikcore{000a0000}-158.o(StubCode)
-    StubCode                                 0x00008c38   Section        8  eikcore{000a0000}-159.o(StubCode)
-    theImportedSymbol                        0x00008c3c   Data           0  eikcore{000a0000}-159.o(StubCode)
-    StubCode                                 0x00008c40   Section        8  eikcore{000a0000}-166.o(StubCode)
-    theImportedSymbol                        0x00008c44   Data           0  eikcore{000a0000}-166.o(StubCode)
-    StubCode                                 0x00008c48   Section        8  eikcore{000a0000}-169.o(StubCode)
-    theImportedSymbol                        0x00008c4c   Data           0  eikcore{000a0000}-169.o(StubCode)
-    StubCode                                 0x00008c50   Section        8  eikcore{000a0000}-171.o(StubCode)
-    theImportedSymbol                        0x00008c54   Data           0  eikcore{000a0000}-171.o(StubCode)
-    StubCode                                 0x00008c58   Section        8  eikcore{000a0000}-175.o(StubCode)
-    theImportedSymbol                        0x00008c5c   Data           0  eikcore{000a0000}-175.o(StubCode)
-    StubCode                                 0x00008c60   Section        8  eikcore{000a0000}-18.o(StubCode)
-    theImportedSymbol                        0x00008c64   Data           0  eikcore{000a0000}-18.o(StubCode)
-    StubCode                                 0x00008c68   Section        8  eikcore{000a0000}-20.o(StubCode)
-    theImportedSymbol                        0x00008c6c   Data           0  eikcore{000a0000}-20.o(StubCode)
-    StubCode                                 0x00008c70   Section        8  eikcore{000a0000}-25.o(StubCode)
-    theImportedSymbol                        0x00008c74   Data           0  eikcore{000a0000}-25.o(StubCode)
-    StubCode                                 0x00008c78   Section        8  eikcore{000a0000}-26.o(StubCode)
-    theImportedSymbol                        0x00008c7c   Data           0  eikcore{000a0000}-26.o(StubCode)
-    StubCode                                 0x00008c80   Section        8  eikcore{000a0000}-27.o(StubCode)
-    theImportedSymbol                        0x00008c84   Data           0  eikcore{000a0000}-27.o(StubCode)
-    StubCode                                 0x00008c88   Section        8  eikcore{000a0000}-28.o(StubCode)
-    theImportedSymbol                        0x00008c8c   Data           0  eikcore{000a0000}-28.o(StubCode)
-    StubCode                                 0x00008c90   Section        8  eikcore{000a0000}-29.o(StubCode)
-    theImportedSymbol                        0x00008c94   Data           0  eikcore{000a0000}-29.o(StubCode)
-    StubCode                                 0x00008c98   Section        8  eikcore{000a0000}-291.o(StubCode)
-    theImportedSymbol                        0x00008c9c   Data           0  eikcore{000a0000}-291.o(StubCode)
-    StubCode                                 0x00008ca0   Section        8  eikcore{000a0000}-293.o(StubCode)
-    theImportedSymbol                        0x00008ca4   Data           0  eikcore{000a0000}-293.o(StubCode)
-    StubCode                                 0x00008ca8   Section        8  eikcore{000a0000}-294.o(StubCode)
-    theImportedSymbol                        0x00008cac   Data           0  eikcore{000a0000}-294.o(StubCode)
-    StubCode                                 0x00008cb0   Section        8  eikcore{000a0000}-295.o(StubCode)
-    theImportedSymbol                        0x00008cb4   Data           0  eikcore{000a0000}-295.o(StubCode)
-    StubCode                                 0x00008cb8   Section        8  eikcore{000a0000}-296.o(StubCode)
-    theImportedSymbol                        0x00008cbc   Data           0  eikcore{000a0000}-296.o(StubCode)
-    StubCode                                 0x00008cc0   Section        8  eikcore{000a0000}-297.o(StubCode)
-    theImportedSymbol                        0x00008cc4   Data           0  eikcore{000a0000}-297.o(StubCode)
-    StubCode                                 0x00008cc8   Section        8  eikcore{000a0000}-298.o(StubCode)
-    theImportedSymbol                        0x00008ccc   Data           0  eikcore{000a0000}-298.o(StubCode)
-    StubCode                                 0x00008cd0   Section        8  eikcore{000a0000}-299.o(StubCode)
-    theImportedSymbol                        0x00008cd4   Data           0  eikcore{000a0000}-299.o(StubCode)
-    StubCode                                 0x00008cd8   Section        8  eikcore{000a0000}-30.o(StubCode)
-    theImportedSymbol                        0x00008cdc   Data           0  eikcore{000a0000}-30.o(StubCode)
-    StubCode                                 0x00008ce0   Section        8  eikcore{000a0000}-302.o(StubCode)
-    theImportedSymbol                        0x00008ce4   Data           0  eikcore{000a0000}-302.o(StubCode)
-    StubCode                                 0x00008ce8   Section        8  eikcore{000a0000}-31.o(StubCode)
-    theImportedSymbol                        0x00008cec   Data           0  eikcore{000a0000}-31.o(StubCode)
-    StubCode                                 0x00008cf0   Section        8  eikcore{000a0000}-317.o(StubCode)
-    theImportedSymbol                        0x00008cf4   Data           0  eikcore{000a0000}-317.o(StubCode)
-    StubCode                                 0x00008cf8   Section        8  eikcore{000a0000}-352.o(StubCode)
-    theImportedSymbol                        0x00008cfc   Data           0  eikcore{000a0000}-352.o(StubCode)
-    StubCode                                 0x00008d00   Section        8  eikcore{000a0000}-37.o(StubCode)
-    theImportedSymbol                        0x00008d04   Data           0  eikcore{000a0000}-37.o(StubCode)
-    StubCode                                 0x00008d08   Section        8  eikcore{000a0000}-390.o(StubCode)
-    theImportedSymbol                        0x00008d0c   Data           0  eikcore{000a0000}-390.o(StubCode)
-    StubCode                                 0x00008d10   Section        8  eikcore{000a0000}-392.o(StubCode)
-    theImportedSymbol                        0x00008d14   Data           0  eikcore{000a0000}-392.o(StubCode)
-    StubCode                                 0x00008d18   Section        8  eikcore{000a0000}-394.o(StubCode)
-    theImportedSymbol                        0x00008d1c   Data           0  eikcore{000a0000}-394.o(StubCode)
-    StubCode                                 0x00008d20   Section        8  eikcore{000a0000}-467.o(StubCode)
-    theImportedSymbol                        0x00008d24   Data           0  eikcore{000a0000}-467.o(StubCode)
-    StubCode                                 0x00008d28   Section        8  eikcore{000a0000}-479.o(StubCode)
-    theImportedSymbol                        0x00008d2c   Data           0  eikcore{000a0000}-479.o(StubCode)
-    StubCode                                 0x00008d30   Section        8  eikcore{000a0000}-490.o(StubCode)
-    theImportedSymbol                        0x00008d34   Data           0  eikcore{000a0000}-490.o(StubCode)
-    StubCode                                 0x00008d38   Section        8  eikcore{000a0000}-506.o(StubCode)
-    theImportedSymbol                        0x00008d3c   Data           0  eikcore{000a0000}-506.o(StubCode)
-    StubCode                                 0x00008d40   Section        8  eikcore{000a0000}-523.o(StubCode)
-    theImportedSymbol                        0x00008d44   Data           0  eikcore{000a0000}-523.o(StubCode)
-    StubCode                                 0x00008d48   Section        8  eikcore{000a0000}-532.o(StubCode)
-    theImportedSymbol                        0x00008d4c   Data           0  eikcore{000a0000}-532.o(StubCode)
-    StubCode                                 0x00008d50   Section        8  eikcore{000a0000}-533.o(StubCode)
-    theImportedSymbol                        0x00008d54   Data           0  eikcore{000a0000}-533.o(StubCode)
-    StubCode                                 0x00008d58   Section        8  eikcore{000a0000}-534.o(StubCode)
-    theImportedSymbol                        0x00008d5c   Data           0  eikcore{000a0000}-534.o(StubCode)
-    StubCode                                 0x00008d60   Section        8  eikcore{000a0000}-535.o(StubCode)
-    theImportedSymbol                        0x00008d64   Data           0  eikcore{000a0000}-535.o(StubCode)
-    StubCode                                 0x00008d68   Section        8  eikcore{000a0000}-536.o(StubCode)
-    theImportedSymbol                        0x00008d6c   Data           0  eikcore{000a0000}-536.o(StubCode)
-    StubCode                                 0x00008d70   Section        8  eikcore{000a0000}-537.o(StubCode)
-    theImportedSymbol                        0x00008d74   Data           0  eikcore{000a0000}-537.o(StubCode)
-    StubCode                                 0x00008d78   Section        8  eikcore{000a0000}-565.o(StubCode)
-    theImportedSymbol                        0x00008d7c   Data           0  eikcore{000a0000}-565.o(StubCode)
-    StubCode                                 0x00008d80   Section        8  eikcore{000a0000}-61.o(StubCode)
-    theImportedSymbol                        0x00008d84   Data           0  eikcore{000a0000}-61.o(StubCode)
-    StubCode                                 0x00008d88   Section        8  eikcore{000a0000}-62.o(StubCode)
-    theImportedSymbol                        0x00008d8c   Data           0  eikcore{000a0000}-62.o(StubCode)
-    StubCode                                 0x00008d90   Section        8  eikcore{000a0000}-63.o(StubCode)
-    theImportedSymbol                        0x00008d94   Data           0  eikcore{000a0000}-63.o(StubCode)
-    StubCode                                 0x00008d98   Section        8  eikcore{000a0000}-64.o(StubCode)
-    theImportedSymbol                        0x00008d9c   Data           0  eikcore{000a0000}-64.o(StubCode)
-    StubCode                                 0x00008da0   Section        8  eikcore{000a0000}-67.o(StubCode)
-    theImportedSymbol                        0x00008da4   Data           0  eikcore{000a0000}-67.o(StubCode)
-    StubCode                                 0x00008da8   Section        8  eikcore{000a0000}-72.o(StubCode)
-    theImportedSymbol                        0x00008dac   Data           0  eikcore{000a0000}-72.o(StubCode)
-    StubCode                                 0x00008db0   Section        8  eikcore{000a0000}-73.o(StubCode)
-    theImportedSymbol                        0x00008db4   Data           0  eikcore{000a0000}-73.o(StubCode)
-    StubCode                                 0x00008db8   Section        8  eikcore{000a0000}-74.o(StubCode)
-    theImportedSymbol                        0x00008dbc   Data           0  eikcore{000a0000}-74.o(StubCode)
-    StubCode                                 0x00008dc0   Section        8  eikcore{000a0000}-75.o(StubCode)
-    theImportedSymbol                        0x00008dc4   Data           0  eikcore{000a0000}-75.o(StubCode)
-    StubCode                                 0x00008dc8   Section        8  eikcore{000a0000}-77.o(StubCode)
-    theImportedSymbol                        0x00008dcc   Data           0  eikcore{000a0000}-77.o(StubCode)
-    StubCode                                 0x00008dd0   Section        8  eikcore{000a0000}-78.o(StubCode)
-    theImportedSymbol                        0x00008dd4   Data           0  eikcore{000a0000}-78.o(StubCode)
-    StubCode                                 0x00008dd8   Section        8  eikcore{000a0000}-79.o(StubCode)
-    theImportedSymbol                        0x00008ddc   Data           0  eikcore{000a0000}-79.o(StubCode)
-    StubCode                                 0x00008de0   Section        8  ws32{000a0000}-211.o(StubCode)
-    theImportedSymbol                        0x00008de4   Data           0  ws32{000a0000}-211.o(StubCode)
-    StubCode                                 0x00008de8   Section        8  gdi{000a0000}-312.o(StubCode)
-    theImportedSymbol                        0x00008dec   Data           0  gdi{000a0000}-312.o(StubCode)
-    StubCode                                 0x00008df0   Section        8  avkon{000a0000}-1132.o(StubCode)
-    theImportedSymbol                        0x00008df4   Data           0  avkon{000a0000}-1132.o(StubCode)
-    StubCode                                 0x00008df8   Section        8  avkon{000a0000}-129.o(StubCode)
-    theImportedSymbol                        0x00008dfc   Data           0  avkon{000a0000}-129.o(StubCode)
-    StubCode                                 0x00008e00   Section        8  avkon{000a0000}-130.o(StubCode)
-    theImportedSymbol                        0x00008e04   Data           0  avkon{000a0000}-130.o(StubCode)
-    StubCode                                 0x00008e08   Section        8  avkon{000a0000}-131.o(StubCode)
-    theImportedSymbol                        0x00008e0c   Data           0  avkon{000a0000}-131.o(StubCode)
-    StubCode                                 0x00008e10   Section        8  avkon{000a0000}-1350.o(StubCode)
-    theImportedSymbol                        0x00008e14   Data           0  avkon{000a0000}-1350.o(StubCode)
-    StubCode                                 0x00008e18   Section        8  avkon{000a0000}-1351.o(StubCode)
-    theImportedSymbol                        0x00008e1c   Data           0  avkon{000a0000}-1351.o(StubCode)
-    StubCode                                 0x00008e20   Section        8  avkon{000a0000}-1366.o(StubCode)
-    theImportedSymbol                        0x00008e24   Data           0  avkon{000a0000}-1366.o(StubCode)
-    StubCode                                 0x00008e28   Section        8  avkon{000a0000}-198.o(StubCode)
-    theImportedSymbol                        0x00008e2c   Data           0  avkon{000a0000}-198.o(StubCode)
-    StubCode                                 0x00008e30   Section        8  avkon{000a0000}-199.o(StubCode)
-    theImportedSymbol                        0x00008e34   Data           0  avkon{000a0000}-199.o(StubCode)
-    StubCode                                 0x00008e38   Section        8  avkon{000a0000}-201.o(StubCode)
-    theImportedSymbol                        0x00008e3c   Data           0  avkon{000a0000}-201.o(StubCode)
-    StubCode                                 0x00008e40   Section        8  avkon{000a0000}-206.o(StubCode)
-    theImportedSymbol                        0x00008e44   Data           0  avkon{000a0000}-206.o(StubCode)
-    StubCode                                 0x00008e48   Section        8  avkon{000a0000}-211.o(StubCode)
-    theImportedSymbol                        0x00008e4c   Data           0  avkon{000a0000}-211.o(StubCode)
-    StubCode                                 0x00008e50   Section        8  avkon{000a0000}-213.o(StubCode)
-    theImportedSymbol                        0x00008e54   Data           0  avkon{000a0000}-213.o(StubCode)
-    StubCode                                 0x00008e58   Section        8  avkon{000a0000}-214.o(StubCode)
-    theImportedSymbol                        0x00008e5c   Data           0  avkon{000a0000}-214.o(StubCode)
-    StubCode                                 0x00008e60   Section        8  avkon{000a0000}-215.o(StubCode)
-    theImportedSymbol                        0x00008e64   Data           0  avkon{000a0000}-215.o(StubCode)
-    StubCode                                 0x00008e68   Section        8  avkon{000a0000}-216.o(StubCode)
-    theImportedSymbol                        0x00008e6c   Data           0  avkon{000a0000}-216.o(StubCode)
-    StubCode                                 0x00008e70   Section        8  avkon{000a0000}-217.o(StubCode)
-    theImportedSymbol                        0x00008e74   Data           0  avkon{000a0000}-217.o(StubCode)
-    StubCode                                 0x00008e78   Section        8  avkon{000a0000}-220.o(StubCode)
-    theImportedSymbol                        0x00008e7c   Data           0  avkon{000a0000}-220.o(StubCode)
-    StubCode                                 0x00008e80   Section        8  avkon{000a0000}-2920.o(StubCode)
-    theImportedSymbol                        0x00008e84   Data           0  avkon{000a0000}-2920.o(StubCode)
-    StubCode                                 0x00008e88   Section        8  avkon{000a0000}-2922.o(StubCode)
-    theImportedSymbol                        0x00008e8c   Data           0  avkon{000a0000}-2922.o(StubCode)
-    StubCode                                 0x00008e90   Section        8  avkon{000a0000}-2924.o(StubCode)
-    theImportedSymbol                        0x00008e94   Data           0  avkon{000a0000}-2924.o(StubCode)
-    StubCode                                 0x00008e98   Section        8  avkon{000a0000}-2925.o(StubCode)
-    theImportedSymbol                        0x00008e9c   Data           0  avkon{000a0000}-2925.o(StubCode)
-    StubCode                                 0x00008ea0   Section        8  avkon{000a0000}-2926.o(StubCode)
-    theImportedSymbol                        0x00008ea4   Data           0  avkon{000a0000}-2926.o(StubCode)
-    StubCode                                 0x00008ea8   Section        8  avkon{000a0000}-2928.o(StubCode)
-    theImportedSymbol                        0x00008eac   Data           0  avkon{000a0000}-2928.o(StubCode)
-    StubCode                                 0x00008eb0   Section        8  avkon{000a0000}-2929.o(StubCode)
-    theImportedSymbol                        0x00008eb4   Data           0  avkon{000a0000}-2929.o(StubCode)
-    StubCode                                 0x00008eb8   Section        8  avkon{000a0000}-2930.o(StubCode)
-    theImportedSymbol                        0x00008ebc   Data           0  avkon{000a0000}-2930.o(StubCode)
-    StubCode                                 0x00008ec0   Section        8  avkon{000a0000}-2931.o(StubCode)
-    theImportedSymbol                        0x00008ec4   Data           0  avkon{000a0000}-2931.o(StubCode)
-    StubCode                                 0x00008ec8   Section        8  avkon{000a0000}-2932.o(StubCode)
-    theImportedSymbol                        0x00008ecc   Data           0  avkon{000a0000}-2932.o(StubCode)
-    StubCode                                 0x00008ed0   Section        8  avkon{000a0000}-2934.o(StubCode)
-    theImportedSymbol                        0x00008ed4   Data           0  avkon{000a0000}-2934.o(StubCode)
-    StubCode                                 0x00008ed8   Section        8  avkon{000a0000}-2935.o(StubCode)
-    theImportedSymbol                        0x00008edc   Data           0  avkon{000a0000}-2935.o(StubCode)
-    StubCode                                 0x00008ee0   Section        8  avkon{000a0000}-2938.o(StubCode)
-    theImportedSymbol                        0x00008ee4   Data           0  avkon{000a0000}-2938.o(StubCode)
-    StubCode                                 0x00008ee8   Section        8  avkon{000a0000}-2993.o(StubCode)
-    theImportedSymbol                        0x00008eec   Data           0  avkon{000a0000}-2993.o(StubCode)
-    StubCode                                 0x00008ef0   Section        8  avkon{000a0000}-2997.o(StubCode)
-    theImportedSymbol                        0x00008ef4   Data           0  avkon{000a0000}-2997.o(StubCode)
-    StubCode                                 0x00008ef8   Section        8  avkon{000a0000}-3826.o(StubCode)
-    theImportedSymbol                        0x00008efc   Data           0  avkon{000a0000}-3826.o(StubCode)
-    StubCode                                 0x00008f00   Section        8  avkon{000a0000}-3862.o(StubCode)
-    theImportedSymbol                        0x00008f04   Data           0  avkon{000a0000}-3862.o(StubCode)
-    StubCode                                 0x00008f08   Section        8  avkon{000a0000}-3868.o(StubCode)
-    theImportedSymbol                        0x00008f0c   Data           0  avkon{000a0000}-3868.o(StubCode)
-    StubCode                                 0x00008f10   Section        8  avkon{000a0000}-4021.o(StubCode)
-    theImportedSymbol                        0x00008f14   Data           0  avkon{000a0000}-4021.o(StubCode)
-    StubCode                                 0x00008f18   Section        8  avkon{000a0000}-4030.o(StubCode)
-    theImportedSymbol                        0x00008f1c   Data           0  avkon{000a0000}-4030.o(StubCode)
-    StubCode                                 0x00008f20   Section        8  eposlandmarks{000a0000}-12.o(StubCode)
-    theImportedSymbol                        0x00008f24   Data           0  eposlandmarks{000a0000}-12.o(StubCode)
-    StubCode                                 0x00008f28   Section        8  eposlandmarks{000a0000}-13.o(StubCode)
-    theImportedSymbol                        0x00008f2c   Data           0  eposlandmarks{000a0000}-13.o(StubCode)
-    StubCode                                 0x00008f30   Section        8  eposlandmarks{000a0000}-65.o(StubCode)
-    theImportedSymbol                        0x00008f34   Data           0  eposlandmarks{000a0000}-65.o(StubCode)
-    StubCode                                 0x00008f38   Section        8  eposlandmarks{000a0000}-68.o(StubCode)
-    theImportedSymbol                        0x00008f3c   Data           0  eposlandmarks{000a0000}-68.o(StubCode)
-    StubCode                                 0x00008f40   Section        8  lbs{000a0000}-207.o(StubCode)
-    theImportedSymbol                        0x00008f44   Data           0  lbs{000a0000}-207.o(StubCode)
-    StubCode                                 0x00008f48   Section        8  lbs{000a0000}-23.o(StubCode)
-    theImportedSymbol                        0x00008f4c   Data           0  lbs{000a0000}-23.o(StubCode)
-    StubCode                                 0x00008f50   Section        8  mnservicelib{000a0000}-1.o(StubCode)
-    theImportedSymbol                        0x00008f54   Data           0  mnservicelib{000a0000}-1.o(StubCode)
-    StubCode                                 0x00008f58   Section        8  mnservicelib{000a0000}-2.o(StubCode)
-    theImportedSymbol                        0x00008f5c   Data           0  mnservicelib{000a0000}-2.o(StubCode)
-    StubCode                                 0x00008f60   Section        8  mnservicelib{000a0000}-21.o(StubCode)
-    theImportedSymbol                        0x00008f64   Data           0  mnservicelib{000a0000}-21.o(StubCode)
-    StubCode                                 0x00008f68   Section        8  mnservicelib{000a0000}-22.o(StubCode)
-    theImportedSymbol                        0x00008f6c   Data           0  mnservicelib{000a0000}-22.o(StubCode)
-    StubCode                                 0x00008f70   Section        8  mnservicelib{000a0000}-23.o(StubCode)
-    theImportedSymbol                        0x00008f74   Data           0  mnservicelib{000a0000}-23.o(StubCode)
-    StubCode                                 0x00008f78   Section        8  mnservicelib{000a0000}-24.o(StubCode)
-    theImportedSymbol                        0x00008f7c   Data           0  mnservicelib{000a0000}-24.o(StubCode)
-    StubCode                                 0x00008f80   Section        8  mnservicelib{000a0000}-27.o(StubCode)
-    theImportedSymbol                        0x00008f84   Data           0  mnservicelib{000a0000}-27.o(StubCode)
-    StubCode                                 0x00008f88   Section        8  mnservicelib{000a0000}-34.o(StubCode)
-    theImportedSymbol                        0x00008f8c   Data           0  mnservicelib{000a0000}-34.o(StubCode)
-    StubCode                                 0x00008f90   Section        8  mnservicelib{000a0000}-45.o(StubCode)
-    theImportedSymbol                        0x00008f94   Data           0  mnservicelib{000a0000}-45.o(StubCode)
-    StubCode                                 0x00008f98   Section        8  mnservicelib{000a0000}-46.o(StubCode)
-    theImportedSymbol                        0x00008f9c   Data           0  mnservicelib{000a0000}-46.o(StubCode)
-    StubCode                                 0x00008fa0   Section        8  mnservicelib{000a0000}-47.o(StubCode)
-    theImportedSymbol                        0x00008fa4   Data           0  mnservicelib{000a0000}-47.o(StubCode)
-    StubCode                                 0x00008fa8   Section        8  mnservicelib{000a0000}-49.o(StubCode)
-    theImportedSymbol                        0x00008fac   Data           0  mnservicelib{000a0000}-49.o(StubCode)
-    StubCode                                 0x00008fb0   Section        8  mnservicelib{000a0000}-50.o(StubCode)
-    theImportedSymbol                        0x00008fb4   Data           0  mnservicelib{000a0000}-50.o(StubCode)
-    StubCode                                 0x00008fb8   Section        8  mnservicelib{000a0000}-53.o(StubCode)
-    theImportedSymbol                        0x00008fbc   Data           0  mnservicelib{000a0000}-53.o(StubCode)
-    StubCode                                 0x00008fc0   Section        8  mnservicelib{000a0000}-56.o(StubCode)
-    theImportedSymbol                        0x00008fc4   Data           0  mnservicelib{000a0000}-56.o(StubCode)
-    StubCode                                 0x00008fc8   Section        8  mnrefproviderengine{000a0000}-10.o(StubCode)
-    theImportedSymbol                        0x00008fcc   Data           0  mnrefproviderengine{000a0000}-10.o(StubCode)
-    StubCode                                 0x00008fd0   Section        8  mnrefproviderengine{000a0000}-12.o(StubCode)
-    theImportedSymbol                        0x00008fd4   Data           0  mnrefproviderengine{000a0000}-12.o(StubCode)
-    StubCode                                 0x00008fd8   Section        8  mnrefproviderengine{000a0000}-18.o(StubCode)
-    theImportedSymbol                        0x00008fdc   Data           0  mnrefproviderengine{000a0000}-18.o(StubCode)
-    StubCode                                 0x00008fe0   Section        8  mnrefproviderengine{000a0000}-19.o(StubCode)
-    theImportedSymbol                        0x00008fe4   Data           0  mnrefproviderengine{000a0000}-19.o(StubCode)
-    StubCode                                 0x00008fe8   Section        8  mnrefproviderengine{000a0000}-21.o(StubCode)
-    theImportedSymbol                        0x00008fec   Data           0  mnrefproviderengine{000a0000}-21.o(StubCode)
-    StubCode                                 0x00008ff0   Section        8  mnrefproviderengine{000a0000}-4.o(StubCode)
-    theImportedSymbol                        0x00008ff4   Data           0  mnrefproviderengine{000a0000}-4.o(StubCode)
-    StubCode                                 0x00008ff8   Section        8  mnrefproviderengine{000a0000}-5.o(StubCode)
-    theImportedSymbol                        0x00008ffc   Data           0  mnrefproviderengine{000a0000}-5.o(StubCode)
-    StubCode                                 0x00009000   Section        8  mnrefproviderengine{000a0000}-54.o(StubCode)
-    theImportedSymbol                        0x00009004   Data           0  mnrefproviderengine{000a0000}-54.o(StubCode)
-    StubCode                                 0x00009008   Section        8  mnrefproviderengine{000a0000}-6.o(StubCode)
-    theImportedSymbol                        0x0000900c   Data           0  mnrefproviderengine{000a0000}-6.o(StubCode)
-    StubCode                                 0x00009010   Section        8  drtaeabi{000a0000}-144.o(StubCode)
-    theImportedSymbol                        0x00009014   Data           0  drtaeabi{000a0000}-144.o(StubCode)
-    StubCode                                 0x00009018   Section        8  drtaeabi{000a0000}-158.o(StubCode)
-    theImportedSymbol                        0x0000901c   Data           0  drtaeabi{000a0000}-158.o(StubCode)
-    StubCode                                 0x00009020   Section        8  drtaeabi{000a0000}-159.o(StubCode)
-    theImportedSymbol                        0x00009024   Data           0  drtaeabi{000a0000}-159.o(StubCode)
-    StubCode                                 0x00009028   Section        8  drtaeabi{000a0000}-180.o(StubCode)
-    theImportedSymbol                        0x0000902c   Data           0  drtaeabi{000a0000}-180.o(StubCode)
-    StubCode                                 0x00009030   Section        8  drtaeabi{000a0000}-182.o(StubCode)
-    theImportedSymbol                        0x00009034   Data           0  drtaeabi{000a0000}-182.o(StubCode)
-    StubCode                                 0x00009038   Section        8  drtaeabi{000a0000}-183.o(StubCode)
-    theImportedSymbol                        0x0000903c   Data           0  drtaeabi{000a0000}-183.o(StubCode)
-    StubCode                                 0x00009040   Section        8  drtaeabi{000a0000}-184.o(StubCode)
-    theImportedSymbol                        0x00009044   Data           0  drtaeabi{000a0000}-184.o(StubCode)
-    StubCode                                 0x00009048   Section        8  drtaeabi{000a0000}-189.o(StubCode)
-    theImportedSymbol                        0x0000904c   Data           0  drtaeabi{000a0000}-189.o(StubCode)
-    StubCode                                 0x00009050   Section        8  scppnwdl{000a0000}-3.o(StubCode)
-    theImportedSymbol                        0x00009054   Data           0  scppnwdl{000a0000}-3.o(StubCode)
-    StubCode                                 0x00009058   Section        8  euser{000a0000}-1360.o(StubCode)
-    theImportedSymbol                        0x0000905c   Data           0  euser{000a0000}-1360.o(StubCode)
-    StubCode                                 0x00009060   Section        8  euser{000a0000}-641.o(StubCode)
-    theImportedSymbol                        0x00009064   Data           0  euser{000a0000}-641.o(StubCode)
-    StubCode                                 0x00009068   Section        8  euser{000a0000}-585.o(StubCode)
-    theImportedSymbol                        0x0000906c   Data           0  euser{000a0000}-585.o(StubCode)
-    StubCode                                 0x00009070   Section        8  euser{000a0000}-650.o(StubCode)
-    theImportedSymbol                        0x00009074   Data           0  euser{000a0000}-650.o(StubCode)
-    StubCode                                 0x00009078   Section        8  drtaeabi{000a0000}-204.o(StubCode)
-    theImportedSymbol                        0x0000907c   Data           0  drtaeabi{000a0000}-204.o(StubCode)
-    i._ZN12CApaDocument16DetachFromStoreLEN8CPicture7TDetachE 0x00009080   Section        2  mnrefproviderback.in(i._ZN12CApaDocument16DetachFromStoreLEN8CPicture7TDetachE)
-    i._ZN14CMnrpAppUiBackC1Ev                0x00009084   Section       60  mnrefproviderback.in(i._ZN14CMnrpAppUiBackC1Ev)
-    i._ZN14CMnrpAppUiBackC1Ev.clean          0x000090c0   Section       10  mnrefproviderback.in(i._ZN14CMnrpAppUiBackC1Ev.clean)
-    i._ZN14CMnrpAppUiBackD0Ev                0x000090ca   Section       16  mnrefproviderback.in(i._ZN14CMnrpAppUiBackD0Ev)
-    i._ZN14CMnrpAppUiBackD1Ev                0x000090da   Section        8  mnrefproviderback.in(i._ZN14CMnrpAppUiBackD1Ev)
-    i._ZN17CMnrpDocumentBackD0Ev             0x000090e2   Section       16  mnrefproviderback.in(i._ZN17CMnrpDocumentBackD0Ev)
-    i._ZN17CMnrpDocumentBackD1Ev             0x000090f2   Section        8  mnrefproviderback.in(i._ZN17CMnrpDocumentBackD1Ev)
-    i._ZN20CMnrpApplicationBackD0Ev          0x000090fa   Section       16  mnrefproviderback.in(i._ZN20CMnrpApplicationBackD0Ev)
-    i._ZN20CMnrpApplicationBackD1Ev          0x0000910a   Section        8  mnrefproviderback.in(i._ZN20CMnrpApplicationBackD1Ev)
-    i._ZN5CBasenwEj                          0x00009112   Section        8  mnrefproviderback.in(i._ZN5CBasenwEj)
-    t._ZNK13RPointerArrayI12CPosLandmarkE5CountEv 0x0000911a   Section        8  mnrefproviderback.in(t._ZNK13RPointerArrayI12CPosLandmarkE5CountEv)
-    .ARM.extab                               0x00009124   Section       16  uc_exe_.o(.ARM.extab)
-    .extab._Z14NewApplicationv               0x00009134   Data           0  mnrefproviderback.in(.ARM.extab)
-    .extab._ZN5CBasenwEj                     0x00009144   Data           0  mnrefproviderback.in(.ARM.extab)
-    .extab._ZN14CMnrpAppUiBackC1Ev           0x00009154   Data           0  mnrefproviderback.in(.ARM.extab)
-    .extab._ZN18CMnrpAppServerBackD1Ev       0x00009164   Data           0  mnrefproviderback.in(.ARM.extab)
-    .extab._ZN21CMnrpGeocodingServiceD1Ev    0x00009174   Data           0  mnrefproviderback.in(.ARM.extab)
-    .extab._ZN21CMnrpGeocodingService24HandleGeocodingCompletedEv 0x00009184   Data           0  mnrefproviderback.in(.ARM.extab)
-    .extab._ZN20CMnrpMapImageServiceD1Ev     0x000091ac   Data           0  mnrefproviderback.in(.ARM.extab)
-    .extab._ZN20CMnrpMapImageService24HandleMapImageCompletedLEv 0x000091bc   Data           0  mnrefproviderback.in(.ARM.extab)
-    .extab._ZN20CMnrpMapImageService26MapImageProcessingCallBackEPv 0x000091e4   Data           0  mnrefproviderback.in(.ARM.extab)
-    .extab.CallThrdProcEntry                 0x0000920c   Data           0  callfirstprocessfn.o(.ARM.extab)
-    .constdata$1                             0x00009228   Data           0  mnrefproviderback.in(.constdata)
-    KUidMnRefProviderBackApp                 0x00009228   Data           4  mnrefproviderback.in(.constdata)
-    .constdata                               0x00009228   Section        4  mnrefproviderback.in(.constdata)
-    .constdata$1                             0x0000922c   Data           0  callfirstprocessfn.o(.constdata)
-    KLitUser                                 0x0000922c   Data          16  callfirstprocessfn.o(.constdata)
-    .constdata                               0x0000922c   Section       16  callfirstprocessfn.o(.constdata)
-    .constdata__ZTI14CMnrpAppUiBack          0x0000923c   Section       12  mnrefproviderback.in(.constdata__ZTI14CMnrpAppUiBack)
-    .constdata__ZTI17CMnrpDocumentBack       0x00009248   Section       12  mnrefproviderback.in(.constdata__ZTI17CMnrpDocumentBack)
-    .constdata__ZTI18CMnrpAppServerBack      0x00009254   Section       12  mnrefproviderback.in(.constdata__ZTI18CMnrpAppServerBack)
-    .constdata__ZTI20CMnrpApplicationBack    0x00009260   Section       12  mnrefproviderback.in(.constdata__ZTI20CMnrpApplicationBack)
-    .constdata__ZTI20CMnrpMapImageService    0x0000926c   Section       12  mnrefproviderback.in(.constdata__ZTI20CMnrpMapImageService)
-    .constdata__ZTI21CMnrpGeocodingService   0x00009278   Section       12  mnrefproviderback.in(.constdata__ZTI21CMnrpGeocodingService)
-    .constdata__ZTI22MEikStatusPaneObserver  0x00009284   Section        8  mnrefproviderback.in(.constdata__ZTI22MEikStatusPaneObserver)
-    .constdata__ZTS14CMnrpAppUiBack          0x0000928c   Section       17  mnrefproviderback.in(.constdata__ZTS14CMnrpAppUiBack)
-    .constdata__ZTS17CMnrpDocumentBack       0x0000929d   Section       20  mnrefproviderback.in(.constdata__ZTS17CMnrpDocumentBack)
-    .constdata__ZTS18CMnrpAppServerBack      0x000092b1   Section       21  mnrefproviderback.in(.constdata__ZTS18CMnrpAppServerBack)
-    .constdata__ZTS20CMnrpApplicationBack    0x000092c6   Section       23  mnrefproviderback.in(.constdata__ZTS20CMnrpApplicationBack)
-    .constdata__ZTS20CMnrpMapImageService    0x000092dd   Section       23  mnrefproviderback.in(.constdata__ZTS20CMnrpMapImageService)
-    .constdata__ZTS21CMnrpGeocodingService   0x000092f4   Section       24  mnrefproviderback.in(.constdata__ZTS21CMnrpGeocodingService)
-    .constdata__ZTS22MEikStatusPaneObserver  0x0000930c   Section       25  mnrefproviderback.in(.constdata__ZTS22MEikStatusPaneObserver)
-    .constdata__ZTV14CMnrpAppUiBack          0x00009328   Section      340  mnrefproviderback.in(.constdata__ZTV14CMnrpAppUiBack)
-    .constdata__ZTV17CMnrpDocumentBack       0x0000947c   Section      112  mnrefproviderback.in(.constdata__ZTV17CMnrpDocumentBack)
-    .constdata__ZTV18CMnrpAppServerBack      0x000094ec   Section       76  mnrefproviderback.in(.constdata__ZTV18CMnrpAppServerBack)
-    .constdata__ZTV20CMnrpApplicationBack    0x00009538   Section       80  mnrefproviderback.in(.constdata__ZTV20CMnrpApplicationBack)
-    .constdata__ZTV20CMnrpMapImageService    0x00009588   Section       64  mnrefproviderback.in(.constdata__ZTV20CMnrpMapImageService)
-    .constdata__ZTV21CMnrpGeocodingService   0x000095c8   Section       72  mnrefproviderback.in(.constdata__ZTV21CMnrpGeocodingService)
-    .constdata__ZTV22MEikStatusPaneObserver  0x00009610   Section       12  mnrefproviderback.in(.constdata__ZTV22MEikStatusPaneObserver)
-    .init_array                              0x0000961c   Section        4  mnrefproviderback.in(.init_array)
-    .ARM.exidx                               0x00009620   Section        8  uc_exe_.o(.ARM.exidx)
-    .ARM.exidx                               0x00009628   Section        8  ucppinit_aeabi.o(.ARM.exidx)
-    .data$0                                  0x00400000   Data           0  mnrefproviderback.in(.data)
-    KProcessingDelay                         0x00400000   Data           4  mnrefproviderback.in(.data)
-    .data                                    0x00400000   Section        4  mnrefproviderback.in(.data)
-
-    Global Symbols
-
-    Symbol Name                              Value     Ov Type        Size  Object(Section)
-
-    BuildAttributes$$THUMB_ISAv3$ARM_ISAv6$M$E$P$PE$A:L22$X:L11$S22$IEEE1$IW$USESV6$~STKCKD$USESV7$~SHL$OSPACE$IEEEJ$EBA8$UX$REQ8$PRES8$EABIv2 0x00000000   Number         0  anon$$obj.o ABSOLUTE
-    #<DLL>apparc{000a0000}[10003a3d].dll#<\DLL>111  - Undefined Reference
-    #<DLL>apparc{000a0000}[10003a3d].dll#<\DLL>112  - Undefined Reference
-    #<DLL>apparc{000a0000}[10003a3d].dll#<\DLL>113  - Undefined Reference
-    #<DLL>apparc{000a0000}[10003a3d].dll#<\DLL>117  - Undefined Reference
-    #<DLL>apparc{000a0000}[10003a3d].dll#<\DLL>118  - Undefined Reference
-    #<DLL>apparc{000a0000}[10003a3d].dll#<\DLL>11c  - Undefined Reference
-    #<DLL>apparc{000a0000}[10003a3d].dll#<\DLL>11d  - Undefined Reference
-    #<DLL>apparc{000a0000}[10003a3d].dll#<\DLL>11e  - Undefined Reference
-    #<DLL>apparc{000a0000}[10003a3d].dll#<\DLL>11f  - Undefined Reference
-    #<DLL>apparc{000a0000}[10003a3d].dll#<\DLL>1e  - Undefined Reference
-    #<DLL>apparc{000a0000}[10003a3d].dll#<\DLL>79  - Undefined Reference
-    #<DLL>apparc{000a0000}[10003a3d].dll#<\DLL>84  - Undefined Reference
-    #<DLL>apparc{000a0000}[10003a3d].dll#<\DLL>ab  - Undefined Reference
-    #<DLL>apparc{000a0000}[10003a3d].dll#<\DLL>c0  - Undefined Reference
-    #<DLL>apparc{000a0000}[10003a3d].dll#<\DLL>c2  - Undefined Reference
-    #<DLL>apparc{000a0000}[10003a3d].dll#<\DLL>ca  - Undefined Reference
-    #<DLL>apparc{000a0000}[10003a3d].dll#<\DLL>de  - Undefined Reference
-    #<DLL>apparc{000a0000}[10003a3d].dll#<\DLL>e8  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>46c  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>546  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>547  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>556  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>81  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>82  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>83  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>b68  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>b6a  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>b6c  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>b6d  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>b6e  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>b70  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>b71  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>b72  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>b73  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>b74  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>b76  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>b77  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>b7a  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>bb1  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>bb5  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>c6  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>c7  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>c9  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>ce  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>d3  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>d5  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>d6  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>d7  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>d8  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>d9  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>dc  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>ef2  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>f16  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>f1c  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>fb5  - Undefined Reference
-    #<DLL>avkon{000a0000}[100056c6].dll#<\DLL>fbe  - Undefined Reference
-    #<DLL>bafl{000a0000}[10003a0f].dll#<\DLL>2b  - Undefined Reference
-    #<DLL>bafl{000a0000}[10003a0f].dll#<\DLL>62  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>15f  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>163  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>27e  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>27f  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>298  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>2a4  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>2a5  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>64  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>65  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>7f  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>80  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>b6  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>d2  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>d4  - Undefined Reference
-    #<DLL>cone{000a0000}[10003a41].dll#<\DLL>dc  - Undefined Reference
-    #<DLL>drtaeabi{000a0000}.dll#<\DLL>90     - Undefined Reference
-    #<DLL>drtaeabi{000a0000}.dll#<\DLL>9e     - Undefined Reference
-    #<DLL>drtaeabi{000a0000}.dll#<\DLL>9f     - Undefined Reference
-    #<DLL>drtaeabi{000a0000}.dll#<\DLL>b4     - Undefined Reference
-    #<DLL>drtaeabi{000a0000}.dll#<\DLL>b6     - Undefined Reference
-    #<DLL>drtaeabi{000a0000}.dll#<\DLL>b7     - Undefined Reference
-    #<DLL>drtaeabi{000a0000}.dll#<\DLL>b8     - Undefined Reference
-    #<DLL>drtaeabi{000a0000}.dll#<\DLL>bd     - Undefined Reference
-    #<DLL>drtaeabi{000a0000}.dll#<\DLL>cc     - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>12  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>123  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>125  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>126  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>127  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>128  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>129  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>12a  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>12b  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>12e  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>13d  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>14  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>160  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>186  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>188  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>18a  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>19  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>1a  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>1b  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>1c  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>1d  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>1d3  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>1df  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>1e  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>1ea  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>1f  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>1fa  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>20b  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>214  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>215  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>216  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>217  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>218  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>219  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>235  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>25  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>3d  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>3e  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>3f  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>40  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>43  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>48  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>49  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>4a  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>4b  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>4d  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>4e  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>4f  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>8d  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>8e  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>8f  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>90  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>93  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>98  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>9b  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>9e  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>9f  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>a6  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>a9  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>ab  - Undefined Reference
-    #<DLL>eikcore{000a0000}[10004892].dll#<\DLL>af  - Undefined Reference
-    #<DLL>eposlandmarks{000a0000}[101fdf8a].dll#<\DLL>41  - Undefined Reference
-    #<DLL>eposlandmarks{000a0000}[101fdf8a].dll#<\DLL>44  - Undefined Reference
-    #<DLL>eposlandmarks{000a0000}[101fdf8a].dll#<\DLL>c  - Undefined Reference
-    #<DLL>eposlandmarks{000a0000}[101fdf8a].dll#<\DLL>d  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>1d7  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>1da  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>1e1  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>249  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>265  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>281  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>289  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>28a  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>28c  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>28e  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>29d  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>2a7  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>2a9  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>346  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>440  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>45c  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>45f  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>493  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>508  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>550  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>563  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>565  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>636  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>639  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>719  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>7cb  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>7cd  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>7cf  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>80c  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>80d  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>822  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>848  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>84b  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>84d  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>853  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>cb  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>cd  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>cf  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>d0  - Undefined Reference
-    #<DLL>gdi{000a0000}[10003b15].dll#<\DLL>138  - Undefined Reference
-    #<DLL>lbs{000a0000}[101f97b1].dll#<\DLL>17  - Undefined Reference
-    #<DLL>lbs{000a0000}[101f97b1].dll#<\DLL>cf  - Undefined Reference
-    #<DLL>mnrefproviderengine{000a0000}[03132015].dll#<\DLL>12  - Undefined Reference
-    #<DLL>mnrefproviderengine{000a0000}[03132015].dll#<\DLL>13  - Undefined Reference
-    #<DLL>mnrefproviderengine{000a0000}[03132015].dll#<\DLL>15  - Undefined Reference
-    #<DLL>mnrefproviderengine{000a0000}[03132015].dll#<\DLL>36  - Undefined Reference
-    #<DLL>mnrefproviderengine{000a0000}[03132015].dll#<\DLL>4  - Undefined Reference
-    #<DLL>mnrefproviderengine{000a0000}[03132015].dll#<\DLL>5  - Undefined Reference
-    #<DLL>mnrefproviderengine{000a0000}[03132015].dll#<\DLL>6  - Undefined Reference
-    #<DLL>mnrefproviderengine{000a0000}[03132015].dll#<\DLL>a  - Undefined Reference
-    #<DLL>mnrefproviderengine{000a0000}[03132015].dll#<\DLL>c  - Undefined Reference
-    #<DLL>mnservicelib{000a0000}[10206903].dll#<\DLL>1  - Undefined Reference
-    #<DLL>mnservicelib{000a0000}[10206903].dll#<\DLL>15  - Undefined Reference
-    #<DLL>mnservicelib{000a0000}[10206903].dll#<\DLL>16  - Undefined Reference
-    #<DLL>mnservicelib{000a0000}[10206903].dll#<\DLL>17  - Undefined Reference
-    #<DLL>mnservicelib{000a0000}[10206903].dll#<\DLL>18  - Undefined Reference
-    #<DLL>mnservicelib{000a0000}[10206903].dll#<\DLL>1b  - Undefined Reference
-    #<DLL>mnservicelib{000a0000}[10206903].dll#<\DLL>2  - Undefined Reference
-    #<DLL>mnservicelib{000a0000}[10206903].dll#<\DLL>22  - Undefined Reference
-    #<DLL>mnservicelib{000a0000}[10206903].dll#<\DLL>2d  - Undefined Reference
-    #<DLL>mnservicelib{000a0000}[10206903].dll#<\DLL>2e  - Undefined Reference
-    #<DLL>mnservicelib{000a0000}[10206903].dll#<\DLL>2f  - Undefined Reference
-    #<DLL>mnservicelib{000a0000}[10206903].dll#<\DLL>31  - Undefined Reference
-    #<DLL>mnservicelib{000a0000}[10206903].dll#<\DLL>32  - Undefined Reference
-    #<DLL>mnservicelib{000a0000}[10206903].dll#<\DLL>35  - Undefined Reference
-    #<DLL>mnservicelib{000a0000}[10206903].dll#<\DLL>38  - Undefined Reference
-    #<DLL>scppnwdl{000a0000}.dll#<\DLL>3      - Undefined Reference
-    #<DLL>ws32{000a0000}[10003b21].dll#<\DLL>d3  - Undefined Reference
-    typeinfo for CAknDocument                 - Undefined Reference
-    typeinfo for CAknAppServer                - Undefined Reference
-    typeinfo for CEikApplication              - Undefined Reference
-    typeinfo for XLeaveException              - Undefined Reference
-    typeinfo for CMnMapImageServiceBase       - Undefined Reference
-    typeinfo for CMnGeocodingServiceBase      - Undefined Reference
-    typeinfo for CBase                        - Undefined Reference
-    typeinfo for CAknAppUi                    - Undefined Reference
-    vtable for __cxxabiv1::__class_type_info  - Undefined Reference
-    vtable for __cxxabiv1::__si_class_type_info  - Undefined Reference
-    _fp_init                                  - Undefined Weak Reference
-    Image$$ER_RO$$Base                       0x00008000   Number         0  anon$$obj.o(linker$$defined$$symbols)
-    _E32Startup                              0x00008000   ARM Code     112  uc_exe_.o(.emb_text)
-    Symbian$$CPP$$Exception$$Descriptor      0x0000805c   Data           0  uc_exe_.o(.emb_text)
-    __cpp_initialize__aeabi_                 0x00008070   ARM Code      72  ucppinit_aeabi.o(.emb_text)
-    std::nothrow                             0x000080b8   ARM Code       0  ucppinit_aeabi.o(.emb_text)
-    Inline ARM to Thumb Veneer to _xxxx_call_user_invariant 0x000080b8   ARM Code       0  uc_exe_.o(.text)
-    _xxxx_call_user_invariant                0x000080c1   Thumb Code     8  uc_exe_.o(.text)
-    _xxxx_call_user_handle_exception         0x000080c9   Thumb Code     8  uc_exe_.o(.text)
-    E32Main()                                0x000080ef   Thumb Code    22  mnrefproviderback.in(.text)
-    CMnrpApplicationBack::AppDllUid() const  0x0000810d   Thumb Code     6  mnrefproviderback.in(.text)
-    CMnrpApplicationBack::CreateDocumentL()  0x00008113   Thumb Code     8  mnrefproviderback.in(.text)
-    CMnrpApplicationBack::NewAppServerL(CApaAppServer*&) 0x0000811b   Thumb Code    12  mnrefproviderback.in(.text)
-    CMnrpAppUiBack::ConstructL()             0x0000812d   Thumb Code    12  mnrefproviderback.in(.text)
-    CMnrpAppUiBack::MoveForeground()         0x00008139   Thumb Code    14  mnrefproviderback.in(.text)
-    CMnrpAppUiBack::MoveBackground()         0x00008147   Thumb Code    16  mnrefproviderback.in(.text)
-    CMnrpAppUiBack::HandleCommandL(int)      0x00008157   Thumb Code    20  mnrefproviderback.in(.text)
-    CMnrpDocumentBack::CMnrpDocumentBack(CEikApplication&) 0x00008171   Thumb Code    16  mnrefproviderback.in(.text)
-    CMnrpDocumentBack::CMnrpDocumentBack__sub_object(CEikApplication&) 0x00008171   Thumb Code     0  mnrefproviderback.in(.text)
-    CMnrpDocumentBack::NewL(CEikApplication&) 0x00008181   Thumb Code    18  mnrefproviderback.in(.text)
-    CMnrpDocumentBack::CreateAppUiL()        0x00008193   Thumb Code    24  mnrefproviderback.in(.text)
-    CMnrpAppServerBack::ConstructL()         0x000081b1   Thumb Code    12  mnrefproviderback.in(.text)
-    CMnrpAppServerBack::NewL()               0x000081bd   Thumb Code    48  mnrefproviderback.in(.text)
-    CMnrpAppServerBack::~CMnrpAppServerBack() 0x000081ed   Thumb Code    28  mnrefproviderback.in(.text)
-    CMnrpAppServerBack::~CMnrpAppServerBack__sub_object() 0x000081ed   Thumb Code     0  mnrefproviderback.in(.text)
-    CMnrpAppServerBack::~CMnrpAppServerBack__deallocating() 0x00008209   Thumb Code    16  mnrefproviderback.in(.text)
-    CMnrpAppServerBack::CreateMapImageServiceL() const 0x00008219   Thumb Code    10  mnrefproviderback.in(.text)
-    CMnrpAppServerBack::CreateGeocodingServiceL() const 0x00008223   Thumb Code    10  mnrefproviderback.in(.text)
-    CMnrpAppServerBack::CreateServiceL(TUid) const 0x0000822d   Thumb Code    32  mnrefproviderback.in(.text)
-    CleanupLandmarksArray(void*)             0x00008259   Thumb Code    48  mnrefproviderback.in(.text)
-    CleanupForeground(void*)                 0x00008289   Thumb Code     8  mnrefproviderback.in(.text)
-    CMnrpGeocodingService::ConstructL()      0x00008291   Thumb Code    20  mnrefproviderback.in(.text)
-    CMnrpGeocodingService::CMnrpGeocodingService(CMnrpEngine&) 0x000082a5   Thumb Code    16  mnrefproviderback.in(.text)
-    CMnrpGeocodingService::CMnrpGeocodingService__sub_object(CMnrpEngine&) 0x000082a5   Thumb Code     0  mnrefproviderback.in(.text)
-    CMnrpGeocodingService::NewL(CMnrpEngine&) 0x000082b5   Thumb Code    36  mnrefproviderback.in(.text)
-    CMnrpGeocodingService::~CMnrpGeocodingService() 0x000082d9   Thumb Code    46  mnrefproviderback.in(.text)
-    CMnrpGeocodingService::~CMnrpGeocodingService__sub_object() 0x000082d9   Thumb Code     0  mnrefproviderback.in(.text)
-    CMnrpGeocodingService::~CMnrpGeocodingService__deallocating() 0x00008307   Thumb Code    16  mnrefproviderback.in(.text)
-    CMnrpGeocodingService::LeaveIfBusyL()    0x00008317   Thumb Code    22  mnrefproviderback.in(.text)
-    CMnrpGeocodingService::LetUserSelectBestMatchL(const CPosLandmark&) 0x0000832d   Thumb Code   318  mnrefproviderback.in(.text)
-    CMnrpGeocodingService::FinishProcessingL() 0x0000846b   Thumb Code   130  mnrefproviderback.in(.text)
-    CMnrpGeocodingService::HandleGeocodingCompleted() 0x000084ed   Thumb Code    72  mnrefproviderback.in(.text)
-    CMnrpGeocodingService::GeocodingProcessingCallBack(void*) 0x00008535   Thumb Code    10  mnrefproviderback.in(.text)
-    CMnrpGeocodingService::StartProcessingL() 0x0000853f   Thumb Code    14  mnrefproviderback.in(.text)
-    CMnrpGeocodingService::HandleFindAddressByCoordinateL(const CPosLandmark&) 0x0000854d   Thumb Code    60  mnrefproviderback.in(.text)
-    CMnrpGeocodingService::HandleFindCoordinateByAddressL(const CPosLandmark&) 0x00008589   Thumb Code    60  mnrefproviderback.in(.text)
-    CMnrpGeocodingService::HandleFindCoordinateByAddressL(const TDesC16&) 0x000085c5   Thumb Code    74  mnrefproviderback.in(.text)
-    CMnrpGeocodingService::DoCancel()        0x0000860f   Thumb Code    16  mnrefproviderback.in(.text)
-    CMnrpMapImageService::CreateFonts()      0x00008635   Thumb Code    64  mnrefproviderback.in(.text)
-    CMnrpMapImageService::ConstructL()       0x00008675   Thumb Code    44  mnrefproviderback.in(.text)
-    CMnrpMapImageService::CMnrpMapImageService(CMnrpEngine&) 0x000086a1   Thumb Code    20  mnrefproviderback.in(.text)
-    CMnrpMapImageService::CMnrpMapImageService__sub_object(CMnrpEngine&) 0x000086a1   Thumb Code     0  mnrefproviderback.in(.text)
-    CMnrpMapImageService::NewL(CMnrpEngine&) 0x000086b5   Thumb Code    36  mnrefproviderback.in(.text)
-    CMnrpMapImageService::DestroyFonts()     0x000086d9   Thumb Code    32  mnrefproviderback.in(.text)
-    CMnrpMapImageService::~CMnrpMapImageService() 0x000086f9   Thumb Code    60  mnrefproviderback.in(.text)
-    CMnrpMapImageService::~CMnrpMapImageService__sub_object() 0x000086f9   Thumb Code     0  mnrefproviderback.in(.text)
-    CMnrpMapImageService::~CMnrpMapImageService__deallocating() 0x00008735   Thumb Code    16  mnrefproviderback.in(.text)
-    CMnrpMapImageService::LeaveIfBusyL()     0x00008745   Thumb Code    24  mnrefproviderback.in(.text)
-    CMnrpMapImageService::RenderL()          0x0000875d   Thumb Code   116  mnrefproviderback.in(.text)
-    CMnrpMapImageService::FinishProcessingL() 0x000087d1   Thumb Code    52  mnrefproviderback.in(.text)
-    CMnrpMapImageService::HandleMapImageCompletedL() 0x00008805   Thumb Code    80  mnrefproviderback.in(.text)
-    CMnrpMapImageService::MapImageProcessingCallBack(void*) 0x00008855   Thumb Code    50  mnrefproviderback.in(.text)
-    CMnrpMapImageService::StartProcessingL() 0x00008887   Thumb Code    22  mnrefproviderback.in(.text)
-    CMnrpMapImageService::HandleRenderingL() 0x0000889d   Thumb Code    24  mnrefproviderback.in(.text)
-    CMnrpMapImageService::DoCancel()         0x000088b5   Thumb Code    18  mnrefproviderback.in(.text)
-    Inline ARM to Thumb Veneer to RunThread  0x000088e0   ARM Code       0  uc_exe.o(.text)
-    RunThread                                0x000088e9   Thumb Code    36  uc_exe.o(.text)
-    CallThrdProcEntry                        0x0000890c   ARM Code     116  callfirstprocessfn.o(.text)
-    __DLL_Export_Table__                     0x00008984   ARM Code       4  dllexp.o(.text)
-    CActive::Cancel()                        0x000089d0   ARM Code       0  euser{000a0000}-1088.o(StubCode)
-    HBufC16::Des()                           0x000089d8   ARM Code       0  euser{000a0000}-1116.o(StubCode)
-    HBufC16::NewLC(int)                      0x000089e0   ARM Code       0  euser{000a0000}-1119.o(StubCode)
-    TPtrC16::TPtrC16(const TDesC16&)         0x000089e8   ARM Code       0  euser{000a0000}-1171.o(StubCode)
-    CServer2::DoCancel()                     0x000089f0   ARM Code       0  euser{000a0000}-1288.o(StubCode)
-    CPeriodic::NewL(int)                     0x000089f8   ARM Code       0  euser{000a0000}-1379.o(StubCode)
-    CPeriodic::Start(TTimeIntervalMicroSeconds32, TTimeIntervalMicroSeconds32, TCallBack) 0x00008a00   ARM Code       0  euser{000a0000}-1381.o(StubCode)
-    RPointerArrayBase::At(int) const         0x00008a08   ARM Code       0  euser{000a0000}-1590.o(StubCode)
-    RPointerArrayBase::Count() const         0x00008a10   ARM Code       0  euser{000a0000}-1593.o(StubCode)
-    TDesC16::AllocL() const                  0x00008a18   ARM Code       0  euser{000a0000}-1817.o(StubCode)
-    CPolicyServer::CustomFailureActionL(const RMessage2&, int, const TSecurityInfo&) 0x00008a20   ARM Code       0  euser{000a0000}-1995.o(StubCode)
-    CPolicyServer::RunL()                    0x00008a28   ARM Code       0  euser{000a0000}-1997.o(StubCode)
-    CPolicyServer::RunError(int)             0x00008a30   ARM Code       0  euser{000a0000}-1999.o(StubCode)
-    CleanupStack::PopAndDestroy()            0x00008a38   ARM Code       0  euser{000a0000}-203.o(StubCode)
-    CleanupStack::Pop()                      0x00008a40   ARM Code       0  euser{000a0000}-205.o(StubCode)
-    User::MarkCleanupStack()                 0x00008a48   ARM Code       0  euser{000a0000}-2060.o(StubCode)
-    User::UnMarkCleanupStack(TTrapHandler*)  0x00008a50   ARM Code       0  euser{000a0000}-2061.o(StubCode)
-    CleanupStack::PushL(TCleanupItem)        0x00008a58   ARM Code       0  euser{000a0000}-207.o(StubCode)
-    CleanupStack::PushL(CBase*)              0x00008a60   ARM Code       0  euser{000a0000}-208.o(StubCode)
-    XLeaveException::GetReason() const       0x00008a68   ARM Code       0  euser{000a0000}-2082.o(StubCode)
-    CPolicyServer::Extension_(unsigned, void*&, void*) 0x00008a70   ARM Code       0  euser{000a0000}-2120.o(StubCode)
-    CBase::Extension_(unsigned, void*&, void*) 0x00008a78   ARM Code       0  euser{000a0000}-2123.o(StubCode)
-    CSession2::Extension_(unsigned, void*&, void*) 0x00008a80   ARM Code       0  euser{000a0000}-2131.o(StubCode)
-    RPointerArrayBase::Reset()               0x00008a88   ARM Code       0  euser{000a0000}-471.o(StubCode)
-    RPointerArrayBase::Remove(int)           0x00008a90   ARM Code       0  euser{000a0000}-474.o(StubCode)
-    RPointerArrayBase::RPointerArrayBase()   0x00008a98   ARM Code       0  euser{000a0000}-481.o(StubCode)
-    User::HandleException(void*)             0x00008aa0   ARM Code       0  euser{000a0000}-613.o(StubCode)
-    User::Leave(int)                         0x00008aa8   ARM Code       0  euser{000a0000}-649.o(StubCode)
-    User::AllocZ(int)                        0x00008ab0   ARM Code       0  euser{000a0000}-652.o(StubCode)
-    User::AllocZL(int)                       0x00008ab8   ARM Code       0  euser{000a0000}-654.o(StubCode)
-    User::Invariant()                        0x00008ac0   ARM Code       0  euser{000a0000}-669.o(StubCode)
-    CIdle::NewL(int)                         0x00008ac8   ARM Code       0  euser{000a0000}-679.o(StubCode)
-    CIdle::Start(TCallBack)                  0x00008ad0   ARM Code       0  euser{000a0000}-681.o(StubCode)
-    TRect::TRect(const TSize&)               0x00008ad8   ARM Code       0  euser{000a0000}-838.o(StubCode)
-    CDesC16Array::AppendL(const TDesC16&)    0x00008ae0   ARM Code       0  bafl{000a0000}-43.o(StubCode)
-    CDesC16ArraySeg::CDesC16ArraySeg(int)    0x00008ae8   ARM Code       0  bafl{000a0000}-98.o(StubCode)
-    MCoeMessageObserver::MCoeMessageObserver_Reserved_1() 0x00008af0   ARM Code       0  cone{000a0000}-100.o(StubCode)
-    MCoeMessageObserver::MCoeMessageObserver_Reserved_2() 0x00008af8   ARM Code       0  cone{000a0000}-101.o(StubCode)
-    MCoeViewDeactivationObserver::MCoeViewDeactivationObserver_Reserved_1() 0x00008b00   ARM Code       0  cone{000a0000}-127.o(StubCode)
-    MCoeViewDeactivationObserver::MCoeViewDeactivationObserver_Reserved_2() 0x00008b08   ARM Code       0  cone{000a0000}-128.o(StubCode)
-    CCoeEnv::Static()                        0x00008b10   ARM Code       0  cone{000a0000}-182.o(StubCode)
-    CCoeAppUi::HandleKeyEventL(const TKeyEvent&, TEventCode) 0x00008b18   ARM Code       0  cone{000a0000}-210.o(StubCode)
-    CCoeAppUi::SetAndDrawFocus(int)          0x00008b20   ARM Code       0  cone{000a0000}-212.o(StubCode)
-    CCoeAppUi::HandleSwitchOnEventL(CCoeControl*) 0x00008b28   ARM Code       0  cone{000a0000}-220.o(StubCode)
-    CCoeAppUi::HelpContextL() const          0x00008b30   ARM Code       0  cone{000a0000}-351.o(StubCode)
-    CCoeAppUi::InputCapabilities() const     0x00008b38   ARM Code       0  cone{000a0000}-355.o(StubCode)
-    MObjectProvider::MObjectProvider_Reserved1() 0x00008b40   ARM Code       0  cone{000a0000}-638.o(StubCode)
-    MObjectProvider::MObjectProvider_Reserved2() 0x00008b48   ARM Code       0  cone{000a0000}-639.o(StubCode)
-    MCoeViewDeactivationObserver::MCoeViewDeactivationObserver__sub_object() 0x00008b50   ARM Code       0  cone{000a0000}-664.o(StubCode)
-    CCoeAppUi::FrameworkCallsRendezvous() const 0x00008b58   ARM Code       0  cone{000a0000}-676.o(StubCode)
-    CCoeAppUi::CCoeAppUi_Reserved_2()        0x00008b60   ARM Code       0  cone{000a0000}-677.o(StubCode)
-    CApaDocument::Capability() const         0x00008b68   ARM Code       0  apparc{000a0000}-121.o(StubCode)
-    CApaApplication::AppFullName() const     0x00008b70   ARM Code       0  apparc{000a0000}-132.o(StubCode)
-    TApaApplicationFactory::TApaApplicationFactory(CApaApplication*(*)()) 0x00008b78   ARM Code       0  apparc{000a0000}-171.o(StubCode)
-    CApaAppServer::CustomSecurityCheckL(const RMessage2&, int&, TSecurityInfo&) 0x00008b80   ARM Code       0  apparc{000a0000}-192.o(StubCode)
-    CApaAppServer::CApaAppServer()           0x00008b88   ARM Code       0  apparc{000a0000}-194.o(StubCode)
-    CApaAppServiceBase::SecurityCheckL(const RMessage2&, int&, TSecurityInfo&) 0x00008b90   ARM Code       0  apparc{000a0000}-202.o(StubCode)
-    CApaAppServer::NewSessionL(const TVersion&, const RMessage2&) const 0x00008b98   ARM Code       0  apparc{000a0000}-222.o(StubCode)
-    CApaAppServiceBase::ExtensionInterface(TUid, void*&) 0x00008ba0   ARM Code       0  apparc{000a0000}-232.o(StubCode)
-    CApaAppServer::CApaAppServer_Reserved1() 0x00008ba8   ARM Code       0  apparc{000a0000}-273.o(StubCode)
-    CApaAppServer::CApaAppServer_Reserved2() 0x00008bb0   ARM Code       0  apparc{000a0000}-274.o(StubCode)
-    CApaAppServer::DoConnect(const RMessage2&) 0x00008bb8   ARM Code       0  apparc{000a0000}-275.o(StubCode)
-    CApaApplication::CApaApplication_Reserved1() 0x00008bc0   ARM Code       0  apparc{000a0000}-279.o(StubCode)
-    CApaApplication::CApaApplication_Reserved2() 0x00008bc8   ARM Code       0  apparc{000a0000}-280.o(StubCode)
-    CApaAppServiceBase::Disconnect(const RMessage2&) 0x00008bd0   ARM Code       0  apparc{000a0000}-284.o(StubCode)
-    CApaAppServiceBase::CountResources()     0x00008bd8   ARM Code       0  apparc{000a0000}-285.o(StubCode)
-    CApaAppServiceBase::CApaAppServiceBase_Reserved1() 0x00008be0   ARM Code       0  apparc{000a0000}-286.o(StubCode)
-    CApaAppServiceBase::CApaAppServiceBase_Reserved2() 0x00008be8   ARM Code       0  apparc{000a0000}-287.o(StubCode)
-    CApaDocument::GlassPictureL()            0x00008bf0   ARM Code       0  apparc{000a0000}-30.o(StubCode)
-    thunk{-20} to CEikDocument::SaveL(MSaveObserver::TSaveType) 0x00008bf8   ARM Code       0  eikcore{000a0000}-141.o(StubCode)
-    CEikAppUi::Reserved_3()                  0x00008c00   ARM Code       0  eikcore{000a0000}-142.o(StubCode)
-    CEikAppUi::Reserved_4()                  0x00008c08   ARM Code       0  eikcore{000a0000}-143.o(StubCode)
-    CEikAppUi::CreateFileL(const TDesC16&)   0x00008c10   ARM Code       0  eikcore{000a0000}-144.o(StubCode)
-    CEikAppUi::SetEmphasis(CCoeControl*, int) 0x00008c18   ARM Code       0  eikcore{000a0000}-147.o(StubCode)
-    CEikAppUi::HandleMessageL(unsigned long, TUid, const TDesC8&) 0x00008c20   ARM Code       0  eikcore{000a0000}-152.o(StubCode)
-    CEikAppUi::ProcessMessageL(TUid, const TDesC8&) 0x00008c28   ARM Code       0  eikcore{000a0000}-155.o(StubCode)
-    CEikAppUi::HandleModelChangeL()          0x00008c30   ARM Code       0  eikcore{000a0000}-158.o(StubCode)
-    CEikAppUi::HandleSideBarMenuL(int, const TPoint&, int, const CEikHotKeyTable*) 0x00008c38   ARM Code       0  eikcore{000a0000}-159.o(StubCode)
-    CEikAppUi::StopDisplayingMenuBar()       0x00008c40   ARM Code       0  eikcore{000a0000}-166.o(StubCode)
-    CEikAppUi::ProcessCommandParametersL(TApaCommand, TBuf<(int)256>&, const TDesC8&) 0x00008c48   ARM Code       0  eikcore{000a0000}-169.o(StubCode)
-    CEikAppUi::ReportResourceChangedToAppL(int) 0x00008c50   ARM Code       0  eikcore{000a0000}-171.o(StubCode)
-    CEikAppUi::OpenFileL(const TDesC16&)     0x00008c58   ARM Code       0  eikcore{000a0000}-175.o(StubCode)
-    CEikDocument::Reserved_2()               0x00008c60   ARM Code       0  eikcore{000a0000}-18.o(StubCode)
-    CEikDocument::NewDocumentL()             0x00008c68   ARM Code       0  eikcore{000a0000}-20.o(StubCode)
-    CEikDocument::UpdateTaskNameL(CApaWindowGroupName*) 0x00008c70   ARM Code       0  eikcore{000a0000}-25.o(StubCode)
-    CEikDocument::CreateFileStoreLC(RFs&, const TDesC16&) 0x00008c78   ARM Code       0  eikcore{000a0000}-26.o(StubCode)
-    CEikDocument::EditL(MApaEmbeddedDocObserver*, int) 0x00008c80   ARM Code       0  eikcore{000a0000}-27.o(StubCode)
-    CEikDocument::SaveL(MSaveObserver::TSaveType) 0x00008c88   ARM Code       0  eikcore{000a0000}-28.o(StubCode)
-    CEikDocument::SaveL()                    0x00008c90   ARM Code       0  eikcore{000a0000}-29.o(StubCode)
-    CEikDocument::HasChanged() const         0x00008c98   ARM Code       0  eikcore{000a0000}-291.o(StubCode)
-    CEikDocument::ExternalizeL(RWriteStream&) const 0x00008ca0   ARM Code       0  eikcore{000a0000}-293.o(StubCode)
-    CEikDocument::StoreL(CStreamStore&, CStreamDictionary&) const 0x00008ca8   ARM Code       0  eikcore{000a0000}-294.o(StubCode)
-    CEikDocument::IsEmpty() const            0x00008cb0   ARM Code       0  eikcore{000a0000}-295.o(StubCode)
-    CEikApplication::Capability(TDes8&) const 0x00008cb8   ARM Code       0  eikcore{000a0000}-296.o(StubCode)
-    CEikApplication::OpenIniFileLC(RFs&) const 0x00008cc0   ARM Code       0  eikcore{000a0000}-297.o(StubCode)
-    CEikApplication::BitmapStoreName() const 0x00008cc8   ARM Code       0  eikcore{000a0000}-298.o(StubCode)
-    CEikApplication::ResourceFileName() const 0x00008cd0   ARM Code       0  eikcore{000a0000}-299.o(StubCode)
-    CEikDocument::PrintL(const CStreamStore&) 0x00008cd8   ARM Code       0  eikcore{000a0000}-30.o(StubCode)
-    CEikApplication::GetDefaultDocumentFileName(TBuf<(int)256>&) const 0x00008ce0   ARM Code       0  eikcore{000a0000}-302.o(StubCode)
-    CEikDocument::RestoreL(const CStreamStore&, const CStreamDictionary&) 0x00008ce8   ARM Code       0  eikcore{000a0000}-31.o(StubCode)
-    CEikAppUi::ValidFileType(TUid) const     0x00008cf0   ARM Code       0  eikcore{000a0000}-317.o(StubCode)
-    CEikonEnv::DenseFont() const             0x00008cf8   ARM Code       0  eikcore{000a0000}-352.o(StubCode)
-    CEikDocument::~CEikDocument__sub_object() 0x00008d00   ARM Code       0  eikcore{000a0000}-37.o(StubCode)
-    thunk{-36} to CEikAppUi::HandleMessageL(unsigned long, TUid, const TDesC8&) 0x00008d08   ARM Code       0  eikcore{000a0000}-390.o(StubCode)
-    thunk{-40} to CEikAppUi::MopNext()       0x00008d10   ARM Code       0  eikcore{000a0000}-392.o(StubCode)
-    EikStart::RunApplication(TApaApplicationFactory) 0x00008d18   ARM Code       0  eikcore{000a0000}-394.o(StubCode)
-    CEikAppServer::ExtensionInterface(TUid, void*&) 0x00008d20   ARM Code       0  eikcore{000a0000}-467.o(StubCode)
-    CEikAppUi::MopNext()                     0x00008d28   ARM Code       0  eikcore{000a0000}-479.o(StubCode)
-    thunk{-24} to CEikAppUi::HandleSideBarMenuL(int, const TPoint&, int, const CEikHotKeyTable*) 0x00008d30   ARM Code       0  eikcore{000a0000}-490.o(StubCode)
-    CEikAppUi::ProcessCommandParametersL(CApaCommandLine&) 0x00008d38   ARM Code       0  eikcore{000a0000}-506.o(StubCode)
-    CEikAppServer::CreateServiceSecurityCheckL(TUid, const RMessage2&, int&, TSecurityInfo&) 0x00008d40   ARM Code       0  eikcore{000a0000}-523.o(StubCode)
-    CEikApplication::CEikApplication_Reserved1() 0x00008d48   ARM Code       0  eikcore{000a0000}-532.o(StubCode)
-    CEikApplication::CEikApplication_Reserved2() 0x00008d50   ARM Code       0  eikcore{000a0000}-533.o(StubCode)
-    MEikMenuObserver::Reserved_2_MenuObserver() 0x00008d58   ARM Code       0  eikcore{000a0000}-534.o(StubCode)
-    MEikMenuObserver::CreateCustomCommandControlL(int) 0x00008d60   ARM Code       0  eikcore{000a0000}-535.o(StubCode)
-    MEikMenuObserver::MEikCommandObserver_Reserved1() 0x00008d68   ARM Code       0  eikcore{000a0000}-536.o(StubCode)
-    MEikMenuObserver::MEikCommandObserver_Reserved2() 0x00008d70   ARM Code       0  eikcore{000a0000}-537.o(StubCode)
-    CEikDocument::ValidatePasswordL() const  0x00008d78   ARM Code       0  eikcore{000a0000}-565.o(StubCode)
-    CEikApplication::CreateDocumentL(CApaProcess*) 0x00008d80   ARM Code       0  eikcore{000a0000}-61.o(StubCode)
-    CEikApplication::PreDocConstructL()      0x00008d88   ARM Code       0  eikcore{000a0000}-62.o(StubCode)
-    thunk{-24} to CEikAppUi::SetEmphasis(CCoeControl*, int) 0x00008d90   ARM Code       0  eikcore{000a0000}-63.o(StubCode)
-    CEikApplication::CEikApplication__sub_object() 0x00008d98   ARM Code       0  eikcore{000a0000}-64.o(StubCode)
-    CEikApplication::~CEikApplication__sub_object() 0x00008da0   ARM Code       0  eikcore{000a0000}-67.o(StubCode)
-    MEikMenuObserver::RestoreMenuL(CCoeControl*, int, MEikMenuObserver::TMenuType) 0x00008da8   ARM Code       0  eikcore{000a0000}-72.o(StubCode)
-    MEikMenuObserver::OfferKeyToAppL(const TKeyEvent&, TEventCode) 0x00008db0   ARM Code       0  eikcore{000a0000}-73.o(StubCode)
-    MEikMenuObserver::DynInitMenuBarL(int, CEikMenuBar*) 0x00008db8   ARM Code       0  eikcore{000a0000}-74.o(StubCode)
-    MEikMenuObserver::DynInitMenuPaneL(int, CEikMenuPane*) 0x00008dc0   ARM Code       0  eikcore{000a0000}-75.o(StubCode)
-    MEikMenuObserver::CheckHotKeyNotDimmedL(int) 0x00008dc8   ARM Code       0  eikcore{000a0000}-77.o(StubCode)
-    MEikMenuObserver::Reserved_1_MenuObserver() 0x00008dd0   ARM Code       0  eikcore{000a0000}-78.o(StubCode)
-    MEikMenuObserver::HandleAttemptDimmedSelectionL(int) 0x00008dd8   ARM Code       0  eikcore{000a0000}-79.o(StubCode)
-    RWindowTreeNode::SetOrdinalPosition(int) 0x00008de0   ARM Code       0  ws32{000a0000}-211.o(StubCode)
-    CFont::FontSpecInTwips() const           0x00008de8   ARM Code       0  gdi{000a0000}-312.o(StubCode)
-    CAknAppServiceBase::CreateL()            0x00008df0   ARM Code       0  avkon{000a0000}-1132.o(StubCode)
-    CAknDocument::OpenFileL(CFileStore*&, RFile&) 0x00008df8   ARM Code       0  avkon{000a0000}-129.o(StubCode)
-    CAknDocument::OpenFileL(int, const TDesC16&, RFs&) 0x00008e00   ARM Code       0  avkon{000a0000}-130.o(StubCode)
-    CAknDocument::CAknDocument__sub_object(CEikApplication&) 0x00008e08   ARM Code       0  avkon{000a0000}-131.o(StubCode)
-    CAknListQueryDialog::SetItemTextArray(MDesC16Array*) 0x00008e10   ARM Code       0  avkon{000a0000}-1350.o(StubCode)
-    CAknListQueryDialog::SetOwnershipType(TListBoxModelItemArrayOwnership) 0x00008e18   ARM Code       0  avkon{000a0000}-1351.o(StubCode)
-    CAknListQueryDialog::CAknListQueryDialog(int*) 0x00008e20   ARM Code       0  avkon{000a0000}-1366.o(StubCode)
-    CAknAppServer::ConstructL(const TDesC16&) 0x00008e28   ARM Code       0  avkon{000a0000}-198.o(StubCode)
-    CAknAppServer::HandleAllClientsClosed()  0x00008e30   ARM Code       0  avkon{000a0000}-199.o(StubCode)
-    CAknAppServer::~CAknAppServer()          0x00008e38   ARM Code       0  avkon{000a0000}-201.o(StubCode)
-    CAknAppUiBase::MopSupplyObject(TTypeUid) 0x00008e40   ARM Code       0  avkon{000a0000}-206.o(StubCode)
-    CAknAppUiBase::HandleResourceChangeL(int) 0x00008e48   ARM Code       0  avkon{000a0000}-211.o(StubCode)
-    CAknAppUiBase::HandleScreenDeviceChangedL() 0x00008e50   ARM Code       0  avkon{000a0000}-213.o(StubCode)
-    CAknAppUiBase::HandleApplicationSpecificEventL(int, const TWsEvent&) 0x00008e58   ARM Code       0  avkon{000a0000}-214.o(StubCode)
-    CAknAppUiBase::Exit()                    0x00008e60   ARM Code       0  avkon{000a0000}-215.o(StubCode)
-    CAknAppUiBase::SetFadedL(int)            0x00008e68   ARM Code       0  avkon{000a0000}-216.o(StubCode)
-    CAknAppUiBase::CAknAppUiBase()           0x00008e70   ARM Code       0  avkon{000a0000}-217.o(StubCode)
-    CAknAppUiBase::~CAknAppUiBase()          0x00008e78   ARM Code       0  avkon{000a0000}-220.o(StubCode)
-    CAknAppUi::HandleError(int, const SExtendedError&, TDes16&, TDes16&) 0x00008e80   ARM Code       0  avkon{000a0000}-2920.o(StubCode)
-    CAknAppUi::PrepareToExit()               0x00008e88   ARM Code       0  avkon{000a0000}-2922.o(StubCode)
-    CAknAppUi::BaseConstructL(int)           0x00008e90   ARM Code       0  avkon{000a0000}-2924.o(StubCode)
-    CAknAppUi::HandleWsEventL(const TWsEvent&, CCoeControl*) 0x00008e98   ARM Code       0  avkon{000a0000}-2925.o(StubCode)
-    CAknAppUi::ProcessCommandL(int)          0x00008ea0   ARM Code       0  avkon{000a0000}-2926.o(StubCode)
-    CAknAppUi::HandleSystemEventL(const TWsEvent&) 0x00008ea8   ARM Code       0  avkon{000a0000}-2928.o(StubCode)
-    CAknAppUi::Reserved_MtsmObject()         0x00008eb0   ARM Code       0  avkon{000a0000}-2929.o(StubCode)
-    CAknAppUi::Reserved_MtsmPosition()       0x00008eb8   ARM Code       0  avkon{000a0000}-2930.o(StubCode)
-    CAknAppUi::HandleForegroundEventL(int)   0x00008ec0   ARM Code       0  avkon{000a0000}-2931.o(StubCode)
-    CAknAppUi::HandleViewDeactivation(const TVwsViewId&, const TVwsViewId&) 0x00008ec8   ARM Code       0  avkon{000a0000}-2932.o(StubCode)
-    CAknAppUi::HandleTouchPaneSizeChange()   0x00008ed0   ARM Code       0  avkon{000a0000}-2934.o(StubCode)
-    CAknAppUi::HandleStatusPaneSizeChange()  0x00008ed8   ARM Code       0  avkon{000a0000}-2935.o(StubCode)
-    CAknAppUi::~CAknAppUi()                  0x00008ee0   ARM Code       0  avkon{000a0000}-2938.o(StubCode)
-    CAknAppServer::CreateServiceL(TUid) const 0x00008ee8   ARM Code       0  avkon{000a0000}-2993.o(StubCode)
-    CAknAppUiBase::ApplicationRect() const   0x00008ef0   ARM Code       0  avkon{000a0000}-2997.o(StubCode)
-    thunk{-100} to CAknAppUi::HandleTouchPaneSizeChange() 0x00008ef8   ARM Code       0  avkon{000a0000}-3826.o(StubCode)
-    thunk{-24} to CAknAppUi::ProcessCommandL(int) 0x00008f00   ARM Code       0  avkon{000a0000}-3862.o(StubCode)
-    thunk{-40} to CAknAppUiBase::MopSupplyObject(TTypeUid) 0x00008f08   ARM Code       0  avkon{000a0000}-3868.o(StubCode)
-    thunk{-88} to CAknAppUi::HandleStatusPaneSizeChange() 0x00008f10   ARM Code       0  avkon{000a0000}-4021.o(StubCode)
-    thunk{-92} to CAknAppUi::HandleViewDeactivation(const TVwsViewId&, const TVwsViewId&) 0x00008f18   ARM Code       0  avkon{000a0000}-4030.o(StubCode)
-    CPosLandmark::NewL(const CPosLandmark&)  0x00008f20   ARM Code       0  eposlandmarks{000a0000}-12.o(StubCode)
-    CPosLandmark::NewL()                     0x00008f28   ARM Code       0  eposlandmarks{000a0000}-13.o(StubCode)
-    CPosLandmark::GetPosition(TLocality&) const 0x00008f30   ARM Code       0  eposlandmarks{000a0000}-65.o(StubCode)
-    CPosLandmark::GetPositionField(unsigned short, TPtrC16&) const 0x00008f38   ARM Code       0  eposlandmarks{000a0000}-68.o(StubCode)
-    TLocality::TLocality()                   0x00008f40   ARM Code       0  lbs{000a0000}-207.o(StubCode)
-    TCoordinate::TCoordinate()               0x00008f48   ARM Code       0  lbs{000a0000}-23.o(StubCode)
-    CMnServiceBase::ServiceError(const RMessage2&, int) 0x00008f50   ARM Code       0  mnservicelib{000a0000}-1.o(StubCode)
-    CMnServiceBase::CompleteRequest(int)     0x00008f58   ARM Code       0  mnservicelib{000a0000}-2.o(StubCode)
-    CMnGeocodingServiceBase::BaseConstructL() 0x00008f60   ARM Code       0  mnservicelib{000a0000}-21.o(StubCode)
-    CMnGeocodingServiceBase::CompleteGeocodingRequestL(const CPosLandmark&) 0x00008f68   ARM Code       0  mnservicelib{000a0000}-22.o(StubCode)
-    CMnGeocodingServiceBase::ServiceL(const RMessage2&) 0x00008f70   ARM Code       0  mnservicelib{000a0000}-23.o(StubCode)
-    CMnGeocodingServiceBase::CMnGeocodingServiceBase__sub_object() 0x00008f78   ARM Code       0  mnservicelib{000a0000}-24.o(StubCode)
-    CMnGeocodingServiceBase::~CMnGeocodingServiceBase__sub_object() 0x00008f80   ARM Code       0  mnservicelib{000a0000}-27.o(StubCode)
-    CMnGeocodingServiceBase::Options() const 0x00008f88   ARM Code       0  mnservicelib{000a0000}-34.o(StubCode)
-    CMnMapImageServiceBase::BaseConstructL() 0x00008f90   ARM Code       0  mnservicelib{000a0000}-45.o(StubCode)
-    CMnMapImageServiceBase::MapImageParams() 0x00008f98   ARM Code       0  mnservicelib{000a0000}-46.o(StubCode)
-    CMnMapImageServiceBase::CompleteRendering() 0x00008fa0   ARM Code       0  mnservicelib{000a0000}-47.o(StubCode)
-    CMnMapImageServiceBase::ServiceL(const RMessage2&) 0x00008fa8   ARM Code       0  mnservicelib{000a0000}-49.o(StubCode)
-    CMnMapImageServiceBase::CMnMapImageServiceBase__sub_object() 0x00008fb0   ARM Code       0  mnservicelib{000a0000}-50.o(StubCode)
-    CMnMapImageServiceBase::~CMnMapImageServiceBase__sub_object() 0x00008fb8   ARM Code       0  mnservicelib{000a0000}-53.o(StubCode)
-    CMnMapImageServiceBase::TargetBitmap() const 0x00008fc0   ARM Code       0  mnservicelib{000a0000}-56.o(StubCode)
-    CMnrpEngine::BestCoordToAddressMatchesL(const TCoordinate&, RPointerArray<CPosLandmark>&, int) 0x00008fc8   ARM Code       0  mnrefproviderengine{000a0000}-10.o(StubCode)
-    CMnrpEngine::NewL()                      0x00008fd0   ARM Code       0  mnrefproviderengine{000a0000}-12.o(StubCode)
-    CMnrpMapModel::UpdateModelL(const CMnrpMapImageService&) 0x00008fd8   ARM Code       0  mnrefproviderengine{000a0000}-18.o(StubCode)
-    CMnrpMapModel::SetScreenSize(TSize)      0x00008fe0   ARM Code       0  mnrefproviderengine{000a0000}-19.o(StubCode)
-    CMnrpMapModel::NewL(CMnrpEngine&)        0x00008fe8   ARM Code       0  mnrefproviderengine{000a0000}-21.o(StubCode)
-    CMnrpEngine::AddressToCoordLC(const CPosLandmark&) 0x00008ff0   ARM Code       0  mnrefproviderengine{000a0000}-4.o(StubCode)
-    CMnrpEngine::AddressToCoordLC(const TDesC16&) 0x00008ff8   ARM Code       0  mnrefproviderengine{000a0000}-5.o(StubCode)
-    CMnrpMapModel::RenderL(CFbsBitmap&, TRect, CFont*, CFont*) const 0x00009000   ARM Code       0  mnrefproviderengine{000a0000}-54.o(StubCode)
-    CMnrpEngine::CoordToAddressLC(const TCoordinate&) 0x00009008   ARM Code       0  mnrefproviderengine{000a0000}-6.o(StubCode)
-    __aeabi_memclr4                          0x00009010   ARM Code       0  drtaeabi{000a0000}-144.o(StubCode)
-    __aeabi_unwind_cpp_pr0                   0x00009018   ARM Code       0  drtaeabi{000a0000}-158.o(StubCode)
-    __aeabi_unwind_cpp_pr1                   0x00009020   ARM Code       0  drtaeabi{000a0000}-159.o(StubCode)
-    __cxa_begin_catch                        0x00009028   ARM Code       0  drtaeabi{000a0000}-180.o(StubCode)
-    __cxa_call_unexpected                    0x00009030   ARM Code       0  drtaeabi{000a0000}-182.o(StubCode)
-    __cxa_end_catch                          0x00009038   ARM Code       0  drtaeabi{000a0000}-183.o(StubCode)
-    __cxa_end_cleanup                        0x00009040   ARM Code       0  drtaeabi{000a0000}-184.o(StubCode)
-    __cxa_pure_virtual                       0x00009048   ARM Code       0  drtaeabi{000a0000}-189.o(StubCode)
-    operator delete (void*)                  0x00009050   ARM Code       0  scppnwdl{000a0000}-3.o(StubCode)
-    UserHeap::SetupThreadHeap(int, SStdEpocThreadCreateInfo&) 0x00009058   ARM Code       0  euser{000a0000}-1360.o(StubCode)
-    User::Exit(int)                          0x00009060   ARM Code       0  euser{000a0000}-641.o(StubCode)
-    User::InitProcess()                      0x00009068   ARM Code       0  euser{000a0000}-585.o(StubCode)
-    User::Panic(const TDesC16&, int)         0x00009070   ARM Code       0  euser{000a0000}-650.o(StubCode)
-    TCppRTExceptionsGlobals::TCppRTExceptionsGlobals() 0x00009078   ARM Code       0  drtaeabi{000a0000}-204.o(StubCode)
-    CApaDocument::DetachFromStoreL(CPicture::TDetach) 0x00009081   Thumb Code     2  mnrefproviderback.in(i._ZN12CApaDocument16DetachFromStoreLEN8CPicture7TDetachE)
-    CMnrpAppUiBack::CMnrpAppUiBack()         0x00009085   Thumb Code    50  mnrefproviderback.in(i._ZN14CMnrpAppUiBackC1Ev)
-    CMnrpAppUiBack::CMnrpAppUiBack__sub_object() 0x00009085   Thumb Code     0  mnrefproviderback.in(i._ZN14CMnrpAppUiBackC1Ev)
-    CMnrpAppUiBack::~CMnrpAppUiBack__deallocating() 0x000090cb   Thumb Code    16  mnrefproviderback.in(i._ZN14CMnrpAppUiBackD0Ev)
-    CMnrpAppUiBack::~CMnrpAppUiBack()        0x000090db   Thumb Code     8  mnrefproviderback.in(i._ZN14CMnrpAppUiBackD1Ev)
-    CMnrpAppUiBack::~CMnrpAppUiBack__sub_object() 0x000090db   Thumb Code     0  mnrefproviderback.in(i._ZN14CMnrpAppUiBackD1Ev)
-    CMnrpDocumentBack::~CMnrpDocumentBack__deallocating() 0x000090e3   Thumb Code    16  mnrefproviderback.in(i._ZN17CMnrpDocumentBackD0Ev)
-    CMnrpDocumentBack::~CMnrpDocumentBack()  0x000090f3   Thumb Code     8  mnrefproviderback.in(i._ZN17CMnrpDocumentBackD1Ev)
-    CMnrpDocumentBack::~CMnrpDocumentBack__sub_object() 0x000090f3   Thumb Code     0  mnrefproviderback.in(i._ZN17CMnrpDocumentBackD1Ev)
-    CMnrpApplicationBack::~CMnrpApplicationBack__deallocating() 0x000090fb   Thumb Code    16  mnrefproviderback.in(i._ZN20CMnrpApplicationBackD0Ev)
-    CMnrpApplicationBack::~CMnrpApplicationBack() 0x0000910b   Thumb Code     8  mnrefproviderback.in(i._ZN20CMnrpApplicationBackD1Ev)
-    CMnrpApplicationBack::~CMnrpApplicationBack__sub_object() 0x0000910b   Thumb Code     0  mnrefproviderback.in(i._ZN20CMnrpApplicationBackD1Ev)
-    CBase::operator new(unsigned)            0x00009113   Thumb Code     8  mnrefproviderback.in(i._ZN5CBasenwEj)
-    RPointerArray<CPosLandmark>::Count() const 0x0000911b   Thumb Code     8  mnrefproviderback.in(t._ZNK13RPointerArrayI12CPosLandmarkE5CountEv)
-    typeinfo for CMnrpAppUiBack              0x0000923c   Data          12  mnrefproviderback.in(.constdata__ZTI14CMnrpAppUiBack)
-    typeinfo for CMnrpDocumentBack           0x00009248   Data          12  mnrefproviderback.in(.constdata__ZTI17CMnrpDocumentBack)
-    typeinfo for CMnrpAppServerBack          0x00009254   Data          12  mnrefproviderback.in(.constdata__ZTI18CMnrpAppServerBack)
-    typeinfo for CMnrpApplicationBack        0x00009260   Data          12  mnrefproviderback.in(.constdata__ZTI20CMnrpApplicationBack)
-    typeinfo for CMnrpMapImageService        0x0000926c   Data          12  mnrefproviderback.in(.constdata__ZTI20CMnrpMapImageService)
-    typeinfo for CMnrpGeocodingService       0x00009278   Data          12  mnrefproviderback.in(.constdata__ZTI21CMnrpGeocodingService)
-    typeinfo for MEikStatusPaneObserver      0x00009284   Data           8  mnrefproviderback.in(.constdata__ZTI22MEikStatusPaneObserver)
-    typeinfo name for CMnrpAppUiBack         0x0000928c   Data          17  mnrefproviderback.in(.constdata__ZTS14CMnrpAppUiBack)
-    typeinfo name for CMnrpDocumentBack      0x0000929d   Data          20  mnrefproviderback.in(.constdata__ZTS17CMnrpDocumentBack)
-    typeinfo name for CMnrpAppServerBack     0x000092b1   Data          21  mnrefproviderback.in(.constdata__ZTS18CMnrpAppServerBack)
-    typeinfo name for CMnrpApplicationBack   0x000092c6   Data          23  mnrefproviderback.in(.constdata__ZTS20CMnrpApplicationBack)
-    typeinfo name for CMnrpMapImageService   0x000092dd   Data          23  mnrefproviderback.in(.constdata__ZTS20CMnrpMapImageService)
-    typeinfo name for CMnrpGeocodingService  0x000092f4   Data          24  mnrefproviderback.in(.constdata__ZTS21CMnrpGeocodingService)
-    typeinfo name for MEikStatusPaneObserver 0x0000930c   Data          25  mnrefproviderback.in(.constdata__ZTS22MEikStatusPaneObserver)
-    vtable for CMnrpAppUiBack                0x00009328   Data         340  mnrefproviderback.in(.constdata__ZTV14CMnrpAppUiBack)
-    vtable for CMnrpDocumentBack             0x0000947c   Data         112  mnrefproviderback.in(.constdata__ZTV17CMnrpDocumentBack)
-    vtable for CMnrpAppServerBack            0x000094ec   Data          76  mnrefproviderback.in(.constdata__ZTV18CMnrpAppServerBack)
-    vtable for CMnrpApplicationBack          0x00009538   Data          80  mnrefproviderback.in(.constdata__ZTV20CMnrpApplicationBack)
-    vtable for CMnrpMapImageService          0x00009588   Data          64  mnrefproviderback.in(.constdata__ZTV20CMnrpMapImageService)
-    vtable for CMnrpGeocodingService         0x000095c8   Data          72  mnrefproviderback.in(.constdata__ZTV21CMnrpGeocodingService)
-    vtable for MEikStatusPaneObserver        0x00009610   Data          12  mnrefproviderback.in(.constdata__ZTV22MEikStatusPaneObserver)
-    SHT$$INIT_ARRAY$$Base                    0x0000961c   Number         0  mnrefproviderback.in(.init_array)
-    .ARM.exidx$$Base                         0x00009620   Number         0  uc_exe_.o(.ARM.exidx)
-    SHT$$INIT_ARRAY$$Limit                   0x00009620   Data           0  mnrefproviderback.in(.init_array)
-    .ARM.exidx$$Limit                        0x00009750   Number         0  mnrefproviderback.in(.ARM.exidx)
-    Image$$ER_RO$$Limit                      0x00009750   Number         0  anon$$obj.o(linker$$defined$$symbols)
-
Binary file locsrv_plat/map_image_conversion_plugin_api/tsrc/data/armv5/urel/mnrefproviderback.rsc has changed
Binary file locsrv_plat/map_image_conversion_plugin_api/tsrc/data/armv5/urel/mnrefproviderback_reg.rsc has changed
Binary file locsrv_plat/map_image_conversion_plugin_api/tsrc/data/armv5/urel/mnrefproviderengine.dll has changed
--- a/locsrv_plat/map_image_conversion_plugin_api/tsrc/data/armv5/urel/mnrefproviderengine.dll.map	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1138 +0,0 @@
-ARM Linker, RVCT2.2 [Build 593]
-
-================================================================================
-
-Image Symbol Table
-
-    Local Symbols
-
-    Symbol Name                              Value     Ov Type        Size  Object(Section)
-
-    [Anonymous Symbol]                       0x00000000   Number         0  drtaeabi{000a0000}-184.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  lbs{000a0000}-28.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  AknIcon{000a0000}-15.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  scppnwdl{000a0000}-3.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  lbs{000a0000}-303.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  AknIcon{000a0000}-16.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnservicelib{000a0000}-5.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  lbs{000a0000}-304.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  AknIcon{000a0000}-21.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnservicelib{000a0000}-55.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  lbs{000a0000}-47.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  gdi{000a0000}-311.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnservicelib{000a0000}-57.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  lbs{000a0000}-48.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  gdi{000a0000}-314.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnservicelib{000a0000}-6.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  lbs{000a0000}-49.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  bitgdi{000a0000}-14.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnservicelib{000a0000}-8.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  lbs{000a0000}-7.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  bitgdi{000a0000}-44.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnservicelib{000a0000}-9.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  lbs{000a0000}-8.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eposlandmarks{000a0000}-12.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  dfpaeabi{000a0000}-12.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  lbs{000a0000}-82.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eposlandmarks{000a0000}-14.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  dfpaeabi{000a0000}-19.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  lbs{000a0000}-83.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eposlandmarks{000a0000}-15.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  dfpaeabi{000a0000}-2.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  lbs{000a0000}-87.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eposlandmarks{000a0000}-4.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  dfpaeabi{000a0000}-20.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  lbs{000a0000}-97.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eposlandmarks{000a0000}-50.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  dfpaeabi{000a0000}-22.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnservicelib{000a0000}-10.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eposlandmarks{000a0000}-51.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  dfpaeabi{000a0000}-23.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnservicelib{000a0000}-13.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eposlandmarks{000a0000}-56.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  dfpaeabi{000a0000}-24.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  mnservicelib{000a0000}-3.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eposlandmarks{000a0000}-6.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  dfpaeabi{000a0000}-25.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  lbs{000a0000}-180.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eposlandmarks{000a0000}-65.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  dfpaeabi{000a0000}-3.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  lbs{000a0000}-181.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eposlandmarks{000a0000}-66.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  dfpaeabi{000a0000}-36.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  lbs{000a0000}-205.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eposlandmarks{000a0000}-67.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  dfpaeabi{000a0000}-41.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  lbs{000a0000}-207.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eposlandmarks{000a0000}-68.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  dfpaeabi{000a0000}-5.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  lbs{000a0000}-21.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eposlandmarks{000a0000}-75.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  dfpaeabi{000a0000}-8.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  lbs{000a0000}-214.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eposlandmarks{000a0000}-8.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  drtaeabi{000a0000}-135.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  lbs{000a0000}-218.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  eposlandmarks{000a0000}-82.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  drtaeabi{000a0000}-147.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  lbs{000a0000}-219.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  lbs{000a0000}-10.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  drtaeabi{000a0000}-158.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  lbs{000a0000}-223.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  lbs{000a0000}-13.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  drtaeabi{000a0000}-159.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  lbs{000a0000}-225.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  lbs{000a0000}-15.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  drtaeabi{000a0000}-180.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  lbs{000a0000}-226.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  lbs{000a0000}-152.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  drtaeabi{000a0000}-183.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  lbs{000a0000}-23.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  lbs{000a0000}-167.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  AknIcon{000a0000}-11.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-476.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  lbs{000a0000}-17.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-838.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-48.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-1090.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-839.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-481.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-1091.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-841.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-49.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-1094.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-936.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-50.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-1116.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-953.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-55.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-1119.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-960.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-551.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-1171.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-966.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-593.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-1172.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-968.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-649.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-120.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-973.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-654.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-1507.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-1051.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-669.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-1510.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-1059.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-81.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-1590.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-1073.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-824.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-1593.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-1074.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-826.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-1625.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-1088.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-207.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-1646.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  efsrv{000a0000}-190.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-208.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-1648.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  efsrv{000a0000}-200.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-2082.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-1649.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  efsrv{000a0000}-204.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-209.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-1651.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  efsrv{000a0000}-68.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-2123.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-1753.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  bafl{000a0000}-123.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-2125.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-1806.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  bafl{000a0000}-124.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-2128.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-1815.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  bafl{000a0000}-129.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-424.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-1821.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  bafl{000a0000}-141.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-46.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-1826.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  bafl{000a0000}-145.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-984.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-203.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  bafl{000a0000}-147.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  efsrv{000a0000}-115.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-205.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  bafl{000a0000}-59.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  efsrv{000a0000}-118.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-2060.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  bafl{000a0000}-62.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  efsrv{000a0000}-181.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-2061.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-472.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  efsrv{000a0000}-182.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-47.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-464.o ABSOLUTE
-    [Anonymous Symbol]                       0x00000000   Number         0  euser{000a0000}-471.o ABSOLUTE
-    M:/epoc32/build/apputils/c_da81efa927799d7f/bafl_dll/armv5/udeb\VtblExports.s 0x00000000   Number         0  VtblExports.o ABSOLUTE
-    M:/epoc32/build/bitgdi/c_92c016796215bf55/bitgdi_lib/armv5/udeb\VtblExports.s 0x00000000   Number         0  VtblExports.o ABSOLUTE
-    M:/epoc32/build/compsupp/c_18558cc638e6e874/drtaeabi_dll/armv5/udeb\VtblExports.s 0x00000000   Number         0  VtblExports.o ABSOLUTE
-    M:/epoc32/build/gdi/c_5dab287815cadb7b/gdi_dll/armv5/udeb\VtblExports.s 0x00000000   Number         0  VtblExports.o ABSOLUTE
-    M:/epoc32/build/store/c_93a13d203e6d3ba7/estor_dll/armv5/udeb\VtblExports.s 0x00000000   Number         0  VtblExports.o ABSOLUTE
-    M:/epoc32/build/uigraphicsutils/c_d265b80414e63acf/egul_dll/armv5/udeb\VtblExports.s 0x00000000   Number         0  VtblExports.o ABSOLUTE
-    M:/epoc32/build/uikon/c_9cf7bef4a7562444/eikcore_dll/armv5/udeb\VtblExports.s 0x00000000   Number         0  VtblExports.o ABSOLUTE
-    M:\\sf\\os\\kernelhwsrv\\kernel\\eka\\compsupp\\rvct2_2\\ucppinit_aeabi.cpp 0x00000000   Number         0  ucppinit_aeabi.o ABSOLUTE
-    M:\sf\os\kernelhwsrv\kernel\eka\compsupp\rvct2_2\ucppinit_aeabi.cpp 0x00000000   Number         0  ucppinit_aeabi.o ABSOLUTE
-    \EPOC32\BUILD\sf\app\location\mapnavproviderrefapp\group\MNREFENGINE\ARMV5\urel\mnrefproviderengine{000a0000}.s 0x00000000   Number         0  mnrefproviderengine{000a0000}.exp ABSOLUTE
-    \EPOC32\BUILD\sf\mw\locationsrv\group\EPOS_LANDMARKSCLIENTLIBRARY\ARMV5\VtblExports.s 0x00000000   Number         0  VtblExports.o ABSOLUTE
-    \EPOC32\BUILD\sf\mw\locationsrv\group\MNCLIENTLIB\ARMV5\VtblExports.s 0x00000000   Number         0  VtblExports.o ABSOLUTE
-    \EPOC32\BUILD\sf\mw\locationsrv\group\MNSERVICELIB\ARMV5\VtblExports.s 0x00000000   Number         0  VtblExports.o ABSOLUTE
-    \EPOC32\BUILD\sf\mw\uiresources\group\AKNICON\ARMV5\VtblExports.s 0x00000000   Number         0  VtblExports.o ABSOLUTE
-    \EPOC32\BUILD\sf\os\kernelhwsrv\kernel\eka\euser\EDLL\ARMV6_ABIV1\urel\uc_dll_.cpp 0x00000000   Number         0  uc_dll_.o ABSOLUTE
-    \EPOC32\BUILD\sf\os\kernelhwsrv\kernel\eka\euser\EUSER\ARMV5\VtblExports.s 0x00000000   Number         0  VtblExports.o ABSOLUTE
-    \EPOC32\BUILD\sf\os\kernelhwsrv\userlibandfileserver\fileserver\group\EFSRV\ARMV5\VtblExports.s 0x00000000   Number         0  VtblExports.o ABSOLUTE
-    \EPOC32\BUILD\sf\os\lbs\locationmgmt\locationadmin\group\LBSAPIVARIANT2\ARMV5\VtblExports.s 0x00000000   Number         0  VtblExports.o ABSOLUTE
-    \\EPOC32\\BUILD\\sf\\os\\kernelhwsrv\\kernel\\eka\\euser\\EDLL\\ARMV6_ABIV1\\urel\\uc_dll_.cpp 0x00000000   Number         0  uc_dll_.o ABSOLUTE
-    \sf\app\location\mapnavproviderrefapp\src\mnrpengine.cpp 0x00000000   Number         0  mnrefproviderengine.in ABSOLUTE
-    \sf\app\location\mapnavproviderrefapp\src\mnrpmapmodel.cpp 0x00000000   Number         0  mnrefproviderengine.in ABSOLUTE
-    \sf\app\location\mapnavproviderrefapp\src\mnrppositionrequest.cpp 0x00000000   Number         0  mnrefproviderengine.in ABSOLUTE
-    \sf\app\location\mapnavproviderrefapp\src\mnrputils.cpp 0x00000000   Number         0  mnrefproviderengine.in ABSOLUTE
-    \sf\os\kernelhwsrv\kernel\eka\euser\epoc\arm\uc_dll.cpp 0x00000000   Number         0  uc_dll.o ABSOLUTE
-    .emb_text                                0x00008000   Section       40  uc_dll_.o(.emb_text)
-    .emb_text                                0x00008028   Section       72  ucppinit_aeabi.o(.emb_text)
-    skip                                     0x0000803c   ARM Code       0  ucppinit_aeabi.o(.emb_text)
-    loop                                     0x0000804c   ARM Code       0  ucppinit_aeabi.o(.emb_text)
-    fpinit                                   0x00008064   Data           0  ucppinit_aeabi.o(.emb_text)
-    base                                     0x00008068   Data           0  ucppinit_aeabi.o(.emb_text)
-    limit                                    0x0000806c   Data           0  ucppinit_aeabi.o(.emb_text)
-    .text                                    0x00008070   Section     1622  mnrefproviderengine.in(.text)
-    .text                                    0x000086c8   Section     5840  mnrefproviderengine.in(.text)
-    |L1.1020|                                0x00008ac4   Data           0  mnrefproviderengine.in(.text)
-    |L1.1028|                                0x00008acc   Data           0  mnrefproviderengine.in(.text)
-    |L1.1056|                                0x00008ae8   Data           0  mnrefproviderengine.in(.text)
-    |L1.1064|                                0x00008af0   Data           0  mnrefproviderengine.in(.text)
-    |L1.2128|                                0x00008f18   Data           0  mnrefproviderengine.in(.text)
-    |L1.2136|                                0x00008f20   Data           0  mnrefproviderengine.in(.text)
-    |L1.2148|                                0x00008f2c   Data           0  mnrefproviderengine.in(.text)
-    |L1.3444|                                0x0000943c   Data           0  mnrefproviderengine.in(.text)
-    .text                                    0x00009d98   Section      756  mnrefproviderengine.in(.text)
-    .text                                    0x0000a08c   Section     1120  mnrefproviderengine.in(.text)
-    .text                                    0x0000a4ec   Section       40  uc_dll.o(.text)
-    .text.clean                              0x0000a514   Section       38  mnrefproviderengine.in(.text.clean)
-    .text.clean                              0x0000a53a   Section       50  mnrefproviderengine.in(.text.clean)
-    .text.clean                              0x0000a56c   Section       20  mnrefproviderengine.in(.text.clean)
-    ExportTable                              0x0000a580   Section      256  mnrefproviderengine{000a0000}.exp(ExportTable)
-    StubCode                                 0x0000a680   Section        8  euser{000a0000}-1051.o(StubCode)
-    theImportedSymbol                        0x0000a684   Data           0  euser{000a0000}-1051.o(StubCode)
-    StubCode                                 0x0000a688   Section        8  euser{000a0000}-1059.o(StubCode)
-    theImportedSymbol                        0x0000a68c   Data           0  euser{000a0000}-1059.o(StubCode)
-    StubCode                                 0x0000a690   Section        8  euser{000a0000}-1073.o(StubCode)
-    theImportedSymbol                        0x0000a694   Data           0  euser{000a0000}-1073.o(StubCode)
-    StubCode                                 0x0000a698   Section        8  euser{000a0000}-1074.o(StubCode)
-    theImportedSymbol                        0x0000a69c   Data           0  euser{000a0000}-1074.o(StubCode)
-    StubCode                                 0x0000a6a0   Section        8  euser{000a0000}-1088.o(StubCode)
-    theImportedSymbol                        0x0000a6a4   Data           0  euser{000a0000}-1088.o(StubCode)
-    StubCode                                 0x0000a6a8   Section        8  euser{000a0000}-1090.o(StubCode)
-    theImportedSymbol                        0x0000a6ac   Data           0  euser{000a0000}-1090.o(StubCode)
-    StubCode                                 0x0000a6b0   Section        8  euser{000a0000}-1091.o(StubCode)
-    theImportedSymbol                        0x0000a6b4   Data           0  euser{000a0000}-1091.o(StubCode)
-    StubCode                                 0x0000a6b8   Section        8  euser{000a0000}-1094.o(StubCode)
-    theImportedSymbol                        0x0000a6bc   Data           0  euser{000a0000}-1094.o(StubCode)
-    StubCode                                 0x0000a6c0   Section        8  euser{000a0000}-1116.o(StubCode)
-    theImportedSymbol                        0x0000a6c4   Data           0  euser{000a0000}-1116.o(StubCode)
-    StubCode                                 0x0000a6c8   Section        8  euser{000a0000}-1119.o(StubCode)
-    theImportedSymbol                        0x0000a6cc   Data           0  euser{000a0000}-1119.o(StubCode)
-    StubCode                                 0x0000a6d0   Section        8  euser{000a0000}-1171.o(StubCode)
-    theImportedSymbol                        0x0000a6d4   Data           0  euser{000a0000}-1171.o(StubCode)
-    StubCode                                 0x0000a6d8   Section        8  euser{000a0000}-1172.o(StubCode)
-    theImportedSymbol                        0x0000a6dc   Data           0  euser{000a0000}-1172.o(StubCode)
-    StubCode                                 0x0000a6e0   Section        8  euser{000a0000}-120.o(StubCode)
-    theImportedSymbol                        0x0000a6e4   Data           0  euser{000a0000}-120.o(StubCode)
-    StubCode                                 0x0000a6e8   Section        8  euser{000a0000}-1507.o(StubCode)
-    theImportedSymbol                        0x0000a6ec   Data           0  euser{000a0000}-1507.o(StubCode)
-    StubCode                                 0x0000a6f0   Section        8  euser{000a0000}-1510.o(StubCode)
-    theImportedSymbol                        0x0000a6f4   Data           0  euser{000a0000}-1510.o(StubCode)
-    StubCode                                 0x0000a6f8   Section        8  euser{000a0000}-1590.o(StubCode)
-    theImportedSymbol                        0x0000a6fc   Data           0  euser{000a0000}-1590.o(StubCode)
-    StubCode                                 0x0000a700   Section        8  euser{000a0000}-1593.o(StubCode)
-    theImportedSymbol                        0x0000a704   Data           0  euser{000a0000}-1593.o(StubCode)
-    StubCode                                 0x0000a708   Section        8  euser{000a0000}-1625.o(StubCode)
-    theImportedSymbol                        0x0000a70c   Data           0  euser{000a0000}-1625.o(StubCode)
-    StubCode                                 0x0000a710   Section        8  euser{000a0000}-1646.o(StubCode)
-    theImportedSymbol                        0x0000a714   Data           0  euser{000a0000}-1646.o(StubCode)
-    StubCode                                 0x0000a718   Section        8  euser{000a0000}-1648.o(StubCode)
-    theImportedSymbol                        0x0000a71c   Data           0  euser{000a0000}-1648.o(StubCode)
-    StubCode                                 0x0000a720   Section        8  euser{000a0000}-1649.o(StubCode)
-    theImportedSymbol                        0x0000a724   Data           0  euser{000a0000}-1649.o(StubCode)
-    StubCode                                 0x0000a728   Section        8  euser{000a0000}-1651.o(StubCode)
-    theImportedSymbol                        0x0000a72c   Data           0  euser{000a0000}-1651.o(StubCode)
-    StubCode                                 0x0000a730   Section        8  euser{000a0000}-1753.o(StubCode)
-    theImportedSymbol                        0x0000a734   Data           0  euser{000a0000}-1753.o(StubCode)
-    StubCode                                 0x0000a738   Section        8  euser{000a0000}-1806.o(StubCode)
-    theImportedSymbol                        0x0000a73c   Data           0  euser{000a0000}-1806.o(StubCode)
-    StubCode                                 0x0000a740   Section        8  euser{000a0000}-1815.o(StubCode)
-    theImportedSymbol                        0x0000a744   Data           0  euser{000a0000}-1815.o(StubCode)
-    StubCode                                 0x0000a748   Section        8  euser{000a0000}-1821.o(StubCode)
-    theImportedSymbol                        0x0000a74c   Data           0  euser{000a0000}-1821.o(StubCode)
-    StubCode                                 0x0000a750   Section        8  euser{000a0000}-1826.o(StubCode)
-    theImportedSymbol                        0x0000a754   Data           0  euser{000a0000}-1826.o(StubCode)
-    StubCode                                 0x0000a758   Section        8  euser{000a0000}-203.o(StubCode)
-    theImportedSymbol                        0x0000a75c   Data           0  euser{000a0000}-203.o(StubCode)
-    StubCode                                 0x0000a760   Section        8  euser{000a0000}-205.o(StubCode)
-    theImportedSymbol                        0x0000a764   Data           0  euser{000a0000}-205.o(StubCode)
-    StubCode                                 0x0000a768   Section        8  euser{000a0000}-2060.o(StubCode)
-    theImportedSymbol                        0x0000a76c   Data           0  euser{000a0000}-2060.o(StubCode)
-    StubCode                                 0x0000a770   Section        8  euser{000a0000}-2061.o(StubCode)
-    theImportedSymbol                        0x0000a774   Data           0  euser{000a0000}-2061.o(StubCode)
-    StubCode                                 0x0000a778   Section        8  euser{000a0000}-207.o(StubCode)
-    theImportedSymbol                        0x0000a77c   Data           0  euser{000a0000}-207.o(StubCode)
-    StubCode                                 0x0000a780   Section        8  euser{000a0000}-208.o(StubCode)
-    theImportedSymbol                        0x0000a784   Data           0  euser{000a0000}-208.o(StubCode)
-    StubCode                                 0x0000a788   Section        8  euser{000a0000}-2082.o(StubCode)
-    theImportedSymbol                        0x0000a78c   Data           0  euser{000a0000}-2082.o(StubCode)
-    StubCode                                 0x0000a790   Section        8  euser{000a0000}-209.o(StubCode)
-    theImportedSymbol                        0x0000a794   Data           0  euser{000a0000}-209.o(StubCode)
-    StubCode                                 0x0000a798   Section        8  euser{000a0000}-2123.o(StubCode)
-    theImportedSymbol                        0x0000a79c   Data           0  euser{000a0000}-2123.o(StubCode)
-    StubCode                                 0x0000a7a0   Section        8  euser{000a0000}-2125.o(StubCode)
-    theImportedSymbol                        0x0000a7a4   Data           0  euser{000a0000}-2125.o(StubCode)
-    StubCode                                 0x0000a7a8   Section        8  euser{000a0000}-2128.o(StubCode)
-    theImportedSymbol                        0x0000a7ac   Data           0  euser{000a0000}-2128.o(StubCode)
-    StubCode                                 0x0000a7b0   Section        8  euser{000a0000}-424.o(StubCode)
-    theImportedSymbol                        0x0000a7b4   Data           0  euser{000a0000}-424.o(StubCode)
-    StubCode                                 0x0000a7b8   Section        8  euser{000a0000}-46.o(StubCode)
-    theImportedSymbol                        0x0000a7bc   Data           0  euser{000a0000}-46.o(StubCode)
-    StubCode                                 0x0000a7c0   Section        8  euser{000a0000}-464.o(StubCode)
-    theImportedSymbol                        0x0000a7c4   Data           0  euser{000a0000}-464.o(StubCode)
-    StubCode                                 0x0000a7c8   Section        8  euser{000a0000}-47.o(StubCode)
-    theImportedSymbol                        0x0000a7cc   Data           0  euser{000a0000}-47.o(StubCode)
-    StubCode                                 0x0000a7d0   Section        8  euser{000a0000}-471.o(StubCode)
-    theImportedSymbol                        0x0000a7d4   Data           0  euser{000a0000}-471.o(StubCode)
-    StubCode                                 0x0000a7d8   Section        8  euser{000a0000}-472.o(StubCode)
-    theImportedSymbol                        0x0000a7dc   Data           0  euser{000a0000}-472.o(StubCode)
-    StubCode                                 0x0000a7e0   Section        8  euser{000a0000}-476.o(StubCode)
-    theImportedSymbol                        0x0000a7e4   Data           0  euser{000a0000}-476.o(StubCode)
-    StubCode                                 0x0000a7e8   Section        8  euser{000a0000}-48.o(StubCode)
-    theImportedSymbol                        0x0000a7ec   Data           0  euser{000a0000}-48.o(StubCode)
-    StubCode                                 0x0000a7f0   Section        8  euser{000a0000}-481.o(StubCode)
-    theImportedSymbol                        0x0000a7f4   Data           0  euser{000a0000}-481.o(StubCode)
-    StubCode                                 0x0000a7f8   Section        8  euser{000a0000}-49.o(StubCode)
-    theImportedSymbol                        0x0000a7fc   Data           0  euser{000a0000}-49.o(StubCode)
-    StubCode                                 0x0000a800   Section        8  euser{000a0000}-50.o(StubCode)
-    theImportedSymbol                        0x0000a804   Data           0  euser{000a0000}-50.o(StubCode)
-    StubCode                                 0x0000a808   Section        8  euser{000a0000}-55.o(StubCode)
-    theImportedSymbol                        0x0000a80c   Data           0  euser{000a0000}-55.o(StubCode)
-    StubCode                                 0x0000a810   Section        8  euser{000a0000}-551.o(StubCode)
-    theImportedSymbol                        0x0000a814   Data           0  euser{000a0000}-551.o(StubCode)
-    StubCode                                 0x0000a818   Section        8  euser{000a0000}-593.o(StubCode)
-    theImportedSymbol                        0x0000a81c   Data           0  euser{000a0000}-593.o(StubCode)
-    StubCode                                 0x0000a820   Section        8  euser{000a0000}-649.o(StubCode)
-    theImportedSymbol                        0x0000a824   Data           0  euser{000a0000}-649.o(StubCode)
-    StubCode                                 0x0000a828   Section        8  euser{000a0000}-654.o(StubCode)
-    theImportedSymbol                        0x0000a82c   Data           0  euser{000a0000}-654.o(StubCode)
-    StubCode                                 0x0000a830   Section        8  euser{000a0000}-669.o(StubCode)
-    theImportedSymbol                        0x0000a834   Data           0  euser{000a0000}-669.o(StubCode)
-    StubCode                                 0x0000a838   Section        8  euser{000a0000}-81.o(StubCode)
-    theImportedSymbol                        0x0000a83c   Data           0  euser{000a0000}-81.o(StubCode)
-    StubCode                                 0x0000a840   Section        8  euser{000a0000}-824.o(StubCode)
-    theImportedSymbol                        0x0000a844   Data           0  euser{000a0000}-824.o(StubCode)
-    StubCode                                 0x0000a848   Section        8  euser{000a0000}-826.o(StubCode)
-    theImportedSymbol                        0x0000a84c   Data           0  euser{000a0000}-826.o(StubCode)
-    StubCode                                 0x0000a850   Section        8  euser{000a0000}-838.o(StubCode)
-    theImportedSymbol                        0x0000a854   Data           0  euser{000a0000}-838.o(StubCode)
-    StubCode                                 0x0000a858   Section        8  euser{000a0000}-839.o(StubCode)
-    theImportedSymbol                        0x0000a85c   Data           0  euser{000a0000}-839.o(StubCode)
-    StubCode                                 0x0000a860   Section        8  euser{000a0000}-841.o(StubCode)
-    theImportedSymbol                        0x0000a864   Data           0  euser{000a0000}-841.o(StubCode)
-    StubCode                                 0x0000a868   Section        8  euser{000a0000}-936.o(StubCode)
-    theImportedSymbol                        0x0000a86c   Data           0  euser{000a0000}-936.o(StubCode)
-    StubCode                                 0x0000a870   Section        8  euser{000a0000}-953.o(StubCode)
-    theImportedSymbol                        0x0000a874   Data           0  euser{000a0000}-953.o(StubCode)
-    StubCode                                 0x0000a878   Section        8  euser{000a0000}-960.o(StubCode)
-    theImportedSymbol                        0x0000a87c   Data           0  euser{000a0000}-960.o(StubCode)
-    StubCode                                 0x0000a880   Section        8  euser{000a0000}-966.o(StubCode)
-    theImportedSymbol                        0x0000a884   Data           0  euser{000a0000}-966.o(StubCode)
-    StubCode                                 0x0000a888   Section        8  euser{000a0000}-968.o(StubCode)
-    theImportedSymbol                        0x0000a88c   Data           0  euser{000a0000}-968.o(StubCode)
-    StubCode                                 0x0000a890   Section        8  euser{000a0000}-973.o(StubCode)
-    theImportedSymbol                        0x0000a894   Data           0  euser{000a0000}-973.o(StubCode)
-    StubCode                                 0x0000a898   Section        8  euser{000a0000}-984.o(StubCode)
-    theImportedSymbol                        0x0000a89c   Data           0  euser{000a0000}-984.o(StubCode)
-    StubCode                                 0x0000a8a0   Section        8  efsrv{000a0000}-115.o(StubCode)
-    theImportedSymbol                        0x0000a8a4   Data           0  efsrv{000a0000}-115.o(StubCode)
-    StubCode                                 0x0000a8a8   Section        8  efsrv{000a0000}-118.o(StubCode)
-    theImportedSymbol                        0x0000a8ac   Data           0  efsrv{000a0000}-118.o(StubCode)
-    StubCode                                 0x0000a8b0   Section        8  efsrv{000a0000}-181.o(StubCode)
-    theImportedSymbol                        0x0000a8b4   Data           0  efsrv{000a0000}-181.o(StubCode)
-    StubCode                                 0x0000a8b8   Section        8  efsrv{000a0000}-182.o(StubCode)
-    theImportedSymbol                        0x0000a8bc   Data           0  efsrv{000a0000}-182.o(StubCode)
-    StubCode                                 0x0000a8c0   Section        8  efsrv{000a0000}-190.o(StubCode)
-    theImportedSymbol                        0x0000a8c4   Data           0  efsrv{000a0000}-190.o(StubCode)
-    StubCode                                 0x0000a8c8   Section        8  efsrv{000a0000}-200.o(StubCode)
-    theImportedSymbol                        0x0000a8cc   Data           0  efsrv{000a0000}-200.o(StubCode)
-    StubCode                                 0x0000a8d0   Section        8  efsrv{000a0000}-204.o(StubCode)
-    theImportedSymbol                        0x0000a8d4   Data           0  efsrv{000a0000}-204.o(StubCode)
-    StubCode                                 0x0000a8d8   Section        8  efsrv{000a0000}-68.o(StubCode)
-    theImportedSymbol                        0x0000a8dc   Data           0  efsrv{000a0000}-68.o(StubCode)
-    StubCode                                 0x0000a8e0   Section        8  bafl{000a0000}-123.o(StubCode)
-    theImportedSymbol                        0x0000a8e4   Data           0  bafl{000a0000}-123.o(StubCode)
-    StubCode                                 0x0000a8e8   Section        8  bafl{000a0000}-124.o(StubCode)
-    theImportedSymbol                        0x0000a8ec   Data           0  bafl{000a0000}-124.o(StubCode)
-    StubCode                                 0x0000a8f0   Section        8  bafl{000a0000}-129.o(StubCode)
-    theImportedSymbol                        0x0000a8f4   Data           0  bafl{000a0000}-129.o(StubCode)
-    StubCode                                 0x0000a8f8   Section        8  bafl{000a0000}-141.o(StubCode)
-    theImportedSymbol                        0x0000a8fc   Data           0  bafl{000a0000}-141.o(StubCode)
-    StubCode                                 0x0000a900   Section        8  bafl{000a0000}-145.o(StubCode)
-    theImportedSymbol                        0x0000a904   Data           0  bafl{000a0000}-145.o(StubCode)
-    StubCode                                 0x0000a908   Section        8  bafl{000a0000}-147.o(StubCode)
-    theImportedSymbol                        0x0000a90c   Data           0  bafl{000a0000}-147.o(StubCode)
-    StubCode                                 0x0000a910   Section        8  bafl{000a0000}-59.o(StubCode)
-    theImportedSymbol                        0x0000a914   Data           0  bafl{000a0000}-59.o(StubCode)
-    StubCode                                 0x0000a918   Section        8  bafl{000a0000}-62.o(StubCode)
-    theImportedSymbol                        0x0000a91c   Data           0  bafl{000a0000}-62.o(StubCode)
-    StubCode                                 0x0000a920   Section        8  AknIcon{000a0000}-11.o(StubCode)
-    theImportedSymbol                        0x0000a924   Data           0  AknIcon{000a0000}-11.o(StubCode)
-    StubCode                                 0x0000a928   Section        8  AknIcon{000a0000}-15.o(StubCode)
-    theImportedSymbol                        0x0000a92c   Data           0  AknIcon{000a0000}-15.o(StubCode)
-    StubCode                                 0x0000a930   Section        8  AknIcon{000a0000}-16.o(StubCode)
-    theImportedSymbol                        0x0000a934   Data           0  AknIcon{000a0000}-16.o(StubCode)
-    StubCode                                 0x0000a938   Section        8  AknIcon{000a0000}-21.o(StubCode)
-    theImportedSymbol                        0x0000a93c   Data           0  AknIcon{000a0000}-21.o(StubCode)
-    StubCode                                 0x0000a940   Section        8  gdi{000a0000}-311.o(StubCode)
-    theImportedSymbol                        0x0000a944   Data           0  gdi{000a0000}-311.o(StubCode)
-    StubCode                                 0x0000a948   Section        8  gdi{000a0000}-314.o(StubCode)
-    theImportedSymbol                        0x0000a94c   Data           0  gdi{000a0000}-314.o(StubCode)
-    StubCode                                 0x0000a950   Section        8  bitgdi{000a0000}-14.o(StubCode)
-    theImportedSymbol                        0x0000a954   Data           0  bitgdi{000a0000}-14.o(StubCode)
-    StubCode                                 0x0000a958   Section        8  bitgdi{000a0000}-44.o(StubCode)
-    theImportedSymbol                        0x0000a95c   Data           0  bitgdi{000a0000}-44.o(StubCode)
-    StubCode                                 0x0000a960   Section        8  eposlandmarks{000a0000}-12.o(StubCode)
-    theImportedSymbol                        0x0000a964   Data           0  eposlandmarks{000a0000}-12.o(StubCode)
-    StubCode                                 0x0000a968   Section        8  eposlandmarks{000a0000}-14.o(StubCode)
-    theImportedSymbol                        0x0000a96c   Data           0  eposlandmarks{000a0000}-14.o(StubCode)
-    StubCode                                 0x0000a970   Section        8  eposlandmarks{000a0000}-15.o(StubCode)
-    theImportedSymbol                        0x0000a974   Data           0  eposlandmarks{000a0000}-15.o(StubCode)
-    StubCode                                 0x0000a978   Section        8  eposlandmarks{000a0000}-4.o(StubCode)
-    theImportedSymbol                        0x0000a97c   Data           0  eposlandmarks{000a0000}-4.o(StubCode)
-    StubCode                                 0x0000a980   Section        8  eposlandmarks{000a0000}-50.o(StubCode)
-    theImportedSymbol                        0x0000a984   Data           0  eposlandmarks{000a0000}-50.o(StubCode)
-    StubCode                                 0x0000a988   Section        8  eposlandmarks{000a0000}-51.o(StubCode)
-    theImportedSymbol                        0x0000a98c   Data           0  eposlandmarks{000a0000}-51.o(StubCode)
-    StubCode                                 0x0000a990   Section        8  eposlandmarks{000a0000}-56.o(StubCode)
-    theImportedSymbol                        0x0000a994   Data           0  eposlandmarks{000a0000}-56.o(StubCode)
-    StubCode                                 0x0000a998   Section        8  eposlandmarks{000a0000}-6.o(StubCode)
-    theImportedSymbol                        0x0000a99c   Data           0  eposlandmarks{000a0000}-6.o(StubCode)
-    StubCode                                 0x0000a9a0   Section        8  eposlandmarks{000a0000}-65.o(StubCode)
-    theImportedSymbol                        0x0000a9a4   Data           0  eposlandmarks{000a0000}-65.o(StubCode)
-    StubCode                                 0x0000a9a8   Section        8  eposlandmarks{000a0000}-66.o(StubCode)
-    theImportedSymbol                        0x0000a9ac   Data           0  eposlandmarks{000a0000}-66.o(StubCode)
-    StubCode                                 0x0000a9b0   Section        8  eposlandmarks{000a0000}-67.o(StubCode)
-    theImportedSymbol                        0x0000a9b4   Data           0  eposlandmarks{000a0000}-67.o(StubCode)
-    StubCode                                 0x0000a9b8   Section        8  eposlandmarks{000a0000}-68.o(StubCode)
-    theImportedSymbol                        0x0000a9bc   Data           0  eposlandmarks{000a0000}-68.o(StubCode)
-    StubCode                                 0x0000a9c0   Section        8  eposlandmarks{000a0000}-75.o(StubCode)
-    theImportedSymbol                        0x0000a9c4   Data           0  eposlandmarks{000a0000}-75.o(StubCode)
-    StubCode                                 0x0000a9c8   Section        8  eposlandmarks{000a0000}-8.o(StubCode)
-    theImportedSymbol                        0x0000a9cc   Data           0  eposlandmarks{000a0000}-8.o(StubCode)
-    StubCode                                 0x0000a9d0   Section        8  eposlandmarks{000a0000}-82.o(StubCode)
-    theImportedSymbol                        0x0000a9d4   Data           0  eposlandmarks{000a0000}-82.o(StubCode)
-    StubCode                                 0x0000a9d8   Section        8  lbs{000a0000}-10.o(StubCode)
-    theImportedSymbol                        0x0000a9dc   Data           0  lbs{000a0000}-10.o(StubCode)
-    StubCode                                 0x0000a9e0   Section        8  lbs{000a0000}-13.o(StubCode)
-    theImportedSymbol                        0x0000a9e4   Data           0  lbs{000a0000}-13.o(StubCode)
-    StubCode                                 0x0000a9e8   Section        8  lbs{000a0000}-15.o(StubCode)
-    theImportedSymbol                        0x0000a9ec   Data           0  lbs{000a0000}-15.o(StubCode)
-    StubCode                                 0x0000a9f0   Section        8  lbs{000a0000}-152.o(StubCode)
-    theImportedSymbol                        0x0000a9f4   Data           0  lbs{000a0000}-152.o(StubCode)
-    StubCode                                 0x0000a9f8   Section        8  lbs{000a0000}-167.o(StubCode)
-    theImportedSymbol                        0x0000a9fc   Data           0  lbs{000a0000}-167.o(StubCode)
-    StubCode                                 0x0000aa00   Section        8  lbs{000a0000}-17.o(StubCode)
-    theImportedSymbol                        0x0000aa04   Data           0  lbs{000a0000}-17.o(StubCode)
-    StubCode                                 0x0000aa08   Section        8  lbs{000a0000}-180.o(StubCode)
-    theImportedSymbol                        0x0000aa0c   Data           0  lbs{000a0000}-180.o(StubCode)
-    StubCode                                 0x0000aa10   Section        8  lbs{000a0000}-181.o(StubCode)
-    theImportedSymbol                        0x0000aa14   Data           0  lbs{000a0000}-181.o(StubCode)
-    StubCode                                 0x0000aa18   Section        8  lbs{000a0000}-205.o(StubCode)
-    theImportedSymbol                        0x0000aa1c   Data           0  lbs{000a0000}-205.o(StubCode)
-    StubCode                                 0x0000aa20   Section        8  lbs{000a0000}-207.o(StubCode)
-    theImportedSymbol                        0x0000aa24   Data           0  lbs{000a0000}-207.o(StubCode)
-    StubCode                                 0x0000aa28   Section        8  lbs{000a0000}-21.o(StubCode)
-    theImportedSymbol                        0x0000aa2c   Data           0  lbs{000a0000}-21.o(StubCode)
-    StubCode                                 0x0000aa30   Section        8  lbs{000a0000}-214.o(StubCode)
-    theImportedSymbol                        0x0000aa34   Data           0  lbs{000a0000}-214.o(StubCode)
-    StubCode                                 0x0000aa38   Section        8  lbs{000a0000}-218.o(StubCode)
-    theImportedSymbol                        0x0000aa3c   Data           0  lbs{000a0000}-218.o(StubCode)
-    StubCode                                 0x0000aa40   Section        8  lbs{000a0000}-219.o(StubCode)
-    theImportedSymbol                        0x0000aa44   Data           0  lbs{000a0000}-219.o(StubCode)
-    StubCode                                 0x0000aa48   Section        8  lbs{000a0000}-223.o(StubCode)
-    theImportedSymbol                        0x0000aa4c   Data           0  lbs{000a0000}-223.o(StubCode)
-    StubCode                                 0x0000aa50   Section        8  lbs{000a0000}-225.o(StubCode)
-    theImportedSymbol                        0x0000aa54   Data           0  lbs{000a0000}-225.o(StubCode)
-    StubCode                                 0x0000aa58   Section        8  lbs{000a0000}-226.o(StubCode)
-    theImportedSymbol                        0x0000aa5c   Data           0  lbs{000a0000}-226.o(StubCode)
-    StubCode                                 0x0000aa60   Section        8  lbs{000a0000}-23.o(StubCode)
-    theImportedSymbol                        0x0000aa64   Data           0  lbs{000a0000}-23.o(StubCode)
-    StubCode                                 0x0000aa68   Section        8  lbs{000a0000}-28.o(StubCode)
-    theImportedSymbol                        0x0000aa6c   Data           0  lbs{000a0000}-28.o(StubCode)
-    StubCode                                 0x0000aa70   Section        8  lbs{000a0000}-303.o(StubCode)
-    theImportedSymbol                        0x0000aa74   Data           0  lbs{000a0000}-303.o(StubCode)
-    StubCode                                 0x0000aa78   Section        8  lbs{000a0000}-304.o(StubCode)
-    theImportedSymbol                        0x0000aa7c   Data           0  lbs{000a0000}-304.o(StubCode)
-    StubCode                                 0x0000aa80   Section        8  lbs{000a0000}-47.o(StubCode)
-    theImportedSymbol                        0x0000aa84   Data           0  lbs{000a0000}-47.o(StubCode)
-    StubCode                                 0x0000aa88   Section        8  lbs{000a0000}-48.o(StubCode)
-    theImportedSymbol                        0x0000aa8c   Data           0  lbs{000a0000}-48.o(StubCode)
-    StubCode                                 0x0000aa90   Section        8  lbs{000a0000}-49.o(StubCode)
-    theImportedSymbol                        0x0000aa94   Data           0  lbs{000a0000}-49.o(StubCode)
-    StubCode                                 0x0000aa98   Section        8  lbs{000a0000}-7.o(StubCode)
-    theImportedSymbol                        0x0000aa9c   Data           0  lbs{000a0000}-7.o(StubCode)
-    StubCode                                 0x0000aaa0   Section        8  lbs{000a0000}-8.o(StubCode)
-    theImportedSymbol                        0x0000aaa4   Data           0  lbs{000a0000}-8.o(StubCode)
-    StubCode                                 0x0000aaa8   Section        8  lbs{000a0000}-82.o(StubCode)
-    theImportedSymbol                        0x0000aaac   Data           0  lbs{000a0000}-82.o(StubCode)
-    StubCode                                 0x0000aab0   Section        8  lbs{000a0000}-83.o(StubCode)
-    theImportedSymbol                        0x0000aab4   Data           0  lbs{000a0000}-83.o(StubCode)
-    StubCode                                 0x0000aab8   Section        8  lbs{000a0000}-87.o(StubCode)
-    theImportedSymbol                        0x0000aabc   Data           0  lbs{000a0000}-87.o(StubCode)
-    StubCode                                 0x0000aac0   Section        8  lbs{000a0000}-97.o(StubCode)
-    theImportedSymbol                        0x0000aac4   Data           0  lbs{000a0000}-97.o(StubCode)
-    StubCode                                 0x0000aac8   Section        8  mnservicelib{000a0000}-10.o(StubCode)
-    theImportedSymbol                        0x0000aacc   Data           0  mnservicelib{000a0000}-10.o(StubCode)
-    StubCode                                 0x0000aad0   Section        8  mnservicelib{000a0000}-13.o(StubCode)
-    theImportedSymbol                        0x0000aad4   Data           0  mnservicelib{000a0000}-13.o(StubCode)
-    StubCode                                 0x0000aad8   Section        8  mnservicelib{000a0000}-3.o(StubCode)
-    theImportedSymbol                        0x0000aadc   Data           0  mnservicelib{000a0000}-3.o(StubCode)
-    StubCode                                 0x0000aae0   Section        8  mnservicelib{000a0000}-5.o(StubCode)
-    theImportedSymbol                        0x0000aae4   Data           0  mnservicelib{000a0000}-5.o(StubCode)
-    StubCode                                 0x0000aae8   Section        8  mnservicelib{000a0000}-55.o(StubCode)
-    theImportedSymbol                        0x0000aaec   Data           0  mnservicelib{000a0000}-55.o(StubCode)
-    StubCode                                 0x0000aaf0   Section        8  mnservicelib{000a0000}-57.o(StubCode)
-    theImportedSymbol                        0x0000aaf4   Data           0  mnservicelib{000a0000}-57.o(StubCode)
-    StubCode                                 0x0000aaf8   Section        8  mnservicelib{000a0000}-6.o(StubCode)
-    theImportedSymbol                        0x0000aafc   Data           0  mnservicelib{000a0000}-6.o(StubCode)
-    StubCode                                 0x0000ab00   Section        8  mnservicelib{000a0000}-8.o(StubCode)
-    theImportedSymbol                        0x0000ab04   Data           0  mnservicelib{000a0000}-8.o(StubCode)
-    StubCode                                 0x0000ab08   Section        8  mnservicelib{000a0000}-9.o(StubCode)
-    theImportedSymbol                        0x0000ab0c   Data           0  mnservicelib{000a0000}-9.o(StubCode)
-    StubCode                                 0x0000ab10   Section        8  dfpaeabi{000a0000}-12.o(StubCode)
-    theImportedSymbol                        0x0000ab14   Data           0  dfpaeabi{000a0000}-12.o(StubCode)
-    StubCode                                 0x0000ab18   Section        8  dfpaeabi{000a0000}-19.o(StubCode)
-    theImportedSymbol                        0x0000ab1c   Data           0  dfpaeabi{000a0000}-19.o(StubCode)
-    StubCode                                 0x0000ab20   Section        8  dfpaeabi{000a0000}-2.o(StubCode)
-    theImportedSymbol                        0x0000ab24   Data           0  dfpaeabi{000a0000}-2.o(StubCode)
-    StubCode                                 0x0000ab28   Section        8  dfpaeabi{000a0000}-20.o(StubCode)
-    theImportedSymbol                        0x0000ab2c   Data           0  dfpaeabi{000a0000}-20.o(StubCode)
-    StubCode                                 0x0000ab30   Section        8  dfpaeabi{000a0000}-22.o(StubCode)
-    theImportedSymbol                        0x0000ab34   Data           0  dfpaeabi{000a0000}-22.o(StubCode)
-    StubCode                                 0x0000ab38   Section        8  dfpaeabi{000a0000}-23.o(StubCode)
-    theImportedSymbol                        0x0000ab3c   Data           0  dfpaeabi{000a0000}-23.o(StubCode)
-    StubCode                                 0x0000ab40   Section        8  dfpaeabi{000a0000}-24.o(StubCode)
-    theImportedSymbol                        0x0000ab44   Data           0  dfpaeabi{000a0000}-24.o(StubCode)
-    StubCode                                 0x0000ab48   Section        8  dfpaeabi{000a0000}-25.o(StubCode)
-    theImportedSymbol                        0x0000ab4c   Data           0  dfpaeabi{000a0000}-25.o(StubCode)
-    StubCode                                 0x0000ab50   Section        8  dfpaeabi{000a0000}-3.o(StubCode)
-    theImportedSymbol                        0x0000ab54   Data           0  dfpaeabi{000a0000}-3.o(StubCode)
-    StubCode                                 0x0000ab58   Section        8  dfpaeabi{000a0000}-36.o(StubCode)
-    theImportedSymbol                        0x0000ab5c   Data           0  dfpaeabi{000a0000}-36.o(StubCode)
-    StubCode                                 0x0000ab60   Section        8  dfpaeabi{000a0000}-41.o(StubCode)
-    theImportedSymbol                        0x0000ab64   Data           0  dfpaeabi{000a0000}-41.o(StubCode)
-    StubCode                                 0x0000ab68   Section        8  dfpaeabi{000a0000}-5.o(StubCode)
-    theImportedSymbol                        0x0000ab6c   Data           0  dfpaeabi{000a0000}-5.o(StubCode)
-    StubCode                                 0x0000ab70   Section        8  dfpaeabi{000a0000}-8.o(StubCode)
-    theImportedSymbol                        0x0000ab74   Data           0  dfpaeabi{000a0000}-8.o(StubCode)
-    StubCode                                 0x0000ab78   Section        8  drtaeabi{000a0000}-135.o(StubCode)
-    theImportedSymbol                        0x0000ab7c   Data           0  drtaeabi{000a0000}-135.o(StubCode)
-    StubCode                                 0x0000ab80   Section        8  drtaeabi{000a0000}-147.o(StubCode)
-    theImportedSymbol                        0x0000ab84   Data           0  drtaeabi{000a0000}-147.o(StubCode)
-    StubCode                                 0x0000ab88   Section        8  drtaeabi{000a0000}-158.o(StubCode)
-    theImportedSymbol                        0x0000ab8c   Data           0  drtaeabi{000a0000}-158.o(StubCode)
-    StubCode                                 0x0000ab90   Section        8  drtaeabi{000a0000}-159.o(StubCode)
-    theImportedSymbol                        0x0000ab94   Data           0  drtaeabi{000a0000}-159.o(StubCode)
-    StubCode                                 0x0000ab98   Section        8  drtaeabi{000a0000}-180.o(StubCode)
-    theImportedSymbol                        0x0000ab9c   Data           0  drtaeabi{000a0000}-180.o(StubCode)
-    StubCode                                 0x0000aba0   Section        8  drtaeabi{000a0000}-183.o(StubCode)
-    theImportedSymbol                        0x0000aba4   Data           0  drtaeabi{000a0000}-183.o(StubCode)
-    StubCode                                 0x0000aba8   Section        8  drtaeabi{000a0000}-184.o(StubCode)
-    theImportedSymbol                        0x0000abac   Data           0  drtaeabi{000a0000}-184.o(StubCode)
-    StubCode                                 0x0000abb0   Section        8  scppnwdl{000a0000}-3.o(StubCode)
-    theImportedSymbol                        0x0000abb4   Data           0  scppnwdl{000a0000}-3.o(StubCode)
-    i._Z18ExecuteAndDeleteLDP15CPosLmOperation 0x0000abb8   Section       22  mnrefproviderengine.in(i._Z18ExecuteAndDeleteLDP15CPosLmOperation)
-    i._ZN7TPtrC163SetERK7TDesC16             0x0000abce   Section       28  mnrefproviderengine.in(i._ZN7TPtrC163SetERK7TDesC16)
-    i._ZN7TPtrC163SetERK7TDesC16.clean       0x0000abea   Section       12  mnrefproviderengine.in(i._ZN7TPtrC163SetERK7TDesC16.clean)
-    i._ZdlPvS_                               0x0000abf6   Section        2  mnrefproviderengine.in(i._ZdlPvS_)
-    i._ZnwjPv                                0x0000abf8   Section        4  mnrefproviderengine.in(i._ZnwjPv)
-    t._Z17CleanupClosePushLI6RArrayIN11CMnrpEngine14TDistanceToPoiEEEvRT_ 0x0000abfc   Section       16  mnrefproviderengine.in(t._Z17CleanupClosePushLI6RArrayIN11CMnrpEngine14TDistanceToPoiEEEvRT_)
-    t._Z3AbsIdET_S0_                         0x0000ac0c   Section       44  mnrefproviderengine.in(t._Z3AbsIdET_S0_)
-    t._Z3MaxIdET_S0_S0_                      0x0000ac38   Section       28  mnrefproviderengine.in(t._Z3MaxIdET_S0_S0_)
-    t._Z3MinIdET_S0_S0_                      0x0000ac54   Section       28  mnrefproviderengine.in(t._Z3MinIdET_S0_S0_)
-    t._ZN12CleanupCloseI6RArrayIN11CMnrpEngine14TDistanceToPoiEEE5CloseEPv 0x0000ac70   Section        8  mnrefproviderengine.in(t._ZN12CleanupCloseI6RArrayIN11CMnrpEngine14TDistanceToPoiEEE5CloseEPv)
-    t._ZN12CleanupCloseI6RArrayImEE5CloseEPv 0x0000ac78   Section        8  mnrefproviderengine.in(t._ZN12CleanupCloseI6RArrayImEE5CloseEPv)
-    t._ZN13RPointerArrayI12CPosLandmarkE7AppendLEPKS0_ 0x0000ac80   Section       12  mnrefproviderengine.in(t._ZN13RPointerArrayI12CPosLandmarkE7AppendLEPKS0_)
-    t._ZN13RPointerArrayIN13CMnrpMapModel9CDrawItemEE15ResetAndDestroyEv 0x0000ac8c   Section       48  mnrefproviderengine.in(t._ZN13RPointerArrayIN13CMnrpMapModel9CDrawItemEE15ResetAndDestroyEv)
-    t._ZN13RPointerArrayIN13CMnrpMapModel9CDrawItemEE7AppendLEPKS1_ 0x0000acbc   Section       12  mnrefproviderengine.in(t._ZN13RPointerArrayIN13CMnrpMapModel9CDrawItemEE7AppendLEPKS1_)
-    t._ZNK20HPositionGenericInfo8GetValueIfEEitRT_ 0x0000acc8   Section       16  mnrefproviderengine.in(t._ZNK20HPositionGenericInfo8GetValueIfEEitRT_)
-    t._ZNK6RArrayIN11CMnrpEngine14TDistanceToPoiEE5CountEv 0x0000acd8   Section        8  mnrefproviderengine.in(t._ZNK6RArrayIN11CMnrpEngine14TDistanceToPoiEE5CountEv)
-    t._ZNK6TArrayIP12CPosLandmarkEixEi       0x0000ace0   Section        8  mnrefproviderengine.in(t._ZNK6TArrayIP12CPosLandmarkEixEi)
-    t._ZNK6TArrayIPN13CMnrpMapModel9CDrawItemEEixEi 0x0000ace8   Section        8  mnrefproviderengine.in(t._ZNK6TArrayIPN13CMnrpMapModel9CDrawItemEEixEi)
-    .extab._ZN11CMnrpEngineC1Ev              0x0000acf0   Data           0  mnrefproviderengine.in(.ARM.extab)
-    .extab._ZN11CMnrpEngineD1Ev              0x0000ad00   Data           0  mnrefproviderengine.in(.ARM.extab)
-    .extab._ZN11CMnrpEngine17FindResourceFileLERK7TDesC16R4TBufILi256EE 0x0000ad10   Data           0  mnrefproviderengine.in(.ARM.extab)
-    .extab._ZN11CMnrpEngine16LoadKnownPlacesLEv 0x0000ad1c   Data           0  mnrefproviderengine.in(.ARM.extab)
-    .extab._ZN11CMnrpEngine12KnownPlacesLEv  0x0000ad2c   Data           0  mnrefproviderengine.in(.ARM.extab)
-    .extab._ZN13CMnrpMapModel9CDrawItem5NewLCERK12CPosLandmark 0x0000ad54   Data           0  mnrefproviderengine.in(.ARM.extab)
-    .extab._ZN13CMnrpMapModelC1ER17MMapModelObserverR11CMnrpEngine 0x0000ad64   Data           0  mnrefproviderengine.in(.ARM.extab)
-    .extab._ZN13CMnrpMapModelC1ER11CMnrpEngine 0x0000ad74   Data           0  mnrefproviderengine.in(.ARM.extab)
-    .extab._ZN13CMnrpMapModelD1Ev            0x0000ad84   Data           0  mnrefproviderengine.in(.ARM.extab)
-    .extab._ZN13CMnrpMapModel9CDrawItemD1Ev  0x0000ad94   Data           0  mnrefproviderengine.in(.ARM.extab)
-    .extab._ZN20CMnrpPositionRequestC1ER21MMnrpPositionObserver 0x0000ada4   Data           0  mnrefproviderengine.in(.ARM.extab)
-    .extab._ZN20CMnrpPositionRequestD1Ev     0x0000adb4   Data           0  mnrefproviderengine.in(.ARM.extab)
-    .extab._ZN7TPtrC163SetERK7TDesC16        0x0000adc4   Data           0  mnrefproviderengine.in(.ARM.extab)
-    .constdata$1                             0x0000add4   Data           0  mnrefproviderengine.in(.constdata)
-    KCitiesResourceFile                      0x0000add4   Data          72  mnrefproviderengine.in(.constdata)
-    .constdata                               0x0000add4   Section      128  mnrefproviderengine.in(.constdata)
-    KLocationNameFormat@_ZN11CMnrpEngine21CreateCloseLandmarkLCERK12CPosLandmarkf_0 0x0000ae1c   Data          28  mnrefproviderengine.in(.constdata)
-    KLocationNameFormatKm@_ZN11CMnrpEngine21CreateCloseLandmarkLCERK12CPosLandmarkf_1 0x0000ae38   Data          28  mnrefproviderengine.in(.constdata)
-    .constdata$1                             0x0000ae54   Data           0  mnrefproviderengine.in(.constdata)
-    KCellDividers                            0x0000ae54   Data          12  mnrefproviderengine.in(.constdata)
-    .constdata                               0x0000ae54   Section       44  mnrefproviderengine.in(.constdata)
-    KRequestorName@_ZN13CMnrpMapModel10ConstructLEv_0 0x0000ae60   Data          32  mnrefproviderengine.in(.constdata)
-    .constdata$1                             0x0000ae80   Data           0  mnrefproviderengine.in(.constdata)
-    KNorth@_ZN9MnrpUtils13AngleToStringEdR6TDes16_1 0x0000ae80   Data           8  mnrefproviderengine.in(.constdata)
-    .constdata                               0x0000ae80   Section      276  mnrefproviderengine.in(.constdata)
-    KSouth@_ZN9MnrpUtils13AngleToStringEdR6TDes16_2 0x0000ae88   Data           8  mnrefproviderengine.in(.constdata)
-    KWest@_ZN9MnrpUtils13AngleToStringEdR6TDes16_3 0x0000ae90   Data           8  mnrefproviderengine.in(.constdata)
-    KEast@_ZN9MnrpUtils13AngleToStringEdR6TDes16_4 0x0000ae98   Data           8  mnrefproviderengine.in(.constdata)
-    KNan                                     0x0000aea0   Data          16  mnrefproviderengine.in(.constdata)
-    KNeg                                     0x0000aeb0   Data          16  mnrefproviderengine.in(.constdata)
-    KOutOfBounds                             0x0000aec0   Data          16  mnrefproviderengine.in(.constdata)
-    KCoordFormatFull@_ZN9MnrpUtils18CoordinateToStringEdR6TDes16ii_0 0x0000aed0   Data          44  mnrefproviderengine.in(.constdata)
-    KCoordFormatPartMseconds@_ZN9MnrpUtils18CoordinateToStringEdR6TDes16ii_1 0x0000aefc   Data          20  mnrefproviderengine.in(.constdata)
-    KSmall@_ZN9MnrpUtils16DistanceToStringEdR6TDes16_0 0x0000af10   Data          16  mnrefproviderengine.in(.constdata)
-    KMeters@_ZN9MnrpUtils16DistanceToStringEdR6TDes16_1 0x0000af20   Data          16  mnrefproviderengine.in(.constdata)
-    KKiloMeters@_ZN9MnrpUtils16DistanceToStringEdR6TDes16_2 0x0000af30   Data          20  mnrefproviderengine.in(.constdata)
-    KThousandsKiloMeters@_ZN9MnrpUtils16DistanceToStringEdR6TDes16_3 0x0000af44   Data          24  mnrefproviderengine.in(.constdata)
-    KAngleFormat@_ZN9MnrpUtils13AngleToStringEdR6TDes16_0 0x0000af5c   Data          44  mnrefproviderengine.in(.constdata)
-    KPerSecond@_ZN9MnrpUtils13SpeedToStringEdR6TDes16_0 0x0000af88   Data          12  mnrefproviderengine.in(.constdata)
-    .constdata__ZTI11CMnrpEngine             0x0000af94   Section       12  mnrefproviderengine.in(.constdata__ZTI11CMnrpEngine)
-    .constdata__ZTI13CMnrpMapModel           0x0000afa0   Section       32  mnrefproviderengine.in(.constdata__ZTI13CMnrpMapModel)
-    .constdata__ZTI20CMnrpPositionRequest    0x0000afc0   Section       12  mnrefproviderengine.in(.constdata__ZTI20CMnrpPositionRequest)
-    .constdata__ZTI21MMnrpPositionObserver   0x0000afcc   Section        8  mnrefproviderengine.in(.constdata__ZTI21MMnrpPositionObserver)
-    .constdata__ZTIN13CMnrpMapModel9CDrawItemE 0x0000afd4   Section       12  mnrefproviderengine.in(.constdata__ZTIN13CMnrpMapModel9CDrawItemE)
-    .constdata__ZTS11CMnrpEngine             0x0000afe0   Section       14  mnrefproviderengine.in(.constdata__ZTS11CMnrpEngine)
-    .constdata__ZTS13CMnrpMapModel           0x0000afee   Section       16  mnrefproviderengine.in(.constdata__ZTS13CMnrpMapModel)
-    .constdata__ZTS20CMnrpPositionRequest    0x0000affe   Section       23  mnrefproviderengine.in(.constdata__ZTS20CMnrpPositionRequest)
-    .constdata__ZTS21MMnrpPositionObserver   0x0000b015   Section       24  mnrefproviderengine.in(.constdata__ZTS21MMnrpPositionObserver)
-    .constdata__ZTSN13CMnrpMapModel9CDrawItemE 0x0000b02d   Section       28  mnrefproviderengine.in(.constdata__ZTSN13CMnrpMapModel9CDrawItemE)
-    .constdata__ZTV11CMnrpEngine             0x0000b04c   Section       20  mnrefproviderengine.in(.constdata__ZTV11CMnrpEngine)
-    .constdata__ZTV13CMnrpMapModel           0x0000b060   Section       36  mnrefproviderengine.in(.constdata__ZTV13CMnrpMapModel)
-    .constdata__ZTV20CMnrpPositionRequest    0x0000b084   Section       32  mnrefproviderengine.in(.constdata__ZTV20CMnrpPositionRequest)
-    .constdata__ZTVN13CMnrpMapModel9CDrawItemE 0x0000b0a4   Section       20  mnrefproviderengine.in(.constdata__ZTVN13CMnrpMapModel9CDrawItemE)
-    .ARM.exidx                               0x0000b0b8   Section        8  ucppinit_aeabi.o(.ARM.exidx)
-
-    Global Symbols
-
-    Symbol Name                              Value     Ov Type        Size  Object(Section)
-
-    BuildAttributes$$THUMB_ISAv3$ARM_ISAv6$M$E$P$PE$A:L22$X:L11$S22$IEEE1$IW$USESV6$~STKCKD$USESV7$~SHL$OSPACE$IEEEJ$EBA8$UX$REQ8$PRES8$EABIv2 0x00000000   Number         0  anon$$obj.o ABSOLUTE
-    #<DLL>AknIcon{000a0000}[1020735a].dll#<\DLL>10  - Undefined Reference
-    #<DLL>AknIcon{000a0000}[1020735a].dll#<\DLL>15  - Undefined Reference
-    #<DLL>AknIcon{000a0000}[1020735a].dll#<\DLL>b  - Undefined Reference
-    #<DLL>AknIcon{000a0000}[1020735a].dll#<\DLL>f  - Undefined Reference
-    #<DLL>bafl{000a0000}[10003a0f].dll#<\DLL>3b  - Undefined Reference
-    #<DLL>bafl{000a0000}[10003a0f].dll#<\DLL>3e  - Undefined Reference
-    #<DLL>bafl{000a0000}[10003a0f].dll#<\DLL>7b  - Undefined Reference
-    #<DLL>bafl{000a0000}[10003a0f].dll#<\DLL>7c  - Undefined Reference
-    #<DLL>bafl{000a0000}[10003a0f].dll#<\DLL>81  - Undefined Reference
-    #<DLL>bafl{000a0000}[10003a0f].dll#<\DLL>8d  - Undefined Reference
-    #<DLL>bafl{000a0000}[10003a0f].dll#<\DLL>91  - Undefined Reference
-    #<DLL>bafl{000a0000}[10003a0f].dll#<\DLL>93  - Undefined Reference
-    #<DLL>bitgdi{000a0000}[10003b18].dll#<\DLL>2c  - Undefined Reference
-    #<DLL>bitgdi{000a0000}[10003b18].dll#<\DLL>e  - Undefined Reference
-    #<DLL>dfpaeabi{000a0000}.dll#<\DLL>13     - Undefined Reference
-    #<DLL>dfpaeabi{000a0000}.dll#<\DLL>14     - Undefined Reference
-    #<DLL>dfpaeabi{000a0000}.dll#<\DLL>16     - Undefined Reference
-    #<DLL>dfpaeabi{000a0000}.dll#<\DLL>17     - Undefined Reference
-    #<DLL>dfpaeabi{000a0000}.dll#<\DLL>18     - Undefined Reference
-    #<DLL>dfpaeabi{000a0000}.dll#<\DLL>19     - Undefined Reference
-    #<DLL>dfpaeabi{000a0000}.dll#<\DLL>2      - Undefined Reference
-    #<DLL>dfpaeabi{000a0000}.dll#<\DLL>24     - Undefined Reference
-    #<DLL>dfpaeabi{000a0000}.dll#<\DLL>29     - Undefined Reference
-    #<DLL>dfpaeabi{000a0000}.dll#<\DLL>3      - Undefined Reference
-    #<DLL>dfpaeabi{000a0000}.dll#<\DLL>5      - Undefined Reference
-    #<DLL>dfpaeabi{000a0000}.dll#<\DLL>8      - Undefined Reference
-    #<DLL>dfpaeabi{000a0000}.dll#<\DLL>c      - Undefined Reference
-    #<DLL>drtaeabi{000a0000}.dll#<\DLL>87     - Undefined Reference
-    #<DLL>drtaeabi{000a0000}.dll#<\DLL>93     - Undefined Reference
-    #<DLL>drtaeabi{000a0000}.dll#<\DLL>9e     - Undefined Reference
-    #<DLL>drtaeabi{000a0000}.dll#<\DLL>9f     - Undefined Reference
-    #<DLL>drtaeabi{000a0000}.dll#<\DLL>b4     - Undefined Reference
-    #<DLL>drtaeabi{000a0000}.dll#<\DLL>b7     - Undefined Reference
-    #<DLL>drtaeabi{000a0000}.dll#<\DLL>b8     - Undefined Reference
-    #<DLL>efsrv{000a0000}[100039e4].dll#<\DLL>44  - Undefined Reference
-    #<DLL>efsrv{000a0000}[100039e4].dll#<\DLL>73  - Undefined Reference
-    #<DLL>efsrv{000a0000}[100039e4].dll#<\DLL>76  - Undefined Reference
-    #<DLL>efsrv{000a0000}[100039e4].dll#<\DLL>b5  - Undefined Reference
-    #<DLL>efsrv{000a0000}[100039e4].dll#<\DLL>b6  - Undefined Reference
-    #<DLL>efsrv{000a0000}[100039e4].dll#<\DLL>be  - Undefined Reference
-    #<DLL>efsrv{000a0000}[100039e4].dll#<\DLL>c8  - Undefined Reference
-    #<DLL>efsrv{000a0000}[100039e4].dll#<\DLL>cc  - Undefined Reference
-    #<DLL>eposlandmarks{000a0000}[101fdf8a].dll#<\DLL>32  - Undefined Reference
-    #<DLL>eposlandmarks{000a0000}[101fdf8a].dll#<\DLL>33  - Undefined Reference
-    #<DLL>eposlandmarks{000a0000}[101fdf8a].dll#<\DLL>38  - Undefined Reference
-    #<DLL>eposlandmarks{000a0000}[101fdf8a].dll#<\DLL>4  - Undefined Reference
-    #<DLL>eposlandmarks{000a0000}[101fdf8a].dll#<\DLL>41  - Undefined Reference
-    #<DLL>eposlandmarks{000a0000}[101fdf8a].dll#<\DLL>42  - Undefined Reference
-    #<DLL>eposlandmarks{000a0000}[101fdf8a].dll#<\DLL>43  - Undefined Reference
-    #<DLL>eposlandmarks{000a0000}[101fdf8a].dll#<\DLL>44  - Undefined Reference
-    #<DLL>eposlandmarks{000a0000}[101fdf8a].dll#<\DLL>4b  - Undefined Reference
-    #<DLL>eposlandmarks{000a0000}[101fdf8a].dll#<\DLL>52  - Undefined Reference
-    #<DLL>eposlandmarks{000a0000}[101fdf8a].dll#<\DLL>6  - Undefined Reference
-    #<DLL>eposlandmarks{000a0000}[101fdf8a].dll#<\DLL>8  - Undefined Reference
-    #<DLL>eposlandmarks{000a0000}[101fdf8a].dll#<\DLL>c  - Undefined Reference
-    #<DLL>eposlandmarks{000a0000}[101fdf8a].dll#<\DLL>e  - Undefined Reference
-    #<DLL>eposlandmarks{000a0000}[101fdf8a].dll#<\DLL>f  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>1a8  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>1d0  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>1d7  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>1d8  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>1dc  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>1e1  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>227  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>251  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>289  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>28e  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>29d  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>2e  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>2f  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>30  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>31  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>32  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>338  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>33a  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>346  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>347  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>349  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>37  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>3a8  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>3b9  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>3c0  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>3c6  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>3c8  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>3cd  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>3d8  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>41b  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>423  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>431  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>432  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>440  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>442  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>443  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>446  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>45c  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>45f  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>493  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>494  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>51  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>5e3  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>5e6  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>636  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>639  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>659  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>66e  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>670  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>671  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>673  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>6d9  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>70e  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>717  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>71d  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>722  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>78  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>80c  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>80d  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>822  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>84b  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>84d  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>850  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>cb  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>cd  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>cf  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>d0  - Undefined Reference
-    #<DLL>euser{000a0000}[100039e5].dll#<\DLL>d1  - Undefined Reference
-    #<DLL>gdi{000a0000}[10003b15].dll#<\DLL>137  - Undefined Reference
-    #<DLL>gdi{000a0000}[10003b15].dll#<\DLL>13a  - Undefined Reference
-    #<DLL>lbs{000a0000}[101f97b1].dll#<\DLL>11  - Undefined Reference
-    #<DLL>lbs{000a0000}[101f97b1].dll#<\DLL>12f  - Undefined Reference
-    #<DLL>lbs{000a0000}[101f97b1].dll#<\DLL>130  - Undefined Reference
-    #<DLL>lbs{000a0000}[101f97b1].dll#<\DLL>15  - Undefined Reference
-    #<DLL>lbs{000a0000}[101f97b1].dll#<\DLL>17  - Undefined Reference
-    #<DLL>lbs{000a0000}[101f97b1].dll#<\DLL>1c  - Undefined Reference
-    #<DLL>lbs{000a0000}[101f97b1].dll#<\DLL>2f  - Undefined Reference
-    #<DLL>lbs{000a0000}[101f97b1].dll#<\DLL>30  - Undefined Reference
-    #<DLL>lbs{000a0000}[101f97b1].dll#<\DLL>31  - Undefined Reference
-    #<DLL>lbs{000a0000}[101f97b1].dll#<\DLL>52  - Undefined Reference
-    #<DLL>lbs{000a0000}[101f97b1].dll#<\DLL>53  - Undefined Reference
-    #<DLL>lbs{000a0000}[101f97b1].dll#<\DLL>57  - Undefined Reference
-    #<DLL>lbs{000a0000}[101f97b1].dll#<\DLL>61  - Undefined Reference
-    #<DLL>lbs{000a0000}[101f97b1].dll#<\DLL>7  - Undefined Reference
-    #<DLL>lbs{000a0000}[101f97b1].dll#<\DLL>8  - Undefined Reference
-    #<DLL>lbs{000a0000}[101f97b1].dll#<\DLL>98  - Undefined Reference
-    #<DLL>lbs{000a0000}[101f97b1].dll#<\DLL>a  - Undefined Reference
-    #<DLL>lbs{000a0000}[101f97b1].dll#<\DLL>a7  - Undefined Reference
-    #<DLL>lbs{000a0000}[101f97b1].dll#<\DLL>b4  - Undefined Reference
-    #<DLL>lbs{000a0000}[101f97b1].dll#<\DLL>b5  - Undefined Reference
-    #<DLL>lbs{000a0000}[101f97b1].dll#<\DLL>cd  - Undefined Reference
-    #<DLL>lbs{000a0000}[101f97b1].dll#<\DLL>cf  - Undefined Reference
-    #<DLL>lbs{000a0000}[101f97b1].dll#<\DLL>d  - Undefined Reference
-    #<DLL>lbs{000a0000}[101f97b1].dll#<\DLL>d6  - Undefined Reference
-    #<DLL>lbs{000a0000}[101f97b1].dll#<\DLL>da  - Undefined Reference
-    #<DLL>lbs{000a0000}[101f97b1].dll#<\DLL>db  - Undefined Reference
-    #<DLL>lbs{000a0000}[101f97b1].dll#<\DLL>df  - Undefined Reference
-    #<DLL>lbs{000a0000}[101f97b1].dll#<\DLL>e1  - Undefined Reference
-    #<DLL>lbs{000a0000}[101f97b1].dll#<\DLL>e2  - Undefined Reference
-    #<DLL>lbs{000a0000}[101f97b1].dll#<\DLL>f  - Undefined Reference
-    #<DLL>mnservicelib{000a0000}[10206903].dll#<\DLL>3  - Undefined Reference
-    #<DLL>mnservicelib{000a0000}[10206903].dll#<\DLL>37  - Undefined Reference
-    #<DLL>mnservicelib{000a0000}[10206903].dll#<\DLL>39  - Undefined Reference
-    #<DLL>mnservicelib{000a0000}[10206903].dll#<\DLL>5  - Undefined Reference
-    #<DLL>mnservicelib{000a0000}[10206903].dll#<\DLL>6  - Undefined Reference
-    #<DLL>mnservicelib{000a0000}[10206903].dll#<\DLL>8  - Undefined Reference
-    #<DLL>mnservicelib{000a0000}[10206903].dll#<\DLL>9  - Undefined Reference
-    #<DLL>mnservicelib{000a0000}[10206903].dll#<\DLL>a  - Undefined Reference
-    #<DLL>mnservicelib{000a0000}[10206903].dll#<\DLL>d  - Undefined Reference
-    #<DLL>scppnwdl{000a0000}.dll#<\DLL>3      - Undefined Reference
-    SHT$$INIT_ARRAY$$Base                     - Undefined Weak Reference
-    SHT$$INIT_ARRAY$$Limit                    - Undefined Weak Reference
-    typeinfo for XLeaveException              - Undefined Reference
-    typeinfo for CBase                        - Undefined Reference
-    typeinfo for CActive                      - Undefined Reference
-    vtable for __cxxabiv1::__class_type_info  - Undefined Reference
-    vtable for __cxxabiv1::__si_class_type_info  - Undefined Reference
-    vtable for __cxxabiv1::__vmi_class_type_info  - Undefined Reference
-    _fp_init                                  - Undefined Weak Reference
-    run_static_dtors                          - Undefined Weak Reference
-    Image$$ER_RO$$Base                       0x00008000   Number         0  anon$$obj.o(linker$$defined$$symbols)
-    _E32Dll                                  0x00008000   ARM Code      40  uc_dll_.o(.emb_text)
-    Symbian$$CPP$$Exception$$Descriptor      0x00008014   Data           0  uc_dll_.o(.emb_text)
-    __cpp_initialize__aeabi_                 0x00008028   ARM Code      72  ucppinit_aeabi.o(.emb_text)
-    CMnrpEngine::ConstructL()                0x00008071   Thumb Code    18  mnrefproviderengine.in(.text)
-    std::nothrow                             0x00008071   Thumb Code     0  ucppinit_aeabi.o(.emb_text)
-    CMnrpEngine::CMnrpEngine()               0x00008083   Thumb Code    22  mnrefproviderengine.in(.text)
-    CMnrpEngine::CMnrpEngine__sub_object()   0x00008083   Thumb Code     0  mnrefproviderengine.in(.text)
-    CMnrpEngine::NewL()                      0x00008099   Thumb Code    32  mnrefproviderengine.in(.text)
-    CMnrpEngine::~CMnrpEngine()              0x000080b9   Thumb Code    74  mnrefproviderengine.in(.text)
-    CMnrpEngine::~CMnrpEngine__sub_object()  0x000080b9   Thumb Code     0  mnrefproviderengine.in(.text)
-    CMnrpEngine::~CMnrpEngine__deallocating() 0x00008103   Thumb Code    16  mnrefproviderengine.in(.text)
-    CMnrpEngine::ReadPlacesResourceL(RResourceReader&) 0x00008113   Thumb Code   154  mnrefproviderengine.in(.text)
-    CMnrpEngine::FindResourceFileL(const TDesC16&, TBuf<(int)256>&) 0x000081ad   Thumb Code   118  mnrefproviderengine.in(.text)
-    CMnrpEngine::LoadKnownPlacesL()          0x00008223   Thumb Code    94  mnrefproviderengine.in(.text)
-    CMnrpEngine::KnownPlacesL()              0x00008281   Thumb Code    76  mnrefproviderengine.in(.text)
-    CMnrpEngine::AddressToCoordL(const CPosLandmark&) 0x000082cd   Thumb Code   124  mnrefproviderengine.in(.text)
-    CMnrpEngine::AddressToCoordLC(const CPosLandmark&) 0x00008349   Thumb Code    32  mnrefproviderengine.in(.text)
-    CMnrpEngine::AddressToCoordL(const TDesC16&) 0x00008369   Thumb Code   124  mnrefproviderengine.in(.text)
-    CMnrpEngine::AddressToCoordLC(const TDesC16&) 0x000083e5   Thumb Code    32  mnrefproviderengine.in(.text)
-    CMnrpEngine::CreateCloseLandmarkLC(const CPosLandmark&, float) 0x00008405   Thumb Code   178  mnrefproviderengine.in(.text)
-    CMnrpEngine::DistanceBetweenLandmarks(const CPosLandmark&, const CPosLandmark&) 0x000084b7   Thumb Code    86  mnrefproviderengine.in(.text)
-    CMnrpEngine::FindClosestPoisL(const CPosLandmark&, RArray<CMnrpEngine::TDistanceToPoi>&, int) 0x0000850d   Thumb Code   178  mnrefproviderengine.in(.text)
-    CMnrpEngine::CoordToAddressLC(const TCoordinate&) 0x000085bf   Thumb Code   124  mnrefproviderengine.in(.text)
-    CMnrpEngine::Fs()                        0x0000863b   Thumb Code     4  mnrefproviderengine.in(.text)
-    CMnrpEngine::BestCoordToAddressMatchesL(const TCoordinate&, RPointerArray<CPosLandmark>&, int) 0x0000863f   Thumb Code   136  mnrefproviderengine.in(.text)
-    AbsoluteToImage(TRealPoint, double)      0x000086c9   Thumb Code    74  mnrefproviderengine.in(.text)
-    TRealPoint::TRealPoint()                 0x00008713   Thumb Code    40  mnrefproviderengine.in(.text)
-    TRealPoint::TRealPoint__sub_object()     0x00008713   Thumb Code     0  mnrefproviderengine.in(.text)
-    TRealPoint::TRealPoint(double, double)   0x0000873b   Thumb Code    16  mnrefproviderengine.in(.text)
-    TRealPoint::TRealPoint__sub_object(double, double) 0x0000873b   Thumb Code     0  mnrefproviderengine.in(.text)
-    TRealPoint::TRealPoint(TCoordinate)      0x0000874b   Thumb Code    36  mnrefproviderengine.in(.text)
-    TRealPoint::TRealPoint__sub_object(TCoordinate) 0x0000874b   Thumb Code     0  mnrefproviderengine.in(.text)
-    TRealPoint::operator +(const TRealPoint&) 0x0000876f   Thumb Code    54  mnrefproviderengine.in(.text)
-    TRealPoint::operator -(const TRealPoint&) 0x000087a5   Thumb Code    52  mnrefproviderengine.in(.text)
-    TRealPoint::operator *(const double&)    0x000087d9   Thumb Code    58  mnrefproviderengine.in(.text)
-    TRealPoint::operator /(const double&)    0x00008813   Thumb Code    56  mnrefproviderengine.in(.text)
-    TRealPoint::Set(double, double)          0x0000884b   Thumb Code    16  mnrefproviderengine.in(.text)
-    TRealPoint::Coordinate()                 0x0000885b   Thumb Code    30  mnrefproviderengine.in(.text)
-    TRealPoint::IsValid()                    0x00008879   Thumb Code    32  mnrefproviderengine.in(.text)
-    CMnrpMapModel::CDrawItem::SetAbsolutePosition(const TLocality&) 0x00008899   Thumb Code    44  mnrefproviderengine.in(.text)
-    CMnrpMapModel::CDrawItem::NewLC(const CPosLandmark&) 0x000088c5   Thumb Code   146  mnrefproviderengine.in(.text)
-    CMnrpMapModel::AddCitiesL()              0x00008957   Thumb Code    64  mnrefproviderengine.in(.text)
-    CMnrpMapModel::ConstructL()              0x00008997   Thumb Code    62  mnrefproviderengine.in(.text)
-    CMnrpMapModel::CMnrpMapModel(MMapModelObserver&, CMnrpEngine&) 0x000089d5   Thumb Code   102  mnrefproviderengine.in(.text)
-    CMnrpMapModel::CMnrpMapModel__sub_object(MMapModelObserver&, CMnrpEngine&) 0x000089d5   Thumb Code     0  mnrefproviderengine.in(.text)
-    CMnrpMapModel::NewL(MMapModelObserver&, CMnrpEngine&) 0x00008a3b   Thumb Code    40  mnrefproviderengine.in(.text)
-    CMnrpMapModel::CMnrpMapModel(CMnrpEngine&) 0x00008a63   Thumb Code   150  mnrefproviderengine.in(.text)
-    CMnrpMapModel::CMnrpMapModel__sub_object(CMnrpEngine&) 0x00008a63   Thumb Code     0  mnrefproviderengine.in(.text)
-    CMnrpMapModel::NewL(CMnrpEngine&)        0x00008af9   Thumb Code    36  mnrefproviderengine.in(.text)
-    CMnrpMapModel::~CMnrpMapModel()          0x00008b1d   Thumb Code    40  mnrefproviderengine.in(.text)
-    CMnrpMapModel::~CMnrpMapModel__sub_object() 0x00008b1d   Thumb Code     0  mnrefproviderengine.in(.text)
-    CMnrpMapModel::~CMnrpMapModel__deallocating() 0x00008b45   Thumb Code    16  mnrefproviderengine.in(.text)
-    CMnrpMapModel::Height() const            0x00008b55   Thumb Code    22  mnrefproviderengine.in(.text)
-    CMnrpMapModel::Bottom() const            0x00008b6b   Thumb Code    28  mnrefproviderengine.in(.text)
-    CMnrpMapModel::Top() const               0x00008b87   Thumb Code    28  mnrefproviderengine.in(.text)
-    CMnrpMapModel::Width() const             0x00008ba3   Thumb Code    22  mnrefproviderengine.in(.text)
-    CMnrpMapModel::Right() const             0x00008bb9   Thumb Code    28  mnrefproviderengine.in(.text)
-    CMnrpMapModel::Left() const              0x00008bd5   Thumb Code    28  mnrefproviderengine.in(.text)
-    CMnrpMapModel::MaxScale() const          0x00008bf1   Thumb Code    60  mnrefproviderengine.in(.text)
-    CMnrpMapModel::CheckBorders()            0x00008c2d   Thumb Code   240  mnrefproviderengine.in(.text)
-    CMnrpMapModel::AdjustBoundingBox(CMnrpMapModel::CDrawItem&, TRealPoint&, TRealPoint&) 0x00008d1d   Thumb Code   166  mnrefproviderengine.in(.text)
-    CMnrpMapModel::CheckDrawItemHasPositionL(CMnrpMapModel::CDrawItem&, const CPosLandmark&) 0x00008dc3   Thumb Code    90  mnrefproviderengine.in(.text)
-    CMnrpMapModel::CDrawItem::NewLC(const CPosLandmark&, CPosLmCategoryManager&) 0x00008e1d   Thumb Code   134  mnrefproviderengine.in(.text)
-    CMnrpMapModel::UpdateModelL(CMnrpMapViewService&) 0x00008ea3   Thumb Code   802  mnrefproviderengine.in(.text)
-    CMnrpMapModel::SetScreenSize(TSize)      0x000091c5   Thumb Code    14  mnrefproviderengine.in(.text)
-    CMnrpMapModel::UpdateModel(const TMnMapImageParams&) 0x000091d3   Thumb Code   178  mnrefproviderengine.in(.text)
-    CMnrpMapModel::UpdateModelL(const CMnrpMapImageService&) 0x00009285   Thumb Code   278  mnrefproviderengine.in(.text)
-    CMnrpMapModel::AbsoluteToScreen(TRealPoint) const 0x0000939b   Thumb Code   106  mnrefproviderengine.in(.text)
-    CMnrpMapModel::AbsoluteToScreen(TCoordinate) const 0x00009405   Thumb Code    84  mnrefproviderengine.in(.text)
-    CMnrpMapModel::CurrentLocation() const   0x00009459   Thumb Code   216  mnrefproviderengine.in(.text)
-    CMnrpMapModel::DrawCurrentLocation(CFbsBitGc&, const TSize&) const 0x00009531   Thumb Code   176  mnrefproviderengine.in(.text)
-    CMnrpMapModel::Items() const             0x000095e1   Thumb Code    88  mnrefproviderengine.in(.text)
-    CMnrpMapModel::DrawLandmarks(CFbsBitGc&, CFont&, const TSize&, int) const 0x00009639   Thumb Code   672  mnrefproviderengine.in(.text)
-    CMnrpMapModel::DrawHorizontalLine(CFbsBitGc&, int, TSize) const 0x000098d9   Thumb Code    28  mnrefproviderengine.in(.text)
-    CMnrpMapModel::DrawVerticalLine(CFbsBitGc&, int, TSize) const 0x000098f5   Thumb Code    30  mnrefproviderengine.in(.text)
-    CMnrpMapModel::DrawGrid(CFbsBitGc&, const TSize&, CMnrpMapModel::TGrid&) const 0x00009913   Thumb Code   128  mnrefproviderengine.in(.text)
-    CMnrpMapModel::AbsoluteToScreen(double) const 0x00009993   Thumb Code    24  mnrefproviderengine.in(.text)
-    CMnrpMapModel::GetGrid(CMnrpMapModel::TGrid&) const 0x000099ab   Thumb Code   348  mnrefproviderengine.in(.text)
-    CMnrpMapModel::RenderL(CFbsBitmap&, TRect, CFont*, CFont*) const 0x00009b07   Thumb Code   204  mnrefproviderengine.in(.text)
-    CMnrpMapModel::NumIgnoredLandmarks()     0x00009bd3   Thumb Code     6  mnrefproviderengine.in(.text)
-    CMnrpMapModel::Zoom(double)              0x00009bd9   Thumb Code    28  mnrefproviderengine.in(.text)
-    CMnrpMapModel::MoveTo(TCoordinate)       0x00009bf5   Thumb Code    54  mnrefproviderengine.in(.text)
-    CMnrpMapModel::GoCenter()                0x00009c2b   Thumb Code    32  mnrefproviderengine.in(.text)
-    CMnrpMapModel::ScreenToAbsolute(TPoint) const 0x00009c4b   Thumb Code   108  mnrefproviderengine.in(.text)
-    CMnrpMapModel::ScreenToAbsolute(int) const 0x00009cb7   Thumb Code    58  mnrefproviderengine.in(.text)
-    CMnrpMapModel::Center() const            0x00009cf1   Thumb Code    32  mnrefproviderengine.in(.text)
-    CMnrpMapModel::HandlePositionRequestCompletedL(int) 0x00009d11   Thumb Code    54  mnrefproviderengine.in(.text)
-    thunk{-4} to CMnrpMapModel::HandlePositionRequestCompletedL(int) 0x00009d47   Thumb Code     4  mnrefproviderengine.in(.text)
-    CMnrpMapModel::CDrawItem::~CDrawItem()   0x00009d4b   Thumb Code    56  mnrefproviderengine.in(.text)
-    CMnrpMapModel::CDrawItem::~CDrawItem__sub_object() 0x00009d4b   Thumb Code     0  mnrefproviderengine.in(.text)
-    CMnrpMapModel::CDrawItem::~CDrawItem__deallocating() 0x00009d83   Thumb Code    16  mnrefproviderengine.in(.text)
-    CMnrpPositionRequest::SetOptionsL(const TPositionUpdateOptionsBase&) 0x00009d99   Thumb Code    14  mnrefproviderengine.in(.text)
-    CMnrpPositionRequest::ConstructL(const TDesC16&) 0x00009da7   Thumb Code    94  mnrefproviderengine.in(.text)
-    CMnrpPositionRequest::CMnrpPositionRequest(MMnrpPositionObserver&) 0x00009e05   Thumb Code   106  mnrefproviderengine.in(.text)
-    CMnrpPositionRequest::CMnrpPositionRequest__sub_object(MMnrpPositionObserver&) 0x00009e05   Thumb Code     0  mnrefproviderengine.in(.text)
-    CMnrpPositionRequest::NewL(const TDesC16&, MMnrpPositionObserver&) 0x00009e6f   Thumb Code    40  mnrefproviderengine.in(.text)
-    CMnrpPositionRequest::~CMnrpPositionRequest() 0x00009e97   Thumb Code    44  mnrefproviderengine.in(.text)
-    CMnrpPositionRequest::~CMnrpPositionRequest__sub_object() 0x00009e97   Thumb Code     0  mnrefproviderengine.in(.text)
-    CMnrpPositionRequest::~CMnrpPositionRequest__deallocating() 0x00009ec3   Thumb Code    16  mnrefproviderengine.in(.text)
-    CMnrpPositionRequest::InitContainer(HPositionGenericInfo&) 0x00009ed3   Thumb Code    56  mnrefproviderengine.in(.text)
-    CMnrpPositionRequest::ExecuteNextStep()  0x00009f0b   Thumb Code    74  mnrefproviderengine.in(.text)
-    CMnrpPositionRequest::FetchNewPosition(int) 0x00009f55   Thumb Code    28  mnrefproviderengine.in(.text)
-    CMnrpPositionRequest::GetPosition(TPositionInfo&) 0x00009f71   Thumb Code    18  mnrefproviderengine.in(.text)
-    CMnrpPositionRequest::Speed()            0x00009f83   Thumb Code     6  mnrefproviderengine.in(.text)
-    CMnrpPositionRequest::Heading()          0x00009f89   Thumb Code     6  mnrefproviderengine.in(.text)
-    CMnrpPositionRequest::MagneticHeading()  0x00009f8f   Thumb Code     6  mnrefproviderengine.in(.text)
-    CMnrpPositionRequest::Course()           0x00009f95   Thumb Code     6  mnrefproviderengine.in(.text)
-    CMnrpPositionRequest::MagneticCourse()   0x00009f9b   Thumb Code     6  mnrefproviderengine.in(.text)
-    CMnrpPositionRequest::DoCancel()         0x00009fa1   Thumb Code    36  mnrefproviderengine.in(.text)
-    CMnrpPositionRequest::SaveContainer(const HPositionGenericInfo&) 0x00009fc5   Thumb Code   116  mnrefproviderengine.in(.text)
-    CMnrpPositionRequest::RunL()             0x0000a039   Thumb Code    64  mnrefproviderengine.in(.text)
-    CMnrpPositionRequest::RunError(int)      0x0000a079   Thumb Code     4  mnrefproviderengine.in(.text)
-    MnrpUtils::CoordinateToString(double, TDes16&, int, int) 0x0000a08d   Thumb Code   426  mnrefproviderengine.in(.text)
-    MnrpUtils::DistanceToString(double, TDes16&) 0x0000a237   Thumb Code   164  mnrefproviderengine.in(.text)
-    MnrpUtils::AngleToString(double, TDes16&) 0x0000a2db   Thumb Code   260  mnrefproviderengine.in(.text)
-    MnrpUtils::SpeedToString(double, TDes16&) 0x0000a3df   Thumb Code    66  mnrefproviderengine.in(.text)
-    MnrpUtils::PrintableStringLC(const TDesC16&) 0x0000a421   Thumb Code   204  mnrefproviderengine.in(.text)
-    _E32Dll_Body                             0x0000a4ed   Thumb Code    34  uc_dll.o(.text)
-    __DLL_Export_Table__                     0x0000a580   ARM Code       0  mnrefproviderengine{000a0000}.exp(ExportTable)
-    DLL##ExportTableSize                     0x0000a584   Data           0  mnrefproviderengine{000a0000}.exp(ExportTable)
-    DLL##ExportTable                         0x0000a588   Data           0  mnrefproviderengine{000a0000}.exp(ExportTable)
-    TRealX::SetNaN()                         0x0000a680   ARM Code       0  euser{000a0000}-1051.o(StubCode)
-    TRealX::TRealX()                         0x0000a688   ARM Code       0  euser{000a0000}-1059.o(StubCode)
-    TRealX::operator double() const          0x0000a690   ARM Code       0  euser{000a0000}-1073.o(StubCode)
-    TRealX::operator float() const           0x0000a698   ARM Code       0  euser{000a0000}-1074.o(StubCode)
-    CActive::Cancel()                        0x0000a6a0   ARM Code       0  euser{000a0000}-1088.o(StubCode)
-    CActive::SetActive()                     0x0000a6a8   ARM Code       0  euser{000a0000}-1090.o(StubCode)
-    CActive::CActive__sub_object(int)        0x0000a6b0   ARM Code       0  euser{000a0000}-1091.o(StubCode)
-    CActive::~CActive__sub_object()          0x0000a6b8   ARM Code       0  euser{000a0000}-1094.o(StubCode)
-    HBufC16::Des()                           0x0000a6c0   ARM Code       0  euser{000a0000}-1116.o(StubCode)
-    HBufC16::NewLC(int)                      0x0000a6c8   ARM Code       0  euser{000a0000}-1119.o(StubCode)
-    TPtrC16::TPtrC16(const TDesC16&)         0x0000a6d0   ARM Code       0  euser{000a0000}-1171.o(StubCode)
-    TPtrC16::TPtrC16()                       0x0000a6d8   ARM Code       0  euser{000a0000}-1172.o(StubCode)
-    RHandleBase::Close()                     0x0000a6e0   ARM Code       0  euser{000a0000}-120.o(StubCode)
-    RArrayBase::At(int) const                0x0000a6e8   ARM Code       0  euser{000a0000}-1507.o(StubCode)
-    RArrayBase::Count() const                0x0000a6f0   ARM Code       0  euser{000a0000}-1510.o(StubCode)
-    RPointerArrayBase::At(int) const         0x0000a6f8   ARM Code       0  euser{000a0000}-1590.o(StubCode)
-    RPointerArrayBase::Count() const         0x0000a700   ARM Code       0  euser{000a0000}-1593.o(StubCode)
-    TChar::IsPrint() const                   0x0000a708   ARM Code       0  euser{000a0000}-1625.o(StubCode)
-    TRect::Intersects(const TRect&) const    0x0000a710   ARM Code       0  euser{000a0000}-1646.o(StubCode)
-    TRect::Size() const                      0x0000a718   ARM Code       0  euser{000a0000}-1648.o(StubCode)
-    TRect::Width() const                     0x0000a720   ARM Code       0  euser{000a0000}-1649.o(StubCode)
-    TRect::Height() const                    0x0000a728   ARM Code       0  euser{000a0000}-1651.o(StubCode)
-    TPoint::operator +(const TPoint&) const  0x0000a730   ARM Code       0  euser{000a0000}-1753.o(StubCode)
-    TDesC16::AtC(int) const                  0x0000a738   ARM Code       0  euser{000a0000}-1806.o(StubCode)
-    TDesC16::FindF(const TDesC16&) const     0x0000a740   ARM Code       0  euser{000a0000}-1815.o(StubCode)
-    TDesC16::AllocLC() const                 0x0000a748   ARM Code       0  euser{000a0000}-1821.o(StubCode)
-    TDesC16::CompareF(const TDesC16&) const  0x0000a750   ARM Code       0  euser{000a0000}-1826.o(StubCode)
-    CleanupStack::PopAndDestroy()            0x0000a758   ARM Code       0  euser{000a0000}-203.o(StubCode)
-    CleanupStack::Pop()                      0x0000a760   ARM Code       0  euser{000a0000}-205.o(StubCode)
-    User::MarkCleanupStack()                 0x0000a768   ARM Code       0  euser{000a0000}-2060.o(StubCode)
-    User::UnMarkCleanupStack(TTrapHandler*)  0x0000a770   ARM Code       0  euser{000a0000}-2061.o(StubCode)
-    CleanupStack::PushL(TCleanupItem)        0x0000a778   ARM Code       0  euser{000a0000}-207.o(StubCode)
-    CleanupStack::PushL(CBase*)              0x0000a780   ARM Code       0  euser{000a0000}-208.o(StubCode)
-    XLeaveException::GetReason() const       0x0000a788   ARM Code       0  euser{000a0000}-2082.o(StubCode)
-    CleanupStack::PushL(void*)               0x0000a790   ARM Code       0  euser{000a0000}-209.o(StubCode)
-    CBase::Extension_(unsigned, void*&, void*) 0x0000a798   ARM Code       0  euser{000a0000}-2123.o(StubCode)
-    CBase::~CBase()                          0x0000a7a0   ARM Code       0  euser{000a0000}-2125.o(StubCode)
-    CActive::Extension_(unsigned, void*&, void*) 0x0000a7a8   ARM Code       0  euser{000a0000}-2128.o(StubCode)
-    CActiveScheduler::Add(CActive*)          0x0000a7b0   ARM Code       0  euser{000a0000}-424.o(StubCode)
-    RArrayBase::Close()                      0x0000a7b8   ARM Code       0  euser{000a0000}-46.o(StubCode)
-    RPointerArrayBase::GetElementPtr(const CBase*, int) 0x0000a7c0   ARM Code       0  euser{000a0000}-464.o(StubCode)
-    RArrayBase::Reset()                      0x0000a7c8   ARM Code       0  euser{000a0000}-47.o(StubCode)
-    RPointerArrayBase::Reset()               0x0000a7d0   ARM Code       0  euser{000a0000}-471.o(StubCode)
-    RPointerArrayBase::Append(const void*)   0x0000a7d8   ARM Code       0  euser{000a0000}-472.o(StubCode)
-    RPointerArrayBase::GetCount(const CBase*) 0x0000a7e0   ARM Code       0  euser{000a0000}-476.o(StubCode)
-    RArrayBase::Append(const void*)          0x0000a7e8   ARM Code       0  euser{000a0000}-48.o(StubCode)
-    RPointerArrayBase::RPointerArrayBase()   0x0000a7f0   ARM Code       0  euser{000a0000}-481.o(StubCode)
-    RArrayBase::Insert(const void*, int)     0x0000a7f8   ARM Code       0  euser{000a0000}-49.o(StubCode)
-    RArrayBase::Remove(int)                  0x0000a800   ARM Code       0  euser{000a0000}-50.o(StubCode)
-    RArrayBase::RArrayBase(int)              0x0000a808   ARM Code       0  euser{000a0000}-55.o(StubCode)
-    Math::IsNaN(const double&)               0x0000a810   ARM Code       0  euser{000a0000}-551.o(StubCode)
-    User::LeaveIfError(int)                  0x0000a818   ARM Code       0  euser{000a0000}-593.o(StubCode)
-    User::Leave(int)                         0x0000a820   ARM Code       0  euser{000a0000}-649.o(StubCode)
-    User::AllocZL(int)                       0x0000a828   ARM Code       0  euser{000a0000}-654.o(StubCode)
-    User::Invariant()                        0x0000a830   ARM Code       0  euser{000a0000}-669.o(StubCode)
-    TBufBase16::TBufBase16(int)              0x0000a838   ARM Code       0  euser{000a0000}-81.o(StubCode)
-    TRect::Grow(int, int)                    0x0000a840   ARM Code       0  euser{000a0000}-824.o(StubCode)
-    TRect::Move(int, int)                    0x0000a848   ARM Code       0  euser{000a0000}-826.o(StubCode)
-    TRect::TRect(const TSize&)               0x0000a850   ARM Code       0  euser{000a0000}-838.o(StubCode)
-    TRect::TRect(const TPoint&, const TSize&) 0x0000a858   ARM Code       0  euser{000a0000}-839.o(StubCode)
-    TRect::TRect(int, int, int, int)         0x0000a860   ARM Code       0  euser{000a0000}-841.o(StubCode)
-    TDes16::AppendFormat(TRefByValue<const TDesC16>, ...) 0x0000a868   ARM Code       0  euser{000a0000}-936.o(StubCode)
-    TDes16::Copy(const TDesC16&)             0x0000a870   ARM Code       0  euser{000a0000}-953.o(StubCode)
-    TDes16::Zero()                           0x0000a878   ARM Code       0  euser{000a0000}-960.o(StubCode)
-    TDes16::Append(TChar)                    0x0000a880   ARM Code       0  euser{000a0000}-966.o(StubCode)
-    TDes16::Append(const TDesC16&)           0x0000a888   ARM Code       0  euser{000a0000}-968.o(StubCode)
-    TDes16::Format(TRefByValue<const TDesC16>, ...) 0x0000a890   ARM Code       0  euser{000a0000}-973.o(StubCode)
-    TDes16::AppendNum(long long)             0x0000a898   ARM Code       0  euser{000a0000}-984.o(StubCode)
-    TParse::Set(const TDesC16&, const TDesC16*, const TDesC16*) 0x0000a8a0   ARM Code       0  efsrv{000a0000}-115.o(StubCode)
-    TParse::TParse()                         0x0000a8a8   ARM Code       0  efsrv{000a0000}-118.o(StubCode)
-    TFindFile::FindByDir(const TDesC16&, const TDesC16&) 0x0000a8b0   ARM Code       0  efsrv{000a0000}-181.o(StubCode)
-    TFindFile::TFindFile(RFs&)               0x0000a8b8   ARM Code       0  efsrv{000a0000}-182.o(StubCode)
-    TParseBase::NameAndExt() const           0x0000a8c0   ARM Code       0  efsrv{000a0000}-190.o(StubCode)
-    TParseBase::Path() const                 0x0000a8c8   ARM Code       0  efsrv{000a0000}-200.o(StubCode)
-    TParseBase::FullName() const             0x0000a8d0   ARM Code       0  efsrv{000a0000}-204.o(StubCode)
-    RFs::Connect(int)                        0x0000a8d8   ARM Code       0  efsrv{000a0000}-68.o(StubCode)
-    RResourceReader::ReadHBufCL()            0x0000a8e0   ARM Code       0  bafl{000a0000}-123.o(StubCode)
-    RResourceReader::ReadInt16L()            0x0000a8e8   ARM Code       0  bafl{000a0000}-124.o(StubCode)
-    RResourceReader::ReadReal64L()           0x0000a8f0   ARM Code       0  bafl{000a0000}-129.o(StubCode)
-    RResourceReader::OpenLC(const CResourceFile*, int) 0x0000a8f8   ARM Code       0  bafl{000a0000}-141.o(StubCode)
-    RResourceReader::RResourceReader()       0x0000a900   ARM Code       0  bafl{000a0000}-145.o(StubCode)
-    RResourceReader::~RResourceReader()      0x0000a908   ARM Code       0  bafl{000a0000}-147.o(StubCode)
-    CResourceFile::ConfirmSignatureL(int)    0x0000a910   ARM Code       0  bafl{000a0000}-59.o(StubCode)
-    CResourceFile::NewLC(RFs&, const TDesC16&, unsigned, int) 0x0000a918   ARM Code       0  bafl{000a0000}-62.o(StubCode)
-    AknIconUtils::CreateIconL(CFbsBitmap*&, CFbsBitmap*&, const TDesC16&, int, int) 0x0000a920   ARM Code       0  AknIcon{000a0000}-11.o(StubCode)
-    AknIconUtils::DestroyIconData(CFbsBitmap*) 0x0000a928   ARM Code       0  AknIcon{000a0000}-15.o(StubCode)
-    AknIconUtils::PreserveIconData(CFbsBitmap*) 0x0000a930   ARM Code       0  AknIcon{000a0000}-16.o(StubCode)
-    AknIconUtils::SetSize(CFbsBitmap*, const TSize&, TScaleMode) 0x0000a938   ARM Code       0  AknIcon{000a0000}-21.o(StubCode)
-    CFont::HeightInPixels() const            0x0000a940   ARM Code       0  gdi{000a0000}-311.o(StubCode)
-    CFont::TextWidthInPixels(const TDesC16&) const 0x0000a948   ARM Code       0  gdi{000a0000}-314.o(StubCode)
-    CFbsDevice::CreateContext(CFbsBitGc*&)   0x0000a950   ARM Code       0  bitgdi{000a0000}-14.o(StubCode)
-    CFbsBitmapDevice::NewL(CFbsBitmap*)      0x0000a958   ARM Code       0  bitgdi{000a0000}-44.o(StubCode)
-    CPosLandmark::NewL(const CPosLandmark&)  0x0000a960   ARM Code       0  eposlandmarks{000a0000}-12.o(StubCode)
-    CPosLandmark::NewLC(const CPosLandmark&) 0x0000a968   ARM Code       0  eposlandmarks{000a0000}-14.o(StubCode)
-    CPosLandmark::NewLC()                    0x0000a970   ARM Code       0  eposlandmarks{000a0000}-15.o(StubCode)
-    CPosLandmark::SetPositionL(const TLocality&) 0x0000a978   ARM Code       0  eposlandmarks{000a0000}-4.o(StubCode)
-    CPosLandmarkDatabase::OpenL(const TDesC16&) 0x0000a980   ARM Code       0  eposlandmarks{000a0000}-50.o(StubCode)
-    CPosLandmarkDatabase::OpenL()            0x0000a988   ARM Code       0  eposlandmarks{000a0000}-51.o(StubCode)
-    CPosLmCategoryManager::NewL(CPosLandmarkDatabase&) 0x0000a990   ARM Code       0  eposlandmarks{000a0000}-56.o(StubCode)
-    CPosLandmark::SetLandmarkNameL(const TDesC16&) 0x0000a998   ARM Code       0  eposlandmarks{000a0000}-6.o(StubCode)
-    CPosLandmark::GetPosition(TLocality&) const 0x0000a9a0   ARM Code       0  eposlandmarks{000a0000}-65.o(StubCode)
-    CPosLandmark::GetCategoriesL(RArray<unsigned long>&) const 0x0000a9a8   ARM Code       0  eposlandmarks{000a0000}-66.o(StubCode)
-    CPosLandmark::GetLandmarkName(TPtrC16&) const 0x0000a9b0   ARM Code       0  eposlandmarks{000a0000}-67.o(StubCode)
-    CPosLandmark::GetPositionField(unsigned short, TPtrC16&) const 0x0000a9b8   ARM Code       0  eposlandmarks{000a0000}-68.o(StubCode)
-    CPosLandmark::GetIcon(TPtrC16&, int&, int&) const 0x0000a9c0   ARM Code       0  eposlandmarks{000a0000}-75.o(StubCode)
-    CPosLandmark::SetPositionFieldL(unsigned short, const TDesC16&) 0x0000a9c8   ARM Code       0  eposlandmarks{000a0000}-8.o(StubCode)
-    CPosLandmarkCategory::GetIcon(TPtrC16&, int&, int&) const 0x0000a9d0   ARM Code       0  eposlandmarks{000a0000}-82.o(StubCode)
-    RPositioner::Open(RPositionServer&)      0x0000a9d8   ARM Code       0  lbs{000a0000}-10.o(StubCode)
-    RPositioner::Close()                     0x0000a9e0   ARM Code       0  lbs{000a0000}-13.o(StubCode)
-    RPositioner::RPositioner()               0x0000a9e8   ARM Code       0  lbs{000a0000}-15.o(StubCode)
-    TPositionUpdateOptions::TPositionUpdateOptions() 0x0000a9f0   ARM Code       0  lbs{000a0000}-152.o(StubCode)
-    RPositionerSubSessionBase::CancelRequest(int) 0x0000a9f8   ARM Code       0  lbs{000a0000}-167.o(StubCode)
-    TCoordinate::SetCoordinate(const double&, const double&) 0x0000aa00   ARM Code       0  lbs{000a0000}-17.o(StubCode)
-    TPositionUpdateOptionsBase::SetUpdateTimeOut(TTimeIntervalMicroSeconds) 0x0000aa08   ARM Code       0  lbs{000a0000}-180.o(StubCode)
-    TPositionUpdateOptionsBase::SetUpdateInterval(TTimeIntervalMicroSeconds) 0x0000aa10   ARM Code       0  lbs{000a0000}-181.o(StubCode)
-    TLocality::TLocality(const TCoordinate&, float) 0x0000aa18   ARM Code       0  lbs{000a0000}-205.o(StubCode)
-    TLocality::TLocality()                   0x0000aa20   ARM Code       0  lbs{000a0000}-207.o(StubCode)
-    TCoordinate::TCoordinate(const double&, const double&) 0x0000aa28   ARM Code       0  lbs{000a0000}-21.o(StubCode)
-    TPosition::TPosition()                   0x0000aa30   ARM Code       0  lbs{000a0000}-214.o(StubCode)
-    RPositioner::GetLastKnownPosition(TPositionInfoBase&, TRequestStatus&) const 0x0000aa38   ARM Code       0  lbs{000a0000}-218.o(StubCode)
-    RPositioner::NotifyPositionUpdate(TPositionInfoBase&, TRequestStatus&) const 0x0000aa40   ARM Code       0  lbs{000a0000}-219.o(StubCode)
-    TCoordinate::Latitude() const            0x0000aa48   ARM Code       0  lbs{000a0000}-223.o(StubCode)
-    TCoordinate::Longitude() const           0x0000aa50   ARM Code       0  lbs{000a0000}-225.o(StubCode)
-    TPositionInfo::GetPosition(TPosition&) const 0x0000aa58   ARM Code       0  lbs{000a0000}-226.o(StubCode)
-    TCoordinate::TCoordinate()               0x0000aa60   ARM Code       0  lbs{000a0000}-23.o(StubCode)
-    TPositionInfo::TPositionInfo()           0x0000aa68   ARM Code       0  lbs{000a0000}-28.o(StubCode)
-    TLocality::HorizontalAccuracy() const    0x0000aa70   ARM Code       0  lbs{000a0000}-303.o(StubCode)
-    TLocality::Distance(const TCoordinate&, float&) const 0x0000aa78   ARM Code       0  lbs{000a0000}-304.o(StubCode)
-    RPositionServer::Close()                 0x0000aa80   ARM Code       0  lbs{000a0000}-47.o(StubCode)
-    RPositionServer::Connect()               0x0000aa88   ARM Code       0  lbs{000a0000}-48.o(StubCode)
-    RPositionServer::RPositionServer()       0x0000aa90   ARM Code       0  lbs{000a0000}-49.o(StubCode)
-    RPositioner::SetRequestor(int, int, const TDesC16&) 0x0000aa98   ARM Code       0  lbs{000a0000}-7.o(StubCode)
-    RPositioner::SetUpdateOptions(const TPositionUpdateOptionsBase&) 0x0000aaa0   ARM Code       0  lbs{000a0000}-8.o(StubCode)
-    HPositionGenericInfo::ClearPositionData() 0x0000aaa8   ARM Code       0  lbs{000a0000}-82.o(StubCode)
-    HPositionGenericInfo::SetRequestedField(unsigned short) 0x0000aab0   ARM Code       0  lbs{000a0000}-83.o(StubCode)
-    HPositionGenericInfo::NewL(int, int)     0x0000aab8   ARM Code       0  lbs{000a0000}-87.o(StubCode)
-    PositionFieldManager::GetValue(unsigned short, float&, const HPositionGenericInfo&) 0x0000aac0   ARM Code       0  lbs{000a0000}-97.o(StubCode)
-    CMnMapViewServiceBase::LinkedLandmarksToShow(int) 0x0000aac8   ARM Code       0  mnservicelib{000a0000}-10.o(StubCode)
-    CMnMapViewServiceBase::LandmarksToShowDatabases() 0x0000aad0   ARM Code       0  mnservicelib{000a0000}-13.o(StubCode)
-    CMnMapViewServiceBase::AreaRadius()      0x0000aad8   ARM Code       0  mnservicelib{000a0000}-3.o(StubCode)
-    CMnMapViewServiceBase::LandmarksToShow() 0x0000aae0   ARM Code       0  mnservicelib{000a0000}-5.o(StubCode)
-    CMnMapImageServiceBase::ShowOptions() const 0x0000aae8   ARM Code       0  mnservicelib{000a0000}-55.o(StubCode)
-    CMnMapImageServiceBase::MapImageParams() const 0x0000aaf0   ARM Code       0  mnservicelib{000a0000}-57.o(StubCode)
-    CMnMapViewServiceBase::GetAreaCentralPoint(TCoordinate&) 0x0000aaf8   ARM Code       0  mnservicelib{000a0000}-6.o(StubCode)
-    CMnMapViewServiceBase::CurrentLocationOption() 0x0000ab00   ARM Code       0  mnservicelib{000a0000}-8.o(StubCode)
-    CMnMapViewServiceBase::IsAreaCentralPointSet() 0x0000ab08   ARM Code       0  mnservicelib{000a0000}-9.o(StubCode)
-    __aeabi_dadd                             0x0000ab10   ARM Code       0  dfpaeabi{000a0000}-12.o(StubCode)
-    __aeabi_ddiv                             0x0000ab18   ARM Code       0  dfpaeabi{000a0000}-19.o(StubCode)
-    __aeabi_cdcmple                          0x0000ab20   ARM Code       0  dfpaeabi{000a0000}-2.o(StubCode)
-    __aeabi_dmul                             0x0000ab28   ARM Code       0  dfpaeabi{000a0000}-20.o(StubCode)
-    __aeabi_drsub                            0x0000ab30   ARM Code       0  dfpaeabi{000a0000}-22.o(StubCode)
-    __aeabi_dsub                             0x0000ab38   ARM Code       0  dfpaeabi{000a0000}-23.o(StubCode)
-    __aeabi_f2d                              0x0000ab40   ARM Code       0  dfpaeabi{000a0000}-24.o(StubCode)
-    __aeabi_f2iz                             0x0000ab48   ARM Code       0  dfpaeabi{000a0000}-25.o(StubCode)
-    __aeabi_cdrcmple                         0x0000ab50   ARM Code       0  dfpaeabi{000a0000}-3.o(StubCode)
-    __aeabi_fdiv                             0x0000ab58   ARM Code       0  dfpaeabi{000a0000}-36.o(StubCode)
-    __aeabi_i2d                              0x0000ab60   ARM Code       0  dfpaeabi{000a0000}-41.o(StubCode)
-    __aeabi_cfcmple                          0x0000ab68   ARM Code       0  dfpaeabi{000a0000}-5.o(StubCode)
-    __aeabi_d2iz                             0x0000ab70   ARM Code       0  dfpaeabi{000a0000}-8.o(StubCode)
-    __aeabi_idivmod                          0x0000ab78   ARM Code       0  drtaeabi{000a0000}-135.o(StubCode)
-    __aeabi_memcpy4                          0x0000ab80   ARM Code       0  drtaeabi{000a0000}-147.o(StubCode)
-    __aeabi_unwind_cpp_pr0                   0x0000ab88   ARM Code       0  drtaeabi{000a0000}-158.o(StubCode)
-    __aeabi_unwind_cpp_pr1                   0x0000ab90   ARM Code       0  drtaeabi{000a0000}-159.o(StubCode)
-    __cxa_begin_catch                        0x0000ab98   ARM Code       0  drtaeabi{000a0000}-180.o(StubCode)
-    __cxa_end_catch                          0x0000aba0   ARM Code       0  drtaeabi{000a0000}-183.o(StubCode)
-    __cxa_end_cleanup                        0x0000aba8   ARM Code       0  drtaeabi{000a0000}-184.o(StubCode)
-    operator delete (void*)                  0x0000abb0   ARM Code       0  scppnwdl{000a0000}-3.o(StubCode)
-    ExecuteAndDeleteLD(CPosLmOperation*)     0x0000abb9   Thumb Code    22  mnrefproviderengine.in(i._Z18ExecuteAndDeleteLDP15CPosLmOperation)
-    TPtrC16::Set(const TDesC16&)             0x0000abcf   Thumb Code    28  mnrefproviderengine.in(i._ZN7TPtrC163SetERK7TDesC16)
-    operator delete (void*, void*)           0x0000abf7   Thumb Code     2  mnrefproviderengine.in(i._ZdlPvS_)
-    operator new(unsigned, void*)            0x0000abf9   Thumb Code     4  mnrefproviderengine.in(i._ZnwjPv)
-    CleanupClosePushL<RArray<CMnrpEngine::TDistanceToPoi>>(T1&) 0x0000abfd   Thumb Code    12  mnrefproviderengine.in(t._Z17CleanupClosePushLI6RArrayIN11CMnrpEngine14TDistanceToPoiEEEvRT_)
-    Abs<double>(T1)                          0x0000ac0d   Thumb Code    36  mnrefproviderengine.in(t._Z3AbsIdET_S0_)
-    Max<double>(T1, T1)                      0x0000ac39   Thumb Code    28  mnrefproviderengine.in(t._Z3MaxIdET_S0_S0_)
-    Min<double>(T1, T1)                      0x0000ac55   Thumb Code    28  mnrefproviderengine.in(t._Z3MinIdET_S0_S0_)
-    CleanupClose<RArray<CMnrpEngine::TDistanceToPoi>>::Close(void*) 0x0000ac71   Thumb Code     8  mnrefproviderengine.in(t._ZN12CleanupCloseI6RArrayIN11CMnrpEngine14TDistanceToPoiEEE5CloseEPv)
-    CleanupClose<RArray<unsigned long>>::Close(void*) 0x0000ac79   Thumb Code     8  mnrefproviderengine.in(t._ZN12CleanupCloseI6RArrayImEE5CloseEPv)
-    RPointerArray<CPosLandmark>::AppendL(const CPosLandmark*) 0x0000ac81   Thumb Code    12  mnrefproviderengine.in(t._ZN13RPointerArrayI12CPosLandmarkE7AppendLEPKS0_)
-    RPointerArray<CMnrpMapModel::CDrawItem>::ResetAndDestroy() 0x0000ac8d   Thumb Code    48  mnrefproviderengine.in(t._ZN13RPointerArrayIN13CMnrpMapModel9CDrawItemEE15ResetAndDestroyEv)
-    RPointerArray<CMnrpMapModel::CDrawItem>::AppendL(const CMnrpMapModel::CDrawItem*) 0x0000acbd   Thumb Code    12  mnrefproviderengine.in(t._ZN13RPointerArrayIN13CMnrpMapModel9CDrawItemEE7AppendLEPKS1_)
-    HPositionGenericInfo::GetValue<float>(unsigned short, T1&) const 0x0000acc9   Thumb Code    16  mnrefproviderengine.in(t._ZNK20HPositionGenericInfo8GetValueIfEEitRT_)
-    RArray<CMnrpEngine::TDistanceToPoi>::Count() const 0x0000acd9   Thumb Code     8  mnrefproviderengine.in(t._ZNK6RArrayIN11CMnrpEngine14TDistanceToPoiEE5CountEv)
-    TArray<CPosLandmark*>::operator [](int) const 0x0000ace1   Thumb Code     8  mnrefproviderengine.in(t._ZNK6TArrayIP12CPosLandmarkEixEi)
-    TArray<CMnrpMapModel::CDrawItem*>::operator [](int) const 0x0000ace9   Thumb Code     8  mnrefproviderengine.in(t._ZNK6TArrayIPN13CMnrpMapModel9CDrawItemEEixEi)
-    typeinfo for CMnrpEngine                 0x0000af94   Data          12  mnrefproviderengine.in(.constdata__ZTI11CMnrpEngine)
-    typeinfo for CMnrpMapModel               0x0000afa0   Data          32  mnrefproviderengine.in(.constdata__ZTI13CMnrpMapModel)
-    typeinfo for CMnrpPositionRequest        0x0000afc0   Data          12  mnrefproviderengine.in(.constdata__ZTI20CMnrpPositionRequest)
-    typeinfo for MMnrpPositionObserver       0x0000afcc   Data           8  mnrefproviderengine.in(.constdata__ZTI21MMnrpPositionObserver)
-    typeinfo for CMnrpMapModel::CDrawItem    0x0000afd4   Data          12  mnrefproviderengine.in(.constdata__ZTIN13CMnrpMapModel9CDrawItemE)
-    typeinfo name for CMnrpEngine            0x0000afe0   Data          14  mnrefproviderengine.in(.constdata__ZTS11CMnrpEngine)
-    typeinfo name for CMnrpMapModel          0x0000afee   Data          16  mnrefproviderengine.in(.constdata__ZTS13CMnrpMapModel)
-    typeinfo name for CMnrpPositionRequest   0x0000affe   Data          23  mnrefproviderengine.in(.constdata__ZTS20CMnrpPositionRequest)
-    typeinfo name for MMnrpPositionObserver  0x0000b015   Data          24  mnrefproviderengine.in(.constdata__ZTS21MMnrpPositionObserver)
-    typeinfo name for CMnrpMapModel::CDrawItem 0x0000b02d   Data          28  mnrefproviderengine.in(.constdata__ZTSN13CMnrpMapModel9CDrawItemE)
-    vtable for CMnrpEngine                   0x0000b04c   Data          20  mnrefproviderengine.in(.constdata__ZTV11CMnrpEngine)
-    vtable for CMnrpMapModel                 0x0000b060   Data          36  mnrefproviderengine.in(.constdata__ZTV13CMnrpMapModel)
-    vtable for CMnrpPositionRequest          0x0000b084   Data          32  mnrefproviderengine.in(.constdata__ZTV20CMnrpPositionRequest)
-    vtable for CMnrpMapModel::CDrawItem      0x0000b0a4   Data          20  mnrefproviderengine.in(.constdata__ZTVN13CMnrpMapModel9CDrawItemE)
-    .ARM.exidx$$Base                         0x0000b0b8   Number         0  ucppinit_aeabi.o(.ARM.exidx)
-    .ARM.exidx$$Limit                        0x0000b358   Number         0  mnrefproviderengine.in(.ARM.exidx)
-    Image$$ER_RO$$Limit                      0x0000b358   Number         0  anon$$obj.o(linker$$defined$$symbols)
-
Binary file locsrv_plat/map_image_conversion_plugin_api/tsrc/data/armv5/urel/mnrefproviderengine.rsc has changed
Binary file locsrv_plat/map_image_conversion_plugin_api/tsrc/data/winscw/udeb/MnRefProviderPlugin.dll has changed
Binary file locsrv_plat/map_image_conversion_plugin_api/tsrc/data/winscw/udeb/mnrefprovider.exe has changed
Binary file locsrv_plat/map_image_conversion_plugin_api/tsrc/data/winscw/udeb/mnrefproviderback.exe has changed
Binary file locsrv_plat/map_image_conversion_plugin_api/tsrc/data/winscw/udeb/mnrefproviderengine.dll has changed
--- a/locsrv_plat/map_image_conversion_plugin_api/tsrc/eabi/testmapimgconpluginapiu.def	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-EXPORTS
-	_Z9LibEntryLR13CTestModuleIf @ 1 NONAME
-
--- a/locsrv_plat/map_image_conversion_plugin_api/tsrc/group/bld.inf	Mon May 03 12:54:42 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: Build information file for test code of Map Image Conversion plugin API
-*
-*/
-
-
-
-PRJ_PLATFORMS
-// specify the platforms your component needs to be built for here
-// defaults to WINS MARM so you can ignore this if you just build these
-DEFAULT
-
-PRJ_TESTEXPORTS
-// NOTE: If using ARS requirements all export operations should be done under this.
-// 'abld test export'
-
-PRJ_EXPORTS
-// Specify the source file followed by its destination here
-// copy will be used to copy the source file to its destination
-// If there's no destination then the source file will be copied
-// to the same name in /epoc32/include
-// Example: 
-/*
-/agnmodel/inc/AGMCOMON.H
-*/
-
-PRJ_TESTMMPFILES
-// NOTE: If using ARS requirements .mmp file operation should be done under this.
-// 'abld test build'
-testmapimgconpluginapi.mmp
-
-PRJ_MMPFILES
-// Specify the .mmp files required for building the important component
-// releasables.
-//
-// Specify "tidy" if the component you need to build doesn't need to be
-// released. Specify "ignore" if the MMP file exists but should be
-// ignored.
-// Example:
-/*
-/agnmodel/group/agnmodel.mmp
-#if defined(MARM)
-/agnmodel/group/agsvexe.mmp
-#endif
-*/
-
-//  End of File
\ No newline at end of file
--- a/locsrv_plat/map_image_conversion_plugin_api/tsrc/group/map_image_conversion_plugin_api_test.pkg	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,62 +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: Package file for test code of Map Image Conversion plugin API
-;
-;
-; Installation file for map_image_conversion_plugin_api_test Test module
-;
-;Languages
-&EN
-;
-; UID is the app's UID
-;
-#{"map_image_conversion_plugin_api_test"},(0x101FB3E3),3,0,0,TYPE=SA
-;
-; Localised Vendor name
-%{"Nokia"}
-
-; Unique Vendor name
-:"Nokia"
-
-;Supports Series 60 v 3.0
-;This line indicates that this installation is for the Series 60 platform v3.0
-;This line must appear _exactly_ as shown below in the sis file
-;If this line is missing or incorrect, the sis file will not be able
-;to be installed on Series 60 v3.0 platforms
-[0x101F6F88], 0, 0, 0, {"Series60ProductID"}
-;
-;
-
-; File to install
-
-
-"\epoc32\release\armv5\urel\testmapimgconpluginapi.dll"-"C:\sys\bin\testmapimgconpluginapi.dll"
-
-;refapp dlls
-"..\data\armv5\urel\mnrefprovider.exe"-"C:\sys\bin\mnrefprovider.exe"
-"..\data\armv5\urel\mnrefprovider.rsc"-"C:\resource\apps\mnrefprovider.rsc"
-"..\data\armv5\urel\mnrefprovider.mbm"-"C:\resource\apps\mnrefprovider.mbm"
-"..\data\armv5\urel\mnrefprovider.mif"-"C:\resource\apps\mnrefprovider.mif"
-"..\data\armv5\urel\mnrefprovider_reg.rsc"-"C:\private\10003a3f\import\apps\mnrefprovider_reg.rsc"
-
-"..\data\armv5\urel\mnrefproviderback.exe"-"C:\sys\bin\mnrefproviderback.exe"
-"..\data\armv5\urel\mnrefproviderback.rsc"-"C:\resource\apps\mnrefproviderback.rsc"
-"..\data\armv5\urel\mnrefproviderback_reg.rsc"-"C:\private\10003a3f\import\apps\mnrefproviderback_reg.rsc"
-
-"..\data\armv5\urel\mnrefproviderengine.dll"-"C:\sys\bin\mnrefproviderengine.dll"
-"..\data\armv5\urel\mnrefproviderengine.rsc"-"C:\resource\mnrefproviderengine.rsc"
-
-;"..\conf\testmapimgconpluginapi.cfg"-"C:\testframework\testmapimgconpluginapi.cfg"
-;"..\init\testframework.ini"-"C:\testframework\testframework.ini"
-
--- a/locsrv_plat/map_image_conversion_plugin_api/tsrc/group/testmapimgconpluginapi.mmp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,62 +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: Project definition file for test code of Map Image Conversion plugin API
-*
-*/
-
-
-
-
-#include <platform_paths.hrh>
-
-
-TARGET          testmapimgconpluginapi.dll
-TARGETTYPE      dll
-UID             0x1000008D 0x101FB3E3
-
-CAPABILITY      ALL -TCB
-/* Remove comments and replace 0x00000000 with correct vendor id */
-// VENDORID     0x00000000
-/* Remove comments and replace 0x00000000 with correct secure id */
-// SECUREID     0x00000000
-
-//TARGETPATH      ?target_path
-DEFFILE         testmapimgconpluginapi.def
-
-SOURCEPATH      ../src
-SOURCE          testmapimgconpluginapi.cpp
-SOURCE          testmapimgconpluginapiBlocks.cpp
-SOURCE					testprovidercoordconverter.cpp
-
-
-USERINCLUDE     ../inc 
-
-MW_LAYER_SYSTEMINCLUDE
-
-
-LIBRARY         euser.lib
-LIBRARY         stiftestinterface.lib
-LIBRARY         stiftestengine.lib
-LIBRARY			mnclientlib.lib
-LIBRARY         lbs.lib
-
-LANG            SC
-
-
- 
-
-
-SMPSAFE
-
-// End of File
--- a/locsrv_plat/map_image_conversion_plugin_api/tsrc/inc/testmapimgconpluginapi.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,123 +0,0 @@
-/*
-* Copyright (c) 2007 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:  Ctestmapimgconpluginapi class
-*
-*/
-
-
-
-#ifndef TESTMAPIMGCONPLUGINAPI_H
-#define TESTMAPIMGCONPLUGINAPI_H
-
-//  INCLUDES
-#include <StifLogger.h>
-#include <TestScripterInternal.h>
-#include <StifTestModule.h>
-
-
-
-// Logging path
-_LIT( KtestmapimgconpluginapiLogPath, "\\logs\\testframework\\testmapimgconpluginapi\\" ); 
-// Log file
-_LIT( KtestmapimgconpluginapiLogFile, "testmapimgconpluginapi.txt" ); 
-_LIT( KtestmapimgconpluginapiLogFileWithTitle, "testmapimgconpluginapi_[%S].txt" );
-
-
-// FORWARD DECLARATIONS
-class Ctestmapimgconpluginapi;
-
-
-/**
-*  Ctestmapimgconpluginapi test class for STIF Test Framework TestScripter.
-*
-*  @lib ?library
-*  @since s60 v5.0
-*/
-NONSHARABLE_CLASS(Ctestmapimgconpluginapi) : public CScriptBase
-    {
-    public:  // Constructors and destructor
-
-        /**
-        * Two-phased constructor.
-        */
-        static Ctestmapimgconpluginapi* NewL( CTestModuleIf& aTestModuleIf );
-
-        /**
-        * Destructor.
-        */
-        virtual ~Ctestmapimgconpluginapi();
-
-    public: // Functions from base classes
-
-        /**
-        * From CScriptBase Runs a script line.
-        * @param aItem Script line containing method name and parameters
-        * @return Symbian OS error code
-        */
-        virtual TInt RunMethodL( CStifItemParser& aItem );
-
-
-    private:
-
-        /**
-        * C++ default constructor.
-        */
-        Ctestmapimgconpluginapi( CTestModuleIf& aTestModuleIf );
-
-        /**
-        * By default Symbian 2nd phase constructor is private.
-        */
-        void ConstructL();
-
-        /**
-        * Frees all resources allocated from test methods.
-        */
-        void Delete();
-
-        /**
-        * Test methods are listed below. 
-        */
-
-        /**
-        * This test case will test MapImageParams method of CMnCoordinateConverterBase
-        * class.
-        * @param aItem Script line containing parameters.
-        * @return Symbian OS error code.
-        */
-        TInt CMnCoordinateConverterBase_MapImageParams( CStifItemParser& aItem );
-        
-        /**
-        * This test case will test GetImageCoordinate method of CMnCoordinateConverterBase
-        * class.
-        * @param aItem Script line containing parameters.
-        * @return Symbian OS error code.
-        */
-        TInt CMnCoordinateConverterBase_GetImageCoordinate( CStifItemParser& aItem );
-        
-        /**
-        * This test case will test GetWorldCoordinate method of CMnCoordinateConverterBase
-        * class.
-        * @param aItem Script line containing parameters.
-        * @return Symbian OS error code.
-        */
-        TInt CMnCoordinateConverterBase_GetWorldCoordinate( CStifItemParser& aItem );
-		
-		
-
-
-    };
-
-#endif      // TESTMAPIMGCONPLUGINAPI_H
-
-// End of File
--- a/locsrv_plat/map_image_conversion_plugin_api/tsrc/inc/testprovidercoordconverter.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,65 +0,0 @@
-/*
-* Copyright (c) 2007 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:  CTestProviderCoordConverter class
-*
-*/
-
-
-#ifndef MNTP_COORDINATECONVERTER_H
-#define MNTP_COORDINATECONVERTER_H
-
-#include <mncoordinateconverterbase.h>
-
-/**
- *  This class provides implementations for CMnCoordinateConverterBase
- *  class.
- *
- *  @lib testmapimgconpluginapi.lib
- *  @since S60 v5.0
- */
-
-class CTestProviderCoordConverter : public CMnCoordinateConverterBase
-    {
-    public:
-      /**
-     	* Two-phased constructor.
-     	*/
-     	static CTestProviderCoordConverter* NewLC();
-     	
-     	/**
-    	* Destructor.
-    	*/
-    	~CTestProviderCoordConverter();
-
-    public: // From CMnCoordinateConverterBase
-
-        TInt GetImageCoordinate( 
-            const TCoordinate& aWorldCoordinate, 
-            TPoint& aImagePoint );
-        
-        TInt GetWorldCoordinate( 
-            const TPoint& aImagePoint, 
-            TCoordinate& aWorldCoordinate );
-                    
-    protected:    
-     
-        /**
-   		* constructor.
-   		*/
-   		CTestProviderCoordConverter();
-        
-  
-    };
-
-#endif //MNTP_COORDINATECONVERTER_H
--- a/locsrv_plat/map_image_conversion_plugin_api/tsrc/init/testframework.ini	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,182 +0,0 @@
-#
-# This is STIFTestFramework initialization file
-# Comment lines start with '#'-character.
-# See STIF TestFramework users guide.doc for instructions
-
-# -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
-# Set following test engine settings:
-#	- Set Test Reporting mode. TestReportMode's possible values are:
-#		+ 'Summary': Summary of the tested test cases.
-#		+ 'Environment': Hardware and software info.
-#		+ 'TestCases': Test case report.
-#		+ 'FullReport': Set of all above ones.
-#		+ Example 'TestReportMode= Summary TestCases'
-#
-# 	- CreateTestReport setting controls report creation mode
-#		+ YES, Test report will created.
-#		+ NO, No Test report.
-#
-# 	- File path indicates the base path of the test report.
-# 	- File name indicates the name of the test report.
-#
-# 	- File format indicates the type of the test report.
-#		+ TXT, Test report file will be txt type, for example 'TestReport.txt'.
-#		+ HTML, Test report will be html type, for example 'TestReport.html'.
-#
-# 	- File output indicates output source of the test report.
-#		+ FILE, Test report logging to file.
-#		+ RDEBUG, Test report logging to using rdebug.
-#
-# 	- File Creation Mode indicates test report overwriting if file exist.
-#		+ OVERWRITE, Overwrites if the Test report file exist.
-#		+ APPEND, Continue logging after the old Test report information if 
-#                 report exist.
-# 	- Sets a device reset module's dll name(Reboot).
-#		+ If Nokia specific reset module is not available or it is not correct one
-#		  StifHWResetStub module may use as a template for user specific reset
-#		  module. 
-
-[Engine_Defaults]
-
-TestReportMode= FullReport		# Possible values are: 'Empty', 'Summary', 'Environment',
-                                                               'TestCases' or 'FullReport'
-
-CreateTestReport= YES			# Possible values: YES or NO
-
-TestReportFilePath= C:\LOGS\TestFramework\
-TestReportFileName= TestReport
-
-TestReportFormat= TXT			# Possible values: TXT or HTML
-TestReportOutput= FILE			# Possible values: FILE or RDEBUG
-TestReportFileCreationMode= OVERWRITE	# Possible values: OVERWRITE or APPEND
-
-DeviceResetDllName= StifResetForNokia.dll # e.g. 'StifHWResetStub.dll' for user specific reseting
-
-[End_Defaults]
-# -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
-
-
-
-# -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
-# Module configurations start
-# Modules are added between module tags
-# tags. Module name is specified after ModuleName= tag, like
-# ModuleName= XXXXXXXXX
-# Modules might have initialisation file, specified as
-# IniFile= c:\testframework\YYYYYY
-# Modules might have several configuration files, like
-# TestCaseFile= c:\testframework\NormalCases.txt
-# TestCaseFile= c:\testframework\SmokeCases.txt
-# TestCaseFile= c:\testframework\ManualCases.txt
-
-# (TestCaseFile is synonym for old term ConfigFile)
-
-# Following case specifies demo module settings. Demo module
-# does not read any settings from file, so tags 
-# IniFile and TestCaseFile are not used.
-# In the simplest case it is enough to specify only the
-# name of the test module when adding new test module
-
-#[New_Module]
-#ModuleName= demomodule
-#[End_Module]
-
-[New_Module]
-ModuleName= TestScripter
-TestCaseFile= C:\Testframework\testmapimgconpluginapi.cfg
-[End_Module]
-
-# Load testmoduleXXX, optionally with initialization file and/or test case files
-#[New_Module]
-#ModuleName= testmodulexxx
-
-#TestModuleXXX used initialization file
-#IniFile= c:\testframework\init.txt
-
-#TestModuleXXX used configuration file(s)
-#TestCaseFile= c:\testframework\testcases1.cfg
-#TestCaseFile= c:\testframework\testcases2.cfg
-#TestCaseFile= c:\testframework\manualtestcases.cfg
-
-#[End_Module]
-# -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
-
-
-
-# -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
-# Set STIFTestFramework logging overwrite parameters for Logger.
-# 	Hardware and emulator environment logging path and styles can
-# 	be configured from here to overwrite the Logger's implemented values.
-#	
-#	Settings description:
-#	- Indicates option for creation log directory/directories. If log directory/directories
-#         is/are not created by user they will make by software.
-#		+ YES, Create log directory/directories if not allready exist.
-#		+ NO, Log directory/directories not created. Only created one is used.
-#
-#	- Overwrite emulator path setting.
-#		+ Example: If 'EmulatorBasePath= C:\LOGS\TestFramework\' and in code is defined 
-#		           Logger's path 'D:\\LOGS\\Module\\' with those definition the path
-#		           will be 'C:\LOGS\TestFramework\LOGS\Module\'
-#
-#	- Overwrite emulator's logging format.
-#		+ TXT, Log file(s) will be txt type(s), for example 'Module.txt'.
-#		+ HTML, Log file(s) will be html type(s), for example 'Module.html'.
-#
-#	- Overwrited emulator logging output source.
-#		+ FILE, Logging to file(s).
-#		+ RDEBUG, Logging to using rdebug(s).
-#
-#	- Overwrite hardware path setting (Same description as above in emulator path).
-#	- Overwrite hardware's logging format(Same description as above in emulator format).
-#	- Overwrite hardware's logging output source(Same description as above in emulator output).
-#
-#	- File Creation Mode indicates file overwriting if file exist.
-#		+ OVERWRITE, Overwrites if file(s) exist.
-#		+ APPEND, Continue logging after the old logging information if file(s) exist.
-#
-#	- Will thread id include to the log filename.
-#		+ YES, Thread id to log file(s) name, Example filename 'Module_b9.txt'.
-#		+ NO, No thread id to log file(s), Example filename 'Module.txt'.
-#
-#	- Will time stamps include the to log file.
-#		+ YES, Time stamp added to each line in log file(s). Time stamp is 
-#                 for example'12.Nov.2003 115958    LOGGING INFO'
-#		+ NO, No time stamp(s).
-#
-#	- Will line breaks include to the log file.
-#		+ YES, Each logging event includes line break and next log event is in own line.
-#		+ NO, No line break(s).
-#
-#	- Will event ranking include to the log file.
-#		+ YES, Event ranking number added to each line in log file(s). Ranking number 
-#                 depends on environment's tics, for example(includes time stamp also)
-#                 '012   12.Nov.2003 115958    LOGGING INFO'
-#		+ NO, No event ranking.
-#
-
-[Logger_Defaults]
-
-#NOTE: If you want to set Logger using next setting(s) remove comment(s)'#' 
-
-#CreateLogDirectories= YES		# Possible values: YES or NO
-
-#EmulatorBasePath= C:\LOGS\TestFramework\
-#EmulatorFormat= HTML			# Possible values: TXT or HTML
-#EmulatorOutput= FILE			# Possible values: FILE or RDEBUG
-
-#HardwareBasePath= D:\LOGS\TestFramework\
-#HardwareFormat= HTML			# Possible values: TXT or HTML
-#HardwareOutput= FILE			# Possible values: FILE or RDEBUG
-
-#FileCreationMode= OVERWRITE		# Possible values: OVERWRITE or APPEND
-
-#ThreadIdToLogFile= YES			# Possible values: YES or NO
-#WithTimeStamp= YES			# Possible values: YES or NO
-#WithLineBreak= YES			# Possible values: YES or NO
-#WithEventRanking= YES			# Possible values: YES or NO
-
-[End_Logger_Defaults]
-# -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
-
-# End of file
--- a/locsrv_plat/map_image_conversion_plugin_api/tsrc/mapnavproviderrefapp/BWINS/mnrefproviderengine.50u.def	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,55 +0,0 @@
-EXPORTS
-	?FindResourceFileL@CMnrpEngine@@QAEXABVTDesC16@@AAV?$TBuf@$0BAA@@@@Z @ 1 NONAME ; void CMnrpEngine::FindResourceFileL(class TDesC16 const &, class TBuf<256> &)
-	?Center@CMnrpMapModel@@QBE?AVTCoordinate@@XZ @ 2 NONAME ; class TCoordinate CMnrpMapModel::Center(void) const
-	?ScreenToAbsolute@CMnrpMapModel@@QBENH@Z @ 3 NONAME ; double CMnrpMapModel::ScreenToAbsolute(int) const
-	?NewL@CMnrpMapModel@@SAPAV1@AAVMMapModelObserver@@AAVCMnrpEngine@@@Z @ 4 NONAME ; class CMnrpMapModel * CMnrpMapModel::NewL(class MMapModelObserver &, class CMnrpEngine &)
-	?Width@CMnrpMapModel@@QBENXZ @ 5 NONAME ; double CMnrpMapModel::Width(void) const
-	?GetPosition@CMnrpPositionRequest@@QAEXAAVTPositionInfo@@@Z @ 6 NONAME ; void CMnrpPositionRequest::GetPosition(class TPositionInfo &)
-	?NewL@CMnrpMapModel@@SAPAV1@AAVCMnrpEngine@@@Z @ 7 NONAME ; class CMnrpMapModel * CMnrpMapModel::NewL(class CMnrpEngine &)
-	?SetOptionsL@CMnrpPositionRequest@@QAEXABVTPositionUpdateOptionsBase@@@Z @ 8 NONAME ; void CMnrpPositionRequest::SetOptionsL(class TPositionUpdateOptionsBase const &)
-	?GoCenter@CMnrpMapModel@@QAEXXZ @ 9 NONAME ; void CMnrpMapModel::GoCenter(void)
-	?FetchNewPosition@CMnrpPositionRequest@@QAEXH@Z @ 10 NONAME ; void CMnrpPositionRequest::FetchNewPosition(int)
-	?Course@CMnrpPositionRequest@@QAEMXZ @ 11 NONAME ; float CMnrpPositionRequest::Course(void)
-	?CoordinateToString@MnrpUtils@@SAXNAAVTDes16@@HH@Z @ 12 NONAME ; void MnrpUtils::CoordinateToString(double, class TDes16 &, int, int)
-	?CurrentLocation@CMnrpMapModel@@QBE?AVTCurrentLocation@1@XZ @ 13 NONAME ; class CMnrpMapModel::TCurrentLocation CMnrpMapModel::CurrentLocation(void) const
-	?AddressToCoordL@CMnrpEngine@@QAEPAVCPosLandmark@@ABV2@@Z @ 14 NONAME ; class CPosLandmark * CMnrpEngine::AddressToCoordL(class CPosLandmark const &)
-	?MoveTo@CMnrpMapModel@@QAEXVTCoordinate@@@Z @ 15 NONAME ; void CMnrpMapModel::MoveTo(class TCoordinate)
-	?AbsoluteToScreen@CMnrpMapModel@@QBEHN@Z @ 16 NONAME ; int CMnrpMapModel::AbsoluteToScreen(double) const
-	?Zoom@CMnrpMapModel@@QAEXN@Z @ 17 NONAME ; void CMnrpMapModel::Zoom(double)
-	?NewL@CMnrpPositionRequest@@SAPAV1@ABVTDesC16@@AAVMMnrpPositionObserver@@@Z @ 18 NONAME ; class CMnrpPositionRequest * CMnrpPositionRequest::NewL(class TDesC16 const &, class MMnrpPositionObserver &)
-	?Right@CMnrpMapModel@@QBENXZ @ 19 NONAME ; double CMnrpMapModel::Right(void) const
-	?Height@CMnrpMapModel@@QBENXZ @ 20 NONAME ; double CMnrpMapModel::Height(void) const
-	?Left@CMnrpMapModel@@QBENXZ @ 21 NONAME ; double CMnrpMapModel::Left(void) const
-	?Heading@CMnrpPositionRequest@@QAEMXZ @ 22 NONAME ; float CMnrpPositionRequest::Heading(void)
-	?AbsoluteToScreen@CMnrpMapModel@@QBE?AVTPoint@@VTCoordinate@@@Z @ 23 NONAME ; class TPoint CMnrpMapModel::AbsoluteToScreen(class TCoordinate) const
-	?GetGrid@CMnrpMapModel@@QBEXAAVTGrid@1@@Z @ 24 NONAME ; void CMnrpMapModel::GetGrid(class CMnrpMapModel::TGrid &) const
-	?UpdateModelL@CMnrpMapModel@@QAEXABVCMnrpMapImageService@@@Z @ 25 NONAME ; void CMnrpMapModel::UpdateModelL(class CMnrpMapImageService const &)
-	?UpdateModel@CMnrpMapModel@@QAEXABVTMnMapImageParams@@@Z @ 26 NONAME ; void CMnrpMapModel::UpdateModel(class TMnMapImageParams const &)
-	?FindClosestPoisL@CMnrpEngine@@QAEXABVCPosLandmark@@AAV?$RArray@UTDistanceToPoi@CMnrpEngine@@@@H@Z @ 27 NONAME ; void CMnrpEngine::FindClosestPoisL(class CPosLandmark const &, class RArray<struct CMnrpEngine::TDistanceToPoi> &, int)
-	?Fs@CMnrpEngine@@QAEAAVRFs@@XZ @ 28 NONAME ; class RFs & CMnrpEngine::Fs(void)
-	?AddressToCoordL@CMnrpEngine@@QAEPAVCPosLandmark@@ABVTDesC16@@@Z @ 29 NONAME ; class CPosLandmark * CMnrpEngine::AddressToCoordL(class TDesC16 const &)
-	?AddressToCoordLC@CMnrpEngine@@QAEPAVCPosLandmark@@ABVTDesC16@@@Z @ 30 NONAME ; class CPosLandmark * CMnrpEngine::AddressToCoordLC(class TDesC16 const &)
-	?DistanceToString@MnrpUtils@@SAXNAAVTDes16@@@Z @ 31 NONAME ; void MnrpUtils::DistanceToString(double, class TDes16 &)
-	?Speed@CMnrpPositionRequest@@QAEMXZ @ 32 NONAME ; float CMnrpPositionRequest::Speed(void)
-	??1CMnrpMapModel@@UAE@XZ @ 33 NONAME ; CMnrpMapModel::~CMnrpMapModel(void)
-	?Bottom@CMnrpMapModel@@QBENXZ @ 34 NONAME ; double CMnrpMapModel::Bottom(void) const
-	?CoordToAddressLC@CMnrpEngine@@QAEPAVCPosLandmark@@ABVTCoordinate@@@Z @ 35 NONAME ; class CPosLandmark * CMnrpEngine::CoordToAddressLC(class TCoordinate const &)
-	?SpeedToString@MnrpUtils@@SAXNAAVTDes16@@@Z @ 36 NONAME ; void MnrpUtils::SpeedToString(double, class TDes16 &)
-	?NumIgnoredLandmarks@CMnrpMapModel@@QAEHXZ @ 37 NONAME ; int CMnrpMapModel::NumIgnoredLandmarks(void)
-	??1CMnrpEngine@@UAE@XZ @ 38 NONAME ; CMnrpEngine::~CMnrpEngine(void)
-	?AngleToString@MnrpUtils@@SAXNAAVTDes16@@@Z @ 39 NONAME ; void MnrpUtils::AngleToString(double, class TDes16 &)
-	?PrintableStringLC@MnrpUtils@@SAPAVHBufC16@@ABVTDesC16@@@Z @ 40 NONAME ; class HBufC16 * MnrpUtils::PrintableStringLC(class TDesC16 const &)
-	?MagneticCourse@CMnrpPositionRequest@@QAEMXZ @ 41 NONAME ; float CMnrpPositionRequest::MagneticCourse(void)
-	?SetScreenSize@CMnrpMapModel@@QAEXVTSize@@@Z @ 42 NONAME ; void CMnrpMapModel::SetScreenSize(class TSize)
-	?BestCoordToAddressMatchesL@CMnrpEngine@@QAEXABVTCoordinate@@AAV?$RPointerArray@VCPosLandmark@@@@H@Z @ 43 NONAME ; void CMnrpEngine::BestCoordToAddressMatchesL(class TCoordinate const &, class RPointerArray<class CPosLandmark> &, int)
-	?AddressToCoordLC@CMnrpEngine@@QAEPAVCPosLandmark@@ABV2@@Z @ 44 NONAME ; class CPosLandmark * CMnrpEngine::AddressToCoordLC(class CPosLandmark const &)
-	?MagneticHeading@CMnrpPositionRequest@@QAEMXZ @ 45 NONAME ; float CMnrpPositionRequest::MagneticHeading(void)
-	?Top@CMnrpMapModel@@QBENXZ @ 46 NONAME ; double CMnrpMapModel::Top(void) const
-	??1CMnrpPositionRequest@@UAE@XZ @ 47 NONAME ; CMnrpPositionRequest::~CMnrpPositionRequest(void)
-	?ScreenToAbsolute@CMnrpMapModel@@QBE?AVTCoordinate@@VTPoint@@@Z @ 48 NONAME ; class TCoordinate CMnrpMapModel::ScreenToAbsolute(class TPoint) const
-	?DistanceBetweenLandmarks@CMnrpEngine@@QAEMABVCPosLandmark@@0@Z @ 49 NONAME ; float CMnrpEngine::DistanceBetweenLandmarks(class CPosLandmark const &, class CPosLandmark const &)
-	?KnownPlacesL@CMnrpEngine@@QAE?AV?$TArray@PAVCPosLandmark@@@@XZ @ 50 NONAME ; class TArray<class CPosLandmark *> CMnrpEngine::KnownPlacesL(void)
-	?UpdateModelL@CMnrpMapModel@@QAEXAAVCMnrpMapViewService@@@Z @ 51 NONAME ; void CMnrpMapModel::UpdateModelL(class CMnrpMapViewService &)
-	?NewL@CMnrpEngine@@SAPAV1@XZ @ 52 NONAME ; class CMnrpEngine * CMnrpEngine::NewL(void)
-	?RenderL@CMnrpMapModel@@QBEXAAVCFbsBitmap@@VTRect@@PAVCFont@@2@Z @ 53 NONAME ; void CMnrpMapModel::RenderL(class CFbsBitmap &, class TRect, class CFont *, class CFont *) const
-
--- a/locsrv_plat/map_image_conversion_plugin_api/tsrc/mapnavproviderrefapp/BWINS/mnrefproviderengineu.def	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,53 +0,0 @@
-EXPORTS
-	??1CMnrpEngine@@UAE@XZ @ 1 NONAME ; CMnrpEngine::~CMnrpEngine(void)
-	??1CMnrpMapModel@@UAE@XZ @ 2 NONAME ; CMnrpMapModel::~CMnrpMapModel(void)
-	??1CMnrpPositionRequest@@UAE@XZ @ 3 NONAME ; CMnrpPositionRequest::~CMnrpPositionRequest(void)
-	?AbsoluteToScreen@CMnrpMapModel@@QBE?AVTPoint@@VTCoordinate@@@Z @ 4 NONAME ; class TPoint CMnrpMapModel::AbsoluteToScreen(class TCoordinate) const
-	?AbsoluteToScreen@CMnrpMapModel@@QBEHN@Z @ 5 NONAME ; int CMnrpMapModel::AbsoluteToScreen(double) const
-	?AddressToCoordLC@CMnrpEngine@@QAEPAVCPosLandmark@@ABV2@@Z @ 6 NONAME ; class CPosLandmark * CMnrpEngine::AddressToCoordLC(class CPosLandmark const &)
-	?AddressToCoordLC@CMnrpEngine@@QAEPAVCPosLandmark@@ABVTDesC16@@@Z @ 7 NONAME ; class CPosLandmark * CMnrpEngine::AddressToCoordLC(class TDesC16 const &)
-	?AngleToString@MnrpUtils@@SAXNAAVTDes16@@@Z @ 8 NONAME ; void MnrpUtils::AngleToString(double, class TDes16 &)
-	?BestCoordToAddressMatchesL@CMnrpEngine@@QAEXABVTCoordinate@@AAV?$RPointerArray@VCPosLandmark@@@@H@Z @ 9 NONAME ; void CMnrpEngine::BestCoordToAddressMatchesL(class TCoordinate const &, class RPointerArray<class CPosLandmark> &, int)
-	?Bottom@CMnrpMapModel@@QBENXZ @ 10 NONAME ; double CMnrpMapModel::Bottom(void) const
-	?Center@CMnrpMapModel@@QBE?AVTCoordinate@@XZ @ 11 NONAME ; class TCoordinate CMnrpMapModel::Center(void) const
-	?CoordToAddressLC@CMnrpEngine@@QAEPAVCPosLandmark@@ABVTCoordinate@@@Z @ 12 NONAME ; class CPosLandmark * CMnrpEngine::CoordToAddressLC(class TCoordinate const &)
-	?CoordinateToString@MnrpUtils@@SAXNAAVTDes16@@HH@Z @ 13 NONAME ; void MnrpUtils::CoordinateToString(double, class TDes16 &, int, int)
-	?Course@CMnrpPositionRequest@@QAEMXZ @ 14 NONAME ; float CMnrpPositionRequest::Course(void)
-	?CurrentLocation@CMnrpMapModel@@QBE?AVTCurrentLocation@1@XZ @ 15 NONAME ; class CMnrpMapModel::TCurrentLocation CMnrpMapModel::CurrentLocation(void) const
-	?DistanceBetweenLandmarks@CMnrpEngine@@QAEMABVCPosLandmark@@0@Z @ 16 NONAME ; float CMnrpEngine::DistanceBetweenLandmarks(class CPosLandmark const &, class CPosLandmark const &)
-	?DistanceToString@MnrpUtils@@SAXNAAVTDes16@@@Z @ 17 NONAME ; void MnrpUtils::DistanceToString(double, class TDes16 &)
-	?FetchNewPosition@CMnrpPositionRequest@@QAEXH@Z @ 18 NONAME ; void CMnrpPositionRequest::FetchNewPosition(int)
-	?FindClosestPoisL@CMnrpEngine@@QAEXABVCPosLandmark@@AAV?$RArray@UTDistanceToPoi@CMnrpEngine@@@@H@Z @ 19 NONAME ; void CMnrpEngine::FindClosestPoisL(class CPosLandmark const &, class RArray<struct CMnrpEngine::TDistanceToPoi> &, int)
-	?FindResourceFileL@CMnrpEngine@@QAEXABVTDesC16@@AAV?$TBuf@$0BAA@@@@Z @ 20 NONAME ; void CMnrpEngine::FindResourceFileL(class TDesC16 const &, class TBuf<256> &)
-	?Fs@CMnrpEngine@@QAEAAVRFs@@XZ @ 21 NONAME ; class RFs & CMnrpEngine::Fs(void)
-	?GetGrid@CMnrpMapModel@@QBEXAAVTGrid@1@@Z @ 22 NONAME ; void CMnrpMapModel::GetGrid(class CMnrpMapModel::TGrid &) const
-	?GetPosition@CMnrpPositionRequest@@QAEXAAVTPositionInfo@@@Z @ 23 NONAME ; void CMnrpPositionRequest::GetPosition(class TPositionInfo &)
-	?GoCenter@CMnrpMapModel@@QAEXXZ @ 24 NONAME ; void CMnrpMapModel::GoCenter(void)
-	?Heading@CMnrpPositionRequest@@QAEMXZ @ 25 NONAME ; float CMnrpPositionRequest::Heading(void)
-	?Height@CMnrpMapModel@@QBENXZ @ 26 NONAME ; double CMnrpMapModel::Height(void) const
-	?KnownPlacesL@CMnrpEngine@@QAE?AV?$TArray@PAVCPosLandmark@@@@XZ @ 27 NONAME ; class TArray<class CPosLandmark *> CMnrpEngine::KnownPlacesL(void)
-	?Left@CMnrpMapModel@@QBENXZ @ 28 NONAME ; double CMnrpMapModel::Left(void) const
-	?MagneticCourse@CMnrpPositionRequest@@QAEMXZ @ 29 NONAME ; float CMnrpPositionRequest::MagneticCourse(void)
-	?MagneticHeading@CMnrpPositionRequest@@QAEMXZ @ 30 NONAME ; float CMnrpPositionRequest::MagneticHeading(void)
-	?MoveTo@CMnrpMapModel@@QAEXVTCoordinate@@@Z @ 31 NONAME ; void CMnrpMapModel::MoveTo(class TCoordinate)
-	?NewL@CMnrpEngine@@SAPAV1@XZ @ 32 NONAME ; class CMnrpEngine * CMnrpEngine::NewL(void)
-	?NewL@CMnrpMapModel@@SAPAV1@AAVCMnrpEngine@@@Z @ 33 NONAME ; class CMnrpMapModel * CMnrpMapModel::NewL(class CMnrpEngine &)
-	?NewL@CMnrpMapModel@@SAPAV1@AAVMMapModelObserver@@AAVCMnrpEngine@@@Z @ 34 NONAME ; class CMnrpMapModel * CMnrpMapModel::NewL(class MMapModelObserver &, class CMnrpEngine &)
-	?NewL@CMnrpPositionRequest@@SAPAV1@ABVTDesC16@@AAVMMnrpPositionObserver@@@Z @ 35 NONAME ; class CMnrpPositionRequest * CMnrpPositionRequest::NewL(class TDesC16 const &, class MMnrpPositionObserver &)
-	?RenderL@CMnrpMapModel@@QBEXAAVCFbsBitmap@@VTRect@@PAVCFont@@2@Z @ 36 NONAME ; void CMnrpMapModel::RenderL(class CFbsBitmap &, class TRect, class CFont *, class CFont *) const
-	?Right@CMnrpMapModel@@QBENXZ @ 37 NONAME ; double CMnrpMapModel::Right(void) const
-	?ScreenToAbsolute@CMnrpMapModel@@QBE?AVTCoordinate@@VTPoint@@@Z @ 38 NONAME ; class TCoordinate CMnrpMapModel::ScreenToAbsolute(class TPoint) const
-	?ScreenToAbsolute@CMnrpMapModel@@QBENH@Z @ 39 NONAME ; double CMnrpMapModel::ScreenToAbsolute(int) const
-	?SetOptionsL@CMnrpPositionRequest@@QAEXABVTPositionUpdateOptionsBase@@@Z @ 40 NONAME ; void CMnrpPositionRequest::SetOptionsL(class TPositionUpdateOptionsBase const &)
-	?SetScreenSize@CMnrpMapModel@@QAEXVTSize@@@Z @ 41 NONAME ; void CMnrpMapModel::SetScreenSize(class TSize)
-	?Speed@CMnrpPositionRequest@@QAEMXZ @ 42 NONAME ; float CMnrpPositionRequest::Speed(void)
-	?SpeedToString@MnrpUtils@@SAXNAAVTDes16@@@Z @ 43 NONAME ; void MnrpUtils::SpeedToString(double, class TDes16 &)
-	?Top@CMnrpMapModel@@QBENXZ @ 44 NONAME ; double CMnrpMapModel::Top(void) const
-	?UpdateModelL@CMnrpMapModel@@QAEXAAVCMnrpMapViewService@@@Z @ 45 NONAME ; void CMnrpMapModel::UpdateModelL(class CMnrpMapViewService &)
-	?Width@CMnrpMapModel@@QBENXZ @ 46 NONAME ; double CMnrpMapModel::Width(void) const
-	?Zoom@CMnrpMapModel@@QAEXN@Z @ 47 NONAME ; void CMnrpMapModel::Zoom(double)
-	?PrintableStringLC@MnrpUtils@@SAPAVHBufC16@@ABVTDesC16@@@Z @ 48 NONAME ; class HBufC16 * MnrpUtils::PrintableStringLC(class TDesC16 const &)
-	?AddressToCoord@CMnrpEngine@@QAEPAVCPosLandmark@@ABV2@@Z @ 49 NONAME ; class CPosLandmark * CMnrpEngine::AddressToCoord(class CPosLandmark const &)
-	?AddressToCoord@CMnrpEngine@@QAEPAVCPosLandmark@@ABVTDesC16@@@Z @ 50 NONAME ; class CPosLandmark * CMnrpEngine::AddressToCoord(class TDesC16 const &)
-	?NumIgnoredLandmarks@CMnrpMapModel@@QAEHXZ @ 51 NONAME ; int CMnrpMapModel::NumIgnoredLandmarks(void)
-
Binary file locsrv_plat/map_image_conversion_plugin_api/tsrc/mapnavproviderrefapp/data/default_lm.bmp has changed
Binary file locsrv_plat/map_image_conversion_plugin_api/tsrc/mapnavproviderrefapp/data/default_lm_mask_soft.bmp has changed
--- a/locsrv_plat/map_image_conversion_plugin_api/tsrc/mapnavproviderrefapp/data/mnrefprovider.rss	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,156 +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:  Resource definition file for MnRefProvider
-*
-*/
-
-
-NAME MNTP
-
-#include <eikon.rsg>
-#include <eikon.rh>
-#include <avkon.rsg>
-#include <avkon.mbg>
-#include <avkon.rh>
-
-#include <appinfo.rh>
-#include "mnrp.hrh"
-
-RESOURCE RSS_SIGNATURE {  }
-
-RESOURCE TBUF { buf="MnRefProvider"; }
-
-RESOURCE EIK_APP_INFO
-    {
-    menubar = r_mnrefprovider_menubar;
-    cba = R_AVKON_SOFTKEYS_OPTIONS_EXIT;
-    }
-
-RESOURCE LOCALISABLE_APP_INFO r_mnrefprovider_localisable_app_info
-    {
-    short_caption = "MnRefProvider";
-    caption_and_icon =
-        CAPTION_AND_ICON_INFO
-            {
-            caption = "MnRefProvider";
-            };
-    view_list = {};
-    }
-
-RESOURCE CONTEXT_PANE r_mnrefprovider_app_icon
-    {
-    }
-
-RESOURCE MENU_BAR r_mnrefprovider_menubar
-    {
-    titles =
-        {
-        MENU_TITLE
-            {
-            menu_pane = r_mnrefprovider_menu;
-            }
-        };
-    }
-
-RESOURCE MENU_PANE r_mnrefprovider_menu
-    {
-    items =
-        {
-        MENU_ITEM
-            {
-            command = EAknSoftkeyExit;
-            txt = "Exit";
-            }
-        };
-    }
-
-RESOURCE DIALOG r_mnrefprovider_selection_dialog
-    {
-    flags = EAknDialogSelectionList;
-    buttons = R_AVKON_SOFTKEYS_OK_CANCEL;
-    items =
-        {
-        DLG_LINE
-            {
-            type = EAknCtSingleGraphicListBox;
-            id = ESelectionListControl;
-            control = LISTBOX
-                {
-                flags = EAknListBoxSelectionList;
-                };
-            },
-        // the next dlg line is optional.
-        DLG_LINE
-            {
-            itemflags = EEikDlgItemNonFocusing;
-            id = EFindControl;
-            type = EAknCtSelectionListFixedFind;
-            }
-        };
-    }
-
-RESOURCE AVKON_VIEW r_mnrefprovider_map_view
-    {
-    menubar = r_mnrefprovider_map_view_menubar;
-    cba = R_AVKON_SOFTKEYS_OPTIONS_EXIT;
-    }
-
-RESOURCE AVKON_VIEW r_mnrefprovider_map_view_chained
-    {
-    menubar = r_mnrefprovider_map_view_menubar;
-    cba = R_AVKON_SOFTKEYS_OPTIONS_BACK;
-    }
-
-RESOURCE MENU_BAR r_mnrefprovider_map_view_menubar
-    {
-    titles =
-        {
-        MENU_TITLE
-            {
-            menu_pane = r_mnrefprovider_map_view_menu;
-            }
-        };
-    }
-
-RESOURCE MENU_PANE r_mnrefprovider_map_view_menu
-    {
-    items =
-        {
-        MENU_ITEM
-            {
-            command = EMnrpCommandSelect;
-            txt = "Select";
-            },
-        MENU_ITEM
-            {
-            command = EMnrpCommandFullScreen;
-            txt = "Toggle Fullscreen";
-            },
-        MENU_ITEM
-            {
-            command = EAknSoftkeyExit;
-            txt = "Exit";
-            }
-        };
-    }
-
-RESOURCE AVKON_VIEW r_mnrefprovider_navi_view
-    {
-    cba = R_AVKON_SOFTKEYS_EXIT;
-    }
-
-RESOURCE AVKON_VIEW r_mnrefprovider_navi_view_chained
-    {
-    cba = R_AVKON_SOFTKEYS_BACK;
-    }
--- a/locsrv_plat/map_image_conversion_plugin_api/tsrc/mapnavproviderrefapp/data/mnrefprovider_reg.rss	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,66 +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:  Registration file for MnRefProvider
-*
-*/
-
-
-#include <appinfo.rh>
-
-#include "mnappserviceuids.hrh"
-#include "mnappservices.hrh"
-#include "mnserviceinfo.rh"
-
-#include <MnRefProvider.rsg>
-
-UID2 KUidAppRegistrationResourceFile
-UID3 0x03132013
-
-RESOURCE APP_REGISTRATION_INFO
-    {
-    app_file = "MnRefProvider";
-    localisable_resource_file = "\\resource\\apps\\MnRefProvider";
-    localisable_resource_id = R_MNREFPROVIDER_LOCALISABLE_APP_INFO;
-    
-    launch = KAppLaunchInForeground;
-    hidden = KAppNotHidden;
-        
-    datatype_list = {};
-    file_ownership_list = {};
-    service_list =
-        {
-        SERVICE_INFO
-            {
-            uid = KMnAppMapViewService;
-            datatype_list = {};
-            opaque_data = r_mnrefprovider_mapview_opaquedata;
-            },
-        SERVICE_INFO
-            {
-            uid = KMnAppNavigationService;
-            datatype_list = {};
-            opaque_data = r_mnrefprovider_navigation_opaquedata;
-            }
-        };
-    }
-
-RESOURCE MN_SERVICE_INFO r_mnrefprovider_mapview_opaquedata
-    {
-    service_features = KMnSvcFeatureShowMap | KMnSvcFeatureSelectFromMap;
-    }
-
-RESOURCE MN_SERVICE_INFO r_mnrefprovider_navigation_opaquedata
-    {
-    service_features = KMnSvcFeatureNavigateTo;
-    }
--- a/locsrv_plat/map_image_conversion_plugin_api/tsrc/mapnavproviderrefapp/data/mnrefproviderback.rss	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,95 +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:  Resource definition file for MnRefProviderBack
-*
-*/
-
-
-NAME MNRG
-
-#include <eikon.rsg>
-#include <eikon.rh>
-#include <avkon.rsg>
-#include <avkon.mbg>
-#include <avkon.rh>
-
-#include <appinfo.rh>
-
-RESOURCE RSS_SIGNATURE {  }
-
-RESOURCE TBUF { buf="MnRefProviderBack"; }
-
-RESOURCE EIK_APP_INFO
-    {
-    menubar = r_mnrefgeocoder_menubar;
-    cba = R_AVKON_SOFTKEYS_OPTIONS_EXIT;
-    }
-
-RESOURCE LOCALISABLE_APP_INFO r_mnrefgeocoder_localisable_app_info
-    {
-    short_caption = "MnRefProvider";
-    caption_and_icon =
-        CAPTION_AND_ICON_INFO
-            {
-            caption = "MnRefProvider";
-            };
-    view_list = {};
-    }
-
-RESOURCE CONTEXT_PANE r_mnrefgeocoder_app_icon
-    {
-    }
-
-RESOURCE MENU_BAR r_mnrefgeocoder_menubar
-    {
-    titles =
-        {
-        MENU_TITLE
-            {
-            menu_pane = r_mnrefgeocoder_menu;
-            }
-        };
-    }
-
-RESOURCE MENU_PANE r_mnrefgeocoder_menu
-    {
-    items =
-        {
-        MENU_ITEM
-            {
-            command = EAknSoftkeyExit;
-            txt = "Exit";
-            }
-        };
-    }
-
-RESOURCE AVKON_LIST_QUERY r_mnrefgeocoder_list_query
-    {
-    flags = EGeneralQueryFlags;
-    softkeys = R_AVKON_SOFTKEYS_OK_CANCEL;
-    items =
-        {
-        AVKON_LIST_QUERY_DLG_LINE
-            {
-            control = AVKON_LIST_QUERY_CONTROL
-                {
-                listtype = EAknCtSinglePopupMenuListBox;
-                listbox = AVKON_LIST_QUERY_LIST
-                    {
-                    };
-                heading = "Select best match";
-                };
-            }
-        };
-    }
--- a/locsrv_plat/map_image_conversion_plugin_api/tsrc/mapnavproviderrefapp/data/mnrefproviderback_reg.rss	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,75 +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:  Registration file for MnRefProviderBack
-*
-*/
-
-
-#include <appinfo.rh>
-
-#include "mnappserviceuids.hrh"
-#include "mnappservices.hrh"
-#include "mnserviceinfo.rh"
-
-#include <mnrefproviderback.rsg>
-
-UID2 KUidAppRegistrationResourceFile
-UID3 0x03132014
-
-RESOURCE APP_REGISTRATION_INFO
-    {
-    app_file = "mnrefproviderback";
-    localisable_resource_file = "\\resource\\apps\\mnrefproviderback";
-    localisable_resource_id = R_MNREFGEOCODER_LOCALISABLE_APP_INFO;
-
-    launch = KAppLaunchInBackground;
-    hidden = KAppIsHidden;
-
-    datatype_list = {};
-    file_ownership_list = {};
-    service_list =
-        {
-        SERVICE_INFO
-            {
-            uid = KMnAppGeocodingService;
-            datatype_list = {};
-            opaque_data = r_mnrefgeocoder_geocoding_opaquedata;
-            }
-#ifdef RD_MAPNAV_BITMAP_ACCESS
-        ,
-        SERVICE_INFO
-            {
-            uid = KMnAppMapImageService;
-            datatype_list = {};
-            opaque_data = r_mnrefprovider_mapimage_opaquedata;
-            }
-#endif
-        };
-    }
-
-RESOURCE MN_SERVICE_INFO r_mnrefgeocoder_geocoding_opaquedata
-    {
-    service_features =
-        KMnSvcFeatureCoordToAddr |
-        KMnSvcFeatureAddrToCoord |
-        KMnSvcFeaturePlainAddrToCoord;
-    }
-
-#ifdef RD_MAPNAV_BITMAP_ACCESS
-RESOURCE MN_SERVICE_INFO r_mnrefprovider_mapimage_opaquedata
-    {
-    service_features = KMnSvcFeatureVectorMap;
-    }
-#endif
-	 
--- a/locsrv_plat/map_image_conversion_plugin_api/tsrc/mapnavproviderrefapp/data/mnrefproviderengine.rss	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,205 +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:  Resource definition file for MnRefProviderEngine
-*
-*/
-
-
-NAME MNRE
-
-#include <eikon.rsg>
-#include <eikon.rh>
-#include <avkon.rsg>
-#include <avkon.mbg>
-#include <avkon.rh>
-
-#include <appinfo.rh>
-
-RESOURCE RSS_SIGNATURE {  }
-
-RESOURCE TBUF { buf=""; }
-
-STRUCT PLACE
-    {
-    LTEXT city;
-    LTEXT country;
-    DOUBLE lat;
-    DOUBLE lon;
-    }
-
-STRUCT PLACES
-    {
-    STRUCT places[];
-    }
-
-RESOURCE PLACES r_mnrefproviderengine_places
-    {
-    places =
-        {
-        PLACE { city="Tampere"; country="Finland"; lat=61.50; lon=23.83; }, 
-        PLACE { city="Turku"; country="Finland"; lat=60.45; lon=22.28; }, 
-        PLACE { city="Oulu"; country="Finland"; lat=65.02; lon=28.47; }, 
-        PLACE { city="Saint-Petersburg"; country="Russia"; lat=59.92; lon=30.42; }, 
-        PLACE { city="Göteborg"; country="Sweden"; lat=57.72; lon=11.97; }, 
-        PLACE { city="Kabul"; country="Afghanistan"; lat=35.10; lon=68.55; },
-        PLACE { city="Tirana"; country="Albania"; lat=41.74; lon=19.38; },
-        PLACE { city="Algiers"; country="Algeria"; lat=37.55; lon=2.29; },
-        PLACE { city="Luanda"; country="Angola"; lat=-8.35; lon=12.76; },
-        PLACE { city="Yerevan"; country="Armenia"; lat=40.47; lon=44.21; },
-        PLACE { city="Oranjestad"; country="Aruba"; lat=13.12; lon=-70.76; },
-        PLACE { city="Canberra"; country="Australia"; lat=-35.15; lon=149.04; },
-        PLACE { city="Vienna"; country="Austria"; lat=48.75; lon=15.82; },
-        PLACE { city="Baku"; country="Azerbaijan"; lat=40.79; lon=49.50; },
-        PLACE { city="Nassau"; country="Bahamas"; lat=25.74; lon=-77.99; },
-        PLACE { city="Dhaka"; country="Bangladesh"; lat=24.10; lon=90.05; },
-        PLACE { city="Bridgetown"; country="Barbados"; lat=13.68; lon=-60.20; },
-        PLACE { city="Minsk"; country="Belarus"; lat=54.08; lon=27.43; },
-        PLACE { city="Brussels"; country="Belgium"; lat=51.64; lon=3.56; },
-        PLACE { city="Belmopan"; country="Belize"; lat=17.32; lon=-88.52; },
-        PLACE { city="Hamilton"; country="Bermuda"; lat=-37.75; lon=175.28; },
-        PLACE { city="Thimphu"; country="Bhutan"; lat=28.07; lon=89.05; },
-        PLACE { city="Gaborone"; country="Botswana"; lat=-24.36; lon=25.56; },
-        PLACE { city="Brasilia"; country="Brazil"; lat=-15.48; lon=-48.22; },
-        PLACE { city="Sofia"; country="Bulgaria"; lat=43.08; lon=23.00; },
-        PLACE { city="Bujumbura"; country="Burundi"; lat=-3.19; lon=29.17; },
-        PLACE { city="Yaounde"; country="Cameroon"; lat=4.52; lon=10.90; },
-        PLACE { city="Ottawa"; country="Canada"; lat=46.28; lon=-76.53; },
-        PLACE { city="Santiago"; country="Chile"; lat=-33.07; lon=-70.99; },
-        PLACE { city="Beijing"; country="China"; lat=40.13; lon=116.12; },
-        PLACE { city="Bogota"; country="Colombia"; lat=4.78; lon=-74.21; },
-        PLACE { city="Moroni"; country="Comoros"; lat=-11.10; lon=42.69; },
-        PLACE { city="Brazzaville"; country="Congo"; lat=-3.48; lon=14.50; },
-        PLACE { city="Zagreb"; country="Croatia"; lat=45.95; lon=15.88; },
-        PLACE { city="Havana"; country="Cuba"; lat=23.82; lon=-83.05; },
-        PLACE { city="Nicosia"; country="Cyprus"; lat=35.79; lon=32.73; },
-        PLACE { city="Copenhagen"; country="Denmark"; lat=56.32; lon=11.93; },
-        PLACE { city="Djibouti"; country="Djibouti"; lat=12.24; lon=42.35; },
-        PLACE { city="Roseau"; country="Dominica"; lat=15.85; lon=-61.91; },
-        PLACE { city="Quito"; country="Ecuador"; lat=-0.20; lon=-78.55; },
-        PLACE { city="Cairo"; country="Egypt"; lat=30.38; lon=30.87; },
-        PLACE { city="Asmara"; country="Eritrea"; lat=15.40; lon=38.83; },
-        PLACE { city="Tallinn"; country="Estonia"; lat=60.28; lon=23.90; },
-        PLACE { city="Suva"; country="Fiji"; lat=-18.07; lon=178.47; },
-        PLACE { city="Helsinki"; country="Finland"; lat=60.32; lon=24.98; },
-        PLACE { city="Paris"; country="France"; lat=49.86; lon=1.34; },
-        PLACE { city="Libreville"; country="Gabon"; lat=1.11; lon=8.74; },
-        PLACE { city="Banjul"; country="Gambia"; lat=14.07; lon=-17.27; },
-        PLACE { city="Tbilisi"; country="Georgia"; lat=42.63; lon=43.90; },
-        PLACE { city="Berlin"; country="Germany"; lat=52.67; lon=13.23; },
-        PLACE { city="Accra"; country="Ghana"; lat=6.16; lon=-0.79; },
-        PLACE { city="Gibraltar"; country="Gibraltar"; lat=36.14; lon=-5.39; },
-        PLACE { city="Athens"; country="Greece"; lat=38.94; lon=22.74; },
-        PLACE { city="Godthabsfjord"; country="Greenland"; lat=64.47; lon=-52.05; },
-        PLACE { city="Agana"; country="Guam"; lat=14.05; lon=144.17; },
-        PLACE { city="Guatemala"; country="Guatemala"; lat=14.69; lon=-90.39; },
-        PLACE { city="Conakry"; country="Guinea"; lat=9.87; lon=-14.20; },
-        PLACE { city="Georgetown"; country="Guyana"; lat=6.90; lon=-58.26; },
-        PLACE { city="Tegucigalpa"; country="Honduras"; lat=14.40; lon=-87.55; },
-        PLACE { city="Budapest"; country="Hungary"; lat=47.53; lon=19.04; },
-        PLACE { city="Reykjavik"; country="Iceland"; lat=64.58; lon=-22.36; },
-        PLACE { city="Delhi"; country="India"; lat=29.56; lon=76.29; },
-        PLACE { city="Jakarta"; country="Indonesia"; lat=-5.99; lon=106.66; },
-        PLACE { city="Tehran"; country="Iran"; lat=35.91; lon=51.24; },
-        PLACE { city="Baghdad"; country="Iraq"; lat=33.40; lon=44.35; },
-        PLACE { city="Jerusalem"; country="Israel"; lat=31.98; lon=34.97; },
-        PLACE { city="Rome"; country="Italy"; lat=42.78; lon=11.60; },
-        PLACE { city="Kingston"; country="Jamaica"; lat=29.30; lon=167.80; },
-        PLACE { city="Tokyo"; country="Japan"; lat=36.39; lon=139.04; },
-        PLACE { city="Amman"; country="Jordan"; lat=32.28; lon=35.54; },
-        PLACE { city="Almaty"; country="Kazakhstan"; lat=43.45; lon=76.75; },
-        PLACE { city="Nairobi"; country="Kenya"; lat=-0.91; lon=36.43; },
-        PLACE { city="Bairiki"; country="Kiribati"; lat=1.87; lon=172.55; },
-        PLACE { city="Bishkek"; country="Kyrgyzstan"; lat=43.45; lon=74.02; },
-        PLACE { city="Vientiane"; country="Laos"; lat=18.51; lon=102.05; },
-        PLACE { city="Riga"; country="Latvia"; lat=57.18; lon=23.92; },
-        PLACE { city="Beirut"; country="Lebanon"; lat=34.19; lon=35.21; },
-        PLACE { city="Maseru"; country="Lesotho"; lat=-28.58; lon=26.78; },
-        PLACE { city="Monrovia"; country="Liberia"; lat=7.24; lon=-11.72; },
-        PLACE { city="Tripoli"; country="Libya"; lat=33.21; lon=12.87; },
-        PLACE { city="Vaduz"; country="Liechtenstein"; lat=48.11; lon=8.54; },
-        PLACE { city="Vilnius"; country="Lithuania"; lat=54.97; lon=25.00; },
-        PLACE { city="Luxembourg"; country="Luxembourg"; lat=50.55; lon=5.22; },
-        PLACE { city="Macau"; country="Macau"; lat=22.49; lon=113.33; },
-        PLACE { city="Antananarivo"; country="Madagascar"; lat=-18.61; lon=47.21; },
-        PLACE { city="Lilongwe"; country="Malawi"; lat=-13.42; lon=33.22; },
-        PLACE { city="Male"; country="Maldives"; lat=4.90; lon=72.77; },
-        PLACE { city="Bamako"; country="Mali"; lat=13.47; lon=-8.82; },
-        PLACE { city="Valletta"; country="Malta"; lat=36.43; lon=13.97; },
-        PLACE { city="Nouakchott"; country="Mauritania"; lat=18.32; lon=-16.14; },
-        PLACE { city="Dzaoudzi"; country="Mayotte"; lat=-12.34; lon=44.84; },
-        PLACE { city="Palikir"; country="Micronesia"; lat=7.51; lon=157.56; },
-        PLACE { city="Chisinau"; country="Moldova"; lat=47.92; lon=27.95; },
-        PLACE { city="Monaco"; country="Monaco"; lat=44.41; lon=6.67; },
-        PLACE { city="Plymouth"; country="Montserrat"; lat=50.65; lon=-4.42; },
-        PLACE { city="Rabat"; country="Morocco"; lat=34.81; lon=-7.57; },
-        PLACE { city="Maputo"; country="Mozambique"; lat=-25.66; lon=32.23; },
-        PLACE { city="Yangon"; country="Myanmar"; lat=16.84; lon=96.08; },
-        PLACE { city="Windhoek"; country="Namibia"; lat=-21.94; lon=16.42; },
-        PLACE { city="Domaneab"; country="Nauru"; lat=0.31; lon=166.07; },
-        PLACE { city="Kathmandu"; country="Nepal"; lat=28.43; lon=84.66; },
-        PLACE { city="Amsterdam"; country="Netherlands"; lat=53.17; lon=4.01; },
-        PLACE { city="Managua"; country="Nicaragua"; lat=12.61; lon=-86.84; },
-        PLACE { city="Niamey"; country="Niger"; lat=13.73; lon=1.89; },
-        PLACE { city="Lagos"; country="Nigeria"; lat=38.00; lon=-9.60; },
-        PLACE { city="Alofi"; country="Niue"; lat=-18.95; lon=-170.02; },
-        PLACE { city="Oslo"; country="Norway"; lat=60.46; lon=10.20; },
-        PLACE { city="Muscat"; country="Oman"; lat=24.48; lon=57.74; },
-        PLACE { city="Islamabad"; country="Pakistan"; lat=34.43; lon=72.40; },
-        PLACE { city="Koror"; country="Palau"; lat=7.77; lon=134.06; },
-        PLACE { city="Panama"; country="Panama"; lat=9.97; lon=-80.52; },
-        PLACE { city="Asuncion"; country="Paraguay"; lat=-25.26; lon=-57.67; },
-        PLACE { city="Lima"; country="Peru"; lat=-11.31; lon=-77.79; },
-        PLACE { city="Manila"; country="Philippines"; lat=14.80; lon=120.75; },
-        PLACE { city="Adamstown"; country="Pitcairn"; lat=-24.53; lon=-130.62; },
-        PLACE { city="Warsaw"; country="Poland"; lat=52.94; lon=20.28; },
-        PLACE { city="Lisbon"; country="Portugal"; lat=38.72; lon=-9.20; },
-        PLACE { city="Doha"; country="Qatar"; lat=25.95; lon=50.93; },
-        PLACE { city="Bucharest"; country="Romania"; lat=45.34; lon=25.21; },
-        PLACE { city="Moscow"; country="Russia"; lat=55.88; lon=37.50; },
-        PLACE { city="Kigali"; country="Rwanda"; lat=-1.70; lon=29.78; },
-        PLACE { city="Dakar"; country="Senegal"; lat=15.06; lon=-17.87; },
-        PLACE { city="Victoria"; country="Seychelles"; lat=-3.71; lon=54.53; },
-        PLACE { city="Singapore"; country="Singapore"; lat=1.28; lon=103.85; },
-        PLACE { city="Ljubljana"; country="Slovenia"; lat=46.83; lon=13.79; },
-        PLACE { city="Mogadishu"; country="Somalia"; lat=2.60; lon=44.85; },
-        PLACE { city="Madrid"; country="Spain"; lat=41.49; lon=-4.74; },
-        PLACE { city="Khartoum"; country="Sudan"; lat=15.56; lon=32.54; },
-        PLACE { city="Paramaribo"; country="Surinam"; lat=5.85; lon=-55.18; },
-        PLACE { city="Mbabane"; country="Swaziland"; lat=-25.92; lon=30.72; },
-        PLACE { city="Stockholm"; country="Sweden"; lat=59.67; lon=17.71; },
-        PLACE { city="Berne"; country="Switzerland"; lat=47.49; lon=6.92; },
-        PLACE { city="Damascus"; country="Syria"; lat=33.89; lon=35.91; },
-        PLACE { city="Taipei"; country="Taiwan"; lat=25.93; lon=120.62; },
-        PLACE { city="Dushanbe"; country="Tajikistan"; lat=39.48; lon=67.88; },
-        PLACE { city="Dodoma"; country="Tanzania"; lat=-5.16; lon=34.78; },
-        PLACE { city="Bangkok"; country="Thailand"; lat=14.36; lon=99.90; },
-        PLACE { city="Lhasa"; country="Tibet"; lat=30.60; lon=90.17; },
-        PLACE { city="Lome"; country="Togo"; lat=6.63; lon=0.73; },
-        PLACE { city="Tunis"; country="Tunisia"; lat=36.85; lon=10.17; },
-        PLACE { city="Ankara"; country="Turkey"; lat=40.34; lon=32.56; },
-        PLACE { city="Ashkhabad"; country="Turkmenistan"; lat=38.22; lon=58.11; },
-        PLACE { city="Funafuti"; country="Tuvalu"; lat=-8.30; lon=178.96; },
-        PLACE { city="Kampala"; country="Uganda"; lat=1.20; lon=31.64; },
-        PLACE { city="Kiev"; country="Ukraine"; lat=50.92; lon=30.06; },
-        PLACE { city="Montevideo"; country="Uruguay"; lat=-34.21; lon=-56.81; },
-        PLACE { city="Tashkent"; country="Uzbekistan"; lat=41.40; lon=69.24; },
-        PLACE { city="Caracas"; country="Venezuela"; lat=11.16; lon=-67.58; },
-        PLACE { city="Hanoi"; country="Vietnam"; lat=21.33; lon=105.67; },
-        PLACE { city="Sanaa"; country="Yemen"; lat=16.39; lon=43.26; },
-        PLACE { city="Belgrade"; country="Yugoslavia"; lat=45.56; lon=19.77; },
-        PLACE { city="Lusaka"; country="Zambia"; lat=-15.00; lon=27.80; },
-        PLACE { city="Harare"; country="Zimbabwe"; lat=-17.30; lon=30.61; }
-		};
-	}
-
--- a/locsrv_plat/map_image_conversion_plugin_api/tsrc/mapnavproviderrefapp/data/mnrefproviderplugin.rss	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,51 +0,0 @@
-/*
-* Copyright (c) 2007 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 ECom registration resource for TestProviderPlugin.
-*
-*/
-
-
-//  RESOURCE IDENTIFIER
-NAME MNTP
-
-#include <ecom/registryinfov2.rh>
-#include <mnpluginuids.hrh> // defines interface UID
-
-RESOURCE REGISTRY_INFO r_mycoordconverterplugin_reginfo
-	{
-	resource_format_version = RESOURCE_FORMAT_VERSION_2;
-	// DLL UID of the DLL
-	dll_uid = 0x03133037;
-	interfaces =
-	    {
-	    INTERFACE_INFO
-	        {
-	        // UID of coordinate converter interface,
-	        // defined in mnpluginuids.hrh
-	        interface_uid = KMnMapImageConverterIf;
-	        implementations =
-	            {
-	            IMPLEMENTATION_INFO
-	                {
-	                // The licensee needs to allocate this UID from Symbian
-	                implementation_uid = 0x03133038;
-	                version_no = 1;
-	                display_name = "MnRefProviderCoordConverter";
-	                // SID of provider application executable
-	                default_data = "03132014";
-	                }
-	            };
-	        }
-	    };
-	}
--- a/locsrv_plat/map_image_conversion_plugin_api/tsrc/mapnavproviderrefapp/eabi/mnrefproviderengine.50u.def	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,64 +0,0 @@
-EXPORTS
-	_ZN11CMnrpEngine12KnownPlacesLEv @ 1 NONAME
-	_ZN11CMnrpEngine15AddressToCoordLERK12CPosLandmark @ 2 NONAME
-	_ZN11CMnrpEngine15AddressToCoordLERK7TDesC16 @ 3 NONAME
-	_ZN11CMnrpEngine16AddressToCoordLCERK12CPosLandmark @ 4 NONAME
-	_ZN11CMnrpEngine16AddressToCoordLCERK7TDesC16 @ 5 NONAME
-	_ZN11CMnrpEngine16CoordToAddressLCERK11TCoordinate @ 6 NONAME
-	_ZN11CMnrpEngine16FindClosestPoisLERK12CPosLandmarkR6RArrayINS_14TDistanceToPoiEEi @ 7 NONAME
-	_ZN11CMnrpEngine17FindResourceFileLERK7TDesC16R4TBufILi256EE @ 8 NONAME
-	_ZN11CMnrpEngine24DistanceBetweenLandmarksERK12CPosLandmarkS2_ @ 9 NONAME
-	_ZN11CMnrpEngine26BestCoordToAddressMatchesLERK11TCoordinateR13RPointerArrayI12CPosLandmarkEi @ 10 NONAME
-	_ZN11CMnrpEngine2FsEv @ 11 NONAME
-	_ZN11CMnrpEngine4NewLEv @ 12 NONAME
-	_ZN11CMnrpEngineD0Ev @ 13 NONAME
-	_ZN11CMnrpEngineD1Ev @ 14 NONAME
-	_ZN11CMnrpEngineD2Ev @ 15 NONAME
-	_ZN13CMnrpMapModel11UpdateModelERK17TMnMapImageParams @ 16 NONAME
-	_ZN13CMnrpMapModel12UpdateModelLER19CMnrpMapViewService @ 17 NONAME
-	_ZN13CMnrpMapModel12UpdateModelLERK20CMnrpMapImageService @ 18 NONAME
-	_ZN13CMnrpMapModel13SetScreenSizeE5TSize @ 19 NONAME
-	_ZN13CMnrpMapModel19NumIgnoredLandmarksEv @ 20 NONAME
-	_ZN13CMnrpMapModel4NewLER11CMnrpEngine @ 21 NONAME
-	_ZN13CMnrpMapModel4NewLER17MMapModelObserverR11CMnrpEngine @ 22 NONAME
-	_ZN13CMnrpMapModel4ZoomEd @ 23 NONAME
-	_ZN13CMnrpMapModel6MoveToE11TCoordinate @ 24 NONAME
-	_ZN13CMnrpMapModel8GoCenterEv @ 25 NONAME
-	_ZN20CMnrpPositionRequest11GetPositionER13TPositionInfo @ 26 NONAME
-	_ZN20CMnrpPositionRequest11SetOptionsLERK26TPositionUpdateOptionsBase @ 27 NONAME
-	_ZN20CMnrpPositionRequest14MagneticCourseEv @ 28 NONAME
-	_ZN20CMnrpPositionRequest15MagneticHeadingEv @ 29 NONAME
-	_ZN20CMnrpPositionRequest16FetchNewPositionEi @ 30 NONAME
-	_ZN20CMnrpPositionRequest4NewLERK7TDesC16R21MMnrpPositionObserver @ 31 NONAME
-	_ZN20CMnrpPositionRequest5SpeedEv @ 32 NONAME
-	_ZN20CMnrpPositionRequest6CourseEv @ 33 NONAME
-	_ZN20CMnrpPositionRequest7HeadingEv @ 34 NONAME
-	_ZN20CMnrpPositionRequestD0Ev @ 35 NONAME
-	_ZN20CMnrpPositionRequestD1Ev @ 36 NONAME
-	_ZN20CMnrpPositionRequestD2Ev @ 37 NONAME
-	_ZN9MnrpUtils13AngleToStringEdR6TDes16 @ 38 NONAME
-	_ZN9MnrpUtils13SpeedToStringEdR6TDes16 @ 39 NONAME
-	_ZN9MnrpUtils16DistanceToStringEdR6TDes16 @ 40 NONAME
-	_ZN9MnrpUtils17PrintableStringLCERK7TDesC16 @ 41 NONAME
-	_ZN9MnrpUtils18CoordinateToStringEdR6TDes16ii @ 42 NONAME
-	_ZNK13CMnrpMapModel16AbsoluteToScreenE11TCoordinate @ 43 NONAME
-	_ZNK13CMnrpMapModel16ScreenToAbsoluteE6TPoint @ 44 NONAME
-	_ZNK13CMnrpMapModel16ScreenToAbsoluteEi @ 45 NONAME
-	_ZNK13CMnrpMapModel3TopEv @ 46 NONAME
-	_ZNK13CMnrpMapModel4LeftEv @ 47 NONAME
-	_ZNK13CMnrpMapModel5RightEv @ 48 NONAME
-	_ZNK13CMnrpMapModel5WidthEv @ 49 NONAME
-	_ZNK13CMnrpMapModel6BottomEv @ 50 NONAME
-	_ZNK13CMnrpMapModel6CenterEv @ 51 NONAME
-	_ZNK13CMnrpMapModel6HeightEv @ 52 NONAME
-	_ZNK13CMnrpMapModel7GetGridERNS_5TGridE @ 53 NONAME
-	_ZNK13CMnrpMapModel7RenderLER10CFbsBitmap5TRectP5CFontS4_ @ 54 NONAME
-	_ZTI11CMnrpEngine @ 55 NONAME ; #<TI>#
-	_ZTI13CMnrpMapModel @ 56 NONAME ; #<TI>#
-	_ZTI20CMnrpPositionRequest @ 57 NONAME ; #<TI>#
-	_ZTIN13CMnrpMapModel9CDrawItemE @ 58 NONAME ; #<TI>#
-	_ZTV11CMnrpEngine @ 59 NONAME ; #<VT>#
-	_ZTV13CMnrpMapModel @ 60 NONAME ; #<VT>#
-	_ZTV20CMnrpPositionRequest @ 61 NONAME ; #<VT>#
-	_ZTVN13CMnrpMapModel9CDrawItemE @ 62 NONAME ; #<VT>#
-
--- a/locsrv_plat/map_image_conversion_plugin_api/tsrc/mapnavproviderrefapp/eabi/mnrefproviderengineu.def	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,62 +0,0 @@
-EXPORTS
-	_ZN11CMnrpEngine12KnownPlacesLEv @ 1 NONAME
-	_ZN11CMnrpEngine16AddressToCoordLCERK12CPosLandmark @ 2 NONAME
-	_ZN11CMnrpEngine16AddressToCoordLCERK7TDesC16 @ 3 NONAME
-	_ZN11CMnrpEngine16CoordToAddressLCERK11TCoordinate @ 4 NONAME
-	_ZN11CMnrpEngine16FindClosestPoisLERK12CPosLandmarkR6RArrayINS_14TDistanceToPoiEEi @ 5 NONAME
-	_ZN11CMnrpEngine17FindResourceFileLERK7TDesC16R4TBufILi256EE @ 6 NONAME
-	_ZN11CMnrpEngine24DistanceBetweenLandmarksERK12CPosLandmarkS2_ @ 7 NONAME
-	_ZN11CMnrpEngine26BestCoordToAddressMatchesLERK11TCoordinateR13RPointerArrayI12CPosLandmarkEi @ 8 NONAME
-	_ZN11CMnrpEngine2FsEv @ 9 NONAME
-	_ZN11CMnrpEngine4NewLEv @ 10 NONAME
-	_ZN11CMnrpEngineD0Ev @ 11 NONAME
-	_ZN11CMnrpEngineD1Ev @ 12 NONAME
-	_ZN11CMnrpEngineD2Ev @ 13 NONAME
-	_ZN13CMnrpMapModel12UpdateModelLER19CMnrpMapViewService @ 14 NONAME
-	_ZN13CMnrpMapModel13SetScreenSizeE5TSize @ 15 NONAME
-	_ZN13CMnrpMapModel4NewLER11CMnrpEngine @ 16 NONAME
-	_ZN13CMnrpMapModel4NewLER17MMapModelObserverR11CMnrpEngine @ 17 NONAME
-	_ZN13CMnrpMapModel4ZoomEd @ 18 NONAME
-	_ZN13CMnrpMapModel6MoveToE11TCoordinate @ 19 NONAME
-	_ZN13CMnrpMapModel8GoCenterEv @ 20 NONAME
-	_ZN20CMnrpPositionRequest11GetPositionER13TPositionInfo @ 21 NONAME
-	_ZN20CMnrpPositionRequest11SetOptionsLERK26TPositionUpdateOptionsBase @ 22 NONAME
-	_ZN20CMnrpPositionRequest14MagneticCourseEv @ 23 NONAME
-	_ZN20CMnrpPositionRequest15MagneticHeadingEv @ 24 NONAME
-	_ZN20CMnrpPositionRequest16FetchNewPositionEi @ 25 NONAME
-	_ZN20CMnrpPositionRequest4NewLERK7TDesC16R21MMnrpPositionObserver @ 26 NONAME
-	_ZN20CMnrpPositionRequest5SpeedEv @ 27 NONAME
-	_ZN20CMnrpPositionRequest6CourseEv @ 28 NONAME
-	_ZN20CMnrpPositionRequest7HeadingEv @ 29 NONAME
-	_ZN20CMnrpPositionRequestD0Ev @ 30 NONAME
-	_ZN20CMnrpPositionRequestD1Ev @ 31 NONAME
-	_ZN20CMnrpPositionRequestD2Ev @ 32 NONAME
-	_ZN9MnrpUtils13AngleToStringEdR6TDes16 @ 33 NONAME
-	_ZN9MnrpUtils13SpeedToStringEdR6TDes16 @ 34 NONAME
-	_ZN9MnrpUtils16DistanceToStringEdR6TDes16 @ 35 NONAME
-	_ZN9MnrpUtils18CoordinateToStringEdR6TDes16ii @ 36 NONAME
-	_ZNK13CMnrpMapModel16AbsoluteToScreenE11TCoordinate @ 37 NONAME
-	_ZNK13CMnrpMapModel16ScreenToAbsoluteE6TPoint @ 38 NONAME
-	_ZNK13CMnrpMapModel16ScreenToAbsoluteEi @ 39 NONAME
-	_ZNK13CMnrpMapModel3TopEv @ 40 NONAME
-	_ZNK13CMnrpMapModel4LeftEv @ 41 NONAME
-	_ZNK13CMnrpMapModel5RightEv @ 42 NONAME
-	_ZNK13CMnrpMapModel5WidthEv @ 43 NONAME
-	_ZNK13CMnrpMapModel6BottomEv @ 44 NONAME
-	_ZNK13CMnrpMapModel6CenterEv @ 45 NONAME
-	_ZNK13CMnrpMapModel6HeightEv @ 46 NONAME
-	_ZNK13CMnrpMapModel7GetGridERNS_5TGridE @ 47 NONAME
-	_ZNK13CMnrpMapModel7RenderLER10CFbsBitmap5TRectP5CFontS4_ @ 48 NONAME
-	_ZTI11CMnrpEngine @ 49 NONAME ; #<TI>#
-	_ZTI13CMnrpMapModel @ 50 NONAME ; #<TI>#
-	_ZTI20CMnrpPositionRequest @ 51 NONAME ; #<TI>#
-	_ZTIN13CMnrpMapModel9CDrawItemE @ 52 NONAME ; #<TI>#
-	_ZTV11CMnrpEngine @ 53 NONAME ; #<VT>#
-	_ZTV13CMnrpMapModel @ 54 NONAME ; #<VT>#
-	_ZTV20CMnrpPositionRequest @ 55 NONAME ; #<VT>#
-	_ZTVN13CMnrpMapModel9CDrawItemE @ 56 NONAME ; #<VT>#
-	_ZN9MnrpUtils17PrintableStringLCERK7TDesC16 @ 57 NONAME
-	_ZN11CMnrpEngine14AddressToCoordERK12CPosLandmark @ 58 NONAME
-	_ZN11CMnrpEngine14AddressToCoordERK7TDesC16 @ 59 NONAME
-	_ZN13CMnrpMapModel19NumIgnoredLandmarksEv @ 60 NONAME
-
--- a/locsrv_plat/map_image_conversion_plugin_api/tsrc/mapnavproviderrefapp/group/bld.inf	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,41 +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:  Build information file for project MapNavRefProviderApp
-*
-*/
-
-
-#include <bldvariant.hrh>
-#include <platform_paths.hrh>
-
-PRJ_PLATFORMS
-DEFAULT
-
-PRJ_EXTENSIONS
-START EXTENSION s60/mifconv
-OPTION TARGETFILE MnRefProvider.mif  // this will also generate .mbm;
-OPTION HEADERFILE MnRefProvider.mbg
-OPTION SOURCES -c8,8 default_lm.bmp
-OPTION SOURCEDIR ../data
-END
-PRJ_MMPFILES
-
-PRJ_TESTMMPFILES
-mnconvpluginrefengine.mmp
-mnconvpluginrefprovider.mmp
-mnconvpluginrefproviderback.mmp
-
-#ifdef RD_MAPNAV_BITMAP_ACCESS
-mnconvpluginrefproviderplugin.mmp
-#endif
--- a/locsrv_plat/map_image_conversion_plugin_api/tsrc/mapnavproviderrefapp/group/mnconvpluginrefengine.mmp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,64 +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:  Project definition file for MnRefProviderEngine
-*
-*/
-
-
-#include <platform_paths.hrh>
-
-TARGET              mnrefproviderengine.dll
-TARGETTYPE          dll
-UID                 0x1000008D 0x03132015
-
-VENDORID            VID_DEFAULT
-CAPABILITY          ReadUserData WriteUserData Location
-
-SOURCEPATH          ../src
-
-SOURCE              mnrpengine.cpp
-SOURCE              mnrpmapmodel.cpp
-SOURCE              mnrppositionrequest.cpp
-SOURCE              mnrputils.cpp
-
-USERINCLUDE         ../inc
-MW_LAYER_SYSTEMINCLUDE
-
-LIBRARY             euser.lib efsrv.lib estor.lib bafl.lib
-LIBRARY             eikcore.lib
-LIBRARY             aknicon.lib egul.lib gdi.lib bitgdi.lib
-
-LIBRARY             eposlandmarks.lib
-LIBRARY             lbs.lib
-LIBRARY             mnclientlib.lib mnservicelib.lib
-
-DEBUGLIBRARY        flogger.lib
-
-START RESOURCE      ../data/mnrefproviderengine.rss
-HEADER
-TARGETPATH          /resource
-END
-
-#ifdef RD_MAPNAV_BITMAP_ACCESS
-#ifdef WINS
-DEFFILE         ../bwins/mnrefproviderengine.50.def
-#else
-DEFFILE         ../eabi/mnrefproviderengine.50.def
-#endif
-#endif
-
-SMPSAFE
-
-// END OF FILE
-
--- a/locsrv_plat/map_image_conversion_plugin_api/tsrc/mapnavproviderrefapp/group/mnconvpluginrefprovider.mmp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,82 +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:  Project definition file for MnRefProvider
-*
-*/
-
-
-#include <platform_paths.hrh>
-
-TARGET              mnrefprovider.exe
-TARGETTYPE          exe
-EPOCSTACKSIZE       0x5000
-UID                 0x100039CE 0x03132013
-
-VENDORID            VID_DEFAULT
-CAPABILITY          ReadUserData WriteUserData Location
-
-SOURCEPATH          ../src
-
-SOURCE              mnrefprovider.cpp
-SOURCE              mnrpapplication.cpp
-SOURCE              mnrpappui.cpp
-SOURCE              mnrpdocument.cpp
-SOURCE              mnrpappserver.cpp
-
-SOURCE              mnrpappview.cpp
-SOURCE              mnrpappcontrol.cpp
-
-SOURCE              mnrpmapview.cpp
-SOURCE              mnrpmapcontrol.cpp
-
-SOURCE              mnrpnaviview.cpp
-SOURCE              mnrpnavimodel.cpp
-SOURCE              mnrpnavicontrol.cpp
-
-SOURCE              mnrpnavigationservice.cpp
-SOURCE              mnrpmapviewservice.cpp
-
-USERINCLUDE         ../inc
-
-MW_LAYER_SYSTEMINCLUDE
-
-LIBRARY             euser.lib efsrv.lib estor.lib apparc.lib bafl.lib
-LIBRARY             cone.lib eikcore.lib eikcoctl.lib eikctl.lib eikdlg.lib
-
-LIBRARY             avkon.lib aknskins.lib aknicon.lib
-LIBRARY             egul.lib gdi.lib ws32.lib fbscli.lib
-LIBRARY             imageconversion.lib
-
-LIBRARY             eposlandmarks.lib eposlmsearchlib.lib
-LIBRARY             lbs.lib
-LIBRARY             mnservicelib.lib
-
-LIBRARY             mnrefproviderengine.lib
-
-DEBUGLIBRARY        flogger.lib
-
-START RESOURCE      ../data/MnRefProvider.rss
-HEADER
-TARGETPATH          /resource/apps
-END
-
-START RESOURCE      ../data/MnRefProvider_reg.rss
-DEPENDS mnrefprovider.rsg
-TARGETPATH          /private/10003a3f/apps
-END
-
-SMPSAFE
-
-// END OF FILE
-
--- a/locsrv_plat/map_image_conversion_plugin_api/tsrc/mapnavproviderrefapp/group/mnconvpluginrefproviderback.mmp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,72 +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:  Project definition file for MnRefGeocoder
-*
-*/
-
-
-#include <platform_paths.hrh>
-
-TARGET              mnrefproviderback.exe
-TARGETTYPE          exe
-EPOCSTACKSIZE       0x5000
-UID                 0x100039CE 0x03132014
-
-VENDORID            VID_DEFAULT
-CAPABILITY          ReadUserData WriteUserData Location
-
-SOURCEPATH          ../src
-
-SOURCE              mnrefproviderback.cpp
-SOURCE              mnrpapplicationback.cpp
-SOURCE              mnrpappuiback.cpp
-SOURCE              mnrpdocumentback.cpp
-SOURCE              mnrpappserverback.cpp
-
-SOURCE              mnrpgeocodingservice.cpp
-#ifdef RD_MAPNAV_BITMAP_ACCESS
-SOURCE              mnrpmapimageservice.cpp
-#endif
-
-USERINCLUDE         ../inc
-MW_LAYER_SYSTEMINCLUDE
-
-LIBRARY             euser.lib efsrv.lib estor.lib bafl.lib
-LIBRARY             cone.lib apparc.lib eikcore.lib eikcoctl.lib
-LIBRARY             ws32.lib gdi.lib
-
-LIBRARY             avkon.lib aknskins.lib
-
-LIBRARY             eposlandmarks.lib
-LIBRARY             lbs.lib
-LIBRARY             mnservicelib.lib
-
-LIBRARY             mnrefproviderengine.lib
-
-DEBUGLIBRARY        flogger.lib
-
-START RESOURCE      ../data/mnrefproviderback.rss
-HEADER
-TARGETPATH          /resource/apps
-END
-
-START RESOURCE      ../data/mnrefproviderback_reg.rss
-DEPENDS mnrefproviderback.rsg
-TARGETPATH          /private/10003a3f/apps
-END
-
-SMPSAFE
-
-// END OF FILE
-
--- a/locsrv_plat/map_image_conversion_plugin_api/tsrc/mapnavproviderrefapp/group/mnconvpluginrefproviderplugin.mmp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,50 +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:  Project definition file for MnRefProviderPlugin
-*
-*/
-
-
-#include <platform_paths.hrh>
-
-TARGET              MnRefProviderPlugin.dll
-TARGETTYPE          PLUGIN
-UID                 0x10009D8D 0x03133037
-
-VENDORID            VID_DEFAULT
-CAPABILITY          ReadUserData WriteUserData Location
-
-SOURCEPATH          ../src
-
-SOURCE              mnrefproviderplugin.cpp
-SOURCE				mnrpcoordconverter.cpp
-
-USERINCLUDE         ../inc
-MW_LAYER_SYSTEMINCLUDE
-
-LIBRARY             euser.lib
-LIBRARY             lbs.lib
-LIBRARY             mnclientlib.lib
-LIBRARY             mnrefproviderengine.lib
-DEBUGLIBRARY        flogger.lib
-
-START RESOURCE      ../data/mnrefproviderplugin.rss
-TARGET			    mnrefproviderplugin.rsc
-TARGETPATH          /resource/plugins
-END
-
-SMPSAFE
-
-// END OF FILE
-
--- a/locsrv_plat/map_image_conversion_plugin_api/tsrc/mapnavproviderrefapp/inc/debug.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,86 +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:  Debug macros
-*
-*/
-
-
-#ifndef MNRP_DEBUG_H
-#define MNRP_DEBUG_H
-
-#include <e32base.h>
-
-#ifdef _DEBUG
-
-#include <e32svr.h>
-#include <e32std.h>
-#include <f32file.h>
-#include <flogger.h>
-
-_LIT(KLogFile, "mnlog.txt");
-_LIT(KLogDirFullName, "c:\\logs\\");
-_LIT(KLogDir, "mn");
-
-inline void Prefix( TDes& aMessage )
-    {
-    RProcess process;
-    _LIT( KPrefix, "[MnRefProvider/%ld]: ");
-    aMessage.Format( KPrefix, process.Id().Id() );
-    }
-
-inline void Log( TRefByValue<const TDesC> aFmt, ... )
-    {
-    VA_LIST list;
-    VA_START( list, aFmt );
-
-    HBufC* buf = HBufC::New(512);
-    if ( buf )
-    	{
-    	TPtr ptr( buf->Des() );
-	    Prefix( ptr );
-	    ptr.AppendFormatList( aFmt, list );
-
-	    RDebug::RawPrint( ptr );
-	    RFileLogger::Write( KLogDir, KLogFile, EFileLoggingModeAppend, ptr );
-
-	    delete buf;
-    	}
-    }
-
-#define LOG( a )             { Log( _L( a ) ); }
-#define LOG1( a, b )         { Log( _L( a ), b ); }
-#define LOG2( a, b, c )      { Log( _L( a ), b, c ); }
-#define LOG3( a, b, c, d )   { Log( _L( a ), b, c, d ); }
-#define LOG4( a, b, c, d, e )   { Log( _L( a ), b, c, d, e ); }
-
-#else // _DEBUG
-
-// Release version - no logging
-#define LOG( a)
-#define LOG1( a, b )
-#define LOG2( a, b, c )
-#define LOG3( a, b, c, d )
-#define LOG4( a, b, c, d, e )
-
-#endif // _DEBUG
-
-inline void Panic( TInt aReason )
-    {
-    _LIT( KPanicCategory, "MnRefProvider" );
-    LOG1("Panicking: %1", aReason);
-    User::Panic( KPanicCategory, aReason );
-    }
-
-#endif // MNRP_DEBUG_H
-
--- a/locsrv_plat/map_image_conversion_plugin_api/tsrc/mapnavproviderrefapp/inc/mnrp.hrh	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,35 +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:  Common source and resource constants
-*
-*/
-
-
-#ifndef __MNRP_HRH__
-#define __MNRP_HRH__
-
-enum TMnrpCommandIds
-    {
-	EMnrpCommandFullScreen = 100,
-	EMnrpCommandSelect
-    };
-
-enum TMnrpViewIds
-    {
-    EMnrpAppViewId = 1,
-    EMnrpMapViewId,
-    EMnrpNavigationViewId
-    };
-
-#endif // __MNRP_HRH__
--- a/locsrv_plat/map_image_conversion_plugin_api/tsrc/mapnavproviderrefapp/inc/mnrpappcontrol.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,53 +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:  CMnrpAppControl class definition 
-*
-*/
-
-
-#ifndef MNRP_APPCONTROL_H
-#define MNRP_APPCONTROL_H
-
-#include <coecntrl.h>
-class CMnrpAppView;
-
-/** Empty view for the case when application is started
- *	from menu */
-class CMnrpAppControl : public CCoeControl
-    {
-    public:
-
-        static CMnrpAppControl* NewL( CMnrpAppView& aView, const TRect& aRect );
-
-        virtual ~CMnrpAppControl();
-
-    public:  // From CCoeControl
-
-        TInt CountComponentControls() const;
-        CCoeControl* ComponentControl( TInt aIndex ) const;
-        void HandleResourceChange( TInt aType );
-
-        void Draw( const TRect& aRect ) const;
-        
-    private:
-
-        void ConstructL( const TRect& aRect );
-        CMnrpAppControl( CMnrpAppView& aView );
-        
-    private:
-        CMnrpAppView&   iView;
-    };
-
-#endif // MNRP_APPCONTROL_H
-
--- a/locsrv_plat/map_image_conversion_plugin_api/tsrc/mapnavproviderrefapp/inc/mnrpapplication.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,55 +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:  CMnrpApplication class definition 
-*
-*/
-
-
-#ifndef MNRP_APPLICATION_H
-#define MNRP_APPLICATION_H
-
-#include <eikapp.h>
-
-/**
- *  An instance of CMnrpApplication is the application part of the Eikon
- *  application framework for the MnRefProvider.
- *	MnRefProvider is an Application Server, which implements MapView and Navigation
- *	services of M&N FW.
- */
-class CMnrpApplication : public CEikApplication
-    {
-    public:  // from CEikApplication
-
-        /** 
-        * AppDllUid returns the application DLL UID value.
-        *
-        *  @return the UID of this Application/Dll
-        */
-        TUid AppDllUid() const;
-
-    protected: // from CEikApplication
-
-        /** 
-        * CreateDocumentL creates a CApaDocument object and return a pointer to it
-        *
-        * @return a pointer to the created document
-        */
-        CApaDocument* CreateDocumentL();
-        
-        void NewAppServerL(CApaAppServer *&aAppServer);
-
-    };
-
-#endif // MNRP_APPLICATION_H
-
--- a/locsrv_plat/map_image_conversion_plugin_api/tsrc/mapnavproviderrefapp/inc/mnrpapplicationback.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,56 +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:  CMnrpApplicationBack class definition
-*
-*/
-
-
-#ifndef MNRP_APPLICATIONBACK_H
-#define MNRP_APPLICATIONBACK_H
-
-#include <eikapp.h>
-
-/**
- *  An instance of CMnrpApplicationBack is the application part of the Eikon
- *  application framework for the MnRefGeocoder.
- *	MnRefGeocoder is a hidden application and works only as geocoder server.
- *	It accepts geocoding requests from M&N FW, serves them and exits, when 
- *	all clients are disconnected.
- */
-class CMnrpApplicationBack : public CEikApplication
-    {
-    public:  // from CEikApplication
-
-        /** 
-        * AppDllUid returns the application DLL UID value.
-        *
-        *  @return the UID of this Application/Dll
-        */
-        TUid AppDllUid() const;
-
-    protected: // from CEikApplication
-
-        /** 
-        * CreateDocumentL creates a CApaDocument object and return a pointer to it
-        *
-        * @return a pointer to the created document
-        */
-        CApaDocument* CreateDocumentL();
-        
-        void NewAppServerL(CApaAppServer *&aAppServer);
-
-    };
-
-#endif // MNRP_APPLICATIONBACK_H
-
--- a/locsrv_plat/map_image_conversion_plugin_api/tsrc/mapnavproviderrefapp/inc/mnrpappserver.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,55 +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:  CMnrpAppServer class definition
-*
-*/
-
-
-#ifndef MNRP_APPSERVER_H
-#define MNRP_APPSERVER_H
-
-#include <aknserverapp.h>
-
-class CMnrpAppUi;
-class CMnrpNavigationService;
-class CMnrpMapViewService;
-
-/** Application Server class of MnRefProvider component */
-class CMnrpAppServer : public CAknAppServer
-    {
-    public:
-        ~CMnrpAppServer();
-        
-        CMnrpAppUi* AppUi();
-
-    public: // from CAknAppServer
-    	/** Creates new service class and returns pointer to it */
-        IMPORT_C CApaAppServiceBase* CreateServiceL(TUid aServiceType) const;
-        
-        /** Overrides base function. Doesn't close application evenb if all
-         *	clients have disconnected until user closes it herself. 
-         *	It is important for standalone execution, when calling application
-         *	may be closed, but user still wants to continue with Map or Navigation.
-         */
-        IMPORT_C void HandleAllClientsClosed();
-        
-    protected:        
-    	/** Creates new navigation service class and returns pointer to it */
-        CMnrpNavigationService* CreateNavigationServiceL() const;
-    	/** Creates new map view service class and returns pointer to it */
-        CMnrpMapViewService* CreateMapViewServiceL() const;
-    };
-
-#endif // MNRP_APPSERVER_H
-
--- a/locsrv_plat/map_image_conversion_plugin_api/tsrc/mapnavproviderrefapp/inc/mnrpappserverback.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,60 +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:  CMnrpAppServerBack class definition
-*
-*/
-
-
-#ifndef MNRP_APPSERVERBACK_H
-#define MNRP_APPSERVERBACK_H
-
-#include <aknserverapp.h>
-
-class CMnrpGeocodingService;
-class CMnrpEngine;
-
-#ifdef RD_MAPNAV_BITMAP_ACCESS
-class CMnrpMapImageService;
-#endif
-
-/** Application Server class of MnRefGeocoder component
- *	It ows Engine instance.
- */
-class CMnrpAppServerBack : public CAknAppServer
-    {
-    public:
-        static CMnrpAppServerBack* NewL();
-        ~CMnrpAppServerBack();
-
-    public: // from CAknAppServer
-    	/** Creates new geocoding service class and returns pointer to it */
-        IMPORT_C CApaAppServiceBase* CreateServiceL( TUid aServiceType ) const;
-
-    protected:
-        void ConstructL();
-
-    	/** Creates new geocoding service class and returns pointer to it */
-        CMnrpGeocodingService* CreateGeocodingServiceL() const;
-
-#ifdef RD_MAPNAV_BITMAP_ACCESS
-    	/** Creates new map image service class and returns pointer to it */
-        CMnrpMapImageService* CreateMapImageServiceL() const;
-#endif
-
-    private:
-        CMnrpEngine* iEngine;
-    };
-
-#endif // MNRP_APPSERVERBACK_H
-
--- a/locsrv_plat/map_image_conversion_plugin_api/tsrc/mapnavproviderrefapp/inc/mnrpappui.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,120 +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:  CMnrpAppUi class definition
-*
-*/
-
-
-#ifndef MNRP_APPUI_H
-#define MNRP_APPUI_H
-
-#include <aknviewappui.h>
-#include <epos_landmarks.h>
-
-class TCoordinate;
-class CPosLandmark;
-
-class CMnrpAppView;
-class CMnrpNaviView;
-class CMnrpMapView;
-
-class CMnrpMapViewService;
-
-class CAknNavigationDecorator;
-class CAknNavigationControlContainer;
-
-class CMnrpEngine;
-
-/** Map selection callback class */
-class MMapSelectionCallback
-    {
-    public:
-        /** Called when user selects location from map */
-        virtual void HandleSelectionL( const TCoordinate& aSelection ) = 0;
-
-        /** Called when user selects landmark from dialog list */
-        virtual void HandleSelectionL( TInt aLandmarkIndex ) = 0;
-        virtual void HandleSelectionL( TPosLmItemId aLandmarkId, TInt aDbIndex ) = 0;
-        
-        /** Called when user refuses selection */
-        virtual void HandleSelectionErrorL( TInt aError ) = 0;
-    };
-
-/** Simple App UI for MnRefProvider component.
- *	It manages application views.
- */
-class CMnrpAppUi : public CAknViewAppUi
-    {
-    public:
-
-        CMnrpAppUi( CMnrpEngine& aEngine );
-        void ConstructL();
-        ~CMnrpAppUi();
-
-        void ShowMapL( CMnrpMapViewService& aService );
-
-        void StartSelectionL( 
-            CMnrpMapViewService& aService,  
-            MMapSelectionCallback& aCallback );
-
-        void StopSelection();
-
-        void ShowNavigationL( const CPosLandmark& aDestination );
-
-		/** Returns ETrue if Map or Navigaton view is still open */
-        TBool IsAnyUserViewActive();
-        
-		/** Returns ETrue if application was started embedded */
-        TBool IsChainedMode();
-
-        void SetNaviPaneTitleL( const TDesC& aPaneTitle );
-        void SetRightSoftkeyCommandL( TInt aCommand, const TDesC& aButtonTitle );
-        
-    protected: // from CAknAppUi
-    
-        void HandleCommandL(TInt aCommand);
-        void HandleResourceChangeL( TInt aType );
-        TBool ProcessCommandParametersL( CApaCommandLine &aCommandLine );
-
-    private:
-
-        void PostConstructL();
-
-        void SelectFromDialogL(
-            CMnrpMapViewService& aService,
-            MMapSelectionCallback& aCallback );
-
-    private:
-    	/** Empty view */
-        CMnrpAppView* iAppView;
-
-		/** Navigation view */
-        CMnrpNaviView* iNaviView;
-		/** Map view */
-        CMnrpMapView* iMapView;
-
-        //Own:
-        CAknNavigationDecorator* iNaviPaneLabel;
-
-        //Ref:
-        CAknNavigationControlContainer* iNaviPane;
-        
-        TInt iParentWg;
-
-        /** Reference to engine */
-        CMnrpEngine& iEngine;
-    };
-
-#endif // MNRP_APPUI_H
-
--- a/locsrv_plat/map_image_conversion_plugin_api/tsrc/mapnavproviderrefapp/inc/mnrpappuiback.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,42 +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:   class definition
-*
-*/
-
-
-#ifndef MNRP_APPUIBACK_H
-#define MNRP_APPUIBACK_H
-
-#include <aknviewappui.h>
-
-/** Simple App UI class of the MnRefGeocoder component */
-class CMnrpAppUiBack : public CAknAppUi
-    {
-    public:
-        void ConstructL();
-
-        /**  Moves application to foreground */
-        void MoveForeground();
-        
-        /**  Moves application to background */
-        void MoveBackground();
-
-    public: // from CEikAppUi
-
-        void HandleCommandL(TInt aCommand);
-    };
-
-#endif // MNRP_APPUIBACK_H
-
--- a/locsrv_plat/map_image_conversion_plugin_api/tsrc/mapnavproviderrefapp/inc/mnrpappview.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,59 +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:  CMnrpAppView class definition 
-*
-*/
-
-
-#ifndef MNRP_APPVIEW_H
-#define MNRP_APPVIEW_H
-
-#include <aknview.h>
-
-class CMnrpAppControl;
-
-/** Empty view for the case when application is started
- *	from menu*/
-class CMnrpAppView : public CAknView
-    {
-    public:
-
-        static CMnrpAppView* NewL();
-        virtual ~CMnrpAppView();
-
-    public: // from CAknView
-
-        TUid Id() const;
-
-        void DoActivateL(
-            const TVwsViewId& aPrevViewId,
-            TUid aCustomMessageId,
-            const TDesC8& aCustomMessage);
-
-        void DoDeactivate();
-
-    private:
-
-        CMnrpAppView();
-        void ConstructL();
-        
-    private:
-    
-    	/** UI control */
-        CMnrpAppControl* iControl;    
-
-    };
-
-#endif // MNRP_APPVIEW_H
-
--- a/locsrv_plat/map_image_conversion_plugin_api/tsrc/mapnavproviderrefapp/inc/mnrpcoordconverter.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,53 +0,0 @@
-/*
-* Copyright (c) 2007 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:  CMnrpCoordConverter class definition
-*
-*/
-
-
-#ifndef MNRP_COORDINATECONVERTER_H
-#define MNRP_COORDINATECONVERTER_H
-
-#include <mncoordinateconverterbase.h>
-
-class CMnrpEngine;
-class CMnrpMapModel;
-
-class CMnrpCoordConverter : public CMnCoordinateConverterBase
-    {
-    public:
-        static CMnrpCoordConverter* NewL();
-
-        ~CMnrpCoordConverter();
-
-    protected: // From CMnCoordinateConverterBase
-
-        TInt GetImageCoordinate(
-            const TCoordinate& aWorldCoordinate,
-            TPoint& aImagePoint );
-
-        TInt GetWorldCoordinate(
-            const TPoint& aImagePoint,
-            TCoordinate& aWorldCoordinate );
-
-    protected:
-        CMnrpCoordConverter();
-
-    private:
-
-        CMnrpEngine*            iEngine;
-        CMnrpMapModel*          iModel;
-    };
-
-#endif /*MNTP_COORDINATECONVERTER_H*/
--- a/locsrv_plat/map_image_conversion_plugin_api/tsrc/mapnavproviderrefapp/inc/mnrpdocument.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,54 +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:  CMnrpDocument class definition
-*
-*/
-
-
-#ifndef MNRP_DOCUMENT_H
-#define MNRP_DOCUMENT_H
-
-#include <akndoc.h>
-
-class CMnrpEngine;
-class CEikApplication;
-
-/** Document class of MnRefProvider component.
- *	It creates and owns Engine instance
- */
-class CMnrpDocument : public CAknDocument
-    {
-    public:
-
-        static CMnrpDocument* NewL( CEikApplication& aApp );
-        ~CMnrpDocument();
-
-		/** Returns reference to Engine instance */        
-        CMnrpEngine& Engine();
-
-    public: // from CAknDocument
-
-        CEikAppUi* CreateAppUiL();
-
-    private:
-
-        CMnrpDocument( CEikApplication& aApp );
-        void ConstructL();
-    
-    private:
-        CMnrpEngine* iEngine;        
-    };
-
-#endif // MNRP_DOCUMENT_H
-
--- a/locsrv_plat/map_image_conversion_plugin_api/tsrc/mapnavproviderrefapp/inc/mnrpdocumentback.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,43 +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:  CMnrpDocumentBack class definition
-*
-*/
-
-
-#ifndef MNRP_DOCUMENTGEO_H
-#define MNRP_DOCUMENTGEO_H
-
-#include <akndoc.h>
-
-class CEikApplication;
-
-/** Document class of MnRefGeocoder component */
-class CMnrpDocumentBack : public CAknDocument
-    {
-    public:
-
-        static CMnrpDocumentBack* NewL( CEikApplication& aApp );
-
-    public: // from CAknDocument
-
-        CEikAppUi* CreateAppUiL();
-
-    private:
-
-        CMnrpDocumentBack( CEikApplication& aApp );
-    };
-
-#endif // MNRP_DOCUMENTGEO_H
-
--- a/locsrv_plat/map_image_conversion_plugin_api/tsrc/mapnavproviderrefapp/inc/mnrpengine.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,147 +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:  CMnrpEngine class definition
-*
-*/
-
-
-#ifndef MNRP_ENGINE_H
-#define MNRP_ENGINE_H
-
-#include <e32base.h>
-#include <f32file.h>
-
-class CPosLandmark;
-class TCoordinate;
-class RResourceReader;
-
-/** Engine class used both by MnRefProvider and MnRefGeocoder 
- *	components. Provides access to POIs database ( resource file,
- *	some cities ) and geocoding services. 
- */
-class CMnrpEngine : public CBase
-    {
-    public:
-    
-        struct TDistanceToPoi
-            {
-            TInt iPoiIndex; // index to KnownPlaces
-            TReal32 iDistance; // distance to Poi of iPoiIndex
-            };
-    
-    public:
-        IMPORT_C static CMnrpEngine* NewL();
-        IMPORT_C ~CMnrpEngine();
-
-		/** Gives access to set of POIs */
-        IMPORT_C TArray<CPosLandmark*> KnownPlacesL();
-        
-        /** Returns coordinate of given address:
-		 *	Find a POI, which country or city matches given address
-		 *	and returns its coordinates.
-		 *	@param aAddress landmark, containing address
-		 *	@return landmark, containg coordinates
-		 *	@leave KErrNotFound if can't find POI matching given address
- 		 */
-        IMPORT_C CPosLandmark* AddressToCoordLC( const CPosLandmark& aAddress );
-
-        /** @overload
-         *  @return landmark, containg coordinates, or NULL
-         */
-        IMPORT_C CPosLandmark* AddressToCoordL( const CPosLandmark& aAddress );
-        
-        /** @overload
-		 *	@param aAddress string containing address
-		 *	@return landmark, containg coordinates
-		 *	@leave KErrNotFound if can't find POI matching given address
- 		 */
-        IMPORT_C CPosLandmark* AddressToCoordLC( const TDesC& aAddress );
-
-        /** @overload
-         *  @param aAddress string containing address
-         *  @return landmark, containg coordinates, or NULL
-         */
-        IMPORT_C CPosLandmark* AddressToCoordL( const TDesC& aAddress );
-
-        /** Returns address for given coordinate:
-		 *	Find a closest POI and return its city and country and
- 		 *	fill street with "%d[m,Km,tKm] from <city>" string, like "5 km to Tampere"
-		 *	@param aLocation coordinate
-		 *	@return landmark, containg address
-		 *	@leave KErrNotFound if can't find any POI
- 		 */
-        IMPORT_C CPosLandmark* CoordToAddressLC( const TCoordinate& aLocation );
-        
-        /** Finds a resource file in the system. 
-         *	It looks on all the drives for the file and folder given as parameter
-         *	@param[in] aFilePathAndName path and name of the file to search for. Drive
-         *							info is ignored
-         *	@param[out] aRscFile full name of found resource file
-         *	@leave KErrNotFound if file is not found.
-         */
-        IMPORT_C void FindResourceFileL( 
-            const TDesC& aFilePathAndName,
-            TFileName& aRscFile );
-
-        /** Returns reference to open file session, given at construction */
-        IMPORT_C RFs& Fs();
-
-        /** Calculates distance between two landmarks.
-         *  @param aFrom Source landmark
-         *  @param aTo Destination landmark
-         *  @return Distance, or NaN, if distance cannot be calculated
-         */
-        IMPORT_C TReal32 DistanceBetweenLandmarks( 
-            const CPosLandmark& aFrom, 
-            const CPosLandmark& aTo );
-
-        /** Finds POIs closest to given reference landmark. 
-         *  @param[in] aReference reference landmark
-         *  @param[out] aNeighbourPois List of closest POIs. 
-         *  @param[in] aMaxMatches Maximum number of results needed
-         */
-        IMPORT_C void FindClosestPoisL( 
-            const CPosLandmark& aReference,
-            RArray<CMnrpEngine::TDistanceToPoi>& aNeighbourPois,
-            TInt aMaxMatches );
-
-        /** Finds POIs closest to given location. 
-         *  @param[in] aReference reference location
-         *  @param[out] aNeighbourPois List of landmarks of closest POIs. 
-         *  @param[in] aMaxMatches Maximum number of results needed
-         */
-        IMPORT_C void BestCoordToAddressMatchesL( 
-            const TCoordinate& aLocation,
-            RPointerArray<CPosLandmark>& aMatches,
-            TInt aMaxMatches );
-
-    protected:
-
-        void ConstructL();
-        CMnrpEngine();
-
-		/** Loads POIs from database ( resource file ) */
-        void LoadKnownPlacesL();
-        /** Reads array of PLACES resource structures */
-        void ReadPlacesResourceL( RResourceReader& aReader );
-        
-        CPosLandmark* CreateCloseLandmarkLC( const CPosLandmark& aReference, TReal32 aDistance );
-
-    private:
-        RPointerArray<CPosLandmark> iPlaces;
-        RFs                         iFileSession;
-    };
-
-#endif // MNRP_ENGINE_H
-
--- a/locsrv_plat/map_image_conversion_plugin_api/tsrc/mapnavproviderrefapp/inc/mnrpgeocodingservice.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,102 +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:  CMnrpGeocodingService class definition
-*
-*/
-
-
-#ifndef MNRP_GEOCODINGSERVICE_H
-#define MNRP_GEOCODINGSERVICE_H
-
-#include "mngeocodingservicebase.h"
-
-class CPosLandmark;
-class CMnrpEngine;
-
-/** Implementation of geocoding service (KMnAppGeocodingService). 
- *	It uses CIdle to simulate asynchronous processing. All the geocoding
- *	job is done using the CMnrpEngine class.
- */
-class CMnrpGeocodingService : public CMnGeocodingServiceBase
-    {
-    public :
-        static CMnrpGeocodingService* NewL( CMnrpEngine& aEngine );
-        
-    protected :
-        CMnrpGeocodingService( CMnrpEngine& aEngine );
-        virtual ~CMnrpGeocodingService();
-
-        void ConstructL();
-
-		/** Prevents parallel asynchronous requests */
-        void LeaveIfBusyL();
-        /** Starts processing of new request by starting CIdle.*/
-        void StartProcessingL();
-        /** Callback for CIdle. Parameter is the pointer to this. */
-        static TInt GeocodingProcessingCallBack( TAny* aPtr );
-        /** Non-leaving part of geocoding. Calls FinishProcessingL and if
-         *	it leaves, completes client's request with error.*/
-        void HandleGeocodingCompleted();
-        /** Does the geocoding and completes user's request.*/
-        void FinishProcessingL();
-
-        /** Asks user to select one of best Coord to Addr matches */
-        CPosLandmark* LetUserSelectBestMatchL( const CPosLandmark& aReference );
-
-    protected: // from CMnGeocodingServiceBase
-    
-        /** Handles client's request for finding address by given coordinate. */
-        void HandleFindAddressByCoordinateL( const CPosLandmark& aLandmark );
-        
-        /** Handles client's request for finding coordinate by given address. */
-        void HandleFindCoordinateByAddressL( const CPosLandmark& aLandmark );
-
-        /** Handles client's request for finding coordinate by given address. */
-        void HandleFindCoordinateByAddressL( const TDesC& aAddress );
-        
-    protected: // from CMnServiceBase
-
-        /** Reports that client cancelled request */
-        void DoCancel();
-
-    private:
-        CMnrpEngine&            iEngine;
-    
-        enum TServiceType
-            {
-            ENone,
-            ECoordToAddr,
-            EAddrToCoord,
-            EPlainToCoord
-            };
-        
-        /** Type of last received request to make correct request to Engine */    
-        TServiceType            iCurrentService;
-    
-    	/** Keeps client's data */
-        CPosLandmark*           iLandmark;
-    	/** Keeps client's data */
-        HBufC*                  iPlainAddress;
-
-        /** Keeps client's option */
-        TBool                   iDialogAllowed;
-
-		/** Asynchronous geocoding processor */        
-        CIdle*                  iProcessor;
-        
-    };
-
-#endif // MNRP_GEOCODINGSERVICE_H
-
-
--- a/locsrv_plat/map_image_conversion_plugin_api/tsrc/mapnavproviderrefapp/inc/mnrpmapcontrol.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,117 +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:  CMnrpMapControl class definition
-*
-*/
-
-
-#ifndef MNRP_MAPCONTROL_H
-#define MNRP_MAPCONTROL_H
-
-#include <coecntrl.h>
-#include "mnrpmapmodel.h"
-
-class CMnrpEngine;
-class CMnrpMapView;
-
-/** Map view. Draws map on screen using information from 
- 	CMnrpMapModel.
- */
-class CMnrpMapControl : public CCoeControl, public MMapModelObserver
-    {
-    public: 
-
-        static CMnrpMapControl* NewL( CMnrpMapView& aView, const TRect& aRect, CMnrpEngine& aEngine );
-        virtual ~CMnrpMapControl();
-        
-        void UpdateModelL( CMnrpMapViewService& aService );
-        void SetSelectionModeL( TBool aSelectionMode );
-        
-        /** Returns current cursor location in selection mode */
-        TCoordinate CurrentLocation();
-
-        void ToggleFullScreen();
-
-    public:  // from CCoeControl
-
-        void Draw( const TRect& aRect ) const;
-        TKeyResponse OfferKeyEventL( const TKeyEvent& aKeyEvent, TEventCode aType );
-        void SizeChanged();
-        void HandleResourceChange( TInt aType );
-
-    public:  // from MMapModelObserver
-
-		/** Redraws itself when model is updated */
-        void HandleModelUpdateL();
-
-    private:
-
-        CMnrpMapControl( CMnrpMapView& aView );
-        void ConstructL( const TRect& aRect, CMnrpEngine& aEngine );
-        
-        void DrawCursor( CWindowGc& aGc ) const;
-
-		/** Draws text around map
-		 *	Top area - left longitude, cell size, right longitude
-		 *	Left area - top latitude, bottom latitude
-		 *	Bottom area - center coordinates
-		 */
-        void DrawGridText( 
-            CWindowGc& aGc, 
-            const TRect& aInnerBox,
-            const TRect& aOuterBox,
-            const CFont* aFont,
-            CMnrpMapModel::TGrid& aGrid ) const;
-
-        /** Helper to find out border size based on font dimensions */
-        TSize BorderSize() const;
-
-		/** Returns specifications of used font */
-        TFontSpec SmallFontSpec( TInt aFontHeightInTwips ) const;
-        
-        void MoveCursor( TInt aXmove, TInt aYmove );
-        TRect CursorMargin();
-
-        void Zoom( TReal aRate );
-
-        void SetFullScreen( TBool aFullScreen );
-
-		void CreateFonts();
-		void DestroyFonts();
-
-		void CreateScreenBufferL( const TSize& aSize );
-        void RenderL();
-
-    private:
-        /** Parent view */
-        CMnrpMapView& iView;
-        
-    	/** Model */
-        CMnrpMapModel* iModel;
-        TSize iViewSize;
-        
-        TBool iSelectionMode;
-        TPoint iCursor;
-        TCoordinate iAbsoluteCursor;
-
-        /** Whether fullscreen mode on or off*/
-        TBool iIsFullScreen;
-        
-        mutable CFbsBitmap* iOffScreenBitmap;
-        CFont* iTextFont;
-        CFont* iItemFont;
-    };
-
-#endif // MNRP_MAPVIEW_H
-
--- a/locsrv_plat/map_image_conversion_plugin_api/tsrc/mapnavproviderrefapp/inc/mnrpmapimageservice.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,92 +0,0 @@
-/*
-* Copyright (c) 2005-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:  CMnrpMapImageService class
-*
-*/
-
-
-#ifndef MN_TPMAPIMAGESERVICE_H
-#define MN_TPMAPIMAGESERVICE_H
-
-#include "mnmapimageservicebase.h"
-
-class CPosLandmark;
-class CEikonEnv;
-class CFont;
-class CMnrpMapModel;
-
-/** Implementation of geocoding service (KMnAppMapImageService). 
- */
-class CMnrpMapImageService : public CMnMapImageServiceBase
-    {
-    public :
-        static CMnrpMapImageService* NewL( CMnrpEngine& aEngine );
-        
-        void HandleTestCommandL( TInt aCommand );
-
-    protected :
-        /** C++ constructor */
-        CMnrpMapImageService( CMnrpEngine& aEngine );
-        /** Destructor */
-        virtual ~CMnrpMapImageService();
-
-        void ConstructL();
-
-        void LeaveIfBusyL();
-        void LeaveIfInstructedL();
-        void StartProcessingL();
-        static TInt MapImageProcessingCallBack( TAny* aPtr );
-        void HandleMapImageCompletedL();
-        void FinishProcessingL();
-
-        TInt GetTestCommand();
-
-        void RenderL();
-
-    private:
-        void DumpDataL();
-        
-        void CreateFonts();
-        void DestroyFonts();
-
-    protected: // from CMnMapImageServiceBase
-    
-        /** Handles client's request for finding address by given coordinate. */
-        void HandleRenderingL();
-        
-    protected: // from CMnServiceBase
-
-        /** Reports that client cancelled request */
-        void DoCancel();
-
-    private:
-    
-        enum TServiceType
-            {
-            ENone,
-            ERender,
-            };
-            
-        TServiceType            iCurrentService;
-        CMnrpEngine&            iEngine;
-        CMnrpMapModel*          iModel;
-        CPeriodic*              iProcessor;
-        CEikonEnv*              iEikon;
-        CFont*                  iItemFont;
-        CFont*                  iTextFont;
-    };
-
-#endif // MN_TPMAPIMAGESERVICE_H
-
-
--- a/locsrv_plat/map_image_conversion_plugin_api/tsrc/mapnavproviderrefapp/inc/mnrpmapmodel.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,301 +0,0 @@
-/*
-* Copyright (c) 2006-2007 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:  CMnrpMapModel class definition
-*
-*/
-
-
-#ifndef MNRP_MAPMODEL_H
-#define MNRP_MAPMODEL_H
-
-#include <coecntrl.h>
-#include "mnrppositionrequest.h"
-#include "epos_landmarks.h"
-
-class CFbsBitmap;
-class CImageDecoder;
-
-class CPosLandmark;
-class CPosLandmarkDatabase;
-class CPosLmCategoryManager;
-
-class CMnrpMapViewService;
-#ifdef RD_MAPNAV_BITMAP_ACCESS
-class CMnrpMapImageService;
-class TMnMapImageParams;
-#endif
-class CMnrpEngine;
-
-class MImageLoaderObserver;
-
-/** Point with real coordinates */
-class TRealPoint
-    {
-    public:
-        TRealPoint();
-        TRealPoint( TReal aX, TReal aY );
-        TRealPoint( TCoordinate aCoordinate );
-
-        TRealPoint operator+( const TRealPoint& aRight );
-        TRealPoint operator-( const TRealPoint& aRight );
-        TRealPoint operator*( const TReal& aRight );
-        TRealPoint operator/( const TReal& aRight );
-
-        void Set( TReal aX, TReal aY );
-        TCoordinate Coordinate();
-        TBool IsValid();
-
-        TReal iX; // matches longitude in this model
-        TReal iY; // matches latitude in this model
-    };
-
-/** Model observer class */
-class MMapModelObserver
-    {
-    public:
-        virtual void HandleModelUpdateL() =0;
-    };
-
-/** Data model for MapView.
- *  This implementation shows map as rectangle and does not support
- *  passing its borders. It displays POIs from Engine and client's
- *	landmarks, which define view area, if not specified by client.
- */
-class CMnrpMapModel : public CBase, public MMnrpPositionObserver
-    {
-    public:
-        IMPORT_C static CMnrpMapModel* NewL(
-            MMapModelObserver& aObserver,
-            CMnrpEngine& aEngine );
-
-        IMPORT_C static CMnrpMapModel* NewL(
-            CMnrpEngine& aEngine );
-
-        IMPORT_C ~CMnrpMapModel();
-
-		/** Service calls it when new ShowOnMap request comes
-		 *	from client */
-        IMPORT_C void UpdateModelL( CMnrpMapViewService& aService );
-
-#ifdef RD_MAPNAV_BITMAP_ACCESS
-		/** Service calls it when new RenderImage request comes
-		 *	from client */
-        IMPORT_C void UpdateModelL( const CMnrpMapImageService& aService );
-
-		/** Plugin calls it when new CoordinateConversion request comes
-		 *	from client */
-        IMPORT_C void UpdateModel( const TMnMapImageParams& aParams );
-#endif
-		/** Defines dimensions of view used for map display.
-		 *	this information is used to convert absolute coordinates
-		 *	to screen coordinates. Absolute coordinates are plain
-		 *	latitude and longitude degrees.
-		 */
-        IMPORT_C void SetScreenSize( TSize aScreenSize );
-
-        IMPORT_C void RenderL(
-            CFbsBitmap& aBitmap,
-            TRect aTargetRect,
-            CFont* aTextFont,
-            CFont* aItemFont ) const;
-        
-        IMPORT_C TInt NumIgnoredLandmarks();
-
-		/** Draw item.
-		 *	It is a POI or client's landmark, holds coordinates
-		 *	and associated text and icon.
-		 */
-        class CDrawItem : public CBase
-            {
-            public:
-            	/** Constructs from landmark instance */
-                static CDrawItem* NewLC( const CPosLandmark& );
-            	/** Constructs from linked landmark. If landmark
-            	 *	does not have icon, it tries to get icon of its
-            	 *	category, if only single category is assigned.
-            	 */
-                static CDrawItem* NewLC(
-                    const CPosLandmark& aLm,
-                    CPosLmCategoryManager& aCatman );
-
-                ~CDrawItem();
-
-                const TDesC& Text() { return *iText; };
-                TPoint& Position() { return iScreenPosition; };
-                TRealPoint AbsolutePosition() { return iAbsolutePosition; };
-                CFbsBitmap* Bitmap() { return iBitmap; };
-                CFbsBitmap* Mask() { return iMask; };
-                TBool IsPoi() { return iOwnPoi; };
-                
-                void SetAbsolutePosition( const TLocality& aLocality );
-
-            private:
-                HBufC*      iText;
-               	/** Absolute coordinates - lat,lon */
-                TRealPoint  iAbsolutePosition;
-                /** Coordinates on screen (pixels) */
-                TPoint      iScreenPosition;
-                CFbsBitmap* iBitmap;
-                CFbsBitmap* iMask;
-                /** Whether it is client's landmark or internal POI */
-                TBool       iOwnPoi;
-
-            friend class CMnrpMapModel;
-            };
-		/** Returns all items, that can be shown on screen. Screen
-		 *	coordinates are updated according to current scale and viewport */
-        TArray<CDrawItem*> Items() const;
-
-		/** Describes grid to show */
-        class TGrid
-            {
-            public:
-            	/** Reference grid point (screen) */
-                TPoint iReference;
-                /** Distance between grid lines (screen)*/
-                TInt iGridStep;
-
-            	/** Coordinate of reference grid point (absolute) */
-                TCoordinate iAbsoluteReference;
-                /** Distance between grid lines (absolute) */
-                TReal iAbsoluteGridStep;
-            };
-
-        /** Returns grid for current viewport and scale */
-        void GetGrid( TGrid& aGrid ) const;
-
-        /** Information about current location */
-        class TCurrentLocation
-            {
-            public:
-            	/** Screen coordinates */
-                TPoint  iLocation;
-            	/** Error radius in screen units - pixels */
-                TInt    iErrorRadius;
-
-                /** Absolute coordinates */
-                TCoordinate iAbsoluteLocation;
-            	/** Error radius in degrees */
-                TReal       iAbsoluteErrorDegrees;
-
-                TBool       iIsValid;
-            };
-
-        /** Returns current location */
-        IMPORT_C TCurrentLocation CurrentLocation() const;
-
-		// Zooming
-        IMPORT_C void Zoom( TReal aZoomRate );
-
-		// View movement
-        IMPORT_C void MoveTo( TCoordinate aTarget );
-
-        // Reset-kind of action, moves to world center
-        IMPORT_C void GoCenter();
-
-		/** Converts absolute units to screen */
-        IMPORT_C TPoint AbsoluteToScreen( TCoordinate aAbsolutePoint ) const;
-        IMPORT_C TInt AbsoluteToScreen( TReal aDistance ) const;
-
-		/** Converts screen coords to absolute */
-        IMPORT_C TCoordinate ScreenToAbsolute( TPoint aScreenPoint ) const;
-        IMPORT_C TReal ScreenToAbsolute( TInt aDistance ) const;
-
-		// Viewport in absolute units - degrees
-        IMPORT_C TReal Left() const;
-        IMPORT_C TReal Top() const;
-        IMPORT_C TReal Right() const;
-        IMPORT_C TReal Bottom() const;
-        IMPORT_C TReal Width() const;
-        IMPORT_C TReal Height() const;
-        IMPORT_C TCoordinate Center() const;
-
-    protected:
-		/** Converts absolute coords to screen */
-        TPoint AbsoluteToScreen( TRealPoint aAbsolutePoint ) const;
-
-    protected:  // from MMnrpPositionObserver
-
-		/** Forces map view update when new position comes */
-        void HandlePositionRequestCompletedL( TInt aError );
-
-    private:
-
-        void ConstructL();
-        CMnrpMapModel( MMapModelObserver& aObserver, CMnrpEngine& aEngine );
-        CMnrpMapModel( CMnrpEngine& aEngine );
-
-        void AddCitiesL();
-
-		/** Includes given draw item into bounding box */
-        void AdjustBoundingBox( CDrawItem& aItem, TRealPoint& aMin, TRealPoint& aMax );
-        
-        /** Verifies if draw item has position. If not, tries geocoding.
-         *  Updates the item if position is found from geocoding.
-         *  @return ETrue if position is found (possibly from geocoding), EFalse otherwise */
-        TBool CheckDrawItemHasPositionL( CDrawItem& aItem, const CPosLandmark& aLandmark );
-
-		/** Adjusts viewport if movement or zooming goes beyond the borders */
-        void CheckBorders();
-
-        TReal MaxScale() const;
-        TRect CursorMargin();
-
-		// Grid drawing
-        void DrawGrid(
-            CFbsBitGc& aGc,
-            const TSize& aBoxSize,
-            CMnrpMapModel::TGrid& aGrid ) const;
-
-        void DrawVerticalLine( CFbsBitGc& aGc, TInt aX, TSize aBoxSize ) const;
-        void DrawHorizontalLine( CFbsBitGc& aGc, TInt aY, TSize aBoxSize ) const;
-
-		/** Draws drawable items */
-        void DrawLandmarks(
-            CFbsBitGc& aGc,
-            CFont& aFont,
-            const TSize& aBoxSize,
-            TBool aSwitchColorAndShadow ) const;
-
-		/** Draws current location */
-        void DrawCurrentLocation(
-            CFbsBitGc& aGc,
-            const TSize& aBoxSize ) const;
-
-    private:
-        CMnrpPositionRequest*           iPositionRequest;
-        TPositionInfo                   iPosInfo;
-
-        TSize                           iScreenSize;
-        TRealPoint                      iViewOrigin;
-
-        TReal                           iScale; // 1 == 1 degree per pixel
-
-        MMapModelObserver*              iObserver;
-
-        mutable RPointerArray<CDrawItem> iDrawItems;
-
-        CMnrpEngine&            		iEngine;
-
-        TBool                           iUseCurrentLocationAsOrigin;
-        TBool                           iShowCurrentLocation;
-
-        CFont*                          iTextFont;
-        CFont*                          iItemFont;
-        
-        TInt 							iNumIgnoredLandmarks; 
-    };
-
-#endif // MNRP_MAPMODEL_H
-
--- a/locsrv_plat/map_image_conversion_plugin_api/tsrc/mapnavproviderrefapp/inc/mnrpmapview.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,95 +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:  CMnrpMapView class definition
-*
-*/
-
-
-#ifndef MNRP_MAPVIEW_H
-#define MNRP_MAPVIEW_H
-
-#include <aknview.h>
-
-class CMnrpEngine;
-class CMnrpMapModel;
-class CMnrpMapControl;
-
-class CMnrpMapViewService;
-class MMapSelectionCallback;
-
-/** Map view. Draws map on screen using information from 
- 	CMnrpMapModel.
- */
-class CMnrpMapView : public CAknView
-    {
-    public: 
-
-        static CMnrpMapView* NewL( TBool aChained, CMnrpEngine& aEngine );
-        virtual ~CMnrpMapView();
-        
-        /** Shows map view in browser mode 
-         *  @param aService Object to get map view options from
-         */
-        void SetMapModeL( CMnrpMapViewService& aService );
-
-        /** Shows map view in selection mode 
-         *  @param aService Object to get map view options from
-         *  @param aCallback Object to inform about selection
-         */
-        void SetSelectionModeL( 
-            CMnrpMapViewService& aService,  
-            MMapSelectionCallback& aCallback );
-
-        void HandleUserSelectionL( TInt aError );
-
-        void StopSelection();
-		
-    public: // from CAknView
-
-        TUid Id() const;
-
-        void HandleCommandL( TInt aCommand );
-
-        void DoActivateL(
-            const TVwsViewId& aPrevViewId,
-            TUid aCustomMessageId,
-            const TDesC8& aCustomMessage);
-
-        void DoDeactivate();
-        
-        void DynInitMenuPaneL( TInt aResourceId, CEikMenuPane *aMenuPane );
-
-    private:
-
-        CMnrpMapView( CMnrpEngine& aEngine );
-        void ConstructL( TBool aChained );
-        
-    private:
-        /** Application engine */
-        CMnrpEngine& iEngine;
-    	
-    	/** UI control */
-        CMnrpMapControl* iControl;    
-
-        /** Map view data */
-        CMnrpMapViewService* iMapViewService;
-
-        /** Selection callback listener */        
-        MMapSelectionCallback* iSelectionCallback;
-        
-        TBool iChained;
-    };
-
-#endif // MNRP_MAPVIEW_H
-
--- a/locsrv_plat/map_image_conversion_plugin_api/tsrc/mapnavproviderrefapp/inc/mnrpmapviewservice.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,80 +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:  CMnrpMapViewService class definition
-*
-*/
-
-
-#ifndef MNRP_MAPVIEWSERVICE_H
-#define MNRP_MAPVIEWSERVICE_H
-
-#include <mnmapviewservicebase.h>
-
-#include "mnrpappui.h"
-
-class CPosLandmark;
-
-/** Implementation of MapView service (KMnAppMapViewService). 
- */
-class CMnrpMapViewService : public CMnMapViewServiceBase, public MMapSelectionCallback
-    {
-    public :
-        static CMnrpMapViewService* NewL();
-        
-    protected :
-        CMnrpMapViewService();
-        virtual ~CMnrpMapViewService();
-        void ConstructL();
-
-        CMnrpAppUi* AppUi();
-
-    protected: // from CMnMapViewServiceBase
-    
-        /** Handles client's request for showing map */
-        void HandleShowMapL();
-
-        /** Handles client's request for showing map from current location */
-        void HandleShowCurrentLocationL();
-
-        /** Handles client's request for selecting a location from map */
-        void HandleSelectFromMapL();
-
-    protected: // from CMnServiceBase
-
-        /** Reports that client cancelled request */
-        void DoCancel();
-
-        void CompleteSelectionL( const TCoordinate& aSelection );
-
-    protected: // from MMapSelectionCallback
-            
-        void HandleSelectionL( const TCoordinate& aSelection );
-
-        void HandleSelectionL( TInt aLandmarkIndex );
-        void HandleSelectionL( TPosLmItemId aLandmarkId, TInt aDbIndex );
-
-        void HandleSelectionErrorL( TInt aError );
-
-    private:
-        void StopSelection();
-
-    private:
-
-        /** Flag shows that selection is ongoing */
-        TBool                   iSelecting;
-    };
-
-#endif // MNRP_MAPVIEWSERVICE_H
-
-
--- a/locsrv_plat/map_image_conversion_plugin_api/tsrc/mapnavproviderrefapp/inc/mnrpnavicontrol.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,69 +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:  CMnrpNaviControl class definition
-*
-*/
-
-
-#ifndef MNRP_NAVICONTROL_H
-#define MNRP_NAVICONTROL_H
-
-#include <coecntrl.h>
-#include "mnrpnavimodel.h"
-
-class CAknSingleHeadingStyleListBox;
-class CMnrpNaviView;
-
-/** Navigation view.
- *	Shows list box with navigation information items: 
- *	destination name and coordinates, current position coordinates
- *	distance and bearing to destination.
- */	
-class CMnrpNaviControl : public CCoeControl, public MNaviModelObserver
-    {
-    public:
-
-        static CMnrpNaviControl* NewL( CMnrpNaviView& aView, const TRect& aRect, CMnrpEngine& aEngine );
-        virtual ~CMnrpNaviControl();
-
-        void UpdateModelL( CPosLandmark& aDestination );
-        
-    protected:    
-    	/** Creates list box */
-        void CreateListBoxL();
-
-    public: // from MNaviModelObserver
-        void HandleModelUpdateL();
-
-    protected:  // from CCoeControl
-        TInt CountComponentControls() const;
-        CCoeControl* ComponentControl( TInt aIndex ) const;
-        TKeyResponse OfferKeyEventL( const TKeyEvent& aKeyEvent, TEventCode aType );
-        void SizeChanged();
-        void HandleResourceChange( TInt aType );
-
-    private:
-
-        void ConstructL( const TRect& aRect, CMnrpEngine& aEngine );
-        CMnrpNaviControl( CMnrpNaviView& aView );
-    
-    private:
-        CMnrpNaviView&                  iView;
-    
-        CAknSingleHeadingStyleListBox*  iListBox;
-        CMnrpNaviModel*         		iModel;
-    };
-
-#endif // MNRP_NAVICONTROL_H
-
--- a/locsrv_plat/map_image_conversion_plugin_api/tsrc/mapnavproviderrefapp/inc/mnrpnavigationservice.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,51 +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:  CMnrpNavigationService class definition
-*
-*/
-
-
-#ifndef MNRP_NAVIGATIONSERVICE_H
-#define MNRP_NAVIGATIONSERVICE_H
-
-#include "mnnavigationservicebase.h"
-
-class CPosLandmark;
-
-/** Implementation of Navigation service (KMnAppNavigationService). 
- */
-class CMnrpNavigationService : public CMnNavigationServiceBase
-    {
-    public :
-        static CMnrpNavigationService* NewL();
-        
-    protected :
-        CMnrpNavigationService();
-        virtual ~CMnrpNavigationService();
-        void ConstructL();
-
-    public: // from CMnNavigationServiceBase
-    
-        /** Handles client's request for navigation. */
-        void HandleNavigateToL( const CPosLandmark& aDestination );
-    
-    protected: // from CMnServiceBase
-
-        /** Empty implementation, as the only request is sychcronous */
-        void DoCancel();
-    };
-
-#endif // MNRP_NAVIGATIONSERVICE_H
-
-
--- a/locsrv_plat/map_image_conversion_plugin_api/tsrc/mapnavproviderrefapp/inc/mnrpnavimodel.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,96 +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:  CMnrpNaviModel class definition
-*
-*/
-
-
-#ifndef MNRP_NAVIMODEL_H
-#define MNRP_NAVIMODEL_H
-
-#include <coecntrl.h>
-#include "mnrppositionrequest.h"
-
-class CMnrpEngine;
-class CPosLandmark;
-
-/** Model observer class */
-class MNaviModelObserver
-    {
-    public:
-        virtual void HandleModelUpdateL() =0;
-    };
-
-/** Navigation view model. 
- *	Prepares data to be shown on navigation view
- */
-class CMnrpNaviModel : public CBase, public MMnrpPositionObserver
-    {
-    public:
-        static CMnrpNaviModel* NewL( MNaviModelObserver& aObserver, CMnrpEngine& aEngine );
-
-		/** Called by service class to inform that client has changed 
-		 *	navigation target */
-        void SetDestinationL( const CPosLandmark& aNewDestination );
-
-		/** List item information */
-        class CListItem : public CBase
-            {
-            public:
-                static CListItem* NewL( 
-                	const TDesC& aItemHeader, 
-                	const TDesC& aItemValue );
-            
-                ~CListItem();
-                
-                const TDesC& Header() { return *iHeader; };
-                const TDesC& Value() { return *iValue; };
-                
-            private:
-            	/** List item header */
-                HBufC* iHeader;
-            	/** List item text */
-                HBufC* iValue;                
-            };
-
-		/** Returns list items to be shown on Navigation view */
-        TArray<CListItem*> ListItemsL();
-
-        ~CMnrpNaviModel();
-        
-    public:  // from MMnrpPositionObserver
-
-		/** Informs navigation view that data has been changed */
-        void HandlePositionRequestCompletedL( TInt aError );
-        
-    private: 
-
-        void ConstructL();
-        CMnrpNaviModel( MNaviModelObserver& aObserver, CMnrpEngine& aEngine );
-    
-    private:
-        CMnrpEngine&                    iEngine;
-    
-        CMnrpPositionRequest*   		iPositionRequest;
-        TPositionInfo                   iPosInfo;
-
-        CPosLandmark*                   iDestination;
-        
-        MNaviModelObserver&             iObserver;
-        
-        RPointerArray<CListItem>        iListItems;
-    };
-
-#endif // MNRP_NAVIMODEL_H
-
--- a/locsrv_plat/map_image_conversion_plugin_api/tsrc/mapnavproviderrefapp/inc/mnrpnaviview.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,74 +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:  CMnrpNaviView class definition
-*
-*/
-
-
-#ifndef MNRP_NAVIVIEW_H
-#define MNRP_NAVIVIEW_H
-
-#include <aknview.h>
-
-class CMnrpEngine;
-class CMnrpNaviModel;
-class CMnrpNaviControl;
-class CPosLandmark;
-
-/** Map view. Draws map on screen using information from 
- 	CMnrpMapModel.
- */
-class CMnrpNaviView : public CAknView
-    {
-    public: 
-
-        static CMnrpNaviView* NewL( TBool aChained, CMnrpEngine& aEngine );
-        virtual ~CMnrpNaviView();
-        
-        /** Shows map view in browser mode 
-         *  @param aService Object to get map view options from
-         */
-        void SetDestinationL( const CPosLandmark& aDestination );
-        
-    public: // from CAknView
-
-        TUid Id() const;
-
-        void HandleCommandL( TInt aCommand );
-
-        void DoActivateL(
-            const TVwsViewId& aPrevViewId,
-            TUid aCustomMessageId,
-            const TDesC8& aCustomMessage);
-
-        void DoDeactivate();
-
-    private:
-
-        CMnrpNaviView( CMnrpEngine& aEngine );
-        void ConstructL( TBool aChained );
-        
-    private:
-        /** Application engine */
-        CMnrpEngine& iEngine;
-    	
-    	/** UI control */
-        CMnrpNaviControl* iControl;    
-        
-        /** Destination */
-        CPosLandmark* iDestination;
-    };
-
-#endif // MNRP_NAVIVIEW_H
-
--- a/locsrv_plat/map_image_conversion_plugin_api/tsrc/mapnavproviderrefapp/inc/mnrppositionrequest.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,141 +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:  CMnrpPositionRequest class definition
-*
-*/
-
-
-#ifndef MNRP_POSITION_REQUEST_H_
-#define MNRP_POSITION_REQUEST_H_
-
-#include <e32base.h>
-#include <lbs.h>
-
-class TPositionUpdateOptions;
-
-/** Position observer */
-class MMnrpPositionObserver
-    {
-    public:
-        virtual void HandlePositionRequestCompletedL( TInt aError ) =0;
-    };
-
-/** Provides an interface for retrieving the current location.
- */
-class CMnrpPositionRequest: public CActive
-    {
-    public: 
-
-        /** Creates new instance of request
-        * @param aAppName the name of this application
-        * @param aObserver observer to callback when locations are retrieved
-        */
-        IMPORT_C static CMnrpPositionRequest* NewL(
-            const TDesC& aRequestorName,
-            MMnrpPositionObserver& aObserver);
-
-        IMPORT_C ~CMnrpPositionRequest();
-
-    public: 
-
-        /**
-         * Starts the fetching of a location. In the first place the default 
-         * proxy is used for retrieving a location. If fetching default location
-         * fails the last known location is fetched. If fetching last known 
-         * location fails, an error code is returned to the observer.
-         *
-         * @param aLastKnownLocationAllowed whether last know location is allowed
-         */
-        IMPORT_C void FetchNewPosition( TBool aLastKnownLocationAllowed = EFalse );
-
- 		/** Returns current location */
-        IMPORT_C void GetPosition( TPositionInfo& aPosition );
-
- 		/** Returns current speed info */
-        IMPORT_C TReal32 Speed();
-
- 		/** Returns current heading info */
-        IMPORT_C TReal32 Heading();
-
- 		/** Returns current magnetic heading info */
-        IMPORT_C TReal32 MagneticHeading();
-
- 		/** Returns current course info */
-        IMPORT_C TReal32 Course();
-
- 		/** Returns current magnetic course info */
-        IMPORT_C TReal32 MagneticCourse();
-
-		/** Modifies options for the next request */
-        IMPORT_C void SetOptionsL( const TPositionUpdateOptionsBase& aOptions );
-
-    protected: // from CActive
-
-        void DoCancel();
-        void RunL();
-        TInt RunError(TInt aError);
-
-    private:
-
-        CMnrpPositionRequest( MMnrpPositionObserver& aObserver );
-        void ConstructL( const TDesC& aAppName );
-
-        /** Issues new request for location retrieval. */
-        void ExecuteNextStep();
-
-        void InitContainer( HPositionGenericInfo& aGenericInfo );
-        void SaveContainer( const HPositionGenericInfo& aGenericInfo );
-
-    private:
-
-        /**
-        * TState defines the different states this object may enter.
-        */
-        enum TState 
-            {
-            EIdle,
-            EAcquiringDefaultLocation,
-            EAcquiringLastKnownLocation
-            };
-
-    private: 
-
-        //! Contains the location
-        HPositionGenericInfo* iGenericPosition;
-        
-        //! Local storage for last location info
-        TPositionInfo iPositionInfo;
-        TReal32 iSpeed;
-        TReal32 iHeading;
-        TReal32 iMagneticHeading;
-        TReal32 iCourse;
-        TReal32 iMagneticCourse;
-
-        //! The observer to callback when location retieval is ready
-        MMnrpPositionObserver& iObserver;
-
-        //! Reference to the Location Server session
-        RPositionServer iLocationServer;
-
-        //! Reference to the Location Server subsession
-        RPositioner iPositioner;
-        
-        TBool iLastKnownLocationAllowed;
-
-        //! The current state this object has entered
-        TState iState;
-    };
-
-#endif // MNRP_POSITION_REQUEST_H_
-
--- a/locsrv_plat/map_image_conversion_plugin_api/tsrc/mapnavproviderrefapp/inc/mnrputils.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,67 +0,0 @@
-/*
-* Copyright (c) 2006-2007 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:  MnrpUtils class definition
-*
-*/
-
-
-#ifndef MNRP_UTILS_H
-#define MNRP_UTILS_H
-
-const TInt KMaxCoordStrSize = 15;
-
-class MnrpUtils
-    {
-    public:
-    
-        /** Converts given coordinate into a string 
-         *  \param aCoord coordinate
-         *  \param aStr target string of KMaxCoordStrSize length (at least)
-         *  \param aFull if EFalse, will omit higher parts if they are 0,
-         *               if ETrue, outputs degrees, minutes, seconds and milliseconds
-         *  \param aMillis whether milliseconds should be included or not
-         */
-        IMPORT_C static void CoordinateToString( 
-            TReal aCoord, 
-            TDes& aStr, 
-            TBool aFull = EFalse,
-            TBool aMillis = EFalse );
-            
-        /** Converts given distance value to a string with units
-         *  \param aDistance distance in meters 
-         *  \param aStr target string
-         */
-        IMPORT_C static void DistanceToString( TReal aDistance, TDes& aStr );
-
-        /** Converts given angle value to a string
-         *  \param aAngle angle in degrees (angle form North Pole) 
-         *  \param aStr target string
-         */
-        IMPORT_C static void AngleToString( TReal aAngle, TDes& aStr );
-
-        /** Converts given speed value to a string with units
-         *  \param aSpeed speed in meters per second
-         *  \param aStr target string
-         */
-        IMPORT_C static void SpeedToString( TReal aSpeed, TDes& aStr );
-
-        /** Replaces unprintable characters in a string with spaces
-         *  \param aStr string to work with
-         *  \return pointer to new string buffer with ownership
-         */
-        IMPORT_C static HBufC* PrintableStringLC( const TDesC& aStr );
-    };
-
-#endif // MNRP_UTILS_H
-
--- a/locsrv_plat/map_image_conversion_plugin_api/tsrc/mapnavproviderrefapp/sis/mnrefprovider_armv5.pkg	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,85 +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: Installation file for MN ref provider
-;
-
-ÿþ;   I n s t a l l a t i o n   f i l e   f o r   M & N   R e f e r e n c e   P r o v i d e r   A p p 
- 
- 
- 
- ;   L a n g u a g e s 
- 
- & E N , R U 
- 
- 
- 
- ;   s t a n d a r d   S I S   f i l e   h e a d e r 
- 
- # { " M n R e f P r o v i d e r E N " , " M n R e f P r o v i d e r R U " } , ( 0 x 0 3 1 3 2 0 1 3 ) , 1 , 2 , 4 
- 
- 
- 
- ;   L o c a l i s e d   V e n d o r   n a m e 
- 
- % { " V e n d o r - E N " , " V e n d o r - R U " } 
- 
- 
- 
- ;   U n i q u e   V e n d o r   n a m e 
- 
- : " V e n d o r " 
- 
- 
- 
- ;   S u p p o r t s   S 6 0   v   3 . 0 
- 
- [ 0 x 1 0 1 F 7 9 6 1 ] ,   0 ,   0 ,   0 ,   { " S 6 0 P r o d u c t I D " , " S 6 0 P r o d u c t I D " } 
- 
- 
- 
- ;   F i l e s   t o   i n s t a l l 
- 
- " \ e p o c 3 2 \ r e l e a s e \ a r m v 5 \ u r e l \ m n r e f p r o v i d e r . e x e " - " ! : \ s y s \ b i n \ m n r e f p r o v i d e r . e x e " 
- 
- " \ e p o c 3 2 \ d a t a \ z \ r e s o u r c e \ a p p s \ m n r e f p r o v i d e r . r s c " - " ! : \ r e s o u r c e \ a p p s \ m n r e f p r o v i d e r . r s c " 
- 
- " \ e p o c 3 2 \ d a t a \ z \ r e s o u r c e \ a p p s \ m n r e f p r o v i d e r . m b m " - " ! : \ r e s o u r c e \ a p p s \ m n r e f p r o v i d e r . m b m " 
- 
- " \ e p o c 3 2 \ d a t a \ z \ r e s o u r c e \ a p p s \ m n r e f p r o v i d e r . m i f " - " ! : \ r e s o u r c e \ a p p s \ m n r e f p r o v i d e r . m i f " 
- 
- " \ e p o c 3 2 \ d a t a \ z \ p r i v a t e \ 1 0 0 0 3 a 3 f \ a p p s \ m n r e f p r o v i d e r _ r e g . r s c " - " ! : \ p r i v a t e \ 1 0 0 0 3 a 3 f \ i m p o r t \ a p p s \ m n r e f p r o v i d e r _ r e g . r s c " 
- 
- 
- 
- " \ e p o c 3 2 \ r e l e a s e \ a r m v 5 \ u r e l \ m n r e f p r o v i d e r b a c k . e x e " - " ! : \ s y s \ b i n \ m n r e f p r o v i d e r b a c k . e x e " 
- 
- " \ e p o c 3 2 \ d a t a \ z \ r e s o u r c e \ a p p s \ m n r e f p r o v i d e r b a c k . r s c " - " ! : \ r e s o u r c e \ a p p s \ m n r e f p r o v i d e r b a c k . r s c " 
- 
- " \ e p o c 3 2 \ d a t a \ z \ p r i v a t e \ 1 0 0 0 3 a 3 f \ a p p s \ m n r e f p r o v i d e r b a c k _ r e g . r s c " - " ! : \ p r i v a t e \ 1 0 0 0 3 a 3 f \ i m p o r t \ a p p s \ m n r e f p r o v i d e r b a c k _ r e g . r s c " 
- 
- 
- 
- " \ e p o c 3 2 \ r e l e a s e \ a r m v 5 \ u r e l \ m n r e f p r o v i d e r e n g i n e . d l l " - " ! : \ s y s \ b i n \ m n r e f p r o v i d e r e n g i n e . d l l " 
- 
- " \ e p o c 3 2 \ d a t a \ z \ r e s o u r c e \ m n r e f p r o v i d e r e n g i n e . r s c " - " ! : \ r e s o u r c e \ m n r e f p r o v i d e r e n g i n e . r s c " 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
\ No newline at end of file
Binary file locsrv_plat/map_image_conversion_plugin_api/tsrc/mapnavproviderrefapp/sis/mnrefprovider_armv5.sis has changed
--- a/locsrv_plat/map_image_conversion_plugin_api/tsrc/mapnavproviderrefapp/sis/mnrefprovider_bitmap_armv5.pkg	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,89 +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: Installation file for MN ref provider ( includes map image service)
-;
-
-ÿþ;   I n s t a l l a t i o n   f i l e   f o r   M & N   R e f e r e n c e   P r o v i d e r   A p p 
- 
- 
- 
- ;   L a n g u a g e s 
- 
- & E N , R U 
- 
- 
- 
- ;   s t a n d a r d   S I S   f i l e   h e a d e r 
- 
- # { " M n R e f P r o v i d e r E N " , " M n R e f P r o v i d e r R U " } , ( 0 x 0 3 1 3 2 0 1 3 ) , 1 , 2 , 4 
- 
- 
- 
- ;   L o c a l i s e d   V e n d o r   n a m e 
- 
- % { " V e n d o r - E N " , " V e n d o r - R U " } 
- 
- 
- 
- ;   U n i q u e   V e n d o r   n a m e 
- 
- : " V e n d o r " 
- 
- 
- 
- ;   S u p p o r t s   S 6 0   v   3 . 0 
- 
- [ 0 x 1 0 1 F 7 9 6 1 ] ,   0 ,   0 ,   0 ,   { " S 6 0 P r o d u c t I D " , " S 6 0 P r o d u c t I D " } 
- 
- 
- 
- ;   F i l e s   t o   i n s t a l l 
- 
- " \ e p o c 3 2 \ r e l e a s e \ a r m v 5 \ u r e l \ m n r e f p r o v i d e r . e x e " - " ! : \ s y s \ b i n \ m n r e f p r o v i d e r . e x e " 
- 
- " \ e p o c 3 2 \ d a t a \ z \ r e s o u r c e \ a p p s \ m n r e f p r o v i d e r . r s c " - " ! : \ r e s o u r c e \ a p p s \ m n r e f p r o v i d e r . r s c " 
- 
- " \ e p o c 3 2 \ d a t a \ z \ r e s o u r c e \ a p p s \ m n r e f p r o v i d e r . m b m " - " ! : \ r e s o u r c e \ a p p s \ m n r e f p r o v i d e r . m b m " 
- 
- " \ e p o c 3 2 \ d a t a \ z \ r e s o u r c e \ a p p s \ m n r e f p r o v i d e r . m i f " - " ! : \ r e s o u r c e \ a p p s \ m n r e f p r o v i d e r . m i f " 
- 
- " \ e p o c 3 2 \ d a t a \ z \ p r i v a t e \ 1 0 0 0 3 a 3 f \ a p p s \ m n r e f p r o v i d e r _ r e g . r s c " - " ! : \ p r i v a t e \ 1 0 0 0 3 a 3 f \ i m p o r t \ a p p s \ m n r e f p r o v i d e r _ r e g . r s c " 
- 
- 
- 
- " \ e p o c 3 2 \ r e l e a s e \ a r m v 5 \ u r e l \ m n r e f p r o v i d e r b a c k . e x e " - " ! : \ s y s \ b i n \ m n r e f p r o v i d e r b a c k . e x e " 
- 
- " \ e p o c 3 2 \ d a t a \ z \ r e s o u r c e \ a p p s \ m n r e f p r o v i d e r b a c k . r s c " - " ! : \ r e s o u r c e \ a p p s \ m n r e f p r o v i d e r b a c k . r s c " 
- 
- " \ e p o c 3 2 \ d a t a \ z \ p r i v a t e \ 1 0 0 0 3 a 3 f \ a p p s \ m n r e f p r o v i d e r b a c k _ r e g . r s c " - " ! : \ p r i v a t e \ 1 0 0 0 3 a 3 f \ i m p o r t \ a p p s \ m n r e f p r o v i d e r b a c k _ r e g . r s c " 
- 
- 
- 
- " \ e p o c 3 2 \ r e l e a s e \ a r m v 5 \ u r e l \ m n r e f p r o v i d e r e n g i n e . d l l " - " ! : \ s y s \ b i n \ m n r e f p r o v i d e r e n g i n e . d l l " 
- 
- " \ e p o c 3 2 \ d a t a \ z \ r e s o u r c e \ m n r e f p r o v i d e r e n g i n e . r s c " - " ! : \ r e s o u r c e \ m n r e f p r o v i d e r e n g i n e . r s c " 
- 
- 
- 
- " \ e p o c 3 2 \ r e l e a s e \ a r m v 5 \ u r e l \ m n r e f p r o v i d e r p l u g i n . d l l " - " ! : \ s y s \ b i n \ m n r e f p r o v i d e r p l u g i n . d l l " 
- 
- " \ e p o c 3 2 \ d a t a \ z \ r e s o u r c e \ p l u g i n s \ m n r e f p r o v i d e r p l u g i n . r s c " - " ! : \ r e s o u r c e \ p l u g i n s \ m n r e f p r o v i d e r p l u g i n . r s c " 
- 
- 
- 
- 
- 
- 
- 
- 
\ No newline at end of file
Binary file locsrv_plat/map_image_conversion_plugin_api/tsrc/mapnavproviderrefapp/sis/mnrefprovider_bitmap_armv5.sis has changed
Binary file locsrv_plat/map_image_conversion_plugin_api/tsrc/mapnavproviderrefapp/sis/mnrefprovider_bitmap_armv5.sisx has changed
--- a/locsrv_plat/map_image_conversion_plugin_api/tsrc/mapnavproviderrefapp/sis/rd-key.pem	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-MIICXAIBAAKBgQDLRF+r1FGGkCwTrb420kbnAps7gi1yYUcXYUdWeFTuBeQe5eW4
-6Y+LWaA8HMlDdoHRB0FgASisYcFagwno9+oFf4AJka4H1gWEs5XTGwAA1s0d8XGh
-7W7Dt9F5FZij8F7/9Pi6+FhhxZFIf1DD+yry9D7+Sp+BgdNALe4XOpf25QIBAwKB
-gQCHgupyjYuvCsgNHn7PNtnvVxInrB5MQNoPli+O+uNJWUK/Q+57Rl+yO8AoEzDX
-pFaLWiuVVhsdloDnAgabT/FXzYncs6uOHyEUV+dSXb78vtLPJqAX+Fg2i3hOXreB
-yskcZ13/OsKVOu5wgrJkx2baZufkqMwOSytf5y9nwjEIKwJBAP+inobagVNrN62j
-KQva3cC+UN/6XnKdTc0CA6bHyLOaJoH1xiMwG/VS2PGjHI0tiSMNtLn/QPpHJ003
-iabGhdUCQQDLjp/9UjFT6K6CF66Chqf30pZXhx+GTSQZmv/gvZiMly7X9fX9BGX3
-2MbJohBC4yI21XKTbisWywkF73Hwh+TRAkEAqmxprzxWN5zPyRdwspHpKymLP/w+
-9xOJM1atGdqFzRFvAU6EF3Vn+OHl9my9s3OwwgkjJqorUYTE3iUGby8D4wJBAIe0
-aqjhdjfwdFa6dFcEb/qMZDpaFQQzbWZnVUB+ZbMPdI/5TqitmU/l2dvBYCyXbCSO
-TGJJcg8yBgP09qBamIsCQFL7j1tM0XPVQJQ89WpKCld7O9ORxRGVj1eG0tWijrH8
-mGbYh8SGCVoWV3vrKSS8GBrFVgQnqUaHuEdtM7tpCAQ=
------END RSA PRIVATE KEY-----
--- a/locsrv_plat/map_image_conversion_plugin_api/tsrc/mapnavproviderrefapp/sis/rd.cer	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
------BEGIN CERTIFICATE-----
-MIICzDCCAjWgAwIBAgIBADANBgkqhkiG9w0BAQUFADArMRAwDgYDVQQKEwdSRCBD
-ZXJ0MRcwFQYDVQQDEw5SRCBDZXJ0aWZpY2F0ZTAeFw0wNDExMTUxMjQyMDZaFw0z
-NzA5MjMxMjQyMDZaMCsxEDAOBgNVBAoTB1JEIENlcnQxFzAVBgNVBAMTDlJEIENl
-cnRpZmljYXRlMIGdMA0GCSqGSIb3DQEBAQUAA4GLADCBhwKBgQDLRF+r1FGGkCwT
-rb420kbnAps7gi1yYUcXYUdWeFTuBeQe5eW46Y+LWaA8HMlDdoHRB0FgASisYcFa
-gwno9+oFf4AJka4H1gWEs5XTGwAA1s0d8XGh7W7Dt9F5FZij8F7/9Pi6+FhhxZFI
-f1DD+yry9D7+Sp+BgdNALe4XOpf25QIBA6OCAQAwgf0wDAYDVR0TBAUwAwEB/zAL
-BgNVHQ8EBAMCAoQwHQYDVR0OBBYEFFi/kuGzxhVpjGxe9ZwlxC3fH9jFMFMGA1Ud
-IwRMMEqAFFi/kuGzxhVpjGxe9ZwlxC3fH9jFoS+kLTArMRAwDgYDVQQKEwdSRCBD
-ZXJ0MRcwFQYDVQQDEw5SRCBDZXJ0aWZpY2F0ZYIBADBsBgNVHSAEZTBjMGEGBFUd
-IAAwWTATBggrBgEFBQcCARYHaHR0cDovLzBCBggrBgEFBQcCAjA2GjRGb3IgUiZE
-IHVzYWdlIG9ubHkuIFRoaXMgY2VydGlmaWNhdGUgaXMgbm90IHRydXN0ZWQuMA0G
-CSqGSIb3DQEBBQUAA4GBAHGB4RQMAgBdeT2hxfOr6f2nA/dZm+M5yX5daUtZnET9
-Ed0A9sazLawfN2G1KFQT9kxEParAyoAkpbMAsRrnRz/9cM3OHgFm/NiKRnf50DpT
-7oCx0I/65mVD2kt+xXE62/Ii5KPnTufIkPi2uLvURCia1tTS8JmJ8dtxDGyQt8BR
------END CERTIFICATE-----
--- a/locsrv_plat/map_image_conversion_plugin_api/tsrc/mapnavproviderrefapp/src/mnrefprovider.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,31 +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:  CApaApplication class implementation
-*
-*/
-
-
-#include <eikstart.h>
-#include "mnrpapplication.h"
-
-LOCAL_C CApaApplication* NewApplication()
-{
-    return new CMnrpApplication;
-}
-
-TInt E32Main()
-{
-    return EikStart::RunApplication( NewApplication );
-}
-
--- a/locsrv_plat/map_image_conversion_plugin_api/tsrc/mapnavproviderrefapp/src/mnrefproviderback.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,31 +0,0 @@
-/*
-* Copyright (c) 2006-2007 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:  Main application methods
-*
-*/
-
-
-#include <eikstart.h>
-#include "mnrpapplicationback.h"
-
-LOCAL_C CApaApplication* NewApplication()
-{
-    return new CMnrpApplicationBack;
-}
-
-TInt E32Main()
-{
-    return EikStart::RunApplication( NewApplication );
-}
-
--- a/locsrv_plat/map_image_conversion_plugin_api/tsrc/mapnavproviderrefapp/src/mnrefproviderplugin.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,47 +0,0 @@
-/*
-* Copyright (c) 2007 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:  Main application methods
-*
-*/
-
-
-#include <e32base.h>
-#include <ecom/ecom.h>
-#include <ecom/implementationproxy.h>
-
-#include "debug.h"
-#include "mnrpcoordconverter.h"
-
-// ========================== GLOBAL FUNCTIONS ===============================
-
-// ---------------------------------------------------------------------------
-// Table of implementations
-// ---------------------------------------------------------------------------
-//
-const TImplementationProxy ImplementationTable[] =
-    {
-    // Note! UID below is implementation UID, not DLL UID.
-    IMPLEMENTATION_PROXY_ENTRY( 0x03133038, CMnrpCoordConverter::NewL ),
-    };
-
-// ---------------------------------------------------------------------------
-// Note this function must be exported at ordinal 1
-// ---------------------------------------------------------------------------
-//
-EXPORT_C const TImplementationProxy* ImplementationGroupProxy(
-    TInt& aTableCount)
-    {
-    aTableCount = 1;
-    return ImplementationTable;
-    }
--- a/locsrv_plat/map_image_conversion_plugin_api/tsrc/mapnavproviderrefapp/src/mnrpappcontrol.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,109 +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:  CMnrpAppControlclass implementation
-*
-*/
-
-
-#include <coemain.h>
-#include <akndef.h>
-#include "mnrpappview.h"
-#include "mnrpappcontrol.h"
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CMnrpAppControl::CMnrpAppControl( CMnrpAppView& aView )
-: iView( aView )
-    {
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CMnrpAppControl::~CMnrpAppControl()
-    {
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CMnrpAppControl* CMnrpAppControl::NewL( CMnrpAppView& aView, const TRect& aRect)
-    {
-    CMnrpAppControl* self = new (ELeave) CMnrpAppControl( aView );
-    CleanupStack::PushL( self );
-    self->ConstructL( aRect );
-    CleanupStack::Pop( self );
-    return self;
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-TInt CMnrpAppControl::CountComponentControls() const 
-    { 
-    return 0; 
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CCoeControl* CMnrpAppControl::ComponentControl( TInt /*aIndex*/ ) const
-    {
-    return NULL;
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpAppControl::ConstructL( const TRect& aRect )
-    {
-    // Create a window for this application view
-    CreateWindowL();
-
-    // Set the windows size
-    SetRect( aRect );
-
-    // Activate the window, which makes it ready to be drawn
-    ActivateL();
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpAppControl::Draw( const TRect& /*aRect*/ ) const
-    {
-    // Get the standard graphics context
-    CWindowGc& gc = SystemGc();
-
-    // Gets the control's extent
-    TRect rect = Rect();
-
-    // Clears the screen
-    gc.Clear( rect );
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpAppControl::HandleResourceChange( TInt aType )
-    {
-    CCoeControl::HandleResourceChange( aType );
-    if ( aType == KEikDynamicLayoutVariantSwitch )
-        {
-        SetRect( iView.ClientRect() );
-        }
-    }
--- a/locsrv_plat/map_image_conversion_plugin_api/tsrc/mapnavproviderrefapp/src/mnrpapplication.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,56 +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:  CMnrpApplication class implementation
-*
-*/
-
-
-#include "debug.h"
-
-#include "mnrpdocument.h"
-#include "mnrpappserver.h"
-#include "mnrpapplication.h"
-
-// UID for the application, this should match the uid defined in the mmp file.
-static const TUid KUidMnRefProviderApp = {0x03132013};
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CApaDocument* CMnrpApplication::CreateDocumentL()
-    {  
-    LOG( "MnRefProvider: CreateDocumentL" );
-    CApaDocument* document = CMnrpDocument::NewL( *this );
-    return document;
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-TUid CMnrpApplication::AppDllUid() const
-    {
-    // Return the UID for the MnRefProvider application
-    return KUidMnRefProviderApp;
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpApplication::NewAppServerL( CApaAppServer*& aAppServer )
-    {
-    LOG( "MnRefProvider: NewAppServerL" );
-    aAppServer = new (ELeave) CMnrpAppServer;
-    }
--- a/locsrv_plat/map_image_conversion_plugin_api/tsrc/mapnavproviderrefapp/src/mnrpapplicationback.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,56 +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:  CMnrpApplicationGeoGeo class implementation
-*
-*/
-
-
-#include "debug.h"
-
-#include "mnrpdocumentback.h"
-#include "mnrpappserverback.h"
-#include "mnrpapplicationback.h"
-
-// UID for the application, this should match the uid defined in the mmp file.
-static const TUid KUidMnRefProviderBackApp = {0x03132014};
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CApaDocument* CMnrpApplicationBack::CreateDocumentL()
-    {  
-    LOG( "MnRefProviderBack: CreateDocumentL" );
-    CApaDocument* document = CMnrpDocumentBack::NewL( *this );
-    return document;
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-TUid CMnrpApplicationBack::AppDllUid() const
-    {
-    // Return the UID for the MnRefProvider application
-    return KUidMnRefProviderBackApp;
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpApplicationBack::NewAppServerL( CApaAppServer*& aAppServer )
-    {
-    LOG( "MnRefProviderBack: NewAppServerL" );
-    aAppServer = CMnrpAppServerBack::NewL();
-    }
--- a/locsrv_plat/map_image_conversion_plugin_api/tsrc/mapnavproviderrefapp/src/mnrpappserver.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,125 +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:  CMnrpAppServer class implementation
-*
-*/
-
-
-#include <mnappserviceuids.hrh>
-#include "debug.h"
-
-#include <lbsposition.h>
-#include <epos_cposlandmark.h>
-
-#include "mnrpnavigationservice.h"
-#include "mnrpmapviewservice.h"
-
-#include <MnRefProvider.rsg>
-#include "mnrpappui.h"
-#include "mnrpengine.h"
-#include "mnrpappserver.h"
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CMnrpAppServer::~CMnrpAppServer()
-    {
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-EXPORT_C CApaAppServiceBase* CMnrpAppServer::CreateServiceL(TUid aServiceType) const
-    {  
-    LOG1("MnRefProvider::CreateServiceL, svcUid = %X", aServiceType.iUid);
-    switch ( aServiceType.iUid )
-        {
-        case KMnAppMapViewService:
-            return CreateMapViewServiceL();
-
-        case KMnAppNavigationService:
-            return CreateNavigationServiceL();
-            
-        default:
-            return CAknAppServer::CreateServiceL( aServiceType );
-        }
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-EXPORT_C void CMnrpAppServer::HandleAllClientsClosed()
-    {
-    LOG( "MnRefProvider: HandleAllClientsClosed" );
-    CMnrpAppUi* appUi = AppUi();
-    if ( appUi )
-    	{
-    	if ( appUi->IsChainedMode() ) 
-    		{
-    		// close
-    		CAknAppServer::HandleAllClientsClosed();
-    		}
-    	else // standalone mode
-    		{
-    		if ( !appUi->IsAnyUserViewActive() )
-    			{
-	    		// close
-	    		CAknAppServer::HandleAllClientsClosed();
-    			}
-    		else
-    			{	
-    			// "remain active until user closes me"
-    			}
-    		}	
-    	}
-	else
-        {
-        CAknAppServer::HandleAllClientsClosed();
-        }
-    }
-    
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CMnrpNavigationService* CMnrpAppServer::CreateNavigationServiceL() const
-    {
-    LOG( "MnRefProvider: CreateNavigationServiceL" );
-    CMnrpNavigationService* svc = CMnrpNavigationService::NewL();
-    return svc;
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CMnrpMapViewService* CMnrpAppServer::CreateMapViewServiceL() const
-    {
-    LOG( "MnRefProvider: CreateMapViewServiceL" );
-    CMnrpMapViewService* svc = CMnrpMapViewService::NewL();
-    return svc;
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CMnrpAppUi* CMnrpAppServer::AppUi()
-    {
-    CMnrpAppUi* ui = (CMnrpAppUi*) CEikonEnv::Static()->AppUi();
-    if ( !ui )
-        {
-        LOG("MnRefProvider: UI not found!");
-        }
-    return ui;
-    }
--- a/locsrv_plat/map_image_conversion_plugin_api/tsrc/mapnavproviderrefapp/src/mnrpappserverback.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,107 +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:  CMnrpAppServerBack class implementation
-*
-*/
-
-
-#include <mnappserviceuids.hrh>
-#include "debug.h"
-
-#include <lbsposition.h>
-#include <epos_cposlandmark.h>
-
-#include "mnrpgeocodingservice.h"
-
-#ifdef RD_MAPNAV_BITMAP_ACCESS
-#include "mnrpmapimageservice.h"
-#endif
-
-#include "mnrpappuiback.h"
-#include "mnrpengine.h"
-#include "mnrpappserverback.h"
-
-// ============================ LOCAL FUNCTIONS ===============================
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CMnrpAppServerBack::~CMnrpAppServerBack()
-    {
-    delete iEngine;
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CMnrpAppServerBack* CMnrpAppServerBack::NewL()
-    {
-    CMnrpAppServerBack* self = new (ELeave) CMnrpAppServerBack();
-    CleanupStack::PushL( self );
-    self->ConstructL();
-    CleanupStack::Pop( self );
-    return self;
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpAppServerBack::ConstructL()
-    {
-    iEngine = CMnrpEngine::NewL();
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-EXPORT_C CApaAppServiceBase* CMnrpAppServerBack::CreateServiceL(TUid aServiceType) const
-    {
-    LOG1("MnRefProviderBack::CreateServiceL, svcUid = %X", aServiceType.iUid);
-    switch ( aServiceType.iUid )
-        {
-        case KMnAppGeocodingService:
-            return CreateGeocodingServiceL();
-
-#ifdef RD_MAPNAV_BITMAP_ACCESS
-        case KMnAppMapImageService:
-            return CreateMapImageServiceL();
-#endif
-        default:
-            return CAknAppServer::CreateServiceL( aServiceType );
-        }
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CMnrpGeocodingService* CMnrpAppServerBack::CreateGeocodingServiceL() const
-    {
-    LOG( "MnRefProviderBack: CreateGeocodingServiceL" );
-    CMnrpGeocodingService* svc = CMnrpGeocodingService::NewL( *iEngine );
-    return svc;
-    }
-
-#ifdef RD_MAPNAV_BITMAP_ACCESS
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CMnrpMapImageService* CMnrpAppServerBack::CreateMapImageServiceL() const
-    {
-    LOG( "MnRefProviderBack: CreateGeocodingServiceL" );
-    CMnrpMapImageService* svc = CMnrpMapImageService::NewL( *iEngine );
-    return svc;
-    }
-#endif
--- a/locsrv_plat/map_image_conversion_plugin_api/tsrc/mapnavproviderrefapp/src/mnrpappui.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,492 +0,0 @@
-/*
-* Copyright (c) 2006-2007 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:  CMnrpAppUi class implementation
-*
-*/
-
-
-#include <aknnavi.h>
-#include <aknnavide.h>
-#include <eikbtgpc.h>
-
-#include <akniconutils.h>
-#include <aknselectionlist.h>
-#include <gulicon.h>
-
-#include <MnRefProvider.rsg>
-#include <MnRefProvider.mbg>
-#include "mnrp.hrh"
-
-#include <epos_cposlandmark.h>
-#include <epos_cposlandmarkdatabase.h>
-
-#include "mnrpappview.h"
-#include "mnrpnaviview.h"
-#include "mnrpmapview.h"
-
-#include "mnrpmapviewservice.h"
-#include "mnrpnavigationservice.h"
-
-#include "mnrpdocument.h"
-#include "mnrpengine.h"
-#include "mnrpappui.h"
-#include "mnrputils.h"
-#include "debug.h"
-
-const TInt KDefaultLmIconIndex = 0;
-_LIT( KMbmFile, "\\resource\\apps\\MnRefProvider.mbm");
-
-// ============================ LOCAL FUNCTIONS ===============================
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-void CleanupIconArray( TAny* aArray )
-    {
-    LOG("MnRefProvider::CleanupIconArray in");
-    ( ( CArrayPtrSeg<CGulIcon>* ) aArray)->ResetAndDestroy();
-    delete aArray;
-    LOG("MnRefProvider::CleanupIconArray out");
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-void AddIconL(
-    CArrayPtr<CGulIcon>& aIconArray,
-    const TDesC& aFileName,
-    TInt aIconIndex,
-    TInt aMaskIndex )
-    {
-    LOG("MnRefProvider::AddIconL in");
-    CFbsBitmap* icon = NULL;
-    CFbsBitmap* mask = NULL;
-
-    AknIconUtils::CreateIconLC( icon, mask, aFileName, aIconIndex, aMaskIndex );
-    CGulIcon* gul = CGulIcon::NewL( icon, mask );
-
-    gul->SetBitmapsOwnedExternally( EFalse );
-    CleanupStack::PushL( gul );
-    aIconArray.AppendL( gul );
-    CleanupStack::Pop( 3 ); // gul, icon & mask
-    LOG("MnRefProvider::AddIconL out");
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-CArrayPtrSeg<CGulIcon>* CreateIconListLC( TInt aGranularity )
-    {
-    CArrayPtrSeg<CGulIcon>* iconList =
-        new (ELeave) CArrayPtrSeg<CGulIcon>( aGranularity );
-    CleanupStack::PushL( TCleanupItem( CleanupIconArray, iconList ) );
-
-    AddIconL(
-        *iconList,
-        KMbmFile,
-        EMbmMnrefproviderDefault_lm,
-        EMbmMnrefproviderDefault_lm_mask);
-
-    return iconList;
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-void AddLandmarkL(
-    const CPosLandmark& aLandmark,
-    CDesCArray& aTextArray,
-    CArrayPtr<CGulIcon>& aIconArray )
-    {
-    TPtrC name;
-    aLandmark.GetLandmarkName( name );
-
-    HBufC* printableName = MnrpUtils::PrintableStringLC( name );
-    
-    TPtrC iconFile;
-    TInt iconIndex, maskIndex, iconArrayIndex;
-
-    if ( aLandmark.GetIcon( iconFile, iconIndex, maskIndex ) == KErrNone )
-        {
-        AddIconL( aIconArray, iconFile, iconIndex, maskIndex );
-        iconArrayIndex = aIconArray.Count() - 1;
-        }
-    else
-        {
-        iconArrayIndex = KDefaultLmIconIndex;
-        }
-
-    _LIT(KListItemFormat, "%d\t%S\t\t");
-    const TInt KListItemMinSize = 20;
-
-    HBufC* item = HBufC::NewLC( printableName->Size() + KListItemMinSize );
-    item->Des().Format( KListItemFormat, iconArrayIndex, printableName );
-
-    aTextArray.AppendL( *item );
-
-    CleanupStack::PopAndDestroy( item );
-    CleanupStack::PopAndDestroy( printableName );
-    }
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CMnrpAppUi::CMnrpAppUi( CMnrpEngine& aEngine )
-  : iEngine( aEngine )
-    {
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpAppUi::ConstructL()
-    {
-    BaseConstructL( EAknEnableSkin );
-    
-    // This is empty view, it will be shown by UI framework,
-    // when application starts
-    iAppView = CMnrpAppView::NewL();
-    AddViewL( iAppView );
-
-    if ( !iEikonEnv->StartedAsServerApp() )
-        {
-        // switch to map view if started normally
-        iMapView = CMnrpMapView::NewL( EFalse, iEngine );
-        AddViewL( iMapView );
-        ActivateLocalViewL( iMapView->Id() );
-        }
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CMnrpAppUi::~CMnrpAppUi()
-    {
-    delete iNaviPaneLabel;
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpAppUi::HandleCommandL( TInt aCommand )
-    {
-    switch(aCommand)
-        {
-        case EAknSoftkeyBack:
-        	{
-    	    CEikAppServer* server = iEikonEnv->AppServer();
-		    if ( server )
-		    	{
-		        server->NotifyServerExit( EEikCmdExit );
-		    	}
-		    Exit();	
-        	break;
-        	}
-        	
-        case EEikCmdExit:
-        case EAknSoftkeyExit:
-            {
-    	    CEikAppServer* server = iEikonEnv->AppServer();
-		    if ( server )
-		    	{
-		        server->NotifyServerExit( EAknCmdExit ); // this will close client also
-		    	}
-		    Exit();	
-        	break;
-            }
-        default:
-            break;
-        }
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-TBool CMnrpAppUi::IsChainedMode()
-    {
-    return ( iParentWg != 0 );
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-TBool CMnrpAppUi::IsAnyUserViewActive()
-    {
-    TVwsViewId viewId;
-    if ( ( GetActiveViewId( viewId ) == KErrNotFound ) ||
-         ( viewId.iViewUid.iUid != EMnrpMapViewId && 
-           viewId.iViewUid.iUid != EMnrpNavigationViewId ) )
-        {
-        return EFalse;
-        }
-    else
-        {
-        return ETrue;
-        }
-    }
-
-// ----------------------------------------------------------------------------
-// ----------------------------------------------------------------------------
-//
-void CMnrpAppUi::SetNaviPaneTitleL( const TDesC& aPaneTitle )
-    {
-    if ( !iNaviPane )
-        {
-        iNaviPane = static_cast<CAknNavigationControlContainer*>(
-                StatusPane()->ControlL( TUid::Uid( EEikStatusPaneUidNavi ) ) );
-        }
-
-    if ( iNaviPaneLabel )
-        {
-        CAknNavigationDecorator* naviLabel = iNaviPane->CreateNavigationLabelL( aPaneTitle );
-        CleanupStack::PushL( naviLabel );
-
-        iNaviPane->ReplaceL( *iNaviPaneLabel, *naviLabel );
-
-        delete iNaviPaneLabel;
-        iNaviPaneLabel = naviLabel;
-
-        CleanupStack::Pop( naviLabel );
-        }
-    else
-        {
-        iNaviPaneLabel = iNaviPane->CreateNavigationLabelL( aPaneTitle );
-        iNaviPane->PushL( *iNaviPaneLabel );
-        }
-    }    
-
-// ----------------------------------------------------------------------------
-// ----------------------------------------------------------------------------
-//
-void CMnrpAppUi::SetRightSoftkeyCommandL( TInt aCommand, const TDesC& aButtonTitle )
-    {
-    if ( Cba() )
-        {
-        Cba()->SetCommandL( 1, aCommand, aButtonTitle );
-        }
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-TBool CMnrpAppUi::ProcessCommandParametersL( CApaCommandLine &aCommandLine )
-    {
-    iParentWg = aCommandLine.ParentWindowGroupID();
-    LOG1("parent window group id %d", iParentWg );
-    
-    return CAknAppUi::ProcessCommandParametersL( aCommandLine );
-    }
-
-// ----------------------------------------------------------------------------
-// ----------------------------------------------------------------------------
-//
-void CMnrpAppUi::HandleResourceChangeL( TInt aType )
-    {
-    CAknAppUi::HandleResourceChangeL( aType );
-    
-    TRect rect( ClientRect() );
-    if ( Cba() )
-        {
-		Cba()->SetBoundingRect( TRect() );
-		Cba()->ReduceRect( rect );
-        }
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpAppUi::ShowMapL( CMnrpMapViewService& aService )
-    {
-    if ( !iMapView )
-        {
-        iMapView = CMnrpMapView::NewL( IsChainedMode(), iEngine );
-        AddViewL( iMapView );
-        }
-        
-    iMapView->SetMapModeL( aService );
-    ActivateLocalViewL( iMapView->Id() );
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpAppUi::ShowNavigationL( const CPosLandmark& aDestination )
-    {
-    if ( !iNaviView )
-        {
-        iNaviView = CMnrpNaviView::NewL( IsChainedMode(), iEngine );
-        AddViewL( iNaviView );
-        }
-        
-    iNaviView->SetDestinationL( aDestination );
-    ActivateLocalViewL( iNaviView->Id() );
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpAppUi::StartSelectionL( 
-    CMnrpMapViewService& aService,  
-    MMapSelectionCallback& aCallback )
-    {
-	SetNaviPaneTitleL( aService.SelectionRequestText() );
-
-    if ( aService.Options() & CMnMapView::EOptionRestrictSelection )
-        {
-        // select from dialog 
-        SelectFromDialogL( aService, aCallback );
-        }
-    else
-        {
-        // select from map
-        if ( !iMapView )
-            {
-            iMapView = CMnrpMapView::NewL( IsChainedMode(), iEngine );
-            AddViewL( iMapView );
-            }
-
-        iMapView->SetSelectionModeL( aService, aCallback );
-        ActivateLocalViewL( iMapView->Id() );
-        }
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpAppUi::StopSelection()
-    {
-    __ASSERT_DEBUG( iMapView, Panic( KErrGeneral ) );
-    iMapView->StopSelection();
-
-    // Selection is done - close selection view
-    TRAP_IGNORE( ActivateLocalViewL( iAppView->Id() ) );
-    }
-    
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpAppUi::SelectFromDialogL(
-    CMnrpMapViewService& aService,
-    MMapSelectionCallback& aCallback )
-    {
-    LOG("MnRefProvider::SelectFromDialogL in");
-
-    const TInt KGranularity = 8;
-
-    CDesCArraySeg *textArray = new (ELeave) CDesCArraySeg( KGranularity );
-    CleanupStack::PushL( textArray );
-    CArrayPtrSeg<CGulIcon>* iconArray = CreateIconListLC( KGranularity );
-
-    TInt linkedLmsOffset = 0;
-
-    CMnrpDocument* doc = ( CMnrpDocument* ) Document();
-    CMnrpEngine& engine = doc->Engine();
-
-    // add non-linked landmarks
-    LOG("MnRefProvider::DoSelectionDialogL adding non-linked landmarks");
-    for ( TInt i = 0; i < aService.LandmarksToShow().Count(); i++)
-        {
-        const CPosLandmark* lm = aService.LandmarksToShow()[i];
-        AddLandmarkL( *lm, *textArray, *iconArray );
-        }
-
-    // add linked landmarks
-    LOG("MnRefProvider::DoSelectionDialogL adding linked landmarks");
-
-    // create dictionary of linked landmarks
-    // in order to ease searching for return values
-    // when completing request
-    RArray<TInt> dbIndices;
-    RArray<TPosLmItemId> lmIds;
-
-    CleanupClosePushL( dbIndices );
-    CleanupClosePushL( lmIds );
-
-    linkedLmsOffset = textArray->Count();
-    for ( TInt db = 0; db < aService.LandmarksToShowDatabases().Count(); db++ )
-        {
-        const HBufC* uri = aService.LandmarksToShowDatabases()[db];
-
-        CPosLandmarkDatabase* lmdb = CPosLandmarkDatabase::OpenL( *uri );
-        CleanupStack::PushL( lmdb );
-
-        if ( lmdb->IsInitializingNeeded() )
-            {
-            ExecuteAndDeleteLD( lmdb->InitializeL() );
-            }
-
-        for ( TInt i = 0; i < aService.LinkedLandmarksToShow(db).Count(); i++)
-            {
-            TPosLmItemId id = aService.LinkedLandmarksToShow(db)[i];
-
-            CPosLandmark* lm = lmdb->ReadLandmarkLC( id );
-            AddLandmarkL( *lm, *textArray, *iconArray );
-            
-            dbIndices.AppendL( db );
-            lmIds.AppendL( id );
-
-            CleanupStack::PopAndDestroy( lm );
-            }
-
-        CleanupStack::PopAndDestroy( lmdb );
-        }
-
-    TInt selected = 0;
-    CAknSelectionListDialog *dialog =
-        CAknSelectionListDialog::NewL( selected, textArray, R_MNREFPROVIDER_MENUBAR );
-
-    dialog->PrepareLC( R_MNREFPROVIDER_SELECTION_DIALOG );
-
-    dialog->SetIconArrayL( iconArray );
-    CleanupStack::Pop(); // iconArray cleanup
-
-    LOG1("MnRefProvider::SelectFromDialogL launching dialog with %d items", textArray->Count() );
-    TInt result = dialog->RunLD();
-    if ( result )
-        {
-        LOG("MnRefProvider::SelectFromDialogL approved");
-        if ( selected < linkedLmsOffset )
-            {
-            aCallback.HandleSelectionL( selected );
-            }
-        else
-            {
-            TInt linkedLmIndex = selected - linkedLmsOffset;
-            if ( linkedLmIndex < dbIndices.Count() && 
-                 linkedLmIndex < lmIds.Count() )
-                {
-                aCallback.HandleSelectionL( lmIds[linkedLmIndex], dbIndices[linkedLmIndex] );
-                }
-            else
-                {
-                // never happens
-                LOG("MnRefProvider::SelectFromDialogL selection out of range, out");
-                aCallback.HandleSelectionErrorL( KErrGeneral );
-                }
-            }
-        }
-    else
-        {
-        LOG("MnRefProvider::SelectFromDialogL cancelled, out");
-        aCallback.HandleSelectionErrorL( KErrCancel );
-        }
-
-    CleanupStack::PopAndDestroy( &lmIds );
-    CleanupStack::PopAndDestroy( &dbIndices );
-
-    CleanupStack::PopAndDestroy( textArray );
-    LOG("MnRefProvider::SelectFromDialogL out");
-}    
--- a/locsrv_plat/map_image_conversion_plugin_api/tsrc/mapnavproviderrefapp/src/mnrpappuiback.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,69 +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:  CMnrpAppUiBack classimplementation
-*
-*/
-
-
-#include <aknnavi.h>
-#include <aknnavide.h>
-
-#include "mnrpengine.h"
-#include "mnrpappuiback.h"
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpAppUiBack::ConstructL()
-    {
-    BaseConstructL( EAknEnableSkin );
-    // no view is created as this application is intended to be run
-    // only as hidden server
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpAppUiBack::HandleCommandL(TInt aCommand)
-    {
-    switch(aCommand)
-        {
-        case EEikCmdExit:
-        case EAknSoftkeyExit:
-            Exit();
-            break;
-        default:
-            break;
-        }
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-void CMnrpAppUiBack::MoveForeground()
-    {
-    RWindowGroup& window = iEikonEnv->RootWin();
-    window.SetOrdinalPosition( 0 );
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-void CMnrpAppUiBack::MoveBackground()
-    {
-    RWindowGroup& window = iEikonEnv->RootWin();
-    window.SetOrdinalPosition( -1 );
-    }
--- a/locsrv_plat/map_image_conversion_plugin_api/tsrc/mapnavproviderrefapp/src/mnrpappview.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,107 +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:  CMnrpAppView class implementation
-*
-*/
-
-
-#include "mnrp.hrh"
-#include "mnrpappui.h"
-#include "mnrpappcontrol.h"
-#include "mnrpappview.h"
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CMnrpAppView::CMnrpAppView()
-    {
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CMnrpAppView::~CMnrpAppView()
-    {
-    delete iControl;
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CMnrpAppView* CMnrpAppView::NewL()
-    {
-    CMnrpAppView* self = new ( ELeave ) CMnrpAppView();
-    CleanupStack::PushL( self );
-    self->ConstructL();
-    CleanupStack::Pop( self );
-    return self;
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpAppView::ConstructL()
-    {
-    BaseConstructL();
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-TUid CMnrpAppView::Id() const
-    {
-    return TUid::Uid( EMnrpAppViewId );
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpAppView::DoActivateL(
-    const TVwsViewId& /*aPrevViewId*/,
-    TUid /* aCustomMessageId */,
-    const TDesC8& /* aCustomMessage */)
-    {
-    if ( !iControl )
-        {
-        iControl = CMnrpAppControl::NewL( *this, ClientRect() );
-        iControl->SetMopParent( this );
-        }
-
-    // Enable receiving of keyboard events.
-    CMnrpAppUi* ui = ( CMnrpAppUi* ) AppUi();
-    ui->AddToStackL( *this, iControl );
-
-    _LIT( KEmpty, "" );
-    ui->SetNaviPaneTitleL( KEmpty );
-
-    // Make view visible.
-    iControl->MakeVisible( ETrue );
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpAppView::DoDeactivate()
-    {
-    if ( iControl )
-        {
-        // Hide view.
-        iControl->MakeVisible( EFalse );
-
-        // Disable receiving keyboard events.
-        AppUi()->RemoveFromStack( iControl );
-        }
-    }
--- a/locsrv_plat/map_image_conversion_plugin_api/tsrc/mapnavproviderrefapp/src/mnrpcoordconverter.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,97 +0,0 @@
-/*
-* Copyright (c) 2007 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:  CMnrpCoordConverter implementation
-*
-*/
-
-
-#include <e32base.h>
-
-#include "debug.h"
-#include "mnrpengine.h"
-#include "mnrpmapmodel.h"
-#include "mnrpcoordconverter.h"
-
-// ========================== MEMBER FUNCTIONS ===============================
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-CMnrpCoordConverter* CMnrpCoordConverter::NewL()
-    {
-    CMnrpCoordConverter* self = new (ELeave) CMnrpCoordConverter;
-    CleanupStack::PushL( self );
-
-    self->iEngine = CMnrpEngine::NewL();
-    self->iModel = CMnrpMapModel::NewL( *self->iEngine );
-
-    CleanupStack::Pop( self );
-    return self;
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-CMnrpCoordConverter::CMnrpCoordConverter()
-    {
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-CMnrpCoordConverter::~CMnrpCoordConverter()
-    {
-    delete iModel;
-    delete iEngine;
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-TInt CMnrpCoordConverter::GetImageCoordinate(
-    const TCoordinate& aWorldCoordinate,
-    TPoint& aImagePoint )
-    {
-    const TMnMapImageParams& params = MapImageParams();
-
-    if ( params.ImageType() == TMnMapImageParams::ETypeSatelliteImage )
-        {
-        return KErrArgument;
-        }
-
-    iModel->UpdateModel( params );
-
-    aImagePoint = iModel->AbsoluteToScreen( aWorldCoordinate );
-    return KErrNone;
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-TInt CMnrpCoordConverter::GetWorldCoordinate(
-    const TPoint& aImagePoint,
-    TCoordinate& aWorldCoordinate )
-    {
-    const TMnMapImageParams& params = MapImageParams();
-
-    if ( params.ImageType() == TMnMapImageParams::ETypeSatelliteImage )
-        {
-        return KErrArgument;
-        }
-
-    iModel->UpdateModel( params );
-
-    aWorldCoordinate = iModel->ScreenToAbsolute( aImagePoint  );
-    return KErrNone;
-    }
--- a/locsrv_plat/map_image_conversion_plugin_api/tsrc/mapnavproviderrefapp/src/mnrpdocument.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,80 +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:  CMnrpDocument class implementation
-*
-*/
-
-
-#include "mnrpappui.h"
-#include "mnrpengine.h"
-#include "mnrpdocument.h"
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CMnrpDocument::CMnrpDocument(CEikApplication& aApp) 
-    : CAknDocument(aApp) 
-    {
-    }   
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpDocument::ConstructL()
-    {
-    iEngine = CMnrpEngine::NewL();
-    }    
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CMnrpDocument* CMnrpDocument::NewL( CEikApplication& aApp )
-    {
-    CMnrpDocument* self = new (ELeave) CMnrpDocument(aApp);
-    CleanupStack::PushL(self);
-    self->ConstructL();
-    CleanupStack::Pop(self);
-    return self;
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CMnrpDocument::~CMnrpDocument()
-    {
-    delete iEngine;
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CMnrpEngine& CMnrpDocument::Engine()
-    { 
-    return *iEngine; 
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CEikAppUi* CMnrpDocument::CreateAppUiL()
-    {
-    // Create the application user interface, and return a pointer to it,
-    // the framework takes ownership of this object
-    CEikAppUi* appUi = new (ELeave) CMnrpAppUi( *iEngine );
-    return appUi;
-    }
-
-
--- a/locsrv_plat/map_image_conversion_plugin_api/tsrc/mapnavproviderrefapp/src/mnrpdocumentback.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,53 +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:  CMnrpDocumentBack class implementation
-*
-*/
-
-
-#include "mnrpappuiback.h"
-#include "mnrpengine.h"
-#include "mnrpdocumentback.h"
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CMnrpDocumentBack::CMnrpDocumentBack(CEikApplication& aApp) 
-    : CAknDocument(aApp) 
-    {
-    }   
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CMnrpDocumentBack* CMnrpDocumentBack::NewL( CEikApplication& aApp )
-    {
-    CMnrpDocumentBack* self = new (ELeave) CMnrpDocumentBack( aApp );
-    return self;
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CEikAppUi* CMnrpDocumentBack::CreateAppUiL()
-    {
-    // Create the application user interface, and return a pointer to it,
-    // the framework takes ownership of this object
-    CEikAppUi* appUi = new (ELeave) CMnrpAppUiBack();
-    return appUi;
-    }
-
-
--- a/locsrv_plat/map_image_conversion_plugin_api/tsrc/mapnavproviderrefapp/src/mnrpengine.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,433 +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:  CMnrpEngine class implementation
-*
-*/
-
-
-#include <coemain.h>
-#include <aknlists.h>
-#include <barsread2.h>
-#include <barsc2.h> 
-
-#include <lbsposition.h>
-#include <lbspositioninfo.h>
-
-#include <epos_cposlandmark.h>
-#include <epos_cposlandmarkdatabase.h>
-
-#include <mnrefproviderengine.rsg>
-
-#include "../inc/debug.h"
-#include "mnrpengine.h"
-
-_LIT( KCitiesResourceFile, "\\resource\\mnrefproviderengine.rsc");
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CMnrpEngine::CMnrpEngine()
-    { 
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-EXPORT_C CMnrpEngine::~CMnrpEngine()
-    {
-    iPlaces.ResetAndDestroy();
-    iFileSession.Close();
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-EXPORT_C CMnrpEngine* CMnrpEngine::NewL()
-    {
-    CMnrpEngine* self = new (ELeave) CMnrpEngine();
-    CleanupStack::PushL( self );
-    self->ConstructL();
-    CleanupStack::Pop( self );
-    return self;
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpEngine::ConstructL()
-    {
-    User::LeaveIfError( iFileSession.Connect() );
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-EXPORT_C TArray<CPosLandmark*> CMnrpEngine::KnownPlacesL()
-    {
-    if ( iPlaces.Count() == 0 )
-        {
-        TRAP_IGNORE( LoadKnownPlacesL() );
-        }
-
-    return iPlaces.Array();        
-    }
-    
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-EXPORT_C CPosLandmark* CMnrpEngine::AddressToCoordLC( const CPosLandmark& aAddress )
-    {
-    CPosLandmark* lm = AddressToCoordL( aAddress );
-    if ( lm )
-        {
-        CleanupStack::PushL( lm );
-        return lm;
-        }
-    else
-        {
-        User::Leave( KErrNotFound );
-        return NULL;
-        }
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-EXPORT_C CPosLandmark* CMnrpEngine::AddressToCoordL( const CPosLandmark& aAddress )
-    {
-    TPtrC city, country;
-    aAddress.GetPositionField( EPositionFieldCity, city );
-    
-    TArray<CPosLandmark*> pois = KnownPlacesL();
-    
-    if ( city.Length() )
-        {
-        for ( TInt i = 0; i < pois.Count(); i++ )
-            {
-            TPtrC poiCity;
-            pois[i]->GetPositionField( EPositionFieldCity, poiCity );
-            if ( poiCity.CompareF( city ) == 0 )
-                {
-                return CPosLandmark::NewL( *pois[i] );
-                }
-            }
-        }
-    
-    return NULL;
-    }
-    
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-EXPORT_C CPosLandmark* CMnrpEngine::AddressToCoordLC( const TDesC& aAddress )
-    {
-    CPosLandmark* lm = AddressToCoordL( aAddress );
-    if ( lm )
-        {
-        CleanupStack::PushL( lm );
-        return lm;
-        }
-    else
-        {
-        User::Leave( KErrNotFound );
-        return NULL;
-        }
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-EXPORT_C CPosLandmark* CMnrpEngine::AddressToCoordL( const TDesC& aAddress )
-    {
-    TArray<CPosLandmark*> pois = KnownPlacesL();
-
-    if ( aAddress.Length() )
-        {
-        for ( TInt i = 0; i < pois.Count(); i++ )
-            {
-            TPtrC city, country;
-            pois[i]->GetPositionField( EPositionFieldCity, city );
-            pois[i]->GetPositionField( EPositionFieldCountry, country );
-            
-            if ( aAddress.FindF( city ) >= 0 )
-                {
-                return CPosLandmark::NewL( *pois[i] );
-                }
-            }
-        }
-        
-    return NULL;
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-EXPORT_C TReal32 CMnrpEngine::DistanceBetweenLandmarks( 
-    const CPosLandmark& aFrom,
-    const CPosLandmark& aTo )
-    {
-    TRealX nan;
-    nan.SetNaN();
-    TReal32 distance = nan;
-    
-    TLocality locFrom, locTo;
-
-    if ( aFrom.GetPosition( locFrom ) == KErrNone &&
-         aTo.GetPosition( locTo ) == KErrNone )
-        {
-        TReal32 dist;
-        if ( locFrom.Distance( locTo, dist ) == KErrNone )
-            {
-            distance = dist;
-            }
-        }
-    return distance;
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-EXPORT_C void CMnrpEngine::FindClosestPoisL( 
-    const CPosLandmark& aReference,
-    RArray<CMnrpEngine::TDistanceToPoi>& aNeighbourPois,
-    TInt aMaxMatches )
-    {
-    aNeighbourPois.Reset();
-    TArray<CPosLandmark*> pois = KnownPlacesL();
-
-    // calc distances to known places and find out closest ones
-    for ( TInt i = 0; i < pois.Count(); i++ )
-        {
-        CPosLandmark* poi = pois[i];
-
-        TReal32 distance = DistanceBetweenLandmarks( aReference, *poi );
-        
-        if ( Math::IsNaN( distance ) )
-            {
-            continue;
-            }
-        
-        TDistanceToPoi newDistToPoi;
-        newDistToPoi.iPoiIndex = i;
-        newDistToPoi.iDistance = distance;
-
-        for ( TInt k = 0; k < aNeighbourPois.Count(); k++ )
-            {
-            TDistanceToPoi distToPoi = aNeighbourPois[k];
-            if ( distance < distToPoi.iDistance )
-                {
-                // current POI is closer to reference than current neighbour
-                aNeighbourPois.InsertL( newDistToPoi, k );
-                break;
-                }
-            }
-
-        if ( aNeighbourPois.Count() < aMaxMatches )
-            {
-            aNeighbourPois.AppendL( newDistToPoi );
-            }
-
-        if ( aNeighbourPois.Count() > aMaxMatches )
-            {
-            aNeighbourPois.Remove( aNeighbourPois.Count() - 1 ); // remove last
-            }
-        }
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CPosLandmark* CMnrpEngine::CreateCloseLandmarkLC( 
-    const CPosLandmark& aReference,
-    TReal32 aDistance )
-    {
-    CPosLandmark* lm = CPosLandmark::NewLC( aReference );
-    TPtrC oldName;
-    lm->GetLandmarkName( oldName );
-    
-    // create street in the form of "50 km to <POI name>"
-    const TInt KDistValueLen = 5; // "40000"
-    const TInt KAdditionalChars = 7; // " km to "
-
-    _LIT( KLocationNameFormat, "%d m to %S" );
-    _LIT( KLocationNameFormatKm, "%d km to %S" );
-
-    HBufC* locName = HBufC::NewLC( oldName.Length() + KDistValueLen + KAdditionalChars );
-
-    if ( aDistance < 1000 )
-        {
-        locName->Des().Format( KLocationNameFormat, TInt( aDistance ), &oldName );
-        }
-    else
-        {
-        locName->Des().Format( KLocationNameFormatKm, TInt( aDistance / 1000 ), &oldName );
-        }
-
-    lm->SetPositionFieldL( EPositionFieldLocationName, *locName );
-    lm->SetPositionFieldL( EPositionFieldStreet, *locName );
-   
-    CleanupStack::PopAndDestroy( locName );
-    return lm; // left in stack
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-EXPORT_C CPosLandmark* CMnrpEngine::CoordToAddressLC( const TCoordinate& aLocation )
-    {
-    TArray<CPosLandmark*> pois = KnownPlacesL();
-
-    // find closest POI
-    RArray<TDistanceToPoi> matches;
-	CleanupClosePushL( matches );
-    
-    CPosLandmark* temp = CPosLandmark::NewLC();
-    TLocality loc( aLocation, 0 ); // accuracy is not used by this implementation
-    temp->SetPositionL( loc );
-    FindClosestPoisL( *temp, matches, 1 ); // only one match needed
-    CleanupStack::PopAndDestroy( temp );
-    
-    if ( matches.Count() < 1 )
-		{
-		User::Leave( KErrNotFound );
-		}
-
-    TDistanceToPoi distToPoi = matches[0];
-	CleanupStack::PopAndDestroy( &matches );
-
-    CPosLandmark* lm = CreateCloseLandmarkLC(
-        *pois[distToPoi.iPoiIndex],
-        distToPoi.iDistance );
-
-    return lm; // left in stack
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-EXPORT_C void CMnrpEngine::BestCoordToAddressMatchesL( 
-    const TCoordinate& aLocation,
-    RPointerArray<CPosLandmark>& aMatches,
-    TInt aMaxMatches )
-    {
-    TArray<CPosLandmark*> pois = KnownPlacesL();
-
-    // find closest POIs
-    RArray<TDistanceToPoi> matches;
-    CleanupClosePushL( matches );
-    
-    CPosLandmark* temp = CPosLandmark::NewLC();
-    TLocality loc( aLocation, 0 ); // accuracy is not used by this implementation
-    temp->SetPositionL( loc );
-    FindClosestPoisL( *temp, matches, aMaxMatches );
-    CleanupStack::PopAndDestroy( temp );
-    
-    for ( TInt i = 0; i < matches.Count(); i++ )
-        {
-        TDistanceToPoi distToPoi = matches[i];
-        
-        CPosLandmark* lm = CreateCloseLandmarkLC( 
-            *pois[distToPoi.iPoiIndex], 
-            distToPoi.iDistance );
-            
-        aMatches.AppendL( lm );    
-        CleanupStack::Pop( lm );
-        }
-    CleanupStack::PopAndDestroy( &matches );
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-EXPORT_C void CMnrpEngine::FindResourceFileL( 
-    const TDesC& aFilePathAndName,
-    TFileName& aRscFile )
-    {
-    TParse parse;
-    parse.Set( aFilePathAndName, NULL, NULL );
-    
-    TFindFile finder( iFileSession );
-    if ( finder.FindByDir( parse.NameAndExt(), parse.Path() ) == KErrNone )
-        {
-        aRscFile.Copy( finder.File() );
-        }
-    else
-        {
-        User::Leave( KErrNotFound );
-        }
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-EXPORT_C RFs& CMnrpEngine::Fs() 
-    { 
-    return iFileSession;
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpEngine::LoadKnownPlacesL()
-    {
-    TFileName resourceFile;
-    FindResourceFileL( KCitiesResourceFile(), resourceFile );
-
-    CResourceFile* resFile = CResourceFile::NewLC( iFileSession, resourceFile, 0, 0 );
-    resFile->ConfirmSignatureL( 0 );
-
-    RResourceReader reader;
-
-    reader.OpenLC( resFile, R_MNREFPROVIDERENGINE_PLACES );
-    ReadPlacesResourceL( reader );
-    CleanupStack::PopAndDestroy( &reader );
-    
-    CleanupStack::PopAndDestroy( resFile );
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpEngine::ReadPlacesResourceL( RResourceReader& aReader )
-    {
-    TInt size = aReader.ReadInt16L();
-
-    for ( TInt i = 0; i < size; i++ )
-        {
-        HBufC* city = aReader.ReadHBufCL();
-        CleanupStack::PushL( city );
-        HBufC* country = aReader.ReadHBufCL();
-        CleanupStack::PushL( country );
-
-        TReal64 lat = aReader.ReadReal64L();
-        TReal64 lon = aReader.ReadReal64L();
-        
-        CPosLandmark* lm = CPosLandmark::NewLC();
-        lm->SetLandmarkNameL( *city );
-        
-        lm->SetPositionFieldL( EPositionFieldCity, *city );
-        lm->SetPositionFieldL( EPositionFieldCountry, *country );
-        
-        TLocality coord;
-        coord.SetCoordinate( lat, lon );
-        lm->SetPositionL( coord );
-        
-        iPlaces.AppendL( lm );
-        CleanupStack::Pop( lm );
-        CleanupStack::PopAndDestroy( country );
-        CleanupStack::PopAndDestroy( city );
-        }
-    }
--- a/locsrv_plat/map_image_conversion_plugin_api/tsrc/mapnavproviderrefapp/src/mnrpgeocodingservice.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,343 +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:  CMnrpGeocodingService class implementation
-*
-*/
-
-
-#include <e32base.h>
-
-#include <aknnotewrappers.h>
-
-#include <lbsposition.h>
-
-#include <epos_cposlandmark.h>
-#include <epos_poslandmarkserialization.h>
-
-#include <mngeocodingservicebase.h>
-
-#include "debug.h"
-
-#include "mnrpappserverback.h"
-#include "mnrpappuiback.h"
-#include "mnrpdocumentback.h"
-#include "mnrpengine.h"
-
-#include <mnrefproviderback.rsg>
-#include "mnrpgeocodingservice.h"
-
-// ======== LOCAL FUNCTIONS ========
-
-// ---------------------------------------------------------------------------
-//  Cleanup item for RPointerArray<CPosLandmark>
-// ---------------------------------------------------------------------------
-//
-void CleanupLandmarksArray( TAny* aArray )
-    {
-    ( static_cast<RPointerArray<CPosLandmark>*>( aArray ) )->ResetAndDestroy();
-    }
-
-// ---------------------------------------------------------------------------
-//  Cleanup item for moving application fore/background
-// ---------------------------------------------------------------------------
-//
-void CleanupForeground( TAny* aAppUi )
-    {
-    ( static_cast<CMnrpAppUiBack*>( aAppUi ) )->MoveBackground();
-    }
-
-// ======== MEMBER FUNCTIONS ========
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-CMnrpGeocodingService::CMnrpGeocodingService( CMnrpEngine& aEngine )
- :  iEngine( aEngine )
-    {
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-CMnrpGeocodingService* CMnrpGeocodingService::NewL( CMnrpEngine& aEngine )
-    {
-    CMnrpGeocodingService* self = new (ELeave) CMnrpGeocodingService( aEngine );
-    CleanupStack::PushL( self );
-    self->ConstructL();
-    CleanupStack::Pop( self );
-    return self;
-    }
-    
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-CMnrpGeocodingService::~CMnrpGeocodingService()
-    {
-    delete iProcessor;
-    delete iLandmark;
-    delete iPlainAddress;
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-void CMnrpGeocodingService::ConstructL()
-    {
-    BaseConstructL();
-    
-    iProcessor = CIdle::NewL( CActive::EPriorityIdle );
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-void CMnrpGeocodingService::LeaveIfBusyL()
-    {
-    if ( iProcessor->IsActive() )
-        {
-        User::Leave( KErrInUse );
-        }
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-void CMnrpGeocodingService::StartProcessingL()
-    {
-    iProcessor->Start( TCallBack( CMnrpGeocodingService::GeocodingProcessingCallBack, this ) );
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-TInt CMnrpGeocodingService::GeocodingProcessingCallBack( TAny* aPtr )
-    {
-    CMnrpGeocodingService* self =    
-        static_cast<CMnrpGeocodingService*> ( aPtr );
-        
-    self->HandleGeocodingCompleted();
-    return EFalse;
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-void CMnrpGeocodingService::HandleGeocodingCompleted()
-    {
-    TInt err = KErrNone;
-    TRAP( err, FinishProcessingL() );
-    if ( err )
-        {
-        CompleteRequest( err );
-        }
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-void CMnrpGeocodingService::FinishProcessingL()
-    {
-    LOG1("MnRefProvider: FinishProcessingL in, cursvc %d", iCurrentService);
-
-    TLocality loc;
-    CPosLandmark* lm = NULL;
-    
-    switch ( iCurrentService )
-        {
-        case ECoordToAddr:
-                
-            if ( iDialogAllowed )
-                {
-                lm = LetUserSelectBestMatchL( *iLandmark );
-                CleanupStack::PushL( lm );
-                }
-            else
-                {
-                // search and return just best match - closest POI
-                if ( iLandmark->GetPosition( loc ) != KErrNone )
-                    {
-                    User::Leave( KErrArgument );
-                    }
-                lm = iEngine.CoordToAddressLC( loc );
-                }
-            break;
-
-        case EAddrToCoord:
-            lm = iEngine.AddressToCoordLC( *iLandmark );
-            break;
-
-        case EPlainToCoord:
-            lm = iEngine.AddressToCoordLC( *iPlainAddress );
-            break;
-            
-        default:            
-            User::Leave( KErrGeneral );
-        }
-
-    iCurrentService = ENone;    
-    
-    CompleteGeocodingRequestL( *lm );
-    CleanupStack::PopAndDestroy( lm );
-
-    LOG("MnRefProvider: FinishProcessingL out");
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-CPosLandmark* CMnrpGeocodingService::LetUserSelectBestMatchL( const CPosLandmark& aReference )
-    {
-    // 1. Find best matches
-    
-    RPointerArray<CPosLandmark> matches;
-    CleanupStack::PushL( TCleanupItem( CleanupLandmarksArray, &matches ) );
-    
-    TLocality location;
-    if ( aReference.GetPosition( location ) != KErrNone )
-        {
-        User::Leave( KErrArgument );
-        }
-    
-    const TInt KMaxmMatches = 3;
-    iEngine.BestCoordToAddressMatchesL( location, matches, KMaxmMatches );
-    
-    if ( matches.Count() < 1 )
-        {
-        User::Leave( KErrNotFound ); // cannot find any match
-        }
-    
-    // 2. Start selection dialog
-    
-    TInt result = 1, selected = 0;
-    if ( matches.Count() > 1 )
-        {
-        // prepare dialog
-        const TInt KGranularity = 8;
-        CDesCArraySeg *textArray = new (ELeave) CDesCArraySeg( KGranularity );
-        CleanupStack::PushL( textArray );
-        
-        for ( TInt i = 0; i < matches.Count(); i++ )
-            {
-            HBufC* buf = HBufC::NewLC( KPosLmMaxTextFieldLength );
-            TPtrC ptr( buf->Des() );
-            
-            matches[i]->GetPositionField( EPositionFieldLocationName, ptr );
-            textArray->AppendL( ptr );
-
-            CleanupStack::PopAndDestroy( buf );
-            }
-        
-        // bring application foreground
-        CMnrpAppUiBack* ui = (CMnrpAppUiBack*) CEikonEnv::Static()->AppUi();
-        CleanupStack::PushL( TCleanupItem( CleanupForeground, ui ) );
-        ui->MoveForeground();
-
-        CAknListQueryDialog* dialog = new (ELeave) CAknListQueryDialog( &selected );
-        dialog->PrepareLC( R_MNREFGEOCODER_LIST_QUERY );
-
-        dialog->SetItemTextArray( textArray );
-        dialog->SetOwnershipType( ELbmOwnsItemArray );
-
-        // pop up dialog
-        result = dialog->RunLD();
-
-        CleanupStack::PopAndDestroy(); // move background
-        CleanupStack::Pop( textArray );
-        }
-
-    // 3. Return result
-    CPosLandmark* lm = NULL;
-    if ( result )
-        {
-        lm = matches[selected];
-        matches.Remove( selected );
-        }
-    else
-        {
-        User::Leave( KErrCancel ); 
-        // user cancelled geocoding selection dialog
-        // it automatically cancels geocoding request
-        }
-
-    CleanupStack::PopAndDestroy(); // matches
-    return lm;
-    }
-
-// ---------------------------------------------------------------------------
-// From class CMnGeocodingServiceBase
-// ---------------------------------------------------------------------------
-//
-void CMnrpGeocodingService::HandleFindAddressByCoordinateL(
-    const CPosLandmark& aLandmark)
-    {
-    LeaveIfBusyL();
-
-    delete iLandmark;
-    iLandmark = NULL;
-    iLandmark = CPosLandmark::NewL(aLandmark);
-    
-    iCurrentService = ECoordToAddr;
-    iDialogAllowed = !( Options() & CMnGeocoder::EOptionDialogDisabled );
-    StartProcessingL();
-    }
-        
-// ---------------------------------------------------------------------------
-// From class CMnGeocodingServiceBase
-// ---------------------------------------------------------------------------
-//
-void CMnrpGeocodingService::HandleFindCoordinateByAddressL(
-    const CPosLandmark& aLandmark)
-    {
-    LeaveIfBusyL();
-
-    delete iLandmark;
-    iLandmark = NULL;
-    iLandmark = CPosLandmark::NewL( aLandmark );
-    
-    iCurrentService = EAddrToCoord;
-    iDialogAllowed = !( Options() & CMnGeocoder::EOptionDialogDisabled );
-    StartProcessingL();
-    }
-
-// ---------------------------------------------------------------------------
-// From class CMnGeocodingServiceBase
-// ---------------------------------------------------------------------------
-//
-void CMnrpGeocodingService::HandleFindCoordinateByAddressL(
-    const TDesC& aAddress)
-    {
-    LeaveIfBusyL();
-
-    delete iPlainAddress;
-    iPlainAddress = NULL;
-    iPlainAddress = aAddress.AllocL();
-    
-    delete iLandmark;
-    iLandmark = NULL;
-    iLandmark = CPosLandmark::NewL();
-    
-    iCurrentService = EPlainToCoord;
-    iDialogAllowed = !( Options() & CMnGeocoder::EOptionDialogDisabled );
-    StartProcessingL();
-    }
-
-// ---------------------------------------------------------------------------
-// From class CMnServiceBase
-// ---------------------------------------------------------------------------
-//
-void CMnrpGeocodingService::DoCancel()
-    {
-    iProcessor->Cancel();
-    iCurrentService = ENone;
-    }
--- a/locsrv_plat/map_image_conversion_plugin_api/tsrc/mapnavproviderrefapp/src/mnrpmapcontrol.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,644 +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:  CMnrpMapControl class implementation
-*
-*/
-
-
-#include <coemain.h>
-#include <aknlists.h>
-#include <barsread.h>
-#include <aknnotewrappers.h>
-
-#include <bitstd.h>
-#include <bitdev.h>
-
-#include <lbsposition.h>
-
-#include "debug.h"
-
-#include "mnrputils.h"
-#include "mnrpmapview.h"
-#include "mnrpmapcontrol.h"
-
-const TInt KCodeKeyLeft = 0x34;
-const TInt KCodeKeyRight = 0x36;
-const TInt KCodeKeyUp = 0x32;
-const TInt KCodeKeyDown = 0x38;
-const TInt KCodeKeyCenter = 0x35;
-
-const TInt KCodeKeySelect = EKeyDevice3;
-const TInt KCodeKeySelect2 = 0x13;
-
-const TInt KCodeKeyZoomIn = 42;
-const TInt KCodeKeyZoomOut = 35;
-const TInt KCodeKeyZoomIn2 = 0x33;
-const TInt KCodeKeyZoomOut2 = 0x39;
-
-const TRgb KCursorColor( 255, 255, 255 );
-const TRgb KGridTextColor( 0, 0, 0 );
-const TRgb KOriginMarkColor( 0, 0, 255 );
-
-const TInt KTextFontHeightInTwips = 100;
-const TInt KItemFontHeightInTwips = 120;
-const TReal KBorderSizeFactor = 2;
-
-const TInt KCursorMarginSize = 20; // pixels
-const TInt KCursorArrowSize = 4; // pixels
-const TInt KCursorCircleRadius = 4; // pixels
-
-const TInt KCursorMove = 10; // pixels
-const TInt KWindowMove = 20; // pixels
-const TReal KJumpFactor = 5;
-const TReal KCrawlFactor = 2.0 / KCursorMove;
-
-const TReal KZoomOutRate = 1.5;
-const TReal KZoomInRate =  1 / KZoomOutRate;
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CMnrpMapControl::CMnrpMapControl( CMnrpMapView& aView )
- :  iView( aView )
-    {
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CMnrpMapControl::~CMnrpMapControl()
-    {
-    delete iModel;
-    delete iOffScreenBitmap;
-    DestroyFonts();
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CMnrpMapControl* CMnrpMapControl::NewL( 
-    CMnrpMapView& aView,
-    const TRect& aRect,
-    CMnrpEngine& aEngine )
-    {
-    CMnrpMapControl* self = new ( ELeave ) CMnrpMapControl( aView );
-    CleanupStack::PushL( self );
-    self->ConstructL( aRect, aEngine );
-    CleanupStack::Pop( self );
-    return self;
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpMapControl::UpdateModelL( CMnrpMapViewService& aService )
-    {
-    iModel->UpdateModelL( aService );
-    }
-    
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpMapControl::SetSelectionModeL( TBool aSelectionMode ) 
-    {
-    iSelectionMode = aSelectionMode;
-    iAbsoluteCursor = iModel->Center();
-    iCursor = iModel->AbsoluteToScreen( iAbsoluteCursor );
-    DrawDeferred();
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-TCoordinate CMnrpMapControl::CurrentLocation()
-    {
-    return iAbsoluteCursor;
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpMapControl::ConstructL( 
-    const TRect& aRect,
-    CMnrpEngine& aEngine )
-    {
-    // Create a window for this application view
-    CreateWindowL();
-
-    iModel = CMnrpMapModel::NewL( *this, aEngine );
-
-    // Set the windows size
-    SetRect( aRect );
-    
-    iAbsoluteCursor = TCoordinate( 0, 0 );
-    iCursor = iModel->AbsoluteToScreen( iAbsoluteCursor );
-    
-    CreateFonts();
-    CreateScreenBufferL( aRect.Size() );
-
-    // Activate the window, which makes it ready to be drawn
-    ActivateL();
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-TKeyResponse CMnrpMapControl::OfferKeyEventL(
-    const TKeyEvent& aKeyEvent, 
-    TEventCode /*aType*/ )
-    {
-    TKeyResponse response = EKeyWasConsumed;
-    
-    TInt step = iSelectionMode ? KCursorMove : KWindowMove;
-    TBool isShift = aKeyEvent.iModifiers & EModifierShift;
-    TReal crawlFactor = isShift ? KCrawlFactor : 1;
-
-    TInt xmove = 0;
-    TInt ymove = 0;
-    
-    TBool redraw = ETrue;
-
-    switch ( aKeyEvent.iCode )
-        {
-        case EKeyLeftArrow:
-            xmove = -step * crawlFactor;
-            break;
-
-        case KCodeKeyLeft:
-            xmove = -step * KJumpFactor;
-            break;
-
-        case EKeyRightArrow:
-            xmove = step * crawlFactor;
-            break;
-
-        case KCodeKeyRight:
-            xmove = step * KJumpFactor;
-            break;
-
-        case EKeyUpArrow:
-            ymove = -step * crawlFactor;
-            break;
-
-        case KCodeKeyUp:
-        case EKeyPageUp:
-            ymove = -step * KJumpFactor;
-            break;
-
-        case EKeyDownArrow:
-            ymove = step * crawlFactor;
-            break;
-            
-        case KCodeKeyDown:
-        case EKeyPageDown:
-            ymove = step * KJumpFactor;
-            break;
-
-        case KCodeKeyZoomIn:
-        case KCodeKeyZoomIn2:
-            Zoom( KZoomInRate );
-            break;
-
-        case KCodeKeyZoomOut:
-        case KCodeKeyZoomOut2:
-            Zoom( KZoomOutRate );
-            break;
-
-        case KCodeKeyCenter:
-            iModel->GoCenter();
-            iCursor = iModel->AbsoluteToScreen( TCoordinate( 0, 0 ) );
-            break;
-
-        case KCodeKeySelect:
-        case KCodeKeySelect2:
-            if ( iSelectionMode )
-                {
-                iView.HandleUserSelectionL( KErrNone );
-                redraw = EFalse;
-                }
-            break;
-
-        default:
-            response = EKeyWasNotConsumed;
-            redraw = EFalse;
-            break;
-        }
-
-    if ( xmove || ymove )
-        {
-        if ( iSelectionMode )
-            {
-            MoveCursor( xmove, ymove );
-            }
-        else
-            {
-            TCoordinate center = iModel->Center();
-            TCoordinate moveTo( 
-                center.Latitude() - iModel->ScreenToAbsolute( ymove ),
-                center.Longitude() + iModel->ScreenToAbsolute( xmove ) );
-            iModel->MoveTo( moveTo );
-            }
-        }
-
-    if ( redraw )
-        {
-        RenderL();
-        DrawDeferred();
-        }
-
-    return response;
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpMapControl::HandleModelUpdateL()
-    {
-    RenderL();
-    DrawDeferred();
-    
-    TInt ignored = iModel->NumIgnoredLandmarks();
-    if ( ignored )
-    	{
-        CAknInformationNote* note = new (ELeave) CAknInformationNote( ETrue );
-        _LIT( KMessageIgnoredLm, "One landmark\nhas no coordinates\nand can't be shown." );
-        _LIT( KMessageIgnoredLms, "%d landmarks\nhave no coordinates\nand can't be shown." );
-        if ( ignored == 1 )
-        	{
-        	note->ExecuteLD( KMessageIgnoredLm() );
-        	}
-        else
-        	{
-            TBuf<64> message;
-        	message.Format( KMessageIgnoredLms, ignored );
-        	note->ExecuteLD( message );
-        	}
-    	}
-    }
-    
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpMapControl::CreateScreenBufferL( const TSize& aSize )
-	{
-	CGraphicsDevice* screenDevice = iEikonEnv->ScreenDevice();
-
-	// create a bitmap to be used off-screen
-	CFbsBitmap* offScreenBitmap = new (ELeave) CFbsBitmap();
-	User::LeaveIfError( offScreenBitmap->Create( aSize, screenDevice->DisplayMode() ) );
-	CleanupStack::PushL( offScreenBitmap );
-
-	if ( iOffScreenBitmap )
-		{
-		delete iOffScreenBitmap;
-		}
-	iOffScreenBitmap = offScreenBitmap;
-
-	CleanupStack::Pop( offScreenBitmap );
-	}
-
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpMapControl::CreateFonts()
-	{
-    CGraphicsDevice* screenDevice = iEikonEnv->ScreenDevice();
-
-    const CFont* denseFont = iEikonEnv->DenseFont();
-    TFontSpec fs = denseFont->FontSpecInTwips();
-
-    fs.iHeight = KTextFontHeightInTwips;
-    screenDevice->GetNearestFontInTwips( iTextFont, fs );
-    
-    fs.iHeight = KItemFontHeightInTwips;
-    screenDevice->GetNearestFontInTwips( iItemFont, fs );
-	}
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpMapControl::DestroyFonts()
-	{
-	CGraphicsDevice* screenDevice = iEikonEnv->ScreenDevice();
-	
-    screenDevice->ReleaseFont( iItemFont );
-    iItemFont = NULL;
-    screenDevice->ReleaseFont( iTextFont );
-    iTextFont = NULL;
-	}
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpMapControl::Draw( const TRect& /*aRect*/ ) const
-    {
-    // Get the standard graphics context
-    CWindowGc& gc = SystemGc();
-
-    TRect rect = Rect();
-    TRect border( rect );
-    border.Shrink( BorderSize() );
-	
-    gc.Clear( TRect( rect.iTl.iX, rect.iTl.iY, rect.iBr.iX, border.iBr.iY ) );
-    gc.Clear( TRect( rect.iTl.iX, border.iBr.iY, rect.iBr.iX, rect.iBr.iY ) );
-    gc.Clear( TRect( rect.iTl.iX, border.iTl.iY, border.iTl.iX, border.iBr.iY ) );
-    gc.Clear( TRect( border.iBr.iX, border.iTl.iY, rect.iBr.iX, border.iBr.iY ) );
-
-    CMnrpMapModel::TGrid grid;
-    iModel->GetGrid( grid );
-    DrawGridText( gc, border, rect, iTextFont, grid );
-
-	if ( iOffScreenBitmap )
-		{
-		gc.BitBlt( border.iTl, iOffScreenBitmap );
-		}
-	else
-		{
-		gc.Clear();	
-		}
-			
-    if ( iSelectionMode )
-        {
-        gc.SetOrigin( border.iTl );
-        DrawCursor( gc );
-        }
-
-    // draw border
-    gc.SetPenColor( KRgbGray );
-    gc.SetPenSize( TSize( 1, 1 ) );
-    gc.SetOrigin( rect.iTl );
-    gc.DrawRect( border );
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpMapControl::DrawGridText( 
-    CWindowGc& aGc, 
-    const TRect& aInnerBox,
-    const TRect& aOuterBox,
-    const CFont* aFont,
-    CMnrpMapModel::TGrid& aGrid ) const
-    {
-    aGc.UseFont( aFont );
-    
-    TBuf<KMaxCoordStrSize> latTopStr, latBottomStr, lonLeftStr, lonRightStr;
-    TBuf<KMaxCoordStrSize> gridMajorStr, latStr, lonStr;
-    
-    MnrpUtils::CoordinateToString( iModel->Left(), lonLeftStr, ETrue );
-    MnrpUtils::CoordinateToString( iModel->Top(), latTopStr, ETrue );
-    MnrpUtils::CoordinateToString( iModel->Right(), lonRightStr, ETrue );
-    MnrpUtils::CoordinateToString( iModel->Bottom(), latBottomStr, ETrue );
-
-    if ( !iSelectionMode )
-        {
-        MnrpUtils::CoordinateToString( ( iModel->Right() + iModel->Left() ) / 2, lonStr, ETrue );
-        MnrpUtils::CoordinateToString( ( iModel->Top() + iModel->Bottom() ) / 2, latStr, ETrue );
-        }
-    else
-        {
-        MnrpUtils::CoordinateToString( iAbsoluteCursor.Longitude(), lonStr, ETrue );
-        MnrpUtils::CoordinateToString( iAbsoluteCursor.Latitude(), latStr, ETrue );
-        }
-
-    MnrpUtils::CoordinateToString( aGrid.iAbsoluteGridStep, gridMajorStr );
-
-    TRect lonBox( aInnerBox.iTl.iX, 0, aInnerBox.iBr.iX, aInnerBox.iBr.iY );
-    TRect latBox( 0, aInnerBox.iTl.iY, aInnerBox.iTl.iX, aInnerBox.iBr.iY );
-    TRect centerBox( aInnerBox.iTl.iX, aInnerBox.iBr.iY, aInnerBox.iBr.iX, aOuterBox.iBr.iY );
-
-    TInt textBaseLine = aFont->AscentInPixels() + KBorderSizeFactor / 2;
-    TInt vertTextBaseLine = aFont->AscentInPixels() + KBorderSizeFactor / 2;
-
-    aGc.SetPenColor( KGridTextColor );
-
-    aGc.DrawText( lonLeftStr, lonBox, textBaseLine, CGraphicsContext::ELeft );
-    aGc.DrawText( lonRightStr, lonBox, textBaseLine, CGraphicsContext::ERight );
-    aGc.DrawTextVertical( latTopStr, latBox, vertTextBaseLine, EFalse, CGraphicsContext::ELeft );
-    aGc.DrawTextVertical( latBottomStr, latBox, vertTextBaseLine, EFalse, CGraphicsContext::ERight );
-
-    aGc.DrawText( gridMajorStr, lonBox, textBaseLine, CGraphicsContext::ECenter );
-
-    aGc.SetPenColor( KOriginMarkColor );
-    aGc.DrawText( latStr, centerBox, textBaseLine, CGraphicsContext::ELeft );
-    aGc.DrawText( lonStr, centerBox, textBaseLine, CGraphicsContext::ERight );
-    
-    aGc.DiscardFont();
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpMapControl::DrawCursor( CWindowGc& aGc ) const
-    {
-    aGc.SetPenColor( KCursorColor );
-    aGc.SetPenSize( TSize( 1, 1 ) );
-    aGc.SetDrawMode( CGraphicsContext::EDrawModeNOTSCREEN );
-    
-    TRect cursorCircleRect( iCursor, TSize( 0, 0 ) );
-    cursorCircleRect.Grow( KCursorCircleRadius, KCursorCircleRadius );
-    aGc.DrawEllipse( cursorCircleRect );
-    
-    // upper vertical line
-    aGc.DrawLine( TPoint( iCursor.iX, cursorCircleRect.iTl.iY ), 
-                  TPoint( iCursor.iX, cursorCircleRect.iTl.iY - KCursorArrowSize ) );
-    // lower vertical line
-    aGc.DrawLine( TPoint( iCursor.iX, cursorCircleRect.iBr.iY ), 
-                  TPoint( iCursor.iX, cursorCircleRect.iBr.iY + KCursorArrowSize ) );
-
-    // left horiz line
-    aGc.DrawLine( TPoint( cursorCircleRect.iTl.iX, iCursor.iY ), 
-                  TPoint( cursorCircleRect.iTl.iX - KCursorArrowSize, iCursor.iY ) );
-    // right horiz line
-    aGc.DrawLine( TPoint( cursorCircleRect.iBr.iX, iCursor.iY ), 
-                  TPoint( cursorCircleRect.iBr.iX + KCursorArrowSize, iCursor.iY ) );
-
-    aGc.SetDrawMode( CGraphicsContext::EDrawModePEN );
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpMapControl::SizeChanged()
-    {
-    TRect rect( Rect() );
-    
-    DestroyFonts();
-    CreateFonts();
-    
-    rect.Shrink( BorderSize() );
-    iViewSize = rect.Size();
-    iModel->SetScreenSize( iViewSize );
-    TRAP_IGNORE( CreateScreenBufferL( rect.Size() ) );
-    TRAP_IGNORE( RenderL() );
-    DrawDeferred();
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpMapControl::HandleResourceChange( TInt aType )
-    {
-    CCoeControl::HandleResourceChange( aType );
-    if ( aType == KEikDynamicLayoutVariantSwitch )
-        {
-        SetFullScreen( iIsFullScreen );
-        }
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpMapControl::ToggleFullScreen()
-    {
-    SetFullScreen( !iIsFullScreen );
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpMapControl::SetFullScreen( TBool aFullScreen )
-    {
-    iIsFullScreen = aFullScreen;
-    if ( iIsFullScreen)
-        {
-        SetExtentToWholeScreen();
-        }
-    else
-        {
-        SetRect( iView.ClientRect() );
-        }
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpMapControl::MoveCursor( TInt aXmove, TInt aYmove )
-    {
-    iCursor += TPoint( aXmove, aYmove );
-
-    iCursor.iX = Max( 0, iCursor.iX );
-    iCursor.iX = Min( iViewSize.iWidth, iCursor.iX );
-
-    iCursor.iY = Max( 0, iCursor.iY );
-    iCursor.iY = Min( iViewSize.iHeight, iCursor.iY );
-
-    // verify cursor margin
-    TRect cursorMargin = CursorMargin();
-    
-    iAbsoluteCursor = iModel->ScreenToAbsolute( iCursor );
-    
-    TReal xcorrection = 0;
-    TReal ycorrection = 0;
-
-    if ( aXmove > 0 ) // moving right
-        {
-        TInt toMargin = iCursor.iX - cursorMargin.iBr.iX;
-        if ( toMargin > 0 ) // cursor went beyond cursor margin, move view
-            {
-            xcorrection = iModel->ScreenToAbsolute( toMargin );
-            }
-        }
-    else if ( aXmove < 0 ) // moving left
-        {
-        TInt toMargin = iCursor.iX - cursorMargin.iTl.iX;
-        if ( toMargin < 0 )
-            {
-            xcorrection = iModel->ScreenToAbsolute( toMargin );
-            }
-        }
-
-    if ( aYmove > 0 ) // moving down
-        {
-        TInt toMargin = iCursor.iY - cursorMargin.iBr.iY;
-        if ( toMargin > 0 )
-            {
-            ycorrection = -iModel->ScreenToAbsolute( toMargin );
-            }
-        }
-    else if ( aYmove < 0 ) // moving up
-        {
-        TInt toMargin = iCursor.iY - cursorMargin.iTl.iY;
-        if ( toMargin < 0 )
-            {
-            ycorrection = -iModel->ScreenToAbsolute( toMargin );
-            }
-        }
-    
-    TCoordinate center = iModel->Center();
-    TCoordinate moveTo( 
-        center.Latitude() + ycorrection,
-        center.Longitude() + xcorrection );
-    iModel->MoveTo( moveTo );
-
-    iCursor = iModel->AbsoluteToScreen( iAbsoluteCursor );
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-TRect CMnrpMapControl::CursorMargin()
-    {
-    TRect rect( iViewSize );
-    rect.Shrink( KCursorMarginSize, KCursorMarginSize );
-    return rect;
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpMapControl::Zoom( TReal aRate )
-    {
-    if ( iSelectionMode )
-        {
-        iModel->MoveTo( iAbsoluteCursor );
-        iModel->Zoom( aRate );
-        iCursor = iModel->AbsoluteToScreen( iAbsoluteCursor );
-        }
-    else
-        {
-        iModel->Zoom( aRate );
-        }
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-TSize CMnrpMapControl::BorderSize() const 
-    {
-	TSize size( 0, 0 );
-	if ( iTextFont )
-		{
-	    TInt fontHeight = iTextFont->HeightInPixels();
-	    
-	    size.iWidth = size.iHeight = TInt( fontHeight + KBorderSizeFactor );
-		}
-    return size;
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpMapControl::RenderL()
-    {
-    TRect rect = Rect();
-    TRect border( rect );
-    border.Shrink( BorderSize() );
-
-    if ( iOffScreenBitmap && iTextFont && iItemFont )
-        {
-        iModel->RenderL( *iOffScreenBitmap, TRect( border.Size() ), iTextFont, iItemFont );
-        }
-    }
--- a/locsrv_plat/map_image_conversion_plugin_api/tsrc/mapnavproviderrefapp/src/mnrpmapimageservice.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,243 +0,0 @@
-/*
-* Copyright (c) 2006-2007 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:  ÑMnrpMapImageService class implementation
-*
-*/
-
-
-#include <e32base.h>
-#include <e32math.h>
-#include <e32property.h>
-#include <eikenv.h>
-#include <gdi.h>
-
-#include <lbsposition.h>
-
-#include <epos_cposlandmark.h>
-#include <epos_poslandmarkserialization.h>
-
-#include <mnmapimage.h>
-#include <mnmapimageparams.h>
-#include <mnmapimageservicebase.h>
-
-#include "debug.h"
-#include "mnrpengine.h"
-#include "mnrpappuiback.h"
-#include "mnrpappserverback.h"
-#include "mnrpmapmodel.h"
-#include "mnrpmapimageservice.h"
-
-const TInt KTextFontHeightInTwips = 100;
-const TInt KItemFontHeightInTwips = 120;
-
-const TTimeIntervalMicroSeconds32 KProcessingDelay = 200 * 1000;
-
-// ======== LOCAL FUNCTIONS ========
-
-extern void CoordinateToString( TReal aCoord, TDes& aStr );
-
-// ======== MEMBER FUNCTIONS ========
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-CMnrpMapImageService* CMnrpMapImageService::NewL( CMnrpEngine& aEngine )
-    {
-    CMnrpMapImageService* self = new (ELeave) CMnrpMapImageService( aEngine );
-    CleanupStack::PushL( self );
-    self->ConstructL();
-    CleanupStack::Pop( self );
-    return self;
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-CMnrpMapImageService::CMnrpMapImageService( CMnrpEngine& aEngine )
-  : iEngine( aEngine )
-    {
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-CMnrpMapImageService::~CMnrpMapImageService()
-    {
-	if ( iProcessor )
-		{
-	    iProcessor->Cancel();
-	    delete iProcessor;
-		}
-    delete iModel;
-    DestroyFonts();
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-void CMnrpMapImageService::ConstructL()
-    {
-    BaseConstructL();
-
-    iEikon = CEikonEnv::Static();
-    CreateFonts();
-
-    iModel = CMnrpMapModel::NewL( iEngine );
-    iProcessor = CPeriodic::NewL( CActive::EPriorityIdle );
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-void CMnrpMapImageService::LeaveIfBusyL()
-    {
-    if ( iProcessor->IsActive() )
-        {
-        LOG("CMnRefProviderMapViewService::LeaveIfBusyL BUSY");
-        User::Leave( KErrInUse );
-        }
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-void CMnrpMapImageService::StartProcessingL()
-    {
-    iProcessor->Start( KProcessingDelay, KProcessingDelay,
-        TCallBack( CMnrpMapImageService::MapImageProcessingCallBack, this ) );
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-TInt CMnrpMapImageService::MapImageProcessingCallBack( TAny* aPtr )
-    {
-    CMnrpMapImageService* self =
-        static_cast<CMnrpMapImageService*> ( aPtr );
-
-    TRAP_IGNORE( self->HandleMapImageCompletedL() );
-    return EFalse;
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-void CMnrpMapImageService::HandleMapImageCompletedL()
-    {
-    iProcessor->Cancel();
-    TInt err = KErrNone;
-    TRAP( err, FinishProcessingL() );
-    if ( err )
-        {
-        CompleteRequest( err );
-        }
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-void CMnrpMapImageService::RenderL()
-    {
-    TMnMapImageParams& params = MapImageParams();
-
-    if ( params.Direction() != 0 ||
-         params.ImageType() != TMnMapImageParams::ETypeVectorMap )
-        {
-        User::Leave( KErrNotSupported );
-        }
-
-    CFbsBitmap& bitmap = TargetBitmap();
-
-    iModel->SetScreenSize( params.Size() );
-    iModel->UpdateModelL( *this );
-    iModel->RenderL( bitmap, TRect( params.Size() ), iTextFont, iItemFont );
-
-    // complete request
-    params.SetProjectionId(0);
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpMapImageService::CreateFonts()
-	{
-    CGraphicsDevice* screenDevice = iEikon->ScreenDevice();
-
-    const CFont* denseFont = iEikon->DenseFont();
-    TFontSpec fs = denseFont->FontSpecInTwips();
-
-    fs.iHeight = KTextFontHeightInTwips;
-    screenDevice->GetNearestFontInTwips( iTextFont, fs );
-
-    fs.iHeight = KItemFontHeightInTwips;
-    screenDevice->GetNearestFontInTwips( iItemFont, fs );
-	}
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpMapImageService::DestroyFonts()
-	{
-	CGraphicsDevice* screenDevice = iEikon->ScreenDevice();
-
-    screenDevice->ReleaseFont( iItemFont );
-    screenDevice->ReleaseFont( iTextFont );
-	}
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-void CMnrpMapImageService::FinishProcessingL()
-    {
-    LOG1("FinishProcessingL in, cursvc %d", iCurrentService);
-    TCoordinate coord;
-    switch ( iCurrentService )
-        {
-        case ERender:
-            {
-            RenderL();
-            }
-            break;
-
-        default:
-            User::Leave( KErrGeneral );
-        }
-
-    iCurrentService = ENone;
-    CompleteRendering();
-    LOG("FinishProcessingL out");
-    }
-
-// ---------------------------------------------------------------------------
-// From class CMnMapImageServiceBase
-// ---------------------------------------------------------------------------
-//
-void CMnrpMapImageService::HandleRenderingL()
-    {
-    LeaveIfBusyL();
-
-    iCurrentService = ERender;
-    StartProcessingL();
-    }
-
-// ---------------------------------------------------------------------------
-// From class CMnServiceBase
-// ---------------------------------------------------------------------------
-//
-void CMnrpMapImageService::DoCancel()
-    {
-    iProcessor->Cancel();
-    iCurrentService = ENone;
-    }
-
--- a/locsrv_plat/map_image_conversion_plugin_api/tsrc/mapnavproviderrefapp/src/mnrpmapmodel.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1251 +0,0 @@
-/*
-* Copyright (c) 2006-2007 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:  CMnrpMapModel class implementation
-*
-*/
-
-
-
-#include <coemain.h>
-#include <barsread.h>
-#include <bautils.h>
-
-#include <aknlists.h>
-#include <akniconutils.h>
-#include <aknwaitdialog.h>
-
-#include <fbs.h>
-#include <imageconversion.h>
-#include <icl/imagedata.h>
-
-#include <lbs.h>
-#include <lbsposition.h>
-#include <lbspositioninfo.h>
-
-#include <epos_cposlandmark.h>
-#include <epos_cposlandmarkdatabase.h>
-#include <epos_cposlandmarkcategory.h>
-#include <epos_cposlmcategorymanager.h>
-
-#include "debug.h"
-#include "mnrpengine.h"
-#include "mnrputils.h"
-#include "mnrpappserver.h"
-
-#include "mnrpmapviewservice.h"
-#ifdef RD_MAPNAV_BITMAP_ACCESS
-#include "mnrpmapimageservice.h"
-#endif
-#include "mnrpmapmodel.h"
-
-const TInt KUpdateInterval = 1 * 1000 * 1000; // 1 sec
-const TInt KUpdateTimeout = 10 * 1000 * 1000; // 10 sec
-
-const TInt KMaxX = 180;
-const TInt KMinX = -180;
-const TInt KMapWidth = KMaxX - KMinX;
-
-const TInt KMaxY = 90;
-const TInt KMinY = -90;
-const TInt KMapHeight = KMaxY - KMinY;
-
-const TReal KDegree = 1.0;
-const TReal KMinute = KDegree / 60.0;
-const TReal KSecond = KMinute / 60.0;
-const TReal KMilliSecond = KSecond / 1000.0;
-
-const TReal KMaxCell = 60 * KDegree;
-const TReal KMinScale = 10 * KMilliSecond; // 0.01 second / 1 px
-
-const TInt KBigCellsInView = 2;
-
-const TInt KCellDividers[] = { 6, 2, 5 };
-const TInt KNumCellDividers = 3;
-
-const TReal KDefaultRadius = 1; // 1 degree
-const TReal KRadiusBorderFactor = 1.1; // 110%
-
-const TReal KEarthEquator = 40075000;
-//const TReal KEarthRadius = 6371010;
-
-const TInt KLmTextOffset = 3;
-const TInt KLmTextShadowOffset = 1;
-
-const TInt KGridPenSize( 1 );
-
-// ============================ LOCAL FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-TPoint AbsoluteToImage( TRealPoint aAbsolute, TReal aImageToAbsoluteScale )
-    {
-    TInt s = ( KMapWidth / 2 + aAbsolute.iX ) / aImageToAbsoluteScale;
-    TInt t = ( KMapHeight / 2 - aAbsolute.iY ) / aImageToAbsoluteScale;
-
-    return TPoint( s , t );
-    }
-
-// ============================ MEMBER CLASSES' FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-//  TRealPoint implementation
-// -----------------------------------------------------------------------------
-//
-
-TRealPoint::TRealPoint()
-    {
-    TRealX nan;
-    nan.SetNaN();
-
-    iX = nan;
-    iY = nan;
-    }
-
-TRealPoint::TRealPoint( TReal aX, TReal aY )
-    : iX( aX ), iY( aY )
-    {
-    }
-
-TRealPoint::TRealPoint( TCoordinate aCoordinate )
-    : iX( aCoordinate.Longitude() ), iY( aCoordinate.Latitude() )
-    {
-    }
-
-TCoordinate TRealPoint::Coordinate()
-    {
-    return TCoordinate( iY, iX );
-    }
-
-TRealPoint TRealPoint::operator+(
-    const TRealPoint& aRight )
-    {
-    return TRealPoint( this->iX + aRight.iX, this->iY + aRight.iY );
-    }
-
-TRealPoint TRealPoint::operator-(
-    const TRealPoint& aRight )
-    {
-    return TRealPoint( this->iX - aRight.iX, this->iY - aRight.iY );
-    }
-
-TRealPoint TRealPoint::operator*( const TReal& aRight )
-    {
-    return TRealPoint( this->iX * aRight, this->iY * aRight );
-    }
-
-TRealPoint TRealPoint::operator/( const TReal& aRight )
-    {
-    return TRealPoint( this->iX / aRight, this->iY / aRight );
-    }
-
-void TRealPoint::Set( TReal aX, TReal aY )
-    {
-    iX = aX;
-    iY = aY;
-    }
-
-TBool TRealPoint::IsValid()
-    {
-    return ( !Math::IsNaN( iX ) && !Math::IsNaN( iY ) );
-    }
-
-// -----------------------------------------------------------------------------
-//  CDrawItem implementation
-// -----------------------------------------------------------------------------
-//
-CMnrpMapModel::CDrawItem* CMnrpMapModel::CDrawItem::NewLC(
-    const CPosLandmark& aLm )
-    {
-    CDrawItem* self = new (ELeave) CDrawItem;
-    CleanupStack::PushL( self );
-
-    TPtrC name;
-    aLm.GetLandmarkName( name );
-    self->iText = MnrpUtils::PrintableStringLC( name );
-    CleanupStack::Pop( self->iText );
-
-    TLocality loc;
-    if ( KErrNone == aLm.GetPosition( loc ) )
-        {
-        self->SetAbsolutePosition( loc );
-        }
-
-    TPtrC iconFile;
-    TInt iconIndex, maskIndex;
-    if ( KErrNone == aLm.GetIcon( iconFile, iconIndex, maskIndex ) )
-        {
-        AknIconUtils::CreateIconL( self->iBitmap, self->iMask, iconFile, iconIndex, maskIndex );
-        AknIconUtils::PreserveIconData( self->iBitmap );
-        }
-
-    return self;
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CMnrpMapModel::CDrawItem* CMnrpMapModel::CDrawItem::NewLC(
-    const CPosLandmark& aLm,
-    CPosLmCategoryManager& aCatman )
-    {
-    CDrawItem* self = NewLC( aLm );
-
-    if ( !self->iBitmap )
-        {
-        // try icon from category
-        RArray<TPosLmItemId> cats;
-        CleanupClosePushL( cats );
-        aLm.GetCategoriesL( cats );
-
-        if ( cats.Count() == 1 )
-            {
-            CPosLandmarkCategory* cat = aCatman.ReadCategoryLC( cats[0] );
-
-            TPtrC iconFile;
-            TInt iconIndex, maskIndex;
-            if ( KErrNone == cat->GetIcon( iconFile, iconIndex, maskIndex ) )
-                {
-                AknIconUtils::CreateIconL( self->iBitmap, self->iMask, iconFile, iconIndex, maskIndex );
-                AknIconUtils::PreserveIconData( self->iBitmap );
-                }
-
-            CleanupStack::PopAndDestroy( cat );
-            }
-        CleanupStack::PopAndDestroy( &cats );
-        }
-
-    return self;
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpMapModel::CDrawItem::SetAbsolutePosition( const TLocality& aLocality )
-    {
-    iAbsolutePosition = TRealPoint( aLocality.Longitude(), aLocality.Latitude() );
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CMnrpMapModel::CDrawItem::~CDrawItem()
-    {
-    if ( iBitmap )
-        {
-        AknIconUtils::DestroyIconData( iBitmap );
-        }
-    delete iBitmap;
-    delete iMask;
-    delete iText;
-    }
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CMnrpMapModel::CMnrpMapModel(
-    MMapModelObserver& aObserver,
-    CMnrpEngine& aEngine )
-    :
-    iObserver( &aObserver ), iEngine( aEngine )
-    {
-    iScale = 1;
-    iViewOrigin.Set( 0, 0 );
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CMnrpMapModel::CMnrpMapModel( CMnrpEngine& aEngine )
-    : iEngine( aEngine )
-    {
-    iScale = 1;
-    iViewOrigin.Set( 0, 0 );
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CMnrpMapModel::~CMnrpMapModel()
-    {
-    delete iPositionRequest;
-    iDrawItems.ResetAndDestroy();
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-EXPORT_C CMnrpMapModel* CMnrpMapModel::NewL(
-    MMapModelObserver& aObserver,
-    CMnrpEngine& aEngine )
-    {
-    CMnrpMapModel* self = new (ELeave) CMnrpMapModel( aObserver, aEngine );
-    CleanupStack::PushL( self );
-    self->ConstructL();
-    CleanupStack::Pop( self );
-    return self;
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-EXPORT_C CMnrpMapModel* CMnrpMapModel::NewL( CMnrpEngine& aEngine )
-    {
-    CMnrpMapModel* self = new (ELeave) CMnrpMapModel( aEngine );
-    CleanupStack::PushL( self );
-    self->ConstructL();
-    CleanupStack::Pop( self );
-    return self;
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpMapModel::ConstructL()
-    {
-    _LIT( KRequestorName, "MnRefProvider" );
-    iPositionRequest = CMnrpPositionRequest::NewL( KRequestorName, *this );
-
-    TPositionUpdateOptions options;
-    options.SetUpdateInterval( TTimeIntervalMicroSeconds( KUpdateInterval ) );
-    options.SetUpdateTimeOut( TTimeIntervalMicroSeconds( KUpdateTimeout ) );
-    iPositionRequest->SetOptionsL( options );
-
-    AddCitiesL();
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-TBool CMnrpMapModel::CheckDrawItemHasPositionL( CDrawItem& aItem, const CPosLandmark& aLandmark )
-	{
-    if ( !aItem.AbsolutePosition().IsValid() )
-        {
-        // try to find coordinate by address
-        CPosLandmark* poi = iEngine.AddressToCoordL( aLandmark );
-        if ( poi )
-        	{
-            TLocality pos;
-            poi->GetPosition( pos );
-            aItem.SetAbsolutePosition( pos );
-        	}
-    	delete poi;
-        }
-    
-    return aItem.AbsolutePosition().IsValid();
-	}
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-EXPORT_C void CMnrpMapModel::UpdateModelL( CMnrpMapViewService& aService )
-    {
-    ASSERT( iObserver );
-
-    iDrawItems.ResetAndDestroy();
-
-    iShowCurrentLocation =
-        aService.CurrentLocationOption() != CMnMapView::ECurrentLocationDisabled;
-
-    if ( iShowCurrentLocation )
-        {
-        iPositionRequest->FetchNewPosition();
-        }
-
-    // Add client-defined marks
-    
-    iNumIgnoredLandmarks = 0;
-    TRealPoint min, max;
-
-    // add non-linked landmarks
-    for ( TInt i = 0; i < aService.LandmarksToShow().Count(); i++)
-        {
-        const CPosLandmark* lm = aService.LandmarksToShow()[i];
-        
-        CDrawItem* item = CDrawItem::NewLC( *lm );
-        if ( CheckDrawItemHasPositionL( *item, *lm ) )
-        	{
-        	iDrawItems.AppendL( item );
-            CleanupStack::Pop( item );
-            AdjustBoundingBox( *item, min, max );
-        	}
-        else
-        	{
-            CleanupStack::PopAndDestroy( item );
-            iNumIgnoredLandmarks++;
-        	}
-        }
-
-    // add linked landmarks
-    for ( TInt db = 0; db < aService.LandmarksToShowDatabases().Count(); db++ )
-        {
-        const HBufC* uri = aService.LandmarksToShowDatabases()[db];
-
-        LOG1("MnRefProvider::LinkedLandmarks: database (%S)", uri );
-
-        CPosLandmarkDatabase* lmdb = CPosLandmarkDatabase::OpenL( *uri );
-        CleanupStack::PushL( lmdb );
-
-        if ( lmdb->IsInitializingNeeded() )
-            {
-            ExecuteAndDeleteLD( lmdb->InitializeL() );
-            }
-
-        CPosLmCategoryManager* catman = CPosLmCategoryManager::NewL( *lmdb );
-        CleanupStack::PushL( catman );
-
-        for ( TInt i = 0; i < aService.LinkedLandmarksToShow(db).Count(); i++)
-            {
-            TPosLmItemId id = aService.LinkedLandmarksToShow(db)[i];
-            LOG1("MnRefProvider::LinkedLandmarks: id (%d)", id );
-
-            CPosLandmark* lm = lmdb->ReadLandmarkLC( id );
-
-            CDrawItem* item = CDrawItem::NewLC( *lm, *catman );
-            if ( CheckDrawItemHasPositionL( *item, *lm ) )
-            	{
-            	iDrawItems.AppendL( item );
-                CleanupStack::Pop( item );
-                AdjustBoundingBox( *item, min, max );
-            	}
-            else
-            	{
-                CleanupStack::PopAndDestroy( item );
-                iNumIgnoredLandmarks++;
-            	}
-
-            CleanupStack::PopAndDestroy( lm );
-            }
-
-        CleanupStack::PopAndDestroy( catman );
-        CleanupStack::PopAndDestroy( lmdb );
-        }
-
-    // Add predefined places
-    AddCitiesL();
-
-    LOG4("MnRefProvider::BoundingBox: %f, %f, %f, %f", min.iX, min.iY, max.iX, max.iY );
-
-    // set origin
-    iUseCurrentLocationAsOrigin = EFalse;
-    if ( aService.IsAreaCentralPointSet() )
-        {
-        TCoordinate center;
-        aService.GetAreaCentralPoint( center );
-        iViewOrigin.Set( center.Longitude(), center.Latitude() );
-        }
-    else if ( !Math::IsNaN( max.iX ) ) // others are also valid then
-        {
-        iViewOrigin.Set( ( max.iX + min.iX ) / 2, ( max.iY + min.iY ) / 2 );
-        }
-    else if ( iShowCurrentLocation )
-        {
-        // get current location and use it as center point
-        // this implementation defers location acquiring
-        iUseCurrentLocationAsOrigin = ETrue;
-        // FetchCurrentLocation();
-        iViewOrigin.Set( 0, 0 );
-        }
-    else
-        {
-        iViewOrigin.Set( 0, 0 );
-        }
-
-    LOG2("MnRefProvider: viewOrigin (%f, %f)", iViewOrigin.iX, iViewOrigin.iY);
-
-    // set scale
-    TReal desiredScale = 0;
-    TReal radius = 0;
-
-    if ( !Math::IsNaN( aService.AreaRadius() ) )
-        {
-         // Radius setting is easy in this implementation
-         // because map is rectangular just convert meters to degrees
-        radius = Abs( aService.AreaRadius() ) / KEarthEquator * 360;
-        LOG1("MnRefProvider: user radius (%f)", radius );
-        }
-    else if ( !Math::IsNaN( max.iX ) ) // others are also valid then
-        {
-        // get radius from bounding box
-        radius = Max( Abs( max.iX - min.iX ), Abs( max.iY - min.iY ) );
-        LOG2("MnRefProvider: bounding radius (%f), with border (%f)", radius, radius * KRadiusBorderFactor );
-        radius *= KRadiusBorderFactor;
-        }
-    else
-        {
-        // default radius
-        }
-
-    if ( radius <= 0 )
-        {
-        radius = KDefaultRadius;
-        LOG1("MnRefProvider: default radius (%f)", radius );
-        }
-
-    desiredScale = radius / TReal( Max( iScreenSize.iWidth, iScreenSize.iHeight ) );
-
-    LOG3("MnRefProvider: desired scale (%f), min (%f), max(%f)",
-        desiredScale, KMinScale, MaxScale() );
-
-    iScale = Max( Min( desiredScale, MaxScale() ), KMinScale );
-    CheckBorders();
-
-    LOG1("MnRefProvider: scale (%f)", iScale );
-
-    iObserver->HandleModelUpdateL();
-    }
-
-
-#ifdef RD_MAPNAV_BITMAP_ACCESS
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-EXPORT_C void CMnrpMapModel::UpdateModelL( const CMnrpMapImageService& aService )
-    {
-    iDrawItems.ResetAndDestroy();
-
-    iShowCurrentLocation =
-        aService.ShowOptions() & CMnMapImage::EShowOptionCurrentLocation;
-
-    if ( iShowCurrentLocation )
-        {
-        iPositionRequest->FetchNewPosition();
-        }
-
-    if ( aService.ShowOptions() & CMnMapImage::EShowOptionLandmarks)
-        {
-
-        // Add user-defined marks
-        TRealPoint min, max;
-
-        // add default landmarks
-        CPosLandmarkDatabase* lmdb = CPosLandmarkDatabase::OpenL();
-        CleanupStack::PushL( lmdb );
-
-        if ( lmdb->IsInitializingNeeded() )
-            {
-            ExecuteAndDeleteLD( lmdb->InitializeL() );
-            }
-
-        CPosLmCategoryManager* catman = CPosLmCategoryManager::NewL( *lmdb );
-        CleanupStack::PushL( catman );
-
-        CPosLmItemIterator* iter = lmdb->LandmarkIteratorL();
-        CleanupStack::PushL( iter );
-
-        TInt count = iter->NumOfItemsL();
-        for ( TInt i = 0; i < count; i++)
-            {
-            TPosLmItemId id = iter->NextL();
-
-            CPosLandmark* lm = lmdb->ReadLandmarkLC( id );
-
-            CDrawItem* item = CDrawItem::NewLC( *lm, *catman );
-            if ( CheckDrawItemHasPositionL( *item, *lm ) )
-            	{
-            	iDrawItems.AppendL( item );
-                CleanupStack::Pop( item );
-                AdjustBoundingBox( *item, min, max );
-            	}
-            else
-            	{
-                CleanupStack::PopAndDestroy( item );
-            	}
-
-            CleanupStack::PopAndDestroy( lm );
-            }
-        CleanupStack::PopAndDestroy( iter );
-        CleanupStack::PopAndDestroy( catman );
-        CleanupStack::PopAndDestroy( lmdb );
-
-        LOG4("MnRefProvider::BoundingBox: %f, %f, %f, %f", min.iX, min.iY, max.iX, max.iY );
-        }
-
-    if ( aService.ShowOptions() & CMnMapImage::EShowOptionPois )
-        {
-        // Add predefined places
-        AddCitiesL();
-        }
-
-    TMnMapImageParams params = aService.MapImageParams();
-
-    UpdateModel( params );
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-EXPORT_C void CMnrpMapModel::UpdateModel( const TMnMapImageParams& aParams )
-    {
-    SetScreenSize( aParams.Size() );
-
-    TCoordinate center;
-    aParams.GetCenterPoint( center );
-    iViewOrigin.Set( center.Longitude(), center.Latitude() );
-
-    LOG2("MnRefProvider: viewOrigin (%f, %f)", iViewOrigin.iX, iViewOrigin.iY);
-
-    // set scale
-    TReal desiredScale = 0;
-    TReal32 width, height;
-    aParams.GetVisibleArea( width, height );
-    TReal radius = Max( width, height );
-
-    if ( radius <= 0 )
-        {
-        radius = KDefaultRadius;
-        LOG1("MnRefProvider: default radius (%f)", radius );
-        }
-
-    desiredScale = radius / TReal( Max( iScreenSize.iWidth, iScreenSize.iHeight ) );
-
-    LOG3("MnRefProvider: desired scale (%f), min (%f), max(%f)",
-        desiredScale, KMinScale, MaxScale() );
-
-    iScale = Max( Min( desiredScale, MaxScale() ), KMinScale );
-    CheckBorders();
-
-    LOG1("MnRefProvider: scale (%f)", iScale );
-    }
-#endif
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpMapModel::AddCitiesL()
-    {
-    TArray<CPosLandmark*> places = iEngine.KnownPlacesL();
-    for ( TInt i = 0; i < places.Count(); i++)
-        {
-        CPosLandmark* lm = places[i];
-        CDrawItem* item = CDrawItem::NewLC( *lm );
-        item->iOwnPoi = ETrue;
-        iDrawItems.AppendL( item );
-        CleanupStack::Pop( item );
-        }
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-EXPORT_C void CMnrpMapModel::GetGrid( CMnrpMapModel::TGrid& aGrid ) const
-    {
-    TReal angle = Min( Width(), Height() );
-
-    TReal minAngle = Min( iScreenSize.iWidth, iScreenSize.iHeight ) * KMinScale;
-
-    if ( angle > minAngle )
-        {
-        // 1. Find nice grid scale
-
-        TInt dividerIndex = 0;
-        TReal cellSize = KMaxCell;
-
-        while ( cellSize * KBigCellsInView > angle )
-            {
-            cellSize /= KCellDividers[dividerIndex];
-
-            if ( ++dividerIndex == KNumCellDividers )
-                {
-                dividerIndex = 0;
-                }
-            }
-
-        aGrid.iAbsoluteGridStep = cellSize;
-
-        // 2. Find closest grid point
-
-        TReal x = TInt( iViewOrigin.iX / cellSize ) * cellSize;
-        TReal y = TInt( iViewOrigin.iY / cellSize ) * cellSize;
-
-        aGrid.iAbsoluteReference = TRealPoint( x, y ).Coordinate();
-        }
-    else
-        {
-        aGrid.iAbsoluteReference = TCoordinate( 0, 0 );
-        aGrid.iAbsoluteGridStep = minAngle / KBigCellsInView;
-        }
-
-    // convert to screen coordinates
-    aGrid.iReference = AbsoluteToScreen( aGrid.iAbsoluteReference );
-    aGrid.iGridStep = AbsoluteToScreen( aGrid.iAbsoluteGridStep );
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-EXPORT_C void CMnrpMapModel::Zoom( TReal aZoomRate )
-    {
-    iScale *= aZoomRate;
-    CheckBorders();
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-EXPORT_C void CMnrpMapModel::GoCenter()
-    {
-    iViewOrigin.Set( 0, 0 );
-    CheckBorders();
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-EXPORT_C void CMnrpMapModel::MoveTo( TCoordinate aTarget )
-    {
-    iViewOrigin = aTarget;
-    CheckBorders();
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpMapModel::CheckBorders()
-    {
-    if ( Height() > KMapHeight || Width() > KMapWidth )
-        {
-        iScale = MaxScale();
-        }
-    if ( iScale < KMinScale )
-        {
-        iScale = KMinScale;
-        }
-    if ( Left() < KMinX )
-        {
-        iViewOrigin.iX = KMinX + Width() / 2;
-        }
-    if ( Right() > KMaxX )
-        {
-        iViewOrigin.iX = KMaxX - Width() / 2;
-        }
-    if ( Top() > KMaxY )
-        {
-        iViewOrigin.iY = KMaxY - Height() / 2;
-        }
-    if ( Bottom() < KMinY )
-        {
-        iViewOrigin.iY = KMinY + Height() / 2;
-        }
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-EXPORT_C TReal CMnrpMapModel::Left() const
-    {
-    return iViewOrigin.iX - Width() / 2;
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-EXPORT_C TReal CMnrpMapModel::Right() const
-    {
-    return iViewOrigin.iX + Width() / 2;
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-EXPORT_C TReal CMnrpMapModel::Top() const
-    {
-    return iViewOrigin.iY + Height() / 2;
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-EXPORT_C TReal CMnrpMapModel::Bottom() const
-    {
-    return iViewOrigin.iY - Height() / 2;
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-EXPORT_C TReal CMnrpMapModel::Width() const
-    {
-    return TReal( iScreenSize.iWidth ) * iScale;
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-EXPORT_C TReal CMnrpMapModel::Height() const
-    {
-    return TReal( iScreenSize.iHeight ) * iScale;
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-EXPORT_C TCoordinate CMnrpMapModel::Center() const
-    {
-    return TCoordinate( iViewOrigin.iY, iViewOrigin.iX );
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-TArray<CMnrpMapModel::CDrawItem*> CMnrpMapModel::Items() const
-    {
-    // adjust all items to screen coordinates
-    for ( TInt i = 0; i < iDrawItems.Count(); i++ )
-        {
-        iDrawItems[i]->iScreenPosition = AbsoluteToScreen( iDrawItems[i]->iAbsolutePosition );
-        }
-    return iDrawItems.Array();
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CMnrpMapModel::TCurrentLocation CMnrpMapModel::CurrentLocation() const
-    {
-    TCurrentLocation current;
-
-    TPosition pos;
-    iPosInfo.GetPosition( pos );
-
-    current.iAbsoluteLocation = pos;
-
-    if ( !Math::IsNaN( pos.Latitude() ) && !Math::IsNaN( pos.Longitude() ) )
-        {
-        current.iLocation = AbsoluteToScreen( current.iAbsoluteLocation );
-
-        // calculate error radius in degrees and pixels
-        if ( !Math::IsNaN( pos.HorizontalAccuracy() ) )
-            {
-            current.iAbsoluteErrorDegrees = ( pos.HorizontalAccuracy() / KEarthEquator ) * 360;
-            current.iErrorRadius = current.iAbsoluteErrorDegrees / iScale;
-            }
-        else
-            {
-            current.iErrorRadius = 0;
-            current.iAbsoluteErrorDegrees = 0;
-            }
-
-        current.iIsValid = ETrue;
-        }
-    else
-        {
-        current.iIsValid = EFalse;
-        }
-
-    return current;
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-EXPORT_C void CMnrpMapModel::SetScreenSize( TSize aScreenSize )
-    {
-    __ASSERT_DEBUG( aScreenSize.iWidth >= 1 && aScreenSize.iHeight >= 1,
-                    Panic( KErrGeneral ) );
-    iScreenSize = aScreenSize;
-    CheckBorders();
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-TReal CMnrpMapModel::MaxScale() const
-    {
-    TReal scaleByWidth = KMapWidth / TReal( iScreenSize.iWidth );
-    TReal scaleByHeight = KMapHeight / TReal( iScreenSize.iHeight );
-    return Min( scaleByWidth, scaleByHeight );
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-TPoint CMnrpMapModel::AbsoluteToScreen( TRealPoint aAbsolutePoint ) const
-    {
-    TRealPoint realScreen = ( aAbsolutePoint - TRealPoint( Left(), Bottom() ) ) / iScale;
-    return TPoint( realScreen.iX, iScreenSize.iHeight - realScreen.iY );
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-EXPORT_C TPoint CMnrpMapModel::AbsoluteToScreen( TCoordinate aAbsolutePoint ) const
-    {
-    TRealPoint real( aAbsolutePoint.Longitude(), aAbsolutePoint.Latitude() );
-    return AbsoluteToScreen( real );
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-TInt CMnrpMapModel::AbsoluteToScreen( TReal aDistance ) const
-    {
-    return aDistance / iScale;
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-EXPORT_C TCoordinate CMnrpMapModel::ScreenToAbsolute( TPoint aScreenPoint ) const
-    {
-    TReal xdiff = aScreenPoint.iX * iScale;
-    TReal ydiff = aScreenPoint.iY * iScale;
-    return TCoordinate( Top() - ydiff, Left() + xdiff );
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-EXPORT_C TReal CMnrpMapModel::ScreenToAbsolute( TInt aDistance ) const
-    {
-    return aDistance * iScale;
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpMapModel::AdjustBoundingBox(
-    CMnrpMapModel::CDrawItem& aItem,
-    TRealPoint& aMin,
-    TRealPoint& aMax )
-    {
-    // X
-    if ( !Math::IsNaN( aItem.iAbsolutePosition.iX ) )
-        {
-        if ( Math::IsNaN( aMin.iX ) || aItem.iAbsolutePosition.iX < aMin.iX )
-            {
-            aMin.iX = aItem.iAbsolutePosition.iX;
-            }
-        if ( Math::IsNaN( aMax.iX ) || aItem.iAbsolutePosition.iX > aMax.iX )
-            {
-            aMax.iX = aItem.iAbsolutePosition.iX;
-            }
-        }
-
-    // Y
-    if ( !Math::IsNaN( aItem.iAbsolutePosition.iY ) )
-        {
-        if ( Math::IsNaN( aMin.iY ) || aItem.iAbsolutePosition.iY < aMin.iY )
-            {
-            aMin.iY = aItem.iAbsolutePosition.iY;
-            }
-        if ( Math::IsNaN( aMax.iY ) || aItem.iAbsolutePosition.iY > aMax.iY )
-            {
-            aMax.iY = aItem.iAbsolutePosition.iY;
-            }
-        }
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpMapModel::HandlePositionRequestCompletedL( TInt aError )
-    {
-    if ( !aError )
-        {
-        iPositionRequest->GetPosition( iPosInfo );
-        if ( iObserver )
-            {
-            iObserver->HandleModelUpdateL();
-            }
-        }
-    if ( iShowCurrentLocation )
-        {
-        iPositionRequest->FetchNewPosition();
-        }
-    }
-
-// =====================================================
-// DRAWING METHODS
-// =====================================================
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-EXPORT_C void CMnrpMapModel::RenderL(
-    CFbsBitmap& aBitmap,
-    TRect aTargetRect,
-    CFont* aTextFont,
-    CFont* aItemFont ) const
-	{
-	// create an off-screen device and context
-	CFbsBitmapDevice* bitmapDevice = CFbsBitmapDevice::NewL( &aBitmap );
-	CleanupStack::PushL( bitmapDevice );
-
-	CFbsBitGc* gc = NULL;
-	User::LeaveIfError( bitmapDevice->CreateContext( gc ) );
-	CleanupStack::PushL( gc );
-
-    gc->UseFont( aTextFont );
-
-    // get data
-    TGrid grid;
-    GetGrid( grid );
-
-    TBool isBackground = EFalse;
-    // background
-    if ( !isBackground )
-        {
-        // no map background, clear map area
-        gc->Clear( aTargetRect );
-        }
-
-    gc->SetClippingRect( aTargetRect );
-    gc->SetOrigin( aTargetRect.iTl );
-
-    DrawGrid( *gc, aTargetRect.Size(), grid );
-
-    gc->DiscardFont(); // text font
-    gc->UseFont( aItemFont );
-
-    // draw items
-    DrawLandmarks( *gc, *aItemFont, aTargetRect.Size(), isBackground ); // invert shadow and text color
-    DrawCurrentLocation( *gc, aTargetRect.Size() );
-
-    // cleanup
-
-    gc->DiscardFont(); // item font
-
-	CleanupStack::PopAndDestroy( gc );
-	CleanupStack::PopAndDestroy( bitmapDevice );
-	}
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-EXPORT_C TInt CMnrpMapModel::NumIgnoredLandmarks()
-	{
-	return iNumIgnoredLandmarks;
-	}
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpMapModel::DrawGrid(
-    CFbsBitGc& aGc,
-    const TSize& aBoxSize,
-    CMnrpMapModel::TGrid& aGrid ) const
-    {
-    const TRgb KGridLineColor( 128, 128, 128 );
-
-    aGc.SetPenSize( TSize( KGridPenSize, KGridPenSize ) );
-    aGc.SetPenColor( KGridLineColor );
-
-    if ( aGrid.iGridStep > 0 )
-        {
-        // 1. Vertical lines
-        TInt x = aGrid.iReference.iX;
-        // find leftmost vertical line
-        while ( x > 0 )
-        	{
-        	x -= aGrid.iGridStep;
-        	}
-        x += aGrid.iGridStep;
-        // draw lines selecting different line colors for major and minor lines
-        while ( x < aBoxSize.iWidth )
-            {
-            DrawVerticalLine( aGc, x, aBoxSize );
-            x += aGrid.iGridStep;
-            }
-
-        // 2. Horizontal lines
-        TInt y = aGrid.iReference.iY;
-        // find topmost vertical line
-        while ( y > 0 )
-        	{
-        	y -= aGrid.iGridStep;
-        	}
-        y += aGrid.iGridStep;
-        // draw lines selecting different line colors for major and minor lines
-        while ( y < aBoxSize.iHeight )
-            {
-            DrawHorizontalLine( aGc, y, aBoxSize );
-            y += aGrid.iGridStep;
-            }
-        }
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpMapModel::DrawVerticalLine( CFbsBitGc& aGc, TInt aX, TSize aBoxSize ) const
-    {
-    aGc.DrawLine( TPoint( aX, 0 ), TPoint( aX, aBoxSize.iHeight ) );
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpMapModel::DrawHorizontalLine( CFbsBitGc& aGc, TInt aY, TSize aBoxSize ) const
-    {
-    aGc.DrawLine( TPoint( 0, aY ), TPoint( aBoxSize.iWidth, aY ) );
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpMapModel::DrawLandmarks(
-    CFbsBitGc& aGc,
-    CFont& aFont,
-    const TSize& aBoxSize,
-    TBool aSwitchColorAndShadow ) const
-    {
-    const TSize KItemMarkSize( 3, 3 ); // pixels
-    const TSize KItemIconSize( 20, 20 ); // pixels
-
-    const TRgb KPoiColor( 0, 0, 192 );
-    const TRgb KPoiTextColor( 0, 0, 0 );
-    const TRgb KPoiTextShadowColor( 224, 224, 224 );
-    const TRgb KLmColor( 255, 0, 0 );
-    const TRgb KLmTextColor( 255, 0, 0 );
-    const TRgb KLmTextShadowColor( 224, 224, 224 );
-
-    TArray<CMnrpMapModel::CDrawItem*> items = Items();
-
-    RArray<TRect> textBoxes;
-
-    for ( TInt i = 0; i < items.Count(); i++ )
-        {
-        const TPoint& pos = items[i]->Position();
-        if ( pos.iX >= 0 && pos.iX < aBoxSize.iWidth &&
-             pos.iY >= 0 && pos.iY < aBoxSize.iHeight )
-            {
-            CFbsBitmap* icon = items[i]->Bitmap();
-            CFbsBitmap* mask = items[i]->Mask();
-
-            if ( icon && mask )
-                {
-                AknIconUtils::SetSize( icon, KItemIconSize );
-
-                TRect iconBox( pos, KItemIconSize );
-                iconBox.Move( -iconBox.Width() / 2, -iconBox.Height() / 2 );
-
-                aGc.DrawBitmapMasked(
-                    iconBox,
-                    icon,
-                    KItemIconSize,
-                    mask,
-                    EFalse );
-                }
-            else
-                {
-                if ( items[i]->IsPoi() )
-                    {
-                    aGc.SetPenColor( KPoiColor );
-                    }
-                else
-                    {
-                    aGc.SetPenColor( KLmColor );
-                    }
-
-                TRect markBox( pos, KItemMarkSize );
-                markBox.Move( -markBox.Width() / 2, -markBox.Height() / 2 );
-                aGc.SetPenSize( KItemMarkSize );
-                aGc.Plot( pos );
-                }
-
-            if ( items[i]->Text().Length() )
-                {
-                TPoint textPos( pos );
-                textPos.iX += KLmTextOffset;
-
-                TSize textSize( aFont.TextWidthInPixels( items[i]->Text() ), aFont.HeightInPixels() );
-                TRect textBox( textPos, textSize );
-
-                // verify this textbox does not intersect any previous ones
-                TBool overlaps = EFalse;
-                for ( TInt b = 0; b < textBoxes.Count(); b++ )
-                    {
-                    if ( textBox.Intersects( textBoxes[b] ) )
-                        {
-                        overlaps = ETrue;
-                        break;
-                        }
-                    }
-
-                if ( !overlaps )
-                    {
-                    textBoxes.Append( textBox );
-
-                    aGc.SetPenSize( TSize( 1, 1 ) );
-
-                    TRgb textColor, textShadowColor;
-
-	                if ( items[i]->IsPoi() )
-	                    {
-	                    textColor = KPoiTextColor;
-						textShadowColor = KPoiTextShadowColor;
-	                    }
-	                else
-	                    {
-	                    textColor = KLmTextColor;
-						textShadowColor = KLmTextShadowColor;
-	                    }
-
-                    // text shadow
-                    TPoint shadowPos( textPos + TPoint( KLmTextShadowOffset, KLmTextShadowOffset ) );
-                    aGc.SetPenColor( aSwitchColorAndShadow ? textColor : textShadowColor );
-                    aGc.DrawText( items[i]->Text(), shadowPos );
-
-                    // text itself
-                    aGc.SetPenColor( aSwitchColorAndShadow ? textShadowColor : textColor );
-                    aGc.DrawText( items[i]->Text(), textPos );
-                    }
-                }
-            }
-        }
-    textBoxes.Close();
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpMapModel::DrawCurrentLocation(
-    CFbsBitGc& aGc,
-    const TSize& aBoxSize ) const
-    {
-    const TSize KPositionPenSize( 20, 20 );
-    const TSize KPositionErrorPenSize( 1, 1 );
-    const TRgb KPositionColor( 255, 255, 0 );
-
-    // draw current location
-    CMnrpMapModel::TCurrentLocation location = CurrentLocation();
-
-    if ( location.iIsValid )
-        {
-        TPoint& pos = location.iLocation;
-
-        if ( pos.iX >= 0 && pos.iX < aBoxSize.iWidth &&
-             pos.iY >= 0 && pos.iY < aBoxSize.iHeight )
-            {
-            if ( location.iErrorRadius )
-                {
-                TRect circleBox( pos.iX, pos.iY, pos.iX, pos.iY );
-                circleBox.Grow( location.iErrorRadius, location.iErrorRadius );
-
-                aGc.SetPenSize( KPositionErrorPenSize );
-                aGc.SetBrushStyle( CGraphicsContext::EVerticalHatchBrush );
-                aGc.SetBrushColor( KPositionColor );
-                aGc.DrawEllipse( circleBox );
-                }
-
-            aGc.SetPenColor( KPositionColor );
-            aGc.SetPenSize( KPositionPenSize );
-            aGc.Plot( pos );
-            }
-        }
-    }
-
--- a/locsrv_plat/map_image_conversion_plugin_api/tsrc/mapnavproviderrefapp/src/mnrpmapview.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,249 +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:  CMnrpMapView class implementation
-*
-*/
-
-
-#include <e32base.h>
-#include <lbsposition.h>
-
-#include <eikmenup.h>
-#include <eikbtgpc.h>
-#include <avkon.rsg>
-
-#include <mnrefprovider.rsg>
-#include "mnrp.hrh"
-
-#include "debug.h"
-
-#include "mnrputils.h"
-#include "mnrpengine.h"
-
-#include "mnrpappui.h"
-#include "mnrpmapview.h"
-#include "mnrpmapcontrol.h"
-#include "mnrpmapviewservice.h"
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CMnrpMapView::CMnrpMapView( CMnrpEngine& aEngine ) 
-: iEngine( aEngine )
-    {
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CMnrpMapView::~CMnrpMapView()
-    {
-    TRAP_IGNORE( HandleUserSelectionL( KErrCancel ) );
-    delete iControl;
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CMnrpMapView* CMnrpMapView::NewL( TBool aChained, CMnrpEngine& aEngine )
-    {
-    CMnrpMapView* self = new (ELeave) CMnrpMapView( aEngine );
-    CleanupStack::PushL( self );
-    self->ConstructL( aChained );
-    CleanupStack::Pop( self );
-    return self;
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpMapView::ConstructL( TBool aChained )
-    {
-    iChained = aChained;
-    if ( aChained )
-        {
-        BaseConstructL( R_MNREFPROVIDER_MAP_VIEW_CHAINED );
-        }
-    else
-        {
-        BaseConstructL( R_MNREFPROVIDER_MAP_VIEW );
-        }
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpMapView::SetMapModeL( CMnrpMapViewService& aService )
-    {
-    iSelectionCallback = NULL;
-    iMapViewService = &aService;
-/*
-    if ( iChained )
-        {
-        Cba()->SetCommandSetL( R_AVKON_SOFTKEYS_OPTIONS_BACK );
-        }
-    else
-        {
-        Cba()->SetCommandSetL( R_AVKON_SOFTKEYS_OPTIONS_EXIT );
-        }
-*/        
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpMapView::SetSelectionModeL( 
-    CMnrpMapViewService& aService,  
-    MMapSelectionCallback& aCallback )
-    {
-    iMapViewService = &aService;
-    iSelectionCallback = &aCallback;
-    Cba()->SetCommandSetL( R_AVKON_SOFTKEYS_OPTIONS_CANCEL );
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpMapView::StopSelection()
-    {
-    iSelectionCallback = NULL;
-    iMapViewService = NULL;
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpMapView::HandleUserSelectionL( TInt aError )
-    {
-    if ( iSelectionCallback && iControl )
-        {
-        if ( !aError )
-            {
-            iSelectionCallback->HandleSelectionL( iControl->CurrentLocation() );
-            }
-        else
-            {
-            iSelectionCallback->HandleSelectionErrorL( aError );
-            }
-        iSelectionCallback = NULL;            
-        }
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-TUid CMnrpMapView::Id() const
-    {
-    return TUid::Uid( EMnrpMapViewId );
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpMapView::HandleCommandL( TInt aCommand )
-    {
-    switch ( aCommand )
-        {
-        case EMnrpCommandFullScreen:
-            if ( iControl ) 
-                {
-                iControl->ToggleFullScreen();
-                }
-            break;
-
-        case EMnrpCommandSelect:
-            HandleUserSelectionL( KErrNone );
-            break;
-
-        case EEikCmdExit:
-        case EAknSoftkeyBack:
-        case EAknSoftkeyExit:
-            HandleUserSelectionL( KErrCancel );
-            AppUi()->HandleCommandL( aCommand );
-            break;
-
-        default:
-            AppUi()->HandleCommandL( aCommand );
-            break;
-        }
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpMapView::DynInitMenuPaneL( TInt aResourceId, CEikMenuPane *aMenuPane )
-    {
-    if ( aResourceId == R_MNREFPROVIDER_MAP_VIEW_MENU )
-        {
-        TBool isSelectionMode = iSelectionCallback != NULL;
-        aMenuPane->SetItemDimmed( EMnrpCommandSelect, !isSelectionMode );
-        }
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpMapView::DoActivateL(
-    const TVwsViewId& /*aPrevViewId*/,
-    TUid /* aCustomMessageId */,
-    const TDesC8& /* aCustomMessage */)
-    {
-    if ( !iControl )
-        {
-        iControl = CMnrpMapControl::NewL( *this, ClientRect(), iEngine );
-        iControl->SetMopParent( this );
-        }
-
-    iControl->SetRect( ClientRect() );
-    if ( iMapViewService )
-        {
-        iControl->UpdateModelL( *iMapViewService );
-        }
-    iControl->SetSelectionModeL( ( iSelectionCallback == NULL ) ? EFalse : ETrue );
-
-    // Enable receiving of keyboard events.
-    CMnrpAppUi* ui = ( CMnrpAppUi* ) AppUi();
-    ui->AddToStackL( *this, iControl );
-
-    if ( iSelectionCallback )
-        {
-        ui->SetNaviPaneTitleL( iMapViewService->SelectionRequestText() );
-        }
-    else
-        {
-        _LIT( KMapView, "MapView" );
-	    ui->SetNaviPaneTitleL( KMapView );
-        }
-
-    // Make view visible.
-    iControl->MakeVisible( ETrue );
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpMapView::DoDeactivate()
-    {
-    if ( iControl )
-        {
-        // Hide view.
-        iControl->MakeVisible( EFalse );
-
-        // Disable receiving keyboard events.
-        AppUi()->RemoveFromStack( iControl );
-        }
-    }
-
--- a/locsrv_plat/map_image_conversion_plugin_api/tsrc/mapnavproviderrefapp/src/mnrpmapviewservice.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,245 +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:  CMnrpMapViewService class implementation
-*
-*/
-
-
-#include <e32base.h>
-#include <eikenv.h>
-
-#include <lbsposition.h>
-
-#include <epos_cposlandmark.h>
-#include <epos_cposlandmarkdatabase.h>
-
-#include "debug.h"
-#include <mnmapviewservicebase.h>
-
-#include "mnrpappui.h"
-#include "mnrpmapview.h"
-#include "mnrpengine.h"
-#include "mnrpdocument.h"
-#include "mnrpappserver.h"
-
-#include "mnrpmapviewservice.h"
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-CMnrpMapViewService* CMnrpMapViewService::NewL()
-    {
-    CMnrpMapViewService* self = new (ELeave) CMnrpMapViewService();
-    CleanupStack::PushL( self );
-    self->ConstructL();
-    CleanupStack::Pop( self );
-    return self;
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-CMnrpMapViewService::CMnrpMapViewService()
-    {
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-CMnrpMapViewService::~CMnrpMapViewService()
-    {
-    if ( iSelecting )
-        {
-        DoCancel();
-        CompleteRequest( KErrCancel );
-        }
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-void CMnrpMapViewService::ConstructL()
-    {
-    BaseConstructL();
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-CMnrpAppUi* CMnrpMapViewService::AppUi()
-    {
-    CMnrpAppServer* server = ( CMnrpAppServer* ) Server();
-    if ( server )
-        {
-        return server->AppUi();
-        }
-    return NULL;
-    }
-
-// ---------------------------------------------------------------------------
-// From class CMnMapViewServiceBase
-// ---------------------------------------------------------------------------
-//
-void CMnrpMapViewService::HandleShowMapL()
-    {
-    LOG("MnRefProvider::HandleShowMapL in");
-
-    /** This implementation cannot show map if selection is active */
-    if ( iSelecting )
-        {
-        User::Leave( KErrInUse );
-        }
-
-    if ( AppUi() )
-        {
-        AppUi()->ShowMapL( *this );
-        }
-
-    LOG("MnRefProvider::HandleShowMapL out");
-    }
-
-// ---------------------------------------------------------------------------
-//  From class CMnMapViewServiceBase
-//
-//  This callback differs from HandleShowMapL in a way that central point
-//  setting is ignored and current location is used instead as central point.
-//
-//  The implementation is the example of how to reject unsupported requests 
-// ---------------------------------------------------------------------------
-//
-void CMnrpMapViewService::HandleShowCurrentLocationL()
-    {
-    User::Leave( KErrNotSupported );
-    }
-
-// ---------------------------------------------------------------------------
-//  From class CMnMapViewServiceBase
-// ---------------------------------------------------------------------------
-//
-void CMnrpMapViewService::HandleSelectFromMapL()
-    {
-    LOG("MnRefProvider::HandleSelectFromMapL in");
-
-    /** Only one selection must be active */
-    if ( iSelecting )
-        {
-        User::Leave( KErrInUse );
-        }
-
-    if ( AppUi() )
-        {
-        iSelecting = ETrue;
-        AppUi()->StartSelectionL( *this, *this );
-        }
-
-    LOG("MnRefProvider::HandleSelectFromMapL out");
-    }
-
-// ---------------------------------------------------------------------------
-//  From class CMnServiceBase
-// ---------------------------------------------------------------------------
-//
-void CMnrpMapViewService::DoCancel()
-    {
-    if ( iSelecting )
-        {
-        iSelecting = EFalse;
-        StopSelection();
-        }
-    }
-
-// ---------------------------------------------------------------------------
-//  From class MMapSelectionCallback
-// ---------------------------------------------------------------------------
-//
-void CMnrpMapViewService::HandleSelectionErrorL( TInt aError )
-    {
-    __ASSERT_DEBUG( iSelecting, Panic( KErrGeneral ) );
-
-    iSelecting = EFalse;
-    // selection view dismissed
-    CompleteRequest( aError );
-    }
-
-// ---------------------------------------------------------------------------
-//  From class MMapSelectionCallback
-// ---------------------------------------------------------------------------
-//
-void CMnrpMapViewService::HandleSelectionL( const TCoordinate& aSelection )
-    {
-    __ASSERT_DEBUG( iSelecting, Panic( KErrGeneral ) );
-
-    iSelecting = EFalse;
-    TInt err = KErrNone;
-    TRAP( err, CompleteSelectionL( aSelection ) );
-    if ( err )
-        {
-        CompleteRequest( err );
-        }
-    StopSelection();
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-void CMnrpMapViewService::CompleteSelectionL( const TCoordinate& aSelection )
-    {
-    TLocality loc( aSelection, 0 );
-    CPosLandmark* lm = CPosLandmark::NewLC();
-    lm->SetPositionL( loc );
-
-    // send landmark to client
-    CompleteSelectionRequestL( *lm );
-
-    CleanupStack::PopAndDestroy( lm );
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-void CMnrpMapViewService::StopSelection()
-    {
-    if ( AppUi() )
-        {
-        AppUi()->StopSelection();
-        }
-    }
-    
-// ---------------------------------------------------------------------------
-//  From class MMapSelectionCallback
-// ---------------------------------------------------------------------------
-//
-void CMnrpMapViewService::HandleSelectionL( TInt aLandmarkIndex )
-    {
-    __ASSERT_DEBUG( iSelecting, Panic( KErrGeneral ) );
-
-    iSelecting = EFalse;
-    CompleteSelectionRequest( aLandmarkIndex );
-    StopSelection();
-    }
-    
-// ---------------------------------------------------------------------------
-//  From class MMapSelectionCallback
-// ---------------------------------------------------------------------------
-//
-void CMnrpMapViewService::HandleSelectionL( TPosLmItemId aLandmarkId, TInt aDbIndex )
-    {
-    __ASSERT_DEBUG( iSelecting, Panic( KErrGeneral ) );
-
-    iSelecting = EFalse;
-    CompleteSelectionRequest( aLandmarkId, aDbIndex );
-    StopSelection();
-    }
--- a/locsrv_plat/map_image_conversion_plugin_api/tsrc/mapnavproviderrefapp/src/mnrpnavicontrol.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,209 +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:  CMnrpNaviControl class implementation
-*
-*/
-
-
-#include <e32base.h>
-#include <coemain.h>
-#include <aknlists.h>
-#include <barsread.h>
-
-#include <aknlists.h>
-
-#include "mnrpnavimodel.h"
-#include "mnrpnaviview.h"
-#include "mnrpnavicontrol.h"
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CMnrpNaviControl::CMnrpNaviControl( CMnrpNaviView& aView )
- :  iView( aView )
-    { 
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CMnrpNaviControl::~CMnrpNaviControl()
-    {
-    delete iListBox;
-    delete iModel;
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CMnrpNaviControl* CMnrpNaviControl::NewL( 
-    CMnrpNaviView& aView, 
-    const TRect& aRect,
-    CMnrpEngine& aEngine )
-    {
-    CMnrpNaviControl* self = new (ELeave) CMnrpNaviControl( aView );
-    CleanupStack::PushL( self );
-    self->ConstructL( aRect, aEngine );
-    CleanupStack::Pop( self );
-    return self;
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpNaviControl::ConstructL( const TRect& aRect, CMnrpEngine& aEngine )
-    {
-    // Create a window for this application view
-    CreateWindowL();
-    CreateListBoxL();
-    
-    // Set the windows size
-    SetRect( aRect );
-    
-    iModel = CMnrpNaviModel::NewL( *this, aEngine );
-
-    // Activate the window, which makes it ready to be drawn
-    ActivateL();
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpNaviControl::UpdateModelL( CPosLandmark& aDestination )
-    {
-    iModel->SetDestinationL( aDestination );
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpNaviControl::HandleModelUpdateL()
-    {
-    TArray< CMnrpNaviModel::CListItem* > items = iModel->ListItemsL();
-    
-    const TInt KGranularity = 8;
-    CDesCArraySeg* array = new (ELeave) CDesCArraySeg( KGranularity );
-    CleanupStack::PushL( array );
-    
-    _LIT( KItemFormat, "%S\t%S\t\t" );
-    for ( TInt i = 0; i < items.Count(); i++ )
-        {
-        CMnrpNaviModel::CListItem* item = items[i];
-
-        const TInt KNumTabsAndOther = 10;
-        HBufC* text = HBufC::NewLC(
-            item->Header().Length() + item->Value().Length() + KNumTabsAndOther);
-
-        text->Des().Format( KItemFormat, &(item->Header()), &(item->Value()) );
-        
-        array->AppendL( *text );
-        CleanupStack::PopAndDestroy( text );
-        }
-        
-    CleanupStack::Pop( array );
-
-    CTextListBoxModel* model = iListBox->Model();
-    model->SetItemTextArray( array );
-    model->SetOwnershipType( ELbmOwnsItemArray );
-    iListBox->HandleItemAdditionL();
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-TInt CMnrpNaviControl::CountComponentControls() const 
-    { 
-    return 1; 
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CCoeControl* CMnrpNaviControl::ComponentControl(TInt aIndex) const
-    {
-    return (aIndex == 0) ? iListBox : NULL;
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-TKeyResponse CMnrpNaviControl::OfferKeyEventL(
-    const TKeyEvent& aKeyEvent, TEventCode aType)
-    {
-    TKeyResponse response = EKeyWasNotConsumed;
-
-    switch (aKeyEvent.iCode)
-        {
-        case EKeyUpArrow:
-        case EKeyDownArrow:
-            // Scrolling the listbox. Forward to iListBox.
-            response = iListBox->OfferKeyEventL(aKeyEvent, aType);
-            break;
-
-        case EKeyLeftArrow:
-        case EKeyRightArrow:
-            // Eat these to disable switching views
-            response = EKeyWasConsumed;
-            break;
-
-        case EKeyDevice3:
-            response = EKeyWasConsumed;
-            break;
-
-        default:
-            // menu keys should be handled
-            break;
-        }
-
-    return response;
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpNaviControl::CreateListBoxL()
-    {
-    // Create a control to display a list of descriptors
-    iListBox = new (ELeave) CAknSingleHeadingStyleListBox();
-    iListBox->SetContainerWindowL( *this );
-    iListBox->ConstructL(this, CEikListBox::EViewerFlag );
-
-    // Create scrollbars
-    CEikScrollBarFrame* scrollBar = iListBox->CreateScrollBarFrameL();
-    scrollBar->SetScrollBarVisibilityL(
-                CEikScrollBarFrame::EOff, CEikScrollBarFrame::EAuto);
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpNaviControl::SizeChanged()
-    {
-    iListBox->SetRect( Rect() );
-    iListBox->DrawDeferred();
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpNaviControl::HandleResourceChange( TInt aType )
-    {
-    CCoeControl::HandleResourceChange( aType );
-    if ( aType == KEikDynamicLayoutVariantSwitch )
-        {
-        SetRect( iView.ClientRect() );
-        }
-    }
--- a/locsrv_plat/map_image_conversion_plugin_api/tsrc/mapnavproviderrefapp/src/mnrpnavigationservice.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,90 +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:  CMnrpNavigationService class implementation
-*
-*/
-
-
-#include <e32base.h>
-#include <eikenv.h>
-
-#include <lbsposition.h>
-
-#include <epos_cposlandmark.h>
-
-#include "debug.h"
-#include <mnnavigationservicebase.h>
-
-#include "mnrpappui.h"
-#include "mnrpnavimodel.h"
-#include "mnrpnaviview.h"
-#include "mnrpappserver.h"
-#include "mnrpnavigationservice.h"
-
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-CMnrpNavigationService* CMnrpNavigationService::NewL()
-    {
-    CMnrpNavigationService* self = new (ELeave) CMnrpNavigationService();
-    CleanupStack::PushL( self );
-    self->ConstructL();
-    CleanupStack::Pop( self );
-    return self;
-    }
-    
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-CMnrpNavigationService::CMnrpNavigationService()
-    {
-    }
-    
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-CMnrpNavigationService::~CMnrpNavigationService()
-    {
-    }
-
-// ---------------------------------------------------------------------------
-// ---------------------------------------------------------------------------
-//
-void CMnrpNavigationService::ConstructL()
-    {
-    BaseConstructL();
-    }
-
-// ---------------------------------------------------------------------------
-// From class CMnNavigationServiceBase
-// ---------------------------------------------------------------------------
-//
-void CMnrpNavigationService::HandleNavigateToL(
-    const CPosLandmark& aLandmark)
-    {
-    CMnrpAppServer* server = ( CMnrpAppServer* ) Server();
-    CMnrpAppUi* ui = server->AppUi();
-    ui->ShowNavigationL( aLandmark );
-    }
-        
-// ---------------------------------------------------------------------------
-// From class CMnServiceBase
-// ---------------------------------------------------------------------------
-//
-void CMnrpNavigationService::DoCancel()
-    {
-    }
--- a/locsrv_plat/map_image_conversion_plugin_api/tsrc/mapnavproviderrefapp/src/mnrpnavimodel.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,241 +0,0 @@
-/*
-* Copyright (c) 2006-2007 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:  CMnrpNaviModel class implementation
-*
-*/
-
-
-#include <coemain.h>
-#include <aknlists.h>
-#include <barsread.h>
-
-#include <lbs.h>
-#include <lbsposition.h>
-#include <lbspositioninfo.h>
-
-#include <epos_cposlandmark.h>
-
-#include "mnrputils.h"
-#include "mnrpengine.h"
-#include "mnrpnavimodel.h"
-
-const TInt KUpdateInterval = 1 * 1000 * 1000; // 1 sec
-const TInt KUpdateTimeout = 10 * 1000 * 1000; // 10 sec
-
-_LIT( KNotDefined, "<n/a>" );
-_LIT( KDestination, "destination" );
-_LIT( KPosition, "position" );
-_LIT( KDistance, "distance" );
-_LIT( KBearing, "bearing" );
-_LIT( KDestinationLat, "dest.lat." );
-_LIT( KDestinationLon, "dest.lon." );
-_LIT( KPositionLat, "pos.lat." );
-_LIT( KPositionLon, "pos.lon." );
-_LIT( KSpeed, "speed" );
-_LIT( KHeading, "heading" );
-_LIT( KMagHeading, "m.heading" );
-_LIT( KCourse, "course" );
-_LIT( KMagCourse, "m.course" );
-
-// ========================== MEMBER CLASS' FUNCTIONS ==========================
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CMnrpNaviModel::CListItem* CMnrpNaviModel::CListItem::NewL( 
-    const TDesC& aItemHeader, 
-    const TDesC& aItemValue )
-    {
-    CListItem* self = new (ELeave) CListItem;
-    CleanupStack::PushL( self );
-    self->iHeader = aItemHeader.AllocL();
-    self->iValue = aItemValue.AllocL();
-    CleanupStack::Pop( self );
-    return self;
-    }
-    
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CMnrpNaviModel::CListItem::~CListItem()
-    {
-    delete iHeader;
-    delete iValue;
-    }
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CMnrpNaviModel::CMnrpNaviModel( MNaviModelObserver& aObserver, CMnrpEngine& aEngine )
-    : iEngine( aEngine ), iObserver( aObserver )
-    { 
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CMnrpNaviModel::~CMnrpNaviModel()
-    {
-    delete iPositionRequest;
-    delete iDestination;
-    iListItems.ResetAndDestroy();
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CMnrpNaviModel* CMnrpNaviModel::NewL( MNaviModelObserver& aObserver, CMnrpEngine& aEngine  )
-    {
-    CMnrpNaviModel* self = new (ELeave) CMnrpNaviModel( aObserver, aEngine );
-    CleanupStack::PushL( self );
-    self->ConstructL();
-    CleanupStack::Pop( self );
-    return self;
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpNaviModel::ConstructL()
-    {
-    _LIT( KRequestorName, "MnRefProvider" );
-    iPositionRequest = CMnrpPositionRequest::NewL( KRequestorName, *this );
-    
-    TPositionUpdateOptions options;
-    options.SetUpdateInterval( TTimeIntervalMicroSeconds( KUpdateInterval ) );
-    options.SetUpdateTimeOut( TTimeIntervalMicroSeconds( KUpdateTimeout ) );
-    iPositionRequest->SetOptionsL( options );
-    
-    iPositionRequest->FetchNewPosition();
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpNaviModel::SetDestinationL( const CPosLandmark& aNewDestination )
-    {
-    delete iDestination;
-    iDestination = NULL;
-    iDestination = CPosLandmark::NewL( aNewDestination );
-    
-    iObserver.HandleModelUpdateL();
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-TArray<CMnrpNaviModel::CListItem*> CMnrpNaviModel::ListItemsL()
-    {
-    iListItems.ResetAndDestroy();
-    
-    TBuf<64> buf;
-    TPosition position;
-    TLocality destination;
-
-    iPosInfo.GetPosition( position );
-
-    if ( !iDestination || iDestination->GetPosition( destination ) )
-        {
-        iListItems.AppendL( CListItem::NewL( KDestination, KNotDefined ) );
-        }
-    else
-        {
-        TPtrC name;
-        iDestination->GetLandmarkName( name );
-        HBufC* printableName = MnrpUtils::PrintableStringLC( name );
-        iListItems.AppendL( CListItem::NewL( KDestination, *printableName ) );
-        CleanupStack::PopAndDestroy( printableName );
-
-        TBool validPosition = ( !Math::IsNaN( position.Latitude() ) && 
-                                !Math::IsNaN( position.Longitude() ) );
-
-        if ( validPosition )
-            {
-            TReal32 distance, bearing;
-            if ( position.Distance( destination, distance ) == KErrNone )
-                {
-                MnrpUtils::DistanceToString( distance, buf );
-                iListItems.AppendL( CListItem::NewL( KDistance, buf ) );
-                }
-            else
-                {
-                iListItems.AppendL( CListItem::NewL( KDistance, KNotDefined ) );
-                }
-                
-            if ( position.BearingTo( destination, bearing ) == KErrNone )
-                {
-                MnrpUtils::AngleToString( bearing, buf );
-                iListItems.AppendL( CListItem::NewL( KBearing, buf ) );
-                }
-            else
-                {
-                iListItems.AppendL( CListItem::NewL( KBearing, KNotDefined ) );
-                }
-
-            MnrpUtils::SpeedToString( iPositionRequest->Speed(), buf );
-            iListItems.AppendL( CListItem::NewL( KSpeed, buf ) );
-
-            MnrpUtils::AngleToString( iPositionRequest->Course(), buf );
-            iListItems.AppendL( CListItem::NewL( KCourse, buf ) );
-
-            MnrpUtils::AngleToString( iPositionRequest->Heading(), buf );
-            iListItems.AppendL( CListItem::NewL( KHeading, buf ) );
-
-            MnrpUtils::CoordinateToString( position.Latitude(), buf, ETrue, ETrue );
-            iListItems.AppendL( CListItem::NewL( KPositionLat, buf ) );
-
-            MnrpUtils::CoordinateToString( position.Longitude(), buf, ETrue, ETrue );
-            iListItems.AppendL( CListItem::NewL( KPositionLon, buf ) );
-            }
-        else
-            {
-            iListItems.AppendL( CListItem::NewL( KPosition, KNotDefined ) );
-            }
-
-        MnrpUtils::CoordinateToString( destination.Latitude(), buf, ETrue, ETrue );
-        iListItems.AppendL( CListItem::NewL( KDestinationLat, buf ) );
-
-        MnrpUtils::CoordinateToString( destination.Longitude(), buf, ETrue, ETrue );
-        iListItems.AppendL( CListItem::NewL( KDestinationLon, buf ) );
-
-        if ( validPosition )
-            {
-            MnrpUtils::AngleToString( iPositionRequest->MagneticCourse(), buf );
-            iListItems.AppendL( CListItem::NewL( KMagCourse, buf ) );
-
-            MnrpUtils::AngleToString( iPositionRequest->MagneticHeading(), buf );
-            iListItems.AppendL( CListItem::NewL( KMagHeading, buf ) );
-            }
-        }
-   
-    return iListItems.Array();
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpNaviModel::HandlePositionRequestCompletedL( TInt aError )
-    {
-    if ( !aError )
-        {
-        iPositionRequest->GetPosition( iPosInfo );
-        TPosition position;
-        iPosInfo.GetPosition( position );
-
-        iObserver.HandleModelUpdateL();
-        }
-    iPositionRequest->FetchNewPosition();
-    }
--- a/locsrv_plat/map_image_conversion_plugin_api/tsrc/mapnavproviderrefapp/src/mnrpnaviview.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,160 +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:  CMnrpNaviView class implementation
-*
-*/
-
-
-#include <e32base.h>
-#include <lbsposition.h>
-#include <epos_cposlandmark.h>
-
-#include <mnrefprovider.rsg>
-#include "mnrp.hrh"
-
-#include "debug.h"
-#include "mnrputils.h"
-#include "mnrpengine.h"
-
-#include "mnrpappui.h"
-#include "mnrpnavicontrol.h"
-
-#include "mnrpnaviview.h"
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CMnrpNaviView::CMnrpNaviView( CMnrpEngine& aEngine )
- : iEngine( aEngine )
-    {
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CMnrpNaviView::~CMnrpNaviView()
-    {
-    delete iDestination;
-    delete iControl;
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CMnrpNaviView* CMnrpNaviView::NewL( TBool aChained, CMnrpEngine& aEngine )
-    {
-    CMnrpNaviView* self = new (ELeave) CMnrpNaviView( aEngine );
-    CleanupStack::PushL( self );
-    self->ConstructL( aChained );
-    CleanupStack::Pop( self );
-    return self;
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpNaviView::ConstructL( TBool aChained )
-    {
-    if ( aChained )
-        {
-        BaseConstructL( R_MNREFPROVIDER_NAVI_VIEW_CHAINED );
-        }
-    else
-        {
-        BaseConstructL( R_MNREFPROVIDER_NAVI_VIEW );
-        }
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpNaviView::SetDestinationL( const CPosLandmark& aNewDestination )
-    {
-    delete iDestination;
-    iDestination = NULL;
-    iDestination = CPosLandmark::NewL( aNewDestination );
-    if ( iControl )
-        {
-        iControl->UpdateModelL( *iDestination );
-        }
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-TUid CMnrpNaviView::Id() const
-    {
-    return TUid::Uid( EMnrpNavigationViewId );
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpNaviView::HandleCommandL( TInt aCommand )
-    {
-    switch ( aCommand )
-        {
-        default:
-            AppUi()->HandleCommandL( aCommand );
-            break;
-        }
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpNaviView::DoActivateL(
-    const TVwsViewId& /*aPrevViewId*/,
-    TUid /* aCustomMessageId */,
-    const TDesC8& /* aCustomMessage */)
-    {
-    if ( !iControl )
-        {
-        iControl = CMnrpNaviControl::NewL( *this, ClientRect(), iEngine );
-        iControl->SetMopParent( this );
-        }
-
-    if ( iDestination )
-        {
-        iControl->UpdateModelL( *iDestination );
-        }
-
-    // Enable receiving of keyboard events.
-    CMnrpAppUi* ui = ( CMnrpAppUi* ) AppUi();
-    ui->AddToStackL( *this, iControl );
-
-    _LIT( KNavigation, "Navigation" );
-    ui->SetNaviPaneTitleL( KNavigation );
-
-    // Make view visible.
-    iControl->MakeVisible( ETrue );
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpNaviView::DoDeactivate()
-    {
-    if ( iControl )
-        {
-        // Hide view.
-        iControl->MakeVisible( EFalse );
-
-        // Disable receiving keyboard events.
-        AppUi()->RemoveFromStack( iControl );
-        }
-    }
-
--- a/locsrv_plat/map_image_conversion_plugin_api/tsrc/mapnavproviderrefapp/src/mnrppositionrequest.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,272 +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:  CMnrpPositionRequest class implementation
-*
-*/
-
-
-#include <aknwaitdialog.h>
-#include <coemain.h>
-#include <aknnotewrappers.h>
-
-#include <lbspositioninfo.h>
-
-#include "mnrppositionrequest.h"
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-CMnrpPositionRequest::CMnrpPositionRequest(
-    MMnrpPositionObserver& aObserver )
-    : 
-    CActive( CActive::EPriorityStandard ), 
-    iObserver( aObserver ),
-    iState( EIdle )
-    {
-    TRealX nan;
-    nan.SetNaN();
-    iSpeed = iHeading = iCourse = iMagneticHeading = iMagneticCourse = nan;
-    
-    CActiveScheduler::Add( this );
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpPositionRequest::ConstructL( const TDesC& aRequestorName )
-    {
-    const TInt KBufSize = 8192;
-    iGenericPosition = HPositionGenericInfo::NewL( KBufSize );
-    
-    // Connect to the location server
-    User::LeaveIfError( iLocationServer.Connect() );
-
-    // Open the default positioner
-    User::LeaveIfError( iPositioner.Open( iLocationServer ) );
-
-    // Set this application as location requestor
-    User::LeaveIfError( iPositioner.SetRequestor(
-        CRequestor::ERequestorService,
-        CRequestor::EFormatApplication,
-        aRequestorName ) );
-
-    // Set default options
-    TPositionUpdateOptions updateOptions;
-
-    const TInt K30Seconds = 30000000;
-    TTimeIntervalMicroSeconds timeOut( K30Seconds );
-
-    updateOptions.SetUpdateTimeOut( timeOut );
-    SetOptionsL( updateOptions );
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-EXPORT_C CMnrpPositionRequest* CMnrpPositionRequest::NewL(
-    const TDesC& aAppName, 
-    MMnrpPositionObserver& aObserver )
-    {
-    CMnrpPositionRequest* self =
-        new (ELeave) CMnrpPositionRequest( aObserver );
-    CleanupStack::PushL( self );
-    self->ConstructL( aAppName );
-    CleanupStack::Pop( self );
-    return self;
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-EXPORT_C CMnrpPositionRequest::~CMnrpPositionRequest()
-    {
-    Cancel();
-    iPositioner.Close();
-    iLocationServer.Close();
-    delete iGenericPosition;
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-EXPORT_C void CMnrpPositionRequest::FetchNewPosition( TBool aLastKnownLocationAllowed )
-    {
-    Cancel();
-    // Request location
-    iState = EAcquiringDefaultLocation;
-    iLastKnownLocationAllowed = aLastKnownLocationAllowed;
-    ExecuteNextStep();
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-EXPORT_C void CMnrpPositionRequest::GetPosition( TPositionInfo& aPositionInfo )
-    {
-    aPositionInfo = iPositionInfo;
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-EXPORT_C TReal32 CMnrpPositionRequest::Speed() 
-    { 
-    return iSpeed;
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-EXPORT_C TReal32 CMnrpPositionRequest::Heading() 
-    { 
-    return iHeading; 
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-EXPORT_C TReal32 CMnrpPositionRequest::MagneticHeading() 
-    { 
-    return iMagneticHeading; 
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-EXPORT_C TReal32 CMnrpPositionRequest::Course() 
-    {
-    return iCourse;
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-EXPORT_C TReal32 CMnrpPositionRequest::MagneticCourse()
-    { 
-    return iMagneticCourse;
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpPositionRequest::DoCancel()
-    {
-    // Cancel location request
-    if (iState == EAcquiringDefaultLocation)
-        {
-        iPositioner.CancelRequest( EPositionerNotifyPositionUpdate );
-        }
-    else if (iState == EAcquiringLastKnownLocation)
-        {
-        iPositioner.CancelRequest( EPositionerGetLastKnownPosition );
-        }
-    iState = EIdle;
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpPositionRequest::RunL()
-    {
-    if ( iStatus != KErrNone &&
-         iState == EAcquiringDefaultLocation && 
-         iLastKnownLocationAllowed )
-        {
-        // Fetching current location failed. Try last known location.
-        iState = EAcquiringLastKnownLocation;
-        ExecuteNextStep();
-        }
-    else
-        {
-        // Operation finished, notify observer
-        iState = EIdle;
-        SaveContainer( *iGenericPosition );
-        iObserver.HandlePositionRequestCompletedL( iStatus.Int() );
-        }
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-TInt CMnrpPositionRequest::RunError(TInt /*aError*/)
-    {
-    // Ignore possible errors.
-    return KErrNone;
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpPositionRequest::ExecuteNextStep()
-    {
-    iStatus = KRequestPending;
-
-    switch (iState)
-        {
-        case EAcquiringDefaultLocation:
-            InitContainer( *iGenericPosition );
-            iPositioner.NotifyPositionUpdate( *iGenericPosition, iStatus);
-            break;
-        case EAcquiringLastKnownLocation:
-            iPositioner.GetLastKnownPosition( iPositionInfo, iStatus );
-            break;
-        default:    
-            // this case should never happen, see RunL
-            return;
-        }
-
-    SetActive();
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-EXPORT_C void CMnrpPositionRequest::SetOptionsL( const TPositionUpdateOptionsBase& aOptions )
-    {
-    User::LeaveIfError( iPositioner.SetUpdateOptions( aOptions ) );
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpPositionRequest::InitContainer( HPositionGenericInfo& aGenericInfo )
-    {
-    aGenericInfo.ClearPositionData();
-    
-    aGenericInfo.SetRequestedField( EPositionFieldHorizontalSpeed );
-    aGenericInfo.SetRequestedField( EPositionFieldTrueCourse );
-    aGenericInfo.SetRequestedField( EPositionFieldMagneticCourse );
-    aGenericInfo.SetRequestedField( EPositionFieldHeading );
-    aGenericInfo.SetRequestedField( EPositionFieldMagneticHeading );
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-void CMnrpPositionRequest::SaveContainer( const HPositionGenericInfo& aGenericInfo )
-    {
-    TRealX nan;
-    nan.SetNaN();
-    iSpeed = iHeading = iCourse = iMagneticHeading = iMagneticCourse = nan;
-    
-    aGenericInfo.GetValue( EPositionFieldHorizontalSpeed, iSpeed );
-    aGenericInfo.GetValue( EPositionFieldTrueCourse, iCourse );
-    aGenericInfo.GetValue( EPositionFieldMagneticCourse, iMagneticCourse );
-    aGenericInfo.GetValue( EPositionFieldHeading, iHeading );
-    aGenericInfo.GetValue( EPositionFieldMagneticHeading, iMagneticHeading );
-    
-    iPositionInfo = *iGenericPosition;
-    }
--- a/locsrv_plat/map_image_conversion_plugin_api/tsrc/mapnavproviderrefapp/src/mnrputils.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,256 +0,0 @@
-/*
-* Copyright (c) 2006-2007 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:  MnrpUtils class implementation
-*
-*/
-
-
-#include <e32base.h>
-#include <e32math.h>
-#include <lbsposition.h>
-
-#include "mnrputils.h"
-
-_LIT( KNan, "<n/a>" );
-_LIT( KNeg, "<neg>" );
-_LIT( KOutOfBounds, "<inv>" );
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-EXPORT_C void MnrpUtils::CoordinateToString(
-    TReal aCoord,
-    TDes& aStr,
-    TBool aFull,
-    TBool aMillis )
-    {
-    const TChar KDegreeMark = 0xB0;
-    const TChar KMinuteMark = 0x27;
-    const TChar KSecondMark = 0x22;
-    const TChar KMilliSecondMark = 0x2E;
-    const TChar KMinus = '-';
-    const TChar KPlus = '+';
-
-    _LIT( KCoordFormatFull, "%c%d%c%02d%c%02d%c" );
-    _LIT( KCoordFormatPartMseconds, "%c%03d" );
-
-    if ( Math::IsNaN( aCoord ) )
-        {
-        aStr.Copy( KNan );
-        }
-    else if ( Abs( aCoord ) > 360 )
-        {
-        aStr.Copy( KOutOfBounds );
-        }
-    else
-        {
-        TBool negative = aCoord < 0;
-        aCoord = Abs( aCoord );
-
-        TInt degrees = TInt( aCoord );
-        aCoord = ( aCoord - degrees ) * 60;
-        TInt minutes = TInt( aCoord );
-        aCoord = ( aCoord - minutes ) * 60;
-        TInt seconds = TInt( aCoord );
-        aCoord = ( aCoord - seconds ) * 100;
-        TInt mseconds = TInt( aCoord );
-
-        TChar sign = negative ? KMinus : KPlus;
-
-        if ( aFull )
-            {
-            aStr.Format( KCoordFormatFull,
-                            TUint( sign ), degrees, TUint( KDegreeMark ),
-                            minutes, TUint( KMinuteMark ),
-                            seconds, TUint( KSecondMark ) );
-            if ( aMillis )
-                {
-                aStr.AppendFormat( KCoordFormatPartMseconds, TUint( KMilliSecondMark ), mseconds );
-                }
-            }
-        else
-            {
-            aStr.Zero();
-            if ( degrees )
-                {
-                aStr.AppendNum( degrees );
-                aStr.Append( KDegreeMark );
-                }
-            if ( minutes )
-                {
-                aStr.AppendNum( minutes );
-                aStr.Append( KMinuteMark );
-                }
-            if ( seconds )
-                {
-                aStr.AppendNum( seconds );
-                aStr.Append( KSecondMark );
-                }
-            if ( mseconds && aMillis )
-                {
-                if ( !seconds )
-                    {
-                    aStr.AppendNum( 0 );
-                    aStr.Append( KSecondMark );
-                    }
-                aStr.AppendFormat( KCoordFormatPartMseconds, TUint( KMilliSecondMark ), mseconds );
-                }
-
-            if ( !aStr.Length() )
-                {
-                aStr.AppendNum( degrees );
-                aStr.Append( KDegreeMark );
-                }
-            }
-        }
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-EXPORT_C void MnrpUtils::DistanceToString( TReal aDistance, TDes& aStr )
-    {
-    _LIT( KSmall, "< 1 m" );
-    _LIT( KMeters, "%d m" );
-    _LIT( KKiloMeters, "%.1f Km" );
-    _LIT( KThousandsKiloMeters, "%.1f tKm" );
-
-    const TInt KMeter = 1;
-    const TInt KKilometer = KMeter * 1000;
-    const TInt KThousandKilometer = KKilometer * 1000;
-
-    if ( Math::IsNaN( aDistance ) )
-        {
-        aStr.Copy( KNan );
-        }
-    else if ( aDistance < 0 )
-        {
-        aStr.Copy( KNeg );
-        }
-    else if ( aDistance < KMeter )
-        {
-        aStr.Copy( KSmall );
-        }
-    else if ( aDistance < KKilometer )
-        {
-        aStr.Format( KMeters, TInt( aDistance ) );
-        }
-    else if ( aDistance < KThousandKilometer )
-        {
-        aStr.Format( KKiloMeters, aDistance / KKilometer );
-        }
-    else
-        {
-        aStr.Format( KThousandsKiloMeters, aDistance / KThousandKilometer );
-        }
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-EXPORT_C void MnrpUtils::SpeedToString( TReal aSpeed, TDes& aStr )
-    {
-    _LIT( KPerSecond, "/s" );
-
-    if ( Math::IsNaN( aSpeed ) )
-        {
-        aStr.Copy( KNan );
-        }
-    else if ( aSpeed < 0 )
-        {
-        aStr.Copy( KNeg );
-        }
-    else
-        {
-        DistanceToString( aSpeed, aStr );
-        aStr.Append( KPerSecond );
-        }
-    }
-    
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-EXPORT_C void MnrpUtils::AngleToString( TReal aAngle, TDes& aStr )
-    {
-    const TChar KMinus = '-';
-    const TChar KPlus = '+';
-    _LIT( KAngleFormat, "%S%c%.1f\xB0 /  %.1f\xB0" );
-    
-    _LIT( KNorth, "N" );
-    _LIT( KSouth, "S" );
-    _LIT( KWest, "W" );
-    _LIT( KEast, "E" );
-
-    TPtrC side;
-    TReal angle;
-
-    if ( Math::IsNaN( aAngle ) )
-        {
-        aStr.Copy( KNan );
-        }
-    else if ( aAngle > 360 )
-        {
-        aStr.Copy( KOutOfBounds );
-        }
-    else
-        {
-        if ( aAngle > 315 )
-            {
-            side.Set( KNorth );
-            angle = aAngle - 360;
-            }
-        else if ( aAngle > 225 )
-            {
-            side.Set( KWest );
-            angle = aAngle - 270;
-            }
-        else if ( aAngle > 135 )
-            {
-            side.Set( KSouth );
-            angle = aAngle - 180;
-            }
-        else if ( aAngle > 45 )
-            {
-            side.Set( KEast );
-            angle = aAngle - 90;
-            }
-        else // aAngle <= 45
-            {
-            side.Set( KNorth );
-            angle = aAngle;
-            }
-
-        TChar sign = ( angle >= 0 ) ? KPlus : KMinus;
-        aStr.Format( KAngleFormat, &side, TUint( sign ), Abs( angle ), aAngle );
-        }
-    }
-
-// -----------------------------------------------------------------------------
-// -----------------------------------------------------------------------------
-//
-EXPORT_C HBufC* MnrpUtils::PrintableStringLC( const TDesC& aStr )
-    {
-    HBufC* buf = aStr.AllocLC();
-    TPtr string( buf->Des() );
-    for ( TInt i = 0; i < string.Length(); i++ )
-        {
-        if ( !TChar( string[i] ).IsPrint() )
-            {
-            string[i] = ' ';
-            }
-        }
-    return buf;
-    }
--- a/locsrv_plat/map_image_conversion_plugin_api/tsrc/src/testmapimgconpluginapi.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,134 +0,0 @@
-/*
-* Copyright (c) 2007 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:  Ctestmapimgconpluginapi class
-*
-*/
-
-
-
-// INCLUDE FILES
-#include <Stiftestinterface.h>
-#include "testmapimgconpluginapi.h"
-#include <SettingServerClient.h>
-
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// Ctestmapimgconpluginapi::Ctestmapimgconpluginapi
-// C++ default constructor can NOT contain any code, that
-// might leave.
-// -----------------------------------------------------------------------------
-//
-Ctestmapimgconpluginapi::Ctestmapimgconpluginapi( 
-    CTestModuleIf& aTestModuleIf ):
-        CScriptBase( aTestModuleIf )
-    {
-    }
-
-// -----------------------------------------------------------------------------
-// Ctestmapimgconpluginapi::ConstructL
-// Symbian 2nd phase constructor can leave.
-// -----------------------------------------------------------------------------
-//
-void Ctestmapimgconpluginapi::ConstructL()
-    {
-    //Read logger settings to check whether test case name is to be
-    //appended to log file name.
-    RSettingServer settingServer;
-    TInt ret = settingServer.Connect();
-    if(ret != KErrNone)
-        {
-        User::Leave(ret);
-        }
-    // Struct to StifLogger settigs.
-    TLoggerSettings loggerSettings; 
-    // Parse StifLogger defaults from STIF initialization file.
-    ret = settingServer.GetLoggerSettings(loggerSettings);
-    if(ret != KErrNone)
-        {
-        User::Leave(ret);
-        } 
-    // Close Setting server session
-    settingServer.Close();
-
-    TFileName logFileName;
-    
-    if(loggerSettings.iAddTestCaseTitle)
-        {
-        TName title;
-        TestModuleIf().GetTestCaseTitleL(title);
-        logFileName.Format(KtestmapimgconpluginapiLogFileWithTitle, &title);
-        }
-    else
-        {
-        logFileName.Copy(KtestmapimgconpluginapiLogFile);
-        }
-
-    iLog = CStifLogger::NewL( KtestmapimgconpluginapiLogPath, 
-                          logFileName,
-                          CStifLogger::ETxt,
-                          CStifLogger::EFile,
-                          EFalse );
-
-    }
-
-// -----------------------------------------------------------------------------
-// Ctestmapimgconpluginapi::NewL
-// Two-phased constructor.
-// -----------------------------------------------------------------------------
-//
-Ctestmapimgconpluginapi* Ctestmapimgconpluginapi::NewL( 
-    CTestModuleIf& aTestModuleIf )
-    {
-    Ctestmapimgconpluginapi* self = new (ELeave) Ctestmapimgconpluginapi( aTestModuleIf );
-
-    CleanupStack::PushL( self );
-    self->ConstructL();
-    CleanupStack::Pop();
-
-    return self;
-
-    }
-
-// Destructor
-Ctestmapimgconpluginapi::~Ctestmapimgconpluginapi()
-    { 
-
-    // Delete resources allocated from test methods
-    Delete();
-
-    // Delete logger
-    delete iLog; 
-
-    }
-    
-
-// ========================== OTHER EXPORTED FUNCTIONS =========================
-
-// -----------------------------------------------------------------------------
-// LibEntryL is a polymorphic Dll entry point.
-// Returns: CScriptBase: New CScriptBase derived object
-// -----------------------------------------------------------------------------
-//
-EXPORT_C CScriptBase* LibEntryL( 
-    CTestModuleIf& aTestModuleIf ) // Backpointer to STIF Test Framework
-    {
-
-    return ( CScriptBase* ) Ctestmapimgconpluginapi::NewL( aTestModuleIf );
-
-    }
-
-
-//  End of File
--- a/locsrv_plat/map_image_conversion_plugin_api/tsrc/src/testmapimgconpluginapiBlocks.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,124 +0,0 @@
-/*
-* Copyright (c) 2007 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:  test case implementations.
-*
-*/
-
-
-
-// [INCLUDE FILES] - do not remove
-#include <e32svr.h>
-#include <StifParser.h>
-#include <Stiftestinterface.h>
-#include <LbsPosition.h>
-#include "testmapimgconpluginapi.h"
-#include "testprovidercoordconverter.h"
-
-const TInt KTestProviderUid = 0x03133038;
-
-// ============================ MEMBER FUNCTIONS ===============================
-
-// -----------------------------------------------------------------------------
-// Ctestmapimgconpluginapi::Delete
-// Delete here all resources allocated and opened from test methods. 
-// Called from destructor. 
-// -----------------------------------------------------------------------------
-//
-void Ctestmapimgconpluginapi::Delete() 
-    {
-
-    }
-
-// -----------------------------------------------------------------------------
-// Ctestmapimgconpluginapi::RunMethodL
-// Run specified method. Contains also table of test mothods and their names.
-// -----------------------------------------------------------------------------
-//
-TInt Ctestmapimgconpluginapi::RunMethodL( 
-    CStifItemParser& aItem ) 
-    {
-
-    static TStifFunctionInfo const KFunctions[] =
-        {  
-        ENTRY( "CMnCoordinateConverterBase_MapImageParams", Ctestmapimgconpluginapi::CMnCoordinateConverterBase_MapImageParams ),
-        ENTRY( "CMnCoordinateConverterBase_GetImageCoordinate", Ctestmapimgconpluginapi::CMnCoordinateConverterBase_GetImageCoordinate ),
-        ENTRY( "CMnCoordinateConverterBase_GetWorldCoordinate", Ctestmapimgconpluginapi::CMnCoordinateConverterBase_GetWorldCoordinate ),
-        };
-
-    const TInt count = sizeof( KFunctions ) / 
-                        sizeof( TStifFunctionInfo );
-
-    return RunInternalL( KFunctions, count, aItem );
-
-    }
-
-
-// -----------------------------------------------------------------------------
-// Ctestmapimgconpluginapi::CMnCoordinateConverterBase_MapImageParams
-// This test case will test MapImageParams method of CMnCoordinateConverterBase
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//
-
-TInt Ctestmapimgconpluginapi::CMnCoordinateConverterBase_MapImageParams(
-   CStifItemParser& /*aItem*/)
-   {
-   CTestProviderCoordConverter* testProviderCoordConverter=
-    								CTestProviderCoordConverter::NewLC();
-   TMnMapImageParams mapImageParams=testProviderCoordConverter->MapImageParams(); 	
-   CleanupStack::PopAndDestroy(testProviderCoordConverter);
-   return KErrNone;
-   }
-   
-// -----------------------------------------------------------------------------
-// Ctestmapimgconpluginapi::CMnCoordinateConverterBase_GetImageCoordinate
-// This test case will test GetImageCoordinate method of CMnCoordinateConverterBase
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//
-
-TInt Ctestmapimgconpluginapi::CMnCoordinateConverterBase_GetImageCoordinate(
-   CStifItemParser& /*aItem*/)
-   {
-   CTestProviderCoordConverter* testProviderCoordConverter=
-    								CTestProviderCoordConverter::NewLC();
-   TCoordinate coordinate;
-   TPoint point;
-   testProviderCoordConverter->GetImageCoordinate(coordinate,point); 
-   	
-   CleanupStack::PopAndDestroy(testProviderCoordConverter);
-   return KErrNone;
-   }   
-   
-// -----------------------------------------------------------------------------
-// Ctestmapimgconpluginapi::CMnCoordinateConverterBase_GetWorldCoordinate
-// This test case will test GetWorldCoordinate method of CMnCoordinateConverterBase
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//
-
-TInt Ctestmapimgconpluginapi::CMnCoordinateConverterBase_GetWorldCoordinate(
-   CStifItemParser& /*aItem*/)
-   {
-   CTestProviderCoordConverter* testProviderCoordConverter=
-    								CTestProviderCoordConverter::NewLC();
-   TCoordinate coordinate;
-   TPoint point;
-   testProviderCoordConverter->GetWorldCoordinate(point,coordinate); 
-   	
-   CleanupStack::PopAndDestroy(testProviderCoordConverter);
-   return KErrNone;
-   } 
-
-//  [End of File] - Do not remove
--- a/locsrv_plat/map_image_conversion_plugin_api/tsrc/src/testprovidercoordconverter.cpp	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,68 +0,0 @@
-/*
-* Copyright (c) 2007 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:  CTestProviderCoordConverter class
-*
-*/
-
-
-#include <e32base.h>
-#include "testprovidercoordconverter.h"
-
-// ========================== MEMBER FUNCTIONS ===============================
-
-// ---------------------------------------------------------------------------
-// Two phase constructor
-//---------------------------------------------------------------------------
-CTestProviderCoordConverter* CTestProviderCoordConverter::NewLC()
-    {
-    CTestProviderCoordConverter* self = new (ELeave) CTestProviderCoordConverter;
-    CleanupStack::PushL(self);
-    return self;
-    }
-
-// ---------------------------------------------------------------------------
-// C++ constructor.
-// ---------------------------------------------------------------------------
-CTestProviderCoordConverter::CTestProviderCoordConverter()
-    {
-    }
-
-// ---------------------------------------------------------------------------
-// C++ destructor
-// ---------------------------------------------------------------------------
-CTestProviderCoordConverter::~CTestProviderCoordConverter()
-    {
-    }
-
-// ---------------------------------------------------------------------------
-// Implementation for GetImageCoordinate declared in base class.
-// ---------------------------------------------------------------------------
-TInt CTestProviderCoordConverter::GetImageCoordinate( 
-    const TCoordinate& /*aWorldCoordinate*/, 
-    TPoint& /*aImagePoint*/ )
-    {
-    return KErrNone;    
-    }
-
-
-// ---------------------------------------------------------------------------
-// Implementation for GetWorldCoordinate declared in base class.
-// ---------------------------------------------------------------------------
-TInt CTestProviderCoordConverter::GetWorldCoordinate( 
-    const TPoint& /*aImagePoint*/, 
-    TCoordinate& /*aWorldCoordinate*/ )
-    {
-    return KErrNone;    
-    }
-
--- a/locsrv_plat/privacy_notifiers_secondary_display_api/group/bld.inf	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +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 
-:                Privacy Notifiers Secondary Display API
-*
-*/
-
-
-#include <platform_paths.hrh>
-
-PRJ_PLATFORMS
-DEFAULT
-
-PRJ_EXPORTS
-
-../inc/locverifiercoverui.h     MW_LAYER_PLATFORM_EXPORT_PATH(locverifiercoverui.h)
--- a/locsrv_plat/privacy_notifiers_secondary_display_api/inc/locverifiercoverui.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,125 +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:  The set of messages provided to Secondary Display software by
-*                Location Verifier dialogs.
-*
-*/
-
-#ifndef LOCVERIFIERCOVERUI_H_
-#define LOCVERIFIERCOVERUI_H_
-
-// System Includes
-#include <e32base.h>
-
-// The category UID for the commands in this header file.
-// UID of the Location Verifier dialogs Dll ( locverifierdlg.dll )
-//
-const TUid KCatUidLocationVerifierDlgs = { 0x101f84fc };
-
-
-// Dialogs shown by Location System UI / Verifer dialogs. These commands are 
-// handled using the Secondary Display support in Avkon.
-// Verification dialogs seek a response from the user about the decision that
-// has to be taken about accepting or rejecting a Location request. 
-// Notification dialogs provides a notification to the user about a particular
-// action taken to a Location request.
-// All the below mentioned command are expected to display a List Query dialog.
-// The requestor strings for filling up the List query dialog would be supplied 
-// as a packaged buffer. The buffer is packed according to the below mentioned
-// format.
-// 
-// | Count | Length(1) | String(1) | Length(2) | String(2) | ..... | Length( Count ) | String( Count ) |
-// 
-// where,
-// Count   - ( 4 bytes ) - The number of requestor strings. 
-// Length(n) - ( 4 bytes ) - Length of the UNICODE ( UCS -2) encoded nth requestor string.
-// String(n) - ( Length(n) * 2 bytes ) - String for the nth requestor. String encoded in 
-// UNICODE ( UCS-2 )  format. Hence, each character takes 2 bytes. Hence, over all length of the
-// string in bytes is 2 * Length(n).
-// 
-// Each entry is packed one after another without any delimters between them
-//
-//
-enum TLocVerifierDlgCoverUiCmds
-    {
-    /**
-     * Command ID for Location verification request when the network default policy for the 
-     * request is accept
-     * Request Type : Verification Request
-     * Dialog Type : List Query Dialog
-     * Hint String : "By default the network will accept this request on your behalf. Requesters:"
-     */    	
-    ECmdDefaultAccept 			= 1,
-    
-    /**
-     * Command ID for Location verification request when the network default policy for 
-     * the request is reject
-     * Request Type : Verification Request
-     * Dialog Type : List Query Dialog     
-     * Hint String : "By default the network will reject this request on your behalf. Requesters:"
-     */     
-    ECmdDefaultReject 		  = 2,
-    
-    /**
-     * Command ID for Location verification request when the network default policy for 
-     * the request is not specified
-     * Request Type : Verification Request
-     * Dialog Type : List Query Dialog      
-     * Hint String : "Your location was requested by:"
-     */     
-    ECmdDefaultNone   		  = 3,
-    
-    /**
-     * Command ID for Location notification
-     * Request Type : Notification Request
-     * Dialog Type : List Query Dialog      
-     * Hint String : "The network sent your location to:"
-     */     
-    ECmdNotifyAccept			  = 4,
-    
-    /**
-     * Command ID for Location notification when network made "accept" decision due to timeout
-     * Request Type : Notification Request
-     * Dialog Type : List Query Dialog           
-     * Hint String : "The network accepted this request on your behalf. Your location was sent to:"
-     */     
-    ECmdNotifyAcceptTimeout = 5,
-    
-    /**
-     *Command ID for Location notification when network made "reject" decision due to timeout
-     * Request Type : Notification Request
-     * Dialog Type : List Query Dialog           
-     * Hint String : "The network rejected this request on your behalf. Your location was not sent to:"
-     */     
-    ECmdNotifyRejectTimeout = 6,
-    
-    /**
-     * Command ID for Location notification when request was rejected due to a conflict despite of user's "accept" decision.
-     * Request Type : Notification Request
-     * Dialog Type : List Query Dialog           
-     * Hint String : "Unable to accept the request"
-     */     
-    ECmdNotifyAcceptFailure = 7,
-    
-    /**
-     * Command ID for Location notification when request was accepted due to a conflict despite of user's "reject" decision.
-     * Request Type : Notification Request
-     * Dialog Type : List Query Dialog           
-     * Hint String : "Unable to reject the request"
-     */     
-    ECmdNotifyRejectFailure = 8
-    };
-
-#endif      // LOCVERIFIERCOVERUI_H_            
-// End of File
--- a/locsrv_plat/privacy_notifiers_secondary_display_api/privacy_notifiers_secondary_display_api.metaxml	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-<?xml version="1.0" ?>
-<api id="816ea835ab7ce0f6e578f35b1967eaa5" dataversion="2.0">
-  <name>Privacy Notifiers Secondary Display API</name>
-  <description>Provides commands and events based message interface for privacy verification and notification for cover UI components on top of Mediator.</description>
-  <type>c++</type>
-  <collection>locationsystemui</collection>
-  <libs>
-  </libs>
-  <release category="platform"/>
-  <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>no</htmldocprovided>
-     <adaptation>no</adaptation>
-  </attributes>
-</api>
--- a/locsrv_plat/psy_configuration_ui_plugin_api/group/bld.inf	Mon May 03 12:54:42 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 
-:                PSY Configuration UI Plug-in API
-*
-*/
-
-
-#include <platform_paths.hrh>
-
-PRJ_PLATFORMS
-DEFAULT
-
-PRJ_EXPORTS
-
-../inc/LocPsyConfigUi.rh     MW_LAYER_PLATFORM_EXPORT_PATH(LocPsyConfigUi.rh)
-../inc/LocPsyConfigUiUID.hrh     MW_LAYER_PLATFORM_EXPORT_PATH(LocPsyConfigUiUID.hrh)
--- a/locsrv_plat/psy_configuration_ui_plugin_api/inc/LocPsyConfigUi.rh	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,49 +0,0 @@
-/*
-* Copyright (c) 2002-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:  PSY Configuration UI Plug-in resource structure definition.
-*
-*/
-
-#ifndef __LOCPSYCONFIGUI_RH__
-#define __LOCPSYCONFIGUI_RH__
-
-/**
- * @file LocPsyConfigUi.rh
- * 
- * This file provides the resource structure definition for PSY Configuration
- * UI plug-in API. The client application which intends to provide a PSY 
- * configuration UI should use this resource structure to define the UID of the
- * PSY module for which its providing the Configuration UI.
- *
- */
- 
-/** 
- * Resource Structure for PSY Configuration UI Plug-in API.
- * 
- * This structure is to be used as the opaque 
- * data field of the SERVICE_INFO structure of the APP_REGISTRATION_INFO 
- * defined in the application's registration resource file.
- *
- * @publishedPartner
- */
-STRUCT PSYCONFIG_REGISTRATION
-	{
-	/**
-	 * The ECom Implementation UID of the PSY module for which the application
-	 * serves as the Configuration UI.
-	 */
-	LONG psy_uid;
-	}
-
-#endif //__LOCPSYCONFIGUI_RH__
--- a/locsrv_plat/psy_configuration_ui_plugin_api/inc/LocPsyConfigUiUID.hrh	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,41 +0,0 @@
-/*
-* Copyright (c) 2002-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:  Service UID definition for PSY Configuration UI Plug-in API.
-*
-*/
-
-#ifndef __LOCPSYCONFIGUI_UID_HRH__
-#define __LOCPSYCONFIGUI_UID_HRH__ 
- 
-/**
- * @file LocPsyConfigUiUID.hrh
- * 
- * This file provides the documentation of the Service UID definition for PSY 
- * Configuration UI Plug-in API.
- *
- * #KLocPsyConfigServiceUid
- */ 
-/**
- * Service UID for PSY Configuration UI Plug-in API.
- * 
- * The client application which intends to provide a PSY configuration UI should 
- * specify this Service UID value in the uid field of the SERVICE_INFO structure 
- * of the APP_REGISTRATION_INFO defined in the application's registration resource
- * file.
- *
- * @publishedPartner
- */
-#define KLocPsyConfigServiceUid 0x10207240 
-
-#endif //__LOCPSYCONFIGUI_UID_HRH__
--- a/locsrv_plat/psy_configuration_ui_plugin_api/psy_configuration_ui_plugin_api.metaxml	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-<?xml version="1.0" ?>
-<api id="645a03f53c58d52243e93ccdd2ed24c9" dataversion="2.0">
-  <name>PSY Configuration UI Plug-in API</name>
-  <description>Provides the interface to plug-in PSY specific configuration UIs into the Location System UI subsystem.</description>
-  <type>c++</type>
-  <collection>locationsystemui</collection>
-  <libs>
-  </libs>
-  <release category="platform"/>
-  <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>no</htmldocprovided>
-     <adaptation>no</adaptation>
-  </attributes>
-</api>
--- a/locsrv_plat/query_and_notification_api/inc/EPos_CPosPrivacyNotifier.h	Mon May 03 12:54:42 2010 +0300
+++ b/locsrv_plat/query_and_notification_api/inc/EPos_CPosPrivacyNotifier.h	Fri May 14 16:17:02 2010 +0300
@@ -23,7 +23,7 @@
 //  INCLUDES
 #include <e32base.h>
 #include <lbs/epos_privacy.h>
-#include <lbs/EPos_TPosQNInputData.h>
+#include <lbs/epos_tposqninputdata.h>
 
 // DATA TYPES
 
--- a/locsrv_plat/supl_query_secondary_display_api/group/bld.inf	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
-/*
-* Copyright (c) 2007 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 for SUPL Query Secondary display API.
-*
-*/
-
-
-#include <platform_paths.hrh>
-
-PRJ_PLATFORMS
-DEFAULT
-
-PRJ_EXPORTS
-
-../inc/epos_omasuplquerycoverui.h     MW_LAYER_PLATFORM_EXPORT_PATH(epos_omasuplquerycoverui.h)
--- a/locsrv_plat/supl_query_secondary_display_api/inc/epos_omasuplquerycoverui.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,65 +0,0 @@
-/*
-* Copyright (c) 2007 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:  Cover UI command definitions for SUPL queries
-*
-*/
-
-#ifndef EPOS_OMASUPLQUERYCOVERUI_H_
-#define EPOS_OMASUPLQUERYCOVERUI_H_
-
-// System Includes
-#include <e32base.h>
-
-// The category UID for the commands in this header file.
-// UID of the SUPL Query Notifier Dll ( epos_omasuplnotifier.dll )
-//
-const TUid KCatUidSuplQuery = { 0x10009BF6 };
-
-
-// Dialogs shown by SUPL Notifers. These commands are handled using the
-// Secondary Display support in Avkon.
-//
-enum TEposSUPLSettingsCoverUiCmds
-    {
-    /**
-     * Command for displaying a confirmation query dialog, which seeks confirmation from the 
-     * user as to whether he wants to use SUPL. The dialog is displayed when the user is
-     * in his home network.
-     * Dialog Type : Message Query Dialog     
-     * Hint String : "Connection to network positioning server is requested. Proceed?"
-     *               "Server Settings ?" Link     
-     */
-    ECmdSuplHomeNetwork = 1,
-    
-    /**
-     * Command for displaying a confirmation query dialog, which seeks confirmation from the 
-     * user as to whether he wants to use SUPL. The dialog is displayed when the user is
-     * not in his home network.
-     * Dialog Type : Message Query Dialog with link     
-     * Hint String : "Connection to network positioning server is requested. You are outside home network. Proceed?"
-     *               "Server Settings ?" Link
-     */
-    ECmdSuplRoamingNetwork = 2,    
-    
-    /**
-     * Command for displaying a timeout query dialog, which informs the user about the 
-     * timeout of SUPL Request. The dialog is displayed when the SUPL connection times out.
-     * Dialog Type : Query Dialog     
-     * Hint String : "Positioning server SUPL request timed out. Network connection not started."
-     */
-    ECmdSuplTimeOut = 3    
-    };
-
-#endif      // EPOS_OMASUPLQUERYCOVERUI_H_            
-// End of File
--- a/locsrv_plat/supl_query_secondary_display_api/supl_query_secondary_display_api.metaxml	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-<?xml version="1.0" ?>
-<api id="ef7a78321606fc5782faaed358c1ac72" dataversion="2.0">
-  <name>SUPL Query Secondary Display API</name>
-  <description>Provides the definition for the Cover UI commands for SUPL queries</description>
-  <type>c++</type>
-  <collection>supl</collection>
-  <libs>
-  </libs>
-  <release category="platform"/>
-  <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>no</htmldocprovided>
-     <adaptation>no</adaptation>
-  </attributes>
-</api>
--- a/locsrv_plat/supl_settings_api/inc/epos_csuplsettingparams.h	Mon May 03 12:54:42 2010 +0300
+++ b/locsrv_plat/supl_settings_api/inc/epos_csuplsettingparams.h	Fri May 14 16:17:02 2010 +0300
@@ -48,6 +48,8 @@
  *  - Network & Operator code ( when tried last ).
  *  - Network & Operator code ( when last used successfully).
  *  - Editable ( yes / no).
+ *	- Product Configuration - Indicates that server is configured by product team or configured by user. 
+ *    
  *
  *  From the abover properties, only following fieds can be changed by SUPL settings client:
  *  - SLP address
@@ -56,6 +58,7 @@
  *  - Remove SLP, when SIM change ( yes / no ).
  *  - Usage in home network ( yes / no ).
  *  - Editable ( yes / no).
+ *	- Product Configuration
  * 
  */
 class CServerParams : public CBase 
@@ -115,7 +118,7 @@
      * @param [IN] aSimChangeRemove Inidcates whether this server entry needs to be deleted when SIM changes 
      * @param [IN] aUsageInHomeNw Inidcates whether server can be used in the home network or not 
      * @param [IN] aEditable Inidcates whether this server entry can be edited or not 
-     *
+     * @param [IN] aSlpId,Id of server for which client has to modify properties of SLP.
      * @return following error codes 
      *      - KErrNone if successful
      *      - KErrArgument if any of the argument is not in the specified range or values specified are not reset value
@@ -133,7 +136,7 @@
 
     /**
      * Returns server parameters. 
-     *
+     * @param [IN] aSlpId,Id of server for which client has to retrive properties of SLP.
      * @param [OUT] aServerAddress Server address in string format 
      * @param [OUT] aIapName The Internet Access Point Name refers to the access point which is 
      * used to access the HSLP over the internet.  This can have maximum size of 100 characters.
@@ -141,7 +144,7 @@
      * @param [OUT] aSimChangeRemove Inidcates whether this server entry needs to be deleted when SIM changes 
      * @param [OUT] aUsageInHomeNw Inidcates whether server can be used in the home network or not 
      * @param [OUT] aEditable Inidcates whether this server entry can be edited or not 
-     *
+     * 
      * @return following error codes
      *      - KErrNone if successful
      *      - KErrNotFound if all of the parameters has reset value 
@@ -155,6 +158,32 @@
                 TBool& aUsageInHomeNw,
                 TBool& aEditable
                 ) const;
+                
+
+    /**
+     * Sets server parameters.  
+     * @param [IN] aConfigurationType, Set ETrue to indicates that server is configured by product,
+     * 																 		 EFalse to indicates that server is configured by user
+     *
+     * @return following error codes 
+     *      - KErrNone if successful
+     *			- Otherwise system wide error code
+     */
+	IMPORT_C void SetServerConfigurationType(TBool aProductConfiguration);
+
+
+    /**
+     * Gets server parameters.  
+     * @param [OUT] aConfigurationType, ETrue  indicates that server is configured by product,
+     * 																  EFalse indicates that server is configured by user
+     *
+     * @return following error codes 
+     *      - KErrNone if successful
+     *			- KErrNotFound if server configuration property is not set.
+     */
+	IMPORT_C TInt GetServerConfigurationType(TBool& aProductConfiguration) const;
+
+
 
 private:
     TInt64 iSlpId;
@@ -164,9 +193,11 @@
     TBool iSimChangeRemove;
     TBool iUsageInHomeNw;
     TBool iEditable;
+    TBool iProductConfigured;
     
     //To indicate if the values were set using the Set method 
     TBool iIsValueSet;
+    
 	};
 
 /**
@@ -328,7 +359,35 @@
                       TUint64&  aOutstandingTrigger,
                       TUint64&  aInterval
                     ) const;     
+                    
+/**
+     * Sets trigger parameters. 
+     *
+     * @since S60 5.2
+     * @param [IN]  aEndTime Inidcates end time for triggering session.  This is valid only 
+     * 						 if the trigger type is periodic triggers.
+     * @return following error codes
+     *      - KErrNone if successful
+     *		- KErrNotFound if Session id specified is not running as periodic triggering session.
+     */
+     
+	IMPORT_C void SetTriggerEndTime(const TTime aEndTime);                  
+	
+	/**
+     * Gets trigger parameters. 
+     *
+     * @since S60 5.2
+     * @param [OUT] aEndTime Inidcates end time for triggering session.  This is valid only 
+     * 						 if the trigger type is periodic triggers.
+     * @return following error codes
+     *      - KErrNone if successful
+     *      - KErrArgument if Session id is not in the specified range
+     *			- KErrNotFound if Session id specified is not running as periodic triggering session.
+     */
+     
+	IMPORT_C TInt GetTriggerEndTime(TTime& aEndTime)const ;                  
 
+    
 
 private:
     TInt64 iSessionId;
@@ -339,6 +398,7 @@
     TRequestType iRequestType;
     TUint64 iOutstandingTrigger;
     TUint64 iInterval;
+    TTime   iEndTime;
     //To indicate if the values were set using the Set method 
     TBool iIsValueSet;
     };
--- a/locsrv_plat/supl_settings_api/inc/epos_csuplsettings.h	Mon May 03 12:54:42 2010 +0300
+++ b/locsrv_plat/supl_settings_api/inc/epos_csuplsettings.h	Fri May 14 16:17:02 2010 +0300
@@ -97,9 +97,28 @@
             ESuplUsageHomeAutomatic, 
             /** Indicates that SUPL usage is disabled */ 
             ESuplUsageDisabled 
-            };                
+            };                 
 
-
+		
+        /**
+         * Enumeration to indicate status of SUPL triggered service.  This is used as parameter for 
+         * @ref ChangeSuplTriggerServiceStatus() and @ref GetSuplTriggerServiceStatus() method. Client has to select one of the values from
+	     * this enumeration when changing SUPL triggered service status.  
+	     * For example, if client is changing SUPL triggered service status to ON,it should select ESuplTriggerON. 
+         * If SUPL triggered service status is set to ESuplTriggerON,then any client requesting triggered service will be served by SUPL Framework.
+         * If SUPL triggered service status is set to ESuplTriggerOFF,then client's request for triggered service will fail.
+         * If SUPL triggers are in progress and client sets off triggered service,then all started triggering sessions will get completed with error.
+         *
+         * @since S60 5.2
+         */
+			enum TSuplTriggerStatus
+            {
+            /** Indicates that SUPL triggered service status is ON */ 
+            ESuplTriggerOn = 0, 
+            /** Indicates that SUPL triggered service status is OFF */ 
+            ESuplTriggerOff
+            };      
+                      
     public:  // Constructors and destructor
 
         /**
@@ -110,7 +129,7 @@
         */
         IMPORT_C static CSuplSettings* NewL();
 
-        /**
+       /**
         * Two-phased constructor.
         *
         * @since S60 5.1 
@@ -118,7 +137,7 @@
         */
         IMPORT_C static CSuplSettings* NewLC();
 
-        /**
+       /**
         * Destructor.
         *
         * @since S60 3.1
@@ -128,7 +147,7 @@
 
     protected:
 
-        /**
+       /**
         * C++ default constructor.
         *
         * @since S60 3.1
@@ -136,7 +155,7 @@
         */
         CSuplSettings();
 
-        /**
+       /**
         * By default EPOC constructor is private.
         *
         * @since S60 3.1
@@ -146,7 +165,7 @@
 
     public: // New functions
 
-        /**
+       /**
         * This method is used to start listening for SUPL setting changes. To
         * listen for changes, the client must implement the
         * @ref MSuplSettingsObserver interface.  Client must allocated memory 
@@ -177,7 +196,7 @@
          */
         IMPORT_C void RemoveObserver();
 
-        /**
+       /**
         * This method is used to start listening for SUPL session changes. To
         * listen for changes, the client must implement the
         * @ref MSuplSessionObserver interface.  Client must allocated memory 
@@ -313,35 +332,25 @@
     IMPORT_C TInt IsImsiChanged(TBool& aChanged);
     
     /**
-     * This method is used to retrieve SUPL usage from settings storage.  
-     *
-     * @since S60 3.2
+     * This method is deprecated.  
      *
-     * @param [OUT] aUsage  will hold, upon successful completion, value indicating 
-     * current SUPL usage 
+     * @since S60 10.1
+     *
      * @return one of the following error codes: 
-     *         - KErrNone if SUPL usage retrieved successfully.  
-     *         - KErrNotFound if the SUPL State is not found in SUPL settings
-     *         - KErrUnknown if retrieving SUPL usage from settings storage failed
+     *         - KErrNotSupported  
      */
 
     IMPORT_C TInt GetSuplUsage(TSuplSettingsUsage& aUsage) const;
 
-    /**
-     * This method is used to change SUPL usage.  Using this method, SUPL usage can be 
-     * set to any of the values specified in the enumeration @ref TSuplSettingsUsage 
-     * By default, SUPL usage will be set to always ask. 
+     /**
+     * This method is deprecated.  
      *
-     * @since S60 3.2
+     * @since S60 10.1
      *
-     * @param [IN] aUsage Usage to be set for SUPL usage 
      * @return one of the following error codes: 
-     *         - KErrNone if SUPL usage is changed successfully.  
-     *         - KErrArgument if aUsage field is not in range
-     *         - KErrUnknown if changing SUPL usage in settings storage has failed
+     *         - KErrNotSupported  
      */
     IMPORT_C TInt SetSuplUsage(TSuplSettingsUsage aUsage);
-
     /**
      * This method is used to add new server into settings.  It is client's responsibility
      * to set all the parameters in aParamValues except SLP identification.  After adding
@@ -564,7 +573,7 @@
             const TBool aEditFlag 
     ) const;
 
-       /**
+    /**
      * This method is used to retrieve parameter which indicates whether server
      * details are editable or not. 
      *
@@ -884,7 +893,7 @@
                                      CTriggerParams*& aParamValues ) const;
           
 
-    /*
+    /**
      * Sets Notification status of particular session
      *
      * @since S60 5.2 
@@ -901,7 +910,7 @@
 	            TInt64 aSessionId,
                 TBool aTriggerNotificationStatus
                 );
-	/*
+	/**
 	 * Cancels given ongoing triggering session
 	 *
 	 * @since S60 5.2 
@@ -929,6 +938,30 @@
 
 	IMPORT_C TInt GetDefaultIAPName(TDes& aIapName);
     
+	/**
+	 * Changes status of SUPL triggered service. 
+	 *
+	 * @since S60 10.1 
+	 * @param [IN] aSuplTriggerStatus, Indicates the new SUPL triggered service status value
+	 * @capability WriteDeviceData Its required for cenrep write operation.
+	 * @return following error codes
+	 *      - KErrNone if successful
+	 *      otherwise system wide error codes. 
+	 */
+	IMPORT_C TInt SetSuplTriggeredServiceStatus( const TSuplTriggerStatus& aSuplTriggerStatus );
+        
+	/**
+	 * Returns the status of SUPL triggered service.
+	 *
+	 * @since S60 10.1 
+	 * @param [OUT] aSuplTriggerStatus, Gets status of SUPL triggering session either ON or OFF
+	 * @capability ReadDeviceData Its required for cenrep read operation.
+	 * @return following error codes
+	 *      - KErrNone if successful
+	 *      otherwise system wide error codes. 
+	 */
+	IMPORT_C TInt GetSuplTriggeredServiceStatus( TSuplTriggerStatus& aSuplTriggerStatus );
+    
     private: // New functions
         
     private:
--- a/locsrv_plat/supl_settings_api/inc/epos_msuplsettingsobserver.h	Mon May 03 12:54:42 2010 +0300
+++ b/locsrv_plat/supl_settings_api/inc/epos_msuplsettingsobserver.h	Fri May 14 16:17:02 2010 +0300
@@ -24,7 +24,7 @@
 
 //  INCLUDES
 #include <e32base.h>
-
+#include <epos_csuplsettings.h>
 // DATA TYPES
 // CLASS DECLARATION
 
@@ -77,6 +77,19 @@
         virtual void HandleSuplSettingsChangeL(
                 TSuplSettingsEventType aEvent,TInt aSlpId = -1                        
         ) = 0;
+        
+        /**
+        * Invoked by SUPL settings API when a any client of SUPL Settings API calls CSuplSettings::ChangeSuplTriggerServiceStatus().
+        *
+        * To be able to receive this notification, the observer object must
+        * first be registered by invoking @p CSuplSettings::SetObserverL().
+        *
+        * @param[OUT] TSuplTriggerStatus, Information saying status of Supl trigger service .
+        */
+        virtual void HandleSuplTriggerStatusChangeL(
+                CSuplSettings::TSuplTriggerStatus aSuplTriggerStatus ) = 0;
+        
+        
     };
 
 #endif      // __EPOS_MSUPLSETTINGSOBSERVER_H__  
--- a/locsrv_plat/supl_settings_api/tsrc/conf/settingsapi_test.cfg	Mon May 03 12:54:42 2010 +0300
+++ b/locsrv_plat/supl_settings_api/tsrc/conf/settingsapi_test.cfg	Fri May 14 16:17:02 2010 +0300
@@ -899,9 +899,66 @@
 delete foobar
 [Endtest]
 
- 				
+[Test]
+title  ChangeSuplTriggerServiceStatusON
+create settingsapi foobar
+foobar ChangeSuplTriggerServiceStatusON
+delete foobar
+[Endtest]				
+
+[Test]
+title  ChangeSuplTriggerServiceStatusOFF
+create settingsapi foobar
+foobar ChangeSuplTriggerServiceStatusOFF
+delete foobar
+[Endtest]
+
+[Test]
+title  GetSuplTriggerServiceStatusON
+create settingsapi foobar
+foobar GetSuplTriggerServiceStatusON
+delete foobar
+[Endtest]
 
 
+[Test]
+title  GetSuplTriggerServiceStatusOFF
+create settingsapi foobar
+foobar GetSuplTriggerServiceStatusOFF
+delete foobar
+[Endtest]
 
+[Test]
+title  SetstatusOtherThanAppropriate
+create settingsapi foobar
+foobar SetstatusOtherThanAppropriate
+delete foobar
+[Endtest]
+
+[Test]
+title  ProductConfiguredServer1
+create settingsapi foobar
+foobar ProductConfiguredServer1
+delete foobar
+[Endtest]
 
+[Test]
+title  ProductConfiguredServer2
+create settingsapi foobar
+foobar ProductConfiguredServer2
+delete foobar
+[Endtest]
 
+[Test]
+title  ProductConfiguredServer3
+create settingsapi foobar
+foobar ProductConfiguredServer3
+delete foobar
+[Endtest]
+
+[Test]
+title  ProductConfiguredServer4
+create settingsapi foobar
+foobar ProductConfiguredServer4
+delete foobar
+[Endtest]
\ No newline at end of file
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/locsrv_plat/supl_settings_api/tsrc/group/log.txt	Fri May 14 16:17:02 2010 +0300
@@ -0,0 +1,1 @@
+Created Settingapi Log folder.
\ No newline at end of file
--- a/locsrv_plat/supl_settings_api/tsrc/group/settingsapi.pkg	Mon May 03 12:54:42 2010 +0300
+++ b/locsrv_plat/supl_settings_api/tsrc/group/settingsapi.pkg	Fri May 14 16:17:02 2010 +0300
@@ -35,8 +35,9 @@
 ;RELEASE
 "\Epoc32\release\armv5\urel\settingsapi.dll"-"c:\sys\bin\settingsapi.dll"
 
-;"..\conf\settingsapi_test.cfg"-"c:\testframework\settingsapi_test.cfg"
-;"..\init\testframework.ini"-"c:\testframework\testframework.ini"
+"..\conf\settingsapi_test.cfg"-"c:\testframework\settingsapi_test.cfg"
+"..\init\testframework.ini"-"c:\testframework\testframewor.ini"
+"..\init\log.txt"-"c:\logs\testframework\suplsettings\log.txt"
 
 
 ; End of File
--- a/locsrv_plat/supl_settings_api/tsrc/inc/settingsapi.h	Mon May 03 12:54:42 2010 +0300
+++ b/locsrv_plat/supl_settings_api/tsrc/inc/settingsapi.h	Fri May 14 16:17:02 2010 +0300
@@ -294,6 +294,10 @@
 				TInt CSettingsApi::SlpCount();
 				TInt CSettingsApi::GetSlpInfoFromAddress(CStifItemParser& aItem);
 				TInt CSettingsApi::GetSlpInfoFromAddress_invalid(CStifItemParser& aItem);
+				TInt CSettingsApi::ProductConfiguredServer1();
+				TInt CSettingsApi::ProductConfiguredServer2();
+				TInt CSettingsApi::ProductConfiguredServer3();
+				TInt CSettingsApi::ProductConfiguredServer4();
 		
 				TInt SetGetTriggerParamsL( CStifItemParser& aItem ); 
 				
@@ -317,8 +321,22 @@
         virtual TInt SetTriggerEmptySessionNameL( CStifItemParser& aItem );
         virtual TInt SetTriggerLongSessionNameL( CStifItemParser& aItem );
 
+        TInt CSettingsApi::ChangeSuplTriggerServiceStatusON();
+            
+
+        TInt CSettingsApi::ChangeSuplTriggerServiceStatusOFF();
+           
+
+        TInt CSettingsApi::GetSuplTriggerServiceStatusON();
 
 
+        TInt CSettingsApi::GetSuplTriggerServiceStatusOFF();
+
+        TInt CSettingsApi::SetstatusOtherThanAppropriate();
+    public : // from MSuplSettingsObserver
+        virtual void HandleSuplTriggerStatusChangeL(
+                       CSuplSettings::TSuplTriggerStatus aSuplTriggerStatus );
+      
 				   
     public:     // Data
         // ?one_line_short_description_of_data
--- a/locsrv_plat/supl_settings_api/tsrc/src/settingsapi.cpp	Mon May 03 12:54:42 2010 +0300
+++ b/locsrv_plat/supl_settings_api/tsrc/src/settingsapi.cpp	Fri May 14 16:17:02 2010 +0300
@@ -129,7 +129,12 @@
     delete iScheduler; 
     
     }
-
+void CSettingsApi::HandleSuplTriggerStatusChangeL(
+               CSuplSettings::TSuplTriggerStatus /* aSuplTriggerStatus */ ) 
+    {
+    iLog->Log(_L("Callback function HandleSuplTriggerStatusChange(); ")) ;
+   // CActiveScheduler::Stop();
+    }
 // ========================== OTHER EXPORTED FUNCTIONS =========================
 
 // -----------------------------------------------------------------------------
--- a/locsrv_plat/supl_settings_api/tsrc/src/settingsapiblocks.cpp	Mon May 03 12:54:42 2010 +0300
+++ b/locsrv_plat/supl_settings_api/tsrc/src/settingsapiblocks.cpp	Fri May 14 16:17:02 2010 +0300
@@ -240,29 +240,36 @@
 				ENTRY( "GetFallBack",CSettingsApi::GetFallBack),
 				
 				ENTRY( "SetGetTriggerParams",CSettingsApi::SetGetTriggerParamsL),
-				ENTRY( "AddTriggerSession",CSettingsApi::AddTriggerSessionL),
+				/*ENTRY( "AddTriggerSession",CSettingsApi::AddTriggerSessionL),
 				ENTRY( "DeleteTriggerSession",CSettingsApi::DeleteTriggerSessionL),
 				ENTRY( "GetAllSessionSetApi",CSettingsApi::GetAllSessionSetApiL),
 				ENTRY( "SetNotStatusSetApi",CSettingsApi::SetNotStatusSetApiL),
 				ENTRY( "AddTriggerSessionTwice",CSettingsApi::AddTriggerSessionTwiceL),
 				ENTRY( "DeleteTriggerSessionInvalid",CSettingsApi::DeleteTriggerSessionInvalidL),
 				ENTRY( "SetNotStatusSetApiInvalid",CSettingsApi::SetNotStatusSetApiInvalidL),
-				ENTRY( "SetSessionObserver",CSettingsApi::SetSessionObserverL),
+				*/ENTRY( "SetSessionObserver",CSettingsApi::SetSessionObserverL),
 				ENTRY( "SetSessionObserverTwice",CSettingsApi::SetSessionObserverTwiceL),
 				ENTRY( "RemoveSessionObserver",CSettingsApi::RemoveSessionObserverL),
 				ENTRY( "RemoveSessionObserverWithoutSet",CSettingsApi::RemoveSessionObserverWithoutSetL),
-				ENTRY( "CheckSessionChangeEvents",CSettingsApi::CheckSessionChangeEventsL),
+/*				ENTRY( "CheckSessionChangeEvents",CSettingsApi::CheckSessionChangeEventsL),
 				ENTRY( "GetASessionParam",CSettingsApi::GetASessionParamL),
 				ENTRY( "GetASessionParamNull",CSettingsApi::GetASessionParamNullL),
 				ENTRY( "GetASessionParamInValid",CSettingsApi::GetASessionParamInValidL),
 				ENTRY( "CancelTriggerSession",CSettingsApi::CancelTriggerSessionL),
 				ENTRY( "SetOutstandingTriggers",CSettingsApi::SetOutstandingTriggersL),
 				ENTRY( "SetOutstandingTriggersInvalid",CSettingsApi::SetOutstandingTriggersInvalidL),
-				ENTRY( "DeleteAllSessions",CSettingsApi::DeleteAllSessionsL),
+				ENTRY( "DeleteAllSessions",CSettingsApi::DeleteAllSessionsL),*/
 				ENTRY( "SetTriggerEmptySessionName",CSettingsApi::SetTriggerEmptySessionNameL),
 				ENTRY( "SetTriggerLongSessionName",CSettingsApi::SetTriggerLongSessionNameL),
-				
-
+				ENTRY( "ChangeSuplTriggerServiceStatusON", CSettingsApi::ChangeSuplTriggerServiceStatusON), 
+				ENTRY( "ChangeSuplTriggerServiceStatusOFF", CSettingsApi::ChangeSuplTriggerServiceStatusOFF),
+				ENTRY( "GetSuplTriggerServiceStatusON", CSettingsApi::GetSuplTriggerServiceStatusON),
+				ENTRY( "GetSuplTriggerServiceStatusOFF", CSettingsApi::GetSuplTriggerServiceStatusOFF),
+				ENTRY( "SetstatusOtherThanAppropriate", CSettingsApi::SetstatusOtherThanAppropriate),
+				ENTRY( "ProductConfiguredServer1", CSettingsApi::ProductConfiguredServer1),	
+				ENTRY( "ProductConfiguredServer2", CSettingsApi::ProductConfiguredServer2),	
+				ENTRY( "ProductConfiguredServer3", CSettingsApi::ProductConfiguredServer3),	
+				ENTRY( "ProductConfiguredServer4", CSettingsApi::ProductConfiguredServer4),	
 			};
     const TInt count = sizeof( KFunctions ) / 
                         sizeof( TStifFunctionInfo );
@@ -4198,54 +4205,62 @@
 
 TInt CSettingsApi::SetUsageAutomatic()
 {
-	CSuplSettings* settings = CSuplSettings::NewL();
-TInt ret;	
-	
-			ret=settings->SetSuplUsage(CSuplSettings::ESuplUsageAutomatic);
+	
+    /*
+    CSuplSettings* settings = CSuplSettings::NewL();
+    TInt ret;	
+	
+			//ret=settings->SetSuplUsage(CSuplSettings::ESuplUsageAutomatic);
 			iLog->Log(_L("SetUsageAutomatic returned=%d" ),ret);
 	
-	delete settings;
-	return ret;
+	delete settings;*/
+    return KErrNone;
 }
 
 TInt CSettingsApi::SetUsageAlwaysAsk()
 {
-	CSuplSettings* settings = CSuplSettings::NewL();
+	/*
+    CSuplSettings* settings = CSuplSettings::NewL();
 	TInt ret;
-			ret=settings->SetSuplUsage(CSuplSettings::ESuplUsageAlwaysAsk);
+			//ret=settings->SetSuplUsage(CSuplSettings::ESuplUsageAlwaysAsk);
 			iLog->Log(_L("SetUsageAlwaysAsk returned=%d" ),ret);
 	
-	delete settings;
-	return ret;
+	delete settings;*/
+    return KErrNone;
 }
 
 TInt CSettingsApi::SetUsageAutoInHMNw()
 {
-	CSuplSettings* settings = CSuplSettings::NewL();
+	/*
+    CSuplSettings* settings = CSuplSettings::NewL();
 	TInt ret;
-			ret=settings->SetSuplUsage(CSuplSettings::ESuplUsageHomeAutomatic);
+			//ret=settings->SetSuplUsage(CSuplSettings::ESuplUsageHomeAutomatic);
 			iLog->Log(_L("SetUsageAutoInHMNw returned=%d" ),ret);
 	
 	delete settings;
-	return ret;
+	*/
+    return KErrNone;;
 }
 
 TInt CSettingsApi::SetUsageDisabled()
 {
-	CSuplSettings* settings = CSuplSettings::NewL();
+	/*
+    CSuplSettings* settings = CSuplSettings::NewL();
 	TInt ret;
-			ret=settings->SetSuplUsage(CSuplSettings::ESuplUsageDisabled);
+			//ret=settings->SetSuplUsage(CSuplSettings::ESuplUsageDisabled);
 			iLog->Log(_L("SetUsageDisabled returned=%d" ),ret);
 	
 	delete settings;
-	return ret;
+	*/
+	return KErrNone;
 }
 
 //////////////////////////////////////////////////////////////////////
 
 TInt CSettingsApi::GetUsageAutomatic()
 	{
-		TInt ret = SetUsageAutomatic();
+	/*	
+    TInt ret = SetUsageAutomatic();
 		if(ret == KErrNone)
 			{
 				CSuplSettings::TSuplSettingsUsage usage;
@@ -4269,13 +4284,14 @@
 			{
 				iLog->Log(_L("SetUsageAutomatic returned error =%d" ),ret);
 			}	
-
-	return ret;			
+    */
+	return KErrNone;			
 	}
 	
 TInt CSettingsApi::GetUsageAlwaysAsk()
 	{
-		TInt ret = SetUsageAlwaysAsk();
+	/*	
+    TInt ret = SetUsageAlwaysAsk();
 		if(ret == KErrNone)
 			{
 				CSuplSettings::TSuplSettingsUsage usage;
@@ -4299,8 +4315,8 @@
 			{
 				iLog->Log(_L("SetUsageAlwaysAsk returned error =%d" ),ret);
 			}	
-
-	return ret;			
+    */
+	return KErrNone;			
 
 	}
 
@@ -4308,7 +4324,8 @@
 TInt CSettingsApi::GetUsageAutoInHMNw()
 	{
 	
-		TInt ret = SetUsageAutoInHMNw();
+	/*	
+    TInt ret = SetUsageAutoInHMNw();
 		if(ret == KErrNone)
 			{
 				CSuplSettings::TSuplSettingsUsage usage;
@@ -4332,15 +4349,16 @@
 			{
 				iLog->Log(_L("SetUsageAutoInHMNw returned error =%d" ),ret);
 			}	
-
-	return ret;			
+     */
+	return KErrNone;			
 	
 	}
 
 TInt CSettingsApi::GetUsageDisabled()
 	{
 	
-		TInt ret = SetUsageDisabled();
+	/*	
+    TInt ret = SetUsageDisabled();
 		if(ret == KErrNone)
 			{
 				CSuplSettings::TSuplSettingsUsage usage;
@@ -4364,8 +4382,8 @@
 			{
 				iLog->Log(_L("SetUsageDisabled returned error =%d" ),ret);
 			}	
-
-	return ret;			
+    */
+	return KErrNone;			
 	
 	}
 	
@@ -4374,7 +4392,8 @@
 
 TInt CSettingsApi::SetUsageOtherThanAppropriate()
 {
-	CSuplSettings::TSuplSettingsUsage usage = (CSuplSettings::TSuplSettingsUsage)100;
+	/*
+    CSuplSettings::TSuplSettingsUsage usage = (CSuplSettings::TSuplSettingsUsage)100;
 	CSuplSettings* settings = CSuplSettings::NewL();
 	TInt ret=settings->SetSuplUsage(usage);
 	
@@ -4390,7 +4409,8 @@
 	iLog->Log(_L("SetSuplUsage returned=%d" ),ret);	
 
 	delete settings;
-	return ret;
+	*/
+	return KErrNone;
 }
 
 
@@ -4399,8 +4419,9 @@
     CTriggerParams* params = CTriggerParams::NewL();
     TBuf<64> sessionName;
     sessionName.Copy(_L("Session1"));
-    
-    TInt ret=params->Set( 5,sessionName,ETrue,ETrue,CTriggerParams::EPeriodic,CTriggerParams::ETerminalInitiated,10,10);
+    TTime endTime1;
+    endTime1 = 100;
+    TInt ret=params->Set( 5,sessionName,ETrue,ETrue,CTriggerParams::EPeriodic,CTriggerParams::ETerminalInitiated,10,10,endTime1);
     if( KErrNone!=ret)
         {
         delete params;
@@ -4413,10 +4434,10 @@
     CTriggerParams::TRequestType requestType;
     TUint64 outstandingTrigger;
     TUint64 interval;
-    
+    TTime endTime2;
     HBufC* name = HBufC::NewL( 256);
     ret = params->Get(sessionId,name->Des(),notificationPresent,triggerNotificationStatus,
-                                 triggerType,requestType,outstandingTrigger,interval );
+                                 triggerType,requestType,outstandingTrigger,interval,endTime2 );
     
     delete params;
     if( KErrNone!=ret)
@@ -4430,7 +4451,7 @@
     if(sessionId==5 &&  comp==0 && notificationPresent && 
        triggerNotificationStatus && triggerType== CTriggerParams::EPeriodic &&
        requestType==CTriggerParams::ETerminalInitiated && outstandingTrigger==10
-       && interval==10)
+       && interval==10 && endTime1 == endTime2 )
         {
         ret=KErrNone;
         }
@@ -4447,7 +4468,7 @@
         {
         sessionName.Append(_L("a"));
         }
-    TInt ret=params->Set( 5,sessionName,ETrue,ETrue,CTriggerParams::EPeriodic,CTriggerParams::ETerminalInitiated,10,10);
+    TInt ret=params->Set( 5,sessionName,ETrue,ETrue,CTriggerParams::EPeriodic,CTriggerParams::ETerminalInitiated,10,10,0);
     delete params;
     if( KErrArgument!= ret )
         {
@@ -4462,7 +4483,7 @@
     CTriggerParams* params = CTriggerParams::NewL();
     TBuf<300> sessionName;
     sessionName.Zero();
-    TInt ret=params->Set( 5,sessionName,ETrue,ETrue,CTriggerParams::EPeriodic,CTriggerParams::ETerminalInitiated,10,10);
+    TInt ret=params->Set( 5,sessionName,ETrue,ETrue,CTriggerParams::EPeriodic,CTriggerParams::ETerminalInitiated,10,10,0);
     
        TInt64 sessionId;
         TBool notificationPresent;
@@ -4471,10 +4492,10 @@
         CTriggerParams::TRequestType requestType;
         TUint64 outstandingTrigger;
         TUint64 interval;
-        
+        TTime endTime;
         HBufC* name = HBufC::NewL( 256);
         ret = params->Get(sessionId,name->Des(),notificationPresent,triggerNotificationStatus,
-                                     triggerType,requestType,outstandingTrigger,interval );
+                                     triggerType,requestType,outstandingTrigger,interval,endTime );
         
         delete params;
      TInt comp=name->Compare(sessionName);
@@ -4603,7 +4624,332 @@
     return err;
     }
 
-
+//Change the status with SuplTriggerON 
+
+TInt CSettingsApi::ChangeSuplTriggerServiceStatusON()
+    {
+    CSuplSettings* settings = CSuplSettings::NewL() ;
+    TInt ret ;
+    //settings->SetObserverL(*this);
+    ret = settings->ChangeSuplTriggerServiceStatus(CSuplSettings::ESuplTriggerON);
+    iLog->Log(_L("Supltrigger ON = %d "),ret ) ;
+    if(ret != KErrNone) 
+        {
+          iLog->Log(_L("Supltrigger service status:Error = %d"), ret); 
+        }
+              
+       // CActiveScheduler::Start();
+    iLog->Log(_L("ChangeSuplTriggerServiceStatus ON = %d "),ret ) ;
+    delete settings;
+    return ret;
+       
+    
+    }
+//Change the status with SuplTriggerOFF
+
+TInt CSettingsApi::ChangeSuplTriggerServiceStatusOFF()
+    {
+    CSuplSettings* settings = CSuplSettings::NewL() ;
+    TInt ret ;
+   // settings->SetObserverL(*this);
+    ret = settings->ChangeSuplTriggerServiceStatus(CSuplSettings::ESuplTriggerOFF);
+    iLog->Log(_L("Supltrigger OFF = %d "),ret ) ;
+    if(ret != KErrNone) 
+        {
+            iLog->Log(_L("Supltrigger service status:Error = %d"), ret); 
+        }
+     //   CActiveScheduler::Start();
+    iLog->Log(_L("ChangeSuplTriggerServiceStatus OFF = %d "),ret ) ;
+    delete settings;
+    return ret;
+       
+    
+    }
+
+//Get the status changes of SuplTriggerON 
+
+TInt CSettingsApi::GetSuplTriggerServiceStatusON()
+    {
+     TInt ret = ChangeSuplTriggerServiceStatusON();
+     iLog->Log(_L("ChangeSuplTriggerServiceStatus ON = %d "),ret ) ;
+     if(ret == KErrNone)
+        {
+         CSuplSettings::TSuplTriggerStatus status;
+         CSuplSettings* settings = CSuplSettings::NewL();
+         ret = settings->GetSuplTriggerServiceStatus(status);
+         if (ret == KErrNone && status == CSuplSettings::ESuplTriggerON)
+            {
+              iLog->Log(_L("status are matching...returned=%d" ),(TInt)status);    
+            }
+         else
+            {
+              iLog->Log(_L("status are not matching...returned=%d" ),(TInt)status);    
+            }   
+                    
+         iLog->Log(_L("GetSuplTriggerServiceStatus returned = %d" ),ret);
+         delete settings;
+        }
+        else
+            {
+                iLog->Log(_L("GetSuplTriggerServiceStatus returned error =%d" ),ret);
+            }   
+
+    return ret;         
+    }
+
+//Get the status changes of SuplTriggerOFF
+TInt CSettingsApi::GetSuplTriggerServiceStatusOFF()
+    {
+    TInt ret = ChangeSuplTriggerServiceStatusOFF();
+    if(ret == KErrNone)
+      {
+       CSuplSettings::TSuplTriggerStatus status;
+       CSuplSettings* settings = CSuplSettings::NewL();
+       ret = settings->GetSuplTriggerServiceStatus(status);
+       if (ret == KErrNone && status == CSuplSettings::ESuplTriggerOFF)
+          {
+           iLog->Log(_L("status are matching...returned=%d" ),(TInt)status);    
+          }
+       else
+          {
+           iLog->Log(_L("status are not matching...returned=%d" ),(TInt)status);    
+          }   
+                    
+       iLog->Log(_L("GetSuplTriggerServiceStatus returned = %d" ),ret);
+       delete settings;
+      }
+        else
+            {
+                iLog->Log(_L("GetSuplTriggerServiceStatus returned error =%d" ),ret);
+            }   
+
+    return ret;         
+    }
+
+// Change the status other than the appropriat
+TInt CSettingsApi::SetstatusOtherThanAppropriate()
+   {
+    CSuplSettings::TSuplTriggerStatus status = (CSuplSettings::TSuplTriggerStatus)10;
+    CSuplSettings* settings = CSuplSettings::NewL();
+    TInt ret=settings->ChangeSuplTriggerServiceStatus(status);
+    
+    if(ret != KErrArgument)
+        {
+         iLog->Log(_L("SuplTriggerServiceStatus returned=%d" ),ret);  
+        }
+    iLog->Log(_L("Expected KErrArgument =%d" ),ret); 
+    ret = KErrNone;        
+    delete settings;
+    return ret;
+}
+
+TInt CSettingsApi::ProductConfiguredServer1()
+   {
+    
+    CServerParams *aParamValues= CServerParams::NewL();
+
+iLog->Log(_L("Setting CServerParams with product config parameter")); 
+_LIT8(KServer, "supl.nokia.com");
+_LIT8(KIap, "airtelgprs.com");
+	
+RBuf aServerAddress, aIapName; 	
+		
+aServerAddress.Create(128);
+aServerAddress.Copy(KServer);
+aIapName.Create(128);
+aIapName.Copy(KIap);
+
+aParamValues->Set(aServerAddress,aIapName,ETrue,EFalse,ETrue,ETrue,0,ETrue);
+
+aIapName.Close();
+aServerAddress.Close();
+
+HBufC* aServerAddress1 = HBufC::NewL(64);
+HBufC* aIapName1 = HBufC::NewL(64);
+TInt64 aSlpId;
+TBool aServerEnabled,aSimChangeRemove,aUsageInHomeNw,aEditable,aProductConfigured;
+
+TInt ret = aParamValues->Get(aSlpId,aServerAddress1->Des(),aIapName1->Des(),aServerEnabled,aSimChangeRemove,aUsageInHomeNw,aEditable,aProductConfigured);
+
+delete aParamValues;
+delete aServerAddress1;
+delete aIapName1;
+
+if(ret != KErrNone) 
+	return ret;
+	
+if (aProductConfigured)
+	return KErrNone;
+else
+	return KErrGeneral;
+}
+
+TInt CSettingsApi::ProductConfiguredServer2()
+   {
+   	CServerParams *aParamValues = CServerParams::NewL();
+   	CSuplSettings *aSettings = CSuplSettings::NewL();
+  	TInt ret;
+  	TInt64 slp;
+
+iLog->Log(_L("Setting CServerParams with product config parameter")); 
+_LIT8(KServer, "supl111.nokia.com");
+_LIT8(KIap, "airtelgprs.com");
+	
+RBuf aServerAddress, aIapName; 	
+		
+aServerAddress.Create(128);
+aServerAddress.Copy(KServer);
+aIapName.Create(128);
+aIapName.Copy(KIap);
+
+aParamValues->Set(aServerAddress,aIapName,ETrue,EFalse,ETrue,ETrue,0,ETrue);
+
+ret = aSettings->AddNewServer(aParamValues,slp);
+	iLog->Log(_L("Return Value=%d" ),ret);
+	iLog->Log(_L("SLP id of the new server: %d" ),slp);	
+
+if (ret != KErrNone)
+	return ret;
+	
+	CServerParams *aParamValues1 = CServerParams::NewL();
+ret = aSettings->GetSlpInfoFromId(slp,aParamValues1);
+	
+aIapName.Close();
+aServerAddress.Close();
+
+HBufC* aServerAddress1 = HBufC::NewL(64);
+HBufC* aIapName1 = HBufC::NewL(64);
+	
+TInt64 aSlpId;
+TBool aServerEnabled,aSimChangeRemove,aUsageInHomeNw,aEditable,aProductConfigured;
+
+ret = aParamValues1->Get(aSlpId,aServerAddress1->Des(),aIapName1->Des(),aServerEnabled,aSimChangeRemove,aUsageInHomeNw,aEditable,aProductConfigured);
+
+delete aParamValues;
+delete aParamValues1;
+delete aSettings;
+delete aServerAddress1;
+delete aIapName1;
+
+if(ret != KErrNone) 
+	return ret;
+	
+if (aProductConfigured)
+	return KErrNone;
+else
+	return KErrGeneral;
+}
+
+TInt CSettingsApi::ProductConfiguredServer3()
+   {
+   	CServerParams *aParamValues = CServerParams::NewL();
+   	CSuplSettings *aSettings = CSuplSettings::NewL();
+  	TInt ret;
+  	TInt64 slp;
+
+iLog->Log(_L("Setting CServerParams with product config parameter")); 
+_LIT8(KServer, "supl121.nokia.com");
+_LIT8(KIap, "airtelgprs.com");
+	
+RBuf aServerAddress, aIapName; 	
+		
+aServerAddress.Create(128);
+aServerAddress.Copy(KServer);
+aIapName.Create(128);
+aIapName.Copy(KIap);
+
+aParamValues->Set(aServerAddress,aIapName,ETrue,EFalse,ETrue,ETrue,0,ETrue);
+
+ ret = aSettings->AddNewServer(aParamValues,slp);
+	iLog->Log(_L("Return Value=%d" ),ret);
+	iLog->Log(_L("SLP id of the new server: %d" ),slp);	
+
+if (ret != KErrNone)
+	return ret;
+	
+	CServerParams *aParamValues1 = CServerParams::NewL();
+ret = aSettings->GetSlpInfoAddress(_L("supl121.nokia.com"),aParamValues1);
+	
+aIapName.Close();
+aServerAddress.Close();
+
+HBufC* aServerAddress1 = HBufC::NewL(64);
+HBufC* aIapName1 = HBufC::NewL(64);
+TInt64 aSlpId;
+TBool aServerEnabled,aSimChangeRemove,aUsageInHomeNw,aEditable,aProductConfigured;
+
+ret = aParamValues1->Get(aSlpId,aServerAddress1->Des(),aIapName1->Des(),aServerEnabled,aSimChangeRemove,aUsageInHomeNw,aEditable,aProductConfigured);
+
+delete aParamValues;
+delete aParamValues1;
+delete aSettings;
+delete aServerAddress1;
+delete aIapName1;
+
+if(ret != KErrNone) 
+	return ret;
+	
+if (aProductConfigured)
+	return KErrNone;
+else
+	return KErrGeneral;
+    
+}
+
+TInt CSettingsApi::ProductConfiguredServer4()
+   {
+   	CServerParams *aParamValues = CServerParams::NewL();
+   	CSuplSettings *aSettings = CSuplSettings::NewL();
+  	TInt ret,slp;
+
+iLog->Log(_L("Setting CServerParams with product config parameter")); 
+_LIT8(KServer, "supl131.nokia.com");
+_LIT8(KIap, "airtelgprs.com");
+	
+RBuf aServerAddress, aIapName; 	
+		
+aServerAddress.Create(128);
+aServerAddress.Copy(KServer);
+aIapName.Create(128);
+aIapName.Copy(KIap);
+
+aParamValues->Set(aServerAddress,aIapName,ETrue,EFalse,ETrue,ETrue,0,ETrue);
+
+ret = aSettings->SetDefaultServer(aParamValues);
+	iLog->Log(_L("Return Value=%d" ),ret);
+	iLog->Log(_L("SLP id of the new server: %d" ),slp);	
+
+if (ret != KErrNone)
+	return ret;
+	
+	CServerParams *aParamValues1 = CServerParams::NewL();
+ret = aSettings->GetDefaultServer(aParamValues1);
+	
+aIapName.Close();
+aServerAddress.Close();
+
+HBufC* aServerAddress1 = HBufC::NewL(64);
+HBufC* aIapName1 = HBufC::NewL(64);
+TInt64 aSlpId;
+TBool aServerEnabled,aSimChangeRemove,aUsageInHomeNw,aEditable,aProductConfigured;
+
+ret = aParamValues1->Get(aSlpId,aServerAddress1->Des(),aIapName1->Des(),aServerEnabled,aSimChangeRemove,aUsageInHomeNw,aEditable,aProductConfigured);
+
+delete aParamValues;
+delete aParamValues1;
+delete aSettings;
+delete aServerAddress1;
+delete aIapName1;
+
+if(ret != KErrNone) 
+	return ret;
+	
+if (aProductConfigured)
+	return KErrNone;
+else
+	return KErrGeneral;
+    
+}
 
 // EPOC default constructor
 void CObserverTest::ConstructL()
--- a/locsrv_plat/supl_settings_notifier_secondary_display_api/group/bld.inf	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +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 
-:                SUPL Settings Notifier Secondary Display API
-*
-*/
-
-
-#include <platform_paths.hrh>
-
-PRJ_PLATFORMS
-DEFAULT
-
-PRJ_EXPORTS
-
-../inc/locsuplsettingscoverui.h     MW_LAYER_PLATFORM_EXPORT_PATH(locsuplsettingscoverui.h)
--- a/locsrv_plat/supl_settings_notifier_secondary_display_api/inc/locsuplsettingscoverui.h	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,54 +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:  The set of messages provided to Secondary Display software by
-*                SUPL Settings UI.
-*
-*/
-
-#ifndef LOCSUPLSETTINGSCOVERUI_H_
-#define LOCSUPLSETTINGSCOVERUI_H_
-
-// System Includes
-#include <e32base.h>
-
-// The category UID for the commands in this header file.
-// UID of the SUPL Settings UI Dll ( locsuplsettings.dll )
-//
-const TUid KCatUidLocationSuplSettingsUi = { 0x10275091 };
-
-
-// Dialogs shown by Location System UI / SUPL Settings UI. These commands are handled using the
-// Secondary Display support in Avkon.
-//
-enum TLocSUPLSettingsCoverUiCmds
-    {
-    /**
-     * Command for displaying a confirmation query dialog, which seeks confirmation from the 
-     * user as to whether he wants to configure SUPL Settings.
-     * Dialog Type : Text Query Dialog     
-     * Hint String : "Secure positioning requires an access point. Define access point?"
-     */
-    ECmdSuplSettingsMissing = 1,
-
-    /**
-     * Command for displaying a confirmation query dialog, which seeks confirmation from the 
-     * user as to whether he wants to enable SUPL .
-     * Dialog Type : Text Query Dialog     
-     * Hint String : "Secure positioning is not enabled. Do you want to enable?"
-     */
-    ECmdSuplStateMissing
-    };
-
-#endif      // LOCSUPLSETTINGSCOVERUI_H_            
-// End of File
--- a/locsrv_plat/supl_settings_notifier_secondary_display_api/supl_settings_notifier_secondary_display_api.metaxml	Mon May 03 12:54:42 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-<?xml version="1.0" ?>
-<api id="f034b81f57f223abaebdcc2e7b73b4cd" dataversion="2.0">
-  <name>SUPL Settings Notifier Secondary Display API</name>
-  <description>Provides commands and events based message interface for SUPL settings related notification for cover UI components on top of Mediator.</description>
-  <type>c++</type>
-  <collection>locationsystemui</collection>
-  <libs>
-  </libs>
-  <release category="platform"/>
-  <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>no</htmldocprovided>
-     <adaptation>no</adaptation>
-  </attributes>
-</api>
--- a/locsrv_plat/supl_terminal_initiation_api/inc/epos_suplterminal.h	Mon May 03 12:54:42 2010 +0300
+++ b/locsrv_plat/supl_terminal_initiation_api/inc/epos_suplterminal.h	Fri May 14 16:17:02 2010 +0300
@@ -1134,6 +1134,15 @@
 	 *  		- KErrGeneral
 	 */	
 	TInt CheckIfSlpExists(const TDesC& aHslpAddress);
+	
+	/**
+	 * Checks if server  is present in the database or not
+	 * @ return codes
+	 *  		- KErrNone if server is present
+	 *  		- KErrNotFound if server is not present
+	 *  		- KErrGeneral
+	 */	
+	TBool CheckSuplTriggerServiceStatus();
 
 
 protected:
--- a/supl/locationomasuplprotocolhandler/asnconverterpluginapi/src/epos_comasuplinit.cpp	Mon May 03 12:54:42 2010 +0300
+++ b/supl/locationomasuplprotocolhandler/asnconverterpluginapi/src/epos_comasuplinit.cpp	Fri May 14 16:17:02 2010 +0300
@@ -300,7 +300,7 @@
 	iSLPAddress = NULL;
 	iSLPAddress = COMASuplSLPAddress::NewL();
 	
-	aSuplInit->SLPAddress(cloneSLPAddress);
+	User::LeaveIfError(aSuplInit->SLPAddress(cloneSLPAddress));
 	COMASuplSLPAddress::TSuplSLPAddressType lChoice = cloneSLPAddress->SLPAddressType();
 
 	switch(lChoice)
--- a/supl/locationomasuplprotocolhandler/asnconverterpluginapi/src/epos_comasupllocationidver2.cpp	Mon May 03 12:54:42 2010 +0300
+++ b/supl/locationomasuplprotocolhandler/asnconverterpluginapi/src/epos_comasupllocationidver2.cpp	Fri May 14 16:17:02 2010 +0300
@@ -85,6 +85,7 @@
 EXPORT_C COMASuplLocationIdVer2* COMASuplLocationIdVer2::CloneL()
     {
     COMASuplLocationIdVer2* retLocationId = COMASuplLocationIdVer2::NewL();
+    CleanupStack::PushL( retLocationId );
     if(iIsV2ExtnSet)
         {
         retLocationId->COMASuplLocationIdVer2::SetVer2CellInfo(iOMASuplVer2CellInfoExtn);
@@ -111,6 +112,7 @@
             break;
                     
         }
+    CleanupStack::Pop(retLocationId);
     return retLocationId;
     }
 // -----------------------------------------------------------------------------
--- a/supl/locationomasuplprotocolhandler/asnconverterpluginapi/src/epos_comasuplreport.cpp	Mon May 03 12:54:42 2010 +0300
+++ b/supl/locationomasuplprotocolhandler/asnconverterpluginapi/src/epos_comasuplreport.cpp	Fri May 14 16:17:02 2010 +0300
@@ -293,10 +293,12 @@
 EXPORT_C COMASuplReportData* COMASuplReportData::CloneL()
     {
     COMASuplReportData* repDataToRet = COMASuplReportData::NewL();
+    CleanupStack::PushL( repDataToRet );
     repDataToRet->SetMutipleLocId(iMultipleLocIds->CloneL());
     repDataToRet->SetResultCode(iResultCode);
     repDataToRet->SetTimeStamp(iTimeStamp);
     repDataToRet->SetPosData(iPositionData->CloneL());
+    CleanupStack::Pop(repDataToRet);
     return repDataToRet;
     }
 // -----------------------------------------------------------------------------
--- a/supl/locationomasuplprotocolhandler/asnconverterpluginapi/src/epos_comasuplsessionid.cpp	Mon May 03 12:54:42 2010 +0300
+++ b/supl/locationomasuplprotocolhandler/asnconverterpluginapi/src/epos_comasuplsessionid.cpp	Fri May 14 16:17:02 2010 +0300
@@ -133,10 +133,14 @@
 EXPORT_C COMASuplSessionID* COMASuplSessionID::CloneL()
     {
     COMASuplSessionID* suplSessionIdToReturn = COMASuplSessionID::NewL();
+    CleanupStack::PushL( suplSessionIdToReturn );
     if(iSETSessionID)
         suplSessionIdToReturn->SetSETSessionID(iSETSessionID->CloneL());
     if(iSLPSessionID)
         suplSessionIdToReturn->SetSLPSessionID(iSLPSessionID->CloneL());
+    
+    CleanupStack::Pop(suplSessionIdToReturn);
+    
     return suplSessionIdToReturn;
     }
 // -----------------------------------------------------------------------------
--- a/supl/locationomasuplprotocolhandler/asnconverterpluginapi/src/epos_comasuplstartver2.cpp	Mon May 03 12:54:42 2010 +0300
+++ b/supl/locationomasuplprotocolhandler/asnconverterpluginapi/src/epos_comasuplstartver2.cpp	Fri May 14 16:17:02 2010 +0300
@@ -113,12 +113,14 @@
 EXPORT_C COMASuplLocationIdData* COMASuplLocationIdData::CloneL()
     {
     COMASuplLocationIdData* retLocIdData = COMASuplLocationIdData::NewL();
+    CleanupStack::PushL( retLocIdData );
     if(iECId)
         retLocIdData->SetECellInfo(iMmCellInfo);
     retLocIdData->SetServingFlag(iServingFlag);
     retLocIdData->SetTimeStamp(iRelativeTimeStamp);
     if(iLocationId2)
         retLocIdData->SetLocationId(iLocationId2->CloneL());
+    CleanupStack::Pop(retLocIdData);
     return retLocIdData;
     }
 /**
@@ -390,9 +392,7 @@
         {
         case EThirdPartyLogicalName:
             {
-            HBufC16*    logicalName = HBufC16::NewL(iLogicalName->Length());
-            *logicalName = *iLogicalName;
-            thirdpartyId->SetLogicalName(*logicalName);
+            thirdpartyId->SetLogicalName(*iLogicalName);
             }
             break;
         case EThirdPartyMSISDN:
@@ -402,23 +402,17 @@
             break;
         case EThirdPartyEmail:
             {
-            HBufC16*    eMailAddress = HBufC16::NewL(iEMailAddress->Length());
-            eMailAddress = iEMailAddress;
-            thirdpartyId->SetEmailAddress(*eMailAddress);
+            thirdpartyId->SetEmailAddress(*iEMailAddress);
             }
             break;
         case EThirdPartySIPURI:
             {
-            HBufC8*      sipUri = HBufC8::NewL(iSipUri->Length());
-            *sipUri = *iSipUri;
-            thirdpartyId->SetSipUri(*sipUri);
+            thirdpartyId->SetSipUri(*iSipUri);
             }
             break;
         case EThirdPartyIMSPublicId:
             {
-            HBufC8* iMSPublicId = HBufC8::NewL(iIMSPublicId->Length()); 
-            *iMSPublicId = *iIMSPublicId;
-            thirdpartyId->SetIMSPublicId(*iMSPublicId);
+            thirdpartyId->SetIMSPublicId(*iIMSPublicId);
             }
             break;
         case EThirdPartyMin:
@@ -433,9 +427,7 @@
             break;
         case EThirdPartyURI:
             {
-            HBufC8*     uRI = HBufC8::NewL(iURI->Length());
-            *uRI = *iURI;
-            thirdpartyId->SetURI(*uRI);
+            thirdpartyId->SetURI(*iURI);
             }
             break;
         }
@@ -698,12 +690,14 @@
 EXPORT_C COMASuplVer2SuplStartExtn* COMASuplVer2SuplStartExtn::CloneL()
     {
     COMASuplVer2SuplStartExtn* ver2ExtnToRet = COMASuplVer2SuplStartExtn::NewL();
+    CleanupStack::PushL( ver2ExtnToRet );
     if(iMultipleLocIds)
         ver2ExtnToRet->SetMultipleLocIds(iMultipleLocIds->CloneL());
     if(iPosition)
         ver2ExtnToRet->SetPosition(static_cast <COMASuplPosition*>(iPosition->CloneL()));
     if(iThirdparty)
         ver2ExtnToRet->SetThirdParty(iThirdparty->CloneL());
+    CleanupStack::Pop(ver2ExtnToRet);
     return ver2ExtnToRet;
     }
 // ============================ MEMBER FUNCTIONS of COMASuplStartVer2===============================
--- a/supl/locationomasuplprotocolhandler/group/bld.inf	Mon May 03 12:54:42 2010 +0300
+++ b/supl/locationomasuplprotocolhandler/group/bld.inf	Fri May 14 16:17:02 2010 +0300
@@ -44,6 +44,6 @@
 #include "../waplistener/group/bld.inf"
 #include "../syncmlprovhandler/group/bld.inf"
 #include "../provisioninghandler/group/bld.inf"
-#include "../notifier/group/bld.inf"
+//#include "../notifier/group/bld.inf"
 
 // End of File
--- a/supl/locationomasuplprotocolhandler/protocolhandler/bwins/eposomasuplprotocolhandleru.def	Mon May 03 12:54:42 2010 +0300
+++ b/supl/locationomasuplprotocolhandler/protocolhandler/bwins/eposomasuplprotocolhandleru.def	Fri May 14 16:17:02 2010 +0300
@@ -23,18 +23,16 @@
 	?SetIAPId@COMASuplSettings@@QAEXH@Z @ 22 NONAME ; void COMASuplSettings::SetIAPId(int)
 	?ReadOMASuplSettingsL@COMASuplCommonConfig@@QAEXXZ @ 23 NONAME ; void COMASuplCommonConfig::ReadOMASuplSettingsL(void)
 	?CancelRunSession@COMASUPLProtocolManager@@UAEXPAVCSuplSessionBase@@@Z @ 24 NONAME ; void COMASUPLProtocolManager::CancelRunSession(class CSuplSessionBase *)
-	?SetSUPLUsage@COMASuplSettings@@QAEXAAW4TSuplSettingsUsage@CSuplSettings@@@Z @ 25 NONAME ; void COMASuplSettings::SetSUPLUsage(enum CSuplSettings::TSuplSettingsUsage &)
-	??1COMASUPLProtocolManager@@UAE@XZ @ 26 NONAME ; COMASUPLProtocolManager::~COMASUPLProtocolManager(void)
-	?HandleSuplMessageL@COMASUPLProtocolManager@@UAEXPAVCSuplSessionBase@@AAVTRequestStatus@@PAVHBufC8@@@Z @ 27 NONAME ; void COMASUPLProtocolManager::HandleSuplMessageL(class CSuplSessionBase *, class TRequestStatus &, class HBufC8 *)
-	?GetSUPLMessageVersionL@COMASUPLProtocolManager@@UAEHAAHABVTDesC8@@@Z @ 28 NONAME ; int COMASUPLProtocolManager::GetSUPLMessageVersionL(int &, class TDesC8 const &)
-	?ConstructL@COMASuplSettings@@AAEXXZ @ 29 NONAME ; void COMASuplSettings::ConstructL(void)
-	?NewL@COMASUPLProtocolManager@@SAPAV1@XZ @ 30 NONAME ; class COMASUPLProtocolManager * COMASUPLProtocolManager::NewL(void)
-	?HandlePacket@COMASUPLProtocolManager@@UAEXABVTDesC8@@I@Z @ 31 NONAME ; void COMASUPLProtocolManager::HandlePacket(class TDesC8 const &, unsigned int)
-	?CancelSuplTriggerSession@COMASUPLProtocolManager@@UAEXPAVCSuplSessionBase@@@Z @ 32 NONAME ; void COMASUPLProtocolManager::CancelSuplTriggerSession(class CSuplSessionBase *)
-	?InitializeL@COMASUPLProtocolManager@@UAEXPAVCSuplCommunicationManager@@AAVTRequestStatus@@@Z @ 33 NONAME ; void COMASUPLProtocolManager::InitializeL(class CSuplCommunicationManager *, class TRequestStatus &)
-	?SUPLUsage@COMASuplSettings@@QBE?AW4TSuplSettingsUsage@CSuplSettings@@XZ @ 34 NONAME ; enum CSuplSettings::TSuplSettingsUsage COMASuplSettings::SUPLUsage(void) const
-	?NewL@COMASuplCommonConfig@@SAPAV1@XZ @ 35 NONAME ; class COMASuplCommonConfig * COMASuplCommonConfig::NewL(void)
-	?SLPAddress@COMASuplSettings@@QBEABVTDesC8@@XZ @ 36 NONAME ; class TDesC8 const & COMASuplSettings::SLPAddress(void) const
-	?HandlePacketError@COMASUPLProtocolManager@@UAEXH@Z @ 37 NONAME ; void COMASUPLProtocolManager::HandlePacketError(int)
-	?NewL@COMASuplSettings@@SAPAV1@XZ @ 38 NONAME ; class COMASuplSettings * COMASuplSettings::NewL(void)
+	??1COMASUPLProtocolManager@@UAE@XZ @ 25 NONAME ; COMASUPLProtocolManager::~COMASUPLProtocolManager(void)
+	?HandleSuplMessageL@COMASUPLProtocolManager@@UAEXPAVCSuplSessionBase@@AAVTRequestStatus@@PAVHBufC8@@@Z @ 26 NONAME ; void COMASUPLProtocolManager::HandleSuplMessageL(class CSuplSessionBase *, class TRequestStatus &, class HBufC8 *)
+	?GetSUPLMessageVersionL@COMASUPLProtocolManager@@UAEHAAHABVTDesC8@@@Z @ 27 NONAME ; int COMASUPLProtocolManager::GetSUPLMessageVersionL(int &, class TDesC8 const &)
+	?ConstructL@COMASuplSettings@@AAEXXZ @ 28 NONAME ; void COMASuplSettings::ConstructL(void)
+	?NewL@COMASUPLProtocolManager@@SAPAV1@XZ @ 29 NONAME ; class COMASUPLProtocolManager * COMASUPLProtocolManager::NewL(void)
+	?HandlePacket@COMASUPLProtocolManager@@UAEXABVTDesC8@@I@Z @ 30 NONAME ; void COMASUPLProtocolManager::HandlePacket(class TDesC8 const &, unsigned int)
+	?CancelSuplTriggerSession@COMASUPLProtocolManager@@UAEXPAVCSuplSessionBase@@@Z @ 31 NONAME ; void COMASUPLProtocolManager::CancelSuplTriggerSession(class CSuplSessionBase *)
+	?InitializeL@COMASUPLProtocolManager@@UAEXPAVCSuplCommunicationManager@@AAVTRequestStatus@@@Z @ 32 NONAME ; void COMASUPLProtocolManager::InitializeL(class CSuplCommunicationManager *, class TRequestStatus &)
+	?NewL@COMASuplCommonConfig@@SAPAV1@XZ @ 33 NONAME ; class COMASuplCommonConfig * COMASuplCommonConfig::NewL(void)
+	?SLPAddress@COMASuplSettings@@QBEABVTDesC8@@XZ @ 34 NONAME ; class TDesC8 const & COMASuplSettings::SLPAddress(void) const
+	?HandlePacketError@COMASUPLProtocolManager@@UAEXH@Z @ 35 NONAME ; void COMASUPLProtocolManager::HandlePacketError(int)
+	?NewL@COMASuplSettings@@SAPAV1@XZ @ 36 NONAME ; class COMASuplSettings * COMASuplSettings::NewL(void)
 
--- a/supl/locationomasuplprotocolhandler/protocolhandler/eabi/eposomasuplprotocolhandleru.def	Mon May 03 12:54:42 2010 +0300
+++ b/supl/locationomasuplprotocolhandler/protocolhandler/eabi/eposomasuplprotocolhandleru.def	Fri May 14 16:17:02 2010 +0300
@@ -3,52 +3,50 @@
 	_ZN16COMASuplSettings10ConstructLEv @ 2 NONAME
 	_ZN16COMASuplSettings10IsHslpNullEv @ 3 NONAME
 	_ZN16COMASuplSettings11SetUIActiveEi @ 4 NONAME
-	_ZN16COMASuplSettings12SetSUPLUsageERN13CSuplSettings18TSuplSettingsUsageE @ 5 NONAME
-	_ZN16COMASuplSettings14SetHSLPAddressERK7TDesC16 @ 6 NONAME
-	_ZN16COMASuplSettings19ConvertIAPNameToIdLERK7TDesC16Rm @ 7 NONAME
-	_ZN16COMASuplSettings22SetHSLPAddressFromIMSIERK7TDesC16 @ 8 NONAME
-	_ZN16COMASuplSettings4NewLEv @ 9 NONAME
-	_ZN16COMASuplSettings8SetIAPIdEi @ 10 NONAME
-	_ZN20COMASuplCommonConfig20ReadOMASuplSettingsLEv @ 11 NONAME
-	_ZN20COMASuplCommonConfig4NewLEv @ 12 NONAME
-	_ZN23COMASUPLProtocolManager11InitializeLEP25CSuplCommunicationManagerR14TRequestStatus @ 13 NONAME
-	_ZN23COMASUPLProtocolManager11RunSessionLEP16CSuplSessionBaseR14TRequestStatusRK7TDesC16iiiR16TSuplTerminalQopi @ 14 NONAME
-	_ZN23COMASUPLProtocolManager11RunSessionLEP16CSuplSessionBaseR14TRequestStatusRK7TDesC16iiii @ 15 NONAME
-	_ZN23COMASUPLProtocolManager12HandlePacketERK6TDesC8j @ 16 NONAME
-	_ZN23COMASUPLProtocolManager14DestroySessionEP16CSuplSessionBase @ 17 NONAME
-	_ZN23COMASUPLProtocolManager15SetCommonConfigERP20COMASuplCommonConfig @ 18 NONAME
-	_ZN23COMASUPLProtocolManager16CancelInitializeEv @ 19 NONAME
-	_ZN23COMASUPLProtocolManager16CancelRunSessionEP16CSuplSessionBase @ 20 NONAME
-	_ZN23COMASUPLProtocolManager17CreateNewSessionLEN24CSUPLProtocolManagerBase12TSuplReqTypeEiN23RSuplTerminalSubSession16TSuplServiceTypeE @ 21 NONAME
-	_ZN23COMASUPLProtocolManager17HandlePacketErrorEi @ 22 NONAME
-	_ZN23COMASUPLProtocolManager18HandleSuplMessageLEP16CSuplSessionBaseR14TRequestStatusP6HBufC8 @ 23 NONAME
-	_ZN23COMASUPLProtocolManager19NotifyTriggerFiredLEP16CSuplSessionBaseR14TRequestStatusR20TSuplTriggerFireInfo @ 24 NONAME
-	_ZN23COMASUPLProtocolManager22GetSUPLMessageVersionLERiRK6TDesC8 @ 25 NONAME
-	_ZN23COMASUPLProtocolManager22RunSuplTriggerSessionLEP16CSuplSessionBaseR14TRequestStatusR28TSuplTerminalPeriodicTriggerRK7TDesC16iii @ 26 NONAME
-	_ZN23COMASUPLProtocolManager24CancelSuplTriggerSessionEP16CSuplSessionBase @ 27 NONAME
-	_ZN23COMASUPLProtocolManager4NewLEv @ 28 NONAME
-	_ZN23COMASUPLProtocolManagerC1Ev @ 29 NONAME
-	_ZN23COMASUPLProtocolManagerC2Ev @ 30 NONAME
-	_ZN23COMASUPLProtocolManagerD0Ev @ 31 NONAME
-	_ZN23COMASUPLProtocolManagerD1Ev @ 32 NONAME
-	_ZN23COMASUPLProtocolManagerD2Ev @ 33 NONAME
-	_ZNK16COMASuplSettings10IsUIActiveEv @ 34 NONAME
-	_ZNK16COMASuplSettings10SLPAddressEv @ 35 NONAME
-	_ZNK16COMASuplSettings18SLPAddressfromImsiEv @ 36 NONAME
-	_ZNK16COMASuplSettings5IAPIdEv @ 37 NONAME
-	_ZNK16COMASuplSettings9SUPLUsageEv @ 38 NONAME
-	_ZTI13COMASuplTrace @ 39 NONAME
-	_ZTI16COMASuplSettings @ 40 NONAME
-	_ZTI20COMASuplCommonConfig @ 41 NONAME
-	_ZTI20COMASuplDeInitilizer @ 42 NONAME
-	_ZTI23COMASUPLProtocolManager @ 43 NONAME
-	_ZTI26COMASuplInitilizeRequestor @ 44 NONAME
-	_ZTV13COMASuplTrace @ 45 NONAME
-	_ZTV16COMASuplSettings @ 46 NONAME
-	_ZTV20COMASuplCommonConfig @ 47 NONAME
-	_ZTV20COMASuplDeInitilizer @ 48 NONAME
-	_ZTV23COMASUPLProtocolManager @ 49 NONAME
-	_ZTV26COMASuplInitilizeRequestor @ 50 NONAME
-	_ZThn4_N23COMASUPLProtocolManager12HandlePacketERK6TDesC8j @ 51 NONAME
-	_ZThn4_N23COMASUPLProtocolManager17HandlePacketErrorEi @ 52 NONAME
+	_ZN16COMASuplSettings14SetHSLPAddressERK7TDesC16 @ 5 NONAME
+	_ZN16COMASuplSettings19ConvertIAPNameToIdLERK7TDesC16Rm @ 6 NONAME
+	_ZN16COMASuplSettings22SetHSLPAddressFromIMSIERK7TDesC16 @ 7 NONAME
+	_ZN16COMASuplSettings4NewLEv @ 8 NONAME
+	_ZN16COMASuplSettings8SetIAPIdEi @ 9 NONAME
+	_ZN20COMASuplCommonConfig20ReadOMASuplSettingsLEv @ 10 NONAME
+	_ZN20COMASuplCommonConfig4NewLEv @ 11 NONAME
+	_ZN23COMASUPLProtocolManager11InitializeLEP25CSuplCommunicationManagerR14TRequestStatus @ 12 NONAME
+	_ZN23COMASUPLProtocolManager11RunSessionLEP16CSuplSessionBaseR14TRequestStatusRK7TDesC16iiiR16TSuplTerminalQopi @ 13 NONAME
+	_ZN23COMASUPLProtocolManager11RunSessionLEP16CSuplSessionBaseR14TRequestStatusRK7TDesC16iiii @ 14 NONAME
+	_ZN23COMASUPLProtocolManager12HandlePacketERK6TDesC8j @ 15 NONAME
+	_ZN23COMASUPLProtocolManager14DestroySessionEP16CSuplSessionBase @ 16 NONAME
+	_ZN23COMASUPLProtocolManager15SetCommonConfigERP20COMASuplCommonConfig @ 17 NONAME
+	_ZN23COMASUPLProtocolManager16CancelInitializeEv @ 18 NONAME
+	_ZN23COMASUPLProtocolManager16CancelRunSessionEP16CSuplSessionBase @ 19 NONAME
+	_ZN23COMASUPLProtocolManager17CreateNewSessionLEN24CSUPLProtocolManagerBase12TSuplReqTypeEiN23RSuplTerminalSubSession16TSuplServiceTypeE @ 20 NONAME
+	_ZN23COMASUPLProtocolManager17HandlePacketErrorEi @ 21 NONAME
+	_ZN23COMASUPLProtocolManager18HandleSuplMessageLEP16CSuplSessionBaseR14TRequestStatusP6HBufC8 @ 22 NONAME
+	_ZN23COMASUPLProtocolManager19NotifyTriggerFiredLEP16CSuplSessionBaseR14TRequestStatusR20TSuplTriggerFireInfo @ 23 NONAME
+	_ZN23COMASUPLProtocolManager22GetSUPLMessageVersionLERiRK6TDesC8 @ 24 NONAME
+	_ZN23COMASUPLProtocolManager22RunSuplTriggerSessionLEP16CSuplSessionBaseR14TRequestStatusR28TSuplTerminalPeriodicTriggerRK7TDesC16iii @ 25 NONAME
+	_ZN23COMASUPLProtocolManager24CancelSuplTriggerSessionEP16CSuplSessionBase @ 26 NONAME
+	_ZN23COMASUPLProtocolManager4NewLEv @ 27 NONAME
+	_ZN23COMASUPLProtocolManagerC1Ev @ 28 NONAME
+	_ZN23COMASUPLProtocolManagerC2Ev @ 29 NONAME
+	_ZN23COMASUPLProtocolManagerD0Ev @ 30 NONAME
+	_ZN23COMASUPLProtocolManagerD1Ev @ 31 NONAME
+	_ZN23COMASUPLProtocolManagerD2Ev @ 32 NONAME
+	_ZNK16COMASuplSettings10IsUIActiveEv @ 33 NONAME
+	_ZNK16COMASuplSettings10SLPAddressEv @ 34 NONAME
+	_ZNK16COMASuplSettings18SLPAddressfromImsiEv @ 35 NONAME
+	_ZNK16COMASuplSettings5IAPIdEv @ 36 NONAME
+	_ZTI13COMASuplTrace @ 37 NONAME
+	_ZTI16COMASuplSettings @ 38 NONAME
+	_ZTI20COMASuplCommonConfig @ 39 NONAME
+	_ZTI20COMASuplDeInitilizer @ 40 NONAME
+	_ZTI23COMASUPLProtocolManager @ 41 NONAME
+	_ZTI26COMASuplInitilizeRequestor @ 42 NONAME
+	_ZTV13COMASuplTrace @ 43 NONAME
+	_ZTV16COMASuplSettings @ 44 NONAME
+	_ZTV20COMASuplCommonConfig @ 45 NONAME
+	_ZTV20COMASuplDeInitilizer @ 46 NONAME
+	_ZTV23COMASUPLProtocolManager @ 47 NONAME
+	_ZTV26COMASuplInitilizeRequestor @ 48 NONAME
+	_ZThn4_N23COMASUPLProtocolManager12HandlePacketERK6TDesC8j @ 49 NONAME
+	_ZThn4_N23COMASUPLProtocolManager17HandlePacketErrorEi @ 50 NONAME
 
--- a/supl/locationomasuplprotocolhandler/protocolhandler/group/omasuplprotocolhandler.mmp	Mon May 03 12:54:42 2010 +0300
+++ b/supl/locationomasuplprotocolhandler/protocolhandler/group/omasuplprotocolhandler.mmp	Fri May 14 16:17:02 2010 +0300
@@ -72,7 +72,7 @@
 LIBRARY insock.lib
 LIBRARY lbs.lib
 LIBRARY eposnwprv.lib
-LIBRARY locsettingsuiclient.lib
+//LIBRARY locsettingsuiclient.lib
 LIBRARY hash.lib
 LIBRARY bafl.lib  //logging
 LIBRARY flogger.lib
--- a/supl/locationomasuplprotocolhandler/protocolhandler/inc/epos_comasuplsettings.h	Mon May 03 12:54:42 2010 +0300
+++ b/supl/locationomasuplprotocolhandler/protocolhandler/inc/epos_comasuplsettings.h	Fri May 14 16:17:02 2010 +0300
@@ -96,7 +96,7 @@
 	* @param aSUPLUsage 
 	* @return None 
 	*/
-  IMPORT_C void SetSUPLUsage(CSuplSettings::TSuplSettingsUsage& aSUPLUsage );
+  //IMPORT_C void SetSUPLUsage(CSuplSettings::TSuplSettingsUsage& aSUPLUsage );
 	
 	/**
 	* SetUIActive Method.
@@ -137,7 +137,7 @@
 	* @param None
 	* @return SUPL Usage
 	*/
-  IMPORT_C CSuplSettings::TSuplSettingsUsage SUPLUsage() const;
+  //IMPORT_C CSuplSettings::TSuplSettingsUsage SUPLUsage() const;
 	
 	/**
 	* IAPId Method.
@@ -166,7 +166,7 @@
 	TInt  	 iIAPId;
 
     // SUPL Usage
-    CSuplSettings::TSuplSettingsUsage iSUPLUsage; 
+    //CSuplSettings::TSuplSettingsUsage iSUPLUsage; 
 	// Flag indicating the activation of settings UI
 	TBool    iSettingsUIActive;
 };
--- a/supl/locationomasuplprotocolhandler/protocolhandler/src/epos_comasuplinitilizerequestor.cpp	Mon May 03 12:54:42 2010 +0300
+++ b/supl/locationomasuplprotocolhandler/protocolhandler/src/epos_comasuplinitilizerequestor.cpp	Fri May 14 16:17:02 2010 +0300
@@ -196,13 +196,25 @@
     		        	{
     		        	RBuf HslpFromImsi;
     		        	HslpFromImsi.CreateL(KMaxIPAddressLength);
-						CleanupClosePushL(HslpFromImsi);
-                		iSuplSettings->GenerateHslpAddressFromImsi( HslpFromImsi );
-                		iOMASuplSettings->SetHSLPAddressFromIMSI(HslpFromImsi);
-                	    CleanupStack::PopAndDestroy();
-    		            iState = EInitializationComplete;
+									CleanupClosePushL(HslpFromImsi);
+						
+									//Coverity fix - checking for return code of GenerateHslpAddressFromImsi
+						
+									TInt genError = iSuplSettings->GenerateHslpAddressFromImsi( HslpFromImsi );
+									if(genError != KErrNone)
+						    		{
+                    iTrace->Trace(_L("GenerateHslpAddressFromImsi failed - completing observer"), KTraceFileName, __LINE__);
+										CleanupStack::PopAndDestroy();
+                    iObserver.InitilizationCompletedL( genError );                            
+                    return;
+						    		}
+               		 iOMASuplSettings->SetHSLPAddressFromIMSI(HslpFromImsi);
+                	 CleanupStack::PopAndDestroy();    		            
+                	 iState = EInitializationComplete;             	    
+
     		        	}
-    		            
+						//comment to ignore coverity missing break error
+    		        	//coverity[MISSING_BREAK  :FALSE]
     		        default:
     		        	if( iState != EInitializationComplete && iVariantEnabled )
     		        		{
@@ -211,7 +223,7 @@
         		            SetActive();
         		            break;
     		        		}
-                        iObserver.InitilizationCompletedL( iStatus.Int() );
+                iObserver.InitilizationCompletedL( iStatus.Int() );
     		    }
     }
 
--- a/supl/locationomasuplprotocolhandler/protocolhandler/src/epos_comasuplprotocolmanager.cpp	Mon May 03 12:54:42 2010 +0300
+++ b/supl/locationomasuplprotocolhandler/protocolhandler/src/epos_comasuplprotocolmanager.cpp	Fri May 14 16:17:02 2010 +0300
@@ -380,7 +380,7 @@
 		    iOMASuplProtocolHandler1->HandlePacket(aPacket,aPortNum);
 		    }
 		}
-	else if( major == 2)
+	else if ( major == 2 )
 		{
 		//SUPL v2
 		if(iOMASuplProtocolHandler2)
@@ -388,17 +388,17 @@
             iOMASuplProtocolHandler2->HandlePacket(aPacket,aPortNum);
             }
 		}
-	else 
+	else
 		{
-		//Use either of the Protocol Handlers to handle the packet
-		if(iOMASuplProtocolHandler1)
-		    {
-		    iOMASuplProtocolHandler1->HandlePacket(aPacket,aPortNum);
-		    }
+		//Use either of the Protocol Handlers to handle the packet 
+		if (iOMASuplProtocolHandler1)
+    		{
+    		iOMASuplProtocolHandler1->HandlePacket(aPacket,aPortNum);
+    		}
 		else if(iOMASuplProtocolHandler2)
             {
             iOMASuplProtocolHandler2->HandlePacket(aPacket,aPortNum);
-            }	
+            } 
 		}			
 	}
 
@@ -535,17 +535,17 @@
 		    iOMASuplProtocolHandler2->HandleSuplMessageL(aSuplSession,aStatus,aMessage);
 		    }
 		}
-	else 
+	else
 		{
-		//Use either of the Protocol Handlers (if they exist) to handle the packet
-		if(iOMASuplProtocolHandler1)
-		    {
-		    iOMASuplProtocolHandler1->HandleSuplMessageL(aSuplSession,aStatus,aMessage);
-		    }
+		//Use either of the Protocol Handlers (if they exist) to handle the packet 
+		if (iOMASuplProtocolHandler1)
+    		{
+    		iOMASuplProtocolHandler1->HandleSuplMessageL(aSuplSession,aStatus,aMessage);
+    		}
 		else if(iOMASuplProtocolHandler2)
 		    {
 		    iOMASuplProtocolHandler2->HandleSuplMessageL(aSuplSession,aStatus,aMessage);
-		    }
+		    }    	
 		}			
 	}
 
@@ -569,7 +569,7 @@
 	else
 		{
 		iTrace->Trace(_L("COMASUPLProtocolManager::DeInitialize ph1 not present"), KTraceFileName, __LINE__);
-		DeInitilizationCompletedL( KErrNotFound ); //ph1 is not present.
+		TRAP_IGNORE(DeInitilizationCompletedL( KErrNotFound )); //ph1 is not present.
 		}
 	
     }            
--- a/supl/locationomasuplprotocolhandler/protocolhandler/src/epos_comasuplsettings.cpp	Mon May 03 12:54:42 2010 +0300
+++ b/supl/locationomasuplprotocolhandler/protocolhandler/src/epos_comasuplsettings.cpp	Fri May 14 16:17:02 2010 +0300
@@ -133,10 +133,10 @@
 // 
 // -----------------------------------------------------------------------------
 //
-EXPORT_C void COMASuplSettings::SetSUPLUsage(CSuplSettings::TSuplSettingsUsage& aSUPLUsage ) 
+/*EXPORT_C void COMASuplSettings::SetSUPLUsage(CSuplSettings::TSuplSettingsUsage& aSUPLUsage ) 
 	{
     iSUPLUsage = aSUPLUsage;
-	}
+	}*/
 
 // -----------------------------------------------------------------------------
 // COMASuplSettings::SUPLUsage() 
@@ -144,11 +144,11 @@
 // 
 // -----------------------------------------------------------------------------
 //
-EXPORT_C CSuplSettings::TSuplSettingsUsage COMASuplSettings::SUPLUsage() const
+/*EXPORT_C CSuplSettings::TSuplSettingsUsage COMASuplSettings::SUPLUsage() const
 	{
 		return iSUPLUsage;
 	}
-
+*/
 
 // -----------------------------------------------------------------------------
 // COMASuplSettings::SetUIActive
--- a/supl/locationomasuplprotocolhandler/protocolhandlerver1/eabi/eposomasuplprotocolhandler1u.def	Mon May 03 12:54:42 2010 +0300
+++ b/supl/locationomasuplprotocolhandler/protocolhandlerver1/eabi/eposomasuplprotocolhandler1u.def	Fri May 14 16:17:02 2010 +0300
@@ -36,29 +36,27 @@
 	_ZTI23COMASuplFallBackHandler @ 35 NONAME
 	_ZTI24COMASUPLProtocolManager1 @ 36 NONAME
 	_ZTI24COMASuplEcomEventWatcher @ 37 NONAME
-	_ZTI24COMASuplSettingsLauncher @ 38 NONAME
-	_ZTI29COMASuplCompleteSelfRequestor @ 39 NONAME
-	_ZTV12COMASuplETel @ 40 NONAME
-	_ZTV13COMASuplState @ 41 NONAME
-	_ZTV13COMASuplTrace @ 42 NONAME
-	_ZTV15COMASuplSession @ 43 NONAME
-	_ZTV16COMASuplEndState @ 44 NONAME
-	_ZTV16COMASuplPosState @ 45 NONAME
-	_ZTV17COMASuplInitState @ 46 NONAME
-	_ZTV18COMASuplStartState @ 47 NONAME
-	_ZTV19COMASuplDialogTimer @ 48 NONAME
-	_ZTV19COMASuplIapNotifier @ 49 NONAME
-	_ZTV20COMASuplETelNotifier @ 50 NONAME
-	_ZTV20COMASuplPOSRequestor @ 51 NONAME
-	_ZTV20COMASuplPosInitState @ 52 NONAME
-	_ZTV20COMASuplTimeoutTimer @ 53 NONAME
-	_ZTV21COMASuplConnRequestor @ 54 NONAME
-	_ZTV21COMASuplResponseState @ 55 NONAME
-	_ZTV23COMASuplFallBackHandler @ 56 NONAME
-	_ZTV24COMASUPLProtocolManager1 @ 57 NONAME
-	_ZTV24COMASuplEcomEventWatcher @ 58 NONAME
-	_ZTV24COMASuplSettingsLauncher @ 59 NONAME
-	_ZTV29COMASuplCompleteSelfRequestor @ 60 NONAME
-	_ZThn4_N24COMASUPLProtocolManager112HandlePacketERK6TDesC8j @ 61 NONAME
-	_ZThn4_N24COMASUPLProtocolManager117HandlePacketErrorEi @ 62 NONAME
+	_ZTI29COMASuplCompleteSelfRequestor @ 38 NONAME
+	_ZTV12COMASuplETel @ 39 NONAME
+	_ZTV13COMASuplState @ 40 NONAME
+	_ZTV13COMASuplTrace @ 41 NONAME
+	_ZTV15COMASuplSession @ 42 NONAME
+	_ZTV16COMASuplEndState @ 43 NONAME
+	_ZTV16COMASuplPosState @ 44 NONAME
+	_ZTV17COMASuplInitState @ 45 NONAME
+	_ZTV18COMASuplStartState @ 46 NONAME
+	_ZTV19COMASuplDialogTimer @ 47 NONAME
+	_ZTV19COMASuplIapNotifier @ 48 NONAME
+	_ZTV20COMASuplETelNotifier @ 49 NONAME
+	_ZTV20COMASuplPOSRequestor @ 50 NONAME
+	_ZTV20COMASuplPosInitState @ 51 NONAME
+	_ZTV20COMASuplTimeoutTimer @ 52 NONAME
+	_ZTV21COMASuplConnRequestor @ 53 NONAME
+	_ZTV21COMASuplResponseState @ 54 NONAME
+	_ZTV23COMASuplFallBackHandler @ 55 NONAME
+	_ZTV24COMASUPLProtocolManager1 @ 56 NONAME
+	_ZTV24COMASuplEcomEventWatcher @ 57 NONAME
+	_ZTV29COMASuplCompleteSelfRequestor @ 58 NONAME
+	_ZThn4_N24COMASUPLProtocolManager112HandlePacketERK6TDesC8j @ 59 NONAME
+	_ZThn4_N24COMASUPLProtocolManager117HandlePacketErrorEi @ 60 NONAME
 
--- a/supl/locationomasuplprotocolhandler/protocolhandlerver1/group/omasuplprotocolhandler1.mmp	Mon May 03 12:54:42 2010 +0300
+++ b/supl/locationomasuplprotocolhandler/protocolhandlerver1/group/omasuplprotocolhandler1.mmp	Fri May 14 16:17:02 2010 +0300
@@ -51,7 +51,7 @@
 SOURCE      epos_comasuplinitstate.cpp
 SOURCE      epos_comasuplposrequestor.cpp
 SOURCE	    epos_comasuplecomeventwatcher.cpp
-SOURCE      epos_comasuplsettingslauncher.cpp
+//SOURCE      epos_comasuplsettingslauncher.cpp
 SOURCE      epos_comasupltrace.cpp
 SOURCE      epos_comasupldialogtimer.cpp
 SOURCE      epos_comasuplfallbackhandler.cpp
@@ -83,7 +83,7 @@
 LIBRARY insock.lib
 LIBRARY lbs.lib
 LIBRARY eposnwprv.lib
-LIBRARY locsettingsuiclient.lib
+//LIBRARY locsettingsuiclient.lib
 LIBRARY hash.lib
 LIBRARY bafl.lib  //logging
 LIBRARY flogger.lib
--- a/supl/locationomasuplprotocolhandler/protocolhandlerver1/inc/epos_comasuplconnrequestor.h	Mon May 03 12:54:42 2010 +0300
+++ b/supl/locationomasuplprotocolhandler/protocolhandlerver1/inc/epos_comasuplconnrequestor.h	Fri May 14 16:17:02 2010 +0300
@@ -40,9 +40,7 @@
  *  @since S60 v3.1
  */
  
-class COMASuplConnRequestor : public CActive, 
-                              public MOMASuplUICompletionObserver,  
-                              public MOMASuplDialogTimeOutNotifier
+class COMASuplConnRequestor : public CActive
 {
 
 	enum TConnState
@@ -50,7 +48,8 @@
 		  EConnecting,
 		  EConnectionDone,
 	      ESending,
-	      EInitilizeSetting
+	      EInitilizeSetting,
+		  EInitialState
 		};
 
 	public :  // Constructor 
@@ -171,7 +170,6 @@
         
         void GetUsedServerAddress(TDes& aHSLPAddressUsed);
         
-        void SettingsUICompletedL(TInt aError);
         void SettingsUsageUICompletedL(TInt /*aError*/) {}
         void SettingsTimeOutUICompletedL(TInt /*aError*/) {}
         TBool ConvertIAPNameToIdL(const TDesC& aIAPName, TUint32& aIAPId);
@@ -213,7 +211,7 @@
 		 * @param None
 		 * @return None
 		 */
-		virtual void DialogTimerExpiredL();	
+		//virtual void DialogTimerExpiredL();	
   	protected :  // Functions from CActive
       /**
       * From CActive 
@@ -285,14 +283,6 @@
             TBool iIsSettingInitilized;
             
             TInt64 iCurrentSLPId;
-            
-            COMASuplDialogTimer* iDialogTimer;
-            
-            TBool iIapDialogShown;
-            
-            TBool iIapDlgTimerExpired;
-            
-            TBool iIsTimeoutDialogTimerStarted;
 
 };
 
--- a/supl/locationomasuplprotocolhandler/protocolhandlerver1/inc/epos_comasuplfallbackhandler.h	Mon May 03 12:54:42 2010 +0300
+++ b/supl/locationomasuplprotocolhandler/protocolhandlerver1/inc/epos_comasuplfallbackhandler.h	Fri May 14 16:17:02 2010 +0300
@@ -151,6 +151,8 @@
   	    TTime iFallBackStartTime;
 
   	    TInt iAllowedFallBackTimerValue;
+		
+		TBool iAttemptedBackupServer;
       
 };
 
--- a/supl/locationomasuplprotocolhandler/protocolhandlerver1/inc/epos_comasuplprotocolmanager1.h	Mon May 03 12:54:42 2010 +0300
+++ b/supl/locationomasuplprotocolhandler/protocolhandlerver1/inc/epos_comasuplprotocolmanager1.h	Fri May 14 16:17:02 2010 +0300
@@ -273,9 +273,9 @@
 public: 
 
 	// For setting UI observer    
-	TInt LaunchSettingsUI(MOMASuplUICompletionObserver* aObserver,const TDesC& aForHslp);
-	TInt LaunchSuplUsageSettingsUI(MOMASuplUICompletionObserver* aObserver, TBool aRoaming);
-	TInt LaunchSuplDialogTimeoutUI(MOMASuplUICompletionObserver* aObserver );
+	//TInt LaunchSettingsUI(MOMASuplUICompletionObserver* aObserver,const TDesC& aForHslp);
+	//TInt LaunchSuplUsageSettingsUI(MOMASuplUICompletionObserver* aObserver, TBool aRoaming);
+	//TInt LaunchSuplDialogTimeoutUI(MOMASuplUICompletionObserver* aObserver );
 	void UpdateAllSubSessnsInSameSession(TInt aIpcSessionId);
 
 	void SettingsChanged();
@@ -287,7 +287,7 @@
 	* @param aError - Error during Launch
 	* @return None
 	*/
-	void SettingsUICompletedL(TInt aError);
+	void SettingsUICompletedL(TInt /*aError*/) {};
 
 	/** 
 	* This callback method is used to notify the client about 
@@ -295,7 +295,7 @@
 	* @param aError - Error during Launch
 	* @return None
 	*/
-	void SettingsUsageUICompletedL(TInt aError);
+	void SettingsUsageUICompletedL(TInt /*aError*/) {};
 
 	/** 
 	* This callback method is used to notify the client about 
@@ -303,7 +303,7 @@
 	* @param aError - Error during Launch
 	* @return None
 	*/
-	void SettingsTimeOutUICompletedL(TInt aError);
+	void SettingsTimeOutUICompletedL(TInt /*aError*/) {};
 	
 public: //From base class MSuplSettingsObserver
 
@@ -462,7 +462,7 @@
      * @param      None. 
      * @return     None.
      */
-    void ReadSuplUsage();
+   //void ReadSuplUsage();
 	
     
     /**
@@ -510,6 +510,10 @@
 public:  // COMASUPLProtocolManager
     void SetCommonConfig(COMASuplCommonConfig*& aCommmonConfig);
 
+public : // from MSuplSettingsObserver
+    virtual void HandleSuplTriggerStatusChangeL(
+                   CSuplSettings::TSuplTriggerStatus aSuplTriggerStatus );
+           
 private: // Data Members
 
 	//Holds all session objects created by CreateNewSession
@@ -604,4 +608,4 @@
 
 };
 
-#endif // C_COMASUPLPROTOCOLMANAGER1_H
\ No newline at end of file
+#endif // C_COMASUPLPROTOCOLMANAGER1_H
--- a/supl/locationomasuplprotocolhandler/protocolhandlerver1/inc/epos_comasuplsession.h	Mon May 03 12:54:42 2010 +0300
+++ b/supl/locationomasuplprotocolhandler/protocolhandlerver1/inc/epos_comasuplsession.h	Fri May 14 16:17:02 2010 +0300
@@ -52,6 +52,8 @@
 
 #include "EPos_CPosNetworkPrivacy.h"
 
+#include <flogger.h>
+
 
 class RMobilePhone;
 class TOMASuplVersion;
@@ -215,21 +217,21 @@
             * @param aError - Error during Launch
             * @return None
             */
-        	void SettingsUICompletedL(TInt aError);
+        	void SettingsUICompletedL(TInt aError) ;
 		
             /** 
             * This callback method is used to notify the client about 
             * the completion of UI
             * @return None
             */
-			void SettingsUsageUICompletedL(TInt aError);
+					void SettingsUsageUICompletedL(TInt /*aError*/) {};
 			
             /** 
             * This callback method is used to notify the client about 
             * the completion of UI 
             * @return None
             */
-			void SettingsTimeOutUICompletedL(TInt aError);
+					void SettingsTimeOutUICompletedL(TInt aError) ;
 			
 	public: 			 
 			/**
@@ -1067,8 +1069,12 @@
 			
 						
 			TTime iSessionStartTime;
+			TTime iSessionStartTime1;
 			
 			TTime iSessionEndTime;
+			
+			RFileLogger iLogger;
+			
 			//Is POS message is First one or Not.
 			TBool iIsFirstPOSMessage;
 
--- a/supl/locationomasuplprotocolhandler/protocolhandlerver1/src/epos_comasuplconnrequestor.cpp	Mon May 03 12:54:42 2010 +0300
+++ b/supl/locationomasuplprotocolhandler/protocolhandlerver1/src/epos_comasuplconnrequestor.cpp	Fri May 14 16:17:02 2010 +0300
@@ -47,10 +47,7 @@
         iCommMgr(aCommMgr), 
         iProtocolManager(aProtoMgr),
         iPort(aPort),
-        iObserver( aObserver),    				 						  
-        iIapDialogShown(EFalse),
-        iIapDlgTimerExpired(EFalse),    				 			            
-        iIsTimeoutDialogTimerStarted(EFalse)
+        iObserver( aObserver)
         {
 
         }
@@ -77,7 +74,6 @@
 
     iCurrentSLPId = KErrNotFound;
 
-    iDialogTimer = COMASuplDialogTimer::NewL(*this);
     }
 
 // -----------------------------------------------------------------------------
@@ -107,12 +103,7 @@
 COMASuplConnRequestor::~COMASuplConnRequestor()
     {
     Cancel();
-    if(iDialogTimer)
-        {
-        iDialogTimer->Cancel();
-        delete iDialogTimer;
-        iDialogTimer = NULL;
-        }
+  
     delete iSuplSettings;
     delete iTrace;
     delete iFallBackHandler;
@@ -138,27 +129,14 @@
 						buffer.Copy(_L("No access point configured for "));
 						buffer.Append(iHostAddress);
 						iTrace->Trace(buffer,KTraceFileName, __LINE__); 				
-						if( isIapDialogShown )
-						    {
-						    TInt err = iProtocolManager.LaunchSettingsUI(this,iHostAddress);
-						    if(err != KErrNone)
-                                {
-                                buffer.Copy(_L("Error in launching UI : "));
-                                buffer.AppendNum(err);
-                                iTrace->Trace(buffer,KTraceFileName, __LINE__);                 
-                                iHostAddress.Zero();
-                                iObserver.OperationCompleteL(err);
-                                }
-						        else
-						        iIapDialogShown = ETrue;
-						    }
-						
+						buffer.Copy(_L("Calling CreateConnection with no IAP"));
+						iTrace->Trace(buffer,KTraceFileName, __LINE__);
+						iConnection = iCommMgr.CreateConnectionL(iHostAddress,iTls,iPskTls,iPort,-1);
+						OpenConnection();
 						
 					}
         else
             {
-            iIsTimeoutDialogTimerStarted = EFalse;
-            iDialogTimer->Cancel();
             buffer.Copy(_L("Connecting to "));
             buffer.Append(iHostAddress);
             iTrace->Trace(buffer,KTraceFileName, __LINE__); 				
@@ -176,12 +154,9 @@
 // -----------------------------------------------------------------------------
 // COMASuplConnRequestor::OpenConnection
 // -----------------------------------------------------------------------------
-//    
-void COMASuplConnRequestor::CreateConnectionL(TInt aDialogTimeOutDelay)
+//  TODO : Remove this method  
+void COMASuplConnRequestor::CreateConnectionL(TInt /*aDialogTimeOutDelay*/)
     {
-    iIsTimeoutDialogTimerStarted = ETrue;
-
-    iDialogTimer->StartTimer(aDialogTimeOutDelay); 
     CreateConnectionL();
     }
 // -----------------------------------------------------------------------------
@@ -405,7 +380,10 @@
 
 TUint COMASuplConnRequestor::GetPortNumber()
 	{
-	return iConnection->GetPortNumberUsed();
+	if(iConnection)
+		return iConnection->GetPortNumberUsed();
+	else 
+		return 0;
 	}
 	
 // -----------------------------------------------------------------------------
@@ -455,57 +433,7 @@
     return result;
     }
 
-// -----------------------------------------------------------------------------
-// COMASuplConnRequestor::SettingsUICompleted
-// 
-// -----------------------------------------------------------------------------
 
-void COMASuplConnRequestor::SettingsUICompletedL(TInt aError)
-    {
-		TBuf<128> buffer(_L("COMASuplConnRequestor:SettingsUICompleted Error: "));
-    buffer.AppendNum(aError);
-    iTrace->Trace(buffer,KTraceFileName, __LINE__); 
-
-    if (iIsTimeoutDialogTimerStarted)
-        {                
-        iTrace->Trace(_L("COMASuplSession::SettingsUICompleted, stopping timer "), KTraceFileName, __LINE__);
-        iIsTimeoutDialogTimerStarted = EFalse;                    
-        iDialogTimer->StopTimer();
-        }
-    if (iIapDlgTimerExpired)
-        {
-        iIapDlgTimerExpired = EFalse;
-        iIapDialogShown = EFalse;
-        iProtocolManager.LaunchSuplDialogTimeoutUI(this);
-        iObserver.OperationCompleteL(KErrNone);
-        return;
-        }
-    if(aError == KErrNone)
-        {
-        TBuf<100> IapName;
-        TInt err = iProtocolManager.GetLastUsedAccessPoint(IapName,iIAPId);
-        if(err == KErrNone)
-            {
-            buffer.Copy(_L("Connecting to "));
-            buffer.Append(iHostAddress);
-            buffer.Append(_L(" using IAP "));
-            buffer.Append(IapName);
-            iTrace->Trace(buffer,KTraceFileName, __LINE__); 				
-            iConnection = iCommMgr.CreateConnectionL(iHostAddress,iTls,iPskTls,iPort,iIAPId);
-            SaveAccessPoint(IapName);
-            OpenConnection();
-            }
-        else
-            {
-            iObserver.OperationCompleteL(err);	
-            }	
-        }
-    else
-        {
-        iObserver.OperationCompleteL(aError);	
-        }	
-
-    }
 
 // -----------------------------------------------------------------------------
 // COMASuplConnRequestor::SaveAccessPoint
@@ -571,19 +499,5 @@
     iFallBackHandler->UpdateSLPListForHomeUsage(aHomeNetwork);
     }
 
-// -----------------------------------------------------------------------------
-// COMASuplConnRequestor::DialogTimerExpiredL
-// Checks whether UI is displayed or not previously
-// 
-// -----------------------------------------------------------------------------
-void COMASuplConnRequestor::DialogTimerExpiredL()
-    {
-    iTrace->Trace(_L("COMASuplConnRequestor:Timer Expired for SUPL IAP Dialog"), KTraceFileName, __LINE__); 
 
-    if (!iIapDialogShown)
-        iProtocolManager.LaunchSuplDialogTimeoutUI(this);
-    else
-        iIapDlgTimerExpired = ETrue;  
-    return; 
-    }
 //  End of File
--- a/supl/locationomasuplprotocolhandler/protocolhandlerver1/src/epos_comasuplendstate.cpp	Mon May 03 12:54:42 2010 +0300
+++ b/supl/locationomasuplprotocolhandler/protocolhandlerver1/src/epos_comasuplendstate.cpp	Fri May 14 16:17:02 2010 +0300
@@ -259,10 +259,15 @@
 	{
 		return ETrue;
 	}
-
+	
 	if(iEncodedSuplInit && (iEncodedSuplInit->Length()) > 0 &&
 	iHSLPAddress && iHSLPAddress->Length() > 0)
 	{
+		TBuf<64> serverCheck;
+	serverCheck.Copy(*iHSLPAddress);
+	iTrace->Trace(_L("Server Address for VER : "), KTraceFileName, __LINE__); 
+	iTrace->Trace(serverCheck, KTraceFileName, __LINE__); 
+	
 		TInt blockSize = 64;
 	    TChar ipad = 0x36;
 	    TChar opad = 0x5c;
--- a/supl/locationomasuplprotocolhandler/protocolhandlerver1/src/epos_comasupletel.cpp	Mon May 03 12:54:42 2010 +0300
+++ b/supl/locationomasuplprotocolhandler/protocolhandlerver1/src/epos_comasupletel.cpp	Fri May 14 16:17:02 2010 +0300
@@ -12,7 +12,7 @@
 * Contributors:
 *
 * Description:   Implementation of COMASuplEtel Class
-*  Version     : %version: 3 % << Don't touch! Updated by Synergy at check-out.
+*  Version     : %version: 4 % << Don't touch! Updated by Synergy at check-out.
 *
 */
 
@@ -207,6 +207,8 @@
                 {
                 // For GSM Cell Information
                 COMASuplLocationId* locationId = COMASuplLocationId::NewL(); 
+				//Comment to ignore coverity cleanup stack error
+                //coverity[SYMBIAN.CLEANUP_STACK :FALSE]
                 CleanupStack::PushL(locationId);
      			COMASuplGSMCellInfo* gsmCellInfo = COMASuplGSMCellInfo::NewL();
      			CleanupStack::PushL(gsmCellInfo);
@@ -259,6 +261,8 @@
                 {
                 // For WCDMA  Cell Information
                 COMASuplLocationId* locationId = COMASuplLocationId::NewL(); 
+				//Comment to ignore coverity cleanup stack error
+                //coverity[SYMBIAN.CLEANUP_STACK :FALSE]
                 CleanupStack::PushL(locationId);
      			COMASuplCellInfo* wcdmaCellInfo = COMASuplCellInfo::NewL();
      			CleanupStack::PushL(wcdmaCellInfo);
@@ -307,6 +311,8 @@
             	#if _DEBUG 
 	            	// For GSM Cell Information
 	            	COMASuplLocationId* locationId = COMASuplLocationId::NewL(); 
+					//Comment to ignore coverity cleanup stack error
+	            	//coverity[SYMBIAN.CLEANUP_STACK :FALSE]
                 	CleanupStack::PushL(locationId);
      				COMASuplGSMCellInfo* gsmCellInfo = COMASuplGSMCellInfo::NewL();
      				CleanupStack::PushL(gsmCellInfo);
@@ -524,7 +530,7 @@
 	 				
 						for(TInt k = 0; k < KOMASUPLMaxTimeSlotIscpAmount; k++ )	 				
 							{
-								iOMASuplwcdmaCellInfo.iNwkMeasureReport[i].iCellMeasuredResult[j].iTddInfo.iTimeslotISCP[k] = iOMASuplwcdmaCellInfo.iNwkMeasureReport[i].iCellMeasuredResult[j].iTddInfo.iTimeslotISCP[k];
+								iOMASuplwcdmaCellInfo.iNwkMeasureReport[i].iCellMeasuredResult[j].iTddInfo.iTimeslotISCP[k] = iCustomWCDMACellInfo.iNwkMeasureReport[i].iCellMeasuredResult[j].iTddInfo.iTimeslotISCP[k];
 							}
 	 					
 	 			}
--- a/supl/locationomasuplprotocolhandler/protocolhandlerver1/src/epos_comasuplfallbackhandler.cpp	Mon May 03 12:54:42 2010 +0300
+++ b/supl/locationomasuplprotocolhandler/protocolhandlerver1/src/epos_comasuplfallbackhandler.cpp	Fri May 14 16:17:02 2010 +0300
@@ -42,7 +42,8 @@
 // -----------------------------------------------------------------------------
 //
 COMASuplFallBackHandler::COMASuplFallBackHandler(CSuplSettingsInternal& aSettings):
-												iSuplSettings(aSettings)
+												iSuplSettings(aSettings),
+												iAttemptedBackupServer(EFalse)
     {
 
     }
@@ -113,6 +114,8 @@
 TInt COMASuplFallBackHandler::GetNextSLPAddressL(TInt64& aSLPId, TDes& aHslpToBeUsedAddress,TDes& aIAPName,TBool& aTls,
                                                  TBool& aPskTls,TInt aLastErrorCode,TBool& aIsIapDialogShown)
     {
+	iTrace->Trace(_L("COMASuplFallBackHandler::GetNextSLPAddressL"),KTraceFileName, __LINE__);
+	
     _LIT(KFormatTxt,"%/0%1%/1%2%/2%3%/3 %-B%:0%J%:1%T%:2%S%:3%+B"); 
     
     TBuf<256> LogBuffer;
@@ -162,6 +165,37 @@
 	     	}  
 	 	} 
     
+	//Check to see if the server list is empty.  If it is create the HSLP Address from the IMSI and use that
+	// as the server address.  This does not add the server to the list and this functionality should only
+	// be tried once
+	if(iSLPList->Count() <= 0 && (!iAttemptedBackupServer))
+		{
+		iTrace->Trace(_L("Going to create and use alternative HSLP Address from IMSI"),KTraceFileName, __LINE__);
+
+		iAttemptedBackupServer = ETrue;
+
+		//Generate the HSLP Address
+		GenerateHslpAddressFromIMSIL();
+
+		//Copy the generated address into the supplied function arguments
+		aHslpToBeUsedAddress.Copy(iGenratedHslpAddress);
+		aIAPName.Zero();   
+		aIAPName.Copy(iDefaultIAPName);
+		aTls = ETrue;
+		aPskTls = EFalse;
+		aIsIapDialogShown = ETrue;
+
+		iTrace->Trace(_L("Server being used:"),KTraceFileName, __LINE__);
+		LogBuffer.Copy(aHslpToBeUsedAddress);
+		iTrace->Trace(LogBuffer,KTraceFileName, __LINE__);
+
+		iTrace->Trace(_L("iap being used:"),KTraceFileName, __LINE__);
+		LogBuffer.Copy(aIAPName);
+		iTrace->Trace(LogBuffer,KTraceFileName, __LINE__);
+
+		return KErrNone;
+		}
+	
     if( iSLPList->Count() <= 0 || iCurrentServerCounter >= iSLPList->Count() ) 
         {
         LogBuffer.Copy(_L("No more servers available..."));
--- a/supl/locationomasuplprotocolhandler/protocolhandlerver1/src/epos_comasuplinitstate.cpp	Mon May 03 12:54:42 2010 +0300
+++ b/supl/locationomasuplprotocolhandler/protocolhandlerver1/src/epos_comasuplinitstate.cpp	Fri May 14 16:17:02 2010 +0300
@@ -988,17 +988,6 @@
 				{
 						iTrace->Trace(_L("Real: Supl 1.0..APE Flag is OFF..."), KTraceFileName, __LINE__); 
 				}
-				  
-  iRequestIDFeatureFlag = ETrue;
-	
-	if (iRequestIDFeatureFlag)
-        {
-						iTrace->Trace(_L("Supl 1.0..APE Centric Arch Feature Flag is ON..."), KTraceFileName, __LINE__); 
-        }   
-	else
-				{
-						iTrace->Trace(_L("Supl 1.0..APE Centric Arch Feature Flag is OFF..."), KTraceFileName, __LINE__); 
-				}
 	
 }
 //  End of File
--- a/supl/locationomasuplprotocolhandler/protocolhandlerver1/src/epos_comasuplposinitstate.cpp	Mon May 03 12:54:42 2010 +0300
+++ b/supl/locationomasuplprotocolhandler/protocolhandlerver1/src/epos_comasuplposinitstate.cpp	Fri May 14 16:17:02 2010 +0300
@@ -392,6 +392,8 @@
 	// Re-initialize the POS Requestor
 	if(iPosRequestor)
 		iPosRequestor->DestroyList();
+	//Comment to ignore coverity forward NULL stack error
+    //coverity[FORWARD_NULL   :FALSE]
 	iPosRequestor->CreateListL();
 	
 	// Create SET capabilities object
@@ -409,24 +411,27 @@
 	// Create Velocity
 	iVelocity = COMASuplVelocity::NewL();
 	
-
-	// Append the SUPL POS INIT optional parameters to the list
-	// in POS Requestor
-	iPosRequestor->AppendInfoRequest(iCurSetCapabilities);
-	iPosRequestor->AppendInfoRequest(iReqAsstData);
-	iPosRequestor->AppendInfoRequest(iPosition);
-	iPosRequestor->AppendInfoRequest(iPosPayload);
-	iPosRequestor->AppendInfoRequest(iVelocity);
+    if(iPosRequestor)
+        {
+        // Append the SUPL POS INIT optional parameters to the list
+        // in POS Requestor
+        iPosRequestor->AppendInfoRequest(iCurSetCapabilities);
+        iPosRequestor->AppendInfoRequest(iReqAsstData);
+        iPosRequestor->AppendInfoRequest(iPosition);
+        iPosRequestor->AppendInfoRequest(iPosPayload);
+        iPosRequestor->AppendInfoRequest(iVelocity);
 	
-	// Set self as Observer to POS Requestor
-	iPosRequestor->SetObserver(this);
+
 	
-	TBuf<128> msg(_L("Filling iPosMethod in iPosRequestor: "));
-	iTrace->Trace(msg, KTraceFileName, __LINE__); 
-	if(iPosRequestor)
-		{
-		iAllowedCapabilitiesforPOS.SetAllowedCapabilities(EFalse, EFalse, EFalse, EFalse, EFalse, EFalse, EFalse, EFalse);
-		iPosRequestor->SetPosMethodAndAllowedCapabilities (iAllowedCapabilitiesforPOS,iPosMethod ); 
+        TBuf<128> msg(_L("Filling iPosMethod in iPosRequestor: "));
+        iTrace->Trace(msg, KTraceFileName, __LINE__); 
+
+        // Set self as Observer to POS Requestor
+		//Comment to ignore coverity reverse NULL error
+        //coverity[REVERSE_INULL :FALSE]
+        iPosRequestor->SetObserver(this);
+        iAllowedCapabilitiesforPOS.SetAllowedCapabilities(EFalse, EFalse, EFalse, EFalse, EFalse, EFalse, EFalse, EFalse);
+        iPosRequestor->SetPosMethodAndAllowedCapabilities (iAllowedCapabilitiesforPOS,iPosMethod ); 
         if(iHSLPAddress)
             {
             HBufC* slpAddress = CnvUtfConverter::ConvertToUnicodeFromUtf8L(*iHSLPAddress);
@@ -438,7 +443,7 @@
 		}
 	// Get the information from POS
 	if(iPosRequestor)
-	User::LeaveIfError(iPosRequestor->GetSuplInfoL());
+	    User::LeaveIfError(iPosRequestor->GetSuplInfoL());
 	
 	}
 // -----------------------------------------------------------------------------
@@ -585,8 +590,8 @@
 
 		    iPosRequestor->SetPosMethodAndAllowedCapabilities (iAllowedCapabilitiesforPOS,iPosMethod  ); 
         }
-		
-		OMASuplPosInit->SetSuplPosInit(static_cast<COMASuplSETCapabilities*>(iOldCapabilities->CloneL()),static_cast<COMASuplLocationId*>(iLocationId->CloneL()),iECId);
+		if(iOldCapabilities)
+		    OMASuplPosInit->SetSuplPosInit(static_cast<COMASuplSETCapabilities*>(iOldCapabilities->CloneL()),static_cast<COMASuplLocationId*>(iLocationId->CloneL()),iECId);
 		if(iECId)
 			{
 				OMASuplPosInit->SetECellId(iMmCellInfo);
@@ -747,6 +752,7 @@
         iTrace->Trace(_L("COMASuplPosInitState::ComparisionLocationIDRequestCompletedL Cell Id not changed since making last request, so continuing"), KTraceFileName, __LINE__); 
         if(iLocationId)
             delete iLocationId;
+        //coverity[REVERSE_INULL  :FALSE]
         iLocationId = aLocationId;
         if(iMsgStateObserver)
         iMsgStateObserver->OperationCompleteL(aErrorCode);
@@ -778,7 +784,8 @@
                        delete iLocationId;
                     iLocationId = aLocationId;
                     iTrace->Trace(_L("COMASuplPosInitState::ComparisionLocationIDRequestCompletedL toe limit greater than KMaxCellIdChangeToeLimit. But repeated a pos fetch already so continuing"), KTraceFileName, __LINE__);
-                    iMsgStateObserver->OperationCompleteL(aErrorCode);//use the pos data as it is
+                    if(iMsgStateObserver)
+                        iMsgStateObserver->OperationCompleteL(aErrorCode);//use the pos data as it is
                     }
                 }
             else //ignore the position data
@@ -789,7 +796,8 @@
                 if(iLocationId)
                 	delete iLocationId;
                 iLocationId = aLocationId;
-                iMsgStateObserver->OperationCompleteL(aErrorCode);
+                if(iMsgStateObserver)
+                    iMsgStateObserver->OperationCompleteL(aErrorCode);
                 }
             }
         }
--- a/supl/locationomasuplprotocolhandler/protocolhandlerver1/src/epos_comasuplposrequestor.cpp	Mon May 03 12:54:42 2010 +0300
+++ b/supl/locationomasuplprotocolhandler/protocolhandlerver1/src/epos_comasuplposrequestor.cpp	Fri May 14 16:17:02 2010 +0300
@@ -75,14 +75,16 @@
 //
 void COMASuplPOSRequestor::DestroyList()
     {
-		iTrace->Trace(_L("COMASuplPOSRequestor::DestroyList"), KTraceFileName, __LINE__); 
-		if(iOMASuplInfoRequestList)
-			{
-				delete iOMASuplInfoRequestList;
-				iOMASuplInfoRequestList = NULL;
-			
-			}
-	}
+    if(iTrace)
+        iTrace->Trace(_L("COMASuplPOSRequestor::DestroyList"), KTraceFileName, __LINE__); 
+    
+    if(iOMASuplInfoRequestList)
+        {
+        delete iOMASuplInfoRequestList;
+        iOMASuplInfoRequestList = NULL;
+
+        }
+    }
 
 // -----------------------------------------------------------------------------
 // COMASuplPOSRequestor::NewL
--- a/supl/locationomasuplprotocolhandler/protocolhandlerver1/src/epos_comasuplprotocolmanager1.cpp	Mon May 03 12:54:42 2010 +0300
+++ b/supl/locationomasuplprotocolhandler/protocolhandlerver1/src/epos_comasuplprotocolmanager1.cpp	Fri May 14 16:17:02 2010 +0300
@@ -102,10 +102,10 @@
 // Destructor.
 EXPORT_C COMASUPLProtocolManager1::~COMASUPLProtocolManager1()
 	{
-	if(iSettingsLauncher)		
+	/*if(iSettingsLauncher)		
 		{
 			iSettingsLauncher->CancelLaunch();
-		}
+		}*/
 	iSuplSettings->SetUIActive( EFalse );
 
 	DeleteAllSessions();
@@ -127,7 +127,7 @@
 	
 	delete iSuplEcomEventWatcher;
 	
-    delete iSettingsLauncher;
+    //delete iSettingsLauncher;
     delete iNotifier;
 	iMobilePhone.Close(); 
 	iTelServer.Close();
@@ -165,7 +165,7 @@
 	iSuplStorageSettings = CSuplSettingsInternal::NewL();
 	iSuplStorageSettings->SetObserverL(*this);
 
-   	iSettingsLauncher = COMASuplSettingsLauncher::NewL( *this );
+   	//iSettingsLauncher = COMASuplSettingsLauncher::NewL( *this );
 	
    	iIMSI.CreateL( KMaxIMSILen );
 	iIsPreviouslyDecodingFailed = EFalse;
@@ -242,7 +242,7 @@
 	//Connect to ETel
 	User::LeaveIfError(ConnectToETelL());
   
-    ReadSuplUsage();    
+    //ReadSuplUsage();    
 	 
 	if(iSuplEcomEventWatcher)
 		{
@@ -1179,7 +1179,7 @@
     if( aEvent == MSuplSettingsObserver::ESuplSettingsEventSuplUsageChange)
         {
         iTrace->Trace(_L("Setting Changed.SUPL Usage changed.. Reeading once again..."), KTraceFileName, __LINE__);
-        ReadSuplUsage();
+        //ReadSuplUsage();
 		}
 	else if( aEvent == MSuplSettingsObserver::ESuplSettingsEventCommParameterChange)
 		{
@@ -1612,7 +1612,7 @@
 // 
 // -----------------------------------------------------------------------------
 //
-TInt COMASUPLProtocolManager1::LaunchSettingsUI(MOMASuplUICompletionObserver* aObserver,const TDesC& aForHslp)
+/*TInt COMASUPLProtocolManager1::LaunchSettingsUI(MOMASuplUICompletionObserver* aObserver,const TDesC& aForHslp)
     {        
 	iTrace->Trace(_L("COMASUPLProtocolManager1::LaunchSettingsUI"), KTraceFileName, __LINE__);
 
@@ -1634,7 +1634,7 @@
     	}
     		
 	return KErrNone;
-    }
+    }*/
 
 // -----------------------------------------------------------------------------
 // COMASUPLProtocolManager1::SettingsUICompletedL
@@ -1642,7 +1642,7 @@
 // 
 // -----------------------------------------------------------------------------
 //
-void COMASUPLProtocolManager1::SettingsUICompletedL(TInt aError)
+/*void COMASUPLProtocolManager1::SettingsUICompletedL(TInt aError)
 	{
 	iTrace->Trace(_L("COMASUPLProtocolManager1::SettingsUICompletedL"), KTraceFileName, __LINE__);
     iSuplSettings->SetUIActive(EFalse);
@@ -1667,7 +1667,7 @@
     iCurrentlyUsedHslp.Copy(_L(""));	
     iUIRequestArray.Reset();
     }
-
+*/
 
 // -----------------------------------------------------------------------------
 // COMASUPLProtocolManager1::DeInitialize
@@ -1727,7 +1727,7 @@
 // 
 // -----------------------------------------------------------------------------
 //
-TInt COMASUPLProtocolManager1::LaunchSuplUsageSettingsUI(MOMASuplUICompletionObserver* aObserver, TBool aRoaming)	
+/*TInt COMASUPLProtocolManager1::LaunchSuplUsageSettingsUI(MOMASuplUICompletionObserver* aObserver, TBool aRoaming)	
 	{
 	iTrace->Trace(_L("COMASUPLProtocolManager1::LaunchSuplUsageSettingsUI"), KTraceFileName, __LINE__);
     if (iSuplSettings->IsUIActive() && !iTimeOutDialogPresent)
@@ -1742,7 +1742,7 @@
     iSessnUIObserver = aObserver;            
     iSuplSettings->SetUIActive(ETrue);
     return iSettingsLauncher->LaunchSuplUsageSettingsUI(aRoaming);
-	}
+	}*/
 
 // -----------------------------------------------------------------------------
 // COMASUPLProtocolManager1::SettingsUsageUICompletedL
@@ -1750,7 +1750,7 @@
 // 
 // -----------------------------------------------------------------------------
 //
-void COMASUPLProtocolManager1::SettingsUsageUICompletedL(TInt aError)
+/*void COMASUPLProtocolManager1::SettingsUsageUICompletedL(TInt aError)
 	{
 	iTrace->Trace(_L("COMASUPLProtocolManager1::SettingsUsageUICompletedL"), KTraceFileName, __LINE__);
     iSuplSettings->SetUIActive(EFalse);
@@ -1768,7 +1768,7 @@
         }
 
     CheckOutstandingUsageUIRequestsL();
-	}
+	}*/
 
 // -----------------------------------------------------------------------------
 // COMASUPLProtocolManager1::ReadSuplUsage
@@ -1776,7 +1776,7 @@
 // 
 // -----------------------------------------------------------------------------
 //
-void COMASUPLProtocolManager1::ReadSuplUsage()
+/*void COMASUPLProtocolManager1::ReadSuplUsage()
 	{
 	iTrace->Trace(_L("COMASUPLProtocolManager1::ReadSuplUsage start"), KTraceFileName, __LINE__);	
 	CSuplSettings::TSuplSettingsUsage suplUsage;
@@ -1786,7 +1786,7 @@
 			iSuplSettings->SetSUPLUsage(suplUsage);
 		}
 	iTrace->Trace(_L("COMASUPLProtocolManager1::ReadSuplUsage end"), KTraceFileName, __LINE__);	
-	}
+	}*/
 
 void COMASUPLProtocolManager1::UpdateAllSubSessnsInSameSession(TInt aIpcSessionId)
     {
@@ -1827,7 +1827,7 @@
 
             if (OMAsuplSession->GetSuplUsageFlag())
                 {                        
-                OMAsuplSession->StartUsageDialogLaunchL();
+                //OMAsuplSession->StartUsageDialogLaunchL();
                 break;
                 }
 		}
@@ -1917,7 +1917,7 @@
 // 
 // -----------------------------------------------------------------------------
 //
-TInt COMASUPLProtocolManager1::LaunchSuplDialogTimeoutUI(MOMASuplUICompletionObserver* aObserver )
+/*TInt COMASUPLProtocolManager1::LaunchSuplDialogTimeoutUI(MOMASuplUICompletionObserver* aObserver )
     {
     iTrace->Trace(_L("COMASUPLProtocolManager1::LaunchTimeOutUI"), KTraceFileName, __LINE__);
     
@@ -1931,7 +1931,7 @@
     iSuplSettings->SetUIActive(ETrue);
     iTimeOutDialogPresent = ETrue;
     return iSettingsLauncher->LaunchSessionTimeOutDialog();		
-    }
+    }*/
 
 // -----------------------------------------------------------------------------
 // COMASUPLProtocolManager1::SettingsTimeOutUICompletedL
@@ -1939,7 +1939,7 @@
 // 
 // -----------------------------------------------------------------------------
 //
-void COMASUPLProtocolManager1::SettingsTimeOutUICompletedL(TInt aError)
+/*void COMASUPLProtocolManager1::SettingsTimeOutUICompletedL(TInt aError)
 	{
 	iTrace->Trace(_L("COMASUPLProtocolManager1::SettingsTimeOutUICompletedL"), KTraceFileName, __LINE__);
     iSuplSettings->SetUIActive(EFalse);
@@ -1956,16 +1956,17 @@
         if (iSessnUIObserver)                
         	iSessnUIObserver->SettingsTimeOutUICompletedL(aError);
         }
-	}
+	}*/
 
 // -----------------------------------------------------------------------------
 // COMASUPLProtocolManager1::GetLastUsedAccessPoint
 // 
 // -----------------------------------------------------------------------------
 //
-TInt COMASUPLProtocolManager1::GetLastUsedAccessPoint(TDes& aLastlyUsedAccessPoint,TUint32& iIAPId)
+TInt COMASUPLProtocolManager1::GetLastUsedAccessPoint(TDes& /*aLastlyUsedAccessPoint*/,TUint32& /*iIAPId*/)
 	{
-	return iSettingsLauncher->GetIAPName(aLastlyUsedAccessPoint,iIAPId);
+	//return iSettingsLauncher->GetIAPName(aLastlyUsedAccessPoint,iIAPId);
+	return KErrNone;
 	}
 
 // -----------------------------------------------------------------------------
@@ -2064,5 +2065,9 @@
     iSuplInitTimeOut = aCommmonConfig->iSuplInitTimeOut;
     iPersistFailTimer = aCommmonConfig->iPersistFailTimer;
     }
+void COMASUPLProtocolManager1::HandleSuplTriggerStatusChangeL(
+               CSuplSettings::TSuplTriggerStatus /*aSuplTriggerStatus*/ ) 
+    {
     
+    }
 // end of file
--- a/supl/locationomasuplprotocolhandler/protocolhandlerver1/src/epos_comasuplsession.cpp	Mon May 03 12:54:42 2010 +0300
+++ b/supl/locationomasuplprotocolhandler/protocolhandlerver1/src/epos_comasuplsession.cpp	Fri May 14 16:17:02 2010 +0300
@@ -205,6 +205,12 @@
         
         iNetworkPrivacy 	= CPosNetworkPrivacy::NewL();
         
+        #ifdef PRINT_MESSAGE
+        TInt retval = iLogger.Connect();
+        if(retval == KErrNone)
+				iLogger.CreateLog(_L("NFT"),_L("NFT.txt"),EFileLoggingModeAppend);
+				#endif
+        
 		iTrace->Trace(_L("End of COMASuplSession::ConstructL"), KTraceFileName, __LINE__); 
     }
     
@@ -316,6 +322,11 @@
         delete iDialogTimer;
         
         delete iNetworkPrivacy;
+        
+        #ifdef PRINT_MESSAGE
+        iLogger.CloseLog();
+				iLogger.Close();
+				#endif
     	
     	if(iTrace)
     		iTrace->Trace(_L("End of ~COMASuplSession::COMASuplSession"), KTraceFileName, __LINE__); 
@@ -426,6 +437,11 @@
                                        TBool aFallBack, TInt aAllowedCapabilities,
  									  TInt aSessionIdSeed,TInt aRequestID)
     {
+    	
+    		iSessionStartTime1.HomeTime();
+    		
+				
+    	
 	    iRunRequestStatus = & aStatus;
 	    *iRunRequestStatus = KRequestPending;
 
@@ -789,9 +805,39 @@
     {	
     	if(iRunRequestStatus)
     		{
-    		
+    		TTimeIntervalSeconds timeTaken;
     		TTime currentTime;
     		currentTime.HomeTime();
+    		currentTime.SecondsFrom(iSessionStartTime1,timeTaken);
+    		
+    		#ifdef PRINT_MESSAGE
+    		TBuf<30> bufTime1;
+    		_LIT( KFormatDate, "%d%+02d%+02d:%+02d%+02d%+02d.%+06d");
+    		
+    		TDateTime datetime = iSessionStartTime1.DateTime();
+				bufTime1.Format( KFormatDate, datetime.Year(), 
+				datetime.Month(), datetime.Day(), 
+				datetime.Hour(), datetime.Minute(), 
+				datetime.Second(), datetime.MicroSecond());
+
+				iLogger.Write(_L("Session started at time : "));
+    		iLogger.Write(bufTime1);
+				
+				TBuf<30> bufTime;
+				
+				TDateTime datetime1 = currentTime.DateTime();
+				bufTime.Format( KFormatDate, datetime1.Year(), 
+				datetime1.Month(), datetime1.Day(), 
+				datetime1.Hour(), datetime1.Minute(), 
+				datetime1.Second(), datetime1.MicroSecond());
+				
+				iLogger.Write(_L("Session ended at time : "));
+    		iLogger.Write(bufTime);
+    		iLogger.Write(_L("Time taken : "));
+    		//bufTime.Copy(timeTaken);
+    		iLogger.Write(bufTime);
+    		#endif
+    		
     		iSessionCompletionCode = aCompletionCode;
     		
 			TBuf<64> errorCode;
@@ -1716,7 +1762,7 @@
 			TInt err = PosEstimate.GetConfidence(confidence);
 			altitude = 0;
 			if (altErr == KErrNone)
-			AltitudeInfo.GetAltitudeInfo(AltitudeDirection,altitude,AltitudeUncertainty);
+			    AltitudeInfo.GetAltitudeInfo(AltitudeDirection,altitude,AltitudeUncertainty);
 			PosEstimate.GetUncertainty(Uncertainty);
             Uncertainty.GetUncertainty(UncertaintySemiMajor,UncertaintySemiMinor,
             							OrientationMajorAxis);
@@ -1950,81 +1996,81 @@
 //
 void COMASuplSession::HandleOMASuplMessageL(COMASuplAsnMessageBase* aDecodedAsnMessage,TRequestStatus& aStatus,TInt aSessionIdSeed,TInt aErrorCode)
 	{
-    delete iSuplState;
-    iSuplState = NULL;
-    
-    iSETSessionUniqueId = aSessionIdSeed;
-    iRunRequestStatus = & aStatus;
-    *iRunRequestStatus = KRequestPending;
-    
-    TInt networkMode = 1;
-    networkMode = GetNetworkModeL();
-    
-    TBuf<64> msg;
-    if ( networkMode == ECoreAppUIsNetworkConnectionNotAllowed )
-        {
-            msg.Copy(_L("The device is in OFFLINE mode."));
-            iTrace->Trace(msg,KTraceFileName, __LINE__); 
-            iSessionObserver.TerminateSession(this, KErrGeneral);
-            return;
-        }
-    else
-        {
-            msg.Copy(_L("The device is in ON LINE mode."));
-            iTrace->Trace(msg,KTraceFileName, __LINE__); 
-        }
-
-    CSuplSettings::TSuplSettingsUsage usage = iSuplSettings->SUPLUsage();
-
-    if (usage == CSuplSettings::ESuplUsageDisabled)
-        {                
-        msg.Copy(_L("SUPL Usage is disabled"));
-        iTrace->Trace(msg,KTraceFileName, __LINE__); 
-        iSessionObserver.TerminateSession(this, KErrGeneral);	
-        return;
-        }
-    
-    COMASuplAsnMessageBase::TSuplMessageType messageType = aDecodedAsnMessage->MessageType();
-    
-    if(messageType == COMASuplAsnMessageBase::ESUPL_INIT && aErrorCode == KErrNone)
-        {
-            HandleOMASuplMessageL(aDecodedAsnMessage);
-        }
-    else //Other messages than SUPL_INIT.... Send End
-        {
-        CreateCloneMessageL(aDecodedAsnMessage);		
-        UpdateSuplSessionIDL();
+		delete iSuplState;
+		iSuplState = NULL;
+		
+		iSETSessionUniqueId = aSessionIdSeed;
+		iRunRequestStatus = & aStatus;
+	    *iRunRequestStatus = KRequestPending;
+	    
+		TInt networkMode = 1;
+		networkMode = GetNetworkModeL();
+		
+		TBuf<64> msg;
+		if ( networkMode == ECoreAppUIsNetworkConnectionNotAllowed )
+			{
+				msg.Copy(_L("The device is in OFFLINE mode."));
+				iTrace->Trace(msg,KTraceFileName, __LINE__); 
+				iSessionObserver.TerminateSession(this, KErrGeneral);
+				return;
+			}
+		else
+			{
+				msg.Copy(_L("The device is in ON LINE mode."));
+				iTrace->Trace(msg,KTraceFileName, __LINE__); 
+			}
+
+        /*CSuplSettings::TSuplSettingsUsage usage = iSuplSettings->SUPLUsage();
+
+        if (usage == CSuplSettings::ESuplUsageDisabled)
+            {                
+			msg.Copy(_L("SUPL Usage is disabled"));
+			iTrace->Trace(msg,KTraceFileName, __LINE__); 
+	        iSessionObserver.TerminateSession(this, KErrGeneral);	
+			return;
+            }*/
+	    
+	    COMASuplAsnMessageBase::TSuplMessageType messageType = aDecodedAsnMessage->MessageType();
+	    
+	    if(messageType == COMASuplAsnMessageBase::ESUPL_INIT && aErrorCode == KErrNone)
+	    	{
+	    		HandleOMASuplMessageL(aDecodedAsnMessage);
+	    	}
+	    else //Other messages than SUPL_INIT.... Send End
+	    	{
+	    		CreateCloneMessageL(aDecodedAsnMessage);		
+	    		UpdateSuplSessionIDL();
         if (iRequestType == ESUPL_NETWORK && messageType == COMASuplAsnMessageBase::ESUPL_INIT)
             {
             ServerAddressCheckForSuplInitL();
             }
-
-        iSuplSessionState = ESUPL_INITIALIZED;
-        iSuplMsgType = ESUPL_END;
-
-        if((aErrorCode == KErrCompletion && messageType == COMASuplAsnMessageBase::ESUPL_INIT) ||
-            (aErrorCode == KErrOMASuplOutOfRangeParameter && messageType == COMASuplAsnMessageBase::ESUPL_INIT) ||
-            (aErrorCode == KErrOMASuplMessageLengthMismatch && messageType == COMASuplAsnMessageBase::ESUPL_INIT) ||
-            (aErrorCode == KErrOMASuplShortFrame && messageType == COMASuplAsnMessageBase::ESUPL_INIT))	    			
-            {
-            iErrorStatusCode = COMASuplEnd::EUnexpectedDataValue;
-            if(aErrorCode == KErrOMASuplMessageLengthMismatch)
-                {
-                    iErrorStatusCode = COMASuplEnd::EProtocolError;
-                }
-            if(aErrorCode == KErrOMASuplShortFrame)
-                {
-                    iErrorStatusCode = COMASuplEnd::EDataMissing;
-                }
-            TInt len = iHSLPAddress.Length();
-            HBufC8 *hslpAdress = NULL;
-            if(len > 0)
-                {
-                hslpAdress = HBufC8::NewL(iHSLPAddress.Length());
-                hslpAdress->Des().Copy(iHSLPAddress);
-                }
-            else if(len ==0)
-                {
+				iSuplSessionState = ESUPL_INITIALIZED;
+				iSuplMsgType = ESUPL_END;
+
+	    		if((aErrorCode == KErrCompletion && messageType == COMASuplAsnMessageBase::ESUPL_INIT) ||
+	    			(aErrorCode == KErrOMASuplOutOfRangeParameter && messageType == COMASuplAsnMessageBase::ESUPL_INIT) ||
+	    			(aErrorCode == KErrOMASuplMessageLengthMismatch && messageType == COMASuplAsnMessageBase::ESUPL_INIT) ||
+						(aErrorCode == KErrOMASuplShortFrame && messageType == COMASuplAsnMessageBase::ESUPL_INIT))	    			
+	    			{
+	    				iErrorStatusCode = COMASuplEnd::EUnexpectedDataValue;
+	    				if(aErrorCode == KErrOMASuplMessageLengthMismatch)
+	    					{
+	    						iErrorStatusCode = COMASuplEnd::EProtocolError;
+	    					}
+      				if(aErrorCode == KErrOMASuplShortFrame)
+	    					{
+	    						iErrorStatusCode = COMASuplEnd::EDataMissing;
+	    					}
+						TInt len = iHSLPAddress.Length();
+						HBufC8 *hslpAdress = NULL;
+						if(len > 0)
+						{
+							hslpAdress = HBufC8::NewL(iHSLPAddress.Length());
+							hslpAdress->Des().Copy(iHSLPAddress);
+						}
+						
+						else if(len ==0)
+						{
                 CServerParams* serverParams = CServerParams::NewL();
                 CleanupStack::PushL(serverParams);
             
@@ -2054,19 +2100,19 @@
                 }
             delete iSuplState;
             iSuplState = NULL;
-            CleanupStack::PushL(hslpAdress);
-            iSuplState = COMASuplEndState::NewL(iErrorStatusCode,iOMASuplAsnHandlerBaseImpl,iEncodedSuplInit,hslpAdress);		
-            CleanupStack::PopAndDestroy(hslpAdress);
-            }
-        else
-            {
-            iErrorStatusCode = COMASuplEnd::EUnexpectedMessage;
-            iSuplState = COMASuplEndState::NewL(iErrorStatusCode,iOMASuplAsnHandlerBaseImpl);
-            }	
-            
-        SetPOSMsgPluginState(COMASuplPosSessionBase::EOMASuplCreating);	
-        iSuplState->SetMsgStateObserver(this);
-        //SMP Changes
+						CleanupStack::PushL(hslpAdress);
+						iSuplState = COMASuplEndState::NewL(iErrorStatusCode,iOMASuplAsnHandlerBaseImpl,iEncodedSuplInit,hslpAdress);		
+						CleanupStack::PopAndDestroy(hslpAdress);
+	    			}
+	    		else
+	    			{
+	    				iErrorStatusCode = COMASuplEnd::EUnexpectedMessage;
+	    				iSuplState = COMASuplEndState::NewL(iErrorStatusCode,iOMASuplAsnHandlerBaseImpl);
+	    			}	
+	    			
+	    		SetPOSMsgPluginState(COMASuplPosSessionBase::EOMASuplCreating);	
+				iSuplState->SetMsgStateObserver(this);
+				//SMP Changes
         iSuplState->GenerateMessageL(); //Has to be here because initialisation has to be done for NI case in decode failed scenario.
         iSuplSessionState = ESUPL_GENERATE;
         }	
@@ -3031,6 +3077,8 @@
 								return;
 							}
 					}
+				//Comment to ignore coverity missing break error
+				//coverity[MISSING_BREAK  :FALSE] 
 				case COMASuplState::ESUPL_POS_INIT:
 				{
 					cancelSendRequestor = EFalse;
@@ -3218,70 +3266,71 @@
 //
 void COMASuplSession::HandleSuplInitErrorL(TInt aErr)
 	{
-    iTrace->Trace(_L("Start COMASuplSession::HandleSuplInitError"), KTraceFileName, __LINE__); 
-    
-    if(aErr == KErrOMAInvalidHSLPAddress)
-        {
-            iTrace->Trace(_L("COMASuplSession::HandleSuplInitError HSLP Address is not matching..."), KTraceFileName, __LINE__);
-            //Close Connection : bug Fix.
-            iConnRequestor->CloseConnection();
-            iPortNum = 0;
-            iSessionObserver.TerminateSession(this, KErrCompletion);
-            return;
-        }
-            
-    TBool setStatusCode = ETrue;
-    
-
-    
-    if(aErr == KErrSuplInvalidSessionID)
-        {
-            iTrace->Trace(_L("COMASuplSession::HandleSuplInitError Received SET Session ID"), KTraceFileName, __LINE__);
-            iErrorStatusCode = COMASuplEnd::EInvalidSessionId;	
-
-            COMASuplSessionID* retrivedSessionID = NULL;
-            iDecodedAsnMessage->SessionId(retrivedSessionID);
-
-            // Set the SessionId.
-            iTrace->Trace(_L("COMASuplSession::HandleSuplInitError Update SET Session ID"), KTraceFileName, __LINE__);
-            UpdateSETSessionIDL(retrivedSessionID);
-
-        }
-        
-    if(aErr == KErrOMANonProxyModeNotSupported)
-        {
-            iTrace->Trace(_L("COMASuplSession::HandleSuplInitError Received Nonproxymode data"), KTraceFileName, __LINE__);
-            iErrorStatusCode = COMASuplEnd::ENonProxyModeNotSupported;	
-        }
-
-    if(KErrAccessDenied == aErr || KErrOMASuplDenied == aErr)
-        {
-            iTrace->Trace(_L("COMASuplSession::HandleSuplInitError KErrAccessDenied|| KErrOMASuplDenied"), KTraceFileName, __LINE__);
-            iErrorStatusCode = COMASuplEnd::EConsentDeniedByUser;	
-        }
-
-    if(aErr == KErrOMASuplNoPosition || KErrOMASuplInformationOnly == aErr)
-        {
-            //Supl End with No Position
-            iTrace->Trace(_L("COMASuplSession::HandleSuplInitError KErrOMASuplNoPosition || KErrOMASuplInformationOnly"), KTraceFileName, __LINE__);
-            setStatusCode = EFalse;
-        }
-    
-    if(KErrOMASuplAccepted == aErr)
-        {
-            iTrace->Trace(_L("COMASuplSession::HandleSuplInitError EConsentGrantedByUser"), KTraceFileName, __LINE__);
-            iErrorStatusCode = COMASuplEnd::EConsentGrantedByUser;	
-        }
-    
-    TInt len = iHSLPAddress.Length();
-    HBufC8 *hslpAdress = NULL;
-    if(len > 0)
-        {
-        hslpAdress = HBufC8::NewL(iHSLPAddress.Length());
-        hslpAdress->Des().Copy(iHSLPAddress);
-        }
-    else if(len ==0)
-        {
+		iTrace->Trace(_L("Start COMASuplSession::HandleSuplInitError"), KTraceFileName, __LINE__); 
+		
+		if(aErr == KErrOMAInvalidHSLPAddress)
+			{
+				iTrace->Trace(_L("COMASuplSession::HandleSuplInitError HSLP Address is not matching..."), KTraceFileName, __LINE__);
+				//Close Connection : bug Fix.
+				iConnRequestor->CloseConnection();
+                iPortNum = 0;
+				iSessionObserver.TerminateSession(this, KErrCompletion);
+				return;
+			}
+				
+		TBool setStatusCode = ETrue;
+		
+	
+		
+		if(aErr == KErrSuplInvalidSessionID)
+			{
+				iTrace->Trace(_L("COMASuplSession::HandleSuplInitError Received SET Session ID"), KTraceFileName, __LINE__);
+				iErrorStatusCode = COMASuplEnd::EInvalidSessionId;	
+
+			    COMASuplSessionID* retrivedSessionID = NULL;
+			    iDecodedAsnMessage->SessionId(retrivedSessionID);
+
+			    // Set the SessionId.
+				iTrace->Trace(_L("COMASuplSession::HandleSuplInitError Update SET Session ID"), KTraceFileName, __LINE__);
+			    UpdateSETSessionIDL(retrivedSessionID);
+
+			}
+			
+		if(aErr == KErrOMANonProxyModeNotSupported)
+			{
+				iTrace->Trace(_L("COMASuplSession::HandleSuplInitError Received Nonproxymode data"), KTraceFileName, __LINE__);
+				iErrorStatusCode = COMASuplEnd::ENonProxyModeNotSupported;	
+			}
+
+		if(KErrAccessDenied == aErr || KErrOMASuplDenied == aErr)
+			{
+				iTrace->Trace(_L("COMASuplSession::HandleSuplInitError KErrAccessDenied|| KErrOMASuplDenied"), KTraceFileName, __LINE__);
+				iErrorStatusCode = COMASuplEnd::EConsentDeniedByUser;	
+			}
+	
+		if(aErr == KErrOMASuplNoPosition || KErrOMASuplInformationOnly == aErr)
+			{
+				//Supl End with No Position
+				iTrace->Trace(_L("COMASuplSession::HandleSuplInitError KErrOMASuplNoPosition || KErrOMASuplInformationOnly"), KTraceFileName, __LINE__);
+				setStatusCode = EFalse;
+			}
+		
+		if(KErrOMASuplAccepted == aErr)
+			{
+				iTrace->Trace(_L("COMASuplSession::HandleSuplInitError EConsentGrantedByUser"), KTraceFileName, __LINE__);
+				iErrorStatusCode = COMASuplEnd::EConsentGrantedByUser;	
+			}
+		
+		TInt len = iHSLPAddress.Length();
+		HBufC8 *hslpAdress = NULL;
+		if(len > 0)
+		{
+			hslpAdress = HBufC8::NewL(iHSLPAddress.Length());
+			hslpAdress->Des().Copy(iHSLPAddress);
+		}
+		
+			else if(len ==0)
+				{
         CServerParams* serverParams = CServerParams::NewL();
         CleanupStack::PushL(serverParams);
         
@@ -3313,28 +3362,29 @@
     delete iSuplState;
     iSuplState = NULL;
     CleanupStack::PushL(hslpAdress);
-    if(setStatusCode)
-        {
-            iSuplState = COMASuplEndState::NewL(iErrorStatusCode,iOMASuplAsnHandlerBaseImpl,iEncodedSuplInit,hslpAdress);		
-        }
-    else
-        {
-            iSuplState = COMASuplEndState::NewL(iOMASuplAsnHandlerBaseImpl,iEncodedSuplInit,hslpAdress );
-        } 		
-        
-    CleanupStack::PopAndDestroy(hslpAdress);
-    
-    iTrace->Trace(_L("COMASuplSession::HandleSuplInitError Send SUPL_END for SUPL_INIT"), KTraceFileName, __LINE__);
-    
-    //iSuplSessionState = ESUPL_GENERATE;		
-    iSuplSessionState = ESUPL_INITIALIZED;
-    iSuplState->SetMsgStateObserver(this);
-    iSuplMsgType = ESUPL_END;
-    SetPOSMsgPluginState(COMASuplPosSessionBase::EOMASuplCreating);	
-    //SMP Changes
-    
-    iSuplState->GenerateMessageL();
-    iSuplSessionState = ESUPL_GENERATE; // HAs to be here because initialisation has to be complete..
+ 		if(setStatusCode)
+ 			{
+	 			iSuplState = COMASuplEndState::NewL(iErrorStatusCode,iOMASuplAsnHandlerBaseImpl,iEncodedSuplInit,hslpAdress);		
+ 			}
+ 		else
+ 			{
+ 				iSuplState = COMASuplEndState::NewL(iOMASuplAsnHandlerBaseImpl,iEncodedSuplInit,hslpAdress );
+ 			} 		
+ 			
+ 		CleanupStack::PopAndDestroy(hslpAdress);
+ 		
+		iTrace->Trace(_L("COMASuplSession::HandleSuplInitError Send SUPL_END for SUPL_INIT"), KTraceFileName, __LINE__);
+		
+		//iSuplSessionState = ESUPL_GENERATE;		
+		iSuplSessionState = ESUPL_INITIALIZED;
+		iSuplState->SetMsgStateObserver(this);
+		iSuplMsgType = ESUPL_END;
+		SetPOSMsgPluginState(COMASuplPosSessionBase::EOMASuplCreating);	
+		//SMP Changes
+		
+		iSuplState->GenerateMessageL();
+		iSuplSessionState = ESUPL_GENERATE; // HAs to be here because initialisation has to be complete..
+	
 	}
 
 // -----------------------------------------------------------------------------
@@ -3795,8 +3845,12 @@
 			else
 				{
 					iTrace->Trace(_L("Received message with wrong version."), KTraceFileName, __LINE__); 
-
+					
+					if (iSuplState)
+					{
 					delete iSuplState;
+					iSuplState = NULL;
+					}
 					iSuplMsgType = ESUPL_END;
 					iErrorStatusCode = COMASuplEnd::EVersionNotSupported;	
 					SetPOSMsgPluginState(COMASuplPosSessionBase::EOMASuplCreating);	
@@ -3843,9 +3897,12 @@
 						    }
                         CleanupStack::PopAndDestroy(serverParams);
                         }
-                    
+                      
+                      if(iSuplState)
+                      {
 	                    delete iSuplState;
 	                    iSuplState = NULL;
+	                  	}
 						
 					    CleanupStack::PushL(hslpAdress);
 	                    ServerAddressCheckForSuplInitL();
@@ -4044,7 +4101,7 @@
 // COMASuplSession::SettingsUsageUICompletedL
 // 
 // -----------------------------------------------------------------------------
-void COMASuplSession::SettingsUsageUICompletedL(TInt aError)
+/*void COMASuplSession::SettingsUsageUICompletedL(TInt aError)
 	{
 	iUIFlag = EFalse;
     TBuf<64> msg;	
@@ -4089,7 +4146,7 @@
 			iSessionObserver.TerminateSession(this, KErrGeneral);	
 			return;
 		}
-	}
+	}*/
 
 // -----------------------------------------------------------------------------
 // COMASuplSession::CheckForSuplUsageL
@@ -4098,7 +4155,7 @@
 void COMASuplSession::CheckForSuplUsageL()
     {
 
-    if (iSuplUsage >= 1)
+    /*if (iSuplUsage >= 1)
         {            
         CSuplSettings::TSuplSettingsUsage usage = iSuplSettings->SUPLUsage();
         if (usage == CSuplSettings::ESuplUsageDisabled)
@@ -4106,7 +4163,7 @@
 	        iSessionObserver.TerminateSession(this, KErrGeneral);	
             }
         else if (usage == CSuplSettings::ESuplUsageAutomatic)
-            {            
+            { */           
             if (iNwInitError)
                 {
                 iNwInitError = EFalse;                    
@@ -4114,7 +4171,7 @@
                 }                
             else
 	            InitializeL(iRequestID); 
-            }
+            /*}
 
             else if (usage == CSuplSettings::ESuplUsageHomeAutomatic || usage == CSuplSettings::ESuplUsageAlwaysAsk)
             {
@@ -4128,7 +4185,7 @@
             }            
         }            
         else
-	        InitializeL(iRequestID); 
+	        InitializeL(iRequestID); */
 
     }        
 
@@ -4211,20 +4268,20 @@
         {            
             iUsageHomeNW = aHomeNw;   
             iConnRequestor->UpdateSLPListForHomeUsage(iUsageHomeNW);             
-            CSuplSettings::TSuplSettingsUsage usage = iSuplSettings->SUPLUsage();
+            //CSuplSettings::TSuplSettingsUsage usage = iSuplSettings->SUPLUsage();
             
-            if (usage == CSuplSettings::ESuplUsageAlwaysAsk)
+            /*if (usage == CSuplSettings::ESuplUsageAlwaysAsk)
                 {
-                TInt err;                
+                TInt err = KErrNone;                
                     if (!aHomeNw)
                         {                            
-                        iTrace->Trace(_L("Invoking LaunchSuplUsageSettingsUI, user is roaming"), KTraceFileName, __LINE__);
-                        err = iProtocolManager.LaunchSuplUsageSettingsUI(this, ETrue);        
+                        //iTrace->Trace(_L("Invoking LaunchSuplUsageSettingsUI, user is roaming"), KTraceFileName, __LINE__);
+                        //err = iProtocolManager.LaunchSuplUsageSettingsUI(this, ETrue);        
                         }
                     else
                         {                            
-                        iTrace->Trace(_L("Invoking LaunchSuplUsageSettingsUI, user is not roaming"), KTraceFileName, __LINE__);
-                        err = iProtocolManager.LaunchSuplUsageSettingsUI(this, EFalse);        
+                        //iTrace->Trace(_L("Invoking LaunchSuplUsageSettingsUI, user is not roaming"), KTraceFileName, __LINE__);
+                        //err = iProtocolManager.LaunchSuplUsageSettingsUI(this, EFalse);        
                         }
 
                 if(KErrNone != err && KErrInUse == err)
@@ -4275,16 +4332,16 @@
                     HandleSuplErrorL(err);
                     }
 
-                }
-            else if (usage == CSuplSettings::ESuplUsageHomeAutomatic) 
-            {                
-            if (!aHomeNw)
-                {                
-                TInt err;                
+                }*/
+            //else if (usage == CSuplSettings::ESuplUsageHomeAutomatic) 
+            //{                
+            //if (!aHomeNw)
+              //  {                
+                //TInt err = KErrNone;                
                 //if (!iSuplSettings->IsUIActive() )
                     {
-                    iTrace->Trace(_L("Invoking LaunchSuplUsageSettingsUI, user is roaming"), KTraceFileName, __LINE__);
-                    err = iProtocolManager.LaunchSuplUsageSettingsUI(this, ETrue);        
+                    //iTrace->Trace(_L("Invoking LaunchSuplUsageSettingsUI, user is roaming"), KTraceFileName, __LINE__);
+                    //err = iProtocolManager.LaunchSuplUsageSettingsUI(this, ETrue);        
 
                     if(iSuplMsgType == ESUPL_INIT)
                         {
@@ -4322,7 +4379,7 @@
                         }
                     }
 
-                if(!iSuplSettings->IsUIActive() && KErrNone != err)
+              /*  if(!iSuplSettings->IsUIActive() && KErrNone != err)
                     {
                         SetSuplUsageFlag();                            
                     }
@@ -4330,10 +4387,10 @@
                     {
                     iTrace->Trace(_L("Invoking HandleSuplErrorL"), KTraceFileName, __LINE__);
                     HandleSuplErrorL(err);
-                    }
-                }
-            else            
-                {                
+                    }*/
+                
+                       
+                                
                 if (iNwInitError)
                     {
                     iNwInitError = EFalse;                    
@@ -4341,12 +4398,11 @@
                     }                
                 else
 	                InitializeL(iRequestID); 
-                }                
-            }                
+                                                
         }
         else
             {
-	        iSessionObserver.TerminateSession(this, KErrGeneral);	
+	        	iSessionObserver.TerminateSession(this, KErrGeneral);	
             }                
     }            
 TInt COMASuplSession::SuplIpcSessionID() 
@@ -4412,7 +4468,7 @@
     return iUsageDialog;
     }        
 
-void COMASuplSession::StartUsageDialogLaunchL()
+/*void COMASuplSession::StartUsageDialogLaunchL()
     {
     iTrace->Trace(_L("COMASuplSession::StartUsageDialogLaunchL"), KTraceFileName, __LINE__);
     ReSetSuplUsageFlag();            
@@ -4578,7 +4634,7 @@
 	            InitializeL(iRequestID); 
             }                
         }                
-    }
+    }*/
 
 TBool COMASuplSession::IsEtelNotifySet()
     {
@@ -4601,10 +4657,10 @@
 {
    iTrace->Trace(_L("Timer Expired for SUPL Dialog"), KTraceFileName, __LINE__); 
   
-    if (!iIapDialogShown)
-	    iProtocolManager.LaunchSuplDialogTimeoutUI(this);
-    else
-        iIapDlgTimerExpired = ETrue;            
+    //if (!iIapDialogShown)
+	   // iProtocolManager.LaunchSuplDialogTimeoutUI(this);
+   // else
+       // iIapDlgTimerExpired = ETrue;            
 
     return;	
 }
@@ -4613,14 +4669,14 @@
 // COMASuplSession::SettingsTimeOutUICompletedL
 // 
 // -----------------------------------------------------------------------------
-void COMASuplSession::SettingsTimeOutUICompletedL(TInt aError)
+void COMASuplSession::SettingsTimeOutUICompletedL(TInt /*aError*/)
 	{
 	
-	    TBuf<64> msg;	
-	    msg.Copy(_L("SUPL Timeout UI completed with ... "));
-	    msg.AppendNum(aError);
-	    iTrace->Trace(msg,KTraceFileName, __LINE__); 
-	    iSessionObserver.TerminateSession(this, KErrGeneral);	
+	  //  TBuf<64> msg;	
+	  //  msg.Copy(_L("SUPL Timeout UI completed with ... "));
+	  //  msg.AppendNum(aError);
+	  //  iTrace->Trace(msg,KTraceFileName, __LINE__); 
+	  //  iSessionObserver.TerminateSession(this, KErrGeneral);	
 	    return;
 	    
 	}
--- a/supl/locationomasuplprotocolhandler/protocolhandlerver1/src/epos_comasuplstate.cpp	Mon May 03 12:54:42 2010 +0300
+++ b/supl/locationomasuplprotocolhandler/protocolhandlerver1/src/epos_comasuplstate.cpp	Fri May 14 16:17:02 2010 +0300
@@ -377,8 +377,9 @@
 //
 void COMASuplState::StopTimer()
 	{
-		iTimer->StopTimer();	 			
-		iTrace->Trace(_L("COMASuplState::StopTimer..."), KTraceFileName, __LINE__); 							
+		iTimer->StopTimer();	 		
+		if(iTrace)	
+		    iTrace->Trace(_L("COMASuplState::StopTimer..."), KTraceFileName, __LINE__); 							
 	}
 	
 // -----------------------------------------------------------------------------
--- a/supl/locationomasuplprotocolhandler/protocolhandlerver2/eabi/eposomasuplprotocolhandler2u.def	Mon May 03 12:54:42 2010 +0300
+++ b/supl/locationomasuplprotocolhandler/protocolhandlerver2/eabi/eposomasuplprotocolhandler2u.def	Fri May 14 16:17:02 2010 +0300
@@ -41,37 +41,35 @@
 	_ZTI23COMASuplFallBackHandler @ 40 NONAME
 	_ZTI24COMASUPLProtocolManager2 @ 41 NONAME
 	_ZTI24COMASuplEcomEventWatcher @ 42 NONAME
-	_ZTI24COMASuplSettingsLauncher @ 43 NONAME
-	_ZTI24COMASuplTriggerStopState @ 44 NONAME
-	_ZTI25COMASuplTriggerStartState @ 45 NONAME
-	_ZTI28COMASuplTriggerResponseState @ 46 NONAME
-	_ZTI29COMASuplCompleteSelfRequestor @ 47 NONAME
-	_ZTV12COMASuplETel @ 48 NONAME
-	_ZTV13COMASuplState @ 49 NONAME
-	_ZTV13COMASuplTrace @ 50 NONAME
-	_ZTV15COMASuplSession @ 51 NONAME
-	_ZTV16COMASuplEndState @ 52 NONAME
-	_ZTV16COMASuplPosState @ 53 NONAME
-	_ZTV16COMASuplSettings @ 54 NONAME
-	_ZTV17COMASuplInitState @ 55 NONAME
-	_ZTV18COMASuplStartState @ 56 NONAME
-	_ZTV19COMASuplDialogTimer @ 57 NONAME
-	_ZTV19COMASuplIapNotifier @ 58 NONAME
-	_ZTV19COMASuplReportState @ 59 NONAME
-	_ZTV20COMASuplETelNotifier @ 60 NONAME
-	_ZTV20COMASuplPOSRequestor @ 61 NONAME
-	_ZTV20COMASuplPosInitState @ 62 NONAME
-	_ZTV20COMASuplTimeoutTimer @ 63 NONAME
-	_ZTV21COMASuplConnRequestor @ 64 NONAME
-	_ZTV21COMASuplResponseState @ 65 NONAME
-	_ZTV23COMASuplFallBackHandler @ 66 NONAME
-	_ZTV24COMASUPLProtocolManager2 @ 67 NONAME
-	_ZTV24COMASuplEcomEventWatcher @ 68 NONAME
-	_ZTV24COMASuplSettingsLauncher @ 69 NONAME
-	_ZTV24COMASuplTriggerStopState @ 70 NONAME
-	_ZTV25COMASuplTriggerStartState @ 71 NONAME
-	_ZTV28COMASuplTriggerResponseState @ 72 NONAME
-	_ZTV29COMASuplCompleteSelfRequestor @ 73 NONAME
-	_ZThn4_N24COMASUPLProtocolManager212HandlePacketERK6TDesC8j @ 74 NONAME
-	_ZThn4_N24COMASUPLProtocolManager217HandlePacketErrorEi @ 75 NONAME
+	_ZTI24COMASuplTriggerStopState @ 43 NONAME
+	_ZTI25COMASuplTriggerStartState @ 44 NONAME
+	_ZTI28COMASuplTriggerResponseState @ 45 NONAME
+	_ZTI29COMASuplCompleteSelfRequestor @ 46 NONAME
+	_ZTV12COMASuplETel @ 47 NONAME
+	_ZTV13COMASuplState @ 48 NONAME
+	_ZTV13COMASuplTrace @ 49 NONAME
+	_ZTV15COMASuplSession @ 50 NONAME
+	_ZTV16COMASuplEndState @ 51 NONAME
+	_ZTV16COMASuplPosState @ 52 NONAME
+	_ZTV16COMASuplSettings @ 53 NONAME
+	_ZTV17COMASuplInitState @ 54 NONAME
+	_ZTV18COMASuplStartState @ 55 NONAME
+	_ZTV19COMASuplDialogTimer @ 56 NONAME
+	_ZTV19COMASuplIapNotifier @ 57 NONAME
+	_ZTV19COMASuplReportState @ 58 NONAME
+	_ZTV20COMASuplETelNotifier @ 59 NONAME
+	_ZTV20COMASuplPOSRequestor @ 60 NONAME
+	_ZTV20COMASuplPosInitState @ 61 NONAME
+	_ZTV20COMASuplTimeoutTimer @ 62 NONAME
+	_ZTV21COMASuplConnRequestor @ 63 NONAME
+	_ZTV21COMASuplResponseState @ 64 NONAME
+	_ZTV23COMASuplFallBackHandler @ 65 NONAME
+	_ZTV24COMASUPLProtocolManager2 @ 66 NONAME
+	_ZTV24COMASuplEcomEventWatcher @ 67 NONAME
+	_ZTV24COMASuplTriggerStopState @ 68 NONAME
+	_ZTV25COMASuplTriggerStartState @ 69 NONAME
+	_ZTV28COMASuplTriggerResponseState @ 70 NONAME
+	_ZTV29COMASuplCompleteSelfRequestor @ 71 NONAME
+	_ZThn4_N24COMASUPLProtocolManager212HandlePacketERK6TDesC8j @ 72 NONAME
+	_ZThn4_N24COMASUPLProtocolManager217HandlePacketErrorEi @ 73 NONAME
 
--- a/supl/locationomasuplprotocolhandler/protocolhandlerver2/group/omasuplprotocolhandler2.mmp	Mon May 03 12:54:42 2010 +0300
+++ b/supl/locationomasuplprotocolhandler/protocolhandlerver2/group/omasuplprotocolhandler2.mmp	Fri May 14 16:17:02 2010 +0300
@@ -52,7 +52,7 @@
 SOURCE      epos_comasuplinitstate.cpp
 SOURCE      epos_comasuplposrequestor.cpp
 SOURCE	    epos_comasuplecomeventwatcher.cpp
-SOURCE      epos_comasuplsettingslauncher.cpp
+//SOURCE      epos_comasuplsettingslauncher.cpp
 SOURCE      epos_comasupltrace.cpp
 SOURCE      epos_comasupldialogtimer.cpp
 SOURCE      epos_comasuplfallbackhandler.cpp
@@ -88,7 +88,7 @@
 LIBRARY insock.lib
 LIBRARY lbs.lib
 LIBRARY eposnwprv.lib
-LIBRARY locsettingsuiclient.lib
+//LIBRARY locsettingsuiclient.lib
 LIBRARY hash.lib
 LIBRARY bafl.lib  //logging
 LIBRARY flogger.lib
--- a/supl/locationomasuplprotocolhandler/protocolhandlerver2/inc/epos_comasuplconnrequestor.h	Mon May 03 12:54:42 2010 +0300
+++ b/supl/locationomasuplprotocolhandler/protocolhandlerver2/inc/epos_comasuplconnrequestor.h	Fri May 14 16:17:02 2010 +0300
@@ -40,9 +40,7 @@
  *  @since S60 v3.1
  */
  
-class COMASuplConnRequestor : public CActive, 
-                              public MOMASuplUICompletionObserver,  
-                              public MOMASuplDialogTimeOutNotifier
+class COMASuplConnRequestor : public CActive
 {
 
 	enum TConnState
@@ -50,7 +48,8 @@
 		  EConnecting,
 		  EConnectionDone,
 	      ESending,
-	      EInitilizeSetting
+	      EInitilizeSetting,
+		  EInitialState
 		};
 
 	public :  // Constructor 
@@ -171,7 +170,6 @@
         
         void GetUsedServerAddress(TDes& aHSLPAddressUsed);
         
-        void SettingsUICompletedL(TInt aError);
         void SettingsUsageUICompletedL(TInt /*aError*/) {}
         void SettingsTimeOutUICompletedL(TInt /*aError*/) {}
         TBool ConvertIAPNameToIdL(const TDesC& aIAPName, TUint32& aIAPId);
@@ -219,7 +217,7 @@
 		 * @param None
 		 * @return None
 		 */
-		virtual void DialogTimerExpiredL();	
+		//virtual void DialogTimerExpiredL();	
   	protected :  // Functions from CActive
       /**
       * From CActive 
@@ -291,14 +289,6 @@
             TBool iIsSettingInitilized;
             
             TInt64 iCurrentSLPId;
-            
-            COMASuplDialogTimer* iDialogTimer;
-            
-            TBool iIapDialogShown;
-            
-            TBool iIapDlgTimerExpired;
-            
-            TBool iIsTimeoutDialogTimerStarted;
 
 };
 
--- a/supl/locationomasuplprotocolhandler/protocolhandlerver2/inc/epos_comasuplfallbackhandler.h	Mon May 03 12:54:42 2010 +0300
+++ b/supl/locationomasuplprotocolhandler/protocolhandlerver2/inc/epos_comasuplfallbackhandler.h	Fri May 14 16:17:02 2010 +0300
@@ -153,6 +153,8 @@
       TTime iFallBackStartTime;
       
       TInt iAllowedFallBackTimerValue;
+	  
+	  TBool iAttemptedBackupServer;
       
 };
 
--- a/supl/locationomasuplprotocolhandler/protocolhandlerver2/inc/epos_comasuplprotocolmanager2.h	Mon May 03 12:54:42 2010 +0300
+++ b/supl/locationomasuplprotocolhandler/protocolhandlerver2/inc/epos_comasuplprotocolmanager2.h	Fri May 14 16:17:02 2010 +0300
@@ -277,9 +277,11 @@
 	virtual void TerminateSession(CSuplSessionBase *aSession, TInt aErrorCode);
 	
 public: // For setting UI observer    
-	TInt LaunchSettingsUI(MOMASuplUICompletionObserver* aObserver,const TDesC& aForHslp);
-	TInt LaunchSuplUsageSettingsUI(MOMASuplUICompletionObserver* aObserver, TBool aRoaming);
-	TInt LaunchSuplDialogTimeoutUI(MOMASuplUICompletionObserver* aObserver );
+
+	// For setting UI observer    
+	//TInt LaunchSettingsUI(MOMASuplUICompletionObserver* aObserver,const TDesC& aForHslp);
+	//TInt LaunchSuplUsageSettingsUI(MOMASuplUICompletionObserver* aObserver, TBool aRoaming);
+	//TInt LaunchSuplDialogTimeoutUI(MOMASuplUICompletionObserver* aObserver );
 	void UpdateAllSubSessnsInSameSession(TInt aIpcSessionId);
 
 	void SettingsChanged();
@@ -291,7 +293,7 @@
 	* @param aError - Error during Launch
 	* @return None
 	*/
-	void SettingsUICompletedL(TInt aError);
+	void SettingsUICompletedL(TInt /*aError*/) {};
 
 	/** 
 	* This callback method is used to notify the client about 
@@ -299,7 +301,7 @@
 	* @param aError - Error during Launch
 	* @return None
 	*/
-	void SettingsUsageUICompletedL(TInt aError);
+	void SettingsUsageUICompletedL(TInt /*aError*/) {};
 
 	/** 
 	* This callback method is used to notify the client about 
@@ -307,8 +309,8 @@
 	* @param aError - Error during Launch
 	* @return None
 	*/
-	void SettingsTimeOutUICompletedL(TInt aError);
-
+	void SettingsTimeOutUICompletedL(TInt /*aError*/) {};
+	
 public: //From base class MSuplSettingsObserver
 
 	/**
@@ -319,6 +321,14 @@
 	*/
     virtual void HandleSuplSettingsChangeL(TSuplSettingsEventType aEvent,TInt aSlpId);                 
 
+	/**
+	* HandleSuplTriggerStatusChangeL,Observeed function, gets called.
+	* @since MCL v10.1
+	* @param       aSuplTriggerStatus,TSuplTriggerStatus, Trigger Status ON or OFF
+	* @return      None
+	*/
+    virtual void HandleSuplTriggerStatusChangeL(CSuplSettings::TSuplTriggerStatus aSuplTriggerStatus);           
+
 public:  // From base class MSuplSessionObserver
 	/**
 	* HandleSuplSessionChangeL,Observeed function, gets called.
@@ -477,7 +487,7 @@
      * @param      None. 
      * @return     None.
      */
-    void ReadSuplUsage();
+    //void ReadSuplUsage();
 	
     /**
      * ReadOMASuplConfigurationL, Reads OMA Supl Configuration.
--- a/supl/locationomasuplprotocolhandler/protocolhandlerver2/inc/epos_comasuplsession2.h	Mon May 03 12:54:42 2010 +0300
+++ b/supl/locationomasuplprotocolhandler/protocolhandlerver2/inc/epos_comasuplsession2.h	Fri May 14 16:17:02 2010 +0300
@@ -229,7 +229,7 @@
             * the completion of UI
             * @return None
             */
-			void SettingsUsageUICompletedL(TInt aError);
+					void SettingsUsageUICompletedL(TInt /*aError*/) {};
 			
             /** 
             * This callback method is used to notify the client about 
--- a/supl/locationomasuplprotocolhandler/protocolhandlerver2/inc/epos_comasuplsettings.h	Mon May 03 12:54:42 2010 +0300
+++ b/supl/locationomasuplprotocolhandler/protocolhandlerver2/inc/epos_comasuplsettings.h	Fri May 14 16:17:02 2010 +0300
@@ -96,7 +96,7 @@
 	* @param aSUPLUsage 
 	* @return None 
 	*/
-    void SetSUPLUsage(CSuplSettings::TSuplSettingsUsage& aSUPLUsage );
+  //  void SetSUPLUsage(CSuplSettings::TSuplSettingsUsage& aSUPLUsage );
 	
 	/**
 	* SetUIActive Method.
@@ -137,7 +137,7 @@
 	* @param None
 	* @return SUPL Usage
 	*/
-    CSuplSettings::TSuplSettingsUsage SUPLUsage() const;
+  //  CSuplSettings::TSuplSettingsUsage SUPLUsage() const;
 	
 	/**
 	* IAPId Method.
@@ -166,7 +166,7 @@
 	TInt  	 iIAPId;
 
     // SUPL Usage
-    CSuplSettings::TSuplSettingsUsage iSUPLUsage; 
+ //   CSuplSettings::TSuplSettingsUsage iSUPLUsage; 
 	// Flag indicating the activation of settings UI
 	TBool    iSettingsUIActive;
 };
--- a/supl/locationomasuplprotocolhandler/protocolhandlerver2/src/epos_comasuplconnrequestor.cpp	Mon May 03 12:54:42 2010 +0300
+++ b/supl/locationomasuplprotocolhandler/protocolhandlerver2/src/epos_comasuplconnrequestor.cpp	Fri May 14 16:17:02 2010 +0300
@@ -47,10 +47,7 @@
     				 						 iCommMgr(aCommMgr), 
     				 						 iProtocolManager(aProtoMgr),
     				 						 iPort(aPort),
-    				 						 iObserver( aObserver),    				 						  
-    				 						 iIapDialogShown(EFalse),
-    				 						 iIapDlgTimerExpired(EFalse),    				 			            
-    				 			             iIsTimeoutDialogTimerStarted(EFalse)
+    				 						 iObserver( aObserver)
     {
 			
     }
@@ -77,7 +74,7 @@
     	
     	iCurrentSLPId = KErrNotFound;
     	
-    	iDialogTimer = COMASuplDialogTimer::NewL(*this);
+    
     }
 
 // -----------------------------------------------------------------------------
@@ -107,13 +104,8 @@
 COMASuplConnRequestor::~COMASuplConnRequestor()
     {
     	Cancel();
-    	if(iDialogTimer)
-    	    {
-    	    iDialogTimer->Cancel();
-    	    delete iDialogTimer;
-    	    iDialogTimer = NULL;
-    	    }
-    	delete iSuplSettings;
+    
+	  	delete iSuplSettings;
     	delete iTrace;
     	delete iFallBackHandler;
     }
@@ -146,27 +138,14 @@
 						buffer.Copy(_L("No access point configured for "));
 						buffer.Append(iHostAddress);
 						iTrace->Trace(buffer,KTraceFileName, __LINE__); 				
-						if( isIapDialogShown )
-						    {
-						    TInt err = iProtocolManager.LaunchSettingsUI(this,iHostAddress);
-						    if(err != KErrNone)
-                                {
-                                buffer.Copy(_L("Error in launching UI : "));
-                                buffer.AppendNum(err);
-                                iTrace->Trace(buffer,KTraceFileName, __LINE__);                 
-                                iHostAddress.Zero();
-                                iObserver.OperationCompleteL(err);
-                                }
-						        else
-						        iIapDialogShown = ETrue;
-						    }
-						
+						buffer.Copy(_L("Calling CreateConnection with no IAP"));
+						iTrace->Trace(buffer,KTraceFileName, __LINE__);
+						iConnection = iCommMgr.CreateConnectionL(iHostAddress,iTls,iPskTls,iPort,-1);
+						OpenConnection();
 						
 					}
 				else
 				    {
-				    iIsTimeoutDialogTimerStarted = EFalse;
-    			    iDialogTimer->Cancel();
 				    buffer.Copy(_L("Connecting to "));
 				    buffer.Append(iHostAddress);
 				    iTrace->Trace(buffer,KTraceFileName, __LINE__); 				
@@ -184,12 +163,9 @@
 // -----------------------------------------------------------------------------
 // COMASuplConnRequestor::OpenConnection
 // -----------------------------------------------------------------------------
-//    
-void COMASuplConnRequestor::CreateConnectionL(TInt aDialogTimeOutDelay, TBool aTriggerSession)
+//  TODO : Remove this method  
+void COMASuplConnRequestor::CreateConnectionL(TInt /*aDialogTimeOutDelay*/, TBool aTriggerSession)
     {
-    iIsTimeoutDialogTimerStarted = ETrue;
-    
-    iDialogTimer->StartTimer(aDialogTimeOutDelay); 
     CreateConnectionL(aTriggerSession);
     }
 // -----------------------------------------------------------------------------
@@ -457,57 +433,7 @@
 		return result;
 	}
 	
-// -----------------------------------------------------------------------------
-// COMASuplConnRequestor::SettingsUICompleted
-// 
-// -----------------------------------------------------------------------------
 
-void COMASuplConnRequestor::SettingsUICompletedL(TInt aError)
-	{
-		TBuf<128> buffer(_L("COMASuplConnRequestor:SettingsUICompleted Error: "));
-		buffer.AppendNum(aError);
-		iTrace->Trace(buffer,KTraceFileName, __LINE__); 
-		
-		if (iIsTimeoutDialogTimerStarted)
-		    {                
-		    iTrace->Trace(_L("COMASuplSession::SettingsUICompleted, stopping timer "), KTraceFileName, __LINE__);
-		    iIsTimeoutDialogTimerStarted = EFalse;                    
-		    iDialogTimer->StopTimer();
-		    }
-		if (iIapDlgTimerExpired)
-		    {
-		    iIapDlgTimerExpired = EFalse;
-		    iIapDialogShown = EFalse;
-		    iProtocolManager.LaunchSuplDialogTimeoutUI(this);
-		    iObserver.OperationCompleteL(KErrNone);
-		    return;
-		    }
-		if(aError == KErrNone)
-			{
-				TBuf<100> IapName;
-				TInt err = iProtocolManager.GetLastUsedAccessPoint(IapName,iIAPId);
-				 if(err == KErrNone)
-					{
-						buffer.Copy(_L("Connecting to "));
-						buffer.Append(iHostAddress);
-						buffer.Append(_L(" using IAP "));
-						buffer.Append(IapName);
-						iTrace->Trace(buffer,KTraceFileName, __LINE__); 				
-						iConnection = iCommMgr.CreateConnectionL(iHostAddress,iTls,iPskTls,iPort,iIAPId);
-						SaveAccessPoint(IapName);
-						OpenConnection();
-					}
-				 else
-				 	{
-				 		iObserver.OperationCompleteL(err);	
-				 	}	
-			}
-		else
-			{
-				iObserver.OperationCompleteL(aError);	
-			}	
-		
-	}
 
 // -----------------------------------------------------------------------------
 // COMASuplConnRequestor::SaveAccessPoint
@@ -575,25 +501,13 @@
 			iFallBackHandler->UpdateSLPListForHomeUsage(aHomeNetwork);
 }
 
-// -----------------------------------------------------------------------------
-// COMASuplConnRequestor::DialogTimerExpiredL
-// Checks whether UI is displayed or not previously
-// 
-// -----------------------------------------------------------------------------
-void COMASuplConnRequestor::DialogTimerExpiredL()
-{
-   iTrace->Trace(_L("COMASuplConnRequestor:Timer Expired for SUPL IAP Dialog"), KTraceFileName, __LINE__); 
-
-    if (!iIapDialogShown)
-        iProtocolManager.LaunchSuplDialogTimeoutUI(this);
-    else
-        iIapDlgTimerExpired = ETrue;  
-    return; 
-}
 
 TUint COMASuplConnRequestor::GetPortNumber()
 	{
-	return iConnection->GetPortNumberUsed();
+		if(iConnection)
+			return iConnection->GetPortNumberUsed();
+		else 
+			return 0;
 	}
 	
 	
--- a/supl/locationomasuplprotocolhandler/protocolhandlerver2/src/epos_comasupletel.cpp	Mon May 03 12:54:42 2010 +0300
+++ b/supl/locationomasuplprotocolhandler/protocolhandlerver2/src/epos_comasupletel.cpp	Fri May 14 16:17:02 2010 +0300
@@ -12,7 +12,7 @@
 * Contributors:
 *
 * Description:   Implementation of COMASuplEtel Class
-*  Version     : %version: 3 % << Don't touch! Updated by Synergy at check-out.
+*  Version     : %version: 4 % << Don't touch! Updated by Synergy at check-out.
 *
 */
 
@@ -207,6 +207,8 @@
                 {
                 // For GSM Cell Information
                 COMASuplLocationId* locationId = COMASuplLocationId::NewL(); 
+				//Comment to ignore coverity cleanup stack error
+                //coverity[SYMBIAN.CLEANUP_STACK :FALSE]
                 CleanupStack::PushL(locationId);
      			COMASuplGSMCellInfo* gsmCellInfo = COMASuplGSMCellInfo::NewL();
      			CleanupStack::PushL(gsmCellInfo);
@@ -259,6 +261,8 @@
                 {
                 // For WCDMA  Cell Information
                 COMASuplLocationId* locationId = COMASuplLocationId::NewL(); 
+				//Comment to ignore coverity cleanup stack error
+                //coverity[SYMBIAN.CLEANUP_STACK :FALSE]
                 CleanupStack::PushL(locationId);
      			COMASuplCellInfo* wcdmaCellInfo = COMASuplCellInfo::NewL();
      			CleanupStack::PushL(wcdmaCellInfo);
@@ -307,6 +311,8 @@
             	#if _DEBUG 
 	            	// For GSM Cell Information
 	            	COMASuplLocationId* locationId = COMASuplLocationId::NewL(); 
+					//Comment to ignore coverity cleanup stack error
+	            	//coverity[SYMBIAN.CLEANUP_STACK :FALSE]
                 	CleanupStack::PushL(locationId);
      				COMASuplGSMCellInfo* gsmCellInfo = COMASuplGSMCellInfo::NewL();
      				CleanupStack::PushL(gsmCellInfo);
@@ -520,7 +526,7 @@
 	 				
 						for(TInt k = 0; k < KOMASUPLMaxTimeSlotIscpAmount; k++ )	 				
 							{
-								iOMASuplwcdmaCellInfo.iNwkMeasureReport[i].iCellMeasuredResult[j].iTddInfo.iTimeslotISCP[k] = iOMASuplwcdmaCellInfo.iNwkMeasureReport[i].iCellMeasuredResult[j].iTddInfo.iTimeslotISCP[k];
+								iOMASuplwcdmaCellInfo.iNwkMeasureReport[i].iCellMeasuredResult[j].iTddInfo.iTimeslotISCP[k] = iCustomWCDMACellInfo.iNwkMeasureReport[i].iCellMeasuredResult[j].iTddInfo.iTimeslotISCP[k];
 							}
 	 					
 	 			}
--- a/supl/locationomasuplprotocolhandler/protocolhandlerver2/src/epos_comasuplfallbackhandler.cpp	Mon May 03 12:54:42 2010 +0300
+++ b/supl/locationomasuplprotocolhandler/protocolhandlerver2/src/epos_comasuplfallbackhandler.cpp	Fri May 14 16:17:02 2010 +0300
@@ -42,7 +42,8 @@
 // -----------------------------------------------------------------------------
 //
 COMASuplFallBackHandler::COMASuplFallBackHandler(CSuplSettingsInternal& aSettings):
-												iSuplSettings(aSettings)
+												iSuplSettings(aSettings),
+												iAttemptedBackupServer(EFalse)
     {
 
     }
@@ -112,6 +113,8 @@
 TInt COMASuplFallBackHandler::GetNextSLPAddressL(TInt64& aSLPId, TDes& aHslpToBeUsedAddress,TDes& aIAPName,TBool& aTls,
                                                  TBool& aPskTls,TInt aLastErrorCode,TBool& aIsIapDialogShown)
     {
+	iTrace->Trace(_L("COMASuplFallBackHandler::GetNextSLPAddressL"),KTraceFileName, __LINE__);
+	
         _LIT(KFormatTxt,"%/0%1%/1%2%/2%3%/3 %-B%:0%J%:1%T%:2%S%:3%+B"); 
         
         TBuf<256> LogBuffer;
@@ -161,6 +164,37 @@
 	     	}  
 	 	} 
 	 	
+		//Check to see if the server list is empty.  If it is create the HSLP Address from the IMSI and use that
+		// as the server address.  This does not add the server to the list and this functionality should only
+		// be tried once
+		if(iSLPList->Count() <= 0 && (!iAttemptedBackupServer))
+			{
+			iTrace->Trace(_L("Going to create and use alternative HSLP Address from IMSI"),KTraceFileName, __LINE__);
+
+			iAttemptedBackupServer = ETrue;
+
+			//Generate the HSLP Address
+			GenerateHslpAddressFromIMSIL();
+
+			//Copy the generated address into the supplied function arguments
+			aHslpToBeUsedAddress.Copy(iGenratedHslpAddress);
+			aIAPName.Zero();   
+			aIAPName.Copy(iDefaultIAPName);
+			aTls = ETrue;
+			aPskTls = EFalse;
+			aIsIapDialogShown = ETrue;
+
+			iTrace->Trace(_L("Server being used:"),KTraceFileName, __LINE__);
+			LogBuffer.Copy(aHslpToBeUsedAddress);
+			iTrace->Trace(LogBuffer,KTraceFileName, __LINE__);
+
+			iTrace->Trace(_L("iap being used:"),KTraceFileName, __LINE__);
+			LogBuffer.Copy(aIAPName);
+			iTrace->Trace(LogBuffer,KTraceFileName, __LINE__);
+
+			return KErrNone;
+			}
+		
         if( iSLPList->Count() <= 0 || iCurrentServerCounter >= iSLPList->Count() ) 
             {
             LogBuffer.Copy(_L("No more servers available..."));
--- a/supl/locationomasuplprotocolhandler/protocolhandlerver2/src/epos_comasuplinitstate.cpp	Mon May 03 12:54:42 2010 +0300
+++ b/supl/locationomasuplprotocolhandler/protocolhandlerver2/src/epos_comasuplinitstate.cpp	Fri May 14 16:17:02 2010 +0300
@@ -1112,7 +1112,6 @@
  	
 	iRequestIDFeatureFlag = FeatureManager::FeatureSupported(KSUPLAPECentricArchSupport);
     FeatureManager::UnInitializeLib();
-    iRequestIDFeatureFlag = EFalse;
 	
 	if (iRequestIDFeatureFlag)
         {
--- a/supl/locationomasuplprotocolhandler/protocolhandlerver2/src/epos_comasuplposinitstate.cpp	Mon May 03 12:54:42 2010 +0300
+++ b/supl/locationomasuplprotocolhandler/protocolhandlerver2/src/epos_comasuplposinitstate.cpp	Fri May 14 16:17:02 2010 +0300
@@ -397,6 +397,8 @@
 	// Re-initialize the POS Requestor
 	if(iPosRequestor)
 		iPosRequestor->DestroyList();
+	//Comment to ignore coverity forward NULL error
+	//coverity[FORWARD_NULL   :FALSE]
 	iPosRequestor->CreateListL();
 	
 	// Create SET capabilities object
@@ -414,24 +416,26 @@
 	// Create Velocity
 	iVelocity = COMASuplVelocity::NewL();
 	
-
-	// Append the SUPL POS INIT optional parameters to the list
-	// in POS Requestor
-	iPosRequestor->AppendInfoRequest(iCurSetCapabilities);
-	iPosRequestor->AppendInfoRequest(iReqAsstData);
-	iPosRequestor->AppendInfoRequest(iPosition);
-	iPosRequestor->AppendInfoRequest(iPosPayload);
-	iPosRequestor->AppendInfoRequest(iVelocity);
-	
-	// Set self as Observer to POS Requestor
-	iPosRequestor->SetObserver(this);
-	
-	TBuf<128> msg(_L("Filling iPosMethod in iPosRequestor: "));
-	iTrace->Trace(msg, KTraceFileName, __LINE__); 
 	if(iPosRequestor)
-		{
-		iAllowedCapabilitiesforPOS.SetAllowedCapabilities(EFalse, EFalse, EFalse, EFalse, EFalse, EFalse, EFalse, EFalse);
-		iPosRequestor->SetPosMethodAndAllowedCapabilities (iAllowedCapabilitiesforPOS,iPosMethod ); 
+	    {
+        // Append the SUPL POS INIT optional parameters to the list
+        // in POS Requestor
+        iPosRequestor->AppendInfoRequest(iCurSetCapabilities);
+        iPosRequestor->AppendInfoRequest(iReqAsstData);
+        iPosRequestor->AppendInfoRequest(iPosition);
+        iPosRequestor->AppendInfoRequest(iPosPayload);
+        iPosRequestor->AppendInfoRequest(iVelocity);
+    
+        // Set self as Observer to POS Requestor
+		//Comment to ignore coverity reverse NULL error
+        //coverity[REVERSE_INULL :FALSE]
+        iPosRequestor->SetObserver(this);
+    
+        TBuf<128> msg(_L("Filling iPosMethod in iPosRequestor: "));
+        iTrace->Trace(msg, KTraceFileName, __LINE__); 
+    
+        iAllowedCapabilitiesforPOS.SetAllowedCapabilities(EFalse, EFalse, EFalse, EFalse, EFalse, EFalse, EFalse, EFalse);
+        iPosRequestor->SetPosMethodAndAllowedCapabilities (iAllowedCapabilitiesforPOS,iPosMethod ); 
         if(iHSLPAddress)
             {
             HBufC* slpAddress = CnvUtfConverter::ConvertToUnicodeFromUtf8L(*iHSLPAddress);
@@ -596,7 +600,10 @@
         }
 		
 		COMASuplLocationIdVer2* locationId2 = COMASuplLocationIdVer2::NewL();
+		//coverity[SYMBIAN.CLEANUP_STACK :FALSE]
+		CleanupStack::PushL(locationId2);
 		CopyLocationidToLocationId2L(locationId2);
+		CleanupStack::Pop(locationId2);
 		OMASuplPosInit->SetLocationId2(locationId2);//Ownership will be with OMASuplPosInit
 		
 
@@ -838,7 +845,8 @@
                         }
                     iLocationId = aLocationId;
                     iTrace->Trace(_L("COMASuplPosInitState::ComparisionLocationIDRequestCompletedL toe limit greater than KMaxCellIdChangeToeLimit. But repeated a pos fetch already so continuing"), KTraceFileName, __LINE__);
-                    iMsgStateObserver->OperationCompleteL(aErrorCode);//use the pos data as it is
+                    if(iMsgStateObserver)
+                        iMsgStateObserver->OperationCompleteL(aErrorCode);//use the pos data as it is
                     }
                 }
             else //ignore the position data
@@ -852,7 +860,8 @@
                 	iLocationId = NULL;
                     }
                 iLocationId = aLocationId;
-                iMsgStateObserver->OperationCompleteL(aErrorCode);
+                if(iMsgStateObserver)
+                    iMsgStateObserver->OperationCompleteL(aErrorCode);
                 }
             }
         }
@@ -1688,6 +1697,8 @@
             TInt MNC,MCC,CI;
             COMASuplCellInfo* cellInfo;
             COMASuplLocationId::TOMASuplStatus status;
+			//Comment to ignore coverity checked return error
+            //coverity[CHECKED_RETURN   :FALSE]
             iLocationId->SuplLocationId(cellInfo, status);
             cellInfo->SuplCellInfo(MNC,MCC,CI);
             
--- a/supl/locationomasuplprotocolhandler/protocolhandlerver2/src/epos_comasuplposrequestor.cpp	Mon May 03 12:54:42 2010 +0300
+++ b/supl/locationomasuplprotocolhandler/protocolhandlerver2/src/epos_comasuplposrequestor.cpp	Fri May 14 16:17:02 2010 +0300
@@ -75,14 +75,14 @@
 //
 void COMASuplPOSRequestor::DestroyList()
     {
-		iTrace->Trace(_L("COMASuplPOSRequestor::DestroyList"), KTraceFileName, __LINE__); 
-		if(iOMASuplInfoRequestList)
-			{
-				delete iOMASuplInfoRequestList;
-				iOMASuplInfoRequestList = NULL;
-			
-			}
-	}
+    if(iTrace)
+        iTrace->Trace(_L("COMASuplPOSRequestor::DestroyList"), KTraceFileName, __LINE__); 
+    if(iOMASuplInfoRequestList)
+        {
+        delete iOMASuplInfoRequestList;
+        iOMASuplInfoRequestList = NULL;
+        }
+    }
 
 // -----------------------------------------------------------------------------
 // COMASuplPOSRequestor::NewL
--- a/supl/locationomasuplprotocolhandler/protocolhandlerver2/src/epos_comasuplprotocolmanager2.cpp	Mon May 03 12:54:42 2010 +0300
+++ b/supl/locationomasuplprotocolhandler/protocolhandlerver2/src/epos_comasuplprotocolmanager2.cpp	Fri May 14 16:17:02 2010 +0300
@@ -104,10 +104,10 @@
 // Destructor.
 EXPORT_C COMASUPLProtocolManager2::~COMASUPLProtocolManager2()
 	{
-	if(iSettingsLauncher)		
+	/*if(iSettingsLauncher)		
 		{
-		iSettingsLauncher->CancelLaunch();
-		}
+			iSettingsLauncher->CancelLaunch();
+		}*/
 	iSuplSettings->SetUIActive( EFalse );
 
 	DeleteAllSessions();
@@ -128,7 +128,7 @@
 	}
 	
 	delete iSuplStorageSettings;
-    delete iSettingsLauncher;
+    //delete iSettingsLauncher;
     delete iNotifier;
 	iMobilePhone.Close(); 
 	iTelServer.Close();
@@ -161,7 +161,7 @@
 	iSuplStorageSettings->SetObserverL(*this);
 	iSuplStorageSettings->SetSessionObserverL(*this);
 	
-   	iSettingsLauncher = COMASuplSettingsLauncher::NewL( *this );
+   	//iSettingsLauncher = COMASuplSettingsLauncher::NewL( *this );
    	
     TRAPD(err,iOMASuplAsnHandlerBaseImpl = COMASuplAsnHandlerBase::NewL(2);) 
     TBuf<64> buf(_L("ASN Plugin 2.0 loaded with error : "));                
@@ -249,7 +249,7 @@
 	//Connect to ETel
 	User::LeaveIfError(ConnectToETelL());
   
-    ReadSuplUsage();    
+    //ReadSuplUsage();    
 	 
 	if(iSuplEcomEventWatcher)
 		{
@@ -1243,7 +1243,7 @@
     if( aEvent == MSuplSettingsObserver::ESuplSettingsEventSuplUsageChange)
         {
         iTrace->Trace(_L("Setting Changed.SUPL Usage changed.. Reeading once again..."), KTraceFileName, __LINE__);
-        ReadSuplUsage();
+        //ReadSuplUsage();
 		}
 	else if( aEvent == MSuplSettingsObserver::ESuplSettingsEventCommParameterChange)
 		{
@@ -1253,6 +1253,26 @@
 	}
 
 // -----------------------------------------------------------------------------
+// COMASUPLProtocolManager2::HandleSuplTriggerStatusChangeL
+// notifier for settings changes.
+// -----------------------------------------------------------------------------
+void COMASUPLProtocolManager2::HandleSuplTriggerStatusChangeL(CSuplSettings::TSuplTriggerStatus aSuplTriggerStatus)
+	{
+  	iTrace->Trace(_L("Setting Changed.SUPL Trigger Status Changed..."), KTraceFileName, __LINE__);
+		if( aSuplTriggerStatus == CSuplSettings::ESuplTriggerOff)
+		{
+						iTrace->Trace(_L("Setting Changed.SUPL Trigger Status to OFF..."), KTraceFileName, __LINE__);
+						TInt TotalSession = iSuplSessions.Count();
+						for(TInt cnt = 0; cnt < TotalSession; ++cnt)
+							{
+									iTrace->Trace(_L("Cancelling Trigger Session..."), KTraceFileName, __LINE__);
+									COMASuplSession* OMAsuplSession = static_cast<COMASuplSession*>(iSuplSessions[cnt]);
+	 								OMAsuplSession->CancelTriggerSession();		
+							}
+		}
+	}
+
+// -----------------------------------------------------------------------------
 // COMASUPLProtocolManager2::LogPacket
 // Logs
 // -----------------------------------------------------------------------------
@@ -1740,7 +1760,7 @@
 // 
 // -----------------------------------------------------------------------------
 //
-TInt COMASUPLProtocolManager2::LaunchSettingsUI(MOMASuplUICompletionObserver* aObserver,const TDesC& aForHslp)
+/*TInt COMASUPLProtocolManager2::LaunchSettingsUI(MOMASuplUICompletionObserver* aObserver,const TDesC& aForHslp)
     {        
 	iTrace->Trace(_L("COMASUPLProtocolManager2::LaunchSettingsUI"), KTraceFileName, __LINE__);
     
@@ -1767,7 +1787,7 @@
     	}
     		
 	return KErrNone;
-    }
+    }*/
 
 // -----------------------------------------------------------------------------
 // COMASUPLProtocolManager2::SettingsUICompletedL
@@ -1775,7 +1795,7 @@
 // 
 // -----------------------------------------------------------------------------
 //
-void COMASUPLProtocolManager2::SettingsUICompletedL(TInt aError)
+/*void COMASUPLProtocolManager2::SettingsUICompletedL(TInt aError)
 	{
 	iTrace->Trace(_L("COMASUPLProtocolManager2::SettingsUICompletedL"), KTraceFileName, __LINE__);
     iSuplSettings->SetUIActive(EFalse);
@@ -1799,7 +1819,7 @@
         iCurrentlyUsedHslp.Copy(_L(""));	
         iUIRequestArray.Reset();
     }
-
+*/
 
 // -----------------------------------------------------------------------------
 // COMASUPLProtocolManager2::DeInitialize
@@ -1863,7 +1883,7 @@
 // -----------------------------------------------------------------------------
 //
 
-TInt COMASUPLProtocolManager2::LaunchSuplUsageSettingsUI(MOMASuplUICompletionObserver* aObserver, TBool aRoaming)	
+/*TInt COMASUPLProtocolManager2::LaunchSuplUsageSettingsUI(MOMASuplUICompletionObserver* aObserver, TBool aRoaming)	
 	{
 	iTrace->Trace(_L("COMASUPLProtocolManager2::LaunchSuplUsageSettingsUI"), KTraceFileName, __LINE__);
     if (iSuplSettings->IsUIActive() && !iTimeOutDialogPresent)
@@ -1878,7 +1898,7 @@
     iSessnUIObserver = aObserver;            
     iSuplSettings->SetUIActive(ETrue);
     return iSettingsLauncher->LaunchSuplUsageSettingsUI(aRoaming);
-	}
+	}*/
 
 // -----------------------------------------------------------------------------
 // COMASUPLProtocolManager2::SettingsUsageUICompletedL
@@ -1886,7 +1906,7 @@
 // 
 // -----------------------------------------------------------------------------
 //
-void COMASUPLProtocolManager2::SettingsUsageUICompletedL(TInt aError)
+/*void COMASUPLProtocolManager2::SettingsUsageUICompletedL(TInt aError)
 	{
 	iTrace->Trace(_L("COMASUPLProtocolManager2::SettingsUsageUICompletedL"), KTraceFileName, __LINE__);
     iSuplSettings->SetUIActive(EFalse);
@@ -1904,7 +1924,7 @@
         }
 
     CheckOutstandingUsageUIRequestsL();
-	}
+	}*/
 
 // -----------------------------------------------------------------------------
 // COMASUPLProtocolManager2::ReadSuplUsage
@@ -1912,7 +1932,7 @@
 // 
 // -----------------------------------------------------------------------------
 //
-void COMASUPLProtocolManager2::ReadSuplUsage()
+/*void COMASUPLProtocolManager1::ReadSuplUsage()
 	{
 	iTrace->Trace(_L("COMASUPLProtocolManager2::ReadSuplUsage start"), KTraceFileName, __LINE__);	
 	CSuplSettings::TSuplSettingsUsage suplUsage;
@@ -1922,7 +1942,7 @@
 			iSuplSettings->SetSUPLUsage(suplUsage);
 		}
 	iTrace->Trace(_L("COMASUPLProtocolManager2::ReadSuplUsage end"), KTraceFileName, __LINE__);	
-	}
+	}*/
 
 void COMASUPLProtocolManager2::UpdateAllSubSessnsInSameSession(TInt aIpcSessionId)
     {
@@ -1963,7 +1983,7 @@
 
             if (OMAsuplSession->GetSuplUsageFlag())
                 {                        
-                OMAsuplSession->StartUsageDialogLaunchL();
+                //OMAsuplSession->StartUsageDialogLaunchL();
                 break;
                 }
 		}
@@ -2053,7 +2073,7 @@
 // 
 // -----------------------------------------------------------------------------
 //
-TInt COMASUPLProtocolManager2::LaunchSuplDialogTimeoutUI(MOMASuplUICompletionObserver* aObserver )
+/*TInt COMASUPLProtocolManager2::LaunchSuplDialogTimeoutUI(MOMASuplUICompletionObserver* aObserver )
     {
     iTrace->Trace(_L("COMASUPLProtocolManager2::LaunchTimeOutUI"), KTraceFileName, __LINE__);
     
@@ -2067,7 +2087,7 @@
     iSuplSettings->SetUIActive(ETrue);
     iTimeOutDialogPresent = ETrue;
     return iSettingsLauncher->LaunchSessionTimeOutDialog();		
-    }
+    }*/
 
 // -----------------------------------------------------------------------------
 // COMASUPLProtocolManager2::SettingsTimeOutUICompletedL
@@ -2075,7 +2095,7 @@
 // 
 // -----------------------------------------------------------------------------
 //
-void COMASUPLProtocolManager2::SettingsTimeOutUICompletedL(TInt aError)
+/*void COMASUPLProtocolManager2::SettingsTimeOutUICompletedL(TInt aError)
 	{
 	iTrace->Trace(_L("COMASUPLProtocolManager2::SettingsTimeOutUICompletedL"), KTraceFileName, __LINE__);
     iSuplSettings->SetUIActive(EFalse);
@@ -2092,7 +2112,7 @@
         if (iSessnUIObserver)                
         	iSessnUIObserver->SettingsTimeOutUICompletedL(aError);
         }
-	}
+	}*/
 
 // -----------------------------------------------------------------------------
 // COMASUPLProtocolManager2::GetLastUsedAccessPoint
@@ -2100,9 +2120,10 @@
 // 
 // -----------------------------------------------------------------------------
 //
-TInt COMASUPLProtocolManager2::GetLastUsedAccessPoint(TDes& aLastlyUsedAccessPoint,TUint32& iIAPId)
+TInt COMASUPLProtocolManager2::GetLastUsedAccessPoint(TDes& /*aLastlyUsedAccessPoint*/,TUint32& /*iIAPId*/)
 	{
-	return iSettingsLauncher->GetIAPName(aLastlyUsedAccessPoint,iIAPId);
+	//return iSettingsLauncher->GetIAPName(aLastlyUsedAccessPoint,iIAPId);
+	return KErrNone;
 	}
 
 // -----------------------------------------------------------------------------
--- a/supl/locationomasuplprotocolhandler/protocolhandlerver2/src/epos_comasuplsession2.cpp	Mon May 03 12:54:42 2010 +0300
+++ b/supl/locationomasuplprotocolhandler/protocolhandlerver2/src/epos_comasuplsession2.cpp	Fri May 14 16:17:02 2010 +0300
@@ -1719,8 +1719,7 @@
     TOMASuplUtcTime UtcTime;
     TOMASuplPositionEstimate PosEstimate;
     TDateTime TimeStamp;
-    TInt ZoneCode,Zone,altitude, HorizontalAccuracy;
-	TInt AltitudeUncertainty = 0;
+    TInt ZoneCode,Zone,altitude,AltitudeUncertainty, HorizontalAccuracy;
     TOMASuplAltitudeInfo AltitudeInfo;
     TInt latitude,longitude;
     TOMASuplPositionEstimate::TOMASuplLatitudeSign LatSign;
@@ -1904,8 +1903,7 @@
     TOMASuplUtcTime UtcTime;
     TOMASuplPositionEstimate PosEstimate;
     TDateTime TimeStamp;
-    TInt ZoneCode,Zone,altitude, HorizontalAccuracy;
-	TInt AltitudeUncertainty = 0;
+    TInt ZoneCode,Zone,altitude,AltitudeUncertainty, HorizontalAccuracy;
     TOMASuplAltitudeInfo AltitudeInfo;
     TInt latitude,longitude;
     TOMASuplPositionEstimate::TOMASuplLatitudeSign LatSign;
@@ -2177,7 +2175,7 @@
         iTrace->Trace(msg,KTraceFileName, __LINE__); 
         }
 
-    CSuplSettings::TSuplSettingsUsage usage = iSuplSettings->SUPLUsage();
+        /*CSuplSettings::TSuplSettingsUsage usage = iSuplSettings->SUPLUsage();
 
     if (usage == CSuplSettings::ESuplUsageDisabled)
         {                
@@ -2185,7 +2183,7 @@
         iTrace->Trace(msg,KTraceFileName, __LINE__); 
         iSessionObserver.TerminateSession(this, KErrGeneral);	
         return;
-        }
+            }*/
 
     COMASuplAsnMessageBase::TSuplMessageType messageType = aDecodedAsnMessage->MessageType();
 
@@ -2197,10 +2195,6 @@
         {
         CreateCloneMessageL(aDecodedAsnMessage);		
         UpdateSuplSessionIDL();
-		if (iRequestType == ESUPL_NETWORK && messageType == COMASuplAsnMessageBase::ESUPL_INIT)
-			{
-			ServerAddressCheckForSuplInitL();
-			}
  
         iSuplSessionState = ESUPL_INITIALIZED;
         iSuplMsgType = ESUPL_END;
@@ -2234,9 +2228,9 @@
     
                 if (iSuplStorageSettings->GetDefaultServer(serverParams) == KErrNotFound )
                     {
-	                iTrace->Trace(_L("Length of HSLP Address is = 0, passing the HSLP generated frm IMSI"), KTraceFileName, __LINE__);
-	                hslpAdress = HBufC8::NewL(iSuplSettings->SLPAddressfromImsi().Length());
-	                hslpAdress->Des().Copy(iSuplSettings->SLPAddressfromImsi());	
+                    iTrace->Trace(_L("Length of HSLP Address is = 0, passing the HSLP generated frm IMSI"), KTraceFileName, __LINE__);
+                    hslpAdress = HBufC8::NewL(iSuplSettings->SLPAddressfromImsi().Length());
+                    hslpAdress->Des().Copy(iSuplSettings->SLPAddressfromImsi());	
                     }
                 else
                     {
@@ -3624,6 +3618,9 @@
                     return;
                     }
                 }
+			//Comment to ignore coverity missing break error
+			//coverity[MISSING_BREAK  :FALSE]
+    		       
             case COMASuplState::ESUPL_POS_INIT:
                 {
                 cancelSendRequestor = EFalse;
@@ -3917,11 +3914,11 @@
 		CleanupStack::PopAndDestroy(serverParams);
 
         }
+    CleanupStack::PushL(hslpAdress);
 
     delete iSuplState;
     iSuplState = NULL;
 
-    CleanupStack::PushL(hslpAdress);
     if(setStatusCode)
         {
         iSuplState = COMASuplEndState::NewL(iErrorStatusCode,iOMASuplAsnHandlerBaseImpl,iEncodedSuplInit,hslpAdress);		
@@ -4448,11 +4445,11 @@
 					
 						if (iSuplStorageSettings->GetDefaultServer(serverParams) == KErrNotFound )
 							{
-                            iTrace->Trace(_L("Length of HSLP Address is = 0, passing the HSLP generated frm IMSI"), KTraceFileName, __LINE__);
-                            hslpAdress = HBufC8::NewL(iSuplSettings->SLPAddressfromImsi().Length());
-                            hslpAdress->Des().Copy(iSuplSettings->SLPAddressfromImsi());	
+	                    	iTrace->Trace(_L("Length of HSLP Address is = 0, passing the HSLP generated frm IMSI"), KTraceFileName, __LINE__);
+	                    	hslpAdress = HBufC8::NewL(iSuplSettings->SLPAddressfromImsi().Length());
+	                    	hslpAdress->Des().Copy(iSuplSettings->SLPAddressfromImsi());	
 							}
-						else
+							else
 							{
 							iTrace->Trace(_L("Sending End with ver for Default HSLP"), KTraceFileName, __LINE__);
 							TInt64 slpId;
@@ -4471,33 +4468,34 @@
 						CleanupStack::PopAndDestroy(serverParams);
                     	}
 
-                    delete iSuplState;
-                    iSuplState = NULL;
-                    CleanupStack::PushL(hslpAdress);
-                    ServerAddressCheckForSuplInitL();
-                    iSuplState = COMASuplEndState::NewL(iErrorStatusCode,iOMASuplAsnHandlerBaseImpl,iEncodedSuplInit,hslpAdress);		
-                    CleanupStack::PopAndDestroy(hslpAdress);
-
-                    // Set the SessionId.
-                    iTrace->Trace(_L("COMASuplSession::CheckProtocolVersionL Update SLP Session ID"), KTraceFileName, __LINE__);
-                    UpdateSLPSessionIDL(SessionID);
-    
-                    iTrace->Trace(_L("COMASuplSession::CheckProtocolVersionL Update SET Session ID"), KTraceFileName, __LINE__);
-                    UpdateSETSessionIDL(SessionID);
-                    iSuplState->SetMsgStateObserver(this);
-                    iSuplState->GenerateMessageL();
-                    iSuplSessionState = ESUPL_GENERATE;
-                    }
-                else
-                    {                                
-                    iSuplState = COMASuplEndState::NewL(iErrorStatusCode,iOMASuplAsnHandlerBaseImpl);		
-                    UpdateSLPSessionIDL(SessionID);
-                    UpdateSETSessionIDL(SessionID);
-                    iSuplState->SetMsgStateObserver(this);
-                    iRequestType = ESUPL_INVALID_SESSION;
-                    iSuplSessionState = ESUPL_GENERATE;
-                    iSuplState->GenerateMessageL();
-                    }
+			    delete iSuplState;
+			    iSuplState = NULL;
+                CleanupStack::PushL(hslpAdress);
+                ServerAddressCheckForSuplInitL();
+                iSuplState = COMASuplEndState::NewL(iErrorStatusCode,iOMASuplAsnHandlerBaseImpl,iEncodedSuplInit,hslpAdress);		
+                CleanupStack::PopAndDestroy(hslpAdress);
+
+                // Set the SessionId.
+                iTrace->Trace(_L("COMASuplSession::CheckProtocolVersionL Update SLP Session ID"), KTraceFileName, __LINE__);
+                UpdateSLPSessionIDL(SessionID);
+
+                iTrace->Trace(_L("COMASuplSession::CheckProtocolVersionL Update SET Session ID"), KTraceFileName, __LINE__);
+                UpdateSETSessionIDL(SessionID);
+                iSuplState->SetMsgStateObserver(this);
+                iSuplState->GenerateMessageL();
+                iSuplSessionState = ESUPL_GENERATE;
+                            }
+                        else
+                            {                                
+					        iSuplState = COMASuplEndState::NewL(iErrorStatusCode,iOMASuplAsnHandlerBaseImpl);		
+						    UpdateSLPSessionIDL(SessionID);
+						    UpdateSETSessionIDL(SessionID);
+						    iSuplState->SetMsgStateObserver(this);
+                            iRequestType = ESUPL_INVALID_SESSION;
+						    iSuplSessionState = ESUPL_GENERATE;
+						    iSuplState->GenerateMessageL();
+                            }
+
                 } 
             else 							
                 {
@@ -4697,7 +4695,7 @@
 // COMASuplSession::SettingsUsageUICompletedL
 // 
 // -----------------------------------------------------------------------------
-void COMASuplSession::SettingsUsageUICompletedL(TInt aError)
+/*void COMASuplSession::SettingsUsageUICompletedL(TInt aError)
     {
     iUIFlag = EFalse;
     TBuf<64> msg;	
@@ -4743,7 +4741,7 @@
         iSessionObserver.TerminateSession(this, KErrGeneral);	
         return;
         }
-    }
+	}*/
 
 // -----------------------------------------------------------------------------
 // COMASuplSession::CheckForSuplUsageL
@@ -4753,7 +4751,7 @@
     {
     iTrace->Trace(_L("COMASuplSession::CheckForSuplUsageL Start"), KTraceFileName, __LINE__); 
 
-    if (iSuplUsage >= 1)
+    /*if (iSuplUsage >= 1)
         {            
         CSuplSettings::TSuplSettingsUsage usage = iSuplSettings->SUPLUsage();
         if (usage == CSuplSettings::ESuplUsageDisabled)
@@ -4762,7 +4760,7 @@
             iSessionObserver.TerminateSession(this, KErrGeneral);	
             }
         else if (usage == CSuplSettings::ESuplUsageAutomatic)
-            {            
+            { */           
             if (iNwInitError)
                 {
                 iNwInitError = EFalse;                    
@@ -4773,7 +4771,7 @@
                 iTrace->Trace(_L("CheckForSuplUsageL, Initializing"), KTraceFileName, __LINE__); 
                 InitializeL(iRequestID); 
                 }
-            }
+            /*}
 
         else if (usage == CSuplSettings::ESuplUsageHomeAutomatic || usage == CSuplSettings::ESuplUsageAlwaysAsk)
             {
@@ -4787,7 +4785,7 @@
             }            
         }            
     else
-        InitializeL(iRequestID); 
+	        InitializeL(iRequestID); */
 
     }        
 
@@ -4870,9 +4868,9 @@
         {            
         iUsageHomeNW = aHomeNw;   
         iConnRequestor->UpdateSLPListForHomeUsage(iUsageHomeNW);             
-        CSuplSettings::TSuplSettingsUsage usage = iSuplSettings->SUPLUsage();
-
-        if (usage == CSuplSettings::ESuplUsageAlwaysAsk)
+            //CSuplSettings::TSuplSettingsUsage usage = iSuplSettings->SUPLUsage();
+
+            /*if (usage == CSuplSettings::ESuplUsageAlwaysAsk)
             {
             TInt err;                
             if (!aHomeNw)
@@ -4934,16 +4932,16 @@
                 HandleSuplErrorL(err);
                 }
 
-            }
-        else if (usage == CSuplSettings::ESuplUsageHomeAutomatic) 
-            {                
-            if (!aHomeNw)
-                {                
-                TInt err;                
+                }*/
+            //else if (usage == CSuplSettings::ESuplUsageHomeAutomatic) 
+            //{                
+            //if (!aHomeNw)
+              //  {                
+                //TInt err = KErrNone;                
                 //if (!iSuplSettings->IsUIActive() )
-                {
-                iTrace->Trace(_L("Invoking LaunchSuplUsageSettingsUI, user is roaming"), KTraceFileName, __LINE__);
-                err = iProtocolManager.LaunchSuplUsageSettingsUI(this, ETrue);        
+                    {
+                    //iTrace->Trace(_L("Invoking LaunchSuplUsageSettingsUI, user is roaming"), KTraceFileName, __LINE__);
+                    //err = iProtocolManager.LaunchSuplUsageSettingsUI(this, ETrue);        
 
                 if(iSuplMsgType == ESUPL_INIT)
                     {
@@ -4982,7 +4980,7 @@
                 }
 
 
-                if(!iSuplSettings->IsUIActive() && KErrNone != err)
+              /*  if(!iSuplSettings->IsUIActive() && KErrNone != err)
                     {
                     SetSuplUsageFlag();                            
                     }
@@ -4990,19 +4988,18 @@
                     {
                     iTrace->Trace(_L("Invoking HandleSuplErrorL"), KTraceFileName, __LINE__);
                     HandleSuplErrorL(err);
-                    }
-                }
-            else            
-                {                
+                    }*/
+                
+                       
+                                
                 if (iNwInitError)
                     {
                     iNwInitError = EFalse;                    
                     HandleSuplInitErrorL(iNwInitCompletionCode);                             
                     }                
                 else
-                    InitializeL(iRequestID); 
-                }                
-            }                
+	                InitializeL(iRequestID); 
+                                                
         }
     else
         {
@@ -5072,7 +5069,7 @@
     return iUsageDialog;
     }        
 
-void COMASuplSession::StartUsageDialogLaunchL()
+/*void COMASuplSession::StartUsageDialogLaunchL()
     {
     iTrace->Trace(_L("COMASuplSession::StartUsageDialogLaunchL"), KTraceFileName, __LINE__);
     ReSetSuplUsageFlag();            
@@ -5238,7 +5235,7 @@
                 InitializeL(iRequestID); 
             }                
         }                
-    }
+    }*/
 
 TBool COMASuplSession::IsEtelNotifySet()
     {
@@ -5278,10 +5275,10 @@
         iTrace->Trace(_L("Timer Expired for SUPL Dialog"), KTraceFileName, __LINE__); 
 
 
-        if (!iIapDialogShown)
-            iProtocolManager.LaunchSuplDialogTimeoutUI(this);
-        else
-            iIapDlgTimerExpired = ETrue;            
+    //if (!iIapDialogShown)
+	   // iProtocolManager.LaunchSuplDialogTimeoutUI(this);
+   // else
+       // iIapDlgTimerExpired = ETrue;            
 
         }
     return;	
@@ -5291,14 +5288,14 @@
 // COMASuplSession::SettingsTimeOutUICompletedL
 // 
 // -----------------------------------------------------------------------------
-void COMASuplSession::SettingsTimeOutUICompletedL(TInt aError)
+void COMASuplSession::SettingsTimeOutUICompletedL(TInt /*aError*/)
     {
 
-    TBuf<64> msg;	
-    msg.Copy(_L("SUPL Timeout UI completed with ... "));
-    msg.AppendNum(aError);
-    iTrace->Trace(msg,KTraceFileName, __LINE__); 
-    iSessionObserver.TerminateSession(this, KErrGeneral);	
+	  //  TBuf<64> msg;	
+	  //  msg.Copy(_L("SUPL Timeout UI completed with ... "));
+	  //  msg.AppendNum(aError);
+	  //  iTrace->Trace(msg,KTraceFileName, __LINE__); 
+	  //  iSessionObserver.TerminateSession(this, KErrGeneral);	
     return;
 
     }
@@ -5612,7 +5609,14 @@
 						}	
 
             CTriggerParams* activeSessionParam = CTriggerParams::NewLC();
+            TTime endTime;
+            endTime.HomeTime();
+            TTimeIntervalSeconds period;
+            period = iNumFixes * iInterval;
+            endTime = endTime + period;
             activeSessionParam->Set(iSETSessionUniqueId,iRequestorName,ETrue,ETrue,CTriggerParams::EPeriodic,requestType,iNumFixes,iInterval);
+            activeSessionParam->SetTriggerEndTime(endTime);
+            
             iTrace->Trace(_L("Session Id : "), KTraceFileName, __LINE__);
             TBuf<64> sessionId;
             sessionId.AppendNum(iSETSessionUniqueId);
@@ -5694,11 +5698,13 @@
     CTriggerParams::TRequestType requestType;
     TUint64 outstandingTrigger;
     TUint64 interval;
+    TTime endTime;
 
 	HBufC* sessionName = HBufC::NewL( KMaxSessionNameLength );
 	
 		aParamValues->Get(sessionId,sessionName->Des(),notificationPresent,triggerNotificationStatus,
                            triggerType,requestType,outstandingTrigger,interval);
+		aParamValues->GetTriggerEndTime(endTime);                                                            
                            //triggerNotificationStatus = ETrue;
 	
 		UpdateActiveTriggerSession(); //Update UI for trigger info...
--- a/supl/locationomasuplprotocolhandler/protocolhandlerver2/src/epos_comasuplsettings.cpp	Mon May 03 12:54:42 2010 +0300
+++ b/supl/locationomasuplprotocolhandler/protocolhandlerver2/src/epos_comasuplsettings.cpp	Fri May 14 16:17:02 2010 +0300
@@ -131,22 +131,22 @@
 // 
 // -----------------------------------------------------------------------------
 //
-void COMASuplSettings::SetSUPLUsage(CSuplSettings::TSuplSettingsUsage& aSUPLUsage ) 
+/*void COMASuplSettings::SetSUPLUsage(CSuplSettings::TSuplSettingsUsage& aSUPLUsage ) 
 {
     iSUPLUsage = aSUPLUsage;
 }
-
+*/
 // -----------------------------------------------------------------------------
 // COMASuplSettings::SUPLUsage() 
 // Gets the SUPL Usage
 // 
 // -----------------------------------------------------------------------------
 //
-CSuplSettings::TSuplSettingsUsage COMASuplSettings::SUPLUsage() const
+/*CSuplSettings::TSuplSettingsUsage COMASuplSettings::SUPLUsage() const
 	{
 		return iSUPLUsage;
 	}
-
+*/
 
 // -----------------------------------------------------------------------------
 // COMASuplSettings::SetUIActive
--- a/supl/locationomasuplprotocolhandler/protocolhandlerver2/src/epos_comasuplstartstate.cpp	Mon May 03 12:54:42 2010 +0300
+++ b/supl/locationomasuplprotocolhandler/protocolhandlerver2/src/epos_comasuplstartstate.cpp	Fri May 14 16:17:02 2010 +0300
@@ -89,7 +89,8 @@
 		iTrace->Trace(_L("COMASuplStartState::~COMASuplStartState..."), KTraceFileName, __LINE__); 							
 
 	delete iLocationIDRequestor;
-	iTrace->Trace(_L("Deleted iLocationIDRequestor..."), KTraceFileName, __LINE__); 							
+	if(iTrace)
+	    iTrace->Trace(_L("Deleted iLocationIDRequestor..."), KTraceFileName, __LINE__); 							
 	
 	if(iPosRequestor)
         {                
@@ -98,15 +99,19 @@
 	else    	    	
         {                
 		delete iSETCapabilities ;
-	    iTrace->Trace(_L("Deleted iSETCapabilities ..."), KTraceFileName, __LINE__); 							
+		if(iTrace)
+		    iTrace->Trace(_L("Deleted iSETCapabilities ..."), KTraceFileName, __LINE__); 							
         }
 
 	delete iAllowedCapabilities;
-	iTrace->Trace(_L("Deleted iAllowedCapabilities..."), KTraceFileName, __LINE__); 							
+	
+	if(iTrace)
+	    iTrace->Trace(_L("Deleted iAllowedCapabilities..."), KTraceFileName, __LINE__); 							
  							
 	if(iLocationId)
 		{
-		iTrace->Trace(_L("Deleted iLocationId..."), KTraceFileName, __LINE__); 							
+        if(iTrace)
+            iTrace->Trace(_L("Deleted iLocationId..."), KTraceFileName, __LINE__); 							
 		delete iLocationId;	
 		iLocationId=NULL;
 		}    		
@@ -241,8 +246,8 @@
             TBool tia801, rrlp, rrc;
 		    posProtocol.GetPosProtocol(tia801, rrlp, rrc);
             posProtocol2.SetPosProtocol(tia801, rrlp, rrc);
-
-            iSETCapabilities2->SetSETCapabilities(posTechnology2, prefMethod2, posProtocol2);
+            if(iSETCapabilities2)
+                iSETCapabilities2->SetSETCapabilities(posTechnology2, prefMethod2, posProtocol2);
         }
 		OMASuplStart->SetMessageBase(aSuplVersion,aSessionId); 
 	
@@ -286,9 +291,10 @@
         // Set SET Capability extn
         TOMAVer2SetCapExtn setCapsExtn;
         setCapsExtn.SetServiceCaps(serviceCaps);
-				iTrace->Trace(_L("SetVer2SetCapExtn"), KTraceFileName, __LINE__);
+        iTrace->Trace(_L("SetVer2SetCapExtn"), KTraceFileName, __LINE__);
         // Set SET Capabilities
-        iSETCapabilities2->SetVer2SetCapExtn(setCapsExtn);
+		if(iSETCapabilities2)
+		    iSETCapabilities2->SetVer2SetCapExtn(setCapsExtn);
 		//iLocationId ownership will be with SUPL start class
 		OMASuplStart->SetSuplStart(iSETCapabilities2,iLocationId2,iECId);
 		if(iECId)
@@ -664,11 +670,11 @@
 			TInt refMNC,refMCC,refCI,refLac;
 			cellInfo->SuplGSMCellInfo(refMNC,refMCC,refCI,refLac);
 			
-	        COMASuplGSMCellInfo* cellInfoClone = COMASuplGSMCellInfo::NewL();
-	        cellInfoClone->SetSuplGSMCellInfo(refMNC,refMCC,refCI,refLac);
+			COMASuplGSMCellInfo* cellInfoClone = COMASuplGSMCellInfo::NewL();
+			cellInfoClone->SetSuplGSMCellInfo(refMNC,refMCC,refCI,refLac);
 			iLocationId2->SetSuplLocationId(cellInfoClone, status);
 
-	        iLocationId = aLocationId;
+			iLocationId = aLocationId;
 
 			if(iECId)
 				{
@@ -679,7 +685,7 @@
 			else
 				{	
 					GetAssistceDataFromPluginL(aErrorCode);
-				}
+				}	
 			}
 	}
 
--- a/supl/locationomasuplprotocolhandler/protocolhandlerver2/src/epos_comasuplstate.cpp	Mon May 03 12:54:42 2010 +0300
+++ b/supl/locationomasuplprotocolhandler/protocolhandlerver2/src/epos_comasuplstate.cpp	Fri May 14 16:17:02 2010 +0300
@@ -396,8 +396,9 @@
 //
 void COMASuplState::StopTimer()
 	{
-		iTimer->StopTimer();	 			
-		iTrace->Trace(_L("COMASuplState::StopTimer..."), KTraceFileName, __LINE__); 							
+		iTimer->StopTimer();	 		
+		if(iTrace)
+		    iTrace->Trace(_L("COMASuplState::StopTimer..."), KTraceFileName, __LINE__); 							
 	}
 	
 // -----------------------------------------------------------------------------
--- a/supl/locationomasuplprotocolhandler/protocolhandlerver2/src/epos_comasupltriggerstartstate.cpp	Mon May 03 12:54:42 2010 +0300
+++ b/supl/locationomasuplprotocolhandler/protocolhandlerver2/src/epos_comasupltriggerstartstate.cpp	Fri May 14 16:17:02 2010 +0300
@@ -88,24 +88,25 @@
 //
 COMASuplTriggerStartState::~COMASuplTriggerStartState()
     {
-    	if(iTrace)
-    		{
-    		iTrace->Trace(_L("COMASuplTriggerStartState::~COMASuplTriggerStartState..."), KTraceFileName, __LINE__); 							
-    		iTrace->Trace(_L("deleting iLocationIDRequestor..."), KTraceFileName, __LINE__); 							
-    	  }
-    	delete iLocationIDRequestor;
-    	
-    	if(iPosRequestor)
-    		iPosRequestor->DestroyList();
-		else    	    	
-            {                
-    	    iTrace->Trace(_L("deleting iSETCapabilities ..."), KTraceFileName, __LINE__); 							
-    		delete iSETCapabilities ;
-            }
+    if(iTrace)
+        {
+        iTrace->Trace(_L("COMASuplTriggerStartState::~COMASuplTriggerStartState..."), KTraceFileName, __LINE__); 							
+        iTrace->Trace(_L("deleting iLocationIDRequestor..."), KTraceFileName, __LINE__); 							
+        }
+    delete iLocationIDRequestor;
 
+    if(iPosRequestor)
+        iPosRequestor->DestroyList();
+    else    	    	
+        {   
+        if(iTrace)
+            iTrace->Trace(_L("deleting iSETCapabilities ..."), KTraceFileName, __LINE__); 							
+        delete iSETCapabilities ;
+        }
 
-    	iTrace->Trace(_L("deleting iAllowedCapabilities ..."), KTraceFileName, __LINE__); 							
-    	delete iAllowedCapabilities;
+    if(iTrace)
+        iTrace->Trace(_L("deleting iAllowedCapabilities ..."), KTraceFileName, __LINE__); 							
+    delete iAllowedCapabilities;
 
     }
 
@@ -260,7 +261,7 @@
 							 posProtocolExt.SetTOMASuplVer2ProtocolExt(tempProtocolVersion,posProtocolVersion,posProtocolVersionTia);								
 							 posProtocol2.SetVer2PosProtoExtn(posProtocolExt);
 						}
-			
+			if(iSETCapabilities2)
 			      iSETCapabilities2->SetSETCapabilities(posTechnology2, prefMethod2, posProtocol2);
       
       }
@@ -308,9 +309,10 @@
         // Set SET Capability extn
         TOMAVer2SetCapExtn setCapsExtn;
         setCapsExtn.SetServiceCaps(serviceCaps);
-				iTrace->Trace(_L("SetVer2SetCapExtn"), KTraceFileName, __LINE__);
+		iTrace->Trace(_L("SetVer2SetCapExtn"), KTraceFileName, __LINE__);
         // Set SET Capabilities
-        iSETCapabilities2->SetVer2SetCapExtn(setCapsExtn);
+		if(iSETCapabilities2)
+		    iSETCapabilities2->SetVer2SetCapExtn(setCapsExtn);
 
 	    iTrace->Trace(_L("SetSuplTriggeredStart"), KTraceFileName, __LINE__);
 	    
--- a/supl/locationomasuplprotocolhandler/provisioninghandler/src/epos_comasuplsettingsrepository.cpp	Mon May 03 12:54:42 2010 +0300
+++ b/supl/locationomasuplprotocolhandler/provisioninghandler/src/epos_comasuplsettingsrepository.cpp	Fri May 14 16:17:02 2010 +0300
@@ -112,7 +112,7 @@
     
     TInt64 slpID;
     
-    
+    paramValues->SetServerConfigurationType(EFalse);
     TInt err = iSettings->AddNewServer(paramValues,slpID);
     if (err == KErrNone || err == KErrAlreadyExists)
     iSettings->SetTopPriority(slpID);
--- a/supl/locationomasuplprotocolhandler/rom/omasuplprotocolhandler.iby	Mon May 03 12:54:42 2010 +0300
+++ b/supl/locationomasuplprotocolhandler/rom/omasuplprotocolhandler.iby	Fri May 14 16:17:02 2010 +0300
@@ -45,9 +45,10 @@
 //OMA Protocol Handler Plugin & resource file
 ECOM_PLUGIN(eposomasuplprotocolhandler1.dll,eposomasuplprotocolhandler1.rsc)
 
+#ifndef FF_DISABLE_OMA_SUPL_V2
 //OMA Protocol Handler Plugin & resource file
 ECOM_PLUGIN(eposomasuplprotocolhandler2.dll,eposomasuplprotocolhandler2.rsc)
-
+#endif // FF_DISABLE_OMA_SUPL_V2
 
 //OMA Provisioning
 ECOM_PLUGIN(epos_omasuplprovhandler.dll,1027509B.rsc)
--- a/supl/locationomasuplprotocolhandler/supllistener/src/epos_comasuplimsiobserver.cpp	Mon May 03 12:54:42 2010 +0300
+++ b/supl/locationomasuplprotocolhandler/supllistener/src/epos_comasuplimsiobserver.cpp	Fri May 14 16:17:02 2010 +0300
@@ -211,6 +211,7 @@
         CServerParams* param=CServerParams::NewL();
         CleanupStack::PushL(param);
         User::LeaveIfError(param->Set( hslpaddr,iapn,ETrue,ETrue,ETrue,EFalse ));
+        param->SetServerConfigurationType(EFalse);
         
         // add new server into settings
         TInt64 slpId;
--- a/supl/locationomasuplprotocolhandler/supllistener/src/epos_comasuplproductconfig.cpp	Mon May 03 12:54:42 2010 +0300
+++ b/supl/locationomasuplprotocolhandler/supllistener/src/epos_comasuplproductconfig.cpp	Fri May 14 16:17:02 2010 +0300
@@ -155,7 +155,8 @@
                     }
                 if(iServerAddress.Length()!=0)
                     {
-                    err = params->Set(iServerAddress,iIapName,serverEnabled,simChangeRemove,usageInHomeNw,editable);
+                    //last parameter is ETrue since this is a product configured server
+                    err = params->Set(iServerAddress,iIapName,serverEnabled,simChangeRemove,usageInHomeNw,editable,0);//by default product config
                     errCode.AppendNum(err);
                     Trace(_L("params->Set returned:"),KProductConfig, __LINE__);
                     Trace(errCode,KProductConfig, __LINE__);
--- a/supl/locationomasuplprotocolhandler/syncmlprovhandler/src/epos_comasupldmrepository.cpp	Mon May 03 12:54:42 2010 +0300
+++ b/supl/locationomasuplprotocolhandler/syncmlprovhandler/src/epos_comasupldmrepository.cpp	Fri May 14 16:17:02 2010 +0300
@@ -345,6 +345,7 @@
                 CServerParams* paramValues = CServerParams::NewL();
                 CleanupStack::PushL(paramValues);
                 TInt err =  paramValues->Set(*iServerAddress,*iIapName);
+                paramValues->SetServerConfigurationType(EFalse);
                 err = iSettings->AddNewServer(paramValues,iSlpId);
                 if(err == KErrAlreadyExists)
                     {
--- a/supl/locationomasuplprotocolhandler/waplistener/src/epos_comasuplwaplistener.cpp	Mon May 03 12:54:42 2010 +0300
+++ b/supl/locationomasuplprotocolhandler/waplistener/src/epos_comasuplwaplistener.cpp	Fri May 14 16:17:02 2010 +0300
@@ -307,8 +307,12 @@
 	TPtrC8 field;
 	TBool isHeaderPresent = aPushMsg->GetBinaryHeaderField(EHttpContentType, field);
 
+#ifdef _DEBUG
+	//Log the received message
     iTrace->Trace( _L( "Received Binary Content Type is:" ), KTraceFileName, __LINE__ );
     PrintHex(field, __LINE__);
+#endif
+
 	if( isHeaderPresent )
 	{
 		    iTrace->Trace( _L( "Binary Content type present..." ), KTraceFileName, __LINE__ );
@@ -328,7 +332,7 @@
 }
 
 // -----------------------------------------------------------------------------
-// COMASuplWapListener::CheckBinaryContentType
+// COMASuplWapListener::PrintHex
 // 
 // -----------------------------------------------------------------------------
 //
@@ -338,8 +342,24 @@
 			TBuf<2> buff;
 			_LIT16(KFormat1,"%02x");
 			TInt len = aBuffer.Length();
+			
+			//The buffer is usually larger than what can be logged in a single line in the log file.  As such this should only attempt
+			// to log 27 hex blocks to each log line.
+			const TInt KNumberOfBlocks = 27;
+			TInt blockNumber = KNumberOfBlocks;
+			
 			for(TInt i = 0 ; i <len; i++)
 				{
+					//Check to see if the buffer should be logged and then emptied
+                    if(i == blockNumber)
+                        {
+                        //Trace the buffer as it currently is
+                        iTrace->Trace(buffer, KTraceFileName, aLine);
+                        //Reset the buffer for the next log line
+                        buffer.Zero();
+                        blockNumber += KNumberOfBlocks;
+                        }
+					
 					buff.Zero();
 					buff.Format(KFormat1,aBuffer[i]);
 					buffer.Append(buff);	
Binary file supl/locationsuplfw/conf/suplsettings.confml has changed
Binary file supl/locationsuplfw/conf/suplsettings_102073D6.crml has changed
--- a/supl/locationsuplfw/gateway/inc/epos_csuplnetinitiatedsession.h	Mon May 03 12:54:42 2010 +0300
+++ b/supl/locationsuplfw/gateway/inc/epos_csuplnetinitiatedsession.h	Fri May 14 16:17:02 2010 +0300
@@ -68,6 +68,10 @@
 	//	void SetHandle(TInt aHandle);
 		
 		void DestroySession(CSuplSessionManager* aSessionMgr);
+		
+		private:
+			TBool CheckSuplTriggerServiceStatus();
+    
     protected:  // Functions from base classes
 
     private:
--- a/supl/locationsuplfw/gateway/src/epos_csuplipcsession.cpp	Mon May 03 12:54:42 2010 +0300
+++ b/supl/locationsuplfw/gateway/src/epos_csuplipcsession.cpp	Fri May 14 16:17:02 2010 +0300
@@ -118,7 +118,11 @@
     TInt dataSize = aMessage.GetDesLength(0);
     if(dataSize>0)
     	{
-    	iSuplServer.HandleNewNetSessionL(iSessionManager,aMessage);  
+    	TRAPD(err,iSuplServer.HandleNewNetSessionL(iSessionManager,aMessage));
+    	if(err != KErrNone)
+    	    {
+            RequestComplete(aMessage,err);
+    	    }
     	}
     else
     	{
--- a/supl/locationsuplfw/gateway/src/epos_csuplipcsubsession.cpp	Mon May 03 12:54:42 2010 +0300
+++ b/supl/locationsuplfw/gateway/src/epos_csuplipcsubsession.cpp	Fri May 14 16:17:02 2010 +0300
@@ -540,6 +540,8 @@
 TInt CSuplIPCSubSession::PackPositionData(const RMessage2& aMessage)
 	{
 	DEBUG_TRACE("CSuplIPCSubSession::PackPositionData", __LINE__)
+	//coverity ignore comment below
+    //coverity[UNUSED_VALUE  :FALSE]  
     TPositionInfo& info = PositionInfo(iPositionBuffer);
  
     TPtr8 ptrToBuffer = iPositionBuffer->Des();
@@ -555,6 +557,8 @@
 TInt CSuplIPCSubSession::PackServerAddressData(const RMessage2& aMessage)
     {
     DEBUG_TRACE("CSuplIPCSubSession::PackServerAddressData", __LINE__)
+	//coverity ignore comment below
+    //coverity[UNUSED_VALUE  :FALSE]  
     TDes& info = ServerAddress(iPositionBuffer);
  
     TPtr8 ptrToBuffer = iPositionBuffer->Des();
@@ -572,6 +576,8 @@
 TInt CSuplIPCSubSession::PackTriggerData(const RMessage2& aMessage)
 	{
 	DEBUG_TRACE("CSuplIPCSubSession::PackTriggerData", __LINE__)
+	//coverity ignore comment below
+    //coverity[UNUSED_VALUE  :FALSE]   
     TSuplTriggerFireInfo& info = TriggerInfo(iPositionBuffer);
  
     TPtr8 ptrToBuffer = iPositionBuffer->Des();
--- a/supl/locationsuplfw/gateway/src/epos_csuplnetinitiatedsession.cpp	Mon May 03 12:54:42 2010 +0300
+++ b/supl/locationsuplfw/gateway/src/epos_csuplnetinitiatedsession.cpp	Fri May 14 16:17:02 2010 +0300
@@ -61,15 +61,34 @@
     TInt majorVersion = KErrNotFound;
     TInt err = aSessnMgr.GetSUPLMessageVersionL(majorVersion,aClientBuf->Des());
     
-    if(majorVersion == 1)
+    if(majorVersion == 2)
+	{
+		if(!CheckSuplTriggerServiceStatus())
+    	{
+    			User::Leave(KErrNotSupported);
+    	}
+		suplService = RSuplTerminalSubSession::ESUPL_2_0;
+	}
+    else 
     	suplService = RSuplTerminalSubSession::ESUPL_1_0;
-    else 
-    	suplService = RSuplTerminalSubSession::ESUPL_2_0;
     
     iSuplSession = aSessnMgr.CreateNewSessionL(aReqType, 0, suplService );
+    if (iSuplSession)
+    {	
     iSuplSession->SetSUPLVersion(majorVersion);
     iSuplSessnReq = CSuplSessionRequest::NewL(aSessnMgr, iSuplSession, aServer);
-  
+    }  
+    else
+    	if (!iSuplSession && suplService == RSuplTerminalSubSession::ESUPL_2_0)
+    		{
+    			 suplService = RSuplTerminalSubSession::ESUPL_1_0;
+    			 iSuplSession = aSessnMgr.CreateNewSessionL(aReqType, 0, suplService );
+    					if (iSuplSession)
+   						 {	
+   						 iSuplSession->SetSUPLVersion(majorVersion);
+    					 iSuplSessnReq = CSuplSessionRequest::NewL(aSessnMgr, iSuplSession, aServer);
+    					 }
+    		}
 
     }
 
@@ -171,5 +190,41 @@
 	aSessionMgr->DestroySession(iSuplSession);
 }
 
+// ---------------------------------------------------------
+// CSuplNetInitiatedSession::CheckSuplTriggerServiceStatus
+//
+// (other items were commented in a header).
+// ---------------------------------------------------------
+//
+TBool CSuplNetInitiatedSession::CheckSuplTriggerServiceStatus()
+{
+	
+	CSuplSettings* 	suplStorageSettings = NULL;
+	
+	CSuplSettings::TSuplTriggerStatus suplTriggerStatus;
+
+	// create local object iSuplStorageSettings
+	TRAPD(err,suplStorageSettings = CSuplSettings::NewL());
+	if(err == KErrNone)
+	{
+			suplStorageSettings->GetSuplTriggeredServiceStatus(suplTriggerStatus);
+			delete suplStorageSettings;
+			suplStorageSettings = NULL;
+
+			if(suplTriggerStatus == CSuplSettings::ESuplTriggerOn)
+			{
+					return ETrue;						
+			}
+			else
+			{
+					return EFalse;	
+			}
+	}		
+	else
+	{
+			return ETrue;
+	}
+}
+
 // End of File
 
--- a/supl/locationsuplfw/gateway/src/epos_csuplserver.cpp	Mon May 03 12:54:42 2010 +0300
+++ b/supl/locationsuplfw/gateway/src/epos_csuplserver.cpp	Fri May 14 16:17:02 2010 +0300
@@ -142,8 +142,8 @@
     // Settings
     TInt keyValue;
     TInt err = KErrNone;
-    
-    CRepository* repository = CRepository::NewL(KCRUidSuplConfiguration);
+    CRepository* repository = NULL;
+    TRAP(err, repository = CRepository::NewL(KCRUidSuplConfiguration));
     CleanupStack::PushL(repository);
     
     if (err != KErrNone)
--- a/supl/locationsuplfw/protocolhandlerapi/group/epos_suplprotocolhandlerplugin.mmp	Mon May 03 12:54:42 2010 +0300
+++ b/supl/locationsuplfw/protocolhandlerapi/group/epos_suplprotocolhandlerplugin.mmp	Fri May 14 16:17:02 2010 +0300
@@ -51,7 +51,7 @@
 LIBRARY			insock.lib 
 LIBRARY			securesocket.lib
 LIBRARY			commdb.lib
-LIBRARY         centralrepository.lib 
+LIBRARY         centralrepository.lib extendedconnpref.lib netmeta.lib /*extendedconnpref.lib netmeta.lib Related to custom preference Api's(OCC).*/
 LIBRARY flogger.lib
 /* LIBRARY         gba.lib */
 
--- a/supl/locationsuplfw/protocolhandlerapi/src/epos_csuplconnection.cpp	Mon May 03 12:54:42 2010 +0300
+++ b/supl/locationsuplfw/protocolhandlerapi/src/epos_csuplconnection.cpp	Fri May 14 16:17:02 2010 +0300
@@ -35,6 +35,8 @@
 #include "epos_psktlsusageprivatecrkeys.h"
 #include "epos_suplpskloger.h"
 
+#include <extendedconnpref.h> //For OCC
+
 const TInt KMaxGBAUsageLength =  4;
 const TInt KMaxVerLength =  4;
 //const TInt KMaxNewPasswordLength =  8;
@@ -321,7 +323,8 @@
     // Cancel Any outstanding request
     Cancel();
     
-    iTrace->Trace(_L("CSuplConnection::Destructor...Deleting Socket Reader"), KTraceFileName, __LINE__);
+    if(iTrace)
+        iTrace->Trace(_L("CSuplConnection::Destructor...Deleting Socket Reader"), KTraceFileName, __LINE__);
     //Delete the Socket Reader
     delete iSocketReader;
     
@@ -940,14 +943,41 @@
             iConnectStarted = ETrue;
 
 #ifndef __WINS__
-			TCommDbConnPref prefs;
-	        prefs.SetDialogPreference(ECommDbDialogPrefDoNotPrompt);
-      		prefs.SetDirection(ECommDbConnectionDirectionOutgoing);
-            prefs.SetIapId(iIAPId);
-
+		 	TExtendedConnPref OCCPrefs;
+            TConnPrefList prefList;           
+           	
+           	OCCPrefs.SetForcedRoaming(EFalse); //do not switch networks during an ongoing connection            
+            OCCPrefs.SetNoteBehaviour(TExtendedConnPref::ENoteBehaviourDefault);
+            
+            
+            if(iIAPId != -1) //if a IAP was configured
+                {
+                iTrace->Trace(_L("CSuplConnection::Connect : IAP configured"), KTraceFileName, __LINE__);                      
+                OCCPrefs.SetIapId(iIAPId);
+                // since IAP Id is set SNAP purpose should not be set - set to unknown
+                OCCPrefs.SetSnapPurpose(CMManager::ESnapPurposeUnknown);
+                OCCPrefs.SetBearerSet(TExtendedConnPref::EExtendedConnBearerUnknown);
+                }
+            else
+                {
+                OCCPrefs.SetSnapPurpose(CMManager::ESnapPurposeInternet);
+                	//WLAN and Cellular Networks allowed for connection
+            		OCCPrefs.SetBearerSet(TExtendedConnPref::EExtendedConnBearerWLAN | TExtendedConnPref::EExtendedConnBearerCellular);
+            
+                //if SNAP purpose is set IAP Id should be zero - zero by default not explicitly set
+                iTrace->Trace(_L("CSuplConnection::Connect : IAP not configured"), KTraceFileName, __LINE__);
+                }
+              
+            
+            TRAP_IGNORE(prefList.AppendL(&OCCPrefs));
+			
             TInt ret = iConnection.Open(iSocketServ);
+            if(ret != KErrNone)
+                iTrace->Trace(_L("RConnection Open returned error"), KTraceFileName, __LINE__);
+            
+            iTrace->Trace(_L("RConnection Start Called, State is ERetriveIAP"), KTraceFileName, __LINE__);
       		// Start an Outgoing Connection with overrides
-      		iConnection.Start(prefs,iStatus);
+      		iConnection.Start(prefList,iStatus);
 			// Set state to ERetriveIAP
 			iState = ERetriveIAP;	
 			SetActive();	 
--- a/supl/locationsuplfw/protocolhandlerapi/src/epos_suplkey.cpp	Mon May 03 12:54:42 2010 +0300
+++ b/supl/locationsuplfw/protocolhandlerapi/src/epos_suplkey.cpp	Fri May 14 16:17:02 2010 +0300
@@ -213,6 +213,7 @@
         }
 
         /* pad the key if necessary */
+        //coverity[OVERRUN_STATIC  :FALSE]
         memset(cx->key + cx->klen, 0, IN_BLOCK_LENGTH - cx->klen);
 
         /* xor ipad into key value  */
--- a/supl/locationsuplfw/settingsapi/bwins/epos_suplsettingsu.def	Mon May 03 12:54:42 2010 +0300
+++ b/supl/locationsuplfw/settingsapi/bwins/epos_suplsettingsu.def	Fri May 14 16:17:02 2010 +0300
@@ -93,4 +93,10 @@
 	?SetServerExtensionParams@CSuplSettingsInternal@@QAEH_JPAVCServerExtensionParams@@@Z @ 92 NONAME ; int CSuplSettingsInternal::SetServerExtensionParams(long long, class CServerExtensionParams *)
 	?NewLC@CServerExtensionParams@@SAPAV1@XZ @ 93 NONAME ; class CServerExtensionParams * CServerExtensionParams::NewLC(void)
 	?GetDefaultIAPName@CSuplSettings@@QAEHAAVTDes16@@@Z @ 94 NONAME ; int CSuplSettings::GetDefaultIAPName(class TDes16 &)
+	?SetServerConfigurationType@CServerParams@@QAEXH@Z @ 95 NONAME ; void CServerParams::SetServerConfigurationType(int)
+	?GetServerConfigurationType@CServerParams@@QBEHAAH@Z @ 96 NONAME ; int CServerParams::GetServerConfigurationType(int &) const
+	?GetTriggerEndTime@CTriggerParams@@QBEHAAVTTime@@@Z @ 97 NONAME ; int CTriggerParams::GetTriggerEndTime(class TTime &) const
+	?SetSuplTriggeredServiceStatus@CSuplSettings@@QAEHABW4TSuplTriggerStatus@1@@Z @ 98 NONAME ; int CSuplSettings::SetSuplTriggeredServiceStatus(enum CSuplSettings::TSuplTriggerStatus const &)
+	?SetTriggerEndTime@CTriggerParams@@QAEXVTTime@@@Z @ 99 NONAME ; void CTriggerParams::SetTriggerEndTime(class TTime)
+	?GetSuplTriggeredServiceStatus@CSuplSettings@@QAEHAAW4TSuplTriggerStatus@1@@Z @ 100 NONAME ; int CSuplSettings::GetSuplTriggeredServiceStatus(enum CSuplSettings::TSuplTriggerStatus &)
 
--- a/supl/locationsuplfw/settingsapi/eabi/epos_suplsettingsu.def	Mon May 03 12:54:42 2010 +0300
+++ b/supl/locationsuplfw/settingsapi/eabi/epos_suplsettingsu.def	Fri May 14 16:17:02 2010 +0300
@@ -116,4 +116,10 @@
 	_ZTI22CServerExtensionParams @ 115 NONAME
 	_ZTV22CServerExtensionParams @ 116 NONAME
 	_ZN13CSuplSettings17GetDefaultIAPNameER6TDes16 @ 117 NONAME
+	_ZN13CServerParams26SetServerConfigurationTypeEi @ 118 NONAME
+	_ZN13CSuplSettings29GetSuplTriggeredServiceStatusERNS_18TSuplTriggerStatusE @ 119 NONAME
+	_ZN13CSuplSettings29SetSuplTriggeredServiceStatusERKNS_18TSuplTriggerStatusE @ 120 NONAME
+	_ZN14CTriggerParams17SetTriggerEndTimeE5TTime @ 121 NONAME
+	_ZNK13CServerParams26GetServerConfigurationTypeERi @ 122 NONAME
+	_ZNK14CTriggerParams17GetTriggerEndTimeER5TTime @ 123 NONAME
 
--- a/supl/locationsuplfw/settingsapi/group/bld.inf	Mon May 03 12:54:42 2010 +0300
+++ b/supl/locationsuplfw/settingsapi/group/bld.inf	Fri May 14 16:17:02 2010 +0300
@@ -27,6 +27,7 @@
 ../inc/epos_csuplsettingsinternal.h	  |../../../inc/epos_csuplsettingsinternal.h
 ../inc/epos_csuplsettingextensionparams.h	  |../../../inc/epos_csuplsettingextensionparams.h
 ../inc/epos_csuplsettingsinternalconstants.h	  |../../../inc/epos_csuplsettingsinternalconstants.h
+../inc/epos_csuplsettingsinternalcrkeys.h         |../../../inc/epos_csuplsettingsinternalcrkeys.h
 PRJ_MMPFILES
 epos_suplsettings.mmp
 
--- a/supl/locationsuplfw/settingsapi/inc/epos_csuplsettingsengine.h	Mon May 03 12:54:42 2010 +0300
+++ b/supl/locationsuplfw/settingsapi/inc/epos_csuplsettingsengine.h	Fri May 14 16:17:02 2010 +0300
@@ -1265,6 +1265,31 @@
     
     TInt SetServerExtensionParams( TInt64 aSlpId,CServerExtensionParams* aServerExtnParams );
     
+  
+    /*
+	 * Changes status of SUPL triggering service. 
+	 *
+	 * @since S60 5.2 
+	 * @param [IN] aSuplTriggerStatus, Indicates that SUPL  triggering service needs to be ON ( ESuplTriggerOn)  or OFF (ESuplTriggerOff)
+	 *
+	 * @return following error codes
+	 *      - KErrNone if successful
+	 *           otherwise system wide error codes. 
+	 */
+	 TInt SetSuplTriggeredServiceStatus( const CSuplSettings::TSuplTriggerStatus& aSuplTriggerStatus );
+        
+    /*
+	 * Gets status of SUPL triggering service.SUPL Triggering service can be either ESuplTriggerOn or ESuplTriggerOff
+	 *
+	 * @since S60 5.2 
+	 * @param [OUT] aSuplTriggerStatus, Gets status of SUPL triggering session either ON or OFF
+	 *
+	 * @return following error codes
+	 *      - KErrNone if successful
+	 *           otherwise system wide error codes. 
+	 */
+	 TInt GetSuplTriggeredServiceStatus( CSuplSettings::TSuplTriggerStatus& aSuplTriggerStatus );
+        
     /**
      * This method is used to read the default configured IAP name from the product config
      * central repository.
--- a/supl/locationsuplfw/settingsapi/inc/epos_csuplsettingsinternalcrkeys.h	Mon May 03 12:54:42 2010 +0300
+++ b/supl/locationsuplfw/settingsapi/inc/epos_csuplsettingsinternalcrkeys.h	Fri May 14 16:17:02 2010 +0300
@@ -32,5 +32,6 @@
 const TUint32 KSuplSettigsDBPath = 0x00000008;
 const TUint32 KSuplSessionDBEvent = 0x00000009;
 const TUint32 KSuplSessionDBChangedSessionId = 0x0000000A;
+const TUint32 KSuplSettingsTriggerServiceStatus = 0x0000000B;
 
 #endif //SUPLSETTINGSINTERNALCRKEYS_H
--- a/supl/locationsuplfw/settingsapi/inc/epos_csuplsettingsnotifier.h	Mon May 03 12:54:42 2010 +0300
+++ b/supl/locationsuplfw/settingsapi/inc/epos_csuplsettingsnotifier.h	Fri May 14 16:17:02 2010 +0300
@@ -107,10 +107,10 @@
         
         TBool iStopObserve;
 
-        CSuplSettings::TSuplSettingsUsage   iUsage;
-        
+         
         TInt iFallBackValue;
         TInt iFallBackTimerValue;
+        TInt iTriggerServiceStatus; // 0 = TriggerON , 1 = TriggerOFF
         
         
         //used to indicate if this object was created to listen for DB Change events
--- a/supl/locationsuplfw/settingsapi/src/epos_csettingsdatabasehandler.cpp	Mon May 03 12:54:42 2010 +0300
+++ b/supl/locationsuplfw/settingsapi/src/epos_csettingsdatabasehandler.cpp	Fri May 14 16:17:02 2010 +0300
@@ -54,6 +54,7 @@
 const TInt KSimChangeRemove = 32;
 const TInt KUsageInHomeNw = 64;
 const TInt KEditable = 128;
+const TInt KProductConfigured= 256;
 
 //values used to set and retrieve major and minor version numbers from a single int
 const TInt KVersionMinorMask = 255;
@@ -126,6 +127,7 @@
 _LIT(KColRequestType,"RequestType");
 _LIT(KColOutstandingTrigger,"OutstandingTrigger");      
 _LIT(KColInterval,"Interval");
+_LIT(KColEndTime,"EndTime");
 
 _LIT(KColServerId,"ServerId");
 _LIT(KColIap1,"Iap1");
@@ -154,18 +156,16 @@
 // ---------------------------------------------------------------------------
 CSettingsDatabaseHandler::~CSettingsDatabaseHandler()
     {
-    if(iSettingsRep)
-        {
-        delete iSettingsRep;
-        iSettingsRep = NULL;
-        }    
-    if(iSettingsNotifierRep)
-        {
-        delete iSettingsNotifierRep;
-        iSettingsNotifierRep = NULL;
-        }
-    iDb.Close();
-    LogQuery(_L("Deleted Settings DB Handle CLosed"));
+				delete iSettingsRep;
+				iSettingsRep = NULL;
+				
+				delete iSettingsNotifierRep;
+				iSettingsNotifierRep = NULL;
+				
+				Close();
+				
+				LogQuery(_L("Deleted Settings DB Handle CLosed"));
+				
     }
 
 // ---------------------------------------------------------------------------
@@ -273,18 +273,6 @@
     }
  
 // ---------------------------------------------------------------------------
-// CSettingsDatabaseHandler::RemoveDb()
-//
-// 
-// ---------------------------------------------------------------------------
-TInt CSettingsDatabaseHandler::RemoveDb()
-    {
-    Close();
-   // iDbs.DeleteDatabase(KWordDatabase,KSecureUid);
-    return KErrNone;
-    }
-
-// ---------------------------------------------------------------------------
 // CSettingsDatabaseHandler::Close()
 //
 // Close the database.
@@ -450,10 +438,11 @@
     
     TInt32  netInfoLastUse = 0;
     TInt32  netInfoLastSucess = 0;
-    TBool   serverEnabled,simChangeRemove,usageInHomeNw,editable;
+    TBool   serverEnabled,simChangeRemove,usageInHomeNw,editable,prodConfig;
     
-    TInt ret = 0;
-    ret = aServParamValues->Get(slpId,SLPAddress->Des(),IAPName->Des(),serverEnabled,simChangeRemove,usageInHomeNw,editable);
+    TInt ret = aServParamValues->Get(slpId,SLPAddress->Des(),IAPName->Des(),serverEnabled,simChangeRemove,usageInHomeNw,editable);
+    					 aServParamValues->GetServerConfigurationType(prodConfig); 
+    
     if(ret == KErrNotFound)
         {
         CleanupStack::PopAndDestroy(3); //SLPAddress,IAPName,manuName
@@ -515,6 +504,10 @@
         {
         OtherProperties |= KEditable;
         }
+    if(prodConfig)
+        {
+        OtherProperties |= KProductConfigured;
+        }
     
     TBuf<KMaxHSLPAddrLen> tempBuf;
     TBuf<KMaxIAPLen> tempIapBuf;
@@ -849,10 +842,8 @@
     
     HBufC* IAPName = HBufC::NewLC( KMaxIAPLen);
     TBool  serverEnabled,simChangeRemove,usageInHomeNw,editable;
-
-
-    TInt ret = 0;
-    ret = aParamValues->Get(slpId,SLPAddress->Des(),IAPName->Des(),serverEnabled,simChangeRemove,usageInHomeNw,editable);
+    
+    TInt ret = aParamValues->Get(slpId,SLPAddress->Des(),IAPName->Des(),serverEnabled,simChangeRemove,usageInHomeNw,editable);
     if(ret == KErrNotFound || slpId == -1 )
         {
         CleanupStack::PopAndDestroy(2); //SLPAddress,IAPName
@@ -908,7 +899,9 @@
          {
          OtherProperties &= ~KEditable;
          }
-
+     //product configuration flag is not altered here since it should not be modified while updation
+     //and gets set only during addition of a new server through product configuration
+     
      TBuf<KGenericStringLen> tempBuf;
      tempBuf.Copy(*SLPAddress);
      tempBuf.Trim();
@@ -1156,7 +1149,9 @@
         {
         OtherProperties &= ~KEditable;
         }
-
+    //product configuration flag is not altered here since it should not be modified while updation
+    //and gets modified only during addition of a new server
+    
     TBuf<KGenericStringLen> tempBuf;
     tempBuf.Copy(*SLPAddress);
     tempBuf.Trim();
@@ -1691,7 +1686,7 @@
     TBool simChangeRemove = EFalse;
     TBool usageInHomeNw = EFalse;
     TBool editable = EFalse;
-
+    TBool prodConfig = ETrue;
 
     TInt columnIndexSLPID = stmt.ColumnIndex(KColSLPId);
     TInt columnIndexSLPAddress = stmt.ColumnIndex(KColSLPAddress);
@@ -1715,7 +1710,10 @@
         simChangeRemove = otherprops & KSimChangeRemove; 
         usageInHomeNw = otherprops & KUsageInHomeNw; 
         editable = otherprops & KEditable;
+        prodConfig = otherprops & KProductConfigured;
         params->Set(ServerAddress,Iap,serverEnabled,simChangeRemove,usageInHomeNw,editable,SLPId);
+        params->SetServerConfigurationType(prodConfig);
+        
         aParamValues.Append(params);//ownership transferred to RPointerArray
         }   
 
@@ -1759,7 +1757,7 @@
     TBool simChangeRemove = EFalse;
     TBool usageInHomeNw = EFalse;
     TBool editable = EFalse;
-
+    TBool prodConfig = ETrue;
 
     TInt columnIndexSLPID = stmt.ColumnIndex(KColSLPId);
     TInt columnIndexSLPAddress = stmt.ColumnIndex(KColSLPAddress);
@@ -1783,7 +1781,9 @@
         simChangeRemove = otherprops & KSimChangeRemove; 
         usageInHomeNw = otherprops & KUsageInHomeNw; 
         editable = otherprops & KEditable;
+        prodConfig = otherprops & KProductConfigured;
         params->Set(ServerAddress,Iap,serverEnabled,simChangeRemove,usageInHomeNw,editable,SLPId);
+        params->SetServerConfigurationType(prodConfig);
         aParamValues.Append(params);//ownership transferred to RPointerArray
         }   
 
@@ -2072,6 +2072,7 @@
     TBool simChangeRemove = EFalse;
     TBool usageInHomeNw = EFalse;
     TBool editable = EFalse;
+    TBool prodConfig = ETrue;
     
     TInt columnIndexSLPID = stmt.ColumnIndex(KColSLPId);
     TInt columnIndexSLPAddress = stmt.ColumnIndex(KColSLPAddress);
@@ -2093,6 +2094,7 @@
         simChangeRemove = otherprops & KSimChangeRemove;
         usageInHomeNw = otherprops & KUsageInHomeNw;
         editable = otherprops & KEditable;
+        prodConfig = otherprops & KProductConfigured;
         //logging
         otherpropbuf.Zero();
         otherpropbuf.AppendNum(otherprops);
@@ -2104,6 +2106,8 @@
     stmt.Close();
     
     aParamValues->Set(serverAddress,Iap,serverEnabled,simChangeRemove,usageInHomeNw,editable,SLPId);
+    aParamValues->SetServerConfigurationType(prodConfig);
+    
     return KErrNone;
     }
 // --------------------------------------------------------------------------------------
@@ -2146,6 +2150,7 @@
     TBool simChangeRemove = EFalse;
     TBool usageInHomeNw = EFalse;
     TBool editable = EFalse;
+    TBool prodConfig = ETrue;
     
     TInt columnIndexSLPID = stmt.ColumnIndex(KColSLPId);
     TInt columnIndexSLPAddress = stmt.ColumnIndex(KColSLPAddress);
@@ -2167,6 +2172,7 @@
         simChangeRemove = otherprops & KSimChangeRemove;
         usageInHomeNw = otherprops & KUsageInHomeNw;
         editable = otherprops & KEditable;
+        prodConfig = otherprops & KProductConfigured;
         //logging
         otherpropbuf.Zero();
         otherpropbuf.AppendNum(otherprops);
@@ -2182,6 +2188,7 @@
         return KErrNotFound;
     
     aParamValues->Set(serverAddress,Iap,serverEnabled,simChangeRemove,usageInHomeNw,editable,SLPId);
+    aParamValues->SetServerConfigurationType(prodConfig);
     return KErrNone;
     }
 // ------------------------------------------------------------------------------------
@@ -2218,7 +2225,8 @@
     TBool simChangeRemove = EFalse;
     TBool usageInHomeNw = EFalse;
     TBool editable = EFalse;
-
+    TBool prodConfig = ETrue;
+    
     TInt columnIndexSLPID = stmt.ColumnIndex(KColSLPId);
     TInt columnIndexSLPAddress = stmt.ColumnIndex(KColSLPAddress);
     TInt columnIndexIAP = stmt.ColumnIndex(KColIap);
@@ -2236,6 +2244,7 @@
         simChangeRemove = otherprops & KSimChangeRemove;
         usageInHomeNw = otherprops & KUsageInHomeNw;
         editable = otherprops & KEditable;
+        prodConfig = otherprops & KProductConfigured;
         //logging
         otherpropbuf.Zero();
         otherpropbuf.AppendNum(otherprops);
@@ -2252,6 +2261,7 @@
     stmt.Close();
 
     aParamValues->Set(serverAddress,Iap,serverEnabled,simChangeRemove,usageInHomeNw,editable,SLPId);
+    aParamValues->SetServerConfigurationType(prodConfig);
     return KErrNone;
     }
 // ---------------------------------------------------------------------------
@@ -2914,6 +2924,11 @@
 
     iSQLString.Append(KColInterval);
     iSQLString.Append(KDataTypeInteger);
+    iSQLString.Append(KCommaSeparator);
+    
+    iSQLString.Append(KColEndTime);
+    iSQLString.Append(KDataTypeInteger);
+        
     iSQLString.Append(KClosingBracket);
     
     TInt err = iDb.Exec(iSQLString);
@@ -2945,10 +2960,14 @@
     CTriggerParams::TRequestType requestType;
     TUint64 outstandingTrigger;
     TUint64 interval;
-    
+    TTime endTime;
     TInt ret = aSessionParamValues->Get(sessionId,sessionName->Des(),notificationPresent,triggerNotificationStatus,
                              triggerType,requestType,outstandingTrigger,interval );
+                             
+         aSessionParamValues->GetTriggerEndTime(endTime);
          
+    TInt64 endTimeInt;
+    endTimeInt = endTime.Int64();
     if(ret == KErrNotFound)
         {
         delete sessionName;
@@ -2981,6 +3000,10 @@
     iSQLString.Append(KCommaSeparator); 
 
     iSQLString.Append(KColInterval);
+    iSQLString.Append(KCommaSeparator);
+    
+    iSQLString.Append(KColEndTime);
+    
     iSQLString.Append(KClosingBracket);
     
     iSQLString.Append(KValues);
@@ -3011,7 +3034,10 @@
     iSQLString.Append(KCommaSeparator);
     
     iSQLString.AppendNum(interval);
-          
+    iSQLString.Append(KCommaSeparator);
+    
+    iSQLString.AppendNum(endTimeInt);
+    
     iSQLString.Append(KClosingBracket);
 
     delete sessionName;   
@@ -3163,7 +3189,9 @@
     TUint64 outstandingTrigger;
     TUint64 interval;
     TBuf<KGenericStringLen> sessionName;
-    
+    TTime endTime;
+    TInt64 endTimeInt;
+        
     TInt columnIndexSessionID = stmt.ColumnIndex(KColSessionId);
     TInt columnIndexSessionName = stmt.ColumnIndex(KColSessionName);
     TInt columnIndexNotificationPresent = stmt.ColumnIndex(KColNotificationPresent);
@@ -3172,6 +3200,7 @@
     TInt columnIndexRequestType = stmt.ColumnIndex(KColRequestType);
     TInt columnIndexOutstandingTrigger = stmt.ColumnIndex(KColOutstandingTrigger);
     TInt columnIndexInterval = stmt.ColumnIndex(KColInterval);
+    TInt columnIndexEndTime = stmt.ColumnIndex(KColEndTime);
 
     // Reset client array
     aParamValues.Reset();
@@ -3186,8 +3215,10 @@
         requestType = (CTriggerParams::TRequestType) stmt.ColumnInt(columnIndexRequestType);
         outstandingTrigger = stmt.ColumnInt(columnIndexOutstandingTrigger);
         interval = stmt.ColumnInt(columnIndexInterval);
-        
+        endTimeInt = stmt.ColumnInt64(columnIndexEndTime);
+        endTime = endTimeInt;
         params->Set(sessionId,sessionName,notificationPresent,triggerNotificationStatus,triggerType,requestType,outstandingTrigger,interval);
+				params->SetTriggerEndTime(endTime);        
         aParamValues.Append(params);//ownership transferred to RPointerArray
         }   
 
@@ -3237,6 +3268,9 @@
     TUint64 outstandingTrigger;
     TUint64 interval;
     TBuf<KGenericStringLen> sessionName;
+    TTime endTime;
+    TInt64 endTimeInt;
+    
         
     TInt columnIndexSessionID = stmt.ColumnIndex(KColSessionId);
     TInt columnIndexSessionName = stmt.ColumnIndex(KColSessionName);
@@ -3246,6 +3280,8 @@
     TInt columnIndexRequestType = stmt.ColumnIndex(KColRequestType);
     TInt columnIndexOutstandingTrigger = stmt.ColumnIndex(KColOutstandingTrigger);
     TInt columnIndexInterval = stmt.ColumnIndex(KColInterval);
+    TInt columnIndexEndTime = stmt.ColumnIndex(KColEndTime);
+    
     while((err=stmt.Next())==KSqlAtRow)
         {
         sessionId = stmt.ColumnInt(columnIndexSessionID);
@@ -3256,8 +3292,10 @@
         requestType = (CTriggerParams::TRequestType) stmt.ColumnInt(columnIndexRequestType);
         outstandingTrigger = stmt.ColumnInt(columnIndexOutstandingTrigger);
         interval = stmt.ColumnInt(columnIndexInterval);
-                
+        endTimeInt = stmt.ColumnInt64(columnIndexEndTime);
+        endTime = endTimeInt;
         aParamValues->Set(sessionId,sessionName,notificationPresent,triggerNotificationStatus,triggerType,requestType,outstandingTrigger,interval);
+        aParamValues->SetTriggerEndTime(endTime);
         }   
 
     stmt.Close();
--- a/supl/locationsuplfw/settingsapi/src/epos_csuplsettingparams.cpp	Mon May 03 12:54:42 2010 +0300
+++ b/supl/locationsuplfw/settingsapi/src/epos_csuplsettingparams.cpp	Fri May 14 16:17:02 2010 +0300
@@ -39,7 +39,7 @@
                                         iSimChangeRemove  (ETrue),
                                         iUsageInHomeNw (ETrue),
                                         iEditable (ETrue),
-                                        
+                                        iProductConfigured(ETrue),
                                         iIsValueSet(EFalse)
     {
 
@@ -90,6 +90,8 @@
         }
 
     }
+    
+    
 // ---------------------------------------------------------------------------
 // CServerParams::Set()
 //
@@ -131,10 +133,10 @@
     iSimChangeRemove = aSimChangeRemove;
     iUsageInHomeNw = aUsageInHomeNw;
     iEditable = aEditable;
-    
     iIsValueSet = ETrue;
     return KErrNone;            
     }
+    
 // ---------------------------------------------------------------------------
 // CServerParams::Get()
 //
@@ -144,6 +146,7 @@
                 TPtr aIapName,TBool& aServerEnabled,
                 TBool& aSimChangeRemove, TBool& aUsageInHomeNw, TBool& aEditable) const
     {
+    	
     if(!iIsValueSet) //if values were not set before using the Set method, return error
         return KErrNotFound;
     
@@ -162,7 +165,25 @@
     aUsageInHomeNw = iUsageInHomeNw;
     aEditable = iEditable;
     return KErrNone;            
+    
     }
+    
+
+EXPORT_C void CServerParams::SetServerConfigurationType(TBool aConfigurationType)
+	{
+		iProductConfigured = aConfigurationType;
+	}
+
+
+EXPORT_C TInt CServerParams::GetServerConfigurationType(TBool& aConfigurationType)const
+	{
+    if(!iIsValueSet) //if values were not set before using the Set method, return error
+        return KErrNotFound;
+        
+			aConfigurationType = iProductConfigured;
+			return KErrNone;            
+			
+	}
 
 // C++ default constructor can NOT contain any code, that
 // might leave.
@@ -175,6 +196,7 @@
                                   iRequestType(EUnSpecified),
                                   iOutstandingTrigger(0),                                            
                                   iInterval(0),
+                                  iEndTime(0),
                                   iIsValueSet(EFalse)
     {
 
@@ -261,6 +283,7 @@
     iOutstandingTrigger = aOutstandingTrigger;
     iInterval = aInterval;
     iIsValueSet = ETrue;
+    
     return KErrNone;            
     }
 // ---------------------------------------------------------------------------
@@ -308,5 +331,31 @@
     return KErrNone;            
     }
 
+// ---------------------------------------------------------------------------
+// CTriggerParams::GetTriggerEndTime()
+//
+// Returns server parameters.
+// ---------------------------------------------------------------------------
+EXPORT_C TInt CTriggerParams::GetTriggerEndTime(TTime& aEndTime)const                
+		{
+	    if( !iIsValueSet ) //if values were not set before using the Set method, return error
+        {
+        return KErrNotFound;
+        }
+
+			aEndTime = iEndTime.Int64();
+			return KErrNone;            
+		}
+
+// ---------------------------------------------------------------------------
+// CTriggerParams::SetTriggerEndTime()
+//
+// Returns server parameters.
+// ---------------------------------------------------------------------------		
+EXPORT_C void CTriggerParams::SetTriggerEndTime(const TTime aEndTime)
+		{
+			iEndTime = aEndTime.Int64();
+		}               
+
 //  End of File
 
--- a/supl/locationsuplfw/settingsapi/src/epos_csuplsettings.cpp	Mon May 03 12:54:42 2010 +0300
+++ b/supl/locationsuplfw/settingsapi/src/epos_csuplsettings.cpp	Fri May 14 16:17:02 2010 +0300
@@ -237,33 +237,18 @@
 //
 //This method is used to retrieve SUPL usage from settings storage. 
 //--------------------------------------------------------------------------------------
-EXPORT_C TInt CSuplSettings::GetSuplUsage(TSuplSettingsUsage& aUsage) const
+EXPORT_C TInt CSuplSettings::GetSuplUsage(TSuplSettingsUsage& /* aUsage */ ) const
     {
-    TInt usage, ret;            
-    ret = iSettingsEngine->GetSuplUsage(usage);
-    
-    if (ret == KErrNone)
-        {
-        aUsage = (TSuplSettingsUsage)usage;
-        return KErrNone;        
-        }            
-    else
-        return ret;            
+    return KErrNotSupported;            
     }            
 //-------------------------------------------------------------------------------------
 //CSuplSettings::SetSuplUsage()
 //
 //This method is used to change SUPL usage.
 //--------------------------------------------------------------------------------------
-EXPORT_C TInt CSuplSettings::SetSuplUsage(const TSuplSettingsUsage aUsage) 
+EXPORT_C TInt CSuplSettings::SetSuplUsage(const TSuplSettingsUsage /* aUsage */ ) 
     {
-    TInt usage = aUsage;            
-
-    if (usage < CSuplSettings::ESuplUsageAlwaysAsk ||
-        usage > CSuplSettings::ESuplUsageDisabled)                    
-        return KErrArgument;
-
-    return iSettingsEngine->SetSuplUsage(aUsage);
+    return KErrNotSupported;   
     }          
 //-------------------------------------------------------------------------------------
 //CSuplSettings::AddNewServer()
@@ -605,4 +590,26 @@
     {
     return iSettingsEngine->GetDefaultIAPName(aIapName);    
     }
+	
+	    
+//---------------------------------------------------------------------
+// CSuplSettings::SetSuplTriggeredServiceStatus()
+//
+// Changes status of SUPL triggering service. 
+//---------------------------------------------------------------------    
+EXPORT_C TInt CSuplSettings::SetSuplTriggeredServiceStatus( const TSuplTriggerStatus& aSuplTriggerStatus )
+	{
+			return iSettingsEngine->SetSuplTriggeredServiceStatus(aSuplTriggerStatus);    
+	}   
+	 
+//---------------------------------------------------------------------
+// CSuplSettings::GetSuplTriggeredServiceStatus()
+//
+// Gets status of SUPL triggering service.SUPL Triggering service can be either ESuplTriggerOn or ESuplTriggerOff
+//---------------------------------------------------------------------    
+EXPORT_C TInt CSuplSettings::GetSuplTriggeredServiceStatus( TSuplTriggerStatus& aSuplTriggerStatus )
+	{
+			return iSettingsEngine->GetSuplTriggeredServiceStatus(aSuplTriggerStatus);    
+	}   	 
+	
 //  End of File
--- a/supl/locationsuplfw/settingsapi/src/epos_csuplsettingsengine.cpp	Mon May 03 12:54:42 2010 +0300
+++ b/supl/locationsuplfw/settingsapi/src/epos_csuplsettingsengine.cpp	Fri May 14 16:17:02 2010 +0300
@@ -80,6 +80,8 @@
     delete iSettingsDBHandler;
     iSettingsDBHandler = NULL;
     }
+    
+/*
 //-------------------------------------------------------------------------------------
 //CSuplSettingsEngine::LockEngineL()
 //
@@ -117,6 +119,7 @@
         return KErrNone;
         }
     }
+*/
 
 //-------------------------------------------------------------------------------------
 //CSuplSettingsEngine::Initialize()
@@ -274,52 +277,6 @@
 	return KErrNone; 
     }        
 
-/*TInt CSuplSettingsEngine::Set(const TDesC& aHslpAddress, const TDesC&  aIapName, 
-                const TInt aChangedBy)
-    {
-    TInt err;
-        
-    err = iRepository->Set(KSuplSettingsHSLPAddress, aHslpAddress);
-    if (err != KErrNone)
-        return err;
-        
-    err = iRepository->Set(KSuplSettingsIAP, aIapName);
-    if (err != KErrNone)
-        return err;           
-        
-    err = iRepository->Set(KSuplSettingsChangedBy, aChangedBy);
-    if (err != KErrNone)
-        return err;            
-        
-    err = iRepository->Set(KSuplSettingsIMSI, iImsi);
-    if (err != KErrNone)
-        return err;
-        
-    return KErrNone;
-    } 
-
-
-TInt CSuplSettingsEngine::Get(TDes& aHslpAddress, TDes&  aIapName, 
-                TDes& aImsi, TInt& aChangedBy)
-    {    
-    TInt err;            
-
-    err = iRepository->Get(KSuplSettingsHSLPAddress, aHslpAddress);
-    if (err != KErrNone)
-        return err;            
-    err = iRepository->Get(KSuplSettingsIAP, aIapName);
-    if (err != KErrNone)
-        return err;            
-    err = iRepository->Get(KSuplSettingsIMSI, aImsi);
-    if (err != KErrNone)
-        return err;            
-    err = iRepository->Get(KSuplSettingsChangedBy, aChangedBy);
-    if (err != KErrNone)
-        return err;            
-
-    return KErrNone;
-    }
-*/
 //-------------------------------------------------------------------------------------
 //CSuplSettingsEngine::IsInitDone()
 //
@@ -447,37 +404,6 @@
     return KErrNone;
     }    
 
-//-------------------------------------------------------------------------------------
-//CSuplSettingsEngine::GetSuplUsage()
-//
-//This method is used to retrieve SUPL usage from settings storage.
-//--------------------------------------------------------------------------------------
-TInt CSuplSettingsEngine::GetSuplUsage(TInt& aUsage)
-    {
-    TInt err;            
-
-    err = iRepository->Get(KSuplSettingsUsage, aUsage);
-    if (err != KErrNone)
-        return err;            
-
-    return KErrNone;
-    }        
-
-//-------------------------------------------------------------------------------------
-//CSuplSettingsEngine::SetSuplUsage()
-//
-//This method is used to change SUPL usage.
-//--------------------------------------------------------------------------------------
-TInt CSuplSettingsEngine::SetSuplUsage(const TInt aUsage) 
-    {
-    TInt err;
-
-    err = iRepository->Set(KSuplSettingsUsage, aUsage);
-    if (err != KErrNone)
-        return err;            
-        
-    return KErrNone;
-    }            
 
 /*
  * GetMccLen
@@ -1334,4 +1260,46 @@
         }
     return err;
     }  
+	
+	//---------------------------------------------------------------------
+// SetSuplTriggeredServiceStatus()
+//
+// Changes status of SUPL triggering service. 
+//---------------------------------------------------------------------    
+ TInt CSuplSettingsEngine::SetSuplTriggeredServiceStatus( const CSuplSettings::TSuplTriggerStatus& aSuplTriggerStatus )
+	{
+		TInt val;
+    if( aSuplTriggerStatus == CSuplSettings::ESuplTriggerOff) //Can be casted to enum directly...
+    {
+    		val = 1;
+    }
+    else
+    {
+    		val = 0;
+    }
+    return  iRepository->Set(KSuplSettingsTriggerServiceStatus, val);
+	}   
+	 
+//---------------------------------------------------------------------
+// GetSuplTriggeredServiceStatus()
+//
+// Gets status of SUPL triggering service.SUPL Triggering service can be either ESuplTriggerOn or ESuplTriggerOff
+//---------------------------------------------------------------------    
+ TInt CSuplSettingsEngine::GetSuplTriggeredServiceStatus( CSuplSettings::TSuplTriggerStatus& aSuplTriggerStatus )
+	{
+		TInt val;
+    TInt err = iRepository->Get(KSuplSettingsTriggerServiceStatus,val);
+    
+    if( val == 1) //Can be casted to enum directly...
+    {
+    	aSuplTriggerStatus = CSuplSettings::ESuplTriggerOff;
+    }
+    else
+    {
+    		aSuplTriggerStatus = CSuplSettings::ESuplTriggerOn;
+    }
+    
+    return err;
+	}
+	
 //End of File
--- a/supl/locationsuplfw/settingsapi/src/epos_csuplsettingsnotifier.cpp	Mon May 03 12:54:42 2010 +0300
+++ b/supl/locationsuplfw/settingsapi/src/epos_csuplsettingsnotifier.cpp	Fri May 14 16:17:02 2010 +0300
@@ -90,29 +90,55 @@
         TReal slpID;
         iRepository->Get(KSuplSettingsDBChangedSLPId, slpID);
         
-
-        MSuplSettingsObserver::TSuplSettingsEventType eventType = (MSuplSettingsObserver::TSuplSettingsEventType)event;
+        MSuplSettingsObserver::TSuplSettingsEventType eventType = MSuplSettingsObserver::ESuplSettingsEventUnspecified;
+        switch(event)
+            {
+            case MSuplSettingsObserver::ESuplSettingsDBAddEvent:
+            case MSuplSettingsObserver::ESuplSettingsDBAddEvent+1 :
+                {
+                eventType = MSuplSettingsObserver::ESuplSettingsDBAddEvent;
+                }
+                break;
+            case MSuplSettingsObserver::ESuplSettingsDBDeleteEvent:
+            case MSuplSettingsObserver::ESuplSettingsDBDeleteEvent+1 :
+                {
+                eventType = MSuplSettingsObserver::ESuplSettingsDBDeleteEvent;
+                }
+                break;
+            case MSuplSettingsObserver::ESuplSettingsDBUpdateEvent:
+            case MSuplSettingsObserver::ESuplSettingsDBUpdateEvent+1 :
+                {
+                eventType = MSuplSettingsObserver::ESuplSettingsDBUpdateEvent;
+                }
+                break;
+            default:                
+                eventType = MSuplSettingsObserver::ESuplSettingsEventUnspecified;
+                break;
+            
+            }
+        
         iObserver.HandleSuplSettingsChangeL(eventType,slpID);
         }
     else
         {
-        TInt usage;
-
-        iRepository->Get(KSuplSettingsUsage, usage);
-
-        if (iUsage != usage) //check if there was a change in the Supl usage value in the cen rep
-            iObserver.HandleSuplSettingsChangeL(MSuplSettingsObserver::ESuplSettingsEventSuplUsageChange);
-        else //else check if any of the other config parameters changed
-            {
             TInt fallBackValue;
             TInt fallBackTimerValue;
             TBuf<KMaxStrlen> imsi;
+            TInt triggerServiceStatus;
+            
             iRepository->Get(KSuplSettingsFallBack,fallBackValue);
             iRepository->Get(KSuplSettingsFallBackTimer,fallBackTimerValue);
             iRepository->Get(KSuplSettingsIMSI,imsi);
+            iRepository->Get(KSuplSettingsTriggerServiceStatus,triggerServiceStatus);
+            
+            if(triggerServiceStatus != iTriggerServiceStatus )
+            {
+            	iObserver.HandleSuplTriggerStatusChangeL((CSuplSettings::TSuplTriggerStatus)triggerServiceStatus);
+            }
+            
             if(fallBackValue != iFallBackValue || fallBackTimerValue != iFallBackTimerValue || imsi.Compare(*iImsi))
                 iObserver.HandleSuplSettingsChangeL(MSuplSettingsObserver::ESuplSettingsEventCommParameterChange);
-            }
+            
         }
     StartListening();
     }
@@ -159,16 +185,15 @@
         }
     else
         {
-        TInt usage;
         TBuf<KMaxStrlen> imsi;
-        iRepository->Get(KSuplSettingsUsage, usage);
         iRepository->Get(KSuplSettingsFallBack,iFallBackValue);
         iRepository->Get(KSuplSettingsFallBackTimer,iFallBackTimerValue);
         iRepository->Get(KSuplSettingsIMSI,imsi);
+        iRepository->Get(KSuplSettingsTriggerServiceStatus,iTriggerServiceStatus);
+        
         if(iImsi)
             iImsi->Des() = imsi;
-        iUsage = (CSuplSettings::TSuplSettingsUsage) usage;
-
+        
         // Request for notification for any field change
         iRepository->NotifyRequest(0x00000000, 0x00000000, iStatus);
         }
--- a/supl/locationsuplfw/terminalinitiationapi/bwins/epos_suplterminitiationu.def	Mon May 03 12:54:42 2010 +0300
+++ b/supl/locationsuplfw/terminalinitiationapi/bwins/epos_suplterminitiationu.def	Fri May 14 16:17:02 2010 +0300
@@ -10,47 +10,47 @@
 	?StartSuplTriggerSession@RSuplTerminalSubSession@@QAEXAAVTRequestStatus@@AAVTSuplTerminalPeriodicTrigger@@HH@Z @ 9 NONAME ; void RSuplTerminalSubSession::StartSuplTriggerSession(class TRequestStatus &, class TSuplTerminalPeriodicTrigger &, int, int)
 	?SetMaxLocationAge@TSuplTerminalQop@@QAEHH@Z @ 10 NONAME ; int TSuplTerminalQop::SetMaxLocationAge(int)
 	?Get@TSuplTriggerFireInfo@@QBEHAAVTPositionInfo@@@Z @ 11 NONAME ; int TSuplTriggerFireInfo::Get(class TPositionInfo &) const
-	?Get@TSuplTerminalQop@@QBEHAAM0AAH1@Z @ 12 NONAME ; int TSuplTerminalQop::Get(float &, float &, int &, int &) const
-	??0TSuplTerminalQop@@QAE@XZ @ 13 NONAME ; TSuplTerminalQop::TSuplTerminalQop(void)
-	?Close@RSuplTerminalSubSession@@QAEXXZ @ 14 NONAME ; void RSuplTerminalSubSession::Close(void)
-	?Ptr@CSuplSubSessnPtrHolder@@QAEAAVTPtr8@@H@Z @ 15 NONAME ; class TPtr8 & CSuplSubSessnPtrHolder::Ptr(int)
-	??0RSuplTerminalServer@@QAE@XZ @ 16 NONAME ; RSuplTerminalServer::RSuplTerminalServer(void)
-	?GetSlpList@RSuplTerminalSubSession@@QAEHAAV?$RPointerArray@VCSuplTerminalParams@@@@@Z @ 17 NONAME ; int RSuplTerminalSubSession::GetSlpList(class RPointerArray<class CSuplTerminalParams> &)
-	?Get@TSuplTerminalPeriodicTrigger@@QBEHAAI00@Z @ 18 NONAME ; int TSuplTerminalPeriodicTrigger::Get(unsigned int &, unsigned int &, unsigned int &) const
-	?RunSession@RSuplTerminalSubSession@@QAEXAAVTRequestStatus@@AAVTSuplTerminalQop@@ABVTDesC16@@HHHH@Z @ 19 NONAME ; void RSuplTerminalSubSession::RunSession(class TRequestStatus &, class TSuplTerminalQop &, class TDesC16 const &, int, int, int, int)
-	??0TSuplTerminalPeriodicTrigger@@QAE@XZ @ 20 NONAME ; TSuplTerminalPeriodicTrigger::TSuplTerminalPeriodicTrigger(void)
-	?Open@RSuplTerminalSubSession@@QAEHAAVRSuplTerminalServer@@W4TSuplServiceType@1@@Z @ 21 NONAME ; int RSuplTerminalSubSession::Open(class RSuplTerminalServer &, enum RSuplTerminalSubSession::TSuplServiceType)
-	?GetVerticalAccuracy@TSuplTerminalQop@@QBEHAAM@Z @ 22 NONAME ; int TSuplTerminalQop::GetVerticalAccuracy(float &) const
-	?RunSession@RSuplTerminalSubSession@@QAEHAAVTSuplTerminalQop@@ABVTDesC16@@HHHH@Z @ 23 NONAME ; int RSuplTerminalSubSession::RunSession(class TSuplTerminalQop &, class TDesC16 const &, int, int, int, int)
-	?Set@TSuplTriggerFireInfo@@QAEHABVTPositionInfo@@@Z @ 24 NONAME ; int TSuplTriggerFireInfo::Set(class TPositionInfo const &)
-	??1CSuplTerminalParams@@UAE@XZ @ 25 NONAME ; CSuplTerminalParams::~CSuplTerminalParams(void)
-	?GetDelay@TSuplTerminalQop@@QBEHAAH@Z @ 26 NONAME ; int TSuplTerminalQop::GetDelay(int &) const
-	?Version@RSuplTerminalServer@@QBE?AVTVersion@@XZ @ 27 NONAME ; class TVersion RSuplTerminalServer::Version(void) const
-	?SetDelay@TSuplTerminalQop@@QAEHH@Z @ 28 NONAME ; int TSuplTerminalQop::SetDelay(int)
-	?Get@CSuplTerminalParams@@QBEHAA_JVTPtr16@@1AAH222@Z @ 29 NONAME ; int CSuplTerminalParams::Get(long long &, class TPtr16, class TPtr16, int &, int &, int &, int &) const
-	?RunSession@RSuplTerminalSubSession@@QAEXAAVTRequestStatus@@ABVTDesC16@@HHHH@Z @ 30 NONAME ; void RSuplTerminalSubSession::RunSession(class TRequestStatus &, class TDesC16 const &, int, int, int, int)
-	?StartSuplTriggerSession@RSuplTerminalSubSession@@QAEXAAVTRequestStatus@@AAVTSuplTerminalPeriodicTrigger@@ABVTDesC16@@HHH@Z @ 31 NONAME ; void RSuplTerminalSubSession::StartSuplTriggerSession(class TRequestStatus &, class TSuplTerminalPeriodicTrigger &, class TDesC16 const &, int, int, int)
-	?ConstructL@RSuplTerminalSubSession@@MAEXXZ @ 32 NONAME ; void RSuplTerminalSubSession::ConstructL(void)
-	?NewLC@CSuplTerminalParams@@SAPAV1@XZ @ 33 NONAME ; class CSuplTerminalParams * CSuplTerminalParams::NewLC(void)
-	?RunSession@RSuplTerminalSubSession@@QAEHAAVTSuplTerminalQop@@HHH@Z @ 34 NONAME ; int RSuplTerminalSubSession::RunSession(class TSuplTerminalQop &, int, int, int)
-	?ExtendedInterface@RSuplTerminalSubSession@@MAEPAXHPAX0@Z @ 35 NONAME ; void * RSuplTerminalSubSession::ExtendedInterface(int, void *, void *)
-	??1CSuplSubSessnPtrHolder@@UAE@XZ @ 36 NONAME ; CSuplSubSessnPtrHolder::~CSuplSubSessnPtrHolder(void)
-	?RunSession@RSuplTerminalSubSession@@QAEXAAVTRequestStatus@@HHH@Z @ 37 NONAME ; void RSuplTerminalSubSession::RunSession(class TRequestStatus &, int, int, int)
-	?RunSession@RSuplTerminalSubSession@@QAEHABVTDesC16@@HHHH@Z @ 38 NONAME ; int RSuplTerminalSubSession::RunSession(class TDesC16 const &, int, int, int, int)
-	?Set@TSuplTerminalPeriodicTrigger@@QAEHABI00@Z @ 39 NONAME ; int TSuplTerminalPeriodicTrigger::Set(unsigned int const &, unsigned int const &, unsigned int const &)
-	?RunSession@RSuplTerminalSubSession@@QAEXAAVTRequestStatus@@AAVTSuplTerminalQop@@HHH@Z @ 40 NONAME ; void RSuplTerminalSubSession::RunSession(class TRequestStatus &, class TSuplTerminalQop &, int, int, int)
-	?NotifyTriggerFired@RSuplTerminalSubSession@@QAEXAAVTRequestStatus@@AAVTSuplTriggerFireInfo@@@Z @ 41 NONAME ; void RSuplTerminalSubSession::NotifyTriggerFired(class TRequestStatus &, class TSuplTriggerFireInfo &)
-	?Set@CSuplTerminalParams@@QAEHABVTDesC16@@0HHHH_J@Z @ 42 NONAME ; int CSuplTerminalParams::Set(class TDesC16 const &, class TDesC16 const &, int, int, int, int, long long)
-	?CancelRunSession@RSuplTerminalSubSession@@QAEXXZ @ 43 NONAME ; void RSuplTerminalSubSession::CancelRunSession(void)
-	??0TSuplTriggerFireInfo@@QAE@XZ @ 44 NONAME ; TSuplTriggerFireInfo::TSuplTriggerFireInfo(void)
-	?Set@TSuplTerminalQop@@QAEHMMHH@Z @ 45 NONAME ; int TSuplTerminalQop::Set(float, float, int, int)
-	?GetServerAddress@RSuplTerminalSubSession@@QAEHAAVTDes16@@@Z @ 46 NONAME ; int RSuplTerminalSubSession::GetServerAddress(class TDes16 &)
-	?NewL@CSuplTerminalParams@@SAPAV1@XZ @ 47 NONAME ; class CSuplTerminalParams * CSuplTerminalParams::NewL(void)
-	?GetHorizontalAccuracy@TSuplTerminalQop@@QBEHAAM@Z @ 48 NONAME ; int TSuplTerminalQop::GetHorizontalAccuracy(float &) const
-	?SetVerticalAccuracy@TSuplTerminalQop@@QAEHM@Z @ 49 NONAME ; int TSuplTerminalQop::SetVerticalAccuracy(float)
-	?GetMaxLocationAge@TSuplTerminalQop@@QBEHAAH@Z @ 50 NONAME ; int TSuplTerminalQop::GetMaxLocationAge(int &) const
-	?GetPosition@RSuplTerminalSubSession@@QAEHAAVTPositionInfoBase@@@Z @ 51 NONAME ; int RSuplTerminalSubSession::GetPosition(class TPositionInfoBase &)
-	?ConstructL@CSuplSubSessnPtrHolder@@IAEXHH@Z @ 52 NONAME ; void CSuplSubSessnPtrHolder::ConstructL(int, int)
-	?NewL@CSuplSubSessnPtrHolder@@SAPAV1@HH@Z @ 53 NONAME ; class CSuplSubSessnPtrHolder * CSuplSubSessnPtrHolder::NewL(int, int)
-	?Connect@RSuplTerminalServer@@QAEHAAVTRequestStatus@@@Z @ 54 NONAME ; int RSuplTerminalServer::Connect(class TRequestStatus &)
+	?Connect@RSuplTerminalServer@@QAEHAAVTRequestStatus@@@Z @ 12 NONAME ; int RSuplTerminalServer::Connect(class TRequestStatus &)
+	?Get@TSuplTerminalQop@@QBEHAAM0AAH1@Z @ 13 NONAME ; int TSuplTerminalQop::Get(float &, float &, int &, int &) const
+	??0TSuplTerminalQop@@QAE@XZ @ 14 NONAME ; TSuplTerminalQop::TSuplTerminalQop(void)
+	?Close@RSuplTerminalSubSession@@QAEXXZ @ 15 NONAME ; void RSuplTerminalSubSession::Close(void)
+	?Ptr@CSuplSubSessnPtrHolder@@QAEAAVTPtr8@@H@Z @ 16 NONAME ; class TPtr8 & CSuplSubSessnPtrHolder::Ptr(int)
+	??0RSuplTerminalServer@@QAE@XZ @ 17 NONAME ; RSuplTerminalServer::RSuplTerminalServer(void)
+	?GetSlpList@RSuplTerminalSubSession@@QAEHAAV?$RPointerArray@VCSuplTerminalParams@@@@@Z @ 18 NONAME ; int RSuplTerminalSubSession::GetSlpList(class RPointerArray<class CSuplTerminalParams> &)
+	?Get@TSuplTerminalPeriodicTrigger@@QBEHAAI00@Z @ 19 NONAME ; int TSuplTerminalPeriodicTrigger::Get(unsigned int &, unsigned int &, unsigned int &) const
+	?RunSession@RSuplTerminalSubSession@@QAEXAAVTRequestStatus@@AAVTSuplTerminalQop@@ABVTDesC16@@HHHH@Z @ 20 NONAME ; void RSuplTerminalSubSession::RunSession(class TRequestStatus &, class TSuplTerminalQop &, class TDesC16 const &, int, int, int, int)
+	??0TSuplTerminalPeriodicTrigger@@QAE@XZ @ 21 NONAME ; TSuplTerminalPeriodicTrigger::TSuplTerminalPeriodicTrigger(void)
+	?Open@RSuplTerminalSubSession@@QAEHAAVRSuplTerminalServer@@W4TSuplServiceType@1@@Z @ 22 NONAME ; int RSuplTerminalSubSession::Open(class RSuplTerminalServer &, enum RSuplTerminalSubSession::TSuplServiceType)
+	?GetVerticalAccuracy@TSuplTerminalQop@@QBEHAAM@Z @ 23 NONAME ; int TSuplTerminalQop::GetVerticalAccuracy(float &) const
+	?RunSession@RSuplTerminalSubSession@@QAEHAAVTSuplTerminalQop@@ABVTDesC16@@HHHH@Z @ 24 NONAME ; int RSuplTerminalSubSession::RunSession(class TSuplTerminalQop &, class TDesC16 const &, int, int, int, int)
+	?Set@TSuplTriggerFireInfo@@QAEHABVTPositionInfo@@@Z @ 25 NONAME ; int TSuplTriggerFireInfo::Set(class TPositionInfo const &)
+	??1CSuplTerminalParams@@UAE@XZ @ 26 NONAME ; CSuplTerminalParams::~CSuplTerminalParams(void)
+	?GetDelay@TSuplTerminalQop@@QBEHAAH@Z @ 27 NONAME ; int TSuplTerminalQop::GetDelay(int &) const
+	?Version@RSuplTerminalServer@@QBE?AVTVersion@@XZ @ 28 NONAME ; class TVersion RSuplTerminalServer::Version(void) const
+	?SetDelay@TSuplTerminalQop@@QAEHH@Z @ 29 NONAME ; int TSuplTerminalQop::SetDelay(int)
+	?Get@CSuplTerminalParams@@QBEHAA_JVTPtr16@@1AAH222@Z @ 30 NONAME ; int CSuplTerminalParams::Get(long long &, class TPtr16, class TPtr16, int &, int &, int &, int &) const
+	?RunSession@RSuplTerminalSubSession@@QAEXAAVTRequestStatus@@ABVTDesC16@@HHHH@Z @ 31 NONAME ; void RSuplTerminalSubSession::RunSession(class TRequestStatus &, class TDesC16 const &, int, int, int, int)
+	?StartSuplTriggerSession@RSuplTerminalSubSession@@QAEXAAVTRequestStatus@@AAVTSuplTerminalPeriodicTrigger@@ABVTDesC16@@HHH@Z @ 32 NONAME ; void RSuplTerminalSubSession::StartSuplTriggerSession(class TRequestStatus &, class TSuplTerminalPeriodicTrigger &, class TDesC16 const &, int, int, int)
+	?ConstructL@RSuplTerminalSubSession@@MAEXXZ @ 33 NONAME ; void RSuplTerminalSubSession::ConstructL(void)
+	?NewLC@CSuplTerminalParams@@SAPAV1@XZ @ 34 NONAME ; class CSuplTerminalParams * CSuplTerminalParams::NewLC(void)
+	?RunSession@RSuplTerminalSubSession@@QAEHAAVTSuplTerminalQop@@HHH@Z @ 35 NONAME ; int RSuplTerminalSubSession::RunSession(class TSuplTerminalQop &, int, int, int)
+	?ExtendedInterface@RSuplTerminalSubSession@@MAEPAXHPAX0@Z @ 36 NONAME ; void * RSuplTerminalSubSession::ExtendedInterface(int, void *, void *)
+	??1CSuplSubSessnPtrHolder@@UAE@XZ @ 37 NONAME ; CSuplSubSessnPtrHolder::~CSuplSubSessnPtrHolder(void)
+	?RunSession@RSuplTerminalSubSession@@QAEXAAVTRequestStatus@@HHH@Z @ 38 NONAME ; void RSuplTerminalSubSession::RunSession(class TRequestStatus &, int, int, int)
+	?RunSession@RSuplTerminalSubSession@@QAEHABVTDesC16@@HHHH@Z @ 39 NONAME ; int RSuplTerminalSubSession::RunSession(class TDesC16 const &, int, int, int, int)
+	?Set@TSuplTerminalPeriodicTrigger@@QAEHABI00@Z @ 40 NONAME ; int TSuplTerminalPeriodicTrigger::Set(unsigned int const &, unsigned int const &, unsigned int const &)
+	?RunSession@RSuplTerminalSubSession@@QAEXAAVTRequestStatus@@AAVTSuplTerminalQop@@HHH@Z @ 41 NONAME ; void RSuplTerminalSubSession::RunSession(class TRequestStatus &, class TSuplTerminalQop &, int, int, int)
+	?NotifyTriggerFired@RSuplTerminalSubSession@@QAEXAAVTRequestStatus@@AAVTSuplTriggerFireInfo@@@Z @ 42 NONAME ; void RSuplTerminalSubSession::NotifyTriggerFired(class TRequestStatus &, class TSuplTriggerFireInfo &)
+	?Set@CSuplTerminalParams@@QAEHABVTDesC16@@0HHHH_J@Z @ 43 NONAME ; int CSuplTerminalParams::Set(class TDesC16 const &, class TDesC16 const &, int, int, int, int, long long)
+	?CancelRunSession@RSuplTerminalSubSession@@QAEXXZ @ 44 NONAME ; void RSuplTerminalSubSession::CancelRunSession(void)
+	??0TSuplTriggerFireInfo@@QAE@XZ @ 45 NONAME ; TSuplTriggerFireInfo::TSuplTriggerFireInfo(void)
+	?Set@TSuplTerminalQop@@QAEHMMHH@Z @ 46 NONAME ; int TSuplTerminalQop::Set(float, float, int, int)
+	?GetServerAddress@RSuplTerminalSubSession@@QAEHAAVTDes16@@@Z @ 47 NONAME ; int RSuplTerminalSubSession::GetServerAddress(class TDes16 &)
+	?NewL@CSuplTerminalParams@@SAPAV1@XZ @ 48 NONAME ; class CSuplTerminalParams * CSuplTerminalParams::NewL(void)
+	?GetHorizontalAccuracy@TSuplTerminalQop@@QBEHAAM@Z @ 49 NONAME ; int TSuplTerminalQop::GetHorizontalAccuracy(float &) const
+	?SetVerticalAccuracy@TSuplTerminalQop@@QAEHM@Z @ 50 NONAME ; int TSuplTerminalQop::SetVerticalAccuracy(float)
+	?GetMaxLocationAge@TSuplTerminalQop@@QBEHAAH@Z @ 51 NONAME ; int TSuplTerminalQop::GetMaxLocationAge(int &) const
+	?GetPosition@RSuplTerminalSubSession@@QAEHAAVTPositionInfoBase@@@Z @ 52 NONAME ; int RSuplTerminalSubSession::GetPosition(class TPositionInfoBase &)
+	?ConstructL@CSuplSubSessnPtrHolder@@IAEXHH@Z @ 53 NONAME ; void CSuplSubSessnPtrHolder::ConstructL(int, int)
+	?NewL@CSuplSubSessnPtrHolder@@SAPAV1@HH@Z @ 54 NONAME ; class CSuplSubSessnPtrHolder * CSuplSubSessnPtrHolder::NewL(int, int)
 
--- a/supl/locationsuplfw/terminalinitiationapi/eabi/epos_suplterminitiationu.def	Mon May 03 12:54:42 2010 +0300
+++ b/supl/locationsuplfw/terminalinitiationapi/eabi/epos_suplterminitiationu.def	Fri May 14 16:17:02 2010 +0300
@@ -13,59 +13,59 @@
 	_ZN19CSuplTerminalParamsD1Ev @ 12 NONAME
 	_ZN19CSuplTerminalParamsD2Ev @ 13 NONAME
 	_ZN19RSuplTerminalServer5CloseEv @ 14 NONAME
-	_ZN19RSuplTerminalServer7ConnectEv @ 15 NONAME
-	_ZN19RSuplTerminalServerC1Ev @ 16 NONAME
-	_ZN19RSuplTerminalServerC2Ev @ 17 NONAME
-	_ZN20TSuplTriggerFireInfo3SetERK13TPositionInfo @ 18 NONAME
-	_ZN20TSuplTriggerFireInfoC1Ev @ 19 NONAME
-	_ZN20TSuplTriggerFireInfoC2Ev @ 20 NONAME
-	_ZN22CSuplSubSessnPtrHolder10ConstructLEii @ 21 NONAME
-	_ZN22CSuplSubSessnPtrHolder3PtrEi @ 22 NONAME
-	_ZN22CSuplSubSessnPtrHolder4NewLEii @ 23 NONAME
-	_ZN22CSuplSubSessnPtrHolder4PtrCEi @ 24 NONAME
-	_ZN22CSuplSubSessnPtrHolderD0Ev @ 25 NONAME
-	_ZN22CSuplSubSessnPtrHolderD1Ev @ 26 NONAME
-	_ZN22CSuplSubSessnPtrHolderD2Ev @ 27 NONAME
-	_ZN23RSuplTerminalSubSession10ConstructLEv @ 28 NONAME
-	_ZN23RSuplTerminalSubSession10GetSlpListER13RPointerArrayI19CSuplTerminalParamsE @ 29 NONAME
-	_ZN23RSuplTerminalSubSession10RunSessionER14TRequestStatusR16TSuplTerminalQopRK7TDesC16iiii @ 30 NONAME
-	_ZN23RSuplTerminalSubSession10RunSessionER14TRequestStatusR16TSuplTerminalQopiii @ 31 NONAME
-	_ZN23RSuplTerminalSubSession10RunSessionER14TRequestStatusRK7TDesC16iiii @ 32 NONAME
-	_ZN23RSuplTerminalSubSession10RunSessionER14TRequestStatusiii @ 33 NONAME
-	_ZN23RSuplTerminalSubSession10RunSessionER16TSuplTerminalQopRK7TDesC16iiii @ 34 NONAME
-	_ZN23RSuplTerminalSubSession10RunSessionER16TSuplTerminalQopiii @ 35 NONAME
-	_ZN23RSuplTerminalSubSession10RunSessionERK7TDesC16iiii @ 36 NONAME
-	_ZN23RSuplTerminalSubSession10RunSessionEiii @ 37 NONAME
-	_ZN23RSuplTerminalSubSession11GetPositionER17TPositionInfoBase @ 38 NONAME
-	_ZN23RSuplTerminalSubSession16CancelRunSessionEv @ 39 NONAME
-	_ZN23RSuplTerminalSubSession16GetServerAddressER6TDes16 @ 40 NONAME
-	_ZN23RSuplTerminalSubSession17ExtendedInterfaceEiPvS0_ @ 41 NONAME
-	_ZN23RSuplTerminalSubSession18NotifyTriggerFiredER14TRequestStatusR20TSuplTriggerFireInfo @ 42 NONAME
-	_ZN23RSuplTerminalSubSession22StopSuplTriggerSessionEv @ 43 NONAME
-	_ZN23RSuplTerminalSubSession23StartSuplTriggerSessionER14TRequestStatusR28TSuplTerminalPeriodicTriggerRK7TDesC16iii @ 44 NONAME
-	_ZN23RSuplTerminalSubSession23StartSuplTriggerSessionER14TRequestStatusR28TSuplTerminalPeriodicTriggerii @ 45 NONAME
-	_ZN23RSuplTerminalSubSession4OpenER19RSuplTerminalServerNS_16TSuplServiceTypeE @ 46 NONAME
-	_ZN23RSuplTerminalSubSession5CloseEv @ 47 NONAME
-	_ZN23RSuplTerminalSubSession8DestructEv @ 48 NONAME
-	_ZN23RSuplTerminalSubSessionC1Ev @ 49 NONAME
-	_ZN23RSuplTerminalSubSessionC2Ev @ 50 NONAME
-	_ZN28TSuplTerminalPeriodicTrigger3SetERKjS1_S1_ @ 51 NONAME
-	_ZN28TSuplTerminalPeriodicTriggerC1Ev @ 52 NONAME
-	_ZN28TSuplTerminalPeriodicTriggerC2Ev @ 53 NONAME
-	_ZNK16TSuplTerminalQop17GetMaxLocationAgeERi @ 54 NONAME
-	_ZNK16TSuplTerminalQop19GetVerticalAccuracyERf @ 55 NONAME
-	_ZNK16TSuplTerminalQop21GetHorizontalAccuracyERf @ 56 NONAME
-	_ZNK16TSuplTerminalQop3GetERfS0_RiS1_ @ 57 NONAME
-	_ZNK16TSuplTerminalQop8GetDelayERi @ 58 NONAME
-	_ZNK19CSuplTerminalParams3GetERx6TPtr16S1_RiS2_S2_S2_ @ 59 NONAME
-	_ZNK19RSuplTerminalServer7VersionEv @ 60 NONAME
-	_ZNK20TSuplTriggerFireInfo3GetER13TPositionInfo @ 61 NONAME
-	_ZNK28TSuplTerminalPeriodicTrigger3GetERjS0_S0_ @ 62 NONAME
-	_ZTI19CSuplTerminalParams @ 63 NONAME
-	_ZTI22CSuplSubSessnPtrHolder @ 64 NONAME
-	_ZTI23RSuplTerminalSubSession @ 65 NONAME
-	_ZTV19CSuplTerminalParams @ 66 NONAME
-	_ZTV22CSuplSubSessnPtrHolder @ 67 NONAME
-	_ZTV23RSuplTerminalSubSession @ 68 NONAME
-	_ZN19RSuplTerminalServer7ConnectER14TRequestStatus @ 69 NONAME
+	_ZN19RSuplTerminalServer7ConnectER14TRequestStatus @ 15 NONAME
+	_ZN19RSuplTerminalServer7ConnectEv @ 16 NONAME
+	_ZN19RSuplTerminalServerC1Ev @ 17 NONAME
+	_ZN19RSuplTerminalServerC2Ev @ 18 NONAME
+	_ZN20TSuplTriggerFireInfo3SetERK13TPositionInfo @ 19 NONAME
+	_ZN20TSuplTriggerFireInfoC1Ev @ 20 NONAME
+	_ZN20TSuplTriggerFireInfoC2Ev @ 21 NONAME
+	_ZN22CSuplSubSessnPtrHolder10ConstructLEii @ 22 NONAME
+	_ZN22CSuplSubSessnPtrHolder3PtrEi @ 23 NONAME
+	_ZN22CSuplSubSessnPtrHolder4NewLEii @ 24 NONAME
+	_ZN22CSuplSubSessnPtrHolder4PtrCEi @ 25 NONAME
+	_ZN22CSuplSubSessnPtrHolderD0Ev @ 26 NONAME
+	_ZN22CSuplSubSessnPtrHolderD1Ev @ 27 NONAME
+	_ZN22CSuplSubSessnPtrHolderD2Ev @ 28 NONAME
+	_ZN23RSuplTerminalSubSession10ConstructLEv @ 29 NONAME
+	_ZN23RSuplTerminalSubSession10GetSlpListER13RPointerArrayI19CSuplTerminalParamsE @ 30 NONAME
+	_ZN23RSuplTerminalSubSession10RunSessionER14TRequestStatusR16TSuplTerminalQopRK7TDesC16iiii @ 31 NONAME
+	_ZN23RSuplTerminalSubSession10RunSessionER14TRequestStatusR16TSuplTerminalQopiii @ 32 NONAME
+	_ZN23RSuplTerminalSubSession10RunSessionER14TRequestStatusRK7TDesC16iiii @ 33 NONAME
+	_ZN23RSuplTerminalSubSession10RunSessionER14TRequestStatusiii @ 34 NONAME
+	_ZN23RSuplTerminalSubSession10RunSessionER16TSuplTerminalQopRK7TDesC16iiii @ 35 NONAME
+	_ZN23RSuplTerminalSubSession10RunSessionER16TSuplTerminalQopiii @ 36 NONAME
+	_ZN23RSuplTerminalSubSession10RunSessionERK7TDesC16iiii @ 37 NONAME
+	_ZN23RSuplTerminalSubSession10RunSessionEiii @ 38 NONAME
+	_ZN23RSuplTerminalSubSession11GetPositionER17TPositionInfoBase @ 39 NONAME
+	_ZN23RSuplTerminalSubSession16CancelRunSessionEv @ 40 NONAME
+	_ZN23RSuplTerminalSubSession16GetServerAddressER6TDes16 @ 41 NONAME
+	_ZN23RSuplTerminalSubSession17ExtendedInterfaceEiPvS0_ @ 42 NONAME
+	_ZN23RSuplTerminalSubSession18NotifyTriggerFiredER14TRequestStatusR20TSuplTriggerFireInfo @ 43 NONAME
+	_ZN23RSuplTerminalSubSession22StopSuplTriggerSessionEv @ 44 NONAME
+	_ZN23RSuplTerminalSubSession23StartSuplTriggerSessionER14TRequestStatusR28TSuplTerminalPeriodicTriggerRK7TDesC16iii @ 45 NONAME
+	_ZN23RSuplTerminalSubSession23StartSuplTriggerSessionER14TRequestStatusR28TSuplTerminalPeriodicTriggerii @ 46 NONAME
+	_ZN23RSuplTerminalSubSession4OpenER19RSuplTerminalServerNS_16TSuplServiceTypeE @ 47 NONAME
+	_ZN23RSuplTerminalSubSession5CloseEv @ 48 NONAME
+	_ZN23RSuplTerminalSubSession8DestructEv @ 49 NONAME
+	_ZN23RSuplTerminalSubSessionC1Ev @ 50 NONAME
+	_ZN23RSuplTerminalSubSessionC2Ev @ 51 NONAME
+	_ZN28TSuplTerminalPeriodicTrigger3SetERKjS1_S1_ @ 52 NONAME
+	_ZN28TSuplTerminalPeriodicTriggerC1Ev @ 53 NONAME
+	_ZN28TSuplTerminalPeriodicTriggerC2Ev @ 54 NONAME
+	_ZNK16TSuplTerminalQop17GetMaxLocationAgeERi @ 55 NONAME
+	_ZNK16TSuplTerminalQop19GetVerticalAccuracyERf @ 56 NONAME
+	_ZNK16TSuplTerminalQop21GetHorizontalAccuracyERf @ 57 NONAME
+	_ZNK16TSuplTerminalQop3GetERfS0_RiS1_ @ 58 NONAME
+	_ZNK16TSuplTerminalQop8GetDelayERi @ 59 NONAME
+	_ZNK19CSuplTerminalParams3GetERx6TPtr16S1_RiS2_S2_S2_ @ 60 NONAME
+	_ZNK19RSuplTerminalServer7VersionEv @ 61 NONAME
+	_ZNK20TSuplTriggerFireInfo3GetER13TPositionInfo @ 62 NONAME
+	_ZNK28TSuplTerminalPeriodicTrigger3GetERjS0_S0_ @ 63 NONAME
+	_ZTI19CSuplTerminalParams @ 64 NONAME
+	_ZTI22CSuplSubSessnPtrHolder @ 65 NONAME
+	_ZTI23RSuplTerminalSubSession @ 66 NONAME
+	_ZTV19CSuplTerminalParams @ 67 NONAME
+	_ZTV22CSuplSubSessnPtrHolder @ 68 NONAME
+	_ZTV23RSuplTerminalSubSession @ 69 NONAME
 
--- a/supl/locationsuplfw/terminalinitiationapi/src/epos_suplterminalapi.cpp	Mon May 03 12:54:42 2010 +0300
+++ b/supl/locationsuplfw/terminalinitiationapi/src/epos_suplterminalapi.cpp	Fri May 14 16:17:02 2010 +0300
@@ -1025,7 +1025,15 @@
 	{
 	__ASSERT_ALWAYS(SubSessionHandle(), 
 				User::Panic(KSuplClientFault, ESuplServerBadHandle));
-    
+   
+   
+  if(!CheckSuplTriggerServiceStatus()) //To check that triggering service is allowed by user...
+  {
+  	TRequestStatus *status = &aStatus; 
+		User::RequestComplete(status,KErrNotSupported);	
+		return;
+  }
+  
 	if( iSuplService != ESUPL_2_0 )
 		{
 		TRequestStatus *status = &aStatus; 
@@ -1094,6 +1102,13 @@
 	__ASSERT_ALWAYS(SubSessionHandle(), 
 			User::Panic(KSuplClientFault, ESuplServerBadHandle));
     
+  if(!CheckSuplTriggerServiceStatus()) //To check that triggering service is allowed by user...
+		{
+			TRequestStatus *status = &aStatus; 
+			User::RequestComplete(status,KErrNotSupported);	
+			return;
+		} 
+
 	if( iSuplService != ESUPL_2_0 )
 		{
 		TRequestStatus *status = &aStatus; 
@@ -1193,6 +1208,13 @@
 	__ASSERT_ALWAYS(SubSessionHandle(), 
 			User::Panic(KSuplClientFault, ESuplServerBadHandle));
 
+		if(!CheckSuplTriggerServiceStatus()) //To check that triggering service is allowed by user...
+		{
+		TRequestStatus *status = &aStatus; 
+		User::RequestComplete(status,KErrNotSupported);	
+		return;
+		}
+
 	if( iSuplService != ESUPL_2_0 )
 		{
 		TRequestStatus *status = &aStatus; 
@@ -1232,4 +1254,41 @@
 	SendReceive(ESuplTerminalSubssnNotifyTriggerFired, args, aStatus);
 	}
 
+// ---------------------------------------------------------
+// RSuplTerminalSubSession::CheckSuplTriggerServiceStatus
+//
+// (other items were commented in a header).
+// ---------------------------------------------------------
+//
+TBool RSuplTerminalSubSession::CheckSuplTriggerServiceStatus()
+{
+	
+	delete iSuplStorageSettings;
+	iSuplStorageSettings = NULL;
+	
+	CSuplSettings::TSuplTriggerStatus suplTriggerStatus;
+
+	// create local object iSuplStorageSettings
+	TRAPD(err,iSuplStorageSettings = CSuplSettings::NewL());
+	if(err == KErrNone)
+	{
+			iSuplStorageSettings->GetSuplTriggeredServiceStatus(suplTriggerStatus);
+			delete iSuplStorageSettings;
+			iSuplStorageSettings = NULL;
+
+			if(suplTriggerStatus == CSuplSettings::ESuplTriggerOn)
+			{
+					return ETrue;						
+			}
+			else
+			{
+					return EFalse;	
+			}
+	}		
+	else
+	{
+			return ETrue;
+	}
+}
+
 // end of file
--- a/supl/locationsuplfw/utilities/src/epos_csupltrace.cpp	Mon May 03 12:54:42 2010 +0300
+++ b/supl/locationsuplfw/utilities/src/epos_csupltrace.cpp	Fri May 14 16:17:02 2010 +0300
@@ -140,6 +140,7 @@
     const TDesC& aTraceLogFile,
     TRefByValue<const TDesC> aFmt, ... )
     {
+    // coverity[var_decl : FALSE]
     VA_LIST list;
     VA_START( list, aFmt );
 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/sysdef_1_5_1.dtd	Fri May 14 16:17:02 2010 +0300
@@ -0,0 +1,88 @@
+ <!ELEMENT SystemDefinition (systemModel?, build?)>
+ <!ATTLIST SystemDefinition
+  name CDATA #REQUIRED
+  schema CDATA #REQUIRED>
+ <!ELEMENT systemModel (layer+)>
+ <!ELEMENT layer (logicalset* | module*)*>
+ <!ATTLIST layer
+  name CDATA #REQUIRED
+  levels CDATA #IMPLIED
+  span CDATA #IMPLIED>
+ <!ELEMENT logicalset (logicalsubset* | module* | unit* | package* | prebuilt*)*>
+ <!ATTLIST logicalset name CDATA #REQUIRED>
+ <!ELEMENT logicalsubset (module* | unit* | package* | prebuilt*)*>
+ <!ATTLIST logicalsubset name CDATA #REQUIRED>
+ <!ELEMENT module (component* | unit* | package* | prebuilt*)*>
+ <!ATTLIST module
+  name CDATA #REQUIRED
+  level CDATA #IMPLIED>
+ <!ELEMENT component (unit* | package* | prebuilt*)*>
+ <!ATTLIST component name CDATA #REQUIRED>
+ <!ELEMENT unit EMPTY>
+ <!ATTLIST unit
+  unitID ID #REQUIRED
+  name CDATA #REQUIRED
+  mrp CDATA #REQUIRED
+  filter CDATA #IMPLIED
+  bldFile CDATA #REQUIRED
+  priority CDATA #IMPLIED
+  contract CDATA #IMPLIED
+  proFile CDATA #IMPLIED
+  qmakeArgs CDATA #IMPLIED>
+ <!ELEMENT package EMPTY>
+ <!ATTLIST package
+  name CDATA #REQUIRED
+  mrp CDATA #REQUIRED
+  filter CDATA #IMPLIED
+  contract CDATA #IMPLIED>
+ <!ELEMENT prebuilt EMPTY>
+ <!ATTLIST prebuilt
+  name CDATA #REQUIRED
+  version CDATA #REQUIRED
+  late (Y|N) #IMPLIED
+  filter CDATA #IMPLIED
+  contract CDATA #IMPLIED>
+ <!ELEMENT build (option* | target+ | targetList+ | unitList+ | configuration+)*>
+ <!ELEMENT unitList (unitRef+)>
+ <!ATTLIST unitList
+  name ID #REQUIRED
+  description CDATA #REQUIRED>
+ <!ELEMENT unitRef EMPTY>
+ <!ATTLIST unitRef unit IDREF #REQUIRED>
+ <!ELEMENT targetList EMPTY>
+ <!ATTLIST targetList
+  name ID #REQUIRED
+  description CDATA #REQUIRED
+  target IDREFS #REQUIRED>
+ <!ELEMENT target EMPTY>
+ <!ATTLIST target
+  name ID #REQUIRED
+  abldTarget CDATA #REQUIRED
+  description CDATA #REQUIRED>
+ <!ELEMENT option EMPTY>
+ <!ATTLIST option
+  name ID #REQUIRED
+  abldOption CDATA #REQUIRED
+  description CDATA #REQUIRED
+  enable (Y | N | y | n) #REQUIRED>
+ <!ELEMENT configuration (unitListRef+ | layerRef+ | task+)*>
+ <!ATTLIST configuration
+  name ID #REQUIRED
+  description CDATA #REQUIRED
+  filter CDATA #REQUIRED>
+ <!ELEMENT task ( unitListRef* , (buildLayer | specialInstructions))>
+ <!ELEMENT unitListRef EMPTY>
+ <!ATTLIST unitListRef unitList IDREF #REQUIRED>
+ <!ELEMENT layerRef EMPTY>
+ <!ATTLIST layerRef layerName CDATA #REQUIRED>
+ <!ELEMENT buildLayer EMPTY>
+ <!ATTLIST buildLayer
+  command CDATA #REQUIRED
+  targetList IDREFS #IMPLIED
+  unitParallel (Y | N | y | n) #REQUIRED
+  targetParallel (Y | N | y | n) #IMPLIED>
+ <!ELEMENT specialInstructions EMPTY>
+ <!ATTLIST specialInstructions
+  name CDATA #REQUIRED
+  cwd CDATA #REQUIRED
+  command CDATA #REQUIRED>