# HG changeset patch # User Dremov Kirill (Nokia-D-MSW/Tampere) # Date 1286971205 -10800 # Node ID bafa26c1d2343d74a2b1e38da58a8db728eeb40d # Parent fbd2e7cec7efe7a454607e63eec538e971a52002 Revision: 201039 Kit: 201041 diff -r fbd2e7cec7ef -r bafa26c1d234 XDMEngine/rom/XdmEngine.iby --- a/XDMEngine/rom/XdmEngine.iby Wed Sep 01 12:23:14 2010 +0100 +++ b/XDMEngine/rom/XdmEngine.iby Wed Oct 13 15:00:05 2010 +0300 @@ -22,9 +22,9 @@ #define __XDMENGINE_IBY__ #ifdef __XDM - file=ABI_DIR/BUILD_DIR/XdmEngine.dll SHARED_LIB_DIR/XdmEngine.dll - file=ABI_DIR/BUILD_DIR/XdmXmlParser.dll SHARED_LIB_DIR/XdmXmlParser.dll - file=ABI_DIR/BUILD_DIR/XdmSettingsApi.dll SHARED_LIB_DIR/XdmSettingsApi.dll + file=ABI_DIR\BUILD_DIR\XdmEngine.dll SHARED_LIB_DIR\XdmEngine.dll + file=ABI_DIR\BUILD_DIR\XdmXmlParser.dll SHARED_LIB_DIR\XdmXmlParser.dll + file=ABI_DIR\BUILD_DIR\XdmSettingsApi.dll SHARED_LIB_DIR\XdmSettingsApi.dll ECOM_PLUGIN( XdmDeviceManagementAdapter.dll, 10275112.rsc) ECOM_PLUGIN( XdmProvisioning.dll, 1028237A.rsc) #endif //__XDM diff -r fbd2e7cec7ef -r bafa26c1d234 XDMEngine/rom/XdmEngineResources.iby --- a/XDMEngine/rom/XdmEngineResources.iby Wed Sep 01 12:23:14 2010 +0100 +++ b/XDMEngine/rom/XdmEngineResources.iby Wed Oct 13 15:00:05 2010 +0300 @@ -23,7 +23,7 @@ // // Settings provisioning adapter plugin resources // -data=DATAZ_/RESOURCE_FILES_DIR/XdmProvisioningTexts.RSC RESOURCE_FILES_DIR/XdmProvisioningTexts.RSC +data=DATAZ_\RESOURCE_FILES_DIR\XdmProvisioningTexts.RSC RESOURCE_FILES_DIR\XdmProvisioningTexts.RSC #endif //__XDMENGINE_RESOURCES_IBY__ diff -r fbd2e7cec7ef -r bafa26c1d234 XDMSettingsUI/data/XDMPluginRsc.rss --- a/XDMSettingsUI/data/XDMPluginRsc.rss Wed Sep 01 12:23:14 2010 +0100 +++ b/XDMSettingsUI/data/XDMPluginRsc.rss Wed Oct 13 15:00:05 2010 +0300 @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include #include #include diff -r fbd2e7cec7ef -r bafa26c1d234 XDMSettingsUI/group/bld.inf --- a/XDMSettingsUI/group/bld.inf Wed Sep 01 12:23:14 2010 +0100 +++ b/XDMSettingsUI/group/bld.inf Wed Oct 13 15:00:05 2010 +0300 @@ -33,7 +33,7 @@ ../rom/GSXDMPlugin.iby CORE_MW_LAYER_IBY_EXPORT_PATH(gsxdmplugin.iby) ../rom/GSXDMPluginResources.iby LANGUAGE_MW_LAYER_IBY_EXPORT_PATH(gsxdmpluginresources.iby) // LOC -../loc/gsxdmplugin.loc MW_LAYER_LOC_EXPORT_PATH(gsxdmplugin.loc) +../loc/GSXDMPlugin.loc MW_LAYER_LOC_EXPORT_PATH(gsxdmplugin.loc) PRJ_EXTENSIONS START EXTENSION s60/mifconv diff -r fbd2e7cec7ef -r bafa26c1d234 XDMSettingsUI/help/rom/xdmsettingsuihelps_variant.iby --- a/XDMSettingsUI/help/rom/xdmsettingsuihelps_variant.iby Wed Sep 01 12:23:14 2010 +0100 +++ b/XDMSettingsUI/help/rom/xdmsettingsuihelps_variant.iby Wed Oct 13 15:00:05 2010 +0300 @@ -19,10 +19,10 @@ #define __XDMSETTINGSUIHELPS_VARIANT_IBY__ #if defined(FF_S60_HELPS_IN_USE) - data=LOCALISE(DATAZ_/resource/xhtml/%02d/0x10207429/contents.zip, RESOURCE_FILES_DIR/xhtml/%02d/0x10207429/contents.zip) - data=LOCALISE(DATAZ_/resource/xhtml/%02d/0x10207429/index.xml, RESOURCE_FILES_DIR/xhtml/%02d/0x10207429/index.xml) - data=LOCALISE(DATAZ_/resource/xhtml/%02d/0x10207429/keywords.xml, RESOURCE_FILES_DIR/xhtml/%02d/0x10207429/keywords.xml) - data=LOCALISE(DATAZ_/resource/xhtml/%02d/0x10207429/meta.xml, RESOURCE_FILES_DIR/xhtml/%02d/0x10207429/meta.xml) + data=LOCALISE(DATAZ_\resource\xhtml\%02d\0x10207429\contents.zip, RESOURCE_FILES_DIR\xhtml\%02d\0x10207429\contents.zip) + data=LOCALISE(DATAZ_\resource\xhtml\%02d\0x10207429\index.xml, RESOURCE_FILES_DIR\xhtml\%02d\0x10207429\index.xml) + data=LOCALISE(DATAZ_\resource\xhtml\%02d\0x10207429\keywords.xml, RESOURCE_FILES_DIR\xhtml\%02d\0x10207429\keywords.xml) + data=LOCALISE(DATAZ_\resource\xhtml\%02d\0x10207429\meta.xml, RESOURCE_FILES_DIR\xhtml\%02d\0x10207429\meta.xml) #endif #endif \ No newline at end of file diff -r fbd2e7cec7ef -r bafa26c1d234 XDMSettingsUI/inc/XDMExternalInterface.h --- a/XDMSettingsUI/inc/XDMExternalInterface.h Wed Sep 01 12:23:14 2010 +0100 +++ b/XDMSettingsUI/inc/XDMExternalInterface.h Wed Oct 13 15:00:05 2010 +0300 @@ -22,7 +22,7 @@ #include #include -#include +#include #include "XDMPlugin.h" #define XDM_PLUGIN diff -r fbd2e7cec7ef -r bafa26c1d234 XDMSettingsUI/rom/GSXDMPlugin.iby --- a/XDMSettingsUI/rom/GSXDMPlugin.iby Wed Sep 01 12:23:14 2010 +0100 +++ b/XDMSettingsUI/rom/GSXDMPlugin.iby Wed Oct 13 15:00:05 2010 +0300 @@ -28,7 +28,7 @@ // GS XDM Plugin UI ECOM_PLUGIN(GSXDMPlugin.dll,10207428.rsc) // this publishes the DLL and the // resource file to the correct location -data=DATAZ_/BITMAP_DIR/GSXDMplugin.mif BITMAP_DIR/GSXDMplugin.mif +data=DATAZ_\BITMAP_DIR\GSXDMplugin.mif BITMAP_DIR\GSXDMplugin.mif #endif //RD_GS_RENOVATION diff -r fbd2e7cec7ef -r bafa26c1d234 XDMSettingsUI/rom/GSXDMPluginResources.iby --- a/XDMSettingsUI/rom/GSXDMPluginResources.iby Wed Sep 01 12:23:14 2010 +0100 +++ b/XDMSettingsUI/rom/GSXDMPluginResources.iby Wed Oct 13 15:00:05 2010 +0300 @@ -27,7 +27,7 @@ // GS XDM Plugin UI -data=DATAZ_/RESOURCE_FILES_DIR/XDMPluginRsc.RSC RESOURCE_FILES_DIR/XDMPluginRsc.RSC +data=DATAZ_\RESOURCE_FILES_DIR\XDMPluginRsc.RSC RESOURCE_FILES_DIR\XDMPluginRsc.RSC #endif //RD_GS_RENOVATION diff -r fbd2e7cec7ef -r bafa26c1d234 msgconnmanager/rom/msgconnmanager.iby --- a/msgconnmanager/rom/msgconnmanager.iby Wed Sep 01 12:23:14 2010 +0100 +++ b/msgconnmanager/rom/msgconnmanager.iby Wed Oct 13 15:00:05 2010 +0300 @@ -34,7 +34,7 @@ #endif //__PRESENCE #ifdef __INCLUDE_CM__ - file=ABI_DIR/BUILD_DIR/msgconnmanager.dll SHARED_LIB_DIR/msgconnmanager.dll + file=ABI_DIR\BUILD_DIR\msgconnmanager.dll SHARED_LIB_DIR\msgconnmanager.dll #endif //__INCLUDE_CM__ #endif //__MSGCONNMANAGER_IBY__ diff -r fbd2e7cec7ef -r bafa26c1d234 presencefwsimpleadpt/rom/presencefwsimpleadpt.iby --- a/presencefwsimpleadpt/rom/presencefwsimpleadpt.iby Wed Sep 01 12:23:14 2010 +0100 +++ b/presencefwsimpleadpt/rom/presencefwsimpleadpt.iby Wed Oct 13 15:00:05 2010 +0300 @@ -30,7 +30,7 @@ ECOM_PLUGIN( simpleplugin.dll, simpleplugin.rss ) // stub SIS, provides support for SIS upgrading -data=DATAZ_/system/install/presencefwsimpleadptstub.sis system/install/presencefwsimpleadptstub.sis +data=DATAZ_\system\install\presencefwsimpleadptstub.sis system\install\presencefwsimpleadptstub.sis #endif // __SIP_SIMPLE_PRESENCE_PROTOCOL #endif // __PRESENCE_FRAMEWORK diff -r fbd2e7cec7ef -r bafa26c1d234 presencesettingsui/data/psuigspluginrsc.rss --- a/presencesettingsui/data/psuigspluginrsc.rss Wed Sep 01 12:23:14 2010 +0100 +++ b/presencesettingsui/data/psuigspluginrsc.rss Wed Oct 13 15:00:05 2010 +0300 @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include #include #include diff -r fbd2e7cec7ef -r bafa26c1d234 presencesettingsui/help/rom/presencesettingsuihelps_variant.iby --- a/presencesettingsui/help/rom/presencesettingsuihelps_variant.iby Wed Sep 01 12:23:14 2010 +0100 +++ b/presencesettingsui/help/rom/presencesettingsuihelps_variant.iby Wed Oct 13 15:00:05 2010 +0300 @@ -19,10 +19,10 @@ #define __PRESENCESETTINGSUIHELPS_VARIANT_IBY__ #if defined(FF_S60_HELPS_IN_USE) - data=LOCALISE(DATAZ_/resource/xhtml/%02d/0x10281EF0/contents.zip, RESOURCE_FILES_DIR/xhtml/%02d/0x10281EF0/contents.zip) - data=LOCALISE(DATAZ_/resource/xhtml/%02d/0x10281EF0/index.xml, RESOURCE_FILES_DIR/xhtml/%02d/0x10281EF0/index.xml) - data=LOCALISE(DATAZ_/resource/xhtml/%02d/0x10281EF0/keywords.xml, RESOURCE_FILES_DIR/xhtml/%02d/0x10281EF0/keywords.xml) - data=LOCALISE(DATAZ_/resource/xhtml/%02d/0x10281EF0/meta.xml, RESOURCE_FILES_DIR/xhtml/%02d/0x10281EF0/meta.xml) + data=LOCALISE(DATAZ_\resource\xhtml\%02d\0x10281EF0\contents.zip, RESOURCE_FILES_DIR\xhtml\%02d\0x10281EF0\contents.zip) + data=LOCALISE(DATAZ_\resource\xhtml\%02d\0x10281EF0\index.xml, RESOURCE_FILES_DIR\xhtml\%02d\0x10281EF0\index.xml) + data=LOCALISE(DATAZ_\resource\xhtml\%02d\0x10281EF0\keywords.xml, RESOURCE_FILES_DIR\xhtml\%02d\0x10281EF0\keywords.xml) + data=LOCALISE(DATAZ_\resource\xhtml\%02d\0x10281EF0\meta.xml, RESOURCE_FILES_DIR\xhtml\%02d\0x10281EF0\meta.xml) #endif #endif \ No newline at end of file diff -r fbd2e7cec7ef -r bafa26c1d234 presencesettingsui/rom/psuigsplugin.iby --- a/presencesettingsui/rom/psuigsplugin.iby Wed Sep 01 12:23:14 2010 +0100 +++ b/presencesettingsui/rom/psuigsplugin.iby Wed Oct 13 15:00:05 2010 +0300 @@ -27,7 +27,7 @@ #ifdef __SIP_SIMPLE_PRESENCE_PROTOCOL ECOM_PLUGIN(psuigsplugin.dll,10281ef0.rsc) -data=DATAZ_/BITMAP_DIR/psuigsplugin.mif BITMAP_DIR/psuigsplugin.mif +data=DATAZ_\BITMAP_DIR\psuigsplugin.mif BITMAP_DIR\psuigsplugin.mif #endif RD_GS_RENOVATION_PHASE2 #endif __SIP_SIMPLE_PRESENCE_PROTOCOL diff -r fbd2e7cec7ef -r bafa26c1d234 presencesettingsui/rom/psuigspluginresources.iby --- a/presencesettingsui/rom/psuigspluginresources.iby Wed Sep 01 12:23:14 2010 +0100 +++ b/presencesettingsui/rom/psuigspluginresources.iby Wed Oct 13 15:00:05 2010 +0300 @@ -26,7 +26,7 @@ #ifdef RD_GS_RENOVATION_PHASE2 #ifdef __SIP_SIMPLE_PRESENCE_PROTOCOL -data=DATAZ_/RESOURCE_FILES_DIR/psuigspluginrsc.rsc RESOURCE_FILES_DIR/psuigspluginrsc.rsc +data=DATAZ_\RESOURCE_FILES_DIR\psuigspluginrsc.rsc RESOURCE_FILES_DIR\psuigspluginrsc.rsc #endif RD_GS_RENOVATION_PHASE2 #endif __SIP_SIMPLE_PRESENCE_PROTOCOL diff -r fbd2e7cec7ef -r bafa26c1d234 presencesettingsui/src/psuigspluginsettingviewcontainer.cpp --- a/presencesettingsui/src/psuigspluginsettingviewcontainer.cpp Wed Sep 01 12:23:14 2010 +0100 +++ b/presencesettingsui/src/psuigspluginsettingviewcontainer.cpp Wed Oct 13 15:00:05 2010 +0300 @@ -32,7 +32,7 @@ #include "psuigsplugin.h" #include "psuigspluginids.hrh" #include -#include +#include // ========================= MEMBER FUNCTIONS ================================ diff -r fbd2e7cec7ef -r bafa26c1d234 pressrv_plat/simple_documents_api/inc/msimplecontent.h --- a/pressrv_plat/simple_documents_api/inc/msimplecontent.h Wed Sep 01 12:23:14 2010 +0100 +++ b/pressrv_plat/simple_documents_api/inc/msimplecontent.h Wed Oct 13 15:00:05 2010 +0300 @@ -22,7 +22,7 @@ #define M_simplecontent_H #include -// #include +// #include // FORWARD DECLARATION diff -r fbd2e7cec7ef -r bafa26c1d234 pressrv_plat/simple_documents_api/inc/msimpledocument.h --- a/pressrv_plat/simple_documents_api/inc/msimpledocument.h Wed Sep 01 12:23:14 2010 +0100 +++ b/pressrv_plat/simple_documents_api/inc/msimpledocument.h Wed Oct 13 15:00:05 2010 +0300 @@ -22,7 +22,7 @@ #define M_simpledocument_H #include -#include +#include #include // FORWARD DECLARATION diff -r fbd2e7cec7ef -r bafa26c1d234 simpleengine/rom/simpleengine.iby --- a/simpleengine/rom/simpleengine.iby Wed Sep 01 12:23:14 2010 +0100 +++ b/simpleengine/rom/simpleengine.iby Wed Oct 13 15:00:05 2010 +0300 @@ -24,17 +24,17 @@ #ifdef __SIP_SIMPLE_PRESENCE_PROTOCOL -file=ABI_DIR/BUILD_DIR/simpleengine.dll SHARED_LIB_DIR/simpleengine.dll -file=ABI_DIR/BUILD_DIR/simplesiputils.dll SHARED_LIB_DIR/simplesiputils.dll -file=ABI_DIR/BUILD_DIR/simplexmlutils.dll SHARED_LIB_DIR/simplexmlutils.dll -file=ABI_DIR/BUILD_DIR/rlspresxdm.dll SHARED_LIB_DIR/rlspresxdm.dll -file=ABI_DIR/BUILD_DIR/presencesettingsapi.dll SHARED_LIB_DIR/presencesettingsapi.dll +file=ABI_DIR\BUILD_DIR\simpleengine.dll SHARED_LIB_DIR\simpleengine.dll +file=ABI_DIR\BUILD_DIR\simplesiputils.dll SHARED_LIB_DIR\simplesiputils.dll +file=ABI_DIR\BUILD_DIR\simplexmlutils.dll SHARED_LIB_DIR\simplexmlutils.dll +file=ABI_DIR\BUILD_DIR\rlspresxdm.dll SHARED_LIB_DIR\rlspresxdm.dll +file=ABI_DIR\BUILD_DIR\presencesettingsapi.dll SHARED_LIB_DIR\presencesettingsapi.dll ECOM_PLUGIN(PresenceDM.dll, 10282415.rsc) ECOM_PLUGIN(PresenceProvisioning.dll, 10282417.rsc) // backup registry -data=DATAZ_/private/10281EEB/backup_registration.xml private/10281EEB/backup_registration.xml +data=DATAZ_\private\10281EEB\backup_registration.xml private\10281EEB\backup_registration.xml #endif // __SIP_SIMPLE_PRESENCE_PROTOCOL #endif diff -r fbd2e7cec7ef -r bafa26c1d234 simpleengine/rom/simpleengineresources.iby --- a/simpleengine/rom/simpleengineresources.iby Wed Sep 01 12:23:14 2010 +0100 +++ b/simpleengine/rom/simpleengineresources.iby Wed Oct 13 15:00:05 2010 +0300 @@ -25,7 +25,7 @@ #include #ifdef __SIP_SIMPLE_PRESENCE_PROTOCOL -data=DATAZ_/RESOURCE_FILES_DIR/PresenceProvisioningTexts.RSC RESOURCE_FILES_DIR/PresenceProvisioningTexts.RSC +data=DATAZ_\RESOURCE_FILES_DIR\PresenceProvisioningTexts.RSC RESOURCE_FILES_DIR\PresenceProvisioningTexts.RSC #endif //__SIP_SIMPLE_PRESENCE_PROTOCOL diff -r fbd2e7cec7ef -r bafa26c1d234 xdmprotocols/rom/XdmProtocols.iby --- a/xdmprotocols/rom/XdmProtocols.iby Wed Sep 01 12:23:14 2010 +0100 +++ b/xdmprotocols/rom/XdmProtocols.iby Wed Oct 13 15:00:05 2010 +0300 @@ -23,14 +23,14 @@ #ifdef __XDM #ifdef __XDM_XCAP - file=ABI_DIR/BUILD_DIR/XcapUtils.dll SHARED_LIB_DIR/XcapUtils.dll - file=ABI_DIR/BUILD_DIR/XcapCacheClient.dll SHARED_LIB_DIR/XcapCacheClient.dll - file=ABI_DIR/BUILD_DIR/XcapCache.exe PROGRAMS_DIR/XcapCache.exe - file=ABI_DIR/BUILD_DIR/XcapHttpTransport.dll SHARED_LIB_DIR/XcapHttpTransport.dll + file=ABI_DIR\BUILD_DIR\XcapUtils.dll SHARED_LIB_DIR\XcapUtils.dll + file=ABI_DIR\BUILD_DIR\XcapCacheClient.dll SHARED_LIB_DIR\XcapCacheClient.dll + file=ABI_DIR\BUILD_DIR\XcapCache.exe PROGRAMS_DIR\XcapCache.exe + file=ABI_DIR\BUILD_DIR\XcapHttpTransport.dll SHARED_LIB_DIR\XcapHttpTransport.dll ECOM_PLUGIN( XcapAppUsage.dll, 10207416.rsc) ECOM_PLUGIN( XcapOperations.dll, 10207410.rsc) ECOM_PLUGIN( XcapProtocol.dll, 1020740F.rsc) - data = DATAZ_/private/10207421/backup_registration.xml private/10207421/backup_registration.xml + data = DATAZ_\private\10207421\backup_registration.xml private\10207421\backup_registration.xml #endif //__XDM_XCAP #ifdef __XDM_LOCALSTORAGE ECOM_PLUGIN( LocalProtocol.dll, 10207458.rsc)