Revision: 200951
authorDremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
Thu, 07 Jan 2010 13:31:38 +0200
changeset 26 cb62a4f66ebe
parent 25 0ed94ceaa377
child 27 6297cdf66332
Revision: 200951 Kit: 201001
browserutilities/aiwbrowserprovider/Group/AiwBrowserProvider.mmp
browserutilities/aiwbrowserprovider/Group/bld.inf
browserutilities/aiwbrowserprovider/data/101FD682.rss
browserutilities/aiwbrowserprovider/data/AiwBrowserProvider.rss
browserutilities/aiwbrowserprovider/src/AiwBrowserProviderOpenUrl.cpp
browserutilities/aiwbrowserprovider/src/AiwBrowserProviderSaveUrl.cpp
browserutilities/aiwbrowserprovider/src/Dllmain.cpp
browserutilities/browserdialogsprovider/Group/bld.inf
browserutilities/browserdialogsprovider/Group/browserdialogsprovider.mmp
browserutilities/browserdialogsprovider/Inc/BrowserSelectElementItemDrawer.h
browserutilities/browserdialogsprovider/Src/BrowserDialogsProvider.cpp
browserutilities/browserdialogsprovider/Src/BrowserSelectElementItemDrawer.cpp
browserutilities/browserdialogsprovider/Src/BrowserUploadProgressNote.cpp
browserutilities/browserdialogsprovider/Src/BrowserViewImagesPopup.cpp
browserutilities/browserdialogsprovider/SrcData/BrowserDialogsProvider.rss
browserutilities/browsertelservice/data/BrowserTelService.rss
browserutilities/browsertelservice/group/BrowserTelService.mmp
browserutilities/browsertelservice/group/bld.inf
browserutilities/connectionmanager/Inc/ConnMan.hrh
browserutilities/connectionmanager/Src/ConnectionObservers.cpp
browserutilities/connectionmanager/Src/InternetConnectionManager.cpp
browserutilities/cxmllibrary/dictionary/dict_creator.c
browserutilities/cxmllibrary/group/cXmlParser.mmp
browserutilities/cxmllibrary/src/dom/include/nw_dom_wbxmltypes.h
browserutilities/cxmllibrary/src/dom/src/attribute.c
browserutilities/cxmllibrary/src/dom/src/document.c
browserutilities/cxmllibrary/src/dom/src/element.c
browserutilities/cxmllibrary/src/dom/src/node.c
browserutilities/cxmllibrary/src/dom/src/text.c
browserutilities/cxmllibrary/src/dom/src/wbxml_types.c
browserutilities/cxmllibrary/src/encoder/include/nw_encoder_tinydom2wbxml.h
browserutilities/cxmllibrary/src/encoder/src/StringTable.c
browserutilities/cxmllibrary/src/encoder/src/WBXMLWriter.cpp
browserutilities/cxmllibrary/src/encoder/src/domencoder.c
browserutilities/cxmllibrary/src/encoder/src/tinydom2wbxml.c
browserutilities/cxmllibrary/src/string/src/char.c
browserutilities/cxmllibrary/src/string/src/string.c
browserutilities/cxmllibrary/src/tinydom/src/tiny_dom.c
browserutilities/cxmllibrary/src/tinydom/src/tiny_dom_utils.c
browserutilities/cxmllibrary/src/tinydom/src/tiny_dom_write.c
browserutilities/cxmllibrary/src/tinytree/src/EBuffer.c
browserutilities/cxmllibrary/src/tinytree/src/TreeVector.c
browserutilities/cxmllibrary/src/tinytree/src/tree.c
browserutilities/cxmllibrary/src/tinytree/src/tree_alloc.c
browserutilities/cxmllibrary/src/utils/include/cxml_internal.h
browserutilities/cxmllibrary/src/utils/include/cxml_mem.h
browserutilities/cxmllibrary/src/utils/src/E32XMLParserDllEntryPoint.cpp
browserutilities/cxmllibrary/src/utils/src/cxml_assert.c
browserutilities/cxmllibrary/src/utils/src/cxml_file_if.cpp
browserutilities/cxmllibrary/src/utils/src/cxml_str.c
browserutilities/cxmllibrary/src/utils/src/cxml_vector.c
browserutilities/cxmllibrary/src/wbxmlp/include/DictionaryContext.h
browserutilities/cxmllibrary/src/wbxmlp/include/nw_wbxml_parsei.h
browserutilities/cxmllibrary/src/wbxmlp/src/DictionaryContext.cpp
browserutilities/cxmllibrary/src/wbxmlp/src/dictionary.c
browserutilities/cxmllibrary/src/wbxmlp/src/doc.c
browserutilities/cxmllibrary/src/wbxmlp/src/opaque.c
browserutilities/cxmllibrary/src/wbxmlp/src/parse_buffer.c
browserutilities/cxmllibrary/src/wbxmlp/src/parse_logic.cpp
browserutilities/cxmllibrary/src/xmlp/include/cxml_xmlp_entity.h
browserutilities/cxmllibrary/src/xmlp/include/cxml_xmlp_int_entity.h
browserutilities/cxmllibrary/src/xmlp/src/XMLParser.cpp
browserutilities/cxmllibrary/src/xmlp/src/XMLReader.c
browserutilities/cxmllibrary/src/xmlp/src/Xmlp2Wbxml.c
browserutilities/cxmllibrary/src/xmlp/src/XmlpEntity.cpp
browserutilities/cxmllibrary/src/xmlp/src/XmlpIntEntity.cpp
browserutilities/downloadmgr/DownloadMgrClntSrv/group/DownloadMgrClntSrv.mmp
browserutilities/downloadmgr/DownloadMgrClntSrv/group/DownloadMgrServer.mmp
browserutilities/downloadmgr/DownloadMgrClntSrv/inc/DownloadMgrDef.h
browserutilities/downloadmgr/DownloadMgrClntSrv/inc/DownloadMgrHandler.h
browserutilities/downloadmgr/DownloadMgrClntSrv/inc/DownloadMgrServer.h
browserutilities/downloadmgr/DownloadMgrClntSrv/src/DownloadMgrClientApiExt.cpp
browserutilities/downloadmgr/DownloadMgrClntSrv/src/DownloadMgrClntSession.cpp
browserutilities/downloadmgr/DownloadMgrClntSrv/src/DownloadMgrClntSubSession.cpp
browserutilities/downloadmgr/DownloadMgrClntSrv/src/DownloadMgrCod.cpp
browserutilities/downloadmgr/DownloadMgrClntSrv/src/DownloadMgrEventQueue.cpp
browserutilities/downloadmgr/DownloadMgrClntSrv/src/DownloadMgrHandler.cpp
browserutilities/downloadmgr/DownloadMgrClntSrv/src/DownloadMgrServer.cpp
browserutilities/downloadmgr/DownloadMgrClntSrv/src/DownloadMgrSrvObject.cpp
browserutilities/downloadmgr/DownloadMgrClntSrv/src/DownloadMgrSrvSession.cpp
browserutilities/downloadmgr/DownloadMgrClntSrv/src/DownloadMgrTransObserver.cpp
browserutilities/downloadmgr/DownloadMgrServEng/Group/HttpDMServEng.mmp
browserutilities/downloadmgr/DownloadMgrServEng/Inc/DownloadDataServ.h
browserutilities/downloadmgr/DownloadMgrServEng/Inc/HttpClientAppInstance.h
browserutilities/downloadmgr/DownloadMgrServEng/Inc/HttpDownloadManagerServerEngine.h
browserutilities/downloadmgr/DownloadMgrServEng/Src/DownloadDataServ.cpp
browserutilities/downloadmgr/DownloadMgrServEng/Src/HttpClientAppInstance.cpp
browserutilities/downloadmgr/DownloadMgrServEng/Src/HttpConnHandler.cpp
browserutilities/downloadmgr/DownloadMgrUiLib/Data/DownloadMgrUiLib.rss
browserutilities/downloadmgr/DownloadMgrUiLib/Group/Bld.inf
browserutilities/downloadmgr/DownloadMgrUiLib/Group/DownloadMgrUiLib.mmp
browserutilities/downloadmgr/DownloadMgrUiLib/Inc/AsyncEventHandlerBase.h
browserutilities/downloadmgr/DownloadMgrUiLib/Src/AsyncEventHandlerBase.cpp
browserutilities/downloadmgr/DownloadMgrUiLib/Src/CDownloadMgrUiBase.cpp
browserutilities/downloadmgr/DownloadMgrUiLib/Src/CDownloadMgrUiDownloadMenu.cpp
browserutilities/downloadmgr/DownloadMgrUiLib/Src/CDownloadMgrUiDownloadsList.cpp
browserutilities/downloadmgr/DownloadMgrUiLib/Src/CDownloadMgrUiLibRegistry.cpp
browserutilities/downloadmgr/DownloadMgrUiLib/Src/CDownloadMgrUiUserInteractions.cpp
browserutilities/downloadmgr/DownloadMgrUiLib/Src/CDownloadsListDlg.cpp
browserutilities/downloadmgr/DownloadMgrUiLib/Src/CUserInteractionsUtils.cpp
browserutilities/downloadmgr/DownloadMgrUiLib/Src/UserInteractionsEventHandler.cpp
browserutilities/favouritesengine/ClientServer/src/ActiveFavouritesDbNotifier.cpp
browserutilities/favouritesengine/ClientServer/src/FavouritesDb.cpp
browserutilities/favouritesengine/ClientServer/src/FavouritesDbIncremental.cpp
browserutilities/favouritesengine/ClientServer/src/FavouritesDbNotifier.cpp
browserutilities/favouritesengine/ClientServer/src/FavouritesFile.cpp
browserutilities/favouritesengine/ClientServer/src/FavouritesHandle.cpp
browserutilities/favouritesengine/ClientServer/src/FavouritesItem.cpp
browserutilities/favouritesengine/ClientServer/src/FavouritesItemList.cpp
browserutilities/favouritesengine/ClientServer/src/FavouritesSession.cpp
browserutilities/favouritesengine/ClientServer/src/FavouritesWapAp.cpp
browserutilities/favouritesengine/ClientServer/srvsrc/FavouritesSrv.cpp
browserutilities/favouritesengine/ClientServer/srvsrc/FavouritesSrvDb.cpp
browserutilities/favouritesengine/ClientServer/srvsrc/FavouritesSrvTable.cpp
browserutilities/feedsengine/FeedsServer/Api/src/FeedsEntity.cpp
browserutilities/feedsengine/FeedsServer/Api/src/FeedsInterface.cpp
browserutilities/feedsengine/FeedsServer/Api/src/FeedsMap.cpp
browserutilities/feedsengine/FeedsServer/Api/src/Transaction.cpp
browserutilities/feedsengine/FeedsServer/Client/inc/FeedRequestHandlers.h
browserutilities/feedsengine/FeedsServer/Client/inc/FolderItemRequestHandlers.h
browserutilities/feedsengine/FeedsServer/Client/src/Enclosure.cpp
browserutilities/feedsengine/FeedsServer/Client/src/Feed.cpp
browserutilities/feedsengine/FeedsServer/Client/src/FeedsServerClient.cpp
browserutilities/feedsengine/FeedsServer/Client/src/FeedsServerFeed.cpp
browserutilities/feedsengine/FeedsServer/Client/src/FeedsServerFolderItem.cpp
browserutilities/feedsengine/FeedsServer/Client/src/FolderItem.cpp
browserutilities/feedsengine/FeedsServer/Client/src/Item.cpp
browserutilities/feedsengine/FeedsServer/Client/src/RequestHandler.cpp
browserutilities/feedsengine/FeedsServer/Common/inc/PackedFeed.h
browserutilities/feedsengine/FeedsServer/Common/inc/PackedFolder.h
browserutilities/feedsengine/FeedsServer/Common/src/LeakTracker.cpp
browserutilities/feedsengine/FeedsServer/Common/src/PackedFeed.cpp
browserutilities/feedsengine/FeedsServer/Common/src/PackedFolder.cpp
browserutilities/feedsengine/FeedsServer/FeedHandler/inc/FeedHandler.h
browserutilities/feedsengine/FeedsServer/FeedHandler/src/AtomFeedParser.cpp
browserutilities/feedsengine/FeedsServer/FeedHandler/src/FeedHandler.cpp
browserutilities/feedsengine/FeedsServer/FeedHandler/src/FeedParser.cpp
browserutilities/feedsengine/FeedsServer/FeedHandler/src/RssFeedParser.cpp
browserutilities/feedsengine/FeedsServer/FolderHandler/inc/OpmlParser.h
browserutilities/feedsengine/FeedsServer/FolderHandler/inc/OpmlWriter.h
browserutilities/feedsengine/FeedsServer/FolderHandler/src/OpmlParser.cpp
browserutilities/feedsengine/FeedsServer/Reconizer/data/102072EE.rss
browserutilities/feedsengine/FeedsServer/Reconizer/src/FeedsRec.cpp
browserutilities/feedsengine/FeedsServer/Server/inc/FeedsDatabase.h
browserutilities/feedsengine/FeedsServer/Server/inc/FeedsServer.h
browserutilities/feedsengine/FeedsServer/Server/inc/FeedsServerSession.h
browserutilities/feedsengine/FeedsServer/Server/inc/ImportFeedsTask.h
browserutilities/feedsengine/FeedsServer/Server/inc/UpdateAllFeedsTask.h
browserutilities/feedsengine/FeedsServer/Server/inc/UpdateFeedTask.h
browserutilities/feedsengine/FeedsServer/Server/src/FeedsDatabase.cpp
browserutilities/feedsengine/FeedsServer/Server/src/FeedsServer.cpp
browserutilities/feedsengine/FeedsServer/Server/src/FeedsServerMain.cpp
browserutilities/feedsengine/FeedsServer/Server/src/FeedsServerSession.cpp
browserutilities/feedsengine/FeedsServer/Server/src/ImportFeedsTask.cpp
browserutilities/feedsengine/FeedsServer/Server/src/UpdateAllFeedsTask.cpp
browserutilities/feedsengine/FeedsServer/Server/src/UpdateFeedTask.cpp
browserutilities/feedsengine/FeedsServer/UrlHandler/inc/FileHandler.h
browserutilities/feedsengine/FeedsServer/UrlHandler/inc/HttpConnection.h
browserutilities/feedsengine/FeedsServer/UrlHandler/inc/HttpHandler.h
browserutilities/feedsengine/FeedsServer/UrlHandler/src/FileHandler.cpp
browserutilities/feedsengine/FeedsServer/UrlHandler/src/HttpConnection.cpp
browserutilities/feedsengine/FeedsServer/UrlHandler/src/HttpHandler.cpp
browserutilities/feedsengine/FeedsServer/XmlUtils/src/XmlEncoding.cpp
browserutilities/feedsengine/FeedsServer/XmlUtils/src/XmlEntity.cpp
browserutilities/feedsengine/FeedsServer/XmlUtils/src/XmlUtils.cpp
browserutilities/feedsengine/FeedsUI/FeedsApp/src/FeedsAppUI.cpp
browserutilities/feedsengine/FeedsUI/FeedsApp/src/FeedsApplication.cpp
browserutilities/feedsengine/FeedsUI/FeedsApp/src/FeedsDocument.cpp
browserutilities/feedsengine/FeedsUI/TestHarness/inc/TestHarness.h
browserutilities/feedsengine/FeedsUI/TestHarness/src/TestHarness.cpp
browserutilities/feedsengine/FeedsUI/TestHarness/src/TestHarnessContainer.cpp
browserutilities/feedsengine/FeedsUI/TestHarness/src/TestHarnessView.cpp
browserutilities/feedsengine/group/FeedsApp.mmp
browserutilities/feedsengine/group/FeedsServer.mmp
browserutilities/feedsengine/group/FeedsServerClient.mmp
browserutilities/multipartparser/group/MultipartParser.mmp
browserutilities/multipartparser/src/BodyPart.cpp
browserutilities/multipartparser/src/MultipartParser.cpp
browserutilities/recenturlstore/RecentUrlSrc/RecentUrlStore.cpp
browserutilities/schemehandler/SchemeApp/data/SchemeApp.rss
browserutilities/schemehandler/SchemeApp/data/SchemeApp_Caption.rss
browserutilities/schemehandler/SchemeApp/group/SchemeApp.mmp
browserutilities/schemehandler/SchemeApp/group/bld.inf
browserutilities/schemehandler/SchemeApp/loc/SchemeApp.loc
browserutilities/schemehandler/SchemeApp/src/SchemeDocument.cpp
browserutilities/schemehandler/SchemeDispatcher/data/101f8531.rss
browserutilities/schemehandler/SchemeDispatcher/group/SchemeDispatcher.mmp
browserutilities/schemehandler/SchemeDispatcher/inc/BaseHandler.h
browserutilities/schemehandler/SchemeDispatcher/src/CtiHandler.cpp
browserutilities/schemehandler/SchemeDispatcher/src/FileHandler.cpp
browserutilities/schemehandler/SchemeDispatcher/src/HttpHandler.cpp
browserutilities/schemehandler/SchemeDispatcher/src/MailToHandler.cpp
browserutilities/schemehandler/SchemeDispatcher/src/MmsHandler.cpp
browserutilities/schemehandler/SchemeDispatcher/src/RtspHandler.cpp
browserutilities/schemehandler/SchemeDispatcher/src/SchemeProxy.cpp
browserutilities/schemehandler/SchemeDispatcher/src/TelHandler.cpp
browserutilities/schemehandler/SchemeDispatcher/src/WtaiHandler.cpp
browserutilities/webutils/conf/webutils.confml
browserutilities/webutils/group/webutils.mmp
browserutilities/webutils/src/CUserAgent.cpp
browserutilities/webutils/tsrc/public/adv/group/WebUtilsBCTest.mmp
browserutilities/xmlparser/group/XMLInterface.mmp
browserutilities/xmlparser/inc/CXMLAttributes.h
browserutilities/xmlparser/inc/CXMLObserver.h
browserutilities/xmlparser/inc/CXMLReader.h
browserutilities/xmlparser/src/RXMLReader.cpp
browserutilities/xmlparser/src/syncml_1_0_dict.c
browserutilities/xmlparser/src/wml_1_1_dict.c
browserutilities/xmlparser/src/wml_1_3_dict.c
browserutilities/xmlparser/src/xhtml_1_0_dict.c
codhandler/coddownload/group/CodDownload.mmp
codhandler/coddownload/src/CodDownload.cpp
codhandler/codeng/group/CodEng.mmp
codhandler/codeng/inc/CodError.h
codhandler/codeng/inc/CodPanic.h
codhandler/codeng/inc/DownloadDataClient.h
codhandler/codeng/inc/MediaObject.h
codhandler/codeng/inc/NwUtil.h
codhandler/codeng/src/CodData.cpp
codhandler/codeng/src/CodEng.cpp
codhandler/codeng/src/CodEngBase.cpp
codhandler/codeng/src/CodParser.cpp
codhandler/codeng/src/DdDummyDict.c
codhandler/codeng/src/DdEng.cpp
codhandler/codeng/src/DdParser.cpp
codhandler/codeng/src/DownloadDataClient.cpp
codhandler/codeng/src/FileSaver.cpp
codhandler/codeng/src/FotaSaver.cpp
codhandler/codeng/src/HttpLoader.cpp
codhandler/codeng/src/MediaObject.cpp
codhandler/codeng/src/NwUtil.cpp
codhandler/codeng/src/RoapSaver.cpp
codhandler/codrecog/group/CodRecog.mmp
codhandler/codrecog/src/10008d49.rss
codhandler/codrecog/src/CodRecog.cpp
codhandler/codui/data/CodUi.rss
codhandler/codui/group/CodUi.mmp
codhandler/codui/inc/CodAppUi.h
codhandler/codui/inc/CodDownloadImpl.h
codhandler/codui/src/CodAppUi.cpp
codhandler/codui/src/CodConfirm.cpp
codhandler/codui/src/CodDocument.cpp
codhandler/codui/src/CodDownloadImpl.cpp
codhandler/codui/src/CodView.cpp
codhandler/codui/src/CodViewerApp.cpp
codhandler/codui/src/DdViewerApp.cpp
codhandler/codviewer/data/CodViewer.rss
codhandler/codviewer/data/CodViewer_reg.rss
codhandler/codviewer/group/CodViewer.mmp
codhandler/codviewer/src/CodViewer.cpp
codhandler/ddrecog/group/DdRecog.mmp
codhandler/ddrecog/src/10008d55.rss
codhandler/ddrecog/src/DdRecog.cpp
codhandler/ddviewer/data/DdViewer.rss
codhandler/ddviewer/data/DdViewer_reg.rss
codhandler/ddviewer/group/DdViewer.mmp
codhandler/ddviewer/src/DdViewer.cpp
codhandler/group/bld.inf
codhandler/roapapp/group/RoapApp.mmp
codhandler/roapapp/inc/RoapAppLogger.h
web_plat/browser_dialogs_provider_api/group/bld.inf
web_plat/browser_platform_api/inc/Browser_platform_variant.hrh
web_plat/cod_handler_api/inc/HttpDownloadData.h
web_plat/connection_manager_api/group/bld.inf
web_plat/connection_manager_api/inc/InternetConnectionManager.h
web_plat/cxml_library_api/inc/cxml_file_if.h
web_plat/cxml_library_api/inc/cxml_nw2cxmlTypes.h
web_plat/cxml_library_api/inc/cxml_proj.h
web_plat/cxml_library_api/inc/cxml_str.h
web_plat/cxml_library_api/inc/nw_cXML_Parser.h
web_plat/cxml_library_api/inc/nw_dom.h
web_plat/cxml_library_api/inc/nw_dom_attribute.h
web_plat/cxml_library_api/inc/nw_dom_document.h
web_plat/cxml_library_api/inc/nw_dom_element.h
web_plat/cxml_library_api/inc/nw_dom_node.h
web_plat/cxml_library_api/inc/nw_dom_text.h
web_plat/cxml_library_api/inc/nw_encoder_domencoder.h
web_plat/cxml_library_api/inc/nw_encoder_stringtable.h
web_plat/cxml_library_api/inc/nw_encoder_wbxmlwriter.h
web_plat/cxml_library_api/inc/nw_string_char.h
web_plat/cxml_library_api/inc/nw_string_string.h
web_plat/cxml_library_api/inc/nw_tinydom.h
web_plat/cxml_library_api/inc/nw_tinydom_utils.h
web_plat/cxml_library_api/inc/nw_tinytree.h
web_plat/cxml_library_api/inc/nw_tinytree_ebuffer.h
web_plat/cxml_library_api/inc/nw_tinytree_treevector.h
web_plat/cxml_library_api/inc/nw_wbxml_dictionary.h
web_plat/cxml_library_api/inc/nw_wbxml_document.h
web_plat/cxml_library_api/inc/nw_wbxml_event.h
web_plat/cxml_library_api/inc/nw_wbxml_opaque.h
web_plat/cxml_library_api/inc/nw_wbxml_parse.h
web_plat/cxml_library_api/inc/nw_wbxml_reader.h
web_plat/cxml_library_api/inc/nw_wbxml_token.h
web_plat/cxml_library_api/inc/nw_xmlp_xmlp2wbxml.h
web_plat/cxml_library_api/inc/nw_xmlp_xmlparser.h
web_plat/cxml_library_api/inc/nw_xmlp_xmlreader.h
web_plat/cxml_library_api/inc/nwx_status.h
web_plat/download_mgr_client_api_extn/inc/DownloadMgrClientApiExt.h
web_plat/feeds_engine_api/group/bld.inf
web_plat/feeds_engine_api/inc/FeedsInterface.h
web_plat/feeds_engine_api/inc/FeedsServerClient.h
web_plat/feeds_engine_api/inc/FeedsServerFeed.h
web_plat/feeds_engine_api/inc/FeedsServerFolderItem.h
web_plat/feeds_engine_api/inc/FeedsServerRequestHandler.h
web_plat/feeds_engine_api/inc/Transaction.h
web_plat/launcher_api/group/bld.inf
web_plat/multipart_parser_api/inc/MultipartParser.h
web_plat/recent_url_store_api/group/bld.inf
web_plat/rt_gesturehelper_api/group/bld.inf
web_plat/scheme_handler_plugin_api/group/bld.inf
web_plat/scheme_handler_plugin_api/inc/SchemeHandler.inl
web_plat/scriptable_plugin_api/group/bld.inf
web_plat/webutils_api/group/bld.inf
web_plat/widget_registry_api/group/bld.inf
web_plat/widget_registry_api/inc/WidgetPropertyValue.h
web_plat/widget_registry_api/inc/WidgetRegistryData.h
web_plat/xml_parser_api/group/bld.inf
web_plat/xml_parser_api/inc/MXMLContentHandler.h
web_pub/browser_control_api/group/bld.inf
web_pub/browser_control_api/tsrc/group/BrCtlApiTest.mmp
web_pub/browser_plugin_api/group/bld.inf
web_pub/browser_plugin_api/inc/CEcomBrowserPluginInterface.h
web_pub/browser_plugin_api/inc/PluginAdapterInterface.h
web_pub/download_mgr_client_api/group/bld.inf
web_pub/download_mgr_client_api/inc/DownloadMgrClient.h
web_pub/download_mgr_ui_api/group/Bld.inf
web_pub/download_mgr_ui_api/inc/CDownloadMgrUiDownloadsList.h
web_pub/favourites_engine_api/group/bld.inf
web_pub/favourites_engine_api/tsrc/inc/FavouritesEngineTest.h
web_pub/favourites_engine_api/tsrc/src/FavouritesDbTestObserver.cpp
web_pub/favourites_engine_api/tsrc/src/FavouritesEngineTest.cpp
web_pub/favourites_engine_api/tsrc/src/FavouritesItemTestCases.cpp
web_pub/favourites_engine_api/tsrc/src/FavouritesWapApTestCases.cpp
webengine/browserrecognizers/data/01005A02.rss
webengine/browserrecognizers/group/BrowserRec.mmp
webengine/browserrecognizers/src/BrowserRec.cpp
webengine/device/group/Device.mmp
webengine/device/rom/Device.iby
webengine/memoryplugin/data/10281f93.rss
webengine/memoryplugin/group/bld.inf
webengine/memoryplugin/group/memoryplugin.mmp
webengine/osswebengine/DerivedSources/JavaScriptCore/chartables.c
webengine/osswebengine/DerivedSources/WebCore/CSSPropertyNames.c
webengine/osswebengine/DerivedSources/WebCore/CSSValueKeywords.c
webengine/osswebengine/DerivedSources/WebCore/ColorData.c
webengine/osswebengine/DerivedSources/WebCore/DocTypeStrings.cpp
webengine/osswebengine/DerivedSources/WebCore/SVGElementFactory.cpp
webengine/osswebengine/DerivedSources/WebCore/SVGNames.cpp
webengine/osswebengine/DerivedSources/WebCore/UserAgentStyleSheets.h
webengine/osswebengine/DerivedSources/WebCore/UserAgentStyleSheetsData.cpp
webengine/osswebengine/DerivedSources/WebCore/XLinkNames.cpp
webengine/osswebengine/DerivedSources/WebCore/ksvgcssproperties.h
webengine/osswebengine/DerivedSources/WebCore/ksvgcssvalues.h
webengine/osswebengine/JavaScriptCore/ForwardingHeaders/JavaScriptCore/APICast.h
webengine/osswebengine/JavaScriptCore/ForwardingHeaders/JavaScriptCore/JSBase.h
webengine/osswebengine/JavaScriptCore/ForwardingHeaders/JavaScriptCore/JSContextRef.h
webengine/osswebengine/JavaScriptCore/ForwardingHeaders/JavaScriptCore/JSLock.h
webengine/osswebengine/JavaScriptCore/ForwardingHeaders/JavaScriptCore/JSObjectRef.h
webengine/osswebengine/JavaScriptCore/ForwardingHeaders/JavaScriptCore/JSStringRef.h
webengine/osswebengine/JavaScriptCore/ForwardingHeaders/JavaScriptCore/JSStringRefCF.h
webengine/osswebengine/JavaScriptCore/ForwardingHeaders/JavaScriptCore/JSValueRef.h
webengine/osswebengine/JavaScriptCore/ForwardingHeaders/JavaScriptCore/JavaScriptCore.h
webengine/osswebengine/JavaScriptCore/JavaScriptCore.apolloproj/ForwardingSources/grammar.cpp
webengine/osswebengine/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/grammarWrapper.cpp
webengine/osswebengine/JavaScriptCore/JavaScriptCorePrefix.h
webengine/osswebengine/JavaScriptCore/icu/unicode/utf_old.h
webengine/osswebengine/JavaScriptCore/pcre/pcre-config.h
webengine/osswebengine/JavaScriptCore/pcre/ucp.h
webengine/osswebengine/JavaScriptCore/pcre/ucpinternal.h
webengine/osswebengine/JavaScriptGlue/ForwardingHeaders/kjs/ExecState.h
webengine/osswebengine/JavaScriptGlue/ForwardingHeaders/wtf/AlwaysInline.h
webengine/osswebengine/JavaScriptGlue/ForwardingHeaders/wtf/Assertions.h
webengine/osswebengine/JavaScriptGlue/ForwardingHeaders/wtf/FastMalloc.h
webengine/osswebengine/JavaScriptGlue/ForwardingHeaders/wtf/Forward.h
webengine/osswebengine/JavaScriptGlue/ForwardingHeaders/wtf/HashCountedSet.h
webengine/osswebengine/JavaScriptGlue/ForwardingHeaders/wtf/HashSet.h
webengine/osswebengine/JavaScriptGlue/ForwardingHeaders/wtf/Noncopyable.h
webengine/osswebengine/JavaScriptGlue/ForwardingHeaders/wtf/OwnArrayPtr.h
webengine/osswebengine/JavaScriptGlue/ForwardingHeaders/wtf/OwnPtr.h
webengine/osswebengine/JavaScriptGlue/ForwardingHeaders/wtf/PassRefPtr.h
webengine/osswebengine/JavaScriptGlue/ForwardingHeaders/wtf/Platform.h
webengine/osswebengine/JavaScriptGlue/ForwardingHeaders/wtf/RefPtr.h
webengine/osswebengine/JavaScriptGlue/ForwardingHeaders/wtf/Vector.h
webengine/osswebengine/JavaScriptGlue/config.h
webengine/osswebengine/MemoryManager/BWINS/MEMMANU.DEF
webengine/osswebengine/MemoryManager/EABI/MemManU.DEF
webengine/osswebengine/MemoryManager/Group/MemMan.mmp
webengine/osswebengine/MemoryManager/Group/MemManTest.mmp
webengine/osswebengine/MemoryManager/Inc/MemoryManager.h
webengine/osswebengine/MemoryManager/Inc/MemoryPool.h
webengine/osswebengine/MemoryManager/Inc/StopScheduler.h
webengine/osswebengine/MemoryManager/Inc/oom.h
webengine/osswebengine/MemoryManager/Src/FastAllocator.cpp
webengine/osswebengine/MemoryManager/Src/MemoryManager.cpp
webengine/osswebengine/MemoryManager/Src/MemoryPool.cpp
webengine/osswebengine/MemoryManager/Src/SymbianDLAllocatorWrapper.cpp
webengine/osswebengine/MemoryManager/Src/fast_malloc.cpp
webengine/osswebengine/WebCore/ForwardingHeaders/bindings/NP_jsobject.h
webengine/osswebengine/WebCore/ForwardingHeaders/bindings/npruntime.h
webengine/osswebengine/WebCore/ForwardingHeaders/bindings/npruntime_impl.h
webengine/osswebengine/WebCore/ForwardingHeaders/bindings/runtime.h
webengine/osswebengine/WebCore/ForwardingHeaders/bindings/runtime_object.h
webengine/osswebengine/WebCore/ForwardingHeaders/bindings/runtime_root.h
webengine/osswebengine/WebCore/ForwardingHeaders/kjs/JSLock.h
webengine/osswebengine/WebCore/ForwardingHeaders/kjs/SavedBuiltins.h
webengine/osswebengine/WebCore/ForwardingHeaders/kjs/collector.h
webengine/osswebengine/WebCore/ForwardingHeaders/kjs/dtoa.h
webengine/osswebengine/WebCore/ForwardingHeaders/kjs/function.h
webengine/osswebengine/WebCore/ForwardingHeaders/kjs/identifier.h
webengine/osswebengine/WebCore/ForwardingHeaders/kjs/internal.h
webengine/osswebengine/WebCore/ForwardingHeaders/kjs/interpreter.h
webengine/osswebengine/WebCore/ForwardingHeaders/kjs/lookup.h
webengine/osswebengine/WebCore/ForwardingHeaders/kjs/object.h
webengine/osswebengine/WebCore/ForwardingHeaders/kjs/operations.h
webengine/osswebengine/WebCore/ForwardingHeaders/kjs/property_map.h
webengine/osswebengine/WebCore/ForwardingHeaders/kjs/protect.h
webengine/osswebengine/WebCore/ForwardingHeaders/kjs/string_object.h
webengine/osswebengine/WebCore/ForwardingHeaders/kjs/ustring.h
webengine/osswebengine/WebCore/ForwardingHeaders/kjs/value.h
webengine/osswebengine/WebCore/ForwardingHeaders/pcre/pcre.h
webengine/osswebengine/WebCore/ForwardingHeaders/wtf/AlwaysInline.h
webengine/osswebengine/WebCore/ForwardingHeaders/wtf/Assertions.h
webengine/osswebengine/WebCore/ForwardingHeaders/wtf/FastMalloc.h
webengine/osswebengine/WebCore/ForwardingHeaders/wtf/Forward.h
webengine/osswebengine/WebCore/ForwardingHeaders/wtf/GetPtr.h
webengine/osswebengine/WebCore/ForwardingHeaders/wtf/HashCountedSet.h
webengine/osswebengine/WebCore/ForwardingHeaders/wtf/HashMap.h
webengine/osswebengine/WebCore/ForwardingHeaders/wtf/HashSet.h
webengine/osswebengine/WebCore/ForwardingHeaders/wtf/HashTable.h
webengine/osswebengine/WebCore/ForwardingHeaders/wtf/HashTraits.h
webengine/osswebengine/WebCore/ForwardingHeaders/wtf/ListHashSet.h
webengine/osswebengine/WebCore/ForwardingHeaders/wtf/MathExtras.h
webengine/osswebengine/WebCore/ForwardingHeaders/wtf/Noncopyable.h
webengine/osswebengine/WebCore/ForwardingHeaders/wtf/OwnArrayPtr.h
webengine/osswebengine/WebCore/ForwardingHeaders/wtf/OwnPtr.h
webengine/osswebengine/WebCore/ForwardingHeaders/wtf/PassRefPtr.h
webengine/osswebengine/WebCore/ForwardingHeaders/wtf/Platform.h
webengine/osswebengine/WebCore/ForwardingHeaders/wtf/RefPtr.h
webengine/osswebengine/WebCore/ForwardingHeaders/wtf/RetainPtr.h
webengine/osswebengine/WebCore/ForwardingHeaders/wtf/StringExtras.h
webengine/osswebengine/WebCore/ForwardingHeaders/wtf/Vector.h
webengine/osswebengine/WebCore/ForwardingHeaders/wtf/unicode/Unicode.h
webengine/osswebengine/WebCore/ForwardingHeaders/wtf/unicode/icu/UnicodeIcu.h
webengine/osswebengine/WebCore/bridge/EditorClient.h
webengine/osswebengine/WebCore/css/MediaQuery.cpp
webengine/osswebengine/WebCore/css/MediaQuery.h
webengine/osswebengine/WebCore/css/MediaQueryEvaluator.cpp
webengine/osswebengine/WebCore/css/MediaQueryEvaluator.h
webengine/osswebengine/WebCore/css/MediaQueryExp.cpp
webengine/osswebengine/WebCore/css/MediaQueryExp.h
webengine/osswebengine/WebCore/icu/unicode/utf_old.h
webengine/osswebengine/WebCore/loader/Cache.cpp
webengine/osswebengine/WebCore/loader/DocumentLoader.cpp
webengine/osswebengine/WebCore/page/FocusController.cpp
webengine/osswebengine/WebCore/page/symbian/WebCoreFrameBridge.h
webengine/osswebengine/WebCore/platform/graphics/cairo/AffineTransformCairo.cpp
webengine/osswebengine/WebCore/platform/graphics/svg/SVGResourceListener.h
webengine/osswebengine/WebCore/platform/image-decoders/zlib/crc32.h
webengine/osswebengine/WebCore/platform/image-decoders/zlib/inffixed.h
webengine/osswebengine/WebCore/platform/image-decoders/zlib/trees.h
webengine/osswebengine/WebCore/platform/network/symbian/HttpConnection.cpp
webengine/osswebengine/WebCore/platform/network/symbian/HttpUiCallbacks.cpp
webengine/osswebengine/WebCore/platform/network/symbian/MultipartContentHandler.cpp
webengine/osswebengine/WebCore/platform/network/symbian/ResolvedConnection.cpp
webengine/osswebengine/WebCore/platform/network/symbian/ResolvedConnection.h
webengine/osswebengine/WebCore/platform/network/symbian/ResourceLoaderDelegate.cpp
webengine/osswebengine/WebCore/platform/network/symbian/UrlConnection.h
webengine/osswebengine/WebCore/platform/symbian/FontCacheSymbian.cpp
webengine/osswebengine/WebCore/platform/symbian/Libxml2/Libxml2_modules.h
webengine/osswebengine/WebCore/platform/symbian/Libxml2/Libxml2_xmlmemory.c
webengine/osswebengine/WebCore/platform/symbian/Libxml2/Libxml2_xmlwriter.c
webengine/osswebengine/WebCore/platform/symbian/Libxml2/libxml/parser.h
webengine/osswebengine/WebCore/platform/symbian/Libxml2/libxml/parserinternals.h
webengine/osswebengine/WebCore/platform/symbian/Libxml2/libxml/tree.h
webengine/osswebengine/WebCore/platform/symbian/Libxml2/libxml/xmlstring.h
webengine/osswebengine/WebCore/platform/symbian/OOMHandler.cpp
webengine/osswebengine/WebCore/platform/symbian/OOMHandler.h
webengine/osswebengine/WebCore/platform/symbian/OOMStopper.cpp
webengine/osswebengine/WebCore/platform/symbian/OOMStopper.h
webengine/osswebengine/WebCore/platform/symbian/StaticObjectsContainer.cpp
webengine/osswebengine/WebCore/platform/symbian/StaticObjectsContainer.h
webengine/osswebengine/WebCore/platform/symbian/bitmap/AnimationDecoder.cpp
webengine/osswebengine/WebCore/platform/symbian/bitmap/AnimationDecoder.h
webengine/osswebengine/WebCore/platform/symbian/bitmap/AnimationDecoderWrapped.cpp
webengine/osswebengine/WebCore/platform/symbian/bitmap/AnimationDecoderWrapped.h
webengine/osswebengine/WebCore/platform/symbian/bitmap/BitmapTiler.cpp
webengine/osswebengine/WebCore/platform/symbian/bitmap/StaticImageDecoder.cpp
webengine/osswebengine/WebCore/xml/xmlhttprequest.cpp
webengine/osswebengine/WebKit/ForwardingHeaders/wtf/unicode/Unicode.h
webengine/osswebengine/WebKit/ForwardingHeaders/wtf/unicode/icu/UnicodeIcu.h
webengine/osswebengine/WebKit/s60/data/01005A02.rss
webengine/osswebengine/WebKit/s60/data/Webkit.rss
webengine/osswebengine/WebKit/s60/data/Webkit_sdk.rss
webengine/osswebengine/WebKit/s60/formcontrols/PopupSelectListBox.cpp
webengine/osswebengine/WebKit/s60/formcontrols/PopupSelectListBox.h
webengine/osswebengine/WebKit/s60/formcontrols/WebFormFillPopup.cpp
webengine/osswebengine/WebKit/s60/group/JavaScriptCore/JavaScriptCore.mmp
webengine/osswebengine/WebKit/s60/group/browserengine/browserengine.mmp
webengine/osswebengine/WebKit/s60/group/common.mmpi
webengine/osswebengine/WebKit/s60/group/libxml2/libxml2.mmp
webengine/osswebengine/WebKit/s60/group/plugins/plugins.mmp
webengine/osswebengine/WebKit/s60/group/webcore/DerivedSources/DerivedSources.mmp
webengine/osswebengine/WebKit/s60/group/webcore/bindings/bindings.mmp
webengine/osswebengine/WebKit/s60/group/webcore/bridge/bridge.mmp
webengine/osswebengine/WebKit/s60/group/webcore/dom/dom.mmp
webengine/osswebengine/WebKit/s60/group/webcore/editing/editing.mmp
webengine/osswebengine/WebKit/s60/group/webcore/history/history.mmp
webengine/osswebengine/WebKit/s60/group/webcore/html/html.mmp
webengine/osswebengine/WebKit/s60/group/webcore/loader/loader.mmp
webengine/osswebengine/WebKit/s60/group/webcore/page/page.mmp
webengine/osswebengine/WebKit/s60/group/webcore/platform/platform.mmp
webengine/osswebengine/WebKit/s60/group/webcore/rendering/rendering.mmp
webengine/osswebengine/WebKit/s60/group/webcore/webcorecss/webcorecss.mmp
webengine/osswebengine/WebKit/s60/group/webcore/xml/xml.mmp
webengine/osswebengine/WebKit/s60/group/webkit/bld.inf
webengine/osswebengine/WebKit/s60/group/webkit/webkit.mmp
webengine/osswebengine/WebKit/s60/misc/WebTabbedNavigation.cpp
webengine/osswebengine/WebKit/s60/misc/WebUtil.h
webengine/osswebengine/WebKit/s60/plugins/NpnImplementation.cpp
webengine/osswebengine/WebKit/s60/plugins/PluginSkin.cpp
webengine/osswebengine/WebKit/s60/plugins/PluginSkin.h
webengine/osswebengine/WebKit/s60/plugins/PluginWin.cpp
webengine/osswebengine/WebKit/s60/webcoresupport/WebEditorClient.cpp
webengine/osswebengine/WebKit/s60/webcoresupport/WebEditorClient.h
webengine/osswebengine/WebKit/s60/webcoresupport/WebFrameLoaderClient.cpp
webengine/osswebengine/WebKit/s60/webview/BrCtl.cpp
webengine/osswebengine/WebKit/s60/webview/BrCtl.h
webengine/osswebengine/WebKit/s60/webview/BrCtlDialogsProviderUtils.cpp
webengine/osswebengine/WebKit/s60/webview/BrCtlSoftkeysObserverImpl.h
webengine/osswebengine/WebKit/s60/webview/BrCtlSpecialLoadObserverImpl.h
webengine/osswebengine/WebKit/s60/webview/BrCtlWindowObserverImpl.h
webengine/osswebengine/WebKit/s60/webview/SettingsContainer.cpp
webengine/osswebengine/WebKit/s60/webview/SettingsContainer.h
webengine/osswebengine/WebKit/s60/webview/WebFepTextEditor.cpp
webengine/osswebengine/WebKit/s60/webview/WebFepTextEditor.h
webengine/osswebengine/WebKit/s60/webview/WebPointerEventHandler.cpp
webengine/osswebengine/WebKit/s60/webview/WebToolBarInterface.h
webengine/osswebengine/WebKit/s60/webview/WebView.cpp
webengine/osswebengine/WebKit/s60/webview/WebView.h
webengine/osswebengine/WebKit/s60/webview/WmlDispatcher.h
webengine/osswebengine/WebKit/s60/webview/WmlInterface.h
webengine/osswebengine/WebKit/s60/webview/WmlInterfaceImpl.h
webengine/osswebengine/WebKit/s60/webview/WmlResourceLoaderClient.h
webengine/osswebengine/WebKit/s60/webview/webview_api_test/inc/BrCtlInterface.h
webengine/osswebengine/WebKit/s60/webview/webview_api_test/tsrc/group/WebViewApiTest.mmp
webengine/osswebengine/WebKit/s60/webview/webview_api_test/tsrc/inc/BrCtl.h
webengine/osswebengine/WebKit/s60/webview/webview_api_test/tsrc/inc/WebView.h
webengine/osswebengine/WebKit/s60/webview/webview_api_test/tsrc/mock/inc/BrCtl.h
webengine/osswebengine/WebKit/s60/webview/webview_api_test/tsrc/mock/src/BrCtl.cpp
webengine/osswebengine/WebKit/win/WebKit.vcproj/resource.h
webengine/osswebengine/WebKitTools/Drosera/win/resource.h
webengine/osswebengine/WebKitTools/DumpRenderTree/TestNetscapePlugIn.subproj/PluginObject.c
webengine/osswebengine/WebKitTools/DumpRenderTree/TestNetscapePlugIn.subproj/PluginObject.h
webengine/osswebengine/WebKitTools/DumpRenderTree/TestNetscapePlugIn.subproj/TestObject.c
webengine/osswebengine/WebKitTools/DumpRenderTree/TestNetscapePlugIn.subproj/TestObject.h
webengine/osswebengine/WebKitTools/DumpRenderTree/TestNetscapePlugIn.subproj/main.c
webengine/osswebengine/WebKitTools/DumpRenderTree/qt/DumpRenderTree.pro
webengine/osswebengine/WebKitTools/DumpRenderTree/win/TestNetscapePlugin/main.c
webengine/osswebengine/WebKitTools/DumpRenderTree/win/TestNetscapePlugin/resource.h
webengine/osswebengine/cache/cache_check.pl
webengine/osswebengine/cache/filter_emulator_output.bat
webengine/osswebengine/cache/filter_log.pl
webengine/osswebengine/cache/group/BrowserCache.mmp
webengine/osswebengine/cache/inc/HttpCacheFileWriteHandler.h
webengine/osswebengine/npscript/group/npscript.mmp
webengine/pagescaler/group/minimap.mmp
webengine/pagescaler/src/minimapgenerator.cpp
webengine/webkitutils/HistoryProvider/HistoryController.cpp
webengine/webkitutils/SqliteSymbian/keywordhash.h
webengine/webkitutils/SqliteSymbian/parse.h
webengine/webkitutils/SqliteSymbian/printf.c
webengine/webkitutils/SqliteSymbian/sqliteInt.h
webengine/webkitutils/ToolBar/ToolBar.cpp
webengine/webkitutils/ToolBar/ToolBar.h
webengine/webkitutils/ToolBar/ToolBarButton.cpp
webengine/webkitutils/group/WebKitUtils.mmp
webengine/webkitutils/rt_gesturehelper/rom/rt_gesturehelper.iby
webengine/webkitutils/rt_gesturehelper/src/gesture.h
webengine/webkitutils/rt_gesturehelper/src/gestureevent.h
webengine/webkitutils/rt_gesturehelper/src/gesturehelper.cpp
webengine/webkitutils/rt_gesturehelper/src/gesturerecogniser.cpp
webengine/webkitutils/rt_gesturehelper/src/gesturerecogniser.h
webengine/widgetbackuprestore/Inc/WidgetActiveCallback.h
webengine/widgetbackuprestore/Src/WidgetActiveCallback.cpp
webengine/widgetbackuprestore/Src/WidgetBackupRestore.cpp
webengine/widgetbackuprestore/group/WidgetBackupRestore.mmp
webengine/widgetengine/group/WidgetEngine.mmp
webengine/widgetengine/inc/MenuClient.h
webengine/widgetengine/inc/MenuItemClient.h
webengine/widgetengine/inc/Preferences.h
webengine/widgetengine/inc/WidgetClient.h
webengine/widgetengine/inc/WidgetEngineBridge.h
webengine/widgetengine/src/Preferences.cpp
webengine/widgetengine/src/WidgetEngineBridge.cpp
webengine/widgetengine/src/WrtPlatform.cpp
webengine/widgetinstaller/Inc/WidgetBackupRegistryXml.h
webengine/widgetinstaller/Src/WidgetBackupRegistryXml.cpp
webengine/widgetinstaller/group/WidgetInstaller.mmp
webengine/widgetmemoryplugin/data/10282855.rss
webengine/widgetmemoryplugin/group/bld.inf
webengine/widgetmemoryplugin/group/widgetmemoryplugin.mmp
webengine/widgetregistry/Client/src/WidgetRegistryClient.cpp
webengine/widgetregistry/Rom/WidgetRegistry.iby
webengine/widgetregistry/Server/inc/UidAllocator.h
webengine/widgetregistry/Server/inc/WidgetEntry.h
webengine/widgetregistry/Server/inc/WidgetMMCHandler.h
webengine/widgetregistry/Server/inc/WidgetRegistry.h
webengine/widgetregistry/Server/inc/WidgetRegistrySession.h
webengine/widgetregistry/Server/inc/WidgetRegistryXml.h
webengine/widgetregistry/Server/src/WidgetEntry.cpp
webengine/widgetregistry/Server/src/WidgetMMCHandler.cpp
webengine/widgetregistry/Server/src/WidgetRegistry.cpp
webengine/widgetregistry/Server/src/WidgetRegistryServer.cpp
webengine/widgetregistry/Server/src/WidgetRegistrySession.cpp
webengine/widgetregistry/group/WidgetRegistryServer.mmp
webengine/wmlengine/group/BLD.INF
webengine/wmlengine/group/Msg/Msg.mmp
webengine/wmlengine/group/Plugin.mmp
webengine/wmlengine/group/Unicode/Unicode.mmp
webengine/wmlengine/group/adt/adt.mmp
webengine/wmlengine/group/browser/browser.mmp
webengine/wmlengine/group/css/css.mmp
webengine/wmlengine/group/evt/evt.mmp
webengine/wmlengine/group/fbox/fbox.mmp
webengine/wmlengine/group/fileloader/fileloader.mmp
webengine/wmlengine/group/gdi/gdi.mmp
webengine/wmlengine/group/hed/hed.mmp
webengine/wmlengine/group/htmlp/htmlp.mmp
webengine/wmlengine/group/image/image.mmp
webengine/wmlengine/group/imagech/imagech.mmp
webengine/wmlengine/group/lmgr/lmgr.mmp
webengine/wmlengine/group/markup/markup.mmp
webengine/wmlengine/group/object/object.mmp
webengine/wmlengine/group/script/script.mmp
webengine/wmlengine/group/system/system.mmp
webengine/wmlengine/group/text/text.mmp
webengine/wmlengine/group/unknownch.mmp
webengine/wmlengine/group/urlloader/urlloader.mmp
webengine/wmlengine/group/webkitcommon.mmpi
webengine/wmlengine/group/wml/wml.mmp
webengine/wmlengine/group/wml1x/wml1x.mmp
webengine/wmlengine/group/wmlengine/mvc.mmpi
webengine/wmlengine/group/wmlengine/utils.mmp
webengine/wmlengine/group/wmlengine/wmlengine.mmp
webengine/wmlengine/group/wmlscriptch/wmlscriptch.mmp
webengine/wmlengine/group/xhtml/xhtml.mmp
webengine/wmlengine/src/FileLoader/src/fileloader_cfilehandler.cpp
webengine/wmlengine/src/FileLoader/src/fileloader_cfileloader.cpp
webengine/wmlengine/src/FileLoader/src/fileloader_csaveddeckhandler.cpp
webengine/wmlengine/src/ImageCH/src/Epoc32ImageContentHandler.cpp
webengine/wmlengine/src/MVC/include/MVCShell.h
webengine/wmlengine/src/MVC/include/MVCView.h
webengine/wmlengine/src/MVC/include/MVCViewAsyncInit.h
webengine/wmlengine/src/MVC/include/httploader_mlinkresolvercallbacks.h
webengine/wmlengine/src/MVC/src/MVCScroll.cpp
webengine/wmlengine/src/MVC/src/MVCShell.cpp
webengine/wmlengine/src/MVC/src/MVCView.cpp
webengine/wmlengine/src/System/src/Epoc32Timer.cpp
webengine/wmlengine/src/System/src/Timer.c
webengine/wmlengine/src/adt/src/DynamicVector.c
webengine/wmlengine/src/browser/include/nw_browser_browserimages.h
webengine/wmlengine/src/browser/src/BROWSEREpoc32MimeTable.cpp
webengine/wmlengine/src/browser/src/wml_1_3_dict.c
webengine/wmlengine/src/browser/src/xhtml_1_0_dict.c
webengine/wmlengine/src/css/include/CSSDeclListHandle.h
webengine/wmlengine/src/css/include/CSSImageList.h
webengine/wmlengine/src/css/include/CSSPatternMatcher.h
webengine/wmlengine/src/css/include/CSSReader.h
webengine/wmlengine/src/css/include/CSSRuleList.h
webengine/wmlengine/src/css/include/CSSSelector.h
webengine/wmlengine/src/css/include/nw_css_defaultstylesheet.h
webengine/wmlengine/src/css/include/nw_css_processor.h
webengine/wmlengine/src/css/src/CSSBufferList.cpp
webengine/wmlengine/src/css/src/CSSDeclListHandle.cpp
webengine/wmlengine/src/css/src/CSSDefaultStyleSheet.cpp
webengine/wmlengine/src/css/src/CSSImageList.cpp
webengine/wmlengine/src/css/src/CSSParser.cpp
webengine/wmlengine/src/css/src/CSSPatternMatcher.cpp
webengine/wmlengine/src/css/src/CSSProcessor.cpp
webengine/wmlengine/src/css/src/CSSPropVal.cpp
webengine/wmlengine/src/css/src/CSSPropertyTable.cpp
webengine/wmlengine/src/css/src/CSSReader.cpp
webengine/wmlengine/src/css/src/CSSRuleList.cpp
webengine/wmlengine/src/css/src/CSSTokenToInt.cpp
webengine/wmlengine/src/css/src/CSSVariableStyleSheet.cpp
webengine/wmlengine/src/fbox/src/Epoc32FormImages.cpp
webengine/wmlengine/src/fbox/src/Epoc32InlineFormImages.cpp
webengine/wmlengine/src/fbox/src/Epoc32InputInteractor.cpp
webengine/wmlengine/src/fbox/src/Epoc32InputSkin.cpp
webengine/wmlengine/src/fbox/src/Epoc32SelectSkin.cpp
webengine/wmlengine/src/fbox/src/Epoc32TextAreaBox.cpp
webengine/wmlengine/src/fbox/src/FBOXButtonBox.cpp
webengine/wmlengine/src/fbox/src/FBOXInputBox.cpp
webengine/wmlengine/src/gdi/src/GDIDeviceContext.cpp
webengine/wmlengine/src/hed/include/TextReverse.h
webengine/wmlengine/src/hed/include/nw_dom_domvisitor.h
webengine/wmlengine/src/hed/include/nw_hed_contenthandler.h
webengine/wmlengine/src/hed/include/nw_hed_context.h
webengine/wmlengine/src/hed/include/nw_hed_domhelper.h
webengine/wmlengine/src/hed/include/nw_hed_domtree.h
webengine/wmlengine/src/hed/include/nw_hed_errorcontenthandler.h
webengine/wmlengine/src/hed/include/nw_hed_iloadrecipient.h
webengine/wmlengine/src/hed/include/nw_hed_mimetable.h
webengine/wmlengine/src/hed/include/nw_hed_urlrequest.h
webengine/wmlengine/src/hed/include/nw_hed_urlresponse.h
webengine/wmlengine/src/hed/src/DomHelper.c
webengine/wmlengine/src/hed/src/DomTree.c
webengine/wmlengine/src/hed/src/HEDCompositeContentHandler.cpp
webengine/wmlengine/src/hed/src/HEDDocumentRoot.cpp
webengine/wmlengine/src/hed/src/HistoryStack.cpp
webengine/wmlengine/src/hed/src/Loader.c
webengine/wmlengine/src/hed/src/MimeTable.cpp
webengine/wmlengine/src/hed/src/UrlResponse.c
webengine/wmlengine/src/hed/src/contentLoader.cpp
webengine/wmlengine/src/htmlp/include/CHtmlpParser.h
webengine/wmlengine/src/htmlp/src/CHtmlpParser.cpp
webengine/wmlengine/src/htmlp/src/htmlp_lexer.c
webengine/wmlengine/src/htmlp/src/htmlp_to_wbxml.cpp
webengine/wmlengine/src/image/include/NW_Image_ImageFactory.h
webengine/wmlengine/src/image/src/Epoc32CannedImages.cpp
webengine/wmlengine/src/image/src/Epoc32ImageDecoder.cpp
webengine/wmlengine/src/image/src/Epoc32SimpleImage.cpp
webengine/wmlengine/src/lmgr/include/ObjectUtils.h
webengine/wmlengine/src/lmgr/src/BoxFormatHandler.cpp
webengine/wmlengine/src/lmgr/src/LMgrAbstractTextBox.cpp
webengine/wmlengine/src/lmgr/src/LMgrBox.cpp
webengine/wmlengine/src/lmgr/src/LMgrContainerBox.cpp
webengine/wmlengine/src/lmgr/src/LMgrFlowBox.cpp
webengine/wmlengine/src/markup/include/nw_markup_elementhandler.h
webengine/wmlengine/src/markup/src/MARKUPNumberCollector.cpp
webengine/wmlengine/src/markup/src/MARKUPWBXMLModule.cpp
webengine/wmlengine/src/markup/src/MARKUPWmlValidator.cpp
webengine/wmlengine/src/markup/src/MARKUPXMLModule.cpp
webengine/wmlengine/src/object/src/Dynamic.c
webengine/wmlengine/src/script/include/scr_core.h
webengine/wmlengine/src/script/src/nwx_script_handler.c
webengine/wmlengine/src/script/src/scr_api.c
webengine/wmlengine/src/script/src/scr_core.c
webengine/wmlengine/src/script/src/scr_reader.c
webengine/wmlengine/src/text/include/NW_Text_Abstract.h
webengine/wmlengine/src/text/src/NW_Text_Abstract.c
webengine/wmlengine/src/urlloader/include/urlloader_curlloader.h
webengine/wmlengine/src/urlloader/include/urlloader_urlloaderI.h
webengine/wmlengine/src/urlloader/include/urlloader_urlloaderint.h
webengine/wmlengine/src/urlloader/src/urlloader_urlresponse.cpp
webengine/wmlengine/src/utils/include/StringUtils.h
webengine/wmlengine/src/utils/include/nw_loadreq.h
webengine/wmlengine/src/utils/include/nwx_multipart_generator.h
webengine/wmlengine/src/utils/include/nwx_osu_file.h
webengine/wmlengine/src/utils/src/CBrowserSettings.cpp
webengine/wmlengine/src/utils/src/CReferrerHelper.cpp
webengine/wmlengine/src/utils/src/ImageUtils.cpp
webengine/wmlengine/src/utils/src/TEncodingMapping.cpp
webengine/wmlengine/src/utils/src/nw_loadreq.cpp
webengine/wmlengine/src/utils/src/nwx_multipart_generator.cpp
webengine/wmlengine/src/utils/src/nwx_osu_epoc32.cpp
webengine/wmlengine/src/utils/src/nwx_osu_file_epoc32.cpp
webengine/wmlengine/src/utils/src/nwx_settings_epoc32.cpp
webengine/wmlengine/src/utils/src/nwx_sprintf.c
webengine/wmlengine/src/utils/src/nwx_url_utils.c
webengine/wmlengine/src/wml/include/nw_evlog_api.h
webengine/wmlengine/src/wml/include/nw_wae.h
webengine/wmlengine/src/wml/include/nw_wml_core.h
webengine/wmlengine/src/wml/include/nw_wml_list.h
webengine/wmlengine/src/wml/include/nw_wml_url_utils.h
webengine/wmlengine/src/wml/include/nw_wml_var.h
webengine/wmlengine/src/wml/include/nw_wtai_api.h
webengine/wmlengine/src/wml/include/wml_core.h
webengine/wmlengine/src/wml/include/wml_deck.h
webengine/wmlengine/src/wml/include/wml_decoder.h
webengine/wmlengine/src/wml/src/WMLWae.cpp
webengine/wmlengine/src/wml/src/WMLhistory.cpp
webengine/wmlengine/src/wml/src/wml_deck_iter.c
webengine/wmlengine/src/wml/src/wml_wae_reader.c
webengine/wmlengine/src/wml1x/include/nw_wml1x_wml1xcontenthandler.h
webengine/wmlengine/src/wml1x/src/Epoc32Wml1xActiveEvent.cpp
webengine/wmlengine/src/wml1x/src/WML1XApi.cpp
webengine/wmlengine/src/wml1x/src/WML1XContentHandler.cpp
webengine/wmlengine/src/wml1x/src/WML1XEventHandler.cpp
webengine/wmlengine/src/wml1x/src/WML1XFormLiaison.cpp
webengine/wmlengine/src/wmlcontrol/include/WmlControl.h
webengine/wmlengine/src/wmlcontrol/include/WmlEngineDefs.h
webengine/wmlengine/src/wmlcontrol/include/WmlEngineInterface.h
webengine/wmlengine/src/wmlcontrol/src/WmlContentInterface.cpp
webengine/wmlengine/src/wmlcontrol/src/WmlControl.cpp
webengine/wmlengine/src/wmlscriptch/include/nw_wmlscriptch_iwmlbrowserlib.h
webengine/wmlengine/src/wmlscriptch/include/nw_wmlscriptch_wmlscriptcontenthandler.h
webengine/wmlengine/src/wmlscriptch/src/WMLSCRIPTCHContentHandler.cpp
webengine/wmlengine/src/wmlscriptch/src/WMLSCRIPTCHScrProxyApi.cpp
webengine/wmlengine/src/xhtml/include/ImageMapPopup.h
webengine/wmlengine/src/xhtml/include/XhtmlObjectElementHandler.h
webengine/wmlengine/src/xhtml/include/XhtmlTableElementHandler.h
webengine/wmlengine/src/xhtml/include/nw_basicforms_xhtmlcontrolset.h
webengine/wmlengine/src/xhtml/include/nw_xhtml_attributepropertytable.h
webengine/wmlengine/src/xhtml/include/nw_xhtml_elementhandler.h
webengine/wmlengine/src/xhtml/include/nw_xhtml_xhtmlcontenthandler.h
webengine/wmlengine/src/xhtml/src/BasicForms/XHTMLFormLiaison.cpp
webengine/wmlengine/src/xhtml/src/BasicForms/XHTMLInputElementHandler.cpp
webengine/wmlengine/src/xhtml/src/Frame/XHTMLFrameElementHandler.cpp
webengine/wmlengine/src/xhtml/src/Hypertext/XHTMLAElementHandler.cpp
webengine/wmlengine/src/xhtml/src/Image/areaElementHandler.cpp
webengine/wmlengine/src/xhtml/src/Image/imgElementHandler.cpp
webengine/wmlengine/src/xhtml/src/Link/XHTMLLinkElementHandler.cpp
webengine/wmlengine/src/xhtml/src/Object/XhtmlObjectElementHandler.cpp
webengine/wmlengine/src/xhtml/src/Structure/XHTMLTitleElementHandler.cpp
webengine/wmlengine/src/xhtml/src/Structure/scriptElementHandler.cpp
webengine/wmlengine/src/xhtml/src/Style/XHTMLStyleElementHandler.cpp
webengine/wmlengine/src/xhtml/src/Text/XHTMLHrElementHandler.cpp
webengine/wmlengine/src/xhtml/src/Variables.c
webengine/wmlengine/src/xhtml/src/XHTMLAttributePropertyTable.cpp
webengine/wmlengine/src/xhtml/src/XHTMLContentHandler.cpp
webengine/wmlengine/src/xhtml/src/XHTMLElementHandler.cpp
webengine/wmlengine/src/xhtml/src/XHTMLEpoc32ContentHandler.cpp
webengine/wmlengine/src/xhtml/src/XHTMLPiElementHandler.cpp
webengine/wmlengine/src/xhtml/src/XHTMLTextElementHandler.cpp
webengine/wrtharvester/data/2001FE2C.rss
webengine/wrtharvester/group/wrtharvester.mmp
webengine/wrtharvester/inc/wrtharvester.h
webengine/wrtharvester/inc/wrtusbhandler.h
webengine/wrtharvester/rom/wrtharvester.iby
webengine/wrtharvester/rom/wrtharvesterResources.iby
webengine/wrtharvester/src/wrtharvester.cpp
webengine/wrtharvester/src/wrtharvesterpsnotifier.cpp
webengine/wrtharvester/src/wrtusbhandler.cpp
widgets/widgetapp/data/WidgetUi.rss
widgets/widgetapp/group/WidgetUi.mmp
widgets/widgetapp/group/bld.inf
widgets/widgetapp/inc/WidgetUiNetworkListener.h
widgets/widgetapp/inc/WidgetUiObserver.h
widgets/widgetapp/inc/WidgetUiWindow.h
widgets/widgetapp/inc/WidgetUiWindowManager.h
widgets/widgetapp/src/WidgetUiApp.cpp
widgets/widgetapp/src/WidgetUiNetworkListener.cpp
widgets/widgetapp/src/WidgetUiObserver.cpp
widgets/widgetapp/src/WidgetUiWindow.cpp
widgets/widgetapp/src/WidgetUiWindowManager.cpp
widgets/widgetapp/src/WidgetUiWindowView.cpp
widgets/widgetapp/src/cpspublisher.cpp
widgets/widgetinstaller/data/WidgetInstallerUI.rss
widgets/widgetinstaller/group/WidgetInstallerUI.mmp
widgets/widgetinstaller/group/bld.inf
widgets/widgetinstaller/src/WidgetUIOperationsWatcher.cpp
widgets/widgetlauncher/group/bld.inf
widgets/widgetlauncher/src/WidgetLauncher.cpp
widgets/widgetrecognizer/data/10282820.rss
widgets/widgetrecognizer/group/WidgetRecognizer.mmp
widgets/widgetrecognizer/src/WidgetRecognizer.cpp
widgets/widgetstartup/Group/Bld.inf
--- a/browserutilities/aiwbrowserprovider/Group/AiwBrowserProvider.mmp	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/aiwbrowserprovider/Group/AiwBrowserProvider.mmp	Thu Jan 07 13:31:38 2010 +0200
@@ -15,8 +15,6 @@
 *
 */
 
-
-
 #include <data_caging_paths.hrh>
 #include <platform_paths.hrh>
 #include <platform/mw/browser_platform_variant.hrh>
@@ -36,7 +34,6 @@
 USERINCLUDE     ../inc ../data
 
 MW_LAYER_SYSTEMINCLUDE
-MW_LAYER_ECOM_SYSTEMINCLUDE
 
 START RESOURCE    ../data/101FD682.rss
 TARGET      AiwBrowserProvider
--- a/browserutilities/aiwbrowserprovider/Group/bld.inf	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/aiwbrowserprovider/Group/bld.inf	Thu Jan 07 13:31:38 2010 +0200
@@ -25,7 +25,7 @@
 DEFAULT
 
 PRJ_EXPORTS
-../loc/AiwBrowserProvider.loc  MW_LAYER_LOC_EXPORT_PATH(AiwBrowserProvider.loc)
+../loc/aiwbrowserprovider.loc  MW_LAYER_LOC_EXPORT_PATH(aiwbrowserprovider.loc)
 
 PRJ_MMPFILES
 AiwBrowserProvider.mmp
--- a/browserutilities/aiwbrowserprovider/data/101FD682.rss	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/aiwbrowserprovider/data/101FD682.rss	Thu Jan 07 13:31:38 2010 +0200
@@ -17,7 +17,7 @@
 
 
 //  INCLUDES
-#include <RegistryInfoV2.rh>
+#include <ecom/RegistryInfoV2.rh>
 #include <AiwCommon.hrh>
 
 //  RESOURCE DEFINITIONS 
--- a/browserutilities/aiwbrowserprovider/data/AiwBrowserProvider.rss	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/aiwbrowserprovider/data/AiwBrowserProvider.rss	Thu Jan 07 13:31:38 2010 +0200
@@ -31,7 +31,7 @@
 #include <avkonsct.loc>
 
 #include "aiwbrowsercommands.hrh"
-#include <AiwBrowserProvider.loc>
+#include <aiwbrowserprovider.loc>
 //  RESOURCE DEFINITIONS 
 // -----------------------------------------------------------------------------
 //   
--- a/browserutilities/aiwbrowserprovider/src/AiwBrowserProviderOpenUrl.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/aiwbrowserprovider/src/AiwBrowserProviderOpenUrl.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -31,7 +31,7 @@
 #include <AknNoteDialog.h>
 #include <apgcli.h>
 #include <favouriteslimits.h>
-#include "aiwbrowsercommands.hrh"
+#include <aiwbrowsercommands.hrh>
 #include "logger.h"
 
 // LOCAL CONSTANTS AND MACROS
--- a/browserutilities/aiwbrowserprovider/src/AiwBrowserProviderSaveUrl.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/aiwbrowserprovider/src/AiwBrowserProviderSaveUrl.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -30,8 +30,8 @@
 #include <AknNoteDialog.h>
 #include <favouritesdb.h>
 #include <e32std.h>
+#include <aiwbrowsercommands.hrh>
 
-#include "aiwbrowsercommands.hrh"
 #include "logger.h"
 
 // LOCAL CONSTANTS AND MACROS
--- a/browserutilities/aiwbrowserprovider/src/Dllmain.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/aiwbrowserprovider/src/Dllmain.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -16,7 +16,7 @@
 */
 // INCLUDES
 #include <e32std.h>
-#include <ImplementationProxy.h>
+#include <ecom/implementationproxy.h>
 #include "AiwBrowserProviderOpenUrl.h"
 #include "AiwBrowserProviderSaveUrl.h"
 #include "logger.h"
--- a/browserutilities/browserdialogsprovider/Group/bld.inf	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/browserdialogsprovider/Group/bld.inf	Thu Jan 07 13:31:38 2010 +0200
@@ -26,7 +26,7 @@
 
 PRJ_EXPORTS
 // export localised loc file
-../loc/BrowserDialogsProvider.loc			MW_LAYER_LOC_EXPORT_PATH(BrowserDialogsProvider.loc)
+../loc/browserdialogsprovider.loc			MW_LAYER_LOC_EXPORT_PATH(browserdialogsprovider.loc)
 ../rom/BrowserDialogsProvider.iby			CORE_MW_LAYER_IBY_EXPORT_PATH(BrowserDialogsProvider.iby)
 ../rom/BrowserDialogsProviderResources.iby	LANGUAGE_MW_LAYER_IBY_EXPORT_PATH(BrowserDialogsProviderResources.iby)
 
--- a/browserutilities/browserdialogsprovider/Group/browserdialogsprovider.mmp	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/browserdialogsprovider/Group/browserdialogsprovider.mmp	Thu Jan 07 13:31:38 2010 +0200
@@ -44,7 +44,6 @@
 
 MW_LAYER_SYSTEMINCLUDE
 
-
 SOURCE ../Src/BrowserDialogsProvider.cpp
 SOURCE ../Src/BrowserAuthenticationDialog.cpp
 SOURCE ../Src/BrowserScriptPromptDialog.cpp
@@ -58,7 +57,6 @@
 SOURCE ../Src/BrowserDialogsProviderAsyncExit.cpp
 SOURCE ../Src/BrowserUploadProgressNote.cpp
 
-
 LIBRARY euser.lib apparc.lib cone.lib eikcore.lib egul.lib
 LIBRARY eikcoctl.lib avkon.lib eikdlg.lib bitgdi.lib
 LIBRARY eikctl.lib fbscli.lib bafl.lib MediaClientImage.lib
--- a/browserutilities/browserdialogsprovider/Inc/BrowserSelectElementItemDrawer.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/browserdialogsprovider/Inc/BrowserSelectElementItemDrawer.h	Thu Jan 07 13:31:38 2010 +0200
@@ -20,7 +20,7 @@
 #define CBROWSERSELECTELEMENTITEMDRAWER_H
 
 // INCLUDES
-#include "brctldialogsprovider.h"
+#include <brctldialogsprovider.h>
 
 #include <aknlists.h>
 #include <avkon.mbg>
--- a/browserutilities/browserdialogsprovider/Src/BrowserDialogsProvider.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/browserdialogsprovider/Src/BrowserDialogsProvider.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -19,11 +19,11 @@
 // INCLUDE Files
 
 // User includes
-#include "browserdialogsprovider.h"	// Class header
+#include <browserdialogsprovider.h>	// Class header
 #include "BrowserDialogsProvider.hrh"
 #include "BrowserAuthenticationDialog.h"
 #include "BrowserDialogsProviderConstants.h"
-#include "browserdialogsproviderobserver.h" //obs
+#include <browserdialogsproviderobserver.h> //obs
 
 // Browser as a Plugin - own classes
 #include "BrowserViewImagesPopup.h"		// For DialogDisplayPageImagesL
@@ -438,17 +438,16 @@
 								TBrCtlSelectOptionType aBrCtlSelectOptionType,
 								CArrayFix<TBrCtlSelectOptionData>& aOptions )
 	{
-    CBrowserSelectElementDlg* dlg = CBrowserSelectElementDlg::NewL(	aTitle, 
+     iSelectDlg = CBrowserSelectElementDlg::NewL(	aTitle, 
 												aBrCtlSelectOptionType, 
 												aOptions );
 
-	
-    iDialogs.Append( dlg );     // Store a pointer to the dialog for CancelAll()
+
 
-	TInt result = dlg->ExecuteLD();
+	TInt result = iSelectDlg->ExecuteLD();
 
-    RemoveDialogFromArray();
-    
+
+    iSelectDlg = 0;
     if ( iObserver )
         {
         iObserver->ReportDialogEventL( 
@@ -981,7 +980,11 @@
 //-----------------------------------------------------------------------------
 //
 EXPORT_C void CBrowserDialogsProvider::CancelAll()
-	{
+    {
+	 if(iSelectDlg  )
+        iSelectDlg->CancelPopup();
+		
+    iDialogs.Close();
     // Empty the array
     iDialogs.ResetAndDestroy();
 	}
--- a/browserutilities/browserdialogsprovider/Src/BrowserSelectElementItemDrawer.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/browserdialogsprovider/Src/BrowserSelectElementItemDrawer.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -20,7 +20,7 @@
 // INCLUDE FILES
 #include "BrowserSelectElementItemDrawer.h"
 #include "BrowserSelectElementModel.h"
-#include "brctldialogsprovider.h"
+#include <brctldialogsprovider.h>
 
 #include <gulicon.h>
 #include <AknIconArray.h>
--- a/browserutilities/browserdialogsprovider/Src/BrowserUploadProgressNote.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/browserdialogsprovider/Src/BrowserUploadProgressNote.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -20,7 +20,7 @@
 
 // INCLUDES
 #include "BrowserUploadProgressNote.h"
-#include "browserdialogsproviderobserver.h"
+#include <browserdialogsproviderobserver.h>
 
 #include <BrowserDialogsProvider.rsg>
 #include <StringLoader.h>
--- a/browserutilities/browserdialogsprovider/Src/BrowserViewImagesPopup.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/browserdialogsprovider/Src/BrowserViewImagesPopup.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -19,7 +19,7 @@
 
 
 // USER INCLUDES
-#include "browserdialogsprovider.h"
+#include <browserdialogsprovider.h>
 #include "BrowserDialogsProvider.hrh"
 #include "BrowserViewImagesPopup.h"
 #include "PhotoOperationWait.h"
--- a/browserutilities/browserdialogsprovider/SrcData/BrowserDialogsProvider.rss	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/browserdialogsprovider/SrcData/BrowserDialogsProvider.rss	Thu Jan 07 13:31:38 2010 +0200
@@ -19,7 +19,7 @@
 
 //  INCLUDES
 #include "BrowserDialogsProvider.hrh"
-#include <BrowserDialogsProvider.loc>
+#include <browserdialogsprovider.loc>
 
 #include <avkon.rsg>
 #include <avkon.rh>	
@@ -340,4 +340,4 @@
             }
         };
     }
-// End of File
\ No newline at end of file
+// End of File
--- a/browserutilities/browsertelservice/data/BrowserTelService.rss	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/browsertelservice/data/BrowserTelService.rss	Thu Jan 07 13:31:38 2010 +0200
@@ -30,7 +30,7 @@
 #include <AiwCommon.hrh>
 #include <AiwCommon.rh>
 
-#include <BrowserTelService.loc>
+#include <browsertelservice.loc>
 #include "BrowserTelService.hrh"
 
 //***************************************************************************************
--- a/browserutilities/browsertelservice/group/BrowserTelService.mmp	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/browsertelservice/group/BrowserTelService.mmp	Thu Jan 07 13:31:38 2010 +0200
@@ -45,7 +45,6 @@
 SOURCE      BrowserTelServiceEtelWatcher.cpp
 SOURCE      BrowserTelServiceDlgs.cpp
 
-
 USERINCLUDE    ../inc
 USERINCLUDE    ../../inc
 
@@ -69,10 +68,7 @@
 	s60/app/messaging/msg_sdk/send_ui_api/inc/SendUiConsts.h
 	s60/app/messaging/msg_sdk/send_ui_api/inc/SenduiMtmUids.h
 */
-//MW_LAYER_SYSTEMINCLUDE
-
-
-SYSTEMINCLUDE	../../../inc
+// MW_LAYER_SYSTEMINCLUDE
 
 LIBRARY		euser.lib 
 LIBRARY		etel.lib 
@@ -91,10 +87,10 @@
 LIBRARY		ApEngine.lib
 LIBRARY		commdb.lib
 LIBRARY		efsrv.lib 
-LIBRARY     commonui.lib
-LIBRARY     featmgr.lib // feature mannger support
-LIBRARY     estor.lib  // RWriteStream, RFileBuf
-LIBRARY     Centralrepository.lib
+LIBRARY   	commonui.lib
+LIBRARY   	featmgr.lib // feature mannger support
+LIBRARY   	estor.lib  // RWriteStream, RFileBuf
+LIBRARY     	Centralrepository.lib
 
 #if defined(ARMCC)
     DEFFILE ../EABI/BROWSERTELSERVICEU_EKA2.def
@@ -107,4 +103,3 @@
 LIBRARY			aiwdialdata.lib
 
 DEBUGLIBRARY    flogger.lib
-
--- a/browserutilities/browsertelservice/group/bld.inf	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/browsertelservice/group/bld.inf	Thu Jan 07 13:31:38 2010 +0200
@@ -25,7 +25,7 @@
 ../inc/BrowserTelService.h    |../../../inc/BrowserTelService.h
 ../inc/BrowserTelServiceEtelWatcher.h    |../../../inc/BrowserTelServiceEtelWatcher.h
 ../rom/browsertelservice.iby CORE_MW_LAYER_IBY_EXPORT_PATH(browsertelservice.iby)
-../loc/BrowserTelService.loc  MW_LAYER_LOC_EXPORT_PATH(BrowserTelService.loc)
+../loc/browsertelservice.loc  MW_LAYER_LOC_EXPORT_PATH(browsertelservice.loc)
 
 PRJ_MMPFILES
 BrowserTelService.mmp
--- a/browserutilities/connectionmanager/Inc/ConnMan.hrh	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/connectionmanager/Inc/ConnMan.hrh	Thu Jan 07 13:31:38 2010 +0200
@@ -24,4 +24,3 @@
 	EConnManWaitNote = 8747,
 	EConnManInfoNote
 	};
-	
\ No newline at end of file
--- a/browserutilities/connectionmanager/Src/ConnectionObservers.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/connectionmanager/Src/ConnectionObservers.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -18,17 +18,14 @@
 *
 */
 
-
-
 #include <nifman.h>
 #include <nifvar.h>
 #include <es_enum.h>
 #include <in_sock.h>
 
-#include "connectionobservers.h"
+#include <connectionobservers.h>
 #include "ConnectionManagerLogger.h"
 
-
 //--------------------------------------------------------------------------
 //CConnectionStageNotifierWCB::NewL()
 //--------------------------------------------------------------------------
--- a/browserutilities/connectionmanager/Src/InternetConnectionManager.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/connectionmanager/Src/InternetConnectionManager.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -65,10 +65,10 @@
 #include <CommsDatTypeInfoV1_1.h>
 
 	//User Includes
-#include "internetconnectionmanager.h"
+#include <internetconnectionmanager.h>
 #include "connman.hrh"
 #include "connectionmanagerlogger.h"
-#include "connectionobservers.h"
+#include <connectionobservers.h>
 #include "connmanactiveconnector.h"
 
 using namespace CMManager;
@@ -1041,7 +1041,7 @@
     
     if (iConnectionType == EDestination)
     	{
-    	err = ConnectWithSnapId(iRequestedSnapId);	
+    	err = ConnectWithSnapIdL(iRequestedSnapId);	
     	return err;
     	}
     	else
@@ -1642,6 +1642,17 @@
     }
     
 //------------------------------------------------------------------------
+//CInternetConnectionManager::CancelConnection
+//    
+ void CInternetConnectionManager::CancelConnection()
+    {
+    if(iSyncConnector && iSyncConnector->IsActive()) 
+        {
+        iSyncConnector->Cancel();
+        }
+	}
+		
+//------------------------------------------------------------------------
 //CInternetConnectionManager::AskIap
 //------------------------------------------------------------------------
 EXPORT_C TInt CInternetConnectionManager::AskIap( TUint32& aNewIap )
@@ -2000,9 +2011,9 @@
     }
     
 //------------------------------------------------------------------------
-//CInternetConnectionManager::ConnectWithSnapId
+//CInternetConnectionManager::ConnectWithSnapIdL
 //------------------------------------------------------------------------    
-TInt CInternetConnectionManager::ConnectWithSnapId(TUint32 aRequestedSnapId)
+TInt CInternetConnectionManager::ConnectWithSnapIdL(TUint32 aRequestedSnapId)
 	{
 
     CLOG_WRITE_1( "CInternetConnectionManager::ConnectWithSnapId - %d", aRequestedSnapId );
--- a/browserutilities/cxmllibrary/dictionary/dict_creator.c	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/cxmllibrary/dictionary/dict_creator.c	Thu Jan 07 13:31:38 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2002 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0""
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
@@ -21,26 +21,6 @@
 *
 */
 
-
-/* ****************************************************************
-**          Copyright 2000 - Nokia Corporation  All rights reserved.
-**          Nokia Americas
-**          6000 Connection Drive
-**          Irving, Texas 75039
-**
-**          Restricted Rights: Use, duplication, or disclosure by the
-**          U.S. Government is subject to restrictions as set forth in
-**          subparagraph (c)(1)(ii) of DFARS 252.227-7013, or in FAR
-**          52.227-19, or in FAR 52.227-14 Alt. III, as applicable.
-**
-**          This software is proprietary to and embodies the confidential
-**          technology of Nokia  Possession, use, or copying of this software 
-**          and media is authorized only pursuant to a valid written license
-**          from Nokia or an authorized sublicensor.
-**
-**          Nokia  - Wireless Software Solutions
-*****************************************************************/
-
 #include <stdio.h>
 #include <io.h>
 #include <string.h>
--- a/browserutilities/cxmllibrary/group/cXmlParser.mmp	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/cxmllibrary/group/cXmlParser.mmp	Thu Jan 07 13:31:38 2010 +0200
@@ -20,8 +20,6 @@
 TARGET          cXmlParser.dll
 TARGETTYPE      dll
 
-
-
 #if defined(ARMCC)
 UID	0x1000008D 	0x101F8710
 deffile EABI/cXmlParser.def
@@ -73,9 +71,6 @@
 SOURCE  utils/src/E32XMLPARSERDLLEntryPoint.cpp
 SOURCE  utils/src/cxml_file_if.cpp
 
-
-
-
 #if defined(WINS)
   #ifndef WINSCW
     SOURCE  utils/src/cxml_assert.c
@@ -91,13 +86,10 @@
 USERINCLUDE     ../src/tinytree/include
 USERINCLUDE     ../src/utils/include
 
-
 // ===================================
 
-
 MW_LAYER_SYSTEMINCLUDE
-MW_LAYER_LIBC_SYSTEMINCLUDE
-
+OS_LAYER_ESTLIB_SYSTEMINCLUDE
 
 // Symbian OS libraries
 //#if defined (WINS)
--- a/browserutilities/cxmllibrary/src/dom/include/nw_dom_wbxmltypes.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/cxmllibrary/src/dom/include/nw_dom_wbxmltypes.h	Thu Jan 07 13:31:38 2010 +0200
@@ -27,15 +27,14 @@
 #ifndef NW_DOM_WBXML_TYPES_H
 #define NW_DOM_WBXML_TYPES_H
 
-#include "cxml_proj.h"
-#include "nw_dom_node.h"
+#include <cxml_proj.h>
+#include <nw_dom_node.h>
 
 #ifdef __cplusplus
 extern "C"
 {
 #endif /* __cplusplus */
 
-
 /** ----------------------------------------------------------------------- **
     @typedef:     NW_DOM_Extension
 
--- a/browserutilities/cxmllibrary/src/dom/src/attribute.c	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/cxmllibrary/src/dom/src/attribute.c	Thu Jan 07 13:31:38 2010 +0200
@@ -17,10 +17,10 @@
 
 
 #include "cxml_internal.h"
-#include "nw_dom_attribute.h"
-#include "nw_wbxml_dictionary.h"
-#include "nw_tinydom.h"
-#include "nw_string_string.h"
+#include <nw_dom_attribute.h>
+#include <nw_wbxml_dictionary.h>
+#include <nw_tinydom.h>
+#include <nw_string_string.h>
 #include "nw_dom_wbxmltypes.h"
 
 /*
--- a/browserutilities/cxmllibrary/src/dom/src/document.c	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/cxmllibrary/src/dom/src/document.c	Thu Jan 07 13:31:38 2010 +0200
@@ -15,15 +15,14 @@
 *
 */
 
-
 #include "cxml_internal.h"
-#include "nw_dom_node.h"
-#include "nw_dom_document.h"
-#include "nw_dom_element.h"
-#include "nw_tinytree.h"
-#include "nw_encoder_wbxmlwriter.h"
-#include "nw_xmlp_xmlp2wbxml.h"
-#include "nw_tinydom_utils.h"
+#include <nw_dom_node.h>
+#include <nw_dom_document.h>
+#include <nw_dom_element.h>
+#include <nw_tinytree.h>
+#include <nw_encoder_wbxmlwriter.h>
+#include <nw_xmlp_xmlp2wbxml.h>
+#include <nw_tinydom_utils.h>
 
 /*#include "nw_parser.h"*/
 
--- a/browserutilities/cxmllibrary/src/dom/src/element.c	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/cxmllibrary/src/dom/src/element.c	Thu Jan 07 13:31:38 2010 +0200
@@ -15,12 +15,11 @@
 *
 */
 
-
 #include "cxml_internal.h"
-#include "nw_dom_element.h"
-#include "nw_dom_attribute.h"
-#include "nw_dom_document.h"
-#include "nw_wbxml_dictionary.h"
+#include <nw_dom_element.h>
+#include <nw_dom_attribute.h>
+#include <nw_dom_document.h>
+#include <nw_wbxml_dictionary.h>
 
 /* 
  * Returns
--- a/browserutilities/cxmllibrary/src/dom/src/node.c	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/cxmllibrary/src/dom/src/node.c	Thu Jan 07 13:31:38 2010 +0200
@@ -17,9 +17,9 @@
 
 
 #include "cxml_internal.h"
-#include "nw_dom_node.h"
-#include "nw_dom_document.h"
-#include "nw_dom_element.h"
+#include <nw_dom_node.h>
+#include <nw_dom_document.h>
+#include <nw_dom_element.h>
 
 /**
  * GENERAL NODE METHODS - applicable to all node types
--- a/browserutilities/cxmllibrary/src/dom/src/text.c	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/cxmllibrary/src/dom/src/text.c	Thu Jan 07 13:31:38 2010 +0200
@@ -15,11 +15,10 @@
 *
 */
 
-
 #include "cxml_internal.h"
-#include "nw_tinytree.h"
-#include "nw_dom_text.h"
-#include "nw_dom_document.h"
+#include <nw_tinytree.h>
+#include <nw_dom_text.h>
+#include <nw_dom_document.h>
 
 /*
  * Returns
--- a/browserutilities/cxmllibrary/src/dom/src/wbxml_types.c	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/cxmllibrary/src/dom/src/wbxml_types.c	Thu Jan 07 13:31:38 2010 +0200
@@ -17,7 +17,7 @@
 
 
 #include "cxml_internal.h"
-#include "nw_dom_node.h"
+#include <nw_dom_node.h>
 #include "nw_dom_wbxmltypes.h"
 
 /** Extension **/
--- a/browserutilities/cxmllibrary/src/encoder/include/nw_encoder_tinydom2wbxml.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/cxmllibrary/src/encoder/include/nw_encoder_tinydom2wbxml.h	Thu Jan 07 13:31:38 2010 +0200
@@ -15,7 +15,6 @@
 *
 */
 
-
 /** ----------------------------------------------------------------------- **
     @package:     NW_Encoder
 
@@ -28,8 +27,8 @@
 #ifndef NW_TINYDOM2WBXML_H
 #define NW_TINYDOM2WBXML_H
 
-#include "nw_encoder_wbxmlwriter.h"
-#include "nw_dom_attribute.h"
+#include <nw_encoder_wbxmlwriter.h>
+#include <nw_dom_attribute.h>
 
 #ifdef __cplusplus
 extern "C" {
--- a/browserutilities/cxmllibrary/src/encoder/src/StringTable.c	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/cxmllibrary/src/encoder/src/StringTable.c	Thu Jan 07 13:31:38 2010 +0200
@@ -16,12 +16,12 @@
 */
 
 
-#include "nw_encoder_stringtable.h"
-#include "nw_wbxml_parse.h"
-#include "nw_dom_attribute.h"
-#include "nw_dom_element.h"
-#include "nw_dom_text.h"
-#include "nw_dom_document.h"
+#include <nw_encoder_stringtable.h>
+#include <nw_wbxml_parse.h>
+#include <nw_dom_attribute.h>
+#include <nw_dom_element.h>
+#include <nw_dom_text.h>
+#include <nw_dom_document.h>
 #include "cxml_internal.h"
 
 /* ------------------------------------------------------------------------- *
--- a/browserutilities/cxmllibrary/src/encoder/src/WBXMLWriter.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/cxmllibrary/src/encoder/src/WBXMLWriter.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -15,11 +15,10 @@
 *
 */
 
-
 #include "cxml_internal.h"
-#include "nw_wbxml_token.h"
-#include "nw_encoder_wbxmlwriter.h"
-#include "nw_wbxml_parse.h"
+#include <nw_wbxml_token.h>
+#include <nw_encoder_wbxmlwriter.h>
+#include <nw_wbxml_parse.h>
 #include "cxml_mem.h"
 
 // WLIU_DEBUG: #include "flogger.h"
@@ -30,7 +29,6 @@
 static const NW_Uint8 zzzunknown[] = {'z','z','z','u','n','k','n','o','w','n','\0'};
 #define zzzunknownEncoding HTTP_utf_8
 
-
 static
 NW_Status_t
 NW_WBXML_Writer_Memcpy(NW_WBXML_Writer_t* pW, const NW_Uint8* pBytes,
--- a/browserutilities/cxmllibrary/src/encoder/src/domencoder.c	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/cxmllibrary/src/encoder/src/domencoder.c	Thu Jan 07 13:31:38 2010 +0200
@@ -15,13 +15,12 @@
 *
 */
 
-
 #include "cxml_internal.h"
-#include "nw_encoder_domencoder.h"
-#include "nw_encoder_stringtable.h"
-#include "nw_dom_element.h"
-#include "nw_dom_text.h"
-#include "nw_dom_attribute.h"
+#include <nw_encoder_domencoder.h>
+#include <nw_encoder_stringtable.h>
+#include <nw_dom_element.h>
+#include <nw_dom_text.h>
+#include <nw_dom_attribute.h>
 
 /* ------------------------------------------------------------------------- *
    private methods
--- a/browserutilities/cxmllibrary/src/encoder/src/tinydom2wbxml.c	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/cxmllibrary/src/encoder/src/tinydom2wbxml.c	Thu Jan 07 13:31:38 2010 +0200
@@ -15,9 +15,6 @@
 *
 */
 
-
-
-
 /*****************************************************************
 **  File: tinydom2wbxml.c
 **
@@ -26,7 +23,7 @@
 
 #include "cxml_internal.h"
 #include "nw_encoder_tinydom2wbxml.h"
-#include "nw_dom_text.h"
+#include <nw_dom_text.h>
 
 /*
 Writes an AttrVal
--- a/browserutilities/cxmllibrary/src/string/src/char.c	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/cxmllibrary/src/string/src/char.c	Thu Jan 07 13:31:38 2010 +0200
@@ -15,7 +15,6 @@
 *
 */
 
-
 /*****************************************************************
 **  File: character.c
 **  Description:
@@ -31,7 +30,7 @@
 * 
 *****************************************************************/
 #include "cxml_internal.h"
-#include "nw_string_char.h"
+#include <nw_string_char.h>
 
 /*  
 * TODO:  Note that there is some duplication between the Validate*
--- a/browserutilities/cxmllibrary/src/string/src/string.c	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/cxmllibrary/src/string/src/string.c	Thu Jan 07 13:31:38 2010 +0200
@@ -15,7 +15,6 @@
 *
 */
 
-
 /*****************************************************************
 **  File: xml_string.c
 **
@@ -30,9 +29,9 @@
  * 
 *****************************************************************/
 #include "cxml_internal.h"
-#include "nw_string_string.h"
-#include "nw_string_char.h"
-#include "nw_wbxml_dictionary.h"
+#include <nw_string_string.h>
+#include <nw_string_char.h>
+#include <nw_wbxml_dictionary.h>
 
 static NW_Status_t
 StringUCS2Init(NW_String_UCS2String_t * string, void *storage)
@@ -51,7 +50,6 @@
   return status;
 }
 
-
 /*  
  * TODO: The following functions need to have the allocator passed 
  * as an argument !!
--- a/browserutilities/cxmllibrary/src/tinydom/src/tiny_dom.c	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/cxmllibrary/src/tinydom/src/tiny_dom.c	Thu Jan 07 13:31:38 2010 +0200
@@ -15,10 +15,10 @@
 *
 */
 #include "cxml_internal.h"
-#include "nw_tinydom.h"
-#include "nw_wbxml_parse.h"
-#include "nw_wbxml_reader.h"
-#include "nw_wbxml_event.h"
+#include <nw_tinydom.h>
+#include <nw_wbxml_parse.h>
+#include <nw_wbxml_reader.h>
+#include <nw_wbxml_event.h>
 #include "nw_wbxml_parsei.h"
 
 /*Parser flags */
--- a/browserutilities/cxmllibrary/src/tinydom/src/tiny_dom_utils.c	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/cxmllibrary/src/tinydom/src/tiny_dom_utils.c	Thu Jan 07 13:31:38 2010 +0200
@@ -15,11 +15,9 @@
 *
 */
 
-
 #include "cxml_internal.h"
-#include "nw_tinydom_utils.h"
-#include "nw_dom_document.h"
-
+#include <nw_tinydom_utils.h>
+#include <nw_dom_document.h>
 
 /****************************************************************************
  * Name:          NW_TinyDom_ParserInitialize
--- a/browserutilities/cxmllibrary/src/tinydom/src/tiny_dom_write.c	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/cxmllibrary/src/tinydom/src/tiny_dom_write.c	Thu Jan 07 13:31:38 2010 +0200
@@ -16,13 +16,12 @@
 */
 /* ************************************************************************/
 #include "cxml_internal.h"
-#include "nw_wbxml_parse.h"
-#include "nw_wbxml_document.h"
-#include "nw_encoder_wbxmlwriter.h"
+#include <nw_wbxml_parse.h>
+#include <nw_wbxml_document.h>
+#include <nw_encoder_wbxmlwriter.h>
 #include "nw_encoder_tinydom2wbxml.h"
-#include "nw_tinytree.h"
-#include "nw_tinydom.h"
-
+#include <nw_tinytree.h>
+#include <nw_tinydom.h>
 
 /* Create an empty tree */
 
--- a/browserutilities/cxmllibrary/src/tinytree/src/EBuffer.c	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/cxmllibrary/src/tinytree/src/EBuffer.c	Thu Jan 07 13:31:38 2010 +0200
@@ -16,7 +16,7 @@
 */
 
 #include "cxml_internal.h"
-#include "nw_tinytree_ebuffer.h"
+#include <nw_tinytree_ebuffer.h>
 
 /* ------------------------------------------------------------------------- *
    private methods
--- a/browserutilities/cxmllibrary/src/tinytree/src/TreeVector.c	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/cxmllibrary/src/tinytree/src/TreeVector.c	Thu Jan 07 13:31:38 2010 +0200
@@ -15,10 +15,9 @@
 *
 */
 
-
 #include "cxml_internal.h"
-#include "nw_tinytree_treevector.h"
-#include "nw_tinytree.h"
+#include <nw_tinytree_treevector.h>
+#include <nw_tinytree.h>
 /* ------------------------------------------------------------------------- */
 
 NW_TinyTree_TreeVector_t*
--- a/browserutilities/cxmllibrary/src/tinytree/src/tree.c	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/cxmllibrary/src/tinytree/src/tree.c	Thu Jan 07 13:31:38 2010 +0200
@@ -15,8 +15,7 @@
 *
 */
 
-
-#include "nw_tinytree.h"
+#include <nw_tinytree.h>
 #include "cxml_vector.h"
 
 NW_TinyTree_t*
--- a/browserutilities/cxmllibrary/src/tinytree/src/tree_alloc.c	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/cxmllibrary/src/tinytree/src/tree_alloc.c	Thu Jan 07 13:31:38 2010 +0200
@@ -15,7 +15,7 @@
 *
 */
 #include "cxml_internal.h"
-#include "nw_tinytree.h"
+#include <nw_tinytree.h>
 #include "nw_tinytree_alloc.h"
 
 /* 
--- a/browserutilities/cxmllibrary/src/utils/include/cxml_internal.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/cxmllibrary/src/utils/include/cxml_internal.h	Thu Jan 07 13:31:38 2010 +0200
@@ -29,9 +29,9 @@
 
 #include <nwx_status.h>
  
-#include "cxml_type_def.h"
+#include <cxml_type_def.h>
 #include "cxml_mem.h"
-#include "cxml_str.h"
+#include <cxml_str.h>
 #include "cxml_vector.h"
 
 
--- a/browserutilities/cxmllibrary/src/utils/include/cxml_mem.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/cxmllibrary/src/utils/include/cxml_mem.h	Thu Jan 07 13:31:38 2010 +0200
@@ -19,7 +19,7 @@
 /*
 ** Includes
 */
-#include "cxml_type_def.h"
+#include <cxml_type_def.h>
 
 /***************************************************************************
 **   File: cxml_mem.h
--- a/browserutilities/cxmllibrary/src/utils/src/E32XMLParserDllEntryPoint.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/cxmllibrary/src/utils/src/E32XMLParserDllEntryPoint.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -15,6 +15,4 @@
 *
 */
 #include <e32std.h>
-#include "nw_wbxml_dictionary.h"
-//#include "FeatMgr.h"
-
+#include <nw_wbxml_dictionary.h>
--- a/browserutilities/cxmllibrary/src/utils/src/cxml_assert.c	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/cxmllibrary/src/utils/src/cxml_assert.c	Thu Jan 07 13:31:38 2010 +0200
@@ -27,7 +27,7 @@
 **-------------------------------------------------------------------------
 */
 
-#include "cxml_type_def.h"
+#include <cxml_type_def.h>
 int kimono_assert ()
 {
   #ifdef __WINS__
--- a/browserutilities/cxmllibrary/src/utils/src/cxml_file_if.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/cxmllibrary/src/utils/src/cxml_file_if.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -15,12 +15,9 @@
 *
 */
 
-
-
 #include <F32File.h>
-#include "cxml_file_if.h"
-#include "nw_string_char.h"
-
+#include <cxml_file_if.h>
+#include <nw_string_char.h>
 
 //
 //CXML_Read_From_File()
--- a/browserutilities/cxmllibrary/src/utils/src/cxml_str.c	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/cxmllibrary/src/utils/src/cxml_str.c	Thu Jan 07 13:31:38 2010 +0200
@@ -15,7 +15,6 @@
 *
 */
 
-
 /***************************************************************************
 **   File: cxml_str.c
 **   Purpose:  Provides the implementation to CXML string API
@@ -28,8 +27,7 @@
 */
 
 #include "cxml_internal.h"
-#include "cxml_nw2cxmlTypes.h"
-
+#include <cxml_nw2cxmlTypes.h>
 
 static NW_Uint16 CXML_Str_Strlen(const CXML_Ucs2 *string)
 {
--- a/browserutilities/cxmllibrary/src/utils/src/cxml_vector.c	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/cxmllibrary/src/utils/src/cxml_vector.c	Thu Jan 07 13:31:38 2010 +0200
@@ -15,8 +15,7 @@
 *
 */
 
-
-#include "nw_tinytree.h"
+#include <nw_tinytree.h>
 #include "cxml_internal.h"
 
 /* ------------------------------------------------------------------------- */
--- a/browserutilities/cxmllibrary/src/wbxmlp/include/DictionaryContext.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/cxmllibrary/src/wbxmlp/include/DictionaryContext.h	Thu Jan 07 13:31:38 2010 +0200
@@ -23,15 +23,13 @@
  */
  
 #define MAX_DICTIONARIES 9
-
   
 /* Temporary methods for storing dictionary & dictionary size inside the context.
  */
 
-#include "cxml_proj.h"
-#include "nw_wbxml_dictionary.h"
+#include <cxml_proj.h>
+#include <nw_wbxml_dictionary.h>
 
- 
 #ifdef __cplusplus
 extern "C"
 {
--- a/browserutilities/cxmllibrary/src/wbxmlp/include/nw_wbxml_parsei.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/cxmllibrary/src/wbxmlp/include/nw_wbxml_parsei.h	Thu Jan 07 13:31:38 2010 +0200
@@ -25,8 +25,8 @@
 #ifndef NW_PARSER_WBXML_PARSE_I_H
 #define NW_PARSER_WBXML_PARSE_I_H
 
-#include "cxml_proj.h"
-#include "nw_wbxml_parse.h"
+#include <cxml_proj.h>
+#include <nw_wbxml_parse.h>
 
 #ifdef __cplusplus
 extern "C" {
--- a/browserutilities/cxmllibrary/src/wbxmlp/src/DictionaryContext.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/cxmllibrary/src/wbxmlp/src/DictionaryContext.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -18,7 +18,7 @@
 #include "DictionaryContext.h"
 #include "cxml_internal.h"
 #include "FeatMgr.h"
-#include "nw_wbxml_dictionary.h"
+#include <nw_wbxml_dictionary.h>
 
 /* There is possibility that dictionary initialize is called by the embedded
  * application also. To make allocation/deallocation of dictionary possible.
--- a/browserutilities/cxmllibrary/src/wbxmlp/src/dictionary.c	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/cxmllibrary/src/wbxmlp/src/dictionary.c	Thu Jan 07 13:31:38 2010 +0200
@@ -15,15 +15,14 @@
 *
 */
 
-
 /*****************************************************************
 **  File: dictionary.c
 **  Description:
 *****************************************************************/
 #include "cxml_internal.h"
 #include "nw_wbxml_parsei.h"
-#include "nw_string_char.h"
-#include "nw_wbxml_dictionary.h"
+#include <nw_string_char.h>
+#include <nw_wbxml_dictionary.h>
 #include "DictionaryContext.h"
 
 /* HTTP_iso_8859_1 IANA MIBenum 4 */
@@ -33,7 +32,6 @@
  * The dictionaries ...
  */
 
-
 static
 NW_Bool
 NW_WBXML_Dictionary_CmpDictDocType(NW_WBXML_Dictionary_t* dictionary,
--- a/browserutilities/cxmllibrary/src/wbxmlp/src/doc.c	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/cxmllibrary/src/wbxmlp/src/doc.c	Thu Jan 07 13:31:38 2010 +0200
@@ -15,17 +15,15 @@
 *
 */
 
-
 /*****************************************************************
 **  File: wbxml_doc.c
 **  Description:
 *****************************************************************/
 
 #include "cxml_internal.h"
-#include "nw_wbxml_document.h"
-#include "nw_string_char.h"
-#include "nw_encoder_stringtable.h"
-
+#include <nw_wbxml_document.h>
+#include <nw_string_char.h>
+#include <nw_encoder_stringtable.h>
 
 EXPORT_C NW_Status_t
 NW_WBXML_Document_construct(NW_WBXML_Document_t * doc, NW_Uint32 default_public_id)
--- a/browserutilities/cxmllibrary/src/wbxmlp/src/opaque.c	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/cxmllibrary/src/wbxmlp/src/opaque.c	Thu Jan 07 13:31:38 2010 +0200
@@ -15,14 +15,13 @@
 *
 */
 
-
 /*****************************************************************
 **  File: opaque.c
 **  Description: Methods on WBXML opaque data objects
 *****************************************************************/
 
 #include "cxml_internal.h"
-#include "nw_wbxml_opaque.h"
+#include <nw_wbxml_opaque.h>
 
 /*
  * Initialize an opaque object
--- a/browserutilities/cxmllibrary/src/wbxmlp/src/parse_buffer.c	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/cxmllibrary/src/wbxmlp/src/parse_buffer.c	Thu Jan 07 13:31:38 2010 +0200
@@ -35,14 +35,14 @@
 *****************************************************************/
 
 #include "cxml_internal.h"
-#include "nw_wbxml_reader.h"
-#include "nw_wbxml_dictionary.h"
-#include "nw_wbxml_event.h"
-#include "nw_wbxml_token.h"
-#include "nw_wbxml_opaque.h"
+#include <nw_wbxml_reader.h>
+#include <nw_wbxml_dictionary.h>
+#include <nw_wbxml_event.h>
+#include <nw_wbxml_token.h>
+#include <nw_wbxml_opaque.h>
 #include "nw_wbxml_parsei.h"
-#include "nw_string_char.h"
-#include "nw_tinydom.h"
+#include <nw_string_char.h>
+#include <nw_tinydom.h>
 
 /*
  * Initialize the parser
--- a/browserutilities/cxmllibrary/src/wbxmlp/src/parse_logic.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/cxmllibrary/src/wbxmlp/src/parse_logic.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -30,13 +30,13 @@
 *****************************************************************/
 
 #include "cxml_internal.h"
-#include "nw_wbxml_token.h"
-#include "nw_wbxml_dictionary.h"
-#include "nw_wbxml_document.h"
-#include "nw_wbxml_event.h"
-#include "nw_wbxml_reader.h"
+#include <nw_wbxml_token.h>
+#include <nw_wbxml_dictionary.h>
+#include <nw_wbxml_document.h>
+#include <nw_wbxml_event.h>
+#include <nw_wbxml_reader.h>
 #include "nw_wbxml_parsei.h"
-#include "nw_string_char.h"
+#include <nw_string_char.h>
 
 #ifndef HTTP_utf_8
 #define HTTP_utf_8 0x6A
--- a/browserutilities/cxmllibrary/src/xmlp/include/cxml_xmlp_entity.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/cxmllibrary/src/xmlp/include/cxml_xmlp_entity.h	Thu Jan 07 13:31:38 2010 +0200
@@ -20,7 +20,7 @@
 #ifndef _CXML_ENTITY_H_
 #define _CXML_ENTITY_H_
 
-#include "cxml_proj.h"
+#include <cxml_proj.h>
 
 #ifdef __cplusplus
 extern "C" {
--- a/browserutilities/cxmllibrary/src/xmlp/include/cxml_xmlp_int_entity.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/cxmllibrary/src/xmlp/include/cxml_xmlp_int_entity.h	Thu Jan 07 13:31:38 2010 +0200
@@ -20,13 +20,12 @@
 #ifndef _CXML_XMLP_INT_ENTITY_H_
 #define _CXML_XMLP_INT_ENTITY_H_
 #include <e32std.h>
-#include "cxml_proj.h"
+#include <cxml_proj.h>
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-
 typedef struct CXML_Internal_Entity_s {
    NW_Ucs2 * name;
    NW_Ucs2 * value;
--- a/browserutilities/cxmllibrary/src/xmlp/src/XMLParser.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/cxmllibrary/src/xmlp/src/XMLParser.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -16,17 +16,14 @@
 */
 
 #include "cxml_internal.h"
-#include "nw_xmlp_xmlreader.h"
-#include "nw_xmlp_xmlparser.h"
-#include "nw_encoder_wbxmlwriter.h"
-
+#include <nw_xmlp_xmlreader.h>
+#include <nw_xmlp_xmlparser.h>
+#include <nw_encoder_wbxmlwriter.h>
 
 #include "cxml_xmlp_entity.h"
-#include "nw_string_string.h"
+#include <nw_string_string.h>
 #include "cxml_xmlp_int_entity.h"
 
-
-
 /* "<?" len 2 */
 #define NW_XML_String_PiFormStartLength 2
 static
--- a/browserutilities/cxmllibrary/src/xmlp/src/XMLReader.c	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/cxmllibrary/src/xmlp/src/XMLReader.c	Thu Jan 07 13:31:38 2010 +0200
@@ -15,7 +15,6 @@
 *
 */
 
-
 /*
 This module provides a text (character) stream, pointers into the stream
 and operations on segments of the stream as though they were strings.
@@ -26,8 +25,8 @@
 */
 
 #include "cxml_internal.h"
-#include "nw_string_char.h"
-#include "nw_xmlp_xmlreader.h"
+#include <nw_string_char.h>
+#include <nw_xmlp_xmlreader.h>
 
 static
 NW_Status_t
--- a/browserutilities/cxmllibrary/src/xmlp/src/Xmlp2Wbxml.c	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/cxmllibrary/src/xmlp/src/Xmlp2Wbxml.c	Thu Jan 07 13:31:38 2010 +0200
@@ -17,13 +17,12 @@
 
 #include <string.h>
 #include "cxml_internal.h"
-#include "nw_encoder_wbxmlwriter.h"
-#include "nw_xmlp_xmlparser.h"
-#include "nw_xmlp_xmlp2wbxml.h"
-#include "nw_encoder_stringtable.h"
+#include <nw_encoder_wbxmlwriter.h>
+#include <nw_xmlp_xmlparser.h>
+#include <nw_xmlp_xmlp2wbxml.h>
+#include <nw_encoder_stringtable.h>
 #include "cxml_xmlp_entity.h"
 
-
 typedef struct CXML_Encoding_String_s {
    NW_Int8* charSetStr;
    NW_Uint32   encodingVal;
--- a/browserutilities/cxmllibrary/src/xmlp/src/XmlpEntity.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/cxmllibrary/src/xmlp/src/XmlpEntity.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -15,11 +15,10 @@
 *
 */
 
-
 #include "cxml_internal.h"
-#include "nw_xmlp_xmlreader.h"
-#include "nw_xmlp_xmlparser.h"
-#include "nw_string_string.h"
+#include <nw_xmlp_xmlreader.h>
+#include <nw_xmlp_xmlparser.h>
+#include <nw_string_string.h>
 #include "cxml_xmlp_entity.h"
 #include "cxml_xmlp_int_entity.h"
 
--- a/browserutilities/cxmllibrary/src/xmlp/src/XmlpIntEntity.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/cxmllibrary/src/xmlp/src/XmlpIntEntity.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -15,22 +15,17 @@
 *
 */
 
-
 /* Code to handle Internal Entities */
 
 #include "cxml_internal.h"
-#include "nw_xmlp_xmlreader.h"
-#include "nw_xmlp_xmlparser.h"
-#include "nw_string_string.h"
+#include <nw_xmlp_xmlreader.h>
+#include <nw_xmlp_xmlparser.h>
+#include <nw_string_string.h>
 
 #include "cxml_xmlp_int_entity.h"
 
 //#include <flogger.h> // Comment out this.
 
-
-
-
-
 /** ----------------------------------------------------------------------- **
     @function:    CXML_XML_Parser_Store_I_Entity
     @synopsis:    Function to store the internal entity.
--- a/browserutilities/downloadmgr/DownloadMgrClntSrv/group/DownloadMgrClntSrv.mmp	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/downloadmgr/DownloadMgrClntSrv/group/DownloadMgrClntSrv.mmp	Thu Jan 07 13:31:38 2010 +0200
@@ -33,7 +33,6 @@
   DEFFILE ../BWinsCw/DOWNLOADMGRU_EKA2.def
 #endif
 
-
 SOURCEPATH ../src
 SOURCE  DownloadMgrClntSession.cpp
 SOURCE  DownloadMgrClntSubSession.cpp
@@ -50,11 +49,10 @@
 SOURCE  ../../DownloadMgrServEng/src/DownloadDataServ.cpp
 
 USERINCLUDE	    ../inc
+USERINCLUDE	    ../../DownloadMgrServEng/Inc
 
 MW_LAYER_SYSTEMINCLUDE
 
-SYSTEMINCLUDE	../../DownloadMgrServEng/Inc
-
 LIBRARY euser.lib
 LIBRARY HttpDMServEng.lib
 LIBRARY efsrv.lib
--- a/browserutilities/downloadmgr/DownloadMgrClntSrv/group/DownloadMgrServer.mmp	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/downloadmgr/DownloadMgrClntSrv/group/DownloadMgrServer.mmp	Thu Jan 07 13:31:38 2010 +0200
@@ -26,6 +26,7 @@
 UID    0x1000008c 0x10008D60
 
 EPOCHEAPSIZE 0x2000 0x300000
+
 MW_LAYER_SYSTEMINCLUDE
 
 USERINCLUDE	    ../inc
@@ -33,7 +34,6 @@
 SOURCEPATH	../src
 SOURCE		DownloadMgrMain.cpp 
 
-
 LIBRARY euser.lib
 
 LIBRARY DownloadMgr.lib                      
--- a/browserutilities/downloadmgr/DownloadMgrClntSrv/inc/DownloadMgrDef.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/downloadmgr/DownloadMgrClntSrv/inc/DownloadMgrDef.h	Thu Jan 07 13:31:38 2010 +0200
@@ -101,13 +101,14 @@
     
     EHttpDownloadDataAttribute,                   // =42
     EHttpDownloadTrackAttribute,				  // =43
+    EHttpDownMgrNumOfSubSessions,                       // =44
 
     /* 
     * This should be the last item and the opcode must be incremented as well.
     * It is also important to make the changes on KDMgrServerPolicyRanges
     * in DownloadMgrServer.cpp according to this!!!
     */
-    EHttpDownloadMgrNotSupported                  // =44 (n+1)
+    EHttpDownloadMgrNotSupported                  // =45 (n+1)
 	};
 
 #endif /* __DOWNLOADMGR_DEF_H__ */
--- a/browserutilities/downloadmgr/DownloadMgrClntSrv/inc/DownloadMgrHandler.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/downloadmgr/DownloadMgrClntSrv/inc/DownloadMgrHandler.h	Thu Jan 07 13:31:38 2010 +0200
@@ -21,7 +21,7 @@
 #ifndef __DOWNLOADMGR_RECEIVEHANDLER_H__
 #define __DOWNLOADMGR_RECEIVEHANDLER_H__
 
-#include "downloadmgrclient.h"
+#include <downloadmgrclient.h>
 #include <e32base.h>
 
 // FORWARD DECLARATIONS
--- a/browserutilities/downloadmgr/DownloadMgrClntSrv/inc/DownloadMgrServer.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/downloadmgr/DownloadMgrClntSrv/inc/DownloadMgrServer.h	Thu Jan 07 13:31:38 2010 +0200
@@ -20,7 +20,7 @@
 #define __DOWNLOADMGR_SERVER_H__
 
 //  INCLUDES
-#include <HttpDownloadManagerServerEngine.h>
+#include "HttpDownloadManagerServerEngine.h"
 #include <e32base.h>
 
 // FORWARD DECLARATIONS
@@ -601,6 +601,13 @@
         * @return None.
 		*/
 		void SetString8AttributeL();
+		
+		/**
+		* Get the number of live subsessions.
+		* @param -
+        * @return None.
+		*/
+		void GetNumberOfSubsession();
 
     private:      // from CSession
 
--- a/browserutilities/downloadmgr/DownloadMgrClntSrv/src/DownloadMgrClientApiExt.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/downloadmgr/DownloadMgrClntSrv/src/DownloadMgrClientApiExt.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -15,8 +15,7 @@
 *
 */
 
-
-#include "downloadmgrclientapiext.h"
+#include <downloadmgrclientapiext.h>
 #include "DownloadMgrLogger.h"
 
 // ======== MEMBER FUNCTIONS ========
--- a/browserutilities/downloadmgr/DownloadMgrClntSrv/src/DownloadMgrClntSession.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/downloadmgr/DownloadMgrClntSrv/src/DownloadMgrClntSession.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -19,7 +19,7 @@
 
 // INCLUDE FILES
 #include "DownloadMgrLogger.h"
-#include "downloadmgrclient.h"
+#include <downloadmgrclient.h>
 #include "DownloadMgrServer.h"
 #include "DownloadMgrStart.h"
 #include "DownloadMgrDef.h"
@@ -36,6 +36,7 @@
 const TInt KHttpDownloadMgrObserverArrayGranularity = 4;
 const TInt KHttpDownloadMgrDefalutAttribsGranularity = 4;
 const TInt KDefaultMsgSlots = 16;
+const TInt KNumOfSubSessions = 16;
 
 _LIT8( KHttpScheme, "http" );
 _LIT8( KHttpsScheme, "https" );
@@ -599,6 +600,11 @@
     
     CLOG_ENTERFN( "RHttpDownloadMgr::CreateDownloadL" )
     
+    //Leave if the number of parallel downloads exceeds 16.
+    if(!IsNewDownloadPossible()){
+        User::LeaveIfError(KErrServerBusy);
+        }
+    
     RHttpDownload* download = new (ELeave) RHttpDownload ( this );
     CleanupStack::PushL( download );
     CleanupClosePushL( *download );
@@ -839,6 +845,22 @@
     }
 
 // ---------------------------------------------------------
+// RHttpDownloadMgr::IsNewDownloadPossible()
+// ---------------------------------------------------------
+ TBool RHttpDownloadMgr::IsNewDownloadPossible()
+{
+    TInt32 value(0);    
+    TPckg<TInt32> pckg( value );
+    if(KErrNone ==  SendReceive( EHttpDownMgrNumOfSubSessions, 
+                           TIpcArgs(&pckg ) )){
+        if(value < KNumOfSubSessions){
+            return ETrue;
+        }
+    }
+    return EFalse;
+}
+
+// ---------------------------------------------------------
 // RHttpDownloadMgr::Disconnect
 // ---------------------------------------------------------
 //
--- a/browserutilities/downloadmgr/DownloadMgrClntSrv/src/DownloadMgrClntSubSession.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/downloadmgr/DownloadMgrClntSrv/src/DownloadMgrClntSubSession.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -19,7 +19,7 @@
 
 // INCLUDE FILES
 #include "DownloadMgrLogger.h"
-#include "downloadmgrclient.h"
+#include <downloadmgrclient.h>
 #include "DownloadMgrServer.h"
 #include "DownloadMgrHandler.h"
 #include "DownloadMgrStart.h"
--- a/browserutilities/downloadmgr/DownloadMgrClntSrv/src/DownloadMgrCod.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/downloadmgr/DownloadMgrClntSrv/src/DownloadMgrCod.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -18,7 +18,7 @@
 
 
 // INCLUDE FILES
-#include "downloadmgrclient.h"
+#include <downloadmgrclient.h>
 #include "DownloadMgrCod.h"
 #include "DownloadMgrLogger.h"
 #include <apgtask.h>
--- a/browserutilities/downloadmgr/DownloadMgrClntSrv/src/DownloadMgrEventQueue.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/downloadmgr/DownloadMgrClntSrv/src/DownloadMgrEventQueue.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -15,12 +15,10 @@
 *
 */
 
-
-
 // INCLUDE FILES
 #include "DownloadMgrEventQueue.h"
 #include "DownloadMgrLogger.h"
-#include <HttpDownload.h>
+#include "HttpDownload.h"
 
 #ifdef __DOWNLOADMGR_LOG__
 //#define __DUMP_EVENT_QUEUE
--- a/browserutilities/downloadmgr/DownloadMgrClntSrv/src/DownloadMgrHandler.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/downloadmgr/DownloadMgrClntSrv/src/DownloadMgrHandler.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -16,16 +16,14 @@
 *
 */
 
-
 // INCLUDE FILES
 #include "DownloadMgrLogger.h"
 #include "DownloadMgrHandler.h"
-#include "downloadmgrclient.h"
+#include <downloadmgrclient.h>
 #include "DownloadMgrDefAttrib.h"
 
 // CONSTANTS
 
-
 // GLOBAL FUNCTIONS
 
 // ================= MEMBER FUNCTIONS =======================
--- a/browserutilities/downloadmgr/DownloadMgrClntSrv/src/DownloadMgrServer.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/downloadmgr/DownloadMgrClntSrv/src/DownloadMgrServer.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -16,14 +16,13 @@
 *
 */
 
-
 // INCLUDE FILES
 #include "DownloadMgrLogger.h"
 #include "DownloadMgrServer.h"
 #include "DownloadMgrDef.h"
 
-#include <HttpClientAppInstance.h>
-#include <HttpDownload.h>
+#include "HttpClientAppInstance.h"
+#include "HttpDownload.h"
 #include <e32svr.h>
 #include <basched.h>
 //#include <e32uid.h>
@@ -84,9 +83,9 @@
     EHttpDownloadCloseCompleted,				  // =41
     EHttpDownloadDataAttribute,                   // =42
     EHttpDownloadTrackAttribute,				  // =43
- 
+    EHttpDownMgrNumOfSubSessions,         //44
 	*/
-    44  // EHttpDownloadMgrNotSupported           // =44
+    45  // EHttpDownloadMgrNotSupported           // =45
 	};
 
 enum TDownloadMgrSecurityPolicy
--- a/browserutilities/downloadmgr/DownloadMgrClntSrv/src/DownloadMgrSrvObject.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/downloadmgr/DownloadMgrClntSrv/src/DownloadMgrSrvObject.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -16,15 +16,14 @@
 *
 */
 
-
 // INCLUDE FILES
 #include "DownloadMgrLogger.h"
 #include "DownloadMgrServer.h"
 #include "DownloadMgrDef.h"
 #include "DownloadMgrDefAttrib.h"
-#include <HttpClientApp.h>
-#include <HttpClientAppInstance.h>
-#include <HttpDownload.h>
+#include "HttpClientApp.h"
+#include "HttpClientAppInstance.h"
+#include "HttpDownload.h"
 #include <e32svr.h>
 #include <basched.h>
 //#include <e32uid.h>
--- a/browserutilities/downloadmgr/DownloadMgrClntSrv/src/DownloadMgrSrvSession.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/downloadmgr/DownloadMgrClntSrv/src/DownloadMgrSrvSession.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -16,15 +16,14 @@
 *
 */
 
-
 // INCLUDE FILES
 #include "DownloadMgrLogger.h"
 #include "DownloadMgrServer.h"
 #include "DownloadMgrDef.h"
 #include "DownloadMgrEventQueue.h"
 
-#include <HttpClientAppInstance.h>
-#include <HttpDownload.h>
+#include "HttpClientAppInstance.h"
+#include "HttpDownload.h"
 #include <e32svr.h>
 #include <basched.h>
 
@@ -174,6 +173,11 @@
     // check for session-relative requests
 	switch( aMessage.Function() )
 		{
+	    case EHttpDownMgrNumOfSubSessions:
+	         {
+	         GetNumberOfSubsession();
+	         return;
+	         }
         case EHttpDownloadMgrInitialize:
             {
             InitializeL();
@@ -312,6 +316,24 @@
     }
 
 // ---------------------------------------------------------
+// CDownloadMgrSession::GetNumberOfSubsession
+// ---------------------------------------------------------
+//
+void CDownloadMgrSession::GetNumberOfSubsession()
+    {    
+    TInt32 value(0);   
+    for( TInt i = 0; i < iObjectIx->Count(); i++ ){
+        CDownloadSubSession* downloadSess 
+                    = ( CDownloadSubSession* )(*iObjectIx)[i];
+         if( downloadSess != NULL ){
+         value++;  
+         }
+        }
+    TPckg<TInt32> pckg( value );
+    Write( 0, CurrentMessage(), pckg );    
+    }
+
+// ---------------------------------------------------------
 // CDownloadMgrSession::InitializeL
 // ---------------------------------------------------------
 //
--- a/browserutilities/downloadmgr/DownloadMgrClntSrv/src/DownloadMgrTransObserver.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/downloadmgr/DownloadMgrClntSrv/src/DownloadMgrTransObserver.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -16,14 +16,12 @@
 *
 */
 
-
 // INCLUDE FILES
 #include "DownloadMgrTransObserver.h"
-#include "downloadmgrclient.h"
+#include <downloadmgrclient.h>
 
 // CONSTANTS
 
-
 // GLOBAL FUNCTIONS
 
 // ================= MEMBER FUNCTIONS =======================
--- a/browserutilities/downloadmgr/DownloadMgrServEng/Group/HttpDMServEng.mmp	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/downloadmgr/DownloadMgrServEng/Group/HttpDMServEng.mmp	Thu Jan 07 13:31:38 2010 +0200
@@ -39,20 +39,10 @@
   
 SOURCEPATH ../src
 
+MW_LAYER_SYSTEMINCLUDE
+#if defined(__PLATFORM_VERSION_50_TUBE__) || defined( __PLATFORM_VERSION_50__)
 APP_LAYER_SYSTEMINCLUDE
-/* SF TODO: resolve APP LAYER DEPENDENCY: 
-	s60/app/devicecontrol/devctrl_dom/fota_engine_api/inc/FotaEngine.h
-	s60/app/devicecontrol/devctrl_dom/fota_engine_api/inc/fotaconst.h
-	s60/app/devicecontrol/devctrl_dom/fota_engine_api/inc/FotaEngStream.h
-
-	s60/app/gallery/gallery_dom/media_file_api/inc/CMGXFileManager.h
-	s60/app/gallery/gallery_dom/media_file_api/inc/MGXFileManagerFactory.h
-*/
-//MW_LAYER_SYSTEMINCLUDE
-
-MW_LAYER_ECOM_SYSTEMINCLUDE
-MW_LAYER_HTTP_SYSTEMINCLUDE
-
+#endif
 
 USERINCLUDE ../inc
 
@@ -64,9 +54,9 @@
 SOURCE HeaderField.cpp
 SOURCE HttpStorage.cpp
 SOURCE HttpDownloadMgrLogger.cpp
-SOURCE  FileExt.cpp
+SOURCE FileExt.cpp
 SOURCE DownloadDataServ.cpp
-SOURCE  BuffStorage.cpp
+SOURCE BuffStorage.cpp
 
 #ifdef __S60_32__
 LANG sc 
--- a/browserutilities/downloadmgr/DownloadMgrServEng/Inc/DownloadDataServ.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/downloadmgr/DownloadMgrServEng/Inc/DownloadDataServ.h	Thu Jan 07 13:31:38 2010 +0200
@@ -15,14 +15,12 @@
 *
 */
 
-
-
 #ifndef DOWNLOAD_DATA_SERV_H
 #define DOWNLOAD_DATA_SERV_H
 
 //  INCLUDES
 #include <e32base.h>
-#include "httpdownloaddata.h"
+#include <httpdownloaddata.h>
 
 // CONSTANTS
 
--- a/browserutilities/downloadmgr/DownloadMgrServEng/Inc/HttpClientAppInstance.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/downloadmgr/DownloadMgrServEng/Inc/HttpClientAppInstance.h	Thu Jan 07 13:31:38 2010 +0200
@@ -15,13 +15,11 @@
 *
 */
 
-
-
 #ifndef HTTPCLIENTAPPINSTANCE_H
 #define HTTPCLIENTAPPINSTANCE_H
 
 //  INCLUDES
-#include "httpdownloadmgrcommon.h"
+#include <httpdownloadmgrcommon.h>
 
 #include <e32base.h>
 
--- a/browserutilities/downloadmgr/DownloadMgrServEng/Inc/HttpDownloadManagerServerEngine.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/downloadmgr/DownloadMgrServEng/Inc/HttpDownloadManagerServerEngine.h	Thu Jan 07 13:31:38 2010 +0200
@@ -16,8 +16,6 @@
 *
 */
 
-
-
 #ifndef HTTPDOWNLOADMANAGER_H
 #define HTTPDOWNLOADMANAGER_H
 
--- a/browserutilities/downloadmgr/DownloadMgrServEng/Src/DownloadDataServ.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/downloadmgr/DownloadMgrServEng/Src/DownloadDataServ.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -15,16 +15,12 @@
 *
 */
 
-
-
 // INCLUDE FILES
 #include <s32mem.h>
 #include "DownloadDataServ.h"
 
-
 // CONSTANTS
 
-
 // ---------------------------------------------------------
 // CMediaDataServ::NewL()
 // Two-phase Constructor - Creates object from stream
--- a/browserutilities/downloadmgr/DownloadMgrServEng/Src/HttpClientAppInstance.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/downloadmgr/DownloadMgrServEng/Src/HttpClientAppInstance.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -15,13 +15,11 @@
 *
 */
 
-
-
 // INCLUDE FILES
 #include    "HttpClientAppInstance.h"
 #include    "HttpClientApp.h"
 #include    "HttpDownloadManagerServerEngine.h"
-#include "HttpDownloadMgrLogger.h"
+#include    "HttpDownloadMgrLogger.h"
 
 // EXTERNAL DATA STRUCTURES
 //extern  ?external_data;
--- a/browserutilities/downloadmgr/DownloadMgrServEng/Src/HttpConnHandler.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/downloadmgr/DownloadMgrServEng/Src/HttpConnHandler.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -15,8 +15,6 @@
 *
 */
 
-
-
 // INCLUDE FILES
 #include "HttpClientApp.h"
 #include "HttpClientAppInstance.h"
--- a/browserutilities/downloadmgr/DownloadMgrUiLib/Data/DownloadMgrUiLib.rss	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/downloadmgr/DownloadMgrUiLib/Data/DownloadMgrUiLib.rss	Thu Jan 07 13:31:38 2010 +0200
@@ -21,7 +21,7 @@
 
 //  INCLUDES
 #include "DownloadMgrUiLib.hrh"
-#include <DownloadMgrUiLib.loc>
+#include <downloadmgruilib.loc>
 #include <avkon.loc>
 #include <badef.rh>
 #include <uikon.rh>
--- a/browserutilities/downloadmgr/DownloadMgrUiLib/Group/Bld.inf	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/downloadmgr/DownloadMgrUiLib/Group/Bld.inf	Thu Jan 07 13:31:38 2010 +0200
@@ -25,7 +25,7 @@
 PRJ_EXPORTS
 ../rom/DownloadMgrUiLib.iby			  CORE_MW_LAYER_IBY_EXPORT_PATH(DownloadMgrUiLib.iby)
 ../rom/DownloadMgrUiLibResources.iby  LANGUAGE_MW_LAYER_IBY_EXPORT_PATH(DownloadMgrUiLibResources.iby)
-../loc/DownloadMgrUiLib.loc			  MW_LAYER_LOC_EXPORT_PATH(DownloadMgrUiLib.loc)
+../loc/downloadmgruilib.loc			  MW_LAYER_LOC_EXPORT_PATH(downloadmgruilib.loc)
 
 #ifdef __SERIES60_32__
 
--- a/browserutilities/downloadmgr/DownloadMgrUiLib/Group/DownloadMgrUiLib.mmp	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/downloadmgr/DownloadMgrUiLib/Group/DownloadMgrUiLib.mmp	Thu Jan 07 13:31:38 2010 +0200
@@ -61,16 +61,10 @@
 USERINCLUDE     ../Inc
 USERINCLUDE     ../../DownloadMgrClntSrv/inc
 
+MW_LAYER_SYSTEMINCLUDE
+#if defined(__PLATFORM_VERSION_50_TUBE__) || defined( __PLATFORM_VERSION_50__)
 APP_LAYER_SYSTEMINCLUDE
-/* SF TODO: resolve APP LAYER DEPENDENCY: 
-	s60/app/devicecontrol/devctrl_dom/fota_engine_api/inc/FotaEngine.h
-	s60/app/devicecontrol/devctrl_dom/fota_engine_api/inc/fotaconst.h
-	s60/app/devicecontrol/devctrl_dom/fota_engine_api/inc/FotaEngStream.h
-
-	s60/app/gallery/gallery_dom/media_file_api/inc/CMGXFileManager.h
-	s60/app/gallery/gallery_dom/media_file_api/inc/MGXFileManagerFactory.h
-*/
-//MW_LAYER_SYSTEMINCLUDE
+#endif
 
 SOURCEPATH      ../Src
 SOURCE          AsyncEventHandlerArray.cpp
--- a/browserutilities/downloadmgr/DownloadMgrUiLib/Inc/AsyncEventHandlerBase.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/downloadmgr/DownloadMgrUiLib/Inc/AsyncEventHandlerBase.h	Thu Jan 07 13:31:38 2010 +0200
@@ -15,8 +15,6 @@
 *
 */
 
-
-
 #ifndef ASYNCEVENTHANDLERBASE_H
 #define ASYNCEVENTHANDLERBASE_H
 
--- a/browserutilities/downloadmgr/DownloadMgrUiLib/Src/AsyncEventHandlerBase.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/downloadmgr/DownloadMgrUiLib/Src/AsyncEventHandlerBase.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -15,11 +15,9 @@
 *
 */
 
-
-
 // INCLUDE FILES
 #include    "AsyncEventHandlerBase.h"
-#include    "cdownloadmgruilibregistry.h"
+#include    <cdownloadmgruilibregistry.h>
 #include    "AsyncEventHandlerArray.h"
 #include    "UiLibLogger.h"
 #include    "DMgrUiLibPanic.h"
--- a/browserutilities/downloadmgr/DownloadMgrUiLib/Src/CDownloadMgrUiBase.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/downloadmgr/DownloadMgrUiLib/Src/CDownloadMgrUiBase.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -15,10 +15,8 @@
 *
 */
 
-
-
 // INCLUDE FILES
-#include    "cdownloadmgruibase.h"
+#include    <cdownloadmgruibase.h>
 #include    "UiLibLogger.h"
 #include    <e32std.h>
 #include    <e32def.h>
--- a/browserutilities/downloadmgr/DownloadMgrUiLib/Src/CDownloadMgrUiDownloadMenu.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/downloadmgr/DownloadMgrUiLib/Src/CDownloadMgrUiDownloadMenu.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -15,10 +15,8 @@
 *
 */
 
-
-
 // INCLUDE FILES
-#include    "cdownloadmgruidownloadmenu.h"
+#include    <cdownloadmgruidownloadmenu.h>
 #include    "UiLibLogger.h"
 #include    <e32std.h>
 #include    <e32def.h>
--- a/browserutilities/downloadmgr/DownloadMgrUiLib/Src/CDownloadMgrUiDownloadsList.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/downloadmgr/DownloadMgrUiLib/Src/CDownloadMgrUiDownloadsList.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -15,13 +15,11 @@
 *
 */
 
-
-
 // INCLUDE FILES
 #include    <browser_platform_variant.hrh>
-#include    "cdownloadmgruidownloadslist.h"
-#include    "cdownloadmgruilibregistry.h"
-#include    "cdownloadmgruidownloadmenu.h"
+#include    <cdownloadmgruidownloadslist.h>
+#include    <cdownloadmgruilibregistry.h>
+#include    <cdownloadmgruidownloadmenu.h>
 #include    "CDownloadsListArray.h"
 #include    "CDownloadsListDlg.h"
 #include    "AsyncEventHandlerArray.h"
--- a/browserutilities/downloadmgr/DownloadMgrUiLib/Src/CDownloadMgrUiLibRegistry.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/downloadmgr/DownloadMgrUiLib/Src/CDownloadMgrUiLibRegistry.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -15,12 +15,10 @@
 *
 */
 
-
-
 // INCLUDE FILES
-#include    "cdownloadmgruilibregistry.h"
-#include    "cdownloadmgruidownloadslist.h"
-#include    "cdownloadmgruiuserinteractions.h"
+#include    <cdownloadmgruilibregistry.h>
+#include    <cdownloadmgruidownloadslist.h>
+#include    <cdownloadmgruiuserinteractions.h>
 #include    "DMgrUiLibPanic.h"
 #include    "UiLibLogger.h"
 
--- a/browserutilities/downloadmgr/DownloadMgrUiLib/Src/CDownloadMgrUiUserInteractions.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/downloadmgr/DownloadMgrUiLib/Src/CDownloadMgrUiUserInteractions.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -15,13 +15,11 @@
 *
 */
 
-
-
 // INCLUDE FILES
-#include    "cdownloadmgruiuserinteractions.h"
+#include    <cdownloadmgruiuserinteractions.h>
 #include    "CUserInteractionsUtils.h"
-#include    "cdownloadmgruidownloadslist.h"
-#include    "cdownloadmgruilibregistry.h"
+#include    <cdownloadmgruidownloadslist.h>
+#include    <cdownloadmgruilibregistry.h>
 #include    "UserInteractionsEventHandler.h"
 #include    "AsyncEventHandlerArray.h"
 #include    "UiLibLogger.h"
@@ -457,15 +455,14 @@
         
         downloadCnt = iRegistryModel.DownloadCount();
 
-        TBool isProgressive (EFalse);
+       
         if ( resp == EAknSoftkeyYes || resp == EAknSoftkeyOk )
 		    {
             for ( TInt i = downloadCnt - 1; i >=0; --i )
 		        {
 	            RHttpDownload* dl = downloads.At(i); //current download
-                dl->GetBoolAttribute( EDlAttrProgressive, isProgressive );
                 dl->GetBoolAttribute( EDlAttrPausable , isPausable );
-                if (!( isProgressive || isPausable ) ) // delete only no-PDL downloads and Non pausable Downloads
+                if (!( isPausable ) ) // delete only Non pausable Downloads
     			    {
                     // Delete not attached downloads.
     	            dl->Delete(); // Return value ignored.
--- a/browserutilities/downloadmgr/DownloadMgrUiLib/Src/CDownloadsListDlg.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/downloadmgr/DownloadMgrUiLib/Src/CDownloadsListDlg.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -15,12 +15,10 @@
 *
 */
 
-
-
 // INCLUDE FILES
 #include    "CDownloadsListDlg.h"
 #include    "CDownloadUtils.h"
-#include    "downloadslistdlgobserver.h"
+#include    <downloadslistdlgobserver.h>
 #include    "CDownloadsListArray.h"
 #include    "DownloadMgrUiLib.hrh"
 #include    "DMgrUiLibPanic.h"
@@ -38,7 +36,6 @@
 
 #include "eikon.hrh"
 
-
 // ============================ MEMBER FUNCTIONS ===============================
 
 // -----------------------------------------------------------------------------
--- a/browserutilities/downloadmgr/DownloadMgrUiLib/Src/CUserInteractionsUtils.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/downloadmgr/DownloadMgrUiLib/Src/CUserInteractionsUtils.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -15,16 +15,14 @@
 *
 */
 
-
-
 // INCLUDE FILES
 #include    <browser_platform_variant.hrh>
 #include    "CUserInteractionsUtils.h"
 #include    "MDownloadHandlerObserver.h"
-#include    "cdownloadmgruibase.h"
-#include    "cdownloadmgruilibregistry.h"
-#include    "cdownloadmgruidownloadslist.h"
-#include    "cdownloadmgruiuserinteractions.h"
+#include    <cdownloadmgruibase.h>
+#include    <cdownloadmgruilibregistry.h>
+#include    <cdownloadmgruidownloadslist.h>
+#include    <cdownloadmgruiuserinteractions.h>
 #include    "UiLibLogger.h"
 #include    "DMgrUiLibPanic.h"
 #include    <DownloadMgrUiLib.rsg>
@@ -51,7 +49,7 @@
 #include	<apmrec.h>
 #include	<apgcli.h>
 #include    <s32mem.h>
-#include    "bautils.h"
+#include    <bautils.h>
 #include	<etelmm.h>
 #include	<MmTsy_names.h>
 #include    <rconnmon.h>
--- a/browserutilities/downloadmgr/DownloadMgrUiLib/Src/UserInteractionsEventHandler.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/downloadmgr/DownloadMgrUiLib/Src/UserInteractionsEventHandler.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -15,16 +15,14 @@
 *
 */
 
-
-
 // INCLUDE FILES
 #include    <browser_platform_variant.hrh>
 #include    "UserInteractionsEventHandler.h"
 #include    "CUserInteractionsUtils.h"
 #include    "ProgressInfoCreator.h"
-#include    "cdownloadmgruilibregistry.h"
-#include    "cdownloadmgruidownloadslist.h"
-#include    "cdownloadmgruiuserinteractions.h"
+#include    <cdownloadmgruilibregistry.h>
+#include    <cdownloadmgruidownloadslist.h>
+#include    <cdownloadmgruiuserinteractions.h>
 #include    "UiLibLogger.h"
 #include    "DMgrUiLibPanic.h"
 #include    <bldvariant.hrh>
@@ -40,7 +38,6 @@
 #include    <AknNoteDialog.h>
 #include    <UriUtils.h>
 
-
 #ifdef BRDO_APP_GALLERY_SUPPORTED_FF
 #include    <MGXFileManagerFactory.h>
 #include    <CMGXFileManager.h>
--- a/browserutilities/favouritesengine/ClientServer/src/ActiveFavouritesDbNotifier.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/favouritesengine/ClientServer/src/ActiveFavouritesDbNotifier.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -17,11 +17,10 @@
 *
 */
 
-
 // INCLUDE FILES
 
-#include "activefavouritesdbnotifier.h"
-#include "favouritesdbobserver.h"
+#include <activefavouritesdbnotifier.h>
+#include <favouritesdbobserver.h>
 
 // ================= MEMBER FUNCTIONS =======================
 
--- a/browserutilities/favouritesengine/ClientServer/src/FavouritesDb.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/favouritesengine/ClientServer/src/FavouritesDb.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -17,17 +17,16 @@
 *
 */
 
-
 // INCLUDE FILES
 
 #include <s32std.h>
-#include "favouritesdb.h"
+#include <favouritesdb.h>
 #include "FavouritesMsg.h"
 #include "FavouritesBuf.h"
 #include "FavouritesFilter.h"
 #include "FavouritesItemImpl.h"
-#include "favouritesitemlist.h"
-#include "favouritesitemdata.h"
+#include <favouritesitemlist.h>
+#include <favouritesitemdata.h>
 #include "FavouritesUtil.h"
 #include "UidMap.h"
 #include "FavouritesLogger.h" 
--- a/browserutilities/favouritesengine/ClientServer/src/FavouritesDbIncremental.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/favouritesengine/ClientServer/src/FavouritesDbIncremental.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -17,11 +17,10 @@
 *
 */
 
-
 // INCLUDE FILES
 
-#include "favouritesdbincremental.h"
-#include "favouritesdb.h"
+#include <favouritesdbincremental.h>
+#include <favouritesdb.h>
 #include "FavouritesMsg.h"
 
 // ================= MEMBER FUNCTIONS =======================
--- a/browserutilities/favouritesengine/ClientServer/src/FavouritesDbNotifier.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/favouritesengine/ClientServer/src/FavouritesDbNotifier.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -17,11 +17,10 @@
 *
 */
 
-
 // INCLUDE FILES
 
-#include "favouritesdbnotifier.h"
-#include "favouritesdb.h"
+#include <favouritesdbnotifier.h>
+#include <favouritesdb.h>
 #include "FavouritesMsg.h"
 
 // ================= MEMBER FUNCTIONS =======================
--- a/browserutilities/favouritesengine/ClientServer/src/FavouritesFile.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/favouritesengine/ClientServer/src/FavouritesFile.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -17,13 +17,12 @@
 *
 */
 
-
 // INCLUDE FILES
 
-#include "favouritesfile.h"
+#include <favouritesfile.h>
 #include "FavouritesMsg.h"
 #include "FavouritesPanic.h"
-#include "favouritesdb.h"
+#include <favouritesdb.h>
 #include <f32file.h>
 
 // CLASS DECLARATION
--- a/browserutilities/favouritesengine/ClientServer/src/FavouritesHandle.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/favouritesengine/ClientServer/src/FavouritesHandle.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -15,10 +15,9 @@
 *
 */
 
-
 // INCLUDE FILES
 
-#include "favouriteshandle.h"
+#include <favouriteshandle.h>
 #include "FavouritesMsg.h"
 #include "FavouritesPanic.h"
 #include "FavouritesLogger.h" 
--- a/browserutilities/favouritesengine/ClientServer/src/FavouritesItem.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/favouritesengine/ClientServer/src/FavouritesItem.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -17,10 +17,9 @@
 *
 */
 
-
 // INCLUDE FILES
 
-#include "favouritesitem.h"
+#include <favouritesitem.h>
 #include "FavouritesItemImpl.h"
 #include "FavouritesPanic.h"
 
--- a/browserutilities/favouritesengine/ClientServer/src/FavouritesItemList.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/favouritesengine/ClientServer/src/FavouritesItemList.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -17,12 +17,11 @@
 *
 */
 
-
 // INCLUDE FILES
 
 #include <s32strm.h>
-#include "favouritesitemlist.h"
-#include "favouritesitem.h"
+#include <favouritesitemlist.h>
+#include <favouritesitem.h>
 
 // CONSTANTS
 
--- a/browserutilities/favouritesengine/ClientServer/src/FavouritesSession.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/favouritesengine/ClientServer/src/FavouritesSession.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -17,10 +17,9 @@
 *
 */
 
-
 // INCLUDE FILES
 
-#include "favouritessession.h"
+#include <favouritessession.h>
 #include "FavouritesSrv.h"
 #include "FavouritesVersion.h"
 #include "FavouritesDef.h"
--- a/browserutilities/favouritesengine/ClientServer/src/FavouritesWapAp.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/favouritesengine/ClientServer/src/FavouritesWapAp.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -17,10 +17,9 @@
 *
 */
 
-
 // INCLUDE FILES
 
-#include "favouriteswapap.h"
+#include <favouriteswapap.h>
 #include "FavouritesPanic.h"
 
 // CONSTANTS
--- a/browserutilities/favouritesengine/ClientServer/srvsrc/FavouritesSrv.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/favouritesengine/ClientServer/srvsrc/FavouritesSrv.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -17,10 +17,9 @@
 *
 */
 
-
 // INCLUDE FILES
 
-#include "favouritessession.h"
+#include <favouritessession.h>
 #include "FavouritesSrv.h"
 #include "FavouritesSrvSession.h"
 #include "FavouritesDef.h"
--- a/browserutilities/favouritesengine/ClientServer/srvsrc/FavouritesSrvDb.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/favouritesengine/ClientServer/srvsrc/FavouritesSrvDb.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -17,7 +17,6 @@
 *
 */
 
-
 // INCLUDE FILES
 
 #include <s32std.h>
@@ -29,15 +28,13 @@
 #include "FavouritesItemImpl.h"
 #include "FavouritesItemImplList.h"
 #include "FavouritesPanic.h"
-#include "favouriteslimits.h"
-#include "favouritesitemdata.h"
+#include <favouriteslimits.h>
+#include <favouritesitemdata.h>
 #include "FavouritesFilter.h"
 #include "UidMap.h"
 #include "FavouritesLogger.h" 
 #include "FavouritesFolder.h"
 
-
-
 // CONSTANTS
 
 /// Uid list granularity.
@@ -52,7 +49,6 @@
 // Secure policy ID of the Faveng database files.
 LOCAL_D const TUint KUidFavengDbPolicy = 0x101FD685;
 
-
 // ==================== LOCAL FUNCTIONS ====================
 
 /**
--- a/browserutilities/favouritesengine/ClientServer/srvsrc/FavouritesSrvTable.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/favouritesengine/ClientServer/srvsrc/FavouritesSrvTable.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -17,13 +17,12 @@
 *
 */
 
-
 // INCLUDE FILES
 
 #include <s32strm.h>
 #include "FavouritesSrvTable.h"
 #include "FavouritesPanic.h"
-#include "favouritesitemdata.h"
+#include <favouritesitemdata.h>
 #include "FavouritesFilter.h"
 
 // CONSTANTS
--- a/browserutilities/feedsengine/FeedsServer/Api/src/FeedsEntity.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/feedsengine/FeedsServer/Api/src/FeedsEntity.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -15,16 +15,15 @@
  *
 */
 
-
-#include "feedsentity.h"
-#include "feedsmap.h"
+#include <feedsentity.h>
+#include <feedsmap.h>
 #include "PackedAttributes.h"
-#include "feedattributes.h"
+#include <feedattributes.h>
 #include <folderattributes.h>
 #include "Packed.h"
 #include "PackedFeed.h"
 #include "PackedFolder.h"
-#include "feedsinterface.h"
+#include <feedsinterface.h>
 
 // Constant definitions
 _LIT(KNew, "new");
--- a/browserutilities/feedsengine/FeedsServer/Api/src/FeedsInterface.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/feedsengine/FeedsServer/Api/src/FeedsInterface.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -15,12 +15,11 @@
  *
 */
 
- 
-#include "feedsinterface.h"
-#include "feedsmap.h"
-#include "transaction.h"
-#include "feedattributes.h"
-#include "folderattributes.h"
+#include <feedsinterface.h>
+#include <feedsmap.h>
+#include <transaction.h>
+#include <feedattributes.h>
+#include <folderattributes.h>
 #include "Logger.h"
 #include <e32math.h>
 
--- a/browserutilities/feedsengine/FeedsServer/Api/src/FeedsMap.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/feedsengine/FeedsServer/Api/src/FeedsMap.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -15,8 +15,8 @@
 *
 */
 
+#include <feedsmap.h>
 
-#include "feedsmap.h"
 // -----------------------------------------------------------------------------
 // CFeedsMap::NewL
 //
--- a/browserutilities/feedsengine/FeedsServer/Api/src/Transaction.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/feedsengine/FeedsServer/Api/src/Transaction.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -15,14 +15,13 @@
  *
 */
 
-
-#include "feedsservermsg.h"
-#include "transaction.h"
-#include "feedsentity.h"
-#include "feedsinterface.h"
+#include <feedsservermsg.h>
+#include <transaction.h>
+#include <feedsentity.h>
+#include <feedsinterface.h>
 #include <S32Mem.h>
 #include <es_sock.h>
-#include "feedsmap.h"
+#include <feedsmap.h>
 #include "Packed.h"
 #include "PackedFeed.h"
 #include "PackedFolder.h"
--- a/browserutilities/feedsengine/FeedsServer/Client/inc/FeedRequestHandlers.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/feedsengine/FeedsServer/Client/inc/FeedRequestHandlers.h	Thu Jan 07 13:31:38 2010 +0200
@@ -24,8 +24,7 @@
 
 // INCLUDES
 #include <feedsservermsg.h>
-
-#include "feedsserverrequesthandler.h"
+#include <feedsserverrequesthandler.h>
 
 // CONSTANTS
 
--- a/browserutilities/feedsengine/FeedsServer/Client/inc/FolderItemRequestHandlers.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/feedsengine/FeedsServer/Client/inc/FolderItemRequestHandlers.h	Thu Jan 07 13:31:38 2010 +0200
@@ -15,7 +15,6 @@
 *
 */
 
-
 #ifndef FOLDER_ITEM_REQUEST_HANDLER_H
 #define FOLDER_ITEM_REQUEST_HANDLER_H
 
@@ -25,8 +24,8 @@
 // INCLUDES
 #include <f32file.h>
 #include <feedsservermsg.h>
-#include "feedsentity.h"
-#include "feedsserverrequesthandler.h"
+#include <feedsentity.h>
+#include <feedsserverrequesthandler.h>
 
 // CONSTANTS
 
--- a/browserutilities/feedsengine/FeedsServer/Client/src/Enclosure.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/feedsengine/FeedsServer/Client/src/Enclosure.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -15,9 +15,8 @@
 *
 */
 
-
-#include "feedattributes.h"
-#include "feedsserverfeed.h"
+#include <feedattributes.h>
+#include <feedsserverfeed.h>
 #include "Logger.h"
 
 // -----------------------------------------------------------------------------
--- a/browserutilities/feedsengine/FeedsServer/Client/src/Feed.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/feedsengine/FeedsServer/Client/src/Feed.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -15,13 +15,12 @@
 *
 */
 
-
 //#ifdef _DEBUG
 #include <f32file.h>
 //#endif
 
-#include "feedattributes.h"
-#include "feedsserverfeed.h"
+#include <feedattributes.h>
+#include <feedsserverfeed.h>
 #include "Logger.h"
 
 // -----------------------------------------------------------------------------
--- a/browserutilities/feedsengine/FeedsServer/Client/src/FeedsServerClient.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/feedsengine/FeedsServer/Client/src/FeedsServerClient.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -15,16 +15,14 @@
 *
 */
 
-
-#include "feedsserverclient.h"
-#include "feedsservermsg.h"
-#include "feedsserversettings.h"
+#include <feedsserverclient.h>
+#include <feedsservermsg.h>
+#include <feedsserversettings.h>
 #include "Logger.h"
 #include "ClientRequestHandlers.h"
 #include "FeedRequestHandlers.h"
 #include "FolderItemRequestHandlers.h"
 
-
 // -----------------------------------------------------------------------------
 // RFeedsServer::RFeedsServer
 //
--- a/browserutilities/feedsengine/FeedsServer/Client/src/FeedsServerFeed.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/feedsengine/FeedsServer/Client/src/FeedsServerFeed.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -15,14 +15,11 @@
 *
 */
 
-
-#include "feedsserverclient.h"
-#include "feedsserverfeed.h" 
+#include <feedsserverclient.h>
+#include <feedsserverfeed.h>
 #include "FeedRequestHandlers.h"
 #include "ClientRequestHandlers.h"
 
-
-
 #include "Logger.h"
 
 // -----------------------------------------------------------------------------
--- a/browserutilities/feedsengine/FeedsServer/Client/src/FeedsServerFolderItem.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/feedsengine/FeedsServer/Client/src/FeedsServerFolderItem.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -15,16 +15,14 @@
 *
 */
 
-
-#include "feedsserverclient.h"
-#include "feedsserverfolderitem.h"
+#include <feedsserverclient.h>
+#include <feedsserverfolderitem.h>
 #include "FolderItemRequestHandlers.h"
 #include "FeedRequestHandlers.h"
 #include "ClientRequestHandlers.h"
 
 #include "Logger.h"
 
-
 // -----------------------------------------------------------------------------
 // RFolderItem::RFolderItem
 //
--- a/browserutilities/feedsengine/FeedsServer/Client/src/FolderItem.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/feedsengine/FeedsServer/Client/src/FolderItem.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -16,10 +16,9 @@
 *
 */
 
-
-#include "feedsserverfolderitem.h"
-#include "folderattributes.h"
-#include "feedattributes.h"
+#include <feedsserverfolderitem.h>
+#include <folderattributes.h>
+#include <feedattributes.h>
 #include "PackedFolder.h"
 
 // -----------------------------------------------------------------------------
--- a/browserutilities/feedsengine/FeedsServer/Client/src/Item.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/feedsengine/FeedsServer/Client/src/Item.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -15,9 +15,8 @@
 *
 */
 
-
-#include "feedattributes.h"
-#include "feedsserverfeed.h"
+#include <feedattributes.h>
+#include <feedsserverfeed.h>
 #include "Logger.h"
 
 // Constants
@@ -25,7 +24,6 @@
 _LIT(KRead, "read");
 _LIT(KUnread, "unread");
 
-
 // -----------------------------------------------------------------------------
 // CItem::NewL
 //
--- a/browserutilities/feedsengine/FeedsServer/Client/src/RequestHandler.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/feedsengine/FeedsServer/Client/src/RequestHandler.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -15,8 +15,7 @@
 *
 */
 
-
-#include "feedsserverrequesthandler.h"
+#include <feedsserverrequesthandler.h>
 
 // -----------------------------------------------------------------------------
 // CRequestHandler::CRequestHandler
--- a/browserutilities/feedsengine/FeedsServer/Common/inc/PackedFeed.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/feedsengine/FeedsServer/Common/inc/PackedFeed.h	Thu Jan 07 13:31:38 2010 +0200
@@ -24,7 +24,7 @@
 // INCLUDES
 #include <e32base.h>
 
-#include "leaktracker.h"
+#include <leaktracker.h>
 #include "Packed.h"
 
 // CONSTANTS
--- a/browserutilities/feedsengine/FeedsServer/Common/inc/PackedFolder.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/feedsengine/FeedsServer/Common/inc/PackedFolder.h	Thu Jan 07 13:31:38 2010 +0200
@@ -24,7 +24,7 @@
 // INCLUDES
 #include <e32base.h>
 
-#include "leaktracker.h"
+#include <leaktracker.h>
 #include "Packed.h"
 
 // CONSTANTS
--- a/browserutilities/feedsengine/FeedsServer/Common/src/LeakTracker.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/feedsengine/FeedsServer/Common/src/LeakTracker.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -15,9 +15,7 @@
 *
 */
 
-
-
-#include "leaktracker.h"
+#include <leaktracker.h>
 #include "Logger.h"
 
 // Globals
--- a/browserutilities/feedsengine/FeedsServer/Common/src/PackedFeed.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/feedsengine/FeedsServer/Common/src/PackedFeed.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -16,13 +16,11 @@
 *
 */
 
-
 #include "PackedAttributes.h"
-#include "feedattributes.h"
+#include <feedattributes.h>
 #include "PackedFeed.h"
 #include "Logger.h"
 
-
 const TInt KTokenArrayIncrementSize = 1000;
 const TInt KStringTableIncrementSize = 10240;
 
--- a/browserutilities/feedsengine/FeedsServer/Common/src/PackedFolder.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/feedsengine/FeedsServer/Common/src/PackedFolder.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -17,16 +17,14 @@
 */
 
 #include "PackedAttributes.h"
-#include "feedattributes.h"
-#include "folderattributes.h"
+#include <feedattributes.h>
+#include <folderattributes.h>
 #include "PackedFolder.h"
 #include "Logger.h"
 
-
 const TInt KTokenArrayIncrementSize = 100;
 const TInt KStringTableIncrementSize = 1024;
 
-
 // -----------------------------------------------------------------------------
 // CPackedFolder::NewL
 //
--- a/browserutilities/feedsengine/FeedsServer/FeedHandler/inc/FeedHandler.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/feedsengine/FeedsServer/FeedHandler/inc/FeedHandler.h	Thu Jan 07 13:31:38 2010 +0200
@@ -16,16 +16,14 @@
 *
 */
 
-
 #ifndef FEED_HANDLER_H
 #define FEED_HANDLER_H
 
-
 // INCLUDES
 #include <e32base.h>
 
 #include "FeedParser.h"
-#include "leaktracker.h"
+#include <leaktracker.h>
 
 // CONSTANTS
 
--- a/browserutilities/feedsengine/FeedsServer/FeedHandler/src/AtomFeedParser.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/feedsengine/FeedsServer/FeedHandler/src/AtomFeedParser.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -15,13 +15,11 @@
 *
 */
 
-
-#include "feedattributes.h"
+#include <feedattributes.h>
 #include "FeedParserObserver.h"
-#include "leaktracker.h"
+#include <leaktracker.h>
 #include "AtomFeedParser.h"
-#include "XmlUtils.h"
-
+#include <xmlutils.h>
 
 // Element and attribute names used by this parser.
 _LIT8(KHead, "feed");
--- a/browserutilities/feedsengine/FeedsServer/FeedHandler/src/FeedHandler.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/feedsengine/FeedsServer/FeedHandler/src/FeedHandler.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -16,14 +16,12 @@
 *
 */
 
-
 #include "CleanupLibXml2.h"
 #include "FeedHandler.h"
-#include "leaktracker.h"
+#include <leaktracker.h>
 #include "RssFeedParser.h"
 #include "AtomFeedParser.h"
-#include "XmlUtils.h"
-
+#include <xmlutils.h>
 
 // -----------------------------------------------------------------------------
 // CFeedHandler::NewL
--- a/browserutilities/feedsengine/FeedsServer/FeedHandler/src/FeedParser.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/feedsengine/FeedsServer/FeedHandler/src/FeedParser.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -15,14 +15,12 @@
 *
 */
 
-
 #include <TInternetDate.h>
 
 #include "FeedParser.h"
 #include "FeedParserObserver.h"
-#include "leaktracker.h"
-#include "XmlUtils.h"
-
+#include <leaktracker.h>
+#include <xmlutils.h>
 
 _LIT8(KUrlStr, "url");
 
--- a/browserutilities/feedsengine/FeedsServer/FeedHandler/src/RssFeedParser.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/feedsengine/FeedsServer/FeedHandler/src/RssFeedParser.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -15,13 +15,11 @@
 *
 */
 
-
-#include "feedattributes.h"
+#include <feedattributes.h>
 #include "FeedParserObserver.h"
-#include "leaktracker.h"
+#include <leaktracker.h>
 #include "RssFeedParser.h"
-#include "XmlUtils.h"
-
+#include <xmlutils.h>
 
 // Element and attribute names used by this parser.
 _LIT8(KRssHead, "rss");
--- a/browserutilities/feedsengine/FeedsServer/FolderHandler/inc/OpmlParser.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/feedsengine/FeedsServer/FolderHandler/inc/OpmlParser.h	Thu Jan 07 13:31:38 2010 +0200
@@ -15,16 +15,14 @@
 *
 */
 
-
 #ifndef OPML_PARSER_H
 #define OPML_PARSER_H
 
-
 // INCLUDES
 #include <e32base.h>
 #include <xmlengdom.h>
 
-#include "leaktracker.h"
+#include <leaktracker.h>
 
 // CONSTANTS
 
--- a/browserutilities/feedsengine/FeedsServer/FolderHandler/inc/OpmlWriter.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/feedsengine/FeedsServer/FolderHandler/inc/OpmlWriter.h	Thu Jan 07 13:31:38 2010 +0200
@@ -15,11 +15,9 @@
 *
 */
 
-
 #ifndef OPML_WRITER_H
 #define OPML_WRITER_H
 
-
 // INCLUDES
 #include <e32base.h>
 #include <f32file.h>
@@ -29,9 +27,7 @@
 
 #include "FeedsDatabase.h"
 #include "CleanupLibXml2.h"
-#include "XmlUtils.h"
-
-
+#include <xmlutils.h>
 
 // CONSTANTS
 
@@ -45,7 +41,6 @@
 
 // CLASS DECLARATION
 
-
 /**
 *  Translates CFolderItems back to opml.
 *
--- a/browserutilities/feedsengine/FeedsServer/FolderHandler/src/OpmlParser.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/feedsengine/FeedsServer/FolderHandler/src/OpmlParser.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -15,13 +15,11 @@
 *
 */
 
-
 #include "OpmlParser.h"
 #include "CleanupLibXml2.h"
-#include "leaktracker.h"
+#include <leaktracker.h>
 #include "PackedFolder.h"
-#include "XmlUtils.h"
-
+#include <xmlutils.h>
 
 // Element and attribute names used by this parser.
 _LIT8(KBody, "body");
--- a/browserutilities/feedsengine/FeedsServer/Reconizer/data/102072EE.rss	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/feedsengine/FeedsServer/Reconizer/data/102072EE.rss	Thu Jan 07 13:31:38 2010 +0200
@@ -16,7 +16,7 @@
 */
 
 
-#include <RegistryInfo.rh>
+#include <ecom/registryinfo.rh>
 
 
 RESOURCE REGISTRY_INFO r_registry
--- a/browserutilities/feedsengine/FeedsServer/Reconizer/src/FeedsRec.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/feedsengine/FeedsServer/Reconizer/src/FeedsRec.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -15,11 +15,9 @@
 *
 */
 
-
 #include "FeedsRec.h"
 
-#include <ImplementationProxy.h>
-
+#include <ecom/implementationproxy.h>
 
 // Constants
 _LIT8(KMimeTypeRss,   "application/rss+xml");
@@ -27,7 +25,6 @@
 _LIT8(KMimeTypeXml1,  "application/xml");
 _LIT8(KMimeTypeXml2,  "text/xml");
 
-
 // -----------------------------------------------------------------------------
 // CFeedsRec::CFeedsRec
 //
@@ -52,7 +49,6 @@
 	return 0x100;
 	}
 
-
 // -----------------------------------------------------------------------------
 // CFeedsRec::SupportedDataTypeL
 //
@@ -73,7 +69,6 @@
         }
 	}
 
-
 // -----------------------------------------------------------------------------
 // CFeedsRec::DoRecognizeL
 //
@@ -101,7 +96,6 @@
     // TODO: in 3.1
     }
 
-
 // -----------------------------------------------------------------------------
 // CFeedsRec::DoRecognizeRss
 //
@@ -170,14 +164,12 @@
     return confidence;
     }
 
-
 // Constants
 const TImplementationProxy ImplementationTable[] = 
 	{
     IMPLEMENTATION_PROXY_ENTRY(KFeedsRecImplUIDValue, CFeedsRec::CreateRecognizerL)
 	};
 
-
 // -----------------------------------------------------------------------------
 // ImplementationGroupProxy
 //
@@ -191,7 +183,6 @@
     return ImplementationTable; 
     }
 
-
 // -----------------------------------------------------------------------------
 // CFeedsRec::CreateRecognizerL
 //
--- a/browserutilities/feedsengine/FeedsServer/Server/inc/FeedsDatabase.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/feedsengine/FeedsServer/Server/inc/FeedsDatabase.h	Thu Jan 07 13:31:38 2010 +0200
@@ -15,7 +15,6 @@
 *
 */
 
-
 #ifndef FEEDS_DATABASE_H
 #define FEEDS_DATABASE_H
 
@@ -24,7 +23,7 @@
 #include <e32base.h>
 #include <f32file.h>
 
-#include "leaktracker.h"
+#include <leaktracker.h>
 
 // CONSTANTS
 const TInt KUnassignedId = -1;
@@ -42,7 +41,6 @@
 
 // CLASS DECLARATION
 
-
 /**
 *  The feeds server database.
 *
--- a/browserutilities/feedsengine/FeedsServer/Server/inc/FeedsServer.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/feedsengine/FeedsServer/Server/inc/FeedsServer.h	Thu Jan 07 13:31:38 2010 +0200
@@ -15,15 +15,13 @@
 *
 */
 
-
 #ifndef FEEDS_SERVER_H
 #define FEEDS_SERVER_H
 
-
 //  INCLUDES
 #include <e32base.h>
 
-#include "leaktracker.h"
+#include <leaktracker.h>
 #include "UpdateAllFeedsTask.h"
 #include "etel3rdparty.h"
 
--- a/browserutilities/feedsengine/FeedsServer/Server/inc/FeedsServerSession.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/feedsengine/FeedsServer/Server/inc/FeedsServerSession.h	Thu Jan 07 13:31:38 2010 +0200
@@ -15,14 +15,13 @@
 *
 */
 
-
 #ifndef FEEDS_SERVER_SESSION_H
 #define FEEDS_SERVER_SESSION_H
 
 // INCLUDES
 #include <e32base.h>
 
-#include "leaktracker.h"
+#include <leaktracker.h>
 #include "UpdateFeedTask.h"
 #include "UpdateAllFeedsTask.h"
 #include "ImportFeedsTask.h"
--- a/browserutilities/feedsengine/FeedsServer/Server/inc/ImportFeedsTask.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/feedsengine/FeedsServer/Server/inc/ImportFeedsTask.h	Thu Jan 07 13:31:38 2010 +0200
@@ -15,11 +15,9 @@
 *
 */
 
-
 #ifndef IMPORT_FEEDS_TASK_H
 #define IMPORT_FEEDS_TASK_H
 
-
 // INCLUDES
 #include <e32base.h>
 #include <f32file.h>
@@ -28,7 +26,7 @@
 #include "PackedFolder.h"
 #include "PackedAttributes.h"
 #include "FeedsDatabase.h"
-#include "folderattributes.h"
+#include <folderattributes.h>
 
 // CONSTANTS
 
@@ -44,7 +42,6 @@
 
 // CLASS DECLARATION
 
-
 /**
 *  The ImportFeedsTask's observer.
 *
--- a/browserutilities/feedsengine/FeedsServer/Server/inc/UpdateAllFeedsTask.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/feedsengine/FeedsServer/Server/inc/UpdateAllFeedsTask.h	Thu Jan 07 13:31:38 2010 +0200
@@ -15,18 +15,16 @@
 *
 */
 
-
 #ifndef UPDATE_ALL_FEEDS_TASK_H
 #define UPDATE_ALL_FEEDS_TASK_H
 
-
 // INCLUDES
 #include <e32base.h>
 
-#include "leaktracker.h"
+#include <leaktracker.h>
 #include "UpdateFeedTask.h"
 #include "Task.h"
-#include "f32file.h"
+#include <f32file.h>
 
 // CONSTANTS
 
@@ -43,7 +41,6 @@
 
 // CLASS DECLARATION
 
-
 /**
 *  The UpdateAllFeedsTask's observer.
 *
--- a/browserutilities/feedsengine/FeedsServer/Server/inc/UpdateFeedTask.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/feedsengine/FeedsServer/Server/inc/UpdateFeedTask.h	Thu Jan 07 13:31:38 2010 +0200
@@ -15,16 +15,14 @@
 *
 */
 
-
 #ifndef UPDATE_FEED_TASK_H
 #define UPDATE_FEED_TASK_H
 
-
 // INCLUDES
 #include <e32base.h>
 
 #include "FeedParserObserver.h"
-#include "leaktracker.h"
+#include <leaktracker.h>
 #include "LoadObserver.h"
 #include "Task.h"
 
--- a/browserutilities/feedsengine/FeedsServer/Server/src/FeedsDatabase.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/feedsengine/FeedsServer/Server/src/FeedsDatabase.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -15,15 +15,14 @@
 *
 */
 
-
 #include <badesca.h>
 #include <e32math.h>
 
-#include "feedattributes.h"
+#include <feedattributes.h>
 #include "FeedsDatabase.h"
-#include "folderattributes.h"
+#include <folderattributes.h>
 #include "PackedAttributes.h"
-#include "leaktracker.h"
+#include <leaktracker.h>
 #include "Logger.h"
 #include "PackedFeed.h"
 #include "PackedFolder.h"
--- a/browserutilities/feedsengine/FeedsServer/Server/src/FeedsServer.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/feedsengine/FeedsServer/Server/src/FeedsServer.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -15,18 +15,17 @@
 *
 */
 
-
 #include "FeedsDatabase.h"
 #include "FeedHandler.h"
 #include "FeedsServer.h"
-#include "feedsservermsg.h"
+#include <feedsservermsg.h>
 #include "FeedsServerSession.h"
 #include "OpmlParser.h"
 #include "OpmlWriter.h"
 #include "PackedFolder.h"
 #include "ServerHttpConnection.h"
 #include "Logger.h"
-#include "XmlUtils.h"
+#include <xmlutils.h>
 #include "BackRestoreHandler.h"
 #include "UpdateManager.h" 
 
@@ -38,7 +37,6 @@
 
 _LIT(KDefaultOPMLFileParam, "");
 
-
 // -----------------------------------------------------------------------------
 // CFeedsServer::NewL
 //
--- a/browserutilities/feedsengine/FeedsServer/Server/src/FeedsServerMain.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/feedsengine/FeedsServer/Server/src/FeedsServerMain.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -15,11 +15,10 @@
 *
 */
 
-
 #include <e32std.h>
 
 #include "FeedsServer.h"
-#include "leaktracker.h"
+#include <leaktracker.h>
 
 // -----------------------------------------------------------------------------
 // E32Main
--- a/browserutilities/feedsengine/FeedsServer/Server/src/FeedsServerSession.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/feedsengine/FeedsServer/Server/src/FeedsServerSession.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -21,7 +21,7 @@
 
 #include "FeedsDatabase.h"
 #include "FeedsServer.h"
-#include "feedsservermsg.h"
+#include <feedsservermsg.h>
 #include "FeedsServerSession.h"
 #include "SessionHttpConnection.h"
 #include "Logger.h"
--- a/browserutilities/feedsengine/FeedsServer/Server/src/ImportFeedsTask.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/feedsengine/FeedsServer/Server/src/ImportFeedsTask.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -15,13 +15,12 @@
 *
 */
 
-
 #include <S32Mem.h>
 
 #include "ImportFeedsTask.h"
 #include "FeedsDatabase.h"
 #include "FeedsServer.h"
-#include "feedsservermsg.h"
+#include <feedsservermsg.h>
 
 // Root folder related.
 const TInt  KRootFolderId = 0;
--- a/browserutilities/feedsengine/FeedsServer/Server/src/UpdateAllFeedsTask.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/feedsengine/FeedsServer/Server/src/UpdateAllFeedsTask.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -15,18 +15,16 @@
 *
 */
 
-
-#include "folderattributes.h"
+#include <folderattributes.h>
 #include "FeedsDatabase.h"
 #include "FeedsServer.h"
-#include "leaktracker.h"
+#include <leaktracker.h>
 #include "Logger.h"
 #include "PackedFeed.h"
 #include "PackedFolder.h"
 #include "UpdateAllFeedsTask.h"
 #include <SysUtil.h>
 
-
 // -----------------------------------------------------------------------------
 // CUpdateAllFeedsTask::NewL
 //
--- a/browserutilities/feedsengine/FeedsServer/Server/src/UpdateFeedTask.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/feedsengine/FeedsServer/Server/src/UpdateFeedTask.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -15,17 +15,15 @@
 *
 */
 
-
-#include "feedattributes.h"
+#include <feedattributes.h>
 #include "FeedHandler.h"
 #include "FeedsServer.h"
-#include "leaktracker.h"
+#include <leaktracker.h>
 #include "Logger.h"
 #include "PackedFeed.h"
 #include "UpdateFeedTask.h"
 #include "UrlHandlerFactory.h"
 
-
 // -----------------------------------------------------------------------------
 // CUpdateFeedTask::NewL
 //
--- a/browserutilities/feedsengine/FeedsServer/UrlHandler/inc/FileHandler.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/feedsengine/FeedsServer/UrlHandler/inc/FileHandler.h	Thu Jan 07 13:31:38 2010 +0200
@@ -15,15 +15,13 @@
 *
 */
 
-
 #ifndef FILE_HANDLER_H
 #define FILE_HANDLER_H
 
-
 // INCLUDES
 #include <e32base.h>
 
-#include "leaktracker.h"
+#include <leaktracker.h>
 #include "UrlHandler.h"
 
 // CONSTANTS
--- a/browserutilities/feedsengine/FeedsServer/UrlHandler/inc/HttpConnection.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/feedsengine/FeedsServer/UrlHandler/inc/HttpConnection.h	Thu Jan 07 13:31:38 2010 +0200
@@ -15,17 +15,15 @@
 *
 */
 
-
 #ifndef HTTP_CONNECTION_H
 #define HTTP_CONNECTION_H
 
-
 // INCLUDES
 #include <e32base.h>
 #include <http/RHTTPSession.h>
 #include <mconnectioncallback.h>
 
-#include "leaktracker.h"
+#include <leaktracker.h>
 
 // CONSTANTS
 
--- a/browserutilities/feedsengine/FeedsServer/UrlHandler/inc/HttpHandler.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/feedsengine/FeedsServer/UrlHandler/inc/HttpHandler.h	Thu Jan 07 13:31:38 2010 +0200
@@ -15,11 +15,9 @@
 *
 */
 
-
 #ifndef HTTP_HANDLER_H
 #define HTTP_HANDLER_H
 
-
 // INCLUDES
 #include <e32base.h>
 #include <http/mhttptransactioncallback.h>
@@ -27,7 +25,7 @@
 #include <http/rhttptransaction.h>
 
 #include "HttpConnection.h"
-#include "leaktracker.h"
+#include <leaktracker.h>
 #include "UrlHandler.h"
 
 // CONSTANTS
@@ -45,7 +43,6 @@
 
 // CLASS DECLARATION
 
-
 /**
 *  A class that fetches resources via HTTP 1.1.
 *
--- a/browserutilities/feedsengine/FeedsServer/UrlHandler/src/FileHandler.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/feedsengine/FeedsServer/UrlHandler/src/FileHandler.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -15,16 +15,14 @@
 *
 */
 
-
 #include <e32base.h>
 #include <e32std.h>
 #include <f32file.h>
 
 #include "FileHandler.h"
-#include "leaktracker.h"
+#include <leaktracker.h>
 #include "Logger.h"
 
-
 // -----------------------------------------------------------------------------
 // CFileHandler::NewL
 //
--- a/browserutilities/feedsengine/FeedsServer/UrlHandler/src/HttpConnection.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/feedsengine/FeedsServer/UrlHandler/src/HttpConnection.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -15,7 +15,6 @@
 *
 */
 
-
 #include <http.h>
 #include <httpfiltercommonstringsext.h>
 #include <httpfilterconnhandlerinterface.h>
@@ -23,10 +22,9 @@
 #include <httpfiltercommonstringsaddition.h>
 
 #include "HttpConnection.h"
-#include "leaktracker.h"
+#include <leaktracker.h>
 #include "Logger.h"
 
-
 // -----------------------------------------------------------------------------
 // CHttpConnection::CHttpConnection
 // C++ default constructor can NOT contain any code, that
@@ -37,7 +35,6 @@
     {
     }
         
-
 // -----------------------------------------------------------------------------
 // CHttpConnection::BaseConstructL
 // Symbian 2nd phase constructor can leave.
--- a/browserutilities/feedsengine/FeedsServer/UrlHandler/src/HttpHandler.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/feedsengine/FeedsServer/UrlHandler/src/HttpHandler.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -15,7 +15,6 @@
 *
 */
 
-
 #include <EscapeUtils.h>
 #include <http.h>
 #include <http/mhttpdatasupplier.h>
@@ -23,10 +22,10 @@
 
 #include "HttpConnection.h"
 #include "HttpHandler.h"
-#include "leaktracker.h"
+#include <leaktracker.h>
 #include "Logger.h"
 
-#include "cuseragent.h"
+#include <cuseragent.h>
 
 // -----------------------------------------------------------------------------
 // CHttpHandler::NewL
--- a/browserutilities/feedsengine/FeedsServer/XmlUtils/src/XmlEncoding.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/feedsengine/FeedsServer/XmlUtils/src/XmlEncoding.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -15,11 +15,9 @@
 *
 */
 
-
 #include <charconv.h>
 
-#include "xmlencoding.h"
-
+#include <xmlencoding.h>
 
 // -----------------------------------------------------------------------------
 // CXmlEncoding::NewL
--- a/browserutilities/feedsengine/FeedsServer/XmlUtils/src/XmlEntity.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/feedsengine/FeedsServer/XmlUtils/src/XmlEntity.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -15,17 +15,14 @@
 *
 */
 
-
-
 #include <EscapeUtils.h>
 #include <libxml2_xmlmemory.h>
 #include <libxml2_globals.h>
 
 #include "CleanupLibXml2.h"
-#include "leaktracker.h"
+#include <leaktracker.h>
 #include "XmlEntity.h"
 
-
 // Private consts.
 // -------------------------------------------------------------------------
 // Note:		This array must be sorted by entity name.  The lookup function
--- a/browserutilities/feedsengine/FeedsServer/XmlUtils/src/XmlUtils.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/feedsengine/FeedsServer/XmlUtils/src/XmlUtils.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -15,18 +15,16 @@
 *
 */
 
-
-
 #include <charconv.h>
 #include <EscapeUtils.h>
 #include <utf.h>
 
 #include "CleanupLibXml2.h"  
-#include "leaktracker.h"
+#include <leaktracker.h>
 #include "Logger.h"
-#include "xmlencoding.h"
+#include <xmlencoding.h>
 #include "XmlEntity.h"
-#include "XmlUtils.h"
+#include <xmlutils.h>
 
 // Local data-types
 struct ErrorContext
@@ -38,7 +36,6 @@
 // Static variables
 static CXmlEntity*  sXmlEntity = NULL;
 
-
 // -----------------------------------------------------------------------------
 // EntityResolverL
 //
--- a/browserutilities/feedsengine/FeedsUI/FeedsApp/src/FeedsAppUI.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/feedsengine/FeedsUI/FeedsApp/src/FeedsAppUI.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -19,12 +19,11 @@
 
 #include "FeedsApp.hrh"
 #include "FeedsAppUi.h"
-#include "leaktracker.h"
+#include <leaktracker.h>
 #include "TestHarnessView.h"
 
 #include "Logger.h"
 
-
 // -----------------------------------------------------------------------------
 // CFeedsAppUi::ConstructL()
 //
--- a/browserutilities/feedsengine/FeedsUI/FeedsApp/src/FeedsApplication.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/feedsengine/FeedsUI/FeedsApp/src/FeedsApplication.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -15,12 +15,10 @@
 *
 */
 
-
 #include "FeedsApplication.h"
 #include "FeedsDocument.h"
 #include "FeedsViews.h"
-#include "leaktracker.h"
-
+#include <leaktracker.h>
 
 // -----------------------------------------------------------------------------
 // CFeedsApplication::~CFeedsApplication
--- a/browserutilities/feedsengine/FeedsUI/FeedsApp/src/FeedsDocument.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/feedsengine/FeedsUI/FeedsApp/src/FeedsDocument.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -15,7 +15,6 @@
 *
 */
 
-
 #include <AiwGenericParam.h>
 #include <StringLoader.h>
 
@@ -23,10 +22,9 @@
 
 #include "FeedsAppUi.h"
 #include "FeedsDocument.h"
-#include "leaktracker.h"
+#include <leaktracker.h>
 #include "Logger.h"
 
-
 // -----------------------------------------------------------------------------
 // CFeedsDocument::CFeedsDocument()
 //
--- a/browserutilities/feedsengine/FeedsUI/TestHarness/inc/TestHarness.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/feedsengine/FeedsUI/TestHarness/inc/TestHarness.h	Thu Jan 07 13:31:38 2010 +0200
@@ -15,11 +15,9 @@
 *
 */
 
-
 #ifndef TEST_HARNESS_H
 #define TEST_HARNESS_H
 
-
 // INCLUDES
 #include <e32base.h>
 #include <e32std.h>
--- a/browserutilities/feedsengine/FeedsUI/TestHarness/src/TestHarness.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/feedsengine/FeedsUI/TestHarness/src/TestHarness.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -15,8 +15,7 @@
 *
 */
 
-
-#include "leaktracker.h"
+#include <leaktracker.h>
 #include "Logger.h"
 #include "StatusPane.h"
 #include "TestHarness.h"
--- a/browserutilities/feedsengine/FeedsUI/TestHarness/src/TestHarnessContainer.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/feedsengine/FeedsUI/TestHarness/src/TestHarnessContainer.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -15,11 +15,9 @@
 *
 */
 
-
 #include "TestHarnessContainer.h"
 #include "TestHarnessView.h"
-#include "leaktracker.h"
-
+#include <leaktracker.h>
 
 // -----------------------------------------------------------------------------
 // CFeedContainer::NewL
--- a/browserutilities/feedsengine/FeedsUI/TestHarness/src/TestHarnessView.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/feedsengine/FeedsUI/TestHarness/src/TestHarnessView.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -15,7 +15,6 @@
 *
 */
 
-
 #include <aknviewappui.h>
 #include <avkon.hrh>
 #include <avkon.rsg>
@@ -25,12 +24,11 @@
 #include "FeedsApp.hrh"
 
 #include "FeedsAppUi.h"
-#include "leaktracker.h"
+#include <leaktracker.h>
 #include "TestHarness.h"
 #include "TestHarnessView.h"
 #include "TestHarnessContainer.h"
 
-
 // -----------------------------------------------------------------------------
 // CTestHarnessView::NewL
 //
--- a/browserutilities/feedsengine/group/FeedsApp.mmp	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/feedsengine/group/FeedsApp.mmp	Thu Jan 07 13:31:38 2010 +0200
@@ -15,13 +15,11 @@
 *
 */
 
-
 #include <bldvariant.hrh>
 #include <data_caging_paths.hrh>
 #include <platform_paths.hrh>
 #include <platform/mw/browser_platform_variant.hrh>
 
-
 TARGET          FeedsApp.exe
 TARGETTYPE      exe
 
@@ -58,17 +56,14 @@
 SOURCE            TestHarnessContainer.cpp
 SOURCE            TestHarnessView.cpp
 
-
 // Client UI Util sources
 SOURCEPATH        ../FeedsUI/Common/src
 SOURCE            StatusPane.cpp
 
-
 // Utils sources
 SOURCEPATH        ../FeedsServer/Common/src
 SOURCE            LeakTracker.cpp
 
-
 // Include paths
 USERINCLUDE       ../FeedsServer/Common/inc
 USERINCLUDE       ../FeedsUI/TestHarness/inc
@@ -78,7 +73,6 @@
 
 MW_LAYER_SYSTEMINCLUDE
 
-
 // Libraries
 DEBUGLIBRARY             flogger.lib
 
@@ -96,7 +90,6 @@
 LIBRARY             FeedsServerClient.lib
 LIBRARY             connectionmanager.lib
 
-
 SOURCEPATH          ../
 
 START RESOURCE      data/FeedsApp_reg.rss
--- a/browserutilities/feedsengine/group/FeedsServer.mmp	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/feedsengine/group/FeedsServer.mmp	Thu Jan 07 13:31:38 2010 +0200
@@ -15,13 +15,11 @@
 *
 */
 
-
 #include <bldvariant.hrh>
 #include <data_caging_paths.hrh>
 #include <platform_paths.hrh>
 #include <platform/mw/browser_platform_variant.hrh>
 
-
 TARGET          FeedsServer.exe
 TARGETTYPE      exe
 EPOCSTACKSIZE   0x5000
@@ -42,7 +40,6 @@
 TARGETPATH      /System/Programs
 #endif
 
-
 // FeedsServer/Server sources
 SOURCEPATH        ../FeedsServer/Server/src
 SOURCE            FeedsDatabase.cpp
@@ -57,7 +54,6 @@
 SOURCE            UpdateManager.cpp  
 SOURCE            UpdateQueue.cpp        
 
-
 // FeedsServer/FeedHandler sources
 SOURCEPATH        ../FeedsServer/FeedHandler/src
 SOURCE            AtomFeedParser.cpp
@@ -84,7 +80,6 @@
 SOURCE            XmlEntity.cpp
 SOURCE            XmlUtils.cpp
 
-
 // Utils sources
 SOURCEPATH        ../FeedsServer/Common/src
 SOURCE            LeakTracker.cpp
@@ -101,36 +96,36 @@
 USERINCLUDE       ../FeedsServer/XmlUtils/inc
 USERINCLUDE       ../../inc
 
-
 MW_LAYER_SYSTEMINCLUDE
-MW_LAYER_LIBC_SYSTEMINCLUDE
+OS_LAYER_ESTLIB_SYSTEMINCLUDE
 
 // Libraries
-LIBRARY             euser.lib
+LIBRARY       euser.lib
 #ifdef _DEBUG
 	LIBRARY    flogger.lib
 #else
 	DEBUGLIBRARY    flogger.lib
 #endif
-LIBRARY             bafl.lib
-LIBRARY             InetProtUtil.lib
-LIBRARY             http.lib
-LIBRARY             efsrv.lib
-LIBRARY             XmlEngine.lib
-LIBRARY             XmlEngineDOM.lib
-LIBRARY             XmlEngineUtils.Lib
-LIBRARY             estlib.lib
-LIBRARY             HttpFilterCommon.lib
-LIBRARY             connectionmanager.lib
-LIBRARY             ecom.lib
-LIBRARY             commdb.lib
-LIBRARY             charconv.lib
-LIBRARY             edbms.lib
-LIBRARY             estor.lib
-LIBRARY             centralrepository.lib
+LIBRARY       bafl.lib
+LIBRARY       InetProtUtil.lib
+LIBRARY       http.lib
+LIBRARY       efsrv.lib
+LIBRARY       XmlEngine.lib
+LIBRARY       XmlEngineDOM.lib
+LIBRARY       XmlEngineUtils.Lib
+LIBRARY       estlib.lib
+LIBRARY       HttpFilterCommon.lib
+LIBRARY       connectionmanager.lib
+LIBRARY       ecom.lib
+LIBRARY       commdb.lib
+LIBRARY       charconv.lib
+LIBRARY       edbms.lib
+LIBRARY       estor.lib
+LIBRARY       centralrepository.lib
 LIBRARY				apengine.lib
-LIBRARY			    ESock.lib
+LIBRARY			  ESock.lib
 LIBRARY				Avkon.lib
 LIBRARY				etel3rdparty.lib 
 LIBRARY				webutils.lib
-LIBRARY             sysutil.lib
+LIBRARY       sysutil.lib
+
--- a/browserutilities/feedsengine/group/FeedsServerClient.mmp	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/feedsengine/group/FeedsServerClient.mmp	Thu Jan 07 13:31:38 2010 +0200
@@ -15,7 +15,6 @@
 *
 */
 
-
 #include <data_caging_paths.hrh>
 #include <platform_paths.hrh>
 #include <platform/mw/browser_platform_variant.hrh>
@@ -40,20 +39,16 @@
 SOURCEPATH        ../FeedsServer/Client/src
 SOURCE            FeedsServerClient.cpp
 SOURCE            ClientRequestHandlers.cpp
-
 SOURCE            FeedsServerFeed.cpp
 SOURCE            FeedRequestHandlers.cpp
 SOURCE            Feed.cpp
-
 SOURCE            FeedsServerFolderItem.cpp
 SOURCE            FolderItemRequestHandlers.cpp
 SOURCE            FolderItem.cpp
 SOURCE            Item.cpp
 SOURCE            Enclosure.cpp
-
 SOURCE            RequestHandler.cpp
 
-
 // Utils sources
 SOURCEPATH        ../FeedsServer/Common/src
 SOURCE            LeakTracker.cpp
@@ -61,14 +56,12 @@
 SOURCE            PackedFolder.cpp
 SOURCE            PackedFeed.cpp
 
-
 USERINCLUDE       ../FeedsServer/Client/inc
 USERINCLUDE       ../FeedsServer/Common/inc
 USERINCLUDE       ../../inc
 
 MW_LAYER_SYSTEMINCLUDE
 
-
 // Libraries
 LIBRARY           euser.lib
 #if defined( _DEBUG )
--- a/browserutilities/multipartparser/group/MultipartParser.mmp	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/multipartparser/group/MultipartParser.mmp	Thu Jan 07 13:31:38 2010 +0200
@@ -15,7 +15,6 @@
 *
 */
 
-
 #include <platform_paths.hrh>
 #include <platform/mw/browser_platform_variant.hrh>
 
@@ -37,11 +36,10 @@
 deffile Bmarm/MULTIPARTPARSER.DEF
 #endif
 
-
 USERINCLUDE     ../inc
 
 MW_LAYER_SYSTEMINCLUDE
-MW_LAYER_LIBC_SYSTEMINCLUDE
+OS_LAYER_ESTLIB_SYSTEMINCLUDE
 
 SOURCEPATH      ../src
 
@@ -55,12 +53,3 @@
 LIBRARY  estor.lib
 LIBRARY	 ezlib.lib
 LIBRARY	 imut.lib
-
-
-
-
-
-  
- 
-
-
--- a/browserutilities/multipartparser/src/BodyPart.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/multipartparser/src/BodyPart.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -15,9 +15,8 @@
 *
 */
 
-
 // INCLUDE FILES
-#include "bodypart.h"
+#include <bodypart.h>
 
 // CONSTANTS
 
--- a/browserutilities/multipartparser/src/MultipartParser.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/multipartparser/src/MultipartParser.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -15,7 +15,6 @@
 *
 */
 
-
 // INCLUDE FILES
 #include <e32def.h>           // First to avoid NULL redefine warning (no #ifndef NULL).
 #include <e32std.h>
@@ -26,11 +25,10 @@
 #include <Uri16.h>
 #include <UriCommon.h>
 
-#include "multipartparser.h"
+#include <multipartparser.h>
 #include "GZipBufMgr.h"
 #include "tinternetdate.h"
 
-
 // CONSTANTS
 const char Multipart_Mixed[] = {"multipart/mixed"};
 const char Multipart_Related[] = {"multipart/related"};
--- a/browserutilities/recenturlstore/RecentUrlSrc/RecentUrlStore.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/recenturlstore/RecentUrlSrc/RecentUrlStore.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -17,10 +17,8 @@
 *
 */
 
-
-
 // INCLUDE FILES
-#include "recenturlstore.h"
+#include <recenturlstore.h>
 
 // EXTERNAL DATA STRUCTURES
 
--- a/browserutilities/schemehandler/SchemeApp/data/SchemeApp.rss	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/schemehandler/SchemeApp/data/SchemeApp.rss	Thu Jan 07 13:31:38 2010 +0200
@@ -29,7 +29,7 @@
 #include <avkon.rh>
 #include <avkon.mbg>
 #include <data_caging_paths_strings.hrh>
-#include <SchemeApp.loc>
+#include <schemeapp.loc>
 
 // RESOURCE DEFINITIONS 
 
--- a/browserutilities/schemehandler/SchemeApp/data/SchemeApp_Caption.rss	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/schemehandler/SchemeApp/data/SchemeApp_Caption.rss	Thu Jan 07 13:31:38 2010 +0200
@@ -18,7 +18,7 @@
 
 
 #include <apcaptionfile.rh>
-#include "SchemeApp.loc"
+#include "schemeapp.loc"
 
 //----------------------------------------------------
 //   
--- a/browserutilities/schemehandler/SchemeApp/group/SchemeApp.mmp	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/schemehandler/SchemeApp/group/SchemeApp.mmp	Thu Jan 07 13:31:38 2010 +0200
@@ -17,7 +17,6 @@
 *
 */
 
-
 #include <platform_paths.hrh>
 #include <platform/mw/schemedefs.hrh>
 #include <data_caging_paths.hrh>
@@ -43,7 +42,6 @@
 SOURCE      SchemeDocument.cpp
 SOURCE	    SchemeDialog.cpp 
 
-
 START RESOURCE ../data/SchemeApp.rss
 DEPENDS avkon.rsg
 HEADER
@@ -58,7 +56,6 @@
 USERINCLUDE     ../inc
 
 MW_LAYER_SYSTEMINCLUDE
-MW_LAYER_ECOM_SYSTEMINCLUDE
 
 LIBRARY     apparc.lib
 LIBRARY     avkon.lib
--- a/browserutilities/schemehandler/SchemeApp/group/bld.inf	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/schemehandler/SchemeApp/group/bld.inf	Thu Jan 07 13:31:38 2010 +0200
@@ -26,7 +26,7 @@
 PRJ_EXPORTS
 ../../rom/SchemeHandler.iby  CORE_MW_LAYER_IBY_EXPORT_PATH(SchemeHandler.iby)
 ../../rom/SchemeHandlerResources.iby  LANGUAGE_MW_LAYER_IBY_EXPORT_PATH(SchemeHandlerResources.iby)
-../loc/SchemeApp.loc  MW_LAYER_LOC_EXPORT_PATH(SchemeApp.loc)
+../loc/schemeapp.loc  MW_LAYER_LOC_EXPORT_PATH(schemeapp.loc)
 
 #ifdef __SERIES60_32__
 
--- a/browserutilities/schemehandler/SchemeApp/loc/SchemeApp.loc	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/schemehandler/SchemeApp/loc/SchemeApp.loc	Thu Jan 07 13:31:38 2010 +0200
@@ -30,4 +30,4 @@
 //d:application name
 //l:cell_app_pane_t1
 //
-#define qtn_apps_services_grid      "Services"
\ No newline at end of file
+#define qtn_apps_services_grid      "Services"
--- a/browserutilities/schemehandler/SchemeApp/src/SchemeDocument.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/schemehandler/SchemeApp/src/SchemeDocument.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -17,12 +17,11 @@
 *
 */
 
-
 // INCLUDE FILES
 
 #include "SchemeDocument.h"
 #include "SchemeAppUi.h"
-#include "schemehandler.h"
+#include <schemehandler.h>
 #include "SchemeAppLogger.h"
 
 // ================= MEMBER FUNCTIONS =======================
--- a/browserutilities/schemehandler/SchemeDispatcher/data/101f8531.rss	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/schemehandler/SchemeDispatcher/data/101f8531.rss	Thu Jan 07 13:31:38 2010 +0200
@@ -17,7 +17,7 @@
 
 
 #include "schemedefs.hrh"
-#include "RegistryInfo.rh"
+#include <ecom/registryinfo.rh>
 
 RESOURCE REGISTRY_INFO theInfo
 	{
--- a/browserutilities/schemehandler/SchemeDispatcher/group/SchemeDispatcher.mmp	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/schemehandler/SchemeDispatcher/group/SchemeDispatcher.mmp	Thu Jan 07 13:31:38 2010 +0200
@@ -50,10 +50,9 @@
 SOURCE      MmsHandler.cpp
 
 USERINCLUDE     ../inc
-SYSTEMINCLUDE     ../../../../inc
+USERINCLUDE     ../../../../inc
 
 MW_LAYER_SYSTEMINCLUDE
-MW_LAYER_ECOM_SYSTEMINCLUDE
 
 LIBRARY     euser.lib
 LIBRARY	    ECOM.LIB
@@ -79,6 +78,3 @@
 	MACRO __SCHEMEDISP_LOG__
 	DEBUGLIBRARY     flogger.lib
 #endif	// __TEST_SCHEMEDISP_LOG_ENABLED
-
-
-
--- a/browserutilities/schemehandler/SchemeDispatcher/inc/BaseHandler.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/schemehandler/SchemeDispatcher/inc/BaseHandler.h	Thu Jan 07 13:31:38 2010 +0200
@@ -17,13 +17,12 @@
 *
 */
 
-
 #ifndef BASE_HANDLER_H
 #define BASE_HANDLER_H
 
 // INCLUDES
 
-#include "schemehandler.h"
+#include <schemehandler.h>
 #include <e32base.h>
 
 // FORWARD DECLARATION
--- a/browserutilities/schemehandler/SchemeDispatcher/src/CtiHandler.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/schemehandler/SchemeDispatcher/src/CtiHandler.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -17,12 +17,11 @@
 *
 */
 
-
 // INCLUDE FILES
 
 #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>
--- a/browserutilities/schemehandler/SchemeDispatcher/src/FileHandler.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/schemehandler/SchemeDispatcher/src/FileHandler.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -17,12 +17,11 @@
 *
 */
 
-
 // INCLUDE FILES
 
 #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>
--- a/browserutilities/schemehandler/SchemeDispatcher/src/HttpHandler.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/schemehandler/SchemeDispatcher/src/HttpHandler.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -17,12 +17,11 @@
 *
 */
 
-
 // INCLUDE FILES
 
 #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>
--- a/browserutilities/schemehandler/SchemeDispatcher/src/MailToHandler.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/schemehandler/SchemeDispatcher/src/MailToHandler.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -17,12 +17,11 @@
 *
 */
 
-
 // INCLUDE FILES
 
 #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>
--- a/browserutilities/schemehandler/SchemeDispatcher/src/MmsHandler.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/schemehandler/SchemeDispatcher/src/MmsHandler.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -17,12 +17,11 @@
 *
 */
 
-
 // INCLUDE FILES
 
 #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>
--- a/browserutilities/schemehandler/SchemeDispatcher/src/RtspHandler.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/schemehandler/SchemeDispatcher/src/RtspHandler.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -17,12 +17,11 @@
 *
 */
 
-
 // INCLUDE FILES
 
 #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>
--- a/browserutilities/schemehandler/SchemeDispatcher/src/SchemeProxy.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/schemehandler/SchemeDispatcher/src/SchemeProxy.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -17,7 +17,6 @@
 *
 */
 
-
 #include "FileHandler.h"
 #include "HttpHandler.h"
 #include "RtspHandler.h"
@@ -28,7 +27,7 @@
 #include "MmsHandler.h"
 #include <e32std.h>
 #include <schemedefs.hrh>
-#include <ImplementationProxy.h>
+#include <ecom/implementationproxy.h>
 
 // Exported proxy for instantiation method resolution
 // Define the interface UIDs
--- a/browserutilities/schemehandler/SchemeDispatcher/src/TelHandler.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/schemehandler/SchemeDispatcher/src/TelHandler.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -17,12 +17,11 @@
 *
 */
 
-
 // INCLUDE FILES
 
 #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>
--- a/browserutilities/schemehandler/SchemeDispatcher/src/WtaiHandler.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/schemehandler/SchemeDispatcher/src/WtaiHandler.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -17,12 +17,11 @@
 *
 */
 
-
 // INCLUDE FILES
 
 #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>
Binary file browserutilities/webutils/conf/webutils.confml has changed
--- a/browserutilities/webutils/group/webutils.mmp	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/webutils/group/webutils.mmp	Thu Jan 07 13:31:38 2010 +0200
@@ -15,7 +15,6 @@
 *
 */
 
-
 #include <platform_paths.hrh>
 #include <data_caging_paths.hrh>
 #include <platform/mw/browser_platform_variant.hrh>
@@ -33,13 +32,11 @@
 // Source files 
 SOURCE			CUserAgent.cpp
 
-
 // Include paths
 USERINCLUDE     . ../INC 
 
 MW_LAYER_SYSTEMINCLUDE
-MW_LAYER_LIBC_SYSTEMINCLUDE
-
+OS_LAYER_ESTLIB_SYSTEMINCLUDE
 
 // Dependencies
 LIBRARY			euser.lib
@@ -53,14 +50,12 @@
 //MACRO _WEBUTILS_LOG_
 //#define _WEBUTILS_LOG_
 
-
 #ifdef _WEBUTILS_LOG_
 LIBRARY flogger.lib
 #else
 DEBUGLIBRARY flogger.lib
 #endif
 
-
 #if defined(ARMCC)
         DEFFILE ../EABI/WebUtils_EKA2.DEF 
 #elif defined( WINSCW )
@@ -70,5 +65,3 @@
 #else
         DEFFILE ../BMARM/WEBUTILS_EKA2.DEF 
 #endif
-
-
--- a/browserutilities/webutils/src/CUserAgent.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/webutils/src/CUserAgent.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -15,7 +15,6 @@
 *
 */
 
-
 // INCLUDE FILES
 #include <e32std.h>
 #include <f32file.h>
@@ -23,11 +22,10 @@
 
 #include <browser_platform_variant.hrh>
 #include "webUtilsCommon.h"
-#include "cuseragent.h"
+#include <cuseragent.h>
 #include "WebUtilsLogger.h"
 
-#include "webutilsinternalcrkeys.h"
-
+#include <webutilsinternalcrkeys.h>
 
 #define KPlaceHolderMozillaVer		_L("Mozilla/5.0")
 #define KPlaceHolderComponent		_L("AppleWebKit/525 (KHTML, like Gecko) Version/3.0")
--- a/browserutilities/webutils/tsrc/public/adv/group/WebUtilsBCTest.mmp	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/webutils/tsrc/public/adv/group/WebUtilsBCTest.mmp	Thu Jan 07 13:31:38 2010 +0200
@@ -39,17 +39,9 @@
 SOURCE          WebUtilsBCTest.cpp
 SOURCE          WebUtilsBCTestCases.cpp
 
-//RESOURCE        resource_file
-//RESOURCE        resource_file2
-
 USERINCLUDE     ../inc 
 
-#if defined(__S60_)
-    MW_LAYER_SYSTEMINCLUDE
-#else
-    MW_LAYER_SYSTEMINCLUDE 
-    SYSTEMINCLUDE   MW_LAYER_PUBLIC_EXPORT_PATH(internal)
-#endif
+MW_LAYER_SYSTEMINCLUDE
 
 LIBRARY         euser.lib
 LIBRARY         stiftestinterface.lib
--- a/browserutilities/xmlparser/group/XMLInterface.mmp	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/xmlparser/group/XMLInterface.mmp	Thu Jan 07 13:31:38 2010 +0200
@@ -21,7 +21,6 @@
 TARGET          XMLInterface.dll
 TARGETTYPE      dll
 UID             0x1000008d 0x101F9750
-//TARGETPATH      ?target_path
 
 VENDORID VID_DEFAULT
 
@@ -40,22 +39,19 @@
 SOURCE          wml_1_3_dict.c
 SOURCE          syncml_1_0_dict.c
 SOURCE          xhtml_1_0_dict.c
-SOURCE		sl_dict.c
+SOURCE		      sl_dict.c
 SOURCE          CXMLReader.cpp
 SOURCE          CXMLAttributes.cpp
 SOURCE          CXMLObserver.cpp
 
-// RESOURCE        resource_file
-// RESOURCE        resource_file2
-
 USERINCLUDE     ../INC
 
 MW_LAYER_SYSTEMINCLUDE
-MW_LAYER_LIBC_SYSTEMINCLUDE
+OS_LAYER_ESTLIB_SYSTEMINCLUDE
 
 CAPABILITY 	CAP_GENERAL_DLL
 
-LIBRARY         efsrv.lib
+LIBRARY   efsrv.lib
 LIBRARY		euser.lib
 LIBRARY		bafl.lib
 LIBRARY		charconv.lib 
@@ -88,3 +84,4 @@
 */
 // DEFFILE ?filename
 // AIF ?filename
+
--- a/browserutilities/xmlparser/inc/CXMLAttributes.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/xmlparser/inc/CXMLAttributes.h	Thu Jan 07 13:31:38 2010 +0200
@@ -15,16 +15,13 @@
 *
 */
 
-
-
 #ifndef __CXMLATTRIBUTES_H
 #define __CXMLATTRIBUTES_H
 
 //  INCLUDES
 #include <e32std.h>
 #include <eikenv.h>  
-#include "mxmlattributes.h"
-
+#include <mxmlattributes.h>
 
 // CLASS DECLARATION
 
--- a/browserutilities/xmlparser/inc/CXMLObserver.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/xmlparser/inc/CXMLObserver.h	Thu Jan 07 13:31:38 2010 +0200
@@ -15,8 +15,6 @@
 *
 */
 
-
-
 #ifndef __CXMLOBSERVER_H
 #define __CXMLOBSERVER_H
 
@@ -24,9 +22,8 @@
 #include <e32std.h>
 #include <eikenv.h>
 #include "CXMLAttributes.h"
-#include "mxmlcontenthandler.h"
-#include "mwbxmlcontenthandler.h"
-
+#include <mxmlcontenthandler.h>
+#include <mwbxmlcontenthandler.h>
 
 // CLASS DECLARATION
 
--- a/browserutilities/xmlparser/inc/CXMLReader.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/xmlparser/inc/CXMLReader.h	Thu Jan 07 13:31:38 2010 +0200
@@ -15,8 +15,6 @@
 *
 */
 
-
-
 #ifndef __CXMLREADER_H
 #define __CXMLREADER_H
 
@@ -24,14 +22,13 @@
 #include <e32std.h>
 #include <F32File.h>
 #include <utf.h>
-#include "nw_cxml_parser.h"
+#include <nw_cxml_parser.h>
 
 #include "CXMLAttributes.h"
-#include "mxmlcontenthandler.h"
-#include "mwbxmlcontenthandler.h"
+#include <mxmlcontenthandler.h>
+#include <mwbxmlcontenthandler.h>
 #include "CXMLObserver.h"
-#include "xmlutils.h"
-
+#include <xmlutils.h>
 
 // CLASS DECLARATION
 
--- a/browserutilities/xmlparser/src/RXMLReader.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/xmlparser/src/RXMLReader.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -15,19 +15,14 @@
 *
 */
 
-
-
 // INCLUDE FILES
-#include "rxmlreader.h"
+#include <rxmlreader.h>
 #include "CXMLReader.h"
 
-
-
 // requirement for E32 DLLs
 
 // ============================ MEMBER FUNCTIONS ===============================
 
-
 // -----------------------------------------------------------------------------
 // RXMLReader::CreateL()
 // -----------------------------------------------------------------------------
@@ -37,8 +32,6 @@
 		iImplementation = CXMLReader::NewL();
 	}
 
-
-
 // -----------------------------------------------------------------------------
 // RXMLReader::Destroy()
 // -----------------------------------------------------------------------------
--- a/browserutilities/xmlparser/src/syncml_1_0_dict.c	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/xmlparser/src/syncml_1_0_dict.c	Thu Jan 07 13:31:38 2010 +0200
@@ -15,7 +15,6 @@
 *
 */
 
-
 /*
 ** WARNING
 **
@@ -34,8 +33,7 @@
  * Doc Type = -//SYNCML//DTD SyncML v1.0//EN
  */
 
-#include "nw_wbxml_dictionary.h"
-
+#include <nw_wbxml_dictionary.h>
 
 static const NW_Ucs2 NW_SyncML_1_0_ElementTag_Add[] = {'A','d','d','\0'};
 static const NW_Ucs2 NW_SyncML_1_0_ElementTag_Alert[] = {'A','l','e','r','t','\0'};
--- a/browserutilities/xmlparser/src/wml_1_1_dict.c	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/xmlparser/src/wml_1_1_dict.c	Thu Jan 07 13:31:38 2010 +0200
@@ -15,15 +15,13 @@
 *
 */
 
-
 /*
 ** This file is not generated by the dictionary creator. If you need any help
 ** to edit this file please see Shaun Keller/Frank Rchichi/Ramesh Bapanapalli.
 */
 
 #include "nw_wml1x_wml_1_3_tokens.h"
-#include "nw_wbxml_dictionary.h"
-
+#include <nw_wbxml_dictionary.h>
 
 static const NW_Ucs2 NW_Wml_1_3_ElementTag_pre[] = {'p','r','e','\0'};
 static const NW_Ucs2 NW_Wml_1_3_ElementTag_a[] = {'a','\0'};
--- a/browserutilities/xmlparser/src/wml_1_3_dict.c	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/xmlparser/src/wml_1_3_dict.c	Thu Jan 07 13:31:38 2010 +0200
@@ -37,8 +37,7 @@
  * Doc Type = -//WAPFORUM//DTD WML 1.3//EN
  */
 #include "nw_wml1x_wml_1_3_tokens.h"
-#include "nw_wbxml_dictionary.h"
-
+#include <nw_wbxml_dictionary.h>
 
 static const NW_Ucs2 NW_Wml_1_3_ElementTag_pre[] = {'p','r','e','\0'};
 static const NW_Ucs2 NW_Wml_1_3_ElementTag_a[] = {'a','\0'};
--- a/browserutilities/xmlparser/src/xhtml_1_0_dict.c	Thu Dec 17 09:20:16 2009 +0200
+++ b/browserutilities/xmlparser/src/xhtml_1_0_dict.c	Thu Jan 07 13:31:38 2010 +0200
@@ -39,8 +39,7 @@
  */
 
 #include "nw_xhtml_xhtml_1_0_tokens.h"
-#include "nw_wbxml_dictionary.h"
-
+#include <nw_wbxml_dictionary.h>
 
 static const NW_Ucs2 NW_XHTML_1_0_ElementTag_body[] = {'b','o','d','y','\0'};
 static const NW_Ucs2 NW_XHTML_1_0_ElementTag_head[] = {'h','e','a','d','\0'};
--- a/codhandler/coddownload/group/CodDownload.mmp	Thu Dec 17 09:20:16 2009 +0200
+++ b/codhandler/coddownload/group/CodDownload.mmp	Thu Jan 07 13:31:38 2010 +0200
@@ -30,9 +30,8 @@
 SOURCE          CodDownload.cpp
 
 USERINCLUDE     ../inc
-
-SYSTEMINCLUDE   ../../CodUi/inc
-SYSTEMINCLUDE   ../../CodEng/inc
+USERINCLUDE   ../../CodUi/inc
+USERINCLUDE   ../../CodEng/inc
 
 MW_LAYER_SYSTEMINCLUDE
 
--- a/codhandler/coddownload/src/CodDownload.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/codhandler/coddownload/src/CodDownload.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -18,7 +18,7 @@
 
 // INCLUDE FILES
 
-#include "coddownload.h"
+#include <coddownload.h>
 #include "CodDownloadImpl.h"
 
 // ================= MEMBER FUNCTIONS =======================
--- a/codhandler/codeng/group/CodEng.mmp	Thu Dec 17 09:20:16 2009 +0200
+++ b/codhandler/codeng/group/CodEng.mmp	Thu Jan 07 13:31:38 2010 +0200
@@ -19,7 +19,7 @@
 
 #include <platform_paths.hrh>
 #include <platform/mw/browser_platform_variant.hrh>
-#include    "../inc/CodDefs.h"
+#include "../inc/CodDefs.h"
 
 TARGET      CodEng.dll
 TARGETTYPE  dll
@@ -27,11 +27,9 @@
 CAPABILITY  CAP_GENERAL_DLL
 VENDORID    VID_DEFAULT
 
-
 //MACRO _DEBUG
 //#define _DEBUG
   
-  
 SOURCEPATH  ../src
 
 SOURCE      CodEngBase.cpp
@@ -72,18 +70,11 @@
 
 USERINCLUDE     ../inc
 
+MW_LAYER_SYSTEMINCLUDE
+OS_LAYER_ESTLIB_SYSTEMINCLUDE
+#if defined(__PLATFORM_VERSION_50_TUBE__) || defined(__PLATFORM_VERSION_50__)
 APP_LAYER_SYSTEMINCLUDE
-/* SF TODO: resolve APP LAYER DEPENDENCY: 
-	s60/app/devicecontrol/devctrl_dom/fota_engine_api/inc/FotaEngine.h
-	s60/app/devicecontrol/devctrl_dom/fota_engine_api/inc/fotaconst.h
-	s60/app/devicecontrol/devctrl_dom/fota_engine_api/inc/FotaEngStream.h
-
-	s60/app/gallery/gallery_dom/media_file_api/inc/CMGXFileManager.h
-	s60/app/gallery/gallery_dom/media_file_api/inc/MGXFileManagerFactory.h
-*/
-//MW_LAYER_SYSTEMINCLUDE
-MW_LAYER_LIBC_SYSTEMINCLUDE
-MW_LAYER_ECOM_SYSTEMINCLUDE
+#endif
 
 LIBRARY     euser.lib
 LIBRARY     efsrv.lib
--- a/codhandler/codeng/inc/CodError.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/codhandler/codeng/inc/CodError.h	Thu Jan 07 13:31:38 2010 +0200
@@ -17,7 +17,6 @@
 *
 */
 
-
 #ifndef COD_ERROR_H
 #define COD_ERROR_H
 
--- a/codhandler/codeng/inc/CodPanic.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/codhandler/codeng/inc/CodPanic.h	Thu Jan 07 13:31:38 2010 +0200
@@ -17,7 +17,6 @@
 *
 */
 
-
 #ifndef COD_PANIC_H
 #define COD_PANIC_H
 
--- a/codhandler/codeng/inc/DownloadDataClient.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/codhandler/codeng/inc/DownloadDataClient.h	Thu Jan 07 13:31:38 2010 +0200
@@ -17,14 +17,13 @@
 *
 */
 
-
 #ifndef DOWNLOAD_DATA_CLIENT_H
 #define DOWNLOAD_DATA_CLIENT_H
 
 // INCLUDES
 
 #include <e32base.h>
-#include "httpdownloaddata.h"
+#include <httpdownloaddata.h>
 
 // ================= CONSTANTS =======================
 
--- a/codhandler/codeng/inc/MediaObject.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/codhandler/codeng/inc/MediaObject.h	Thu Jan 07 13:31:38 2010 +0200
@@ -27,7 +27,7 @@
 #include <bamdesca.h>
 #include "CodDefs.h"
 #include <f32file.h>
-#include "httpdownloaddata.h"
+#include <httpdownloaddata.h>
 
 // ================= CONSTANTS =======================
 /// OMA 1 DD MIME type.
--- a/codhandler/codeng/inc/NwUtil.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/codhandler/codeng/inc/NwUtil.h	Thu Jan 07 13:31:38 2010 +0200
@@ -17,7 +17,6 @@
 *
 */
 
-
 #ifndef NW_UTIL_H
 #define NW_UTIL_H
 
--- a/codhandler/codeng/src/CodData.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/codhandler/codeng/src/CodData.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -17,7 +17,6 @@
 *
 */
 
-
 // INCLUDE FILES
 
 #include "CodData.h"
@@ -25,8 +24,7 @@
 #include "CodUtil.h"
 #include <badesca.h>
 #include "FileExt.h"
-#include "httpdownloaddata.h"
-
+#include <httpdownloaddata.h>
 
 // ================= MEMBER FUNCTIONS =======================
 
--- a/codhandler/codeng/src/CodEng.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/codhandler/codeng/src/CodEng.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -17,7 +17,6 @@
 *
 */
 
-
 // INCLUDE FILES
 
 #include "CodEng.h"
--- a/codhandler/codeng/src/CodEngBase.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/codhandler/codeng/src/CodEngBase.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -17,7 +17,6 @@
 *
 */
 
-
 // INCLUDE FILES
 
 #include "CodEngBase.h"
@@ -51,8 +50,8 @@
 #include <CodUi.rsg>
 #include <AknQueryDialog.h>
 #include <stringloader.h>
-#include  <bautils.h>
-#include    "FileExt.h"
+#include <bautils.h>
+#include "FileExt.h"
 
 #ifdef __SYNCML_DM_FOTA
 #include <fotaengine.h>
--- a/codhandler/codeng/src/CodParser.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/codhandler/codeng/src/CodParser.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -17,7 +17,6 @@
 *
 */
 
-
 // INCLUDE FILES
 
 #include "CodParser.h"
--- a/codhandler/codeng/src/DdDummyDict.c	Thu Dec 17 09:20:16 2009 +0200
+++ b/codhandler/codeng/src/DdDummyDict.c	Thu Jan 07 13:31:38 2010 +0200
@@ -35,8 +35,7 @@
  */
 
 #include "DdDummyDict.h"
-#include "nw_wbxml_dictionary.h"
-
+#include <nw_wbxml_dictionary.h>
 
 static const NW_Ucs2 NW_DdDummy_ElementTag_name[] = {'n','a','m','e','\0'};
 static const NW_Ucs2 NW_DdDummy_ElementTag_vendor[] = {'v','e','n','d','o','r','\0'};
--- a/codhandler/codeng/src/DdEng.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/codhandler/codeng/src/DdEng.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -17,7 +17,6 @@
 *
 */
 
-
 // INCLUDE FILES
 
 #include "DdEng.h"
--- a/codhandler/codeng/src/DdParser.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/codhandler/codeng/src/DdParser.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -17,7 +17,6 @@
 *
 */
 
-
 // INCLUDE FILES
 
 #include "DdParser.h"
@@ -27,7 +26,7 @@
 #include "CodLogger.h"
 #include "NwUtil.h"
 #include "DdDummyDict.h"
-#include "httpdownloaddata.h"
+#include <httpdownloaddata.h>
 #include <nw_dom_document.h>
 #include <utf.h>
 
--- a/codhandler/codeng/src/DownloadDataClient.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/codhandler/codeng/src/DownloadDataClient.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -17,7 +17,6 @@
 *
 */
 
-
 // INCLUDE FILES
 
 #include <s32mem.h>
@@ -27,10 +26,8 @@
 
 // ================= CONSTANTS =======================
 
-
 // ================= MEMBER FUNCTIONS =======================
 
-    
 // ---------------------------------------------------------
 // CMediaDataClient::NewL()
 // ---------------------------------------------------------
--- a/codhandler/codeng/src/FileSaver.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/codhandler/codeng/src/FileSaver.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -17,7 +17,6 @@
 *
 */
 
-
 // INCLUDE FILES
 #include <browser_platform_variant.hrh>
 #include "FileSaver.h"
@@ -47,7 +46,6 @@
 const TInt KDefaultStorageBufferSize = 128 * 1024;
 const TInt KDefaultStorageBufferSizePD = 16 * 1024;
 
-
 // ================= MEMBER FUNCTIONS =======================
 
 // ---------------------------------------------------------
--- a/codhandler/codeng/src/FotaSaver.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/codhandler/codeng/src/FotaSaver.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -15,7 +15,6 @@
 *
 */
 
-
 // INCLUDE FILES
 
 #include "FotaSaver.h"
--- a/codhandler/codeng/src/HttpLoader.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/codhandler/codeng/src/HttpLoader.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -17,7 +17,6 @@
 *
 */
 
-
 // INCLUDE FILES
 
 #include "HttpLoader.h"
@@ -38,17 +37,15 @@
 #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>
 #include <Oma2Agent.h>
 #include <httpdownloadmgrcommon.h>
-#include    "HeaderField.h"
-#include    "FileExt.h"
-#include    "CodData.h"
-
-
+#include "HeaderField.h"
+#include "FileExt.h"
+#include "CodData.h"
 
 _LIT8( KDRMOldContentType, "x-drm-old-content-type");           // old content type header to be added
 _LIT8( KAcceptRangeHeader, "bytes");           
--- a/codhandler/codeng/src/MediaObject.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/codhandler/codeng/src/MediaObject.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -750,4 +750,4 @@
     const TDataType& type( iTypes->MdcaPoint( aIndex ) );
     iTypes->Delete(aIndex);
     iTypes->InsertL(0,type.Des8());	
-    }
\ No newline at end of file
+    }
--- a/codhandler/codeng/src/NwUtil.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/codhandler/codeng/src/NwUtil.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -17,7 +17,6 @@
 *
 */
 
-
 // INCLUDE FILES
 
 #include "NwUtil.h"
--- a/codhandler/codeng/src/RoapSaver.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/codhandler/codeng/src/RoapSaver.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -15,7 +15,6 @@
 *
 */
 
-
 // INCLUDE FILES
 
 #include <RoapEng.h>
--- a/codhandler/codrecog/group/CodRecog.mmp	Thu Dec 17 09:20:16 2009 +0200
+++ b/codhandler/codrecog/group/CodRecog.mmp	Thu Jan 07 13:31:38 2010 +0200
@@ -36,10 +36,9 @@
 SOURCE          CodRecog.cpp
 
 USERINCLUDE     ../inc
+USERINCLUDE   ../../CodEng/inc
 
-SYSTEMINCLUDE   ../../CodEng/inc
 MW_LAYER_SYSTEMINCLUDE
-MW_LAYER_ECOM_SYSTEMINCLUDE
 
 LIBRARY         euser.lib
 LIBRARY         efsrv.lib
--- a/codhandler/codrecog/src/10008d49.rss	Thu Dec 17 09:20:16 2009 +0200
+++ b/codhandler/codrecog/src/10008d49.rss	Thu Jan 07 13:31:38 2010 +0200
@@ -20,7 +20,7 @@
 
 //  INCLUDES
 
-#include "RegistryInfo.rh"
+#include <ecom/registryinfo.rh>
 
 //  RESOURCE DEFINITIONS 
 
--- a/codhandler/codrecog/src/CodRecog.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/codhandler/codrecog/src/CodRecog.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -24,9 +24,9 @@
 #include <apmrec.h>
 #include <apmstd.h>
 #include <f32file.h>
-#include <CodDefs.h>
+#include "CodDefs.h"
 #include <CharConv.h>
-#include <ImplementationProxy.h>
+#include <ecom/implementationproxy.h>
 #include "CodRecog.h"
 #include "CodRecogLogger.h"
 
--- a/codhandler/codui/data/CodUi.rss	Thu Dec 17 09:20:16 2009 +0200
+++ b/codhandler/codui/data/CodUi.rss	Thu Jan 07 13:31:38 2010 +0200
@@ -17,7 +17,6 @@
 *
 */
 
-
 // RESOURCE IDENTIFIER
 
 NAME CODU
@@ -25,9 +24,9 @@
 // INCLUDES
 
 #include <eikon.rh>
-#include <CodDefs.h>
+#include "CodDefs.h"
 #include "CodUi.hrh"
-#include <CodViewer.loc>
+#include <codviewer.loc>
 #include "eikon.rsg"
 #include <avkon.loc>
 #include <avkon.rsg>
--- a/codhandler/codui/group/CodUi.mmp	Thu Dec 17 09:20:16 2009 +0200
+++ b/codhandler/codui/group/CodUi.mmp	Thu Jan 07 13:31:38 2010 +0200
@@ -41,7 +41,7 @@
 SOURCE      DdViewerApp.cpp
 SOURCE      CodDownloadImpl.cpp
 SOURCE      CodDialog.cpp
-SOURCE		CodConfirm.cpp 
+SOURCE		  CodConfirm.cpp 
 
 START RESOURCE ../data/CodUi.rss
 DEPENDS avkon.rsg
@@ -55,12 +55,9 @@
 END
 
 USERINCLUDE     ../inc
-
-
-SYSTEMINCLUDE   ../../CodEng/inc
+USERINCLUDE     ../../CodEng/inc
 
 MW_LAYER_SYSTEMINCLUDE
-MW_LAYER_ECOM_SYSTEMINCLUDE
 
 LIBRARY         efsrv.lib
 LIBRARY         apparc.lib
--- a/codhandler/codui/inc/CodAppUi.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/codhandler/codui/inc/CodAppUi.h	Thu Jan 07 13:31:38 2010 +0200
@@ -15,7 +15,6 @@
 *
 */
 
-
 #ifndef COD_APP_UI_H
 #define COD_APP_UI_H
 
@@ -24,7 +23,7 @@
 #include <e32base.h>
 #include <AknAppUi.h>
 #include <AknServerApp.h>
-#include <CodLoadObserver.h>
+#include "CodLoadObserver.h"
 #include "CodWaitDialog.h"
 
 // FORWARD DECLARATIONS
--- a/codhandler/codui/inc/CodDownloadImpl.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/codhandler/codui/inc/CodDownloadImpl.h	Thu Jan 07 13:31:38 2010 +0200
@@ -15,7 +15,6 @@
 *
 */
 
-
 #ifndef COD_DOWNLOAD_IMPL_H
 #define COD_DOWNLOAD_IMPL_H
 
@@ -33,7 +32,7 @@
 #include <e32std.h>
 #include <f32file.h>
 #include <coddownload.h>
-#include <CodLoadObserver.h>
+#include "CodLoadObserver.h"
 #include <AknServerApp.h>
 
 // CONSTANTS
--- a/codhandler/codui/src/CodAppUi.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/codhandler/codui/src/CodAppUi.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -15,7 +15,6 @@
 *
 */
 
-
 #include <avkon.hrh>
 #include <eikbtgpc.h>
 #include <eikapp.h>
@@ -31,12 +30,12 @@
 #include <RoapDef.h>
 #include <DRMCommon.h>
 #include <StringLoader.h>
-#include <CodEng.h>
-#include <CodData.h>
-#include <CodError.h>
-#include <CodStatus.h>
-#include <CodUtil.h>
-#include <RoapData.h>
+#include "CodEng.h"
+#include "CodData.h"
+#include "CodError.h"
+#include "CodStatus.h"
+#include "CodUtil.h"
+#include "RoapData.h"
 #include "CodAppUi.h"
 #include "CodView.h" 
 #include "CodDocument.h" 
--- a/codhandler/codui/src/CodConfirm.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/codhandler/codui/src/CodConfirm.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -15,14 +15,13 @@
 *
 */
 
-
 // INCLUDE FILES
 
 #include <AknUtils.h>
 #include <AknDef.h>
 #include <StringLoader.h>
-#include <CodData.h>
-#include <CodDefs.h>
+#include "CodData.h"
+#include "CodDefs.h"
 #include <avkon.rsg>
 #include <CodUi.rsg>
 #include "CodConfirm.h"
@@ -30,17 +29,15 @@
 #include <Oma2Agent.h>
 #include <AknLayout.cdl.h>
 
-
 #include <eikmobs.h>
 #include <aknPopup.h>
 #include <aknlists.h>
-#include    <StringLoader.h>
+#include <StringLoader.h>
 
 _LIT( KListBoxSeparator, "\t" );
 
 // FORWARD DECLARATIONS
 
-
 // ================= TYPES =======================
 
 /**
--- a/codhandler/codui/src/CodDocument.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/codhandler/codui/src/CodDocument.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -15,13 +15,12 @@
 *
 */
 
-
 // INCLUDE FILES
 
 #include <AiwGenericParam.h>
-#include <CodEng.h>
-#include <DdEng.h>
-#include <CodUtil.h>
+#include "CodEng.h"
+#include "DdEng.h"
+#include "CodUtil.h"
 #include "CodDocument.h"
 #include "CodAppUi.h"
 #include "RequestCompleteCallback.h"
--- a/codhandler/codui/src/CodDownloadImpl.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/codhandler/codui/src/CodDownloadImpl.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -15,7 +15,6 @@
 *
 */
 
-
 // INCLUDE FILES
 
 #include <bldvariant.hrh>
@@ -34,14 +33,14 @@
 #include <AknQueryDialog.h>
 #include "CodDownloadImpl.h"
 #include "CodUiPanic.h"
-#include <CodStatus.h>
-#include <CodDefs.h>
-#include <CodError.h>
-#include <CodEng.h>
-#include <CodData.h>
-#include <RoapData.h>
-#include <DdEng.h>
-#include <CodUtil.h>
+#include "CodStatus.h"
+#include "CodDefs.h"
+#include "CodError.h"
+#include "CodEng.h"
+#include "CodData.h"
+#include "RoapData.h"
+#include "DdEng.h"
+#include "CodUtil.h"
 #include "CodUiResource.h"
 #include <CodUi.rsg>
 #include "CodViewDialog.h"
@@ -52,7 +51,7 @@
 #include <Oma2Agent.h>
 #include <bldvariant.hrh>
 #include "CodConfirm.h" 
-#include  <bautils.h>
+#include <bautils.h>
 
 #ifdef RD_MULTIPLE_DRIVE
 #include <driveinfo.h>
--- a/codhandler/codui/src/CodView.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/codhandler/codui/src/CodView.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -15,7 +15,6 @@
 *
 */
 
-
 // INCLUDE FILES
 
 #include <eikrted.h>
@@ -24,8 +23,8 @@
 #include <AknUtils.h>
 #include <AknDef.h>
 #include <StringLoader.h>
-#include <CodData.h>
-#include <CodDefs.h>
+#include "CodData.h"
+#include "CodDefs.h"
 #include <avkon.rsg>
 #include <CodUi.rsg>
 #include "CodView.h"
@@ -36,7 +35,6 @@
 
 #include "eikon.hrh"
 
-
 // ================= TYPES =======================
 
 /**
--- a/codhandler/codui/src/CodViewerApp.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/codhandler/codui/src/CodViewerApp.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -15,10 +15,9 @@
 *
 */
 
-
 // INCLUDE FILES
 
-#include <CodDefs.h>
+#include "CodDefs.h"
 #include "CodViewerApp.h"
 #include "CodDocument.h"
 
--- a/codhandler/codui/src/DdViewerApp.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/codhandler/codui/src/DdViewerApp.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -15,10 +15,9 @@
 *
 */
 
-
 // INCLUDE FILES
 
-#include <CodDefs.h>
+#include "CodDefs.h"
 #include "DdViewerApp.h"
 #include "CodDocument.h"
 
--- a/codhandler/codviewer/data/CodViewer.rss	Thu Dec 17 09:20:16 2009 +0200
+++ b/codhandler/codviewer/data/CodViewer.rss	Thu Jan 07 13:31:38 2010 +0200
@@ -25,7 +25,7 @@
 #include <eikon.rh>
 #include <appinfo.rh>
 #include <avkon.rsg>
-#include <CodViewer.loc>
+#include <codviewer.loc>
 
 
 // RESOURCE DEFINITIONS 
--- a/codhandler/codviewer/data/CodViewer_reg.rss	Thu Dec 17 09:20:16 2009 +0200
+++ b/codhandler/codviewer/data/CodViewer_reg.rss	Thu Jan 07 13:31:38 2010 +0200
@@ -17,10 +17,9 @@
 *
 */
 
-
 #include <appinfo.rh>
 #include <CodViewer.rsg>
-#include <CodDefs.h>
+#include "CodDefs.h"
 #include <data_caging_paths_strings.hrh>
 
 UID2 KUidAppRegistrationResourceFile
--- a/codhandler/codviewer/group/CodViewer.mmp	Thu Dec 17 09:20:16 2009 +0200
+++ b/codhandler/codviewer/group/CodViewer.mmp	Thu Jan 07 13:31:38 2010 +0200
@@ -43,11 +43,11 @@
 #endif
 END
 
-SYSTEMINCLUDE   ../../CodEng/inc
-SYSTEMINCLUDE   ../../CodUi/inc
+USERINCLUDE   ../../CodEng/inc
+USERINCLUDE   ../../CodUi/inc
+
 MW_LAYER_SYSTEMINCLUDE
 
-
 LIBRARY         euser.lib
 LIBRARY         eikcore.lib
 LIBRARY         apparc.lib
--- a/codhandler/codviewer/src/CodViewer.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/codhandler/codviewer/src/CodViewer.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -15,11 +15,10 @@
 *
 */
 
-
 // INCLUDE FILES
 
 #include <eikstart.h>
-#include <CodViewerApp.h>
+#include "CodViewerApp.h"
 
 // ================= OTHER FUNCTIONS ==============
 
--- a/codhandler/ddrecog/group/DdRecog.mmp	Thu Dec 17 09:20:16 2009 +0200
+++ b/codhandler/ddrecog/group/DdRecog.mmp	Thu Jan 07 13:31:38 2010 +0200
@@ -36,10 +36,9 @@
 SOURCE          DdRecog.cpp
 
 USERINCLUDE     ../inc
+USERINCLUDE   ../../CodEng/inc
 
-SYSTEMINCLUDE   ../../CodEng/inc
 MW_LAYER_SYSTEMINCLUDE
-MW_LAYER_ECOM_SYSTEMINCLUDE
 
 LIBRARY         euser.lib
 LIBRARY         efsrv.lib
--- a/codhandler/ddrecog/src/10008d55.rss	Thu Dec 17 09:20:16 2009 +0200
+++ b/codhandler/ddrecog/src/10008d55.rss	Thu Jan 07 13:31:38 2010 +0200
@@ -20,7 +20,7 @@
 
 //  INCLUDES
 
-#include "RegistryInfo.rh"
+#include <ecom/registryinfo.rh>
 
 //  RESOURCE DEFINITIONS 
 
--- a/codhandler/ddrecog/src/DdRecog.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/codhandler/ddrecog/src/DdRecog.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -17,16 +17,15 @@
 *
 */
 
-
 // INCLUDE FILES
 
 #include <s32std.h>
 #include <apmrec.h>
 #include <apmstd.h>
 #include <f32file.h>
-#include <CodDefs.h>
+#include "CodDefs.h"
 #include <CharConv.h>
-#include <ImplementationProxy.h>
+#include <ecom/implementationproxy.h>
 #include "DdRecog.h"
 #include "DdRecogLogger.h"
 
--- a/codhandler/ddviewer/data/DdViewer.rss	Thu Dec 17 09:20:16 2009 +0200
+++ b/codhandler/ddviewer/data/DdViewer.rss	Thu Jan 07 13:31:38 2010 +0200
@@ -25,7 +25,7 @@
 #include <eikon.rh>
 #include <appinfo.rh>
 #include <avkon.rsg>
-#include <CodViewer.loc>
+#include <codviewer.loc>
 
 
 // RESOURCE DEFINITIONS 
--- a/codhandler/ddviewer/data/DdViewer_reg.rss	Thu Dec 17 09:20:16 2009 +0200
+++ b/codhandler/ddviewer/data/DdViewer_reg.rss	Thu Jan 07 13:31:38 2010 +0200
@@ -17,10 +17,9 @@
 *
 */
 
-
 #include <appinfo.rh>
 #include <DdViewer.rsg>
-#include <CodDefs.h>
+#include "CodDefs.h"
 #include <data_caging_paths_strings.hrh>
 
 UID2 KUidAppRegistrationResourceFile
--- a/codhandler/ddviewer/group/DdViewer.mmp	Thu Dec 17 09:20:16 2009 +0200
+++ b/codhandler/ddviewer/group/DdViewer.mmp	Thu Jan 07 13:31:38 2010 +0200
@@ -16,6 +16,7 @@
 *      
 *
 */
+
 #include <platform_paths.hrh>
 #include <data_caging_paths.hrh>
 #include <platform/mw/browser_platform_variant.hrh>
@@ -43,11 +44,11 @@
 #endif
 END
 
-SYSTEMINCLUDE   ../../CodEng/inc
-SYSTEMINCLUDE   ../../CodUi/inc
+USERINCLUDE   ../../CodEng/inc
+USERINCLUDE   ../../CodUi/inc
+
 MW_LAYER_SYSTEMINCLUDE
 
-
 LIBRARY         euser.lib
 LIBRARY         eikcore.lib
 LIBRARY         apparc.lib
--- a/codhandler/ddviewer/src/DdViewer.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/codhandler/ddviewer/src/DdViewer.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -19,7 +19,7 @@
 // INCLUDE FILES
 
 #include <eikstart.h>
-#include <DdViewerApp.h>
+#include "DdViewerApp.h"
 
 // ================= OTHER FUNCTIONS ==============
 
--- a/codhandler/group/bld.inf	Thu Dec 17 09:20:16 2009 +0200
+++ b/codhandler/group/bld.inf	Thu Jan 07 13:31:38 2010 +0200
@@ -22,7 +22,7 @@
 #include "../../web_plat/browser_platform_api/inc/browser_platform_variant.hrh"
 
 PRJ_EXPORTS
-../loc/CodViewer.loc  				MW_LAYER_LOC_EXPORT_PATH(CodViewer.loc)
+../loc/codviewer.loc  				MW_LAYER_LOC_EXPORT_PATH(codviewer.loc)
 ../rom/CodHandler.iby				CORE_MW_LAYER_IBY_EXPORT_PATH(CodHandler.iby)
 ../rom/CodHandlerResources.iby		LANGUAGE_MW_LAYER_IBY_EXPORT_PATH(CodHandlerResources.iby)
 
--- a/codhandler/roapapp/group/RoapApp.mmp	Thu Dec 17 09:20:16 2009 +0200
+++ b/codhandler/roapapp/group/RoapApp.mmp	Thu Jan 07 13:31:38 2010 +0200
@@ -53,10 +53,9 @@
 END
 
 USERINCLUDE     ../inc
+
 MW_LAYER_SYSTEMINCLUDE
 
-
-
 LIBRARY     efsrv.lib
 LIBRARY     apparc.lib
 LIBRARY     apgrfx.lib
@@ -81,8 +80,7 @@
 LIBRARY     aknskins.lib
 LIBRARY     aknskinsrv.lib
 LIBRARY     DownloadMgr.lib 
-LIBRARY		Centralrepository.lib
-
+LIBRARY	    Centralrepository.lib
 
 #ifdef __SERIES60_HELP
 LIBRARY         hlplch.lib 
--- a/codhandler/roapapp/inc/RoapAppLogger.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/codhandler/roapapp/inc/RoapAppLogger.h	Thu Jan 07 13:31:38 2010 +0200
@@ -17,7 +17,6 @@
 *
 */
 
-
 #ifndef ROAP_APP_LOGGER_H
 #define ROAP_APP_LOGGER_H
 
--- a/web_plat/browser_dialogs_provider_api/group/bld.inf	Thu Dec 17 09:20:16 2009 +0200
+++ b/web_plat/browser_dialogs_provider_api/group/bld.inf	Thu Jan 07 13:31:38 2010 +0200
@@ -21,7 +21,6 @@
 #include "../../../web_plat/browser_platform_api/inc/browser_platform_variant.hrh"
 
 PRJ_PLATFORMS
-
 DEFAULT
 
 PRJ_EXPORTS
--- a/web_plat/browser_platform_api/inc/Browser_platform_variant.hrh	Thu Dec 17 09:20:16 2009 +0200
+++ b/web_plat/browser_platform_api/inc/Browser_platform_variant.hrh	Thu Jan 07 13:31:38 2010 +0200
@@ -154,6 +154,10 @@
 // Defines Symbian HTTP stack parameters specific for symbian 9.3 (e.g. EHttpEnableOptimalPipelining, EHttpOptimalPipelining)
 //Flag need to be removed after this fix is supplied to Symbian 9.4
 #define BRDO_HTTP_STACK_93
+
+// Flag for Multiple Font Support(Times New Roman,Arial and Courier).This feature is available only for TB9.2   
+#define BRDO_BROWSER_MULTIPLE_FONT_SUPPORT
+
 /*
 * ===================
 *        S60 3.23
@@ -161,6 +165,9 @@
 */ 
 #if defined(__PLATFORM_VERSION_32__)
 
+// Flag for Multiple Font Support(Times New Roman,Arial and Courier).This feature is available only for TB9.2
+#undef BRDO_BROWSER_MULTIPLE_FONT_SUPPORT
+
 // Defines touch screen capability
 #undef BRDO_TOUCH_ENABLED_FF
 
@@ -207,23 +214,13 @@
 #define BRDO_ADDED_EXPORT_LOCATION(exported) MW_LAYER_DOMAIN_EXPORT_PATH(../platform/mw/##exported)
 #endif
 
-#define APP_LAYER_LIBC_SYSTEMINCLUDE SYSTEMINCLUDE  OS_LAYER_PUBLIC_EXPORT_PATH(libc)
-#define APP_LAYER_ECOM_SYSTEMINCLUDE SYSTEMINCLUDE  OS_LAYER_PUBLIC_EXPORT_PATH(ecom)
-#define APP_LAYER_HTTP_SYSTEMINCLUDE SYSTEMINCLUDE  OS_LAYER_PUBLIC_EXPORT_PATH(http)
-#define APP_LAYER_CONNECT_SYSTEMINCLUDE SYSTEMINCLUDE  OS_LAYER_PUBLIC_EXPORT_PATH(connect)
-#define APP_LAYER_SWI_SYSTEMINCLUDE SYSTEMINCLUDE  OS_LAYER_PUBLIC_EXPORT_PATH(swi)
-#define APP_LAYER_OSKERNEL_SYSTEMINCLUDE SYSTEMINCLUDE  OS_LAYER_PUBLIC_EXPORT_PATH(kernel)
-#define APP_LAYER_PUSH_SYSTEMINCLUDE SYSTEMINCLUDE  OS_LAYER_PUBLIC_EXPORT_PATH(push)
-#define APP_LAYER_STDAPIS_SYSTEMINCLUDE SYSTEMINCLUDE  OS_LAYER_PUBLIC_EXPORT_PATH(stdapis)
+#ifndef OS_LAYER_ESTLIB_SYSTEMINCLUDE
+#define OS_LAYER_ESTLIB_SYSTEMINCLUDE SYSTEMINCLUDE OS_LAYER_PUBLIC_EXPORT_PATH(libc)
+#endif
 
-#define MW_LAYER_LIBC_SYSTEMINCLUDE SYSTEMINCLUDE  OS_LAYER_PUBLIC_EXPORT_PATH(libc)
-#define MW_LAYER_ECOM_SYSTEMINCLUDE SYSTEMINCLUDE  OS_LAYER_PUBLIC_EXPORT_PATH(ecom)
-#define MW_LAYER_HTTP_SYSTEMINCLUDE SYSTEMINCLUDE  OS_LAYER_PUBLIC_EXPORT_PATH(http)
+#ifndef MW_LAYER_CONNECT_SYSTEMINCLUDE
 #define MW_LAYER_CONNECT_SYSTEMINCLUDE SYSTEMINCLUDE  OS_LAYER_PUBLIC_EXPORT_PATH(connect)
-#define MW_LAYER_SWI_SYSTEMINCLUDE SYSTEMINCLUDE  OS_LAYER_PUBLIC_EXPORT_PATH(swi)
-#define MW_LAYER_OSKERNEL_SYSTEMINCLUDE SYSTEMINCLUDE  OS_LAYER_PUBLIC_EXPORT_PATH(kernel)
-#define MW_LAYER_PUSH_SYSTEMINCLUDE SYSTEMINCLUDE  OS_LAYER_PUBLIC_EXPORT_PATH(push)
-#define MW_LAYER_STDAPIS_SYSTEMINCLUDE SYSTEMINCLUDE  OS_LAYER_PUBLIC_EXPORT_PATH(stdapis)
+#endif
 
 /*
 * ===================
@@ -232,6 +229,9 @@
 */ 
 #elif defined(__PLATFORM_VERSION_50_TUBE__)
 
+// Flag for Multiple Font Support(Times New Roman,Arial and Courier).This feature is available only for TB9.2
+#undef BRDO_BROWSER_MULTIPLE_FONT_SUPPORT
+
 // Defines must accumulate versions. ie for 5.01 you must define BRDO_BROWSER_50_FF and BRDO_BROWSER_501_FF(To be reviewed)
 // The assumption is that anything that worked in 3.2 will work in 5.0 and 5.01.  For anything doesn't work
 // in 3.2 but works in 5.0 and above, that code should be behind the BRDO_BROWSER_50_FF flag.
@@ -255,23 +255,18 @@
 #define BRDO_ADDED_EXPORT_LOCATION(exported) MW_LAYER_DOMAIN_EXPORT_PATH(../../platform/mw/##exported)
 #endif
 
-#define APP_LAYER_LIBC_SYSTEMINCLUDE SYSTEMINCLUDE  OS_LAYER_PUBLIC_EXPORT_PATH(../libc)
-#define APP_LAYER_ECOM_SYSTEMINCLUDE SYSTEMINCLUDE  OS_LAYER_PUBLIC_EXPORT_PATH(../ecom)
-#define APP_LAYER_HTTP_SYSTEMINCLUDE SYSTEMINCLUDE  OS_LAYER_PUBLIC_EXPORT_PATH(../http)
-#define APP_LAYER_CONNECT_SYSTEMINCLUDE SYSTEMINCLUDE  OS_LAYER_PUBLIC_EXPORT_PATH(../connect)
-#define APP_LAYER_SWI_SYSTEMINCLUDE SYSTEMINCLUDE  OS_LAYER_PUBLIC_EXPORT_PATH(../swi)
-#define APP_LAYER_OSKERNEL_SYSTEMINCLUDE SYSTEMINCLUDE  OS_LAYER_PUBLIC_EXPORT_PATH(../kernel)
-#define APP_LAYER_PUSH_SYSTEMINCLUDE SYSTEMINCLUDE  OS_LAYER_PUBLIC_EXPORT_PATH(../push)
-#define APP_LAYER_STDAPIS_SYSTEMINCLUDE SYSTEMINCLUDE  OS_LAYER_PUBLIC_EXPORT_PATH(../stdapis)
+#ifndef OS_LAYER_ESTLIB_SYSTEMINCLUDE
+#define OS_LAYER_ESTLIB_SYSTEMINCLUDE SYSTEMINCLUDE OS_LAYER_PUBLIC_EXPORT_PATH(../libc)
+#endif
 
-#define MW_LAYER_LIBC_SYSTEMINCLUDE SYSTEMINCLUDE  OS_LAYER_PUBLIC_EXPORT_PATH(../libc)
-#define MW_LAYER_ECOM_SYSTEMINCLUDE SYSTEMINCLUDE  OS_LAYER_PUBLIC_EXPORT_PATH(../ecom)
-#define MW_LAYER_HTTP_SYSTEMINCLUDE SYSTEMINCLUDE  OS_LAYER_PUBLIC_EXPORT_PATH(../http)
-#define MW_LAYER_CONNECT_SYSTEMINCLUDE SYSTEMINCLUDE  OS_LAYER_PUBLIC_EXPORT_PATH(../connect)
-#define MW_LAYER_SWI_SYSTEMINCLUDE SYSTEMINCLUDE  OS_LAYER_PUBLIC_EXPORT_PATH(../swi)
-#define MW_LAYER_OSKERNEL_SYSTEMINCLUDE SYSTEMINCLUDE  OS_LAYER_PUBLIC_EXPORT_PATH(../kernel)
-#define MW_LAYER_PUSH_SYSTEMINCLUDE SYSTEMINCLUDE  OS_LAYER_PUBLIC_EXPORT_PATH(../push)
-#define MW_LAYER_STDAPIS_SYSTEMINCLUDE SYSTEMINCLUDE  OS_LAYER_PUBLIC_EXPORT_PATH(../stdapis)
+#ifndef OS_LAYER_LIBC_SYSTEMINCLUDE
+#define OS_LAYER_LIBC_SYSTEMINCLUDE SYSTEMINCLUDE  OS_LAYER_PUBLIC_EXPORT_PATH(../stdapis) \
+                                                   OS_LAYER_PUBLIC_EXPORT_PATH(stdapis)
+#endif
+
+#ifndef MW_LAYER_CONNECT_SYSTEMINCLUDE
+#define MW_LAYER_CONNECT_SYSTEMINCLUDE SYSTEMINCLUDE  /epoc32/include/connect
+#endif
 
 // Defines Symbian HTTP stack parameters specific for symbian 9.3 (e.g. EHttpEnableOptimalPipelining, EHttpOptimalPipelining)
 //Flag need to be removed after this fix is supplied to Symbian 9.4
@@ -283,6 +278,9 @@
 */ 
 #elif defined(__PLATFORM_VERSION_50__)
 
+// Flag for Multiple Font Support(Times New Roman,Arial and Courier).This feature is available only for TB9.2
+#undef BRDO_BROWSER_MULTIPLE_FONT_SUPPORT
+
 // Defines must accumulate versions. ie for 5.01 you must define BRDO_BROWSER_50_FF and BRDO_BROWSER_501_FF(To be reviewed)
 // The assumption is that anything that worked in 3.2 will work in 5.0 and 5.01.  For anything doesn't work
 // in 3.2 but works in 5.0 and above, that code should be behind the BRDO_BROWSER_50_FF flag.
@@ -294,23 +292,13 @@
 #define BRDO_ADDED_EXPORT_LOCATION(exported) MW_LAYER_DOMAIN_EXPORT_PATH(../../platform/mw/##exported)
 #endif
 
-#define APP_LAYER_LIBC_SYSTEMINCLUDE SYSTEMINCLUDE  OS_LAYER_PUBLIC_EXPORT_PATH(../libc)
-#define APP_LAYER_ECOM_SYSTEMINCLUDE SYSTEMINCLUDE  OS_LAYER_PUBLIC_EXPORT_PATH(../ecom)
-#define APP_LAYER_HTTP_SYSTEMINCLUDE SYSTEMINCLUDE  OS_LAYER_PUBLIC_EXPORT_PATH(../http)
-#define APP_LAYER_CONNECT_SYSTEMINCLUDE SYSTEMINCLUDE  OS_LAYER_PUBLIC_EXPORT_PATH(../connect)
-#define APP_LAYER_SWI_SYSTEMINCLUDE SYSTEMINCLUDE  OS_LAYER_PUBLIC_EXPORT_PATH(../swi)
-#define APP_LAYER_OSKERNEL_SYSTEMINCLUDE SYSTEMINCLUDE  OS_LAYER_PUBLIC_EXPORT_PATH(../kernel)
-#define APP_LAYER_PUSH_SYSTEMINCLUDE SYSTEMINCLUDE  OS_LAYER_PUBLIC_EXPORT_PATH(../push)
-#define APP_LAYER_STDAPIS_SYSTEMINCLUDE SYSTEMINCLUDE  OS_LAYER_PUBLIC_EXPORT_PATH(../stdapis)
+#ifndef OS_LAYER_ESTLIB_SYSTEMINCLUDE
+#define OS_LAYER_ESTLIB_SYSTEMINCLUDE SYSTEMINCLUDE OS_LAYER_PUBLIC_EXPORT_PATH(../libc)
+#endif
 
-#define MW_LAYER_LIBC_SYSTEMINCLUDE SYSTEMINCLUDE  OS_LAYER_PUBLIC_EXPORT_PATH(../libc)
-#define MW_LAYER_ECOM_SYSTEMINCLUDE SYSTEMINCLUDE  OS_LAYER_PUBLIC_EXPORT_PATH(../ecom)
-#define MW_LAYER_HTTP_SYSTEMINCLUDE SYSTEMINCLUDE  OS_LAYER_PUBLIC_EXPORT_PATH(../http)
-#define MW_LAYER_CONNECT_SYSTEMINCLUDE SYSTEMINCLUDE  OS_LAYER_PUBLIC_EXPORT_PATH(../connect)
-#define MW_LAYER_SWI_SYSTEMINCLUDE SYSTEMINCLUDE  OS_LAYER_PUBLIC_EXPORT_PATH(../swi)
-#define MW_LAYER_OSKERNEL_SYSTEMINCLUDE SYSTEMINCLUDE  OS_LAYER_PUBLIC_EXPORT_PATH(../kernel)
-#define MW_LAYER_PUSH_SYSTEMINCLUDE SYSTEMINCLUDE  OS_LAYER_PUBLIC_EXPORT_PATH(../push)
-#define MW_LAYER_STDAPIS_SYSTEMINCLUDE SYSTEMINCLUDE  OS_LAYER_PUBLIC_EXPORT_PATH(../stdapis)
+#ifndef MW_LAYER_CONNECT_SYSTEMINCLUDE
+#define MW_LAYER_CONNECT_SYSTEMINCLUDE SYSTEMINCLUDE  /epoc32/include/connect
+#endif
 
 // Defines Symbian HTTP stack parameters specific for symbian 9.3 (e.g. EHttpEnableOptimalPipelining, EHttpOptimalPipelining)
 //Flag need to be removed after this fix is supplied to Symbian 9.4
@@ -322,29 +310,18 @@
 */ 
 #elif defined(__PLATFORM_VERSION_51__)
 
+// Flag for Multiple Font Support(Times New Roman,Arial and Courier).This feature is available only for TB9.2
+#undef BRDO_BROWSER_MULTIPLE_FONT_SUPPORT
+
 // Defines whether SAPI Security Manager Prompt Enhancement is available
 #undef BRDO_SEC_MGR_PROMPT_ENHANCEMENT_FF
 
 #define BRDO_BROWSER_50_FF
 #define BRDO_BROWSER_51_FF
 
-#define APP_LAYER_LIBC_SYSTEMINCLUDE SYSTEMINCLUDE  OS_LAYER_PUBLIC_EXPORT_PATH(libc)
-#define APP_LAYER_ECOM_SYSTEMINCLUDE SYSTEMINCLUDE  OS_LAYER_PUBLIC_EXPORT_PATH(ecom)
-#define APP_LAYER_HTTP_SYSTEMINCLUDE SYSTEMINCLUDE  OS_LAYER_PUBLIC_EXPORT_PATH(http)
-#define APP_LAYER_CONNECT_SYSTEMINCLUDE SYSTEMINCLUDE  OS_LAYER_PUBLIC_EXPORT_PATH(connect)
-#define APP_LAYER_SWI_SYSTEMINCLUDE SYSTEMINCLUDE  OS_LAYER_PUBLIC_EXPORT_PATH(swi)
-#define APP_LAYER_OSKERNEL_SYSTEMINCLUDE SYSTEMINCLUDE  OS_LAYER_PUBLIC_EXPORT_PATH(kernel)
-#define APP_LAYER_PUSH_SYSTEMINCLUDE SYSTEMINCLUDE  OS_LAYER_PUBLIC_EXPORT_PATH(push)
-#define APP_LAYER_STDAPIS_SYSTEMINCLUDE SYSTEMINCLUDE  OS_LAYER_PUBLIC_EXPORT_PATH(stdapis)
-
-#define MW_LAYER_LIBC_SYSTEMINCLUDE SYSTEMINCLUDE  OS_LAYER_PUBLIC_EXPORT_PATH(libc)
-#define MW_LAYER_ECOM_SYSTEMINCLUDE SYSTEMINCLUDE  OS_LAYER_PUBLIC_EXPORT_PATH(ecom)
-#define MW_LAYER_HTTP_SYSTEMINCLUDE SYSTEMINCLUDE  OS_LAYER_PUBLIC_EXPORT_PATH(http)
-#define MW_LAYER_CONNECT_SYSTEMINCLUDE SYSTEMINCLUDE  OS_LAYER_PUBLIC_EXPORT_PATH(connect)
-#define MW_LAYER_SWI_SYSTEMINCLUDE SYSTEMINCLUDE  OS_LAYER_PUBLIC_EXPORT_PATH(swi)
-#define MW_LAYER_OSKERNEL_SYSTEMINCLUDE SYSTEMINCLUDE  OS_LAYER_PUBLIC_EXPORT_PATH(kernel)
-#define MW_LAYER_PUSH_SYSTEMINCLUDE SYSTEMINCLUDE  OS_LAYER_PUBLIC_EXPORT_PATH(push)
-#define MW_LAYER_STDAPIS_SYSTEMINCLUDE SYSTEMINCLUDE  OS_LAYER_PUBLIC_EXPORT_PATH(stdapis)
+#ifndef OS_LAYER_ESTLIB_SYSTEMINCLUDE
+#define OS_LAYER_ESTLIB_SYSTEMINCLUDE SYSTEMINCLUDE OS_LAYER_PUBLIC_EXPORT_PATH(libc)
+#endif
 
 // Defines Symbian HTTP stack parameters specific for symbian 9.3 (e.g. EHttpEnableOptimalPipelining, EHttpOptimalPipelining)
 //Flag need to be removed after this fix is supplied to Symbian 9.4
@@ -373,23 +350,9 @@
 //Flag need to be removed after this fix is supplied to Symbian 9.4
 #undef BRDO_HTTP_STACK_93
 
-#define APP_LAYER_LIBC_SYSTEMINCLUDE SYSTEMINCLUDE  OS_LAYER_PUBLIC_EXPORT_PATH(libc)
-#define APP_LAYER_ECOM_SYSTEMINCLUDE SYSTEMINCLUDE  OS_LAYER_PUBLIC_EXPORT_PATH(ecom)
-#define APP_LAYER_HTTP_SYSTEMINCLUDE SYSTEMINCLUDE  OS_LAYER_PUBLIC_EXPORT_PATH(http)
-#define APP_LAYER_CONNECT_SYSTEMINCLUDE SYSTEMINCLUDE  OS_LAYER_PUBLIC_EXPORT_PATH(connect)
-#define APP_LAYER_SWI_SYSTEMINCLUDE SYSTEMINCLUDE  OS_LAYER_PUBLIC_EXPORT_PATH(swi)
-#define APP_LAYER_OSKERNEL_SYSTEMINCLUDE SYSTEMINCLUDE  OS_LAYER_PUBLIC_EXPORT_PATH(kernel)
-#define APP_LAYER_PUSH_SYSTEMINCLUDE SYSTEMINCLUDE  OS_LAYER_PUBLIC_EXPORT_PATH(push)
-#define APP_LAYER_STDAPIS_SYSTEMINCLUDE SYSTEMINCLUDE  OS_LAYER_PUBLIC_EXPORT_PATH(stdapis)
-
-#define MW_LAYER_LIBC_SYSTEMINCLUDE SYSTEMINCLUDE  OS_LAYER_PUBLIC_EXPORT_PATH(libc)
-#define MW_LAYER_ECOM_SYSTEMINCLUDE SYSTEMINCLUDE  OS_LAYER_PUBLIC_EXPORT_PATH(ecom)
-#define MW_LAYER_HTTP_SYSTEMINCLUDE SYSTEMINCLUDE  OS_LAYER_PUBLIC_EXPORT_PATH(http)
-#define MW_LAYER_CONNECT_SYSTEMINCLUDE SYSTEMINCLUDE  OS_LAYER_PUBLIC_EXPORT_PATH(connect)
-#define MW_LAYER_SWI_SYSTEMINCLUDE SYSTEMINCLUDE  OS_LAYER_PUBLIC_EXPORT_PATH(swi)
-#define MW_LAYER_OSKERNEL_SYSTEMINCLUDE SYSTEMINCLUDE  OS_LAYER_PUBLIC_EXPORT_PATH(kernel)
-#define MW_LAYER_PUSH_SYSTEMINCLUDE SYSTEMINCLUDE  OS_LAYER_PUBLIC_EXPORT_PATH(push)
-#define MW_LAYER_STDAPIS_SYSTEMINCLUDE SYSTEMINCLUDE  OS_LAYER_PUBLIC_EXPORT_PATH(stdapis)
+#ifndef OS_LAYER_ESTLIB_SYSTEMINCLUDE
+#define OS_LAYER_ESTLIB_SYSTEMINCLUDE SYSTEMINCLUDE OS_LAYER_PUBLIC_EXPORT_PATH(libc)
+#endif
 
 // Platform contains new Symbian Libxml implementation
 #define BRDO_SYMBIAN_LIBXML_FF
@@ -408,5 +371,4 @@
 #define BRDO_BROWSER_UPDATE_UI_FF 0
 #endif // KFeatureIdIAUpdate
 
-
 #endif // BROWSER_PLATFORM_VARIANT_HRH
--- a/web_plat/cod_handler_api/inc/HttpDownloadData.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/web_plat/cod_handler_api/inc/HttpDownloadData.h	Thu Jan 07 13:31:38 2010 +0200
@@ -15,8 +15,6 @@
 *
 */
 
-
-
 #ifndef HTTPDOWNLOADDATA_H
 #define HTTPDOWNLOADDATA_H
 
--- a/web_plat/connection_manager_api/group/bld.inf	Thu Dec 17 09:20:16 2009 +0200
+++ b/web_plat/connection_manager_api/group/bld.inf	Thu Jan 07 13:31:38 2010 +0200
@@ -21,7 +21,6 @@
 DEFAULT
 
 PRJ_EXPORTS
-
 ../inc/internetconnectionmanager.h     MW_LAYER_PLATFORM_EXPORT_PATH(internetconnectionmanager.h)
 ../inc/mconnection.h                   MW_LAYER_PLATFORM_EXPORT_PATH(mconnection.h)
 ../inc/connectionobservers.h           MW_LAYER_PLATFORM_EXPORT_PATH(connectionobservers.h)
--- a/web_plat/connection_manager_api/inc/InternetConnectionManager.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/web_plat/connection_manager_api/inc/InternetConnectionManager.h	Thu Jan 07 13:31:38 2010 +0200
@@ -244,6 +244,12 @@
         * @return none.
         */
         IMPORT_C void ShowConnectionChangedDlg();
+        
+        /**
+        * Cancels the connection.
+        * @return none.
+        */         
+         virtual void CancelConnection();
 	
 	public:
 
@@ -396,7 +402,7 @@
 		/**
 		*Utility functions that are used to establish a connection with a snap Id
 		*/
- 		TInt ConnectWithSnapId(TUint32 aRequestedSnapId);
+ 		TInt ConnectWithSnapIdL(TUint32 aRequestedSnapId);
  		
  		TInt ConnectSnapWithoutCheckL(TUint32 aRequestedSnapId);
 		 
--- a/web_plat/cxml_library_api/inc/cxml_file_if.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/web_plat/cxml_library_api/inc/cxml_file_if.h	Thu Jan 07 13:31:38 2010 +0200
@@ -15,12 +15,10 @@
 *
 */
 
-
-
 #ifndef _CXML_FILE_IF_H_
 #define _CXML_FILE_IF_H_
 
-#include "cxml_proj.h"
+#include <cxml_proj.h>
 
 #ifdef __cplusplus
 extern "C" {
--- a/web_plat/cxml_library_api/inc/cxml_nw2cxmlTypes.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/web_plat/cxml_library_api/inc/cxml_nw2cxmlTypes.h	Thu Jan 07 13:31:38 2010 +0200
@@ -19,7 +19,7 @@
 #ifndef CXML_NW2CXMLTYPES_H
 #define CXML_NW2CXMLTYPES_H
 
-#include "cxml_type_def.h"
+#include <cxml_type_def.h>
 
 #ifdef __cplusplus
 extern "C"
--- a/web_plat/cxml_library_api/inc/cxml_proj.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/web_plat/cxml_library_api/inc/cxml_proj.h	Thu Jan 07 13:31:38 2010 +0200
@@ -27,16 +27,14 @@
 #ifndef CXML_PROJ_H
 #define CXML_PROJ_H
 
-
-
 #ifndef NOKIA_MOBILE_BROWSER
 
-#include "cxml_nw2cxmlTypes.h"
+#include <cxml_nw2cxmlTypes.h>
 #endif
 
 #include <nwx_status.h>
 
-#include "cxml_type_def.h"
+#include <cxml_type_def.h>
 
 #ifdef __cplusplus
 extern "C"
--- a/web_plat/cxml_library_api/inc/cxml_str.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/web_plat/cxml_library_api/inc/cxml_str.h	Thu Jan 07 13:31:38 2010 +0200
@@ -31,7 +31,7 @@
 /*
 ** Includes
 */
-#include "cxml_type_def.h"
+#include <cxml_type_def.h>
 
 CXML_Ucs2 CXML_Str_ToLower(const CXML_Ucs2 ch);
 CXML_Ucs2 CXML_Str_ToUpper(const CXML_Ucs2 ch);
--- a/web_plat/cxml_library_api/inc/nw_cXML_Parser.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/web_plat/cxml_library_api/inc/nw_cXML_Parser.h	Thu Jan 07 13:31:38 2010 +0200
@@ -15,8 +15,6 @@
 *
 */
 
-
-
 #ifndef NW_CXML_PARSER_H
 #define NW_CXML_PARSER_H
 
@@ -24,7 +22,6 @@
 
 // This header file includes all public API headers for the cXML Parser.
 
-
 #include <nw_xmlp_xmlreader.h>
 #include <nw_xmlp_xmlparser.h>
 #include <nw_wbxml_reader.h>
--- a/web_plat/cxml_library_api/inc/nw_dom.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/web_plat/cxml_library_api/inc/nw_dom.h	Thu Jan 07 13:31:38 2010 +0200
@@ -19,8 +19,8 @@
 #ifndef NW_DOM_H
 #define NW_DOM_H
 
-#include "cxml_proj.h"
-#include "nw_wbxml_parse.h"
+#include <cxml_proj.h>
+#include <nw_wbxml_parse.h>
 
 #ifdef __cplusplus
 extern "C" {
--- a/web_plat/cxml_library_api/inc/nw_dom_attribute.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/web_plat/cxml_library_api/inc/nw_dom_attribute.h	Thu Jan 07 13:31:38 2010 +0200
@@ -27,15 +27,14 @@
 #ifndef NW_DOM_ATTRIBUTE_H
 #define NW_DOM_ATTRIBUTE_H
 
-#include "cxml_proj.h"
-#include "nw_dom_node.h"
-#include "nw_tinytree.h"
+#include <cxml_proj.h>
+#include <nw_dom_node.h>
+#include <nw_tinytree.h>
 
 #ifdef __cplusplus
 extern "C" {
 #endif /* __cplusplus */
 
-
 /** ----------------------------------------------------------------------- **
     @struct:      NW_DOM_AttributeListIterator
 
--- a/web_plat/cxml_library_api/inc/nw_dom_document.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/web_plat/cxml_library_api/inc/nw_dom_document.h	Thu Jan 07 13:31:38 2010 +0200
@@ -15,7 +15,6 @@
 *
 */
 
-
 /** ----------------------------------------------------------------------- **
     @package:     NW_DOM
 
@@ -27,11 +26,11 @@
 #ifndef NW_DOM_DOCUMENT_H
 #define NW_DOM_DOCUMENT_H
 
-#include "cxml_proj.h"
-#include "nw_dom_node.h"
-#include "nw_dom_text.h"
-#include "nw_dom_element.h"
-#include "nw_wbxml_dictionary.h"
+#include <cxml_proj.h>
+#include <nw_dom_node.h>
+#include <nw_dom_text.h>
+#include <nw_dom_element.h>
+#include <nw_wbxml_dictionary.h>
 
 #ifdef __cplusplus
 extern "C" {
--- a/web_plat/cxml_library_api/inc/nw_dom_element.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/web_plat/cxml_library_api/inc/nw_dom_element.h	Thu Jan 07 13:31:38 2010 +0200
@@ -27,8 +27,8 @@
 #ifndef NW_DOM_ELEMENT_H
 #define NW_DOM_ELEMENT_H
 
-#include "nw_dom_node.h"
-#include "nw_dom_attribute.h"
+#include <nw_dom_node.h>
+#include <nw_dom_attribute.h>
 
 #ifdef __cplusplus
 extern "C" {
--- a/web_plat/cxml_library_api/inc/nw_dom_node.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/web_plat/cxml_library_api/inc/nw_dom_node.h	Thu Jan 07 13:31:38 2010 +0200
@@ -15,7 +15,6 @@
 *
 */
 
-
 /** ----------------------------------------------------------------------- **
     @package:     NW_DOM
 
@@ -27,9 +26,9 @@
 #ifndef NW_DOM_NODE_H
 #define NW_DOM_NODE_H
 
-#include "nw_tinytree.h"
-#include "nw_tinydom.h"
-#include "nw_string_string.h"
+#include <nw_tinytree.h>
+#include <nw_tinydom.h>
+#include <nw_string_string.h>
 
 #ifdef __cplusplus
 extern "C" {
--- a/web_plat/cxml_library_api/inc/nw_dom_text.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/web_plat/cxml_library_api/inc/nw_dom_text.h	Thu Jan 07 13:31:38 2010 +0200
@@ -27,14 +27,13 @@
 #ifndef NW_DOM_TEXT_H
 #define NW_DOM_TEXT_H
 
-#include "cxml_proj.h"
-#include "nw_dom_node.h"
+#include <cxml_proj.h>
+#include <nw_dom_node.h>
 
 #ifdef __cplusplus
 extern "C" {
 #endif /* __cplusplus */
 
-
 /** ----------------------------------------------------------------------- **
     @typedef:     NW_DOM_TextItemIterator
 
--- a/web_plat/cxml_library_api/inc/nw_encoder_domencoder.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/web_plat/cxml_library_api/inc/nw_encoder_domencoder.h	Thu Jan 07 13:31:38 2010 +0200
@@ -15,7 +15,6 @@
 *
 */
 
-
 /** ----------------------------------------------------------------------- **
     @package:     NW_Encoder
 
@@ -27,19 +26,18 @@
 #ifndef _NW_ENCODER_WRITER_HEADER_GUARD_
 #define _NW_ENCODER_WRITER_HEADER_GUARD_
 
-#include "nw_encoder_stringtable.h"
-#include "nw_encoder_wbxmlwriter.h"
-#include "nw_dom_attribute.h"
-#include "nw_dom_element.h"
-#include "nw_dom_text.h"
-#include "nw_dom_document.h"
+#include <nw_encoder_stringtable.h>
+#include <nw_encoder_wbxmlwriter.h>
+#include <nw_dom_attribute.h>
+#include <nw_dom_element.h>
+#include <nw_dom_text.h>
+#include <nw_dom_document.h>
 
 #ifdef __cplusplus
 extern "C"
 {
 #endif /* __cplusplus */
 
-
 #define MEMORY_INCREMENT 100
 
 /** ----------------------------------------------------------------------- **
--- a/web_plat/cxml_library_api/inc/nw_encoder_stringtable.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/web_plat/cxml_library_api/inc/nw_encoder_stringtable.h	Thu Jan 07 13:31:38 2010 +0200
@@ -15,7 +15,6 @@
 *
 */
 
-
 /** ----------------------------------------------------------------------- **
     @package:     NW_Encoder
 
@@ -28,9 +27,9 @@
 #ifndef _NW_ENCODER_STRING_TABLE_HEADER_GUARD_
 #define _NW_ENCODER_STRING_TABLE_HEADER_GUARD_
 
-#include "nw_string_string.h"
-#include "nw_tinytree.h"
-#include "nw_wbxml_dictionary.h"
+#include <nw_string_string.h>
+#include <nw_tinytree.h>
+#include <nw_wbxml_dictionary.h>
 
 #ifdef __cplusplus
 extern "C"
@@ -51,7 +50,6 @@
  ** ----------------------------------------------------------------------- **/
 typedef NW_TinyTree_Node_t NW_DOM_DocumentNode_t;
 
-
 /*
  * StringItem methods
  */
--- a/web_plat/cxml_library_api/inc/nw_encoder_wbxmlwriter.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/web_plat/cxml_library_api/inc/nw_encoder_wbxmlwriter.h	Thu Jan 07 13:31:38 2010 +0200
@@ -28,7 +28,7 @@
 #ifndef NW_WBXMLWRITER_H
 #define NW_WBXMLWRITER_H
 
-#include "nw_wbxml_dictionary.h"
+#include <nw_wbxml_dictionary.h>
 
 #ifdef __cplusplus
 extern "C" {
--- a/web_plat/cxml_library_api/inc/nw_string_char.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/web_plat/cxml_library_api/inc/nw_string_char.h	Thu Jan 07 13:31:38 2010 +0200
@@ -29,7 +29,7 @@
 #ifndef NW_STRING_CHARACTER_H
 #define NW_STRING_CHARACTER_H
 
-#include "cxml_proj.h"
+#include <cxml_proj.h>
 
 #ifdef __cplusplus
 extern "C" {
--- a/web_plat/cxml_library_api/inc/nw_string_string.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/web_plat/cxml_library_api/inc/nw_string_string.h	Thu Jan 07 13:31:38 2010 +0200
@@ -15,7 +15,6 @@
 *
 */
 
-
 /** ----------------------------------------------------------------------- **
     @package:     NW_String
 
@@ -28,15 +27,14 @@
 #ifndef NW_STRING_STRING_H
 #define NW_STRING_STRING_H
 
-#include "cxml_proj.h"
-#include "nw_string_char.h"
+#include <cxml_proj.h>
+#include <nw_string_char.h>
 
 #ifdef __cplusplus
 extern "C"
 {
 #endif /* __cplusplus */
 
-
 /** ----------------------------------------------------------------------- **
     @struct:      NW_String_String
 
--- a/web_plat/cxml_library_api/inc/nw_tinydom.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/web_plat/cxml_library_api/inc/nw_tinydom.h	Thu Jan 07 13:31:38 2010 +0200
@@ -28,26 +28,22 @@
 #ifndef NW_TINY_DOM_H
 #define NW_TINY_DOM_H
 
-#include "cxml_proj.h"
-#include "nw_tinytree.h"
-#include "nw_wbxml_document.h"
-#include "nw_wbxml_parse.h"
-#include "nw_wbxml_opaque.h"
-#include "nw_encoder_wbxmlwriter.h"
+#include <cxml_proj.h>
+#include <nw_tinytree.h>
+#include <nw_wbxml_document.h>
+#include <nw_wbxml_parse.h>
+#include <nw_wbxml_opaque.h>
+#include <nw_encoder_wbxmlwriter.h>
 
 #ifdef __cplusplus
 extern "C" {
 #endif /* __cplusplus */
 
-
-
-
 enum NW_TinyDom_ExtensionType_e {
   NW_TINYDOM_EXTENSION_TYPE_NORMAL,
   NW_TINYDOM_EXTENSION_TYPE_EXT_T_INTEGER
 };
 
-
 /** ----------------------------------------------------------------------- **
     @struct:      NW_TinyDom_Extension
 
--- a/web_plat/cxml_library_api/inc/nw_tinydom_utils.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/web_plat/cxml_library_api/inc/nw_tinydom_utils.h	Thu Jan 07 13:31:38 2010 +0200
@@ -15,7 +15,6 @@
 *
 */
 
-
 /** ----------------------------------------------------------------------- **
     @package:     NW_TinyDom
 
@@ -28,10 +27,10 @@
 #ifndef TINY_DOM_UTILS_H
 #define TINY_DOM_UTILS_H
 
-#include "nw_wbxml_parse.h"
-#include "nw_tinydom.h" 
-#include "nw_encoder_wbxmlwriter.h"
-#include "nw_dom_document.h"
+#include <nw_wbxml_parse.h>
+#include <nw_tinydom.h> 
+#include <nw_encoder_wbxmlwriter.h>
+#include <nw_dom_document.h>
 
 #ifdef __cplusplus
 extern "C"
--- a/web_plat/cxml_library_api/inc/nw_tinytree.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/web_plat/cxml_library_api/inc/nw_tinytree.h	Thu Jan 07 13:31:38 2010 +0200
@@ -29,15 +29,14 @@
 #ifndef NW_TINY_TREE_H
 #define NW_TINY_TREE_H
 
-#include "cxml_proj.h"
-#include "nw_tinytree_treevector.h"
-#include "nw_tinytree_ebuffer.h"
+#include <cxml_proj.h>
+#include <nw_tinytree_treevector.h>
+#include <nw_tinytree_ebuffer.h>
 
 #ifdef __cplusplus
 extern "C" {
 #endif /* __cplusplus */
 
-
 /* ----------------------------------------------------------------------- **
    Tiny tree definitions   
 ** ----------------------------------------------------------------------- **/
--- a/web_plat/cxml_library_api/inc/nw_tinytree_ebuffer.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/web_plat/cxml_library_api/inc/nw_tinytree_ebuffer.h	Thu Jan 07 13:31:38 2010 +0200
@@ -28,7 +28,7 @@
 #ifndef NW_TINYTREE_EBUFFER_H
 #define NW_TINYTREE_EBUFFER_H
 
-#include "cxml_proj.h"
+#include <cxml_proj.h>
 
 #ifdef __cplusplus
 extern "C" {
--- a/web_plat/cxml_library_api/inc/nw_tinytree_treevector.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/web_plat/cxml_library_api/inc/nw_tinytree_treevector.h	Thu Jan 07 13:31:38 2010 +0200
@@ -28,14 +28,12 @@
 #ifndef NW_TINYTREE_TREEVECTOR_H
 #define NW_TINYTREE_TREEVECTOR_H
 
-#include "cxml_proj.h"
-
+#include <cxml_proj.h>
 
 #ifdef __cplusplus
 extern "C" {
 #endif /* __cplusplus */
   
-
 typedef struct NW_TinyTree_TinyTree_s NW_TinyTree_t;
 
 /** ----------------------------------------------------------------------- **
--- a/web_plat/cxml_library_api/inc/nw_wbxml_dictionary.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/web_plat/cxml_library_api/inc/nw_wbxml_dictionary.h	Thu Jan 07 13:31:38 2010 +0200
@@ -28,8 +28,8 @@
 #ifndef NW_PARSER_WBXML_DICTIONARY_H
 #define NW_PARSER_WBXML_DICTIONARY_H
 
-#include "cxml_proj.h"
-#include "nw_string_string.h"
+#include <cxml_proj.h>
+#include <nw_string_string.h>
 
 #ifdef __cplusplus
 extern "C"
--- a/web_plat/cxml_library_api/inc/nw_wbxml_document.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/web_plat/cxml_library_api/inc/nw_wbxml_document.h	Thu Jan 07 13:31:38 2010 +0200
@@ -28,9 +28,9 @@
 #ifndef NW_PARSER_WBXML_DOCUMENT_H
 #define NW_PARSER_WBXML_DOCUMENT_H
 
-#include "cxml_proj.h"
-#include "nw_string_string.h"
-#include "nw_encoder_stringtable.h"
+#include <cxml_proj.h>
+#include <nw_string_string.h>
+#include <nw_encoder_stringtable.h>
 
 #ifdef __cplusplus
 extern "C" {
--- a/web_plat/cxml_library_api/inc/nw_wbxml_event.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/web_plat/cxml_library_api/inc/nw_wbxml_event.h	Thu Jan 07 13:31:38 2010 +0200
@@ -28,8 +28,8 @@
 #ifndef NW_PARSER_WBXML_EVENT_H
 #define NW_PARSER_WBXML_EVENT_H
 
-#include "nw_wbxml_document.h"
-#include "cxml_proj.h"
+#include <cxml_proj.h>
+#include <nw_wbxml_document.h>
 
 #ifdef __cplusplus
 extern "C" {
--- a/web_plat/cxml_library_api/inc/nw_wbxml_opaque.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/web_plat/cxml_library_api/inc/nw_wbxml_opaque.h	Thu Jan 07 13:31:38 2010 +0200
@@ -28,7 +28,7 @@
 #ifndef NW_PARSER_WBXML_OPAQUE_H
 #define NW_PARSER_WBXML_OPAQUE_H
 
-#include "cxml_proj.h"
+#include <cxml_proj.h>
 
 #ifdef __cplusplus
 extern "C" {
--- a/web_plat/cxml_library_api/inc/nw_wbxml_parse.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/web_plat/cxml_library_api/inc/nw_wbxml_parse.h	Thu Jan 07 13:31:38 2010 +0200
@@ -28,15 +28,14 @@
 #ifndef NW_PARSER_WBXML_PARSE_H
 #define NW_PARSER_WBXML_PARSE_H
 
-#include "cxml_proj.h"
-#include "nw_wbxml_token.h"
-#include "nw_wbxml_event.h"
+#include <cxml_proj.h>
+#include <nw_wbxml_token.h>
+#include <nw_wbxml_event.h>
 
 #ifdef __cplusplus
 extern "C" {
 #endif /* __cplusplus */
 
-
 /** ----------------------------------------------------------------------- **
     @struct:      NW_WBXML_CP_Registry_Entry
 
--- a/web_plat/cxml_library_api/inc/nw_wbxml_reader.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/web_plat/cxml_library_api/inc/nw_wbxml_reader.h	Thu Jan 07 13:31:38 2010 +0200
@@ -32,16 +32,15 @@
 #ifndef NW_PARSER_WBXML_READER_H
 #define NW_PARSER_WBXML_READER_H
 
-#include "cxml_proj.h"
-#include "nw_wbxml_document.h"
-#include "nw_wbxml_opaque.h"
-#include "nw_wbxml_parse.h"
+#include <cxml_proj.h>
+#include <nw_wbxml_document.h>
+#include <nw_wbxml_opaque.h>
+#include <nw_wbxml_parse.h>
 
 #ifdef __cplusplus
 extern "C" {
 #endif /* __cplusplus */
 
-
 /* The "parser-reader" interface */
 
 /** ----------------------------------------------------------------------- **
--- a/web_plat/cxml_library_api/inc/nw_wbxml_token.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/web_plat/cxml_library_api/inc/nw_wbxml_token.h	Thu Jan 07 13:31:38 2010 +0200
@@ -15,7 +15,6 @@
 *
 */
 
-
 /** ----------------------------------------------------------------------- **
     @package:     NW_WBXML
 
@@ -28,15 +27,14 @@
 #ifndef NW_PARSER_WBXML_TOKEN_H
 #define NW_PARSER_WBXML_TOKEN_H
 
-#include "cxml_proj.h"
-#include "nw_string_string.h"
+#include <cxml_proj.h>
+#include <nw_string_string.h>
 
 #ifdef __cplusplus
 extern "C"
 {
 #endif /* __cplusplus */
 
-
 /*
  * WBXML global tokens, section 7
  */
--- a/web_plat/cxml_library_api/inc/nw_xmlp_xmlp2wbxml.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/web_plat/cxml_library_api/inc/nw_xmlp_xmlp2wbxml.h	Thu Jan 07 13:31:38 2010 +0200
@@ -28,7 +28,7 @@
 #ifndef NW_XMLP2WBXML_H
 #define NW_XMLP2WBXML_H
 
-#include "nw_xmlp_xmlreader.h"
+#include <nw_xmlp_xmlreader.h>
 
 #ifdef __cplusplus
 extern "C" {
--- a/web_plat/cxml_library_api/inc/nw_xmlp_xmlparser.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/web_plat/cxml_library_api/inc/nw_xmlp_xmlparser.h	Thu Jan 07 13:31:38 2010 +0200
@@ -28,7 +28,7 @@
 #ifndef NW_XMLPARSER_H
 #define NW_XMLPARSER_H
 
-#include "nw_xmlp_xmlreader.h"
+#include <nw_xmlp_xmlreader.h>
 
 #ifdef __cplusplus
 extern "C" {
--- a/web_plat/cxml_library_api/inc/nw_xmlp_xmlreader.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/web_plat/cxml_library_api/inc/nw_xmlp_xmlreader.h	Thu Jan 07 13:31:38 2010 +0200
@@ -28,7 +28,7 @@
 #ifndef NW_XML_READER_H
 #define NW_XML_READER_H
 
-#include "cxml_proj.h"
+#include <cxml_proj.h>
 /** ----------------------------------------------------------------------- **
     @enum:        NW_XML_Endianness
 
--- a/web_plat/cxml_library_api/inc/nwx_status.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/web_plat/cxml_library_api/inc/nwx_status.h	Thu Jan 07 13:31:38 2010 +0200
@@ -15,7 +15,6 @@
 *
 */
 
-
 /***************************************************************************
 **   File: nwx_status.h
 **   Purpose: Contains definitions of status values common throughout 
--- a/web_plat/download_mgr_client_api_extn/inc/DownloadMgrClientApiExt.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/web_plat/download_mgr_client_api_extn/inc/DownloadMgrClientApiExt.h	Thu Jan 07 13:31:38 2010 +0200
@@ -15,14 +15,10 @@
 *
 */
 
-
-
 #ifndef __RHTTPDOWNLOADMGRAPIEXT_H__
 #define __RHTTPDOWNLOADMGRAPIEXT_H__
 
-
-#include "downloadmgrclient.h"
-
+#include <downloadmgrclient.h>
 
 /**
  *  API Extensions for RHttpDownloadMgr
--- a/web_plat/feeds_engine_api/group/bld.inf	Thu Dec 17 09:20:16 2009 +0200
+++ b/web_plat/feeds_engine_api/group/bld.inf	Thu Jan 07 13:31:38 2010 +0200
@@ -14,6 +14,7 @@
 * Description:  Build information for the Feeds Server Api
 *
 */
+
 #include <platform_paths.hrh>
 #include "../../../web_plat/browser_platform_api/inc/browser_platform_variant.hrh"
 
@@ -21,7 +22,6 @@
 DEFAULT
 
 PRJ_EXPORTS
-
 ../inc/feedsserverclient.h          MW_LAYER_PLATFORM_EXPORT_PATH(feedsserverclient.h)
 ../inc/feedsserverfeed.h            MW_LAYER_PLATFORM_EXPORT_PATH(feedsserverfeed.h)
 ../inc/feedsserverfolderitem.h      MW_LAYER_PLATFORM_EXPORT_PATH(feedsserverfolderitem.h)
--- a/web_plat/feeds_engine_api/inc/FeedsInterface.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/web_plat/feeds_engine_api/inc/FeedsInterface.h	Thu Jan 07 13:31:38 2010 +0200
@@ -15,7 +15,6 @@
  *
 */
 
-
 #ifndef FEED_INTERFACE_H
 #define FEED_INTERFACE_H
 
@@ -23,10 +22,11 @@
 #include <e32std.h>
 #include <e32base.h>
 #include <ApEngineconsts.h>
-//#include "Transaction.h"
-#include "FeedsEntity.h"
-#include "FeedAttributes.h"
-#include "FolderAttributes.h"
+//#include <transaction.h>
+#include <feedsentity.h>
+#include <feedattributes.h>
+#include <folderattributes.h>
+
 // CONSTANTS
 
 // MACROS
--- a/web_plat/feeds_engine_api/inc/FeedsServerClient.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/web_plat/feeds_engine_api/inc/FeedsServerClient.h	Thu Jan 07 13:31:38 2010 +0200
@@ -15,7 +15,6 @@
 *
 */
 
-
 #ifndef FEEDS_SERVER_CLIENT_H
 #define FEEDS_SERVER_CLIENT_H
 
@@ -28,9 +27,9 @@
 #include <FeedsServerSettings.h>
 
 //API changes
-#include "FeedsInterface.h"
-#include "FeedsMap.h"
-#include "Transaction.h"
+#include <feedsinterface.h>
+#include <feedsmap.h>
+#include <transaction.h>
 
 // CONSTANTS
 
@@ -42,7 +41,6 @@
 
 // FORWARD DECLARATIONS
 
-
 // CLASS DECLARATION
    class CClientRequestHandler;
 /**
--- a/web_plat/feeds_engine_api/inc/FeedsServerFeed.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/web_plat/feeds_engine_api/inc/FeedsServerFeed.h	Thu Jan 07 13:31:38 2010 +0200
@@ -15,7 +15,6 @@
 *
 */
 
-
 #ifndef FEEDS_SERVER_FEED_H
 #define FEEDS_SERVER_FEED_H
 
@@ -25,16 +24,14 @@
 
 #include <FeedsServerRequestHandler.h>
 #include <FeedsServerMsg.h>
-#include "FeedsEntity.h"
-
-#include "LeakTracker.h"
-#include "Transaction.h"
+#include <feedsentity.h>
+#include <leaktracker.h>
+#include <transaction.h>
 
 // CONSTANTS
 
 // MACROS
 
-
 // FUNCTION PROTOTYPES
 
 // FORWARD DECLARATIONS
--- a/web_plat/feeds_engine_api/inc/FeedsServerFolderItem.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/web_plat/feeds_engine_api/inc/FeedsServerFolderItem.h	Thu Jan 07 13:31:38 2010 +0200
@@ -15,7 +15,6 @@
 *
 */
 
-
 #ifndef FEEDS_SERVER_FOLDER_ITEM_H
 #define FEEDS_SERVER_FOLDER_ITEM_H
 
@@ -24,10 +23,9 @@
 #include <e32std.h>
 
 #include <FeedsServerRequestHandler.h>
-#include "FeedsEntity.h"
-#include "LeakTracker.h"
-
-#include "Transaction.h"
+#include <feedsentity.h>
+#include <leaktracker.h>
+#include <transaction.h>
 
 // CONSTANTS
 
--- a/web_plat/feeds_engine_api/inc/FeedsServerRequestHandler.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/web_plat/feeds_engine_api/inc/FeedsServerRequestHandler.h	Thu Jan 07 13:31:38 2010 +0200
@@ -23,7 +23,7 @@
 #include <e32base.h>
 #include <e32std.h>
 
-#include <ConnectionObserver.h>
+#include <connectionobserver.h>
 
 // CONSTANTS
 
--- a/web_plat/feeds_engine_api/inc/Transaction.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/web_plat/feeds_engine_api/inc/Transaction.h	Thu Jan 07 13:31:38 2010 +0200
@@ -15,7 +15,6 @@
  *
 */
 
-
 #ifndef TRANSACTION_H
 #define TRANSACTION_H
 
@@ -24,10 +23,9 @@
 #include <e32std.h>
 
 #include <ApEngineconsts.h>
-#include "FeedsServerMsg.h"
-
-#include "FeedsEntity.h"
-#include "FeedsInterface.h"
+#include <feedsservermsg.h>
+#include <feedsentity.h>
+#include <feedsinterface.h>
 
 // CONSTANTS
 
--- a/web_plat/launcher_api/group/bld.inf	Thu Dec 17 09:20:16 2009 +0200
+++ b/web_plat/launcher_api/group/bld.inf	Thu Jan 07 13:31:38 2010 +0200
@@ -21,17 +21,14 @@
 #include "../../../web_plat/browser_platform_api/inc/browser_platform_variant.hrh"
 
 PRJ_PLATFORMS
-
 DEFAULT
 
 PRJ_EXPORTS
-
 ../inc/browserlauncher.h                MW_LAYER_PLATFORM_EXPORT_PATH(browserlauncher.h)
 ../inc/downloadedcontenthandler.h       MW_LAYER_PLATFORM_EXPORT_PATH(downloadedcontenthandler.h)
 ../inc/browseroverriddensettings.h      MW_LAYER_PLATFORM_EXPORT_PATH(browseroverriddensettings.h)
 ../inc/browseroverriddensettings.inl    MW_LAYER_PLATFORM_EXPORT_PATH(browseroverriddensettings.inl)
+
 PRJ_MMPFILES
 
 // End of file
-
-
--- a/web_plat/multipart_parser_api/inc/MultipartParser.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/web_plat/multipart_parser_api/inc/MultipartParser.h	Thu Jan 07 13:31:38 2010 +0200
@@ -15,21 +15,16 @@
 *
 */
 
-
-
 #ifndef MULTIPARTPARSER_H
 #define MULTIPARTPARSER_H
 
 //  INCLUDES
-#include "BodyPart.h"
-
+#include <bodypart.h>
 
 //  CONSTANTS
 
-
 // DATA TYPES
 
-
 // FORWARD DECLARATIONS
 class CBodyPart;
 
--- a/web_plat/recent_url_store_api/group/bld.inf	Thu Dec 17 09:20:16 2009 +0200
+++ b/web_plat/recent_url_store_api/group/bld.inf	Thu Jan 07 13:31:38 2010 +0200
@@ -21,7 +21,6 @@
 DEFAULT
 
 PRJ_EXPORTS
-
 ../inc/recenturlstore.h  MW_LAYER_PLATFORM_EXPORT_PATH(recenturlstore.h)
 
 PRJ_MMPFILES
--- a/web_plat/rt_gesturehelper_api/group/bld.inf	Thu Dec 17 09:20:16 2009 +0200
+++ b/web_plat/rt_gesturehelper_api/group/bld.inf	Thu Jan 07 13:31:38 2010 +0200
@@ -21,10 +21,7 @@
 DEFAULT
 
 PRJ_EXPORTS
-
 ../inc/rt_gesturehelper.h    MW_LAYER_PLATFORM_EXPORT_PATH(rt_gesturehelper.h)
 ../inc/rt_gestureobserver.h  MW_LAYER_PLATFORM_EXPORT_PATH(rt_gestureobserver.h)
 
 PRJ_MMPFILES
-
-
--- a/web_plat/scheme_handler_plugin_api/group/bld.inf	Thu Dec 17 09:20:16 2009 +0200
+++ b/web_plat/scheme_handler_plugin_api/group/bld.inf	Thu Jan 07 13:31:38 2010 +0200
@@ -17,7 +17,6 @@
 *
 */
 
-
 #include <platform_paths.hrh>
 #include "../../../web_plat/browser_platform_api/inc/browser_platform_variant.hrh"
 
@@ -34,5 +33,3 @@
 #endif
 
 PRJ_MMPFILES
-
-
--- a/web_plat/scheme_handler_plugin_api/inc/SchemeHandler.inl	Thu Dec 17 09:20:16 2009 +0200
+++ b/web_plat/scheme_handler_plugin_api/inc/SchemeHandler.inl	Thu Jan 07 13:31:38 2010 +0200
@@ -21,7 +21,7 @@
 // INCLUDE FILES
 
 #include <SchemeDefs.hrh>
-#include <ECom.h>		// For REComSession
+#include <ecom/ecom.h>		// For REComSession
 
 // ================= CONSTANTS =======================
 
--- a/web_plat/scriptable_plugin_api/group/bld.inf	Thu Dec 17 09:20:16 2009 +0200
+++ b/web_plat/scriptable_plugin_api/group/bld.inf	Thu Jan 07 13:31:38 2010 +0200
@@ -21,7 +21,6 @@
 DEFAULT
 
 PRJ_EXPORTS
-
 ../inc/npscript.h  MW_LAYER_PLATFORM_EXPORT_PATH(npscript.h)
 
 PRJ_MMPFILES
--- a/web_plat/webutils_api/group/bld.inf	Thu Dec 17 09:20:16 2009 +0200
+++ b/web_plat/webutils_api/group/bld.inf	Thu Jan 07 13:31:38 2010 +0200
@@ -14,6 +14,7 @@
 * Description:  Build information for the WebUtils API.
 *
 */
+
 #include <platform_paths.hrh>
 #include "../../../web_plat/browser_platform_api/inc/browser_platform_variant.hrh"
 
--- a/web_plat/widget_registry_api/group/bld.inf	Thu Dec 17 09:20:16 2009 +0200
+++ b/web_plat/widget_registry_api/group/bld.inf	Thu Jan 07 13:31:38 2010 +0200
@@ -14,6 +14,7 @@
 * Description:  Build information for the Widget Registry API.
 *
 */
+
 #include <platform_paths.hrh>
 #include "../../../web_plat/browser_platform_api/inc/browser_platform_variant.hrh"
 
@@ -21,7 +22,6 @@
 DEFAULT
 
 PRJ_EXPORTS
-
 ../inc/widgetregistryclient.h    MW_LAYER_PLATFORM_EXPORT_PATH(widgetregistryclient.h)
 ../inc/widgetpropertyvalue.h     MW_LAYER_PLATFORM_EXPORT_PATH(widgetpropertyvalue.h)
 ../inc/widgetregistryconstants.h MW_LAYER_PLATFORM_EXPORT_PATH(widgetregistryconstants.h)
--- a/web_plat/widget_registry_api/inc/WidgetPropertyValue.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/web_plat/widget_registry_api/inc/WidgetPropertyValue.h	Thu Jan 07 13:31:38 2010 +0200
@@ -16,13 +16,12 @@
 *
 */
 
-
 #ifndef WIDGETPROPERTYVALUE_H
 #define WIDGETPROPERTYVALUE_H
 
 #include <e32base.h>
 #include <s32strm.h>
-#include "WidgetRegistryConstants.h"
+#include <widgetregistryconstants.h>
 
 // serialize length = header + value
 const TInt32 KWidgetPropertyValSerializeMaxLength = 32 + KWidgetRegistryVal;
--- a/web_plat/widget_registry_api/inc/WidgetRegistryData.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/web_plat/widget_registry_api/inc/WidgetRegistryData.h	Thu Jan 07 13:31:38 2010 +0200
@@ -21,7 +21,7 @@
 
 // INCLUDES
 #include <f32file.h>
-#include "WidgetRegistryConstants.h"
+#include <widgetregistryconstants.h>
 
 // CONSTANTS
 
--- a/web_plat/xml_parser_api/group/bld.inf	Thu Dec 17 09:20:16 2009 +0200
+++ b/web_plat/xml_parser_api/group/bld.inf	Thu Jan 07 13:31:38 2010 +0200
@@ -22,9 +22,10 @@
 DEFAULT
 
 PRJ_EXPORTS
+../inc/mxmlcontenthandler.h     MW_LAYER_PLATFORM_EXPORT_PATH(mxmlcontenthandler.h)
+../inc/rxmlreader.h             MW_LAYER_PLATFORM_EXPORT_PATH(rxmlreader.h)
+../inc/mwbxmlcontenthandler.h   MW_LAYER_PLATFORM_EXPORT_PATH(mwbxmlcontenthandler.h)
+../inc/mxmlattributes.h         MW_LAYER_PLATFORM_EXPORT_PATH(mxmlattributes.h)
+../inc/xmlutils.h               MW_LAYER_PLATFORM_EXPORT_PATH(xmlutils.h)
 
-../inc/mxmlcontenthandler.h     MW_LAYER_PLATFORM_EXPORT_PATH(mxmlcontenthandler.h)
-../inc/rxmlreader.h     MW_LAYER_PLATFORM_EXPORT_PATH(rxmlreader.h)
-../inc/mwbxmlcontenthandler.h     MW_LAYER_PLATFORM_EXPORT_PATH(mwbxmlcontenthandler.h)
-../inc/mxmlattributes.h     MW_LAYER_PLATFORM_EXPORT_PATH(mxmlattributes.h)
-../inc/xmlutils.h     MW_LAYER_PLATFORM_EXPORT_PATH(xmlutils.h)
+PRJ_MMPFILES
--- a/web_plat/xml_parser_api/inc/MXMLContentHandler.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/web_plat/xml_parser_api/inc/MXMLContentHandler.h	Thu Jan 07 13:31:38 2010 +0200
@@ -15,26 +15,10 @@
 *
 */
 
-
-
-
-
-
-
 /**
  * DO NOT USE THIS API. DEPRECATED AND REMOVED IN S60 5.0. USE SYMBIAN XML FRAMEWORK INSTEAD.
  */
 
-
-
-
-
-
-
-
-
-
-
 #ifndef __MXMLCONTENTHANDLER_H
 #define __MXMLCONTENTHANDLER_H
 
--- a/web_pub/browser_control_api/group/bld.inf	Thu Dec 17 09:20:16 2009 +0200
+++ b/web_pub/browser_control_api/group/bld.inf	Thu Jan 07 13:31:38 2010 +0200
@@ -14,17 +14,14 @@
 * Description:  
 *
 */
-#ifndef __BROWSER_SDK
+
 #include <platform_paths.hrh>
 #include "../../../web_plat/browser_platform_api/inc/browser_platform_variant.hrh"
-#endif
 
 PRJ_PLATFORMS
-DEFAULT GCCE
+DEFAULT
 
 PRJ_EXPORTS
-#ifndef __BROWSER_SDK
-
 ../inc/brctldefs.h                MW_LAYER_PUBLIC_EXPORT_PATH(brctldefs.h)
 ../inc/brctldialogsprovider.h     MW_LAYER_PUBLIC_EXPORT_PATH(brctldialogsprovider.h)
 ../inc/brctlinterface.h           MW_LAYER_PUBLIC_EXPORT_PATH(brctlinterface.h)
@@ -35,20 +32,6 @@
 ../inc/brctlwindowobserver.h      MW_LAYER_PUBLIC_EXPORT_PATH(brctlwindowobserver.h)
 ../inc/brctldownloadobserver.h    MW_LAYER_PUBLIC_EXPORT_PATH(brctldownloadobserver.h)
 
-#else
-
-../inc/brctldefs.h                /epoc32/include/brctldefs.h
-../inc/brctldialogsprovider.h     /epoc32/include/brctldialogsprovider.h
-../inc/brctlinterface.h           /epoc32/include/brctlinterface.h
-../inc/brctllayoutobserver.h      /epoc32/include/brctllayoutobserver.h
-../inc/brctllinkresolver.h        /epoc32/include/brctllinkresolver.h
-../inc/brctlsoftkeysobserver.h    /epoc32/include/brctlsoftkeysobserver.h
-../inc/brctlspecialloadobserver.h /epoc32/include/brctlspecialloadobserver.h
-../inc/brctlwindowobserver.h      /epoc32/include/brctlwindowobserver.h
-../inc/brctldownloadobserver.h    /epoc32/include/brctldownloadobserver.h
-                      
-#endif //#ifndef __BROWSER_SDK
-
 PRJ_MMPFILES
 
 PRJ_TESTMMPFILES
--- a/web_pub/browser_control_api/tsrc/group/BrCtlApiTest.mmp	Thu Dec 17 09:20:16 2009 +0200
+++ b/web_pub/browser_control_api/tsrc/group/BrCtlApiTest.mmp	Thu Jan 07 13:31:38 2010 +0200
@@ -37,11 +37,10 @@
 MW_LAYER_SYSTEMINCLUDE
 
 SYSTEMINCLUDE   . 
-MW_LAYER_ECOM_SYSTEMINCLUDE
 
 SOURCEPATH      ../src
 SOURCE          brctlapitest.cpp brctlapitestblocks.cpp
-SOURCE          brctlapitestcontainer.cpp brbtlapitestobserver.cpp 
+SOURCE          brctlapitestcontainer.cpp brctlapitestobserver.cpp 
 SOURCE          brctlapiteststatechangeobserver.cpp brctlapitestdialogsprovider.cpp
 
 LIBRARY         euser.lib cone.lib eikcore.lib apparc.lib avkon.lib 
--- a/web_pub/browser_plugin_api/group/bld.inf	Thu Dec 17 09:20:16 2009 +0200
+++ b/web_pub/browser_plugin_api/group/bld.inf	Thu Jan 07 13:31:38 2010 +0200
@@ -14,16 +14,14 @@
 * Description:  
 *
 */
-#ifndef __BROWSER_SDK
+
 #include <platform_paths.hrh>
 #include "../../../web_plat/browser_platform_api/inc/browser_platform_variant.hrh"
-#endif
 
 PRJ_PLATFORMS
-DEFAULT GCCE
+DEFAULT
 
 PRJ_EXPORTS
-
 ../inc/browserplugininterface.h      MW_LAYER_PUBLIC_EXPORT_PATH(browserplugininterface.h)
 ../inc/cecombrowserplugininterface.h MW_LAYER_PUBLIC_EXPORT_PATH(cecombrowserplugininterface.h)
 ../inc/npapi.h                       MW_LAYER_PUBLIC_EXPORT_PATH(npapi.h)
--- a/web_pub/browser_plugin_api/inc/CEcomBrowserPluginInterface.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/web_pub/browser_plugin_api/inc/CEcomBrowserPluginInterface.h	Thu Jan 07 13:31:38 2010 +0200
@@ -23,8 +23,8 @@
 #include <ecom/ecom.h>
 
 // User includes
-#include "npupp.h"
-#include "browserplugininterface.h"
+#include <npupp.h>
+#include <browserplugininterface.h>
 
 typedef struct
     {
--- a/web_pub/browser_plugin_api/inc/PluginAdapterInterface.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/web_pub/browser_plugin_api/inc/PluginAdapterInterface.h	Thu Jan 07 13:31:38 2010 +0200
@@ -20,9 +20,9 @@
 #define MPLUGINADAPTER_H
 
 //  INCLUDES
-#include "coecntrl.h"
-#include "coecobs.h"
-#include "npupp.h"
+#include <coecntrl.h>
+#include <coecobs.h>
+#include <npupp.h>
 
 // FORWARD DECLARATIONS
 class MPluginNotifier;
--- a/web_pub/download_mgr_client_api/group/bld.inf	Thu Dec 17 09:20:16 2009 +0200
+++ b/web_pub/download_mgr_client_api/group/bld.inf	Thu Jan 07 13:31:38 2010 +0200
@@ -14,6 +14,7 @@
 * Description:  Build information for the Download Mgr Server.
 *
 */
+
 #include <platform_paths.hrh>
 #include "../../../web_plat/browser_platform_api/inc/browser_platform_variant.hrh"
 
--- a/web_pub/download_mgr_client_api/inc/DownloadMgrClient.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/web_pub/download_mgr_client_api/inc/DownloadMgrClient.h	Thu Jan 07 13:31:38 2010 +0200
@@ -116,6 +116,7 @@
 *  @lib -
 *  @since Series 60 2.8
 */
+
 NONSHARABLE_CLASS( RHttpDownloadMgr ) : public RSessionBase,
                                         public MHttpDownloadMgrObserver
 	{
@@ -364,6 +365,13 @@
         * @return None.
 		*/        
         IMPORT_C void SetNextUriObserver( MHttpDownloadMgrNextUriObserver* aObserver );
+        
+    /**
+		* Checks for possibility of a new donload 
+		* @param None
+        * @return TBool,possibility of a new download.
+		*/
+        TBool IsNewDownloadPossible();
 
     protected: // from MHttpDownloadMgrObserver
 
--- a/web_pub/download_mgr_ui_api/group/Bld.inf	Thu Dec 17 09:20:16 2009 +0200
+++ b/web_pub/download_mgr_ui_api/group/Bld.inf	Thu Jan 07 13:31:38 2010 +0200
@@ -14,15 +14,14 @@
 * Description:  
 *
 */
+
 #include <platform_paths.hrh>
 #include "../../../web_plat/browser_platform_api/inc/browser_platform_variant.hrh"
 
 PRJ_PLATFORMS
-
 DEFAULT
 
 PRJ_EXPORTS
-
 ../Inc/cdownloadmgruibase.h                 MW_LAYER_PUBLIC_EXPORT_PATH(cdownloadmgruibase.h)
 ../Inc/cdownloadmgruiuserinteractions.h     MW_LAYER_PUBLIC_EXPORT_PATH(cdownloadmgruiuserinteractions.h)
 ../Inc/cdownloadmgruidownloadslist.h        MW_LAYER_PUBLIC_EXPORT_PATH(cdownloadmgruidownloadslist.h)
@@ -35,4 +34,3 @@
 PRJ_TESTMMPFILES
 
 //  End of File  
-
--- a/web_pub/download_mgr_ui_api/inc/CDownloadMgrUiDownloadsList.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/web_pub/download_mgr_ui_api/inc/CDownloadMgrUiDownloadsList.h	Thu Jan 07 13:31:38 2010 +0200
@@ -15,8 +15,6 @@
 *
 */
 
-
-
 #ifndef CDOWNLOADMGRUIDOWNLOADSLIST_H
 #define CDOWNLOADMGRUIDOWNLOADSLIST_H
 
--- a/web_pub/favourites_engine_api/group/bld.inf	Thu Dec 17 09:20:16 2009 +0200
+++ b/web_pub/favourites_engine_api/group/bld.inf	Thu Jan 07 13:31:38 2010 +0200
@@ -14,6 +14,7 @@
 * Description:  Build information for the Favourites Engine
 *
 */
+
 #include <platform_paths.hrh>
 #include "../../../web_plat/browser_platform_api/inc/browser_platform_variant.hrh"
 
@@ -40,11 +41,6 @@
 ../inc/favouriteshandle.h           MW_LAYER_PUBLIC_EXPORT_PATH(favouriteshandle.h)
 ../inc/favouriteshandle.inl         MW_LAYER_PUBLIC_EXPORT_PATH(favouriteshandle.inl)
 
-
-
 PRJ_MMPFILES
 
-
 PRJ_TESTMMPFILES
-
-
--- a/web_pub/favourites_engine_api/tsrc/inc/FavouritesEngineTest.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/web_pub/favourites_engine_api/tsrc/inc/FavouritesEngineTest.h	Thu Jan 07 13:31:38 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2002 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
--- a/web_pub/favourites_engine_api/tsrc/src/FavouritesDbTestObserver.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/web_pub/favourites_engine_api/tsrc/src/FavouritesDbTestObserver.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -15,13 +15,12 @@
 *
 */
 
-
 // INCLUDE FILES
 
 #include <favouritesdb.h>
 #include "favouritesdbtestobserver.h"
 //#include "FavouritesDbTester.h"
-#include "activefavouritesdbnotifier.h"
+#include <activefavouritesdbnotifier.h>
 
 // CONSTANTS
 
--- a/web_pub/favourites_engine_api/tsrc/src/FavouritesEngineTest.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/web_pub/favourites_engine_api/tsrc/src/FavouritesEngineTest.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
--- a/web_pub/favourites_engine_api/tsrc/src/FavouritesItemTestCases.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/web_pub/favourites_engine_api/tsrc/src/FavouritesItemTestCases.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2008 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
--- a/web_pub/favourites_engine_api/tsrc/src/FavouritesWapApTestCases.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/web_pub/favourites_engine_api/tsrc/src/FavouritesWapApTestCases.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2002 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
--- a/webengine/browserrecognizers/data/01005A02.rss	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/browserrecognizers/data/01005A02.rss	Thu Jan 07 13:31:38 2010 +0200
@@ -15,7 +15,7 @@
 *
 */
 
-#include <RegistryInfo.rh>
+#include <ecom/registryinfo.rh>
 RESOURCE REGISTRY_INFO r_registry
 {
 	dll_uid = 0x01005A02; 	// Should match the name of this file
--- a/webengine/browserrecognizers/group/BrowserRec.mmp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/browserrecognizers/group/BrowserRec.mmp	Thu Jan 07 13:31:38 2010 +0200
@@ -14,28 +14,20 @@
 * Description:  Recognizer for the bowser supported MIME types.
 *
 */
-#if defined(__BROWSER_SDK)
-TARGET          BrowserRec_sdk.DLL
-#else
 #include <platform_paths.hrh>
 #include <platform/mw/browser_platform_variant.hrh>
 TARGET          BrowserRec.DLL
-#endif
 
 TARGETTYPE      PLUGIN
 UID             0x10009D8D 0x01005A02
 
 CAPABILITY CAP_ECOM_PLUGIN 
 
-
 SOURCEPATH      ../Data
 
 START RESOURCE  01005A02.rss
-#if defined(__BROWSER_SDK)
-TARGET          BrowserRec_sdk.rsc
-#else
+
 TARGET          BrowserRec.rsc
-#endif
 
 END
 
@@ -45,15 +37,8 @@
 SOURCE           BrowserRec.cpp
 
 USERINCLUDE     ../inc
-#ifndef __BROWSER_SDK
+
 MW_LAYER_SYSTEMINCLUDE
-MW_LAYER_ECOM_SYSTEMINCLUDE
-#else
-SYSTEMINCLUDE   /Epoc32/include  /Epoc32/include/ecom
-#endif
-
-
 
 LIBRARY         EUSER.LIB 
 LIBRARY         APMIME.LIB
-
--- a/webengine/browserrecognizers/src/BrowserRec.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/browserrecognizers/src/BrowserRec.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -17,7 +17,7 @@
 
 #include "BrowserRec.h"
 
-#include "ImplementationProxy.h"
+#include <ecom/implementationproxy.h>
 
 //
 // CBrowserRecognizer
--- a/webengine/device/group/Device.mmp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/device/group/Device.mmp	Thu Jan 07 13:31:38 2010 +0200
@@ -50,20 +50,19 @@
 #endif
 
 MW_LAYER_SYSTEMINCLUDE
+OS_LAYER_ESTLIB_SYSTEMINCLUDE
+
 SYSTEMINCLUDE ../../osswebengine/JavaScriptCore
 SYSTEMINCLUDE ../../osswebengine/JavaScriptCore/kjs
 SYSTEMINCLUDE ../../osswebengine/JavaScriptCore/bindings
 SYSTEMINCLUDE ../../osswebengine/JavaScriptCore/wtf
 SYSTEMINCLUDE ../../osswebengine/JavaScriptCore/wtf/symbian
 SYSTEMINCLUDE ../../../../../
-MW_LAYER_ECOM_SYSTEMINCLUDE
-MW_LAYER_LIBC_SYSTEMINCLUDE
 SYSTEMINCLUDE ../../../inc
 
 USERINCLUDE     ../inc
 SOURCEPATH      ../src 
 
-
 SOURCE          Device.cpp
 SOURCE          DeviceBridge.cpp
 SOURCE          ServiceEventHandler.cpp
@@ -84,3 +83,4 @@
 LIBRARY         RTSecMgrUtil.lib 
 LIBRARY         WidgetRegistryClient.lib
 LIBRARY         efsrv.lib 
+
--- a/webengine/device/rom/Device.iby	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/device/rom/Device.iby	Thu Jan 07 13:31:38 2010 +0200
@@ -18,7 +18,11 @@
 
 #ifndef __DEVICE_IBY__
 #define __DEVICE_IBY__
+#ifdef __S60_32__
+#include <browser_platform_variant.hrh>
+#else
 #include <platform/mw/browser_platform_variant.hrh>
+#endif
 
 
 // bitmaps
--- a/webengine/memoryplugin/data/10281f93.rss	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/memoryplugin/data/10281f93.rss	Thu Jan 07 13:31:38 2010 +0200
@@ -15,7 +15,7 @@
 *
 */
 
-#include <RegistryInfo.rh>
+#include <ecom/registryinfo.rh>
 #include <oommonitorplugin.hrh>
 
 RESOURCE REGISTRY_INFO theInfo
@@ -35,4 +35,4 @@
 				};
 		}
 	};
-}
\ No newline at end of file
+}
--- a/webengine/memoryplugin/group/bld.inf	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/memoryplugin/group/bld.inf	Thu Jan 07 13:31:38 2010 +0200
@@ -15,7 +15,6 @@
 *
 */
 
-
 PRJ_PLATFORMS
 DEFAULT
 
--- a/webengine/memoryplugin/group/memoryplugin.mmp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/memoryplugin/group/memoryplugin.mmp	Thu Jan 07 13:31:38 2010 +0200
@@ -29,15 +29,15 @@
 
 USERINCLUDE     .
 MW_LAYER_SYSTEMINCLUDE
-MW_LAYER_ECOM_SYSTEMINCLUDE
 
 START RESOURCE	../data/10281f93.rss
-TARGET 					memoryplugin.rsc
+TARGET 			memoryplugin.rsc
 END
 
 SOURCEPATH    	../src
-SOURCE 					memoryplugin.cpp
+SOURCE 			memoryplugin.cpp
 
-LIBRARY 				ECOM.LIB
+LIBRARY 		ECOM.LIB
 LIBRARY         euser.lib
 LIBRARY         oommonitor.lib
+
--- a/webengine/osswebengine/DerivedSources/JavaScriptCore/chartables.c	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/DerivedSources/JavaScriptCore/chartables.c	Thu Jan 07 13:31:38 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
--- a/webengine/osswebengine/DerivedSources/WebCore/CSSPropertyNames.c	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/DerivedSources/WebCore/CSSPropertyNames.c	Thu Jan 07 13:31:38 2010 +0200
@@ -1,3 +1,19 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of the License "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: 
+*
+*/
 /* ANSI-C code produced by gperf version 2.7.2 */
 /* Command-line: gperf -a -L ANSI-C -E -C -c -o -t -k '*' -NfindProp -Hhash_prop -Wwordlist_prop -D -s 2 CSSPropertyNames.gperf  */
 /* This file is automatically generated from CSSPropertyNames.in by makeprop, do not edit */
--- a/webengine/osswebengine/DerivedSources/WebCore/CSSValueKeywords.c	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/DerivedSources/WebCore/CSSValueKeywords.c	Thu Jan 07 13:31:38 2010 +0200
@@ -1,3 +1,19 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of the License "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: 
+*
+*/
 /* ANSI-C code produced by gperf version 3.0.3 */
 /* Command-line: gperf -L ANSI-C -E -C -n -o -t -k '*' -NfindValue -Hhash_val -Wwordlist_value -D CSSValueKeywords.gperf  */
 
--- a/webengine/osswebengine/DerivedSources/WebCore/ColorData.c	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/DerivedSources/WebCore/ColorData.c	Thu Jan 07 13:31:38 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
--- a/webengine/osswebengine/DerivedSources/WebCore/DocTypeStrings.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/DerivedSources/WebCore/DocTypeStrings.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
--- a/webengine/osswebengine/DerivedSources/WebCore/SVGElementFactory.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/DerivedSources/WebCore/SVGElementFactory.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
--- a/webengine/osswebengine/DerivedSources/WebCore/SVGNames.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/DerivedSources/WebCore/SVGNames.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
--- a/webengine/osswebengine/DerivedSources/WebCore/UserAgentStyleSheets.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/DerivedSources/WebCore/UserAgentStyleSheets.h	Thu Jan 07 13:31:38 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
--- a/webengine/osswebengine/DerivedSources/WebCore/UserAgentStyleSheetsData.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/DerivedSources/WebCore/UserAgentStyleSheetsData.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
--- a/webengine/osswebengine/DerivedSources/WebCore/XLinkNames.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/DerivedSources/WebCore/XLinkNames.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
--- a/webengine/osswebengine/DerivedSources/WebCore/ksvgcssproperties.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/DerivedSources/WebCore/ksvgcssproperties.h	Thu Jan 07 13:31:38 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
--- a/webengine/osswebengine/DerivedSources/WebCore/ksvgcssvalues.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/DerivedSources/WebCore/ksvgcssvalues.h	Thu Jan 07 13:31:38 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
--- a/webengine/osswebengine/JavaScriptCore/ForwardingHeaders/JavaScriptCore/APICast.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/JavaScriptCore/ForwardingHeaders/JavaScriptCore/APICast.h	Thu Jan 07 13:31:38 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
--- a/webengine/osswebengine/JavaScriptCore/ForwardingHeaders/JavaScriptCore/JSBase.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/JavaScriptCore/ForwardingHeaders/JavaScriptCore/JSBase.h	Thu Jan 07 13:31:38 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
--- a/webengine/osswebengine/JavaScriptCore/ForwardingHeaders/JavaScriptCore/JSContextRef.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/JavaScriptCore/ForwardingHeaders/JavaScriptCore/JSContextRef.h	Thu Jan 07 13:31:38 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
--- a/webengine/osswebengine/JavaScriptCore/ForwardingHeaders/JavaScriptCore/JSLock.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/JavaScriptCore/ForwardingHeaders/JavaScriptCore/JSLock.h	Thu Jan 07 13:31:38 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
--- a/webengine/osswebengine/JavaScriptCore/ForwardingHeaders/JavaScriptCore/JSObjectRef.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/JavaScriptCore/ForwardingHeaders/JavaScriptCore/JSObjectRef.h	Thu Jan 07 13:31:38 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
--- a/webengine/osswebengine/JavaScriptCore/ForwardingHeaders/JavaScriptCore/JSStringRef.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/JavaScriptCore/ForwardingHeaders/JavaScriptCore/JSStringRef.h	Thu Jan 07 13:31:38 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
--- a/webengine/osswebengine/JavaScriptCore/ForwardingHeaders/JavaScriptCore/JSStringRefCF.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/JavaScriptCore/ForwardingHeaders/JavaScriptCore/JSStringRefCF.h	Thu Jan 07 13:31:38 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
--- a/webengine/osswebengine/JavaScriptCore/ForwardingHeaders/JavaScriptCore/JSValueRef.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/JavaScriptCore/ForwardingHeaders/JavaScriptCore/JSValueRef.h	Thu Jan 07 13:31:38 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
--- a/webengine/osswebengine/JavaScriptCore/ForwardingHeaders/JavaScriptCore/JavaScriptCore.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/JavaScriptCore/ForwardingHeaders/JavaScriptCore/JavaScriptCore.h	Thu Jan 07 13:31:38 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
--- a/webengine/osswebengine/JavaScriptCore/JavaScriptCore.apolloproj/ForwardingSources/grammar.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/JavaScriptCore/JavaScriptCore.apolloproj/ForwardingSources/grammar.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
--- a/webengine/osswebengine/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/grammarWrapper.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/grammarWrapper.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
--- a/webengine/osswebengine/JavaScriptCore/JavaScriptCorePrefix.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/JavaScriptCore/JavaScriptCorePrefix.h	Thu Jan 07 13:31:38 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
--- a/webengine/osswebengine/JavaScriptCore/icu/unicode/utf_old.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/JavaScriptCore/icu/unicode/utf_old.h	Thu Jan 07 13:31:38 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
--- a/webengine/osswebengine/JavaScriptCore/pcre/pcre-config.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/JavaScriptCore/pcre/pcre-config.h	Thu Jan 07 13:31:38 2010 +0200
@@ -1,3 +1,19 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of the License "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: 
+*
+*/
 /* On Unix systems config.in is converted by configure into config.h. PCRE is
 written in Standard C, but there are a few non-standard things it can cope
 with, allowing it to run on SunOS4 and other "close to standard" systems.
--- a/webengine/osswebengine/JavaScriptCore/pcre/ucp.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/JavaScriptCore/pcre/ucp.h	Thu Jan 07 13:31:38 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
--- a/webengine/osswebengine/JavaScriptCore/pcre/ucpinternal.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/JavaScriptCore/pcre/ucpinternal.h	Thu Jan 07 13:31:38 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
--- a/webengine/osswebengine/JavaScriptGlue/ForwardingHeaders/kjs/ExecState.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/JavaScriptGlue/ForwardingHeaders/kjs/ExecState.h	Thu Jan 07 13:31:38 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
--- a/webengine/osswebengine/JavaScriptGlue/ForwardingHeaders/wtf/AlwaysInline.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/JavaScriptGlue/ForwardingHeaders/wtf/AlwaysInline.h	Thu Jan 07 13:31:38 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
--- a/webengine/osswebengine/JavaScriptGlue/ForwardingHeaders/wtf/Assertions.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/JavaScriptGlue/ForwardingHeaders/wtf/Assertions.h	Thu Jan 07 13:31:38 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
--- a/webengine/osswebengine/JavaScriptGlue/ForwardingHeaders/wtf/FastMalloc.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/JavaScriptGlue/ForwardingHeaders/wtf/FastMalloc.h	Thu Jan 07 13:31:38 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
--- a/webengine/osswebengine/JavaScriptGlue/ForwardingHeaders/wtf/Forward.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/JavaScriptGlue/ForwardingHeaders/wtf/Forward.h	Thu Jan 07 13:31:38 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
--- a/webengine/osswebengine/JavaScriptGlue/ForwardingHeaders/wtf/HashCountedSet.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/JavaScriptGlue/ForwardingHeaders/wtf/HashCountedSet.h	Thu Jan 07 13:31:38 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
--- a/webengine/osswebengine/JavaScriptGlue/ForwardingHeaders/wtf/HashSet.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/JavaScriptGlue/ForwardingHeaders/wtf/HashSet.h	Thu Jan 07 13:31:38 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
--- a/webengine/osswebengine/JavaScriptGlue/ForwardingHeaders/wtf/Noncopyable.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/JavaScriptGlue/ForwardingHeaders/wtf/Noncopyable.h	Thu Jan 07 13:31:38 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
--- a/webengine/osswebengine/JavaScriptGlue/ForwardingHeaders/wtf/OwnArrayPtr.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/JavaScriptGlue/ForwardingHeaders/wtf/OwnArrayPtr.h	Thu Jan 07 13:31:38 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
--- a/webengine/osswebengine/JavaScriptGlue/ForwardingHeaders/wtf/OwnPtr.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/JavaScriptGlue/ForwardingHeaders/wtf/OwnPtr.h	Thu Jan 07 13:31:38 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
--- a/webengine/osswebengine/JavaScriptGlue/ForwardingHeaders/wtf/PassRefPtr.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/JavaScriptGlue/ForwardingHeaders/wtf/PassRefPtr.h	Thu Jan 07 13:31:38 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
--- a/webengine/osswebengine/JavaScriptGlue/ForwardingHeaders/wtf/Platform.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/JavaScriptGlue/ForwardingHeaders/wtf/Platform.h	Thu Jan 07 13:31:38 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
--- a/webengine/osswebengine/JavaScriptGlue/ForwardingHeaders/wtf/RefPtr.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/JavaScriptGlue/ForwardingHeaders/wtf/RefPtr.h	Thu Jan 07 13:31:38 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
--- a/webengine/osswebengine/JavaScriptGlue/ForwardingHeaders/wtf/Vector.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/JavaScriptGlue/ForwardingHeaders/wtf/Vector.h	Thu Jan 07 13:31:38 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
--- a/webengine/osswebengine/JavaScriptGlue/config.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/JavaScriptGlue/config.h	Thu Jan 07 13:31:38 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
--- a/webengine/osswebengine/MemoryManager/BWINS/MEMMANU.DEF	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/MemoryManager/BWINS/MEMMANU.DEF	Thu Jan 07 13:31:38 2010 +0200
@@ -28,4 +28,6 @@
 	?SwitchToFastAllocator@MemoryManager@@SAPAVRAllocator@@XZ @ 27 NONAME ; class RAllocator * MemoryManager::SwitchToFastAllocator(void)
 	?CreateFastAllocator@MemoryManager@@SAXXZ @ 28 NONAME ; void MemoryManager::CreateFastAllocator(void)
 	?InitFastAllocator@MemoryManager@@SAXXZ @ 29 NONAME ; void MemoryManager::InitFastAllocator(void)
+	?InitOOMDialog@MemoryManager@@SAXXZ @ 30 NONAME ; void MemoryManager::InitOOMDialog(void)
+	?ResetOOMDialogDisplayed@MemoryManager@@SAXXZ @ 31 NONAME ; void MemoryManager::ResetOOMDialogDisplayed(void)
 
--- a/webengine/osswebengine/MemoryManager/EABI/MemManU.DEF	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/MemoryManager/EABI/MemManU.DEF	Thu Jan 07 13:31:38 2010 +0200
@@ -40,4 +40,6 @@
 	_ZTV18CDefaultMemoryPool @ 39 NONAME ; #<VT>#
 	_ZN13MemoryManager17InitFastAllocatorEv @ 40 NONAME
 	_ZN13MemoryManager19CreateFastAllocatorEv @ 41 NONAME
+	_ZN13MemoryManager13InitOOMDialogEv @ 42 NONAME
+	_ZN13MemoryManager23ResetOOMDialogDisplayedEv @ 43 NONAME
 
--- a/webengine/osswebengine/MemoryManager/Group/MemMan.mmp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/MemoryManager/Group/MemMan.mmp	Thu Jan 07 13:31:38 2010 +0200
@@ -15,13 +15,11 @@
 *
 */
 
-#if defined(__BROWSER_SDK)
-TARGET          MemMan_sdk.dll
-#else
+
 #include <platform_paths.hrh>
 #include <platform/mw/browser_platform_variant.hrh>
+
 TARGET          MemMan.dll
-#endif
 
 TARGETTYPE      dll
 
@@ -39,14 +37,9 @@
 CAPABILITY CAP_GENERAL_DLL
 VENDORID    VID_DEFAULT
 EPOCALLOWDLLDATA
-#ifndef __BROWSER_SDK
+
 MW_LAYER_SYSTEMINCLUDE
-//MW_LAYER_LIBC_SYSTEMINCLUDE
-#else
-SYSTEMINCLUDE   /Epoc32/include
-#endif
-SYSTEMINCLUDE   /epoc32/include/libc
-//#endif
+OS_LAYER_ESTLIB_SYSTEMINCLUDE
 
 USERINCLUDE     ../Inc
 
@@ -59,10 +52,13 @@
 SOURCE heap.cpp
 SOURCE SymbianDLAllocatorWrapper.cpp
 
-LIBRARY euser.lib
-DEBUGLIBRARY flogger.lib
-LIBRARY avkon.lib
-LIBRARY estlib.lib
-LIBRARY hal.lib
+LIBRARY   euser.lib
+LIBRARY   avkon.lib
+LIBRARY   estlib.lib
+LIBRARY   hal.lib
 
 LIBRARY   oommonitor.lib
+LIBRARY   aknnotify.lib
+LIBRARY   commonengine.lib
+
+DEBUGLIBRARY flogger.lib
--- a/webengine/osswebengine/MemoryManager/Group/MemManTest.mmp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/MemoryManager/Group/MemManTest.mmp	Thu Jan 07 13:31:38 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
@@ -15,10 +15,10 @@
 *
 */
 
-#ifndef __BROWSER_SDK
+
 #include <platform_paths.hrh>
 #include <platform/mw/browser_platform_variant.hrh>
-#endif
+
 TARGET		MemManTest.exe
 TARGETTYPE  	exe
 UID         	0x01000007
@@ -32,29 +32,23 @@
 MACRO KHTML_NO_SCRIPTING
 
 EPOCHEAPSIZE 524288 8388608
-#ifndef __BROWSER_SDK
+
 MW_LAYER_SYSTEMINCLUDE
-MW_LAYER_LIBC_SYSTEMINCLUDE
-#else
-SYSTEMINCLUDE 	/epoc32/include /epoc32/include/libc
-#endif
+OS_LAYER_ESTLIB_SYSTEMINCLUDE
 
 USERINCLUDE 	../../WEBCORE/bridge ../../WEBCORE/kwq
 USERINCLUDE 	../Inc
 USERINCLUDE 	../tsrc
 
 SOURCEPATH	../tsrc
-SOURCE	        MemManUnit.cpp	
+SOURCE	    MemManUnit.cpp	
 SOURCE		MemManUTConsole.cpp
 SOURCE		MemManUTContainer.cpp
 
 
 LIBRARY		ResLoader.lib
-#if defined(__BROWSER_SDK)
-LIBRARY   MemMan_sdk.lib
-#else
-LIBRARY         memman.lib
-#endif
+LIBRARY     memman.lib
+
 LIBRARY		ESTLIB.lib 
 LIBRARY		euser.lib 
 LIBRARY		EFSRV.lib 
@@ -64,9 +58,9 @@
 LIBRARY		hal.lib
 STATICLIBRARY		kwq.lib KHTML.lib
 
-
 #ifdef __S60_32__
 LANG sc 
 #else
 LANGUAGE_IDS 
 #endif
+
--- a/webengine/osswebengine/MemoryManager/Inc/MemoryManager.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/MemoryManager/Inc/MemoryManager.h	Thu Jan 07 13:31:38 2010 +0200
@@ -317,6 +317,27 @@
         * @return
         */
         IMPORT_C static void MemoryManager::InitFastAllocator();
+
+        /**
+        * initialize the OOM handler in the memorypool
+        * @since 9.2
+        * @param
+        * @param
+        * @return
+        */
+        IMPORT_C static void InitOOMDialog();
+
+        /**
+        * Reset the OOM dialog display flag in the memorypool; we want to pop the OOM dialog once per page,
+        * so we need to clear this when we are either done with the page (it unloads) or when we load a new one,
+        * so that it will display again when we run out of memory
+        * @since 9.2
+        * @param
+        * @param
+        * @return
+        */
+        IMPORT_C static void ResetOOMDialogDisplayed();
+        
     };
 
 #endif// !_MEMORYMANAGER_H_
--- a/webengine/osswebengine/MemoryManager/Inc/MemoryPool.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/MemoryManager/Inc/MemoryPool.h	Thu Jan 07 13:31:38 2010 +0200
@@ -21,7 +21,8 @@
 
 #include <e32base.h>
 #include <e32std.h>
-#include "MemoryManager.h"
+#include <aknglobalnote.h>
+#include <MemoryManager.h>
 
 // CONSTANTS
 
@@ -356,6 +357,8 @@
         TUint PostCheck();
         TUint FreeMemory( TFreeMem& aFree );
         void RestoreRescueBuffer();
+        void InitOOMDialog();
+        void ResetOOMDialogDisplayed();
 #ifdef OOM_LOGGING         
         void DumpHeapLogs();
 #endif        
@@ -363,6 +366,13 @@
     	void InitLocal();
     	
     	RSymbianDLHeap *iAlloc;
+    	// Out of memory dialog and localized resource message
+        void ShowOOMDialog();
+        
+        CAknGlobalNote* iOOMErrorDialog;
+        HBufC *iOOMMessage;
+        bool isInitted;
+        bool iOOMDisplayed;
     };
 
 #endif
--- a/webengine/osswebengine/MemoryManager/Inc/StopScheduler.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/MemoryManager/Inc/StopScheduler.h	Thu Jan 07 13:31:38 2010 +0200
@@ -20,7 +20,7 @@
 
 // INCLUDES
 
-#include "MemoryManager.h"
+#include <MemoryManager.h>
 
 // CONSTANTS
 
--- a/webengine/osswebengine/MemoryManager/Inc/oom.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/MemoryManager/Inc/oom.h	Thu Jan 07 13:31:38 2010 +0200
@@ -20,7 +20,7 @@
 
 #ifdef __OOM__
 
-#include "MemoryManager.h"
+#include <MemoryManager.h>
 
 /*
 #include "ObjectBase.h"
--- a/webengine/osswebengine/MemoryManager/Src/FastAllocator.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/MemoryManager/Src/FastAllocator.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -17,7 +17,7 @@
 */
 
 #include "FastAllocator.h"
-#include "MemoryManager.h"
+#include <MemoryManager.h>
 #include "MemoryPool.h"
 #include <e32std.h>
 #include <e32debug.h>
--- a/webengine/osswebengine/MemoryManager/Src/MemoryManager.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/MemoryManager/Src/MemoryManager.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -18,7 +18,7 @@
 
 // INCLUDE FILES
 
-#include "MemoryManager.h"
+#include <MemoryManager.h>
 #include "MemoryPool.h"
 #include "FastAllocator.h"
 #include "MemoryLogger.h"
@@ -32,16 +32,6 @@
 //  initializing a global memory pool.
 static CMemoryPool *s_pool = 0;
 
-struct cleanupMemoryPool {
-    ~cleanupMemoryPool() {
-    	if(s_pool)
-    		{
-    		delete s_pool;
-    		s_pool = NULL;
-    		}
-    }
-};
-static cleanupMemoryPool deleteMemoryPool;
 
 //-----------------------------------------------------------------------------
 // Pool() - a utility function for accessing the right memory pool
@@ -113,6 +103,32 @@
     }
 
 //-----------------------------------------------------------------------------
+// MemoryManager::InitOOMHandler
+//-----------------------------------------------------------------------------
+EXPORT_C void MemoryManager::InitOOMDialog()
+    {
+#ifdef __NEW_ALLOCATOR__
+    if (s_pool)
+        {
+        ((CNewSymbianHeapPool *)s_pool)->InitOOMDialog();
+        }
+#endif
+    }
+
+//-----------------------------------------------------------------------------
+// MemoryManager::ResetOOMDialogDisplayed
+//-----------------------------------------------------------------------------
+EXPORT_C void MemoryManager::ResetOOMDialogDisplayed()
+    {
+#ifdef __NEW_ALLOCATOR__
+    if (s_pool)
+        {
+        ((CNewSymbianHeapPool *)s_pool)->ResetOOMDialogDisplayed();
+        }
+#endif
+    }
+
+//-----------------------------------------------------------------------------
 // MemoryManager::CloseFastAllocator
 //-----------------------------------------------------------------------------
 EXPORT_C void MemoryManager::CloseFastAllocator(RAllocator* aDefaultAllocator)
--- a/webengine/osswebengine/MemoryManager/Src/MemoryPool.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/MemoryManager/Src/MemoryPool.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -28,6 +28,10 @@
 #include "SymbianDlHeap.h"
 #include <OOMMonitorSession.h>
 #include <hal.h>
+#include <avkon.hrh>
+#include <avkon.rsg>
+#include <StringLoader.h>
+#include <WebKit.rsg>
 
 // CONSTANTS
 
@@ -461,7 +465,10 @@
 //-----------------------------------------------------------------------------
 TAny* CNewSymbianHeapPool::DoAlloc( TUint aSize )
     {
-    return iAlloc->Alloc( aSize );
+    TAny *p = iAlloc->Alloc( aSize );
+    if (!p)
+        ShowOOMDialog();
+    return p;
     }
 
 //-----------------------------------------------------------------------------
@@ -477,6 +484,7 @@
     // check memory manager status
     if( !p || iMemStatus & ERescueOOM )
         {
+        ShowOOMDialog();
         if( !iIsCollecting )
             {
             CollectMemory();
@@ -551,7 +559,8 @@
 	if(req > 0)
 		return ETrue;
 	
-	// We haven't got the required amount free yet, try the browser heap.
+    // We haven't got the required amount free yet, pop an OOM dialog and then try the browser heap.
+    ShowOOMDialog();
 	CollectMemory(aTotalSize);
 	// ask the system how much is free now...
 	HAL::Get(HALData::EMemoryRAMFree, systemFreeMemory);
@@ -610,6 +619,9 @@
 
 CNewSymbianHeapPool::CNewSymbianHeapPool() : CMemoryPool()
 	{
+    isInitted = EFalse;
+    iOOMErrorDialog = 0;
+    iOOMMessage = 0;
 	}
 
 CNewSymbianHeapPool::~CNewSymbianHeapPool()
@@ -663,6 +675,55 @@
 	return CMemoryPool::Create();
 	}
 
+/*
+ * Initialize the OOM dialog and localized message resource
+ * This should be called as soon in the startup process as possible
+ * (unfortunately it can't be called until resources are already loaded)
+ * Note: apps are responsible for showing their own oom dialog; there
+ * is no system one AFAIK; at least we can re-use the oom localized
+ * resource message from elsewhere
+ */
+void CNewSymbianHeapPool::InitOOMDialog()
+    {
+    if (!isInitted)
+        {
+        isInitted = ETrue;
+        iOOMErrorDialog = CAknGlobalNote::NewL();
+        iOOMErrorDialog->SetSoftkeys(R_AVKON_SOFTKEYS_OK_EMPTY);
+        iOOMMessage = StringLoader::LoadL(R_QTN_BROWSER_DIALOG_OOM);
+        iOOMDisplayed = EFalse;
+        }
+    }
+
+void CNewSymbianHeapPool::ShowOOMDialog()
+    {
+    // Don't show it if we did once already
+    if (iOOMDisplayed)
+        return;
+
+    // If we got OOM, show a dialog (if the dialog was initted properly to begin with)
+    if (iOOMErrorDialog)
+        {
+        // If we couldn't load the message resource when we first initted, 
+        // try again now; this shouldn't ever happen
+        if (!iOOMMessage)
+            {
+            iOOMMessage = StringLoader::LoadL(R_QTN_BROWSER_DIALOG_OOM);
+            }
+        // If we have no dialog or message we unfortunately cannot display it!
+        if (iOOMMessage) 
+            {
+            iOOMErrorDialog->ShowNoteL(EAknGlobalWarningNote,iOOMMessage->Des());
+            iOOMDisplayed = ETrue;
+            }
+        }
+    }
+
+void CNewSymbianHeapPool::ResetOOMDialogDisplayed()
+    {
+    iOOMDisplayed = EFalse;
+    }
+
 #ifdef OOM_LOGGING   
 void CNewSymbianHeapPool::DumpHeapLogs()
     {
--- a/webengine/osswebengine/MemoryManager/Src/SymbianDLAllocatorWrapper.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/MemoryManager/Src/SymbianDLAllocatorWrapper.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -17,7 +17,7 @@
 */
 
 #include "FastAllocator.h"
-#include "MemoryManager.h"
+#include <MemoryManager.h>
 #include "MemoryPool.h"
 #include <e32std.h>
 #include <e32debug.h>
--- a/webengine/osswebengine/MemoryManager/Src/fast_malloc.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/MemoryManager/Src/fast_malloc.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -448,7 +448,7 @@
 #include <e32hal.h>
 #include <hal.h>
 
-#include "MemoryManager.h"
+#include <MemoryManager.h>
 
 //#define OOM_LOGGING
 #include "MemoryLogger.h"
@@ -5381,13 +5381,13 @@
 // global data and if closing util is not the last
 // one to be deleted, it will crash.  Luckly enough
 // , it seems to be working fine and no crash so far.
+/*
 struct ChunkClosingUtil
 {
     ~ChunkClosingUtil()     { rchunk.Close(); }
 };
-
 static ChunkClosingUtil __gx_closing;
-
+*/
 /* -----------------------------------------------------------------------
 History:
     C2.8.2 Sun Jun 12 16:01:10 2005  Doug Lea  (dl at gee)
--- a/webengine/osswebengine/WebCore/ForwardingHeaders/bindings/NP_jsobject.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/WebCore/ForwardingHeaders/bindings/NP_jsobject.h	Thu Jan 07 13:31:38 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
--- a/webengine/osswebengine/WebCore/ForwardingHeaders/bindings/npruntime.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/WebCore/ForwardingHeaders/bindings/npruntime.h	Thu Jan 07 13:31:38 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
--- a/webengine/osswebengine/WebCore/ForwardingHeaders/bindings/npruntime_impl.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/WebCore/ForwardingHeaders/bindings/npruntime_impl.h	Thu Jan 07 13:31:38 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
--- a/webengine/osswebengine/WebCore/ForwardingHeaders/bindings/runtime.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/WebCore/ForwardingHeaders/bindings/runtime.h	Thu Jan 07 13:31:38 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
--- a/webengine/osswebengine/WebCore/ForwardingHeaders/bindings/runtime_object.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/WebCore/ForwardingHeaders/bindings/runtime_object.h	Thu Jan 07 13:31:38 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
--- a/webengine/osswebengine/WebCore/ForwardingHeaders/bindings/runtime_root.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/WebCore/ForwardingHeaders/bindings/runtime_root.h	Thu Jan 07 13:31:38 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
--- a/webengine/osswebengine/WebCore/ForwardingHeaders/kjs/JSLock.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/WebCore/ForwardingHeaders/kjs/JSLock.h	Thu Jan 07 13:31:38 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
--- a/webengine/osswebengine/WebCore/ForwardingHeaders/kjs/SavedBuiltins.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/WebCore/ForwardingHeaders/kjs/SavedBuiltins.h	Thu Jan 07 13:31:38 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
--- a/webengine/osswebengine/WebCore/ForwardingHeaders/kjs/collector.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/WebCore/ForwardingHeaders/kjs/collector.h	Thu Jan 07 13:31:38 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
--- a/webengine/osswebengine/WebCore/ForwardingHeaders/kjs/dtoa.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/WebCore/ForwardingHeaders/kjs/dtoa.h	Thu Jan 07 13:31:38 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
--- a/webengine/osswebengine/WebCore/ForwardingHeaders/kjs/function.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/WebCore/ForwardingHeaders/kjs/function.h	Thu Jan 07 13:31:38 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
--- a/webengine/osswebengine/WebCore/ForwardingHeaders/kjs/identifier.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/WebCore/ForwardingHeaders/kjs/identifier.h	Thu Jan 07 13:31:38 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
--- a/webengine/osswebengine/WebCore/ForwardingHeaders/kjs/internal.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/WebCore/ForwardingHeaders/kjs/internal.h	Thu Jan 07 13:31:38 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
--- a/webengine/osswebengine/WebCore/ForwardingHeaders/kjs/interpreter.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/WebCore/ForwardingHeaders/kjs/interpreter.h	Thu Jan 07 13:31:38 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
--- a/webengine/osswebengine/WebCore/ForwardingHeaders/kjs/lookup.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/WebCore/ForwardingHeaders/kjs/lookup.h	Thu Jan 07 13:31:38 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
--- a/webengine/osswebengine/WebCore/ForwardingHeaders/kjs/object.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/WebCore/ForwardingHeaders/kjs/object.h	Thu Jan 07 13:31:38 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
--- a/webengine/osswebengine/WebCore/ForwardingHeaders/kjs/operations.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/WebCore/ForwardingHeaders/kjs/operations.h	Thu Jan 07 13:31:38 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
--- a/webengine/osswebengine/WebCore/ForwardingHeaders/kjs/property_map.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/WebCore/ForwardingHeaders/kjs/property_map.h	Thu Jan 07 13:31:38 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
--- a/webengine/osswebengine/WebCore/ForwardingHeaders/kjs/protect.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/WebCore/ForwardingHeaders/kjs/protect.h	Thu Jan 07 13:31:38 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
--- a/webengine/osswebengine/WebCore/ForwardingHeaders/kjs/string_object.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/WebCore/ForwardingHeaders/kjs/string_object.h	Thu Jan 07 13:31:38 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
--- a/webengine/osswebengine/WebCore/ForwardingHeaders/kjs/ustring.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/WebCore/ForwardingHeaders/kjs/ustring.h	Thu Jan 07 13:31:38 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
--- a/webengine/osswebengine/WebCore/ForwardingHeaders/kjs/value.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/WebCore/ForwardingHeaders/kjs/value.h	Thu Jan 07 13:31:38 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
--- a/webengine/osswebengine/WebCore/ForwardingHeaders/pcre/pcre.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/WebCore/ForwardingHeaders/pcre/pcre.h	Thu Jan 07 13:31:38 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
--- a/webengine/osswebengine/WebCore/ForwardingHeaders/wtf/AlwaysInline.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/WebCore/ForwardingHeaders/wtf/AlwaysInline.h	Thu Jan 07 13:31:38 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
--- a/webengine/osswebengine/WebCore/ForwardingHeaders/wtf/Assertions.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/WebCore/ForwardingHeaders/wtf/Assertions.h	Thu Jan 07 13:31:38 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
--- a/webengine/osswebengine/WebCore/ForwardingHeaders/wtf/FastMalloc.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/WebCore/ForwardingHeaders/wtf/FastMalloc.h	Thu Jan 07 13:31:38 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
--- a/webengine/osswebengine/WebCore/ForwardingHeaders/wtf/Forward.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/WebCore/ForwardingHeaders/wtf/Forward.h	Thu Jan 07 13:31:38 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
--- a/webengine/osswebengine/WebCore/ForwardingHeaders/wtf/GetPtr.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/WebCore/ForwardingHeaders/wtf/GetPtr.h	Thu Jan 07 13:31:38 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
--- a/webengine/osswebengine/WebCore/ForwardingHeaders/wtf/HashCountedSet.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/WebCore/ForwardingHeaders/wtf/HashCountedSet.h	Thu Jan 07 13:31:38 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
--- a/webengine/osswebengine/WebCore/ForwardingHeaders/wtf/HashMap.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/WebCore/ForwardingHeaders/wtf/HashMap.h	Thu Jan 07 13:31:38 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
--- a/webengine/osswebengine/WebCore/ForwardingHeaders/wtf/HashSet.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/WebCore/ForwardingHeaders/wtf/HashSet.h	Thu Jan 07 13:31:38 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
--- a/webengine/osswebengine/WebCore/ForwardingHeaders/wtf/HashTable.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/WebCore/ForwardingHeaders/wtf/HashTable.h	Thu Jan 07 13:31:38 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
--- a/webengine/osswebengine/WebCore/ForwardingHeaders/wtf/HashTraits.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/WebCore/ForwardingHeaders/wtf/HashTraits.h	Thu Jan 07 13:31:38 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
--- a/webengine/osswebengine/WebCore/ForwardingHeaders/wtf/ListHashSet.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/WebCore/ForwardingHeaders/wtf/ListHashSet.h	Thu Jan 07 13:31:38 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
--- a/webengine/osswebengine/WebCore/ForwardingHeaders/wtf/MathExtras.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/WebCore/ForwardingHeaders/wtf/MathExtras.h	Thu Jan 07 13:31:38 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
--- a/webengine/osswebengine/WebCore/ForwardingHeaders/wtf/Noncopyable.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/WebCore/ForwardingHeaders/wtf/Noncopyable.h	Thu Jan 07 13:31:38 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
--- a/webengine/osswebengine/WebCore/ForwardingHeaders/wtf/OwnArrayPtr.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/WebCore/ForwardingHeaders/wtf/OwnArrayPtr.h	Thu Jan 07 13:31:38 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
--- a/webengine/osswebengine/WebCore/ForwardingHeaders/wtf/OwnPtr.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/WebCore/ForwardingHeaders/wtf/OwnPtr.h	Thu Jan 07 13:31:38 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
--- a/webengine/osswebengine/WebCore/ForwardingHeaders/wtf/PassRefPtr.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/WebCore/ForwardingHeaders/wtf/PassRefPtr.h	Thu Jan 07 13:31:38 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
--- a/webengine/osswebengine/WebCore/ForwardingHeaders/wtf/Platform.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/WebCore/ForwardingHeaders/wtf/Platform.h	Thu Jan 07 13:31:38 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
--- a/webengine/osswebengine/WebCore/ForwardingHeaders/wtf/RefPtr.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/WebCore/ForwardingHeaders/wtf/RefPtr.h	Thu Jan 07 13:31:38 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
--- a/webengine/osswebengine/WebCore/ForwardingHeaders/wtf/RetainPtr.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/WebCore/ForwardingHeaders/wtf/RetainPtr.h	Thu Jan 07 13:31:38 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
--- a/webengine/osswebengine/WebCore/ForwardingHeaders/wtf/StringExtras.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/WebCore/ForwardingHeaders/wtf/StringExtras.h	Thu Jan 07 13:31:38 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
--- a/webengine/osswebengine/WebCore/ForwardingHeaders/wtf/Vector.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/WebCore/ForwardingHeaders/wtf/Vector.h	Thu Jan 07 13:31:38 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
--- a/webengine/osswebengine/WebCore/ForwardingHeaders/wtf/unicode/Unicode.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/WebCore/ForwardingHeaders/wtf/unicode/Unicode.h	Thu Jan 07 13:31:38 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
--- a/webengine/osswebengine/WebCore/ForwardingHeaders/wtf/unicode/icu/UnicodeIcu.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/WebCore/ForwardingHeaders/wtf/unicode/icu/UnicodeIcu.h	Thu Jan 07 13:31:38 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
--- a/webengine/osswebengine/WebCore/bridge/EditorClient.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/WebCore/bridge/EditorClient.h	Thu Jan 07 13:31:38 2010 +0200
@@ -138,6 +138,9 @@
     virtual bool spellingUIIsShowing() = 0;
     virtual void getGuessesForWord(const String&, Vector<String>& guesses) = 0;
     virtual void setInputMethodState(bool enabled) = 0;
+#if PLATFORM(SYMBIAN)     
+    virtual void preFocusChange(Node* oldNode, Node* newNode) = 0; 
+#endif 
 };
 
 }
--- a/webengine/osswebengine/WebCore/css/MediaQuery.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/WebCore/css/MediaQuery.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2005, 2006 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
--- a/webengine/osswebengine/WebCore/css/MediaQuery.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/WebCore/css/MediaQuery.h	Thu Jan 07 13:31:38 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
--- a/webengine/osswebengine/WebCore/css/MediaQueryEvaluator.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/WebCore/css/MediaQueryEvaluator.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
--- a/webengine/osswebengine/WebCore/css/MediaQueryEvaluator.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/WebCore/css/MediaQueryEvaluator.h	Thu Jan 07 13:31:38 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
--- a/webengine/osswebengine/WebCore/css/MediaQueryExp.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/WebCore/css/MediaQueryExp.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
--- a/webengine/osswebengine/WebCore/css/MediaQueryExp.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/WebCore/css/MediaQueryExp.h	Thu Jan 07 13:31:38 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
--- a/webengine/osswebengine/WebCore/icu/unicode/utf_old.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/WebCore/icu/unicode/utf_old.h	Thu Jan 07 13:31:38 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
--- a/webengine/osswebengine/WebCore/loader/Cache.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/WebCore/loader/Cache.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -106,7 +106,7 @@
 {
     // FIXME: Do we really need to special-case an empty URL?
     // Would it be better to just go on with the cache code and let it fail later?
-    if (url.isEmpty())
+    if (url.isEmpty() || url.url().lower() == "about:blank")
         return 0;
     
     // Look up the resource in our map.
--- a/webengine/osswebengine/WebCore/loader/DocumentLoader.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/WebCore/loader/DocumentLoader.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -711,6 +711,7 @@
 bool DocumentLoader::startLoadingMainResource(unsigned long identifier)
 {
     ASSERT(!m_mainResourceLoader);
+    MemoryManager::ResetOOMDialogDisplayed();
     m_mainResourceLoader = MainResourceLoader::create(m_frame);
     m_mainResourceLoader->setIdentifier(identifier);
 
--- a/webengine/osswebengine/WebCore/page/FocusController.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/WebCore/page/FocusController.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -267,7 +267,11 @@
         
     if (oldFocusedNode && oldFocusedNode->rootEditableElement() == oldFocusedNode && !relinquishesEditingFocus(oldFocusedNode))
         return false;
-        
+
+#if PLATFORM(SYMBIAN)
+    m_page->editorClient()->preFocusChange(oldFocusedNode,node);
+#endif 
+    
     clearSelectionIfNeeded(oldFocusedFrame.get(), newFocusedFrame.get(), node);
     
     if (!node) {
--- a/webengine/osswebengine/WebCore/page/symbian/WebCoreFrameBridge.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/WebCore/page/symbian/WebCoreFrameBridge.h	Thu Jan 07 13:31:38 2010 +0200
@@ -20,7 +20,7 @@
 
 #include "Shared.h"
 #include <wtf/Vector.h>
-#include "brctldefs.h"
+#include <brctldefs.h>
 
 namespace WebCore {
     class Node;
--- a/webengine/osswebengine/WebCore/platform/graphics/cairo/AffineTransformCairo.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/WebCore/platform/graphics/cairo/AffineTransformCairo.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
--- a/webengine/osswebengine/WebCore/platform/graphics/svg/SVGResourceListener.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/WebCore/platform/graphics/svg/SVGResourceListener.h	Thu Jan 07 13:31:38 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
--- a/webengine/osswebengine/WebCore/platform/image-decoders/zlib/crc32.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/WebCore/platform/image-decoders/zlib/crc32.h	Thu Jan 07 13:31:38 2010 +0200
@@ -1,3 +1,19 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of the License "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: 
+*
+*/
 /* crc32.h -- tables for rapid CRC calculation
  * Generated automatically by crc32.c
  */
--- a/webengine/osswebengine/WebCore/platform/image-decoders/zlib/inffixed.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/WebCore/platform/image-decoders/zlib/inffixed.h	Thu Jan 07 13:31:38 2010 +0200
@@ -1,3 +1,19 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of the License "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: 
+*
+*/
     /* inffixed.h -- table for decoding fixed codes
      * Generated automatically by makefixed().
      */
--- a/webengine/osswebengine/WebCore/platform/image-decoders/zlib/trees.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/WebCore/platform/image-decoders/zlib/trees.h	Thu Jan 07 13:31:38 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
--- a/webengine/osswebengine/WebCore/platform/network/symbian/HttpConnection.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/WebCore/platform/network/symbian/HttpConnection.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -32,7 +32,7 @@
 #include <httpfiltercommonstringsext.h>
 #include <brctldefs.h>
 #include "BrCtl.h"
-#include "brctlspecialloadobserver.h"
+#include <brctlspecialloadobserver.h>
 #include "Frame.h"
 #include "FrameLoader.h"
 #include "DocumentLoader.h"
--- a/webengine/osswebengine/WebCore/platform/network/symbian/HttpUiCallbacks.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/WebCore/platform/network/symbian/HttpUiCallbacks.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -27,7 +27,7 @@
 #include "WebView.h"
 #include "BrCtl.h"
 #include "SettingsContainer.h"
-#include "brctlspecialloadobserver.h"
+#include <brctlspecialloadobserver.h>
 #include "StaticObjectsContainer.h"
 #include "ResourceLoaderDelegate.h"
 #include "HttpDefs.h"
--- a/webengine/osswebengine/WebCore/platform/network/symbian/MultipartContentHandler.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/WebCore/platform/network/symbian/MultipartContentHandler.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -18,8 +18,8 @@
 // INCLUDE FILES
 #include "config.h"
 #include "MultipartContentHandler.h"
-#include "multipartparser.h"
-#include "bodypart.h"
+#include <multipartparser.h>
+#include <bodypart.h>
 #include "HttpSessionManager.h"
 #include "httpcachemanager.h"
 #include <http/rhttptransaction.h>
--- a/webengine/osswebengine/WebCore/platform/network/symbian/ResolvedConnection.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/WebCore/platform/network/symbian/ResolvedConnection.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -82,7 +82,9 @@
 
 void ResolvedConnection::cancel()
 {
-    control(m_frame)->brCtlLinkResolver()->CancelAll();
+	  if(m_frame) {
+        control(m_frame)->brCtlLinkResolver()->CancelAll();
+    }
 }
 
 void ResolvedConnection::download(ResourceHandle* handle,
--- a/webengine/osswebengine/WebCore/platform/network/symbian/ResolvedConnection.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/WebCore/platform/network/symbian/ResolvedConnection.h	Thu Jan 07 13:31:38 2010 +0200
@@ -20,8 +20,8 @@
 
 #include <e32base.h>
 #include "UrlConnection.h"
-#include "brctldefs.h"
-#include "brctllinkresolver.h"
+#include <brctldefs.h>
+#include <brctllinkresolver.h>
 
 namespace WebCore {
     class Frame;
--- a/webengine/osswebengine/WebCore/platform/network/symbian/ResourceLoaderDelegate.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/WebCore/platform/network/symbian/ResourceLoaderDelegate.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -40,8 +40,8 @@
 #include "WebUtil.h"
 #include "WebFrame.h"
 #include "SettingsContainer.h"
-#include "brctlspecialloadobserver.h"
-#include "brctllinkresolver.h"
+#include <brctlspecialloadobserver.h>
+#include <brctllinkresolver.h>
 #include "WebDocumentLoader.h"
 #include "WebView.h"
 
--- a/webengine/osswebengine/WebCore/platform/network/symbian/UrlConnection.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/WebCore/platform/network/symbian/UrlConnection.h	Thu Jan 07 13:31:38 2010 +0200
@@ -22,7 +22,7 @@
 #include "ResourceHandle.h"
 #include "ResourceHandleInternal.h"
 
-#include "brctldefs.h"
+#include <brctldefs.h>
 
 namespace WebCore {
     class Frame;
--- a/webengine/osswebengine/WebCore/platform/symbian/FontCacheSymbian.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/WebCore/platform/symbian/FontCacheSymbian.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -138,6 +138,9 @@
 
 const AtomicString& PlatformFontCache::SystemFontFamily( const AtomicString& familyName )
 {
+#ifdef BRDO_BROWSER_MULTIPLE_FONT_SUPPORT
+    return familyName;
+#else
     // first check if we support this font
     for (TInt n=0; n<iTypefaceCount; ++n)
     {
@@ -148,6 +151,7 @@
     }
 
     return DeviceDefaultFontFamilies();
+#endif
 }
 
 const AtomicString& PlatformFontCache::DeviceDefaultFontFamilies()
--- a/webengine/osswebengine/WebCore/platform/symbian/Libxml2/Libxml2_modules.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/WebCore/platform/symbian/Libxml2/Libxml2_modules.h	Thu Jan 07 13:31:38 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
--- a/webengine/osswebengine/WebCore/platform/symbian/Libxml2/Libxml2_xmlmemory.c	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/WebCore/platform/symbian/Libxml2/Libxml2_xmlmemory.c	Thu Jan 07 13:31:38 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
--- a/webengine/osswebengine/WebCore/platform/symbian/Libxml2/Libxml2_xmlwriter.c	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/WebCore/platform/symbian/Libxml2/Libxml2_xmlwriter.c	Thu Jan 07 13:31:38 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
--- a/webengine/osswebengine/WebCore/platform/symbian/Libxml2/libxml/parser.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/WebCore/platform/symbian/Libxml2/libxml/parser.h	Thu Jan 07 13:31:38 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
--- a/webengine/osswebengine/WebCore/platform/symbian/Libxml2/libxml/parserinternals.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/WebCore/platform/symbian/Libxml2/libxml/parserinternals.h	Thu Jan 07 13:31:38 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
--- a/webengine/osswebengine/WebCore/platform/symbian/Libxml2/libxml/tree.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/WebCore/platform/symbian/Libxml2/libxml/tree.h	Thu Jan 07 13:31:38 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
--- a/webengine/osswebengine/WebCore/platform/symbian/Libxml2/libxml/xmlstring.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/WebCore/platform/symbian/Libxml2/libxml/xmlstring.h	Thu Jan 07 13:31:38 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
--- a/webengine/osswebengine/WebCore/platform/symbian/OOMHandler.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/WebCore/platform/symbian/OOMHandler.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -1,20 +1,30 @@
 /*
-* Copyright (c) 2007 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: 
-*
-*/
-
+ * Copyright (C) 2007 Nokia, Inc.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1.  Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer. 
+ * 2.  Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in the
+ *     documentation and/or other materials provided with the distribution. 
+ * 3.  Neither the name of Apple Computer, Inc. ("Apple") nor the names of
+ *     its contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission. 
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
 
 #include "config.h"
 #include "OOMHandler.h"
--- a/webengine/osswebengine/WebCore/platform/symbian/OOMHandler.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/WebCore/platform/symbian/OOMHandler.h	Thu Jan 07 13:31:38 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
@@ -20,7 +20,7 @@
 #define __OOMHANDLER_H__
 
 #include <e32def.h>
-#include "MemoryManager.h"
+#include <MemoryManager.h>
 
 namespace WebCore {
 
--- a/webengine/osswebengine/WebCore/platform/symbian/OOMStopper.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/WebCore/platform/symbian/OOMStopper.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -1,20 +1,30 @@
 /*
-* Copyright (c) 2007 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: 
-*
-*/
-
+ * Copyright (C) 2007 Nokia, Inc.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1.  Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer. 
+ * 2.  Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in the
+ *     documentation and/or other materials provided with the distribution. 
+ * 3.  Neither the name of Apple Computer, Inc. ("Apple") nor the names of
+ *     its contributors may be used to endorse or promote products derived
+ *     from this software without specific prior written permission. 
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
 
 #include "config.h"
 #include "OOMStopper.h"
--- a/webengine/osswebengine/WebCore/platform/symbian/OOMStopper.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/WebCore/platform/symbian/OOMStopper.h	Thu Jan 07 13:31:38 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
@@ -20,7 +20,7 @@
 #define __OOMSTOPPER_H__
 
 #include <e32def.h>
-#include "MemoryManager.h"
+#include <MemoryManager.h>
 
 namespace WebCore {
 
--- a/webengine/osswebengine/WebCore/platform/symbian/StaticObjectsContainer.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/WebCore/platform/symbian/StaticObjectsContainer.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
@@ -27,7 +27,7 @@
 #include "FormFillController.h"
 #include "ResourceLoaderDelegate.h"
 #include "webkitLogger.h"
-#include "brctldefs.h"
+#include <brctldefs.h>
 #include "WebIconDatabase.h"
 #include "WebSurface.h"
 #include "WebCursor.h"
--- a/webengine/osswebengine/WebCore/platform/symbian/StaticObjectsContainer.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/WebCore/platform/symbian/StaticObjectsContainer.h	Thu Jan 07 13:31:38 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
--- a/webengine/osswebengine/WebCore/platform/symbian/bitmap/AnimationDecoder.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/WebCore/platform/symbian/bitmap/AnimationDecoder.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
--- a/webengine/osswebengine/WebCore/platform/symbian/bitmap/AnimationDecoder.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/WebCore/platform/symbian/bitmap/AnimationDecoder.h	Thu Jan 07 13:31:38 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
--- a/webengine/osswebengine/WebCore/platform/symbian/bitmap/AnimationDecoderWrapped.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/WebCore/platform/symbian/bitmap/AnimationDecoderWrapped.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
@@ -32,7 +32,7 @@
 #include "MaskedBitmap.h"
 #include "ImageObserver.h"
 #include "SyncDecodeThread.h"
-#include "Oma2Agent.h"
+#include <Oma2Agent.h>
 using namespace ContentAccess;
 
 namespace TBidirectionalState {
--- a/webengine/osswebengine/WebCore/platform/symbian/bitmap/AnimationDecoderWrapped.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/WebCore/platform/symbian/bitmap/AnimationDecoderWrapped.h	Thu Jan 07 13:31:38 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
--- a/webengine/osswebengine/WebCore/platform/symbian/bitmap/BitmapTiler.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/WebCore/platform/symbian/bitmap/BitmapTiler.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -15,9 +15,8 @@
 *
 */
 
-
 #include <fbs.h>
-//#include <oom.h>
+//#include "oom.h"
 #include "BitmapTiler.h"
 #include "MaskedBitmap.h"
 
--- a/webengine/osswebengine/WebCore/platform/symbian/bitmap/StaticImageDecoder.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/WebCore/platform/symbian/bitmap/StaticImageDecoder.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -21,7 +21,7 @@
 #include <imageconversion.h>
 #include <eikenv.h>
 #include <fbs.h>
-#include <oom.h>
+#include "oom.h"
 
 // CONSTANTS
 // block all images that would take free ram below this amount when decoded
--- a/webengine/osswebengine/WebCore/xml/xmlhttprequest.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/WebCore/xml/xmlhttprequest.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -725,7 +725,7 @@
         else if (responseIsXML())
             m_decoder = new TextResourceDecoder("application/xml");
         else if (responseMIMEType() == "text/html")
-            m_decoder = new TextResourceDecoder("text/html");
+            m_decoder = new TextResourceDecoder("text/html", "UTF-8");
         else
             m_decoder = new TextResourceDecoder("text/plain", "UTF-8");
     }
--- a/webengine/osswebengine/WebKit/ForwardingHeaders/wtf/unicode/Unicode.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/WebKit/ForwardingHeaders/wtf/unicode/Unicode.h	Thu Jan 07 13:31:38 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
--- a/webengine/osswebengine/WebKit/ForwardingHeaders/wtf/unicode/icu/UnicodeIcu.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/WebKit/ForwardingHeaders/wtf/unicode/icu/UnicodeIcu.h	Thu Jan 07 13:31:38 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
--- a/webengine/osswebengine/WebKit/s60/data/01005A02.rss	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/WebKit/s60/data/01005A02.rss	Thu Jan 07 13:31:38 2010 +0200
@@ -15,7 +15,7 @@
 *
 */
 
-#include <RegistryInfo.rh>
+#include <ecom/registryinfo.rh>
 RESOURCE REGISTRY_INFO r_registry
 {
 	dll_uid = 0x01005A02; 	// Should match the name of this file
--- a/webengine/osswebengine/WebKit/s60/data/Webkit.rss	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/WebKit/s60/data/Webkit.rss	Thu Jan 07 13:31:38 2010 +0200
@@ -27,7 +27,8 @@
 #include <AiwCommon.hrh>
 #include <AiwCommon.rh>
 #include <CommonDialogs.rh>
-#include <Webkit.loc>
+#include <webkit.loc>
+#include <Avkon.loc>
 
 RESOURCE RSS_SIGNATURE { }
 	
@@ -250,3 +251,5 @@
 RESOURCE TBUF r_qtn_browser_dialog_scriptlog_disable_msg { buf=qtn_browser_dialog_scriptlog_disable_msg; }     
 
 
+// Misc dialogs
+RESOURCE TBUF r_qtn_browser_dialog_oom { buf=qtn_memlo_ram_out_of_mem; } 
--- a/webengine/osswebengine/WebKit/s60/data/Webkit_sdk.rss	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/WebKit/s60/data/Webkit_sdk.rss	Thu Jan 07 13:31:38 2010 +0200
@@ -22,7 +22,7 @@
 #include <avkon.rsg>
 #include <avkon.rh>
 #include <CommonDialogs.rh>
-#include <Webkit.loc>
+#include <webkit.loc>
 
 RESOURCE RSS_SIGNATURE { }
   
--- a/webengine/osswebengine/WebKit/s60/formcontrols/PopupSelectListBox.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/WebKit/s60/formcontrols/PopupSelectListBox.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -23,10 +23,11 @@
 #include <gulbordr.h>
 #include <eikfrlbd.h> //CFormattedCellListBoxData
 
+#include <brctldialogsprovider.h>
+
 #include "PopupSelectListBox.h"
 #include "WebView.h"
 #include "WebFepTextEditor.h"
-#include "brctldialogsprovider.h"
 
 // CONSTANTS
 
--- a/webengine/osswebengine/WebKit/s60/formcontrols/PopupSelectListBox.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/WebKit/s60/formcontrols/PopupSelectListBox.h	Thu Jan 07 13:31:38 2010 +0200
@@ -15,7 +15,6 @@
 *
 */
 
-
 #ifndef POPUPSELECTLISTBOX_H
 #define POPUPSELECTLISTBOX_H
 
@@ -24,10 +23,8 @@
 #include <eiktxlbx.h>
 #include <eikfrlb.h> //CFormattedCellListBox
 
-
 // CONSTANTS
 
-
 // FORWARD DECLARATIONS
 
 class TBrCtlSelectOptionData;
--- a/webengine/osswebengine/WebKit/s60/formcontrols/WebFormFillPopup.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/WebKit/s60/formcontrols/WebFormFillPopup.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -17,13 +17,15 @@
 
 // INCLUDE FILES
 #include <../bidi.h>
+#include <brctldialogsprovider.h>
+
 #include "WebFormFillPopup.h"
 #include "WebView.h"
 #include "WebFrame.h"
 #include "WebFrameView.h"
-#include "brctldefs.h"
+#include <brctldefs.h>
 #include "PopupSelectListBox.h"
-#include "brctldialogsprovider.h"
+
 #include "WebFepTextEditor.h"
 #include "FormFillCallback.h"
 #include "Page.h"
@@ -37,7 +39,6 @@
 
 #include "eikon.hrh"
 
-
 static const TInt KMaxNumToShow = 6; // max number of list items to show
 static const TInt KInitArraySize = 10; // initial array size
 static const TInt KBorderSize = 1; // List Box Border size
--- a/webengine/osswebengine/WebKit/s60/group/JavaScriptCore/JavaScriptCore.mmp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/WebKit/s60/group/JavaScriptCore/JavaScriptCore.mmp	Thu Jan 07 13:31:38 2010 +0200
@@ -15,7 +15,6 @@
 *
 */
 
-
 TARGET      JavaScriptCore.DLL
 TARGETTYPE  dll
 UID 0x1000008d 0x10281B70
@@ -72,8 +71,8 @@
 SYSTEMINCLUDE ../../../../JavaScriptCore/ForwardingHeaders
 SYSTEMINCLUDE ../../../../
 
-MW_LAYER_LIBC_SYSTEMINCLUDE
-MW_LAYER_STDAPIS_SYSTEMINCLUDE
+OS_LAYER_ESTLIB_SYSTEMINCLUDE
+OS_LAYER_LIBC_SYSTEMINCLUDE
 
 SOURCEPATH ../../../../DerivedSources/JavaScriptCore
 SOURCE grammar.cpp
@@ -130,7 +129,6 @@
 SOURCE JSWrapperObject.cpp
 SOURCE PropertyNameArray.cpp
 
-
 SOURCEPATH ../../../../JavaScriptCore/pcre
 SOURCE pcre_refcount.c
 SOURCE pcre_ucp_findchar.c
@@ -177,6 +175,5 @@
 LIBRARY         estlib.lib
 LIBRARY         euser.lib
 LIBRARY		memman.lib
-LIBRARY     charconv.lib
+LIBRARY     	charconv.lib
 
-
--- a/webengine/osswebengine/WebKit/s60/group/browserengine/browserengine.mmp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/WebKit/s60/group/browserengine/browserengine.mmp	Thu Jan 07 13:31:38 2010 +0200
@@ -15,7 +15,6 @@
 *
 */
 #include "../common.mmpi"
-#include <platform/mw/browser_platform_variant.hrh>
 
 TARGET          browserengine.dll
 TARGETTYPE      dll
--- a/webengine/osswebengine/WebKit/s60/group/common.mmpi	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/WebKit/s60/group/common.mmpi	Thu Jan 07 13:31:38 2010 +0200
@@ -20,6 +20,7 @@
 #include <platform/mw/browser_platform_variant.hrh>
 
 SYSTEMINCLUDE ../../../WebCore/platform/symbian/Libxml2
+
 MW_LAYER_SYSTEMINCLUDE
 
 USERINCLUDE ../../../WebCore 
@@ -75,11 +76,8 @@
 SYSTEMINCLUDE ../../../WebCore/icu
 SYSTEMINCLUDE ../../../WebCore/bindings/js
 
-MW_LAYER_ECOM_SYSTEMINCLUDE
-MW_LAYER_HTTP_SYSTEMINCLUDE
-MW_LAYER_LIBC_SYSTEMINCLUDE
-MW_LAYER_STDAPIS_SYSTEMINCLUDE
-
+OS_LAYER_ESTLIB_SYSTEMINCLUDE
+OS_LAYER_LIBC_SYSTEMINCLUDE
 
 SYSTEMINCLUDE ../../../../PageScaler/inc
 SYSTEMINCLUDE ../../../../WidgetEngine/inc
--- a/webengine/osswebengine/WebKit/s60/group/libxml2/libxml2.mmp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/WebKit/s60/group/libxml2/libxml2.mmp	Thu Jan 07 13:31:38 2010 +0200
@@ -54,4 +54,4 @@
 USERINCLUDE             .
 
 MW_LAYER_SYSTEMINCLUDE
-MW_LAYER_LIBC_SYSTEMINCLUDE
+OS_LAYER_ESTLIB_SYSTEMINCLUDE
--- a/webengine/osswebengine/WebKit/s60/group/plugins/plugins.mmp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/WebKit/s60/group/plugins/plugins.mmp	Thu Jan 07 13:31:38 2010 +0200
@@ -14,15 +14,14 @@
 * Description:  
 *
 */
+
 #include "../common.mmpi"
 
 TARGET          plugins.lib
 TARGETTYPE      lib
 
-
 VENDORID        VID_DEFAULT
 
-MW_LAYER_SYSTEMINCLUDE
 SYSTEMINCLUDE	../../../../../../inc
 SYSTEMINCLUDE	../../../../WebCore/html
 SYSTEMINCLUDE	../../../../WebCore/dom
--- a/webengine/osswebengine/WebKit/s60/group/webcore/DerivedSources/DerivedSources.mmp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/WebKit/s60/group/webcore/DerivedSources/DerivedSources.mmp	Thu Jan 07 13:31:38 2010 +0200
@@ -14,9 +14,6 @@
 // * Description:  This is the project specification file for WebCore.
 // *
 
-#include <platform_paths.hrh>
-#include <data_caging_paths.hrh>
-#include <platform/mw/browser_platform_variant.hrh>
 #include "../../common.mmpi"
 
 TARGET  WebCoreDerivedSources.lib
--- a/webengine/osswebengine/WebKit/s60/group/webcore/bindings/bindings.mmp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/WebKit/s60/group/webcore/bindings/bindings.mmp	Thu Jan 07 13:31:38 2010 +0200
@@ -14,10 +14,6 @@
 // * Description:  This is the project specification file for WebCore.
 // *
 
-
-#include <platform_paths.hrh>
-#include <data_caging_paths.hrh>
-#include <platform/mw/browser_platform_variant.hrh>
 #include "../../common.mmpi"
 
 TARGET  WebCorebindings.lib
--- a/webengine/osswebengine/WebKit/s60/group/webcore/bridge/bridge.mmp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/WebKit/s60/group/webcore/bridge/bridge.mmp	Thu Jan 07 13:31:38 2010 +0200
@@ -14,9 +14,6 @@
 // * Description:  This is the project specification file for WebCore.
 // *
 
-#include <platform_paths.hrh>
-#include <data_caging_paths.hrh>
-#include <platform/mw/browser_platform_variant.hrh>
 #include "../../common.mmpi"
 
 TARGET  WebCorebridge.lib
--- a/webengine/osswebengine/WebKit/s60/group/webcore/dom/dom.mmp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/WebKit/s60/group/webcore/dom/dom.mmp	Thu Jan 07 13:31:38 2010 +0200
@@ -14,9 +14,6 @@
 // * Description:  This is the project specification file for WebCore.
 // *
 
-#include <platform_paths.hrh>
-#include <data_caging_paths.hrh>
-#include <platform/mw/browser_platform_variant.hrh>
 #include "../../common.mmpi"
 
 TARGET  WebCoredom.lib
--- a/webengine/osswebengine/WebKit/s60/group/webcore/editing/editing.mmp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/WebKit/s60/group/webcore/editing/editing.mmp	Thu Jan 07 13:31:38 2010 +0200
@@ -14,9 +14,6 @@
 // * Description:  This is the project specification file for WebCore.
 // *
 
-#include <platform_paths.hrh>
-#include <data_caging_paths.hrh>
-#include <platform/mw/browser_platform_variant.hrh>
 #include "../../common.mmpi"
 
 TARGET  WebCoreediting.lib
--- a/webengine/osswebengine/WebKit/s60/group/webcore/history/history.mmp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/WebKit/s60/group/webcore/history/history.mmp	Thu Jan 07 13:31:38 2010 +0200
@@ -14,9 +14,6 @@
 // * Description:  This is the project specification file for WebCore.
 // *
 
-#include <platform_paths.hrh>
-#include <data_caging_paths.hrh>
-#include <platform/mw/browser_platform_variant.hrh>
 #include "../../common.mmpi"
 
 TARGET  WebCorehistory.lib
--- a/webengine/osswebengine/WebKit/s60/group/webcore/html/html.mmp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/WebKit/s60/group/webcore/html/html.mmp	Thu Jan 07 13:31:38 2010 +0200
@@ -14,9 +14,6 @@
 // * Description:  This is the project specification file for WebCore.
 // *
 
-#include <platform_paths.hrh>
-#include <data_caging_paths.hrh>
-#include <platform/mw/browser_platform_variant.hrh>
 #include "../../common.mmpi"
 
 TARGET  WebCorehtml.lib
--- a/webengine/osswebengine/WebKit/s60/group/webcore/loader/loader.mmp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/WebKit/s60/group/webcore/loader/loader.mmp	Thu Jan 07 13:31:38 2010 +0200
@@ -14,9 +14,6 @@
 // * Description:  This is the project specification file for WebCore.
 // *
 
-#include <platform_paths.hrh>
-#include <data_caging_paths.hrh>
-#include <platform/mw/browser_platform_variant.hrh>
 #include "../../common.mmpi"
 
 TARGET  WebCoreloader.lib
--- a/webengine/osswebengine/WebKit/s60/group/webcore/page/page.mmp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/WebKit/s60/group/webcore/page/page.mmp	Thu Jan 07 13:31:38 2010 +0200
@@ -14,9 +14,6 @@
 // * Description:  This is the project specification file for WebCore.
 // *
 
-#include <platform_paths.hrh>
-#include <data_caging_paths.hrh>
-#include <platform/mw/browser_platform_variant.hrh>
 #include "../../common.mmpi"
 
 TARGET  WebCorepage.lib
--- a/webengine/osswebengine/WebKit/s60/group/webcore/platform/platform.mmp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/WebKit/s60/group/webcore/platform/platform.mmp	Thu Jan 07 13:31:38 2010 +0200
@@ -14,10 +14,7 @@
 // * Description:  This is the project specification file for WebCore.
 // *
 
-#include <platform_paths.hrh>
-#include <data_caging_paths.hrh>
 #include "../../common.mmpi"
-#include <platform/mw/browser_platform_variant.hrh>
 
 TARGET  WebCoreplatform.lib
 
@@ -51,7 +48,6 @@
 	SOURCE 1 	../../../data/SelectMultimask.bmp
 END
 
-
 //OPTION CW -prefix pragmas.pref
 
 SOURCEPATH ../../../../../WebCore/platform
--- a/webengine/osswebengine/WebKit/s60/group/webcore/rendering/rendering.mmp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/WebKit/s60/group/webcore/rendering/rendering.mmp	Thu Jan 07 13:31:38 2010 +0200
@@ -14,9 +14,6 @@
 // * Description:  This is the project specification file for WebCore.
 // *
 
-#include <platform_paths.hrh>
-#include <data_caging_paths.hrh>
-#include <platform/mw/browser_platform_variant.hrh>
 #include "../../common.mmpi"
 
 TARGET  WebCorerendering.lib
--- a/webengine/osswebengine/WebKit/s60/group/webcore/webcorecss/webcorecss.mmp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/WebKit/s60/group/webcore/webcorecss/webcorecss.mmp	Thu Jan 07 13:31:38 2010 +0200
@@ -14,9 +14,6 @@
 // * Description:  This is the project specification file for WebCore.
 // *
 
-#include <platform_paths.hrh>
-#include <data_caging_paths.hrh>
-#include <platform/mw/browser_platform_variant.hrh>
 #include "../../common.mmpi"
 
 TARGET  WebCorecss.lib
--- a/webengine/osswebengine/WebKit/s60/group/webcore/xml/xml.mmp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/WebKit/s60/group/webcore/xml/xml.mmp	Thu Jan 07 13:31:38 2010 +0200
@@ -14,9 +14,6 @@
 // * Description:  This is the project specification file for WebCore.
 // *
 
-#include <platform_paths.hrh>
-#include <data_caging_paths.hrh>
-#include <platform/mw/browser_platform_variant.hrh>
 #include "../../common.mmpi"
 
 TARGET  WebCorexml.lib
--- a/webengine/osswebengine/WebKit/s60/group/webkit/bld.inf	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/WebKit/s60/group/webkit/bld.inf	Thu Jan 07 13:31:38 2010 +0200
@@ -21,7 +21,7 @@
 DEFAULT 
 
 PRJ_EXPORTS
-../../loc/Webkit.loc                MW_LAYER_LOC_EXPORT_PATH(Webkit.loc)
+../../loc/webkit.loc                MW_LAYER_LOC_EXPORT_PATH(webkit.loc)
 ../../rom/webkit.iby                CORE_MW_LAYER_IBY_EXPORT_PATH(webkit.iby)
 ../../rom/webkitResources.iby       LANGUAGE_MW_LAYER_IBY_EXPORT_PATH(webkitResources.iby)
 
--- a/webengine/osswebengine/WebKit/s60/group/webkit/webkit.mmp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/WebKit/s60/group/webkit/webkit.mmp	Thu Jan 07 13:31:38 2010 +0200
@@ -19,7 +19,6 @@
 TARGET          WebKit.lib
 TARGETTYPE      lib
 
-
 VENDORID        VID_DEFAULT
 
 SOURCEPATH      ../../WebView
--- a/webengine/osswebengine/WebKit/s60/misc/WebTabbedNavigation.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/WebKit/s60/misc/WebTabbedNavigation.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -27,7 +27,7 @@
 #include "HitTestResult.h"
 #include "HTMLNames.h"
 #include "FrameTree.h"
-#include "brctldefs.h"
+#include <brctldefs.h>
 #include "WebCursor.h"
 #include "StaticObjectsContainer.h"
 #include "Page.h"
--- a/webengine/osswebengine/WebKit/s60/misc/WebUtil.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/WebKit/s60/misc/WebUtil.h	Thu Jan 07 13:31:38 2010 +0200
@@ -19,7 +19,7 @@
 #define __WEBUTIL_H__
 
 #include <e32std.h>
-#include "brctldefs.h"
+#include <brctldefs.h>
 
 class WebFrame;
 class WebView;
--- a/webengine/osswebengine/WebKit/s60/plugins/NpnImplementation.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/WebKit/s60/plugins/NpnImplementation.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -494,7 +494,7 @@
                 else {
                 cursorPos = static_cast<TPoint*>(aSetValue);
                 }
-                pluginWin->pluginDeactivate(*cursorPos);
+            pluginWin->pluginDeactivate(*cursorPos);
             }
         }
         break;
--- a/webengine/osswebengine/WebKit/s60/plugins/PluginSkin.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/WebKit/s60/plugins/PluginSkin.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -33,7 +33,7 @@
 #include "BrCtl.h"
 #include "WebCoreGraphicsContext.h"
 #include "StaticObjectsContainer.h"
-#include "brctldefs.h"
+#include <brctldefs.h>
 #include "SettingsContainer.h"
 #include <Uri8.h>
 #include <StringLoader.h>
--- a/webengine/osswebengine/WebKit/s60/plugins/PluginSkin.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/WebKit/s60/plugins/PluginSkin.h	Thu Jan 07 13:31:38 2010 +0200
@@ -31,7 +31,7 @@
 #include "WebFrame.h"
 #include "WebFrameView.h"
 #include "WebView.h"
-#include "MemoryManager.h"
+#include <MemoryManager.h>
 //#include <Element.h>
 
 // FORWARD DECLARATIONS
--- a/webengine/osswebengine/WebKit/s60/plugins/PluginWin.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/WebKit/s60/plugins/PluginWin.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -28,7 +28,7 @@
 
 #include "WebFrame.h"
 #include "HttpDefs.h"
-#include "brctldefs.h"
+#include <brctldefs.h>
 #include "StaticObjectsContainer.h"
 #include <pluginadapterinterface.h>
 #include "PluginWin.h"
--- a/webengine/osswebengine/WebKit/s60/webcoresupport/WebEditorClient.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/WebKit/s60/webcoresupport/WebEditorClient.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -451,26 +451,6 @@
                 break;
 
             case EKeyF18:
-                if (magnify)
-                {
-                    switch (kevent->symbianEvent().iScanCode)
-                        {
-                        case EEikCmdEditCut:
-                            m_webView->fepTextEditor()->CcpuCutL();
-                            frame->editor()->deleteWithDirection(SelectionController::BACKWARD,
-                                                             CharacterGranularity, false, true);
-                            m_webView->fepTextEditor()->HandleUpdateCursor();
-                            break;
-                        case EEikCmdEditCopy:
-                            m_webView->fepTextEditor()->CcpuCopyL();
-                            break;
-                        case EEikCmdEditPaste:
-                            m_webView->fepTextEditor()->CcpuPasteL();
-                            break;
-                        default:
-                            break;
-                        }
-                }
                 break;
 
 // All of the diagonal KeyEvents are allowed to flow through the "default" case...
@@ -563,8 +543,12 @@
 //-----------------------------------------------------------------------------
 bool WebEditorClient::doTextFieldCommandFromEvent(Element*, KeyboardEvent*)
 {
-    notImplemented();
-    return false;
+    /*
+     * Check here from WAP css property. Returning true will cause
+     * HTMLInputElement::defaultEventHandler(Event* evt) stop handling
+     * keyboard event end set it as default handled.
+     */
+    return !m_webView->fepTextEditor()->validateTextFormat();    
 }
 
 //-----------------------------------------------------------------------------
@@ -691,3 +675,12 @@
     }
 }
 
+void WebEditorClient::preFocusChange(Node* oldNode, Node* newNode)
+    {      
+    TBool contentEditable = m_webView->page()->focusController()->focusedOrMainFrame()->selectionController()->isContentEditable();    
+    if ( oldNode && newNode && contentEditable ) {       
+        m_webView->fepTextEditor()->FocusChanging();
+       }
+    }
+
+
--- a/webengine/osswebengine/WebKit/s60/webcoresupport/WebEditorClient.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/WebKit/s60/webcoresupport/WebEditorClient.h	Thu Jan 07 13:31:38 2010 +0200
@@ -97,7 +97,8 @@
      bool spellingUIIsShowing();
      void getGuessesForWord(const WebCore::String&, Vector<WebCore::String>& guesses);     
      void setInputMethodState(bool enabled);
-
+     void preFocusChange(WebCore::Node* oldNode, WebCore::Node* newNode);
+     
 private:
     void handleInsertText(WebCore::Frame* frame, const WebCore::String& text);
     void handleDeleteText(WebCore::Frame* frame);
--- a/webengine/osswebengine/WebKit/s60/webcoresupport/WebFrameLoaderClient.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/WebKit/s60/webcoresupport/WebFrameLoaderClient.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -44,7 +44,7 @@
 #include "WebPolicyManager.h"
 #include "StaticObjectsContainer.h"
 #include "ResourceLoaderDelegate.h"
-#include "brctlwindowobserver.h"
+#include <brctlwindowobserver.h>
 #include "WmlDispatcher.h"
 #include "WebUtil.h"
 #include "errordefs.h"
@@ -931,9 +931,10 @@
 void WebFrameLoaderClient::committedLoad(DocumentLoader* loader, const char* data, int length) 
 { 
     if (brctl(m_webFrame)->wmlMode()) {
-        TRAP_IGNORE(
-        m_WmlContentListener->ResponseL( data, length );
-        );
+    if(m_WmlContentListener)
+    	TRAP_IGNORE(
+         m_WmlContentListener->ResponseL( data, length );
+         );
         return;
     }
     m_webFrame->bridge()->receivedData(data, length, m_response.textEncodingName());
@@ -1142,9 +1143,9 @@
 void WebFrameLoaderClient::frameLoadCompleted()
 {
     if (brctl(m_webFrame)->wmlMode()) {
+    if (m_WmlContentListener)
         TRAP_IGNORE(
-		if (m_WmlContentListener)
-        	m_WmlContentListener->CompleteL( 0, 0 );
+         m_WmlContentListener->CompleteL( 0, 0 );
         );
         return;
     }
--- a/webengine/osswebengine/WebKit/s60/webview/BrCtl.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/WebKit/s60/webview/BrCtl.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -34,7 +34,7 @@
 #include <e32uid.h>
 #include <browserdialogsprovider.h>
 //tot:fixme
-//#include <oom.h>
+//#include "oom.h"
 
 #include "config.h"
 #include "BrCtl.h"
@@ -414,6 +414,7 @@
    , m_commandIdBase(aCommandIdBase)
    , m_capabilities(aBrCtlCapabilities)
    , m_suspendTimers(false)
+   , m_pageLoadFinished(false)
    , m_wmlEngineInterface(NULL)
    , m_brCtlDownloadObserver(aBrCtlDownloadObserver)
    , m_windoCloseTimer(NULL)
@@ -495,6 +496,9 @@
         }
     
     LoadResourceFileL();
+
+    MemoryManager::InitOOMDialog();
+    
     // Set the rect for BrowserControl (a CCoeControl).
     SetRect(aRect);
     CCoeEnv::Static()->DisableExitChecks(true);
@@ -583,6 +587,7 @@
 
     switch (aLoadEvent) {
         case TBrCtlDefs::EEventNewContentStart:
+            m_pageLoadFinished = false;
             if (m_webView->pageScalerEnabled())
                 m_webView->pageScaler()->DocumentStarted();
             if (m_webView->formFillPopup() && m_webView->formFillPopup()->IsVisible()) 
@@ -590,9 +595,10 @@
             break;
         case TBrCtlDefs::EEventContentFinished:
         case TBrCtlDefs::EEventUploadFinished:
+            m_pageLoadFinished = true;
             if (m_suspendTimers) {
                 m_suspendTimers = false;
-                HandleCommandL(TBrCtlDefs::ECommandAppBackground);
+                setDeferringTimers(true);
             }
 #ifndef BRDO_WML_DISABLED_FF
             if (m_wmlUnloadPending)
@@ -770,10 +776,20 @@
         case TBrCtlDefs::ECommandAppBackground:
             {
 #ifndef PERF_REGRESSION_LOG
-                if (m_webView->isLoading())
-                    m_suspendTimers = true;
-                else if (!isDeferringTimers())
-                    setDeferringTimers(true);
+                if(m_webView->widgetExtension())
+                    {
+                    if(m_pageLoadFinished)
+                        setDeferringTimers(true);
+                    else 
+                        m_suspendTimers = true;
+                    }
+                else
+                    {
+                    if (m_webView->isLoading())
+                        m_suspendTimers = true;
+                    else if (!isDeferringTimers())
+                        setDeferringTimers(true);
+                    }
 #endif
 
                 //Disable the zooming bar when it goes to background
--- a/webengine/osswebengine/WebKit/s60/webview/BrCtl.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/WebKit/s60/webview/BrCtl.h	Thu Jan 07 13:31:38 2010 +0200
@@ -23,7 +23,6 @@
 //  INCLUDES
 #include <brctlinterface.h>
 
-#include "brctldefs.h"
 #include "HistoryInterface.h"
 
 #include "WmlInterface.h"
@@ -705,6 +704,7 @@
         CPeriodic* m_timer;
         bool m_wmlMode;
         bool m_suspendTimers;
+        bool m_pageLoadFinished;
         MWmlEngineInterface* m_wmlEngineInterface;
         RLibrary  m_Library;
         MWmlInterface* m_WmlInterface;
--- a/webengine/osswebengine/WebKit/s60/webview/BrCtlDialogsProviderUtils.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/WebKit/s60/webview/BrCtlDialogsProviderUtils.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -15,14 +15,11 @@
 *
 */
 
-
-
 //  INCLUDES
 #include <e32std.h>
 #include <e32base.h>
 
-#include "brctldialogsprovider.h"
-
+#include <brctldialogsprovider.h>
 
 // ----------------------------------------------------------------------------
 // CBrCtlObjectInfo class
--- a/webengine/osswebengine/WebKit/s60/webview/BrCtlSoftkeysObserverImpl.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/WebKit/s60/webview/BrCtlSoftkeysObserverImpl.h	Thu Jan 07 13:31:38 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
--- a/webengine/osswebengine/WebKit/s60/webview/BrCtlSpecialLoadObserverImpl.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/WebKit/s60/webview/BrCtlSpecialLoadObserverImpl.h	Thu Jan 07 13:31:38 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
--- a/webengine/osswebengine/WebKit/s60/webview/BrCtlWindowObserverImpl.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/WebKit/s60/webview/BrCtlWindowObserverImpl.h	Thu Jan 07 13:31:38 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
--- a/webengine/osswebengine/WebKit/s60/webview/SettingsContainer.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/WebKit/s60/webview/SettingsContainer.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -15,7 +15,6 @@
 *
 */
 
-
 #include <../bidi.h>
 #include "SettingsContainer.h"
 #include "WebView.h"
@@ -31,7 +30,7 @@
 #include "StaticObjectsContainer.h"
 #include "ResourceLoaderDelegate.h"
 #include "HistoryInterface.h"
-#include "brctldefs.h"
+#include <brctldefs.h>
 #include "WebDocumentLoader.h"
 #include "Frame.h"
 #include "FrameLoader.h"
--- a/webengine/osswebengine/WebKit/s60/webview/SettingsContainer.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/WebKit/s60/webview/SettingsContainer.h	Thu Jan 07 13:31:38 2010 +0200
@@ -20,7 +20,7 @@
 #define __SETTINGSCONTAINER_H__
 
 #include <e32base.h>
-#include "brctldefs.h"
+#include <brctldefs.h>
 
 class WebView;
 class HistoryControllerInterface;
--- a/webengine/osswebengine/WebKit/s60/webview/WebFepTextEditor.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/WebKit/s60/webview/WebFepTextEditor.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -54,6 +54,8 @@
 #include <aknutils.h>
 #include "Text.h"
 
+#define KLineEnterChar 0x21b2
+
 using namespace WebCore;
 
 static const int kInfinite = -1;
@@ -85,7 +87,7 @@
 #if defined(BRDO_BROWSER_50_FF)
     SetAlignment( CAknExtendedInputCapabilities::EInputEditorAlignBidi );
 #endif
-	EnableCcpu(ETrue);
+    TRAP_IGNORE( EnableCcpuL() );
 }
 
 // -----------------------------------------------------------------------------
@@ -99,6 +101,7 @@
     delete m_inlineEditText;
     delete m_textFormatMask;
 	delete m_ExtendedInputCapabilities;
+	delete m_CcpuSupport;
     }
 
 // -----------------------------------------------------------------------------
@@ -341,6 +344,22 @@
 // -----------------------------------------------------------------------------
 void CWebFepTextEditor::CancelFepInlineEdit()
 {
+    if (IsTextAreaFocused()) {
+        if (m_inlineEditText && DocumentLengthForFep() < DocumentMaximumLengthForFep()) {
+            HBufC* tempBuf = HBufC::NewLC(DocumentLengthForFep());
+            TPtr ptr(tempBuf->Des());
+            GetEditorContentForFep(ptr, 0, DocumentLengthForFep());
+            TInt position = ptr.Locate(KLineEnterChar);
+            if(position != KErrNotFound){
+                TRAP_IGNORE(m_webView->fepTextEditor()->DoCommitFepInlineEditL());
+                Frame* frame = m_webView->page()->focusController()->focusedOrMainFrame();
+				if(frame){
+                	frame->editor()->execCommand("BackwardDelete");
+				}
+            }
+            CleanupStack::PopAndDestroy();
+        }
+    }
 }
 
 // -----------------------------------------------------------------------------
@@ -704,6 +723,10 @@
     	}
 
     state->ReportAknEdStateEventL(MAknEdStateObserver::EAknEdwinStateFlagsUpdate);
+    if (m_CcpuSupport)
+    {
+        TRAP_IGNORE(m_CcpuSupport->HandleFocusChangeL());
+    }
 }
 
 // -----------------------------------------------------------------------------
@@ -773,6 +796,10 @@
     CAknEdwinState* state = static_cast<CAknEdwinState*>(State(KNullUid));
     if ( state ) {
         TRAP_IGNORE( state->ReportAknEdStateEventL( MAknEdStateObserver::EAknCursorPositionChanged ) );
+		if (m_CcpuSupport)
+		{
+			TRAP_IGNORE(m_CcpuSupport->HandleSelectionChangeL());
+		}
     }
 }
 
@@ -1069,7 +1096,7 @@
 {
     TCursorSelection selection;
     GetCursorSelectionForFep(selection);
-    return selection.Length();
+    return m_CcpuSupport && selection.Length();
 }
 
 // -----------------------------------------------------------------------------
@@ -1082,6 +1109,12 @@
     PlaceDataOnClipboardL();
     TCursorSelection selection;
     GetCursorSelectionForFep(selection);
+    Frame* frame = m_webView->page()->focusController()->focusedOrMainFrame();
+    if (frame) {      
+        frame->editor()->deleteWithDirection(SelectionController::BACKWARD,
+            CharacterGranularity, false, true);
+        }
+    HandleUpdateCursor();
 }
 
 // -----------------------------------------------------------------------------
@@ -1093,7 +1126,7 @@
 {
     TCursorSelection selection;
     GetCursorSelectionForFep(selection);
-    return selection.Length();
+    return m_CcpuSupport && selection.Length();
 }
 
 // -----------------------------------------------------------------------------
@@ -1114,7 +1147,7 @@
 TBool CWebFepTextEditor::CcpuCanPaste() const
 {
     TRAPD(err, DoCcpuCanPasteL());
-    return err == KErrNone;
+    return (err == KErrNone) && m_CcpuSupport;
 }
 
 // -----------------------------------------------------------------------------
@@ -1320,17 +1353,24 @@
 //
 //
 // -----------------------------------------------------------------------------
-void CWebFepTextEditor::EnableCcpu(TBool aSupport)
+void CWebFepTextEditor::EnableCcpuL()
 {
+    CAknCcpuSupport* ccpu = NULL;
     CAknEdwinState* edwinState = static_cast<CAknEdwinState*>(this->State(KNullUid));
-    if(aSupport)
+    ccpu = new(ELeave) CAknCcpuSupport(this);
+    ccpu->SetMopParent(this);
+    CleanupStack::PushL(ccpu);
+    ccpu->ConstructL();
+    CleanupStack::Pop(ccpu);
+    delete m_CcpuSupport;
+    m_CcpuSupport = ccpu;
+    if (edwinState)
         {
-        edwinState->SetCcpuState(this);
-        }
-    else
-        {
-        edwinState->SetCcpuState(NULL);
-        }
+        edwinState->SetCcpuState(this);    
+        edwinState->SetMenu();
+        if (edwinState->MenuBar())
+            edwinState->MenuBar()->SetEditMenuObserver( m_CcpuSupport );
+        }        
 }
 
 // -----------------------------------------------------------------------------
@@ -1415,3 +1455,19 @@
     }
 }
 
+// -----------------------------------------------------------------------------
+// FocusChanging
+//
+// Called when the focus of the node changes, to commit the text 
+// -----------------------------------------------------------------------------
+void CWebFepTextEditor::FocusChanging()
+    { 
+    CAknEdwinState* state = static_cast<CAknEdwinState*>(State(KNullUid));
+    if ( state ) {
+        TRAP_IGNORE( state->ReportAknEdStateEventL(MAknEdStateObserver::EAknSyncEdwinState ) );
+    }
+    CommitFepInlineEditL(*CEikonEnv::Static());
+    CancelEditingMode();    
+    } 
+
+
--- a/webengine/osswebengine/WebKit/s60/webview/WebFepTextEditor.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/WebKit/s60/webview/WebFepTextEditor.h	Thu Jan 07 13:31:38 2010 +0200
@@ -122,8 +122,6 @@
 #endif	// BRDO_BROWSER_50_FF
 
     bool IsTextAreaFocused() const;
-    
-    void EnableCcpu(TBool aSupport);
     void DoCcpuCanPasteL() const;
     void PlaceDataOnClipboardL();
     void RetrieveDataFromClipboardL();
@@ -132,11 +130,13 @@
     void HandleMaskedInsertText(WebCore::Frame* frame, const String& text);
     void HandleMaskedDeleteText(WebCore::Frame* frame);
     bool IsWapMaskedModeInput(WebCore::Frame* frame);
-
+    void FocusChanging();
+    
 private:
     void  findPrevSiblingTextLen(Node*, TInt&) const;
     Node* findTextNodeForCurPos(Node* aNode, TInt& aPos) const;
     void setSCTAvailability(bool aAvailable);
+    void EnableCcpuL();
        
 private:
     CState* m_state;        
@@ -145,6 +145,7 @@
     HBufC* m_inlineEditText;
     String m_inputTextColor;
     CAknExtendedInputCapabilities* m_ExtendedInputCapabilities;
+    CAknCcpuSupport* m_CcpuSupport;
     };
 
 #endif
--- a/webengine/osswebengine/WebKit/s60/webview/WebPointerEventHandler.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/WebKit/s60/webview/WebPointerEventHandler.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -23,7 +23,7 @@
 #include <touchfeedback.h>
 #endif // BRDO_TOUCH_ENABLED_FF
 #include "brctl.h"
-#include "brctldefs.h"
+#include <brctldefs.h>
 #include "WebPointerEventHandler.h"
 #include "WebView.h"
 #include "WebFrame.h"
@@ -146,8 +146,6 @@
 {
     TGestureCode gtype = aEvent.Code(EAxisBoth);
     
-    m_highlightPos = aEvent.CurrentPos();
-
     TBrCtlDefs::TBrCtlElementType elType = m_webview->focusedElementType();
     
     PluginSkin* plugin = m_webview->mainFrame()->focusedPlugin();
@@ -269,6 +267,7 @@
     PluginHandler* pluginHandler = WebCore::StaticObjectsContainer::instance()->pluginHandler();
     PluginSkin* pluginToActivate = pluginHandler->pluginToActivate();
     m_buttonDownEvent = m_currentEvent;
+    m_highlightPos = aEvent.CurrentPos();    
     
     if ( !m_buttonDownTimer.isActive() && !m_webview->inPageViewMode()){
         m_buttonDownTimer.startOneShot(0.1f);        
@@ -424,7 +423,11 @@
     TPoint pt(wfrm->frameView()->viewCoordsInFrameCoords(pos));
     TPoint nodePoint;
     
-    Element* eventNode = frm->document()->elementFromPoint(pos.iX, pos.iY);
+    Element* eventNode = frm->document()->elementFromPoint(pt.iX, pt.iY);
+    
+    if (m_isHighlighted){
+               dehighlight();                
+           }
     
     m_highlightedNode = NULL;
 
--- a/webengine/osswebengine/WebKit/s60/webview/WebToolBarInterface.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/WebKit/s60/webview/WebToolBarInterface.h	Thu Jan 07 13:31:38 2010 +0200
@@ -17,7 +17,6 @@
 *
 */
 
-
 #ifndef __WEBTOOLBARINTERFACE
 #define __WEBTOOLBARINTERFACE
 
@@ -29,7 +28,7 @@
 #include <AknsConstants.h>
 #include <AknsItemID.h>
 #include <AknsConstants.h>
-#include "brctldefs.h"
+#include <brctldefs.h>
 #include "ToolBar.h"
 /*
 #include "Favicon.h"
--- a/webengine/osswebengine/WebKit/s60/webview/WebView.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/WebKit/s60/webview/WebView.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -490,6 +490,9 @@
             //Reset the iFocusedElementType to be the same as before the second window is opened.
             cursor->setPosition(m_savedCursorPosition);
             cursor->updatePositionAndElemType(m_savedCursorPosition);
+            if ( m_widgetextension && m_focusedElementType == TBrCtlDefs::EElementSelectBox){
+                m_focusedElementType = TBrCtlDefs::EElementNone;
+            }
         } else
             m_savedCursorPosition = cursor->position();
         cursor->cursorUpdate(visible & !AknLayoutUtils::PenEnabled());
@@ -532,7 +535,7 @@
 {
 
     int zoomLevel = m_currentZoomLevel;
-    if(!(   m_widgetextension && m_widgetextension->IsWidgetPublising())) {
+    if(m_widgetextension && !(m_widgetextension->IsWidgetPublising())) {
         zoomLevelChanged( KZoomLevelDefaultValue );
     }
     Frame* f = m_page->mainFrame();
@@ -2491,7 +2494,14 @@
 
     setZoomLevel(zoomLevel);
     mainFrame()->notifyPluginsOfScrolling();
-}
+    
+    if (zoomLevel == KZoomLevelDefaultValue)
+        {
+        // for pages based on tables this is required
+        doLayout();
+        }
+    
+ }
 
 //-------------------------------------------------------------------------------
 // WebView::openPluginPlayerL
--- a/webengine/osswebengine/WebKit/s60/webview/WebView.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/WebKit/s60/webview/WebView.h	Thu Jan 07 13:31:38 2010 +0200
@@ -23,10 +23,10 @@
 #include <e32std.h>
 #include <eikscrlb.h>
 #include "platform/Shared.h"
-#include "brctldefs.h"
+#include <brctldefs.h>
 #include "PageScaler.h"
 #include "Timer.h"
-#include "MemoryManager.h"
+#include <MemoryManager.h>
 
 namespace WebCore
 {
--- a/webengine/osswebengine/WebKit/s60/webview/WmlDispatcher.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/WebKit/s60/webview/WmlDispatcher.h	Thu Jan 07 13:31:38 2010 +0200
@@ -21,7 +21,7 @@
 //  INCLUDES
 #include <e32base.h>
 #include <w32std.h>
-#include "brctldefs.h"
+#include <brctldefs.h>
 
 #include "BrCtl.h"
 #include "SelfDownloadContentHandler.h"
--- a/webengine/osswebengine/WebKit/s60/webview/WmlInterface.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/WebKit/s60/webview/WmlInterface.h	Thu Jan 07 13:31:38 2010 +0200
@@ -23,7 +23,7 @@
 //  INCLUDES
 #include <e32std.h>
 #include <e32base.h>
-#include "brctldefs.h"
+#include <brctldefs.h>
 #include "BrCtl.h" 
 
 class CWmlContentInterface;
--- a/webengine/osswebengine/WebKit/s60/webview/WmlInterfaceImpl.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/WebKit/s60/webview/WmlInterfaceImpl.h	Thu Jan 07 13:31:38 2010 +0200
@@ -25,7 +25,7 @@
 #include <e32base.h>
 #include "WmlInterface.h"
 
-#include "brctldialogsprovider.h"
+#include <brctldialogsprovider.h>
 
 class CBrCtlObjectInfo;
 class CWmlContentInterface;
--- a/webengine/osswebengine/WebKit/s60/webview/WmlResourceLoaderClient.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/WebKit/s60/webview/WmlResourceLoaderClient.h	Thu Jan 07 13:31:38 2010 +0200
@@ -21,7 +21,7 @@
 //  INCLUDES
 #include <e32base.h>
 #include <w32std.h>
-#include "brctldefs.h"
+#include <brctldefs.h>
 
 #include "BrCtl.h"
 #include "SelfDownloadContentHandler.h"
--- a/webengine/osswebengine/WebKit/s60/webview/webview_api_test/inc/BrCtlInterface.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/WebKit/s60/webview/webview_api_test/inc/BrCtlInterface.h	Thu Jan 07 13:31:38 2010 +0200
@@ -15,8 +15,6 @@
 *
 */
 
-
-
 #ifndef BRCTLINTERFACE_H
 #define BRCTLINTERFACE_H
 
--- a/webengine/osswebengine/WebKit/s60/webview/webview_api_test/tsrc/group/WebViewApiTest.mmp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/WebKit/s60/webview/webview_api_test/tsrc/group/WebViewApiTest.mmp	Thu Jan 07 13:31:38 2010 +0200
@@ -64,12 +64,11 @@
 USERINCLUDE ../../../../WebEngine/OssWebEngine/WebCore/loader/icon
 USERINCLUDE ../../../../WebEngine/OssWebEngine/WebCore/loader/wml
 
-//
 USERINCLUDE ../../../../WebEngine/OssWebEngine/WebKit/S60/Plugins
 USERINCLUDE ../../../../WebEngine/OssWebEngine/WebKit/S60/WebCoreSupport
 USERINCLUDE ../../../../WebEngine/OssWebEngine/WebKit/S60/FormControls
 USERINCLUDE ../../../../WebEngine/OssWebEngine/WebKit/S60/Misc
-USERINCLUDE ../../../../WebEngine/OssWebEngine/MemoryManager/Inc 
+// USERINCLUDE ../../../../WebEngine/OssWebEngine/MemoryManager/Inc 
 USERINCLUDE ../../../../WebEngine/OssWebEngine/DerivedSources/WebCore
 
 SYSTEMINCLUDE ../../../../WebEngine/OssWebEngine/WebKit/S60/Plugins
--- a/webengine/osswebengine/WebKit/s60/webview/webview_api_test/tsrc/inc/BrCtl.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/WebKit/s60/webview/webview_api_test/tsrc/inc/BrCtl.h	Thu Jan 07 13:31:38 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
@@ -23,7 +23,6 @@
 //  INCLUDES
 #include <brctlinterface.h>
 
-#include "brctldefs.h"
 #include "HistoryInterface.h"
 
 #include "WmlInterface.h"
--- a/webengine/osswebengine/WebKit/s60/webview/webview_api_test/tsrc/inc/WebView.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/WebKit/s60/webview/webview_api_test/tsrc/inc/WebView.h	Thu Jan 07 13:31:38 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
@@ -23,10 +23,10 @@
 #include <e32std.h>
 #include <eikscrlb.h>
 #include "Shared.h"
-#include "brctldefs.h"
+#include <brctldefs.h>
 #include "PageScaler.h"
 #include "Timer.h"
-#include "MemoryManager.h"
+#include <MemoryManager.h>
 
 namespace WebCore
 {
--- a/webengine/osswebengine/WebKit/s60/webview/webview_api_test/tsrc/mock/inc/BrCtl.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/WebKit/s60/webview/webview_api_test/tsrc/mock/inc/BrCtl.h	Thu Jan 07 13:31:38 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
@@ -16,14 +16,13 @@
 */
 
 
-
 #ifndef BRCTL_H
 #define BRCTL_H
 
 //  INCLUDES
 #include <brctlinterface.h>
 
-#include "brctldefs.h"
+#include <brctldefs.h>
 #include "HistoryInterface.h"
 
 #include "WmlInterface.h"
--- a/webengine/osswebengine/WebKit/s60/webview/webview_api_test/tsrc/mock/src/BrCtl.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/WebKit/s60/webview/webview_api_test/tsrc/mock/src/BrCtl.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
@@ -34,7 +34,7 @@
 #include <e32uid.h>
 #include <browserdialogsprovider.h>
 //tot:fixme
-//#include <oom.h>
+//#include "oom.h"
 
 #include "config.h"
 #include "BrCtl.h"
--- a/webengine/osswebengine/WebKit/win/WebKit.vcproj/resource.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/WebKit/win/WebKit.vcproj/resource.h	Thu Jan 07 13:31:38 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
--- a/webengine/osswebengine/WebKitTools/Drosera/win/resource.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/WebKitTools/Drosera/win/resource.h	Thu Jan 07 13:31:38 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
--- a/webengine/osswebengine/WebKitTools/DumpRenderTree/TestNetscapePlugIn.subproj/PluginObject.c	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/WebKitTools/DumpRenderTree/TestNetscapePlugIn.subproj/PluginObject.c	Thu Jan 07 13:31:38 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
--- a/webengine/osswebengine/WebKitTools/DumpRenderTree/TestNetscapePlugIn.subproj/PluginObject.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/WebKitTools/DumpRenderTree/TestNetscapePlugIn.subproj/PluginObject.h	Thu Jan 07 13:31:38 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
--- a/webengine/osswebengine/WebKitTools/DumpRenderTree/TestNetscapePlugIn.subproj/TestObject.c	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/WebKitTools/DumpRenderTree/TestNetscapePlugIn.subproj/TestObject.c	Thu Jan 07 13:31:38 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
--- a/webengine/osswebengine/WebKitTools/DumpRenderTree/TestNetscapePlugIn.subproj/TestObject.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/WebKitTools/DumpRenderTree/TestNetscapePlugIn.subproj/TestObject.h	Thu Jan 07 13:31:38 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
--- a/webengine/osswebengine/WebKitTools/DumpRenderTree/TestNetscapePlugIn.subproj/main.c	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/WebKitTools/DumpRenderTree/TestNetscapePlugIn.subproj/main.c	Thu Jan 07 13:31:38 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
--- a/webengine/osswebengine/WebKitTools/DumpRenderTree/qt/DumpRenderTree.pro	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/WebKitTools/DumpRenderTree/qt/DumpRenderTree.pro	Thu Jan 07 13:31:38 2010 +0200
@@ -2,7 +2,7 @@
 # Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 # All rights reserved.
 # This component and the accompanying materials are made available
-# under the terms of "Eclipse Public License v1.0"
+# under the terms of the License "Eclipse Public License v1.0"
 # which accompanies this distribution, and is available
 # at the URL "http://www.eclipse.org/legal/epl-v10.html".
 #
--- a/webengine/osswebengine/WebKitTools/DumpRenderTree/win/TestNetscapePlugin/main.c	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/WebKitTools/DumpRenderTree/win/TestNetscapePlugin/main.c	Thu Jan 07 13:31:38 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
--- a/webengine/osswebengine/WebKitTools/DumpRenderTree/win/TestNetscapePlugin/resource.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/WebKitTools/DumpRenderTree/win/TestNetscapePlugin/resource.h	Thu Jan 07 13:31:38 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
--- a/webengine/osswebengine/cache/cache_check.pl	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/cache/cache_check.pl	Thu Jan 07 13:31:38 2010 +0200
@@ -2,7 +2,7 @@
 # Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 # All rights reserved.
 # This component and the accompanying materials are made available
-# under the terms of "Eclipse Public License v1.0"
+# under the terms of the License "Eclipse Public License v1.0"
 # which accompanies this distribution, and is available
 # at the URL "http://www.eclipse.org/legal/epl-v10.html".
 #
--- a/webengine/osswebengine/cache/filter_emulator_output.bat	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/cache/filter_emulator_output.bat	Thu Jan 07 13:31:38 2010 +0200
@@ -2,7 +2,7 @@
 @rem Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 @rem All rights reserved.
 @rem This component and the accompanying materials are made available
-@rem under the terms of "Eclipse Public License v1.0"
+@rem under the terms of the License "Eclipse Public License v1.0"
 @rem which accompanies this distribution, and is available
 @rem at the URL "http://www.eclipse.org/legal/epl-v10.html".
 @rem
--- a/webengine/osswebengine/cache/filter_log.pl	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/cache/filter_log.pl	Thu Jan 07 13:31:38 2010 +0200
@@ -2,7 +2,7 @@
 # Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 # All rights reserved.
 # This component and the accompanying materials are made available
-# under the terms of "Eclipse Public License v1.0"
+# under the terms of the License "Eclipse Public License v1.0"
 # which accompanies this distribution, and is available
 # at the URL "http://www.eclipse.org/legal/epl-v10.html".
 #
--- a/webengine/osswebengine/cache/group/BrowserCache.mmp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/cache/group/BrowserCache.mmp	Thu Jan 07 13:31:38 2010 +0200
@@ -14,13 +14,11 @@
 * Description:  BrowserCache
 *
 */
-#if defined(__BROWSER_SDK)
-TARGET          BrowserCache_sdk.dll
-#else
+
 #include <platform_paths.hrh>
 #include <platform/mw/browser_platform_variant.hrh>
-TARGET          BrowserCache.dll
-#endif
+TARGET   BrowserCache.dll
+
 TARGETTYPE      dll
 
 UID 0x1000008D  0x10282353
@@ -30,14 +28,12 @@
 EPOCALLOWDLLDATA
 //MACRO HTTP_CACHE_LOGGING
 
-
 #if defined(WINSCW)
 deffile Bwinscw/BrowserCache.def
 #elif defined(ARMCC)
 deffile EABI/BrowserCache.def
 #endif
 
-
 SOURCEPATH    ../src
 
 SOURCE        HttpCacheManager.cpp
@@ -51,18 +47,11 @@
 SOURCE        HttpCacheFileWriteHandler.cpp
 SOURCE        HttpCachePostponeWriteUtilities.cpp
 
-
 USERINCLUDE    ../inc
 
-//--
 
-#ifndef __BROWSER_SDK
 MW_LAYER_SYSTEMINCLUDE
-#else
-SYSTEMINCLUDE   /epoc32/include  /epoc32/include/oem
-#endif
-SYSTEMINCLUDE /Epoc32/include/http
-SYSTEMINCLUDE /Epoc32/include/libc
+OS_LAYER_ESTLIB_SYSTEMINCLUDE
 
 
 
@@ -81,3 +70,4 @@
 LIBRARY     memman.lib
 LIBRARY     cone.lib                // CoeControl
 DEBUGLIBRARY flogger.lib
+
--- a/webengine/osswebengine/cache/inc/HttpCacheFileWriteHandler.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/cache/inc/HttpCacheFileWriteHandler.h	Thu Jan 07 13:31:38 2010 +0200
@@ -23,7 +23,7 @@
 #include <f32file.h>
 #include "HttpCacheHandler.h"
 #include "HttpCacheEntry.h"
-#include "MemoryManager.h"
+#include <MemoryManager.h>
 
 // CONSTANTS
 
--- a/webengine/osswebengine/npscript/group/npscript.mmp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/osswebengine/npscript/group/npscript.mmp	Thu Jan 07 13:31:38 2010 +0200
@@ -27,18 +27,15 @@
 VENDORID    VID_DEFAULT
 CAPABILITY  CAP_GENERAL_DLL
 
-
 #if defined(WINSCW)
 deffile BWINSCW/npscript.def
 #elif defined(ARMCC)
 deffile EABI/npscript.def
 #endif
 
-
 SOURCEPATH      ../npscript
 SOURCE          npscript.cpp
 
-
 MW_LAYER_SYSTEMINCLUDE 
 
 SYSTEMINCLUDE   ../../javascriptcore/bindings
--- a/webengine/pagescaler/group/minimap.mmp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/pagescaler/group/minimap.mmp	Thu Jan 07 13:31:38 2010 +0200
@@ -15,7 +15,6 @@
 *
 */
 
-
 #include <platform_paths.hrh>
 #include <platform/mw/browser_platform_variant.hrh>
 
@@ -40,9 +39,8 @@
 USERINCLUDE     ../inc
 
 MW_LAYER_SYSTEMINCLUDE
-MW_LAYER_LIBC_SYSTEMINCLUDE
-SYSTEMINCLUDE 	../../osswebengine/memorymanager/inc
-
+OS_LAYER_ESTLIB_SYSTEMINCLUDE
+// SYSTEMINCLUDE 	../../osswebengine/memorymanager/inc
 
 LIBRARY         euser.lib 
 LIBRARY         cone.lib
@@ -53,5 +51,3 @@
 LIBRARY         BitmapTransforms.lib
 LIBRARY         MemMan.lib
 
-
-
--- a/webengine/pagescaler/src/minimapgenerator.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/pagescaler/src/minimapgenerator.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -47,7 +47,7 @@
 
 // MODULE DATA STRUCTURES
 #ifdef __OOM__
-#include <oom.h>
+#include "oom.h"
 
 class CMinimapOOMCollector : public CBase, MMemoryCollector
     {
--- a/webengine/webkitutils/HistoryProvider/HistoryController.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/webkitutils/HistoryProvider/HistoryController.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -18,11 +18,12 @@
 
 // INCLUDE FILES
 #include <../bidi.h>
+#include <brctldialogsprovider.h>
+
 #include "HistoryController.h"
-#include "brctldefs.h"
+#include <brctldefs.h>
 #include "HistoryView.h"
 #include "HistoryEntry.h"
-#include "brctldialogsprovider.h"
 
 // EXTERNAL DATA STRUCTURES
 
--- a/webengine/webkitutils/SqliteSymbian/keywordhash.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/webkitutils/SqliteSymbian/keywordhash.h	Thu Jan 07 13:31:38 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
--- a/webengine/webkitutils/SqliteSymbian/parse.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/webkitutils/SqliteSymbian/parse.h	Thu Jan 07 13:31:38 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
--- a/webengine/webkitutils/SqliteSymbian/printf.c	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/webkitutils/SqliteSymbian/printf.c	Thu Jan 07 13:31:38 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
--- a/webengine/webkitutils/SqliteSymbian/sqliteInt.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/webkitutils/SqliteSymbian/sqliteInt.h	Thu Jan 07 13:31:38 2010 +0200
@@ -65,7 +65,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <assert.h>
-#include <libc/stddef.h>
+#include <stddef.h>
 
 /*
 ** If compiling for a processor that lacks floating point support,
@@ -1881,3 +1881,4 @@
 #endif
 
 #endif
+
--- a/webengine/webkitutils/ToolBar/ToolBar.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/webkitutils/ToolBar/ToolBar.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -15,7 +15,6 @@
 *
 */
 
-
 // INCLUDE FILES
 #include <AknUtils.h>
 #include <StringLoader.h>
@@ -31,11 +30,9 @@
 
 #include "ToolBar.h"
 #include "ToolBarButton.h"
-#include "brctldefs.h"
 
 #include "eikon.hrh"
 
-
 // EXTERNAL DATA STRUCTURES
 
 // EXTERNAL FUNCTION PROTOTYPES
--- a/webengine/webkitutils/ToolBar/ToolBar.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/webkitutils/ToolBar/ToolBar.h	Thu Jan 07 13:31:38 2010 +0200
@@ -15,7 +15,6 @@
 *
 */
 
-
 #ifndef __TOOLBAR
 #define __TOOLBAR
 
@@ -27,7 +26,7 @@
 #include <AknsConstants.h>
 #include <AknsItemID.h>
 #include <AknsConstants.h>
-#include "brctldefs.h"
+#include <brctldefs.h>
 #include <eikmobs.h>
 #include <webkitutils.rsg>
 // CONSTANTS
--- a/webengine/webkitutils/ToolBar/ToolBarButton.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/webkitutils/ToolBar/ToolBarButton.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -22,11 +22,11 @@
 #include "ToolBarButton.h"
 #include "ToolBar.h"
 #include "W32STD.H"
-#include "recenturlstore.h"
+#include <recenturlstore.h>
 #include <Uri16.h>
 #include <GULICON.H>
 #include <AknBidiTextUtils.h>
-#include "brctlinterface.h"
+#include <brctlinterface.h>
 #include <favouritesitem.h>
 #include <favouritesitemlist.h>
 #include <favouritessession.h>
@@ -34,7 +34,6 @@
 
 #include "eikon.hrh"
 
-
 // EXTERNAL DATA STRUCTURES
 
 // EXTERNAL FUNCTION PROTOTYPES
--- a/webengine/webkitutils/group/WebKitUtils.mmp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/webkitutils/group/WebKitUtils.mmp	Thu Jan 07 13:31:38 2010 +0200
@@ -15,7 +15,6 @@
 *
 */
 
-
 TARGET          webkitutils.dll
 TARGETTYPE      dll
 UID 0x1000008D  0x2000B19D  
@@ -108,8 +107,8 @@
 USERINCLUDE     ../SqliteSymbian
 
 MW_LAYER_SYSTEMINCLUDE
-SYSTEMINCLUDE   ../../../inc 
-MW_LAYER_LIBC_SYSTEMINCLUDE
+OS_LAYER_ESTLIB_SYSTEMINCLUDE
+// SYSTEMINCLUDE   ../../../inc 
 
 LIBRARY         estlib.lib 
 LIBRARY         euser.lib 
@@ -132,3 +131,4 @@
 LIBRARY         eikcore.lib 
 LIBRARY         eikcoctl.lib 
 LIBRARY         MemMan.lib
+
--- a/webengine/webkitutils/rt_gesturehelper/rom/rt_gesturehelper.iby	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/webkitutils/rt_gesturehelper/rom/rt_gesturehelper.iby	Thu Jan 07 13:31:38 2010 +0200
@@ -19,7 +19,11 @@
 #ifndef _RT_GESTUREHELPER_IBY_
 #define _RT_GESTUREHELPER_IBY_
 
+#ifdef __S60_32__
+#include <browser_platform_variant.hrh>
+#else
 #include <platform/mw/browser_platform_variant.hrh>
+#endif
 
 #ifdef BRDO_USE_GESTURE_HELPER
 
--- a/webengine/webkitutils/rt_gesturehelper/src/gesture.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/webkitutils/rt_gesturehelper/src/gesture.h	Thu Jan 07 13:31:38 2010 +0200
@@ -15,20 +15,18 @@
 *
 */
 
-
 #ifndef _GESTURE_H_
 #define _GESTURE_H_
 
 #include <e32base.h>
 
-#include "rt_gestureobserver.h"
+#include <rt_gestureobserver.h>
 #include "gesturerecogniser.h"
 #include "pointarray.h"
 
 namespace RT_GestureHelper
 {
 
-
 enum TEventState
     {     
     ENoEvent = 0,
--- a/webengine/webkitutils/rt_gesturehelper/src/gestureevent.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/webkitutils/rt_gesturehelper/src/gestureevent.h	Thu Jan 07 13:31:38 2010 +0200
@@ -19,7 +19,7 @@
 #define GESTUREEVENT_H_
 
 #include <e32base.h>
-#include "rt_gestureobserver.h"
+#include <rt_gestureobserver.h>
 #include "pointarray.h"
 
 namespace RT_GestureHelper
--- a/webengine/webkitutils/rt_gesturehelper/src/gesturehelper.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/webkitutils/rt_gesturehelper/src/gesturehelper.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -15,9 +15,8 @@
 *
 */
 
-
 // class include
-#include "rt_gesturehelper.h"
+#include <rt_gesturehelper.h>
 
 // local includes
 #include "gesturehelperimpl.h"
--- a/webengine/webkitutils/rt_gesturehelper/src/gesturerecogniser.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/webkitutils/rt_gesturehelper/src/gesturerecogniser.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -15,13 +15,12 @@
 *
 */
 
-
 #include "gesturerecogniser.h"
 
 #include <e32math.h>
 
 #include "gesturedefs.h"
-#include "rt_gestureobserver.h"
+#include <rt_gestureobserver.h>
 #include "pointarray.h"
 #include "utils.h"
 
--- a/webengine/webkitutils/rt_gesturehelper/src/gesturerecogniser.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/webkitutils/rt_gesturehelper/src/gesturerecogniser.h	Thu Jan 07 13:31:38 2010 +0200
@@ -15,12 +15,11 @@
 *
 */
 
-
 #ifndef _GESTURERECOGNISER_H_
 #define _GESTURERECOGNISER_H_
 
 #include <e32std.h>
-#include "rt_gestureobserver.h"
+#include <rt_gestureobserver.h>
 
 namespace RT_GestureHelper
 {
--- a/webengine/widgetbackuprestore/Inc/WidgetActiveCallback.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/widgetbackuprestore/Inc/WidgetActiveCallback.h	Thu Jan 07 13:31:38 2010 +0200
@@ -20,7 +20,7 @@
 #define WIDGETACTIVECALLBACK_H
 
 #include <e32base.h>    // CBase
-#include <abclient.h>
+#include <connect/abclient.h>
 #ifdef _DEBUG
 #include <flogger.h>
 #endif
--- a/webengine/widgetbackuprestore/Src/WidgetActiveCallback.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/widgetbackuprestore/Src/WidgetActiveCallback.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -17,7 +17,7 @@
 
 
 // INCLUDE FILES
-#include <abclient.h>
+#include <connect/abclient.h>
 #include <bautils.h>
 
 #include "WidgetActiveCallback.h"
--- a/webengine/widgetbackuprestore/Src/WidgetBackupRestore.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/widgetbackuprestore/Src/WidgetBackupRestore.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -16,7 +16,7 @@
 */
 
 
-#include <abclient.h>
+#include <connect/abclient.h>
 #include <e32property.h>
 #include "widgetbackuprestore.h"
 #include "WidgetActiveCallback.h"
--- a/webengine/widgetbackuprestore/group/WidgetBackupRestore.mmp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/widgetbackuprestore/group/WidgetBackupRestore.mmp	Thu Jan 07 13:31:38 2010 +0200
@@ -46,8 +46,10 @@
 USERINCLUDE     ../../../inc
 
 MW_LAYER_SYSTEMINCLUDE
-MW_LAYER_LIBC_SYSTEMINCLUDE
+OS_LAYER_ESTLIB_SYSTEMINCLUDE
+#if defined(__PLATFORM_VERSION_32__) || defined(__PLATFORM_VERSION_50_TUBE__) || defined(__PLATFORM_VERSION_50__)
 MW_LAYER_CONNECT_SYSTEMINCLUDE
+#endif
 
 // Libraries
 LIBRARY         euser.lib
--- a/webengine/widgetengine/group/WidgetEngine.mmp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/widgetengine/group/WidgetEngine.mmp	Thu Jan 07 13:31:38 2010 +0200
@@ -25,6 +25,8 @@
 #include <platform/mw/browser_platform_variant.hrh>
 
 MW_LAYER_SYSTEMINCLUDE
+OS_LAYER_ESTLIB_SYSTEMINCLUDE
+
 USERINCLUDE ../../osswebengine/Webkit/S60/WebView
 USERINCLUDE ../../osswebengine/Webkit/S60/Plugins
 USERINCLUDE ../../osswebengine/Webkit/S60/WebCoreSupport
@@ -63,14 +65,9 @@
 SYSTEMINCLUDE ../../webkitutils/ToolBar
 SYSTEMINCLUDE ../../webkitutils/HistoryProvider
 
-MW_LAYER_ECOM_SYSTEMINCLUDE
-MW_LAYER_HTTP_SYSTEMINCLUDE
-MW_LAYER_LIBC_SYSTEMINCLUDE
-MW_LAYER_SWI_SYSTEMINCLUDE
-#if defined(BRDO_BROWSER_50_FF)
-MW_LAYER_STDAPIS_SYSTEMINCLUDE
-#endif
-SYSTEMINCLUDE /epoc32/include/swi
+// #if defined(BRDO_BROWSER_50_FF)
+// MW_LAYER_STDAPIS_SYSTEMINCLUDE
+// #endif
 
 MACRO __S60__
 MACRO arm
@@ -92,11 +89,9 @@
 MACRO NOKIA_CHANGES
 MACRO __CPLUSPLUS
 
-
 USERINCLUDE     ../inc
 SOURCEPATH      ../src
 
-
 SOURCE      Widget.cpp
 SOURCE      WidgetFuncs.cpp
 SOURCE      WidgetEventHandler.cpp
@@ -144,3 +139,4 @@
 LIBRARY			etel.lib
 LIBRARY			etelmm.lib
 LIBRARY		  WebUtils.lib
+
--- a/webengine/widgetengine/inc/MenuClient.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/widgetengine/inc/MenuClient.h	Thu Jan 07 13:31:38 2010 +0200
@@ -23,7 +23,7 @@
 #include <avkon.hrh>
 #include <widgetmenu.rsg>
 
-#include "brctlinterface.h"
+#include <brctlinterface.h>
 #include "MenuCallbacks.h"
 #include "MenuItemCallbacks.h"
 #include "WidgetEngineCallbacks.h"
--- a/webengine/widgetengine/inc/MenuItemClient.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/widgetengine/inc/MenuItemClient.h	Thu Jan 07 13:31:38 2010 +0200
@@ -20,7 +20,7 @@
 
 //  INCLUDES
 #include <e32base.h>
-#include "brctlinterface.h"
+#include <brctlinterface.h>
 
 // CONSTANTS
 
--- a/webengine/widgetengine/inc/Preferences.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/widgetengine/inc/Preferences.h	Thu Jan 07 13:31:38 2010 +0200
@@ -167,7 +167,11 @@
     * Remove preference for a particular key
     */
     void removePreferenceL( const TDesC& akey, const TDesC& avalue);   
-    
+    void externalizeL(RWriteStream& aStream) const;
+
+    void internalizeL(RReadStream& aStream);
+      
+    void deleteAllPrefFiles();
 
 private:
     RPtrHashMap<TDesC,PrefElement>* m_preferences;                
--- a/webengine/widgetengine/inc/WidgetClient.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/widgetengine/inc/WidgetClient.h	Thu Jan 07 13:31:38 2010 +0200
@@ -20,7 +20,7 @@
 
 //  INCLUDES
 #include <e32base.h>
-#include "brctlinterface.h"
+#include <brctlinterface.h>
 #include "WidgetCallbacks.h"
 #include "WidgetEngineCallbacks.h"
 
--- a/webengine/widgetengine/inc/WidgetEngineBridge.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/widgetengine/inc/WidgetEngineBridge.h	Thu Jan 07 13:31:38 2010 +0200
@@ -15,8 +15,6 @@
 *
 */
 
-
-
 #ifndef __WIDGETENGINEINTERFACE
 #define __WIDGETENGINEINTERFACE
 
@@ -24,7 +22,7 @@
 #include "config.h"
 #include <e32base.h>
 #include <eikenv.h>
-#include "brctldefs.h"
+#include <brctldefs.h>
 #include "WidgetEngineCallbacks.h"
 #include "WidgetJSObjectProtector.h"
 #include "wtf/HashSet.h"
--- a/webengine/widgetengine/src/Preferences.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/widgetengine/src/Preferences.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -34,6 +34,8 @@
 
 _LIT( KKeyFormat, "%d.%S" );
 _LIT( KPrefsFile,"prefs.dat" );
+_LIT( KPrefsTmpFile,"prefs.dat.tmp" );
+_LIT( KPrefsBakFile, "prefs.dat.bak" );
 
 
 // ----------------------------------------------------------------------------
@@ -264,7 +266,11 @@
         CleanupStack::Pop();   // k
 
         // Save update to persistent storage
-		saveL();
+        TRAPD(err, saveL());
+        if(err!= KErrNone)
+            {
+            deleteAllPrefFiles();
+            }
     }
 
 }
@@ -306,7 +312,10 @@
         CleanupStack::PopAndDestroy();   // k
 
         // Save update to persistent storage
-		saveL();
+	TRAPD(err, saveL());
+    if(err!= KErrNone) {
+        deleteAllPrefFiles();
+        }
     }
 }
 
@@ -323,46 +332,180 @@
 
     RFs fs;
 
-    if ( fs.Connect() == KErrNone ) {
+        
+    // Connect to file server
+    User::LeaveIfError(fs.Connect());
+    CleanupClosePushL( fs );
         
-        CleanupClosePushL( fs );
-        HBufC* filePath = HBufC::NewLC( m_basepath->Length() + KPrefsFile().Length() );
+    // Form filenames
+    HBufC* tmpFilePath = HBufC::NewLC( m_basepath->Length() + KPrefsTmpFile().Length() );
+    HBufC* bakFilePath = HBufC::NewLC( m_basepath->Length() + KPrefsBakFile().Length() );
+    HBufC* filePath = HBufC::NewLC( m_basepath->Length() + KPrefsFile().Length() );
+
+    TPtr fName( tmpFilePath->Des() );
+    fName.Append( *m_basepath );
+    fName.Append( KPrefsTmpFile );
+    
+    fName.Set( bakFilePath->Des() );
+    fName.Append( *m_basepath );
+    fName.Append( KPrefsBakFile );
+    
+    fName.Set( filePath->Des() );
+    fName.Append( *m_basepath );
+    fName.Append( KPrefsFile );
+
+	  RFileWriteStream writeStream;
+    writeStream.PushL();
+    
+	// Try to create the temp file
+	if(writeStream.Replace(fs, *tmpFilePath, EFileWrite|EFileShareExclusive) != KErrNone) {
+		// Make sure the private path exists
+		fs.CreatePrivatePath( EDriveC );
+		
+		// Try again to create the file
+		User::LeaveIfError(writeStream.Create(fs, *tmpFilePath, EFileWrite|EFileShareExclusive));
+	}
 
-        TPtr fName( filePath->Des() );
-        fName.Append( *m_basepath );
-        fName.Append( KPrefsFile );
+    // Try to externalize the data to the stream
+    TRAPD(err, externalizeL(writeStream));
+    
+    // Close the stream
+    CleanupStack::PopAndDestroy(); // writeStream
+    	     
+    // If no error at this point then we're guaranteed to have a valid file
+    if(err!=KErrNone)
+    	{
+    	// Delete the temp file
+    	fs.Delete(*tmpFilePath);
+    	
+    	// And leave with the error code
+    	User::Leave(err);
+    	}
+    	
+    // Backup any old valid file just in case
+    fs.Delete(*bakFilePath);
+    fs.Rename(*filePath, *bakFilePath);
+    
+    // Rename the temp file to be the actual settings file
+    err = fs.Rename(*tmpFilePath, *filePath);
+    if(err!=KErrNone)
+    	{
+    	// If we had a backup settings file, try to return it
+    	fs.Rename(*bakFilePath, *filePath);
+    	User::Leave(err);
+    	}
 
-        RFileWriteStream writeStream;
-        TInt fileerror = writeStream.Replace( fs, *filePath, EFileWrite );
+	// Cleanup
+	CleanupStack::PopAndDestroy(4); // filePath, bakFilePath, tmpFilePath, fs
+
+}
 
-        if ( fileerror != KErrNone ) {
-            fs.CreatePrivatePath( EDriveC );
-            fileerror = writeStream.Create( fs, *filePath, EFileWrite|EFileShareExclusive );
-        }
+// ----------------------------------------------------------------------------
+// WidgetPreferences::externalizeL
+//
+//
+// ----------------------------------------------------------------------------
+
+void WidgetPreferences::externalizeL(RWriteStream& aStream) const
+{
+    aStream.WriteInt32L( m_preferences->Count() );
+	
+    TPtrHashMapIter<TDesC,PrefElement> it( *m_preferences );
+    const TDesC* key;
+    const PrefElement* pref;
 
-        if ( fileerror == KErrNone ) {
-            CleanupClosePushL( writeStream );
-            writeStream.WriteInt32L( m_preferences->Count() );
-            
-            TPtrHashMapIter<TDesC,PrefElement> it( *m_preferences );
-            const TDesC* key;
-            const PrefElement* pref;
+    while ( ( key = it.NextKey() ) != 0 ) {
+        pref = it.CurrentValue();
+        aStream.WriteInt32L( key->Length() );
+        aStream.WriteL( *key );
+        aStream.WriteInt32L( pref->value().Length() );
+        aStream.WriteL( pref->value() );
+        aStream.WriteInt32L( pref->valueSize() );
+    }
+    aStream.CommitL();
+    
+}
+
+// ----------------------------------------------------------------------------
+// WidgetPreferences::internalizeL
+//
+//
+// ----------------------------------------------------------------------------
+void WidgetPreferences::internalizeL(RReadStream& aStream)
+{
+    TInt count( aStream.ReadInt32L() );
+    for( TInt i = 0; i < count; i++ ) {
+        
+        TInt len = aStream.ReadInt32L();
+
+        if ( len > 0 ) {
+            HBufC* key = HBufC::NewLC( len );
+            TPtr ptrkey = key->Des();
+            aStream.ReadL( ptrkey, len );
+            len = aStream.ReadInt32L();
 
-            while ( ( key = it.NextKey() ) != 0 ) {
-                pref = it.CurrentValue();
-                writeStream.WriteInt32L( key->Length() );
-                writeStream.WriteL( *key );
-                writeStream.WriteInt32L( pref->value().Length() );
-                writeStream.WriteL( pref->value() );
-                writeStream.WriteInt32L( pref->valueSize() );
+            if ( len <= KMaxKeyValueSize ) {
+                HBufC* value = HBufC::NewLC( len );
+                TPtr ptrvalue = value->Des();
+                aStream.ReadL( ptrvalue, len );
+                PrefElement* pref = new ( ELeave ) PrefElement;
+                CleanupStack::PushL( pref );
+                pref->setValueL( ptrvalue );
+                TInt size = aStream.ReadInt32L();
+                pref->setValueSize( size );
+                m_preferences->InsertL( key, pref );
+                CleanupStack::Pop(); //pref
+                CleanupStack::PopAndDestroy(); //value
+                CleanupStack::Pop(); //key
             }
+            else {
+                CleanupStack::PopAndDestroy( key );
+             }
 
-            writeStream.CommitL();
-            CleanupStack::PopAndDestroy(); //writeStream
+         }
+
+        else {
+            break;
         }
+     }
 
-        CleanupStack::PopAndDestroy( 2 ); //fs,filePath
-    }
+ }
+
+// ----------------------------------------------------------------------------
+// WidgetPreferences::deleteAllPrefFiles
+//
+//
+// ----------------------------------------------------------------------------
+void WidgetPreferences::deleteAllPrefFiles(){
+
+   if ( !m_basepath || (m_basepath->Length() <= 0) ) 
+         return;
+
+
+   RFs fs;
+   // Deleting bkUp and main prefs file.
+   User::LeaveIfError(fs.Connect());
+   CleanupClosePushL( fs );
+   
+   HBufC* bkFilePath = HBufC::NewLC( m_basepath->Length() + KPrefsBakFile().Length() );
+
+   TPtr fName( bkFilePath->Des() );
+   fName.Append( *m_basepath );
+   fName.Append( KPrefsBakFile );
+ 
+   fs.Delete( *bkFilePath  );
+         
+   CleanupStack::PopAndDestroy(); 
+
+   HBufC* prefFilePath = HBufC::NewLC( m_basepath->Length() + KPrefsFile().Length() );
+
+   TPtr fNamePr( prefFilePath->Des() );
+   fNamePr.Append( *m_basepath );
+   fNamePr.Append( KPrefsFile);
+ 
+   fs.Delete( *prefFilePath  );
+         
+   CleanupStack::PopAndDestroy(2);
 
 }
 
@@ -374,61 +517,32 @@
 // ----------------------------------------------------------------------------
 void WidgetPreferences::loadL()
 {
+   if ( !m_basepath || (m_basepath->Length() <= 0) ) 
+         return;
+    
+    // Try to connect to file server
     RFs fs;
-    if ( !m_basepath || (m_basepath->Length() <= 0) )
-        return;
-
-    if ( fs.Connect() == KErrNone ) {
-        CleanupClosePushL( fs );
-        HBufC* filePath = HBufC::NewLC( m_basepath->Length() + KPrefsFile().Length() );
-
-        TPtr fName( filePath->Des() );
-        fName.Append( *m_basepath );
-        fName.Append( KPrefsFile );
-
-        RFileReadStream readStream;
-
-        if ( readStream.Open( fs, *filePath, EFileRead ) == KErrNone ) {
-            CleanupClosePushL( readStream );
-            TInt count( readStream.ReadInt32L() );
-
-            for( TInt i = 0; i < count; i++ ) {
-                TInt len = readStream.ReadInt32L();
-
-                if ( len > 0 ) {
-                    HBufC* key = HBufC::NewLC( len );
-                    TPtr ptrkey = key->Des();
-                    readStream.ReadL( ptrkey, len );
-                    len = readStream.ReadInt32L();
+    User::LeaveIfError(fs.Connect());
+    CleanupClosePushL( fs );
+    
+    // Form settings file name
+    HBufC* filePath = HBufC::NewLC( m_basepath->Length() + KPrefsFile().Length() );
+    TPtr fName( filePath->Des() );
+    fName.Append( *m_basepath );
+    fName.Append( KPrefsFile );
 
-                    if ( len <= KMaxKeyValueSize ) {
-                        HBufC* value = HBufC::NewLC( len );
-                        TPtr ptrvalue = value->Des();
-                        readStream.ReadL( ptrvalue, len );
-                        PrefElement* pref = new ( ELeave ) PrefElement;
-                        CleanupStack::PushL( pref );
-                        pref->setValueL( ptrvalue );
-                        TInt size = readStream.ReadInt32L();
-                        pref->setValueSize( size );
-                        m_preferences->InsertL( key, pref );
-                        CleanupStack::Pop(); //pref 
-                        CleanupStack::PopAndDestroy(); //value
-                        CleanupStack::Pop(); //key
-                    }
-                    else {
-                        CleanupStack::PopAndDestroy( key );
-                    }
-                }
-                else {
-                    break;
-                }
-            }
+    // Open stream
+    RFileReadStream readStream;
+    readStream.PushL();
+    TInt err = readStream.Open( fs, *filePath, EFileRead );
+    if(err!=KErrNone) {
+        User::Leave(err);
+    }
+    
+    // Read the data from the stream
+    internalizeL(readStream);
 
-            CleanupStack::PopAndDestroy(); //readStream
-        }
-
-        CleanupStack::PopAndDestroy( 2 ); //fs,filePath
-    }
+    CleanupStack::PopAndDestroy(3); // readStream, filePath, fs
 }
     
 // ----------------------------------------------------------------------------
@@ -488,3 +602,4 @@
 }
 
 
+
--- a/webengine/widgetengine/src/WidgetEngineBridge.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/widgetengine/src/WidgetEngineBridge.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -15,8 +15,6 @@
 *
 */
 
-
-
 // INCLUDE FILES
 #include "WidgetEngineBridge.h"
 #include "WidgetEventHandler.h"
@@ -25,7 +23,7 @@
 #include <eikmenub.h>
 #include <gdi.h>
 #include <bitdev.h>
-#include "brctlinterface.h"
+#include <brctlinterface.h>
 #include "WidgetEngineCallbacks.h"
 
 #include "WidgetClient.h"
@@ -172,7 +170,11 @@
     switch( aParam ) {
         case TBrCtlDefs::EWidgetBasePath: {
             m_preferences->setBasePathL(aValue);
-            m_preferences->loadL();            
+           TRAPD(err, m_preferences->loadL());
+            if(err!=KErrNone)
+            	{
+                m_preferences->deleteAllPrefFiles();
+           	    }
             break;
         }
         case TBrCtlDefs::EWidgetBundleId: {
@@ -321,3 +323,4 @@
 //END OF FILE
 
 
+
--- a/webengine/widgetengine/src/WrtPlatform.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/widgetengine/src/WrtPlatform.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -20,8 +20,8 @@
 // INCLUDE FILES
 
 #include "WrtPlatform.h"
-#include <sisregistryentry.h>
-#include <sisregistrysession.h>
+#include <swi\sisregistryentry.h>
+#include <swi\sisregistrysession.h>
 #include <sysutil.h> 
 #include <etel.h>
 #include <etelmm.h>
--- a/webengine/widgetinstaller/Inc/WidgetBackupRegistryXml.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/widgetinstaller/Inc/WidgetBackupRegistryXml.h	Thu Jan 07 13:31:38 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2008 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
@@ -23,8 +23,8 @@
 
 // INCLUDES
 #include <libxml2_tree.h>
-#include "widgetregistryconstants.h"
-#include "widgetpropertyvalue.h"
+#include <widgetregistryconstants.h>
+#include <widgetpropertyvalue.h>
 
 class RFs;
 /**
--- a/webengine/widgetinstaller/Src/WidgetBackupRegistryXml.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/widgetinstaller/Src/WidgetBackupRegistryXml.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2008 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
--- a/webengine/widgetinstaller/group/WidgetInstaller.mmp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/widgetinstaller/group/WidgetInstaller.mmp	Thu Jan 07 13:31:38 2010 +0200
@@ -27,12 +27,10 @@
 #include <platform_paths.hrh>
 #include <platform/mw/browser_platform_variant.hrh>
 
-
 // Capability assignment.
 CAPABILITY      CAP_GENERAL_DLL
 VENDORID        VID_DEFAULT
 
-
 // Sources
 SOURCEPATH      .
 SOURCEPATH      ../Src
@@ -47,8 +45,7 @@
 USERINCLUDE     . ../Inc/
 
 MW_LAYER_SYSTEMINCLUDE
-MW_LAYER_LIBC_SYSTEMINCLUDE
-MW_LAYER_CONNECT_SYSTEMINCLUDE
+OS_LAYER_ESTLIB_SYSTEMINCLUDE
 
 // Libraries
 LIBRARY         euser.lib
--- a/webengine/widgetmemoryplugin/data/10282855.rss	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/widgetmemoryplugin/data/10282855.rss	Thu Jan 07 13:31:38 2010 +0200
@@ -15,7 +15,7 @@
 *
 */
 
-#include <RegistryInfo.rh>
+#include <ecom/registryinfo.rh>
 #include <oommonitorplugin.hrh>
 
 RESOURCE REGISTRY_INFO theInfo
@@ -35,4 +35,4 @@
 				};
 		}
 	};
-}
\ No newline at end of file
+}
--- a/webengine/widgetmemoryplugin/group/bld.inf	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/widgetmemoryplugin/group/bld.inf	Thu Jan 07 13:31:38 2010 +0200
@@ -15,7 +15,6 @@
 *
 */
 
-
 PRJ_PLATFORMS
 DEFAULT
 
--- a/webengine/widgetmemoryplugin/group/widgetmemoryplugin.mmp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/widgetmemoryplugin/group/widgetmemoryplugin.mmp	Thu Jan 07 13:31:38 2010 +0200
@@ -28,8 +28,8 @@
 VENDORID        VID_DEFAULT
 
 USERINCLUDE     .
+
 MW_LAYER_SYSTEMINCLUDE
-MW_LAYER_ECOM_SYSTEMINCLUDE
 
 START RESOURCE ../data/10282855.rss
 TARGET widgetmemoryplugin.rsc
@@ -39,5 +39,5 @@
 SOURCE 		widgetmemoryplugin.cpp
 
 LIBRARY 	ECOM.LIB
-LIBRARY         euser.lib
-LIBRARY         oommonitor.lib
+LIBRARY   euser.lib
+LIBRARY   oommonitor.lib
--- a/webengine/widgetregistry/Client/src/WidgetRegistryClient.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/widgetregistry/Client/src/WidgetRegistryClient.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -19,8 +19,7 @@
 #include <e32base.h>
 #include <f32file.h>
 #include <s32mem.h>
-#include "widgetregistryclient.h"
-
+#include <widgetregistryclient.h>
 
 // ============================================================================
 // Starts the widget registry server
--- a/webengine/widgetregistry/Rom/WidgetRegistry.iby	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/widgetregistry/Rom/WidgetRegistry.iby	Thu Jan 07 13:31:38 2010 +0200
@@ -19,7 +19,11 @@
 #ifndef __WIDGETREGISTRY_IBY__
 #define __WIDGETREGISTRY_IBY__
 
+#ifdef __S60_32__
+#include <browser_platform_variant.hrh>
+#else
 #include <platform/mw/browser_platform_variant.hrh>
+#endif
 
 // app exe
 S60_APP_EXE(WidgetRegistry)
--- a/webengine/widgetregistry/Server/inc/UidAllocator.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/widgetregistry/Server/inc/UidAllocator.h	Thu Jan 07 13:31:38 2010 +0200
@@ -15,12 +15,11 @@
 *
 */
 
-
 #ifndef UIDALLOCATOR_H
 #define UIDALLOCATOR_H
 
 // INCLUDE FILES
-#include "widgetregistryconstants.h"
+#include <widgetregistryconstants.h>
 
 /**
  * This class allows clients to allocate a UID from a given range.
@@ -37,4 +36,3 @@
     static TBool IsWidget( TUid aUid );
     };
 #endif
-
--- a/webengine/widgetregistry/Server/inc/WidgetEntry.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/widgetregistry/Server/inc/WidgetEntry.h	Thu Jan 07 13:31:38 2010 +0200
@@ -17,19 +17,17 @@
 *
 */
 
-
 #ifndef WIDGETENTRY_H
 #define WIDGETENTRY_H
 
 // INCLUDES
-#include "widgetpropertyvalue.h"
+#include <widgetpropertyvalue.h>
 #include "WidgetRegistryXml.h"
 
 // FORWARD DECLARATIONS
 class RFileWriteStream;
 class RFileReadStream;
 
-
 /**
 *
 *  This class holds all information related to a widget
--- a/webengine/widgetregistry/Server/inc/WidgetMMCHandler.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/widgetregistry/Server/inc/WidgetMMCHandler.h	Thu Jan 07 13:31:38 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2008 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
--- a/webengine/widgetregistry/Server/inc/WidgetRegistry.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/widgetregistry/Server/inc/WidgetRegistry.h	Thu Jan 07 13:31:38 2010 +0200
@@ -24,9 +24,9 @@
 #include <e32hashtab.h>
 #include <apgcli.h>
 #include <browser_platform_variant.hrh>
-#include "widgetregistrydata.h"
-#include "widgetregistryconstants.h"
-#include "widgetpropertyvalue.h"
+#include <widgetregistrydata.h>
+#include <widgetregistryconstants.h>
+#include <widgetpropertyvalue.h>
 #include "WidgetRegistryLog.h"
 
 // CONSTANTS
@@ -215,6 +215,8 @@
      */
      TInt SecurityPolicyId() { return FetchSecurityPolicyIdL(); }
      
+     static void NotifyWidgetAltered();
+     
 private:
 
     /**
--- a/webengine/widgetregistry/Server/inc/WidgetRegistrySession.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/widgetregistry/Server/inc/WidgetRegistrySession.h	Thu Jan 07 13:31:38 2010 +0200
@@ -22,7 +22,7 @@
 #define WIDGETREGISTRYSESSION_H
 
 // INCLUDES
-#include "widgetregistrydata.h"
+#include <widgetregistrydata.h>
 
 // FORWARD DECLARATIONS
 
--- a/webengine/widgetregistry/Server/inc/WidgetRegistryXml.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/widgetregistry/Server/inc/WidgetRegistryXml.h	Thu Jan 07 13:31:38 2010 +0200
@@ -17,14 +17,13 @@
 *
 */
 
-
 #ifndef WIDGETREGISTRYXML_H
 #define WIDGETREGISTRYXML_H
 
 // INCLUDES
 #include <libxml2_tree.h>
-#include "widgetregistryconstants.h"
-#include "widgetpropertyvalue.h"
+#include <widgetregistryconstants.h>
+#include <widgetpropertyvalue.h>
 
 class RFs;
 /**
--- a/webengine/widgetregistry/Server/src/WidgetEntry.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/widgetregistry/Server/src/WidgetEntry.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -17,7 +17,7 @@
 */
 
 #include "WidgetEntry.h"
-#include "widgetregistryconstants.h"
+#include <widgetregistryconstants.h>
 #include <s32file.h>
 #include <f32file.h>
 #include <APGTASK.H>
--- a/webengine/widgetregistry/Server/src/WidgetMMCHandler.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/widgetregistry/Server/src/WidgetMMCHandler.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
@@ -233,5 +233,7 @@
                 }
             }
         iDeltaDriveFlags = 0;
+        
+        CWidgetRegistry::NotifyWidgetAltered();
         }
     }
--- a/webengine/widgetregistry/Server/src/WidgetRegistry.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/widgetregistry/Server/src/WidgetRegistry.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -134,7 +134,7 @@
 // ============================================================================
 //
 
-static void NotifyWidgetAltered()
+void CWidgetRegistry::NotifyWidgetAltered()
     {
     const TUid KMyPropertyCat = { 0x10282E5A };
     enum TMyPropertyKeys { EMyPropertyAltered = 110 };
--- a/webengine/widgetregistry/Server/src/WidgetRegistryServer.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/widgetregistry/Server/src/WidgetRegistryServer.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -15,11 +15,10 @@
 *
 */
 
-
 #include <e32base.h>
 #include <w32std.h>
 #include <apgcli.h>
-#include "widgetregistryconstants.h"
+#include <widgetregistryconstants.h>
 #include "widgetregistryserver.h"
 #include "widgetregistrysession.h"
 
--- a/webengine/widgetregistry/Server/src/WidgetRegistrySession.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/widgetregistry/Server/src/WidgetRegistrySession.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -15,17 +15,14 @@
 *
 */
 
-
 #include <S32MEM.H>
 
 // User includes
 #include "WidgetRegistry.h"
-#include "widgetregistryconstants.h"
+#include <widgetregistryconstants.h>
 #include "widgetregistryserver.h"
-#include "widgetregistryconstants.h"
 #include "WidgetRegistrySession.h"
 
-
 CWidgetRegistry* CWidgetRegistryServerSession::iWidgetRegistry = 0;
 
 // ============================================================================
--- a/webengine/widgetregistry/group/WidgetRegistryServer.mmp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/widgetregistry/group/WidgetRegistryServer.mmp	Thu Jan 07 13:31:38 2010 +0200
@@ -17,7 +17,6 @@
 *
 */
 
-
 TARGET          WidgetRegistry.exe
 TARGETTYPE      EXE
 UID             0x1000008d 0x10282F06
@@ -49,8 +48,9 @@
 USERINCLUDE       ../Server/inc
 USERINCLUDE       ../Common/inc
 USERINCLUDE       ../../../inc
+
 MW_LAYER_SYSTEMINCLUDE
-MW_LAYER_LIBC_SYSTEMINCLUDE
+OS_LAYER_ESTLIB_SYSTEMINCLUDE
 
 LIBRARY         euser.lib
 LIBRARY         efsrv.lib
--- a/webengine/wmlengine/group/BLD.INF	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wmlengine/group/BLD.INF	Thu Jan 07 13:31:38 2010 +0200
@@ -15,7 +15,6 @@
 *
 */
 
-
 #include <platform_paths.hrh>
 #include "../../../web_plat/browser_platform_api/inc/browser_platform_variant.hrh"
 
--- a/webengine/wmlengine/group/Msg/Msg.mmp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wmlengine/group/Msg/Msg.mmp	Thu Jan 07 13:31:38 2010 +0200
@@ -15,8 +15,7 @@
 *
 */
 
-#include <platform_paths.hrh>
-#include <platform/mw/browser_platform_variant.hrh>
+#include  "../webkitcommon.mmpi"
 
 TARGET          Msg.lib
 TARGETTYPE      lib
@@ -27,12 +26,3 @@
 
 SOURCE Message.cpp
 SOURCE MessageDispatcher.cpp
-
-USERINCLUDE     .
-USERINCLUDE     ../../src/Msg/include
-USERINCLUDE     ../../src/Object/include
-USERINCLUDE     ../../src/Hed/include
-
-SYSTEMINCLUDE   ../../src/utils/include
-MW_LAYER_SYSTEMINCLUDE
-MW_LAYER_LIBC_SYSTEMINCLUDE
--- a/webengine/wmlengine/group/Plugin.mmp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wmlengine/group/Plugin.mmp	Thu Jan 07 13:31:38 2010 +0200
@@ -38,12 +38,7 @@
 USERINCLUDE     ../ResourceLoader/Inc
 USERINCLUDE     ../PageScaler/Inc
 USERINCLUDE     ../../WEBCORE/bridge
-
-SYSTEMINCLUDE		../../MemoryManager/Inc
-MW_LAYER_SYSTEMINCLUDE
-MW_LAYER_LIBC_SYSTEMINCLUDE
+// USERINCLUDE		../../MemoryManager/Inc
 
-
-
-
-
+MW_LAYER_SYSTEMINCLUDE
+OS_LAYER_ESTLIB_SYSTEMINCLUDE
--- a/webengine/wmlengine/group/Unicode/Unicode.mmp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wmlengine/group/Unicode/Unicode.mmp	Thu Jan 07 13:31:38 2010 +0200
@@ -15,8 +15,7 @@
 *
 */
 
-#include <platform_paths.hrh>
-#include <platform/mw/browser_platform_variant.hrh>
+#include  "../webkitcommon.mmpi"
 
 TARGET          unicode.lib
 TARGETTYPE      lib
@@ -62,23 +61,3 @@
 SOURCE	NW_Unicode_SymbolMath.c
 SOURCE	NW_Unicode_SymbolModifier.c
 SOURCE	NW_Unicode_SymbolOther.c
-
-USERINCLUDE     .
-USERINCLUDE     ../../src/adt/include
-USERINCLUDE     ../../src/evt/include
-USERINCLUDE     ../../src/fbox/include
-USERINCLUDE     ../../src/gdi/include
-USERINCLUDE     ../../src/hed/include
-USERINCLUDE     ../../src/image/include
-USERINCLUDE     ../../src/lmgr/include
-USERINCLUDE     ../../src/object/include
-USERINCLUDE     ../../src/text/include
-USERINCLUDE     ../../src/Unicode/include
-USERINCLUDE     ../../src/utils/include
-USERINCLUDE     ../../src/wml/src
-USERINCLUDE     ../../src/wml/include
-SYSTEMINCLUDE   ../../src/urlloader/include
-SYSTEMINCLUDE   ../../src/utils/include
-SYSTEMINCLUDE   ../../src/utils/src
-MW_LAYER_SYSTEMINCLUDE
-MW_LAYER_LIBC_SYSTEMINCLUDE
--- a/webengine/wmlengine/group/adt/adt.mmp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wmlengine/group/adt/adt.mmp	Thu Jan 07 13:31:38 2010 +0200
@@ -15,8 +15,7 @@
 *
 */
 
-#include <platform_paths.hrh>
-#include <platform/mw/browser_platform_variant.hrh>
+#include  "../webkitcommon.mmpi"
 
 TARGET          adt.lib
 TARGETTYPE      lib
@@ -46,15 +45,3 @@
 SOURCE	ValueList.c
 SOURCE	Vector.c
 SOURCE	VectorIterator.c
-
-USERINCLUDE     .
-USERINCLUDE     ../../src/adt/include
-USERINCLUDE     ../../src/htmlp/include
-USERINCLUDE     ../../src/object/include
-USERINCLUDE     ../../src/text/include
-USERINCLUDE     ../../src/urlloader/include
-USERINCLUDE     ../../src/utils/include
-
-MW_LAYER_SYSTEMINCLUDE
-SYSTEMINCLUDE   ../../src/utils/include
-MW_LAYER_LIBC_SYSTEMINCLUDE
--- a/webengine/wmlengine/group/browser/browser.mmp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wmlengine/group/browser/browser.mmp	Thu Jan 07 13:31:38 2010 +0200
@@ -15,8 +15,7 @@
 *
 */
 
-#include <platform_paths.hrh>
-#include <platform/mw/browser_platform_variant.hrh>
+#include  "../webkitcommon.mmpi"
 
 TARGET          RbBrowser.lib
 TARGETTYPE      lib
@@ -29,39 +28,7 @@
 
 SOURCEPATH      ../../src/browser/src/
 
-
 //SOURCE	Epoc32BrowserMimeTable.c
 SOURCE	xhtml_1_0_dict.c
 SOURCE	wml_1_3_dict.c
 
-
-
-
-USERINCLUDE  ../../src/adt/include
-USERINCLUDE  ../../src/css/include
-USERINCLUDE  ../../src/evt/include
-USERINCLUDE  ../../src/fbox/include
-USERINCLUDE  ../../src/gdi/include
-USERINCLUDE  ../../src/hed/include
-USERINCLUDE  ../../src/image/include
-USERINCLUDE  ../../src/imagech/include
-USERINCLUDE  ../../src/lmgr/include
-USERINCLUDE  ../../src/markup/include
-USERINCLUDE  ../../src/Msg/include
-USERINCLUDE  ../../src/mvc/include
-USERINCLUDE  ../../src/object/include
-USERINCLUDE  ../../src/text/include
-USERINCLUDE  ../../src/system/include
-USERINCLUDE  ../../src/wml1x/include
-USERINCLUDE  ../../src/browser/include
-USERINCLUDE  ../../src/wmlscriptch/include
-USERINCLUDE  ../../src/xhtml/include
-USERINCLUDE  ../../src/wml/src
-
-
-MW_LAYER_SYSTEMINCLUDE
-SYSTEMINCLUDE  ../../src/wml/include
-SYSTEMINCLUDE  ../../src/utils/include
-MW_LAYER_LIBC_SYSTEMINCLUDE
-
-
--- a/webengine/wmlengine/group/css/css.mmp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wmlengine/group/css/css.mmp	Thu Jan 07 13:31:38 2010 +0200
@@ -15,8 +15,7 @@
 *
 */
 
-#include <platform_paths.hrh>
-#include <platform/mw/browser_platform_variant.hrh>
+#include  "../webkitcommon.mmpi"
 
 TARGET          css.lib
 TARGETTYPE      lib
@@ -29,7 +28,6 @@
 
 SOURCEPATH      ../../src/css/src
 
-
 #ifdef _DEBUG
     #define _BROWSER_ENG_DEBUG
 #endif
@@ -49,32 +47,3 @@
 SOURCE  CSSHandler.cpp
 SOURCE  CSSVariableStyleSheet.cpp
 
-#include  "../webkitcommon.mmpi"
-
-USERINCLUDE     .
-USERINCLUDE     ../../src/adt/include
-USERINCLUDE     ../../src/css/include
-USERINCLUDE     ../../src/htmlp/include
-USERINCLUDE     ../../src/evt/include
-USERINCLUDE     ../../src/gdi/include
-USERINCLUDE     ../../src/hed/include
-USERINCLUDE     ../../src/markup/include
-USERINCLUDE     ../../src/fbox/include
-USERINCLUDE     ../../src/image/include
-USERINCLUDE     ../../src/lmgr/include
-USERINCLUDE     ../../src/object/include
-USERINCLUDE     ../../src/system/include
-USERINCLUDE     ../../src/text/include
-USERINCLUDE     ../../src/xhtml/include
-USERINCLUDE     ../../src/wml/src
-USERINCLUDE     ../../src/wml/include
-USERINCLUDE     ../../src/imagech/include
-USERINCLUDE     ../../src/mvc/include
-USERINCLUDE     ../../src/msg/include
-USERINCLUDE     ../../src/wmlcontrol/include
-
-MW_LAYER_SYSTEMINCLUDE
-SYSTEMINCLUDE   ../../src/urlloader/include
-SYSTEMINCLUDE   ../../src/utils/include
-SYSTEMINCLUDE		../../../osswebengine/MemoryManager/Inc
-MW_LAYER_LIBC_SYSTEMINCLUDE
--- a/webengine/wmlengine/group/evt/evt.mmp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wmlengine/group/evt/evt.mmp	Thu Jan 07 13:31:38 2010 +0200
@@ -15,8 +15,7 @@
 *
 */
 
-#include <platform_paths.hrh>
-#include <platform/mw/browser_platform_variant.hrh>
+#include  "../webkitcommon.mmpi"
 
 TARGET          evt.lib
 TARGETTYPE      lib
@@ -43,10 +42,3 @@
 SOURCE UnicodeKeyEvent.c
 SOURCE OpenViewerEvent.c
 
-USERINCLUDE     ../../src/evt/include
-USERINCLUDE     ../../src/object/include
-USERINCLUDE     ../../src/gdi/include
-USERINCLUDE   	../../src/utils/include
-
-MW_LAYER_SYSTEMINCLUDE
-MW_LAYER_LIBC_SYSTEMINCLUDE
--- a/webengine/wmlengine/group/fbox/fbox.mmp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wmlengine/group/fbox/fbox.mmp	Thu Jan 07 13:31:38 2010 +0200
@@ -15,8 +15,7 @@
 *
 */
 
-#include <platform_paths.hrh>
-#include <platform/mw/browser_platform_variant.hrh>
+#include  "../webkitcommon.mmpi"
 
 TARGET          fbox.lib
 TARGETTYPE      lib
@@ -35,8 +34,6 @@
 LANGUAGE_IDS 
 #endif
 
-#include  "../webkitcommon.mmpi"
-
 SOURCE	FBOXButtonBox.cpp
 SOURCE	FBOXButtonBoxSkin.cpp
 SOURCE	FBOXCheckBox.cpp
@@ -79,36 +76,3 @@
 SOURCE  Epoc32SelectSkin.cpp
 SOURCE  FBOXCEpoc32InputBox.cpp
 SOURCE	FBOXEpoc32InlineCheckBoxSkin.cpp
-
-
-USERINCLUDE     .
-USERINCLUDE     ../../src/adt/include
-USERINCLUDE     ../../src/evt/include
-USERINCLUDE     ../../src/fbox/include
-USERINCLUDE     ../../src/gdi/include
-USERINCLUDE     ../../src/hed/include
-USERINCLUDE     ../../src/image/include
-USERINCLUDE     ../../src/ImageCH/include
-USERINCLUDE     ../../src/lmgr/include
-USERINCLUDE     ../../src/msg/include
-USERINCLUDE     ../../src/mvc/include
-USERINCLUDE     ../../src/object/include
-USERINCLUDE     ../../src/system/include
-USERINCLUDE     ../../src/text/include
-USERINCLUDE	    ../../src/Unicode/include
-USERINCLUDE     ../../src/urlloader/include
-USERINCLUDE     ../../src/fileloader/include
-USERINCLUDE     ../../src/utils/include
-USERINCLUDE     ../../src/wml/src
-USERINCLUDE     ../../src/wml/include
-USERINCLUDE     ../../src/wml1x/include
-USERINCLUDE     ../../src/wmlscriptch/include
-USERINCLUDE     ../../src/markup/include
-USERINCLUDE     ../../src/wmlcontrol/include
-
-MW_LAYER_SYSTEMINCLUDE
-SYSTEMINCLUDE   ../../src/browser/include
-SYSTEMINCLUDE   ../../src/urlloader/include
-SYSTEMINCLUDE   ../../src/utils/include
-SYSTEMINCLUDE		../../../osswebengine/MemoryManager/Inc
-MW_LAYER_LIBC_SYSTEMINCLUDE
--- a/webengine/wmlengine/group/fileloader/fileloader.mmp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wmlengine/group/fileloader/fileloader.mmp	Thu Jan 07 13:31:38 2010 +0200
@@ -15,8 +15,7 @@
 *
 */
 
-#include <platform_paths.hrh>
-#include <platform/mw/browser_platform_variant.hrh>
+#include  "../webkitcommon.mmpi"
 
 TARGET          fileloader.lib
 TARGETTYPE      lib
@@ -24,22 +23,7 @@
 CAPABILITY CAP_GENERAL_DLL
 VENDORID        VID_DEFAULT
 
-
 SOURCEPATH      ../../src/fileloader/src
 SOURCE		fileloader_cfileloader.cpp
 SOURCE		fileloader_cfilehandler.cpp
 SOURCE		fileloader_csaveddeckhandler.cpp
-
-USERINCLUDE     ../../src/urlloader/include
-USERINCLUDE     ../../src/fileloader/include
-USERINCLUDE     ../../src/utils/include
-
-
-MW_LAYER_SYSTEMINCLUDE
-SYSTEMINCLUDE   ../../src/utils/include
-MW_LAYER_LIBC_SYSTEMINCLUDE
-
-
-
-
-
--- a/webengine/wmlengine/group/gdi/gdi.mmp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wmlengine/group/gdi/gdi.mmp	Thu Jan 07 13:31:38 2010 +0200
@@ -15,8 +15,7 @@
 *
 */
 
-#include <platform_paths.hrh>
-#include <platform/mw/browser_platform_variant.hrh>
+#include  "../webkitcommon.mmpi"
 
 TARGET          RbGdi.lib
 TARGETTYPE      lib
@@ -26,37 +25,9 @@
 
 MACRO NOKIA_MOBILE_BROWSER
 #define NOKIA_MOBILE_BROWSER 1
-#include  "../webkitcommon.mmpi"
 
 SOURCEPATH      ../../src/gdi/src
 
 SOURCE	GDIDeviceContext.cpp
 SOURCE	GDIFont.cpp
 SOURCE	Utils.c
-
-USERINCLUDE     .
-USERINCLUDE     ../../src/gdi/include
-USERINCLUDE     ../../src/htmlp/include
-USERINCLUDE     ../../src/mvc/include
-USERINCLUDE     ../../src/object/include
-USERINCLUDE     ../../src/system/include
-USERINCLUDE     ../../src/text/include
-USERINCLUDE     ../../src/browser/include
-USERINCLUDE     ../../src/hed/include
-USERINCLUDE     ../../src/evt/include
-USERINCLUDE     ../../src/lmgr/include
-USERINCLUDE     ../../src/image/include
-USERINCLUDE     ../../src/adt/include
-USERINCLUDE     ../../src/wml/include
-USERINCLUDE     ../../src/wml/src
-USERINCLUDE     ../../src/wmlcontrol/include
-USERINCLUDE			../../../OssWebengine/MemoryManager/Inc
-USERINCLUDE			../../../PageScaler/Inc
-SYSTEMINCLUDE   ../../src/urlloader/include
-SYSTEMINCLUDE   ../../src/utils/include
-
-
-
-
-MW_LAYER_SYSTEMINCLUDE
-MW_LAYER_LIBC_SYSTEMINCLUDE
--- a/webengine/wmlengine/group/hed/hed.mmp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wmlengine/group/hed/hed.mmp	Thu Jan 07 13:31:38 2010 +0200
@@ -15,8 +15,7 @@
 *
 */
 
-#include <platform_paths.hrh>
-#include <platform/mw/browser_platform_variant.hrh>
+#include  "../webkitcommon.mmpi"
 
 MACRO NOKIA_MOBILE_BROWSER
 #define NOKIA_MOBILE_BROWSER 1
@@ -25,7 +24,6 @@
 TARGETTYPE      lib
 SOURCEPATH      ../../src/hed/src/
 
-
 SOURCE  ChildIterator.c
 SOURCE	HEDCompositeContentHandler.cpp
 SOURCE	HEDCompositeNode.cpp
@@ -53,41 +51,6 @@
 SOURCE	UrlRequest.c
 SOURCE	UrlResponse.c
 
-
 SOURCE  ContentLoader.cpp
 SOURCE  TextReverse.cpp
 SOURCE	urlloader_urlresponse.cpp
-
-#include  "../webkitcommon.mmpi"
-
-USERINCLUDE     .
-USERINCLUDE     ../../src/utils/include
-USERINCLUDE     ../../src/adt/include
-USERINCLUDE     ../../src/evt/include
-USERINCLUDE     ../../src/htmlp/include
-USERINCLUDE     ../../src/gdi/include
-USERINCLUDE     ../../src/hed/include
-USERINCLUDE     ../../src/msg/include
-USERINCLUDE     ../../src/markup/include
-USERINCLUDE     ../../src/image/include
-USERINCLUDE     ../../src/imagech/include
-USERINCLUDE     ../../src/lmgr/include
-USERINCLUDE     ../../src/object/include
-USERINCLUDE     ../../src/system/include
-USERINCLUDE     ../../src/text/include
-USERINCLUDE     ../../src/MVC/include
-USERINCLUDE     ../../src/wml1x/include
-USERINCLUDE     ../../src/wmlscriptch/include
-USERINCLUDE     ../../src/fbox/include
-USERINCLUDE     ../../src/wml/src
-USERINCLUDE     ../../src/wml/include
-USERINCLUDE     ../../src/wmlcontrol/include
-
-SYSTEMINCLUDE   ../../src/utils/include
-SYSTEMINCLUDE   ../../src/urlloader/include
-SYSTEMINCLUDE		../../../osswebengine/MemoryManager/Inc
-
-
-MW_LAYER_SYSTEMINCLUDE
-MW_LAYER_LIBC_SYSTEMINCLUDE
-
--- a/webengine/wmlengine/group/htmlp/htmlp.mmp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wmlengine/group/htmlp/htmlp.mmp	Thu Jan 07 13:31:38 2010 +0200
@@ -15,8 +15,7 @@
 *
 */
 
-#include <platform_paths.hrh>
-#include <platform/mw/browser_platform_variant.hrh>
+#include  "../webkitcommon.mmpi"
 
 TARGET          htmlp.lib
 TARGETTYPE      lib
@@ -34,10 +33,3 @@
 SOURCE	htmlp_lexer.c
 SOURCE	CHtmlpParser.cpp
 SOURCE	htmlp_to_wbxml.cpp
-
-USERINCLUDE     ../../src/htmlp/include
-
-MW_LAYER_SYSTEMINCLUDE
-MW_LAYER_LIBC_SYSTEMINCLUDE
-SYSTEMINCLUDE   ../../src/urlloader/include
-SYSTEMINCLUDE   ../../src/utils/include
--- a/webengine/wmlengine/group/image/image.mmp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wmlengine/group/image/image.mmp	Thu Jan 07 13:31:38 2010 +0200
@@ -15,9 +15,7 @@
 *
 */
 
-#include <platform_paths.hrh>
-#include <data_caging_paths.hrh>
-#include <platform/mw/browser_platform_variant.hrh>
+#include  "../webkitcommon.mmpi"
 
 TARGET          image.lib
 TARGETTYPE      lib
@@ -78,36 +76,4 @@
 SOURCE  Epoc32SimpleImage.cpp
 SOURCE	IMAGEVirtualImage.cpp
 SOURCE  Epoc32ImageDecoder.cpp
-
 SOURCE  nw_image_iimageobserver.cpp
-
-#include  "../webkitcommon.mmpi"
-
-USERINCLUDE     .
-USERINCLUDE     ../../src/adt/include
-USERINCLUDE     ../../src/evt/include
-USERINCLUDE     ../../src/gdi/include
-USERINCLUDE     ../../src/hed/include
-USERINCLUDE     ../../src/htmlp/include
-USERINCLUDE     ../../src/markup/include
-USERINCLUDE     ../../src/image/include
-USERINCLUDE     ../../src/imagech/include
-USERINCLUDE     ../../src/lmgr/include
-USERINCLUDE     ../../src/fbox/include
-USERINCLUDE     ../../src/object/include
-USERINCLUDE     ../../src/system/include
-USERINCLUDE     ../../src/text/include
-USERINCLUDE     ../../src/wml/src
-USERINCLUDE     ../../src/wml/include
-USERINCLUDE     ../../src/mvc/include
-USERINCLUDE     ../../src/msg/include
-USERINCLUDE     ../../src/wmlcontrol/include
-
-
-MW_LAYER_SYSTEMINCLUDE
-SYSTEMINCLUDE   ../../src/browser/include
-SYSTEMINCLUDE   ../../src/urlloader/include
-SYSTEMINCLUDE   ../../src/utils/include
-SYSTEMINCLUDE		../../../osswebengine/MemoryManager/Inc
-MW_LAYER_LIBC_SYSTEMINCLUDE
-
--- a/webengine/wmlengine/group/imagech/imagech.mmp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wmlengine/group/imagech/imagech.mmp	Thu Jan 07 13:31:38 2010 +0200
@@ -15,8 +15,7 @@
 *
 */
 
-#include <platform_paths.hrh>
-#include <platform/mw/browser_platform_variant.hrh>
+#include  "../webkitcommon.mmpi"
 
 TARGET          imagech.lib
 TARGETTYPE      lib
@@ -30,31 +29,3 @@
 #define NOKIA_MOBILE_BROWSER 1
 
 SOURCE Epoc32ImageContentHandler.cpp
-
-#include  "../webkitcommon.mmpi"
-
-USERINCLUDE     ../../src/adt/include
-USERINCLUDE     ../../src/evt/include
-USERINCLUDE     ../../src/gdi/include
-USERINCLUDE     ../../src/hed/include
-USERINCLUDE     ../../src/htmlp/include
-USERINCLUDE     ../../src/markup/include
-USERINCLUDE     ../../src/image/include
-USERINCLUDE     ../../src/imagech/include
-USERINCLUDE     ../../src/lmgr/include
-USERINCLUDE     ../../src/object/include
-USERINCLUDE     ../../src/system/include
-USERINCLUDE     ../../src/text/include
-USERINCLUDE     ../../src/fbox/include
-USERINCLUDE     ../../src/wml1x/include
-USERINCLUDE     ../../src/wmlscriptch/include
-USERINCLUDE			../../src/browser/include
-USERINCLUDE     ../../src/wml/src
-USERINCLUDE     ../../src/wml/include
-USERINCLUDE     ../../src/mvc/include
-USERINCLUDE     ../../src/msg/include
-
-SYSTEMINCLUDE   ../../src/urlloader/include
-SYSTEMINCLUDE   ../../src/utils/include
-MW_LAYER_SYSTEMINCLUDE
-MW_LAYER_LIBC_SYSTEMINCLUDE
--- a/webengine/wmlengine/group/lmgr/lmgr.mmp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wmlengine/group/lmgr/lmgr.mmp	Thu Jan 07 13:31:38 2010 +0200
@@ -15,8 +15,7 @@
 *
 */
 
-#include <platform_paths.hrh>
-#include <platform/mw/browser_platform_variant.hrh>
+#include  "../webkitcommon.mmpi"
 
 TARGET          lmgr.lib
 TARGETTYPE      lib
@@ -30,7 +29,6 @@
 
 SOURCEPATH      ../../src/lmgr/src/
 
-
 SOURCE  LMgrAbstractTextBox.cpp
 SOURCE  LMgrAccessKey.cpp
 SOURCE  Action.c
@@ -85,30 +83,3 @@
 SOURCE  LMgrAnonBlock.cpp
 SOURCE  LMgrAnonTableBox.cpp
 SOURCE  LMgrPosFlowBox.cpp
-
-#include  "../webkitcommon.mmpi"
-
-USERINCLUDE     .
-USERINCLUDE     ../../src/adt/include
-USERINCLUDE     ../../src/evt/include
-USERINCLUDE     ../../src/fbox/include
-USERINCLUDE     ../../src/gdi/include
-USERINCLUDE     ../../src/hed/include
-USERINCLUDE     ../../src/htmlp/include
-USERINCLUDE     ../../src/image/include
-USERINCLUDE     ../../src/lmgr/include
-USERINCLUDE     ../../src/object/include
-USERINCLUDE     ../../src/system/include
-USERINCLUDE     ../../src/text/include
-USERINCLUDE     ../../src/wml/src
-USERINCLUDE     ../../src/wml/include
-USERINCLUDE     ../../src/css/include
-USERINCLUDE     ../../src/markup/include
-USERINCLUDE     ../../src/mvc/include
-USERINCLUDE     ../../src/msg/include
-USERINCLUDE   	../../src/utils/include
-
-SYSTEMINCLUDE   ../../src/utils/include
-SYSTEMINCLUDE   ../../src/urlloader/include
-MW_LAYER_SYSTEMINCLUDE
-MW_LAYER_LIBC_SYSTEMINCLUDE
--- a/webengine/wmlengine/group/markup/markup.mmp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wmlengine/group/markup/markup.mmp	Thu Jan 07 13:31:38 2010 +0200
@@ -15,8 +15,7 @@
 *
 */
 
-#include <platform_paths.hrh>
-#include <platform/mw/browser_platform_variant.hrh>
+#include  "../webkitcommon.mmpi"
 
 TARGET          markup.lib
 TARGETTYPE      lib
@@ -36,32 +35,3 @@
 SOURCE MARKUPXMLModule.cpp
 SOURCE MARKUPNumberCollector.cpp
 SOURCE MARKUPImageViewer.cpp
-
-#include  "../webkitcommon.mmpi"
-
-USERINCLUDE     ../../src/adt/include
-USERINCLUDE     ../../src/Evt/include
-USERINCLUDE     ../../src/htmlp/include
-USERINCLUDE     ../../src/fbox/include
-USERINCLUDE     ../../src/gdi/include
-USERINCLUDE     ../../src/hed/include
-USERINCLUDE     ../../src/imageCH/include
-USERINCLUDE     ../../src/image/include
-USERINCLUDE     ../../src/lmgr/include
-USERINCLUDE     ../../src/markup/include
-USERINCLUDE     ../../src/object/include
-USERINCLUDE     ../../src/scrolling/inc
-USERINCLUDE     ../../src/system/include
-USERINCLUDE     ../../src/text/include
-USERINCLUDE     ../../src/wmlscriptch/include
-USERINCLUDE     ../../src/wml/src
-USERINCLUDE     ../../src/wml/include
-USERINCLUDE     ../../src/mvc/include
-USERINCLUDE     ../../src/msg/include
-
-
-SYSTEMINCLUDE   ../../src/urlloader/include
-SYSTEMINCLUDE   ../../src/utils/include
-MW_LAYER_SYSTEMINCLUDE
-MW_LAYER_LIBC_SYSTEMINCLUDE
-
--- a/webengine/wmlengine/group/object/object.mmp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wmlengine/group/object/object.mmp	Thu Jan 07 13:31:38 2010 +0200
@@ -15,8 +15,7 @@
 *
 */
 
-#include <platform_paths.hrh>
-#include <platform/mw/browser_platform_variant.hrh>
+#include  "../webkitcommon.mmpi"
 
 TARGET          object.lib
 TARGETTYPE      lib
@@ -35,9 +34,3 @@
 SOURCE  Object.c
 SOURCE  Secondary.c
 SOURCE	Shared.c
-
-USERINCLUDE     .
-USERINCLUDE     ../../src/object/include
-SYSTEMINCLUDE   ../../src/utils/include
-MW_LAYER_SYSTEMINCLUDE
-MW_LAYER_LIBC_SYSTEMINCLUDE
--- a/webengine/wmlengine/group/script/script.mmp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wmlengine/group/script/script.mmp	Thu Jan 07 13:31:38 2010 +0200
@@ -15,8 +15,7 @@
 *
 */
 
-#include <platform_paths.hrh>
-#include <platform/mw/browser_platform_variant.hrh>
+#include  "../webkitcommon.mmpi"
 
 TARGET          script.lib
 TARGETTYPE      lib
@@ -53,18 +52,3 @@
 SOURCE	scr_valexpr.c
 SOURCE	scr_wta.c
 SOURCE	scr_crypto.c
-
-USERINCLUDE     ../../src/script/src
-USERINCLUDE     ../../src/urlloader/include
-USERINCLUDE     ../../src/utils/include
-USERINCLUDE     ../../src/wml/include
-SYSTEMINCLUDE   ../../src/script/include
-SYSTEMINCLUDE   ../../src/utils/src
-MW_LAYER_SYSTEMINCLUDE
-MW_LAYER_LIBC_SYSTEMINCLUDE
-SYSTEMINCLUDE   ../../src/utils/include
-
-
-
-
-
--- a/webengine/wmlengine/group/system/system.mmp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wmlengine/group/system/system.mmp	Thu Jan 07 13:31:38 2010 +0200
@@ -15,39 +15,16 @@
 *
 */
 
-#include <platform_paths.hrh>
-#include <platform/mw/browser_platform_variant.hrh>
+#include  "../webkitcommon.mmpi"
 
 TARGET          System.lib
 TARGETTYPE      lib
 SOURCEPATH      ../../src/system/src/
 
 CAPABILITY CAP_GENERAL_DLL
-VENDORID        VID_DEFAULT
+VENDORID	 VID_DEFAULT
 
 SOURCE Timer.c
 SOURCE Epoc32Timer.cpp
 SOURCE CEpoc32Timer.cpp
 SOURCE Epoc32OptionList.cpp
-
-#include  "../webkitcommon.mmpi"
-
-USERINCLUDE     .
-USERINCLUDE     ../../src/Object/include
-USERINCLUDE     ../../src/mvc/include
-USERINCLUDE     ../../src/system/include
-USERINCLUDE     ../../src/utils/include
-USERINCLUDE     ../../src/hed/include
-USERINCLUDE     ../../src/msg/include
-USERINCLUDE     ../../src/wml/include
-USERINCLUDE     ../../src/markup/include
-USERINCLUDE     ../../src/wmlcontrol/include
-
-
-
-SYSTEMINCLUDE   ../../src/utils/include
-SYSTEMINCLUDE   ../../src/utils/src
-SYSTEMINCLUDE		../../../osswebengine/MemoryManager/Inc
-MW_LAYER_SYSTEMINCLUDE
-MW_LAYER_LIBC_SYSTEMINCLUDE
-
--- a/webengine/wmlengine/group/text/text.mmp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wmlengine/group/text/text.mmp	Thu Jan 07 13:31:38 2010 +0200
@@ -15,8 +15,7 @@
 *
 */
 
-#include <platform_paths.hrh>
-#include <platform/mw/browser_platform_variant.hrh>
+#include  "../webkitcommon.mmpi"
 
 TARGET          text.lib
 TARGETTYPE      lib
@@ -39,16 +38,3 @@
 SOURCE	FixedWidthIterator.c
 SOURCE	Text_Iterator.c
 SOURCE	VariableWidthIterator.c
-
-
-USERINCLUDE     .
-USERINCLUDE     ../../src/adt/include
-USERINCLUDE     ../../src/htmlp/include
-USERINCLUDE     ../../src/object/include
-USERINCLUDE     ../../src/text/include
-
-SYSTEMINCLUDE   ../../src/urlloader/include
-SYSTEMINCLUDE   ../../src/utils/include
-SYSTEMINCLUDE   ../../src/utils/src
-MW_LAYER_SYSTEMINCLUDE
-MW_LAYER_LIBC_SYSTEMINCLUDE
--- a/webengine/wmlengine/group/unknownch.mmp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wmlengine/group/unknownch.mmp	Thu Jan 07 13:31:38 2010 +0200
@@ -40,11 +40,9 @@
 USERINCLUDE     ../src/evt/include
 USERINCLUDE     ../src/object/include
 USERINCLUDE     ../src/markup/include
+USERINCLUDE     ../src/urlloader/include
+USERINCLUDE     ../src/utils/include
+USERINCLUDE     ../src/wml/include
+USERINCLUDE     ../src/wml/src
 
-SYSTEMINCLUDE   ../src/urlloader/include
-SYSTEMINCLUDE   ../src/utils/include
-SYSTEMINCLUDE   ../src/wml/include
-SYSTEMINCLUDE   ../src/wml/src
 MW_LAYER_SYSTEMINCLUDE
-
-
--- a/webengine/wmlengine/group/urlloader/urlloader.mmp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wmlengine/group/urlloader/urlloader.mmp	Thu Jan 07 13:31:38 2010 +0200
@@ -15,9 +15,7 @@
 *
 */
 
-
-#include <platform_paths.hrh>
-#include <platform/mw/browser_platform_variant.hrh>
+#include  "../webkitcommon.mmpi"
 
 TARGET          urlloader.lib
 TARGETTYPE      lib
@@ -28,36 +26,9 @@
 MACRO NOKIA_MOBILE_BROWSER
 #define NOKIA_MOBILE_BROWSER
 
-
 SOURCEPATH      ../../src/urlloader/src
 SOURCE      urlloader_urlloaderint.cpp
 SOURCE			urlloader_curlloader.cpp
 SOURCE			urlloader_loaderutils.cpp
 SOURCE      urlloader_urlresponse.cpp
 SOURCE      nwx_http_content_type_strings.c
-
-#include  "../webkitcommon.mmpi"
-
-//USERINCLUDE     ../../src/httploader/include
-//USERINCLUDE     ../../src/httploader/src
-USERINCLUDE     ../../src/fileloader/include
-USERINCLUDE     ../../src/urlloader/include
-USERINCLUDE     ../../src/wml/src
-USERINCLUDE     ../../src/wml/include
-USERINCLUDE     ../../src/mvc/include
-USERINCLUDE     ../../src/utils/include
-USERINCLUDE     ../../src/wmlcontrol/include
-
-
-SYSTEMINCLUDE   ../../src/urlloader/include
-SYSTEMINCLUDE   ../../src/utils/include
-SYSTEMINCLUDE		../../../osswebengine/MemoryManager/Inc
-MW_LAYER_LIBC_SYSTEMINCLUDE
-MW_LAYER_SYSTEMINCLUDE
-MW_LAYER_HTTP_SYSTEMINCLUDE
-MW_LAYER_ECOM_SYSTEMINCLUDE
-
-
-
-
-
--- a/webengine/wmlengine/group/webkitcommon.mmpi	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wmlengine/group/webkitcommon.mmpi	Thu Jan 07 13:31:38 2010 +0200
@@ -14,17 +14,9 @@
 * Description: 
 *
 */
-//USERINCLUDE     ../../BrowserView/inc
-//USERINCLUDE     ../../BrowserControl/inc
-//USERINCLUDE     ../../BrowserCore/Misc/inc
-//
-//USERINCLUDE     ../../../WEBCORE/bridge/symbian
-//USERINCLUDE     ../../ResourceLoader/inc
-//USERINCLUDE     ../../HistoryProvider/inc
-//USERINCLUDE     ../../BrowserCore/ScrollBars/inc
-
-//SYSTEMINCLUDE   ../../MemoryManager/Inc
-
+#include <platform_paths.hrh>
+#include <data_caging_paths.hrh>
+#include <platform/mw/browser_platform_variant.hrh>
 
 USERINCLUDE     ../../pagescaler/inc
 USERINCLUDE     ../../webkitutils/HistoryProvider
@@ -38,3 +30,36 @@
 USERINCLUDE     ../../osswebengine/WEBCORE/loader
 
 USERINCLUDE     ../../osswebengine/JavaScriptCore
+
+USERINCLUDE     ../src/adt/include
+USERINCLUDE     ../src/browser/include
+USERINCLUDE     ../src/css/include
+USERINCLUDE     ../src/evt/include
+USERINCLUDE     ../src/fbox/include
+USERINCLUDE     ../src/fileloader/include
+USERINCLUDE     ../src/gdi/include
+USERINCLUDE     ../src/hed/include
+USERINCLUDE     ../src/htmlp/include
+USERINCLUDE     ../src/image/include
+USERINCLUDE     ../src/imagech/include
+USERINCLUDE     ../src/lmgr/include
+USERINCLUDE     ../src/markup/include
+USERINCLUDE     ../src/msg/include
+USERINCLUDE     ../src/mvc/include
+USERINCLUDE     ../src/object/include
+USERINCLUDE     ../src/script/include
+USERINCLUDE     ../src/scrolling/inc
+USERINCLUDE     ../src/system/include
+USERINCLUDE     ../src/text/include
+USERINCLUDE     ../src/unicode/include
+USERINCLUDE     ../src/urlloader/include
+USERINCLUDE     ../src/utils/include
+USERINCLUDE     ../src/wml/include
+USERINCLUDE     ../src/wml1x/include
+USERINCLUDE     ../src/wmlcontrol/include
+USERINCLUDE     ../src/wmlscriptch/include
+USERINCLUDE     ../src/xhtml/include
+// USERINCLUDE     ../../../osswebengine/MemoryManager/Inc
+
+MW_LAYER_SYSTEMINCLUDE
+OS_LAYER_ESTLIB_SYSTEMINCLUDE
--- a/webengine/wmlengine/group/wml/wml.mmp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wmlengine/group/wml/wml.mmp	Thu Jan 07 13:31:38 2010 +0200
@@ -15,8 +15,7 @@
 *
 */
 
-#include <platform_paths.hrh>
-#include <platform/mw/browser_platform_variant.hrh>
+#include  "../webkitcommon.mmpi"
 
 TARGET          wml.lib
 TARGETTYPE      lib
@@ -29,7 +28,6 @@
 
 SOURCEPATH      ../../src/wml/src
 
-
 SOURCE	nw_evlog_api.c
 SOURCE	wml_bind.c
 SOURCE	wml_core.c
@@ -57,39 +55,3 @@
 SOURCE	wml_var.c
 SOURCE	WMLWae.cpp
 SOURCE	wml_wae_reader.c
-
-#include  "../webkitcommon.mmpi"
-
-USERINCLUDE   ../../src/wml/src
-USERINCLUDE   ../../src/Wml/include
-USERINCLUDE   ../../src/urlloader/include
-USERINCLUDE   ../../src/script/include
-USERINCLUDE   ../../src/utils/include
-USERINCLUDE   ../../src/image/include
-USERINCLUDE   ../../src/adt/include
-USERINCLUDE   ../../src/mvc/include
-USERINCLUDE   ../../src/htmlp/include
-USERINCLUDE   ../../src/evt/include
-USERINCLUDE   ../../src/fbox/include
-USERINCLUDE   ../../src/gdi/include
-
-USERINCLUDE   ../../src/hed/include
-USERINCLUDE   ../../src/lmgr/include
-USERINCLUDE   ../../src/markup/include
-USERINCLUDE   ../../src/msg/include
-USERINCLUDE   ../../src/object/include
-USERINCLUDE   ../../src/system/include
-USERINCLUDE   ../../src/text/include
-USERINCLUDE   ../../src/Unicode/include
-USERINCLUDE   ../../src/wml1x/include
-USERINCLUDE   ../../src/wmlscriptch/include
-USERINCLUDE   ../../src/wmlcontrol/include
-
-
-SYSTEMINCLUDE   ../../src/utils/include
-SYSTEMINCLUDE   ../../src/urlloader/include
-SYSTEMINCLUDE   ../../src/Wml/include
-SYSTEMINCLUDE		../../../osswebengine/MemoryManager/Inc
-MW_LAYER_SYSTEMINCLUDE
-MW_LAYER_LIBC_SYSTEMINCLUDE
-
--- a/webengine/wmlengine/group/wml1x/wml1x.mmp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wmlengine/group/wml1x/wml1x.mmp	Thu Jan 07 13:31:38 2010 +0200
@@ -15,8 +15,7 @@
 *
 */
 
-#include <platform_paths.hrh>
-#include <platform/mw/browser_platform_variant.hrh>
+#include  "../webkitcommon.mmpi"
 
 TARGET          wml1x.lib
 TARGETTYPE      lib
@@ -24,7 +23,6 @@
 CAPABILITY CAP_GENERAL_DLL
 VENDORID        VID_DEFAULT
 
-
 MACRO NOKIA_MOBILE_BROWSER
 #define NOKIA_MOBILE_BROWSER 1
 
@@ -44,36 +42,3 @@
 SOURCE  Epoc32Wml1xActiveEvent.cpp
 SOURCE  WML1XEpoc32DefaultStyleSheet.cpp
 SOURCE  WML1XEpoc32ContentHandler.cpp
-
-#include  "../webkitcommon.mmpi"
-
-USERINCLUDE     .
-USERINCLUDE     ../../src/adt/include
-USERINCLUDE     ../../src/htmlp/include
-USERINCLUDE     ../../src/Evt/include
-USERINCLUDE     ../../src/fbox/include
-USERINCLUDE     ../../src/gdi/include
-USERINCLUDE     ../../src/hed/include
-USERINCLUDE     ../../src/image/include
-USERINCLUDE     ../../src/ImageCH/include
-USERINCLUDE     ../../src/lmgr/include
-USERINCLUDE     ../../src/markup/include
-USERINCLUDE     ../../src/object/include
-USERINCLUDE     ../../src/system/include
-USERINCLUDE     ../../src/text/include
-USERINCLUDE     ../../src/wml1x/include
-USERINCLUDE     ../../src/wmlscriptch/include
-USERINCLUDE     ../../src/wml/src
-USERINCLUDE     ../../src/wml/include
-USERINCLUDE     ../../src/MVC/include
-USERINCLUDE     ../../src/msg/include
-USERINCLUDE     ../../src/wmlcontrol/include
-USERINCLUDE   	../../src/utils/include
-
-SYSTEMINCLUDE   ../../src/utils/include
-SYSTEMINCLUDE   ../../src/urlloader/include
-SYSTEMINCLUDE   ../../src/wml/include
-SYSTEMINCLUDE		../../../osswebengine/MemoryManager/Inc
-MW_LAYER_SYSTEMINCLUDE
-MW_LAYER_LIBC_SYSTEMINCLUDE
-
--- a/webengine/wmlengine/group/wmlengine/mvc.mmpi	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wmlengine/group/wmlengine/mvc.mmpi	Thu Jan 07 13:31:38 2010 +0200
@@ -15,10 +15,8 @@
 *
 */
 
-
 #include  "../webkitcommon.mmpi"
 
-
 SOURCEPATH     ../../src/mvc/src
 
 SOURCE  ILoadListener.c
@@ -27,36 +25,3 @@
 SOURCE  MVCScroll.cpp
 SOURCE  MVCViewAsyncInit.cpp
 SOURCE  CEmbeddedDocExitObserver.cpp
-
-//#ifdef __SERIES60_WIM
-//SOURCE  epoc32/WimUi.cpp
-//#endif __SERIES60_WIM
-
-USERINCLUDE    ../../src/adt/include
-USERINCLUDE    ../../src/wmlcontrol/include
-USERINCLUDE    ../../src/css/include
-USERINCLUDE    ../../src/evt/include
-USERINCLUDE    ../../src/fbox/include
-USERINCLUDE    ../../src/gdi/include
-USERINCLUDE    ../../src/hed/include
-USERINCLUDE    ../../src/image/include
-USERINCLUDE    ../../src/imagech/include
-USERINCLUDE    ../../src/lmgr/include
-USERINCLUDE    ../../src/markup/include
-USERINCLUDE    ../../src/Msg/include
-USERINCLUDE    ../../src/mvc/include
-USERINCLUDE    ../../src/object/include
-USERINCLUDE    ../../src/text/include
-USERINCLUDE    ../../src/system/include
-USERINCLUDE    ../../src/wml1x/include
-USERINCLUDE    ../../src/browser/include
-USERINCLUDE    ../../src/wmlscriptch/include
-USERINCLUDE    ../../src/xhtml/include
-USERINCLUDE    ../../src/urlloader/include
-//USERINCLUDE   /S60/mw/web/WebEngine/WmlEngine/src/wml/include
-USERINCLUDE    ../../src/fileloader/include
-//USERINCLUDE		../../MemoryManager/Inc
-
-//SYSTEMINCLUDE ../WmlEngine/urlloader/include
-//SYSTEMINCLUDE ../WmlEngine/wml/include
-
--- a/webengine/wmlengine/group/wmlengine/utils.mmp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wmlengine/group/wmlengine/utils.mmp	Thu Jan 07 13:31:38 2010 +0200
@@ -15,8 +15,7 @@
 *
 */
 
-#include <platform_paths.hrh>
-#include <platform/mw/browser_platform_variant.hrh>
+#include  "../webkitcommon.mmpi"
 
 #ifndef INCLUDE_UTILS_MMP
 
@@ -52,7 +51,6 @@
 SOURCE	nwx_osu_epoc32.cpp
 SOURCE  nwx_statuscodeconvert.c
 SOURCE  nwx_assert.c
-
 SOURCE	nwx_string.c
 SOURCE	nwx_time_utils.c
 SOURCE	nwx_url_utils.c
@@ -62,29 +60,3 @@
 SOURCE  ucs2_transformation_epoc32.c
 SOURCE  CReferrerHelper.cpp
 SOURCE  FileNameUtils.cpp
-
-USERINCLUDE	    ../../src/wml/include
-
-#ifndef INCLUDE_UTILS_MMP
-USERINCLUDE	.
-USERINCLUDE     ../../src/urlloader/include
-USERINCLUDE			../../src/script/include
-USERINCLUDE			../../src/utils/include
-USERINCLUDE			../../src/wml/src
-// The following are required ONLY because of epoc32/nwx_cleanup_epoc32.cpp
-USERINCLUDE			../../src/adt/include
-USERINCLUDE			../../src/evt/include
-USERINCLUDE			../../src/hed/include
-USERINCLUDE			../../src/gdi/include
-USERINCLUDE			../../src/image/include
-USERINCLUDE			../../src/imagech/include
-USERINCLUDE     ../../src/lmgr/include
-USERINCLUDE			../../src/object/include
-USERINCLUDE     ../../src/text/include
-// end of cleanup includes
-SYSTEMINCLUDE   ../../src/urlloader/include
-SYSTEMINCLUDE   ../../src/utils/include
-MW_LAYER_SYSTEMINCLUDE
-MW_LAYER_LIBC_SYSTEMINCLUDE
-
-#endif 
--- a/webengine/wmlengine/group/wmlengine/wmlengine.mmp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wmlengine/group/wmlengine/wmlengine.mmp	Thu Jan 07 13:31:38 2010 +0200
@@ -15,8 +15,7 @@
 *
 */
 
-#include <platform_paths.hrh>
-#include <platform/mw/browser_platform_variant.hrh>
+#include  "../webkitcommon.mmpi"
 
 TARGET          wmlEngine.dll
 TARGETTYPE      dll
@@ -29,8 +28,6 @@
 CAPABILITY	CAP_GENERAL_DLL
 EPOCALLOWDLLDATA
 
-
-
 #if defined(WINSCW)
 deffile ../Bwinscw/WmlEngine.def
 #elif defined(ARMCC)
@@ -52,10 +49,9 @@
 #define INCLUDE_UTILS_MMP
 #include "utils.mmp"
 
-
 SOURCEPATH      ../../src/wmlcontrol/src
 
-SOURCE          WmlControl.cpp
+SOURCE			WmlControl.cpp
 SOURCE			WmlContentInterface.cpp
 
 SOURCEPATH      ../../src/htmlp/src
@@ -73,25 +69,6 @@
 SOURCE          LMgrBox.cpp
 //--
 
-USERINCLUDE     ../../src/utils/include
-USERINCLUDE     ../../src/scrolling/inc
-USERINCLUDE     ../../src/script/include
-USERINCLUDE     ../../src/script/src
-USERINCLUDE     ../../src/htmlp/include
-
-MW_LAYER_HTTP_SYSTEMINCLUDE
-
-SYSTEMINCLUDE   ../../src/utils/include
-SYSTEMINCLUDE		../../src/utils/src
-SYSTEMINCLUDE   ../../src/urlloader/include
-SYSTEMINCLUDE		../../src/wml/include
-SYSTEMINCLUDE		../../../osswebengine/MemoryManager/Inc
-MW_LAYER_LIBC_SYSTEMINCLUDE
-MW_LAYER_SYSTEMINCLUDE
-MW_LAYER_OSKERNEL_SYSTEMINCLUDE
-
-
-
 STATICLIBRARY    RbBrowser.lib
 // Rainbow tempest libraries
 STATICLIBRARY    xhtml.lib
@@ -171,7 +148,6 @@
 LIBRARY         DownloadMgrUiLib.lib
 LIBRARY         imut.lib
 
-
 LIBRARY         eikctl.lib 
 LIBRARY         form.lib 
 LIBRARY         etext.lib 
@@ -189,6 +165,3 @@
 LIBRARY 	broaffpopup.lib
 #endif
 LIBRARY	   	aknicon.lib
-
-
-
--- a/webengine/wmlengine/group/wmlscriptch/wmlscriptch.mmp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wmlengine/group/wmlscriptch/wmlscriptch.mmp	Thu Jan 07 13:31:38 2010 +0200
@@ -15,8 +15,7 @@
 *
 */
 
-#include <platform_paths.hrh>
-#include <platform/mw/browser_platform_variant.hrh>
+#include  "../webkitcommon.mmpi"
 
 TARGET          wmlscriptch.lib
 TARGETTYPE      lib
@@ -29,34 +28,7 @@
 
 SOURCEPATH      ../../src/wmlscriptch/src/
 
-
 SOURCE	iwmlBrowserLib.c
 SOURCE	iwmlScriptListener.c
 SOURCE	WMLSCRIPTCHScrProxyApi.cpp
 SOURCE	WMLSCRIPTCHContentHandler.cpp
-
-#include  "../webkitcommon.mmpi"
-
-USERINCLUDE     .
-USERINCLUDE     ../../src/adt/include
-USERINCLUDE     ../../src/htmlp/include
-USERINCLUDE     ../../src/Evt/include
-USERINCLUDE     ../../src/gdi/include
-USERINCLUDE     ../../src/hed/include
-USERINCLUDE     ../../src/markup/include
-USERINCLUDE     ../../src/lmgr/include
-USERINCLUDE     ../../src/object/include
-USERINCLUDE     ../../src/text/include
-USERINCLUDE     ../../src/wmlscriptch/include
-USERINCLUDE     ../../src/wml/src
-USERINCLUDE     ../../src/wml/include
-USERINCLUDE     ../../src/mvc/include
-USERINCLUDE     ../../src/msg/include
-USERINCLUDE   	../../src/utils/include
-
-USERINCLUDE     ../../../osswebengine/MemoryManager/inc
-
-SYSTEMINCLUDE   ../../src/utils/include
-SYSTEMINCLUDE   ../../src/urlloader/include
-MW_LAYER_SYSTEMINCLUDE
-MW_LAYER_LIBC_SYSTEMINCLUDE
--- a/webengine/wmlengine/group/xhtml/xhtml.mmp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wmlengine/group/xhtml/xhtml.mmp	Thu Jan 07 13:31:38 2010 +0200
@@ -15,8 +15,7 @@
 *
 */
 
-#include <platform_paths.hrh>
-#include <platform/mw/browser_platform_variant.hrh>
+#include  "../webkitcommon.mmpi"
 
 TARGET          xhtml.lib
 TARGETTYPE      lib
@@ -24,14 +23,11 @@
 CAPABILITY CAP_GENERAL_DLL
 VENDORID        VID_DEFAULT
 
-
 MACRO NOKIA_MOBILE_BROWSER
 #define NOKIA_MOBILE_BROWSER 1
 
 SOURCEPATH      ../../src/xhtml/src/
 
-#include  "../webkitcommon.mmpi"
-
 SOURCE	structure/XHTMLHeadElementHandler.cpp
 SOURCE	structure/XHTMLStructureModule.cpp
 SOURCE	structure/XHTMLTitleElementHandler.cpp
@@ -90,35 +86,3 @@
 SOURCE  frame/XHTMLFrameElementHandler.cpp
 SOURCE  ignore/XHTMLIgnoreElementHandler.cpp
 SOURCE  XHTMLMessageListener.cpp
-
-
-USERINCLUDE     .
-USERINCLUDE     ../../src/adt/include
-USERINCLUDE     ../../src/css/include
-USERINCLUDE     ../../src/Evt/include
-USERINCLUDE     ../../src/htmlp/include
-USERINCLUDE     ../../src/fbox/include
-USERINCLUDE     ../../src/gdi/include
-USERINCLUDE     ../../src/hed/include
-USERINCLUDE     ../../src/ImageCH/include
-USERINCLUDE     ../../src/image/include
-USERINCLUDE     ../../src/lmgr/include
-USERINCLUDE     ../../src/markup/include
-USERINCLUDE     ../../src/Msg/include
-USERINCLUDE     ../../src/mvc/include
-USERINCLUDE     ../../src/object/include
-USERINCLUDE     ../../src/scrolling/inc
-USERINCLUDE     ../../src/system/include
-USERINCLUDE     ../../src/text/include
-USERINCLUDE     ../../src/wmlscriptch/include
-USERINCLUDE     ../../src/xhtml/include
-USERINCLUDE     ../../src/wml/src
-USERINCLUDE     ../../src/wml/include
-USERINCLUDE     ../../src/wmlcontrol/include
-USERINCLUDE   	../../src/utils/include
-
-SYSTEMINCLUDE   ../../src/utils/include
-SYSTEMINCLUDE   ../../src/urlloader/include
-SYSTEMINCLUDE		../../../osswebengine/MemoryManager/Inc
-MW_LAYER_SYSTEMINCLUDE
-MW_LAYER_LIBC_SYSTEMINCLUDE
--- a/webengine/wmlengine/src/FileLoader/src/fileloader_cfilehandler.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wmlengine/src/FileLoader/src/fileloader_cfilehandler.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -15,8 +15,6 @@
 *
 */
 
-
-
 // INCLUDE FILES
 #include <e32std.h>
 #include <e32base.h>
--- a/webengine/wmlengine/src/FileLoader/src/fileloader_cfileloader.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wmlengine/src/FileLoader/src/fileloader_cfileloader.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -15,8 +15,6 @@
 *
 */
 
-
-
 // INCLUDE FILES
 #include <e32std.h>
 #include <e32base.h>
@@ -25,7 +23,6 @@
 #include "urlloader_loaderutils.h"
 #include "fileloader_cfilehandler.h"
 
-
 // EXTERNAL DATA STRUCTURES
 
 // EXTERNAL FUNCTION PROTOTYPES
--- a/webengine/wmlengine/src/FileLoader/src/fileloader_csaveddeckhandler.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wmlengine/src/FileLoader/src/fileloader_csaveddeckhandler.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -15,8 +15,6 @@
 *
 */
 
-
-
 // INCLUDE FILES
 #include <e32std.h>
 #include <e32base.h>
@@ -30,8 +28,6 @@
 #include "nwx_http_defs.h"
 #include "nwx_settings.h"
 
-
-
 // EXTERNAL DATA STRUCTURES
 
 // EXTERNAL FUNCTION PROTOTYPES
--- a/webengine/wmlengine/src/ImageCH/src/Epoc32ImageContentHandler.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wmlengine/src/ImageCH/src/Epoc32ImageContentHandler.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -15,7 +15,6 @@
 *
 */
 
-
 #include <e32def.h>  // First to avoid NULL redefine warning (no #ifndef NULL).
 #include <e32std.h>
 
@@ -37,8 +36,7 @@
 #include "nw_lmgr_statictablecellbox.h"
 #include "nwx_logger.h"
 #include "nwx_settings.h"
-#include "MemoryManager.h"
-
+#include <MemoryManager.h>
 
 /*required for animations*/
 
--- a/webengine/wmlengine/src/MVC/include/MVCShell.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wmlengine/src/MVC/include/MVCShell.h	Thu Jan 07 13:31:38 2010 +0200
@@ -15,14 +15,10 @@
 *
 */
 
-
 #ifndef __MVCSHELL_H
 #define __MVCSHELL_H
 
-
 #include <apmstd.h>
-#include "BrsrStatusCodes.h"
-#include "BrsrTypes.h"
 #include <badesca.h>
 #include <bldvariant.hrh>
 #include <charconv.h>
@@ -31,7 +27,9 @@
 #include <f32file.h>
 #include <ApEngineConsts.h>
 
-#include "brctldialogsprovider.h"
+#include <brctldialogsprovider.h>
+#include "BrsrStatusCodes.h"
+#include "BrsrTypes.h"
 
 #include "HEDDocumentListener.h"
 #include "httploader_mlinkresolvercallbacks.h"
@@ -42,7 +40,7 @@
 #include "nw_scrproxy.h"
 #include "nw_wae.h"
 #include "nwx_defs.h"
-#include "nwx_status.h"
+#include <nwx_status.h>
 #include "urlloader_urlresponse.h"
 #include "EmbeddedDocExitObserver.h"
 //R
@@ -50,12 +48,10 @@
 //#include "webkitview.h"
 #include "wmlcontrol.h"
 
-
 #ifdef __SERIES60_WIM
 #include "WimUi.h"
 #endif __SERIES60_WIM
 
-
 enum TUrlLoadState
   {
   // We are now loading the URL
--- a/webengine/wmlengine/src/MVC/include/MVCView.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wmlengine/src/MVC/include/MVCView.h	Thu Jan 07 13:31:38 2010 +0200
@@ -43,7 +43,7 @@
 #include "CBrowserSettings.h"
 
 #include "BrCtl.h"
-#include "MemoryManager.h"
+#include <MemoryManager.h>
 #include "pagescaler.h"
 
 
--- a/webengine/wmlengine/src/MVC/include/MVCViewAsyncInit.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wmlengine/src/MVC/include/MVCViewAsyncInit.h	Thu Jan 07 13:31:38 2010 +0200
@@ -15,8 +15,6 @@
 *
 */
 
-
-
 #ifndef VIEWASYNCINIT_H
 #define VIEWASYNCINIT_H
 
--- a/webengine/wmlengine/src/MVC/include/httploader_mlinkresolvercallbacks.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wmlengine/src/MVC/include/httploader_mlinkresolvercallbacks.h	Thu Jan 07 13:31:38 2010 +0200
@@ -15,19 +15,14 @@
 *
 */
 
-
-
 #ifndef MLINKRESOLVERCALLBACKS_H
 #define MLINKRESOLVERCALLBACKS_H
 
+#include <brctldefs.h>
 
 #include "BrsrStatusCodes.h"
-#include "brctldefs.h"
 #include "urlloader_urlresponse.h"
 
-
-
-
 //  INCLUDES
 
 // CONSTANTS
--- a/webengine/wmlengine/src/MVC/src/MVCScroll.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wmlengine/src/MVC/src/MVCScroll.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -18,7 +18,7 @@
  
 // INCLUDE FILES
 #include <e32def.h>  // To avoid NULL redefine warning (no #ifndef NULL)
-#include <nwx_settings.h>
+#include "nwx_settings.h"
 
 #include "MVCScroll.h"
 
--- a/webengine/wmlengine/src/MVC/src/MVCShell.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wmlengine/src/MVC/src/MVCShell.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -15,7 +15,6 @@
 *
 */
 
-
 // INCLUDE FILES
 #include <e32def.h> // resolve NULL redefinition warning.
 #include <e32base.h>
@@ -34,10 +33,11 @@
 #include <caf/caf.h>
 #include <caf/caftypes.h>
 #include <caf/supplieroutputfile.h> 
-#include "Oma2Agent.h"
+#include <Oma2Agent.h>
+#include <brctldefs.h>
+#include <brctldialogsprovider.h>
 
 #include "brctl.h"
-#include "brctldefs.h"
 
 #include "BrsrStatusCodes.h"
 #include "MVCShell.h"
@@ -61,13 +61,13 @@
 #include "nw_text_ucs2.h"
 //#include "nw_unknown_contenthandler.h"
 #include "nw_wae.h"
-#include "nw_wbxml_dictionary.h"
+#include <nw_wbxml_dictionary.h>
 #include "nw_wml_core.h"
 #include "nw_wmlscriptch_wmlscriptcontenthandler.h"
 #include "nw_wml1x_wml1xformliaison.h"
 #include "nw_wml1x_epoc32contenthandler.h"
 #include "nw_xhtml_epoc32contenthandler.h"
-#include <nwx_assert.h>
+#include "nwx_assert.h"
 #include "nwx_ctx.h"
 #include "nwx_datastruct.h"
 #include "nwx_defs_symbian.h"
@@ -90,10 +90,8 @@
 #include "urlloader_urlresponse.h"
 #include "CSSVariableStyleSheet.h"
 #include "TEncodingMapping.h"
-#include "brctldialogsprovider.h"
 #include "WmlInterface.h"
 
-
 // EXTERNAL DATA STRUCTURES
 #ifdef __cplusplus
 extern "C" {
--- a/webengine/wmlengine/src/MVC/src/MVCView.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wmlengine/src/MVC/src/MVCView.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -28,7 +28,6 @@
 #include <FeatMgr.h>
 #include <f32file.h>
 #include <flogger.h>
-#include <nwx_defs_symbian.h>
 #include <stddef.h>
 
 #include <CenRepNotifyHandler.h>
@@ -38,6 +37,8 @@
 #include <stringloader.h>
 #include <webkit.rsg>
 
+#include <brctlinterface.h>
+
 #include "BoxFormatHandler.h"
 #include "BoxRender.h"
 #include "BrCtl.h"
@@ -57,6 +58,7 @@
 #include "nw_adt_resizablevector.h"
 #include "nwx_cleanup_epoc32.h"
 #include "nwx_ctx.h"
+#include "nwx_defs_symbian.h"
 #include "nw_evt_accesskeyevent.h"
 #include "nw_evt_activateevent.h"
 #include "nw_evt_clearfieldevent.h"
@@ -116,8 +118,6 @@
 
 #include "TEncodingMapping.h"
 #include "urlloader_urlloaderint.h"
-#include <brctlinterface.h>
-#include "brctldialogsprovider.h"
 
 #include "HistoryController.h"
 #include "WmlInterface.h"
--- a/webengine/wmlengine/src/System/src/Epoc32Timer.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wmlengine/src/System/src/Epoc32Timer.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -25,8 +25,7 @@
 #include "nwx_ctx.h"
 #include "nwx_defs_symbian.h"
 #include "BrsrStatusCodes.h"
-#include "MemoryManager.h"
-
+#include <MemoryManager.h>
 
 /* ------------------------------------------------------------------------- *
    static data
--- a/webengine/wmlengine/src/System/src/Timer.c	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wmlengine/src/System/src/Timer.c	Thu Jan 07 13:31:38 2010 +0200
@@ -15,7 +15,6 @@
 *
 */
 
-
 #include "nw_system_timeri.h"
 #include "nwx_time.h"
 #include "BrsrStatusCodes.h"
--- a/webengine/wmlengine/src/adt/src/DynamicVector.c	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wmlengine/src/adt/src/DynamicVector.c	Thu Jan 07 13:31:38 2010 +0200
@@ -17,7 +17,7 @@
 
 
 #include "nw_adt_dynamicvectori.h"
-#include <nwx_assert.h>
+#include "nwx_assert.h"
 #include "BrsrStatusCodes.h"
 
 /* ------------------------------------------------------------------------- *
--- a/webengine/wmlengine/src/browser/include/nw_browser_browserimages.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wmlengine/src/browser/include/nw_browser_browserimages.h	Thu Jan 07 13:31:38 2010 +0200
@@ -22,7 +22,6 @@
 
 _LIT( KBrowserBitmapsName,"browserbitmaps.mbm" );
 
-
 const TUint qgn_prop_wml_square                 = 0;
 const TUint qgn_prop_wml_disc                   = 1;
 const TUint qgn_prop_wml_circle                 = 2;
--- a/webengine/wmlengine/src/browser/src/BROWSEREpoc32MimeTable.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wmlengine/src/browser/src/BROWSEREpoc32MimeTable.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -15,12 +15,11 @@
 *
 */
 
-
 #include "nw_browser_browsermimetablei.h"
 
 #include "nw_imagech_epoc32contenthandler.h"
 #include "nw_xhtml_epoc32contenthandler.h"
-#include <nw_wml_core.h>  /* needed for the wml content handler */
+#include "nw_wml_core.h"  /* needed for the wml content handler */
 #include "nw_wmlscriptch_wmlscriptcontenthandler.h"
 #include "nw_wml1x_epoc32contenthandler.h"
 #include "nwx_http_defs.h"
--- a/webengine/wmlengine/src/browser/src/wml_1_3_dict.c	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wmlengine/src/browser/src/wml_1_3_dict.c	Thu Jan 07 13:31:38 2010 +0200
@@ -39,8 +39,7 @@
 
 #include "nwx_defs.h"
 #include "nw_wml1x_wml_1_3_tokens.h"
-#include "nw_wbxml_dictionary.h"
-
+#include <nw_wbxml_dictionary.h>
 
 static const NW_Ucs2 NW_Wml_1_3_ElementTag_pre[] = {'p','r','e','\0'};
 static const NW_Ucs2 NW_Wml_1_3_ElementTag_a[] = {'a','\0'};
--- a/webengine/wmlengine/src/browser/src/xhtml_1_0_dict.c	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wmlengine/src/browser/src/xhtml_1_0_dict.c	Thu Jan 07 13:31:38 2010 +0200
@@ -35,8 +35,7 @@
  */
 #include "nwx_defs.h"
 #include "nw_xhtml_xhtml_1_0_tokens.h"
-#include "nw_wbxml_dictionary.h"
-
+#include <nw_wbxml_dictionary.h>
 
 static const NW_Ucs2 NW_XHTML_1_0_ElementTag_body[] = {'b','o','d','y','\0'};
 static const NW_Ucs2 NW_XHTML_1_0_ElementTag_head[] = {'h','e','a','d','\0'};
--- a/webengine/wmlengine/src/css/include/CSSDeclListHandle.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wmlengine/src/css/include/CSSDeclListHandle.h	Thu Jan 07 13:31:38 2010 +0200
@@ -15,7 +15,6 @@
 *
 */
 
-
 #ifndef TCSSDECLLISTHANDLE_H
 #define TCSSDECLLISTHANDLE_H
 
@@ -24,7 +23,7 @@
 #include "nw_lmgr_propertylist.h"
 #include "CSSParser.h"
 #include "CSSPropertyTable.h"
-#include "nw_dom_element.h"
+#include <nw_dom_element.h>
 #include "nw_css_processor.h"
 
 // MACROS
--- a/webengine/wmlengine/src/css/include/CSSImageList.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wmlengine/src/css/include/CSSImageList.h	Thu Jan 07 13:31:38 2010 +0200
@@ -20,14 +20,14 @@
 #define CCSSImageList_H
 
 //  INCLUDES
+#include <e32base.h>
 #include "BrsrStatusCodes.h"
 #include "nw_text_ucs2.h"
 #include "nw_image_abstractimage.h"
 #include "nw_image_virtualimage.h"
 #include "nw_image_epoc32simpleimage.h"
-#include <nwx_http_header.h>
+#include "nwx_http_header.h"
 #include "nw_css_processor.h"
-#include <e32base.h>
 
 // CONSTANTS
 
--- a/webengine/wmlengine/src/css/include/CSSPatternMatcher.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wmlengine/src/css/include/CSSPatternMatcher.h	Thu Jan 07 13:31:38 2010 +0200
@@ -22,8 +22,8 @@
 //  INCLUDES
 #include "CSSParser.h"
 #include "CSSSelector.h"
-#include "nw_dom_element.h"
-#include "nw_wbxml_dictionary.h"
+#include <nw_dom_element.h>
+#include <nw_wbxml_dictionary.h>
 #include "nw_evt_event.h"
 #include "nw_hed_documentnode.h"
 #include "nw_hed_domhelper.h"
--- a/webengine/wmlengine/src/css/include/CSSReader.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wmlengine/src/css/include/CSSReader.h	Thu Jan 07 13:31:38 2010 +0200
@@ -15,13 +15,12 @@
 *
 */
 
-
 #ifndef TCSSReader_H
 #define TCSSReader_H
 
 //  INCLUDES
 #include "nwx_defs.h"
-#include "nw_string_string.h"
+#include <nw_string_string.h>
 #include <e32std.h>
 
 // CONSTANTS
--- a/webengine/wmlengine/src/css/include/CSSRuleList.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wmlengine/src/css/include/CSSRuleList.h	Thu Jan 07 13:31:38 2010 +0200
@@ -22,7 +22,7 @@
 //  INCLUDES
 #include "CSSEventListener.h"
 #include "CSSBufferList.h"
-#include "nw_wbxml_dictionary.h"
+#include <nw_wbxml_dictionary.h>
 #include "nw_css_processori.h"
 #include "CSSPatternMatcher.h"
 #include "CSSSelector.h"
--- a/webengine/wmlengine/src/css/include/CSSSelector.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wmlengine/src/css/include/CSSSelector.h	Thu Jan 07 13:31:38 2010 +0200
@@ -22,7 +22,7 @@
 //  INCLUDES
 //#include "CSSEventListener.h"
 //#include "CSSBufferList.h"
-//#include "nw_wbxml_dictionary.h"
+//#include <nw_wbxml_dictionary.h>
 //#include "nw_css_processori.h"
 //#include "CSSPatternMatcher.h"
 
--- a/webengine/wmlengine/src/css/include/nw_css_defaultstylesheet.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wmlengine/src/css/include/nw_css_defaultstylesheet.h	Thu Jan 07 13:31:38 2010 +0200
@@ -21,8 +21,8 @@
 
 #include "nw_object_base.h"
 #include "nw_lmgr_propertylist.h"
-#include "nw_dom_element.h"
-#include "nw_wbxml_dictionary.h"
+#include <nw_dom_element.h>
+#include <nw_wbxml_dictionary.h>
 #include "nw_evt_event.h"
 #include "nw_lmgr_box.h"
 #include "nw_hed_documentnode.h"
--- a/webengine/wmlengine/src/css/include/nw_css_processor.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wmlengine/src/css/include/nw_css_processor.h	Thu Jan 07 13:31:38 2010 +0200
@@ -25,7 +25,7 @@
 #include "nw_hed_documentnode.h"
 #include "nw_hed_domhelper.h"
 #include "nw_text_ucs2.h"
-#include "nw_dom_element.h"
+#include <nw_dom_element.h>
 #include "nw_lmgr_box.h"
 #include "nw_hed_iloadrecipient.h"
 #include "nw_image_iimageobserver.h"
--- a/webengine/wmlengine/src/css/src/CSSBufferList.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wmlengine/src/css/src/CSSBufferList.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -15,12 +15,10 @@
 *
 */
 
-
-
 // INCLUDE FILES
 #include <e32def.h>  // First to avoid NULL redefine warning (no #ifndef NULL).
 #include "CSSBufferList.h"
-#include <nwx_assert.h>
+#include "nwx_assert.h"
 #include "nwx_multipart_generator.h"
 #include "nwx_string.h"
 #include "nwx_http_defs.h"
--- a/webengine/wmlengine/src/css/src/CSSDeclListHandle.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wmlengine/src/css/src/CSSDeclListHandle.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -21,14 +21,14 @@
 #include <e32def.h>  // First to avoid NULL redefine warning (no #ifndef NULL).
 
 #include <e32base.h>
-#include <nwx_assert.h>
+#include "nwx_assert.h"
 #include "CSSDeclListHandle.h"
 #include "nw_lmgr_simplepropertylist.h"
 #include "nw_text_ucs2.h"
 #include "nw_lmgr_rootbox.h"
 #include "CSSPropVal.h"
 #include "nwx_math.h"
-#include <nwx_string.h>
+#include "nwx_string.h"
 #include "CSSReader.h" 
 #include "BrsrStatusCodes.h"
  
--- a/webengine/wmlengine/src/css/src/CSSDefaultStyleSheet.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wmlengine/src/css/src/CSSDefaultStyleSheet.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -21,10 +21,10 @@
 
 #include "nw_text_ucs2.h"
 #include "nw_lmgr_cssproperties.h"
-#include "nw_string_char.h"
+#include <nw_string_char.h>
 #include "nw_lmgr_rootbox.h"
 #include "CSSPropVal.h"
-#include <nwx_string.h>
+#include "nwx_string.h"
 #include "CSSPropertyTable.h"
 #include "CSSDeclListHandle.h"
 #include "CSSPatternMatcher.h"
--- a/webengine/wmlengine/src/css/src/CSSImageList.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wmlengine/src/css/src/CSSImageList.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -15,8 +15,6 @@
 *
 */
 
-
-
 // INCLUDE FILES
 #include <e32def.h>  // First to avoid NULL redefine warning (no #ifndef NULL).
 #include "BrsrStatusCodes.h"
--- a/webengine/wmlengine/src/css/src/CSSParser.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wmlengine/src/css/src/CSSParser.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -15,14 +15,12 @@
 *
 */
 
-
-
 // INCLUDE FILES
 #include <e32def.h>  // First to avoid NULL redefine warning (no #ifndef NULL).
 
 #include "CSSParser.h"
-#include "nw_string_string.h"
-#include <nwx_assert.h>
+#include <nw_string_string.h>
+#include "nwx_assert.h"
 #include "nwx_http_defs.h"
 #include "nwx_string.h"
 #include "BrsrStatusCodes.h"
--- a/webengine/wmlengine/src/css/src/CSSPatternMatcher.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wmlengine/src/css/src/CSSPatternMatcher.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -15,16 +15,14 @@
 *
 */
 
-
-
 // INCLUDE FILES
 #include <e32def.h>  // First to avoid NULL redefine warning (no #ifndef NULL).
 
 #include "CSSPatternMatcher.h"
-#include "nw_dom_document.h"
+#include <nw_dom_document.h>
 #include "nw_evt_activateevent.h"
 #include "nw_evt_focusevent.h"
-#include <nwx_assert.h>
+#include "nwx_assert.h"
 #include "nwx_string.h"
 
 #include "nw_hed_contenthandler.h"
@@ -32,7 +30,7 @@
 #include "nw_hed_historyvisitor.h"
 #include "nw_xhtml_xhtml_1_0_tokens.h"
 #include "BrsrStatusCodes.h"
-#include "MemoryManager.h"
+#include <MemoryManager.h>
 
 // EXTERNAL DATA STRUCTURES
 
--- a/webengine/wmlengine/src/css/src/CSSProcessor.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wmlengine/src/css/src/CSSProcessor.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -16,9 +16,9 @@
 */
 
 #include <stddef.h>
-#include <nwx_assert.h>
-#include <nwx_string.h>
-#include <nwx_logger.h>
+#include "nwx_assert.h"
+#include "nwx_string.h"
+#include "nwx_logger.h"
 #include "BrsrStatusCodes.h"
 #include "CSSDeclListHandle.h"
 #include "CSSHandler.h"
@@ -46,7 +46,7 @@
 #include "nwx_settings.h"
 #include "nwx_http_defs.h"
 #include "GDIDeviceContext.h"
-#include "bodypart.h"
+#include <bodypart.h>
 #include "nw_xhtml_xhtmlcontenthandler.h"
 #include "MVCShell.h"
 //#include "BrCtl.h"
--- a/webengine/wmlengine/src/css/src/CSSPropVal.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wmlengine/src/css/src/CSSPropVal.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -27,7 +27,7 @@
 #include "nw_css_tokentoint.h"
 #include "nw_lmgr_propertylist.h"
 #include "nwx_math.h"
-#include <nwx_string.h>
+#include "nwx_string.h"
 #include "BrsrStatusCodes.h"
 
 // EXTERNAL DATA STRUCTURES
--- a/webengine/wmlengine/src/css/src/CSSPropertyTable.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wmlengine/src/css/src/CSSPropertyTable.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -22,7 +22,7 @@
 
 #include "nw_text_ascii.h"
 #include "nw_image_virtualimage.h"
-#include <nwx_string.h>
+#include "nwx_string.h"
 
 // EXTERNAL DATA STRUCTURES
 
--- a/webengine/wmlengine/src/css/src/CSSReader.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wmlengine/src/css/src/CSSReader.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -15,15 +15,13 @@
 *
 */
 
-
-
 // INCLUDE FILES
 #include <e32def.h>  // First to avoid NULL redefine warning (no #ifndef NULL).
 #include "nwx_defs.h"
 
 #include "CSSReader.h"
 #include "nw_text_ucs2.h"
-#include <nwx_assert.h>
+#include "nwx_assert.h"
 #include "nwx_http_defs.h"
 #include "nwx_string.h"
 #include "BrsrStatusCodes.h"
--- a/webengine/wmlengine/src/css/src/CSSRuleList.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wmlengine/src/css/src/CSSRuleList.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -19,13 +19,13 @@
 
 // INCLUDE FILES
 #include "CSSRuleList.h"
-#include <nwx_assert.h>
+#include "nwx_assert.h"
 #include "BrsrStatusCodes.h"
 #include "nwx_settings.h"
 
 #include "CSSParser.h"
 #include "nw_text_ucs2.h"
-#include <nwx_string.h>
+#include "nwx_string.h"
 #include "nw_hed_contenthandler.h"
 #include "CSSDeclListHandle.h"
 #include "TKeyArrayPtr.h"
--- a/webengine/wmlengine/src/css/src/CSSTokenToInt.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wmlengine/src/css/src/CSSTokenToInt.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -18,11 +18,10 @@
 #include <e32def.h>  // First to avoid NULL redefine warning (no #ifndef NULL).
 
 #include "nw_css_tokentointi.h"
-
 #include "nw_lmgr_cssproperties.h"
 #include "nw_text_ucs2.h"
-#include <nwx_string.h>
-#include <nwx_math.h>
+#include "nwx_string.h"
+#include "nwx_math.h"
 #include "BrsrStatusCodes.h"
 #include "aknutils.h"
 
--- a/webengine/wmlengine/src/css/src/CSSVariableStyleSheet.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wmlengine/src/css/src/CSSVariableStyleSheet.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -21,7 +21,7 @@
 #include <e32def.h>  // First to avoid NULL redefine warning (no #ifndef NULL).
 #include <f32file.h>
 #include "nw_css_defaultstylesheet.h"
-#include <nwx_assert.h>
+#include "nwx_assert.h"
 #include "nwx_settings.h"
 #include "nwx_ctx.h"
 #include "nwx_logger.h"
--- a/webengine/wmlengine/src/fbox/src/Epoc32FormImages.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wmlengine/src/fbox/src/Epoc32FormImages.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -15,7 +15,6 @@
 *
 */
 
-
 #include <e32def.h>  // First to avoid NULL redefine warning (no #ifndef NULL).
 #include "nw_fbox_epoc32formimagesi.h"
 
@@ -26,8 +25,8 @@
 
 #include <e32base.h>
 #include <fbs.h>
-#include <nwx_buffer.h>
-#include <nw_browser_browserimages.h>
+#include "nwx_buffer.h"
+#include "nw_browser_browserimages.h"
 
 /* ------------------------------------------------------------------------- */
 const
--- a/webengine/wmlengine/src/fbox/src/Epoc32InlineFormImages.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wmlengine/src/fbox/src/Epoc32InlineFormImages.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -15,15 +15,13 @@
 *
 */
 
-
 #include "nw_fbox_epoc32inlineformimagesi.h"
-#include <nw_browser_browserimages.h>
+#include "nw_browser_browserimages.h"
 
 /* ------------------------------------------------------------------------- *
    static data
  * ------------------------------------------------------------------------- */
 
-
 /* ------------------------------------------------------------------------- */
 static const
 NW_FBox_FormImages_Entry_t _NW_FBox_InlineFormImages_CheckBoxEntries[] = {
--- a/webengine/wmlengine/src/fbox/src/Epoc32InputInteractor.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wmlengine/src/fbox/src/Epoc32InputInteractor.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -32,10 +32,9 @@
 #include "nw_fbox_keymapper.h"
 #include "nw_fbox_textareabox.h"
 #include "nw_fbox_epoc32inputskin.h"
-#include <nwx_time.h>
+#include "nwx_time.h"
 #include "BrsrStatusCodes.h"
 
-
 /* ------------------------------------------------------------------------- *
    static data
  * ------------------------------------------------------------------------- */
--- a/webengine/wmlengine/src/fbox/src/Epoc32InputSkin.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wmlengine/src/fbox/src/Epoc32InputSkin.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -18,12 +18,10 @@
 
 #include <e32def.h>  // First to avoid NULL redefine warning (no #ifndef NULL).
 #include <calslbs.h>            // for Latin.... font methods
-#include <nwx_string.h>
 
+#include "nwx_string.h"
 #include "nw_fbox_formbox.h"
 #include "nw_evt_ecmaevent.h"
-
-
 #include "nw_fbox_epoc32inputskini.h"
 #include "nw_wml1x_wml_1_3_tokens.h"
 #include "nw_fbox_inputbox.h"
--- a/webengine/wmlengine/src/fbox/src/Epoc32SelectSkin.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wmlengine/src/fbox/src/Epoc32SelectSkin.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -15,7 +15,6 @@
 *
 */
 
-
 #include <e32def.h>  // First to avoid NULL redefine warning (no #ifndef NULL).
 #include "nw_fbox_epoc32selectskini.h"
 #include "nw_image_cannedimages.h"
@@ -30,7 +29,7 @@
 #include "KimonoLocalizationStrings.h"
 #include "nwx_logger.h"
 #include "nw_lmgr_statictablecellbox.h"
-#include <nw_browser_browserimages.h>
+#include "nw_browser_browserimages.h"
 #include "BrsrStatusCodes.h"
 
 /* ------------------------------------------------------------------------- *
--- a/webengine/wmlengine/src/fbox/src/Epoc32TextAreaBox.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wmlengine/src/fbox/src/Epoc32TextAreaBox.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -15,10 +15,9 @@
 *
 */
 
-
 #include "nw_fbox_textareaboxi.h"
 #include "nw_lmgr_rootbox.h"
-#include <nwx_string.h>
+#include "nwx_string.h"
 #include "nw_fbox_textareaskin.h"
 #include "nw_fbox_inputinteractor.h"
 #include "BrsrStatusCodes.h"
--- a/webengine/wmlengine/src/fbox/src/FBOXButtonBox.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wmlengine/src/fbox/src/FBOXButtonBox.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -28,7 +28,7 @@
 
 #include "KimonoLocalizationStrings.h"
 #include "BrsrStatusCodes.h"
-#include "MemoryManager.h"
+#include <MemoryManager.h>
 
 /* ------------------------------------------------------------------------- *
    global data
--- a/webengine/wmlengine/src/fbox/src/FBOXInputBox.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wmlengine/src/fbox/src/FBOXInputBox.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -15,7 +15,6 @@
 *
 */
 
-
 #include "nw_fbox_inputboxi.h"
 
 #include "nw_fbox_inputskin.h"
@@ -32,7 +31,6 @@
 #include "nw_wml_core.h"
 #include "nw_wml1x_wml1xcontenthandler.h"
 
-
 /* ------------------------------------------------------------------------- *
    private data
  * ------------------------------------------------------------------------- */
--- a/webengine/wmlengine/src/gdi/src/GDIDeviceContext.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wmlengine/src/gdi/src/GDIDeviceContext.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -15,19 +15,11 @@
 *
 */
 
+// INCLUDE FILES
 
-// INCLUDE FILES
 #include <e32def.h>  // First to avoid NULL redefine warning (no #ifndef NULL).
-#include "GDIDeviceContext.h"
-#include "nw_object_dynamici.h"
-#include "GDIFont.h"
-#include "nw_gdi_utils.h"
-#include "nw_text_ucs2.h"
-#include <nwx_string.h>
-#include <nwx_settings.h>
-#include "nwx_logger.h"
-#include "nwx_http_defs.h"
-#include "MVCview.h"
+#include <bldvariant.hrh>
+
 #include <AknUtils.h>
 #include <gdi.h>
 #include <w32std.h>
@@ -39,13 +31,23 @@
 #include <aknpictographinterface.h>
 #include <aknpictographdrawerinterface.h>
 #include <biditext.h>
-#include "BrsrStatusCodes.h"
-#include "FeatMgr.h"
 #include <AknFontAccess.h>
+#include <FeatMgr.h>
+#include <data_caging_path_literals.hrh>
 
-#include <bldvariant.hrh>
-#include <data_caging_path_literals.hrh>
-#include "MemoryManager.h"
+#include "GDIDeviceContext.h"
+#include "nw_object_dynamici.h"
+#include "GDIFont.h"
+#include "nw_gdi_utils.h"
+#include "nw_text_ucs2.h"
+#include "nwx_string.h"
+#include "nwx_settings.h"
+#include "nwx_logger.h"
+#include "nwx_http_defs.h"
+#include "MVCview.h"
+#include "BrsrStatusCodes.h"
+
+#include <MemoryManager.h>
 
 // EXTERNAL DATA STRUCTURES
 
--- a/webengine/wmlengine/src/hed/include/TextReverse.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wmlengine/src/hed/include/TextReverse.h	Thu Jan 07 13:31:38 2010 +0200
@@ -15,8 +15,6 @@
 *
 */
 
-
-
 #ifndef TEXTREVERSE_H
 #define TEXTREVERSE_H
 
@@ -24,11 +22,10 @@
 extern "C" {
 #endif
 
-
 //  INCLUDES
 #include "nwx_defs.h"
 #include "nwx_http_defs.h"
-#include "nw_string_string.h"
+#include <nw_string_string.h>
 #include "BrsrStatusCodes.h"
 
 // CONSTANTS
@@ -39,8 +36,6 @@
 
 // FUNCTION PROTOTYPES
 
-
-
 TBrowserStatusCode ReverseText(NW_String_t* string);
 
 #ifdef __cplusplus
--- a/webengine/wmlengine/src/hed/include/nw_dom_domvisitor.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wmlengine/src/hed/include/nw_dom_domvisitor.h	Thu Jan 07 13:31:38 2010 +0200
@@ -20,7 +20,7 @@
 #define NW_CXML_DOM_DOMVISITOR_H
 
 #include "nw_object_dynamic.h"
-#include "nw_dom_node.h"
+#include <nw_dom_node.h>
 #include "BrsrStatusCodes.h"
 
 #ifdef __cplusplus
--- a/webengine/wmlengine/src/hed/include/nw_hed_contenthandler.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wmlengine/src/hed/include/nw_hed_contenthandler.h	Thu Jan 07 13:31:38 2010 +0200
@@ -24,7 +24,7 @@
 #include "nw_hed_urlrequest.h"
 #include "nw_hed_urlresponse.h"
 #include "nw_text_ucs2.h"
-#include <urlloader_urlresponse.h>
+#include "urlloader_urlresponse.h"
 #include "BrsrStatusCodes.h"
 
 #ifdef __cplusplus
--- a/webengine/wmlengine/src/hed/include/nw_hed_context.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wmlengine/src/hed/include/nw_hed_context.h	Thu Jan 07 13:31:38 2010 +0200
@@ -15,13 +15,12 @@
 *
 */
 
-
 #ifndef NW_HED_CONTEXT_H
 #define NW_HED_CONTEXT_H
 
 #include "nw_object_dynamic.h"
 #include "nw_adt_dynamicvector.h"
-#include "nw_string_string.h"
+#include <nw_string_string.h>
 #include "NW_HED_EXPORT.h"
 #include "BrsrStatusCodes.h"
 
--- a/webengine/wmlengine/src/hed/include/nw_hed_domhelper.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wmlengine/src/hed/include/nw_hed_domhelper.h	Thu Jan 07 13:31:38 2010 +0200
@@ -27,8 +27,8 @@
 #ifndef NW_HED_DOM_HELPER_H
 #define NW_HED_DOM_HELPER_H
 
-#include "nw_dom_node.h"
-#include "nw_string_string.h"
+#include <nw_dom_node.h>
+#include <nw_string_string.h>
 #include "nw_hed_context.h"
 #include "nw_hed_entityset.h"
 #include "BrsrStatusCodes.h"
--- a/webengine/wmlengine/src/hed/include/nw_hed_domtree.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wmlengine/src/hed/include/nw_hed_domtree.h	Thu Jan 07 13:31:38 2010 +0200
@@ -22,7 +22,7 @@
 #include "nwx_http_header.h"
 #include "nwx_buffer.h"
 
-#include "nw_dom_node.h"
+#include <nw_dom_node.h>
 
 #ifdef __cplusplus
 extern "C" {
--- a/webengine/wmlengine/src/hed/include/nw_hed_errorcontenthandler.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wmlengine/src/hed/include/nw_hed_errorcontenthandler.h	Thu Jan 07 13:31:38 2010 +0200
@@ -15,21 +15,18 @@
 *
 */
 
-
 #ifndef NW_HED_ERRORCONTENTHANDLER_H
 #define NW_HED_ERRORCONTENTHANDLER_H
 
 #include "nw_hed_contenthandler.h"
 #include "nw_text_ucs2.h"
-#include <urlloader_urlresponse.h>
+#include "urlloader_urlresponse.h"
 #include "BrsrStatusCodes.h"
 
 #ifdef __cplusplus
 extern "C" {
 #endif /* __cplusplus */
   
-
-
 /* ------------------------------------------------------------------------- */
 typedef struct NW_HED_ErrorContentHandler_Class_s NW_HED_ErrorContentHandler_Class_t;
 typedef struct NW_HED_ErrorContentHandler_s NW_HED_ErrorContentHandler_t;
--- a/webengine/wmlengine/src/hed/include/nw_hed_iloadrecipient.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wmlengine/src/hed/include/nw_hed_iloadrecipient.h	Thu Jan 07 13:31:38 2010 +0200
@@ -15,22 +15,19 @@
 *
 */
 
-
 #ifndef NW_HED_ILOADRECIPIENT_H
 #define NW_HED_ILOADRECIPIENT_H
 
 #include "nw_object_interface.h"
-#include "NW_Text_Abstract.h"
+#include "nw_Text_Abstract.h"
 #include "nw_hed_urlrequest.h"
-#include <urlloader_urlresponse.h>
+#include "urlloader_urlresponse.h"
 #include "BrsrStatusCodes.h"
 
 #ifdef __cplusplus
 extern "C" {
 #endif /* __cplusplus */
   
-
-
 /* ------------------------------------------------------------------------- *
    forward declarations
  * ------------------------------------------------------------------------- */
--- a/webengine/wmlengine/src/hed/include/nw_hed_mimetable.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wmlengine/src/hed/include/nw_hed_mimetable.h	Thu Jan 07 13:31:38 2010 +0200
@@ -15,20 +15,17 @@
 *
 */
 
-
 #ifndef NW_HED_MIMETABLE_H
 #define NW_HED_MIMETABLE_H
 
 #include "nw_object_base.h"
 #include "nw_hed_contenthandler.h"
-#include <urlloader_urlresponse.h>
+#include "urlloader_urlresponse.h"
 
 #ifdef __cplusplus
 extern "C" {
 #endif /* __cplusplus */
   
-
-
 /* ------------------------------------------------------------------------- *
    forward declarations
  * ------------------------------------------------------------------------- */
--- a/webengine/wmlengine/src/hed/include/nw_hed_urlrequest.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wmlengine/src/hed/include/nw_hed_urlrequest.h	Thu Jan 07 13:31:38 2010 +0200
@@ -15,7 +15,6 @@
 *
 */
 
-
 #ifndef NW_HED_URLREQUEST_H
 #define NW_HED_URLREQUEST_H
 
@@ -24,7 +23,7 @@
 #include "nw_adt_dynamicvector.h"
 #include "NW_Text_Abstract.h"
 #include "urlloader_urlresponse.h"
-#include <nwx_http_header.h>
+#include "nwx_http_header.h"
 #include "nwx_buffer.h"
 #include "NW_HED_EXPORT.h"
 #include "BrsrStatusCodes.h"
@@ -33,7 +32,6 @@
 extern "C" {
 #endif /* __cplusplus */
 
-
 typedef enum NW_HED_UrlRequest_LoadMode_e {
   NW_HED_UrlRequest_LoadNormal,
   NW_HED_UrlRequest_LoadLocal
--- a/webengine/wmlengine/src/hed/include/nw_hed_urlresponse.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wmlengine/src/hed/include/nw_hed_urlresponse.h	Thu Jan 07 13:31:38 2010 +0200
@@ -15,15 +15,14 @@
 *
 */
 
-
 #ifndef NW_HED_URLRESPONSE_H
 #define NW_HED_URLRESPONSE_H
 
 #include "nw_object_dynamic.h"
 #include "nw_adt_dynamicvector.h"
-#include "NW_Text_Abstract.h"
-#include <urlloader_urlresponse.h>
-#include "NW_HED_EXPORT.h"
+#include "nw_text_abstract.h"
+#include "urlloader_urlresponse.h"
+#include "nw_hed_export.h"
 #include "BrsrStatusCodes.h"
 
 #ifdef __cplusplus
--- a/webengine/wmlengine/src/hed/src/DomHelper.c	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wmlengine/src/hed/src/DomHelper.c	Thu Jan 07 13:31:38 2010 +0200
@@ -15,14 +15,13 @@
 *
 */
 
-
 #include "nwx_defs.h"
 #include "nw_hed_domhelper.h"
 
-#include "nw_dom_element.h"
+#include <nw_dom_element.h>
 #include "nw_dom_domvisitor.h"
-#include "nw_dom_text.h"
-#include "nw_dom_document.h"
+#include <nw_dom_text.h>
+#include <nw_dom_document.h>
 #include "nwx_string.h"
 #include "nwx_url_utils.h"
 #include "nwx_logger.h"
@@ -34,7 +33,6 @@
 #include "BrsrStatusCodes.h"
 #include "wml_elm_attr.h"
 
-
 /* ------------------------------------------------------------------------- *
    private constants
  * ------------------------------------------------------------------------- */
--- a/webengine/wmlengine/src/hed/src/DomTree.c	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wmlengine/src/hed/src/DomTree.c	Thu Jan 07 13:31:38 2010 +0200
@@ -15,12 +15,11 @@
 *
 */
 
-
 #include "nw_hed_domtree.h"
-#include "nw_tinydom_utils.h"
+#include <nw_tinydom_utils.h>
 #include "nw_object_exceptions.h"
 #include "nwx_statuscodeconvert.h"
-//#include "Nw_string_string.h"
+// #include <nw_string_string.h>
 
 struct NW_HED_DomTree_s {
   Parser_t          domParser;
--- a/webengine/wmlengine/src/hed/src/HEDCompositeContentHandler.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wmlengine/src/hed/src/HEDCompositeContentHandler.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -15,7 +15,6 @@
 *
 */
 
-
 #include "nw_hed_compositecontenthandleri.h"
 #include "nw_hed_documentroot.h"
 #include "nw_system_optionlist.h"
@@ -29,12 +28,11 @@
 #include "nw_image_virtualimage.h"
 #include "BrsrStatusCodes.h"
 #include "nwx_settings.h"
-#include <nwx_http_defs.h>
+#include "nwx_http_defs.h"
 #include "stringutils.h"
 #include "TEncodingMapping.h"
-#include "bodypart.h"
-#include "MemoryManager.h"
-
+#include <bodypart.h>
+#include <MemoryManager.h>
 
 /* ------------------------------------------------------------------------- *
    static data
--- a/webengine/wmlengine/src/hed/src/HEDDocumentRoot.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wmlengine/src/hed/src/HEDDocumentRoot.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -14,8 +14,8 @@
 * Description: 
 *
 */
-
-
+#include <stddef.h>
+#include <Uri16.h>
 
 #include "nw_hed_documentrooti.h"
 #include "nw_hed_historyentry.h"
@@ -40,15 +40,11 @@
 #include "nw_evlog_api.h"
 #include "nwx_logger.h"
 #include "nwx_http_defs.h"
-#include <stddef.h>
-#include <Uri16.h>
 #include "BrsrStatusCodes.h"
 #include "HEDDocumentListener.h"
 
 #include "WmlControl.h"
 
-
-
 /* ------------------------------------------------------------------------- *
    private methods
  * ------------------------------------------------------------------------- */
--- a/webengine/wmlengine/src/hed/src/HistoryStack.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wmlengine/src/hed/src/HistoryStack.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -14,7 +14,7 @@
 * Description: 
 *
 */
-
+#include <brctldefs.h>
 
 #include "nw_hed_historystacki.h"
 
@@ -30,7 +30,6 @@
 #include "WmlControl.h"
 #include "HistoryController.h"
 #include "HistoryStack.h"
-#include "brctldefs.h"
 #include "HistoryEntry.h"
 #include "WmlInterface.h"
 
--- a/webengine/wmlengine/src/hed/src/Loader.c	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wmlengine/src/hed/src/Loader.c	Thu Jan 07 13:31:38 2010 +0200
@@ -15,9 +15,9 @@
 *
 */
 
+#include <e32def.h>
 
 #include "nw_hed_loaderi.h"
-
 #include "nw_adt_resizablevector.h"
 #include "nw_text_ucs2.h"
 #include "nw_hed_urlrequest.h"
@@ -29,9 +29,6 @@
 #include "nwx_http_defs.h"
 #include "BrsrStatusCodes.h"
 
-#include <e32def.h>
-
-
 /* ------------------------------------------------------------------------- */
 
 /* Static data not permitted in Epoc. For now it's been moved to the
--- a/webengine/wmlengine/src/hed/src/MimeTable.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wmlengine/src/hed/src/MimeTable.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -15,14 +15,13 @@
 *
 */
 
+#include <e32std.h>
+#include <stdarg.h>
 
 #include "nw_hed_mimetablei.h"
 #include "nwx_http_defs.h"
 #include "nwx_string.h"
 #include "nw_imagech_epoc32contenthandler.h"
-#include <e32std.h>
-
-#include <stdarg.h>
 
 static
 NW_Bool NW_HED_MimeTable_IsImageContentType(NW_Http_ContentTypeString_t contentTypeString)
--- a/webengine/wmlengine/src/hed/src/UrlResponse.c	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wmlengine/src/hed/src/UrlResponse.c	Thu Jan 07 13:31:38 2010 +0200
@@ -15,11 +15,9 @@
 *
 */
 
-
 #include "nw_hed_urlresponsei.h"
-
 #include "nw_text_ucs2.h"
-#include <nwx_string.h>
+#include "nwx_string.h"
 #include "BrsrStatusCodes.h"
 
 /*
--- a/webengine/wmlengine/src/hed/src/contentLoader.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wmlengine/src/hed/src/contentLoader.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -15,7 +15,6 @@
 *
 */
 
-
 // This module forwards content that is not handled by the browser to the OS
 // document handler.
 
--- a/webengine/wmlengine/src/htmlp/include/CHtmlpParser.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wmlengine/src/htmlp/include/CHtmlpParser.h	Thu Jan 07 13:31:38 2010 +0200
@@ -15,8 +15,6 @@
 *
 */
 
-
-
 /** ----------------------------------------------------------------------- **
     @package:     NW_HTMLP
 
@@ -32,7 +30,7 @@
 #include "nw_htmlp_lexer.h"
 #include "BrsrStatusCodes.h"
 #include "nwx_buffer.h"
-#include "nw_encoder_wbxmlwriter.h"
+#include <nw_encoder_wbxmlwriter.h>
 
 #ifdef __cplusplus
 extern "C" {
--- a/webengine/wmlengine/src/htmlp/src/CHtmlpParser.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wmlengine/src/htmlp/src/CHtmlpParser.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -15,7 +15,6 @@
 *
 */
 
-
 /*
 
   HTML Parser
@@ -25,14 +24,14 @@
 
 #include "nwx_defs.h"
 #include "CHtmlpParser.h"
-#include "nw_string_char.h"
+#include <nw_string_char.h>
 #include "BrsrStatusCodes.h"
 #include "nwx_string.h"
 #include "nw_htmlp_to_wbxml.h"
 #include "nw_htmlp_html_dict.h"
 #include "nw_htmlp_wml_dict.h"
-#include "nw_wbxml_dictionary.h"
-#include "nw_encoder_stringtable.h"
+#include <nw_wbxml_dictionary.h>
+#include <nw_encoder_stringtable.h>
 
 /* "<?" len 2 */
 #define NW_HTMLP_String_PiFormStartLength 2
--- a/webengine/wmlengine/src/htmlp/src/htmlp_lexer.c	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wmlengine/src/htmlp/src/htmlp_lexer.c	Thu Jan 07 13:31:38 2010 +0200
@@ -15,7 +15,6 @@
 *
 */
 
-
 /*
 
 Lexer for HTML parser.
@@ -25,7 +24,7 @@
 
 #include "nwx_defs.h"
 #include "nw_htmlp_lexer.h"
-#include "nw_string_char.h"
+#include <nw_string_char.h>
 #include "BrsrStatusCodes.h"
 
 /* Does not copy the buffer */
--- a/webengine/wmlengine/src/htmlp/src/htmlp_to_wbxml.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wmlengine/src/htmlp/src/htmlp_to_wbxml.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -15,9 +15,8 @@
 *
 */
 
-
 #include "nwx_defs.h"
-#include "nw_encoder_wbxmlwriter.h"
+#include <nw_encoder_wbxmlwriter.h>
 #include "CHtmlpParser.h"
 #include "nw_htmlp_to_wbxml.h"
 #include "nw_htmlp_dict.h"
@@ -25,8 +24,8 @@
 #include "nwx_statuscodeconvert.h"
 #include "BrsrStatusCodes.h"
 #include "nw_wml1x_wml_1_3_tokens.h"
-#include "nw_wbxml_dictionary.h"
-#include "nw_encoder_stringtable.h"
+#include <nw_wbxml_dictionary.h>
+#include <nw_encoder_stringtable.h>
 #include "nwx_logger.h"
 #include "nwx_http_defs.h"
 
--- a/webengine/wmlengine/src/image/include/NW_Image_ImageFactory.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wmlengine/src/image/include/NW_Image_ImageFactory.h	Thu Jan 07 13:31:38 2010 +0200
@@ -19,13 +19,10 @@
 #ifndef NW_Image_ImageFactory_h
 #define NW_Image_ImageFactory_h
 
-
-
-
 #include "nw_object_core.h"
 #include "nw_image_abstractimage.h"
-#include <nwx_buffer.h>
-#include <nwx_http_header.h>
+#include "nwx_buffer.h"
+#include "nwx_http_header.h"
 
 #ifdef __cplusplus
 extern "C" {
--- a/webengine/wmlengine/src/image/src/Epoc32CannedImages.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wmlengine/src/image/src/Epoc32CannedImages.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -15,14 +15,14 @@
 *
 */
 
+#include <e32def.h>  // First to avoid NULL redefine warning (no #ifndef NULL).
+#include <fbs.h>
 
-#include <e32def.h>  // First to avoid NULL redefine warning (no #ifndef NULL).
 #include "nw_image_cannedimagesi.h"
 #include "nw_image_epoc32cannedimage.h"
 #include "nw_text_ascii.h"
 
-#include <fbs.h>
-#include <nw_browser_browserimages.h>
+#include "nw_browser_browserimages.h"
 #include "BrsrStatusCodes.h"
 
 static TBrowserStatusCode
--- a/webengine/wmlengine/src/image/src/Epoc32ImageDecoder.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wmlengine/src/image/src/Epoc32ImageDecoder.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -46,13 +46,11 @@
 #include "nw_lmgr_statictablebox.h"
 #include "nw_xhtml_xhtml_1_0_tokens.h"
 #include "nwx_statuscodeconvert.h"
-#include "nw_dom_attribute.h"
-#include "nw_dom_element.h"
-#include "Oma2Agent.h"
+#include <nw_dom_attribute.h>
+#include <nw_dom_element.h>
+#include <Oma2Agent.h>
 #include "nwx_ctx.h"
 
-
-
 /* The Media server seems to return a value larger than this if the animation
  * should end; it is 0xffff x 10; I'm not sure if this is significant. I didn't
  * find any documentation for this. */
--- a/webengine/wmlengine/src/image/src/Epoc32SimpleImage.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wmlengine/src/image/src/Epoc32SimpleImage.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -15,7 +15,6 @@
 *
 */
 
-
 #include <e32def.h>  // First to avoid NULL redefine warning (no #ifndef NULL).
 #include "nw_image_epoc32simpleimagei.h"
 #include "Epoc32ImageDecoder.h"
@@ -33,8 +32,7 @@
 #include <bitdev.h>
 #include "BrsrStatusCodes.h"
 #include "nwx_logger.h"
-#include "MemoryManager.h"
-
+#include <MemoryManager.h>
 
 // Forward declaration which can't be put inside header file without breaking
 // compilation of OOC files.
@@ -42,7 +40,6 @@
 TBrowserStatusCode 
 scaleBitmap( CFbsBitmap* bitmap, CFbsBitmap** scaledBitmap, TRect* rect );
 
-
 void
 _NW_Image_Epoc32SimpleImage_ImageOpened( NW_Image_AbstractImage_t* aAbstractImage, NW_Bool aFailed,
                                      NW_Int16 aSuppressDupReformats )
--- a/webengine/wmlengine/src/lmgr/include/ObjectUtils.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wmlengine/src/lmgr/include/ObjectUtils.h	Thu Jan 07 13:31:38 2010 +0200
@@ -15,8 +15,6 @@
 *
 */
 
-
-
 #ifndef OBJECTUTILS_H
 #define OBJECTUTILS_H
 
@@ -25,7 +23,7 @@
 #include <badesca.h>
 
 #include "nwx_defs.h"
-#include "nw_dom_element.h"
+#include <nw_dom_element.h>
 
 // CONSTANTS
 
--- a/webengine/wmlengine/src/lmgr/src/BoxFormatHandler.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wmlengine/src/lmgr/src/BoxFormatHandler.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -16,7 +16,6 @@
 *
 */
 
-
 // INCLUDE FILES
 #include "BoxFormatHandler.h"
 #include "nwx_logger.h"
@@ -31,7 +30,6 @@
 #include <f32file.h>
 #include <flogger.h>
 
-
 // EXTERNAL FUNCTION PROTOTYPES
 
 // CONSTANTS
--- a/webengine/wmlengine/src/lmgr/src/LMgrAbstractTextBox.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wmlengine/src/lmgr/src/LMgrAbstractTextBox.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -15,7 +15,6 @@
 *
 */
 
-
 #include "nw_lmgr_abstracttextboxi.h"
 #include "nw_lmgr_splittextbox.h"
 #include "nw_lmgr_rootbox.h"
--- a/webengine/wmlengine/src/lmgr/src/LMgrBox.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wmlengine/src/lmgr/src/LMgrBox.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -15,7 +15,6 @@
 *
 */
 
-
 #include "nw_lmgr_boxi.h" 
 #include "nw_lmgr_rootbox.h"
 #include "nw_lmgr_marqueebox.h"
@@ -45,8 +44,8 @@
 #include "BrsrStatusCodes.h"
 #include "LMgrAnonBlock.h"
 #include "nw_css_tokentoint.h"
-#include "bitdev.h"
-#include "aknutils.h"
+#include <bitdev.h>
+#include <aknutils.h>
 #include "LMgrObjectBoxOOC.h"
 
 /* ------------------------------------------------------------------------- *
--- a/webengine/wmlengine/src/lmgr/src/LMgrContainerBox.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wmlengine/src/lmgr/src/LMgrContainerBox.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -15,7 +15,6 @@
 *
 */
 
-
 #include "nw_lmgr_containerboxi.h"
 #include "nw_lmgr_box.h"
 #include "nw_lmgr_flowbox.h"
--- a/webengine/wmlengine/src/lmgr/src/LMgrFlowBox.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wmlengine/src/lmgr/src/LMgrFlowBox.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -27,7 +27,7 @@
 #include "nw_fbox_inputbox.h"
 #include "nw_lmgr_imgcontainerbox.h"
 #include "BrsrStatusCodes.h"
-#include "MemoryManager.h"
+#include <MemoryManager.h>
 
 /* The static instance of the Flow_Box class object 
  * Flow box is a pure virtual class with several methods
--- a/webengine/wmlengine/src/markup/include/nw_markup_elementhandler.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wmlengine/src/markup/include/nw_markup_elementhandler.h	Thu Jan 07 13:31:38 2010 +0200
@@ -22,7 +22,7 @@
 #include "nw_object_base.h"
 #include "nw_lmgr_containerbox.h"
 #include "nw_lmgr_activebox.h"
-#include "nw_dom_node.h"
+#include <nw_dom_node.h>
 #include "NW_Markup_EXPORT.h"
 #include "BrsrStatusCodes.h"
 
--- a/webengine/wmlengine/src/markup/src/MARKUPNumberCollector.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wmlengine/src/markup/src/MARKUPNumberCollector.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -26,7 +26,7 @@
 #include "nw_lmgr_imgcontainerbox.h"
 #include "nw_fbox_optionbox.h"
 #include "BrsrStatusCodes.h"
-#include "MemoryManager.h"
+#include <MemoryManager.h>
 
 /* ------------------------------------------------------------------------- *
    private methods
--- a/webengine/wmlengine/src/markup/src/MARKUPWBXMLModule.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wmlengine/src/markup/src/MARKUPWBXMLModule.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -15,9 +15,8 @@
 *
 */
 
-
 #include "nw_markup_wbxmlmodulei.h"
-#include "nw_dom_element.h"
+#include <nw_dom_element.h>
 #include "nw_hed_domhelper.h"
 
 /* ------------------------------------------------------------------------- *
--- a/webengine/wmlengine/src/markup/src/MARKUPWmlValidator.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wmlengine/src/markup/src/MARKUPWmlValidator.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -15,7 +15,6 @@
 *
 */
 
-
 #include "nwx_string.h"
 #include "nw_wml_core.h"
 #include "nw_markup_wmlvalidatori.h"
--- a/webengine/wmlengine/src/markup/src/MARKUPXMLModule.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wmlengine/src/markup/src/MARKUPXMLModule.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -18,12 +18,11 @@
 /*lint --e{767} macro was defined differently in another module */
 
 #include "nw_markup_xmlmodulei.h"
-#include "nw_dom_element.h"
+#include <nw_dom_element.h>
 
-#include <nwx_string.h>
+#include "nwx_string.h"
 #include "BrsrStatusCodes.h"
 
-
 /* ------------------------------------------------------------------------- *
    class definition
  * ------------------------------------------------------------------------- */
--- a/webengine/wmlengine/src/object/src/Dynamic.c	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wmlengine/src/object/src/Dynamic.c	Thu Jan 07 13:31:38 2010 +0200
@@ -15,10 +15,9 @@
 *
 */
 
-
 #include "nw_object_dynamici.h"
 #include "nw_object_aggregatei.h"
-#include <nwx_mem.h>
+#include "nwx_mem.h"
 #include "BrsrStatusCodes.h"
 
 /* ------------------------------------------------------------------------- */
--- a/webengine/wmlengine/src/script/include/scr_core.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wmlengine/src/script/include/scr_core.h	Thu Jan 07 13:31:38 2010 +0200
@@ -15,7 +15,6 @@
 *
 */
 
-
 #ifndef SCR_CORE_H
 #define SCR_CORE_H
 
@@ -26,8 +25,6 @@
 #include "nwx_http_header.h"
 #include "BrsrStatusCodes.h"
 
-
-
 typedef NW_Bool lib_function(void);
 
 typedef struct {
--- a/webengine/wmlengine/src/script/src/nwx_script_handler.c	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wmlengine/src/script/src/nwx_script_handler.c	Thu Jan 07 13:31:38 2010 +0200
@@ -15,7 +15,6 @@
 *
 */
 
-
 #include "nwx_defs.h"
 #include "nwx_mem.h"
 #include "nwx_string.h"
@@ -46,8 +45,6 @@
   NW_Msg_t         *finishMsg;  /* msg alloc'ed at start */
 } Script_Context_t; 
 
-
-
 /*************************** Global Data *****************************
       NOTES: For now we will create a single global variable to
       hold all of the context for the component. It will be
--- a/webengine/wmlengine/src/script/src/scr_api.c	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wmlengine/src/script/src/scr_api.c	Thu Jan 07 13:31:38 2010 +0200
@@ -15,7 +15,6 @@
 *
 */
 
-
 #include "scr_api.h"
 #include "scr_srv.h"
 #include "scr_core.h"
--- a/webengine/wmlengine/src/script/src/scr_core.c	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wmlengine/src/script/src/scr_core.c	Thu Jan 07 13:31:38 2010 +0200
@@ -15,7 +15,6 @@
 *
 */
 
-
 #include "scr_core.h"
 #include "scr_conv.h"
 #include "scr_api.h"
--- a/webengine/wmlengine/src/script/src/scr_reader.c	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wmlengine/src/script/src/scr_reader.c	Thu Jan 07 13:31:38 2010 +0200
@@ -38,7 +38,6 @@
 #include "nwx_http_defs.h"
 #include "BrsrStatusCodes.h"
 
-
 /* prototypes */
 NW_Bool read_header_info(NW_Reader_t *r);
 NW_Bool read_constpool(NW_Reader_t *r);
--- a/webengine/wmlengine/src/text/include/NW_Text_Abstract.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wmlengine/src/text/include/NW_Text_Abstract.h	Thu Jan 07 13:31:38 2010 +0200
@@ -15,7 +15,6 @@
 *
 */
 
-
 #ifndef NW_Text_Abstract_h
 #define NW_Text_Abstract_h
 
@@ -23,8 +22,8 @@
 #include "nw_object_dynamic.h"
 #include "nw_text_types.h"
 #include "nw_text_iterator.h"
-#include "nw_string_char.h"
-#include "nw_string_string.h"
+#include <nw_string_char.h>
+#include <nw_string_string.h>
 #include "BrsrStatusCodes.h"
 
 #ifdef __cplusplus
--- a/webengine/wmlengine/src/text/src/NW_Text_Abstract.c	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wmlengine/src/text/src/NW_Text_Abstract.c	Thu Jan 07 13:31:38 2010 +0200
@@ -15,7 +15,6 @@
 *
 */
 
-
 #include "NW_Text_AbstractI.h"
 
 #include "nw_text_ucs2.h"
@@ -23,7 +22,7 @@
 #include "nw_text_latin1.h"
 #include "nw_text_ascii.h"
 #include "nwx_string.h"
-#include "nw_string_string.h"
+#include <nw_string_string.h>
 #include "BrsrStatusCodes.h"
 
 /* ------------------------------------------------------------------------- *
--- a/webengine/wmlengine/src/urlloader/include/urlloader_curlloader.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wmlengine/src/urlloader/include/urlloader_curlloader.h	Thu Jan 07 13:31:38 2010 +0200
@@ -21,10 +21,10 @@
 #define CKUrlLoader_H
 
 //  INCLUDES
+#include <brctldefs.h>
+
 #include "urlloader_murlschemehandler.h"
 #include "BrsrStatusCodes.h"
-#include "brctldefs.h"
-
 
 // CONSTANTS
 
--- a/webengine/wmlengine/src/urlloader/include/urlloader_urlloaderI.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wmlengine/src/urlloader/include/urlloader_urlloaderI.h	Thu Jan 07 13:31:38 2010 +0200
@@ -15,16 +15,14 @@
 *
 */
 
-
-
 #ifndef URLLOADERI_H
 #define URLLOADERI_H
 
 //  INCLUDES
+#include <brctldefs.h>
 #include "urlloader_urlloaderint.h"
 #include "httploader_mlinkresolvercallbacks.h"
 #include "BrsrStatusCodes.h"
-#include "brctldefs.h"
 
 #ifdef __cplusplus
 extern "C" {
--- a/webengine/wmlengine/src/urlloader/include/urlloader_urlloaderint.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wmlengine/src/urlloader/include/urlloader_urlloaderint.h	Thu Jan 07 13:31:38 2010 +0200
@@ -15,7 +15,6 @@
 *
 */
 
-
 #ifndef URLLOADERINT_H
 #define URLLOADERINT_H
 
@@ -24,7 +23,6 @@
 #include "urlloader_urlresponse.h"
 #include "BrsrStatusCodes.h"
 
-
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -33,7 +31,6 @@
     
 #define NW_NUM_INSTANCES 3
 
-
 // MACROS
     
 // DATA TYPES
--- a/webengine/wmlengine/src/urlloader/src/urlloader_urlresponse.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wmlengine/src/urlloader/src/urlloader_urlresponse.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -15,7 +15,6 @@
 *
 */
 
-
 // INCLUDE FILES
 #include <e32std.h>
 #include <e32base.h>
--- a/webengine/wmlengine/src/utils/include/StringUtils.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wmlengine/src/utils/include/StringUtils.h	Thu Jan 07 13:31:38 2010 +0200
@@ -15,8 +15,6 @@
 *
 */
 
-
-
 #ifndef STRINGUTIL_H
 #define STRINGUTIL_H
 
@@ -26,7 +24,6 @@
 #include "nwx_defs.h"
 #include <nw_string_string.h>
 
-
 // CLASS DECLARATION
 
 /**
--- a/webengine/wmlengine/src/utils/include/nw_loadreq.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wmlengine/src/utils/include/nw_loadreq.h	Thu Jan 07 13:31:38 2010 +0200
@@ -15,7 +15,6 @@
 *
 */
 
-
 #ifndef NW_LOADREQ_H
 #define NW_LOADREQ_H
 
@@ -38,7 +37,6 @@
 ** Preprocessor Macro Definitions
 */
 
-
 #ifdef __cplusplus
 extern "C" {
 #endif
--- a/webengine/wmlengine/src/utils/include/nwx_multipart_generator.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wmlengine/src/utils/include/nwx_multipart_generator.h	Thu Jan 07 13:31:38 2010 +0200
@@ -15,7 +15,6 @@
 *
 */
 
-
 #ifndef NWX_MULTIPART_GENERATOR_H
 #define NWX_MULTIPART_GENERATOR_H
 
--- a/webengine/wmlengine/src/utils/include/nwx_osu_file.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wmlengine/src/utils/include/nwx_osu_file.h	Thu Jan 07 13:31:38 2010 +0200
@@ -23,7 +23,6 @@
 extern "C" {
 #endif
 
-
 /*
 ** Includes
 */
--- a/webengine/wmlengine/src/utils/src/CBrowserSettings.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wmlengine/src/utils/src/CBrowserSettings.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -15,7 +15,6 @@
 *
 */
 
-
 #include <bldvariant.hrh>
 #include "CBrowserSettings.h"
 
--- a/webengine/wmlengine/src/utils/src/CReferrerHelper.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wmlengine/src/utils/src/CReferrerHelper.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -15,7 +15,6 @@
 *
 */
 
-
 #include "CReferrerHelper.h"
 #include "urlloader_urlloaderint.h"
 #include "nwx_http_defs.h"	// For NW_URL_METHOD_GET
--- a/webengine/wmlengine/src/utils/src/ImageUtils.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wmlengine/src/utils/src/ImageUtils.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -15,8 +15,6 @@
 *
 */
 
-
-
 // INCLUDE FILES
 #include <e32base.h>
 
--- a/webengine/wmlengine/src/utils/src/TEncodingMapping.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wmlengine/src/utils/src/TEncodingMapping.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -15,7 +15,6 @@
 *
 */
 
-
 #include "TEncodingMapping.h"
 #include "nwx_http_defs.h"
 #include "nwx_defs.h"
--- a/webengine/wmlengine/src/utils/src/nw_loadreq.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wmlengine/src/utils/src/nw_loadreq.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -15,7 +15,6 @@
 *
 */
 
-
 /*
 **-------------------------------------------------------------------------
 **  Component Generic Include
@@ -32,7 +31,7 @@
 #include "nwx_url_utils.h"
 #include "nw_nvpair.h"
 #include "nw_wae_reader.h"
-#include "nw_string_string.h"
+#include <nw_string_string.h>
 #include "nwx_http_defs.h"
 #include "nwx_settings.h"
 #include "nwx_statuscodeconvert.h"
@@ -45,7 +44,6 @@
 #include "nw_loadreq.h"
 #include "urlloader_urlloaderint.h"
 #include "BrsrStatusCodes.h"
-#include "nwx_http_defs.h"
 
 /*
 **-------------------------------------------------------------------------
--- a/webengine/wmlengine/src/utils/src/nwx_multipart_generator.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wmlengine/src/utils/src/nwx_multipart_generator.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -15,7 +15,6 @@
 *
 */
 
-
 #include "nwx_defs.h"
 #include "nwx_http_defs.h"
 #include "nwx_string.h"
--- a/webengine/wmlengine/src/utils/src/nwx_osu_epoc32.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wmlengine/src/utils/src/nwx_osu_epoc32.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -27,7 +27,7 @@
 #include "nwx_osu_epoc32.h"
 #include "nwx_logger.h"
 #include "nwx_string.h"
-#include <ls_std.h>
+#include <kernel/localise.h>
 #include "BrsrStatusCodes.h"
 
 /*
--- a/webengine/wmlengine/src/utils/src/nwx_osu_file_epoc32.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wmlengine/src/utils/src/nwx_osu_file_epoc32.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -15,7 +15,6 @@
 *
 */
 
-
 /*
 **-------------------------------------------------------------------------
 **  Include Files
@@ -31,7 +30,6 @@
 #include <SysUtil.h>
 #include "BrsrStatusCodes.h"
 
-
 /*
 **-------------------------------------------------------------------------
 **  Defines 
--- a/webengine/wmlengine/src/utils/src/nwx_settings_epoc32.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wmlengine/src/utils/src/nwx_settings_epoc32.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -15,7 +15,6 @@
 *
 */
 
-
 /*
 **-------------------------------------------------------------------------
 **  Include Files
--- a/webengine/wmlengine/src/utils/src/nwx_sprintf.c	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wmlengine/src/utils/src/nwx_sprintf.c	Thu Jan 07 13:31:38 2010 +0200
@@ -33,7 +33,7 @@
 #include "nwx_url_utils.h"
 
 #include <stdarg.h>
-#include <float.h> /* FLT_DIG */
+#include "float.h" /* FLT_DIG */
 
 /*lint -save -e794, -e661 Conceivable use of null pointer, Possible access of out-of-bounds pointer*/
 
--- a/webengine/wmlengine/src/utils/src/nwx_url_utils.c	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wmlengine/src/utils/src/nwx_url_utils.c	Thu Jan 07 13:31:38 2010 +0200
@@ -15,8 +15,6 @@
 *
 */
 
-
-
 /*****************************************************************
 **    File name:  nwx_url_utils.c
 **    Part of: Url Utils (NW)
@@ -24,7 +22,6 @@
 **      to the standards defined in RFC 2396.
 ******************************************************************/
 
-
 /*
 **-------------------------------------------------------------------------
 **  Include Files
--- a/webengine/wmlengine/src/wml/include/nw_evlog_api.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wmlengine/src/wml/include/nw_evlog_api.h	Thu Jan 07 13:31:38 2010 +0200
@@ -15,7 +15,6 @@
 *
 */
 
-
 #ifndef NW_EVLOG_API_H
 #define NW_EVLOG_API_H
 
--- a/webengine/wmlengine/src/wml/include/nw_wae.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wmlengine/src/wml/include/nw_wae.h	Thu Jan 07 13:31:38 2010 +0200
@@ -15,7 +15,6 @@
 *
 */
 
-
 /***************************************************************************
 **   File: nw_wae.h
 **   Subsystem Name: WAE User Agent
@@ -45,7 +44,6 @@
 #include "wml_wae_transaction.h"
 #include "BrsrStatusCodes.h"
 
-
 /*                                                                          */
 /* Spectrum uses the new SIA/OTA Push application, which registers directly */
 /* with the WSP stack, rather than the Rainbow OEM Push handlering code     */
--- a/webengine/wmlengine/src/wml/include/nw_wml_core.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wmlengine/src/wml/include/nw_wml_core.h	Thu Jan 07 13:31:38 2010 +0200
@@ -15,7 +15,6 @@
 *
 */
 
-
 /*
     $Workfile: nw_wml_core.h $
 
@@ -55,10 +54,8 @@
 #include "urlloader_urlresponse.h"
 #include "BrsrStatusCodes.h"
 
-
 #define MAX_NUMBER_INTRA_OEF 15 /* the value is so chosen that the call stack does not max out - Vishy*/
 
-
 /*---------------------------------------------------------------------
  * NW_Wml_History_t -- history stack element -- holds information needed
  * to reconstruct the call to access a card we've been to recently.
--- a/webengine/wmlengine/src/wml/include/nw_wml_list.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wmlengine/src/wml/include/nw_wml_list.h	Thu Jan 07 13:31:38 2010 +0200
@@ -33,7 +33,7 @@
 #endif
 
 #include "nwx_defs.h"
-#include "nwx_status.h"
+#include <nwx_status.h>
 #include "nwx_memseg.h"
 
 /* A single linked list with a dummy element first */
--- a/webengine/wmlengine/src/wml/include/nw_wml_url_utils.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wmlengine/src/wml/include/nw_wml_url_utils.h	Thu Jan 07 13:31:38 2010 +0200
@@ -34,9 +34,8 @@
 extern "C" {
 #endif
 
-
 #include "nw_wml_core.h"
-#include "nwx_status.h"
+#include <nwx_status.h>
 
 #ifdef __cplusplus
 } /* extern "C" */
--- a/webengine/wmlengine/src/wml/include/nw_wml_var.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wmlengine/src/wml/include/nw_wml_var.h	Thu Jan 07 13:31:38 2010 +0200
@@ -35,7 +35,7 @@
 
 #include "nwx_defs.h"
 #include "nwx_memseg.h"
-#include "nwx_status.h"
+#include <nwx_status.h>
 
 typedef struct _NW_Wml_Var_t NW_Wml_Var_t;
 struct _NW_Wml_Var_t {
--- a/webengine/wmlengine/src/wml/include/nw_wtai_api.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wmlengine/src/wml/include/nw_wtai_api.h	Thu Jan 07 13:31:38 2010 +0200
@@ -15,7 +15,6 @@
 *
 */
 
-
 /*****************************************************************
 **    File name:  wml_wtai_api.h
 **    Part of: WAE
@@ -29,7 +28,6 @@
 extern "C" {
 #endif
 
-
 /*
 **-------------------------------------------------------------------------
 **  Include Files
@@ -40,7 +38,6 @@
 #include "nwx_http_header.h"
 #include "BrsrStatusCodes.h"
 
-
 /*
 **-------------------------------------------------------------------------
 **  Macros
--- a/webengine/wmlengine/src/wml/include/wml_core.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wmlengine/src/wml/include/wml_core.h	Thu Jan 07 13:31:38 2010 +0200
@@ -37,5 +37,4 @@
 #include "wml_list.h"
 #include "wml_api.h"
 
-
 #endif /* WML_CORE_H */
--- a/webengine/wmlengine/src/wml/include/wml_deck.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wmlengine/src/wml/include/wml_deck.h	Thu Jan 07 13:31:38 2010 +0200
@@ -15,7 +15,6 @@
 *
 */
 
-
 #ifndef WML_DECK_H
 #define WML_DECK_H
 
--- a/webengine/wmlengine/src/wml/include/wml_decoder.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wmlengine/src/wml/include/wml_decoder.h	Thu Jan 07 13:31:38 2010 +0200
@@ -15,7 +15,6 @@
 *
 */
 
-
 #ifndef WML_DECODER_H
 #define WML_DECODER_H
 
@@ -32,7 +31,6 @@
 #include "nw_hed_context.h"
 #include "BrsrStatusCodes.h"
 
-
 #ifdef __cplusplus
 extern "C" {
 #endif
--- a/webengine/wmlengine/src/wml/src/WMLWae.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wmlengine/src/wml/src/WMLWae.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -18,7 +18,6 @@
 *
 */
 
-
 /*
 **-------------------------------------------------------------------------
 **  Include Files
@@ -44,7 +43,6 @@
 **-------------------------------------------------------------------------
 */
 
-
 /*
 **-------------------------------------------------------------------------
 **  Internal Prototypes
--- a/webengine/wmlengine/src/wml/src/WMLhistory.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wmlengine/src/wml/src/WMLhistory.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -35,8 +35,7 @@
 #include "nwx_ctx.h"
 #include "nw_hed_documentroot.h"
 #include "BrsrStatusCodes.h"
-#include "MemoryManager.h"
-
+#include <MemoryManager.h>
 
 /*------------------------------------------------------------------------
  * StringCopy -- makes a copy of src string, puts its address in *dest,
--- a/webengine/wmlengine/src/wml/src/wml_deck_iter.c	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wmlengine/src/wml/src/wml_deck_iter.c	Thu Jan 07 13:31:38 2010 +0200
@@ -15,12 +15,11 @@
 *
 */
 
-
-#include <nwx_logger.h>
+#include "nwx_logger.h"
 
-#include "nw_dom_text.h"
+#include <nw_dom_text.h>
 #include "wml_deck_iter.h"
-#include "nw_dom_document.h"
+#include <nw_dom_document.h>
 #include "BrsrStatusCodes.h"
 
 static NW_DOM_Node_t* x_GetNextElement_AllChildren (NW_Wml_DeckIter_t* thisObj)
--- a/webengine/wmlengine/src/wml/src/wml_wae_reader.c	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wmlengine/src/wml/src/wml_wae_reader.c	Thu Jan 07 13:31:38 2010 +0200
@@ -16,7 +16,6 @@
 *
 */
 
-
 #include "nw_wae_reader.h"
 
 #include "nwx_defs.h"
--- a/webengine/wmlengine/src/wml1x/include/nw_wml1x_wml1xcontenthandler.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wmlengine/src/wml1x/include/nw_wml1x_wml1xcontenthandler.h	Thu Jan 07 13:31:38 2010 +0200
@@ -15,7 +15,6 @@
 *
 */
 
-
 #ifndef NW_WML1X_CONTENTHANDLER_H
 #define NW_WML1X_CONTENTHANDLER_H
 
@@ -30,10 +29,9 @@
 #include "nw_text_ucs2.h"
 #include "nw_adt_dynamicvector.h"
 #include "nw_wml1x_wml1xformliaison.h"
-#include "nw_tinydom_utils.h"
+#include <nw_tinydom_utils.h>
 #include "BrsrStatusCodes.h"
 
-
 #ifdef __cplusplus
 extern "C" {
 #endif /* __cplusplus */
--- a/webengine/wmlengine/src/wml1x/src/Epoc32Wml1xActiveEvent.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wmlengine/src/wml1x/src/Epoc32Wml1xActiveEvent.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -15,7 +15,6 @@
 *
 */
 
-
 #include <e32def.h> // resolves NULL redefinition warning.
  
 #include "nw_wml1x_wml1xcontenthandler.h"
--- a/webengine/wmlengine/src/wml1x/src/WML1XApi.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wmlengine/src/wml1x/src/WML1XApi.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -15,7 +15,6 @@
 *
 */
 
-
 /* Includes */
 #include "nwx_string.h"
 #include "nwx_url_utils.h"
@@ -67,10 +66,10 @@
 #include "nw_wml1x_wml1xapi.h"
 #include "nwx_http_defs.h"
 #include "BrsrStatusCodes.h"
-#include "bodypart.h"
+#include <bodypart.h>
 #include "MVCShell.h"
 #include "BrCtl.h"
-#include "MemoryManager.h"
+#include <MemoryManager.h>
 
 /*
 **-------------------------------------------------------------------------
--- a/webengine/wmlengine/src/wml1x/src/WML1XContentHandler.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wmlengine/src/wml1x/src/WML1XContentHandler.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -31,7 +31,7 @@
 #include "nw_lmgr_cssproperties.h"
 #include "nw_imagech_epoc32contenthandler.h"
 #include "nwx_string.h"
-#include "stdarg.h"
+#include <stdarg.h>
 #include "nw_lmgr_bidiflowbox.h"
 #include "nw_wml1x_wml1xdefaultstylesheet.h"
 #include "nw_image_cannedimages.h"
@@ -39,7 +39,7 @@
 #include "nwx_osu.h"
 #include "wml_url_utils.h"
 #include "wml_history.h"
-#include "nw_xmlp_xmlp2wbxml.h"
+#include <nw_xmlp_xmlp2wbxml.h>
 #include "nwx_settings.h"
 #include "nw_wml1x_wml_1_3_tokens.h"
 #include "wml_elm_attr.h"
@@ -63,7 +63,6 @@
 #include "BrsrStatusCodes.h"
 #include "HEDDocumentListener.h"
 
-
 #include "wmlcontrol.h"
 
 /* ------------------------------------------------------------------------- *
--- a/webengine/wmlengine/src/wml1x/src/WML1XEventHandler.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wmlengine/src/wml1x/src/WML1XEventHandler.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -15,8 +15,7 @@
 *
 */
 
-
-#include <nw_wml_core.h>
+#include "nw_wml_core.h"
 #include "nw_hed_documentrooti.h"
 #include "nw_wml1x_wml1xeventhandleri.h"
 #include "nw_lmgr_cssproperties.h"
--- a/webengine/wmlengine/src/wml1x/src/WML1XFormLiaison.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wmlengine/src/wml1x/src/WML1XFormLiaison.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -15,7 +15,6 @@
 *
 */
 
-
 #include "nw_wml_core.h"
 #include "wml_url_utils.h"
 #include "wml_task.h"
--- a/webengine/wmlengine/src/wmlcontrol/include/WmlControl.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wmlengine/src/wmlcontrol/include/WmlControl.h	Thu Jan 07 13:31:38 2010 +0200
@@ -21,7 +21,7 @@
 //  INCLUDES
 #include <e32base.h>
 #include <w32std.h>
-#include "brctldefs.h"
+#include <brctldefs.h>
 
 #include "BrCtl.h"
 #include "WmlEngineInterface.h"
--- a/webengine/wmlengine/src/wmlcontrol/include/WmlEngineDefs.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wmlengine/src/wmlcontrol/include/WmlEngineDefs.h	Thu Jan 07 13:31:38 2010 +0200
@@ -19,13 +19,6 @@
 #define WMLENGINEDEFS_H
 
 //  INCLUDES
-//#include <e32base.h>
-//#include <w32std.h>
-//#include "brctldefs.h"
-
-//#include "BrCtl.h"
-//#include "WebKitLoader.h"
-
 
 // CONSTANTS
 
@@ -51,15 +44,14 @@
 enum TWMLOptions
 	{
      WML_OPTION_UNKNOWN = 1,
-	 WML_OPTION_ACCEPT  = 2,
+	   WML_OPTION_ACCEPT  = 2,
      WML_OPTION_PREV    = 3,
      WML_OPTION_HELP    = 4,
-	 WML_OPTION_RESET   = 5,
+	   WML_OPTION_RESET   = 5,
      WML_OPTION_OPTIONS = 6,
      WML_OPTION_DELETE  = 7
 	};
 };
 
-
 #endif      // WMLENGINEDEFS_H           
 // End of File
--- a/webengine/wmlengine/src/wmlcontrol/include/WmlEngineInterface.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wmlengine/src/wmlcontrol/include/WmlEngineInterface.h	Thu Jan 07 13:31:38 2010 +0200
@@ -22,13 +22,11 @@
 
 #include <e32base.h>
 #include <COEDEF.H>
-#include "brctldefs.h"
-#include "WmlEngineDefs.h"
-
+#include <brctldefs.h>
+#include <WmlEngineDefs.h>
 
 // CONSTANTS
 
-
 //Forword declrartion;
 class CBrCtl;
 class MWmlInterface;
--- a/webengine/wmlengine/src/wmlcontrol/src/WmlContentInterface.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wmlengine/src/wmlcontrol/src/WmlContentInterface.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -15,8 +15,6 @@
 *
 */
 
-
-
 // INCLUDES
 #include <e32base.h>
 #include "BrsrStatusCodes.h"
--- a/webengine/wmlengine/src/wmlcontrol/src/WmlControl.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wmlengine/src/wmlcontrol/src/WmlControl.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -15,10 +15,9 @@
 *
 */
 
-
 //  INCLUDES
 #include "WmlControl.h"
-#include "multipartparser.h"
+#include <multipartparser.h>
 #include "MVCView.h"
 #include "MVCShell.h"
 #include "WmlInterface.h"
--- a/webengine/wmlengine/src/wmlscriptch/include/nw_wmlscriptch_iwmlbrowserlib.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wmlengine/src/wmlscriptch/include/nw_wmlscriptch_iwmlbrowserlib.h	Thu Jan 07 13:31:38 2010 +0200
@@ -15,7 +15,6 @@
 *
 */
 
-
 #ifndef NW_WMLSCH_IWMLBROWSERLIB_H
 #define NW_WMLSCH_IWMLBROWSERLIB_H
 
@@ -27,19 +26,16 @@
 extern "C" {
 #endif /* __cplusplus */
   
-
 /* ------------------------------------------------------------------------- *
    forward declarations
  * ------------------------------------------------------------------------- */
 typedef struct NW_WmlsCh_IWmlBrowserLib_Class_s NW_WmlsCh_IWmlBrowserLib_Class_t;
 typedef struct NW_WmlsCh_IWmlBrowserLib_s NW_WmlsCh_IWmlBrowserLib_t;
 
-
 /* ------------------------------------------------------------------------- *
    method type prototypes
  * ------------------------------------------------------------------------- */
 
- 
 typedef 
 TBrowserStatusCode
 (*NW_WmlsCh_IWmlBrowserLib_Init_t) (NW_WmlsCh_IWmlBrowserLib_t *wmlBrowser);
--- a/webengine/wmlengine/src/wmlscriptch/include/nw_wmlscriptch_wmlscriptcontenthandler.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wmlengine/src/wmlscriptch/include/nw_wmlscriptch_wmlscriptcontenthandler.h	Thu Jan 07 13:31:38 2010 +0200
@@ -15,7 +15,6 @@
 *
 */
 
-
 #ifndef NW_WMLSCRIPT_CONTENTHANDLER_H
 #define NW_WMLSCRIPT_CONTENTHANDLER_H
 
--- a/webengine/wmlengine/src/wmlscriptch/src/WMLSCRIPTCHContentHandler.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wmlengine/src/wmlscriptch/src/WMLSCRIPTCHContentHandler.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -22,7 +22,7 @@
 #include "nw_wae.h"
 #include "nwx_ctx.h"
 #include "nwx_string.h"
-#include "stdarg.h"
+#include <stdarg.h>
 #include "BrsrStatusCodes.h"
 
 /*lint -restore */
--- a/webengine/wmlengine/src/wmlscriptch/src/WMLSCRIPTCHScrProxyApi.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wmlengine/src/wmlscriptch/src/WMLSCRIPTCHScrProxyApi.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -38,7 +38,7 @@
 #include "nwx_http_header.h"
 #include "nw_wmlscriptch_wmlscriptcontenthandler.h"
 #include "BrsrStatusCodes.h"
-#include "MemoryManager.h"
+#include <MemoryManager.h>
 
 /*
 **-------------------------------------------------------------------------
--- a/webengine/wmlengine/src/xhtml/include/ImageMapPopup.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wmlengine/src/xhtml/include/ImageMapPopup.h	Thu Jan 07 13:31:38 2010 +0200
@@ -17,7 +17,6 @@
 *
 */
 
-
 #ifndef __IMAGEMAPPOPUP_H
 #define __IMAGEMAPPOPUP_H
 
--- a/webengine/wmlengine/src/xhtml/include/XhtmlObjectElementHandler.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wmlengine/src/xhtml/include/XhtmlObjectElementHandler.h	Thu Jan 07 13:31:38 2010 +0200
@@ -25,7 +25,7 @@
 #include <e32base.h>
 
 #include "nwx_defs.h"
-#include "nw_dom_node.h"
+#include <nw_dom_node.h>
 
 #include "HedLoadObserver.h"
 #include "LMgrBoxDestructionListener.h"
--- a/webengine/wmlengine/src/xhtml/include/XhtmlTableElementHandler.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wmlengine/src/xhtml/include/XhtmlTableElementHandler.h	Thu Jan 07 13:31:38 2010 +0200
@@ -15,8 +15,6 @@
 *
 */
 
-
-
 #ifndef CXHTMLTABLEELEMENTHANDLER__H
 #define CXHTMLTABLEELEMENTHANDLER__H
 
@@ -25,8 +23,7 @@
 #include <e32base.h>
 
 #include "nwx_defs.h"
-#include "nw_dom_node.h"
-
+#include <nw_dom_node.h>
 
 // CONSTANTS
 
--- a/webengine/wmlengine/src/xhtml/include/nw_basicforms_xhtmlcontrolset.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wmlengine/src/xhtml/include/nw_basicforms_xhtmlcontrolset.h	Thu Jan 07 13:31:38 2010 +0200
@@ -20,7 +20,7 @@
 #define NW_XHTML_XHTMLCONTROLSET_H
 
 #include "nw_object_dynamic.h"
-#include "nw_dom_node.h"
+#include <nw_dom_node.h>
 #include "nw_adt_dynamicvector.h"
 #include "BrsrStatusCodes.h"
 
--- a/webengine/wmlengine/src/xhtml/include/nw_xhtml_attributepropertytable.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wmlengine/src/xhtml/include/nw_xhtml_attributepropertytable.h	Thu Jan 07 13:31:38 2010 +0200
@@ -20,7 +20,7 @@
 #define NW_XHTML_ATTRIBUTEPROPERTYTABLE_H
 
 #include "nw_object_base.h"
-#include "nw_dom_node.h"
+#include <nw_dom_node.h>
 #include "nw_lmgr_cssproperties.h"
 #include "nw_text_coretextelementhandleri.h"
 #include "nw_xhtml_xhtml_1_0_tokens.h"
--- a/webengine/wmlengine/src/xhtml/include/nw_xhtml_elementhandler.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wmlengine/src/xhtml/include/nw_xhtml_elementhandler.h	Thu Jan 07 13:31:38 2010 +0200
@@ -15,14 +15,13 @@
 *
 */
 
-
 #ifndef NW_XHTML_ELEMENTHANDLER_H
 #define NW_XHTML_ELEMENTHANDLER_H
 
 #include "nw_object_base.h"
 #include "nw_lmgr_containerbox.h"
 #include "nw_lmgr_activebox.h"
-#include "nw_dom_node.h"
+#include <nw_dom_node.h>
 #include "nw_lmgr_cssproperties.h"
 #include "nw_xhtml_xhtml_1_0_tokens.h"
 #include "BrsrStatusCodes.h"
--- a/webengine/wmlengine/src/xhtml/include/nw_xhtml_xhtmlcontenthandler.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wmlengine/src/xhtml/include/nw_xhtml_xhtmlcontenthandler.h	Thu Jan 07 13:31:38 2010 +0200
@@ -15,7 +15,6 @@
 *
 */
 
-
 #ifndef _NW_XHTML_ContentHandler_h_
 #define _NW_XHTML_ContentHandler_h_
 
@@ -30,7 +29,7 @@
 #include "nw_markup_numbercollector.h"
 #include "nw_markup_module.h"
 #include "nw_system_timer.h"
-#include "nw_tinydom_utils.h"
+#include <nw_tinydom_utils.h>
 #include "nw_xhtml_elementhandler.h"
 #include "nwx_http_header.h"
 #include "BrsrStatusCodes.h"
--- a/webengine/wmlengine/src/xhtml/src/BasicForms/XHTMLFormLiaison.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wmlengine/src/xhtml/src/BasicForms/XHTMLFormLiaison.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -15,15 +15,15 @@
 *
 */
 
-
 #include <e32def.h>
 #include <calslbs.h>
 #include <StringLoader.h>
 #include <webkit.rsg>
 #include <commoncontentpolicy.h>
 
+#include <brctldialogsprovider.h>
+
 #include "BrCtl.h"
-#include "brctldialogsprovider.h"
 
 #include "BrsrStatusCodes.h"
 #include "MVCShell.h"
@@ -31,7 +31,7 @@
 #include "nw_adt_mapiterator.h"
 #include "nw_basicforms_xhtmlformliaisoni.h"
 //#include "nw_ecma_contenthandler.h"
-#include "nw_dom_document.h"
+#include <nw_dom_document.h>
 #include "nw_dom_domvisitor.h"
 #include "nw_fbox_formbox.h"
 #include "nw_fbox_optgrpbox.h"
@@ -46,7 +46,6 @@
 //R->ul #include "urlloader_urlloaderint.h"
 #include "TEncodingMapping.h"
 
-
 // LOCAL CONSTANTS
 _LIT(KEmptyTitle, "");
 
--- a/webengine/wmlengine/src/xhtml/src/BasicForms/XHTMLInputElementHandler.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wmlengine/src/xhtml/src/BasicForms/XHTMLInputElementHandler.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -15,8 +15,6 @@
 *
 */
 
-
-
 #include "nw_basicforms_inputelementhandleri.h"
 
 #include "nw_basicforms_xhtmlformliaison.h"
--- a/webengine/wmlengine/src/xhtml/src/Frame/XHTMLFrameElementHandler.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wmlengine/src/xhtml/src/Frame/XHTMLFrameElementHandler.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -15,9 +15,7 @@
 *
 */
 
-
 #include "nw_frame_frameelementhandleri.h"
-
 #include "nw_xhtml_xhtmlcontenthandler.h"
 #include "nw_hed_hedeventhandler.h"
 #include "nw_hed_documentroot.h"
--- a/webengine/wmlengine/src/xhtml/src/Hypertext/XHTMLAElementHandler.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wmlengine/src/xhtml/src/Hypertext/XHTMLAElementHandler.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -17,7 +17,6 @@
 
 
 #include "nw_hypertext_aelementhandleri.h"
-
 #include "nw_xhtml_xhtmlcontenthandler.h"
 #include "nw_hed_hedeventhandler.h"
 #include "nw_hed_documentroot.h"
--- a/webengine/wmlengine/src/xhtml/src/Image/areaElementHandler.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wmlengine/src/xhtml/src/Image/areaElementHandler.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -15,7 +15,6 @@
 *
 */
 
-
 // INCLUDE FILES
 #include "nw_image_areaelementhandleri.h"
 #include "nw_xhtml_xhtmlcontenthandler.h"
--- a/webengine/wmlengine/src/xhtml/src/Image/imgElementHandler.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wmlengine/src/xhtml/src/Image/imgElementHandler.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -15,7 +15,6 @@
 *
 */
 
-
 // INCLUDE FILES
 #include "nw_image_imgelementhandleri.h"
 #include "nw_image_virtualimage.h"
--- a/webengine/wmlengine/src/xhtml/src/Link/XHTMLLinkElementHandler.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wmlengine/src/xhtml/src/Link/XHTMLLinkElementHandler.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -15,10 +15,9 @@
 *
 */
 
-
 #include "nw_link_linkelementhandleri.h"
 #include "nw_xhtml_xhtmlcontenthandler.h"
-#include "nw_dom_document.h"
+#include <nw_dom_document.h>
 #include "nw_xhtml_xhtml_1_0_tokens.h"
 #include "nwx_string.h"
 #include "BrsrStatusCodes.h"
--- a/webengine/wmlengine/src/xhtml/src/Object/XhtmlObjectElementHandler.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wmlengine/src/xhtml/src/Object/XhtmlObjectElementHandler.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -15,7 +15,6 @@
 *
 */
 
-
 // INCLUDE FILES
 #include <e32std.h>
 #include <e32def.h>
@@ -49,7 +48,6 @@
 #include "nwx_http_defs.h"
 #include "urlloader_urlresponse.h"
 
-
 // ============================ MEMBER FUNCTIONS ===============================
 
 // -----------------------------------------------------------------------------
--- a/webengine/wmlengine/src/xhtml/src/Structure/XHTMLTitleElementHandler.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wmlengine/src/xhtml/src/Structure/XHTMLTitleElementHandler.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -15,15 +15,13 @@
 *
 */
 
-
 #include "nw_structure_titleelementhandleri.h"
 #include "nw_xhtml_xhtmlcontenthandler.h"
 #include "nw_text_ucs2.h"
-#include "nw_dom_text.h"
-#include <nwx_string.h>
+#include <nw_dom_text.h>
+#include "nwx_string.h"
 #include "BrsrStatusCodes.h"
-#include "MemoryManager.h"
-
+#include <MemoryManager.h>
 
 /* ------------------------------------------------------------------------- *
    class definition
--- a/webengine/wmlengine/src/xhtml/src/Structure/scriptElementHandler.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wmlengine/src/xhtml/src/Structure/scriptElementHandler.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -18,9 +18,14 @@
 // INCLUDE FILES
 #include <e32std.h>
 #include <e32base.h>
+#include <f32file.h>
+#include <flogger.h>
 
-#include <nwx_string.h> 
+#include <stddef.h>
+#include <stdio.h>
+
 // User Includes
+#include "nwx_string.h" 
 #include "ecmadll.h"
 #include "XhtmlTableElementHandlerOOC.h"
 #include "nw_lmgr_statictablebox.h"
@@ -37,29 +42,21 @@
 #include "nw_basicforms_inputelementhandler.h"
 #include "nw_structure_scriptelementhandleri.h"
 #include "nw_xhtml_xhtmlcontenthandler.h"
-#include "nw_dom_document.h"
 #include "nw_htmlp_to_wbxml.h"
 #include "nw_lmgr_slavepropertylist.h"
 #include "nw_xhtml_xhtml_1_0_tokens.h"
 #include "nw_text_ucs2.h"
-#include "nw_dom_text.h"
+#include <nw_dom_text.h>
 #include "nw_dom_domvisitor.h"
-#include "nw_tinydom.h"
-#include "nw_dom_element.h"
-#include "nw_dom_document.h"
+#include <nw_tinydom.h>
+#include <nw_dom_element.h>
+#include <nw_dom_document.h>
 
-#include <f32file.h>
-#include <flogger.h>
-
-#include <stddef.h>
-#include <stdio.h>
-
-#include <nwx_string.h>
 #include "nw_ecma_contenthandler.h"
 #include "nw_lmgr_textbox.h"
 #include "nwx_http_defs.h"
+#include "nwx_logger.h"
 
-#include "nwx_logger.h"
 _LIT(KScriptLanguage, "javascript");
 _LIT(KScriptType1, "text/javascript");
 _LIT(KScriptType2, "text/ecmascript");
--- a/webengine/wmlengine/src/xhtml/src/Style/XHTMLStyleElementHandler.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wmlengine/src/xhtml/src/Style/XHTMLStyleElementHandler.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -21,8 +21,8 @@
 #include "nw_link_linkelementhandleri.h"
 
 #include "nw_xhtml_xhtmlcontenthandler.h"
-#include "nw_dom_text.h"
-#include "nw_dom_document.h"
+#include <nw_dom_text.h>
+#include <nw_dom_document.h>
 #include "BrsrStatusCodes.h"
 
 /* ------------------------------------------------------------------------- *
--- a/webengine/wmlengine/src/xhtml/src/Text/XHTMLHrElementHandler.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wmlengine/src/xhtml/src/Text/XHTMLHrElementHandler.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -19,7 +19,7 @@
 #include "nw_text_hrelementhandleri.h"
 
 #include "nw_xhtml_xhtmlcontenthandler.h"
-#include "nw_dom_document.h"
+#include <nw_dom_document.h>
 #include "nw_lmgr_rulebox.h"
 #include "NW_Text_Abstract.h"
 #include "nw_dom_domvisitor.h"
--- a/webengine/wmlengine/src/xhtml/src/Variables.c	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wmlengine/src/xhtml/src/Variables.c	Thu Jan 07 13:31:38 2010 +0200
@@ -17,9 +17,8 @@
 
 
 #include "nw_xhtml_variablesi.h"
-
 #include "nw_adt_segmentedvector.h"
-#include <nwx_string.h>
+#include "nwx_string.h"
 #include "BrsrStatusCodes.h"
 
 /* ------------------------------------------------------------------------- *
--- a/webengine/wmlengine/src/xhtml/src/XHTMLAttributePropertyTable.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wmlengine/src/xhtml/src/XHTMLAttributePropertyTable.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -15,11 +15,10 @@
 *
 */
 
-
 #include "nwx_string.h"
 #include "nwx_settings.h"
 #include "BrsrStatusCodes.h"
-#include "nw_dom_node.h"
+#include <nw_dom_node.h>
 #include "nw_css_tokentoint.h"
 #include "nw_lmgr_cssproperties.h"
 #include "nw_lmgr_propertylist.h"
--- a/webengine/wmlengine/src/xhtml/src/XHTMLContentHandler.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wmlengine/src/xhtml/src/XHTMLContentHandler.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -15,7 +15,6 @@
 *
 */
 
-
 // INCLUDE FILES
 #include <e32def.h>  // To avoid NULL redefine warning (no #ifndef NULL)
 
@@ -36,7 +35,6 @@
 #include <stdio.h>
 #include <string.h>
 
-
 #include "nwx_string.h"
 
 #include "nw_xhtml_xhtmlcontenthandleri.h"
@@ -52,13 +50,13 @@
 #include "nw_hed_inumbercollectori.h"
 #include "nw_lmgr_bidiflowbox.h"
 #include "nw_dom_domvisitor.h"
-#include "nw_tinydom.h"
-#include "nw_dom_element.h"
-#include "nw_dom_document.h"
+#include <nw_tinydom.h>
+#include <nw_dom_element.h>
+#include <nw_dom_document.h>
 #include "nw_adt_segmentedvector.h"
 #include "nw_adt_resizableobjectvector.h"
 #include "nw_adt_mapiterator.h"
-#include "nw_xmlp_xmlp2wbxml.h"
+#include <nw_xmlp_xmlp2wbxml.h>
 #include "nw_htmlp_to_wbxml.h"
 #include "nwx_url_utils.h"
 #include "nwx_string.h"
@@ -91,11 +89,10 @@
 #include "nw_structure_scriptelementhandler.h"
 #include "XhtmlObjectElementHandlerOOCi.h"
 #include "XHTMLMessageListener.h"
-#include "bodypart.h"
+#include <bodypart.h>
 #include "MVCShell.h"
 #include "BrCtl.h"
 
-
 #include <stddef.h>
 #include "CReferrerHelper.h"
 #include "CSSVariableStyleSheet.h"
--- a/webengine/wmlengine/src/xhtml/src/XHTMLElementHandler.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wmlengine/src/xhtml/src/XHTMLElementHandler.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -38,8 +38,8 @@
 #include "nw_link_linkelementhandler.h"
 #include "nw_base_baseelementhandler.h"
 #include "nw_xhtml_textelementhandler.h"
-#include "nw_dom_element.h"
-#include "nw_dom_document.h"
+#include <nw_dom_element.h>
+#include <nw_dom_document.h>
 #include "nw_xhtml_attributepropertytable.h"
 #include "nw_css_defaultstylesheet.h"
 #include "nw_xhtml_xhtml_1_0_tokens.h"
--- a/webengine/wmlengine/src/xhtml/src/XHTMLEpoc32ContentHandler.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wmlengine/src/xhtml/src/XHTMLEpoc32ContentHandler.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -15,7 +15,6 @@
 *
 */
 
-
 #include "BrsrStatusCodes.h"
 #include "nw_xhtml_epoc32contenthandleri.h"
 #include "nw_structure_structuremodule.h"
--- a/webengine/wmlengine/src/xhtml/src/XHTMLPiElementHandler.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wmlengine/src/xhtml/src/XHTMLPiElementHandler.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -15,16 +15,15 @@
 *
 */
 
-
 #include "nw_xhtml_pielementhandleri.h"
 #include "nw_xhtml_xhtmlcontenthandler.h"
-#include "nw_dom_document.h"
+#include <nw_dom_document.h>
 #include "nw_htmlp_to_wbxml.h"
 #include "nw_xhtml_xhtml_1_0_tokens.h"
 #include "nwx_string.h"
 #include "nw_link_linkelementhandler.h"
 #include <nwx_status.h>
-#include <nwx_settings.h>
+#include "nwx_settings.h"
 #include "nwx_statuscodeconvert.h"
 #include "BrsrStatusCodes.h"
 #include "nwx_http_defs.h"
--- a/webengine/wmlengine/src/xhtml/src/XHTMLTextElementHandler.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wmlengine/src/xhtml/src/XHTMLTextElementHandler.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -19,7 +19,7 @@
 #include "nw_xhtml_textelementhandleri.h"
 
 #include "nw_lmgr_textbox.h"
-#include "nw_dom_text.h"
+#include <nw_dom_text.h>
 #include "nw_xhtml_xhtmlcontenthandler.h"
 #include "nw_hed_documentroot.h"
 #include "nw_hed_hedeventhandler.h"
--- a/webengine/wrtharvester/data/2001FE2C.rss	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wrtharvester/data/2001FE2C.rss	Thu Jan 07 13:31:38 2010 +0200
@@ -17,7 +17,7 @@
 
 
 // INCLUDES
-#include <registryinfo.rh>
+#include <ecom/registryinfo.rh>
 #include <contentharvesterpluginuids.hrh>
 
 //  RESOURCE DEFINITIONS 
--- a/webengine/wrtharvester/group/wrtharvester.mmp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wrtharvester/group/wrtharvester.mmp	Thu Jan 07 13:31:38 2010 +0200
@@ -32,7 +32,7 @@
 SOURCE          wrtusbhandler.cpp
 
 MW_LAYER_SYSTEMINCLUDE
-MW_LAYER_ECOM_SYSTEMINCLUDE
+
 USERINCLUDE     ../inc
 
 START RESOURCE  ../data/2001FE2C.rss
--- a/webengine/wrtharvester/inc/wrtharvester.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wrtharvester/inc/wrtharvester.h	Thu Jan 07 13:31:38 2010 +0200
@@ -113,11 +113,18 @@
     	*/
 		void QueueOperationL(  TWidgetOperations aOperation, TUid aUid );	
 		
-		void DialogShown(){ iDialogShown = EFalse; }
 		//to check if the device is in mass memory mode
 		TInt IsInMSMode() { return iMSMode; }
 		void  SetMSMode(TInt val)  { iMSMode = val; }
-		 
+		//To check if registry can be accessed
+		TInt CanAccessRegistry(){ return iCanAccessRegistry; }
+		void SetRegistryAccess(TBool aValue){ iCanAccessRegistry = aValue; }
+		
+		void SetReinstallWidget(TBool aValue){ iReinstallingWidget = aValue; }			
+
+        void DialogShown();
+
+        static TInt DeleteCallback(TAny* aPtr);		
 		
 	private:
         
@@ -329,6 +336,25 @@
          *
          */
          RPointerArray<HBufC> iHSWidgets;
+         /**
+          * 
+          */
+         TBool iCanAccessRegistry;
+         
+         /**
+          * 
+          */
+		 TBool iReinstallingWidget;
+		 
+        /**
+         * 
+         */
+		 RArray<TUid> iUid;
+		 
+        /**
+         * 
+         */
+		 CAsyncCallBack*  iAsyncCallBack;
     };
 
 #endif // C_WRTCONTENTHARVESTER_H 
--- a/webengine/wrtharvester/inc/wrtusbhandler.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wrtharvester/inc/wrtusbhandler.h	Thu Jan 07 13:31:38 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2008 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
@@ -44,9 +44,7 @@
     virtual ~CWrtUsbHandler();
 
     void Start();
-    void ToggleUSBMode();
-    void DoScanAndUpdate();
-    void DeleteTimer();
+    void DoScanAndUpdate();   
 
 protected:
 
@@ -75,8 +73,6 @@
     RFs iFs;
 
     TInt iDriveFlags;
-    CPeriodic* iCallBackTimer;
-
     };
 
 #endif // #ifndef WIDGETMMCHANDLER_H
--- a/webengine/wrtharvester/rom/wrtharvester.iby	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wrtharvester/rom/wrtharvester.iby	Thu Jan 07 13:31:38 2010 +0200
@@ -19,7 +19,11 @@
 #ifndef WRTHARVESTER_IBY
 #define WRTHARVESTER_IBY
 #include <bldvariant.hrh>
+#ifdef __S60_32__
+#include <browser_platform_variant.hrh>
+#else
 #include <platform/mw/browser_platform_variant.hrh>
+#endif
 
 #ifdef BRDO_WRT_HS_FF
 ECOM_PLUGIN(wrtharvester.dll, wrtharvester.rsc)
--- a/webengine/wrtharvester/rom/wrtharvesterResources.iby	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wrtharvester/rom/wrtharvesterResources.iby	Thu Jan 07 13:31:38 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
@@ -20,7 +20,11 @@
 #ifndef WRTHARVESTERRESOURCES_IBY
 #define WRTHARVESTERRESOURCES_IBY
 
+#ifdef __S60_32__
+#include <browser_platform_variant.hrh>
+#else
 #include <platform/mw/browser_platform_variant.hrh>
+#endif
 
 #ifdef BRDO_WRT_HS_FF
 data=ZRESOURCE\wrtharvester.rsc		RESOURCE_FILES_DIR\wrtharvester.rsc
--- a/webengine/wrtharvester/src/wrtharvester.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wrtharvester/src/wrtharvester.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -26,7 +26,7 @@
 #include <widgetregistryconstants.h>
 #include <wrtharvester.rsg>
 
-#include <implementationproxy.h>
+#include <ecom/implementationproxy.h>
 
 #include <LiwServiceHandler.h>
 #include <LiwVariant.h>
@@ -229,6 +229,10 @@
     iWidgetUsbListener->Start();
     SetMSMode(0);
     
+    iCanAccessRegistry = ETrue;    
+	iReinstallingWidget = EFalse;
+	
+	    
     TFileName resourceFileName;  
     TParse parse;    
     Dll::FileName (resourceFileName);           
@@ -278,6 +282,13 @@
     delete iWidgetRegListener;
     delete iWidgetMMCListener;
     delete iWidgetUsbListener;
+    if(iAsyncCallBack)
+        {
+        iAsyncCallBack->Cancel();       
+        }
+    delete iAsyncCallBack;
+    iAsyncCallBack = NULL;
+    iUid.Close();
     iWidgetOperations.Close();
     iHSWidgets.ResetAndDestroy();
     iApaSession.Close();
@@ -385,6 +396,11 @@
 //
 void CWrtHarvester::UpdatePublishersL() 
     {
+    if(iReinstallingWidget)
+        {        
+        iReinstallingWidget = EFalse;
+        return;
+        }
     iRegistryAccess.WidgetInfosL( iWidgetInfo );
     RemoveObsoletePublishersL();
     
@@ -795,12 +811,25 @@
     RWidgetRegistryClientSession session;
     CleanupClosePushL( session );
     User::LeaveIfError( session.Connect() );
-    if ( session.IsBlanketPermGranted ( aUid ) == EBlanketUnknown && !iDialogShown )
+    TBool preInstalled = *(session.GetWidgetPropertyValueL( aUid, EPreInstalled ) );
+    
+    // Set blanket permission to true for pre-installed widgets
+    if ( preInstalled )
+        {
+        session.SetBlanketPermissionL( aUid, EBlanketTrue );
+        }
+    
+    if ( session.IsBlanketPermGranted ( aUid ) == EBlanketUnknown && !iDialogShown 
+         &&  iCanAccessRegistry  )
         {
         iDialogShown = ETrue;            
         AllowPlatformAccessL( aUid );
         }
-    else if(!iDialogShown)
+    else if(session.IsBlanketPermGranted ( aUid ) == EBlanketUnknown)
+        {
+        iUid.Append(aUid);
+        }
+    else
         {
         QueueOperationL( WidgetResume, aUid );
         }        
@@ -879,6 +908,33 @@
     
     return networkAccess;
     }
+// ----------------------------------------------------------------------------
+// 
+// ----------------------------------------------------------------------------
+//
+TInt CWrtHarvester::DeleteCallback(TAny* aPtr)
+    {
+    CWrtHarvester* self = (CWrtHarvester*)aPtr;    
+    self->QueueResumeL(self->iUid[0]);
+    self->iUid.Remove(0);    
+    delete self->iAsyncCallBack;
+    self->iAsyncCallBack = NULL;
+    return 0;
+    }
+
+// ----------------------------------------------------------------------------
+// 
+// ----------------------------------------------------------------------------
+//
+void CWrtHarvester::DialogShown()
+    {
+    iDialogShown = EFalse;
+    if(iUid.Count())
+        {
+        iAsyncCallBack = new (ELeave) CAsyncCallBack(TCallBack(DeleteCallback,this),CActive::EPriorityUserInput);
+        iAsyncCallBack->CallBack(); 
+        }
+    }
 
 // ----------------------------------------------------------------------------
 // 
--- a/webengine/wrtharvester/src/wrtharvesterpsnotifier.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wrtharvester/src/wrtharvesterpsnotifier.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -77,7 +77,7 @@
     	r = RProperty::Define( KPropertyCat, iKey, RProperty::EInt );
     	}
 
-    if ( r != KErrAlreadyExists || r != KErrNone )
+    if ( r != KErrAlreadyExists && r != KErrNone )
         {
         User::LeaveIfError( r );
         }
@@ -148,8 +148,17 @@
             iHarvester->ClearAllOperations();
             SetValue(1);
             }
+        else if( iKey == EWidgetUIState && value == 3 )
+            {            
+            iHarvester->SetReinstallWidget(ETrue);
+            }        
         else if( iKey == EWidgetRegAltered && value == 1 )
             {
+            if(!iHarvester->CanAccessRegistry())
+                {                
+                iHarvester->SetMSMode(0);
+                iHarvester->SetRegistryAccess(ETrue);
+                }
              iHarvester->UpdateL();
             }
         }
--- a/webengine/wrtharvester/src/wrtusbhandler.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/webengine/wrtharvester/src/wrtusbhandler.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
@@ -25,16 +25,6 @@
 // CONSTANTS
 
 
-static TInt TimerCallBack( TAny* ptr )
-{    
-    CWrtUsbHandler* temp = static_cast<CWrtUsbHandler*>(ptr);
-    if(temp)
-        {
-        temp->DeleteTimer();
-        temp->DoScanAndUpdate();       
-        }
-    return 0;    
-}
 // ============================================================================
 // CWrtUsbHandler::NewL()
 // two-phase constructor
@@ -122,9 +112,7 @@
     {
     if ( iStatus == KErrNone )
         {
-        //Call back Timer
-        iCallBackTimer = CPeriodic::NewL(CActive::EPriorityLow);
-        iCallBackTimer->Start(10000000,0,TCallBack(&TimerCallBack,this));         
+        DoScanAndUpdate();
         }
     }
 
@@ -144,9 +132,8 @@
         //Unpluging USB from Mass storage . . . 
         if(iHarvester->IsInMSMode() == 1)
             {                  
-            iHarvester->SetMSMode(0);
             iHarvester->ClearAllOperations();
-            TRAP(err, iHarvester->UpdateL() );            
+            iHarvester->SetRegistryAccess(EFalse);
             iFs.NotifyChange( ENotifyDisk, iStatus );
             SetActive();
             return;
@@ -173,9 +160,7 @@
            {           
            iHarvester->SetMSMode(1);            
            }
-       
-        TRAP( err, iHarvester->UpdateL() ); 
-        }
+        }    
     iFs.NotifyChange( ENotifyDisk, iStatus );
     SetActive();
     }
@@ -250,9 +235,4 @@
 
     return error;
     }
-void CWrtUsbHandler::DeleteTimer()
-    {
-    iCallBackTimer->Cancel();
-    delete iCallBackTimer;
-    iCallBackTimer = NULL; 
-    }
+
--- a/widgets/widgetapp/data/WidgetUi.rss	Thu Dec 17 09:20:16 2009 +0200
+++ b/widgets/widgetapp/data/WidgetUi.rss	Thu Jan 07 13:31:38 2010 +0200
@@ -21,7 +21,7 @@
 #include <bldvariant.hrh>
 #include <eikon.rh>
 #include "WidgetUi.hrh"
-#include <WidgetUi.loc>
+#include <widgetui.loc>
 #include <avkon.rsg>
 #include <avkon.rh>
 #include <avkon.mbg>
--- a/widgets/widgetapp/group/WidgetUi.mmp	Thu Dec 17 09:20:16 2009 +0200
+++ b/widgets/widgetapp/group/WidgetUi.mmp	Thu Jan 07 13:31:38 2010 +0200
@@ -83,8 +83,7 @@
 USERINCLUDE ../../WidgetInstaller/inc
 
 MW_LAYER_SYSTEMINCLUDE
-MW_LAYER_LIBC_SYSTEMINCLUDE
-MW_LAYER_ECOM_SYSTEMINCLUDE
+OS_LAYER_ESTLIB_SYSTEMINCLUDE
 
 // LIB DEPENDENCIES
 
@@ -113,14 +112,18 @@
 LIBRARY ImageConversion.lib
 LIBRARY ecom.lib  // for schemeHandler
 LIBRARY MemMan.lib
+
 #ifdef BRDO_WRT_HS_FF
 LIBRARY	liwservicehandler.lib
 #endif
+
 LIBRARY bitgdi.lib
 LIBRARY aknnotify.lib
+
 #ifdef RD_SCALABLE_UI_V2
 LIBRARY cdlengine.lib 
 #endif
+
 LIBRARY esock.lib
 
 DEBUGLIBRARY flogger.lib 
--- a/widgets/widgetapp/group/bld.inf	Thu Dec 17 09:20:16 2009 +0200
+++ b/widgets/widgetapp/group/bld.inf	Thu Jan 07 13:31:38 2010 +0200
@@ -24,7 +24,7 @@
 
 PRJ_EXPORTS
 // export localization files
-../loc/WidgetUi.loc       MW_LAYER_LOC_EXPORT_PATH(WidgetUi.loc)
+../loc/widgetui.loc       MW_LAYER_LOC_EXPORT_PATH(widgetui.loc)
 
 ../inc/widgetappdefs.rh   MW_LAYER_PLATFORM_EXPORT_PATH(widgetappdefs.rh)
 
--- a/widgets/widgetapp/inc/WidgetUiNetworkListener.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/widgets/widgetapp/inc/WidgetUiNetworkListener.h	Thu Jan 07 13:31:38 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2008, 2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
--- a/widgets/widgetapp/inc/WidgetUiObserver.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/widgets/widgetapp/inc/WidgetUiObserver.h	Thu Jan 07 13:31:38 2010 +0200
@@ -287,10 +287,9 @@
         * Rcognize the mime type.
         * @since 3.1
         * @param aFileName
-        * @param aData
         * @return HBufC*
         */
-        HBufC* RecognizeLC( const TDesC& aFileName, const TDesC8& aData );
+        HBufC* RecognizeLC( const TDesC& aFileName );
 
         /**
         * TranslateURLToFilenameL
--- a/widgets/widgetapp/inc/WidgetUiWindow.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/widgets/widgetapp/inc/WidgetUiWindow.h	Thu Jan 07 13:31:38 2010 +0200
@@ -500,7 +500,20 @@
          * @return CActiveSchedulerWait*
          */
         CActiveSchedulerWait* NetworkModeWait() { return iNetworkModeWait; }
-
+        
+        /**
+         * NeedToNotifyNetworkState
+         * Notifies to Widget about network state
+         * @since 7.1
+		 * @param aNetworkState the online/offline state needs to be notified to widget or not
+         * @return none
+         */
+        void NeedToNotifyNetworkState(TBool aNetworkState);
+        
+        TBool CanBeDeleted();
+        
+        static TInt DeleteItself(TAny* aPtr);
+        
         
     protected:
 
@@ -594,12 +607,18 @@
         //Download transaction ID
         long                            iDlId;  
 		TInt                            iClickCount;
-        CFbsBitmap*                     iMiniviewBitmap ;
+        CFbsBitmap                      iMiniviewBitmap1;
+        CFbsBitmap                      iMiniviewBitmap2;
+        CFbsBitmap*                     iActiveMiniviewBitmap;
+        
         TTime                           iOOMWidgetStartTime; 
         TBool                           iWidgetLoadStarted; // Set to true when widget load starts
         CJpgSaver*                       iJpgSaver; 
         CActiveSchedulerWait*           iNetworkModeWait;
-                            
+        TBool                           iNeedToNotifyNetworkState;        
+        TBool                           iConnecting;                            
+        TBool                           iDeleteItself;
+        CAsyncCallBack*                 iAsyncCallBack;                                    
    };
 
 #endif  //
--- a/widgets/widgetapp/inc/WidgetUiWindowManager.h	Thu Dec 17 09:20:16 2009 +0200
+++ b/widgets/widgetapp/inc/WidgetUiWindowManager.h	Thu Jan 07 13:31:38 2010 +0200
@@ -236,7 +236,15 @@
         void HandleOOMEventL( TBool aForeground );
 
 // Utility stuff.
-
+        /**
+        * ExitNow
+        * Exits the AppUi
+        * @since 5.0
+        * @param none
+        * @return none
+        */        
+        void ExitNow();
+        
         /**
         * WindowList
         * Gets the list of running windows
--- a/widgets/widgetapp/src/WidgetUiApp.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/widgets/widgetapp/src/WidgetUiApp.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -15,12 +15,12 @@
 *
 */
 
-#include    "WidgetUiApp.h"
-#include    "WidgetUiDocument.h"
-#include    "MemoryManager.h"
-#include    "widgetappdefs.rh"
-#include    <eikstart.h>
-#include <u32std.h>
+#include  "WidgetUiApp.h"
+#include  "WidgetUiDocument.h"
+#include  <MemoryManager.h>
+#include  "widgetappdefs.rh"
+#include  <eikstart.h>
+#include  <u32std.h>
 
 // EXTERNAL DATA STRUCTURES
 
--- a/widgets/widgetapp/src/WidgetUiNetworkListener.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/widgets/widgetapp/src/WidgetUiNetworkListener.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -2,7 +2,7 @@
 * Copyright (c) 2008, 2009 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
+* under the terms of the License "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
--- a/widgets/widgetapp/src/WidgetUiObserver.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/widgets/widgetapp/src/WidgetUiObserver.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -266,7 +266,7 @@
         CleanupStack::PushL( buf );
         HBufC* contentType = NULL;
         TPtrC p( NULL, 0 );
-        contentType = RecognizeLC( *iFileName, *buf );
+        contentType = RecognizeLC( *iFileName );
         aEmbeddedLinkContent.HandleResolveComplete( *contentType, p, buf );
         CleanupStack::PopAndDestroy( 2, buf ); // contentType, buf
         return ETrue;
@@ -442,19 +442,25 @@
 // CWidgetUiObserver::RecognizeL
 // -----------------------------------------------------------------------------
 //
-HBufC* CWidgetUiObserver::RecognizeLC( const TDesC& aFileName, const TDesC8& aData )
+HBufC* CWidgetUiObserver::RecognizeLC( const TDesC& aFileName )
     {
     TDataRecognitionResult dataType;
     RApaLsSession apaSession;
     TInt ret;
+    
+    RFile file;
+    User::LeaveIfError( file.Open(CCoeEnv::Static()->FsSession(), aFileName, EFileRead|EFileShareAny) );
+    CleanupClosePushL( file );
 
     CleanupClosePushL(apaSession);
     User::LeaveIfError( apaSession.Connect() );
 
     // Ask the application architecture to find the file type
-    ret = apaSession.RecognizeData( aFileName, aData, dataType );
+    ret = apaSession.RecognizeData( file, dataType );
     apaSession.Close();
+    
     CleanupStack::PopAndDestroy(1, &apaSession);
+    CleanupStack::PopAndDestroy( &file );
     
     TPtrC8 mimeTypePtr = dataType.iDataType.Des8();
     TInt len = mimeTypePtr.Length() + 1;
--- a/widgets/widgetapp/src/WidgetUiWindow.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/widgets/widgetapp/src/WidgetUiWindow.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -21,7 +21,7 @@
 #include "WidgetUiWindowContainer.h"
 #include "WidgetUiWindowManager.h"
 #include "WidgetUiDialogsProviderProxy.h"
-#include "widgetregistryconstants.h"
+#include <widgetregistryconstants.h>
 #include "browser_platform_variant.hrh"
 #ifdef BRDO_WRT_HS_FF
 #include "cpspublisher.h"
@@ -42,7 +42,6 @@
 #include <aknsdrawutils.h>
 #include "SWInstWidgetUid.h"
 
-
 // EXTERNAL DATA STRUCTURES
 
 // EXTERNAL FUNCTION PROTOTYPES
@@ -194,8 +193,10 @@
 
     iDlId = 0;
 
+    iNeedToNotifyNetworkState = EFalse;
     // determine initial widget online/offline network state
     DetermineNetworkState();
+    iAsyncCallBack = new (ELeave) CAsyncCallBack(TCallBack(DeleteItself,this),CActive::EPriorityUserInput);
     }
 
 // -----------------------------------------------------------------------------
@@ -220,10 +221,20 @@
     delete iLeftSoftKeyLabel;
     delete iWidgetUiDialogsProviderProxy;
     delete iSchemeHandler;
-    delete iMiniviewBitmap;
+    
+    iActiveMiniviewBitmap = 0;
+    iMiniviewBitmap1.Reset();
+    iMiniviewBitmap2.Reset();
+    
 #ifdef BRDO_WRT_HS_FF
     delete iNetworkModeWait;
 #endif
+    if(iAsyncCallBack)
+        {
+        iAsyncCallBack->Cancel();
+        }
+    delete iAsyncCallBack;
+    iAsyncCallBack=NULL;    
     }
 
 // -----------------------------------------------------------------------------
@@ -613,6 +624,9 @@
         {
         Engine()->MakeVisible( ETrue );
         }
+    PublishSnapShot();
+    if(iWidgetLoaded && iNeedToNotifyNetworkState)
+        DetermineNetworkState();
     }
 
 // -----------------------------------------------------------------------------
@@ -627,16 +641,18 @@
         {
 #ifdef BRDO_WRT_HS_FF
 
-        if ( !iMiniviewBitmap )
+        if ( iCpsPublisher)
             {
-            iMiniviewBitmap = new CFbsBitmap();
-            }
-
-        if ( iMiniviewBitmap && iCpsPublisher)
-            {
+            // Swap bitmaps
+            if(iActiveMiniviewBitmap == &iMiniviewBitmap1)
+            	iActiveMiniviewBitmap = &iMiniviewBitmap2;
+            else
+            	iActiveMiniviewBitmap = &iMiniviewBitmap1;
+            
+            // Take snapshot and publish	
             TRAP_IGNORE(
-               (iEngine->TakeSnapshotL( *iMiniviewBitmap ));
-                iCpsPublisher->PublishBitmapL( *iMiniviewBitmap, *iWidgetBundleId );
+               (iEngine->TakeSnapshotL( *iActiveMiniviewBitmap ));
+                iCpsPublisher->PublishBitmapL( *iActiveMiniviewBitmap, *iWidgetBundleId );
                 );
             }
 #endif
@@ -810,6 +826,13 @@
                     iWindowManager.GetConnection()->SetRequestedAP( iap );
                 );
             }
+
+        if ( EBrowserCenRepApSelModeAlwaysAsk == ask )
+            {
+              //Always ask case
+              TUint32 ap( 0 );
+              iWindowManager.GetConnection()->SetRequestedAP( ap );
+            }
         }
     }
 
@@ -825,11 +848,21 @@
     if ( !iWindowManager.GetConnection()->Connected() )
         {
         // 2.2. make a connection
-        TInt connFailure = iWindowManager.GetConnection()->StartConnectionL( ETrue );
+        iConnecting=ETrue;
+        TInt connFailure = 0;
+        TRAPD(err, connFailure=iWindowManager.GetConnection()->StartConnectionL( ETrue ));
+        iConnecting=EFalse;
+        User::LeaveIfError(err);
+        if(iDeleteItself)
+            iAsyncCallBack->CallBack();
         if (KErrCancel == connFailure)
             {
 #ifdef BRDO_WRT_HS_FF
-            iCpsPublisher->NetworkConnectionCancelledL();
+            if(! (EMiniViewEnabled == WidgetMiniViewState() || 
+                  EMiniViewNotEnabled == WidgetMiniViewState()) )
+                {        
+                iCpsPublisher->NetworkConnectionCancelledL();
+                }
 #endif
             User::Leave( connFailure );
             }
@@ -1121,7 +1154,7 @@
     {
     TNetworkState currNetState;
     RWidgetRegistryClientSession& widgetRegistry = iWindowManager.WidgetUIClientSession();
-    TInt inMiniView = widgetRegistry.IsWidgetInMiniView( iUid);
+    TInt inMiniView = !(WidgetMiniViewState()==EMiniViewEnabled || WidgetMiniViewState()==EMiniViewNotEnabled);//widgetRegistry.IsWidgetInMiniView( iUid);
     CWidgetPropertyValue* propValue = widgetRegistry.GetWidgetPropertyValueL( iUid, EAllowNetworkAccess );
     TInt netAccessWdgtProp = *propValue;    // AllowNetworkAccess in the info.plist file
 
@@ -1183,4 +1216,38 @@
             }
         }
     }
+
+// -----------------------------------------------------------------------------
+// CWidgetUiWindow::NeedToNotifyNetworkState()
+// -----------------------------------------------------------------------------
+//
+void CWidgetUiWindow::NeedToNotifyNetworkState(TBool aNetworkState)
+    {
+    iNeedToNotifyNetworkState = aNetworkState;
+    }
+
+// -----------------------------------------------------------------------------
+// CWidgetUiWindow::CanBeDeleted()
+// -----------------------------------------------------------------------------
+//
+TBool CWidgetUiWindow::CanBeDeleted()
+    {
+    iDeleteItself = iConnecting;
+    return !iConnecting;
+    }
+    
+// -----------------------------------------------------------------------------
+// CWidgetUiWindow::DeleteItself()
+// -----------------------------------------------------------------------------
+//
+TInt CWidgetUiWindow::DeleteItself(TAny* aPtr)
+    {
+    CWidgetUiWindow* self = (CWidgetUiWindow*)aPtr;
+    CWidgetUiWindowManager* p = &self->iWindowManager;
+    delete self;
+    if(p->WindowListCount() == 0)
+        p->ExitNow();
+    return 0;
+    }
+
 // End of file
--- a/widgets/widgetapp/src/WidgetUiWindowManager.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/widgets/widgetapp/src/WidgetUiWindowManager.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -202,6 +202,9 @@
 //
 CWidgetUiWindowManager::~CWidgetUiWindowManager()
     {
+    if( iDialogsProvider)
+        iDialogsProvider->CancelAll();
+    iActiveFsWindow = NULL;
     iWindowList.ResetAndDestroy();
     
     delete iNetworkListener;
@@ -351,7 +354,10 @@
                     wdgt_window->NetworkModeWait()->AsyncStop();
                     }
 #endif
-                wdgt_window->DetermineNetworkState();
+                if(wdgt_window->IsWidgetLoaded())
+                    wdgt_window->DetermineNetworkState();
+                else
+                    wdgt_window->NeedToNotifyNetworkState(ETrue);
                 }
             }
             break;
@@ -370,21 +376,23 @@
                 // if no full view widgets open, then close the network connection
                 if ( ( !FullViewWidgetsOpen() ) && ( iConnection->Connected() ) )
                     {
+                    TRAP_IGNORE( wdgt_window->Engine()->HandleCommandL( 
+                            (TInt)TBrCtlDefs::ECommandIdBase +
+                            (TInt)TBrCtlDefs::ECommandCancelFetch ) );
+                    
                     wdgt_window->Engine()->HandleCommandL( 
                             (TInt)TBrCtlDefs::ECommandIdBase +
                             (TInt)TBrCtlDefs::ECommandDisconnect );
+                    iConnection->CancelConnection();
                     iConnection->StopConnectionL();
                     }
-                wdgt_window->DetermineNetworkState();
+                if(wdgt_window->IsWidgetLoaded())
+                    wdgt_window->DetermineNetworkState();
+                else
+                    wdgt_window->NeedToNotifyNetworkState(ETrue);
                 }
             }
-            break;
-       case WidgetRestart:
-           {
-           OpenOrCreateWindowL( aUid, LaunchMiniview );
-           ResumeWidgetL( aUid );
-           }
-           break;
+            break; 
         }
     if(needToNotify)
     // Widget is up and running, notify that next one can be launched    
@@ -639,16 +647,21 @@
             (TInt)TBrCtlDefs::ECommandCancelFetch ) );   
     if ( lastOne )
         {
-        TRAP_IGNORE( aWidgetWindow->Engine()->HandleCommandL( 
-                (TInt)TBrCtlDefs::ECommandIdBase +
-                (TInt)TBrCtlDefs::ECommandDisconnect ) );
-
-        delete aWidgetWindow;
-        return ETrue;
+        if(aWidgetWindow->CanBeDeleted())
+            {
+            TRAP_IGNORE( aWidgetWindow->Engine()->HandleCommandL( 
+                    (TInt)TBrCtlDefs::ECommandIdBase +
+                    (TInt)TBrCtlDefs::ECommandDisconnect ) );
+            iConnection->CancelConnection(); 
+            iConnection->StopConnectionL();
+            delete aWidgetWindow;
+            return ETrue;
+            }
         }
     else
         {
-        delete aWidgetWindow;
+        if(aWidgetWindow->CanBeDeleted())
+            delete aWidgetWindow;
         }
     return EFalse;
     }
@@ -748,6 +761,7 @@
     if ( window == iActiveFsWindow )
         {
         //make the active window NULL and also CurrentWindow as False
+        iActiveFsWindow->SetCurrentWindow(EFalse);
         iActiveFsWindow->SetIsCurrentWindow(EFalse);
         iActiveFsWindow = NULL;        
         }        
@@ -862,6 +876,8 @@
         }
     else
         {
+        if(iDialogsProvider)
+            iDialogsProvider->CancelAll();
         HideWindow( iActiveFsWindow );
         }
     }
@@ -1308,7 +1324,16 @@
    TInt nWidgetsCount = iWindowList.Count();  
        for ( TInt i = (nWidgetsCount-1); i >= 0; i-- )  
            {  
-           CWidgetUiWindow* window = iWindowList[i];    
+           CWidgetUiWindow* window = iWindowList[i];   
+           TRAP_IGNORE( window->Engine()->HandleCommandL( 
+                   (TInt)TBrCtlDefs::ECommandIdBase +
+                   (TInt)TBrCtlDefs::ECommandCancelFetch ) ); 
+           if(i == 0)
+               TRAP_IGNORE( window->Engine()->HandleCommandL( 
+                       (TInt)TBrCtlDefs::ECommandIdBase +
+                       (TInt)TBrCtlDefs::ECommandDisconnect ) );
+                       iConnection->CancelConnection();
+                       iConnection->StopConnectionL();
            delete window;  
            }  
    iWindowList.Reset();
@@ -1341,6 +1366,12 @@
     return EFalse;
     }
 
+
+void CWidgetUiWindowManager::ExitNow()
+    {
+    iAppUi.Exit();
+    }
+
 CRequestRAM::CRequestRAM(CWidgetUiWindowManager* aWidgetUiWindowManager, const TUid& aUid, TUint32 aOperation):
     CActive( EPriorityStandard ),
     iOperation(aOperation),
@@ -1380,6 +1411,7 @@
     if(iStatus >= 0)
         {        
         iWidgetUiWindowManager->OpenOrCreateWindowL( iUid, LaunchMiniview );
+        iWidgetUiWindowManager->GetWindow(iUid)->NeedToNotifyNetworkState(ETrue);
         iWidgetUiWindowManager->ResumeWidgetL( iUid );
         iWidgetUiWindowManager->GetWindow(iUid)->SetTime();
 #ifdef OOM_WIDGET_CLOSEALL        
--- a/widgets/widgetapp/src/WidgetUiWindowView.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/widgets/widgetapp/src/WidgetUiWindowView.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -323,6 +323,13 @@
 
     TBool visible(iStatusPaneVisible);
 
+    // non-touch: always show status pane in landscape if softkeys are visible
+    if (!visible && Cba()->IsVisible() &&
+        AknLayoutUtils::CbaLocation() != AknLayoutUtils::EAknCbaLocationBottom)
+        {
+        visible = ETrue;
+        }
+
     StatusPane()->MakeVisible(visible);
 
     if (visible && StatusPane()->CurrentLayoutResId() != R_AVKON_STATUS_PANE_LAYOUT_USUAL_FLAT)
--- a/widgets/widgetapp/src/cpspublisher.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/widgets/widgetapp/src/cpspublisher.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -72,6 +72,7 @@
 _LIT( KWRTPublisher, "wrt_publisher");
 
 const TInt KSkinGfxInnerRectShrink = 5;
+const TUint KDisablePersist = 0x1000;
 
 static void DoResetAndDestroy( TAny* aPtr )
     {
@@ -455,7 +456,7 @@
        
     inparam.AppendL( item );
     
-    iCpsInterface->ExecuteCmdL( KAdd , inparam, outparam);
+    iCpsInterface->ExecuteCmdL( KAdd , inparam, outparam, KDisablePersist);
     
  
     CleanupStack::PopAndDestroy(); // item
--- a/widgets/widgetinstaller/data/WidgetInstallerUI.rss	Thu Dec 17 09:20:16 2009 +0200
+++ b/widgets/widgetinstaller/data/WidgetInstallerUI.rss	Thu Jan 07 13:31:38 2010 +0200
@@ -26,7 +26,7 @@
 #include <avkon.rh>
 #include <avkon.mbg>
 #include <avkon.loc>
-#include <WidgetInstallerUI.loc>
+#include <widgetinstallerui.loc>
 
 RESOURCE RSS_SIGNATURE { }
 
--- a/widgets/widgetinstaller/group/WidgetInstallerUI.mmp	Thu Dec 17 09:20:16 2009 +0200
+++ b/widgets/widgetinstaller/group/WidgetInstallerUI.mmp	Thu Jan 07 13:31:38 2010 +0200
@@ -62,7 +62,7 @@
 USERINCLUDE     ../../../Inc
 
 MW_LAYER_SYSTEMINCLUDE
-MW_LAYER_LIBC_SYSTEMINCLUDE
+OS_LAYER_ESTLIB_SYSTEMINCLUDE
 
 // Libraries
 LIBRARY         euser.lib
--- a/widgets/widgetinstaller/group/bld.inf	Thu Dec 17 09:20:16 2009 +0200
+++ b/widgets/widgetinstaller/group/bld.inf	Thu Jan 07 13:31:38 2010 +0200
@@ -25,7 +25,7 @@
 
 PRJ_EXPORTS
 // export localization files
-../loc/WidgetInstallerUI.loc  MW_LAYER_LOC_EXPORT_PATH(WidgetInstallerUI.loc)
+../loc/widgetinstallerui.loc  MW_LAYER_LOC_EXPORT_PATH(widgetinstallerui.loc)
 
 // If EKA2 Kernel Architecture is supported, assume S60 3rd Edition Platform
 
--- a/widgets/widgetinstaller/src/WidgetUIOperationsWatcher.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/widgets/widgetinstaller/src/WidgetUIOperationsWatcher.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -29,6 +29,7 @@
 #include <SWInstLogTaskParam.h>
 #include <apacmdln.h>
 #include <s32mem.h>
+#include <e32property.h>
 
 #include <widgetappdefs.rh>
 #include "WidgetUIOperationsWatcher.h"
@@ -60,6 +61,14 @@
 // removable memory cards means that drive letters may change.
 
 
+static void NotifyCommandHandled()
+    {
+    const TUid KMyPropertyCat = { 0x10282E5A };
+    enum TMyPropertyKeys { EMyPropertyState = 109 };
+    TInt state( 3 );
+    RProperty::Set( KMyPropertyCat, EMyPropertyState , state );
+    }
+
 using namespace SwiUI;
 
 // =========================== MEMBER FUNCTIONS ===============================
@@ -206,6 +215,27 @@
     if ( PromptUserForInstallL( replaceExisting )
          && PromptUserForUntrustedWidgetL( ) )
         {
+        if ( replaceExisting )
+            {
+            //Runnning widget should be first closed
+            RApaLsSession apaLsSession;
+            apaLsSession.Connect();
+            TApaAppInfo info;
+            TUid aUid = TUid::Uid( *(iPropertyValues[EUid]) );
+                        
+            User::LeaveIfError( apaLsSession.GetAppInfo( info, aUid ) );
+            iWidgetName = info.iFullName;
+            HBufC *widgetName = iWidgetName.AllocLC();
+            if(iWidgetInHS)
+                NotifyCommandHandled();
+            
+            HandleWidgetCommandL(apaLsSession, *widgetName, aUid, Deactivate);
+                        
+            CleanupStack::PopAndDestroy( widgetName );
+            apaLsSession.Close();
+            }
+        
+        
         // reinitialize
         delete iMembers;
         iMembers = NULL;
@@ -447,21 +477,6 @@
         found = ETrue;
         TUid aUid = TUid::Uid( *(iPropertyValues[EUid]) );
         iWidgetInHS = iRegistry.IsWidgetInMiniView( aUid );
-        if ( iRegistry.IsWidgetRunning( aUid ) )
-            {
-            //Runnning widget should be first closed
-            RApaLsSession apaLsSession;
-            apaLsSession.Connect();
-            TApaAppInfo info;
-
-            User::LeaveIfError( apaLsSession.GetAppInfo( info, aUid ) );
-            iWidgetName = info.iFullName;
-            HBufC *widgetName = iWidgetName.AllocLC();
-            HandleWidgetCommandL(apaLsSession, *widgetName, aUid, Deactivate);
-
-            CleanupStack::PopAndDestroy( widgetName );
-            apaLsSession.Close();
-            }
         // get original install dir from registry in case user
         // decides to "overrite" to another memory location
         iOriginalDir = *( iRegistry.GetWidgetPropertyValueL(
@@ -759,7 +774,6 @@
 
         // TODO if registration steps fail does it leave inconsistent state???
 
-        iRegistry.RegisterWidgetL( iPropertyValues );
 
         iAppManager->RegisterWidgetL( *(iPropertyValues[EMainHTML]),
                                       *(iPropertyValues[EBundleDisplayName]),
@@ -767,21 +781,14 @@
                                       *(iPropertyValues[EDriveName]),
                                       TUid::Uid( *(iPropertyValues[EUid]) ) );
 
+        iRegistry.RegisterWidgetL( iPropertyValues );
+
+
+
         if ( iOverwriting )
             {
             // delete backup
-            (void)iFileMgr->RmDir( iBackupDir );
-            if ( iWidgetInHS )
-                {
-                RApaLsSession apaLsSession;
-                apaLsSession.Connect();
-
-                HBufC* widgetName = iWidgetName.AllocLC();
-                HandleWidgetCommandL(apaLsSession, *widgetName, TUid::Uid( *(iPropertyValues[EUid]) ), WidgetRestart);
-                CleanupStack::PopAndDestroy( widgetName );
-
-                apaLsSession.Close();
-                }
+            (void)iFileMgr->RmDir( iBackupDir );            
             }
         if ( !iSilent )
             {
--- a/widgets/widgetlauncher/group/bld.inf	Thu Dec 17 09:20:16 2009 +0200
+++ b/widgets/widgetlauncher/group/bld.inf	Thu Jan 07 13:31:38 2010 +0200
@@ -15,9 +15,8 @@
 *
 */
 
-
 PRJ_PLATFORMS
-DEFAULT GCCE
+DEFAULT
 
 PRJ_EXPORTS
 
--- a/widgets/widgetlauncher/src/WidgetLauncher.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/widgets/widgetlauncher/src/WidgetLauncher.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -31,7 +31,9 @@
 #include <APGTASK.H>
 #include <oommonitorsession.h>
 #include <e32property.h>
+#ifndef FF_OOM_MONITOR2_COMPONENT 
 #include <systemwarninglevels.hrh>
+#endif
 #include "browser_platform_variant.hrh"
 
 // CONSTANTS
--- a/widgets/widgetrecognizer/data/10282820.rss	Thu Dec 17 09:20:16 2009 +0200
+++ b/widgets/widgetrecognizer/data/10282820.rss	Thu Jan 07 13:31:38 2010 +0200
@@ -16,7 +16,7 @@
 */
 
 
-#include <RegistryInfo.rh>
+#include <ecom/registryinfo.rh>
 RESOURCE REGISTRY_INFO r_registry
 {
 	dll_uid = 0x10282820; 	// Should match the name of this file
--- a/widgets/widgetrecognizer/group/WidgetRecognizer.mmp	Thu Dec 17 09:20:16 2009 +0200
+++ b/widgets/widgetrecognizer/group/WidgetRecognizer.mmp	Thu Jan 07 13:31:38 2010 +0200
@@ -15,7 +15,6 @@
 *
 */
 
-
 #include <platform_paths.hrh>
 #include <platform/mw/browser_platform_variant.hrh>
 
@@ -25,23 +24,20 @@
 
 CAPABILITY CAP_ECOM_PLUGIN 
 
-
 SOURCEPATH      ../Data
 
 START RESOURCE  10282820.rss
 TARGET          WidgetRecognizer.rsc
 END
 
-
 VENDORID        VID_DEFAULT
 
 SOURCEPATH      ../src
 SOURCE           WidgetRecognizer.cpp
 
 USERINCLUDE     ../inc
+
 MW_LAYER_SYSTEMINCLUDE
-MW_LAYER_ECOM_SYSTEMINCLUDE
-
 
 LIBRARY         EUSER.LIB 
 LIBRARY         APMIME.LIB
--- a/widgets/widgetrecognizer/src/WidgetRecognizer.cpp	Thu Dec 17 09:20:16 2009 +0200
+++ b/widgets/widgetrecognizer/src/WidgetRecognizer.cpp	Thu Jan 07 13:31:38 2010 +0200
@@ -16,7 +16,7 @@
 */
 
 #include "WidgetRecognizer.h"
-#include "ImplementationProxy.h"
+#include <ecom/implementationproxy.h>
 
 // CONSTANTS
 _LIT(KWidgetExtension, ".wgz");
--- a/widgets/widgetstartup/Group/Bld.inf	Thu Dec 17 09:20:16 2009 +0200
+++ b/widgets/widgetstartup/Group/Bld.inf	Thu Jan 07 13:31:38 2010 +0200
@@ -15,11 +15,8 @@
 *
 */
 
-
-
 PRJ_PLATFORMS
 DEFAULT
 
 PRJ_MMPFILES
-
 WidgetStartup.mmp