# HG changeset patch
# User Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
# Date 1278419309 -10800
# Node ID c572a90d97eb6c3a9e7163b5d05efe03ce7712b8
# Parent  e358f2276d3f058f7816518e585dd9b38a428d7f
Revision: 201026
Kit: 2010127

diff -r e358f2276d3f -r c572a90d97eb browserutilities/browsertelservice/src/BrowserTelService.cpp
--- a/browserutilities/browsertelservice/src/BrowserTelService.cpp	Wed Jun 23 19:24:55 2010 +0300
+++ b/browserutilities/browsertelservice/src/BrowserTelService.cpp	Tue Jul 06 15:28:29 2010 +0300
@@ -68,7 +68,7 @@
 #include <BrowserUiSDKCRKeys.h>
 #include <centralrepository.h>
 
-#include <nwx_status.h>
+#include <xml/cxml/nwx_status.h>
 
 #include <DialUtils.h>
 
diff -r e358f2276d3f -r c572a90d97eb browserutilities/feedsengine/FeedsServer/FolderHandler/inc/OpmlWriter.h
--- a/browserutilities/feedsengine/FeedsServer/FolderHandler/inc/OpmlWriter.h	Wed Jun 23 19:24:55 2010 +0300
+++ b/browserutilities/feedsengine/FeedsServer/FolderHandler/inc/OpmlWriter.h	Tue Jul 06 15:28:29 2010 +0300
@@ -95,4 +95,4 @@
     
 #endif      // OPML_WRITER_H
             
-// End of File
\ No newline at end of file
+// End of File
diff -r e358f2276d3f -r c572a90d97eb browserutilities/feedsengine/FeedsServer/Server/src/FeedsServer.cpp
--- a/browserutilities/feedsengine/FeedsServer/Server/src/FeedsServer.cpp	Wed Jun 23 19:24:55 2010 +0300
+++ b/browserutilities/feedsengine/FeedsServer/Server/src/FeedsServer.cpp	Tue Jul 06 15:28:29 2010 +0300
@@ -26,7 +26,7 @@
 #include "PackedFolder.h"
 #include "ServerHttpConnection.h"
 #include "Logger.h"
-#include "XmlUtils.h"
+#include "XMLUtils.h"
 #include "BackRestoreHandler.h"
 #include "UpdateManager.h" 
 
diff -r e358f2276d3f -r c572a90d97eb browserutilities/group/bld.inf
--- a/browserutilities/group/bld.inf	Wed Jun 23 19:24:55 2010 +0300
+++ b/browserutilities/group/bld.inf	Tue Jul 06 15:28:29 2010 +0300
@@ -17,8 +17,8 @@
 
 #include "../browserdialogsprovider/Group/bld.inf"
 #include "../recenturlstore/group/bld.inf"
-#include "../xmlparser/group/bld.inf"
-#include "../cxmllibrary/group/BLD.INF"
+//#include "../xmlparser/group/bld.inf"
+//#include "../cxmllibrary/group/BLD.INF"
 #include "../downloadmgr/Group/bld.inf"
 #include "../connectionmanager/Group/bld.inf"
 #include "../browsertelservice/group/bld.inf"
diff -r e358f2276d3f -r c572a90d97eb browserutilities/schemehandler/SchemeApp/group/bld.inf
--- a/browserutilities/schemehandler/SchemeApp/group/bld.inf	Wed Jun 23 19:24:55 2010 +0300
+++ b/browserutilities/schemehandler/SchemeApp/group/bld.inf	Tue Jul 06 15:28:29 2010 +0300
@@ -37,7 +37,6 @@
 #else
     gnumakefile schemeappaificonsdc.mk
 #endif
-../group/SchemeApp.mmp
 
 #else
 
diff -r e358f2276d3f -r c572a90d97eb browserutilities/schemehandler/SchemeDispatcher/src/CtiHandler.cpp
--- a/browserutilities/schemehandler/SchemeDispatcher/src/CtiHandler.cpp	Wed Jun 23 19:24:55 2010 +0300
+++ b/browserutilities/schemehandler/SchemeDispatcher/src/CtiHandler.cpp	Tue Jul 06 15:28:29 2010 +0300
@@ -22,7 +22,7 @@
 
 #include "CtiHandler.h"
 #include "SchemeDispLogger.h"
