# HG changeset patch # User Dremov Kirill (Nokia-D-MSW/Tampere) # Date 1284486893 -10800 # Node ID 9da50d567e3c0834672bad80442d026b4cb42afb # Parent f4a778e096c2baeaaebaa72baf1a94db9959edb9 Revision: 201033 Kit: 201035 diff -r f4a778e096c2 -r 9da50d567e3c ccservices/cmsservices/cmscontactor/group/cmscontactor.mmp --- a/ccservices/cmsservices/cmscontactor/group/cmscontactor.mmp Wed Sep 01 12:29:52 2010 +0100 +++ b/ccservices/cmsservices/cmscontactor/group/cmscontactor.mmp Tue Sep 14 20:54:53 2010 +0300 @@ -61,7 +61,7 @@ LIBRARY euser.lib LIBRARY efsrv.lib LIBRARY aiwdialdata.lib //AIW -LIBRARY commonengine.lib +LIBRARY CommonEngine.lib LIBRARY servicehandler.lib //AIW LIBRARY sendui.lib LIBRARY cmsclient.lib //CMS diff -r f4a778e096c2 -r 9da50d567e3c ccservices/cmsservices/cmsengine/Server/group/cmsserver.mmp --- a/ccservices/cmsservices/cmsengine/Server/group/cmsserver.mmp Wed Sep 01 12:29:52 2010 +0100 +++ b/ccservices/cmsservices/cmsengine/Server/group/cmsserver.mmp Tue Sep 14 20:54:53 2010 +0300 @@ -39,7 +39,7 @@ SOURCE cmsphonebookproxy.cpp SOURCE cmsserverasynccontact.cpp SOURCE cmsserverxspcontacthandler.cpp -SOURCE cmsfindlinkedcontact.cpp +SOURCE cmsfindlinkedcontact.cpp SOURCE cmssetvoicecalldefault.cpp USERINCLUDE ../inc @@ -57,13 +57,13 @@ LIBRARY efsrv.lib LIBRARY euser.lib LIBRARY fbscli.lib -LIBRARY FeatMgr.lib -LIBRARY vpbkeng.lib -LIBRARY CommonEngine.lib +LIBRARY featmgr.lib +LIBRARY VPbkEng.lib +LIBRARY CommonEngine.lib LIBRARY presencecacheutils.lib LIBRARY presencecacheclient2.lib LIBRARY Pbk2Presentation.lib // nameformatter -LIBRARY serviceprovidersettings.lib +LIBRARY serviceprovidersettings.lib LIBRARY presencetrafficlights.lib LIBRARY rcse.lib diff -r f4a778e096c2 -r 9da50d567e3c ccservices/cmsservices/cmsengine/Server/inc/cmsdefines.h --- a/ccservices/cmsservices/cmsengine/Server/inc/cmsdefines.h Wed Sep 01 12:29:52 2010 +0100 +++ b/ccservices/cmsservices/cmsengine/Server/inc/cmsdefines.h Tue Sep 14 20:54:53 2010 +0300 @@ -22,7 +22,7 @@ // INCLUDES #include -#include +#include //The types for voice calls diff -r f4a778e096c2 -r 9da50d567e3c ccservices/cmsservices/cmsengine/Server/inc/cmsservercontact.h --- a/ccservices/cmsservices/cmsengine/Server/inc/cmsservercontact.h Wed Sep 01 12:29:52 2010 +0100 +++ b/ccservices/cmsservices/cmsengine/Server/inc/cmsservercontact.h Tue Sep 14 20:54:53 2010 +0300 @@ -22,7 +22,7 @@ // INCLUDES #include "cmscontact.h" -#include +#include #include #include "bpasobserver.h" #include "cmscontactinterface.h" diff -r f4a778e096c2 -r 9da50d567e3c ccservices/cmsservices/cmsengine/Server/inc/cmsserverxspcontacthandler.h --- a/ccservices/cmsservices/cmsengine/Server/inc/cmsserverxspcontacthandler.h Wed Sep 01 12:29:52 2010 +0100 +++ b/ccservices/cmsservices/cmsengine/Server/inc/cmsserverxspcontacthandler.h Tue Sep 14 20:54:53 2010 +0300 @@ -23,7 +23,7 @@ // INCLUDES #include #include "cmscontact.h" -#include +#include #include #include #include diff -r f4a778e096c2 -r 9da50d567e3c ccservices/cmsservices/cmsengine/Server/src/cmsfindlinkedcontact.cpp --- a/ccservices/cmsservices/cmsengine/Server/src/cmsfindlinkedcontact.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/ccservices/cmsservices/cmsengine/Server/src/cmsfindlinkedcontact.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include #include diff -r f4a778e096c2 -r 9da50d567e3c ccservices/cmsservices/cmsengine/Server/src/cmsserverutils.cpp --- a/ccservices/cmsservices/cmsengine/Server/src/cmsserverutils.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/ccservices/cmsservices/cmsengine/Server/src/cmsserverutils.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -18,7 +18,7 @@ // INCLUDE FILES -#include +#include #include #include #include diff -r f4a778e096c2 -r 9da50d567e3c ccservices/cmsservices/cmsengine/Server/src/cmssetvoicecalldefault.cpp --- a/ccservices/cmsservices/cmsengine/Server/src/cmssetvoicecalldefault.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/ccservices/cmsservices/cmsengine/Server/src/cmssetvoicecalldefault.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include "cmssetvoicecalldefault.h" diff -r f4a778e096c2 -r 9da50d567e3c ccservices/cmsservices/cmsengine/tsrc/contactcreator/Server/group/creatorserver.mmp --- a/ccservices/cmsservices/cmsengine/tsrc/contactcreator/Server/group/creatorserver.mmp Wed Sep 01 12:29:52 2010 +0100 +++ b/ccservices/cmsservices/cmsengine/tsrc/contactcreator/Server/group/creatorserver.mmp Tue Sep 14 20:54:53 2010 +0300 @@ -43,7 +43,7 @@ LIBRARY estor.lib LIBRARY efsrv.lib LIBRARY euser.lib -LIBRARY vpbkeng.lib +LIBRARY VPbkEng.lib LIBRARY flogger.lib LIBRARY cntmodel.lib LIBRARY CommonEngine.lib diff -r f4a778e096c2 -r 9da50d567e3c ccservices/cmsservices/cmsengine/tsrc/contactcreator/Server/src/creatorserver.cpp --- a/ccservices/cmsservices/cmsengine/tsrc/contactcreator/Server/src/creatorserver.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/ccservices/cmsservices/cmsengine/tsrc/contactcreator/Server/src/creatorserver.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -23,7 +23,7 @@ #include #include #include -#include +#include #include #include #include diff -r f4a778e096c2 -r 9da50d567e3c ccservices/cmsservices/cmsengine/tsrc/contactcreator2/Server/group/creatorserver2.mmp --- a/ccservices/cmsservices/cmsengine/tsrc/contactcreator2/Server/group/creatorserver2.mmp Wed Sep 01 12:29:52 2010 +0100 +++ b/ccservices/cmsservices/cmsengine/tsrc/contactcreator2/Server/group/creatorserver2.mmp Tue Sep 14 20:54:53 2010 +0300 @@ -43,7 +43,7 @@ LIBRARY estor.lib LIBRARY efsrv.lib LIBRARY euser.lib -LIBRARY vpbkeng.lib +LIBRARY VPbkEng.lib LIBRARY flogger.lib LIBRARY CommonEngine.lib diff -r f4a778e096c2 -r 9da50d567e3c ccservices/cmsservices/cmsengine/tsrc/contactcreator2/Server/src/creatorserver2.cpp --- a/ccservices/cmsservices/cmsengine/tsrc/contactcreator2/Server/src/creatorserver2.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/ccservices/cmsservices/cmsengine/tsrc/contactcreator2/Server/src/creatorserver2.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include #include #include diff -r f4a778e096c2 -r 9da50d567e3c ccservices/cmsservices/contactpresence/group/contactpresence.mmp --- a/ccservices/cmsservices/contactpresence/group/contactpresence.mmp Wed Sep 01 12:29:52 2010 +0100 +++ b/ccservices/cmsservices/contactpresence/group/contactpresence.mmp Tue Sep 14 20:54:53 2010 +0300 @@ -53,7 +53,7 @@ LIBRARY presencetrafficlights.lib LIBRARY aknskins.lib -LIBRARY vpbkeng.lib +LIBRARY VPbkEng.lib LIBRARY Pbk2Presentation.lib //nameformatter -LIBRARY serviceprovidersettings.lib +LIBRARY serviceprovidersettings.lib diff -r f4a778e096c2 -r 9da50d567e3c ccservices/cmsservices/contactpresence/inc/presenceiconinfo.h --- a/ccservices/cmsservices/contactpresence/inc/presenceiconinfo.h Wed Sep 01 12:29:52 2010 +0100 +++ b/ccservices/cmsservices/contactpresence/inc/presenceiconinfo.h Tue Sep 14 20:54:53 2010 +0300 @@ -23,7 +23,7 @@ #include #include #include -#include +#include #include "mpresencetrafficlightsobs.h" #include "presenceiconinfolistener.h" diff -r f4a778e096c2 -r 9da50d567e3c contactextensions/predefinedcontacts/group/predefinedcontacts.mmp --- a/contactextensions/predefinedcontacts/group/predefinedcontacts.mmp Wed Sep 01 12:29:52 2010 +0100 +++ b/contactextensions/predefinedcontacts/group/predefinedcontacts.mmp Tue Sep 14 20:54:53 2010 +0300 @@ -53,9 +53,9 @@ USERINCLUDE ../inc LIBRARY euser.lib -LIBRARY CentralRepository.lib -LIBRARY vpbkeng.lib -LIBRARY vpbkvcardeng.lib +LIBRARY centralrepository.lib +LIBRARY VPbkEng.lib +LIBRARY VPbkVCardEng.lib LIBRARY efsrv.lib LIBRARY estor.lib LIBRARY xmlframework.lib @@ -63,8 +63,8 @@ LIBRARY sysutil.lib LIBRARY aknnotify.lib LIBRARY eiksrv.lib -LIBRARY commonengine.lib -LIBRARY PbkEng.lib +LIBRARY CommonEngine.lib +LIBRARY pbkeng.lib LIBRARY ecom.lib LIBRARY flogger.lib LIBRARY cntmodel.lib diff -r f4a778e096c2 -r 9da50d567e3c contactextensions/predefinedcontacts/inc/pdcxmlmapping.h --- a/contactextensions/predefinedcontacts/inc/pdcxmlmapping.h Wed Sep 01 12:29:52 2010 +0100 +++ b/contactextensions/predefinedcontacts/inc/pdcxmlmapping.h Tue Sep 14 20:54:53 2010 +0300 @@ -20,7 +20,7 @@ #define PDCXMLMAPPING_H // System includes -#include +#include // User includes #include "pdcstringconstants.h" // PdcStringTable diff -r f4a778e096c2 -r 9da50d567e3c contacts_plat/cca_launch_api/tsrc/cca_launch_api/group/cca_launch_api.mmp --- a/contacts_plat/cca_launch_api/tsrc/cca_launch_api/group/cca_launch_api.mmp Wed Sep 01 12:29:52 2010 +0100 +++ b/contacts_plat/cca_launch_api/tsrc/cca_launch_api/group/cca_launch_api.mmp Tue Sep 14 20:54:53 2010 +0300 @@ -45,7 +45,7 @@ USERINCLUDE ../inc LIBRARY euser.lib -LIBRARY stiftestinterface.lib +LIBRARY StifTestInterface.lib LIBRARY estlib.lib LIBRARY bafl.lib LIBRARY efsrv.lib diff -r f4a778e096c2 -r 9da50d567e3c contacts_plat/cca_view_plugin_api/tsrc/ut_cccappviewpluginakncontainer/group/ut_cccappviewpluginakncontainer.mmp --- a/contacts_plat/cca_view_plugin_api/tsrc/ut_cccappviewpluginakncontainer/group/ut_cccappviewpluginakncontainer.mmp Wed Sep 01 12:29:52 2010 +0100 +++ b/contacts_plat/cca_view_plugin_api/tsrc/ut_cccappviewpluginakncontainer/group/ut_cccappviewpluginakncontainer.mmp Tue Sep 14 20:54:53 2010 +0300 @@ -36,7 +36,7 @@ SYSTEMINCLUDE /epoc32/include/ecom LIBRARY euser.lib -LIBRARY stiftestinterface.lib +LIBRARY StifTestInterface.lib LIBRARY ecom.lib LIBRARY flogger.lib LIBRARY cone.lib//avkon view/container diff -r f4a778e096c2 -r 9da50d567e3c contacts_plat/cca_view_plugin_api/tsrc/ut_cccappviewpluginaknview/group/ut_cccappviewpluginaknview.mmp --- a/contacts_plat/cca_view_plugin_api/tsrc/ut_cccappviewpluginaknview/group/ut_cccappviewpluginaknview.mmp Wed Sep 01 12:29:52 2010 +0100 +++ b/contacts_plat/cca_view_plugin_api/tsrc/ut_cccappviewpluginaknview/group/ut_cccappviewpluginaknview.mmp Tue Sep 14 20:54:53 2010 +0300 @@ -36,7 +36,7 @@ SYSTEMINCLUDE /epoc32/include/ecom LIBRARY euser.lib -LIBRARY stiftestinterface.lib +LIBRARY StifTestInterface.lib LIBRARY ecom.lib LIBRARY flogger.lib LIBRARY cone.lib//avkon view/container diff -r f4a778e096c2 -r 9da50d567e3c contacts_plat/contactpresence_api/tsrc/contactpresenceapitester/group/contactpresenceapitester.mmp --- a/contacts_plat/contactpresence_api/tsrc/contactpresenceapitester/group/contactpresenceapitester.mmp Wed Sep 01 12:29:52 2010 +0100 +++ b/contacts_plat/contactpresence_api/tsrc/contactpresenceapitester/group/contactpresenceapitester.mmp Tue Sep 14 20:54:53 2010 +0300 @@ -45,9 +45,9 @@ LIBRARY fbscli.lib LIBRARY euser.lib LIBRARY efsrv.lib -LIBRARY vpbkeng.lib +LIBRARY VPbkEng.lib LIBRARY flogger.lib -LIBRARY stiftestinterface.lib +LIBRARY StifTestInterface.lib LIBRARY aknicon.lib LIBRARY serviceprovidersettings.lib // for writing cache diff -r f4a778e096c2 -r 9da50d567e3c contacts_plat/contactpresence_api/tsrc/contactpresenceapitester/src/contactpresencephonebook.cpp --- a/contacts_plat/contactpresence_api/tsrc/contactpresenceapitester/src/contactpresencephonebook.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/contacts_plat/contactpresence_api/tsrc/contactpresenceapitester/src/contactpresencephonebook.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -20,7 +20,7 @@ #include #include -#include +#include #include #include diff -r f4a778e096c2 -r 9da50d567e3c contacts_plat/phonebook_2_contact_related_icon_customization_api/tsrc/group/Pbk2IconCustomApiTestModule.mmp --- a/contacts_plat/phonebook_2_contact_related_icon_customization_api/tsrc/group/Pbk2IconCustomApiTestModule.mmp Wed Sep 01 12:29:52 2010 +0100 +++ b/contacts_plat/phonebook_2_contact_related_icon_customization_api/tsrc/group/Pbk2IconCustomApiTestModule.mmp Tue Sep 14 20:54:53 2010 +0300 @@ -33,6 +33,6 @@ LIBRARY euser.lib LIBRARY ecom.lib LIBRARY fbscli.lib -LIBRARY stiftestinterface.lib +LIBRARY StifTestInterface.lib // End of File diff -r f4a778e096c2 -r 9da50d567e3c contacts_plat/phonebook_2_rcl_api/tsrc/rcltestsuite/group/rcltestsuite.mmp --- a/contacts_plat/phonebook_2_rcl_api/tsrc/rcltestsuite/group/rcltestsuite.mmp Wed Sep 01 12:29:52 2010 +0100 +++ b/contacts_plat/phonebook_2_rcl_api/tsrc/rcltestsuite/group/rcltestsuite.mmp Tue Sep 14 20:54:53 2010 +0300 @@ -41,10 +41,10 @@ APP_LAYER_SYSTEMINCLUDE LIBRARY euser.lib -LIBRARY stiftestinterface.lib +LIBRARY StifTestInterface.lib LIBRARY stiftestengine.lib -LIBRARY eCom.lib +LIBRARY ecom.lib LIBRARY flogger.lib LIBRARY estor.lib LIBRARY pbk2rclengine.lib diff -r f4a778e096c2 -r 9da50d567e3c contacts_plat/predictivesearch_client_api/tsrc/PsClientTestSuite/group/PsClientTestSuite.mmp --- a/contacts_plat/predictivesearch_client_api/tsrc/PsClientTestSuite/group/PsClientTestSuite.mmp Wed Sep 01 12:29:52 2010 +0100 +++ b/contacts_plat/predictivesearch_client_api/tsrc/PsClientTestSuite/group/PsClientTestSuite.mmp Tue Sep 14 20:54:53 2010 +0300 @@ -42,12 +42,12 @@ APP_LAYER_SYSTEMINCLUDE LIBRARY euser.lib -LIBRARY stiftestinterface.lib +LIBRARY StifTestInterface.lib LIBRARY stiftestengine.lib LIBRARY PsServerClientAPI.lib LIBRARY PcsUtils.lib LIBRARY VPbkEng.lib -LIBRARY eCom.lib +LIBRARY ecom.lib LIBRARY flogger.lib LIBRARY bafl.lib diff -r f4a778e096c2 -r 9da50d567e3c contacts_plat/predictivesearch_utils_api/tsrc/PsUtilsTestSuite/group/PsUtilsTestSuite.mmp --- a/contacts_plat/predictivesearch_utils_api/tsrc/PsUtilsTestSuite/group/PsUtilsTestSuite.mmp Wed Sep 01 12:29:52 2010 +0100 +++ b/contacts_plat/predictivesearch_utils_api/tsrc/PsUtilsTestSuite/group/PsUtilsTestSuite.mmp Tue Sep 14 20:54:53 2010 +0300 @@ -39,12 +39,12 @@ APP_LAYER_SYSTEMINCLUDE LIBRARY euser.lib -LIBRARY stiftestinterface.lib +LIBRARY StifTestInterface.lib LIBRARY stiftestengine.lib //LIBRARY PsServerClientAPI.lib LIBRARY PcsUtils.lib LIBRARY VPbkEng.lib -LIBRARY eCom.lib +LIBRARY ecom.lib LIBRARY flogger.lib LIBRARY estor.lib diff -r f4a778e096c2 -r 9da50d567e3c contacts_plat/presence_cache_api/tsrc/clientsrvtester/group/clientsrvtester.mmp --- a/contacts_plat/presence_cache_api/tsrc/clientsrvtester/group/clientsrvtester.mmp Wed Sep 01 12:29:52 2010 +0100 +++ b/contacts_plat/presence_cache_api/tsrc/clientsrvtester/group/clientsrvtester.mmp Tue Sep 14 20:54:53 2010 +0300 @@ -44,7 +44,7 @@ LIBRARY euser.lib LIBRARY efsrv.lib LIBRARY flogger.lib -LIBRARY stiftestinterface.lib +LIBRARY StifTestInterface.lib LIBRARY presencecacheclient2.lib LIBRARY presencecacheutils.lib diff -r f4a778e096c2 -r 9da50d567e3c contacts_plat/speed_dial_dialogs_api/tsrc/bc/group/BCTestSpeedDial.mmp --- a/contacts_plat/speed_dial_dialogs_api/tsrc/bc/group/BCTestSpeedDial.mmp Wed Sep 01 12:29:52 2010 +0100 +++ b/contacts_plat/speed_dial_dialogs_api/tsrc/bc/group/BCTestSpeedDial.mmp Tue Sep 14 20:54:53 2010 +0300 @@ -51,21 +51,21 @@ LIBRARY euser.lib -LIBRARY stiftestinterface.lib +LIBRARY StifTestInterface.lib LIBRARY stiftestengine.lib -LIBRARY SpdCtrl.lib -LIBRARY PbkEng.lib +LIBRARY spdctrl.lib +LIBRARY pbkeng.lib LIBRARY efsrv.lib LIBRARY cone.lib ws32.lib avkon.lib eikcoctl.lib eikctl.lib apgrfx.lib aknskins.lib LIBRARY bafl.lib aknskinsrv.lib aknswallpaperutils.lib eikcore.lib LIBRARY Pbk2CommonUI.lib -LIBRARY ServiceHandler.lib +LIBRARY servicehandler.lib LIBRARY Pbk2Presentation.lib -LIBRARY PbkView.lib -LIBRARY PhoneClient.LIB +LIBRARY pbkview.lib +LIBRARY phoneclient.lib LIBRARY VPbkEng.lib diff -r f4a778e096c2 -r 9da50d567e3c contacts_plat/virtual_phonebook_engine_api/inc/MVPbkFieldType.h --- a/contacts_plat/virtual_phonebook_engine_api/inc/MVPbkFieldType.h Wed Sep 01 12:29:52 2010 +0100 +++ b/contacts_plat/virtual_phonebook_engine_api/inc/MVPbkFieldType.h Tue Sep 14 20:54:53 2010 +0300 @@ -641,7 +641,7 @@ TInt aMatchPriority ) const = 0; /** - * Returns the field type resource id from VPbkEng.rsg + * Returns the field type resource id from vpbkeng.rsg * that be used to identify a type. * * @return A field type resource id. @@ -732,7 +732,7 @@ * Returns the field type corresponding to field type resource id. * * If no match is found returns NULL. The resource id aFieldTypeResId - * corresponds to the VPBK_FIELD_TYPE types in VPbkEng.rsg. + * corresponds to the VPBK_FIELD_TYPE types in vpbkeng.rsg. * * @param aFieldTypeResId The field type resource id. * @return The corresponding field type. diff -r f4a778e096c2 -r 9da50d567e3c contacts_plat/virtual_phonebook_policy_api/tsrc/T_VPbkPolicyApi/group/T_VPbkPolicyApi.mmp --- a/contacts_plat/virtual_phonebook_policy_api/tsrc/T_VPbkPolicyApi/group/T_VPbkPolicyApi.mmp Wed Sep 01 12:29:52 2010 +0100 +++ b/contacts_plat/virtual_phonebook_policy_api/tsrc/T_VPbkPolicyApi/group/T_VPbkPolicyApi.mmp Tue Sep 14 20:54:53 2010 +0300 @@ -36,7 +36,7 @@ APP_LAYER_SYSTEMINCLUDE LIBRARY euser.lib -LIBRARY stiftestinterface.lib +LIBRARY StifTestInterface.lib LIBRARY stiftestengine.lib LIBRARY VPbkEng.lib diff -r f4a778e096c2 -r 9da50d567e3c contacts_plat/virtual_phonebook_sim_services_api/tsrc/T_VPbkSimServicesApi/group/T_VPbkSimServicesApi.mmp --- a/contacts_plat/virtual_phonebook_sim_services_api/tsrc/T_VPbkSimServicesApi/group/T_VPbkSimServicesApi.mmp Wed Sep 01 12:29:52 2010 +0100 +++ b/contacts_plat/virtual_phonebook_sim_services_api/tsrc/T_VPbkSimServicesApi/group/T_VPbkSimServicesApi.mmp Tue Sep 14 20:54:53 2010 +0300 @@ -36,11 +36,11 @@ APP_LAYER_SYSTEMINCLUDE LIBRARY euser.lib -LIBRARY stiftestinterface.lib +LIBRARY StifTestInterface.lib LIBRARY stiftestengine.lib LIBRARY VPbkEng.lib LIBRARY VPbkSimStoreImpl.lib -LIBRARY VPbkSimStoreService.lib +LIBRARY vpbksimstoreservice.lib LANG SC diff -r f4a778e096c2 -r 9da50d567e3c contacts_plat/virtual_phonebook_store_api/tsrc/T_MVPbkContactStore/group/T_MVPbkContactStore.mmp --- a/contacts_plat/virtual_phonebook_store_api/tsrc/T_MVPbkContactStore/group/T_MVPbkContactStore.mmp Wed Sep 01 12:29:52 2010 +0100 +++ b/contacts_plat/virtual_phonebook_store_api/tsrc/T_MVPbkContactStore/group/T_MVPbkContactStore.mmp Tue Sep 14 20:54:53 2010 +0300 @@ -43,7 +43,7 @@ SYSTEMINCLUDE ../../../../../phonebookengines/VirtualPhonebook/inc SYSTEMINCLUDE /epoc32/include/Digia/EUnit -LIBRARY EUnit.lib +LIBRARY eunit.lib LIBRARY euser.lib efsrv.lib bafl.lib estor.lib cone.lib ecom.lib LIBRARY serviceprovidersettings.lib LIBRARY cntmodel.lib diff -r f4a778e096c2 -r 9da50d567e3c contacts_plat/virtual_phonebook_store_api/tsrc/T_MVPbkContactStore/inc/T_MVPbkContactStoreSingle.h --- a/contacts_plat/virtual_phonebook_store_api/tsrc/T_MVPbkContactStore/inc/T_MVPbkContactStoreSingle.h Wed Sep 01 12:29:52 2010 +0100 +++ b/contacts_plat/virtual_phonebook_store_api/tsrc/T_MVPbkContactStore/inc/T_MVPbkContactStoreSingle.h Tue Sep 14 20:54:53 2010 +0300 @@ -32,7 +32,7 @@ #include #include #include -#include +#include #include #include #include diff -r f4a778e096c2 -r 9da50d567e3c contacts_plat/virtual_phonebook_store_api/tsrc/T_MVPbkContactStore/src/T_MVPbkContactStoreComposite.cpp --- a/contacts_plat/virtual_phonebook_store_api/tsrc/T_MVPbkContactStore/src/T_MVPbkContactStoreComposite.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/contacts_plat/virtual_phonebook_store_api/tsrc/T_MVPbkContactStore/src/T_MVPbkContactStoreComposite.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -36,7 +36,7 @@ #include #include -#include +#include // EXTERNAL INCLUDES #include diff -r f4a778e096c2 -r 9da50d567e3c contacts_plat/virtual_phonebook_store_api/tsrc/T_MVPbkContactStore/src/T_MVPbkContactStoreDllMain.cpp --- a/contacts_plat/virtual_phonebook_store_api/tsrc/T_MVPbkContactStore/src/T_MVPbkContactStoreDllMain.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/contacts_plat/virtual_phonebook_store_api/tsrc/T_MVPbkContactStore/src/T_MVPbkContactStoreDllMain.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -30,7 +30,7 @@ #include "T_MVPbkContactStoreSingle.h" #include "T_MVPbkContactStoreComposite.h" #include "TVPbkContactStoreUriPtr.h" -#include +#include #include // LOCAL diff -r f4a778e096c2 -r 9da50d567e3c contacts_plat/virtual_phonebook_store_api/tsrc/T_MVPbkContactStore/src/T_MVPbkContactStoreSingle.cpp --- a/contacts_plat/virtual_phonebook_store_api/tsrc/T_MVPbkContactStore/src/T_MVPbkContactStoreSingle.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/contacts_plat/virtual_phonebook_store_api/tsrc/T_MVPbkContactStore/src/T_MVPbkContactStoreSingle.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -58,7 +58,7 @@ #include #include #include -#include +#include #include #include #include diff -r f4a778e096c2 -r 9da50d567e3c contacts_plat/virtual_phonebook_vcard_api/tsrc/T_VPbkVCardApi/group/T_VPbkVCardApi.mmp --- a/contacts_plat/virtual_phonebook_vcard_api/tsrc/T_VPbkVCardApi/group/T_VPbkVCardApi.mmp Wed Sep 01 12:29:52 2010 +0100 +++ b/contacts_plat/virtual_phonebook_vcard_api/tsrc/T_VPbkVCardApi/group/T_VPbkVCardApi.mmp Tue Sep 14 20:54:53 2010 +0300 @@ -44,10 +44,10 @@ LIBRARY eikcore.lib LIBRARY euser.lib LIBRARY estor.lib -LIBRARY stiftestinterface.lib +LIBRARY StifTestInterface.lib LIBRARY stiftestengine.lib LIBRARY VPbkEng.lib -LIBRARY vpbkvcardeng.lib efsrv.lib +LIBRARY VPbkVCardEng.lib efsrv.lib LANG SC diff -r f4a778e096c2 -r 9da50d567e3c contacts_plat/virtual_phonebook_vcard_api/tsrc/T_VPbkVCardApi/src/VPbkVCardStifBlocks.cpp --- a/contacts_plat/virtual_phonebook_vcard_api/tsrc/T_VPbkVCardApi/src/VPbkVCardStifBlocks.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/contacts_plat/virtual_phonebook_vcard_api/tsrc/T_VPbkVCardApi/src/VPbkVCardStifBlocks.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include _LIT( KCntDbUri, "cntdb://c:testcontacts.cdb" ); diff -r f4a778e096c2 -r 9da50d567e3c contacts_plat/virtual_phonebook_view_definition_api/tsrc/T_VPbkViewDefinitionApi/group/T_VPbkViewDefinitionApi.mmp --- a/contacts_plat/virtual_phonebook_view_definition_api/tsrc/T_VPbkViewDefinitionApi/group/T_VPbkViewDefinitionApi.mmp Wed Sep 01 12:29:52 2010 +0100 +++ b/contacts_plat/virtual_phonebook_view_definition_api/tsrc/T_VPbkViewDefinitionApi/group/T_VPbkViewDefinitionApi.mmp Tue Sep 14 20:54:53 2010 +0300 @@ -36,7 +36,7 @@ APP_LAYER_SYSTEMINCLUDE LIBRARY euser.lib -LIBRARY stiftestinterface.lib +LIBRARY StifTestInterface.lib LIBRARY stiftestengine.lib LIBRARY VPbkEng.lib diff -r f4a778e096c2 -r 9da50d567e3c contacts_pub/phonebook_data_addedit_ui_api/tsrc/bc/group/BCTestPbkDataAddEdit.mmp --- a/contacts_pub/phonebook_data_addedit_ui_api/tsrc/bc/group/BCTestPbkDataAddEdit.mmp Wed Sep 01 12:29:52 2010 +0100 +++ b/contacts_pub/phonebook_data_addedit_ui_api/tsrc/bc/group/BCTestPbkDataAddEdit.mmp Tue Sep 14 20:54:53 2010 +0300 @@ -64,10 +64,10 @@ LIBRARY euser.lib eikcore.lib eikcoctl.lib LIBRARY efsrv.lib cone.lib -LIBRARY PbkEng.lib PbkView.lib cntmodel.lib -LIBRARY stiftestinterface.lib +LIBRARY pbkeng.lib pbkview.lib cntmodel.lib +LIBRARY StifTestInterface.lib LIBRARY stiftestengine.lib -LIBRARY commonengine.lib +LIBRARY CommonEngine.lib LANG SC diff -r f4a778e096c2 -r 9da50d567e3c contacts_pub/phonebook_data_addedit_ui_api/tsrc/bc/src/BCTestPbkDataAddEditBlocks.cpp --- a/contacts_pub/phonebook_data_addedit_ui_api/tsrc/bc/src/BCTestPbkDataAddEditBlocks.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/contacts_pub/phonebook_data_addedit_ui_api/tsrc/bc/src/BCTestPbkDataAddEditBlocks.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -30,7 +30,7 @@ #include #include -//#include +//#include #include #include #include diff -r f4a778e096c2 -r 9da50d567e3c contacts_pub/phonebook_data_management_api/tsrc/bc/MTPbkContactChangeNotifier/group/MTPbkContactChangeNotifier.mmp --- a/contacts_pub/phonebook_data_management_api/tsrc/bc/MTPbkContactChangeNotifier/group/MTPbkContactChangeNotifier.mmp Wed Sep 01 12:29:52 2010 +0100 +++ b/contacts_pub/phonebook_data_management_api/tsrc/bc/MTPbkContactChangeNotifier/group/MTPbkContactChangeNotifier.mmp Tue Sep 14 20:54:53 2010 +0300 @@ -63,14 +63,14 @@ SOURCE CContactEngineEventQueue.cpp LIBRARY euser.lib -LIBRARY stiftestinterface.lib +LIBRARY StifTestInterface.lib LIBRARY stiftestengine.lib LIBRARY bafl.lib LIBRARY cntmodel.lib LIBRARY efsrv.lib LIBRARY estor.lib -LIBRARY PbkEng.lib -LIBRARY SysUtil.lib +LIBRARY pbkeng.lib +LIBRARY sysutil.lib LANG SC diff -r f4a778e096c2 -r 9da50d567e3c contacts_pub/phonebook_data_management_api/tsrc/bc/MTPbkContactEngine/group/MTPbkContactEngine.mmp --- a/contacts_pub/phonebook_data_management_api/tsrc/bc/MTPbkContactEngine/group/MTPbkContactEngine.mmp Wed Sep 01 12:29:52 2010 +0100 +++ b/contacts_pub/phonebook_data_management_api/tsrc/bc/MTPbkContactEngine/group/MTPbkContactEngine.mmp Tue Sep 14 20:54:53 2010 +0300 @@ -63,15 +63,15 @@ SOURCE CContactEngineEventQueue.cpp -LIBRARY stiftestinterface.lib +LIBRARY StifTestInterface.lib LIBRARY stiftestengine.lib LIBRARY bafl.lib LIBRARY cntmodel.lib LIBRARY efsrv.lib LIBRARY estor.lib LIBRARY euser.lib -LIBRARY PbkEng.lib -LIBRARY SysUtil.lib +LIBRARY pbkeng.lib +LIBRARY sysutil.lib LANG SC diff -r f4a778e096c2 -r 9da50d567e3c contacts_pub/phonebook_data_management_api/tsrc/bc/MTPbkContactItem/group/MTPbkContactItem.mmp --- a/contacts_pub/phonebook_data_management_api/tsrc/bc/MTPbkContactItem/group/MTPbkContactItem.mmp Wed Sep 01 12:29:52 2010 +0100 +++ b/contacts_pub/phonebook_data_management_api/tsrc/bc/MTPbkContactItem/group/MTPbkContactItem.mmp Tue Sep 14 20:54:53 2010 +0300 @@ -62,18 +62,18 @@ SOURCE MTPbkContactItemBlocks.cpp LIBRARY euser.lib -LIBRARY stiftestinterface.lib +LIBRARY StifTestInterface.lib LIBRARY stiftestengine.lib LIBRARY bafl.lib -LIBRARY CentralRepository.lib +LIBRARY centralrepository.lib LIBRARY cntmodel.lib LIBRARY cntview.lib -LIBRARY commonengine.lib -LIBRARY ECom.lib +LIBRARY CommonEngine.lib +LIBRARY ecom.lib LIBRARY efsrv.lib LIBRARY estor.lib -LIBRARY PbkEng.lib -LIBRARY SysUtil.lib +LIBRARY pbkeng.lib +LIBRARY sysutil.lib LANG SC diff -r f4a778e096c2 -r 9da50d567e3c contacts_pub/phonebook_data_management_api/tsrc/bc/MTPbkContactItemField/group/MTPbkContactItemField.mmp --- a/contacts_pub/phonebook_data_management_api/tsrc/bc/MTPbkContactItemField/group/MTPbkContactItemField.mmp Wed Sep 01 12:29:52 2010 +0100 +++ b/contacts_pub/phonebook_data_management_api/tsrc/bc/MTPbkContactItemField/group/MTPbkContactItemField.mmp Tue Sep 14 20:54:53 2010 +0300 @@ -63,17 +63,17 @@ LIBRARY euser.lib -LIBRARY stiftestinterface.lib +LIBRARY StifTestInterface.lib LIBRARY stiftestengine.lib LIBRARY bafl.lib LIBRARY cntmodel.lib LIBRARY cntview.lib -LIBRARY commonengine.lib -LIBRARY ECom.lib +LIBRARY CommonEngine.lib +LIBRARY ecom.lib LIBRARY efsrv.lib LIBRARY estor.lib -LIBRARY PbkEng.lib -LIBRARY SysUtil.lib +LIBRARY pbkeng.lib +LIBRARY sysutil.lib LANG SC diff -r f4a778e096c2 -r 9da50d567e3c contacts_pub/phonebook_data_management_api/tsrc/bc/MTPbkContactIter/group/MTPbkContactIter.mmp --- a/contacts_pub/phonebook_data_management_api/tsrc/bc/MTPbkContactIter/group/MTPbkContactIter.mmp Wed Sep 01 12:29:52 2010 +0100 +++ b/contacts_pub/phonebook_data_management_api/tsrc/bc/MTPbkContactIter/group/MTPbkContactIter.mmp Tue Sep 14 20:54:53 2010 +0300 @@ -62,14 +62,14 @@ SOURCE MTPbkContactIterBlocks.cpp LIBRARY euser.lib -LIBRARY stiftestinterface.lib +LIBRARY StifTestInterface.lib LIBRARY stiftestengine.lib LIBRARY bafl.lib LIBRARY cntmodel.lib LIBRARY efsrv.lib LIBRARY estor.lib -LIBRARY PbkEng.lib -LIBRARY SysUtil.lib +LIBRARY pbkeng.lib +LIBRARY sysutil.lib diff -r f4a778e096c2 -r 9da50d567e3c contacts_pub/phonebook_data_management_api/tsrc/bc/MTPbkFieldData/group/MTPbkFieldData.mmp --- a/contacts_pub/phonebook_data_management_api/tsrc/bc/MTPbkFieldData/group/MTPbkFieldData.mmp Wed Sep 01 12:29:52 2010 +0100 +++ b/contacts_pub/phonebook_data_management_api/tsrc/bc/MTPbkFieldData/group/MTPbkFieldData.mmp Tue Sep 14 20:54:53 2010 +0300 @@ -63,14 +63,14 @@ LIBRARY euser.lib -LIBRARY stiftestinterface.lib +LIBRARY StifTestInterface.lib LIBRARY stiftestengine.lib LIBRARY bafl.lib LIBRARY cntmodel.lib LIBRARY efsrv.lib LIBRARY estor.lib -LIBRARY PbkEng.lib -LIBRARY SysUtil.lib +LIBRARY pbkeng.lib +LIBRARY sysutil.lib LANG SC diff -r f4a778e096c2 -r 9da50d567e3c contacts_pub/phonebook_data_management_api/tsrc/bc/MTPbkFields/group/MTPbkFields.mmp --- a/contacts_pub/phonebook_data_management_api/tsrc/bc/MTPbkFields/group/MTPbkFields.mmp Wed Sep 01 12:29:52 2010 +0100 +++ b/contacts_pub/phonebook_data_management_api/tsrc/bc/MTPbkFields/group/MTPbkFields.mmp Tue Sep 14 20:54:53 2010 +0300 @@ -63,14 +63,14 @@ LIBRARY euser.lib -LIBRARY stiftestinterface.lib +LIBRARY StifTestInterface.lib LIBRARY stiftestengine.lib LIBRARY bafl.lib LIBRARY cntmodel.lib LIBRARY efsrv.lib LIBRARY estor.lib -LIBRARY PbkEng.lib -LIBRARY SysUtil.lib +LIBRARY pbkeng.lib +LIBRARY sysutil.lib LANG SC diff -r f4a778e096c2 -r 9da50d567e3c contacts_pub/phonebook_data_management_api/tsrc/bc/MTPbkFieldsInfo/group/MTPbkFieldsInfo.mmp --- a/contacts_pub/phonebook_data_management_api/tsrc/bc/MTPbkFieldsInfo/group/MTPbkFieldsInfo.mmp Wed Sep 01 12:29:52 2010 +0100 +++ b/contacts_pub/phonebook_data_management_api/tsrc/bc/MTPbkFieldsInfo/group/MTPbkFieldsInfo.mmp Tue Sep 14 20:54:53 2010 +0300 @@ -64,14 +64,14 @@ SOURCE MTPbkFieldsInfoBlocks.cpp LIBRARY euser.lib -LIBRARY stiftestinterface.lib +LIBRARY StifTestInterface.lib LIBRARY stiftestengine.lib LIBRARY bafl.lib LIBRARY cntmodel.lib LIBRARY efsrv.lib LIBRARY estor.lib -LIBRARY PbkEng.lib -LIBRARY SysUtil.lib +LIBRARY pbkeng.lib +LIBRARY sysutil.lib LANG SC diff -r f4a778e096c2 -r 9da50d567e3c contacts_pub/phonebook_data_management_api/tsrc/bc/MTPbkIconId/group/MTPbkIconId.mmp --- a/contacts_pub/phonebook_data_management_api/tsrc/bc/MTPbkIconId/group/MTPbkIconId.mmp Wed Sep 01 12:29:52 2010 +0100 +++ b/contacts_pub/phonebook_data_management_api/tsrc/bc/MTPbkIconId/group/MTPbkIconId.mmp Tue Sep 14 20:54:53 2010 +0300 @@ -62,15 +62,15 @@ SOURCE MTPbkIconIdBlocks.cpp -LIBRARY stiftestinterface.lib +LIBRARY StifTestInterface.lib LIBRARY stiftestengine.lib LIBRARY bafl.lib LIBRARY cntmodel.lib LIBRARY efsrv.lib LIBRARY estor.lib LIBRARY euser.lib -LIBRARY PbkEng.lib -LIBRARY SysUtil.lib +LIBRARY pbkeng.lib +LIBRARY sysutil.lib LANG SC diff -r f4a778e096c2 -r 9da50d567e3c contacts_pub/phonebook_data_management_api/tsrc/bc/MTPbkIconInfo/group/MTPbkIconInfo.mmp --- a/contacts_pub/phonebook_data_management_api/tsrc/bc/MTPbkIconInfo/group/MTPbkIconInfo.mmp Wed Sep 01 12:29:52 2010 +0100 +++ b/contacts_pub/phonebook_data_management_api/tsrc/bc/MTPbkIconInfo/group/MTPbkIconInfo.mmp Tue Sep 14 20:54:53 2010 +0300 @@ -63,11 +63,11 @@ LIBRARY euser.lib -LIBRARY stiftestinterface.lib +LIBRARY StifTestInterface.lib LIBRARY stiftestengine.lib LIBRARY bafl.lib LIBRARY cone.lib -LIBRARY PbkView.lib +LIBRARY pbkview.lib LIBRARY aknskins.lib LIBRARY egul.lib diff -r f4a778e096c2 -r 9da50d567e3c contacts_pub/phonebook_data_management_api/tsrc/bc/MTPbkIdleFinder/group/MTPbkIdleFinder.mmp --- a/contacts_pub/phonebook_data_management_api/tsrc/bc/MTPbkIdleFinder/group/MTPbkIdleFinder.mmp Wed Sep 01 12:29:52 2010 +0100 +++ b/contacts_pub/phonebook_data_management_api/tsrc/bc/MTPbkIdleFinder/group/MTPbkIdleFinder.mmp Tue Sep 14 20:54:53 2010 +0300 @@ -62,15 +62,15 @@ SOURCE MTPbkIdleFinderBlocks.cpp -LIBRARY stiftestinterface.lib +LIBRARY StifTestInterface.lib LIBRARY stiftestengine.lib LIBRARY bafl.lib LIBRARY cntmodel.lib LIBRARY efsrv.lib LIBRARY estor.lib LIBRARY euser.lib -LIBRARY PbkEng.lib -LIBRARY SysUtil.lib +LIBRARY pbkeng.lib +LIBRARY sysutil.lib LANG SC diff -r f4a778e096c2 -r 9da50d567e3c contacts_pub/phonebook_data_management_api/tsrc/bc/MTRPbkViewResourceFile/group/MTRPbkViewResourceFile.mmp --- a/contacts_pub/phonebook_data_management_api/tsrc/bc/MTRPbkViewResourceFile/group/MTRPbkViewResourceFile.mmp Wed Sep 01 12:29:52 2010 +0100 +++ b/contacts_pub/phonebook_data_management_api/tsrc/bc/MTRPbkViewResourceFile/group/MTRPbkViewResourceFile.mmp Tue Sep 14 20:54:53 2010 +0300 @@ -62,15 +62,15 @@ SOURCE MTRPbkViewResourceFileBlocks.cpp -LIBRARY stiftestinterface.lib +LIBRARY StifTestInterface.lib LIBRARY stiftestengine.lib LIBRARY bafl.lib LIBRARY cntmodel.lib LIBRARY efsrv.lib LIBRARY estor.lib LIBRARY euser.lib -LIBRARY PbkView.lib -LIBRARY SysUtil.lib +LIBRARY pbkview.lib +LIBRARY sysutil.lib LIBRARY cone.lib LANG SC diff -r f4a778e096c2 -r 9da50d567e3c contacts_pub/phonebook_fetch_ui_api/tsrc/bc/MTPbkAddressSelect/group/MTPbkAddressSelect.mmp --- a/contacts_pub/phonebook_fetch_ui_api/tsrc/bc/MTPbkAddressSelect/group/MTPbkAddressSelect.mmp Wed Sep 01 12:29:52 2010 +0100 +++ b/contacts_pub/phonebook_fetch_ui_api/tsrc/bc/MTPbkAddressSelect/group/MTPbkAddressSelect.mmp Tue Sep 14 20:54:53 2010 +0300 @@ -74,20 +74,20 @@ END // RESOURCE -LIBRARY stiftestinterface.lib +LIBRARY StifTestInterface.lib LIBRARY stiftestengine.lib LIBRARY aknicon.lib -LIBRARY AknSkins.lib +LIBRARY aknskins.lib LIBRARY apgrfx.lib LIBRARY apmime.lib LIBRARY avkon.lib LIBRARY bafl.lib LIBRARY bitgdi.lib -LIBRARY BitmapTransforms.lib +LIBRARY bitmaptransforms.lib LIBRARY centralrepository.lib LIBRARY cntmodel.lib LIBRARY cntview.lib -LIBRARY commonengine.lib +LIBRARY CommonEngine.lib LIBRARY cone.lib LIBRARY DrmHelper.lib LIBRARY efsrv.lib @@ -99,10 +99,10 @@ LIBRARY estor.lib LIBRARY euser.lib LIBRARY fbscli.lib -LIBRARY ImageConversion.lib -LIBRARY MGFetch.lib -LIBRARY PbkEng.lib -LIBRARY PbkView.lib +LIBRARY imageconversion.lib +LIBRARY mgfetch.lib +LIBRARY pbkeng.lib +LIBRARY pbkview.lib LIBRARY sysutil.lib LANG SC diff -r f4a778e096c2 -r 9da50d567e3c contacts_pub/phonebook_fetch_ui_api/tsrc/bc/MTPbkAddressSelect/src/CAddressSelect.cpp --- a/contacts_pub/phonebook_fetch_ui_api/tsrc/bc/MTPbkAddressSelect/src/CAddressSelect.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/contacts_pub/phonebook_fetch_ui_api/tsrc/bc/MTPbkAddressSelect/src/CAddressSelect.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -34,7 +34,7 @@ #include #include #include "MTPbkAddressSelect.h" -#include +#include // ================= MEMBER FUNCTIONS ======================= diff -r f4a778e096c2 -r 9da50d567e3c contacts_pub/phonebook_fetch_ui_api/tsrc/bc/MTPbkEmailAddressSelect/group/MTPbkEmailAddressSelect.mmp --- a/contacts_pub/phonebook_fetch_ui_api/tsrc/bc/MTPbkEmailAddressSelect/group/MTPbkEmailAddressSelect.mmp Wed Sep 01 12:29:52 2010 +0100 +++ b/contacts_pub/phonebook_fetch_ui_api/tsrc/bc/MTPbkEmailAddressSelect/group/MTPbkEmailAddressSelect.mmp Tue Sep 14 20:54:53 2010 +0300 @@ -66,20 +66,20 @@ SOURCE ../../ExtraCodes/CSimulateKeyEvents.cpp -LIBRARY stiftestinterface.lib +LIBRARY StifTestInterface.lib LIBRARY stiftestengine.lib LIBRARY aknicon.lib -LIBRARY AknSkins.lib +LIBRARY aknskins.lib LIBRARY apgrfx.lib LIBRARY apmime.lib LIBRARY avkon.lib LIBRARY bafl.lib LIBRARY bitgdi.lib -LIBRARY BitmapTransforms.lib +LIBRARY bitmaptransforms.lib LIBRARY centralrepository.lib LIBRARY cntmodel.lib LIBRARY cntview.lib -LIBRARY commonengine.lib +LIBRARY CommonEngine.lib LIBRARY cone.lib LIBRARY DrmHelper.lib LIBRARY efsrv.lib @@ -91,10 +91,10 @@ LIBRARY estor.lib LIBRARY euser.lib LIBRARY fbscli.lib -LIBRARY ImageConversion.lib -LIBRARY MGFetch.lib -LIBRARY PbkEng.lib -LIBRARY PbkView.lib +LIBRARY imageconversion.lib +LIBRARY mgfetch.lib +LIBRARY pbkeng.lib +LIBRARY pbkview.lib LIBRARY sysutil.lib LANG SC diff -r f4a778e096c2 -r 9da50d567e3c contacts_pub/phonebook_fetch_ui_api/tsrc/bc/MTPbkEmailOverSms/group/MTPbkEmailOverSms.mmp --- a/contacts_pub/phonebook_fetch_ui_api/tsrc/bc/MTPbkEmailOverSms/group/MTPbkEmailOverSms.mmp Wed Sep 01 12:29:52 2010 +0100 +++ b/contacts_pub/phonebook_fetch_ui_api/tsrc/bc/MTPbkEmailOverSms/group/MTPbkEmailOverSms.mmp Tue Sep 14 20:54:53 2010 +0300 @@ -64,20 +64,20 @@ SOURCE ../../ExtraCodes/CSimulateKeyBase.cpp SOURCE ../../ExtraCodes/CSimulateKeyEvents.cpp -LIBRARY stiftestinterface.lib +LIBRARY StifTestInterface.lib LIBRARY stiftestengine.lib LIBRARY aknicon.lib -LIBRARY AknSkins.lib +LIBRARY aknskins.lib LIBRARY apgrfx.lib LIBRARY apmime.lib LIBRARY avkon.lib LIBRARY bafl.lib LIBRARY bitgdi.lib -LIBRARY BitmapTransforms.lib +LIBRARY bitmaptransforms.lib LIBRARY centralrepository.lib LIBRARY cntmodel.lib LIBRARY cntview.lib -LIBRARY commonengine.lib +LIBRARY CommonEngine.lib LIBRARY cone.lib LIBRARY DrmHelper.lib LIBRARY efsrv.lib @@ -89,10 +89,10 @@ LIBRARY estor.lib LIBRARY euser.lib LIBRARY fbscli.lib -LIBRARY ImageConversion.lib -LIBRARY MGFetch.lib -LIBRARY PbkEng.lib -LIBRARY PbkView.lib +LIBRARY imageconversion.lib +LIBRARY mgfetch.lib +LIBRARY pbkeng.lib +LIBRARY pbkview.lib LIBRARY sysutil.lib LANG SC diff -r f4a778e096c2 -r 9da50d567e3c contacts_pub/phonebook_fetch_ui_api/tsrc/bc/MTPbkFetchCallbacks/group/MTPbkFetchCallbacks.mmp --- a/contacts_pub/phonebook_fetch_ui_api/tsrc/bc/MTPbkFetchCallbacks/group/MTPbkFetchCallbacks.mmp Wed Sep 01 12:29:52 2010 +0100 +++ b/contacts_pub/phonebook_fetch_ui_api/tsrc/bc/MTPbkFetchCallbacks/group/MTPbkFetchCallbacks.mmp Tue Sep 14 20:54:53 2010 +0300 @@ -65,20 +65,20 @@ SOURCE ../../ExtraCodes/CSimulateKeyBase.cpp SOURCE ../../ExtraCodes/CSimulateKeyEvents.cpp -LIBRARY stiftestinterface.lib +LIBRARY StifTestInterface.lib LIBRARY stiftestengine.lib LIBRARY aknicon.lib -LIBRARY AknSkins.lib +LIBRARY aknskins.lib LIBRARY apgrfx.lib LIBRARY apmime.lib LIBRARY avkon.lib LIBRARY bafl.lib LIBRARY bitgdi.lib -LIBRARY BitmapTransforms.lib +LIBRARY bitmaptransforms.lib LIBRARY centralrepository.lib LIBRARY cntmodel.lib LIBRARY cntview.lib -LIBRARY commonengine.lib +LIBRARY CommonEngine.lib LIBRARY cone.lib LIBRARY DrmHelper.lib LIBRARY efsrv.lib @@ -90,10 +90,10 @@ LIBRARY estor.lib LIBRARY euser.lib LIBRARY fbscli.lib -LIBRARY ImageConversion.lib -LIBRARY MGFetch.lib -LIBRARY PbkEng.lib -LIBRARY PbkView.lib +LIBRARY imageconversion.lib +LIBRARY mgfetch.lib +LIBRARY pbkeng.lib +LIBRARY pbkview.lib LIBRARY sysutil.lib LANG SC diff -r f4a778e096c2 -r 9da50d567e3c contacts_pub/phonebook_fetch_ui_api/tsrc/bc/MTPbkFetchDlgSelection/group/MTPbkFetchDlgSelection.mmp --- a/contacts_pub/phonebook_fetch_ui_api/tsrc/bc/MTPbkFetchDlgSelection/group/MTPbkFetchDlgSelection.mmp Wed Sep 01 12:29:52 2010 +0100 +++ b/contacts_pub/phonebook_fetch_ui_api/tsrc/bc/MTPbkFetchDlgSelection/group/MTPbkFetchDlgSelection.mmp Tue Sep 14 20:54:53 2010 +0300 @@ -65,20 +65,20 @@ SOURCE ../../ExtraCodes/CSimulateKeyBase.cpp SOURCE ../../ExtraCodes/CSimulateKeyEvents.cpp -LIBRARY stiftestinterface.lib +LIBRARY StifTestInterface.lib LIBRARY stiftestengine.lib LIBRARY aknicon.lib -LIBRARY AknSkins.lib +LIBRARY aknskins.lib LIBRARY apgrfx.lib LIBRARY apmime.lib LIBRARY avkon.lib LIBRARY bafl.lib LIBRARY bitgdi.lib -LIBRARY BitmapTransforms.lib +LIBRARY bitmaptransforms.lib LIBRARY centralrepository.lib LIBRARY cntmodel.lib LIBRARY cntview.lib -LIBRARY commonengine.lib +LIBRARY CommonEngine.lib LIBRARY cone.lib LIBRARY DrmHelper.lib LIBRARY efsrv.lib @@ -90,10 +90,10 @@ LIBRARY estor.lib LIBRARY euser.lib LIBRARY fbscli.lib -LIBRARY ImageConversion.lib -LIBRARY MGFetch.lib -LIBRARY PbkEng.lib -LIBRARY PbkView.lib +LIBRARY imageconversion.lib +LIBRARY mgfetch.lib +LIBRARY pbkeng.lib +LIBRARY pbkview.lib LIBRARY sysutil.lib LANG SC diff -r f4a778e096c2 -r 9da50d567e3c contacts_pub/phonebook_fetch_ui_api/tsrc/bc/MTPbkMemoryEntryAddItemDlg/group/MTPbkMemoryEntryAddItemDlg.mmp --- a/contacts_pub/phonebook_fetch_ui_api/tsrc/bc/MTPbkMemoryEntryAddItemDlg/group/MTPbkMemoryEntryAddItemDlg.mmp Wed Sep 01 12:29:52 2010 +0100 +++ b/contacts_pub/phonebook_fetch_ui_api/tsrc/bc/MTPbkMemoryEntryAddItemDlg/group/MTPbkMemoryEntryAddItemDlg.mmp Tue Sep 14 20:54:53 2010 +0300 @@ -64,20 +64,20 @@ SOURCE ../../ExtraCodes/CSimulateKeyEvents.cpp -LIBRARY stiftestinterface.lib +LIBRARY StifTestInterface.lib LIBRARY stiftestengine.lib LIBRARY aknicon.lib -LIBRARY AknSkins.lib +LIBRARY aknskins.lib LIBRARY apgrfx.lib LIBRARY apmime.lib LIBRARY avkon.lib LIBRARY bafl.lib LIBRARY bitgdi.lib -LIBRARY BitmapTransforms.lib +LIBRARY bitmaptransforms.lib LIBRARY centralrepository.lib LIBRARY cntmodel.lib LIBRARY cntview.lib -LIBRARY commonengine.lib +LIBRARY CommonEngine.lib LIBRARY cone.lib LIBRARY DrmHelper.lib LIBRARY efsrv.lib @@ -89,10 +89,10 @@ LIBRARY estor.lib LIBRARY euser.lib LIBRARY fbscli.lib -LIBRARY ImageConversion.lib -LIBRARY MGFetch.lib -LIBRARY PbkEng.lib -LIBRARY PbkView.lib +LIBRARY imageconversion.lib +LIBRARY mgfetch.lib +LIBRARY pbkeng.lib +LIBRARY pbkview.lib LIBRARY sysutil.lib LANG SC diff -r f4a778e096c2 -r 9da50d567e3c contacts_pub/phonebook_fetch_ui_api/tsrc/bc/MTPbkMmsAddressSelect/group/MTPbkMmsAddressSelect.mmp --- a/contacts_pub/phonebook_fetch_ui_api/tsrc/bc/MTPbkMmsAddressSelect/group/MTPbkMmsAddressSelect.mmp Wed Sep 01 12:29:52 2010 +0100 +++ b/contacts_pub/phonebook_fetch_ui_api/tsrc/bc/MTPbkMmsAddressSelect/group/MTPbkMmsAddressSelect.mmp Tue Sep 14 20:54:53 2010 +0300 @@ -65,20 +65,20 @@ SOURCE ../../ExtraCodes/CSimulateKeyBase.cpp SOURCE ../../ExtraCodes/CSimulateKeyEvents.cpp -LIBRARY stiftestinterface.lib +LIBRARY StifTestInterface.lib LIBRARY stiftestengine.lib LIBRARY aknicon.lib -LIBRARY AknSkins.lib +LIBRARY aknskins.lib LIBRARY apgrfx.lib LIBRARY apmime.lib LIBRARY avkon.lib LIBRARY bafl.lib LIBRARY bitgdi.lib -LIBRARY BitmapTransforms.lib +LIBRARY bitmaptransforms.lib LIBRARY centralrepository.lib LIBRARY cntmodel.lib LIBRARY cntview.lib -LIBRARY commonengine.lib +LIBRARY CommonEngine.lib LIBRARY cone.lib LIBRARY DrmHelper.lib LIBRARY efsrv.lib @@ -90,10 +90,10 @@ LIBRARY estor.lib LIBRARY euser.lib LIBRARY fbscli.lib -LIBRARY ImageConversion.lib -LIBRARY MGFetch.lib -LIBRARY PbkEng.lib -LIBRARY PbkView.lib +LIBRARY imageconversion.lib +LIBRARY mgfetch.lib +LIBRARY pbkeng.lib +LIBRARY pbkview.lib LIBRARY sysutil.lib LANG SC diff -r f4a778e096c2 -r 9da50d567e3c contacts_pub/phonebook_fetch_ui_api/tsrc/bc/MTPbkMultipleEntryFetchDlg/group/MTPbkMultipleEntryFetchDlg.mmp --- a/contacts_pub/phonebook_fetch_ui_api/tsrc/bc/MTPbkMultipleEntryFetchDlg/group/MTPbkMultipleEntryFetchDlg.mmp Wed Sep 01 12:29:52 2010 +0100 +++ b/contacts_pub/phonebook_fetch_ui_api/tsrc/bc/MTPbkMultipleEntryFetchDlg/group/MTPbkMultipleEntryFetchDlg.mmp Tue Sep 14 20:54:53 2010 +0300 @@ -66,20 +66,20 @@ SOURCE ../../ExtraCodes/CSimulateKeyBase.cpp SOURCE ../../ExtraCodes/CSimulateKeyEvents.cpp -LIBRARY stiftestinterface.lib +LIBRARY StifTestInterface.lib LIBRARY stiftestengine.lib LIBRARY aknicon.lib -LIBRARY AknSkins.lib +LIBRARY aknskins.lib LIBRARY apgrfx.lib LIBRARY apmime.lib LIBRARY avkon.lib LIBRARY bafl.lib LIBRARY bitgdi.lib -LIBRARY BitmapTransforms.lib +LIBRARY bitmaptransforms.lib LIBRARY centralrepository.lib LIBRARY cntmodel.lib LIBRARY cntview.lib -LIBRARY commonengine.lib +LIBRARY CommonEngine.lib LIBRARY cone.lib LIBRARY DrmHelper.lib LIBRARY efsrv.lib @@ -91,10 +91,10 @@ LIBRARY estor.lib LIBRARY euser.lib LIBRARY fbscli.lib -LIBRARY ImageConversion.lib -LIBRARY MGFetch.lib -LIBRARY PbkEng.lib -LIBRARY PbkView.lib +LIBRARY imageconversion.lib +LIBRARY mgfetch.lib +LIBRARY pbkeng.lib +LIBRARY pbkview.lib LIBRARY sysutil.lib LANG SC diff -r f4a778e096c2 -r 9da50d567e3c contacts_pub/phonebook_fetch_ui_api/tsrc/bc/MTPbkPhoneNumberSelect/group/MTPbkPhoneNumberSelect.mmp --- a/contacts_pub/phonebook_fetch_ui_api/tsrc/bc/MTPbkPhoneNumberSelect/group/MTPbkPhoneNumberSelect.mmp Wed Sep 01 12:29:52 2010 +0100 +++ b/contacts_pub/phonebook_fetch_ui_api/tsrc/bc/MTPbkPhoneNumberSelect/group/MTPbkPhoneNumberSelect.mmp Tue Sep 14 20:54:53 2010 +0300 @@ -64,20 +64,20 @@ SOURCE ../../ExtraCodes/CSimulateKeyBase.cpp SOURCE ../../ExtraCodes/CSimulateKeyEvents.cpp -LIBRARY stiftestinterface.lib +LIBRARY StifTestInterface.lib LIBRARY stiftestengine.lib LIBRARY aknicon.lib -LIBRARY AknSkins.lib +LIBRARY aknskins.lib LIBRARY apgrfx.lib LIBRARY apmime.lib LIBRARY avkon.lib LIBRARY bafl.lib LIBRARY bitgdi.lib -LIBRARY BitmapTransforms.lib +LIBRARY bitmaptransforms.lib LIBRARY centralrepository.lib LIBRARY cntmodel.lib LIBRARY cntview.lib -LIBRARY commonengine.lib +LIBRARY CommonEngine.lib LIBRARY cone.lib LIBRARY DrmHelper.lib LIBRARY efsrv.lib @@ -89,10 +89,10 @@ LIBRARY estor.lib LIBRARY euser.lib LIBRARY fbscli.lib -LIBRARY ImageConversion.lib -LIBRARY MGFetch.lib -LIBRARY PbkEng.lib -LIBRARY PbkView.lib +LIBRARY imageconversion.lib +LIBRARY mgfetch.lib +LIBRARY pbkeng.lib +LIBRARY pbkview.lib LIBRARY sysutil.lib LANG SC diff -r f4a778e096c2 -r 9da50d567e3c contacts_pub/phonebook_fetch_ui_api/tsrc/bc/MTPbkPhoneNumberSelectBase/group/MTPbkPhoneNumberSelectBase.mmp --- a/contacts_pub/phonebook_fetch_ui_api/tsrc/bc/MTPbkPhoneNumberSelectBase/group/MTPbkPhoneNumberSelectBase.mmp Wed Sep 01 12:29:52 2010 +0100 +++ b/contacts_pub/phonebook_fetch_ui_api/tsrc/bc/MTPbkPhoneNumberSelectBase/group/MTPbkPhoneNumberSelectBase.mmp Tue Sep 14 20:54:53 2010 +0300 @@ -73,20 +73,20 @@ TARGETPATH resource END // RESOURCE -LIBRARY stiftestinterface.lib +LIBRARY StifTestInterface.lib LIBRARY stiftestengine.lib LIBRARY aknicon.lib -LIBRARY AknSkins.lib +LIBRARY aknskins.lib LIBRARY apgrfx.lib LIBRARY apmime.lib LIBRARY avkon.lib LIBRARY bafl.lib LIBRARY bitgdi.lib -LIBRARY BitmapTransforms.lib +LIBRARY bitmaptransforms.lib LIBRARY centralrepository.lib LIBRARY cntmodel.lib LIBRARY cntview.lib -LIBRARY commonengine.lib +LIBRARY CommonEngine.lib LIBRARY cone.lib LIBRARY DrmHelper.lib LIBRARY efsrv.lib @@ -98,10 +98,10 @@ LIBRARY estor.lib LIBRARY euser.lib LIBRARY fbscli.lib -LIBRARY ImageConversion.lib -LIBRARY MGFetch.lib -LIBRARY PbkEng.lib -LIBRARY PbkView.lib +LIBRARY imageconversion.lib +LIBRARY mgfetch.lib +LIBRARY pbkeng.lib +LIBRARY pbkview.lib LIBRARY sysutil.lib LANG SC diff -r f4a778e096c2 -r 9da50d567e3c contacts_pub/phonebook_fetch_ui_api/tsrc/bc/MTPbkPhoneNumberSelectBase/src/CPhoneNumberSelectBase.cpp --- a/contacts_pub/phonebook_fetch_ui_api/tsrc/bc/MTPbkPhoneNumberSelectBase/src/CPhoneNumberSelectBase.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/contacts_pub/phonebook_fetch_ui_api/tsrc/bc/MTPbkPhoneNumberSelectBase/src/CPhoneNumberSelectBase.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -27,7 +27,7 @@ #include #include // StringLoader -#include +#include #include #include "CPhoneNumberSelectBase.h" diff -r f4a778e096c2 -r 9da50d567e3c contacts_pub/phonebook_fetch_ui_api/tsrc/bc/MTPbkPocAddressSelect/group/MTPbkPocAddressSelect.mmp --- a/contacts_pub/phonebook_fetch_ui_api/tsrc/bc/MTPbkPocAddressSelect/group/MTPbkPocAddressSelect.mmp Wed Sep 01 12:29:52 2010 +0100 +++ b/contacts_pub/phonebook_fetch_ui_api/tsrc/bc/MTPbkPocAddressSelect/group/MTPbkPocAddressSelect.mmp Tue Sep 14 20:54:53 2010 +0300 @@ -64,20 +64,20 @@ SOURCE ../../ExtraCodes/CSimulateKeyBase.cpp SOURCE ../../ExtraCodes/CSimulateKeyEvents.cpp -LIBRARY stiftestinterface.lib +LIBRARY StifTestInterface.lib LIBRARY stiftestengine.lib LIBRARY aknicon.lib -LIBRARY AknSkins.lib +LIBRARY aknskins.lib LIBRARY apgrfx.lib LIBRARY apmime.lib LIBRARY avkon.lib LIBRARY bafl.lib LIBRARY bitgdi.lib -LIBRARY BitmapTransforms.lib +LIBRARY bitmaptransforms.lib LIBRARY centralrepository.lib LIBRARY cntmodel.lib LIBRARY cntview.lib -LIBRARY commonengine.lib +LIBRARY CommonEngine.lib LIBRARY cone.lib LIBRARY DrmHelper.lib LIBRARY efsrv.lib @@ -89,10 +89,10 @@ LIBRARY estor.lib LIBRARY euser.lib LIBRARY fbscli.lib -LIBRARY ImageConversion.lib -LIBRARY MGFetch.lib -LIBRARY PbkEng.lib -LIBRARY PbkView.lib +LIBRARY imageconversion.lib +LIBRARY mgfetch.lib +LIBRARY pbkeng.lib +LIBRARY pbkview.lib LIBRARY sysutil.lib LANG SC diff -r f4a778e096c2 -r 9da50d567e3c contacts_pub/phonebook_fetch_ui_api/tsrc/bc/MTPbkSelectFieldDlg/group/MTPbkSelectFieldDlg.mmp --- a/contacts_pub/phonebook_fetch_ui_api/tsrc/bc/MTPbkSelectFieldDlg/group/MTPbkSelectFieldDlg.mmp Wed Sep 01 12:29:52 2010 +0100 +++ b/contacts_pub/phonebook_fetch_ui_api/tsrc/bc/MTPbkSelectFieldDlg/group/MTPbkSelectFieldDlg.mmp Tue Sep 14 20:54:53 2010 +0300 @@ -65,20 +65,20 @@ SOURCE ../../ExtraCodes/CSimulateKeyEvents.cpp -LIBRARY stiftestinterface.lib +LIBRARY StifTestInterface.lib LIBRARY stiftestengine.lib LIBRARY aknicon.lib -LIBRARY AknSkins.lib +LIBRARY aknskins.lib LIBRARY apgrfx.lib LIBRARY apmime.lib LIBRARY avkon.lib LIBRARY bafl.lib LIBRARY bitgdi.lib -LIBRARY BitmapTransforms.lib +LIBRARY bitmaptransforms.lib LIBRARY centralrepository.lib LIBRARY cntmodel.lib LIBRARY cntview.lib -LIBRARY commonengine.lib +LIBRARY CommonEngine.lib LIBRARY cone.lib LIBRARY DrmHelper.lib LIBRARY efsrv.lib @@ -90,10 +90,10 @@ LIBRARY estor.lib LIBRARY euser.lib LIBRARY fbscli.lib -LIBRARY ImageConversion.lib -LIBRARY MGFetch.lib -LIBRARY PbkEng.lib -LIBRARY PbkView.lib +LIBRARY imageconversion.lib +LIBRARY mgfetch.lib +LIBRARY pbkeng.lib +LIBRARY pbkview.lib LIBRARY sysutil.lib LANG SC diff -r f4a778e096c2 -r 9da50d567e3c contacts_pub/phonebook_fetch_ui_api/tsrc/bc/MTPbkSelectFieldDlg/group/TestFramework.ini --- a/contacts_pub/phonebook_fetch_ui_api/tsrc/bc/MTPbkSelectFieldDlg/group/TestFramework.ini Wed Sep 01 12:29:52 2010 +0100 +++ b/contacts_pub/phonebook_fetch_ui_api/tsrc/bc/MTPbkSelectFieldDlg/group/TestFramework.ini Tue Sep 14 20:54:53 2010 +0300 @@ -93,7 +93,7 @@ [New_Module] ModuleName= testcombiner -TestCaseFile= c:\testframework\tcBCTestSEFieldDlg.cfg +TestCaseFile= c:\testframework\tcBCTestFieldDlg.cfg [End_Module] diff -r f4a778e096c2 -r 9da50d567e3c contacts_pub/phonebook_fetch_ui_api/tsrc/bc/MTPbkSingleEntryFetchDlg/group/MTPbkSingleEntryFetchDlg.mmp --- a/contacts_pub/phonebook_fetch_ui_api/tsrc/bc/MTPbkSingleEntryFetchDlg/group/MTPbkSingleEntryFetchDlg.mmp Wed Sep 01 12:29:52 2010 +0100 +++ b/contacts_pub/phonebook_fetch_ui_api/tsrc/bc/MTPbkSingleEntryFetchDlg/group/MTPbkSingleEntryFetchDlg.mmp Tue Sep 14 20:54:53 2010 +0300 @@ -64,20 +64,20 @@ SOURCE ../../ExtraCodes/CSimulateKeyBase.cpp SOURCE ../../ExtraCodes/CSimulateKeyEvents.cpp -LIBRARY stiftestinterface.lib +LIBRARY StifTestInterface.lib LIBRARY stiftestengine.lib LIBRARY aknicon.lib -LIBRARY AknSkins.lib +LIBRARY aknskins.lib LIBRARY apgrfx.lib LIBRARY apmime.lib LIBRARY avkon.lib LIBRARY bafl.lib LIBRARY bitgdi.lib -LIBRARY BitmapTransforms.lib +LIBRARY bitmaptransforms.lib LIBRARY centralrepository.lib LIBRARY cntmodel.lib LIBRARY cntview.lib -LIBRARY commonengine.lib +LIBRARY CommonEngine.lib LIBRARY cone.lib LIBRARY DrmHelper.lib LIBRARY efsrv.lib @@ -89,10 +89,10 @@ LIBRARY estor.lib LIBRARY euser.lib LIBRARY fbscli.lib -LIBRARY ImageConversion.lib -LIBRARY MGFetch.lib -LIBRARY PbkEng.lib -LIBRARY PbkView.lib +LIBRARY imageconversion.lib +LIBRARY mgfetch.lib +LIBRARY pbkeng.lib +LIBRARY pbkview.lib LIBRARY sysutil.lib LANG SC diff -r f4a778e096c2 -r 9da50d567e3c contacts_pub/phonebook_fetch_ui_api/tsrc/bc/MTPbkSingleItemFetchDlg/group/MTPbkSingleItemFetchDlg.mmp --- a/contacts_pub/phonebook_fetch_ui_api/tsrc/bc/MTPbkSingleItemFetchDlg/group/MTPbkSingleItemFetchDlg.mmp Wed Sep 01 12:29:52 2010 +0100 +++ b/contacts_pub/phonebook_fetch_ui_api/tsrc/bc/MTPbkSingleItemFetchDlg/group/MTPbkSingleItemFetchDlg.mmp Tue Sep 14 20:54:53 2010 +0300 @@ -64,20 +64,20 @@ SOURCE ../../ExtraCodes/CSimulateKeyBase.cpp SOURCE ../../ExtraCodes/CSimulateKeyEvents.cpp -LIBRARY stiftestinterface.lib +LIBRARY StifTestInterface.lib LIBRARY stiftestengine.lib LIBRARY aknicon.lib -LIBRARY AknSkins.lib +LIBRARY aknskins.lib LIBRARY apgrfx.lib LIBRARY apmime.lib LIBRARY avkon.lib LIBRARY bafl.lib LIBRARY bitgdi.lib -LIBRARY BitmapTransforms.lib +LIBRARY bitmaptransforms.lib LIBRARY centralrepository.lib LIBRARY cntmodel.lib LIBRARY cntview.lib -LIBRARY commonengine.lib +LIBRARY CommonEngine.lib LIBRARY cone.lib LIBRARY DrmHelper.lib LIBRARY efsrv.lib @@ -89,10 +89,10 @@ LIBRARY estor.lib LIBRARY euser.lib LIBRARY fbscli.lib -LIBRARY ImageConversion.lib -LIBRARY MGFetch.lib -LIBRARY PbkEng.lib -LIBRARY PbkView.lib +LIBRARY imageconversion.lib +LIBRARY mgfetch.lib +LIBRARY pbkeng.lib +LIBRARY pbkview.lib LIBRARY sysutil.lib LANG SC diff -r f4a778e096c2 -r 9da50d567e3c contacts_pub/phonebook_fetch_ui_api/tsrc/bc/MTPbkSmsAddressSelect/group/MTPbkSmsAddressSelect.mmp --- a/contacts_pub/phonebook_fetch_ui_api/tsrc/bc/MTPbkSmsAddressSelect/group/MTPbkSmsAddressSelect.mmp Wed Sep 01 12:29:52 2010 +0100 +++ b/contacts_pub/phonebook_fetch_ui_api/tsrc/bc/MTPbkSmsAddressSelect/group/MTPbkSmsAddressSelect.mmp Tue Sep 14 20:54:53 2010 +0300 @@ -65,20 +65,20 @@ SOURCE ../../ExtraCodes/CSimulateKeyEvents.cpp -LIBRARY stiftestinterface.lib +LIBRARY StifTestInterface.lib LIBRARY stiftestengine.lib LIBRARY aknicon.lib -LIBRARY AknSkins.lib +LIBRARY aknskins.lib LIBRARY apgrfx.lib LIBRARY apmime.lib LIBRARY avkon.lib LIBRARY bafl.lib LIBRARY bitgdi.lib -LIBRARY BitmapTransforms.lib +LIBRARY bitmaptransforms.lib LIBRARY centralrepository.lib LIBRARY cntmodel.lib LIBRARY cntview.lib -LIBRARY commonengine.lib +LIBRARY CommonEngine.lib LIBRARY cone.lib LIBRARY DrmHelper.lib LIBRARY efsrv.lib @@ -90,10 +90,10 @@ LIBRARY estor.lib LIBRARY euser.lib LIBRARY fbscli.lib -LIBRARY ImageConversion.lib -LIBRARY MGFetch.lib -LIBRARY PbkEng.lib -LIBRARY PbkView.lib +LIBRARY imageconversion.lib +LIBRARY mgfetch.lib +LIBRARY pbkeng.lib +LIBRARY pbkview.lib LIBRARY sysutil.lib LANG SC diff -r f4a778e096c2 -r 9da50d567e3c contacts_pub/phonebook_fetch_ui_api/tsrc/bc/group/MTPbkPocAddressSelect.mmp --- a/contacts_pub/phonebook_fetch_ui_api/tsrc/bc/group/MTPbkPocAddressSelect.mmp Wed Sep 01 12:29:52 2010 +0100 +++ b/contacts_pub/phonebook_fetch_ui_api/tsrc/bc/group/MTPbkPocAddressSelect.mmp Tue Sep 14 20:54:53 2010 +0300 @@ -65,20 +65,20 @@ SOURCE ../../ExtraCodes/CSimulateKeyEvents.cpp -LIBRARY stiftestinterface.lib +LIBRARY StifTestInterface.lib LIBRARY stiftestengine.lib LIBRARY aknicon.lib -LIBRARY AknSkins.lib +LIBRARY aknskins.lib LIBRARY apgrfx.lib LIBRARY apmime.lib LIBRARY avkon.lib LIBRARY bafl.lib LIBRARY bitgdi.lib -LIBRARY BitmapTransforms.lib +LIBRARY bitmaptransforms.lib LIBRARY centralrepository.lib LIBRARY cntmodel.lib LIBRARY cntview.lib -LIBRARY commonengine.lib +LIBRARY CommonEngine.lib LIBRARY cone.lib LIBRARY DrmHelper.lib LIBRARY efsrv.lib @@ -90,10 +90,10 @@ LIBRARY estor.lib LIBRARY euser.lib LIBRARY fbscli.lib -LIBRARY ImageConversion.lib -LIBRARY MGFetch.lib -LIBRARY PbkEng.lib -LIBRARY PbkView.lib +LIBRARY imageconversion.lib +LIBRARY mgfetch.lib +LIBRARY pbkeng.lib +LIBRARY pbkview.lib LIBRARY sysutil.lib LANG SC diff -r f4a778e096c2 -r 9da50d567e3c contacts_pub/phonebook_ui_utilities_api/tsrc/bc/group/BCTestPbkUIUtil.mmp --- a/contacts_pub/phonebook_ui_utilities_api/tsrc/bc/group/BCTestPbkUIUtil.mmp Wed Sep 01 12:29:52 2010 +0100 +++ b/contacts_pub/phonebook_ui_utilities_api/tsrc/bc/group/BCTestPbkUIUtil.mmp Tue Sep 14 20:54:53 2010 +0300 @@ -62,13 +62,13 @@ SOURCE BCTestPbkUIUtilBlocks.cpp -LIBRARY euser.lib SysUtil.lib -LIBRARY stiftestinterface.lib +LIBRARY euser.lib sysutil.lib +LIBRARY StifTestInterface.lib LIBRARY stiftestengine.lib -LIBRARY PbkEng.lib PbkView.lib +LIBRARY pbkeng.lib pbkview.lib LIBRARY efsrv.lib estor.lib cntmodel.lib -LIBRARY cone.lib commonengine.lib -LIBRARY eikcoctl.lib eikcore.lib Avkon.lib +LIBRARY cone.lib CommonEngine.lib +LIBRARY eikcoctl.lib eikcore.lib avkon.lib LIBRARY bafl.lib aknskins.lib egul.lib diff -r f4a778e096c2 -r 9da50d567e3c contacts_pub/phonebook_vcard_importexport_api/tsrc/bc/group/BCTestPbkVcardImportExport.mmp --- a/contacts_pub/phonebook_vcard_importexport_api/tsrc/bc/group/BCTestPbkVcardImportExport.mmp Wed Sep 01 12:29:52 2010 +0100 +++ b/contacts_pub/phonebook_vcard_importexport_api/tsrc/bc/group/BCTestPbkVcardImportExport.mmp Tue Sep 14 20:54:53 2010 +0300 @@ -65,17 +65,17 @@ LIBRARY euser.lib -LIBRARY stiftestinterface.lib +LIBRARY StifTestInterface.lib LIBRARY stiftestengine.lib LIBRARY bafl.lib -LIBRARY BCardEng.lib +LIBRARY bcardeng.lib LIBRARY cntmodel.lib LIBRARY efsrv.lib LIBRARY estor.lib -LIBRARY ImageConversion.lib -LIBRARY PbkEng.lib -LIBRARY PbkView.lib +LIBRARY imageconversion.lib +LIBRARY pbkeng.lib +LIBRARY pbkview.lib LIBRARY vcard.lib LIBRARY versit.lib LIBRARY charconv.lib // unicode coversion diff -r f4a778e096c2 -r 9da50d567e3c contacts_pub/phonebook_vcard_importexport_api/tsrc/bc/src/BCTestPbkVcardImportExportBlocks.cpp --- a/contacts_pub/phonebook_vcard_importexport_api/tsrc/bc/src/BCTestPbkVcardImportExportBlocks.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/contacts_pub/phonebook_vcard_importexport_api/tsrc/bc/src/BCTestPbkVcardImportExportBlocks.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -398,7 +398,6 @@ ASSERT(testBCEngine->SupportsFieldType(EPbkFieldIdSecondName)); ASSERT(testBCEngine->SupportsFieldType(EPbkFieldIdPhoneNumberVideo)); ASSERT(testBCEngine->SupportsFieldType(EPbkFieldIdVOIP)); - ASSERT(testBCEngine->SupportsFieldType(EPbkFieldIdPushToTalk)); ASSERT(testBCEngine->SupportsFieldType(EPbkFieldIdShareView)); ASSERT(testBCEngine->SupportsFieldType(EPbkFieldIdSIPID)); ASSERT(testBCEngine->SupportsFieldType(EPbkFieldIdPrefix)); diff -r f4a778e096c2 -r 9da50d567e3c contacts_pub/speed_dial_utility_control_api/tsrc/bc/group/BCTestSpeedDial.mmp --- a/contacts_pub/speed_dial_utility_control_api/tsrc/bc/group/BCTestSpeedDial.mmp Wed Sep 01 12:29:52 2010 +0100 +++ b/contacts_pub/speed_dial_utility_control_api/tsrc/bc/group/BCTestSpeedDial.mmp Tue Sep 14 20:54:53 2010 +0300 @@ -51,11 +51,11 @@ LIBRARY euser.lib -LIBRARY stiftestinterface.lib +LIBRARY StifTestInterface.lib LIBRARY stiftestengine.lib -LIBRARY SpdCtrl.lib -LIBRARY PbkEng.lib +LIBRARY spdctrl.lib +LIBRARY pbkeng.lib LIBRARY efsrv.lib LIBRARY cone.lib ws32.lib avkon.lib eikcoctl.lib eikctl.lib apgrfx.lib aknskins.lib diff -r f4a778e096c2 -r 9da50d567e3c contacts_pub/speed_dial_utility_control_api/tsrc/bc/src/BCTestSpeedDialBlocks.cpp --- a/contacts_pub/speed_dial_utility_control_api/tsrc/bc/src/BCTestSpeedDialBlocks.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/contacts_pub/speed_dial_utility_control_api/tsrc/bc/src/BCTestSpeedDialBlocks.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -231,6 +231,7 @@ CSpdiaControl* spd = CSpdiaControl::NewL( *pbk ); TRAPD( err, spd->ExecuteLD( 1, 1 ) ); + delete spd; spd = 0; delete pbk; pbk = 0; diff -r f4a778e096c2 -r 9da50d567e3c logsui/AocCtViewSrc/CLogsMMEAocUtil.cpp --- a/logsui/AocCtViewSrc/CLogsMMEAocUtil.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/logsui/AocCtViewSrc/CLogsMMEAocUtil.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -22,7 +22,7 @@ #include #include -#include +#include #include diff -r f4a778e096c2 -r 9da50d567e3c logsui/AppSrc/CCtControlContainer.cpp --- a/logsui/AppSrc/CCtControlContainer.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/logsui/AppSrc/CCtControlContainer.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -24,7 +24,7 @@ #include // als query popup #include //for skinned icons -#include // note structure +#include // note structure #include // Logs own icons #include diff -r f4a778e096c2 -r 9da50d567e3c logsui/AppSrc/CCtView.cpp --- a/logsui/AppSrc/CCtView.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/logsui/AppSrc/CCtView.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -20,7 +20,7 @@ // INCLUDE FILES #include -#include +#include #include "CCtView.h" #include "CCtControlContainer.h" diff -r f4a778e096c2 -r 9da50d567e3c logsui/AppSrc/CGprsCtControlContainer.cpp --- a/logsui/AppSrc/CGprsCtControlContainer.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/logsui/AppSrc/CGprsCtControlContainer.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -23,7 +23,7 @@ #include // tab group #include // for skinned icons -#include // note structure +#include // note structure #include // Index file for Logs icons. #include "CGprsCtControlContainer.h" #include "CGprsCtView.h" diff -r f4a778e096c2 -r 9da50d567e3c logsui/AppSrc/CGprsCtView.cpp --- a/logsui/AppSrc/CGprsCtView.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/logsui/AppSrc/CGprsCtView.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -20,7 +20,7 @@ // INCLUDE FILES #include -#include +#include #include "CGprsCtView.h" #include "CGprsCtControlContainer.h" diff -r f4a778e096c2 -r 9da50d567e3c logsui/AppSrc/CLogsAppListControlContainer.cpp --- a/logsui/AppSrc/CLogsAppListControlContainer.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/logsui/AppSrc/CLogsAppListControlContainer.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -23,7 +23,7 @@ #include #include // for skinned icons -#include +#include #include // Index file for Logs icons. #include "CLogsAppListControlContainer.h" diff -r f4a778e096c2 -r 9da50d567e3c logsui/AppSrc/CLogsAppListView.cpp --- a/logsui/AppSrc/CLogsAppListView.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/logsui/AppSrc/CLogsAppListView.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -18,7 +18,7 @@ // INCLUDE FILES -#include +#include #include #include diff -r f4a778e096c2 -r 9da50d567e3c logsui/AppSrc/CLogsAppUi.cpp --- a/logsui/AppSrc/CLogsAppUi.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/logsui/AppSrc/CLogsAppUi.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -30,7 +30,7 @@ #include #include #include -#include +#include //+ __GFXTRANS__ // Transition effects diff -r f4a778e096c2 -r 9da50d567e3c logsui/AppSrc/CLogsBaseControlContainer.cpp --- a/logsui/AppSrc/CLogsBaseControlContainer.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/logsui/AppSrc/CLogsBaseControlContainer.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -29,7 +29,7 @@ #include #include //KEikDynamicLayoutVariantSwitch #include -#include +#include #include "CLogsBaseControlContainer.h" #include "MLogsKeyProcessor.h" diff -r f4a778e096c2 -r 9da50d567e3c logsui/AppSrc/CLogsBaseView.cpp --- a/logsui/AppSrc/CLogsBaseView.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/logsui/AppSrc/CLogsBaseView.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -48,7 +48,7 @@ #include //additional event uids #include -#include +#include #include "LogsIcons.hrh" #include "LogsConsts.h" @@ -1715,6 +1715,32 @@ TRACE_ENTRY_POINT; CAiwGenericParamList& paramList = iServHandlerRef->InParamListL(); + // identify the call type to hide the matching call type from the menu + // The call items (voice, video and VoIP are located in the main level + // of the menu when the parameter EGenericParamHideCallSubmenu is passed + // to the aiw provider + if( !this-> OriginalCallMenuIsVisible() && ( NULL!= aEvent )&&( NULL!= aEvent->LogsEventData())) + { + TAiwVariant variant; + + // Video call + if ( aEvent->LogsEventData()->VT() ) + { + variant.Set( EGenericParamVideoCall ); + } + // VoIP call + else if ( aEvent->LogsEventData()->VoIP() ) + { + variant.Set( EGenericParamVoIPCall ); + } + // voice call + else + { + variant.Set( EGenericParamVoiceCall ); + } + TAiwGenericParam param( EGenericParamHideCallSubmenu, variant ); + paramList.AppendL( param ); + } //Check do we provide only voice call (i.e. skip video call option) if ( !aVideo ) { @@ -1732,9 +1758,12 @@ // Sawfish VoIP changes >>>> TPtrC8 tempPtr( KNullDesC8 ); - TInt result; + TInt result = KErrNotFound; CLogsCntLinkChecker* contactCheckerPtr; - result = aEvent->LogsEventData()->GetContactLink( tempPtr ); + if (( NULL!= aEvent )&&( NULL!= aEvent->LogsEventData())) + { + result = aEvent->LogsEventData()->GetContactLink( tempPtr ); + } if ( KErrNone == result ) { @@ -1782,7 +1811,9 @@ *aMenuPane, //Handle of menu pane to initialise aResourceId, //MenuResourceId KAiwCmdCall, //Base ID for the handler to generate menu IDs for placeholders - paramList ); //input parameter list for provider's parameters checking + paramList, //input parameter list for provider's parameters checking + EFalse, //Not use submenu + ETrue ); TRACE_EXIT_POINT; } @@ -3075,6 +3106,16 @@ TRACE_EXIT_POINT; } +// ---------------------------------------------------------------------------- +// CLogsBaseView::OriginalCallMenuIsVisible +// ---------------------------------------------------------------------------- +// +TBool CLogsBaseView::OriginalCallMenuIsVisible() + { + // Original CallMenu is not visible + return EFalse; + } + // End of File diff -r f4a778e096c2 -r 9da50d567e3c logsui/AppSrc/CLogsBaseView.h --- a/logsui/AppSrc/CLogsBaseView.h Wed Sep 01 12:29:52 2010 +0100 +++ b/logsui/AppSrc/CLogsBaseView.h Tue Sep 14 20:54:53 2010 +0300 @@ -656,6 +656,14 @@ */ void SetCurrentMenuType(CEikMenuBar::TMenuType aMenuType); + public: + /** + * Get whether the original CallMenu is visible + * + * @return EFalse\ETrue whether the original CallMenu is visible + */ + virtual TBool OriginalCallMenuIsVisible(); + private: // data CEikMenuBar* iPopup; diff -r f4a778e096c2 -r 9da50d567e3c logsui/AppSrc/CLogsCtAdapter.cpp --- a/logsui/AppSrc/CLogsCtAdapter.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/logsui/AppSrc/CLogsCtAdapter.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -20,7 +20,7 @@ // INCLUDE FILES #include -#include +#include #include // AknTextUtils #include "CLogsCtAdapter.h" diff -r f4a778e096c2 -r 9da50d567e3c logsui/AppSrc/CLogsDetailAdapter.cpp --- a/logsui/AppSrc/CLogsDetailAdapter.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/logsui/AppSrc/CLogsDetailAdapter.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -26,7 +26,7 @@ #include #include //caknsingleheadingstylelistbox -#include // detail view's event type texts. +#include // detail view's event type texts. #include "CLogsDetailAdapter.h" #include "CLogsDetailView.h" diff -r f4a778e096c2 -r 9da50d567e3c logsui/AppSrc/CLogsDetailControlContainer.cpp --- a/logsui/AppSrc/CLogsDetailControlContainer.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/logsui/AppSrc/CLogsDetailControlContainer.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -21,7 +21,7 @@ #include #include #include //Dynamic layout functions -#include +#include #include #include "CLogsDetailControlContainer.h" diff -r f4a778e096c2 -r 9da50d567e3c logsui/AppSrc/CLogsDetailView.cpp --- a/logsui/AppSrc/CLogsDetailView.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/logsui/AppSrc/CLogsDetailView.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -22,7 +22,7 @@ #include #include #include -#include +#include #include "CLogsDetailView.h" #include "CLogsDetailControlContainer.h" @@ -498,4 +498,15 @@ } } } + +// ---------------------------------------------------------------------------- +// CLogsDetailView::OriginalCallMenuIsVisible +// ---------------------------------------------------------------------------- +// +TBool CLogsDetailView::OriginalCallMenuIsVisible() + { + // Original CallMenu is visible + return ETrue; + } + // End of File diff -r f4a778e096c2 -r 9da50d567e3c logsui/AppSrc/CLogsDetailView.h --- a/logsui/AppSrc/CLogsDetailView.h Wed Sep 01 12:29:52 2010 +0100 +++ b/logsui/AppSrc/CLogsDetailView.h Tue Sep 14 20:54:53 2010 +0300 @@ -208,6 +208,14 @@ void SetMenuItemsItemSpecificProperty( CEikMenuPane* aMenuPane, TBool aItemSpecific ); + public: + /** + * Get whether the original CallMenu is visible + * + * @return EFalse\ETrue whether the original CallMenu is visible + */ + TBool OriginalCallMenuIsVisible(); + private: // data /// Own: This view's control container. diff -r f4a778e096c2 -r 9da50d567e3c logsui/AppSrc/CLogsEventListAdapter.cpp --- a/logsui/AppSrc/CLogsEventListAdapter.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/logsui/AppSrc/CLogsEventListAdapter.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -25,7 +25,7 @@ #include // akntextutils #include // ceikcolumnlistbox -#include +#include #include "CLogsEventListAdapter.h" #include "CLogsEventListControlContainer.h" diff -r f4a778e096c2 -r 9da50d567e3c logsui/AppSrc/CLogsEventListControlContainer.cpp --- a/logsui/AppSrc/CLogsEventListControlContainer.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/logsui/AppSrc/CLogsEventListControlContainer.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -24,7 +24,7 @@ #include #include //for skinned icons -#include +#include #include #include "CLogsEventListControlContainer.h" diff -r f4a778e096c2 -r 9da50d567e3c logsui/AppSrc/CLogsEventListView.cpp --- a/logsui/AppSrc/CLogsEventListView.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/logsui/AppSrc/CLogsEventListView.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -21,7 +21,7 @@ #include #include #include //FeatureManger -#include +#include #include "CLogsEventListView.h" #include "CLogsAppUi.h" @@ -710,4 +710,14 @@ return iState; } +// ---------------------------------------------------------------------------- +// CLogsEventListView::OriginalCallMenuIsVisible +// ---------------------------------------------------------------------------- +// +TBool CLogsEventListView::OriginalCallMenuIsVisible() + { + // Original CallMenu is visible + return ETrue; + } + // End of File diff -r f4a778e096c2 -r 9da50d567e3c logsui/AppSrc/CLogsEventListView.h --- a/logsui/AppSrc/CLogsEventListView.h Wed Sep 01 12:29:52 2010 +0100 +++ b/logsui/AppSrc/CLogsEventListView.h Tue Sep 14 20:54:53 2010 +0300 @@ -187,6 +187,14 @@ * Function filters the events from log db. */ void CmdFilterL(); + + public: + /** + * Get whether the original CallMenu is visible + * + * @return EFalse\ETrue whether the original CallMenu is visible + */ + TBool OriginalCallMenuIsVisible(); private: // data diff -r f4a778e096c2 -r 9da50d567e3c logsui/AppSrc/CLogsGprsCtAdapter.cpp --- a/logsui/AppSrc/CLogsGprsCtAdapter.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/logsui/AppSrc/CLogsGprsCtAdapter.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -20,7 +20,7 @@ // INCLUDE FILES #include #include -#include +#include #include "CLogsGprsCtAdapter.h" #include "MLogsSharedData.h" diff -r f4a778e096c2 -r 9da50d567e3c logsui/AppSrc/CLogsRecentListAdapter.cpp --- a/logsui/AppSrc/CLogsRecentListAdapter.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/logsui/AppSrc/CLogsRecentListAdapter.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -21,9 +21,9 @@ #include #include #include -#include +#include #include -#include +#include #include #include "CLogsRecentListAdapter.h" diff -r f4a778e096c2 -r 9da50d567e3c logsui/AppSrc/CLogsRecentListControlContainer.cpp --- a/logsui/AppSrc/CLogsRecentListControlContainer.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/logsui/AppSrc/CLogsRecentListControlContainer.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -23,7 +23,7 @@ #include #include //For skinned icons #include -#include +#include #include //Index file for Logs icons. #include "CLogsRecentListControlContainer.h" @@ -119,11 +119,10 @@ iAdapter = CLogsRecentListAdapter::NewL( this, iLastOwnIconOffset ); + // Shows "No missed calls" in this case + MakeEmptyTextListBoxL( iListBox, EmptyListboxResourceL() ); iListBox->Model()->SetItemTextArray( iAdapter ); - //The below was a bad place for this as container is not deleted when we lose foreground - //but we still reread events. Instead we handle this in CLogsRecentListView::StateChangedL - //MakeEmptyTextListBoxL( iListBox, EmptyListboxResource() ); //Shows "no data" in this case MakeScrollArrowsL( iListBox ); //Create recent list view tab group (Logs.rss) diff -r f4a778e096c2 -r 9da50d567e3c logsui/AppSrc/CLogsRecentListView.cpp --- a/logsui/AppSrc/CLogsRecentListView.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/logsui/AppSrc/CLogsRecentListView.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -29,8 +29,8 @@ #include #include #include -#include -#include +#include +#include #include //KAiwCmdCall #include //TAiwPocParameterData #include diff -r f4a778e096c2 -r 9da50d567e3c logsui/AppSrc/CLogsSubAppListControlContainer.cpp --- a/logsui/AppSrc/CLogsSubAppListControlContainer.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/logsui/AppSrc/CLogsSubAppListControlContainer.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -25,7 +25,7 @@ #include //for skinned icons #include -#include +#include #include #include "CLogsSubAppListControlContainer.h" diff -r f4a778e096c2 -r 9da50d567e3c logsui/AppSrc/CLogsSubAppListView.cpp --- a/logsui/AppSrc/CLogsSubAppListView.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/logsui/AppSrc/CLogsSubAppListView.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -21,7 +21,7 @@ #include #include -#include +#include #include "CLogsSubAppListView.h" #include "CLogsSubAppListControlContainer.h" diff -r f4a778e096c2 -r 9da50d567e3c logsui/EngineSrc/CLogsEventUpdater.cpp --- a/logsui/EngineSrc/CLogsEventUpdater.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/logsui/EngineSrc/CLogsEventUpdater.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -23,7 +23,7 @@ #endif #include #include -#include +#include #include #include #include diff -r f4a778e096c2 -r 9da50d567e3c logsui/LogsIndicatorPlugin/CLogsIndicatorPlugin.cpp --- a/logsui/LogsIndicatorPlugin/CLogsIndicatorPlugin.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/logsui/LogsIndicatorPlugin/CLogsIndicatorPlugin.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -28,7 +28,7 @@ #include #include -#include +#include #include #include diff -r f4a778e096c2 -r 9da50d567e3c logsui/LogsPlugin/CLogsSettingsControlContainer.cpp --- a/logsui/LogsPlugin/CLogsSettingsControlContainer.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/logsui/LogsPlugin/CLogsSettingsControlContainer.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -20,7 +20,7 @@ // INCLUDE FILES #include #include -#include +#include #include "CLogsSettingsControlContainer.h" #include "CLogsSettingsView.h" diff -r f4a778e096c2 -r 9da50d567e3c logsui/LogsPlugin/CLogsSettingsView.cpp --- a/logsui/LogsPlugin/CLogsSettingsView.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/logsui/LogsPlugin/CLogsSettingsView.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -27,7 +27,7 @@ #include //parser #include -#include +#include #include // Series 60 localisation stringloader #include diff -r f4a778e096c2 -r 9da50d567e3c logsui/group/Common.rss --- a/logsui/group/Common.rss Wed Sep 01 12:29:52 2010 +0100 +++ b/logsui/group/Common.rss Tue Sep 14 20:54:53 2010 +0300 @@ -32,8 +32,8 @@ { command = KAiwCmdCall; //Same ID as in interest. txt = ""; //AIW plugin will override the text set here - cascade = AIW_CASCADE_ID; //as a fix to ASAA-6VYJ2H always show a submenu - flags = EEikMenuItemSpecificListQuery; + cascade = AIW_INTELLIGENT_CASCADE_ID; //No submenu if only one item in it + flags = EEikMenuItemSpecific; // Click-To-Call EEikMenuItemSpecificListQuery; } }; } diff -r f4a778e096c2 -r 9da50d567e3c logsui/group/Logs.mmp --- a/logsui/group/Logs.mmp Wed Sep 01 12:29:52 2010 +0100 +++ b/logsui/group/Logs.mmp Tue Sep 14 20:54:53 2010 +0300 @@ -97,13 +97,13 @@ APP_LAYER_SYSTEMINCLUDE // Dependencies to other Logs components -LIBRARY LogsEng.lib +LIBRARY logseng.lib LIBRARY AocCtView.lib // Dependencies to system components LIBRARY apparc.lib LIBRARY avkon.lib -LIBRARY commonengine.lib // StringLoader +LIBRARY CommonEngine.lib // StringLoader LIBRARY cone.lib LIBRARY eikcoctl.lib LIBRARY eikctl.lib @@ -115,20 +115,20 @@ LIBRARY logcli.lib // CLogClient LIBRARY etext.lib // CPlainText LIBRARY sendui.lib // sendui -LIBRARY AknSkins.lib +LIBRARY aknskins.lib LIBRARY hlplch.lib // Help application -LIBRARY FeatMgr.lib // Feature Manager API +LIBRARY featmgr.lib // Feature Manager API LIBRARY ws32.lib LIBRARY apgrfx.lib LIBRARY numbergrouping.lib //Formatting North American phone numbers -LIBRARY ServiceHandler.lib //Application InterWorking +LIBRARY servicehandler.lib //Application InterWorking LIBRARY CdlEngine.lib //Dynamic ui stuff LIBRARY eikdlg.lib LIBRARY gdi.lib LIBRARY efsrv.lib -LIBRARY GSEcomPlugin.lib +LIBRARY gsecomplugin.lib LIBRARY ecom.lib -LIBRARY PhoneClient.lib //For Emergency call API +LIBRARY phoneclient.lib //For Emergency call API LIBRARY aiwdialdata.lib LIBRARY centralrepository.lib diff -r f4a778e096c2 -r 9da50d567e3c logsui/group/LogsEng.mmp --- a/logsui/group/LogsEng.mmp Wed Sep 01 12:29:52 2010 +0100 +++ b/logsui/group/LogsEng.mmp Tue Sep 14 20:54:53 2010 +0300 @@ -73,17 +73,17 @@ LIBRARY logcli.lib LIBRARY bafl.lib LIBRARY logwrap.lib -LIBRARY commonengine.lib +LIBRARY CommonEngine.lib LIBRARY efsrv.lib LIBRARY VPbkEng.lib LIBRARY Pbk2Presentation.lib -LIBRARY SysUtil.lib +LIBRARY sysutil.lib -LIBRARY SSSettings.lib -LIBRARY FeatMgr.lib // Feature Manager +LIBRARY sssettings.lib +LIBRARY featmgr.lib // Feature Manager LIBRARY centralrepository.lib -LIBRARY CenRepNotifHandler.lib +LIBRARY cenrepnotifhandler.lib LIBRARY charconv.lib //For conversion to Unicode LIBRARY etel.lib // ETel functionalities LIBRARY etelmm.lib // ETel functionalities diff -r f4a778e096c2 -r 9da50d567e3c logsui/group/LogsIndicatorPlugin.mmp --- a/logsui/group/LogsIndicatorPlugin.mmp Wed Sep 01 12:29:52 2010 +0100 +++ b/logsui/group/LogsIndicatorPlugin.mmp Tue Sep 14 20:54:53 2010 +0300 @@ -59,11 +59,11 @@ LIBRARY apgrfx.lib LIBRARY ecom.lib LIBRARY avkon.lib -LIBRARY commonengine.lib // StringLoader +LIBRARY CommonEngine.lib // StringLoader LIBRARY bafl.lib LIBRARY efsrv.lib LIBRARY centralrepository.lib -LIBRARY PlatformEnv.lib +LIBRARY platformenv.lib LIBRARY cenrepnotifhandler.lib DEBUGLIBRARY flogger.lib // End of File diff -r f4a778e096c2 -r 9da50d567e3c logsui/group/LogsPlugin.mmp --- a/logsui/group/LogsPlugin.mmp Wed Sep 01 12:29:52 2010 +0100 +++ b/logsui/group/LogsPlugin.mmp Tue Sep 14 20:54:53 2010 +0300 @@ -57,14 +57,14 @@ APP_LAYER_SYSTEMINCLUDE // Dependencies to Logs components -LIBRARY LogsEng.lib +LIBRARY logseng.lib LIBRARY AocCtView.lib // Dependencies to system components LIBRARY logcli.lib // CLogClient LIBRARY apparc.lib LIBRARY avkon.lib -LIBRARY commonengine.lib // StringLoader +LIBRARY CommonEngine.lib // StringLoader LIBRARY cone.lib LIBRARY eikcoctl.lib LIBRARY eikctl.lib @@ -76,9 +76,9 @@ LIBRARY etext.lib // CPlainText -LIBRARY AknSkins.lib +LIBRARY aknskins.lib LIBRARY hlplch.lib // Help application -LIBRARY FeatMgr.lib // Feature Manager API +LIBRARY featmgr.lib // Feature Manager API LIBRARY ws32.lib LIBRARY apgrfx.lib LIBRARY CdlEngine.lib //Dynamic ui stuff @@ -87,8 +87,8 @@ LIBRARY gdi.lib //This is needed for 3.1 builds (because of API change in CFont Class (gdi.h) LIBRARY ecom.lib -LIBRARY GSEcomPlugin.lib -LIBRARY GSFramework.lib +LIBRARY gsecomplugin.lib +LIBRARY gsframework.lib LIBRARY efsrv.lib // End of File diff -r f4a778e096c2 -r 9da50d567e3c logsui/group/Logs_reg.rss --- a/logsui/group/Logs_reg.rss Wed Sep 01 12:29:52 2010 +0100 +++ b/logsui/group/Logs_reg.rss Tue Sep 14 20:54:53 2010 +0300 @@ -18,7 +18,7 @@ #include #include -#include +#include #include "../group/LogsUID.h" // common Logs UID definitions diff -r f4a778e096c2 -r 9da50d567e3c logsui/logsserviceextension/group/logsserviceextension.mmp --- a/logsui/logsserviceextension/group/logsserviceextension.mmp Wed Sep 01 12:29:52 2010 +0100 +++ b/logsui/logsserviceextension/group/logsserviceextension.mmp Tue Sep 14 20:54:53 2010 +0300 @@ -91,7 +91,7 @@ LIBRARY cchclient.lib //Virtual Phonebook Engine -LIBRARY vpbkeng.lib +LIBRARY VPbkEng.lib //Base64 encoding LIBRARY imut.lib diff -r f4a778e096c2 -r 9da50d567e3c logsui/logsserviceextension/src/clogsextpresentityidfetcher.cpp --- a/logsui/logsserviceextension/src/clogsextpresentityidfetcher.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/logsui/logsserviceextension/src/clogsextpresentityidfetcher.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -35,7 +35,7 @@ #include #include #include -#include // url field resource id +#include // url field resource id #include #include diff -r f4a778e096c2 -r 9da50d567e3c logsui/logsserviceextension/src/clogsviewextension.cpp --- a/logsui/logsserviceextension/src/clogsviewextension.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/logsui/logsserviceextension/src/clogsviewextension.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -30,7 +30,7 @@ #include #include -#include +#include #include "MLogsEventGetter.h" #include "MLogsEvent.h" diff -r f4a778e096c2 -r 9da50d567e3c phonebookengines/CntFindPlugin/group/CntFindPlugin.mmp --- a/phonebookengines/CntFindPlugin/group/CntFindPlugin.mmp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookengines/CntFindPlugin/group/CntFindPlugin.mmp Tue Sep 14 20:54:53 2010 +0300 @@ -42,5 +42,5 @@ END LIBRARY euser.lib -LIBRARY ECom.lib -LIBRARY findutil.lib +LIBRARY ecom.lib +LIBRARY FindUtil.lib diff -r f4a778e096c2 -r 9da50d567e3c phonebookengines/CntSortPlugin/group/CntSortPlugin.mmp --- a/phonebookengines/CntSortPlugin/group/CntSortPlugin.mmp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookengines/CntSortPlugin/group/CntSortPlugin.mmp Tue Sep 14 20:54:53 2010 +0300 @@ -43,6 +43,6 @@ END LIBRARY euser.lib -LIBRARY ECom.lib +LIBRARY ecom.lib LIBRARY cntmodel.lib -LIBRARY sortutil.lib +LIBRARY SortUtil.lib diff -r f4a778e096c2 -r 9da50d567e3c phonebookengines/VirtualPhonebook/VPbkCntModel/src/CContactStore.cpp --- a/phonebookengines/VirtualPhonebook/VPbkCntModel/src/CContactStore.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookengines/VirtualPhonebook/VPbkCntModel/src/CContactStore.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -45,7 +45,7 @@ #include "VoiceTagSupport.h" #include "CContactLink.h" #include "COwnContactLinkOperation.h" -#include +#include // Virtual Phonebook #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookengines/VirtualPhonebook/VPbkCntModel/src/CContactStoreDomain.cpp --- a/phonebookengines/VirtualPhonebook/VPbkCntModel/src/CContactStoreDomain.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookengines/VirtualPhonebook/VPbkCntModel/src/CContactStoreDomain.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -35,7 +35,7 @@ #include #include #include -#include +#include #include #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookengines/VirtualPhonebook/VPbkCntModel/src/CFieldFactory.cpp --- a/phonebookengines/VirtualPhonebook/VPbkCntModel/src/CFieldFactory.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookengines/VirtualPhonebook/VPbkCntModel/src/CFieldFactory.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -26,7 +26,7 @@ #include #include #include -#include +#include // System includes #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookengines/VirtualPhonebook/VPbkCntModel/src/CFilteredContactView.cpp --- a/phonebookengines/VirtualPhonebook/VPbkCntModel/src/CFilteredContactView.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookengines/VirtualPhonebook/VPbkCntModel/src/CFilteredContactView.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -23,7 +23,7 @@ #include "CContactStore.h" #include "CFieldFactory.h" #include "CCustomFilteredContactView.h" -#include +#include #include "VPbkCntModelRemoteViewPreferences.h" #include "NamedRemoteViewViewDefinitionStoreUtility.h" diff -r f4a778e096c2 -r 9da50d567e3c phonebookengines/VirtualPhonebook/VPbkCntModel/src/CFilteredGroupView.cpp --- a/phonebookengines/VirtualPhonebook/VPbkCntModel/src/CFilteredGroupView.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookengines/VirtualPhonebook/VPbkCntModel/src/CFilteredGroupView.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -23,7 +23,7 @@ #include "CContactStore.h" #include "CFieldFactory.h" #include "CCustomFilteredGroupView.h" -#include +#include #include "VPbkCntModelRemoteViewPreferences.h" #include "NamedRemoteViewViewDefinitionStoreUtility.h" diff -r f4a778e096c2 -r 9da50d567e3c phonebookengines/VirtualPhonebook/VPbkEng/src/CVPbkContactManager.cpp --- a/phonebookengines/VirtualPhonebook/VPbkEng/src/CVPbkContactManager.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookengines/VirtualPhonebook/VPbkEng/src/CVPbkContactManager.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -40,7 +40,7 @@ #include #include #include -#include +#include #include #include #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookengines/VirtualPhonebook/VPbkEng/src/CVPbkFieldTypeSelector.cpp --- a/phonebookengines/VirtualPhonebook/VPbkEng/src/CVPbkFieldTypeSelector.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookengines/VirtualPhonebook/VPbkEng/src/CVPbkFieldTypeSelector.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookengines/VirtualPhonebook/VPbkEng/src/CVPbkPhoneNumberMatchStrategy.cpp --- a/phonebookengines/VirtualPhonebook/VPbkEng/src/CVPbkPhoneNumberMatchStrategy.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookengines/VirtualPhonebook/VPbkEng/src/CVPbkPhoneNumberMatchStrategy.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -30,8 +30,8 @@ #include #include #include -#include -#include +#include +#include #include #include #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookengines/VirtualPhonebook/VPbkEng/src/CVPbkTopContactOperation.cpp --- a/phonebookengines/VirtualPhonebook/VPbkEng/src/CVPbkTopContactOperation.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookengines/VirtualPhonebook/VPbkEng/src/CVPbkTopContactOperation.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -39,7 +39,7 @@ #include #include #include -#include +#include #include #include #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookengines/VirtualPhonebook/VPbkEng/src/CVPbkxSPContactsOperation.cpp --- a/phonebookengines/VirtualPhonebook/VPbkEng/src/CVPbkxSPContactsOperation.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookengines/VirtualPhonebook/VPbkEng/src/CVPbkxSPContactsOperation.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -25,7 +25,7 @@ #include -#include +#include #include #include #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookengines/VirtualPhonebook/VPbkEng/src/VPbkContactViewFilterBuilder.cpp --- a/phonebookengines/VirtualPhonebook/VPbkEng/src/VPbkContactViewFilterBuilder.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookengines/VirtualPhonebook/VPbkEng/src/VPbkContactViewFilterBuilder.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -24,7 +24,7 @@ #include #include #include -#include +#include // Virtual Phonebook Engine Utils #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookengines/VirtualPhonebook/VPbkEng/src/VPbkFieldTypeSelectorFactory.cpp --- a/phonebookengines/VirtualPhonebook/VPbkEng/src/VPbkFieldTypeSelectorFactory.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookengines/VirtualPhonebook/VPbkEng/src/VPbkFieldTypeSelectorFactory.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -24,10 +24,10 @@ #include #include #include -#include +#include #include #include -#include +#include #include #include #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookengines/VirtualPhonebook/VPbkEng/src/VPbkUtils.cpp --- a/phonebookengines/VirtualPhonebook/VPbkEng/src/VPbkUtils.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookengines/VirtualPhonebook/VPbkEng/src/VPbkUtils.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -29,7 +29,7 @@ #include #include #include -#include +#include #include #include #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookengines/VirtualPhonebook/VPbkSimStore/src/CContactStoreDomain.cpp --- a/phonebookengines/VirtualPhonebook/VPbkSimStore/src/CContactStoreDomain.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookengines/VirtualPhonebook/VPbkSimStore/src/CContactStoreDomain.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -30,7 +30,7 @@ #include #include #include -#include +#include #include #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookengines/VirtualPhonebook/VPbkVCardEng/inc/CVPbkVCardAttributeHandler.h --- a/phonebookengines/VirtualPhonebook/VPbkVCardEng/inc/CVPbkVCardAttributeHandler.h Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookengines/VirtualPhonebook/VPbkVCardEng/inc/CVPbkVCardAttributeHandler.h Tue Sep 14 20:54:53 2010 +0300 @@ -36,9 +36,11 @@ /** * Decides whether to create an attribute from aParameter or not. * @param aParameter Field type parameter + * @param aFieldTypeName Field type name * @return ETrue if creates the attribute, otherwise EFalse. */ - TBool CreateAttributeL( TVPbkFieldTypeParameter aParameter ); + TBool CreateAttributeL( TVPbkFieldTypeParameter aParameter, + TVPbkFieldTypeName aFieldTypeName ); /** * Returns the created attribute or NULL. diff -r f4a778e096c2 -r 9da50d567e3c phonebookengines/VirtualPhonebook/VPbkVCardEng/src/CVPbkVCardAttributeHandler.cpp --- a/phonebookengines/VirtualPhonebook/VPbkVCardEng/src/CVPbkVCardAttributeHandler.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookengines/VirtualPhonebook/VPbkVCardEng/src/CVPbkVCardAttributeHandler.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -36,14 +36,29 @@ delete iAttribute; } -TBool CVPbkVCardAttributeHandler::CreateAttributeL(TVPbkFieldTypeParameter aParameter) +TBool CVPbkVCardAttributeHandler::CreateAttributeL(TVPbkFieldTypeParameter aParameter, + TVPbkFieldTypeName aFieldTypeName ) { TBool retval(EFalse); delete iAttribute; iAttribute = NULL; - if (aParameter == EVPbkVersitParamPREF) + if ( EVPbkVersitParamPREF == aParameter ) { - iAttribute = CVPbkDefaultAttribute::NewL(EVPbkDefaultTypePhoneNumber); + if ( EVPbkVersitNameURL == aFieldTypeName ) + { + // Create default attribute for URL field. + iAttribute = CVPbkDefaultAttribute::NewL( EVPbkDefaultTypeOpenLink ); + } + else if ( EVPbkVersitNameIMPP == aFieldTypeName ) + { + // Create default attribute for IMPP field. + iAttribute = CVPbkDefaultAttribute::NewL( EVPbkDefaultTypeChat ); + } + else + { + // Create default attribute for other fields. + iAttribute = CVPbkDefaultAttribute::NewL( EVPbkDefaultTypePhoneNumber ); + } retval = ETrue; } return retval; diff -r f4a778e096c2 -r 9da50d567e3c phonebookengines/VirtualPhonebook/VPbkVCardEng/src/CVPbkVCardCompactBCardImporter.cpp --- a/phonebookengines/VirtualPhonebook/VPbkVCardEng/src/CVPbkVCardCompactBCardImporter.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookengines/VirtualPhonebook/VPbkVCardEng/src/CVPbkVCardCompactBCardImporter.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -24,7 +24,7 @@ #include "CVPbkVCardCompactBCardImporter.h" #include "VPbkVCardEngError.h" #include "CVPbkVCardFieldTypeProperty.h" -#include +#include // From Virtual Phonebook engine #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookengines/VirtualPhonebook/VPbkVCardEng/src/CVPbkVCardData.cpp --- a/phonebookengines/VirtualPhonebook/VPbkVCardEng/src/CVPbkVCardData.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookengines/VirtualPhonebook/VPbkVCardEng/src/CVPbkVCardData.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -24,7 +24,7 @@ #include #include -#include +#include #include #include #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookengines/VirtualPhonebook/VPbkVCardEng/src/CVPbkVCardPropertyParser.cpp --- a/phonebookengines/VirtualPhonebook/VPbkVCardEng/src/CVPbkVCardPropertyParser.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookengines/VirtualPhonebook/VPbkVCardEng/src/CVPbkVCardPropertyParser.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -143,7 +143,8 @@ TVPbkFieldTypeParameter fieldTypeParam = static_cast( TVPbkMappingsFindTool::FindIdByName( *name, paramArray ) ); - if (!iAttributeHandler.CreateAttributeL(fieldTypeParam)) + if (!iAttributeHandler.CreateAttributeL(fieldTypeParam, + iVersitProperty.Name())) { // No attribute created from fieldTypeParam, // so add to parameters list @@ -163,7 +164,8 @@ TVPbkFieldTypeParameter fieldTypeParam = static_cast( TVPbkMappingsFindTool::FindIdByName( *name, paramArray ) ); - if (!iAttributeHandler.CreateAttributeL(fieldTypeParam)) + if (!iAttributeHandler.CreateAttributeL(fieldTypeParam, + iVersitProperty.Name())) { // No attribute created from fieldTypeParam, // so add to parameters list diff -r f4a778e096c2 -r 9da50d567e3c phonebookengines/VirtualPhonebook/group/VPbkCntModel.mmp --- a/phonebookengines/VirtualPhonebook/group/VPbkCntModel.mmp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookengines/VirtualPhonebook/group/VPbkCntModel.mmp Tue Sep 14 20:54:53 2010 +0300 @@ -140,14 +140,14 @@ LIBRARY euser.lib efsrv.lib bafl.lib estor.lib LIBRARY cntmodel.lib cntview.lib sysutil.lib -LIBRARY commonengine.lib diskspacereserver.lib ecom.lib -LIBRARY VPbkEng.lib VPbkEngUtils.lib PbkEng.lib +LIBRARY CommonEngine.lib diskspacereserver.lib ecom.lib +LIBRARY VPbkEng.lib VPbkEngUtils.lib pbkeng.lib LIBRARY featmgr.lib cone.lib // Only SIND voice tags are supported and only if SIND AIW service // is not on. Dependency to NssVASApi.lib can be removed when RD_SIND_VIA_AIW // is removed from platform and SIND AIW service is always on. #if defined (__SIND) && !defined (RD_SIND_VIA_AIW) -LIBRARY NssVASApi.lib +LIBRARY nssvasapi.lib #endif #ifdef VPBK_ENABLE_PROFILE diff -r f4a778e096c2 -r 9da50d567e3c phonebookengines/VirtualPhonebook/group/VPbkSimStore.mmp --- a/phonebookengines/VirtualPhonebook/group/VPbkSimStore.mmp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookengines/VirtualPhonebook/group/VPbkSimStore.mmp Tue Sep 14 20:54:53 2010 +0300 @@ -88,7 +88,7 @@ // Dependencies to other Phonebook components LIBRARY VPbkEng.lib VPbkEngUtils.lib -LIBRARY VPbkSimStoreService.lib VPbkSimStoreCommon.lib +LIBRARY vpbksimstoreservice.lib VPbkSimStoreCommon.lib LIBRARY VPbkSimStoreImpl.lib #ifdef VPBK_ENABLE_PROFILE diff -r f4a778e096c2 -r 9da50d567e3c phonebookengines/VirtualPhonebook/group/VPbkSimStoreService.mmp --- a/phonebookengines/VirtualPhonebook/group/VPbkSimStoreService.mmp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookengines/VirtualPhonebook/group/VPbkSimStoreService.mmp Tue Sep 14 20:54:53 2010 +0300 @@ -48,7 +48,7 @@ LIBRARY VPbkSimStoreCommon.lib LIBRARY euser.lib LIBRARY estor.lib -LIBRARY FeatMgr.lib +LIBRARY featmgr.lib ///////////////////////////////////// // DEBUG DEPENDENCIES diff -r f4a778e096c2 -r 9da50d567e3c phonebookengines/VirtualPhonebook/tsrc/MT_VPbkEng_SelectorFactory/group/MT_VPbkEng_SelectorFactory.mmp --- a/phonebookengines/VirtualPhonebook/tsrc/MT_VPbkEng_SelectorFactory/group/MT_VPbkEng_SelectorFactory.mmp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookengines/VirtualPhonebook/tsrc/MT_VPbkEng_SelectorFactory/group/MT_VPbkEng_SelectorFactory.mmp Tue Sep 14 20:54:53 2010 +0300 @@ -56,7 +56,7 @@ #endif LIBRARY euser.lib VPbkContactTestUtils.lib -LIBRARY stiftestinterface.lib serviceprovidersettings.lib +LIBRARY StifTestInterface.lib serviceprovidersettings.lib LIBRARY stiftestengine.lib VPbkEng.lib VPbkEngUtils.lib efsrv.lib bafl.lib LANG SC diff -r f4a778e096c2 -r 9da50d567e3c phonebookengines/VirtualPhonebook/tsrc/MT_VPbkEng_SelectorFactory/inc/constants.h --- a/phonebookengines/VirtualPhonebook/tsrc/MT_VPbkEng_SelectorFactory/inc/constants.h Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookengines/VirtualPhonebook/tsrc/MT_VPbkEng_SelectorFactory/inc/constants.h Tue Sep 14 20:54:53 2010 +0300 @@ -17,7 +17,7 @@ #ifndef __SELECTOR_CONSTANTS_H #define __SELECTOR_CONSTANTS_H -#include +#include #include "stifunitmacros.h" #include #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookengines/VirtualPhonebook/tsrc/MT_VPbkEng_SelectorFactory/src/MT_VPbkEng_SelectorFactoryCases.cpp --- a/phonebookengines/VirtualPhonebook/tsrc/MT_VPbkEng_SelectorFactory/src/MT_VPbkEng_SelectorFactoryCases.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookengines/VirtualPhonebook/tsrc/MT_VPbkEng_SelectorFactory/src/MT_VPbkEng_SelectorFactoryCases.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include #include @@ -47,8 +47,6 @@ #include #include -#include - namespace { const TUint KSPSupportCallOutKey = 0x2000B160; diff -r f4a778e096c2 -r 9da50d567e3c phonebookengines/VirtualPhonebook/tsrc/MT_VPbkEng_StrCntAnalyzer/group/MT_VPbkEng_StrCntAnalyzer.mmp --- a/phonebookengines/VirtualPhonebook/tsrc/MT_VPbkEng_StrCntAnalyzer/group/MT_VPbkEng_StrCntAnalyzer.mmp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookengines/VirtualPhonebook/tsrc/MT_VPbkEng_StrCntAnalyzer/group/MT_VPbkEng_StrCntAnalyzer.mmp Tue Sep 14 20:54:53 2010 +0300 @@ -57,7 +57,7 @@ #endif LIBRARY euser.lib -LIBRARY stiftestinterface.lib +LIBRARY StifTestInterface.lib LIBRARY stiftestengine.lib VPbkEngUtils.lib VPbkEng.lib LANG SC diff -r f4a778e096c2 -r 9da50d567e3c phonebookengines/VirtualPhonebook/tsrc/MT_VPbkEng_StrCntAnalyzer/src/MT_VPbkEng_StrCntAnalyzerCases.cpp --- a/phonebookengines/VirtualPhonebook/tsrc/MT_VPbkEng_StrCntAnalyzer/src/MT_VPbkEng_StrCntAnalyzerCases.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookengines/VirtualPhonebook/tsrc/MT_VPbkEng_StrCntAnalyzer/src/MT_VPbkEng_StrCntAnalyzerCases.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -27,7 +27,7 @@ #include #include #include -//#include +//#include #include #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookengines/contactsmodel/groupsql/cntmodel.iby --- a/phonebookengines/contactsmodel/groupsql/cntmodel.iby Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookengines/contactsmodel/groupsql/cntmodel.iby Tue Sep 14 20:54:53 2010 +0300 @@ -33,9 +33,9 @@ #define CONTACT_SERVER_MAX_HEAPSIZE 0x200000 #endif -file=ABI_DIR\BUILD_DIR\cntsrv.exe System\Programs\cntsrv.exe heapmax=CONTACT_SERVER_MAX_HEAPSIZE -file=ABI_DIR\BUILD_DIR\cntmodel.dll System\Libs\cntmodel.dll -file=ABI_DIR\BUILD_DIR\cntview.dll System\Libs\cntview.dll +file=ABI_DIR/BUILD_DIR/cntsrv.exe System/Programs/cntsrv.exe heapmax=CONTACT_SERVER_MAX_HEAPSIZE +file=ABI_DIR/BUILD_DIR/cntmodel.dll System/Libs/cntmodel.dll +file=ABI_DIR/BUILD_DIR/cntview.dll System/Libs/cntview.dll ECOM_PLUGIN(cntvcard.dll,102035f8.rsc) ECOM_PLUGIN(cntphone.dll,102035fb.rsc) diff -r f4a778e096c2 -r 9da50d567e3c phonebookengines/contactsmodel/inc/cntdef_internal.hrh --- a/phonebookengines/contactsmodel/inc/cntdef_internal.hrh Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookengines/contactsmodel/inc/cntdef_internal.hrh Tue Sep 14 20:54:53 2010 +0300 @@ -47,4 +47,5 @@ /** @internalComponent */ #define KIntFieldFlagFilterable4 0x100 -#endif //__CNTDEF_INTERNAL_HRH__ \ No newline at end of file +#endif //__CNTDEF_INTERNAL_HRH__ + diff -r f4a778e096c2 -r 9da50d567e3c phonebookengines/contactsmodel/tsrc/t_cnt_backup.h --- a/phonebookengines/contactsmodel/tsrc/t_cnt_backup.h Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookengines/contactsmodel/tsrc/t_cnt_backup.h Tue Sep 14 20:54:53 2010 +0300 @@ -14,7 +14,6 @@ // #include -#include // // Forward declarations. diff -r f4a778e096c2 -r 9da50d567e3c phonebookengines/contactsmodel/tsrc/t_cnt_backup.mmp --- a/phonebookengines/contactsmodel/tsrc/t_cnt_backup.mmp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookengines/contactsmodel/tsrc/t_cnt_backup.mmp Tue Sep 14 20:54:53 2010 +0300 @@ -13,18 +13,20 @@ // Description: // -target t_cnt_backup.exe -targettype EXE +TARGET t_cnt_backup.exe +TARGETTYPE EXE + UID 0x10281846 CAPABILITY ReadUserData WriteUserData ReadDeviceData WriteDeviceData AllFiles VENDORID 0x70000001 SOURCEPATH ../tsrc -APP_LAYER_SYSTEMINCLUDE_SYMBIAN -userinclude ../inc +APP_LAYER_SYSTEMINCLUDE_SYMBIAN +SYSTEMINCLUDE /epoc32/include/app-services/private +USERINCLUDE ../inc -source t_cnt_backup.cpp +SOURCE t_cnt_backup.cpp LIBRARY cntmodel.lib euser.lib edbms.lib efsrv.lib bafl.lib sbeclient.lib LIBRARY pimtestclient.lib diff -r f4a778e096c2 -r 9da50d567e3c phonebookengines/contactsmodel/tsrc/t_contenttype.mmp --- a/phonebookengines/contactsmodel/tsrc/t_contenttype.mmp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookengines/contactsmodel/tsrc/t_contenttype.mmp Tue Sep 14 20:54:53 2010 +0300 @@ -13,19 +13,21 @@ // Description: // -target t_contenttype.exe -targettype EXE +TARGET t_contenttype.exe +TARGETTYPE EXE + CAPABILITY ReadUserData WriteUserData UID 0x1000007a VENDORID 0x70000001 SOURCEPATH ../tsrc -systeminclude /epoc32/include -userinclude ../inc . +SYSTEMINCLUDE /epoc32/include +SYSTEMINCLUDE /epoc32/include/platform +USERINCLUDE ../inc . -source t_contenttype.cpp +SOURCE t_contenttype.cpp -library euser.lib efsrv.lib cntmodel.lib estor.lib +LIBRARY euser.lib efsrv.lib cntmodel.lib estor.lib SMPSAFE diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook/AIF/Phonebook_reg.rss --- a/phonebookui/Phonebook/AIF/Phonebook_reg.rss Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook/AIF/Phonebook_reg.rss Tue Sep 14 20:54:53 2010 +0300 @@ -17,7 +17,7 @@ #include -#include +#include #include UID2 KUidAppRegistrationResourceFile diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook/App/rss/PbkAiwInterest.rss --- a/phonebookui/Phonebook/App/rss/PbkAiwInterest.rss Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook/App/rss/PbkAiwInterest.rss Tue Sep 14 20:54:53 2010 +0300 @@ -20,7 +20,7 @@ #include #include -#include +#include #include #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook/App/rss/Phonebook.rss --- a/phonebookui/Phonebook/App/rss/Phonebook.rss Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook/App/rss/Phonebook.rss Tue Sep 14 20:54:53 2010 +0300 @@ -25,7 +25,7 @@ #include #include -#include +#include #include #include //Icon in save query #include @@ -37,7 +37,7 @@ #include // Phonebook icon mapping #include #include -#include +#include #if defined(__SCALABLE_ICONS) #define num_aif_icons 1 diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook/App/src/CPbkAiwInterestItemCall.cpp --- a/phonebookui/Phonebook/App/src/CPbkAiwInterestItemCall.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook/App/src/CPbkAiwInterestItemCall.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -29,7 +29,7 @@ #include #include #include "CPbkCallTypeSelector.h" -#include +#include #include #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook/App/src/CPbkAiwInterestItemPoc.cpp --- a/phonebookui/Phonebook/App/src/CPbkAiwInterestItemPoc.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook/App/src/CPbkAiwInterestItemPoc.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -32,7 +32,7 @@ #include #include -#include +#include #include #include #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook/App/src/CPbkAiwInterestItemSyncMl.cpp --- a/phonebookui/Phonebook/App/src/CPbkAiwInterestItemSyncMl.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook/App/src/CPbkAiwInterestItemSyncMl.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -29,7 +29,7 @@ #include #include -#include +#include #include #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook/App/src/CPbkAppUi.cpp --- a/phonebookui/Phonebook/App/src/CPbkAppUi.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook/App/src/CPbkAppUi.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -27,7 +27,7 @@ #include #include // HlpLauncher -#include // Phonebook resources +#include // Phonebook resources #include "CPbkApplication.h" // Phonebook application class #include "CPbkDocument.h" // Phonebook document class #include "PbkAppViewFactory.h" // Application view factory diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook/App/src/CPbkAssignToGroupCmd.cpp --- a/phonebookui/Phonebook/App/src/CPbkAssignToGroupCmd.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook/App/src/CPbkAssignToGroupCmd.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -21,7 +21,7 @@ #include "CPbkAssignToGroupCmd.h" #include #include -#include +#include #include #include #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook/App/src/CPbkCodImageCmd.cpp --- a/phonebookui/Phonebook/App/src/CPbkCodImageCmd.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook/App/src/CPbkCodImageCmd.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -29,7 +29,7 @@ #include #include #include -#include // PbkView resource symbols +#include // PbkView resource symbols #include #include #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook/App/src/CPbkContactInfoAppView.cpp --- a/phonebookui/Phonebook/App/src/CPbkContactInfoAppView.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook/App/src/CPbkContactInfoAppView.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -27,8 +27,8 @@ #include // Phonebook.app include files -#include -#include +#include +#include // Phone include files #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook/App/src/CPbkContactInfoBaseNavigationStrategy.cpp --- a/phonebookui/Phonebook/App/src/CPbkContactInfoBaseNavigationStrategy.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook/App/src/CPbkContactInfoBaseNavigationStrategy.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -28,8 +28,8 @@ #include // Phonebook.app include files -#include -#include +#include +#include #include // PbkEng.dll include files diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook/App/src/CPbkContactListAppView.cpp --- a/phonebookui/Phonebook/App/src/CPbkContactListAppView.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook/App/src/CPbkContactListAppView.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -34,7 +34,7 @@ #include #include #include -#include // Phonebook resources +#include // Phonebook resources #include #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook/App/src/CPbkDeleteContactsCmd.cpp --- a/phonebookui/Phonebook/App/src/CPbkDeleteContactsCmd.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook/App/src/CPbkDeleteContactsCmd.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -19,7 +19,7 @@ // INCLUDE FILES #include "CPbkDeleteContactsCmd.h" -#include +#include #include #include #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook/App/src/CPbkGoToURLCmd.cpp --- a/phonebookui/Phonebook/App/src/CPbkGoToURLCmd.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook/App/src/CPbkGoToURLCmd.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -22,7 +22,7 @@ #include "CPbkGoToURLCmd.h" #include #include -#include +#include #include #include #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook/App/src/CPbkGroupMembersListAppView.cpp --- a/phonebookui/Phonebook/App/src/CPbkGroupMembersListAppView.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook/App/src/CPbkGroupMembersListAppView.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -36,7 +36,7 @@ #include // for Send UI functionality #include // Send UI MTM uid's -#include // Phonebook resources +#include // Phonebook resources #include #include "CPbkAppUi.h" // Phonebook application UI class #include "CPbkAssignToGroupCmd.h" @@ -48,7 +48,7 @@ #include #include -#include // PbkView dll resources +#include // PbkView dll resources #include #include #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook/App/src/CPbkGroupsListAppView.cpp --- a/phonebookui/Phonebook/App/src/CPbkGroupsListAppView.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook/App/src/CPbkGroupsListAppView.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -27,7 +27,7 @@ #include // Phonebook.app APIs -#include // Phonebook resources +#include // Phonebook resources #include #include "CPbkAppUi.h" #include @@ -43,7 +43,7 @@ #include // PbkView.dll APIs -#include // PbkView dll resources +#include // PbkView dll resources #include // Phonebook view state object #include #include // CPbkGroupNameQueryDlg diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook/App/src/CPbkMenuFiltering.cpp --- a/phonebookui/Phonebook/App/src/CPbkMenuFiltering.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook/App/src/CPbkMenuFiltering.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -27,7 +27,7 @@ #include #include #include -#include +#include namespace { diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook/App/src/CPbkNamesListAppView.cpp --- a/phonebookui/Phonebook/App/src/CPbkNamesListAppView.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook/App/src/CPbkNamesListAppView.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -33,7 +33,7 @@ #include // Send UI MTM uid's // Phonebook.app include files -#include // Phonebook resources +#include // Phonebook resources #include "CPbkAppUi.h" // Phonebook application UI class #include "CPbkDeleteContactsCmd.h" #include "CPbkAssignToGroupCmd.h" @@ -54,7 +54,7 @@ #include // Phonebook view include files -#include // PbkView dll resources +#include // PbkView dll resources #include // Phonebook view state object #include #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook/App/src/CPbkRemoveFromGroupCmd.cpp --- a/phonebookui/Phonebook/App/src/CPbkRemoveFromGroupCmd.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook/App/src/CPbkRemoveFromGroupCmd.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -22,7 +22,7 @@ #include #include #include -#include +#include #include #include #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook/App/src/CPbkSendContactCmd.cpp --- a/phonebookui/Phonebook/App/src/CPbkSendContactCmd.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook/App/src/CPbkSendContactCmd.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -24,7 +24,7 @@ #include #include -#include +#include #include #include #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook/App/src/CPbkSendMultipleMessageCmd.cpp --- a/phonebookui/Phonebook/App/src/CPbkSendMultipleMessageCmd.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook/App/src/CPbkSendMultipleMessageCmd.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -31,7 +31,7 @@ #include "TSingleDesCArray.h" #include "CPbkAppGlobals.h" #include -#include +#include #include #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook/App/src/CPbkSetToneToGroupCmd.cpp --- a/phonebookui/Phonebook/App/src/CPbkSetToneToGroupCmd.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook/App/src/CPbkSetToneToGroupCmd.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -24,8 +24,8 @@ #include #include #include -#include -#include +#include +#include #include #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook/App/src/CPbkViewNavigator.cpp --- a/phonebookui/Phonebook/App/src/CPbkViewNavigator.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook/App/src/CPbkViewNavigator.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -33,7 +33,7 @@ #include #include #include -#include +#include // ================= MEMBER FUNCTIONS ======================= diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook/BCardEng/src/BCardEng.cpp --- a/phonebookui/Phonebook/BCardEng/src/BCardEng.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook/BCardEng/src/BCardEng.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -41,7 +41,7 @@ #include #include -#include +#include #include "CBCardParserParamArray.h" #include "CBCardFieldAction.h" #include "CBCardFieldUidMapping.h" diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook/Engine/rss/PbkEng.rss --- a/phonebookui/Phonebook/Engine/rss/PbkEng.rss Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook/Engine/rss/PbkEng.rss Tue Sep 14 20:54:53 2010 +0300 @@ -23,7 +23,7 @@ /*============================================================================ * NB. PbkEng resources MUST be defined in PbkEngCommon.rss -* because only one PbkEng.rsg file used with different language +* because only one pbkeng.rsg file used with different language * specific ".rsc" files. Otherwise BC is broken. ============================================================================*/ diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook/Engine/rss/PbkEngChinese.rss --- a/phonebookui/Phonebook/Engine/rss/PbkEngChinese.rss Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook/Engine/rss/PbkEngChinese.rss Tue Sep 14 20:54:53 2010 +0300 @@ -24,7 +24,7 @@ /*============================================================================ * NB. PbkEng resources MUST be defined in PbkEngCommon.rss -* because only one PbkEng.rsg file used with different language +* because only one pbkeng.rsg file used with different language * specific ".rsc" files. Otherwise BC is broken. ============================================================================*/ diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook/Engine/rss/PbkEngJapanese.rss --- a/phonebookui/Phonebook/Engine/rss/PbkEngJapanese.rss Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook/Engine/rss/PbkEngJapanese.rss Tue Sep 14 20:54:53 2010 +0300 @@ -23,7 +23,7 @@ /*============================================================================ * NB. PbkEng resources MUST be defined in PbkEngCommon.rss -* because only one PbkEng.rsg file used with different language +* because only one pbkeng.rsg file used with different language * specific ".rsc" files. Otherwise BC is broken. ============================================================================*/ diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook/Engine/src/CPbkConstants.cpp --- a/phonebookui/Phonebook/Engine/src/CPbkConstants.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook/Engine/src/CPbkConstants.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -22,7 +22,7 @@ #include #include #include -#include +#include #include "CPbkLocalVariationManager.h" diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook/Engine/src/CPbkContactEngine.cpp --- a/phonebookui/Phonebook/Engine/src/CPbkContactEngine.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook/Engine/src/CPbkContactEngine.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -29,7 +29,7 @@ #include #include // BaflUtils -#include // Engine resources +#include // Engine resources #include "CPbkFieldsInfo.h" #include "CPbkFieldInfo.h" #include "CPbkContactItem.h" diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook/Engine/src/CPbkFieldsInfo.cpp --- a/phonebookui/Phonebook/Engine/src/CPbkFieldsInfo.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook/Engine/src/CPbkFieldsInfo.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -24,7 +24,7 @@ #include #include -#include +#include #include "CPbkFieldInfo.h" #include "CPbkFieldInfoGroup.h" #include "CPbkUidMap.h" diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook/Engine/src/CPbkSortOrderManager.cpp --- a/phonebookui/Phonebook/Engine/src/CPbkSortOrderManager.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook/Engine/src/CPbkSortOrderManager.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -23,7 +23,7 @@ #include #include #include -#include +#include #include // TResourceReader #include #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook/PbkAiwProviders/src/CPbkAiwCmdAssignProvider.cpp --- a/phonebookui/Phonebook/PbkAiwProviders/src/CPbkAiwCmdAssignProvider.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook/PbkAiwProviders/src/CPbkAiwCmdAssignProvider.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -24,8 +24,8 @@ #include #include #include -#include -#include +#include +#include #include #include #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook/PbkAiwProviders/src/CPbkAiwProviderBase.cpp --- a/phonebookui/Phonebook/PbkAiwProviders/src/CPbkAiwProviderBase.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook/PbkAiwProviders/src/CPbkAiwProviderBase.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -21,13 +21,13 @@ #include "CPbkAiwProviderBase.h" #include -#include +#include #include #include #include #include #include "PbkDataCaging.hrh" -#include +#include #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook/PbkAiwProviders/src/CPbkAssignImageCmd.cpp --- a/phonebookui/Phonebook/PbkAiwProviders/src/CPbkAssignImageCmd.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook/PbkAiwProviders/src/CPbkAssignImageCmd.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -22,8 +22,8 @@ #include #include -#include -#include +#include +#include #include #include #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook/PbkAiwProviders/src/CPbkAssignRingingToneCmd.cpp --- a/phonebookui/Phonebook/PbkAiwProviders/src/CPbkAssignRingingToneCmd.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook/PbkAiwProviders/src/CPbkAssignRingingToneCmd.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -22,8 +22,8 @@ #include #include -#include -#include +#include +#include #include #include #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook/PbkEngine_FM/rss/PbkEngine_FMChineseRes.rss --- a/phonebookui/Phonebook/PbkEngine_FM/rss/PbkEngine_FMChineseRes.rss Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook/PbkEngine_FM/rss/PbkEngine_FMChineseRes.rss Tue Sep 14 20:54:53 2010 +0300 @@ -24,7 +24,7 @@ /*============================================================================ * NB. PbkEngine_FM resources MUST be defined in PbkEngine_FMCommonRes.rss -* because only one PbkEngine_FMRes.rsg file used with different language +* because only one pbkengine_fmres.rsg file used with different language * specific ".rsc" files. Otherwise BC is broken. ============================================================================*/ diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook/PbkEngine_FM/rss/PbkEngine_FMJapaneseRes.rss --- a/phonebookui/Phonebook/PbkEngine_FM/rss/PbkEngine_FMJapaneseRes.rss Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook/PbkEngine_FM/rss/PbkEngine_FMJapaneseRes.rss Tue Sep 14 20:54:53 2010 +0300 @@ -24,7 +24,7 @@ /*============================================================================ * NB. PbkEngine_FM resources MUST be defined in PbkEngine_FMCommonRes.rss -* because only one PbkEngine_FMRes.rsg file used with different language +* because only one pbkengine_fmres.rsg file used with different language * specific ".rsc" files. Otherwise BC is broken. ============================================================================*/ diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook/PbkEngine_FM/rss/PbkEngine_FMRes.rss --- a/phonebookui/Phonebook/PbkEngine_FM/rss/PbkEngine_FMRes.rss Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook/PbkEngine_FM/rss/PbkEngine_FMRes.rss Tue Sep 14 20:54:53 2010 +0300 @@ -24,7 +24,7 @@ /*============================================================================ * NB. PbkEngine_FM resources MUST be defined in PbkEngine_FMCommonRes.rss -* because only one PbkEngine_FMRes.rsg file used with different language +* because only one pbkengine_fmres.rsg file used with different language * specific ".rsc" files. Otherwise BC is broken. ============================================================================*/ diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook/PbkEngine_FM/src/Cfmpbkengineextension.cpp --- a/phonebookui/Phonebook/PbkEngine_FM/src/Cfmpbkengineextension.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook/PbkEngine_FM/src/Cfmpbkengineextension.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -19,7 +19,7 @@ // INCLUDES #include "Cfmpbkengineextension.h" -#include // Common for all langugages +#include // Common for all langugages #include #include #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook/View/rss/PbkNonTouchableView.rss --- a/phonebookui/Phonebook/View/rss/PbkNonTouchableView.rss Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook/View/rss/PbkNonTouchableView.rss Tue Sep 14 20:54:53 2010 +0300 @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include #include // Icon in save query diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook/View/src/CPbkAddToGroup.cpp --- a/phonebookui/Phonebook/View/src/CPbkAddToGroup.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook/View/src/CPbkAddToGroup.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -23,7 +23,7 @@ #include // AVKON Notes #include // StringLoader -#include // Phonebook view dll resource IDs +#include // Phonebook view dll resource IDs #include "CPbkGroupPopup.h" #include // Phonebook engine diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook/View/src/CPbkContactEditorDateField.cpp --- a/phonebookui/Phonebook/View/src/CPbkContactEditorDateField.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook/View/src/CPbkContactEditorDateField.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -31,7 +31,7 @@ #include #include -#include +#include /// Unnamed namespace for local definitons diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook/View/src/CPbkContactEditorDlg.cpp --- a/phonebookui/Phonebook/View/src/CPbkContactEditorDlg.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook/View/src/CPbkContactEditorDlg.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -54,7 +54,7 @@ #include #include #include -#include +#include #include #include #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook/View/src/CPbkContactEditorEditContact.cpp --- a/phonebookui/Phonebook/View/src/CPbkContactEditorEditContact.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook/View/src/CPbkContactEditorEditContact.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -29,7 +29,7 @@ #include "CPbkContactItem.h" #include "CPbkDeleteContactQuery.h" #include -#include +#include #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook/View/src/CPbkContactEditorFieldArray.cpp --- a/phonebookui/Phonebook/View/src/CPbkContactEditorFieldArray.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook/View/src/CPbkContactEditorFieldArray.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -29,7 +29,7 @@ #include "PbkIconInfo.h" #include "CPbkFieldInfo.h" #include "CPbkReadingEditorBinderVisitor.h" -#include +#include #include #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook/View/src/CPbkContactEditorNewContact.cpp --- a/phonebookui/Phonebook/View/src/CPbkContactEditorNewContact.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook/View/src/CPbkContactEditorNewContact.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include "CPbkContactEngine.h" #include #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook/View/src/CPbkContactEditorSyncField.cpp --- a/phonebookui/Phonebook/View/src/CPbkContactEditorSyncField.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook/View/src/CPbkContactEditorSyncField.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -23,7 +23,7 @@ #include "MPbkContactEditorUiBuilder.h" #include "MPbkFieldEditorVisitor.h" -#include +#include #include #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook/View/src/CPbkContactInfoControl.cpp --- a/phonebookui/Phonebook/View/src/CPbkContactInfoControl.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook/View/src/CPbkContactInfoControl.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -29,7 +29,7 @@ #include #include -#include // View resources +#include // View resources #include #include "CPbkViewState.h" #include "CPbkThumbnailPopup.h" diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook/View/src/CPbkContactViewListControl.cpp --- a/phonebookui/Phonebook/View/src/CPbkContactViewListControl.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook/View/src/CPbkContactViewListControl.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include // KEikDynamicLayoutVariantSwitch #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook/View/src/CPbkContextPaneIcon.cpp --- a/phonebookui/Phonebook/View/src/CPbkContextPaneIcon.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook/View/src/CPbkContextPaneIcon.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -25,7 +25,7 @@ #include // Status pane control UIDs #include // CEikImage #include // CAknContextPane -#include // Phonebook view dll resource IDs +#include // Phonebook view dll resource IDs #include #include #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook/View/src/CPbkDataSaveAppUi.cpp --- a/phonebookui/Phonebook/View/src/CPbkDataSaveAppUi.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook/View/src/CPbkDataSaveAppUi.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -25,7 +25,7 @@ // PbkView include files #include "PbkDataSaveAppUi.hrh" -#include +#include #include "CPbkContactEditorDlg.h" #include "CPbkSingleEntryFetchDlg.h" #include "CPbkMemoryEntryAddItemDlg.h" diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook/View/src/CPbkDeleteContactQuery.cpp --- a/phonebookui/Phonebook/View/src/CPbkDeleteContactQuery.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook/View/src/CPbkDeleteContactQuery.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -19,7 +19,7 @@ // INCLUDE FILES #include "CPbkDeleteContactQuery.h" -#include +#include #include #include #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook/View/src/CPbkDrmManager.cpp --- a/phonebookui/Phonebook/View/src/CPbkDrmManager.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook/View/src/CPbkDrmManager.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include #include #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook/View/src/CPbkEmailAddressSelect.cpp --- a/phonebookui/Phonebook/View/src/CPbkEmailAddressSelect.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook/View/src/CPbkEmailAddressSelect.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -24,7 +24,7 @@ #include // AVKON softkey codes #include #include // StringLoader -#include +#include #include #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook/View/src/CPbkEmailOverSmsAddressSelect.cpp --- a/phonebookui/Phonebook/View/src/CPbkEmailOverSmsAddressSelect.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook/View/src/CPbkEmailOverSmsAddressSelect.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -24,7 +24,7 @@ #include // R_AVKON_SOFTKEYS_SELECT_CANCEL; #include #include // StringLoader -#include +#include #include #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook/View/src/CPbkFetchDlg.cpp --- a/phonebookui/Phonebook/View/src/CPbkFetchDlg.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook/View/src/CPbkFetchDlg.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -23,7 +23,7 @@ #include // AVKON resource IDs #include // CAknNavigationDecorator #include // CEikAppUi -#include // Phonebook view dll resource IDs +#include // Phonebook view dll resource IDs #include #include #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook/View/src/CPbkFieldFormatter.cpp --- a/phonebookui/Phonebook/View/src/CPbkFieldFormatter.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook/View/src/CPbkFieldFormatter.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -25,7 +25,7 @@ #include "CPbkFieldInfo.h" #include "CPbkSyncronizationConstants.h" #include -#include +#include // ==================== LOCAL FUNCTIONS ==================== diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook/View/src/CPbkGroupBelongings.cpp --- a/phonebookui/Phonebook/View/src/CPbkGroupBelongings.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook/View/src/CPbkGroupBelongings.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -25,7 +25,7 @@ #include #include -#include +#include #include "CPbkGroupPopup.h" #include #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook/View/src/CPbkGroupMembersFetchDlg.cpp --- a/phonebookui/Phonebook/View/src/CPbkGroupMembersFetchDlg.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook/View/src/CPbkGroupMembersFetchDlg.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -22,7 +22,7 @@ #include // PbkView APIs -#include +#include #include "CPbkFetchDlg.h" #include "MPbkFetchCallbacks.h" diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook/View/src/CPbkGroupNameQueryDlg.cpp --- a/phonebookui/Phonebook/View/src/CPbkGroupNameQueryDlg.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook/View/src/CPbkGroupNameQueryDlg.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -23,7 +23,7 @@ #include #include #include -#include +#include #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook/View/src/CPbkIconArray.cpp --- a/phonebookui/Phonebook/View/src/CPbkIconArray.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook/View/src/CPbkIconArray.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -22,7 +22,7 @@ #include // TResourceReader #include // CGulIcon #include // CCoeEnv -#include +#include #include "PbkIconInfo.h" #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook/View/src/CPbkMemoryEntryAddItemDlg.cpp --- a/phonebookui/Phonebook/View/src/CPbkMemoryEntryAddItemDlg.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook/View/src/CPbkMemoryEntryAddItemDlg.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -26,7 +26,7 @@ #include // EikControlFactory // PbkView classes -#include +#include #include // PbkEng classes diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook/View/src/CPbkMemoryEntryDefaultsDlg.cpp --- a/phonebookui/Phonebook/View/src/CPbkMemoryEntryDefaultsDlg.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook/View/src/CPbkMemoryEntryDefaultsDlg.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -23,7 +23,7 @@ #include #include -#include +#include #include "MPbkClipListBoxText.h" #include "CPbkFieldListBoxModel.h" #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook/View/src/CPbkMemoryEntrySelectAddItemDlg.cpp --- a/phonebookui/Phonebook/View/src/CPbkMemoryEntrySelectAddItemDlg.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook/View/src/CPbkMemoryEntrySelectAddItemDlg.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -30,7 +30,7 @@ // PbkView classes -#include +#include #include #include "TPbkAddItemWrapper.h" diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook/View/src/CPbkMmsAddressSelect.cpp --- a/phonebookui/Phonebook/View/src/CPbkMmsAddressSelect.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook/View/src/CPbkMmsAddressSelect.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -24,7 +24,7 @@ #include // R_AVKON_SOFTKEYS_SELECT_CANCEL; #include #include // StringLoader -#include +#include #include #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook/View/src/CPbkMultipleEntryFetchDlg.cpp --- a/phonebookui/Phonebook/View/src/CPbkMultipleEntryFetchDlg.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook/View/src/CPbkMultipleEntryFetchDlg.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -19,7 +19,7 @@ // INCLUDE FILES #include "CPbkMultipleEntryFetchDlg.h" // This class -#include +#include #include "CPbkFetchDlg.h" #include "MPbkFetchDlgSelection.h" #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook/View/src/CPbkPhoneNumberSelect.cpp --- a/phonebookui/Phonebook/View/src/CPbkPhoneNumberSelect.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook/View/src/CPbkPhoneNumberSelect.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -23,7 +23,7 @@ #include // AVKON softkey codes #include // AVKON Notes #include // StringLoader -#include // PbkView resources +#include // PbkView resources #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook/View/src/CPbkPhoneNumberSelectBase.cpp --- a/phonebookui/Phonebook/View/src/CPbkPhoneNumberSelectBase.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook/View/src/CPbkPhoneNumberSelectBase.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -22,7 +22,7 @@ #include "CPbkPhoneNumberSelectBase.h" #include #include // StringLoader -#include +#include #include #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook/View/src/CPbkPhonebookInfoDlg.cpp --- a/phonebookui/Phonebook/View/src/CPbkPhonebookInfoDlg.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook/View/src/CPbkPhonebookInfoDlg.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -20,7 +20,7 @@ // INCLUDE FILES #include "CPbkPhonebookInfoDlg.h" -#include +#include #include #include #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook/View/src/CPbkPocAddressSelect.cpp --- a/phonebookui/Phonebook/View/src/CPbkPocAddressSelect.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook/View/src/CPbkPocAddressSelect.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -24,7 +24,7 @@ #include // R_AVKON_SOFTKEYS_SELECT_CANCEL; #include #include // StringLoader -#include +#include #include #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook/View/src/CPbkRingingToneFetch.cpp --- a/phonebookui/Phonebook/View/src/CPbkRingingToneFetch.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook/View/src/CPbkRingingToneFetch.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -22,7 +22,7 @@ #include #include #include -#include +#include #include #include #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook/View/src/CPbkSelectFieldDlg.cpp --- a/phonebookui/Phonebook/View/src/CPbkSelectFieldDlg.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook/View/src/CPbkSelectFieldDlg.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -24,7 +24,7 @@ #include // CColumnListBoxData #include // AknTextUtils -#include // View DLL resource Ids +#include // View DLL resource Ids #include "CPbkFieldListBoxModel.h" #include "MPbkControlKeyObserver.h" #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook/View/src/CPbkSendKeyAddressSelect.cpp --- a/phonebookui/Phonebook/View/src/CPbkSendKeyAddressSelect.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook/View/src/CPbkSendKeyAddressSelect.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -23,7 +23,7 @@ #include // AVKON softkey codes #include // AVKON Notes #include // StringLoader -#include +#include #include #include #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook/View/src/CPbkSettingsDlg.cpp --- a/phonebookui/Phonebook/View/src/CPbkSettingsDlg.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook/View/src/CPbkSettingsDlg.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -24,7 +24,7 @@ #include "PbkUID.h" #include "PbkViewUtils.h" -#include +#include #include #include #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook/View/src/CPbkSettingsList.cpp --- a/phonebookui/Phonebook/View/src/CPbkSettingsList.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook/View/src/CPbkSettingsList.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -21,7 +21,7 @@ #include "CPbkSettingsList.h" // This class #include "Cpbknameordersettingitem.h" #include -#include +#include #include /// Unnamed namespace for local definitons diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook/View/src/CPbkSingleEntryFetchDlg.cpp --- a/phonebookui/Phonebook/View/src/CPbkSingleEntryFetchDlg.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook/View/src/CPbkSingleEntryFetchDlg.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -19,7 +19,7 @@ // INCLUDE FILES #include "CPbkSingleEntryFetchDlg.h" // This class -#include +#include #include "CPbkFetchDlg.h" #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook/View/src/CPbkSingleItemFetchDlg.cpp --- a/phonebookui/Phonebook/View/src/CPbkSingleItemFetchDlg.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook/View/src/CPbkSingleItemFetchDlg.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -23,7 +23,7 @@ #include #include -#include +#include #include "CPbkFetchDlg.h" #include "MPbkFetchCallbacks.h" #include "CPbkSelectFieldDlg.h" diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook/View/src/CPbkSwapContextPaneIcon.cpp --- a/phonebookui/Phonebook/View/src/CPbkSwapContextPaneIcon.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook/View/src/CPbkSwapContextPaneIcon.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -23,7 +23,7 @@ #include // CEikStatusPane #include // CEikImage #include // CAknContextPane -#include // Phonebook view dll resource IDs +#include // Phonebook view dll resource IDs #include #include #include // Context pane bitmap size diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook/View/src/CPbkThumbnailCmd.cpp --- a/phonebookui/Phonebook/View/src/CPbkThumbnailCmd.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook/View/src/CPbkThumbnailCmd.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -26,7 +26,7 @@ #include #include -#include // PbkView resource symbols +#include // PbkView resource symbols #include #include "CPbkThumbnailManager.h" diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook/View/src/CPbkThumbnailPopup.cpp --- a/phonebookui/Phonebook/View/src/CPbkThumbnailPopup.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook/View/src/CPbkThumbnailPopup.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -29,7 +29,7 @@ #include #include #include -#include +#include #include #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook/View/src/CPbkThumbnailPopupControl.cpp --- a/phonebookui/Phonebook/View/src/CPbkThumbnailPopupControl.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook/View/src/CPbkThumbnailPopupControl.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -19,7 +19,7 @@ // INCLUDE FILES #include "CPbkThumbnailPopupControl.h" -#include +#include #include // TResourceReader #include // CCoeEnv #include // CCoeMain diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook/View/src/CPbkThumbnailPopupControlSlim.cpp --- a/phonebookui/Phonebook/View/src/CPbkThumbnailPopupControlSlim.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook/View/src/CPbkThumbnailPopupControlSlim.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -19,7 +19,7 @@ // INCLUDE FILES #include "CPbkThumbnailPopupControlSlim.h" -#include +#include #include // TResourceReader #include // CCoeEnv #include // CCoeMain diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook/View/src/CPbkURLAddressSelect.cpp --- a/phonebookui/Phonebook/View/src/CPbkURLAddressSelect.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook/View/src/CPbkURLAddressSelect.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -24,7 +24,7 @@ #include // R_AVKON_SOFTKEYS_SELECT_CANCEL; #include #include // StringLoader -#include +#include #include #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook/View/src/CPbkVideoNumberSelect.cpp --- a/phonebookui/Phonebook/View/src/CPbkVideoNumberSelect.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook/View/src/CPbkVideoNumberSelect.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -23,7 +23,7 @@ #include // AVKON softkey codes #include // AVKON Notes #include // StringLoader -#include // PbkView resources +#include // PbkView resources #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook/View/src/CPbkVoipAddressSelect.cpp --- a/phonebookui/Phonebook/View/src/CPbkVoipAddressSelect.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook/View/src/CPbkVoipAddressSelect.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -24,7 +24,7 @@ #include // R_AVKON_SOFTKEYS_SELECT_CANCEL; #include #include // StringLoader -#include +#include #include #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook/View/src/Cpbknameordersettingitem.cpp --- a/phonebookui/Phonebook/View/src/Cpbknameordersettingitem.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook/View/src/Cpbknameordersettingitem.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -21,7 +21,7 @@ #include "Cpbknameordersettingitem.h" // This class #include #include -#include +#include #include #include "PbkViewUtils.h" diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook/View/src/PbkIconInfo.cpp --- a/phonebookui/Phonebook/View/src/PbkIconInfo.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook/View/src/PbkIconInfo.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -22,7 +22,7 @@ #include #include #include -#include +#include #include #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook/View/src/PbkViewUtils.cpp --- a/phonebookui/Phonebook/View/src/PbkViewUtils.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook/View/src/PbkViewUtils.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -19,7 +19,7 @@ // INCLUDE FILES #include "PbkViewUtils.h" -#include +#include #include #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook/group/BCardEng.mmp --- a/phonebookui/Phonebook/group/BCardEng.mmp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook/group/BCardEng.mmp Tue Sep 14 20:54:53 2010 +0300 @@ -64,12 +64,12 @@ // Dependencies to system components LIBRARY euser.lib bafl.lib estor.lib // User libraries LIBRARY efsrv.lib // file server -LIBRARY versit.lib vcard.lib // Versit parser -LIBRARY cntmodel.lib // Contact model -LIBRARY ImageConversion.lib // Image handling -LIBRARY featmgr.lib // FeatureManager +LIBRARY versit.lib vcard.lib // Versit parser +LIBRARY cntmodel.lib // Contact model +LIBRARY imageconversion.lib // Image handling +LIBRARY featmgr.lib // FeatureManager // Dependencies to other components -LIBRARY PbkEng.lib PbkView.lib +LIBRARY pbkeng.lib pbkview.lib // End of File diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook/group/PbkAiwProviders.mmp --- a/phonebookui/Phonebook/group/PbkAiwProviders.mmp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook/group/PbkAiwProviders.mmp Tue Sep 14 20:54:53 2010 +0300 @@ -59,9 +59,9 @@ APP_LAYER_SYSTEMINCLUDE // macro that defines the platform system includes // Dependencies to other components -LIBRARY euser.lib cone.lib commonengine.lib diskspacereserver.lib eikcoctl.lib +LIBRARY euser.lib cone.lib CommonEngine.lib diskspacereserver.lib eikcoctl.lib LIBRARY avkon.lib servicehandler.lib -LIBRARY PbkEng.lib PbkView.lib PbkUi.lib +LIBRARY pbkeng.lib pbkview.lib PbkUi.lib LIBRARY centralrepository.lib LIBRARY efsrv.lib // RFs diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook/group/PbkEng.mmp --- a/phonebookui/Phonebook/group/PbkEng.mmp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook/group/PbkEng.mmp Tue Sep 14 20:54:53 2010 +0300 @@ -135,12 +135,12 @@ APP_LAYER_SYSTEMINCLUDE // macro that defines the platform system includes // Dependencies to system components -LIBRARY euser.lib bafl.lib estor.lib efsrv.lib ECom.lib +LIBRARY euser.lib bafl.lib estor.lib efsrv.lib ecom.lib LIBRARY cntmodel.lib cntview.lib -LIBRARY CentralRepository.lib +LIBRARY centralrepository.lib // Dependencies to other components -LIBRARY SysUtil.lib diskspacereserver.lib featmgr.lib CenRepNotifHandler.lib +LIBRARY sysutil.lib diskspacereserver.lib featmgr.lib cenrepnotifhandler.lib // Debugging dependencies #ifdef PBK_ENABLE_DEBUG_LOGGER diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook/group/PbkEngine_FM.mmp --- a/phonebookui/Phonebook/group/PbkEngine_FM.mmp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook/group/PbkEngine_FM.mmp Tue Sep 14 20:54:53 2010 +0300 @@ -73,9 +73,9 @@ LIBRARY ecom.lib LIBRARY bafl.lib -LIBRARY FeatMgr.lib +LIBRARY featmgr.lib -LIBRARY PbkEng.lib +LIBRARY pbkeng.lib // End of File diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook/group/PbkSINDHandler.mmp --- a/phonebookui/Phonebook/group/PbkSINDHandler.mmp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook/group/PbkSINDHandler.mmp Tue Sep 14 20:54:53 2010 +0300 @@ -55,7 +55,7 @@ LIBRARY euser.lib LIBRARY efsrv.lib LIBRARY ecom.lib -LIBRARY NssVASApi.lib +LIBRARY nssvasapi.lib LIBRARY flogger.lib diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook/group/PbkView.mmp --- a/phonebookui/Phonebook/group/PbkView.mmp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook/group/PbkView.mmp Tue Sep 14 20:54:53 2010 +0300 @@ -167,7 +167,7 @@ LIBRARY euser.lib estor.lib efsrv.lib bafl.lib bitgdi.lib LIBRARY fbscli.lib cone.lib egul.lib eikcore.lib LIBRARY cntmodel.lib cntview.lib apgrfx.lib -LIBRARY ImageConversion.lib BitmapTransforms.lib +LIBRARY imageconversion.lib bitmaptransforms.lib // Dependencies to AVKON LIBRARY avkon.lib aknlayout.lib eikctl.lib eikcoctl.lib eikdlg.lib aknicon.lib @@ -176,20 +176,20 @@ LIBRARY AknLayout2Scalable.lib // Dependencies to Series60 platform components -LIBRARY commonengine.lib sysutil.lib -LIBRARY AknSkins.lib AknJapaneseReading.lib -LIBRARY FeatMgr.lib FindUtil.lib numbergrouping.lib +LIBRARY CommonEngine.lib sysutil.lib +LIBRARY aknskins.lib aknjapanesereading.lib +LIBRARY featmgr.lib FindUtil.lib numbergrouping.lib LIBRARY DrmHelper.lib apmime.lib centralrepository.lib LIBRARY diskspacereserver.lib LIBRARY hlplch.lib // Dependencies to other Phonebook components -LIBRARY PbkEng.lib // Phonebook Engine +LIBRARY pbkeng.lib // Phonebook Engine LIBRARY PbkExt.lib // Phonebook Extension manager // Dependencies to other Series60 applications -LIBRARY MGFetch.lib -LIBRARY FileList.lib +LIBRARY mgfetch.lib +LIBRARY filelist.lib // DRM dependencies LIBRARY DrmParsers.lib DrmDcf.lib DrmRights.lib diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook/group/Phonebook.mmp --- a/phonebookui/Phonebook/group/Phonebook.mmp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook/group/Phonebook.mmp Tue Sep 14 20:54:53 2010 +0300 @@ -153,25 +153,25 @@ LIBRARY apgrfx.lib eikctl.lib // Dependencies to AVKON -LIBRARY Avkon.lib eikcoctl.lib -LIBRARY AknSkins.lib +LIBRARY avkon.lib eikcoctl.lib +LIBRARY aknskins.lib // Dependencies to Series60 platform components -LIBRARY commonengine.lib diskspacereserver.lib -LIBRARY ecom.lib FeatMgr.lib +LIBRARY CommonEngine.lib diskspacereserver.lib +LIBRARY ecom.lib featmgr.lib LIBRARY sendui.lib servicehandler.lib LIBRARY spdctrl.lib LIBRARY hlplch.lib // Dependencies to other Phonebook components -LIBRARY PbkEng.lib // Engine component +LIBRARY pbkeng.lib // Engine component LIBRARY PbkExt.lib // Phonebook Extension manager -LIBRARY BCardEng.lib // Business card import/export component -LIBRARY PbkView.lib // View component +LIBRARY bcardeng.lib // Business card import/export component +LIBRARY pbkview.lib // View component LIBRARY PbkUI.lib // Common Phonebook UI framework // Dependencies to other Series60 applications -LIBRARY MGFetch.lib +LIBRARY mgfetch.lib LIBRARY commonui.lib LIBRARY apmime.lib diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/AIF/Pbk2ServerApp_reg.rss --- a/phonebookui/Phonebook2/AIF/Pbk2ServerApp_reg.rss Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/AIF/Pbk2ServerApp_reg.rss Tue Sep 14 20:54:53 2010 +0300 @@ -17,7 +17,7 @@ #include -#include +#include #include UID2 KUidAppRegistrationResourceFile diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/AIF/Phonebook2_reg.rss --- a/phonebookui/Phonebook2/AIF/Phonebook2_reg.rss Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/AIF/Phonebook2_reg.rss Tue Sep 14 20:54:53 2010 +0300 @@ -17,7 +17,7 @@ #include -#include +#include #include UID2 KUidAppRegistrationResourceFile diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/Application/rss/Pbk2MenuResources.rss --- a/phonebookui/Phonebook2/Application/rss/Pbk2MenuResources.rss Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/Application/rss/Pbk2MenuResources.rss Tue Sep 14 20:54:53 2010 +0300 @@ -18,8 +18,8 @@ // INCLUDES -#include // menu pane definitions are here -#include // CBA resources +#include // menu pane definitions are here +#include // CBA resources // -------------------------------------------------------------------------- // Names List View's main resource diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/Application/src/CPbk2AppUi.cpp --- a/phonebookui/Phonebook2/Application/src/CPbk2AppUi.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/Application/src/CPbk2AppUi.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -43,7 +43,7 @@ #include #include #include -#include +#include #include #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/Application/src/CPbk2ContactInfoAppView.cpp --- a/phonebookui/Phonebook2/Application/src/CPbk2ContactInfoAppView.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/Application/src/CPbk2ContactInfoAppView.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -26,9 +26,9 @@ #include "CPbk2ViewActivationTransaction.h" #include "Pbk2InternalCommands.hrh" #include "CPbk2ViewLoader.h" -#include -#include -#include +#include +#include +#include #include #include #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/Application/src/CPbk2SettingsView.cpp --- a/phonebookui/Phonebook2/Application/src/CPbk2SettingsView.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/Application/src/CPbk2SettingsView.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -36,8 +36,8 @@ #include #include #include -#include -#include +#include +#include // System includes #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/Application/src/CPbk2StartupMonitor.cpp --- a/phonebookui/Phonebook2/Application/src/CPbk2StartupMonitor.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/Application/src/CPbk2StartupMonitor.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -30,8 +30,8 @@ #include #include #include -#include -#include +#include +#include #include // Virtual Phonebook diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/Application/src/CPbk2UIApplicationServices.cpp --- a/phonebookui/Phonebook2/Application/src/CPbk2UIApplicationServices.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/Application/src/CPbk2UIApplicationServices.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include #include #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/Application/src/CPbk2ViewExplorer.cpp --- a/phonebookui/Phonebook2/Application/src/CPbk2ViewExplorer.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/Application/src/CPbk2ViewExplorer.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -25,7 +25,7 @@ #include "CPbk2AppViewFactory.h" #include "CPbk2AppUi.h" #include "CPbk2Document.h" -#include +#include #include #include #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/BWINS/Pbk2CommandsU.DEF --- a/phonebookui/Phonebook2/BWINS/Pbk2CommandsU.DEF Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/BWINS/Pbk2CommandsU.DEF Tue Sep 14 20:54:53 2010 +0300 @@ -37,4 +37,6 @@ ?AttachL@CPbk2AiwInterestItemBase@@UAEXHHH@Z @ 36 NONAME ; void CPbk2AiwInterestItemBase::AttachL(int, int, int) ?InterestId@CPbk2AiwInterestItemBase@@UBEHXZ @ 37 NONAME ; int CPbk2AiwInterestItemBase::InterestId(void) const ?SetStore@CPbk2DriveSpaceCheck@@QAEXABVTDesC16@@@Z @ 38 NONAME ; void CPbk2DriveSpaceCheck::SetStore(class TDesC16 const &) + ?CommandStore@CPbk2CommandHandler@@QAEPAVCPbk2CommandStore@@XZ @ 39 NONAME ; class CPbk2CommandStore * CPbk2CommandHandler::CommandStore(void) + ?DestroyAllCommands@CPbk2CommandStore@@QAEXXZ @ 40 NONAME ; void CPbk2CommandStore::DestroyAllCommands(void) diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/Commands/inc/CPbk2CommandStore.h --- a/phonebookui/Phonebook2/Commands/inc/CPbk2CommandStore.h Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/Commands/inc/CPbk2CommandStore.h Tue Sep 14 20:54:53 2010 +0300 @@ -73,7 +73,7 @@ * Destroys all the commands in the iCommandArray. * by calling CommandFinished() on each one. */ - void DestroyAllCommands(); + IMPORT_C void DestroyAllCommands(); public: // From MPbk2CommandList IMPORT_C void AddAndExecuteCommandL( diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/Commands/src/CPbk2AiwInterestItemCall.cpp --- a/phonebookui/Phonebook2/Commands/src/CPbk2AiwInterestItemCall.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/Commands/src/CPbk2AiwInterestItemCall.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -27,8 +27,8 @@ #include "MPbk2CommandFactory.h" #include "CPbk2CallTypeSelector.h" #include -#include -#include +#include +#include #include #include #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/Commands/src/CPbk2AiwInterestItemOviSync.cpp --- a/phonebookui/Phonebook2/Commands/src/CPbk2AiwInterestItemOviSync.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/Commands/src/CPbk2AiwInterestItemOviSync.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -22,7 +22,7 @@ #include #include #include -#include +#include #include "Pbk2InternalCommands.hrh" // System includes diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/Commands/src/CPbk2AiwInterestItemPoc.cpp --- a/phonebookui/Phonebook2/Commands/src/CPbk2AiwInterestItemPoc.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/Commands/src/CPbk2AiwInterestItemPoc.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -23,8 +23,8 @@ #include "CPbk2PocCmd.h" #include #include -#include -#include +#include +#include #include #include #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/Commands/src/CPbk2AiwInterestItemSyncMl.cpp --- a/phonebookui/Phonebook2/Commands/src/CPbk2AiwInterestItemSyncMl.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/Commands/src/CPbk2AiwInterestItemSyncMl.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -23,7 +23,7 @@ #include #include #include -#include +#include // System includes #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/Commands/src/CPbk2CallCmd.cpp --- a/phonebookui/Phonebook2/Commands/src/CPbk2CallCmd.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/Commands/src/CPbk2CallCmd.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -38,7 +38,7 @@ #include #include #include -#include +#include #include // System includes diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/Commands/src/CPbk2CallTypeSelector.cpp --- a/phonebookui/Phonebook2/Commands/src/CPbk2CallTypeSelector.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/Commands/src/CPbk2CallTypeSelector.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -22,7 +22,7 @@ // Phonebook 2 #include #include -#include +#include #include // Virtual Phonebook diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/Commands/src/CPbk2CommandHandler.cpp --- a/phonebookui/Phonebook2/Commands/src/CPbk2CommandHandler.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/Commands/src/CPbk2CommandHandler.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -28,8 +28,8 @@ #include #include #include -#include -#include +#include +#include #include #include #include @@ -1127,4 +1127,13 @@ return index; } +// -------------------------------------------------------------------------- +// CPbk2CommandHandler::CommandStore +// -------------------------------------------------------------------------- +// +EXPORT_C CPbk2CommandStore* CPbk2CommandHandler::CommandStore() + { + return iCommandStore; + } + // End of File diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/Commands/src/CPbk2CommandStore.cpp --- a/phonebookui/Phonebook2/Commands/src/CPbk2CommandStore.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/Commands/src/CPbk2CommandStore.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -252,7 +252,7 @@ // CPbk2CommandStore::DestroyAllCommands // -------------------------------------------------------------------------- // -void CPbk2CommandStore::DestroyAllCommands() +EXPORT_C void CPbk2CommandStore::DestroyAllCommands() { // Delete objects in idle commands array using CommandFinished for (TInt i = 0; i < iCommandArray.Count(); ++i) diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/Commands/src/CPbk2PrependCmd.cpp --- a/phonebookui/Phonebook2/Commands/src/CPbk2PrependCmd.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/Commands/src/CPbk2PrependCmd.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -22,7 +22,7 @@ // From Phonebook2 #include "CPbk2CallCmd.h" #include "CPbk2AiwInterestArray.h" -#include +#include #include #include #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/Commands/src/CPbk2SetToneBase.cpp --- a/phonebookui/Phonebook2/Commands/src/CPbk2SetToneBase.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/Commands/src/CPbk2SetToneBase.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -27,8 +27,8 @@ #include #include #include -#include -#include +#include +#include #include #include #include @@ -40,7 +40,7 @@ #include #include #include -#include +#include // System includes #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/Commands/src/CPbk2SetToneCmd.cpp --- a/phonebookui/Phonebook2/Commands/src/CPbk2SetToneCmd.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/Commands/src/CPbk2SetToneCmd.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -38,7 +38,7 @@ #include #include "CPbk2RingingToneFetch.h" -#include +#include #include #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/Commands/src/TPbk2CopyContactsResults.cpp --- a/phonebookui/Phonebook2/Commands/src/TPbk2CopyContactsResults.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/Commands/src/TPbk2CopyContactsResults.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -22,7 +22,7 @@ #include #include -#include +#include namespace{ diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/Commands/src/cpbk2storestatechecker.cpp --- a/phonebookui/Phonebook2/Commands/src/cpbk2storestatechecker.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/Commands/src/cpbk2storestatechecker.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -20,7 +20,7 @@ #include "cpbk2storestatechecker.h" // Phonebook 2 -#include +#include #include #include #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/CommandsExtension/src/CPbk2CopyAddressToClipboardCmd.cpp --- a/phonebookui/Phonebook2/CommandsExtension/src/CPbk2CopyAddressToClipboardCmd.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/CommandsExtension/src/CPbk2CopyAddressToClipboardCmd.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -30,8 +30,8 @@ #include #include #include -#include -#include +#include +#include #include #include // CPlainText diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/CommandsExtension/src/CPbk2CopyContactsCmd.cpp --- a/phonebookui/Phonebook2/CommandsExtension/src/CPbk2CopyContactsCmd.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/CommandsExtension/src/CPbk2CopyContactsCmd.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include #include #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/CommandsExtension/src/CPbk2CopyContactsStarterCmd.cpp --- a/phonebookui/Phonebook2/CommandsExtension/src/CPbk2CopyContactsStarterCmd.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/CommandsExtension/src/CPbk2CopyContactsStarterCmd.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -32,7 +32,7 @@ #include #include #include -#include +#include // Virtual Phonebook #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/CommandsExtension/src/CPbk2CopyDetailToClipboardCmd.cpp --- a/phonebookui/Phonebook2/CommandsExtension/src/CPbk2CopyDetailToClipboardCmd.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/CommandsExtension/src/CPbk2CopyDetailToClipboardCmd.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -30,8 +30,8 @@ #include #include #include -#include -#include +#include +#include #include #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/CommandsExtension/src/CPbk2CopyNumberToClipboardCmd.cpp --- a/phonebookui/Phonebook2/CommandsExtension/src/CPbk2CopyNumberToClipboardCmd.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/CommandsExtension/src/CPbk2CopyNumberToClipboardCmd.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -30,8 +30,8 @@ #include #include #include -#include -#include +#include +#include #include // CPlainText #include // CClipboard diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/CommandsExtension/src/CPbk2CreateNewContactCmd.cpp --- a/phonebookui/Phonebook2/CommandsExtension/src/CPbk2CreateNewContactCmd.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/CommandsExtension/src/CPbk2CreateNewContactCmd.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -26,9 +26,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include #include #include #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/CommandsExtension/src/CPbk2DeleteContactsCmd.cpp --- a/phonebookui/Phonebook2/CommandsExtension/src/CPbk2DeleteContactsCmd.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/CommandsExtension/src/CPbk2DeleteContactsCmd.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -23,8 +23,8 @@ #include #include "MPbk2ProcessDecorator.h" #include "Pbk2ProcessDecoratorFactory.h" -#include -#include +#include +#include #include #include #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/CommandsExtension/src/CPbk2GoToURLCmd.cpp --- a/phonebookui/Phonebook2/CommandsExtension/src/CPbk2GoToURLCmd.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/CommandsExtension/src/CPbk2GoToURLCmd.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include // Virtual Phonebook diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/CommandsExtension/src/CPbk2ImageCmdBase.cpp --- a/phonebookui/Phonebook2/CommandsExtension/src/CPbk2ImageCmdBase.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/CommandsExtension/src/CPbk2ImageCmdBase.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -38,7 +38,7 @@ #include #include #include -#include +#include // System headers #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/CommandsExtension/src/CPbk2InfoDialogCmd.cpp --- a/phonebookui/Phonebook2/CommandsExtension/src/CPbk2InfoDialogCmd.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/CommandsExtension/src/CPbk2InfoDialogCmd.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -21,7 +21,7 @@ #include "CPbk2InfoDialogCmd.h" // Phonebook 2 -#include +#include #include #include #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/CommandsExtension/src/CPbk2MergeConflict.cpp --- a/phonebookui/Phonebook2/CommandsExtension/src/CPbk2MergeConflict.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/CommandsExtension/src/CPbk2MergeConflict.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -17,7 +17,7 @@ // Phonebook2 includes #include -#include +#include #include #include #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/CommandsExtension/src/CPbk2MergeContactsCmd.cpp --- a/phonebookui/Phonebook2/CommandsExtension/src/CPbk2MergeContactsCmd.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/CommandsExtension/src/CPbk2MergeContactsCmd.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -44,9 +44,9 @@ #include #include -#include -#include -#include +#include +#include +#include //Virtual Phonebook #include #include @@ -58,7 +58,7 @@ #include #include #include -#include +#include #include //System diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/CommandsExtension/src/CPbk2MergeResolver.cpp --- a/phonebookui/Phonebook2/CommandsExtension/src/CPbk2MergeResolver.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/CommandsExtension/src/CPbk2MergeResolver.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -33,7 +33,7 @@ #include #include #include -#include +#include // System includes #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/CommandsExtension/src/CPbk2RemoveImageCmd.cpp --- a/phonebookui/Phonebook2/CommandsExtension/src/CPbk2RemoveImageCmd.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/CommandsExtension/src/CPbk2RemoveImageCmd.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -20,7 +20,7 @@ // INCLUDE FILES #include "CPbk2RemoveImageCmd.h" #include "CPbk2ImageManager.h" -#include +#include #include #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/CommandsExtension/src/CPbk2RemoveSpeedDialCmd.cpp --- a/phonebookui/Phonebook2/CommandsExtension/src/CPbk2RemoveSpeedDialCmd.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/CommandsExtension/src/CPbk2RemoveSpeedDialCmd.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include // From Virtual Phonebook diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/CommandsExtension/src/CPbk2SendContactCmd.cpp --- a/phonebookui/Phonebook2/CommandsExtension/src/CPbk2SendContactCmd.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/CommandsExtension/src/CPbk2SendContactCmd.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -22,8 +22,8 @@ #include "Pbk2SendCmdUtils.h" #include "CPbk2vCardConverter.h" #include -#include -#include +#include +#include #include #include #include @@ -42,7 +42,7 @@ #include #include #include -#include +#include // System includes #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/CommandsExtension/src/CPbk2SendMessageCmd.cpp --- a/phonebookui/Phonebook2/CommandsExtension/src/CPbk2SendMessageCmd.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/CommandsExtension/src/CPbk2SendMessageCmd.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -26,20 +26,20 @@ #include #include #include -#include +#include #include #include -#include +#include #include #include #include -#include +#include #include #include #include #include #include -#include +#include // Virtual Phonebook #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/CommandsExtension/src/CPbk2SetImageCmd.cpp --- a/phonebookui/Phonebook2/CommandsExtension/src/CPbk2SetImageCmd.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/CommandsExtension/src/CPbk2SetImageCmd.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -25,13 +25,13 @@ #include "CPbk2DrmManager.h" #include "Pbk2DataCaging.hrh" #include "Pbk2PresentationUtils.h" -#include -#include +#include +#include #include #include #include #include -#include +#include // Virtual Phonebook #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/CommandsExtension/src/CPbk2SetThumbnailCmd.cpp --- a/phonebookui/Phonebook2/CommandsExtension/src/CPbk2SetThumbnailCmd.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/CommandsExtension/src/CPbk2SetThumbnailCmd.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -25,8 +25,8 @@ #include "CPbk2DrmManager.h" #include "Pbk2DataCaging.hrh" #include "Pbk2PresentationUtils.h" -#include -#include +#include +#include #include #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/CommandsExtension/src/CPbk2ThumbnailCmdBase.cpp --- a/phonebookui/Phonebook2/CommandsExtension/src/CPbk2ThumbnailCmdBase.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/CommandsExtension/src/CPbk2ThumbnailCmdBase.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -21,7 +21,7 @@ #include "CPbk2ThumbnailCmdBase.h" // Phonebook 2 -#include +#include #include #include #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/CommandsExtension/src/CPbk2ViewImageCmd.cpp --- a/phonebookui/Phonebook2/CommandsExtension/src/CPbk2ViewImageCmd.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/CommandsExtension/src/CPbk2ViewImageCmd.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -22,11 +22,11 @@ // Phonebook 2 #include "Pbk2DataCaging.hrh" -#include +#include #include #include -#include -#include +#include +#include // Virtual Phonebook #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/CommandsExtension/src/CPbk2vCardConverter.cpp --- a/phonebookui/Phonebook2/CommandsExtension/src/CPbk2vCardConverter.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/CommandsExtension/src/CPbk2vCardConverter.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -21,8 +21,8 @@ // Phonebook 2 #include "Pbk2SendCmdUtils.h" #include -#include -#include +#include +#include #include // Virtual Phonebook diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/CommandsExtension/src/CPbkRclCmd.cpp --- a/phonebookui/Phonebook2/CommandsExtension/src/CPbkRclCmd.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/CommandsExtension/src/CPbkRclCmd.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -20,7 +20,7 @@ #include "CPbkRclCmd.h" // Phonebook 2 -#include +#include #include #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/CommonUI/src/CPbk2ApplicationServices.cpp --- a/phonebookui/Phonebook2/CommonUI/src/CPbk2ApplicationServices.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/CommonUI/src/CPbk2ApplicationServices.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include #include #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/CommonUI/src/CPbk2ContactRelocator.cpp --- a/phonebookui/Phonebook2/CommonUI/src/CPbk2ContactRelocator.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/CommonUI/src/CPbk2ContactRelocator.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/CommonUI/src/CPbk2ContactViewSupplier.cpp --- a/phonebookui/Phonebook2/CommonUI/src/CPbk2ContactViewSupplier.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/CommonUI/src/CPbk2ContactViewSupplier.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/CommonUI/src/CPbk2DrmManager.cpp --- a/phonebookui/Phonebook2/CommonUI/src/CPbk2DrmManager.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/CommonUI/src/CPbk2DrmManager.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -21,7 +21,7 @@ #include "CPbk2DrmManager.h" // Phonebook 2 -#include +#include // System includes #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/CommonUI/src/CPbk2IconFactory.cpp --- a/phonebookui/Phonebook2/CommonUI/src/CPbk2IconFactory.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/CommonUI/src/CPbk2IconFactory.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -22,7 +22,7 @@ #include "CPbk2IconInfo.h" #include #include -#include +#include #include // System includes diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/CommonUI/src/CPbk2RingingToneFetch.cpp --- a/phonebookui/Phonebook2/CommonUI/src/CPbk2RingingToneFetch.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/CommonUI/src/CPbk2RingingToneFetch.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -20,7 +20,7 @@ #include // Phonebook 2 -#include +#include // System includes #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/CommonUI/src/CPbk2StoreManager.cpp --- a/phonebookui/Phonebook2/CommonUI/src/CPbk2StoreManager.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/CommonUI/src/CPbk2StoreManager.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -24,7 +24,7 @@ #include #include #include -#include +#include // Virtual Phonebook #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/EABI/Pbk2CommandsU.DEF --- a/phonebookui/Phonebook2/EABI/Pbk2CommandsU.DEF Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/EABI/Pbk2CommandsU.DEF Tue Sep 14 20:54:53 2010 +0300 @@ -73,4 +73,6 @@ _ZThn28_N24CPbk2AiwInterestItemBase7AttachLEiii @ 72 NONAME ; ## _ZThn28_NK24CPbk2AiwInterestItemBase10InterestIdEv @ 73 NONAME ; ## _ZN20CPbk2DriveSpaceCheck8SetStoreERK7TDesC16 @ 74 NONAME + _ZN17CPbk2CommandStore18DestroyAllCommandsEv @ 75 NONAME + _ZN19CPbk2CommandHandler12CommandStoreEv @ 76 NONAME diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/GroupExtension/rss/Pbk2GroupUiRes.rss --- a/phonebookui/Phonebook2/GroupExtension/rss/Pbk2GroupUiRes.rss Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/GroupExtension/rss/Pbk2GroupUiRes.rss Tue Sep 14 20:54:53 2010 +0300 @@ -24,11 +24,11 @@ #include #include #include -#include +#include #include #include #include -#include +#include #include #include "Pbk2GroupUi.hrh" #include "Pbk2UIExtension.rh" diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/GroupExtension/src/CPguAddMembersCmd.cpp --- a/phonebookui/Phonebook2/GroupExtension/src/CPguAddMembersCmd.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/GroupExtension/src/CPguAddMembersCmd.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -19,9 +19,9 @@ #include "CPguAddMembersCmd.h" // Phonebook 2 -#include -#include -#include +#include +#include +#include #include #include #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/GroupExtension/src/CPguBelongsToGroupsCmd.cpp --- a/phonebookui/Phonebook2/GroupExtension/src/CPguBelongsToGroupsCmd.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/GroupExtension/src/CPguBelongsToGroupsCmd.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -20,8 +20,8 @@ // Phonebook 2 #include "CPguGroupPopup.h" -#include -#include +#include +#include #include #include #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/GroupExtension/src/CPguCreateNewGroupCmd.cpp --- a/phonebookui/Phonebook2/GroupExtension/src/CPguCreateNewGroupCmd.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/GroupExtension/src/CPguCreateNewGroupCmd.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -22,8 +22,8 @@ #include "CPguGroupNameQueryDlg.h" #include "Pbk2GroupConsts.h" #include -#include -#include +#include +#include #include #include #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/GroupExtension/src/CPguDeleteGroupCmd.cpp --- a/phonebookui/Phonebook2/GroupExtension/src/CPguDeleteGroupCmd.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/GroupExtension/src/CPguDeleteGroupCmd.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -23,9 +23,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include #include #include #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/GroupExtension/src/CPguGroupMembersView.cpp --- a/phonebookui/Phonebook2/GroupExtension/src/CPguGroupMembersView.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/GroupExtension/src/CPguGroupMembersView.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -22,9 +22,9 @@ #include "CPguAddMembersCmd.h" #include "CPguRemoveFromGroupCmd.h" #include "Pbk2GroupUi.hrh" -#include +#include #include -#include +#include #include #include #include @@ -49,8 +49,8 @@ #include #include #include -#include -#include +#include +#include #include #include #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/GroupExtension/src/CPguGroupNameQueryDlg.cpp --- a/phonebookui/Phonebook2/GroupExtension/src/CPguGroupNameQueryDlg.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/GroupExtension/src/CPguGroupNameQueryDlg.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -21,7 +21,7 @@ // Phonebook 2 #include "Pbk2GroupConsts.h" #include -#include +#include #include #include #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/GroupExtension/src/CPguGroupView.cpp --- a/phonebookui/Phonebook2/GroupExtension/src/CPguGroupView.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/GroupExtension/src/CPguGroupView.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -28,10 +28,10 @@ #include #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/GroupExtension/src/CPguRemoveFromGroupCmd.cpp --- a/phonebookui/Phonebook2/GroupExtension/src/CPguRemoveFromGroupCmd.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/GroupExtension/src/CPguRemoveFromGroupCmd.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -20,7 +20,7 @@ #include "CPguRemoveFromGroupCmd.h" // Phonebook2 -#include +#include #include #include #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/GroupExtension/src/CPguRenameGroupCmd.cpp --- a/phonebookui/Phonebook2/GroupExtension/src/CPguRenameGroupCmd.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/GroupExtension/src/CPguRenameGroupCmd.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -22,7 +22,7 @@ // Phonebook 2 #include "CPguGroupNameQueryDlg.h" #include "Pbk2GroupConsts.h" -#include +#include #include #include #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/GroupExtension/src/CPguSendMessageGroupCmd.cpp --- a/phonebookui/Phonebook2/GroupExtension/src/CPguSendMessageGroupCmd.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/GroupExtension/src/CPguSendMessageGroupCmd.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include #include @@ -380,9 +380,14 @@ sp->ControlL( TUid::Uid( EEikStatusPaneUidTitle ) ) ); title = titlePane->Text()->AllocLC(); - Phonebook2::Pbk2AppUi()->ApplicationServices().SendUiL()-> - CreateAndSendMessageL( iMtmUid, iMessageData ); + TRAPD( error, Phonebook2::Pbk2AppUi()->ApplicationServices().SendUiL()-> + CreateAndSendMessageL( iMtmUid, iMessageData ) ); + if ( error ) + { + //Show Appropriate Error Note + + } if( !Layout_Meta_Data::IsLandscapeOrientation() ) { sp->SwitchLayoutL( R_AVKON_STATUS_PANE_LAYOUT_USUAL ); diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/GroupExtension/src/CPguSetToneCmd.cpp --- a/phonebookui/Phonebook2/GroupExtension/src/CPguSetToneCmd.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/GroupExtension/src/CPguSetToneCmd.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -22,8 +22,8 @@ // Phonebook 2 #include #include -#include -#include +#include +#include // Virtual Phonebook #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/GroupExtension/src/CPguSortOrder.cpp --- a/phonebookui/Phonebook2/GroupExtension/src/CPguSortOrder.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/GroupExtension/src/CPguSortOrder.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -20,7 +20,7 @@ // Phonebook 2 #include -#include +#include #include // Virtual Phonebook diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/MMCExtension/rss/Pbk2DriveUiRes.rss --- a/phonebookui/Phonebook2/MMCExtension/rss/Pbk2DriveUiRes.rss Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/MMCExtension/rss/Pbk2DriveUiRes.rss Tue Sep 14 20:54:53 2010 +0300 @@ -20,7 +20,7 @@ #include "Pbk2MmcUiUid.h" #include "PmuCommands.hrh" #include -#include +#include #include #include #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/MMCExtension/src/CPmuCopyFromDriveCmd.cpp --- a/phonebookui/Phonebook2/MMCExtension/src/CPmuCopyFromDriveCmd.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/MMCExtension/src/CPmuCopyFromDriveCmd.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -32,7 +32,7 @@ #include #include #include -#include +#include // Virtual Phonebook #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/MMCExtension/src/CPmuCopyToDriveCmd.cpp --- a/phonebookui/Phonebook2/MMCExtension/src/CPmuCopyToDriveCmd.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/MMCExtension/src/CPmuCopyToDriveCmd.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include // Virtual Phonebook diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/MMCExtension/src/CPmuUIExtensionPlugin.cpp --- a/phonebookui/Phonebook2/MMCExtension/src/CPmuUIExtensionPlugin.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/MMCExtension/src/CPmuUIExtensionPlugin.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -27,8 +27,8 @@ #include #include #include -#include -#include +#include +#include // System includes #include @@ -82,14 +82,22 @@ case R_PMU_CASCADING_COPY_CONTACT_CARD_MENU : { TBool marked = aControl.ContactsMarked(); - if ( !marked) + // Menu item "To other memory" is not displayed if there is no marked item in the Names List + // Menu item "From other memory" is not displayed if there is marked item in the Names List + TInt pos = 0; + if ( marked ) { - //Not displayed if no marked items in the Names List. - TInt pos; + if ( aMenuPane->MenuItemExists( EPmuCmdImportFromMemoryCard, pos ) ) + { + aMenuPane->SetItemDimmed( EPmuCmdImportFromMemoryCard, ETrue ); + } + } + else + { if ( aMenuPane->MenuItemExists( EPmuCmdExportToMemoryCard, pos ) ) - { - aMenuPane->SetItemDimmed( EPmuCmdExportToMemoryCard, ETrue ); - } + { + aMenuPane->SetItemDimmed( EPmuCmdExportToMemoryCard, ETrue ); + } } break; } diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/MapExtension/inc/cpmapcmd.h --- a/phonebookui/Phonebook2/MapExtension/inc/cpmapcmd.h Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/MapExtension/inc/cpmapcmd.h Tue Sep 14 20:54:53 2010 +0300 @@ -37,6 +37,7 @@ class MVPbkStoreContactField; class TLocality; class CMnMapView; +class MPbk2DialogEliminator; enum TCurrentMapLaunchedByState { @@ -299,6 +300,14 @@ TVPbkFieldTypeParameter iAddressType; /// Own: Is already address is there? TBool iNoAddress; + + /// Ref: For address select dialog's exit handling + ///Doesnt Own + MPbk2DialogEliminator* iAddressSelectEliminator; + + ///Bool to denote whether the Current Obj has been deleted or not + ///Doesnt Own + TBool *iThisPtrDestroyed; }; #endif // CPMAPCMD_H diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/MapExtension/rss/pbk2mapuires.rss --- a/phonebookui/Phonebook2/MapExtension/rss/pbk2mapuires.rss Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/MapExtension/rss/pbk2mapuires.rss Tue Sep 14 20:54:53 2010 +0300 @@ -19,12 +19,12 @@ #include "pbk2mapuiuid.h" #include "pbk2mapcommands.hrh" #include -#include +#include #include #include #include #include "Pbk2UIControls.hrh" -#include +#include #include "Pbk2EditorLineIds.hrh" #include "Pbk2FieldProperty.hrh" #include "Pbk2UIFieldProperty.hrh" diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/MapExtension/src/CPbk2ContactEditorUIAFMField.cpp --- a/phonebookui/Phonebook2/MapExtension/src/CPbk2ContactEditorUIAFMField.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/MapExtension/src/CPbk2ContactEditorUIAFMField.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -22,12 +22,12 @@ #include "MPbk2ContactEditorFieldVisitor.h" #include "MPbk2ContactEditorUiBuilderExtension.h" #include "CPbk2IconInfoContainer.h" -#include +#include #include "MPbk2UIField.h" #include "Pbk2EditorLineIds.hrh" #include #include "CPbk2ContactEditorReadonlyField.h" -#include +#include // System includes #include #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/MapExtension/src/cpmapcmd.cpp --- a/phonebookui/Phonebook2/MapExtension/src/cpmapcmd.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/MapExtension/src/cpmapcmd.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -25,18 +25,18 @@ #include #include #include -#include +#include #include #include #include #include -#include +#include #include #include #include -#include #include #include +#include // Virtual Phonebook #include @@ -49,7 +49,7 @@ #include #include #include -#include +#include #include #include #include @@ -126,6 +126,11 @@ // CPmapCmd::~CPmapCmd() { + if ( iAddressSelectEliminator ) + { + iAddressSelectEliminator->ForceExit(); + } + Cancel(); if(iMapView) { @@ -139,6 +144,13 @@ iUiControl->RegisterCommand( NULL ); } delete iMapViewProvider; + + //Indication that the object has been deleted. + if ( iThisPtrDestroyed ) + { + *iThisPtrDestroyed = ETrue; + } + } // -------------------------------------------------------------------------- @@ -258,6 +270,9 @@ PBK2_DEBUG_PRINT(PBK2_DEBUG_STRING ("CPmapCmd::ExecuteLD")); + TBool amIDestroyed( EFalse ); + iThisPtrDestroyed = &amIDestroyed; + iAddressUpdatePrompt = ETrue; TPbk2FieldGroupId groupId = EPbk2FieldGroupIdNone; if( !IsAddressInContact() ) @@ -309,6 +324,15 @@ { groupId = SelectAddressL(); } + + //This object could have been deleted because of some external activity + //Dont proceed if this object is destroyed + if ( amIDestroyed ) + { + return; + } + + iThisPtrDestroyed = NULL; if( groupId != EPbk2FieldGroupIdNone ) { @@ -506,6 +530,12 @@ CleanupStack::PopAndDestroy( appServices ); CPbk2AddressSelect* addressSelect = CPbk2AddressSelect::NewL( params ); + + // Execute + iAddressSelectEliminator = addressSelect; + iAddressSelectEliminator->ResetWhenDestroyed + ( &iAddressSelectEliminator ); + MVPbkStoreContactField* selectedField = addressSelect->ExecuteLD(); CleanupStack::PopAndDestroy(); // resReader diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/MapExtension/src/cpmapcontacteditorextension.cpp --- a/phonebookui/Phonebook2/MapExtension/src/cpmapcontacteditorextension.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/MapExtension/src/cpmapcontacteditorextension.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -19,9 +19,9 @@ // Phonebook 2 #include -#include -#include -#include +#include +#include +#include #include #include #include @@ -52,10 +52,9 @@ #include #include #include -#include -#include +#include +#include #include -#include #include #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/MapExtension/src/cpmapuiextensionplugin.cpp --- a/phonebookui/Phonebook2/MapExtension/src/cpmapuiextensionplugin.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/MapExtension/src/cpmapuiextensionplugin.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -24,10 +24,10 @@ #include #include #include -#include -#include +#include +#include #include -#include +#include #include #include "cpmapcmd.h" diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/NamesListExtension/rss/Pbk2ExNamesListRes.rss --- a/phonebookui/Phonebook2/NamesListExtension/rss/Pbk2ExNamesListRes.rss Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/NamesListExtension/rss/Pbk2ExNamesListRes.rss Tue Sep 14 20:54:53 2010 +0300 @@ -35,12 +35,12 @@ #include #include #include -#include -#include +#include +#include #include #include #include -#include +#include #include #include #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/NamesListExtension/src/CPbk2CmdItemAddTop.cpp --- a/phonebookui/Phonebook2/NamesListExtension/src/CPbk2CmdItemAddTop.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/NamesListExtension/src/CPbk2CmdItemAddTop.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -24,7 +24,7 @@ #include #include #include "Pbk2NamesListExUID.h" -#include +#include #include #include "pbk2nameslistexiconid.hrh" #include "pbk2contactuicontroldoublelistboxextension.h" diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/NamesListExtension/src/CPbk2CmdItemRemoteContactLookup.cpp --- a/phonebookui/Phonebook2/NamesListExtension/src/CPbk2CmdItemRemoteContactLookup.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/NamesListExtension/src/CPbk2CmdItemRemoteContactLookup.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -22,7 +22,7 @@ #include "CPbk2RemoteContactLookupVisibility.h" #include #include -#include +#include // General #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/NamesListExtension/src/CPbk2DelayedWaitNote.cpp --- a/phonebookui/Phonebook2/NamesListExtension/src/CPbk2DelayedWaitNote.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/NamesListExtension/src/CPbk2DelayedWaitNote.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -17,7 +17,7 @@ // INCLUDES #include -#include +#include #include #include "CPbk2DelayedWaitNote.h" diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/NamesListExtension/src/CPbk2NameslistUiControlExtension.cpp --- a/phonebookui/Phonebook2/NamesListExtension/src/CPbk2NameslistUiControlExtension.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/NamesListExtension/src/CPbk2NameslistUiControlExtension.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -31,12 +31,12 @@ #include #include #include -#include +#include #include #include #include #include -#include +#include //ECE #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/NamesListExtension/src/CPbk2NlxAddToTopContactsCmd.cpp --- a/phonebookui/Phonebook2/NamesListExtension/src/CPbk2NlxAddToTopContactsCmd.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/NamesListExtension/src/CPbk2NlxAddToTopContactsCmd.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -21,10 +21,10 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include @@ -39,7 +39,7 @@ #include #include #include -#include +#include #include #include #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/NamesListExtension/src/CPbk2NlxMoveTopContactsCmd.cpp --- a/phonebookui/Phonebook2/NamesListExtension/src/CPbk2NlxMoveTopContactsCmd.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/NamesListExtension/src/CPbk2NlxMoveTopContactsCmd.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -21,7 +21,7 @@ #include "CPbk2NlxMoveTopContactsDlg.h" #include "CPbk2NlxReorderingModel.h" -#include +#include #include #include #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/NamesListExtension/src/CPbk2NlxMoveTopContactsDlg.cpp --- a/phonebookui/Phonebook2/NamesListExtension/src/CPbk2NlxMoveTopContactsDlg.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/NamesListExtension/src/CPbk2NlxMoveTopContactsDlg.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -23,7 +23,7 @@ #include #include #include -#include +#include // Virtual Phonebook #include @@ -43,7 +43,7 @@ #include "CPbk2NlxReorderingModel.h" #include "Pbk2NlxUIControls.hrh" -#include +#include #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/NamesListExtension/src/CPbk2NlxRemoveFromTopContactsCmd.cpp --- a/phonebookui/Phonebook2/NamesListExtension/src/CPbk2NlxRemoveFromTopContactsCmd.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/NamesListExtension/src/CPbk2NlxRemoveFromTopContactsCmd.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -27,7 +27,7 @@ #include #include #include -#include +#include // Debugging headers #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/NamesListExtension/src/CPbk2NlxReorderingModel.cpp --- a/phonebookui/Phonebook2/NamesListExtension/src/CPbk2NlxReorderingModel.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/NamesListExtension/src/CPbk2NlxReorderingModel.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -28,7 +28,7 @@ #include #include #include -#include +#include #include #include #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/NamesListExtension/src/NamesListExView.cpp --- a/phonebookui/Phonebook2/NamesListExtension/src/NamesListExView.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/NamesListExtension/src/NamesListExView.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -21,7 +21,7 @@ #include "CPbk2CmdItemAddTop.h" #include "CPbk2CmdItemRemoteContactLookup.h" #include -#include +#include #include "Pbk2NlxMenuFiltering.h" #include "cpbk2cmditemmycard.h" #include "cpbk2mycard.h" @@ -36,14 +36,15 @@ #include #include "CPbk2ViewState.h" #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include #include #include +#include #include #include #include @@ -815,6 +816,23 @@ } break; } + case R_PHONEBOOK2_NAMESLIST_BACKUP_MENU_PLACEHOLDER: + { + if ( iControl->ContactsMarked() && iMarkingModeOn ) + { + // This item is shown in option menu but not in popup menu + CEikMenuBar* menuBar = static_cast( aMenuPane->Parent() ); + if ( menuBar && menuBar->GetMenuType() == CEikMenuBar::EMenuOptions ) + { + aMenuPane->SetItemSpecific( EPmuCmdCascadingBackup, ETrue ); + } + else + { + aMenuPane->SetItemDimmed( EPmuCmdCascadingBackup, ETrue ); + } + } + break; + } case R_PHONEBOOK2_NAMESLIST_SEND_URL_MENU: { DimItem( aMenuPane, EPbk2CmdGoToURL ); diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/NamesListExtension/src/NamesListUiExtensionPlugin.cpp --- a/phonebookui/Phonebook2/NamesListExtension/src/NamesListUiExtensionPlugin.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/NamesListExtension/src/NamesListUiExtensionPlugin.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -48,13 +48,13 @@ #include #include -#include +#include #include #include #include #include #include -#include +#include #include #include #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/NamesListExtension/src/cpbk2cmditemmycard.cpp --- a/phonebookui/Phonebook2/NamesListExtension/src/cpbk2cmditemmycard.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/NamesListExtension/src/cpbk2cmditemmycard.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -21,7 +21,7 @@ // Pbk2 #include "CPbk2AddFavoritesVisibility.h" #include -#include +#include #include #include #include "cpbk2mycard.h" diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/NamesListExtension/src/cpbk2deletemycardcmd.cpp --- a/phonebookui/Phonebook2/NamesListExtension/src/cpbk2deletemycardcmd.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/NamesListExtension/src/cpbk2deletemycardcmd.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -20,12 +20,12 @@ #include "cpbk2deletemycardcmd.h" #include #include -#include +#include // Phonebook2 #include #include -#include +#include #include #include #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/NamesListExtension/src/cpbk2mycard.cpp --- a/phonebookui/Phonebook2/NamesListExtension/src/cpbk2mycard.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/NamesListExtension/src/cpbk2mycard.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -41,7 +41,7 @@ // thumbnail loading #include #include -#include +#include #include #include #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/NewContactLauncher/data/NewContactLauncher_reg.rss --- a/phonebookui/Phonebook2/NewContactLauncher/data/NewContactLauncher_reg.rss Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/NewContactLauncher/data/NewContactLauncher_reg.rss Tue Sep 14 20:54:53 2010 +0300 @@ -18,7 +18,7 @@ #include "NewContactLauncher.hrh" #include "NewContactLauncher.rls" #include -#include +#include UID2 KUidAppRegistrationResourceFile UID3 _UID3 diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/NewContactLauncher/group/NewContactLauncher.mmp --- a/phonebookui/Phonebook2/NewContactLauncher/group/NewContactLauncher.mmp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/NewContactLauncher/group/NewContactLauncher.mmp Tue Sep 14 20:54:53 2010 +0300 @@ -56,7 +56,7 @@ LIBRARY cone.lib LIBRARY eikcore.lib LIBRARY avkon.lib -LIBRARY commonengine.lib +LIBRARY CommonEngine.lib LIBRARY efsrv.lib LIBRARY estor.lib LIBRARY aknnotify.lib diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/NewContactLauncher/src/NewContactLauncherAppUi.cpp --- a/phonebookui/Phonebook2/NewContactLauncher/src/NewContactLauncherAppUi.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/NewContactLauncher/src/NewContactLauncherAppUi.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -37,7 +37,7 @@ #include #include #include -#include +#include #include #include #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/Presentation/inc/CPbk2FieldOrderingManager.h --- a/phonebookui/Phonebook2/Presentation/inc/CPbk2FieldOrderingManager.h Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/Presentation/inc/CPbk2FieldOrderingManager.h Tue Sep 14 20:54:53 2010 +0300 @@ -76,7 +76,7 @@ TFieldTypeOrder( TResourceReader& aReader ); /** - * Field type resource id from VPbkEng.rsg + * Field type resource id from vpbkeng.rsg */ TInt iFieldTypeResId; diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/Presentation/inc/Pbk2FieldOrdering.rh --- a/phonebookui/Phonebook2/Presentation/inc/Pbk2FieldOrdering.rh Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/Presentation/inc/Pbk2FieldOrdering.rh Tue Sep 14 20:54:53 2010 +0300 @@ -26,7 +26,7 @@ // STRUCT PBK2_FIELDTYPE_PRESENTATION_ORDER { - /// Field type resource id from VPbkEng.rsg + /// Field type resource id from vpbkeng.rsg LONG fieldTypeResId; /// The number that specifies the location of this field type /// in contact presentation (defines the order of fields). diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/Presentation/rss/Pbk2FieldOrdering.rss --- a/phonebookui/Phonebook2/Presentation/rss/Pbk2FieldOrdering.rss Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/Presentation/rss/Pbk2FieldOrdering.rss Tue Sep 14 20:54:53 2010 +0300 @@ -17,7 +17,7 @@ */ #include "Pbk2FieldOrdering.rh" -#include +#include // --------------------------------------------------------------------------- // R_PBK2_FIELDTYPE_PRESENTATION_ORDERS diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/Presentation/rss/Pbk2Presentation.rss --- a/phonebookui/Phonebook2/Presentation/rss/Pbk2Presentation.rss Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/Presentation/rss/Pbk2Presentation.rss Tue Sep 14 20:54:53 2010 +0300 @@ -22,7 +22,7 @@ /*============================================================================ * NB. Pbk2Presentation resources MUST be defined in Pbk2PresentationCommon.rss -* because only one Pbk2Presentation.rsg file used with different language +* because only one pbk2presentation.rsg file used with different language * specific ".rsc" files. Otherwise BC is broken. ============================================================================*/ diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/Presentation/rss/Pbk2PresentationChinese.rss --- a/phonebookui/Phonebook2/Presentation/rss/Pbk2PresentationChinese.rss Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/Presentation/rss/Pbk2PresentationChinese.rss Tue Sep 14 20:54:53 2010 +0300 @@ -22,7 +22,7 @@ /*============================================================================ * NB. Pbk2Presentation resources MUST be defined in Pbk2PresentationCommon.rss -* because only one Pbk2Presentation.rsg file used with different language +* because only one pbk2presentation.rsg file used with different language * specific ".rsc" files. Otherwise BC is broken. ============================================================================*/ diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/Presentation/rss/Pbk2PresentationCommon.rss --- a/phonebookui/Phonebook2/Presentation/rss/Pbk2PresentationCommon.rss Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/Presentation/rss/Pbk2PresentationCommon.rss Tue Sep 14 20:54:53 2010 +0300 @@ -40,7 +40,7 @@ #include #include #include -#include +#include #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/Presentation/rss/Pbk2PresentationJapanese.rss --- a/phonebookui/Phonebook2/Presentation/rss/Pbk2PresentationJapanese.rss Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/Presentation/rss/Pbk2PresentationJapanese.rss Tue Sep 14 20:54:53 2010 +0300 @@ -22,7 +22,7 @@ /*============================================================================ * NB. Pbk2Presentation resources MUST be defined in Pbk2PresentationCommon.rss -* because only one Pbk2Presentation.rsg file used with different language +* because only one pbk2presentation.rsg file used with different language * specific ".rsc" files. Otherwise BC is broken. ============================================================================*/ diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/Presentation/src/CPbk2ContactMerge.cpp --- a/phonebookui/Phonebook2/Presentation/src/CPbk2ContactMerge.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/Presentation/src/CPbk2ContactMerge.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/Presentation/src/CPbk2ContactNameFormatter.cpp --- a/phonebookui/Phonebook2/Presentation/src/CPbk2ContactNameFormatter.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/Presentation/src/CPbk2ContactNameFormatter.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -24,7 +24,7 @@ #include #include -#include +#include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/Presentation/src/CPbk2ContactViewBuilder.cpp --- a/phonebookui/Phonebook2/Presentation/src/CPbk2ContactViewBuilder.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/Presentation/src/CPbk2ContactViewBuilder.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -26,7 +26,7 @@ #include "CPbk2StorePropertyArray.h" #include "CPbk2StoreViewDefinition.h" #include -#include +#include #include #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/Presentation/src/CPbk2DuplicateContactFinder.cpp --- a/phonebookui/Phonebook2/Presentation/src/CPbk2DuplicateContactFinder.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/Presentation/src/CPbk2DuplicateContactFinder.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -32,7 +32,7 @@ #include #include -#include +#include namespace { #ifdef _DEBUG diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/Presentation/src/CPbk2EmbeddedImage.cpp --- a/phonebookui/Phonebook2/Presentation/src/CPbk2EmbeddedImage.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/Presentation/src/CPbk2EmbeddedImage.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -40,7 +40,7 @@ #include #include "Pbk2DataCaging.hrh" -#include +#include /// Unnamed namespace for local definitions namespace { diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/Presentation/src/CPbk2FieldGroupPropertyArray.cpp --- a/phonebookui/Phonebook2/Presentation/src/CPbk2FieldGroupPropertyArray.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/Presentation/src/CPbk2FieldGroupPropertyArray.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -22,7 +22,7 @@ #include "Pbk2PresentationUtils.h" #include #include -#include +#include #include #include #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/Presentation/src/CPbk2FieldPropertyArray.cpp --- a/phonebookui/Phonebook2/Presentation/src/CPbk2FieldPropertyArray.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/Presentation/src/CPbk2FieldPropertyArray.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -25,7 +25,7 @@ #include "CPbk2FieldOrderingManager.h" #include #include -#include +#include #include #include @@ -33,7 +33,7 @@ #include #include #include -#include +#include // System includes #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/Presentation/src/CPbk2PresentationContact.cpp --- a/phonebookui/Phonebook2/Presentation/src/CPbk2PresentationContact.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/Presentation/src/CPbk2PresentationContact.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -34,7 +34,7 @@ #include #include #include -#include +#include // System includes #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/Presentation/src/CPbk2ServiceManager.cpp --- a/phonebookui/Phonebook2/Presentation/src/CPbk2ServiceManager.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/Presentation/src/CPbk2ServiceManager.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -20,7 +20,7 @@ #include #include #include -#include +#include #include #include "CPbk2ServiceManager.h" #include "Pbk2PresentationUtils.h" diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/Presentation/src/CPbk2SortOrderManagerImpl.cpp --- a/phonebookui/Phonebook2/Presentation/src/CPbk2SortOrderManagerImpl.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/Presentation/src/CPbk2SortOrderManagerImpl.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -23,7 +23,7 @@ #include "Pbk2DataCaging.hrh" #include #include -#include +#include #include // Virtual Phonebook diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/Presentation/src/CPbk2StorePropertyArray.cpp --- a/phonebookui/Phonebook2/Presentation/src/CPbk2StorePropertyArray.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/Presentation/src/CPbk2StorePropertyArray.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -24,7 +24,7 @@ #include "Pbk2PresentationUtils.h" #include "CPbk2StoreProperty.h" #include -#include +#include #include // From Virtual Phonebook diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/Presentation/src/Pbk2ContactNameFormatterFactory.cpp --- a/phonebookui/Phonebook2/Presentation/src/Pbk2ContactNameFormatterFactory.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/Presentation/src/Pbk2ContactNameFormatterFactory.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -26,7 +26,7 @@ #include "CPbk2ChineseContactNameFormatter.h" #include "Pbk2PresentationUtils.h" #include -#include +#include // From Virtual Phonebook #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/ServerApplication/inc/CPbk2ServerAppStoreManager.h --- a/phonebookui/Phonebook2/ServerApplication/inc/CPbk2ServerAppStoreManager.h Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/ServerApplication/inc/CPbk2ServerAppStoreManager.h Tue Sep 14 20:54:53 2010 +0300 @@ -191,6 +191,8 @@ CVPbkSortOrderAcquirer* iSortOrderAcquirer; /// Ref: list of opened contact stores RPointerArray iOpenedStores; + /// Not Own - Group View + MVPbkContactViewBase* iGroupView; }; #endif // CPBK2SERVERAPPSTOREMANAGER_H diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/ServerApplication/src/CPbk2AddressSelectPhase.cpp --- a/phonebookui/Phonebook2/ServerApplication/src/CPbk2AddressSelectPhase.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/ServerApplication/src/CPbk2AddressSelectPhase.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -25,8 +25,8 @@ #include #include #include -#include -#include +#include +#include #include // Virtual Phonebook diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/ServerApplication/src/CPbk2AssignCreateNewProperty.cpp --- a/phonebookui/Phonebook2/ServerApplication/src/CPbk2AssignCreateNewProperty.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/ServerApplication/src/CPbk2AssignCreateNewProperty.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -20,8 +20,8 @@ // Phonebook 2 #include "TPbk2AssignNoteService.h" -#include -#include +#include +#include #include #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/ServerApplication/src/CPbk2AssignMultiProperty.cpp --- a/phonebookui/Phonebook2/ServerApplication/src/CPbk2AssignMultiProperty.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/ServerApplication/src/CPbk2AssignMultiProperty.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -21,7 +21,7 @@ // Phonebook 2 #include "CPbk2ServerAppAppUi.h" -#include +#include #include #include #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/ServerApplication/src/CPbk2AssignSingleProperty.cpp --- a/phonebookui/Phonebook2/ServerApplication/src/CPbk2AssignSingleProperty.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/ServerApplication/src/CPbk2AssignSingleProperty.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -22,7 +22,7 @@ // Phonebook 2 #include "Pbk2AssignValidateField.h" #include "CPbk2ServerAppAppUi.h" -#include +#include #include #include #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/ServerApplication/src/CPbk2AttributeAddressSelectPhase.cpp --- a/phonebookui/Phonebook2/ServerApplication/src/CPbk2AttributeAddressSelectPhase.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/ServerApplication/src/CPbk2AttributeAddressSelectPhase.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include // Virtual Phonebook @@ -37,7 +37,7 @@ #include #include #include -#include +#include #include // System includes diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/ServerApplication/src/CPbk2CommAddressSelectPhase.cpp --- a/phonebookui/Phonebook2/ServerApplication/src/CPbk2CommAddressSelectPhase.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/ServerApplication/src/CPbk2CommAddressSelectPhase.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -26,8 +26,8 @@ #include #include #include -#include -#include +#include +#include #include // Virtual Phonebook @@ -45,7 +45,7 @@ #include #include #include -#include +#include // System includes #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/ServerApplication/src/CPbk2ContactAttributeAssigner.cpp --- a/phonebookui/Phonebook2/ServerApplication/src/CPbk2ContactAttributeAssigner.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/ServerApplication/src/CPbk2ContactAttributeAssigner.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -31,7 +31,7 @@ #include "CPbk2AttributeAddressSelectPhase.h" #include "CPbk2PrepareAttributeAssignPhase.h" #include -#include +#include #include #include #include @@ -42,7 +42,7 @@ #include #include #include -#include +#include #include #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/ServerApplication/src/CPbk2ContactImageAssigner.cpp --- a/phonebookui/Phonebook2/ServerApplication/src/CPbk2ContactImageAssigner.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/ServerApplication/src/CPbk2ContactImageAssigner.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -30,7 +30,7 @@ #include #include #include -#include +#include // System includes #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/ServerApplication/src/CPbk2ContactRingingToneAssigner.cpp --- a/phonebookui/Phonebook2/ServerApplication/src/CPbk2ContactRingingToneAssigner.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/ServerApplication/src/CPbk2ContactRingingToneAssigner.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -21,7 +21,7 @@ // Phonebook 2 #include "MPbk2ContactAssignerObserver.h" #include -#include +#include // Virtual Phonebook #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/ServerApplication/src/CPbk2ItemFetcher.cpp --- a/phonebookui/Phonebook2/ServerApplication/src/CPbk2ItemFetcher.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/ServerApplication/src/CPbk2ItemFetcher.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -27,7 +27,7 @@ #include "CPbk2ContactFetchPhase.h" #include "CPbk2AddressSelectPhase.h" #include -#include +#include #include #include #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/ServerApplication/src/CPbk2MultiAssignDataPhase.cpp --- a/phonebookui/Phonebook2/ServerApplication/src/CPbk2MultiAssignDataPhase.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/ServerApplication/src/CPbk2MultiAssignDataPhase.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -33,7 +33,7 @@ #include #include #include -#include +#include // Virtual Phonebook #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/ServerApplication/src/CPbk2MultiContactDataAssigner.cpp --- a/phonebookui/Phonebook2/ServerApplication/src/CPbk2MultiContactDataAssigner.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/ServerApplication/src/CPbk2MultiContactDataAssigner.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -31,8 +31,8 @@ #include "MPbk2SelectFieldProperty.h" #include #include -#include -#include +#include +#include // Virtual Phonebook #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/ServerApplication/src/CPbk2PrepareAttributeAssignPhase.cpp --- a/phonebookui/Phonebook2/ServerApplication/src/CPbk2PrepareAttributeAssignPhase.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/ServerApplication/src/CPbk2PrepareAttributeAssignPhase.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -24,7 +24,7 @@ #include "CPbk2KeyEventDealer.h" #include #include -#include +#include // Virtual Phonebook #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/ServerApplication/src/CPbk2PrepareSingleAssignPhase.cpp --- a/phonebookui/Phonebook2/ServerApplication/src/CPbk2PrepareSingleAssignPhase.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/ServerApplication/src/CPbk2PrepareSingleAssignPhase.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -28,7 +28,7 @@ #include "CPbk2KeyEventDealer.h" #include #include -#include +#include // Virtual Phonebook #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/ServerApplication/src/CPbk2ServerAppMonitor.cpp --- a/phonebookui/Phonebook2/ServerApplication/src/CPbk2ServerAppMonitor.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/ServerApplication/src/CPbk2ServerAppMonitor.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -28,8 +28,8 @@ #include #include #include -#include -#include +#include +#include // Virtual Phonebook #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/ServerApplication/src/CPbk2ServerAppStoreManager.cpp --- a/phonebookui/Phonebook2/ServerApplication/src/CPbk2ServerAppStoreManager.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/ServerApplication/src/CPbk2ServerAppStoreManager.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -219,6 +219,8 @@ ( aStoreUris, *this, *sortOrder, aViewFilter, aFlags ); + iGroupView = result; + CleanupStack::Pop(); // result } @@ -346,10 +348,13 @@ // -------------------------------------------------------------------------- // void CPbk2ServerAppStoreManager::ContactAddedToView - ( MVPbkContactViewBase& /*aView*/, TInt /*aIndex*/, + ( MVPbkContactViewBase& aView, TInt /*aIndex*/, const MVPbkContactLink& /*aContactLink*/ ) { - // Do nothing + if ( iGroupView && aView.Type() == EVPbkContactsView ) + { + iGroupView->RefreshL(); + } } // -------------------------------------------------------------------------- @@ -357,10 +362,13 @@ // -------------------------------------------------------------------------- // void CPbk2ServerAppStoreManager::ContactRemovedFromView - ( MVPbkContactViewBase& /*aView*/, TInt /*aIndex*/, + ( MVPbkContactViewBase& aView, TInt /*aIndex*/, const MVPbkContactLink& /*aContactLink*/ ) { - // Do nothing + if ( iGroupView && aView.Type() == EVPbkContactsView ) + { + iGroupView->RefreshL(); + } } // -------------------------------------------------------------------------- diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/ServerApplication/src/CPbk2SingleAssignDataPhase.cpp --- a/phonebookui/Phonebook2/ServerApplication/src/CPbk2SingleAssignDataPhase.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/ServerApplication/src/CPbk2SingleAssignDataPhase.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -31,8 +31,8 @@ #include #include #include -#include -#include +#include +#include // Virtual Phonebook #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/ServerApplication/src/CPbk2SingleContactDataAssigner.cpp --- a/phonebookui/Phonebook2/ServerApplication/src/CPbk2SingleContactDataAssigner.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/ServerApplication/src/CPbk2SingleContactDataAssigner.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -30,8 +30,8 @@ #include "CPbk2SelectCreateNewPropertyPhase.h" #include "CPbk2PrepareSingleAssignPhase.h" #include "MPbk2SelectFieldProperty.h" -#include -#include +#include +#include #include #include #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/ServerApplication/src/Pbk2AssignValidateField.cpp --- a/phonebookui/Phonebook2/ServerApplication/src/Pbk2AssignValidateField.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/ServerApplication/src/Pbk2AssignValidateField.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -27,7 +27,7 @@ #include #include #include -#include +#include /// Unnamed namespace for local definitions diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/ServerApplication/src/TPbk2AssignNoteService.cpp --- a/phonebookui/Phonebook2/ServerApplication/src/TPbk2AssignNoteService.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/ServerApplication/src/TPbk2AssignNoteService.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -22,9 +22,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include // Virtual Phonebook #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/ServerApplication/src/TPbk2ServerMessageDataRetriever.cpp --- a/phonebookui/Phonebook2/ServerApplication/src/TPbk2ServerMessageDataRetriever.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/ServerApplication/src/TPbk2ServerMessageDataRetriever.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -24,7 +24,7 @@ #include #include #include -#include +#include // Virtual Phonebook #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/ServerApplication/src/TPbk2TitlePaneOperator.cpp --- a/phonebookui/Phonebook2/ServerApplication/src/TPbk2TitlePaneOperator.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/ServerApplication/src/TPbk2TitlePaneOperator.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -20,7 +20,7 @@ // Phonebook 2 #include -#include +#include // Virtual Phonebook diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/ServerApplication/src/cpbk2preparemultipleassignphase.cpp --- a/phonebookui/Phonebook2/ServerApplication/src/cpbk2preparemultipleassignphase.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/ServerApplication/src/cpbk2preparemultipleassignphase.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -29,7 +29,7 @@ #include #include #include -#include +#include // Virtual Phonebook #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/UIControls/inc/CPbk2AdaptiveSearchGridFiller.h --- a/phonebookui/Phonebook2/UIControls/inc/CPbk2AdaptiveSearchGridFiller.h Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/UIControls/inc/CPbk2AdaptiveSearchGridFiller.h Tue Sep 14 20:54:53 2010 +0300 @@ -140,6 +140,9 @@ TBool GridFromPsEngineL( const MVPbkContactViewBase& aView ); // Check whether the title is empty or not. TBool IsActualTitleEmpty( const MVPbkViewContact& aContact ); + // Sort the Adaptive Search Grid. + void SortGridL( TBool aAddSpace ); + private: // Data /// Own: Containts adaptive search grid. @@ -180,7 +183,10 @@ /// Used to save the contacts' title which include drgraphs RPointerArray iDigraphContactsTitleArray; - + + /// Used to get the status of feature manager + TBool iFeatureManagerInitialized; + /// Own: Number of contacts in view TInt iViewItemCount; diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/UIControls/rss/Pbk2AddressSelect.rss --- a/phonebookui/Phonebook2/UIControls/rss/Pbk2AddressSelect.rss Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/UIControls/rss/Pbk2AddressSelect.rss Tue Sep 14 20:54:53 2010 +0300 @@ -17,7 +17,7 @@ #include "Pbk2AddressSelect.rh" -#include +#include // -------------------------------------------------------------------------- // Phone number select diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/UIControls/rss/Pbk2Settings.rss --- a/phonebookui/Phonebook2/UIControls/rss/Pbk2Settings.rss Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/UIControls/rss/Pbk2Settings.rss Tue Sep 14 20:54:53 2010 +0300 @@ -16,7 +16,7 @@ */ -#include +#include // -------------------------------------------------------------------------- diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/UIControls/src/CPbk2AdaptiveSearchGridFiller.cpp --- a/phonebookui/Phonebook2/UIControls/src/CPbk2AdaptiveSearchGridFiller.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/UIControls/src/CPbk2AdaptiveSearchGridFiller.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -124,6 +124,12 @@ delete iSearchString; delete iFindUtil; iDigraphContactsTitleArray.ResetAndDestroy(); + + if (iFeatureManagerInitialized) + { + // It can be safely called UnInitializeLib as it has been really intialized. + FeatureManager::UnInitializeLib(); // Decreases ref.count + } } @@ -150,6 +156,10 @@ { iKeyMap = HBufC::NewL( KAdaptiveSearchKeyMapGranularity ); iFindUtil = CFindUtil::NewL(); + + // Initialize feature manager + FeatureManager::InitializeLibL(); + iFeatureManagerInitialized = ETrue; // UI Language TLanguage uiLanguage = User::Language(); if ( uiLanguage != ELangJapanese && uiLanguage != ELangPrcChinese && @@ -414,40 +424,16 @@ void CPbk2AdaptiveSearchGridFiller::SetAdaptiveGridCharsL( const TInt aMaxSpacesNumber, const TInt aSearchStringSpacesNumber ) - { - TPtr ptr = iKeyMap->Des(); - - // Do upper case for all characters - ptr.UpperCase(); - CDesCArray* array = new (ELeave) CDesCArrayFlat( KAdaptiveSearchKeyMapGranularity ); - CleanupStack::PushL( array ); - TInt length = ptr.Length(); - - for( TInt ii = 0; ii < length; ii++ ) - { - array->AppendL( ptr.Mid( ii, 1 ) ); - } - - // Alphabetical sort - array->Sort( ECmpCollated ); - ptr.Zero(); - + { // Add space character only if: // - user typed already some characters in the find pane, // - and more spaces can be found in contacts than in the current search string, // - and space is not the last character in the search string. - if ( iSearchString->Length() > 0 - && aMaxSpacesNumber > aSearchStringSpacesNumber - && (*iSearchString)[iSearchString->Length() - 1] != TChar( ' ' ) ) - { - ptr.Append( TChar( ' ' ) ); - } - - for( TInt ii = 0; ii < length; ii++ ) - { - ptr.Append(array->MdcaPoint( ii )); - } - CleanupStack::PopAndDestroy();//array + TBool addSpace = ( iSearchString->Length() > 0 + && aMaxSpacesNumber > aSearchStringSpacesNumber + && (*iSearchString)[iSearchString->Length() - 1] != TChar( ' ' ) ); + + SortGridL( addSpace ); if( iCurrentGrid ) { @@ -479,6 +465,36 @@ } +void CPbk2AdaptiveSearchGridFiller::SortGridL( TBool aAddSpace ) + { + TPtr ptr = iKeyMap->Des(); + + // Do upper case for all characters + ptr.UpperCase(); + CDesCArray* array = new (ELeave) CDesCArrayFlat( KAdaptiveSearchKeyMapGranularity ); + CleanupStack::PushL( array ); + TInt length = ptr.Length(); + + for( TInt ii = 0; ii < length; ii++ ) + { + array->AppendL( ptr.Mid( ii, 1 ) ); + } + + // Alphabetical sort + array->Sort( ECmpCollated ); + ptr.Zero(); + + if ( aAddSpace ) + { + ptr.Append( TChar( ' ' ) ); + } + + for( TInt ii = 0; ii < length; ii++ ) + { + ptr.Append( array->MdcaPoint( ii ) ); + } + CleanupStack::PopAndDestroy();//array + } CDesC16Array* CPbk2AdaptiveSearchGridFiller::SplitContactFieldTextIntoArrayLC( const TDesC& aText ) @@ -512,7 +528,23 @@ // Scan for next word beg = end; } - + + // consonent based adaptive search: + if ( FeatureManager::FeatureSupported( KFeatureIdKorean ) ) + { + /* + When user has a contact with first name "??" and last name "?", + It should be displayed with "? ??" in Korea variant. + That means it should be found with search keyword, "?" or "??". + Thus, need to put the "? ??" in the item list which is delivered to FindUtil. + no need to care about just one word like "???" + */ + if ( array->MdcaCount() != 1 ) + { + array->AppendL( aText ); + } + } + return array; } @@ -749,6 +781,8 @@ iKeyMap = iKeyMap->ReAllocL( gridChars.Length() ); } iKeyMap->Des().Copy( gridChars ); + // Sort the grid, space is not needed + SortGridL( EFalse ); delete iCurrentGrid; iCurrentGrid = NULL; diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/UIControls/src/CPbk2AddItemToContactDlg.cpp --- a/phonebookui/Phonebook2/UIControls/src/CPbk2AddItemToContactDlg.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/UIControls/src/CPbk2AddItemToContactDlg.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -21,7 +21,7 @@ // Phonebook 2 #include #include -#include +#include #include #include #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/UIControls/src/CPbk2AddressSelect.cpp --- a/phonebookui/Phonebook2/UIControls/src/CPbk2AddressSelect.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/UIControls/src/CPbk2AddressSelect.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -28,8 +28,8 @@ #include #include #include -#include -#include +#include +#include #include #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/UIControls/src/CPbk2ContactEditorDateField.cpp --- a/phonebookui/Phonebook2/UIControls/src/CPbk2ContactEditorDateField.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/UIControls/src/CPbk2ContactEditorDateField.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -23,7 +23,7 @@ #include "MPbk2ContactEditorFieldVisitor.h" #include #include -#include +#include // Virtual Phonebook #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/UIControls/src/CPbk2ContactEditorDlgImpl.cpp --- a/phonebookui/Phonebook2/UIControls/src/CPbk2ContactEditorDlgImpl.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/UIControls/src/CPbk2ContactEditorDlgImpl.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -36,7 +36,7 @@ #include #include #include -#include +#include #include #include #include @@ -81,7 +81,7 @@ #include #include -#include +#include #include #include @@ -2400,6 +2400,7 @@ iDelayDelete = CIdle::NewL( CActive::EPriorityStandard ); } delete iAddressView; + iAddressView = NULL; } else { diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/UIControls/src/CPbk2ContactEditorEditContact.cpp --- a/phonebookui/Phonebook2/UIControls/src/CPbk2ContactEditorEditContact.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/UIControls/src/CPbk2ContactEditorEditContact.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -20,7 +20,7 @@ // Phonebook 2 #include "CPbk2InputAbsorber.h" -#include +#include #include #include #include @@ -37,7 +37,7 @@ #include #include #include -#include +#include // System includes #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/UIControls/src/CPbk2ContactEditorFieldArray.cpp --- a/phonebookui/Phonebook2/UIControls/src/CPbk2ContactEditorFieldArray.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/UIControls/src/CPbk2ContactEditorFieldArray.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -23,12 +23,12 @@ #include "Pbk2ContactEditorFieldFactory.h" #include "MPbk2ContactEditorField.h" #include "MPbk2ContactEditorUiBuilder.h" -#include +#include #include #include #include #include -#include +#include #include #include #include "TPbk2ContactEditorParams.h" @@ -47,7 +47,7 @@ #include #include #include -#include +#include #include #include #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/UIControls/src/CPbk2ContactEditorImageField.cpp --- a/phonebookui/Phonebook2/UIControls/src/CPbk2ContactEditorImageField.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/UIControls/src/CPbk2ContactEditorImageField.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -35,7 +35,7 @@ #include #include #include -#include +#include // System includes #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/UIControls/src/CPbk2ContactEditorNewContact.cpp --- a/phonebookui/Phonebook2/UIControls/src/CPbk2ContactEditorNewContact.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/UIControls/src/CPbk2ContactEditorNewContact.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -21,7 +21,7 @@ #include "CPbk2ContactEditorNewContact.h" // Phonebook 2 -#include +#include #include #include #include "CPbk2InputAbsorber.h" diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/UIControls/src/CPbk2ContactEditorRingtoneField.cpp --- a/phonebookui/Phonebook2/UIControls/src/CPbk2ContactEditorRingtoneField.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/UIControls/src/CPbk2ContactEditorRingtoneField.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -35,7 +35,7 @@ #include #include #include -#include +#include // System includes #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/UIControls/src/CPbk2ContactEditorSyncField.cpp --- a/phonebookui/Phonebook2/UIControls/src/CPbk2ContactEditorSyncField.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/UIControls/src/CPbk2ContactEditorSyncField.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -23,7 +23,7 @@ #include "MPbk2ContactEditorFieldVisitor.h" #include #include -#include +#include #include "Pbk2UIControls.hrh" // Virtual Phonebook diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/UIControls/src/CPbk2ContactEditorUIAddressField.cpp --- a/phonebookui/Phonebook2/UIControls/src/CPbk2ContactEditorUIAddressField.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/UIControls/src/CPbk2ContactEditorUIAddressField.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -22,12 +22,12 @@ #include "MPbk2ContactEditorFieldVisitor.h" #include "MPbk2ContactEditorUiBuilderExtension.h" #include "CPbk2IconInfoContainer.h" -#include +#include #include "MPbk2UIField.h" #include "Pbk2EditorLineIds.hrh" #include #include "CPbk2ContactEditorReadonlyField.h" -#include +#include // System includes #include #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/UIControls/src/CPbk2ContactEditorUIAddressHomeField.cpp --- a/phonebookui/Phonebook2/UIControls/src/CPbk2ContactEditorUIAddressHomeField.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/UIControls/src/CPbk2ContactEditorUIAddressHomeField.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -22,12 +22,12 @@ #include "MPbk2ContactEditorFieldVisitor.h" #include "MPbk2ContactEditorUiBuilderExtension.h" #include "CPbk2IconInfoContainer.h" -#include +#include #include "MPbk2UIField.h" #include "Pbk2EditorLineIds.hrh" #include #include "CPbk2ContactEditorReadonlyField.h" -#include +#include // System includes #include #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/UIControls/src/CPbk2ContactEditorUIAddressOfficeField.cpp --- a/phonebookui/Phonebook2/UIControls/src/CPbk2ContactEditorUIAddressOfficeField.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/UIControls/src/CPbk2ContactEditorUIAddressOfficeField.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -22,12 +22,12 @@ #include "MPbk2ContactEditorFieldVisitor.h" #include "MPbk2ContactEditorUiBuilderExtension.h" #include "CPbk2IconInfoContainer.h" -#include +#include #include "MPbk2UIField.h" #include "Pbk2EditorLineIds.hrh" #include #include "CPbk2ContactEditorReadonlyField.h" -#include +#include // System includes #include #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/UIControls/src/CPbk2ContactIconsUtils.cpp --- a/phonebookui/Phonebook2/UIControls/src/CPbk2ContactIconsUtils.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/UIControls/src/CPbk2ContactIconsUtils.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -29,7 +29,7 @@ #include #include -#include +#include #include #include "Pbk2NamesListExUID.h" diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/UIControls/src/CPbk2ContactInfoControl.cpp --- a/phonebookui/Phonebook2/UIControls/src/CPbk2ContactInfoControl.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/UIControls/src/CPbk2ContactInfoControl.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -26,7 +26,7 @@ #include "CPbk2ContactFieldDynamicProperties.h" #include "CPbk2ThumbnailLoader.h" #include "Pbk2TitlePanePictureFactory.h" -#include +#include #include #include #include @@ -57,7 +57,7 @@ #include #include #include -#include +#include // System includes #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/UIControls/src/CPbk2ContactInfoListBox.cpp --- a/phonebookui/Phonebook2/UIControls/src/CPbk2ContactInfoListBox.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/UIControls/src/CPbk2ContactInfoListBox.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -25,7 +25,7 @@ #include "CPbk2FieldListBoxModel.h" #include #include -#include +#include #include #include #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/UIControls/src/CPbk2ContactViewListBoxModel.cpp --- a/phonebookui/Phonebook2/UIControls/src/CPbk2ContactViewListBoxModel.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/UIControls/src/CPbk2ContactViewListBoxModel.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -30,7 +30,7 @@ #include #include #include -#include +#include #include #include #include "Pbk2NamesListExUID.h" diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/UIControls/src/CPbk2DefaultSavingStorageSettingItem.cpp --- a/phonebookui/Phonebook2/UIControls/src/CPbk2DefaultSavingStorageSettingItem.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/UIControls/src/CPbk2DefaultSavingStorageSettingItem.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/UIControls/src/CPbk2FetchDlg.cpp --- a/phonebookui/Phonebook2/UIControls/src/CPbk2FetchDlg.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/UIControls/src/CPbk2FetchDlg.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -30,7 +30,7 @@ #include #include #include -#include +#include #include #include #include @@ -1327,6 +1327,21 @@ // void CPbk2FetchDlg::RestoreSelectionsL() { + // Remove selections in all pages. Selections will be restored later. + // In case of sort order change the selections will be in a new position, + // that's why they need to be removed. + if ( iPages ) + { + const TInt pageCount = iPages->DlgPageCount(); + for ( TInt i = 0; i < pageCount; i++ ) + { + if ( iPages->DlgPageAt(i).Control().ContactsMarked() ) + { + iPages->DlgPageAt(i).Control().ClearMarks(); + } + } + } + if ( iResults ) { for ( TInt i = 0; i < iResults->Count(); ++i ) diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/UIControls/src/CPbk2FetchDlgGroupPage.cpp --- a/phonebookui/Phonebook2/UIControls/src/CPbk2FetchDlgGroupPage.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/UIControls/src/CPbk2FetchDlgGroupPage.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include // Virtual Phonebook diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/UIControls/src/CPbk2FetchDlgPage.cpp --- a/phonebookui/Phonebook2/UIControls/src/CPbk2FetchDlgPage.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/UIControls/src/CPbk2FetchDlgPage.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include // Virtual Phonebook diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/UIControls/src/CPbk2FieldAnalyzer.cpp --- a/phonebookui/Phonebook2/UIControls/src/CPbk2FieldAnalyzer.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/UIControls/src/CPbk2FieldAnalyzer.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -30,7 +30,7 @@ #include #include #include -#include +#include #include #include #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/UIControls/src/CPbk2FieldFormatter.cpp --- a/phonebookui/Phonebook2/UIControls/src/CPbk2FieldFormatter.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/UIControls/src/CPbk2FieldFormatter.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -21,7 +21,7 @@ #include #include #include -#include +#include // Virtual Phonebook #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/UIControls/src/CPbk2FieldListBoxModel.cpp --- a/phonebookui/Phonebook2/UIControls/src/CPbk2FieldListBoxModel.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/UIControls/src/CPbk2FieldListBoxModel.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -34,7 +34,7 @@ #include #include #include -#include +#include #include "Pbk2AddressTools.h" // Virtual Phonebook @@ -45,7 +45,7 @@ #include #include #include -#include +#include #include /// Unnamed namespace for local definitions diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/UIControls/src/CPbk2GeneralConfirmationQuery.cpp --- a/phonebookui/Phonebook2/UIControls/src/CPbk2GeneralConfirmationQuery.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/UIControls/src/CPbk2GeneralConfirmationQuery.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -22,7 +22,7 @@ #include #include #include -#include +#include // Virtual Phonebook #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/UIControls/src/CPbk2MemoryEntryDefaultsAssignDlg.cpp --- a/phonebookui/Phonebook2/UIControls/src/CPbk2MemoryEntryDefaultsAssignDlg.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/UIControls/src/CPbk2MemoryEntryDefaultsAssignDlg.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -23,7 +23,7 @@ #include "CPbk2FieldListBoxModel.h" #include #include -#include +#include #include #include #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/UIControls/src/CPbk2MemoryEntryDefaultsDlg.cpp --- a/phonebookui/Phonebook2/UIControls/src/CPbk2MemoryEntryDefaultsDlg.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/UIControls/src/CPbk2MemoryEntryDefaultsDlg.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -25,7 +25,7 @@ #include "CPbk2FieldSelector.h" #include #include -#include +#include #include #include #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/UIControls/src/CPbk2MemorySelectionSettingItem.cpp --- a/phonebookui/Phonebook2/UIControls/src/CPbk2MemorySelectionSettingItem.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/UIControls/src/CPbk2MemorySelectionSettingItem.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -25,7 +25,7 @@ #include #include #include -#include +#include // Virtual Phonebook #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/UIControls/src/CPbk2MergeConflictsDlg.cpp --- a/phonebookui/Phonebook2/UIControls/src/CPbk2MergeConflictsDlg.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/UIControls/src/CPbk2MergeConflictsDlg.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -29,7 +29,7 @@ #include #include #include -#include +#include #include #include #include "CPbk2MergeConflictsDlg.h" diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/UIControls/src/CPbk2MergePhotoConflictDlg.cpp --- a/phonebookui/Phonebook2/UIControls/src/CPbk2MergePhotoConflictDlg.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/UIControls/src/CPbk2MergePhotoConflictDlg.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -29,13 +29,13 @@ #include #include #include -#include +#include #include #include #include #include #include -#include +#include #include #include #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/UIControls/src/CPbk2NameOrderSettingItem.cpp --- a/phonebookui/Phonebook2/UIControls/src/CPbk2NameOrderSettingItem.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/UIControls/src/CPbk2NameOrderSettingItem.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -20,7 +20,7 @@ // INCLUDE FILES #include "CPbk2NameOrderSettingItem.h" // This class -#include +#include #include #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/UIControls/src/CPbk2NamesListControl.cpp --- a/phonebookui/Phonebook2/UIControls/src/CPbk2NamesListControl.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/UIControls/src/CPbk2NamesListControl.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -42,8 +42,8 @@ #include "CPbk2PredictiveSearchFilter.h" #include "cpbk2contactviewdoublelistbox.h" #include -#include -#include +#include +#include #include "CPbk2AppUi.h" // Virtual Phonebook diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/UIControls/src/CPbk2NamesListNotReadyState.cpp --- a/phonebookui/Phonebook2/UIControls/src/CPbk2NamesListNotReadyState.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/UIControls/src/CPbk2NamesListNotReadyState.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -23,7 +23,7 @@ #include "CPbk2ContactViewListBox.h" #include "CPbk2NamesListControl.h" #include -#include +#include // System includes #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/UIControls/src/CPbk2NamesListReadyState.cpp --- a/phonebookui/Phonebook2/UIControls/src/CPbk2NamesListReadyState.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/UIControls/src/CPbk2NamesListReadyState.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -2103,19 +2103,40 @@ PBK2_DEBUG_PRINT(PBK2_DEBUG_STRING ("CPbk2NamesListReadyState::RestoreMarkedItemsL: %d items"), aSelectedItems.Count() ); - - DisableRedrawEnablePushL(); - iListBox.ClearSelection(); + const TInt count = aSelectedItems.Count(); - for ( TInt i = 0; i < count; ++i ) + if ( count > 0 ) { - TInt index = iViewStack.IndexOfBookmarkL( aSelectedItems.At( i ) ) + CommandItemCount(); - if ( index >= 0 ) + CListBoxView::CSelectionIndexArray* updateSelections = + new(ELeave) CArrayFixFlat( count ); + CleanupStack::PushL( updateSelections ); + + // Get the index of each selected item. If one of items could not be found, break. + for ( TInt i = 0; i < count; ++i ) { - iListBox.View()->SelectItemL( index ); + TInt index = iViewStack.IndexOfBookmarkL( aSelectedItems.At( i ) ) + CommandItemCount(); + if ( index >= 0 ) + { + updateSelections->AppendL( index ); + } + else + { + break; + } } + + // If all the selected items can be found in iViewStack, update the list box. + // The list box will change nothing if some of selected items are not found in iViewStack. + if ( updateSelections->Count() == count ) + { + DisableRedrawEnablePushL(); + iListBox.ClearSelection(); + iListBox.SetSelectionIndexesL( updateSelections ); + CleanupStack::PopAndDestroy(); // DisableRedrawEnablePushL + } + + CleanupStack::PopAndDestroy( updateSelections ); // Destroy updateSelections } - CleanupStack::PopAndDestroy(); // DisableRedrawEnablePushL } // -------------------------------------------------------------------------- diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/UIControls/src/CPbk2PhonebookInfoDlg.cpp --- a/phonebookui/Phonebook2/UIControls/src/CPbk2PhonebookInfoDlg.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/UIControls/src/CPbk2PhonebookInfoDlg.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -21,7 +21,7 @@ #include "CPbk2StoreInfoItemBuilder.h" #include "MPbk2StoreInfoUiItem.h" -#include +#include #include #include #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/UIControls/src/CPbk2PredictiveSearchFilter.cpp --- a/phonebookui/Phonebook2/UIControls/src/CPbk2PredictiveSearchFilter.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/UIControls/src/CPbk2PredictiveSearchFilter.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -36,7 +36,7 @@ #include #include #include -#include +#include #include #include #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/UIControls/src/CPbk2ReadingFieldEditorVisitor.cpp --- a/phonebookui/Phonebook2/UIControls/src/CPbk2ReadingFieldEditorVisitor.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/UIControls/src/CPbk2ReadingFieldEditorVisitor.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -21,7 +21,7 @@ // Phonebook 2 #include #include -#include +#include // Virtual Phonebook #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/UIControls/src/CPbk2SelectFieldDlg.cpp --- a/phonebookui/Phonebook2/UIControls/src/CPbk2SelectFieldDlg.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/UIControls/src/CPbk2SelectFieldDlg.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include #include "CPbk2FieldAnalyzer.h" #include @@ -336,19 +336,28 @@ TKeyResponse CPbk2SelectFieldDlg::CPopupList::OfferKeyEventL (const TKeyEvent& aKeyEvent, TEventCode aType) { - // The focus can display after clicking on navigation key and MSK key. - // Then, both LSK and RSK should be visible. - // Check whether LSK is hidden, if yes, make it visible - if ( !ButtonGroupContainer()->IsCommandVisible( EAknSoftkeySelect ) ) - { - // Whether navigation key or MSK key is pressed. - if ( aKeyEvent.iCode == EKeyUpArrow - || aKeyEvent.iCode == EKeyDownArrow - || aKeyEvent.iCode == EKeyDevice3 ) + if ( aKeyEvent.iCode == EKeyEscape ) + { + // When the popup list is prompting for selection, if the user closes Phonebook application from FSW, + // the dialog is to be closed otherwise re-enter Phonebook would result in wrong UI behavior. + AttemptExitL( EFalse); + } + else + { + // The focus can display after clicking on navigation key and MSK key. + // Then, both LSK and RSK should be visible. + // Check whether LSK is hidden, if yes, make it visible + if ( !ButtonGroupContainer()->IsCommandVisible( EAknSoftkeySelect ) ) { - ButtonGroupContainer()->MakeCommandVisible( EAknSoftkeySelect, ETrue ); + // Whether navigation key or MSK key is pressed. + if ( aKeyEvent.iCode == EKeyUpArrow || aKeyEvent.iCode + == EKeyDownArrow || aKeyEvent.iCode == EKeyDevice3 ) + { + ButtonGroupContainer()->MakeCommandVisible( + EAknSoftkeySelect, ETrue ); + } } - } + } TKeyResponse response = ListBox()->OfferKeyEventL( aKeyEvent, aType ); return response; } diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/UIControls/src/CPbk2SettingsListControl.cpp --- a/phonebookui/Phonebook2/UIControls/src/CPbk2SettingsListControl.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/UIControls/src/CPbk2SettingsListControl.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -28,7 +28,7 @@ #include "Phonebook2PrivateCRKeys.h" // From Phonebook 2 -#include +#include #include #include #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/UIControls/src/CPbk2StoreInfoItemBuilder.cpp --- a/phonebookui/Phonebook2/UIControls/src/CPbk2StoreInfoItemBuilder.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/UIControls/src/CPbk2StoreInfoItemBuilder.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/UIControls/src/CPbk2StoreListQuery.cpp --- a/phonebookui/Phonebook2/UIControls/src/CPbk2StoreListQuery.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/UIControls/src/CPbk2StoreListQuery.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -22,7 +22,7 @@ #include -#include +#include #include #include #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/UIControls/src/CPbk2ThumbnailManager.cpp --- a/phonebookui/Phonebook2/UIControls/src/CPbk2ThumbnailManager.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/UIControls/src/CPbk2ThumbnailManager.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -44,7 +44,7 @@ #include //Pbk2 -#include +#include #include namespace { diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/UIControls/src/CPbk2ThumbnailPopup.cpp --- a/phonebookui/Phonebook2/UIControls/src/CPbk2ThumbnailPopup.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/UIControls/src/CPbk2ThumbnailPopup.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -28,7 +28,7 @@ #include #include #include -#include +#include // Virtual Phonebook #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/UIControls/src/CPbk2UIFieldArray.cpp --- a/phonebookui/Phonebook2/UIControls/src/CPbk2UIFieldArray.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/UIControls/src/CPbk2UIFieldArray.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -17,7 +17,7 @@ #include "CPbk2UIFieldArray.h" #include "CPbk2UIField.h" -#include +#include // Phonebook 2 #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/UIControls/src/Pbk2AddressTools.cpp --- a/phonebookui/Phonebook2/UIControls/src/Pbk2AddressTools.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/UIControls/src/Pbk2AddressTools.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -18,7 +18,7 @@ #include "Pbk2AddressTools.h" // Phonebook 2 -#include +#include #include "Pbk2UIFieldProperty.hrh" // Virtual Phonebook diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/UIControls/src/Pbk2ContactEditorFieldFactory.cpp --- a/phonebookui/Phonebook2/UIControls/src/Pbk2ContactEditorFieldFactory.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/UIControls/src/Pbk2ContactEditorFieldFactory.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -38,7 +38,7 @@ #include "CPbk2ContactEditorUIAddressOfficeField.h" #include #include "CPbk2IconInfoContainer.h" -#include +#include #include #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/UIControls/src/Pbk2ImageCommands.cpp --- a/phonebookui/Phonebook2/UIControls/src/Pbk2ImageCommands.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/UIControls/src/Pbk2ImageCommands.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -36,9 +36,9 @@ #include #include "Pbk2DataCaging.hrh" #include "Pbk2PresentationUtils.h" -#include -#include -#include +#include +#include +#include #include // MPbk2ImageSetObserver #include // MAknServerAppExitObserver @@ -49,7 +49,7 @@ #include #include #include -#include +#include // System includes #include @@ -60,7 +60,7 @@ #include #include // CDocumentHandler #include // TDataType -#include +#include #include #include #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/UIControls/src/Pbk2RingtoneCommands.cpp --- a/phonebookui/Phonebook2/UIControls/src/Pbk2RingtoneCommands.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/UIControls/src/Pbk2RingtoneCommands.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -29,9 +29,9 @@ #include #include -#include -#include -#include +#include +#include +#include // VPbk includes #include @@ -39,7 +39,7 @@ #include #include #include -#include +#include // System includes #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/UIControls/src/Pbk2TitlePanePictureFactory.cpp --- a/phonebookui/Phonebook2/UIControls/src/Pbk2TitlePanePictureFactory.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/UIControls/src/Pbk2TitlePanePictureFactory.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -25,7 +25,7 @@ #include #include #include -#include +#include // Virtual Phonebook #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/UIControls/src/TPbk2DeleteItemManager.cpp --- a/phonebookui/Phonebook2/UIControls/src/TPbk2DeleteItemManager.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/UIControls/src/TPbk2DeleteItemManager.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -21,7 +21,7 @@ // Phonebook 2 #include "MPbk2ContactEditorFieldArray.h" #include -#include +#include #include #include #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/UIControls/src/cpbk2predictiveviewstack.cpp --- a/phonebookui/Phonebook2/UIControls/src/cpbk2predictiveviewstack.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/UIControls/src/cpbk2predictiveviewstack.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -21,7 +21,7 @@ // Phonebook 2 / Virtual Phonebook #include #include -#include +#include #include #include #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/UIPolicy/src/CPbk2ContactCopyPolicy.cpp --- a/phonebookui/Phonebook2/UIPolicy/src/CPbk2ContactCopyPolicy.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/UIPolicy/src/CPbk2ContactCopyPolicy.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -29,7 +29,7 @@ #include #include #include -#include +#include // Virtual Phonebook #include @@ -48,7 +48,7 @@ #include #include #include -#include +#include // System includes #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/UIPolicy/src/CPbk2ContactDuplicatePolicy.cpp --- a/phonebookui/Phonebook2/UIPolicy/src/CPbk2ContactDuplicatePolicy.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/UIPolicy/src/CPbk2ContactDuplicatePolicy.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -27,7 +27,7 @@ #include #include "Pbk2DataCaging.hrh" #include "Pbk2PresentationUtils.h" -#include +#include #include #include #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/UIPolicy/src/CPbk2ContactFindPolicy.cpp --- a/phonebookui/Phonebook2/UIPolicy/src/CPbk2ContactFindPolicy.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/UIPolicy/src/CPbk2ContactFindPolicy.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -30,7 +30,7 @@ #include #include #include -#include +#include #include #include @@ -214,10 +214,9 @@ { FeatureManager::InitializeLibL(); TBool chinese = FeatureManager::FeatureSupported( KFeatureIdChinese ); + + TBool korean = FeatureManager::FeatureSupported( KFeatureIdKorean ); FeatureManager::UnInitializeLib(); - - TBool korean = (User::Language() == ELangKorean); - if ( chinese || korean ) { match = MatchChineseContactNameL( aFindWords, aContact ); diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/UIPolicy/src/CPbk2ContactViewSortPolicy.cpp --- a/phonebookui/Phonebook2/UIPolicy/src/CPbk2ContactViewSortPolicy.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/UIPolicy/src/CPbk2ContactViewSortPolicy.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -22,7 +22,7 @@ #include "CPbk2SortKeyArray.h" #include "RPbk2LocalizedResourceFile.h" #include "Pbk2DataCaging.hrh" -#include +#include // Virtual Phonebook #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/UIServices/src/CPbk2AiwAssignProvider.cpp --- a/phonebookui/Phonebook2/UIServices/src/CPbk2AiwAssignProvider.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/UIServices/src/CPbk2AiwAssignProvider.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -22,8 +22,8 @@ #include "CPbk2ServerAppConnection.h" #include "Pbk2UIServices.hrh" #include -#include -#include +#include +#include #include #include #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/USIMExtension/inc/Pbk2USimUI.rh --- a/phonebookui/Phonebook2/USIMExtension/inc/Pbk2USimUI.rh Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/USIMExtension/inc/Pbk2USimUI.rh Tue Sep 14 20:54:53 2010 +0300 @@ -49,7 +49,7 @@ { // VPBK_FIELD_TYPE_SELECTOR that defines the fields that are mapped from STRUCT sourceTypeSelector; - // The SIM field type resource id, from VPbkEng.rsg + // The SIM field type resource id, from vpbkeng.rsg LONG targetSimType; // Flags defined in Pbk2UsimUi.hrh BYTE flags = 0; diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/USIMExtension/rss/Pbk2USimSimCopy.rss --- a/phonebookui/Phonebook2/USIMExtension/rss/Pbk2USimSimCopy.rss Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/USIMExtension/rss/Pbk2USimSimCopy.rss Tue Sep 14 20:54:53 2010 +0300 @@ -15,7 +15,7 @@ * */ -#include +#include // ----------------------------------------------------------------------------- // diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/USIMExtension/rss/Pbk2USimUiRes.rss --- a/phonebookui/Phonebook2/USIMExtension/rss/Pbk2USimUiRes.rss Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/USIMExtension/rss/Pbk2USimUiRes.rss Tue Sep 14 20:54:53 2010 +0300 @@ -25,8 +25,8 @@ #include #include #include -#include -#include +#include +#include #include #include #include @@ -49,7 +49,7 @@ #include #include #include -#include +#include #include // System includes diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/USIMExtension/src/CPsu2ContactCopyInspector.cpp --- a/phonebookui/Phonebook2/USIMExtension/src/CPsu2ContactCopyInspector.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/USIMExtension/src/CPsu2ContactCopyInspector.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -25,7 +25,7 @@ #include #include #include -#include // field type res ids +#include // field type res ids CPsu2ContactCopyInspector::CPsu2ContactCopyInspector ( MPbk2ContactNameFormatter& aNameFormatter ) diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/USIMExtension/src/CPsu2ContactEditorExtension.cpp --- a/phonebookui/Phonebook2/USIMExtension/src/CPsu2ContactEditorExtension.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/USIMExtension/src/CPsu2ContactEditorExtension.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -22,9 +22,9 @@ #include "CPsu2CharConv.h" #include "CPsu2FdnContactEditorPhoneNumberField.h" #include -#include -#include -#include +#include +#include +#include #include #include #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/USIMExtension/src/CPsu2CopyAllToPbkCmd.cpp --- a/phonebookui/Phonebook2/USIMExtension/src/CPsu2CopyAllToPbkCmd.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/USIMExtension/src/CPsu2CopyAllToPbkCmd.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -34,11 +34,11 @@ #include /// Use R_PBK2_GENERAL_CONFIRMATION_QUERY from UI controls /// As a core components UiControl's resource file is loaded in core Pbk2 -#include -#include +#include +#include /// Use R_GENERAL_COPY_PROGRESS_NOTE from Commands /// As a core components Command's resource file is loaded in core Pbk2 -#include +#include #include #include #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/USIMExtension/src/CPsu2CopyFromPbkCmd.cpp --- a/phonebookui/Phonebook2/USIMExtension/src/CPsu2CopyFromPbkCmd.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/USIMExtension/src/CPsu2CopyFromPbkCmd.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -30,20 +30,20 @@ #include #include #include -#include -#include +#include +#include #include #include #include #include #include #include -#include +#include #include #include #include #include -#include +#include // Virtual Phonebook #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/USIMExtension/src/CPsu2CopyToSimCmd.cpp --- a/phonebookui/Phonebook2/USIMExtension/src/CPsu2CopyToSimCmd.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/USIMExtension/src/CPsu2CopyToSimCmd.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -29,12 +29,12 @@ #include #include #include -#include +#include #include #include #include #include -#include +#include // Virtual Phonebook #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/USIMExtension/src/CPsu2CopyToSimFieldInfoArray.cpp --- a/phonebookui/Phonebook2/USIMExtension/src/CPsu2CopyToSimFieldInfoArray.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/USIMExtension/src/CPsu2CopyToSimFieldInfoArray.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -23,8 +23,8 @@ #include #include -#include -#include +#include +#include #include #include @@ -34,7 +34,7 @@ #include #include #include -#include +#include namespace { @@ -86,9 +86,9 @@ MVPbkFieldTypeSelector& SourceTypeSelector() const; /** - * Returns the resource id (VPbkEng.rsg) of the target field type. + * Returns the resource id (vpbkeng.rsg) of the target field type. * - * @return the resource id (VPbkEng.rsg) of the target field type. + * @return the resource id (vpbkeng.rsg) of the target field type. */ TInt TargetFieldtypeResId() const; @@ -112,7 +112,7 @@ private: // Data /// Own: source field type selector CVPbkFieldTypeSelector* iSourceTypeSelector; - /// Own: target field type resource id (VPbkEng.rsg) + /// Own: target field type resource id (vpbkeng.rsg) TInt iTargetFieldTypeResId; /// Flags from Pbk2UsimUi.hrh TUint8 iFlags; diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/USIMExtension/src/CPsu2FixedDialingCall.cpp --- a/phonebookui/Phonebook2/USIMExtension/src/CPsu2FixedDialingCall.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/USIMExtension/src/CPsu2FixedDialingCall.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -23,7 +23,7 @@ #include "CPsu2NumberQueryDlg.h" #include #include -#include +#include #include #include #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/USIMExtension/src/CPsu2FixedDialingInfoView.cpp --- a/phonebookui/Phonebook2/USIMExtension/src/CPsu2FixedDialingInfoView.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/USIMExtension/src/CPsu2FixedDialingInfoView.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -27,10 +27,10 @@ #include #include #include -#include +#include #include #include -#include +#include #include #include #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/USIMExtension/src/CPsu2FixedDialingView.cpp --- a/phonebookui/Phonebook2/USIMExtension/src/CPsu2FixedDialingView.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/USIMExtension/src/CPsu2FixedDialingView.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -32,8 +32,8 @@ #include #include #include -#include -#include +#include +#include #include #include #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/USIMExtension/src/CPsu2LaunchViewCmd.cpp --- a/phonebookui/Phonebook2/USIMExtension/src/CPsu2LaunchViewCmd.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/USIMExtension/src/CPsu2LaunchViewCmd.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -21,7 +21,7 @@ // Phonebook 2 #include "CPsu2ViewManager.h" #include -#include +#include #include #include #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/USIMExtension/src/CPsu2NameListViewBase.cpp --- a/phonebookui/Phonebook2/USIMExtension/src/CPsu2NameListViewBase.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/USIMExtension/src/CPsu2NameListViewBase.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -28,9 +28,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include #include #include #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/USIMExtension/src/CPsu2NumberQueryDlg.cpp --- a/phonebookui/Phonebook2/USIMExtension/src/CPsu2NumberQueryDlg.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/USIMExtension/src/CPsu2NumberQueryDlg.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -19,8 +19,8 @@ // INCLUDE FILES #include "CPsu2NumberQueryDlg.h" -#include -#include +#include +#include // ============================ MEMBER FUNCTIONS =============================== diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/USIMExtension/src/CPsu2OwnNumberControl.cpp --- a/phonebookui/Phonebook2/USIMExtension/src/CPsu2OwnNumberControl.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/USIMExtension/src/CPsu2OwnNumberControl.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -21,7 +21,7 @@ // From Phonebook 2 #include "CPsu2OwnNumberListBoxModel.h" #include "Pbk2USIMUIUID.h" -#include +#include #include #include #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/USIMExtension/src/CPsu2OwnNumbersView.cpp --- a/phonebookui/Phonebook2/USIMExtension/src/CPsu2OwnNumbersView.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/USIMExtension/src/CPsu2OwnNumbersView.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/USIMExtension/src/CPsu2ServiceDialingInfoView.cpp --- a/phonebookui/Phonebook2/USIMExtension/src/CPsu2ServiceDialingInfoView.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/USIMExtension/src/CPsu2ServiceDialingInfoView.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -23,8 +23,8 @@ #include #include #include -#include -#include +#include +#include #include #include #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/USIMExtension/src/CPsu2ServiceDialingView.cpp --- a/phonebookui/Phonebook2/USIMExtension/src/CPsu2ServiceDialingView.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/USIMExtension/src/CPsu2ServiceDialingView.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -25,10 +25,10 @@ #include #include #include -#include +#include #include #include -#include +#include // System includes #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/USIMExtension/src/CPsu2SimContactProcessor.cpp --- a/phonebookui/Phonebook2/USIMExtension/src/CPsu2SimContactProcessor.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/USIMExtension/src/CPsu2SimContactProcessor.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -42,7 +42,7 @@ #include #include #include -#include +#include // System includes #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/USIMExtension/src/CPsu2ViewManager.cpp --- a/phonebookui/Phonebook2/USIMExtension/src/CPsu2ViewManager.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/USIMExtension/src/CPsu2ViewManager.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -25,11 +25,11 @@ #include "MPsu2ViewLaunchCallback.h" #include #include -#include +#include #include #include #include -#include +#include #include // Virtual Phonebook diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/USIMExtension/src/TPsu2SimCopyResults.cpp --- a/phonebookui/Phonebook2/USIMExtension/src/TPsu2SimCopyResults.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/USIMExtension/src/TPsu2SimCopyResults.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -20,8 +20,8 @@ #include "TPsu2SimCopyResults.h" // Phonebook 2 -#include -#include +#include +#include // System includes #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/USIMThinExtension/src/CPsu2CopySimContactsCmd.cpp --- a/phonebookui/Phonebook2/USIMThinExtension/src/CPsu2CopySimContactsCmd.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/USIMThinExtension/src/CPsu2CopySimContactsCmd.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -37,13 +37,13 @@ #include #include #include -#include +#include /// Use R_PBK2_GENERAL_CONFIRMATION_QUERY from UI controls /// As a core components UiControl's resource file is loaded in core Pbk2 -#include +#include /// Use R_GENERAL_COPY_PROGRESS_NOTE from Commands /// As a core components Command's resource file is loaded in core Pbk2 -#include +#include #include #include #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/USIMThinExtension/src/CPsu2ThinUIExtensionPlugin.cpp --- a/phonebookui/Phonebook2/USIMThinExtension/src/CPsu2ThinUIExtensionPlugin.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/USIMThinExtension/src/CPsu2ThinUIExtensionPlugin.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -22,8 +22,8 @@ // Phonebook 2 #include "CPsu2CopySimContactsCmd.h" #include -#include -#include +#include +#include #include #include #include "CPsu2CheckAvailabeSimStore.h" diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/ccapplication/ccacommlauncherplugin/data/ccappcommlauncherpluginrsc.rss --- a/phonebookui/Phonebook2/ccapplication/ccacommlauncherplugin/data/ccappcommlauncherpluginrsc.rss Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/ccapplication/ccacommlauncherplugin/data/ccappcommlauncherpluginrsc.rss Tue Sep 14 20:54:53 2010 +0300 @@ -26,7 +26,7 @@ #include #include -#include +#include #include #include #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/ccapplication/ccacommlauncherplugin/group/ccappcommlauncherplugin.mmp --- a/phonebookui/Phonebook2/ccapplication/ccacommlauncherplugin/group/ccappcommlauncherplugin.mmp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/ccapplication/ccacommlauncherplugin/group/ccappcommlauncherplugin.mmp Tue Sep 14 20:54:53 2010 +0300 @@ -53,7 +53,7 @@ APP_LAYER_SYSTEMINCLUDE SYSTEMINCLUDE /epoc32/include/ecom -SYSTEMINCLUDE ../../../inc //phonebook2/inc internal headers +SYSTEMINCLUDE ../../../inc ../../../commands/inc //phonebook2/inc internal headers USERINCLUDE ../../inc //ccapplication/inc USERINCLUDE ../../ccapp/ccapputil/inc @@ -74,15 +74,15 @@ LIBRARY servicehandler.lib // aiw LIBRARY ccapputil.lib LIBRARY bafl.lib -LIBRARY commonengine.lib//coneresourceloader +LIBRARY CommonEngine.lib//coneresourceloader LIBRARY eikctl.lib LIBRARY aknicon.lib LIBRARY egul.lib LIBRARY aknskinsrv.lib LIBRARY aknswallpaperutils.lib -LIBRARY aknlayout2scalable.lib +LIBRARY AknLayout2Scalable.lib LIBRARY aknlayout2.lib -LIBRARY cdlengine.lib +LIBRARY CdlEngine.lib LIBRARY eikcore.lib LIBRARY cone.lib LIBRARY flogger.lib @@ -100,7 +100,7 @@ // Dependencies to AVKON LIBRARY CdlEngine.lib LIBRARY touchfeedback.lib -LIBRARY FeatMgr.lib +LIBRARY featmgr.lib LIBRARY akntransitionutils.lib LIBRARY aknphysics.lib @@ -113,7 +113,7 @@ LIBRARY pbk2spbcontentprovider.lib LIBRARY charconv.lib -LIBRARY FontUtils.lib +LIBRARY fontutils.lib LIBRARY apgrfx.lib LIBRARY ws32.lib diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/ccapplication/ccacommlauncherplugin/inc/CCCAppCommLauncherPbkCmd.h --- a/phonebookui/Phonebook2/ccapplication/ccacommlauncherplugin/inc/CCCAppCommLauncherPbkCmd.h Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/ccapplication/ccacommlauncherplugin/inc/CCCAppCommLauncherPbkCmd.h Tue Sep 14 20:54:53 2010 +0300 @@ -76,6 +76,8 @@ void ExecutePbk2CmdAddImageL( const TDesC8& aContact ); void ExecutePbk2CmdDeleteL( const TDesC8& aContact ); TBool IsPbk2CommandRunning(); + //Close all the pending pbk2commands launched from CCA + void DeleteAllRunningCmd(); public: // from MVPbkContactStoreObserver diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/ccapplication/ccacommlauncherplugin/inc/ccappcommlaunchercontainer.h --- a/phonebookui/Phonebook2/ccapplication/ccacommlauncherplugin/inc/ccappcommlaunchercontainer.h Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/ccapplication/ccacommlauncherplugin/inc/ccappcommlaunchercontainer.h Tue Sep 14 20:54:53 2010 +0300 @@ -472,9 +472,6 @@ */ CCCaFactoryExtensionNotifier* iFactoryExtensionNotifier; - - TBool iLongTap; - /** * Owns - Input Blocker */ diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/ccapplication/ccacommlauncherplugin/src/CCCAppCommLauncherPbkCmd.cpp --- a/phonebookui/Phonebook2/ccapplication/ccacommlauncherplugin/src/CCCAppCommLauncherPbkCmd.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/ccapplication/ccacommlauncherplugin/src/CCCAppCommLauncherPbkCmd.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -33,6 +33,7 @@ #include #include #include +#include _LIT(KPbk2CommandsDllResFileName, "Pbk2Commands.rsc"); _LIT(KPbk2UiControlsDllResFileName, "Pbk2UiControls.rsc"); @@ -944,3 +945,25 @@ { return *iAppServices; } + +// -------------------------------------------------------------------------- +// CCCAppCommLauncherPbkCmd::DeleteAllRunningCmd +// -------------------------------------------------------------------------- +// +void CCCAppCommLauncherPbkCmd::DeleteAllRunningCmd() + { + //Close all the pending pbk2commands launched from CCA + if ( iPlugin.CommandState().IsRunning() ) + { + iPlugin.CommandState().SetNotRunning(); + if ( iCommandHandler ) + { + CPbk2CommandStore* cmdStore( iCommandHandler->CommandStore() ); + if ( cmdStore ) + { + cmdStore->DestroyAllCommands(); + } + } + } + } + diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/ccapplication/ccacommlauncherplugin/src/ccappcommlaunchercontainer.cpp --- a/phonebookui/Phonebook2/ccapplication/ccacommlauncherplugin/src/ccappcommlaunchercontainer.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/ccapplication/ccacommlauncherplugin/src/ccappcommlaunchercontainer.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -513,11 +513,10 @@ VPbkFieldTypeSelectorFactory::TVPbkContactActionTypeSelector contactActionType = iPlugin.Container().SelectedCommunicationMethod(); - - if ( !iLongTap && contactActionType + + if ( contactActionType == VPbkFieldTypeSelectorFactory::EFindOnMapSelector ) - { - iLongTap = ETrue; + { DoShowMapCmdL( (TPbk2CommandId)EPbk2ExtensionShowOnMap ); } else @@ -608,14 +607,7 @@ // void CCCAppCommLauncherContainer::HandleFindOnMapContactActionL() { - if ( !iLongTap ) - { - DoShowMapCmdL( (TPbk2CommandId)EPbk2ExtensionShowOnMap ); - } - else - { - iLongTap = EFalse; - } + DoShowMapCmdL( (TPbk2CommandId)EPbk2ExtensionShowOnMap ); } // ---------------------------------------------------------------------------- @@ -812,6 +804,13 @@ void CCCAppCommLauncherContainer::ContactInfoFetchedNotifyL( const CCmsContactFieldInfo& aContactFieldInfo) { + + //CloseAll Pending Pbk2Commands initiated by CCA. + if( iPbkCmd ) + { + iPbkCmd->DeleteAllRunningCmd(); + } + // update buttons iModel->UpdateAddressesValidationL( aContactFieldInfo ); iModel->FillButtonArrayL(); diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/ccapplication/ccacommlauncherplugin/src/ccappcommlauncherheadercontrol.cpp --- a/phonebookui/Phonebook2/ccapplication/ccacommlauncherplugin/src/ccappcommlauncherheadercontrol.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/ccapplication/ccacommlauncherplugin/src/ccappcommlauncherheadercontrol.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -459,15 +459,15 @@ case TPointerEvent::EButton1Down: { TCmsContactStore cntStore = iPlugin.ContactHandler().ContactStore(); - // Image selection popup - // Image selection popup should not be shown for contact's that belong to sdn store - // Image selection popup can be shown only if the default - // saving memory includes local contact db (contacts.cdb) or if the contact belongs to - // local contact DB - if( cntStore != ECmsContactStoreSdn - && IsPhoneMemoryInConfigurationL() - && (cntStore != ECmsContactStoreSim) - && iImage->Rect().Contains(aPointerEvent.iPosition) ) + // Image selection popup + // Image selection popup should not be shown for contact's that belong to sdn store / Sim Store + // Image selection popup can be shown for the contact that belongs to + // local contact DB / XSP Store + + if( ( (cntStore != ECmsContactStoreSdn) && (cntStore != ECmsContactStoreSim) ) + && + iImage->Rect().Contains(aPointerEvent.iPosition) + ) { // Show the feedback MTouchFeedback* feedback = MTouchFeedback::Instance(); diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/ccapplication/ccacommlauncherplugin/src/ccappcommlauncherheadertextorder.cpp --- a/phonebookui/Phonebook2/ccapplication/ccacommlauncherplugin/src/ccappcommlauncherheadertextorder.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/ccapplication/ccacommlauncherplugin/src/ccappcommlauncherheadertextorder.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -18,7 +18,7 @@ #include "ccappcommlauncherheaders.h" #include "cmscontact.h" #include -#include +#include #include #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/ccapplication/ccacommlauncherplugin/tsrc/ut_commlaunchercontacthandler/group/ut_commlaunchercontacthandler.mmp --- a/phonebookui/Phonebook2/ccapplication/ccacommlauncherplugin/tsrc/ut_commlaunchercontacthandler/group/ut_commlaunchercontacthandler.mmp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/ccapplication/ccacommlauncherplugin/tsrc/ut_commlaunchercontacthandler/group/ut_commlaunchercontacthandler.mmp Tue Sep 14 20:54:53 2010 +0300 @@ -48,7 +48,7 @@ LIBRARY euser.lib -LIBRARY stiftestinterface.lib +LIBRARY StifTestInterface.lib LIBRARY stiftestengine.lib LIBRARY flogger.lib LIBRARY centralrepository.lib diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/ccapplication/ccacontactorservice/group/ccacontactorservice.mmp --- a/phonebookui/Phonebook2/ccapplication/ccacontactorservice/group/ccacontactorservice.mmp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/ccapplication/ccacontactorservice/group/ccacontactorservice.mmp Tue Sep 14 20:54:53 2010 +0300 @@ -63,7 +63,7 @@ LIBRARY efsrv.lib LIBRARY bafl.lib LIBRARY aiwdialdata.lib //AIW -LIBRARY commonengine.lib +LIBRARY CommonEngine.lib LIBRARY servicehandler.lib //AIW LIBRARY sendui.lib LIBRARY ecom.lib diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/ccapplication/ccacontactorservice/src/ccacontactoremailoperation.cpp --- a/phonebookui/Phonebook2/ccapplication/ccacontactorservice/src/ccacontactoremailoperation.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/ccapplication/ccacontactorservice/src/ccacontactoremailoperation.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -77,9 +77,19 @@ // void CCCAContactorEmailOperation::ExecuteLD() { - CleanupStack::PushL(this); - CCCAMsgEditors::ExecuteL(KSenduiMtmSmtpUid, iParam, - iName); + CleanupStack::PushL(this); + + TInt err = KErrNone; + TRAP( err, + CCCAMsgEditors::ExecuteL( KSenduiMtmSmtpUid, iParam, iName ); + ); + + if ( KErrNone != err ) + { + // Show error note. + CCoeEnv::Static()->HandleError( err ); + } + CleanupStack::PopAndDestroy(this); } // Enf of File diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/ccapplication/ccacontactorservice/src/ccacontactorunieditoroperation.cpp --- a/phonebookui/Phonebook2/ccapplication/ccacontactorservice/src/ccacontactorunieditoroperation.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/ccapplication/ccacontactorservice/src/ccacontactorunieditoroperation.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -79,8 +79,19 @@ void CCCAContactorUniEditorOperation::ExecuteLD() { CleanupStack::PushL(this); + + TInt err = KErrNone; + TRAP( err, CCCAMsgEditors::ExecuteL (KSenduiMtmUniMessageUid, iParam, iName); + ); + + if ( KErrNone != err ) + { + // Show error note. + CCoeEnv::Static()->HandleError( err ); + } + CleanupStack::PopAndDestroy(this); } // End of File diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/ccapplication/ccadetailsviewplugin/data/ccappdetailsviewpluginrsc.rss --- a/phonebookui/Phonebook2/ccapplication/ccadetailsviewplugin/data/ccappdetailsviewpluginrsc.rss Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/ccapplication/ccadetailsviewplugin/data/ccappdetailsviewpluginrsc.rss Tue Sep 14 20:54:53 2010 +0300 @@ -26,7 +26,7 @@ #include #include -#include +#include #include #include #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/ccapplication/ccadetailsviewplugin/group/ccappdetailsviewplugin.mmp --- a/phonebookui/Phonebook2/ccapplication/ccadetailsviewplugin/group/ccappdetailsviewplugin.mmp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/ccapplication/ccadetailsviewplugin/group/ccappdetailsviewplugin.mmp Tue Sep 14 20:54:53 2010 +0300 @@ -58,7 +58,7 @@ LIBRARY ecom.lib LIBRARY VPbkEng.lib LIBRARY Pbk2Presentation.lib -LIBRARY Pbk2UIControls.lib +LIBRARY pbk2uicontrols.lib LIBRARY Pbk2CommonUI.lib LIBRARY Pbk2UIExt.lib LIBRARY Pbk2Commands.lib @@ -72,7 +72,7 @@ LIBRARY aknskins.lib LIBRARY eikcoctl.lib LIBRARY servicehandler.lib // aiw -LIBRARY commonengine.lib +LIBRARY CommonEngine.lib LIBRARY CdlEngine.lib LIBRARY AknLayout2Scalable.lib LIBRARY cone.lib @@ -80,7 +80,7 @@ LIBRARY eikctl.lib LIBRARY ws32.lib LIBRARY mnclientlib.lib -LIBRARY SpdCtrl.lib +LIBRARY spdctrl.lib DEBUGLIBRARY flogger.lib LIBRARY ccacontactorservice.lib diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/ccapplication/ccadetailsviewplugin/src/ccappdetailsviewcontainer.cpp --- a/phonebookui/Phonebook2/ccapplication/ccadetailsviewplugin/src/ccappdetailsviewcontainer.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/ccapplication/ccadetailsviewplugin/src/ccappdetailsviewcontainer.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -32,7 +32,7 @@ #include // PhoneBook2 -#include +#include #include #include #include @@ -62,7 +62,7 @@ #include #include -#include +#include /// Unnamed namespace for local definitions namespace { diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/ccapplication/ccadetailsviewplugin/src/ccappdetailsviewlistboxmodel.cpp --- a/phonebookui/Phonebook2/ccapplication/ccadetailsviewplugin/src/ccappdetailsviewlistboxmodel.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/ccapplication/ccadetailsviewplugin/src/ccappdetailsviewlistboxmodel.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -60,14 +60,13 @@ #include #include #include - #include #include #include -#include -#include +#include +#include #include "ccappdetailsviewlistboxmodel.h" #include "ccappdetailsviewdefs.h" diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/ccapplication/ccamycardplugin/data/ccappmycardpluginrsc.rss --- a/phonebookui/Phonebook2/ccapplication/ccamycardplugin/data/ccappmycardpluginrsc.rss Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/ccapplication/ccamycardplugin/data/ccappmycardpluginrsc.rss Tue Sep 14 20:54:53 2010 +0300 @@ -21,7 +21,7 @@ // INCLUDES #include -#include +#include #include #include @@ -40,7 +40,7 @@ #include "ccappmycard.hrh" // includes for the field resource -#include +#include #include #include #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/ccapplication/ccamycardplugin/group/ccappmycardplugin.mmp --- a/phonebookui/Phonebook2/ccapplication/ccamycardplugin/group/ccappmycardplugin.mmp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/ccapplication/ccamycardplugin/group/ccappmycardplugin.mmp Tue Sep 14 20:54:53 2010 +0300 @@ -68,17 +68,17 @@ LIBRARY ecom.lib LIBRARY bafl.lib LIBRARY aknicon.lib -LIBRARY commonengine.lib +LIBRARY CommonEngine.lib LIBRARY eikcoctl.lib LIBRARY servicehandler.lib -LIBRARY cdlengine.lib +LIBRARY CdlEngine.lib LIBRARY aknlayout2.lib LIBRARY featmgr.lib LIBRARY AknLayout2Scalable.lib -LIBRARY vpbkeng.lib -LIBRARY pbk2presentation.lib -LIBRARY pbk2commonui.lib +LIBRARY VPbkEng.lib +LIBRARY Pbk2Presentation.lib +LIBRARY Pbk2CommonUI.lib LIBRARY pbk2uicontrols.lib LIBRARY Pbk2Commands.lib LIBRARY ccapputil.lib diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/ccapplication/ccamycardplugin/inc/ccappmycardimageloader.h --- a/phonebookui/Phonebook2/ccapplication/ccamycardplugin/inc/ccappmycardimageloader.h Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/ccapplication/ccamycardplugin/inc/ccappmycardimageloader.h Tue Sep 14 20:54:53 2010 +0300 @@ -18,7 +18,7 @@ #ifndef CCAPPMYCARDIMAGELOADER_H #define CCAPPMYCARDIMAGELOADER_H -#include +#include class MVPbkStoreContact; class CCCAppImageDecoding; diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/ccapplication/ccamycardplugin/src/ccappmycard.cpp --- a/phonebookui/Phonebook2/ccapplication/ccamycardplugin/src/ccappmycard.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/ccapplication/ccamycardplugin/src/ccappmycard.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -39,7 +39,7 @@ #include #include #include -#include +#include #include #include #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/ccapplication/ccamycardplugin/src/ccappmycardcontainer.cpp --- a/phonebookui/Phonebook2/ccapplication/ccamycardplugin/src/ccappmycardcontainer.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/ccapplication/ccamycardplugin/src/ccappmycardcontainer.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -30,7 +30,7 @@ #include #include #include -#include +#include #include #include #include @@ -56,13 +56,13 @@ #include #include #include -#include +#include #include "MVPbkFieldType.h" #include #include #include #include -#include +#include #include #include #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/ccapplication/ccamycardplugin/src/ccappmycardimageloader.cpp --- a/phonebookui/Phonebook2/ccapplication/ccamycardplugin/src/ccappmycardimageloader.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/ccapplication/ccamycardplugin/src/ccappmycardimageloader.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -25,7 +25,7 @@ #include #include -#include +#include #include #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/ccapplication/ccamycardplugin/src/ccappmycardplugin.cpp --- a/phonebookui/Phonebook2/ccapplication/ccamycardplugin/src/ccappmycardplugin.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/ccapplication/ccamycardplugin/src/ccappmycardplugin.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -24,7 +24,7 @@ #include "ccappmycard.hrh" #include #include -#include +#include #include #include #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/ccapplication/ccapp/ccapputil/group/ccapputil.mmp --- a/phonebookui/Phonebook2/ccapplication/ccapp/ccapputil/group/ccapputil.mmp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/ccapplication/ccapp/ccapputil/group/ccapputil.mmp Tue Sep 14 20:54:53 2010 +0300 @@ -46,7 +46,7 @@ LIBRARY bafl.lib LIBRARY euser.lib LIBRARY flogger.lib -LIBRARY commonengine.lib//coneresourceloader +LIBRARY CommonEngine.lib//coneresourceloader LIBRARY cmsclient.lib//cms wrapper LIBRARY ccaclient.lib//cms wrapper LIBRARY avkon.lib//avkon view/container @@ -57,8 +57,8 @@ LIBRARY pbk2spbcontentprovider.lib // CSpbContentProvider LIBRARY Pbk2Presentation.lib // TPbk2IconId LIBRARY egul.lib // CGulIcon -LIBRARY AknSkins.lib -LIBRARY cdlengine.lib +LIBRARY aknskins.lib +LIBRARY CdlEngine.lib LIBRARY aknlayout2.lib LIBRARY touchfeedback.lib LIBRARY ecom.lib diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/ccapplication/ccapp/group/ccaapp.mmp --- a/phonebookui/Phonebook2/ccapplication/ccapp/group/ccaapp.mmp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/ccapplication/ccapp/group/ccaapp.mmp Tue Sep 14 20:54:53 2010 +0300 @@ -81,7 +81,7 @@ LIBRARY bafl.lib LIBRARY apgrfx.lib LIBRARY efsrv.lib -LIBRARY AknIcon.lib +LIBRARY aknicon.lib LIBRARY ccaclient.lib LIBRARY centralrepository.lib LIBRARY cmsclient.lib @@ -90,7 +90,7 @@ LIBRARY hlplch.lib LIBRARY ccapputil.lib LIBRARY CdlEngine.lib -LIBRARY AknLayout2.lib +LIBRARY aknlayout2.lib LIBRARY ws32.lib LIBRARY Pbk2CommonUI.lib LIBRARY VPbkEng.lib diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/ccapplication/ccapp/src/ccapppluginloader.cpp --- a/phonebookui/Phonebook2/ccapplication/ccapp/src/ccapppluginloader.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/ccapplication/ccapp/src/ccapppluginloader.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -22,7 +22,7 @@ #include #include -#include +#include #include #include #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/ccapplication/ccapp/tsrc/ut_cmscontactfetcher/group/ut_cmscontactfetcher.mmp --- a/phonebookui/Phonebook2/ccapplication/ccapp/tsrc/ut_cmscontactfetcher/group/ut_cmscontactfetcher.mmp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/ccapplication/ccapp/tsrc/ut_cmscontactfetcher/group/ut_cmscontactfetcher.mmp Tue Sep 14 20:54:53 2010 +0300 @@ -51,7 +51,7 @@ LIBRARY euser.lib -LIBRARY stiftestinterface.lib +LIBRARY StifTestInterface.lib LIBRARY stiftestengine.lib LIBRARY flogger.lib diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/group/Pbk2Commands.mmp --- a/phonebookui/Phonebook2/group/Pbk2Commands.mmp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/group/Pbk2Commands.mmp Tue Sep 14 20:54:53 2010 +0300 @@ -86,8 +86,8 @@ LIBRARY bafl.lib hlplch.lib eikcore.lib // Dependencies to S60 platform components -LIBRARY Avkon.lib CommonEngine.lib FeatMgr.lib -LIBRARY ServiceHandler.lib FileList.lib +LIBRARY avkon.lib CommonEngine.lib featmgr.lib +LIBRARY servicehandler.lib filelist.lib LIBRARY centralrepository.lib LIBRARY sysutil.lib efsrv.lib LIBRARY aiwdialdata.lib @@ -95,7 +95,7 @@ // Dependencies to Phonebook LIBRARY VPbkEng.lib -LIBRARY Pbk2UIControls.lib Pbk2Presentation.lib +LIBRARY pbk2uicontrols.lib Pbk2Presentation.lib LIBRARY Pbk2CommonUI.lib Pbk2UIExt.lib // Depencency to Phonebook profiling library diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/group/Pbk2CommandsExtension.mmp --- a/phonebookui/Phonebook2/group/Pbk2CommandsExtension.mmp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/group/Pbk2CommandsExtension.mmp Tue Sep 14 20:54:53 2010 +0300 @@ -100,13 +100,13 @@ LIBRARY imageconversion.lib fbscli.lib // Dependencies to S60 components -LIBRARY Avkon.lib CommonEngine.lib BrowserLauncher.lib SendUI.lib FeatMgr.lib -LIBRARY MGFetch.lib SpdCtrl.lib -LIBRARY CommonUI.lib +LIBRARY avkon.lib CommonEngine.lib browserlauncher.lib sendui.lib featmgr.lib +LIBRARY mgfetch.lib spdctrl.lib +LIBRARY commonui.lib // Dependencies to Phonebook LIBRARY VPbkEng.lib VPbkVCardEng.lib Pbk2Commands.lib -LIBRARY Pbk2UIControls.lib Pbk2Presentation.lib +LIBRARY pbk2uicontrols.lib Pbk2Presentation.lib LIBRARY Pbk2CommonUI.lib Pbk2UIExt.lib LIBRARY pbk2rclengine.lib diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/group/Pbk2CommonUI.mmp --- a/phonebookui/Phonebook2/group/Pbk2CommonUI.mmp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/group/Pbk2CommonUI.mmp Tue Sep 14 20:54:53 2010 +0300 @@ -94,17 +94,17 @@ // Dependencies to Symbian OS components LIBRARY euser.lib bafl.lib apparc.lib LIBRARY cone.lib eikcore.lib eikcoctl.lib egul.lib -LIBRARY efsrv.lib CentralRepository.lib +LIBRARY efsrv.lib centralrepository.lib LIBRARY estor.lib ecom.lib LIBRARY fbscli.lib // Dependencies to S60 platform components -LIBRARY avkon.lib AknSkins.lib CommonEngine.lib +LIBRARY avkon.lib aknskins.lib CommonEngine.lib LIBRARY aknicon.lib AknLayout2Scalable.lib CdlEngine.lib LIBRARY apgrfx.lib apmime.lib -LIBRARY FeatMgr.lib -LIBRARY DrmHelper.lib DrmRights.lib DrmCommon.lib -LIBRARY mediafilelist.lib +LIBRARY featmgr.lib +LIBRARY DrmHelper.lib DrmRights.lib DRMCommon.lib +LIBRARY MediaFileList.lib // Dependencies to Phonebook LIBRARY VPbkEng.lib @@ -116,7 +116,7 @@ #endif // PBK2_ENABLE_PROFILE #ifdef RD_DRM_COMMON_INTERFACE_FOR_OMA_AND_WMDRM -LIBRARY drmutility.lib +LIBRARY DRMUtility.lib #endif // End of File diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/group/Pbk2GroupExtension.mmp --- a/phonebookui/Phonebook2/group/Pbk2GroupExtension.mmp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/group/Pbk2GroupExtension.mmp Tue Sep 14 20:54:53 2010 +0300 @@ -78,15 +78,15 @@ APP_LAYER_SYSTEMINCLUDE // Dependencies to Symbian OS components -LIBRARY euser.lib commonengine.lib +LIBRARY euser.lib CommonEngine.lib LIBRARY cone.lib eikcoctl.lib bafl.lib eikctl.lib eikdlg.lib eikcore.lib LIBRARY efsrv.lib ecom.lib // Dependencies to S60 components -LIBRARY Avkon.lib FeatMgr.lib sendui.lib touchfeedback.lib +LIBRARY avkon.lib featmgr.lib sendui.lib touchfeedback.lib // Dependencies to Phonebook -LIBRARY Pbk2CommonUi.lib Pbk2UiControls.lib Pbk2Commands.lib +LIBRARY Pbk2CommonUI.lib pbk2uicontrols.lib Pbk2Commands.lib LIBRARY Pbk2Presentation.lib VPbkEng.lib LIBRARY CdlEngine.lib // End of File diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/group/Pbk2MMCExtension.mmp --- a/phonebookui/Phonebook2/group/Pbk2MMCExtension.mmp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/group/Pbk2MMCExtension.mmp Tue Sep 14 20:54:53 2010 +0300 @@ -70,19 +70,19 @@ APP_LAYER_SYSTEMINCLUDE // Dependencies to Symbian OS components -LIBRARY euser.lib commonengine.lib +LIBRARY euser.lib CommonEngine.lib LIBRARY efsrv.lib estor.lib ecom.lib LIBRARY cone.lib LIBRARY eikcoctl.lib eikcore.lib // Dependencies to S60 components -LIBRARY Avkon.lib PlatformEnv.lib +LIBRARY avkon.lib platformenv.lib #ifdef RD_MULTIPLE_DRIVE -LIBRARY CommonDialogs.lib +LIBRARY commondialogs.lib #endif // RD_MULTIPLE_DRIVE // Dependencies to Phonebook LIBRARY Pbk2Presentation.lib Pbk2Commands.lib -LIBRARY Pbk2CommonUi.lib VPbkVCardEng.lib VPbkEng.lib +LIBRARY Pbk2CommonUI.lib VPbkVCardEng.lib VPbkEng.lib // End of File diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/group/Pbk2MapExtension.mmp --- a/phonebookui/Phonebook2/group/Pbk2MapExtension.mmp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/group/Pbk2MapExtension.mmp Tue Sep 14 20:54:53 2010 +0300 @@ -62,17 +62,17 @@ APP_LAYER_SYSTEMINCLUDE // Dependencies to Symbian OS components -LIBRARY euser.lib commonengine.lib cone.lib +LIBRARY euser.lib CommonEngine.lib cone.lib LIBRARY efsrv.lib estor.lib ecom.lib bafl.lib // Dependencies to Symbian OS components LIBRARY eikcoctl.lib eikcore.lib eikctl.lib // Dependencies to S60 components -LIBRARY lbs.lib servicehandler.lib eposlandmarks.lib Avkon.lib +LIBRARY lbs.lib servicehandler.lib eposlandmarks.lib avkon.lib LIBRARY mnservicelib.lib mnclientlib.lib // Dependencies to Phonebook -LIBRARY Pbk2CommonUi.lib VPbkEng.lib Pbk2Commands.lib Pbk2UIControls.lib +LIBRARY Pbk2CommonUI.lib VPbkEng.lib Pbk2Commands.lib pbk2uicontrols.lib // End of File diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/group/Pbk2MigrationSupport.mmp --- a/phonebookui/Phonebook2/group/Pbk2MigrationSupport.mmp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/group/Pbk2MigrationSupport.mmp Tue Sep 14 20:54:53 2010 +0300 @@ -51,6 +51,6 @@ LIBRARY euser.lib ecom.lib // Dependencies to S60 components -LIBRARY PbkView.lib VPbkEng.lib Pbk2CommonUi.lib +LIBRARY pbkview.lib VPbkEng.lib Pbk2CommonUI.lib // End of File diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/group/Pbk2NamesListExtension.mmp --- a/phonebookui/Phonebook2/group/Pbk2NamesListExtension.mmp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/group/Pbk2NamesListExtension.mmp Tue Sep 14 20:54:53 2010 +0300 @@ -87,25 +87,25 @@ END // Dependencies to Symbian OS components -LIBRARY euser.lib commonengine.lib +LIBRARY euser.lib CommonEngine.lib LIBRARY cone.lib bafl.lib LIBRARY efsrv.lib ecom.lib // Dependencies to S60 components -LIBRARY Avkon.lib FeatMgr.lib sendui.lib CdlEngine.lib +LIBRARY avkon.lib featmgr.lib sendui.lib CdlEngine.lib LIBRARY eikctl.lib eikdlg.lib eikcore.lib eikcoctl.lib bsclient.lib serviceprovidersettings.lib //CCA LIBRARY ccaclient.lib // Dependencies to Phonebook -LIBRARY Pbk2CommonUi.lib Pbk2UiControls.lib Pbk2Commands.lib Pbk2UIExt.lib +LIBRARY Pbk2CommonUI.lib pbk2uicontrols.lib Pbk2Commands.lib Pbk2UIExt.lib LIBRARY pbk2rclengine.lib LIBRARY Pbk2Presentation.lib VPbkEng.lib pbk2spbcontentprovider.lib LIBRARY centralrepository.lib touchfeedback.lib LIBRARY fbscli.lib LIBRARY egul.lib LIBRARY contactpresence.lib -LIBRARY AknLayout2.lib AknLayout2Scalable.lib +LIBRARY aknlayout2.lib AknLayout2Scalable.lib LIBRARY estor.lib LIBRARY ws32.lib diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/group/Pbk2Presentation.mmp --- a/phonebookui/Phonebook2/group/Pbk2Presentation.mmp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/group/Pbk2Presentation.mmp Tue Sep 14 20:54:53 2010 +0300 @@ -133,12 +133,12 @@ APP_LAYER_SYSTEMINCLUDE // Dependencies to Symbian OS components -LIBRARY euser.lib efsrv.lib bafl.lib CentralRepository.lib +LIBRARY euser.lib efsrv.lib bafl.lib centralrepository.lib LIBRARY cone.lib fbscli.lib imageconversion.lib bitmaptransforms.lib // Dependencies to S60 components -LIBRARY FeatMgr.lib -LIBRARY avkon.lib eikcdlg.lib eikctl.lib CommonEngine.lib AknIcon.lib +LIBRARY featmgr.lib +LIBRARY avkon.lib eikcdlg.lib eikctl.lib CommonEngine.lib aknicon.lib // Dependencies to Phonebook LIBRARY VPbkEng.lib diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/group/Pbk2ServerApp.mmp --- a/phonebookui/Phonebook2/group/Pbk2ServerApp.mmp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/group/Pbk2ServerApp.mmp Tue Sep 14 20:54:53 2010 +0300 @@ -122,13 +122,13 @@ LIBRARY AknLayout2Scalable.lib CdlEngine.lib // Dependencies to S60 platform components -LIBRARY Avkon.lib CentralRepository.lib FeatMgr.lib -LIBRARY CommonEngine.lib AknSkins.lib +LIBRARY avkon.lib centralrepository.lib featmgr.lib +LIBRARY CommonEngine.lib aknskins.lib LIBRARY serviceprovidersettings.lib LIBRARY contactpresence.lib // Dependencies Phonebook -LIBRARY VPbkEng.lib Pbk2CommonUi.lib Pbk2UiExt.lib Pbk2Presentation.lib -LIBRARY Pbk2UiControls.lib Pbk2Commands.lib Pbk2CommonUtility.lib +LIBRARY VPbkEng.lib Pbk2CommonUI.lib Pbk2UIExt.lib Pbk2Presentation.lib +LIBRARY pbk2uicontrols.lib Pbk2Commands.lib Pbk2CommonUtility.lib // End of File diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/group/Pbk2UIControls.mmp --- a/phonebookui/Phonebook2/group/Pbk2UIControls.mmp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/group/Pbk2UIControls.mmp Tue Sep 14 20:54:53 2010 +0300 @@ -183,26 +183,26 @@ // Dependencies to Symbian OS components LIBRARY euser.lib cone.lib bafl.lib eikdlg.lib bitmaptransforms.lib LIBRARY eikcoctl.lib eikctl.lib eikcore.lib estor.lib fbscli.lib ecom.lib -LIBRARY CentralRepository.lib efsrv.lib egul.lib -LIBRARY hlplch.lib findutil.lib charconv.lib +LIBRARY centralrepository.lib efsrv.lib egul.lib +LIBRARY hlplch.lib FindUtil.lib charconv.lib LIBRARY form.lib etext.lib // Dependencies to AVKON -LIBRARY Avkon.lib AknSkins.lib -LIBRARY CdlEngine.lib AknJapaneseReading.lib -LIBRARY AknLayout2.lib AknLayout2Scalable.lib AknIcon.lib +LIBRARY avkon.lib aknskins.lib +LIBRARY CdlEngine.lib aknjapanesereading.lib +LIBRARY aknlayout2.lib AknLayout2Scalable.lib aknicon.lib LIBRARY touchfeedback.lib LIBRARY serviceprovidersettings.lib LIBRARY rcse.lib // Dependencies to S60 platform components -LIBRARY commonengine.lib FeatMgr.lib numbergrouping.lib +LIBRARY CommonEngine.lib featmgr.lib numbergrouping.lib LIBRARY DrmParsers.lib DrmDcf.lib DrmRights.lib LIBRARY DrmServerInterfaces.lib LIBRARY DRMCommon.lib -LIBRARY apparc.lib MGFetch.lib CommonUI.lib apmime.lib sysutil.lib +LIBRARY apparc.lib mgfetch.lib commonui.lib apmime.lib sysutil.lib // Dependencies to other Phonebook components LIBRARY VPbkEng.lib Pbk2Presentation.lib Pbk2UIExt.lib Pbk2CommonUI.lib @@ -222,6 +222,8 @@ LIBRARY akntransitionutils.lib LIBRARY aknphysics.lib -LIBRARY aknpictograph.lib +LIBRARY aknpictograph.lib +LIBRARY featmgr.lib + // End of File diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/group/Pbk2UIExtensionManager.mmp --- a/phonebookui/Phonebook2/group/Pbk2UIExtensionManager.mmp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/group/Pbk2UIExtensionManager.mmp Tue Sep 14 20:54:53 2010 +0300 @@ -70,13 +70,13 @@ // Dependencies to Symbian OS components LIBRARY euser.lib ecom.lib efsrv.lib cone.lib bafl.lib LIBRARY eikcoctl.lib eikcore.lib -LIBRARY FeatMgr.lib +LIBRARY featmgr.lib // Dependencies to S60 platform components LIBRARY avkon.lib // Dependencies to Phonebook components -LIBRARY Pbk2Presentation.lib Pbk2CommonUi.lib +LIBRARY Pbk2Presentation.lib Pbk2CommonUI.lib #ifdef PBK2_ENABLE_PROFILE // Depencency to Phonebook profiling library diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/group/Pbk2UIPolicy.mmp --- a/phonebookui/Phonebook2/group/Pbk2UIPolicy.mmp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/group/Pbk2UIPolicy.mmp Tue Sep 14 20:54:53 2010 +0300 @@ -75,7 +75,7 @@ // Dependencies to S60 platform components LIBRARY SortUtil.lib FindUtil.lib -LIBRARY FeatMgr.lib +LIBRARY featmgr.lib // Dependencies to Phonebook LIBRARY VPbkEng.lib Pbk2Presentation.lib diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/group/Pbk2UIServices.mmp --- a/phonebookui/Phonebook2/group/Pbk2UIServices.mmp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/group/Pbk2UIServices.mmp Tue Sep 14 20:54:53 2010 +0300 @@ -68,8 +68,8 @@ LIBRARY cone.lib eikcoctl.lib estor.lib efsrv.lib // Dependencies to S60 platform components -LIBRARY Avkon.lib ServiceHandler.lib -LIBRARY FeatMgr.lib +LIBRARY avkon.lib servicehandler.lib +LIBRARY featmgr.lib // Dependencies to Phonebook LIBRARY VPbkEng.lib Pbk2Presentation.lib Pbk2CommonUtility.lib diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/group/Pbk2USimExtension.mmp --- a/phonebookui/Phonebook2/group/Pbk2USimExtension.mmp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/group/Pbk2USimExtension.mmp Tue Sep 14 20:54:53 2010 +0300 @@ -106,18 +106,18 @@ APP_LAYER_SYSTEMINCLUDE // Dependencies to Symbian OS components -LIBRARY euser.lib commonengine.lib ecom.lib +LIBRARY euser.lib CommonEngine.lib ecom.lib LIBRARY cone.lib eikcoctl.lib eikdlg.lib LIBRARY eikcore.lib bafl.lib charconv.lib centralrepository.lib // Dependencies to S60 components -LIBRARY avkon.lib aknicon.lib cdlengine.lib aknskins.lib +LIBRARY avkon.lib aknicon.lib CdlEngine.lib aknskins.lib LIBRARY secui.lib servicehandler.lib LIBRARY featmgr.lib // Dependencies to Phonebook -LIBRARY VPbkEng.lib VPbkSimStoreService.lib +LIBRARY VPbkEng.lib vpbksimstoreservice.lib LIBRARY Pbk2CommonUI.lib Pbk2Presentation.lib -LIBRARY Pbk2UiControls.lib Pbk2Commands.lib +LIBRARY pbk2uicontrols.lib Pbk2Commands.lib // End of File diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/group/Pbk2USimThinExtension.mmp --- a/phonebookui/Phonebook2/group/Pbk2USimThinExtension.mmp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/group/Pbk2USimThinExtension.mmp Tue Sep 14 20:54:53 2010 +0300 @@ -65,10 +65,10 @@ LIBRARY euser.lib ecom.lib eikcoctl.lib cone.lib // Dependencies to S60 platform components -LIBRARY commonengine.lib avkon.lib +LIBRARY CommonEngine.lib avkon.lib // Dependencies to Phonebook -LIBRARY VPbkEng.lib VPbkSimStoreService.lib +LIBRARY VPbkEng.lib vpbksimstoreservice.lib LIBRARY Pbk2Presentation.lib Pbk2CommonUI.lib Pbk2Commands.lib // End of File diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/group/Pbk2VoiceTagExtension.mmp --- a/phonebookui/Phonebook2/group/Pbk2VoiceTagExtension.mmp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/group/Pbk2VoiceTagExtension.mmp Tue Sep 14 20:54:53 2010 +0300 @@ -67,11 +67,11 @@ LIBRARY eikcore.lib ecom.lib // Dependencies to S60 components -LIBRARY Avkon.lib FeatMgr.lib +LIBRARY avkon.lib featmgr.lib LIBRARY VoiceUiNameDialer.lib LIBRARY CommonEngine.lib // Dependencies to Phonebook2 -LIBRARY VPbkEng.lib Pbk2CommonUi.lib Pbk2Presentation.lib +LIBRARY VPbkEng.lib Pbk2CommonUI.lib Pbk2Presentation.lib // End of File diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/group/Pbk2VoiceTagThinExtension.mmp --- a/phonebookui/Phonebook2/group/Pbk2VoiceTagThinExtension.mmp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/group/Pbk2VoiceTagThinExtension.mmp Tue Sep 14 20:54:53 2010 +0300 @@ -56,6 +56,6 @@ LIBRARY euser.lib ecom.lib eikcoctl.lib // Dependencies to S60 platform components -LIBRARY FeatMgr.lib +LIBRARY featmgr.lib // End of File diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/group/Phonebook2.mmp --- a/phonebookui/Phonebook2/group/Phonebook2.mmp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/group/Phonebook2.mmp Tue Sep 14 20:54:53 2010 +0300 @@ -94,17 +94,17 @@ LIBRARY apparc.lib cone.lib fbscli.lib LIBRARY eikcore.lib efsrv.lib eikcoctl.lib LIBRARY ws32.lib apgrfx.lib -LIBRARY CentralRepository.lib -LIBRARY PlatformEnv.lib +LIBRARY centralrepository.lib +LIBRARY platformenv.lib // Dependencies to S60 platform components -LIBRARY Avkon.lib AknSkins.lib -LIBRARY CommonEngine.lib SendUI.lib +LIBRARY avkon.lib aknskins.lib +LIBRARY CommonEngine.lib sendui.lib LIBRARY gfxtrans.lib // Dependencies to Phonebook -LIBRARY VPbkEng.lib Pbk2UiControls.lib Pbk2CommonUI.lib -LIBRARY Pbk2Presentation.lib Pbk2UiExt.lib Pbk2Commands.lib +LIBRARY VPbkEng.lib pbk2uicontrols.lib Pbk2CommonUI.lib +LIBRARY Pbk2Presentation.lib Pbk2UIExt.lib Pbk2Commands.lib #ifdef PBK2_ENABLE_PROFILE // Depencency to Phonebook profiling library diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/group/pbk2spbcontentprovider.mmp --- a/phonebookui/Phonebook2/group/pbk2spbcontentprovider.mmp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/group/pbk2spbcontentprovider.mmp Tue Sep 14 20:54:53 2010 +0300 @@ -60,10 +60,10 @@ LIBRARY estor.lib LIBRARY featmgr.lib -LIBRARY vpbkeng.lib +LIBRARY VPbkEng.lib LIBRARY bsclient.lib -LIBRARY pbk2presentation.lib -LIBRARY pbk2commonui.lib +LIBRARY Pbk2Presentation.lib +LIBRARY Pbk2CommonUI.lib LIBRARY presencecacheclient2.lib LIBRARY presencecacheutils.lib LIBRARY efsrv.lib diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/group/xSPExtensionManager.mmp --- a/phonebookui/Phonebook2/group/xSPExtensionManager.mmp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/group/xSPExtensionManager.mmp Tue Sep 14 20:54:53 2010 +0300 @@ -69,14 +69,14 @@ TARGETPATH ECOM_RESOURCE_DIR END -LIBRARY euser.lib cone.lib ecom.lib bafl.lib commonengine.lib +LIBRARY euser.lib cone.lib ecom.lib bafl.lib CommonEngine.lib LIBRARY eikcore.lib eikctl.lib eikcoctl.lib -LIBRARY avkon.lib aknnotify.lib estor.lib efsrv.lib aknicon.lib egul.lib AknSkins.lib -LIBRARY xSPViewServices.lib +LIBRARY avkon.lib aknnotify.lib estor.lib efsrv.lib aknicon.lib egul.lib aknskins.lib +LIBRARY xspviewservices.lib LIBRARY centralrepository.lib // Dependencies to Phonebook2 -LIBRARY Pbk2CommonUi.lib Pbk2UIExt.lib Pbk2Presentation.lib VPbkEng.lib +LIBRARY Pbk2CommonUI.lib Pbk2UIExt.lib Pbk2Presentation.lib VPbkEng.lib LIBRARY bitgdi.lib fbscli.lib START BITMAP ExtensionManager.mbm diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/group/xSPViewServices.mmp --- a/phonebookui/Phonebook2/group/xSPViewServices.mmp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/group/xSPViewServices.mmp Tue Sep 14 20:54:53 2010 +0300 @@ -31,7 +31,7 @@ SOURCEPATH ../xSPExtensionManager/src SOURCE xSPViewServices.cpp -SOURCE CxSPViewData.cpp +SOURCE CxSPViewData.cpp LIBRARY apgrfx.lib apparc.lib ws32.lib ecom.lib euser.lib -LIBRARY Pbk2CommonUi.lib VPbkEng.lib estor.lib +LIBRARY Pbk2CommonUI.lib VPbkEng.lib estor.lib diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/inc/CPbk2CommandHandler.h --- a/phonebookui/Phonebook2/inc/CPbk2CommandHandler.h Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/inc/CPbk2CommandHandler.h Tue Sep 14 20:54:53 2010 +0300 @@ -136,6 +136,15 @@ TInt aPresIndex, const MVPbkStoreContact* aStoreContact ); + public: + /** + * Returns the Command Store + * OwnerShip is not transferred. + * + * @return Pointer to the instance CPbk2CommandStore. Can be NULL. Ownership not transferred + */ + IMPORT_C CPbk2CommandStore* CommandStore(); + private: // Data /// Own: Command factory MPbk2CommandFactory* iCommandFactory; diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/remotecontactlookup/contactactionmenu/group/pbk2rclcontactactionmenu.mmp --- a/phonebookui/Phonebook2/remotecontactlookup/contactactionmenu/group/pbk2rclcontactactionmenu.mmp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/remotecontactlookup/contactactionmenu/group/pbk2rclcontactactionmenu.mmp Tue Sep 14 20:54:53 2010 +0300 @@ -61,12 +61,12 @@ LIBRARY aknskins.lib LIBRARY aknskinsrv.lib LIBRARY aknswallpaperutils.lib -LIBRARY FontUtils.lib -LIBRARY cdlengine.lib +LIBRARY fontutils.lib +LIBRARY CdlEngine.lib LIBRARY aknlayout2.lib -LIBRARY aknlayout2scalable.lib -LIBRARY aknlayout2adaptation.lib -LIBRARY commonengine.lib +LIBRARY AknLayout2Scalable.lib +LIBRARY AknLayout2Adaptation.lib +LIBRARY CommonEngine.lib #if (PBKX_DEBUG_LEVEL > 0) LIBRARY pbkxdebug.lib diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/remotecontactlookup/contactactionservice/callplugin/group/pbk2rclcallplugin.mmp --- a/phonebookui/Phonebook2/remotecontactlookup/contactactionservice/callplugin/group/pbk2rclcallplugin.mmp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/remotecontactlookup/contactactionservice/callplugin/group/pbk2rclcallplugin.mmp Tue Sep 14 20:54:53 2010 +0300 @@ -46,13 +46,13 @@ LIBRARY ecom.lib LIBRARY egul.lib // Icon LIBRARY servicehandler.lib // AIW -LIBRARY commonengine.lib // String loadder +LIBRARY CommonEngine.lib // String loadder LIBRARY bafl.lib LIBRARY cone.lib LIBRARY fbscli.lib LIBRARY ws32.lib LIBRARY featmgr.lib -LIBRARY profileengine.lib +LIBRARY ProfileEngine.lib LIBRARY centralrepository.lib LIBRARY aiwdialdata.lib diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/remotecontactlookup/contactactionservice/data/pbk2rclactionutils.rss --- a/phonebookui/Phonebook2/remotecontactlookup/contactactionservice/data/pbk2rclactionutils.rss Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/remotecontactlookup/contactactionservice/data/pbk2rclactionutils.rss Tue Sep 14 20:54:53 2010 +0300 @@ -37,7 +37,7 @@ #include #include "FscFieldOrdering.rh" -#include +#include // RESOURCE DEFINITIONS #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/remotecontactlookup/contactactionservice/group/pbk2rclcontactactionservice.mmp --- a/phonebookui/Phonebook2/remotecontactlookup/contactactionservice/group/pbk2rclcontactactionservice.mmp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/remotecontactlookup/contactactionservice/group/pbk2rclcontactactionservice.mmp Tue Sep 14 20:54:53 2010 +0300 @@ -72,13 +72,13 @@ LIBRARY ecom.lib LIBRARY cone.lib LIBRARY avkon.lib -LIBRARY commonengine.lib +LIBRARY CommonEngine.lib LIBRARY centralrepository.lib LIBRARY egul.lib // Icon LIBRARY fbscli.lib LIBRARY featmgr.lib LIBRARY aknskins.lib -LIBRARY vpbkeng.lib +LIBRARY VPbkEng.lib LIBRARY bafl.lib LIBRARY efsrv.lib LIBRARY eikcoctl.lib @@ -89,7 +89,7 @@ // Dependencies to Phonebook LIBRARY Pbk2Presentation.lib -LIBRARY Pbk2CommonUi.lib +LIBRARY Pbk2CommonUI.lib #if (PBKX_DEBUG_LEVEL > 0) LIBRARY pbkxdebug.lib diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/remotecontactlookup/contactactionservice/inc/CFscFieldOrderingManager.h --- a/phonebookui/Phonebook2/remotecontactlookup/contactactionservice/inc/CFscFieldOrderingManager.h Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/remotecontactlookup/contactactionservice/inc/CFscFieldOrderingManager.h Tue Sep 14 20:54:53 2010 +0300 @@ -75,7 +75,7 @@ TFieldTypeOrder( TResourceReader& aReader ); /** - * Field type resource id from VPbkEng.rsg + * Field type resource id from vpbkeng.rsg */ TInt iFieldTypeResId; diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/remotecontactlookup/contactactionservice/inc/FscFieldOrdering.rh --- a/phonebookui/Phonebook2/remotecontactlookup/contactactionservice/inc/FscFieldOrdering.rh Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/remotecontactlookup/contactactionservice/inc/FscFieldOrdering.rh Tue Sep 14 20:54:53 2010 +0300 @@ -25,7 +25,7 @@ // STRUCT FSC_FIELDTYPE_PRESENTATION_ORDER { - /// Field type resource id from VPbkEng.rsg + /// Field type resource id from vpbkeng.rsg LONG fieldTypeResId; /// The number that specifies the location of this field type /// in contact presentation (defines the order of fields). diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/remotecontactlookup/contactactionservice/pocplugin/group/pbk2rclpocplugin.mmp --- a/phonebookui/Phonebook2/remotecontactlookup/contactactionservice/pocplugin/group/pbk2rclpocplugin.mmp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/remotecontactlookup/contactactionservice/pocplugin/group/pbk2rclpocplugin.mmp Tue Sep 14 20:54:53 2010 +0300 @@ -44,16 +44,16 @@ LIBRARY euser.lib LIBRARY ecom.lib LIBRARY egul.lib -LIBRARY ServiceHandler.lib -LIBRARY commonengine.lib +LIBRARY servicehandler.lib +LIBRARY CommonEngine.lib LIBRARY bafl.lib LIBRARY cone.lib LIBRARY fbscli.lib LIBRARY ws32.lib -LIBRARY FeatMgr.lib +LIBRARY featmgr.lib LIBRARY centralrepository.lib LIBRARY aknskins.lib -LIBRARY profileengine.lib +LIBRARY ProfileEngine.lib #if (PBKX_DEBUG_LEVEL > 0) LIBRARY pbkxdebug.lib diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/remotecontactlookup/contactactionservice/saveascontactplugin/group/pbk2rclsaveascontactplugin.mmp --- a/phonebookui/Phonebook2/remotecontactlookup/contactactionservice/saveascontactplugin/group/pbk2rclsaveascontactplugin.mmp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/remotecontactlookup/contactactionservice/saveascontactplugin/group/pbk2rclsaveascontactplugin.mmp Tue Sep 14 20:54:53 2010 +0300 @@ -46,7 +46,7 @@ LIBRARY euser.lib LIBRARY ecom.lib LIBRARY egul.lib -LIBRARY commonengine.lib +LIBRARY CommonEngine.lib LIBRARY bafl.lib LIBRARY cone.lib LIBRARY VPbkEng.lib diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/remotecontactlookup/contactactionservice/sendbusinesscard/group/pbk2rclsendbusinesscardplugin.mmp --- a/phonebookui/Phonebook2/remotecontactlookup/contactactionservice/sendbusinesscard/group/pbk2rclsendbusinesscardplugin.mmp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/remotecontactlookup/contactactionservice/sendbusinesscard/group/pbk2rclsendbusinesscardplugin.mmp Tue Sep 14 20:54:53 2010 +0300 @@ -49,7 +49,7 @@ LIBRARY euser.lib LIBRARY ecom.lib LIBRARY egul.lib -LIBRARY commonengine.lib +LIBRARY CommonEngine.lib LIBRARY bafl.lib LIBRARY cone.lib LIBRARY VPbkEng.lib @@ -59,19 +59,19 @@ LIBRARY centralrepository.lib LIBRARY Pbk2Presentation.lib -LIBRARY sendui.lib -LIBRARY etext.lib -LIBRARY featmgr.lib -LIBRARY bcardeng.lib -LIBRARY pbkeng.lib -LIBRARY estor.lib //RFileWriteStream -LIBRARY PlatformEnv.lib -LIBRARY VPbkVCardEng.lib +LIBRARY sendui.lib +LIBRARY etext.lib +LIBRARY featmgr.lib +LIBRARY bcardeng.lib +LIBRARY pbkeng.lib +LIBRARY estor.lib //RFileWriteStream +LIBRARY platformenv.lib +LIBRARY VPbkVCardEng.lib -LIBRARY eikcoctl.lib -LIBRARY apparc.lib -LIBRARY apmime.lib +LIBRARY eikcoctl.lib +LIBRARY apparc.lib +LIBRARY apmime.lib #if (PBKX_DEBUG_LEVEL > 0) LIBRARY pbkxdebug.lib diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/remotecontactlookup/contactactionservice/sendplugin/group/pbk2rclsendplugin.mmp --- a/phonebookui/Phonebook2/remotecontactlookup/contactactionservice/sendplugin/group/pbk2rclsendplugin.mmp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/remotecontactlookup/contactactionservice/sendplugin/group/pbk2rclsendplugin.mmp Tue Sep 14 20:54:53 2010 +0300 @@ -43,7 +43,7 @@ LIBRARY euser.lib LIBRARY ecom.lib LIBRARY egul.lib -LIBRARY commonengine.lib +LIBRARY CommonEngine.lib LIBRARY bafl.lib LIBRARY cone.lib LIBRARY fbscli.lib @@ -52,7 +52,7 @@ LIBRARY sysutil.lib LIBRARY featmgr.lib LIBRARY centralrepository.lib -LIBRARY vpbkeng.lib +LIBRARY VPbkEng.lib SOURCEPATH ../data START RESOURCE 20029F33.rss diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/remotecontactlookup/contactactionservice/src/CFscFieldPropertyArray.cpp --- a/phonebookui/Phonebook2/remotecontactlookup/contactactionservice/src/CFscFieldPropertyArray.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/remotecontactlookup/contactactionservice/src/CFscFieldPropertyArray.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -31,7 +31,7 @@ #include #include #include -#include +#include // System includes #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/remotecontactlookup/engine/group/pbk2rclengine.mmp --- a/phonebookui/Phonebook2/remotecontactlookup/engine/group/pbk2rclengine.mmp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/remotecontactlookup/engine/group/pbk2rclengine.mmp Tue Sep 14 20:54:53 2010 +0300 @@ -32,22 +32,22 @@ SOURCEPATH ../src SOURCE cpbkxrclqueryeditor.cpp SOURCE cpbkxrclresultinfodlg.cpp -SOURCE cpbkxrclsearchresultdlg.cpp -SOURCE cpbkxrclserviceuicontextimpl.cpp -SOURCE cpbkxrclprotocolresultimpl.cpp -SOURCE cpbkxrclprotocolenvimpl.cpp -SOURCE cpbkxrclprotocolaccountimpl.cpp -SOURCE pbkxrclutils.cpp -SOURCE cpbkxrcleventscheduler.cpp -SOURCE cpbkxrclvcardsender.cpp -SOURCE cpbkxrclcbrsender.cpp -SOURCE cpbkxrclactionservicewrapper.cpp -SOURCE cpbkxrclcontactupdater.cpp -SOURCE cpbkxrclsettingitem.cpp -SOURCE cpbkxrclbasedlg.cpp -SOURCE cpbkxrclsearchresultlistbox.cpp -SOURCE cpbkxrclresultinfolistbox.cpp -SOURCE cpbkxrclcontactconverter.cpp +SOURCE cpbkxrclsearchresultdlg.cpp +SOURCE cpbkxrclserviceuicontextimpl.cpp +SOURCE cpbkxrclprotocolresultimpl.cpp +SOURCE cpbkxrclprotocolenvimpl.cpp +SOURCE cpbkxrclprotocolaccountimpl.cpp +SOURCE pbkxrclutils.cpp +SOURCE cpbkxrcleventscheduler.cpp +SOURCE cpbkxrclvcardsender.cpp +SOURCE cpbkxrclcbrsender.cpp +SOURCE cpbkxrclactionservicewrapper.cpp +SOURCE cpbkxrclcontactupdater.cpp +SOURCE cpbkxrclsettingitem.cpp +SOURCE cpbkxrclbasedlg.cpp +SOURCE cpbkxrclsearchresultlistbox.cpp +SOURCE cpbkxrclresultinfolistbox.cpp +SOURCE cpbkxrclcontactconverter.cpp SOURCE pbk2remotecontactlookupfactory.cpp SOURCE cpbk2remotecontactlookupaccounts.cpp @@ -62,40 +62,40 @@ USERINCLUDE ../../../../inc SYSTEMINCLUDE /epoc32/include/cshelp -LIBRARY AknLayout2.lib -LIBRARY AknLayout2Scalable.lib -LIBRARY CdlEngine.lib +LIBRARY aknlayout2.lib +LIBRARY AknLayout2Scalable.lib +LIBRARY CdlEngine.lib LIBRARY euser.lib LIBRARY ecom.lib LIBRARY centralrepository.lib -LIBRARY commonengine.lib +LIBRARY CommonEngine.lib LIBRARY cone.lib -LIBRARY cntmodel.lib +LIBRARY cntmodel.lib LIBRARY avkon.lib LIBRARY eikcoctl.lib LIBRARY eikctl.lib LIBRARY eikdlg.lib LIBRARY eikcore.lib -LIBRARY bafl.lib -LIBRARY pbkeng.lib -LIBRARY pbkview.lib -LIBRARY aknskins.lib -LIBRARY aknskinsrv.lib -LIBRARY efsrv.lib -LIBRARY estor.lib -LIBRARY bcardeng.lib -LIBRARY sendui.lib -LIBRARY etext.lib -LIBRARY featmgr.lib -LIBRARY servicehandler.lib -LIBRARY ws32.lib -LIBRARY egul.lib -LIBRARY aknicon.lib -LIBRARY fepbase.lib -LIBRARY hlplch.lib -LIBRARY VPbkEng.lib -LIBRARY VPbkVCardEng.lib -LIBRARY PlatformEnv.lib +LIBRARY bafl.lib +LIBRARY pbkeng.lib +LIBRARY pbkview.lib +LIBRARY aknskins.lib +LIBRARY aknskinsrv.lib +LIBRARY efsrv.lib +LIBRARY estor.lib +LIBRARY bcardeng.lib +LIBRARY sendui.lib +LIBRARY etext.lib +LIBRARY featmgr.lib +LIBRARY servicehandler.lib +LIBRARY ws32.lib +LIBRARY egul.lib +LIBRARY aknicon.lib +LIBRARY fepbase.lib +LIBRARY hlplch.lib +LIBRARY VPbkEng.lib +LIBRARY VPbkVCardEng.lib +LIBRARY platformenv.lib LIBRARY Pbk2CommonUI.lib #if (PBKX_DEBUG_LEVEL > 0) diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/remotecontactlookup/settingplugin/group/pbk2rclsetting.mmp --- a/phonebookui/Phonebook2/remotecontactlookup/settingplugin/group/pbk2rclsetting.mmp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/remotecontactlookup/settingplugin/group/pbk2rclsetting.mmp Tue Sep 14 20:54:53 2010 +0300 @@ -54,7 +54,7 @@ USERINCLUDE ../inc USERINCLUDE ../../inc // for emailtrace.h -USERINCLUDE ../../../../inc +USERINCLUDE ../../../../inc SYSTEMINCLUDE /epoc32/include/ecom @@ -62,7 +62,7 @@ // Dependencies to Symbian OS components LIBRARY euser.lib -LIBRARY commonengine.lib +LIBRARY CommonEngine.lib LIBRARY ecom.lib LIBRARY cone.lib LIBRARY eikcoctl.lib diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/spbcontentprovider/src/spbcontactdatamodelprivate.cpp --- a/phonebookui/Phonebook2/spbcontentprovider/src/spbcontactdatamodelprivate.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/spbcontentprovider/src/spbcontactdatamodelprivate.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -16,7 +16,7 @@ */ #include -#include +#include #include #include #include @@ -35,7 +35,7 @@ #include #include #include -#include +#include #include #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/spbcontentprovider/src/spbphonenumberparser.cpp --- a/phonebookui/Phonebook2/spbcontentprovider/src/spbphonenumberparser.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/spbcontentprovider/src/spbphonenumberparser.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -26,7 +26,7 @@ #include #include #include -#include // resource ids for numbers +#include // resource ids for numbers // --------------------------------------------------------------------------- diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/tsrc/UT_AddFavoritiesVisibility/group/UT_AddFavoritiesVisibility.mmp --- a/phonebookui/Phonebook2/tsrc/UT_AddFavoritiesVisibility/group/UT_AddFavoritiesVisibility.mmp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/tsrc/UT_AddFavoritiesVisibility/group/UT_AddFavoritiesVisibility.mmp Tue Sep 14 20:54:53 2010 +0300 @@ -58,7 +58,7 @@ #endif LIBRARY euser.lib -LIBRARY stiftestinterface.lib +LIBRARY StifTestInterface.lib LIBRARY stiftestengine.lib LIBRARY VPbkContactTestUtils.lib LIBRARY centralrepository.lib diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/tsrc/Utilities/ChangePbk2CenRepKeyValuesTool/group/ChangePbk2CenRepKeyValuesTool.mmp --- a/phonebookui/Phonebook2/tsrc/Utilities/ChangePbk2CenRepKeyValuesTool/group/ChangePbk2CenRepKeyValuesTool.mmp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/tsrc/Utilities/ChangePbk2CenRepKeyValuesTool/group/ChangePbk2CenRepKeyValuesTool.mmp Tue Sep 14 20:54:53 2010 +0300 @@ -53,7 +53,7 @@ #endif LIBRARY euser.lib -LIBRARY stiftestinterface.lib +LIBRARY StifTestInterface.lib LIBRARY stiftestengine.lib LIBRARY centralrepository.lib diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/xSPExtensionManager/src/CExtensionManagerFactory.cpp --- a/phonebookui/Phonebook2/xSPExtensionManager/src/CExtensionManagerFactory.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/xSPExtensionManager/src/CExtensionManagerFactory.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -38,7 +38,7 @@ #include "CxSPAppUiManager.h" #include "CxSPLoader.h" #include "ExtensionManager.hrh" -#include +#include #include "CxSPViewIdChanger.h" #include "ExtensionManagerIcons.hrh" #include "CxSPViewInfo.h" diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/xSPExtensionManager/src/CxSPAppUiManager.cpp --- a/phonebookui/Phonebook2/xSPExtensionManager/src/CxSPAppUiManager.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/xSPExtensionManager/src/CxSPAppUiManager.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -43,7 +43,7 @@ #include // internal -#include +#include #include "ExtensionManager.hrh" #include "CxSPViewInfo.h" #include "CxSPViewIdChanger.h" diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/xSPExtensionManager/src/CxSPSortNamesListViewExtension.cpp --- a/phonebookui/Phonebook2/xSPExtensionManager/src/CxSPSortNamesListViewExtension.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/xSPExtensionManager/src/CxSPSortNamesListViewExtension.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -32,7 +32,7 @@ // internal #include "ExtensionManager.hrh" -#include +#include #include "MxSPCommandMapper.h" #include "ExtensionManagerUID.H" diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/xSPExtensionManager/src/CxSPSortView.cpp --- a/phonebookui/Phonebook2/xSPExtensionManager/src/CxSPSortView.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/xSPExtensionManager/src/CxSPSortView.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -45,7 +45,7 @@ // internal #include "ExtensionManager.hrh" -#include +#include #include "ExtensionManagerUID.H" #include "CxSPLoader.h" #include "MxSPFactory.h" diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/xSPExtensionManager/src/CxSPSortViewControl.cpp --- a/phonebookui/Phonebook2/xSPExtensionManager/src/CxSPSortViewControl.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/xSPExtensionManager/src/CxSPSortViewControl.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -33,7 +33,7 @@ #include "MxSPFactory.h" #include "CxSPViewIdChanger.h" #include "CxSPViewInfo.h" -#include +#include #include "xSPOrderOrganizer.h" #include "CGlobalNoteObserver.h" #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/xSPExtensionManager/src/CxSPViewIdChanger.cpp --- a/phonebookui/Phonebook2/xSPExtensionManager/src/CxSPViewIdChanger.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/xSPExtensionManager/src/CxSPViewIdChanger.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -28,7 +28,7 @@ #include "MxSPViewInfo.h" #include "ExtensionManager.hrh" #include "CxSPViewInfo.h" -#include +#include #include "ExtensionManagerUID.H" #include "xSPOrderOrganizer.h" #include "Phonebook2PrivateCRKeys.h" diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Phonebook2/xSPExtensionManager/src/CxSPViewManager.cpp --- a/phonebookui/Phonebook2/xSPExtensionManager/src/CxSPViewManager.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Phonebook2/xSPExtensionManager/src/CxSPViewManager.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -18,7 +18,7 @@ // INCLUDE FILES -#include +#include #include #include #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Speeddial/ControlSrc/SpdiaControl.cpp --- a/phonebookui/Speeddial/ControlSrc/SpdiaControl.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Speeddial/ControlSrc/SpdiaControl.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -48,7 +48,7 @@ #include // Phonebook view dll resource file loader #include -#include +#include #include #include #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Speeddial/ControlSrc/SpdiaControl_platsec.cpp --- a/phonebookui/Speeddial/ControlSrc/SpdiaControl_platsec.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Speeddial/ControlSrc/SpdiaControl_platsec.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -44,7 +44,7 @@ #include #include // Phonebook view dll resource file loader #include -#include +#include #include #include #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Speeddial/ControlSrc/SpdiaGrid.cpp --- a/phonebookui/Speeddial/ControlSrc/SpdiaGrid.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Speeddial/ControlSrc/SpdiaGrid.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -31,7 +31,7 @@ #include #include #include -#include +#include const TInt KItemPrimary(3); const TInt KItemSecondary(3); diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Speeddial/ControlSrc/SpdiaGridDlg.cpp --- a/phonebookui/Speeddial/ControlSrc/SpdiaGridDlg.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Speeddial/ControlSrc/SpdiaGridDlg.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -44,7 +44,7 @@ #include // phonebook engine #include #include -#include +#include #include "SpdiaControl.hrh" #include "SpdiaControl.h" #include "SpdiaGridDlg.h" diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Speeddial/VPbkControlInc/speeddialprivate.h --- a/phonebookui/Speeddial/VPbkControlInc/speeddialprivate.h Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Speeddial/VPbkControlInc/speeddialprivate.h Tue Sep 14 20:54:53 2010 +0300 @@ -722,6 +722,7 @@ RArray ixspIconInfoArray; + MVPbkContactOperationBase* iFindOperation; //own: contact find operation }; diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Speeddial/VPbkControlSrc/SpdiaGridDlgVPbk.cpp --- a/phonebookui/Speeddial/VPbkControlSrc/SpdiaGridDlgVPbk.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Speeddial/VPbkControlSrc/SpdiaGridDlgVPbk.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -40,7 +40,7 @@ #include #include -#include +#include #include "SpdiaControl.hrh" #include "speeddialprivate.h" #include "SpdiaGridDlgVPbk.h" diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Speeddial/VPbkControlSrc/SpdiaGridVPbk.cpp --- a/phonebookui/Speeddial/VPbkControlSrc/SpdiaGridVPbk.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Speeddial/VPbkControlSrc/SpdiaGridVPbk.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -31,7 +31,7 @@ #include #include #include -#include +#include const TInt KItemPrimary(3); const TInt KItemSecondary(3); diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Speeddial/VPbkControlSrc/speeddialprivate.cpp --- a/phonebookui/Speeddial/VPbkControlSrc/speeddialprivate.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Speeddial/VPbkControlSrc/speeddialprivate.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -44,7 +44,7 @@ #include -#include +#include #include #include #include @@ -97,7 +97,7 @@ #include #include -#include +#include #include #include "SpdiaContainer.h" @@ -223,7 +223,8 @@ iFetchmail(EFalse), iServiceHandler(NULL), iCancelFlag(0), - iRemoveConfirmQueryDialog( NULL ) + iRemoveConfirmQueryDialog( NULL ), + iFindOperation( NULL ) /*iOperationComplete(EFalse),*/ { @@ -495,7 +496,10 @@ iRemoveConfirmQueryDialog = NULL; } - ixspIconInfoArray.Close(); + ixspIconInfoArray.Close(); + + // Make sure iFindOperation released if it has not release in InitIndexDataL() + delete iFindOperation; } // --------------------------------------------------------- @@ -2695,15 +2699,16 @@ iFetchAll = EFalse; iSpeedDial->SetIndex(CVPbkSpeedDialAttribute::KSpeedDialIndexNotDefined); // iSpeedDial->SetIndex(2); - MVPbkContactOperationBase* findOperation = iAttributeManager->ListContactsL(*iSpeedDial,(*this)); + iFindOperation = iAttributeManager->ListContactsL( *iSpeedDial , ( *this ) ); - while(findOperation != NULL && !iFetchAll) + while( iFindOperation != NULL && !iFetchAll ) { //Wait till every contactlink is fetched and set. Wait(); } //Delete the handle - delete findOperation; + delete iFindOperation; + iFindOperation = NULL; MVPbkContactOperationBase* retrieveOperation = NULL; for(TInt count =0; iContactLinkArray && count < iContactLinkArray->Count();++count) diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Speeddial/datasrc/SpdCtrl.rss --- a/phonebookui/Speeddial/datasrc/SpdCtrl.rss Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Speeddial/datasrc/SpdCtrl.rss Tue Sep 14 20:54:53 2010 +0300 @@ -32,7 +32,7 @@ #include #include #include -#include +#include #include #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Speeddial/datasrc/SpeedDial.rss --- a/phonebookui/Speeddial/datasrc/SpeedDial.rss Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Speeddial/datasrc/SpeedDial.rss Tue Sep 14 20:54:53 2010 +0300 @@ -35,7 +35,7 @@ #include #include #include -#include +#include #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Speeddial/group/SpdCtrl.mmp --- a/phonebookui/Speeddial/group/SpdCtrl.mmp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Speeddial/group/SpdCtrl.mmp Tue Sep 14 20:54:53 2010 +0300 @@ -69,7 +69,7 @@ USERINCLUDE ../inc ../ControlInc ../VPbkControlInc // Dependencies to other Phonebook components -LIBRARY PbkEng.lib PbkView.lib +LIBRARY pbkeng.lib pbkview.lib // Dependencies to other components //LIBRARY PalbView.lib //PalbEng.lib @@ -79,26 +79,26 @@ // Dependencies to system components LIBRARY euser.lib bafl.lib cntmodel.lib -LIBRARY cone.lib eikcoctl.lib eikdlg.lib Avkon.lib fbscli.lib egul.lib -LIBRARY eikcore.lib commonengine.lib centralrepository.lib -LIBRARY sysutil.lib commonui.lib cdlengine.lib +LIBRARY cone.lib eikcoctl.lib eikdlg.lib avkon.lib fbscli.lib egul.lib +LIBRARY eikcore.lib CommonEngine.lib centralrepository.lib +LIBRARY sysutil.lib commonui.lib CdlEngine.lib // phone client support -LIBRARY PhoneClient.LIB +LIBRARY phoneclient.lib // skins support -LIBRARY AknSkins.LIB -LIBRARY AknIcon.lib -LIBRARY efsrv.lib +LIBRARY aknskins.lib +LIBRARY aknicon.lib +LIBRARY efsrv.lib LIBRARY bitgdi.lib -LIBRARY AknLayout2.lib +LIBRARY aknlayout2.lib LIBRARY AknLayout2Scalable.lib -LIBRARY UikLaf.lib -LIBRARY FeatMgr.lib +LIBRARY uiklaf.lib +LIBRARY featmgr.lib LIBRARY avkon.lib LIBRARY aknicon.lib -LIBRARY ServiceHandler.lib +LIBRARY servicehandler.lib LIBRARY VPbkEng.lib -LIBRARY Pbk2Presentation.lib -LIBRARY Pbk2CommonUI.lib +LIBRARY Pbk2Presentation.lib +LIBRARY Pbk2CommonUI.lib // End of File diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Speeddial/group/SpeedDial.mmp --- a/phonebookui/Speeddial/group/SpeedDial.mmp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Speeddial/group/SpeedDial.mmp Tue Sep 14 20:54:53 2010 +0300 @@ -62,11 +62,11 @@ // Dependencies to system components LIBRARY euser.lib apparc.lib ws32.lib bafl.lib -LIBRARY cone.lib eikcoctl.lib Avkon.lib fbscli.lib egul.lib -LIBRARY eikcore.lib commonengine.lib +LIBRARY cone.lib eikcoctl.lib avkon.lib fbscli.lib egul.lib +LIBRARY eikcore.lib CommonEngine.lib LIBRARY eikdlg.lib LIBRARY numbergrouping.lib -LIBRARY ServiceHandler.lib //Application InterWorking +LIBRARY servicehandler.lib //Application InterWorking LIBRARY efsrv.lib LIBRARY apgrfx.lib LIBRARY bitgdi.lib @@ -74,23 +74,23 @@ LIBRARY VPbkEng.lib LIBRARY Pbk2Presentation.lib LIBRARY Pbk2CommonUI.lib -LIBRARY CentralRepository.lib +LIBRARY centralrepository.lib LIBRARY cenrepnotifhandler.lib // Cenrep notifier // external dependencies /// phone engine support -LIBRARY PbkEng.lib +LIBRARY pbkeng.lib /// context sensitive help support LIBRARY hlplch.lib // for "Help" options menu -LIBRARY FeatMgr.lib +LIBRARY featmgr.lib -library AknLayout.lib -LIBRARY AknLayout2.lib +library aknlayout.lib +LIBRARY aknlayout2.lib LIBRARY AknLayout2Scalable.lib -LIBRARY UikLaf.lib -LIBRARY AknIcon.lib +LIBRARY uiklaf.lib +LIBRARY aknicon.lib library vmbx.lib library aknnotify.lib -library SSSettings.lib +library sssettings.lib LIBRARY sendui.lib LIBRARY etext.lib diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Speeddial/group/Speeddial_reg.rss --- a/phonebookui/Speeddial/group/Speeddial_reg.rss Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Speeddial/group/Speeddial_reg.rss Tue Sep 14 20:54:53 2010 +0300 @@ -20,7 +20,7 @@ #include -#include +#include #include UID2 KUidAppRegistrationResourceFile diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Speeddial/speeddialgsplugin/data/speeddialgspluginrsc.rss --- a/phonebookui/Speeddial/speeddialgsplugin/data/speeddialgspluginrsc.rss Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Speeddial/speeddialgsplugin/data/speeddialgspluginrsc.rss Tue Sep 14 20:54:53 2010 +0300 @@ -27,13 +27,13 @@ #include #include #include -#include +#include #include #include #include #include #include -#include +#include #include #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Speeddial/speeddialgsplugin/group/speeddialgsplugin.mmp --- a/phonebookui/Speeddial/speeddialgsplugin/group/speeddialgsplugin.mmp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Speeddial/speeddialgsplugin/group/speeddialgsplugin.mmp Tue Sep 14 20:54:53 2010 +0300 @@ -66,14 +66,14 @@ LIBRARY egul.lib LIBRARY flogger.lib // File logging LIBRARY CommonEngine.lib // For RConeResourceLoader -LIBRARY FeatMgr.lib // Feature manager -LIBRARY CentralRepository.lib +LIBRARY featmgr.lib // Feature manager +LIBRARY centralrepository.lib LIBRARY aknskinsrv.lib // for enhanced skinning LIBRARY aknskins.lib // for enhanced skinning -LIBRARY GSEcomPlugin.lib +LIBRARY gsecomplugin.lib LIBRARY hlplch.lib // for "Help" options menu -LIBRARY GSFramework.lib // For base classes -LIBRARY GSListBox.lib // For CGSListBoxItemTextArray +LIBRARY gsframework.lib // For base classes +LIBRARY gslistbox.lib // For CGSListBoxItemTextArray LIBRARY apgrfx.lib LIBRARY apparc.lib LIBRARY ws32.lib diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Speeddial/src/SpdiaAppUi.cpp --- a/phonebookui/Speeddial/src/SpdiaAppUi.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Speeddial/src/SpdiaAppUi.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -29,7 +29,7 @@ #include #include -#include +#include #include #include "speeddial.hrh" diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Speeddial/src/SpdiaBaseView.cpp --- a/phonebookui/Speeddial/src/SpdiaBaseView.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Speeddial/src/SpdiaBaseView.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -25,7 +25,7 @@ #include -#include +#include #include "SpdiaBaseView.h" diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Speeddial/src/SpdiaCallingVmbxContainer.cpp --- a/phonebookui/Speeddial/src/SpdiaCallingVmbxContainer.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Speeddial/src/SpdiaCallingVmbxContainer.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -21,7 +21,7 @@ // INCLUDE FILES -#include +#include #include "speeddialprivate.h" #include "SpdiaCallingVmbxContainer.h" diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Speeddial/src/SpdiaCallingVmbxView.cpp --- a/phonebookui/Speeddial/src/SpdiaCallingVmbxView.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Speeddial/src/SpdiaCallingVmbxView.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -24,12 +24,11 @@ #include #include -#include +#include #include #include #include -#include #include // needed just to get localized error message #include diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Speeddial/src/SpdiaContainer.cpp --- a/phonebookui/Speeddial/src/SpdiaContainer.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Speeddial/src/SpdiaContainer.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -33,14 +33,14 @@ #include #include -#include +#include #include #include #include #include #include -#include +#include #include "speeddial.hrh" #include "SpdiaControl.hrh" diff -r f4a778e096c2 -r 9da50d567e3c phonebookui/Speeddial/src/SpdiaView.cpp --- a/phonebookui/Speeddial/src/SpdiaView.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/phonebookui/Speeddial/src/SpdiaView.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -28,7 +28,7 @@ #include #include -#include +#include #include #include //KAiwCmdCall #include @@ -50,13 +50,13 @@ #include #include -#include "SpdCtrl.rsg" +#include "spdctrl.rsg" #include #include #include -#include +#include #include _LIT( KSpace, " " ); diff -r f4a778e096c2 -r 9da50d567e3c pimprotocols/pbap/group/btaccesshost.mmp --- a/pimprotocols/pbap/group/btaccesshost.mmp Wed Sep 01 12:29:52 2010 +0100 +++ b/pimprotocols/pbap/group/btaccesshost.mmp Tue Sep 14 20:54:53 2010 +0300 @@ -61,7 +61,7 @@ LIBRARY pbaplogeng.lib logcli.lib LIBRARY cntmodel.lib cntview.lib LIBRARY versit.lib vcard.lib logwrap.lib - +LIBRARY centralrepository.lib LIBRARY btlogger.lib tzclient.lib SMPSAFE diff -r f4a778e096c2 -r 9da50d567e3c pimprotocols/pbap/inc/pbapvcardexporterutil.h --- a/pimprotocols/pbap/inc/pbapvcardexporterutil.h Wed Sep 01 12:29:52 2010 +0100 +++ b/pimprotocols/pbap/inc/pbapvcardexporterutil.h Tue Sep 14 20:54:53 2010 +0300 @@ -79,6 +79,7 @@ TVCardVersion iFormat; TUint64 iFilter; RTz iTzClient; + TInt iMatchDigitCount; }; #endif // PBAPVCARDEXPORTERUTIL_H diff -r f4a778e096c2 -r 9da50d567e3c pimprotocols/pbap/server/pbapvcardexporterutil.cpp --- a/pimprotocols/pbap/server/pbapvcardexporterutil.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/pimprotocols/pbap/server/pbapvcardexporterutil.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -21,6 +21,8 @@ #include #include #include +#include + #ifdef SYMBIAN_ENABLE_SPLIT_HEADERS #include "vcard3.h" #include "cntdb_internal.h" @@ -29,6 +31,13 @@ #include "pbaplogeng.h" #include "btaccesshostlog.h" +/* These constants are properly defined in telconfigcrkeys.h, however we +are not allowed to include that from here. As a temporary fix the constants +from that file are re-defined here. */ +const TUid KCRUidTelConfiguration = {0x102828B8}; +const TUint32 KTelMatchDigits = 0x00000001; +/* And similarly this constant is defined in ccsdefs.h */ +const TInt KDefaultGsmNumberMatchLength = 7; //constants _LIT8(KVersitTokenCALLDATETIME,"X-IRMC-CALL-DATETIME"); @@ -59,6 +68,23 @@ LOG_FUNC CVersitTlsData::VersitTlsDataL(); User::LeaveIfError(iTzClient.Connect()); + + // Read the amount of digits to be used in contact matching + // The key is properly owned by PhoneApp, however we cannot include + // that header file from here, so a temporary fix has been done to + // use locally defined versions. If there is a problem here it is + // likely because these values have gone out of sync. + CRepository* repository = CRepository::NewLC(KCRUidTelConfiguration); + if ( repository->Get(KTelMatchDigits, iMatchDigitCount) == KErrNone ) + { + // Min is 7 + iMatchDigitCount = Max(iMatchDigitCount, KDefaultGsmNumberMatchLength); + } + else + { + iMatchDigitCount = KDefaultGsmNumberMatchLength; + } + CleanupStack::PopAndDestroy(repository); } CPbapVCardExporterUtil::~CPbapVCardExporterUtil() @@ -161,16 +187,12 @@ TContactItemId CPbapVCardExporterUtil::FindContactIdFromNumberL(const TDesC& aNumber) { TContactItemId ret = KNullContactId; - CContactItemFieldDef* fieldDef; - fieldDef = new(ELeave) CContactItemFieldDef; - CleanupStack::PushL(fieldDef); - fieldDef->AppendL(KUidContactFieldPhoneNumber); - CContactIdArray* contactIdArray = iDatabase.FindLC(aNumber, fieldDef); + CContactIdArray* contactIdArray = iDatabase.MatchPhoneNumberL(aNumber, iMatchDigitCount); if (contactIdArray->Count() > 0) { ret = (*contactIdArray)[0]; } - CleanupStack::PopAndDestroy(2); // contactIdArray, fieldDef + delete contactIdArray; return ret; } diff -r f4a778e096c2 -r 9da50d567e3c predictivesearch/PcsAlgorithm/Algorithm1/group/PcsAlgorithm1.mmp --- a/predictivesearch/PcsAlgorithm/Algorithm1/group/PcsAlgorithm1.mmp Wed Sep 01 12:29:52 2010 +0100 +++ b/predictivesearch/PcsAlgorithm/Algorithm1/group/PcsAlgorithm1.mmp Tue Sep 14 20:54:53 2010 +0300 @@ -51,7 +51,7 @@ APP_LAYER_SYSTEMINCLUDE LIBRARY euser.lib -LIBRARY eCom.lib +LIBRARY ecom.lib LIBRARY efsrv.lib LIBRARY estor.lib LIBRARY flogger.lib diff -r f4a778e096c2 -r 9da50d567e3c predictivesearch/PcsAlgorithm/Algorithm1/inc/CPcsPoolElement.h --- a/predictivesearch/PcsAlgorithm/Algorithm1/inc/CPcsPoolElement.h Wed Sep 01 12:29:52 2010 +0100 +++ b/predictivesearch/PcsAlgorithm/Algorithm1/inc/CPcsPoolElement.h Tue Sep 14 20:54:53 2010 +0300 @@ -65,7 +65,7 @@ * Compares the two Pool Elements and returms the comparison value. * It takes care of language variance too. */ - static TInt CompareByData ( const CPcsPoolElement& aObject1, + static TInt CompareByDataL ( const CPcsPoolElement& aObject1, const CPcsPoolElement& aObject2 ); private: diff -r f4a778e096c2 -r 9da50d567e3c predictivesearch/PcsAlgorithm/Algorithm1/src/CPcsAlgorithm1Utils.cpp --- a/predictivesearch/PcsAlgorithm/Algorithm1/src/CPcsAlgorithm1Utils.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/predictivesearch/PcsAlgorithm/Algorithm1/src/CPcsAlgorithm1Utils.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -23,6 +23,7 @@ #include "CPcsCache.h" #include "CPsQuery.h" #include "CPsQueryItem.h" +#include "CPcsDebug.h" #include @@ -212,73 +213,122 @@ // CPcsAlgorithm1Utils::CompareDataBySortOrderL() // TLinearOrder rule for comparison of data objects // ---------------------------------------------------------------------------- -TInt CPcsAlgorithm1Utils::CompareDataBySortOrderL(const CPsData& aObject1, +TInt CPcsAlgorithm1Utils::CompareDataBySortOrderL(const CPsData& aObject1, const CPsData& aObject2) { - TInt compareRes(0); - + TInt compareRes = 0; + if( CPsData::CompareById(aObject1, aObject2) ) { return compareRes; } - + // Fetch the cache list stored in TLS to recover the sort order typedef RPointerArray PTR; PTR* pcsCache = static_cast(Dll::Tls()); User::LeaveIfNull(pcsCache); - - CPcsCache* cache1 = (*pcsCache)[aObject1.UriId()]; + + CPcsCache* cache1 = (*pcsCache)[aObject1.UriId()]; CPcsCache* cache2 = (*pcsCache)[aObject2.UriId()]; - RArray indexOrder1; + RArray indexOrder1; RArray indexOrder2; - + // Get the index order based on sort order from the cache - cache1->GetIndexOrder(indexOrder1); - CleanupClosePushL(indexOrder1); - cache2->GetIndexOrder(indexOrder2); - CleanupClosePushL(indexOrder2); + cache1->GetIndexOrder(indexOrder1); + CleanupClosePushL(indexOrder1); + cache2->GetIndexOrder(indexOrder2); + CleanupClosePushL(indexOrder2); - TInt idx2 = 0; - for(TInt idx1 = 0; - idx1 < indexOrder1.Count() && idx2 < indexOrder2.Count() && compareRes == 0; - idx1++) + // Check if Sort Order is identical (it must be for same cache) + TBool sameIndexOrder = ETrue; + if ( indexOrder1.Count() != indexOrder2.Count() ) + { + sameIndexOrder = EFalse; + } + else { + for ( TInt i = 0; i < indexOrder1.Count(); i++ ) + { + if (indexOrder1[i] != indexOrder2[i]) + { + sameIndexOrder = EFalse; + break; + } + } + } + + // Sort Orders among different caches should be the same, anyway + // if caches and SO are different we compare by cache URI index + if (!sameIndexOrder) + { + compareRes = aObject1.UriId() - aObject2.UriId(); + + CleanupStack::PopAndDestroy(&indexOrder2); + CleanupStack::PopAndDestroy(&indexOrder1); + return compareRes; + } + + // The comparison between contacts data is done for the sort order + // fields skipping the ones that are empty + TInt indexCount = indexOrder1.Count(); + TInt idx1 = 0; + TInt idx2 = 0; + while ( compareRes == 0 && idx1 < indexCount && idx2 < indexCount ) + { + // Get contact field of 1st contact TInt object1Idx = indexOrder1[idx1]; HBufC* strCompare1 = aObject1.Data(object1Idx)->Des().AllocLC(); - - if ( object1Idx < aObject1.DataElementCount() - && aObject1.Data(object1Idx) - && strCompare1->Length() ) + TPtr strCompare1Ptr( strCompare1->Des() ); + CPcsAlgorithm1Utils::MyTrim( strCompare1Ptr ); + + // Get contact field of 2nd contact + TInt object2Idx = indexOrder2[idx2]; + HBufC* strCompare2 = aObject2.Data(object2Idx)->Des().AllocLC(); + TPtr strCompare2Ptr( strCompare2->Des() ); + CPcsAlgorithm1Utils::MyTrim( strCompare2Ptr ); + + if ( strCompare1->Length() > 0 && strCompare2->Length() > 0 ) { - strCompare1->Des().TrimAll(); - - for(; idx2 < indexOrder2.Count(); idx2++) - { - TInt object2Idx = indexOrder2[idx2]; - - HBufC* strCompare2 = aObject2.Data(object2Idx)->Des().AllocLC(); - - if( strCompare2->Length() ) - { - strCompare2->Des().TrimAll(); - - compareRes = CPcsAlgorithm1Utils::MyCompareC(*strCompare1, *strCompare2); - - CleanupStack::PopAndDestroy(strCompare2); - - if( compareRes == 0 ) - { - idx2++; - } - break; - } - CleanupStack::PopAndDestroy(strCompare2); - } + compareRes = CPcsAlgorithm1Utils::MyCompareC(*strCompare1, *strCompare2); + idx1++; + idx2++; } + else // Increment only the index of the contact with empty field + { + if ( strCompare1->Length() == 0 ) + idx1++; + if ( strCompare2->Length() == 0 ) + idx2++; + } + + CleanupStack::PopAndDestroy(strCompare2); CleanupStack::PopAndDestroy(strCompare1); } - - CleanupStack::PopAndDestroy(&indexOrder2); + + // We do not return that contacts are equal by SO + if ( compareRes == 0 ) + { + if ( idx1 != idx2 ) + { + // Compare by index position + // If idx1 > idx2 and SO is "FN LN" it means for instance that: + // Contact1=[FN:"", LN:"Smith"], idx1=2 + // Contact2=[FN:"Smith", LN:"Donald"], idx2=1 + // Therefore Contact1="Smith" is < than Contact2="Smith Donald" + // and the return value of this method has to be < 0 (idx2-idx1) + + compareRes = idx2 - idx1; + } + else + { + // Compare by URI ID as 1st choice and Contact ID as 2nd choice + + compareRes == ( aObject1.UriId() != aObject2.UriId() ) ? + aObject1.UriId() - aObject2.UriId() : aObject1.Id() - aObject2.Id(); + } + } + + CleanupStack::PopAndDestroy(&indexOrder2); CleanupStack::PopAndDestroy(&indexOrder1); return compareRes; diff -r f4a778e096c2 -r 9da50d567e3c predictivesearch/PcsAlgorithm/Algorithm1/src/CPcsCache.cpp --- a/predictivesearch/PcsAlgorithm/Algorithm1/src/CPcsCache.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/predictivesearch/PcsAlgorithm/Algorithm1/src/CPcsCache.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -174,7 +174,7 @@ // element doesn't get added for the same data RHashMap elementHash; CleanupClosePushL( elementHash ); - TLinearOrder rule( CPcsPoolElement::CompareByData ); + TLinearOrder rule( CPcsPoolElement::CompareByDataL ); TBool unnamed = ETrue; // Parse thru each data element diff -r f4a778e096c2 -r 9da50d567e3c predictivesearch/PcsAlgorithm/Algorithm1/src/CPcsPoolElement.cpp --- a/predictivesearch/PcsAlgorithm/Algorithm1/src/CPcsPoolElement.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/predictivesearch/PcsAlgorithm/Algorithm1/src/CPcsPoolElement.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -74,10 +74,10 @@ } // ---------------------------------------------------------------------------- -// CPcsPoolElement::CompareByData -// Calls CPsData::CompareByData to compare CPsData objects +// CPcsPoolElement::CompareByDataL +// // ---------------------------------------------------------------------------- -TInt CPcsPoolElement::CompareByData ( const CPcsPoolElement& aObject1, const CPcsPoolElement& aObject2 ) +TInt CPcsPoolElement::CompareByDataL ( const CPcsPoolElement& aObject1, const CPcsPoolElement& aObject2 ) { CPsData *data1 = const_cast (aObject1).GetPsData(); CPsData *data2 = const_cast (aObject2).GetPsData(); diff -r f4a778e096c2 -r 9da50d567e3c predictivesearch/PcsAlgorithm/Algorithm2/group/PcsAlgorithm2.mmp --- a/predictivesearch/PcsAlgorithm/Algorithm2/group/PcsAlgorithm2.mmp Wed Sep 01 12:29:52 2010 +0100 +++ b/predictivesearch/PcsAlgorithm/Algorithm2/group/PcsAlgorithm2.mmp Tue Sep 14 20:54:53 2010 +0300 @@ -51,7 +51,7 @@ APP_LAYER_SYSTEMINCLUDE LIBRARY euser.lib -LIBRARY eCom.lib +LIBRARY ecom.lib LIBRARY efsrv.lib LIBRARY estor.lib LIBRARY flogger.lib @@ -60,9 +60,9 @@ LIBRARY eikcoctl.lib LIBRARY PcsUtils.lib LIBRARY ptiengine.lib -LIBRARY CenRepNotifHandler.lib +LIBRARY cenrepnotifhandler.lib LIBRARY cone.lib LIBRARY fepbase.lib LIBRARY centralrepository.lib -LIBRARY findutil.lib +LIBRARY FindUtil.lib LIBRARY pbkeng.lib diff -r f4a778e096c2 -r 9da50d567e3c predictivesearch/PcsAlgorithm/Algorithm2/inc/CPcsAlgorithm2Utils.h --- a/predictivesearch/PcsAlgorithm/Algorithm2/inc/CPcsAlgorithm2Utils.h Wed Sep 01 12:29:52 2010 +0100 +++ b/predictivesearch/PcsAlgorithm/Algorithm2/inc/CPcsAlgorithm2Utils.h Tue Sep 14 20:54:53 2010 +0300 @@ -52,7 +52,7 @@ /** * TLinearOrder rule for comparison of data objects */ - static TInt CompareDataBySortOrder(const CPsData& aObject1, const CPsData& aObject2); + static TInt CompareDataBySortOrderL(const CPsData& aObject1, const CPsData& aObject2); /** * TIdentityRelation rule for comparing descriptors case-sensitively. diff -r f4a778e096c2 -r 9da50d567e3c predictivesearch/PcsAlgorithm/Algorithm2/inc/CPcsPoolElement.h --- a/predictivesearch/PcsAlgorithm/Algorithm2/inc/CPcsPoolElement.h Wed Sep 01 12:29:52 2010 +0100 +++ b/predictivesearch/PcsAlgorithm/Algorithm2/inc/CPcsPoolElement.h Tue Sep 14 20:54:53 2010 +0300 @@ -64,7 +64,7 @@ * Compares the two Pool Elements and returms the comparison value. * It takes care of language variance too. */ - static TInt CompareByData(const CPcsPoolElement& aObject1, + static TInt CompareByDataL(const CPcsPoolElement& aObject1, const CPcsPoolElement& aObject2); private: diff -r f4a778e096c2 -r 9da50d567e3c predictivesearch/PcsAlgorithm/Algorithm2/src/CPcsAlgorithm2.cpp --- a/predictivesearch/PcsAlgorithm/Algorithm2/src/CPcsAlgorithm2.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/predictivesearch/PcsAlgorithm/Algorithm2/src/CPcsAlgorithm2.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -16,7 +16,7 @@ */ // INCLUDES -#include +#include #include #include #include @@ -301,7 +301,7 @@ // Sort rule - TLinearOrder rule(CPcsAlgorithm2Utils::CompareDataBySortOrder); + TLinearOrder rule(CPcsAlgorithm2Utils::CompareDataBySortOrderL); // Avoid duplicates and add new results TIdentityRelation identityRule(CPsData::CompareById); diff -r f4a778e096c2 -r 9da50d567e3c predictivesearch/PcsAlgorithm/Algorithm2/src/CPcsAlgorithm2FilterHelper.cpp --- a/predictivesearch/PcsAlgorithm/Algorithm2/src/CPcsAlgorithm2FilterHelper.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/predictivesearch/PcsAlgorithm/Algorithm2/src/CPcsAlgorithm2FilterHelper.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -173,7 +173,7 @@ aPatternSequence.Sort(rule); // Sort rule - TLinearOrder psDataRule(CPcsAlgorithm2Utils::CompareDataBySortOrder); + TLinearOrder psDataRule(CPcsAlgorithm2Utils::CompareDataBySortOrderL); // Search Rule TIdentityRelation identitySearchRule(CPsData::CompareById); diff -r f4a778e096c2 -r 9da50d567e3c predictivesearch/PcsAlgorithm/Algorithm2/src/CPcsAlgorithm2Utils.cpp --- a/predictivesearch/PcsAlgorithm/Algorithm2/src/CPcsAlgorithm2Utils.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/predictivesearch/PcsAlgorithm/Algorithm2/src/CPcsAlgorithm2Utils.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -38,7 +38,7 @@ { TInt maxIndex = 0; TInt maxValue = aSearchResultsArr[maxIndex]->Count(); - TLinearOrder rule(CPcsAlgorithm2Utils::CompareDataBySortOrder); + TLinearOrder rule(CPcsAlgorithm2Utils::CompareDataBySortOrderL); // Find the largest array in aSearchResultsArr const TInt searchResultsArrCount = aSearchResultsArr.Count(); @@ -99,102 +99,128 @@ } // ---------------------------------------------------------------------------- -// CPcsAlgorithm2Utils::CompareDataBySortOrder() +// CPcsAlgorithm2Utils::CompareDataBySortOrderL() // TLinearOrder rule for comparison of data objects // ---------------------------------------------------------------------------- -TInt CPcsAlgorithm2Utils::CompareDataBySortOrder(const CPsData& aObject1, - const CPsData& aObject2) +TInt CPcsAlgorithm2Utils::CompareDataBySortOrderL(const CPsData& aObject1, + const CPsData& aObject2) { - _LIT(KSpace, " "); + TInt compareRes = 0; + + if( CPsData::CompareById(aObject1, aObject2) ) + { + return compareRes; + } // Fetch the cache list stored in TLS to recover the sort order typedef RPointerArray PTR; - PTR* pcsCache = static_cast (Dll::Tls()); + PTR* pcsCache = static_cast(Dll::Tls()); + User::LeaveIfNull(pcsCache); - // Data1 - TBuf<255> data1(KNullDesC); - TInt uriId1 = aObject1.UriId(); - CPcsCache* cache = (*pcsCache)[uriId1]; - - RArray indexOrder; + CPcsCache* cache1 = (*pcsCache)[aObject1.UriId()]; + CPcsCache* cache2 = (*pcsCache)[aObject2.UriId()]; + RArray indexOrder1; + RArray indexOrder2; // Get the index order based on sort order from the cache - cache->GetIndexOrder(indexOrder); + cache1->GetIndexOrder(indexOrder1); + CleanupClosePushL(indexOrder1); + cache2->GetIndexOrder(indexOrder2); + CleanupClosePushL(indexOrder2); - // Append sort order elements first - const TInt indexOrderCount1 = indexOrder.Count(); - for (int i = 0; i < indexOrderCount1; i++) + // Check if Sort Order is identical (it must be for same cache) + TBool sameIndexOrder = ETrue; + if ( indexOrder1.Count() != indexOrder2.Count() ) { - TInt index = indexOrder[i]; - if (index < aObject1.DataElementCount() && aObject1.Data(index)) + sameIndexOrder = EFalse; + } + else + { + for ( TInt i = 0; i < indexOrder1.Count(); i++ ) { - // Trim the unnecessary white spaces/special chars before we compare - TBuf<255> str(KNullDesC); - - str = aObject1.Data(index)->Des(); - CPcsAlgorithm2Utils::MyTrim(str); - - data1 += str; - data1 += KSpace; + if (indexOrder1[i] != indexOrder2[i]) + { + sameIndexOrder = EFalse; + break; + } } } - /* --- NOT SURE IF THIS BEHAVIOR IS REQUIRED --- - // Append remaining elements in order - for ( int i = 0; i < aObject1.DataElementCount(); i++ ) - { - if ( indexOrder.Find(i) == KErrNone && aObject1.Data(i) ) - { - data1 += aObject1.Data(i)->Des(); - data1 += KSpace; - } - } - */ + // Sort Orders among diffent caches should be the same, anyway + // if caches and SO are different we compare by cache URI index + if (!sameIndexOrder) + { + compareRes = aObject1.UriId() - aObject2.UriId(); + + CleanupStack::PopAndDestroy(&indexOrder2); + CleanupStack::PopAndDestroy(&indexOrder1); + return compareRes; + } - // Data2 - TBuf<255> data2(KNullDesC); - TInt uriId2 = aObject2.UriId(); - cache = (*pcsCache)[uriId2]; + // The comparison between contacts data is done for the sort order + // fields skipping the ones that are empty + TInt indexCount = indexOrder1.Count(); + TInt idx1 = 0; + TInt idx2 = 0; + while ( compareRes == 0 && idx1 < indexCount && idx2 < indexCount ) + { + // Get contact field of 1st contact + TInt object1Idx = indexOrder1[idx1]; + HBufC* strCompare1 = aObject1.Data(object1Idx)->Des().AllocLC(); + TPtr strCompare1Ptr( strCompare1->Des() ); + CPcsAlgorithm2Utils::MyTrim( strCompare1Ptr ); - indexOrder.Reset(); + // Get contact field of 2nd contact + TInt object2Idx = indexOrder2[idx2]; + HBufC* strCompare2 = aObject2.Data(object2Idx)->Des().AllocLC(); + TPtr strCompare2Ptr( strCompare2->Des() ); + CPcsAlgorithm2Utils::MyTrim( strCompare2Ptr ); - // Get the index order based on sort order from the cache - cache->GetIndexOrder(indexOrder); - const TInt indexOrderCount2 = indexOrder.Count(); + if ( strCompare1->Length() > 0 && strCompare2->Length() > 0 ) + { + compareRes = CPcsAlgorithm2Utils::MyCompareC(*strCompare1, *strCompare2); + idx1++; + idx2++; + } + else // Increment only the index of the contact with empty field + { + if ( strCompare1->Length() == 0 ) + idx1++; + if ( strCompare2->Length() == 0 ) + idx2++; + } - // Append sort order elements first - for (int i = 0; i < indexOrderCount2; i++) + CleanupStack::PopAndDestroy(strCompare2); + CleanupStack::PopAndDestroy(strCompare1); + } + + // We do not return that contacts are equal by SO + if ( compareRes == 0 ) { - TInt index = indexOrder[i]; - if (index < aObject2.DataElementCount() && aObject2.Data(index)) + if ( idx1 != idx2 ) { - // Trim the unnecessary white spaces/special chars before we compare - TBuf<255> str(KNullDesC); + // Compare by index position + // If idx1 > idx2 and SO is "FN LN" it means for instance that: + // Contact1=[FN:"", LN:"Smith"], idx1=2 + // Contact2=[FN:"Smith", LN:"Donald"], idx2=1 + // Therefore Contact1="Smith" is < than Contact2="Smith Donald" + // and the return value of this method has to be < 0 (idx2-idx1) - str = aObject2.Data(index)->Des(); - CPcsAlgorithm2Utils::MyTrim(str); + compareRes = idx2 - idx1; + } + else + { + // Compare by URI ID as 1st choice and Contact ID as 2nd choice - data2 += str; - data2 += KSpace; + compareRes == ( aObject1.UriId() != aObject2.UriId() ) ? + aObject1.UriId() - aObject2.UriId() : aObject1.Id() - aObject2.Id(); } } - /* --- NOT SURE IF THIS BEHAVIOR IS REQUIRED --- - // Append remaining elements in order - for ( int i = 0; i < aObject2.DataElementCount(); i++ ) - { - if ( indexOrder.Find(i) == KErrNone && aObject2.Data(i) ) - { - data2 += aObject2.Data(i)->Des(); - data2 += KSpace; - } - } - */ + CleanupStack::PopAndDestroy(&indexOrder2); + CleanupStack::PopAndDestroy(&indexOrder1); - indexOrder.Reset(); - data1.TrimAll(); - data2.TrimAll(); - return (CPcsAlgorithm2Utils::MyCompareC(data1, data2)); + return compareRes; } // ---------------------------------------------------------------------------- diff -r f4a778e096c2 -r 9da50d567e3c predictivesearch/PcsAlgorithm/Algorithm2/src/CPcsCache.cpp --- a/predictivesearch/PcsAlgorithm/Algorithm2/src/CPcsCache.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/predictivesearch/PcsAlgorithm/Algorithm2/src/CPcsCache.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -22,7 +22,7 @@ // INCLUDE FILES #include -#include +#include #include "FindUtilChineseECE.h" #include "CPsData.h" @@ -168,7 +168,7 @@ // element doesn't get added for the same data RHashMap elementHash; CleanupClosePushL( elementHash ); - TLinearOrder rule(CPcsPoolElement::CompareByData); + TLinearOrder rule(CPcsPoolElement::CompareByDataL); // Parse thru each data element const TInt dataElementCount = aData.DataElementCount(); @@ -259,7 +259,7 @@ iCacheInfo.InsertL(aData.Id(), poolMap); // Include this element in master pool - TLinearOrder rule(CPcsAlgorithm2Utils::CompareDataBySortOrder); + TLinearOrder rule(CPcsAlgorithm2Utils::CompareDataBySortOrderL); iMasterPool.InsertInOrderAllowRepeatsL(&aData, rule); } diff -r f4a778e096c2 -r 9da50d567e3c predictivesearch/PcsAlgorithm/Algorithm2/src/CPcsPoolElement.cpp --- a/predictivesearch/PcsAlgorithm/Algorithm2/src/CPcsPoolElement.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/predictivesearch/PcsAlgorithm/Algorithm2/src/CPcsPoolElement.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -73,15 +73,15 @@ } // ---------------------------------------------------------------------------- -// CPcsPoolElement::CompareByData -// Calls CPsData::CompareByData to compare CPsData objects +// CPcsPoolElement::CompareByDataL +// // // ---------------------------------------------------------------------------- -TInt CPcsPoolElement::CompareByData ( const CPcsPoolElement& aObject1, const CPcsPoolElement& aObject2 ) +TInt CPcsPoolElement::CompareByDataL ( const CPcsPoolElement& aObject1, const CPcsPoolElement& aObject2 ) { CPsData *data1 = const_cast (aObject1).GetPsData(); CPsData *data2 = const_cast (aObject2).GetPsData(); - return (CPcsAlgorithm2Utils::CompareDataBySortOrder(*(data1), *(data2))); + return (CPcsAlgorithm2Utils::CompareDataBySortOrderL(*(data1), *(data2))); } // CPcsPoolElement::IsDataMatch diff -r f4a778e096c2 -r 9da50d567e3c predictivesearch/PcsServer/group/PcsServer.mmp --- a/predictivesearch/PcsServer/group/PcsServer.mmp Wed Sep 01 12:29:52 2010 +0100 +++ b/predictivesearch/PcsServer/group/PcsServer.mmp Tue Sep 14 20:54:53 2010 +0300 @@ -44,4 +44,4 @@ LIBRARY bafl.lib LIBRARY ecom.lib LIBRARY PcsUtils.lib -LIBRARY FeatMgr.lib +LIBRARY featmgr.lib diff -r f4a778e096c2 -r 9da50d567e3c predictivesearch/PcsServer/src/CPcsServer.cpp --- a/predictivesearch/PcsServer/src/CPcsServer.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/predictivesearch/PcsServer/src/CPcsServer.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -133,7 +133,7 @@ CPcsPluginInterface* CPcsServer::PluginInterface() { return iPcs; -}; +} // ---------------------------------------------------------------------------- // CPcsServer::IsChineseFeatureInitilizedL() diff -r f4a778e096c2 -r 9da50d567e3c predictivesearch/PcsServerClientAPI/group/PsServerClientAPI.mmp --- a/predictivesearch/PcsServerClientAPI/group/PsServerClientAPI.mmp Wed Sep 01 12:29:52 2010 +0100 +++ b/predictivesearch/PcsServerClientAPI/group/PsServerClientAPI.mmp Tue Sep 14 20:54:53 2010 +0300 @@ -41,4 +41,4 @@ LIBRARY PcsUtils.lib LIBRARY VPbkEng.lib -LIBRARY eCom.lib +LIBRARY ecom.lib diff -r f4a778e096c2 -r 9da50d567e3c predictivesearch/adapters/contacts/group/pscontactdatastore.mmp --- a/predictivesearch/adapters/contacts/group/pscontactdatastore.mmp Wed Sep 01 12:29:52 2010 +0100 +++ b/predictivesearch/adapters/contacts/group/pscontactdatastore.mmp Tue Sep 14 20:54:53 2010 +0300 @@ -49,7 +49,7 @@ APP_LAYER_SYSTEMINCLUDE LIBRARY euser.lib -LIBRARY eCom.lib +LIBRARY ecom.lib LIBRARY efsrv.lib LIBRARY flogger.lib @@ -57,6 +57,6 @@ LIBRARY PcsUtils.lib LIBRARY VPbkEng.lib LIBRARY centralrepository.lib -LIBRARY FeatMgr.lib -LIBRARY pbk2presentation.lib +LIBRARY featmgr.lib +LIBRARY Pbk2Presentation.lib diff -r f4a778e096c2 -r 9da50d567e3c predictivesearch/adapters/contacts/src/cpcscontactfetch.cpp --- a/predictivesearch/adapters/contacts/src/cpcscontactfetch.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/predictivesearch/adapters/contacts/src/cpcscontactfetch.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -35,7 +35,7 @@ #include #include #include -#include +#include #include #include #include diff -r f4a778e096c2 -r 9da50d567e3c predictivesearch/adapters/contacts/src/cpcscontactstore.cpp --- a/predictivesearch/adapters/contacts/src/cpcscontactstore.cpp Wed Sep 01 12:29:52 2010 +0100 +++ b/predictivesearch/adapters/contacts/src/cpcscontactstore.cpp Tue Sep 14 20:54:53 2010 +0300 @@ -36,7 +36,7 @@ #include #include #include -#include +#include #include #include #include diff -r f4a778e096c2 -r 9da50d567e3c presencecache/presencecacheutils/group/presencecacheutils.mmp --- a/presencecache/presencecacheutils/group/presencecacheutils.mmp Wed Sep 01 12:29:52 2010 +0100 +++ b/presencecache/presencecacheutils/group/presencecacheutils.mmp Tue Sep 14 20:54:53 2010 +0300 @@ -45,7 +45,7 @@ LIBRARY euser.lib LIBRARY bafl.lib LIBRARY estor.lib -LIBRARY vpbkeng.lib +LIBRARY VPbkEng.lib LIBRARY ecom.lib // UNICODE CONVERSION LIBRARY charconv.lib