-#include <ecom.h>		// For REComSession
+#include <ecom/ecom.h>		// For REComSession
 #include <eikenv.h>
 #include <apparc.h>
 #include <apgcli.h>
diff -r e358f2276d3f -r c572a90d97eb browserutilities/schemehandler/SchemeDispatcher/src/FileHandler.cpp
--- a/browserutilities/schemehandler/SchemeDispatcher/src/FileHandler.cpp	Wed Jun 23 19:24:55 2010 +0300
+++ b/browserutilities/schemehandler/SchemeDispatcher/src/FileHandler.cpp	Tue Jul 06 15:28:29 2010 +0300
@@ -22,7 +22,7 @@
 
 #include "FileHandler.h"
 #include "SchemeDispLogger.h"
-#include <ecom.h>		// For REComSession
+#include <ecom/ecom.h>		// For REComSession
 #include <eikenv.h>
 #include <apmstd.h>
 #include <apparc.h>
diff -r e358f2276d3f -r c572a90d97eb browserutilities/schemehandler/SchemeDispatcher/src/HttpHandler.cpp
--- a/browserutilities/schemehandler/SchemeDispatcher/src/HttpHandler.cpp	Wed Jun 23 19:24:55 2010 +0300
+++ b/browserutilities/schemehandler/SchemeDispatcher/src/HttpHandler.cpp	Tue Jul 06 15:28:29 2010 +0300
@@ -22,7 +22,7 @@
 
 #include "HttpHandler.h"
 #include "SchemeDispLogger.h"
-#include <ecom.h>		// For REComSession
+#include <ecom/ecom.h>		// For REComSession
 #include <eikenv.h>
 #include <DocumentHandler.h>
 #include <apgcli.h>
diff -r e358f2276d3f -r c572a90d97eb browserutilities/schemehandler/SchemeDispatcher/src/MailToHandler.cpp
--- a/browserutilities/schemehandler/SchemeDispatcher/src/MailToHandler.cpp	Wed Jun 23 19:24:55 2010 +0300
+++ b/browserutilities/schemehandler/SchemeDispatcher/src/MailToHandler.cpp	Tue Jul 06 15:28:29 2010 +0300
@@ -22,7 +22,7 @@
 
 #include "MailToHandler.h"
 #include "SchemeDispLogger.h"
-#include <ecom.h>		// For REComSession
+#include <ecom/ecom.h>		// For REComSession
 #include <eikenv.h>
 #include <DocumentHandler.h>
 #include <apgcli.h>
diff -r e358f2276d3f -r c572a90d97eb browserutilities/schemehandler/SchemeDispatcher/src/MmsHandler.cpp
--- a/browserutilities/schemehandler/SchemeDispatcher/src/MmsHandler.cpp	Wed Jun 23 19:24:55 2010 +0300
+++ b/browserutilities/schemehandler/SchemeDispatcher/src/MmsHandler.cpp	Tue Jul 06 15:28:29 2010 +0300
@@ -22,7 +22,7 @@
 
 #include "MmsHandler.h"
 #include "SchemeDispLogger.h"
-#include <ecom.h>		// For REComSession
+#include <ecom/ecom.h>		// For REComSession
 #include <eikenv.h>
 #include <DocumentHandler.h>
 #include <apgcli.h>
diff -r e358f2276d3f -r c572a90d97eb browserutilities/schemehandler/SchemeDispatcher/src/RtspHandler.cpp
--- a/browserutilities/schemehandler/SchemeDispatcher/src/RtspHandler.cpp	Wed Jun 23 19:24:55 2010 +0300
+++ b/browserutilities/schemehandler/SchemeDispatcher/src/RtspHandler.cpp	Tue Jul 06 15:28:29 2010 +0300
@@ -22,7 +22,7 @@
 
 #include "RtspHandler.h"
 #include "SchemeDispLogger.h"
-#include <ecom.h>		// For REComSession
+#include <ecom/ecom.h>		// For REComSession
 #include <eikenv.h>
 #include <DocumentHandler.h>
 #include <apgcli.h>
diff -r e358f2276d3f -r c572a90d97eb browserutilities/schemehandler/SchemeDispatcher/src/TelHandler.cpp
--- a/browserutilities/schemehandler/SchemeDispatcher/src/TelHandler.cpp	Wed Jun 23 19:24:55 2010 +0300
+++ b/browserutilities/schemehandler/SchemeDispatcher/src/TelHandler.cpp	Tue Jul 06 15:28:29 2010 +0300
@@ -22,7 +22,7 @@
 
 #include "SchemeDispLogger.h"
 #include "TelHandler.h"
-#include <ecom.h>		// For REComSession
+#include <ecom/ecom.h>		// For REComSession
 #include <eikenv.h>
 #include <apparc.h>
 #include <apgcli.h>
diff -r e358f2276d3f -r c572a90d97eb browserutilities/schemehandler/SchemeDispatcher/src/WtaiHandler.cpp
--- a/browserutilities/schemehandler/SchemeDispatcher/src/WtaiHandler.cpp	Wed Jun 23 19:24:55 2010 +0300
+++ b/browserutilities/schemehandler/SchemeDispatcher/src/WtaiHandler.cpp	Tue Jul 06 15:28:29 2010 +0300
@@ -22,7 +22,7 @@
 
 #include "WtaiHandler.h"
 #include "SchemeDispLogger.h"
-#include <ecom.h>		// For REComSession
+#include <ecom/ecom.h>		// For REComSession
 #include <eikenv.h>
 #include <apparc.h>
 #include <apgcli.h>
diff -r e358f2276d3f -r c572a90d97eb codhandler/codeng/inc/DdDummyDict.h
--- a/codhandler/codeng/inc/DdDummyDict.h	Wed Jun 23 19:24:55 2010 +0300
+++ b/codhandler/codeng/inc/DdDummyDict.h	Tue Jul 06 15:28:29 2010 +0300
@@ -31,7 +31,7 @@
 #ifndef HEADER_GUARD_DdDummyDict_h
 #define HEADER_GUARD_DdDummyDict_h
 
-#include <nw_wbxml_dictionary.h>
+#include <xml/cxml/nw_wbxml_dictionary.h>
 
 #ifdef __cplusplus
 extern "C"
diff -r e358f2276d3f -r c572a90d97eb codhandler/codeng/inc/DdParser.h
--- a/codhandler/codeng/inc/DdParser.h	Wed Jun 23 19:24:55 2010 +0300
+++ b/codhandler/codeng/inc/DdParser.h	Tue Jul 06 15:28:29 2010 +0300
@@ -24,7 +24,7 @@
 // INCLUDES
 
 #include <e32base.h>
-#include <nw_dom_document.h>
+#include <xml/cxml/nw_dom_document.h>
 
 // FORWARD DECLARATION
 
diff -r e358f2276d3f -r c572a90d97eb codhandler/codeng/inc/NwUtil.h
--- a/codhandler/codeng/inc/NwUtil.h	Wed Jun 23 19:24:55 2010 +0300
+++ b/codhandler/codeng/inc/NwUtil.h	Tue Jul 06 15:28:29 2010 +0300
@@ -24,10 +24,10 @@
 // INCLUDES
 
 #include <e32base.h>
-#include <nwx_status.h>
-#include <nw_wbxml_dictionary.h>
-#include <nw_encoder_stringtable.h>
-#include <nw_string_string.h>
+#include <xml/cxml/nwx_status.h>
+#include <xml/cxml/nw_wbxml_dictionary.h>
+#include <xml/cxml/nw_encoder_stringtable.h>
+#include <xml/cxml/nw_string_string.h>
 
 // FUNCTION DECLARATION
 
diff -r e358f2276d3f -r c572a90d97eb codhandler/codeng/src/DdDummyDict.c
--- a/codhandler/codeng/src/DdDummyDict.c	Wed Jun 23 19:24:55 2010 +0300
+++ b/codhandler/codeng/src/DdDummyDict.c	Tue Jul 06 15:28:29 2010 +0300
@@ -35,7 +35,7 @@
  */
 
 #include "DdDummyDict.h"
-#include "nw_wbxml_dictionary.h"
+#include <xml/cxml/nw_wbxml_dictionary.h>
 
 
 static const NW_Ucs2 NW_DdDummy_ElementTag_name[] = {'n','a','m','e','\0'};
diff -r e358f2276d3f -r c572a90d97eb codhandler/codeng/src/DdParser.cpp
--- a/codhandler/codeng/src/DdParser.cpp	Wed Jun 23 19:24:55 2010 +0300
+++ b/codhandler/codeng/src/DdParser.cpp	Tue Jul 06 15:28:29 2010 +0300
@@ -28,7 +28,7 @@
 #include "NwUtil.h"
 #include "DdDummyDict.h"
 #include "HttpDownloadData.h"
-#include <nw_dom_document.h>
+#include <xml/cxml/nw_dom_document.h>
 #include <utf.h>
 
 // ================= CONSTANTS =======================
diff -r e358f2276d3f -r c572a90d97eb codhandler/codeng/src/HttpLoader.cpp
--- a/codhandler/codeng/src/HttpLoader.cpp	Wed Jun 23 19:24:55 2010 +0300
+++ b/codhandler/codeng/src/HttpLoader.cpp	Tue Jul 06 15:28:29 2010 +0300
@@ -38,7 +38,7 @@
 #include <deflatefilterinterface.h>
 #include <httperr.h>
 #include <bldvariant.hrh>
-#include <ecom.h>
+#include <ecom/ecom.h>
 #include <es_sock.h>
 #include <escapeutils.h>
 #include <http/rhttpheaders.h>
diff -r e358f2276d3f -r c572a90d97eb codhandler/codeng/src/NwUtil.cpp
--- a/codhandler/codeng/src/NwUtil.cpp	Wed Jun 23 19:24:55 2010 +0300
+++ b/codhandler/codeng/src/NwUtil.cpp	Tue Jul 06 15:28:29 2010 +0300
@@ -23,7 +23,7 @@
 #include "NwUtil.h"
 #include "CodError.h"
 #include "CodPanic.h"
-#include <nw_dom_document.h>
+#include <xml/cxml/nw_dom_document.h>
 
 // ================= LOCAL FUNCTIONS =======================
 
diff -r e358f2276d3f -r c572a90d97eb web_plat/group/bld.inf
--- a/web_plat/group/bld.inf	Wed Jun 23 19:24:55 2010 +0300
+++ b/web_plat/group/bld.inf	Tue Jul 06 15:28:29 2010 +0300
@@ -23,7 +23,7 @@
 #include "../browser_platform_api/group/bld.inf"
 #include "../cod_handler_api/group/bld.inf"
 #include "../connection_manager_api/group/bld.inf"
-#include "../cxml_library_api/group/bld.inf"
+//#include "../cxml_library_api/group/bld.inf"
 #include "../download_mgr_client_api_extn/group/bld.inf"
 #include "../feeds_engine_api/group/bld.inf"
 #include "../launcher_api/group/bld.inf"
@@ -36,7 +36,7 @@
 #include "../scriptable_plugin_api/group/bld.inf"
 #include "../webutils_api/group/bld.inf"
 #include "../widget_registry_api/group/bld.inf"
-#include "../xml_parser_api/group/bld.inf"
+//#include "../xml_parser_api/group/bld.inf"
 
 PRJ_PLATFORMS
 DEFAULT
diff -r e358f2276d3f -r c572a90d97eb web_plat/scheme_handler_plugin_api/inc/SchemeHandler.inl
--- a/web_plat/scheme_handler_plugin_api/inc/SchemeHandler.inl	Wed Jun 23 19:24:55 2010 +0300
+++ b/web_plat/scheme_handler_plugin_api/inc/SchemeHandler.inl	Tue Jul 06 15:28:29 2010 +0300
@@ -21,7 +21,7 @@
 // INCLUDE FILES
 
 #include <SchemeDefs.hrh>
-#include <ECom.h>		// For REComSession
+#include <ecom/ecom.h>		// For REComSession
 
 // ================= CONSTANTS =======================