# HG changeset patch
# User Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
# Date 1261034416 -7200
# Node ID 0ed94ceaa3775d66a09c6b6098d33a4018589588
# Parent  9a9a761f03f1c825af8873c7d7cef83b4e23fa16
Revision: 200948
Kit: 200951

diff -r 9a9a761f03f1 -r 0ed94ceaa377 brdo.layers.sysdef.xml
--- a/brdo.layers.sysdef.xml	Tue Nov 24 09:02:20 2009 +0200
+++ b/brdo.layers.sysdef.xml	Thu Dec 17 09:20:16 2009 +0200
@@ -48,7 +48,7 @@
       <module name="webengine">
         <unit unitID="cache" name="cache" bldFile="&layer_real_source_path;/webengine/osswebengine/cache/group" mrp=""/>
         <unit unitID="memorymanager" name="memorymanager" bldFile="&layer_real_source_path;/webengine/osswebengine/MemoryManager/group" mrp=""/>
-        <unit unitID="javascriptcore" name="javascriptcore" bldFile="&layer_real_source_path;/webengine/osswebengine/WebKit/S60/group/JavaScriptCore" mrp=""/>
+        <unit unitID="javascriptcore" name="javascriptcore" bldFile="&layer_real_source_path;/webengine/osswebengine/webkit/s60/group/JavaScriptCore" mrp=""/>
         <unit unitID="npscript" name="npscript" bldFile="&layer_real_source_path;/webengine/osswebengine/npscript/group" mrp=""/>
         <unit unitID="webkitutils" name="webkitutils" bldFile="&layer_real_source_path;/webengine/webkitutils/group" mrp=""/>
         <unit unitID="pagescaler" name="pagescaler" bldFile="&layer_real_source_path;/webengine/pagescaler/group" mrp=""/>
@@ -56,23 +56,23 @@
         <unit unitID="widgetregistry" name="widgetregistry" bldFile="&layer_real_source_path;/webengine/widgetregistry/group" mrp=""/>
         <unit unitID="webkit_libxml2" name="webkit_libxml2" bldFile="&layer_real_source_path;/webengine/osswebengine/webkit/s60/group/libxml2" mrp=""/>
         <component name="webcore">
-          <unit unitID="webcore_derivedsources" name="webcore_derivedsources" bldFile="&layer_real_source_path;/webengine/osswebengine/WebKit/S60/group/webcore/DerivedSources" mrp=""/>
-          <unit unitID="webcore_bindings" name="webcore_bindings" bldFile="&layer_real_source_path;/webengine/osswebengine/WebKit/S60/group/webcore/bindings" mrp=""/>
-          <unit unitID="webcore_webcorecss" name="webcore_webcorecss" bldFile="&layer_real_source_path;/webengine/osswebengine/WebKit/S60/group/webcore/webcorecss" mrp=""/>
-          <unit unitID="webcore_dom" name="webcore_dom" bldFile="&layer_real_source_path;/webengine/osswebengine/WebKit/S60/group/webcore/dom" mrp=""/>
-          <unit unitID="webcore_editing" name="webcore_editing" bldFile="&layer_real_source_path;/webengine/osswebengine/WebKit/S60/group/webcore/editing" mrp=""/>
-          <unit unitID="webcore_history" name="webcore_history" bldFile="&layer_real_source_path;/webengine/osswebengine/WebKit/S60/group/webcore/history" mrp=""/>
-          <unit unitID="webcore_html" name="webcore_html" bldFile="&layer_real_source_path;/webengine/osswebengine/WebKit/S60/group/webcore/html" mrp=""/>
-          <unit unitID="webcore_loader" name="webcore_loader" bldFile="&layer_real_source_path;/webengine/osswebengine/WebKit/S60/group/webcore/loader" mrp=""/>
-          <unit unitID="webcore_page" name="webcore_page" bldFile="&layer_real_source_path;/webengine/osswebengine/WebKit/S60/group/webcore/page" mrp=""/>
-          <unit unitID="webcore_rendering" name="webcore_rendering" bldFile="&layer_real_source_path;/webengine/osswebengine/WebKit/S60/group/webcore/rendering" mrp=""/>
-          <unit unitID="webcore_xml" name="webcore_xml" bldFile="&layer_real_source_path;/webengine/osswebengine/WebKit/S60/group/webcore/xml" mrp=""/>
-          <unit unitID="webcore_bridge" name="webcore_bridge" bldFile="&layer_real_source_path;/webengine/osswebengine/WebKit/S60/group/webcore/bridge" mrp=""/>
-          <unit unitID="webcore_platform" name="webcore_platform" bldFile="&layer_real_source_path;/webengine/osswebengine/WebKit/S60/group/webcore/platform" mrp=""/>
+          <unit unitID="webcore_derivedsources" name="webcore_derivedsources" bldFile="&layer_real_source_path;/webengine/osswebengine/webkit/s60/group/webcore/DerivedSources" mrp=""/>
+          <unit unitID="webcore_bindings" name="webcore_bindings" bldFile="&layer_real_source_path;/webengine/osswebengine/webkit/s60/group/webcore/bindings" mrp=""/>
+          <unit unitID="webcore_webcorecss" name="webcore_webcorecss" bldFile="&layer_real_source_path;/webengine/osswebengine/webkit/s60/group/webcore/webcorecss" mrp=""/>
+          <unit unitID="webcore_dom" name="webcore_dom" bldFile="&layer_real_source_path;/webengine/osswebengine/webkit/s60/group/webcore/dom" mrp=""/>
+          <unit unitID="webcore_editing" name="webcore_editing" bldFile="&layer_real_source_path;/webengine/osswebengine/webkit/s60/group/webcore/editing" mrp=""/>
+          <unit unitID="webcore_history" name="webcore_history" bldFile="&layer_real_source_path;/webengine/osswebengine/webkit/s60/group/webcore/history" mrp=""/>
+          <unit unitID="webcore_html" name="webcore_html" bldFile="&layer_real_source_path;/webengine/osswebengine/webkit/s60/group/webcore/html" mrp=""/>
+          <unit unitID="webcore_loader" name="webcore_loader" bldFile="&layer_real_source_path;/webengine/osswebengine/webkit/s60/group/webcore/loader" mrp=""/>
+          <unit unitID="webcore_page" name="webcore_page" bldFile="&layer_real_source_path;/webengine/osswebengine/webkit/s60/group/webcore/page" mrp=""/>
+          <unit unitID="webcore_rendering" name="webcore_rendering" bldFile="&layer_real_source_path;/webengine/osswebengine/webkit/s60/group/webcore/rendering" mrp=""/>
+          <unit unitID="webcore_xml" name="webcore_xml" bldFile="&layer_real_source_path;/webengine/osswebengine/webkit/s60/group/webcore/xml" mrp=""/>
+          <unit unitID="webcore_bridge" name="webcore_bridge" bldFile="&layer_real_source_path;/webengine/osswebengine/webkit/s60/group/webcore/bridge" mrp=""/>
+          <unit unitID="webcore_platform" name="webcore_platform" bldFile="&layer_real_source_path;/webengine/osswebengine/webkit/s60/group/webcore/platform" mrp=""/>
         </component>
-        <unit unitID="webkit_plugins" name="webkit_plugins" bldFile="&layer_real_source_path;/webengine/osswebengine/WebKit/S60/group/plugins" mrp=""/>
-        <unit unitID="webkit_webkit" name="webkit_webkit" bldFile="&layer_real_source_path;/webengine/osswebengine/WebKit/S60/group/webkit" mrp=""/>
-        <unit unitID="webkit_browserengine" name="webkit_browserengine" bldFile="&layer_real_source_path;/webengine/osswebengine/WebKit/S60/group/browserengine" mrp=""/>
+        <unit unitID="webkit_plugins" name="webkit_plugins" bldFile="&layer_real_source_path;/webengine/osswebengine/webkit/s60/group/plugins" mrp=""/>
+        <unit unitID="webkit_webkit" name="webkit_webkit" bldFile="&layer_real_source_path;/webengine/osswebengine/webkit/s60/group/webkit" mrp=""/>
+        <unit unitID="webkit_browserengine" name="webkit_browserengine" bldFile="&layer_real_source_path;/webengine/osswebengine/webkit/s60/group/browserengine" mrp=""/>
         <component name="wmlengine">
         <unit unitID="wmlengine_adt" name="wmlengine_adt" bldFile="&layer_real_source_path;/webengine/wmlengine/group/adt" mrp=""/>
           <unit unitID="wmlengine_css" name="wmlengine_css" bldFile="&layer_real_source_path;/webengine/wmlengine/group/css" mrp=""/>
diff -r 9a9a761f03f1 -r 0ed94ceaa377 browserutilities/aiwbrowserprovider/Group/AiwBrowserProvider.mmp
--- a/browserutilities/aiwbrowserprovider/Group/AiwBrowserProvider.mmp	Tue Nov 24 09:02:20 2009 +0200
+++ b/browserutilities/aiwbrowserprovider/Group/AiwBrowserProvider.mmp	Thu Dec 17 09:20:16 2009 +0200
@@ -19,7 +19,7 @@
 
 #include <data_caging_paths.hrh>
 #include <platform_paths.hrh>
-#include <platform/mw/Browser_platform_variant.hrh>
+#include <platform/mw/browser_platform_variant.hrh>
 
 TARGET      AiwBrowserProvider.dll
 TARGETTYPE      PLUGIN
diff -r 9a9a761f03f1 -r 0ed94ceaa377 browserutilities/aiwbrowserprovider/Group/bld.inf
--- a/browserutilities/aiwbrowserprovider/Group/bld.inf	Tue Nov 24 09:02:20 2009 +0200
+++ b/browserutilities/aiwbrowserprovider/Group/bld.inf	Thu Dec 17 09:20:16 2009 +0200
@@ -19,7 +19,7 @@
 
 
 #include <platform_paths.hrh>
-#include "../../../web_plat/browser_platform_api/inc/Browser_platform_variant.hrh"
+#include "../../../web_plat/browser_platform_api/inc/browser_platform_variant.hrh"
 
 PRJ_PLATFORMS
 DEFAULT
diff -r 9a9a761f03f1 -r 0ed94ceaa377 browserutilities/aiwbrowserprovider/data/AiwBrowserProvider.rss
--- a/browserutilities/aiwbrowserprovider/data/AiwBrowserProvider.rss	Tue Nov 24 09:02:20 2009 +0200
+++ b/browserutilities/aiwbrowserprovider/data/AiwBrowserProvider.rss	Thu Dec 17 09:20:16 2009 +0200
@@ -30,7 +30,7 @@
 #include <avkon.loc>
 #include <avkonsct.loc>
 
-#include "AiwBrowserCommands.hrh"
+#include "aiwbrowsercommands.hrh"
 #include <AiwBrowserProvider.loc>
 //  RESOURCE DEFINITIONS 
 // -----------------------------------------------------------------------------
diff -r 9a9a761f03f1 -r 0ed94ceaa377 browserutilities/aiwbrowserprovider/src/AiwBrowserProviderOpenUrl.cpp
--- a/browserutilities/aiwbrowserprovider/src/AiwBrowserProviderOpenUrl.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/browserutilities/aiwbrowserprovider/src/AiwBrowserProviderOpenUrl.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -30,8 +30,8 @@
 #include <aknnotewrappers.h> 
 #include <AknNoteDialog.h>
 #include <apgcli.h>
-#include <FavouritesLimits.h>
-#include "AiwBrowserCommands.hrh"
+#include <favouriteslimits.h>
+#include "aiwbrowsercommands.hrh"
 #include "logger.h"
 
 // LOCAL CONSTANTS AND MACROS
diff -r 9a9a761f03f1 -r 0ed94ceaa377 browserutilities/aiwbrowserprovider/src/AiwBrowserProviderSaveUrl.cpp
--- a/browserutilities/aiwbrowserprovider/src/AiwBrowserProviderSaveUrl.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/browserutilities/aiwbrowserprovider/src/AiwBrowserProviderSaveUrl.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -28,10 +28,10 @@
 #include <data_caging_path_literals.hrh>  
 #include <aknnotewrappers.h> 
 #include <AknNoteDialog.h>
-#include <FavouritesDb.h>
+#include <favouritesdb.h>
 #include <e32std.h>
 
-#include "AiwBrowserCommands.hrh"
+#include "aiwbrowsercommands.hrh"
 #include "logger.h"
 
 // LOCAL CONSTANTS AND MACROS
diff -r 9a9a761f03f1 -r 0ed94ceaa377 browserutilities/browserdialogsprovider/Group/bld.inf
--- a/browserutilities/browserdialogsprovider/Group/bld.inf	Tue Nov 24 09:02:20 2009 +0200
+++ b/browserutilities/browserdialogsprovider/Group/bld.inf	Thu Dec 17 09:20:16 2009 +0200
@@ -18,7 +18,7 @@
 */
 
 #include <platform_paths.hrh>
-#include "../../../web_plat/browser_platform_api/inc/Browser_platform_variant.hrh"
+#include "../../../web_plat/browser_platform_api/inc/browser_platform_variant.hrh"
 
 PRJ_PLATFORMS
 
diff -r 9a9a761f03f1 -r 0ed94ceaa377 browserutilities/browserdialogsprovider/Group/browserdialogsprovider.mmp
--- a/browserutilities/browserdialogsprovider/Group/browserdialogsprovider.mmp	Tue Nov 24 09:02:20 2009 +0200
+++ b/browserutilities/browserdialogsprovider/Group/browserdialogsprovider.mmp	Thu Dec 17 09:20:16 2009 +0200
@@ -18,7 +18,7 @@
 
 #include <data_caging_paths.hrh>
 #include <platform_paths.hrh>
-#include <platform/mw/Browser_platform_variant.hrh>
+#include <platform/mw/browser_platform_variant.hrh>
 
 TARGET          browserdialogsprovider.dll
 EPOCSTACKSIZE   0x5000
diff -r 9a9a761f03f1 -r 0ed94ceaa377 browserutilities/browserdialogsprovider/Inc/BrowserSelectElementDlg.h
--- a/browserutilities/browserdialogsprovider/Inc/BrowserSelectElementDlg.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/browserutilities/browserdialogsprovider/Inc/BrowserSelectElementDlg.h	Thu Dec 17 09:20:16 2009 +0200
@@ -25,7 +25,7 @@
 // User includes
 
 // System includes
-#include <BrCtlDialogsProvider.h>
+#include <brctldialogsprovider.h>
 
 #include <aknpopup.h>
 #include <aknlists.h>
diff -r 9a9a761f03f1 -r 0ed94ceaa377 browserutilities/browserdialogsprovider/Inc/BrowserSelectElementItemDrawer.h
--- a/browserutilities/browserdialogsprovider/Inc/BrowserSelectElementItemDrawer.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/browserutilities/browserdialogsprovider/Inc/BrowserSelectElementItemDrawer.h	Thu Dec 17 09:20:16 2009 +0200
@@ -20,7 +20,7 @@
 #define CBROWSERSELECTELEMENTITEMDRAWER_H
 
 // INCLUDES
-#include "BrCtlDialogsProvider.h"
+#include "brctldialogsprovider.h"
 
 #include <aknlists.h>
 #include <avkon.mbg>
diff -r 9a9a761f03f1 -r 0ed94ceaa377 browserutilities/browserdialogsprovider/Inc/BrowserSelectElementListBox.h
--- a/browserutilities/browserdialogsprovider/Inc/BrowserSelectElementListBox.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/browserutilities/browserdialogsprovider/Inc/BrowserSelectElementListBox.h	Thu Dec 17 09:20:16 2009 +0200
@@ -22,7 +22,7 @@
 
 //  INCLUDES
 #include <aknlists.h>
-#include <BrCtlDialogsProvider.h>
+#include <brctldialogsprovider.h>
 
 // CLASSES
 
diff -r 9a9a761f03f1 -r 0ed94ceaa377 browserutilities/browserdialogsprovider/Inc/BrowserViewImagesListBox.h
--- a/browserutilities/browserdialogsprovider/Inc/BrowserViewImagesListBox.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/browserutilities/browserdialogsprovider/Inc/BrowserViewImagesListBox.h	Thu Dec 17 09:20:16 2009 +0200
@@ -29,7 +29,7 @@
 #include <MdaImageConverter.h>
 
 // Browser as a Plugin includes
-#include <BrCtlDialogsProvider.h>
+#include <brctldialogsprovider.h>
 
 // FORWARD DECLARATIONS
 class CCoeControl;
diff -r 9a9a761f03f1 -r 0ed94ceaa377 browserutilities/browserdialogsprovider/Inc/BrowserViewImagesPopup.h
--- a/browserutilities/browserdialogsprovider/Inc/BrowserViewImagesPopup.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/browserutilities/browserdialogsprovider/Inc/BrowserViewImagesPopup.h	Thu Dec 17 09:20:16 2009 +0200
@@ -29,7 +29,7 @@
 #include <MdaImageConverter.h>
 
 // Browser as a Plugin includes
-#include <BrCtlDialogsProvider.h>
+#include <brctldialogsprovider.h>
 
 // FORWARD DECLARATIONS
 class CCoeControl;
diff -r 9a9a761f03f1 -r 0ed94ceaa377 browserutilities/browserdialogsprovider/Src/BrowserDialogsProvider.cpp
--- a/browserutilities/browserdialogsprovider/Src/BrowserDialogsProvider.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/browserutilities/browserdialogsprovider/Src/BrowserDialogsProvider.cpp	Thu Dec 17 09:20:16 2009 +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
@@ -61,13 +61,14 @@
 #include <BrowserDialogsProvider.rsg>
 
 // Data Caging
-#include <data_caging_path_literals.hrh>    
+#include <data_caging_path_literals.hrh>
 
 // CONSTANTS
 const TInt KBrCtlObjectElementMaxLength = 50;
 const TInt KBrCtlMBFormat = 4;
 const TInt KBrCtlGBFormat = 10;
 const TInt KBrCtlMegabyte = 1000;	// although 1MB=1024 kB, treat as 1000kb for user simplicity
+const TInt KBrowserFileNotFound  = -26003; // Defined in ErrorDefs.h but not exported so define here
 
 // DLL resource file name with path
 _LIT( KBrowserDialogsProviderDirAndFile, "z:BrowserDialogsProvider.rsc" );// resource
@@ -165,8 +166,17 @@
             }
         default:
             {
-            // Handle all others as system error dialog
-            CCoeEnv::Static()->HandleError( aErrCode );
+            // change error code to browser error code, when trying to open file
+            // that doesn't exist
+            if ( KErrNotFound == aErrCode )
+            	{
+            	iCoeEnv.HandleError( KBrowserFileNotFound );
+            	}
+            else
+            	{
+				// Handle all others as system error dialog
+            	iCoeEnv.HandleError( aErrCode );
+            	}
         	break;
             }
         }   // end of switch
diff -r 9a9a761f03f1 -r 0ed94ceaa377 browserutilities/browserdialogsprovider/Src/BrowserSelectElementItemDrawer.cpp
--- a/browserutilities/browserdialogsprovider/Src/BrowserSelectElementItemDrawer.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/browserutilities/browserdialogsprovider/Src/BrowserSelectElementItemDrawer.cpp	Thu Dec 17 09:20:16 2009 +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>
diff -r 9a9a761f03f1 -r 0ed94ceaa377 browserutilities/browserdialogsprovider/Src/BrowserUploadProgressNote.cpp
--- a/browserutilities/browserdialogsprovider/Src/BrowserUploadProgressNote.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/browserutilities/browserdialogsprovider/Src/BrowserUploadProgressNote.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -20,7 +20,7 @@
 
 // INCLUDES
 #include "BrowserUploadProgressNote.h"
-#include "BrowserDialogsProviderObserver.h"
+#include "browserdialogsproviderobserver.h"
 
 #include <BrowserDialogsProvider.rsg>
 #include <StringLoader.h>
diff -r 9a9a761f03f1 -r 0ed94ceaa377 browserutilities/browserdialogsprovider/Src/BrowserViewImagesPopup.cpp
--- a/browserutilities/browserdialogsprovider/Src/BrowserViewImagesPopup.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/browserutilities/browserdialogsprovider/Src/BrowserViewImagesPopup.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -19,7 +19,7 @@
 
 
 // USER INCLUDES
-#include "BrowserDialogsProvider.h"
+#include "browserdialogsprovider.h"
 #include "BrowserDialogsProvider.hrh"
 #include "BrowserViewImagesPopup.h"
 #include "PhotoOperationWait.h"
diff -r 9a9a761f03f1 -r 0ed94ceaa377 browserutilities/browsertelservice/group/BrowserTelService.mmp
--- a/browserutilities/browsertelservice/group/BrowserTelService.mmp	Tue Nov 24 09:02:20 2009 +0200
+++ b/browserutilities/browsertelservice/group/BrowserTelService.mmp	Thu Dec 17 09:20:16 2009 +0200
@@ -19,7 +19,7 @@
 
 #include <data_caging_paths.hrh>
 #include <platform_paths.hrh>
-#include <platform/mw/Browser_platform_variant.hrh>
+#include <platform/mw/browser_platform_variant.hrh>
 
 TARGET		BrowserTelService.dll
 TARGETTYPE	dll
diff -r 9a9a761f03f1 -r 0ed94ceaa377 browserutilities/browsertelservice/group/bld.inf
--- a/browserutilities/browsertelservice/group/bld.inf	Tue Nov 24 09:02:20 2009 +0200
+++ b/browserutilities/browsertelservice/group/bld.inf	Thu Dec 17 09:20:16 2009 +0200
@@ -15,7 +15,7 @@
 *
 */
 #include <platform_paths.hrh>
-#include "../../../web_plat/browser_platform_api/inc/Browser_platform_variant.hrh"
+#include "../../../web_plat/browser_platform_api/inc/browser_platform_variant.hrh"
 
 PRJ_PLATFORMS
 DEFAULT
diff -r 9a9a761f03f1 -r 0ed94ceaa377 browserutilities/browsertelservice/inc/BrowserTelService.h
--- a/browserutilities/browsertelservice/inc/BrowserTelService.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/browserutilities/browsertelservice/inc/BrowserTelService.h	Thu Dec 17 09:20:16 2009 +0200
@@ -31,7 +31,7 @@
 #include <f32file.h>
 #include <AknProgressDialog.h>
 #include <AknWaitDialog.h>
-#include <ConnectionObservers.h>
+#include <connectionobservers.h>
 #include <ApEngineConsts.h>
 #include <errorui.h> 
 #include <bldvariant.hrh>
diff -r 9a9a761f03f1 -r 0ed94ceaa377 browserutilities/browsertelservice/src/BrowserTelService.cpp
--- a/browserutilities/browsertelservice/src/BrowserTelService.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/browserutilities/browsertelservice/src/BrowserTelService.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -66,7 +66,7 @@
 // Const file name for make call
 #include <mmtsy_names.h>
 
-#include <BrowserUiSDKCRKeys.h>
+#include <browseruisdkcrkeys.h>
 #include <centralrepository.h>
 
 #include <nwx_status.h>
diff -r 9a9a761f03f1 -r 0ed94ceaa377 browserutilities/connectionmanager/Group/ConnectionManager.mmp
--- a/browserutilities/connectionmanager/Group/ConnectionManager.mmp	Tue Nov 24 09:02:20 2009 +0200
+++ b/browserutilities/connectionmanager/Group/ConnectionManager.mmp	Thu Dec 17 09:20:16 2009 +0200
@@ -21,7 +21,7 @@
 #include <data_caging_paths.hrh>
 #include <bldvariant.hrh>
 #include <platform_paths.hrh>
-#include <platform/mw/Browser_platform_variant.hrh>
+#include <platform/mw/browser_platform_variant.hrh>
 
 TARGET  ConnectionManager.dll
 TARGETTYPE  dll
diff -r 9a9a761f03f1 -r 0ed94ceaa377 browserutilities/connectionmanager/Group/bld.inf
--- a/browserutilities/connectionmanager/Group/bld.inf	Tue Nov 24 09:02:20 2009 +0200
+++ b/browserutilities/connectionmanager/Group/bld.inf	Thu Dec 17 09:20:16 2009 +0200
@@ -18,7 +18,7 @@
 
 
 #include <platform_paths.hrh>
-#include "../../../web_plat/browser_platform_api/inc/Browser_platform_variant.hrh"
+#include "../../../web_plat/browser_platform_api/inc/browser_platform_variant.hrh"
 
 PRJ_PLATFORMS
 DEFAULT
diff -r 9a9a761f03f1 -r 0ed94ceaa377 browserutilities/connectionmanager/Src/ConnectionObservers.cpp
--- a/browserutilities/connectionmanager/Src/ConnectionObservers.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/browserutilities/connectionmanager/Src/ConnectionObservers.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -25,7 +25,7 @@
 #include <es_enum.h>
 #include <in_sock.h>
 
-#include "ConnectionObservers.h"
+#include "connectionobservers.h"
 #include "ConnectionManagerLogger.h"
 
 
diff -r 9a9a761f03f1 -r 0ed94ceaa377 browserutilities/connectionmanager/Src/Idpair.cpp
--- a/browserutilities/connectionmanager/Src/Idpair.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/browserutilities/connectionmanager/Src/Idpair.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -21,7 +21,7 @@
 
 //User Includes
 #include <e32std.h>
-#include "IdPair.h"
+#include "idpair.h"
 //TIdPair
 EXPORT_C TIdPair::TIdPair( TUint32 aFirstPreference, TUint32 aSecondPreference ): 
 	iFirstPreference( aFirstPreference), iSecondPreference( aSecondPreference )
diff -r 9a9a761f03f1 -r 0ed94ceaa377 browserutilities/connectionmanager/Src/InternetConnectionManager.cpp
--- a/browserutilities/connectionmanager/Src/InternetConnectionManager.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/browserutilities/connectionmanager/Src/InternetConnectionManager.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -65,7 +65,7 @@
 #include <CommsDatTypeInfoV1_1.h>
 
 	//User Includes
-#include "InternetConnectionManager.h"
+#include "internetconnectionmanager.h"
 #include "connman.hrh"
 #include "connectionmanagerlogger.h"
 #include "connectionobservers.h"
diff -r 9a9a761f03f1 -r 0ed94ceaa377 browserutilities/cxmllibrary/dictionary/dict_creator.c
--- a/browserutilities/cxmllibrary/dictionary/dict_creator.c	Tue Nov 24 09:02:20 2009 +0200
+++ b/browserutilities/cxmllibrary/dictionary/dict_creator.c	Thu Dec 17 09:20:16 2009 +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 the License "Eclipse Public License v1.0"
+* under the terms of "Eclipse Public License v1.0""
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
diff -r 9a9a761f03f1 -r 0ed94ceaa377 browserutilities/cxmllibrary/group/BLD.INF
--- a/browserutilities/cxmllibrary/group/BLD.INF	Tue Nov 24 09:02:20 2009 +0200
+++ b/browserutilities/cxmllibrary/group/BLD.INF	Thu Dec 17 09:20:16 2009 +0200
@@ -16,7 +16,7 @@
 */
 
 #include <platform_paths.hrh>
-#include "../../../web_plat/browser_platform_api/inc/Browser_platform_variant.hrh"
+#include "../../../web_plat/browser_platform_api/inc/browser_platform_variant.hrh"
 
 PRJ_PLATFORMS
 DEFAULT
diff -r 9a9a761f03f1 -r 0ed94ceaa377 browserutilities/cxmllibrary/group/cXmlParser.mmp
--- a/browserutilities/cxmllibrary/group/cXmlParser.mmp	Tue Nov 24 09:02:20 2009 +0200
+++ b/browserutilities/cxmllibrary/group/cXmlParser.mmp	Thu Dec 17 09:20:16 2009 +0200
@@ -16,7 +16,7 @@
 */
 
 #include <platform_paths.hrh>
-#include <platform/mw/Browser_platform_variant.hrh>
+#include <platform/mw/browser_platform_variant.hrh>
 TARGET          cXmlParser.dll
 TARGETTYPE      dll
 
diff -r 9a9a761f03f1 -r 0ed94ceaa377 browserutilities/downloadmgr/DownloadMgrClntSrv/group/DownloadMgrClntSrv.mmp
--- a/browserutilities/downloadmgr/DownloadMgrClntSrv/group/DownloadMgrClntSrv.mmp	Tue Nov 24 09:02:20 2009 +0200
+++ b/browserutilities/downloadmgr/DownloadMgrClntSrv/group/DownloadMgrClntSrv.mmp	Thu Dec 17 09:20:16 2009 +0200
@@ -17,7 +17,7 @@
 */
 
 #include <platform_paths.hrh>
-#include <platform/mw/Browser_platform_variant.hrh>
+#include <platform/mw/browser_platform_variant.hrh>
 
 TARGET      DownloadMgr.dll
 TARGETTYPE  DLL
diff -r 9a9a761f03f1 -r 0ed94ceaa377 browserutilities/downloadmgr/DownloadMgrClntSrv/group/DownloadMgrServer.mmp
--- a/browserutilities/downloadmgr/DownloadMgrClntSrv/group/DownloadMgrServer.mmp	Tue Nov 24 09:02:20 2009 +0200
+++ b/browserutilities/downloadmgr/DownloadMgrClntSrv/group/DownloadMgrServer.mmp	Thu Dec 17 09:20:16 2009 +0200
@@ -18,7 +18,7 @@
 
 #include <defaultcaps.hrh>
 #include <platform_paths.hrh>
-#include <platform/mw/Browser_platform_variant.hrh>
+#include <platform/mw/browser_platform_variant.hrh>
 
 TARGET			DownloadMgrServer.exe
 TARGETTYPE		exe
@@ -38,6 +38,6 @@
 
 LIBRARY DownloadMgr.lib                      
 
-CAPABILITY CAP_SERVER -SwEvent -Location -LocalServices -UserEnvironment -ReadUserData -WriteUserData NetworkControl
+CAPABILITY CAP_SERVER -SwEvent -Location -LocalServices -UserEnvironment -WriteUserData ReadUserData NetworkControl
 
 VENDORID VID_DEFAULT
diff -r 9a9a761f03f1 -r 0ed94ceaa377 browserutilities/downloadmgr/DownloadMgrClntSrv/inc/DownloadMgrCod.h
--- a/browserutilities/downloadmgr/DownloadMgrClntSrv/inc/DownloadMgrCod.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/browserutilities/downloadmgr/DownloadMgrClntSrv/inc/DownloadMgrCod.h	Thu Dec 17 09:20:16 2009 +0200
@@ -22,7 +22,7 @@
 #define __DOWNLOADMGR_CODOBSERVER_H__
 
 #include <e32base.h>
-#include <CodDownload.h>
+#include <coddownload.h>
 
 // FORWARD DECLARATIONS
 class RHttpDownloadMgr;
diff -r 9a9a761f03f1 -r 0ed94ceaa377 browserutilities/downloadmgr/DownloadMgrClntSrv/inc/DownloadMgrDefAttrib.h
--- a/browserutilities/downloadmgr/DownloadMgrClntSrv/inc/DownloadMgrDefAttrib.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/browserutilities/downloadmgr/DownloadMgrClntSrv/inc/DownloadMgrDefAttrib.h	Thu Dec 17 09:20:16 2009 +0200
@@ -22,7 +22,7 @@
 
 //  INCLUDES
 #include <e32base.h>
-#include <HttpDownloadMgrCommon.h>
+#include <httpdownloadmgrcommon.h>
 
 // DATA TYPES
 typedef TPckgBuf< TInt32 > THttpDownloadMgrIntegerBuf;
diff -r 9a9a761f03f1 -r 0ed94ceaa377 browserutilities/downloadmgr/DownloadMgrClntSrv/inc/DownloadMgrEventQueue.h
--- a/browserutilities/downloadmgr/DownloadMgrClntSrv/inc/DownloadMgrEventQueue.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/browserutilities/downloadmgr/DownloadMgrClntSrv/inc/DownloadMgrEventQueue.h	Thu Dec 17 09:20:16 2009 +0200
@@ -22,7 +22,7 @@
 
 //  INCLUDES
 #include <e32base.h>
-#include <HttpDownloadMgrCommon.h>
+#include <httpdownloadmgrcommon.h>
 
 // FORWARD DECLARATIONS
 class CHttpDownload;
diff -r 9a9a761f03f1 -r 0ed94ceaa377 browserutilities/downloadmgr/DownloadMgrClntSrv/inc/DownloadMgrHandler.h
--- a/browserutilities/downloadmgr/DownloadMgrClntSrv/inc/DownloadMgrHandler.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/browserutilities/downloadmgr/DownloadMgrClntSrv/inc/DownloadMgrHandler.h	Thu Dec 17 09:20:16 2009 +0200
@@ -21,7 +21,7 @@
 #ifndef __DOWNLOADMGR_RECEIVEHANDLER_H__
 #define __DOWNLOADMGR_RECEIVEHANDLER_H__
 
-#include "DownloadMgrClient.h"
+#include "downloadmgrclient.h"
 #include <e32base.h>
 
 // FORWARD DECLARATIONS
diff -r 9a9a761f03f1 -r 0ed94ceaa377 browserutilities/downloadmgr/DownloadMgrClntSrv/src/DownloadMgrClientApiExt.cpp
--- a/browserutilities/downloadmgr/DownloadMgrClntSrv/src/DownloadMgrClientApiExt.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/browserutilities/downloadmgr/DownloadMgrClntSrv/src/DownloadMgrClientApiExt.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -16,7 +16,7 @@
 */
 
 
-#include "DownloadMgrClientApiExt.h"
+#include "downloadmgrclientapiext.h"
 #include "DownloadMgrLogger.h"
 
 // ======== MEMBER FUNCTIONS ========
diff -r 9a9a761f03f1 -r 0ed94ceaa377 browserutilities/downloadmgr/DownloadMgrClntSrv/src/DownloadMgrClntSession.cpp
--- a/browserutilities/downloadmgr/DownloadMgrClntSrv/src/DownloadMgrClntSession.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/browserutilities/downloadmgr/DownloadMgrClntSrv/src/DownloadMgrClntSession.cpp	Thu Dec 17 09:20:16 2009 +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"
@@ -29,8 +29,8 @@
 #include <EscapeUtils.h>
 #include <centralrepository.h>
 #include "DownloadMgrCRKeys.h"
-#include <BrowserUiSDKCRKeys.h>
-#include <CodDownload.h>
+#include <browseruisdkcrkeys.h>
+#include <coddownload.h>
 
 // CONSTANTS
 const TInt KHttpDownloadMgrObserverArrayGranularity = 4;
diff -r 9a9a761f03f1 -r 0ed94ceaa377 browserutilities/downloadmgr/DownloadMgrClntSrv/src/DownloadMgrClntSubSession.cpp
--- a/browserutilities/downloadmgr/DownloadMgrClntSrv/src/DownloadMgrClntSubSession.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/browserutilities/downloadmgr/DownloadMgrClntSrv/src/DownloadMgrClntSubSession.cpp	Thu Dec 17 09:20:16 2009 +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"
@@ -31,10 +31,10 @@
 
 #include <hash.h>
 #include <e32svr.h>
-#include <CodDownload.h>
+#include <coddownload.h>
 #include <AiwGenericParam.h>
 #include <eikenv.h>
-#include <HttpFilterCommonStringsExt.h>
+#include <httpfiltercommonstringsext.h>
 #include <EscapeUtils.h>
 
 // CONSTANTS
diff -r 9a9a761f03f1 -r 0ed94ceaa377 browserutilities/downloadmgr/DownloadMgrClntSrv/src/DownloadMgrCod.cpp
--- a/browserutilities/downloadmgr/DownloadMgrClntSrv/src/DownloadMgrCod.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/browserutilities/downloadmgr/DownloadMgrClntSrv/src/DownloadMgrCod.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -18,7 +18,7 @@
 
 
 // INCLUDE FILES
-#include "DownloadMgrClient.h"
+#include "downloadmgrclient.h"
 #include "DownloadMgrCod.h"
 #include "DownloadMgrLogger.h"
 #include <apgtask.h>
diff -r 9a9a761f03f1 -r 0ed94ceaa377 browserutilities/downloadmgr/DownloadMgrClntSrv/src/DownloadMgrHandler.cpp
--- a/browserutilities/downloadmgr/DownloadMgrClntSrv/src/DownloadMgrHandler.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/browserutilities/downloadmgr/DownloadMgrClntSrv/src/DownloadMgrHandler.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -20,7 +20,7 @@
 // INCLUDE FILES
 #include "DownloadMgrLogger.h"
 #include "DownloadMgrHandler.h"
-#include "DownloadMgrClient.h"
+#include "downloadmgrclient.h"
 #include "DownloadMgrDefAttrib.h"
 
 // CONSTANTS
diff -r 9a9a761f03f1 -r 0ed94ceaa377 browserutilities/downloadmgr/DownloadMgrClntSrv/src/DownloadMgrTransObserver.cpp
--- a/browserutilities/downloadmgr/DownloadMgrClntSrv/src/DownloadMgrTransObserver.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/browserutilities/downloadmgr/DownloadMgrClntSrv/src/DownloadMgrTransObserver.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -19,7 +19,7 @@
 
 // INCLUDE FILES
 #include "DownloadMgrTransObserver.h"
-#include "DownloadMgrClient.h"
+#include "downloadmgrclient.h"
 
 // CONSTANTS
 
diff -r 9a9a761f03f1 -r 0ed94ceaa377 browserutilities/downloadmgr/DownloadMgrServEng/Group/HttpDMServEng.mmp
--- a/browserutilities/downloadmgr/DownloadMgrServEng/Group/HttpDMServEng.mmp	Tue Nov 24 09:02:20 2009 +0200
+++ b/browserutilities/downloadmgr/DownloadMgrServEng/Group/HttpDMServEng.mmp	Thu Dec 17 09:20:16 2009 +0200
@@ -18,7 +18,7 @@
 
 #include <data_caging_paths.hrh>
 #include <platform_paths.hrh>
-#include <platform/mw/Browser_platform_variant.hrh>
+#include <platform/mw/browser_platform_variant.hrh>
 
 TARGET  HttpDMServEng.dll
 TARGETTYPE  dll
diff -r 9a9a761f03f1 -r 0ed94ceaa377 browserutilities/downloadmgr/DownloadMgrServEng/Inc/DownloadDataServ.h
--- a/browserutilities/downloadmgr/DownloadMgrServEng/Inc/DownloadDataServ.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/browserutilities/downloadmgr/DownloadMgrServEng/Inc/DownloadDataServ.h	Thu Dec 17 09:20:16 2009 +0200
@@ -22,7 +22,7 @@
 
 //  INCLUDES
 #include <e32base.h>
-#include "HttpDownloadData.h"
+#include "httpdownloaddata.h"
 
 // CONSTANTS
 
diff -r 9a9a761f03f1 -r 0ed94ceaa377 browserutilities/downloadmgr/DownloadMgrServEng/Inc/HeaderField.h
--- a/browserutilities/downloadmgr/DownloadMgrServEng/Inc/HeaderField.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/browserutilities/downloadmgr/DownloadMgrServEng/Inc/HeaderField.h	Thu Dec 17 09:20:16 2009 +0200
@@ -22,7 +22,7 @@
 
 //  INCLUDES
 #include <e32base.h>
-#include <HttpDownloadMgrCommon.h>
+#include <httpdownloadmgrcommon.h>
 #include <http.h>
 
 // CONSTANTS
diff -r 9a9a761f03f1 -r 0ed94ceaa377 browserutilities/downloadmgr/DownloadMgrServEng/Inc/HttpClientAppInstance.h
--- a/browserutilities/downloadmgr/DownloadMgrServEng/Inc/HttpClientAppInstance.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/browserutilities/downloadmgr/DownloadMgrServEng/Inc/HttpClientAppInstance.h	Thu Dec 17 09:20:16 2009 +0200
@@ -21,7 +21,7 @@
 #define HTTPCLIENTAPPINSTANCE_H
 
 //  INCLUDES
-#include "HttpDownloadMgrCommon.h"
+#include "httpdownloadmgrcommon.h"
 
 #include <e32base.h>
 
diff -r 9a9a761f03f1 -r 0ed94ceaa377 browserutilities/downloadmgr/DownloadMgrServEng/Inc/HttpDownload.h
--- a/browserutilities/downloadmgr/DownloadMgrServEng/Inc/HttpDownload.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/browserutilities/downloadmgr/DownloadMgrServEng/Inc/HttpDownload.h	Thu Dec 17 09:20:16 2009 +0200
@@ -25,7 +25,7 @@
 #include "HttpConnHandler.h"
 #include "DownloadDataServ.h"
 
-#include <HttpDownloadMgrCommon.h>
+#include <httpdownloadmgrcommon.h>
 #include <e32base.h>
 #include <es_sock.h>
 #include <http.h>
diff -r 9a9a761f03f1 -r 0ed94ceaa377 browserutilities/downloadmgr/DownloadMgrServEng/Inc/HttpDownloadManagerServerEngine.h
--- a/browserutilities/downloadmgr/DownloadMgrServEng/Inc/HttpDownloadManagerServerEngine.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/browserutilities/downloadmgr/DownloadMgrServEng/Inc/HttpDownloadManagerServerEngine.h	Thu Dec 17 09:20:16 2009 +0200
@@ -24,7 +24,7 @@
 //  INCLUDES
 #include "HttpDownload.h"
 
-#include <HttpDownloadMgrCommon.h>
+#include <httpdownloadmgrcommon.h>
 #include <e32std.h>
 #include <f32file.h>
 
diff -r 9a9a761f03f1 -r 0ed94ceaa377 browserutilities/downloadmgr/DownloadMgrServEng/Src/HttpConnHandler.cpp
--- a/browserutilities/downloadmgr/DownloadMgrServEng/Src/HttpConnHandler.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/browserutilities/downloadmgr/DownloadMgrServEng/Src/HttpConnHandler.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -28,12 +28,12 @@
 
 #include <in_sock.h>
 #include <CommDbConnPref.h>
-#include <HttpFilterAuthenticationInterface.h>
+#include <httpfilterauthenticationinterface.h>
 #include <uaproffilter_interface.h>
-#include <HttpFilterCommonStringsExt.h>
+#include <httpfiltercommonstringsext.h>
 #include <cdblen.h>
-//#include <DeflateFilterInterface.h>
-#include <CookieFilterInterface.h>
+//#include <deflatefilterinterface.h>
+#include <cookiefilterinterface.h>
 
 // EXTERNAL DATA STRUCTURES
 //extern  ?external_data;
diff -r 9a9a761f03f1 -r 0ed94ceaa377 browserutilities/downloadmgr/DownloadMgrServEng/Src/HttpDownload.cpp
--- a/browserutilities/downloadmgr/DownloadMgrServEng/Src/HttpDownload.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/browserutilities/downloadmgr/DownloadMgrServEng/Src/HttpDownload.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -18,7 +18,7 @@
 
 
 // INCLUDE FILES
-#include <platform/mw/Browser_platform_variant.hrh>
+#include    <browser_platform_variant.hrh>
 #include    "HeaderField.h"
 #include    "HttpDownloadManagerServerEngine.h"
 #include    "HttpClientApp.h"
@@ -32,7 +32,7 @@
 #include    <Uri16.h>
 #include    <F32FILE.H>
 #include    <EscapeUtils.h>
-#include    <HttpFilterCommonStringsExt.h>
+#include    <httpfiltercommonstringsext.h>
 #include    <tinternetdate.h>
 #include    <SysUtil.h>
 
diff -r 9a9a761f03f1 -r 0ed94ceaa377 browserutilities/downloadmgr/DownloadMgrServEng/Src/HttpDownloadManagerServerEngine.cpp
--- a/browserutilities/downloadmgr/DownloadMgrServEng/Src/HttpDownloadManagerServerEngine.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/browserutilities/downloadmgr/DownloadMgrServEng/Src/HttpDownloadManagerServerEngine.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -28,7 +28,7 @@
 #include <bldvariant.hrh>
 #include <e32std.h>
 #include <centralrepository.h>
-#include <BrowserUiSDKCRKeys.h>
+#include <browseruisdkcrkeys.h>
 #include <DocumentHandler.h>
 #include <FeatMgr.h>
 
diff -r 9a9a761f03f1 -r 0ed94ceaa377 browserutilities/downloadmgr/DownloadMgrServEng/Src/HttpStorage.cpp
--- a/browserutilities/downloadmgr/DownloadMgrServEng/Src/HttpStorage.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/browserutilities/downloadmgr/DownloadMgrServEng/Src/HttpStorage.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -19,7 +19,7 @@
 
 // INCLUDE FILES
 #include <bldvariant.hrh>
-#include <Browser_platform_variant.hrh>
+#include <browser_platform_variant.hrh>
 
 #include "FileExt.h"
 #include "HttpClientApp.h"
diff -r 9a9a761f03f1 -r 0ed94ceaa377 browserutilities/downloadmgr/DownloadMgrUiLib/Group/Bld.inf
--- a/browserutilities/downloadmgr/DownloadMgrUiLib/Group/Bld.inf	Tue Nov 24 09:02:20 2009 +0200
+++ b/browserutilities/downloadmgr/DownloadMgrUiLib/Group/Bld.inf	Thu Dec 17 09:20:16 2009 +0200
@@ -16,7 +16,7 @@
 */
 
 #include <platform_paths.hrh>
-#include "../../../../web_plat/browser_platform_api/inc/Browser_platform_variant.hrh"
+#include "../../../../web_plat/browser_platform_api/inc/browser_platform_variant.hrh"
 
 PRJ_PLATFORMS
 
diff -r 9a9a761f03f1 -r 0ed94ceaa377 browserutilities/downloadmgr/DownloadMgrUiLib/Group/DownloadMgrUiLib.mmp
--- a/browserutilities/downloadmgr/DownloadMgrUiLib/Group/DownloadMgrUiLib.mmp	Tue Nov 24 09:02:20 2009 +0200
+++ b/browserutilities/downloadmgr/DownloadMgrUiLib/Group/DownloadMgrUiLib.mmp	Thu Dec 17 09:20:16 2009 +0200
@@ -19,7 +19,7 @@
 #include <defaultcaps.hrh>
 #include <data_caging_paths.hrh>
 #include <platform_paths.hrh>
-#include <platform/mw/Browser_platform_variant.hrh>
+#include <platform/mw/browser_platform_variant.hrh>
 
 TARGET          DownloadMgrUiLib.dll
 TARGETTYPE      dll
diff -r 9a9a761f03f1 -r 0ed94ceaa377 browserutilities/downloadmgr/DownloadMgrUiLib/Inc/AsyncEventHandlerBase.h
--- a/browserutilities/downloadmgr/DownloadMgrUiLib/Inc/AsyncEventHandlerBase.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/browserutilities/downloadmgr/DownloadMgrUiLib/Inc/AsyncEventHandlerBase.h	Thu Dec 17 09:20:16 2009 +0200
@@ -22,7 +22,7 @@
 
 //  INCLUDES
 #include <e32base.h>
-#include <DownloadMgrClient.h>
+#include <downloadmgrclient.h>
 
 // FORWARD DECLARATIONS
 class RHttpDownload;
diff -r 9a9a761f03f1 -r 0ed94ceaa377 browserutilities/downloadmgr/DownloadMgrUiLib/Inc/CDownloadUtils.h
--- a/browserutilities/downloadmgr/DownloadMgrUiLib/Inc/CDownloadUtils.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/browserutilities/downloadmgr/DownloadMgrUiLib/Inc/CDownloadUtils.h	Thu Dec 17 09:20:16 2009 +0200
@@ -22,7 +22,7 @@
 
 //  INCLUDES
 #include <e32base.h>
-#include <HttpDownloadMgrCommon.h>
+#include <httpdownloadmgrcommon.h>
 
 // FORWARD DECLARATIONS
 class RHttpDownload;
diff -r 9a9a761f03f1 -r 0ed94ceaa377 browserutilities/downloadmgr/DownloadMgrUiLib/Inc/CDownloadsListArray.h
--- a/browserutilities/downloadmgr/DownloadMgrUiLib/Inc/CDownloadsListArray.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/browserutilities/downloadmgr/DownloadMgrUiLib/Inc/CDownloadsListArray.h	Thu Dec 17 09:20:16 2009 +0200
@@ -23,7 +23,7 @@
 //  INCLUDES
 #include <e32base.h>
 #include <e32std.h>
-#include <DownloadMgrClient.h>
+#include <downloadmgrclient.h>
 #include <badesca.h>
 #include <bamdesca.h>
 #include <apgcli.h>
@@ -282,4 +282,4 @@
     return KErrNotFound;
     }
 
-#endif /* CDOWNLOADSLISTARRAY_H */
\ No newline at end of file
+#endif /* CDOWNLOADSLISTARRAY_H */
diff -r 9a9a761f03f1 -r 0ed94ceaa377 browserutilities/downloadmgr/DownloadMgrUiLib/Inc/CUserInteractionsUtils.h
--- a/browserutilities/downloadmgr/DownloadMgrUiLib/Inc/CUserInteractionsUtils.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/browserutilities/downloadmgr/DownloadMgrUiLib/Inc/CUserInteractionsUtils.h	Thu Dec 17 09:20:16 2009 +0200
@@ -25,7 +25,7 @@
 #include <E32DEF.H>
 #include <e32std.h>
 #include <apparc.h>
-#include <HttpDownloadMgrCommon.h>
+#include <httpdownloadmgrcommon.h>
 #include <vwsdef.h>
 #include <AknServerApp.h>
 #include "CDownloadUtils.h"
diff -r 9a9a761f03f1 -r 0ed94ceaa377 browserutilities/downloadmgr/DownloadMgrUiLib/Inc/DownloadMgrUiLib.hrh
--- a/browserutilities/downloadmgr/DownloadMgrUiLib/Inc/DownloadMgrUiLib.hrh	Tue Nov 24 09:02:20 2009 +0200
+++ b/browserutilities/downloadmgr/DownloadMgrUiLib/Inc/DownloadMgrUiLib.hrh	Thu Dec 17 09:20:16 2009 +0200
@@ -46,7 +46,7 @@
     };
 
 
-#define KUiLibMaxDefAttrLength 32 // See KMaxDefAttrLength in HttpDownloadMgrCommon.h!
+#define KUiLibMaxDefAttrLength 32 // See KMaxDefAttrLength in httpdownloadmgrcommon.h!
 
 enum TDMULAIWMENUIDs
     {
diff -r 9a9a761f03f1 -r 0ed94ceaa377 browserutilities/downloadmgr/DownloadMgrUiLib/Src/AsyncEventHandlerBase.cpp
--- a/browserutilities/downloadmgr/DownloadMgrUiLib/Src/AsyncEventHandlerBase.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/browserutilities/downloadmgr/DownloadMgrUiLib/Src/AsyncEventHandlerBase.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -19,7 +19,7 @@
 
 // INCLUDE FILES
 #include    "AsyncEventHandlerBase.h"
-#include    "CDownloadMgrUiLibRegistry.h"
+#include    "cdownloadmgruilibregistry.h"
 #include    "AsyncEventHandlerArray.h"
 #include    "UiLibLogger.h"
 #include    "DMgrUiLibPanic.h"
diff -r 9a9a761f03f1 -r 0ed94ceaa377 browserutilities/downloadmgr/DownloadMgrUiLib/Src/CDownloadMgrUiBase.cpp
--- a/browserutilities/downloadmgr/DownloadMgrUiLib/Src/CDownloadMgrUiBase.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/browserutilities/downloadmgr/DownloadMgrUiLib/Src/CDownloadMgrUiBase.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -18,7 +18,7 @@
 
 
 // INCLUDE FILES
-#include    "CDownloadMgrUiBase.h"
+#include    "cdownloadmgruibase.h"
 #include    "UiLibLogger.h"
 #include    <e32std.h>
 #include    <e32def.h>
diff -r 9a9a761f03f1 -r 0ed94ceaa377 browserutilities/downloadmgr/DownloadMgrUiLib/Src/CDownloadMgrUiDownloadMenu.cpp
--- a/browserutilities/downloadmgr/DownloadMgrUiLib/Src/CDownloadMgrUiDownloadMenu.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/browserutilities/downloadmgr/DownloadMgrUiLib/Src/CDownloadMgrUiDownloadMenu.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -18,7 +18,7 @@
 
 
 // INCLUDE FILES
-#include    "CDownloadMgrUiDownloadMenu.h"
+#include    "cdownloadmgruidownloadmenu.h"
 #include    "UiLibLogger.h"
 #include    <e32std.h>
 #include    <e32def.h>
diff -r 9a9a761f03f1 -r 0ed94ceaa377 browserutilities/downloadmgr/DownloadMgrUiLib/Src/CDownloadMgrUiDownloadsList.cpp
--- a/browserutilities/downloadmgr/DownloadMgrUiLib/Src/CDownloadMgrUiDownloadsList.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/browserutilities/downloadmgr/DownloadMgrUiLib/Src/CDownloadMgrUiDownloadsList.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -18,10 +18,10 @@
 
 
 // INCLUDE FILES
-#include <platform/mw/Browser_platform_variant.hrh>
-#include    "CDownloadMgrUiDownloadsList.h"
-#include    "CDownloadMgrUiLibRegistry.h"
-#include    "CDownloadMgrUiDownloadMenu.h"
+#include    <browser_platform_variant.hrh>
+#include    "cdownloadmgruidownloadslist.h"
+#include    "cdownloadmgruilibregistry.h"
+#include    "cdownloadmgruidownloadmenu.h"
 #include    "CDownloadsListArray.h"
 #include    "CDownloadsListDlg.h"
 #include    "AsyncEventHandlerArray.h"
@@ -49,7 +49,7 @@
 
 #include    <DocumentHandler.h>
 #include    "bautils.h"
-#include    <BrowserUiSDKCRKeys.h>
+#include    <browseruisdkcrkeys.h>
 #include    <aknnotewrappers.h> 
 #include    <StringLoader.h>
 #include    <apgtask.h>
diff -r 9a9a761f03f1 -r 0ed94ceaa377 browserutilities/downloadmgr/DownloadMgrUiLib/Src/CDownloadMgrUiLibRegistry.cpp
--- a/browserutilities/downloadmgr/DownloadMgrUiLib/Src/CDownloadMgrUiLibRegistry.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/browserutilities/downloadmgr/DownloadMgrUiLib/Src/CDownloadMgrUiLibRegistry.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -18,9 +18,9 @@
 
 
 // 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"
 
diff -r 9a9a761f03f1 -r 0ed94ceaa377 browserutilities/downloadmgr/DownloadMgrUiLib/Src/CDownloadMgrUiUserInteractions.cpp
--- a/browserutilities/downloadmgr/DownloadMgrUiLib/Src/CDownloadMgrUiUserInteractions.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/browserutilities/downloadmgr/DownloadMgrUiLib/Src/CDownloadMgrUiUserInteractions.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -18,10 +18,10 @@
 
 
 // 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"
@@ -912,6 +912,10 @@
     for( TInt i = 0; i < downloadCnt; ++i )
         {
         RHttpDownload* dl = downloads.At(i); // current download
+        // we do not have to show the download in case of invalid descriptor
+        HBufC* name = HBufC::NewLC( KMaxUrlLength );
+        TPtr tempPtr = name->Des(); 
+        dl->GetStringAttribute( EDlAttrName, tempPtr );		
         err = dl->GetBoolAttribute( EDlAttrPausable, isPausable );
         if ( !err )
             {
@@ -938,10 +942,11 @@
         	err = dl->GetBoolAttribute( EDlAttrNoMedia, isNoMedia );
         	}
         CLOG_WRITE_FORMAT(" err: %d",err);
-        if ( !err && ( !isPausable || isHidden ||isNoMedia || state == EHttpDlMultipleMOCompleted  ) )
+        if ( !err && ( !isPausable || isHidden ||isNoMedia || state == EHttpDlMultipleMOCompleted || !tempPtr.Length()  ) )
             {
             ++ignoredDownloads;
             }
+        CleanupStack::PopAndDestroy( name ); // name 			
         }
     CLOG_WRITE_FORMAT(" downloadCnt: %d",downloadCnt);
     CLOG_WRITE_FORMAT(" ignoredDownloads: %d",ignoredDownloads);
diff -r 9a9a761f03f1 -r 0ed94ceaa377 browserutilities/downloadmgr/DownloadMgrUiLib/Src/CDownloadUtils.cpp
--- a/browserutilities/downloadmgr/DownloadMgrUiLib/Src/CDownloadUtils.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/browserutilities/downloadmgr/DownloadMgrUiLib/Src/CDownloadUtils.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -20,7 +20,7 @@
 // INCLUDE FILES
 #include    "CDownloadUtils.h" 
 #include    "UiLibLogger.h"
-#include    <DownloadMgrClient.h>
+#include    <downloadmgrclient.h>
 #include    <DocumentHandler.h>
 #include    <Oma2Agent.h>
 #include    <DRMCommon.h>
diff -r 9a9a761f03f1 -r 0ed94ceaa377 browserutilities/downloadmgr/DownloadMgrUiLib/Src/CDownloadsListArray.cpp
--- a/browserutilities/downloadmgr/DownloadMgrUiLib/Src/CDownloadsListArray.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/browserutilities/downloadmgr/DownloadMgrUiLib/Src/CDownloadsListArray.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -18,7 +18,7 @@
 
 
 // INCLUDE FILES
-#include <platform/mw/Browser_platform_variant.hrh>
+#include    <browser_platform_variant.hrh>
 #include    "CDownloadsListArray.h"
 #include    "ProgressInfoCreator.h"
 #include    "DMgrUiLibPanic.h"
@@ -39,7 +39,7 @@
 #endif
 
 #include    "CDownloadUtils.h"
-#include    <HttpDownloadMgrCommon.h>
+#include    <httpdownloadmgrcommon.h>
 #include    "CUserInteractionsUtils.h"
 
 
diff -r 9a9a761f03f1 -r 0ed94ceaa377 browserutilities/downloadmgr/DownloadMgrUiLib/Src/CDownloadsListDlg.cpp
--- a/browserutilities/downloadmgr/DownloadMgrUiLib/Src/CDownloadsListDlg.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/browserutilities/downloadmgr/DownloadMgrUiLib/Src/CDownloadsListDlg.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -20,7 +20,7 @@
 // INCLUDE FILES
 #include    "CDownloadsListDlg.h"
 #include    "CDownloadUtils.h"
-#include    "DownloadsListDlgObserver.h"
+#include    "downloadslistdlgobserver.h"
 #include    "CDownloadsListArray.h"
 #include    "DownloadMgrUiLib.hrh"
 #include    "DMgrUiLibPanic.h"
diff -r 9a9a761f03f1 -r 0ed94ceaa377 browserutilities/downloadmgr/DownloadMgrUiLib/Src/CUserInteractionsUtils.cpp
--- a/browserutilities/downloadmgr/DownloadMgrUiLib/Src/CUserInteractionsUtils.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/browserutilities/downloadmgr/DownloadMgrUiLib/Src/CUserInteractionsUtils.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -18,17 +18,17 @@
 
 
 // INCLUDE FILES
-#include <platform/mw/Browser_platform_variant.hrh>
+#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>
-#include    <DownloadMgrClient.h>
+#include    <downloadmgrclient.h>
 #include    <AiwGenericParam.h>
 #include    <DocumentHandler.h>
 #include    <coemain.h>
@@ -42,8 +42,8 @@
 #include    <AknSoftNotificationParameters.h>
 #include    <AknSoftNotifier.h>
 #include    <AknNoteWrappers.h>
-#include    <BrowserDialogsProvider.h>
-#include    <HttpDownloadMgrCommon.h>
+#include    <browserdialogsprovider.h>
+#include    <httpdownloadmgrcommon.h>
 #include    <PathInfo.h>
 #include    <aknglobalnote.h>
 #include    <Oma2Agent.h>
diff -r 9a9a761f03f1 -r 0ed94ceaa377 browserutilities/downloadmgr/DownloadMgrUiLib/Src/UserInteractionsEventHandler.cpp
--- a/browserutilities/downloadmgr/DownloadMgrUiLib/Src/UserInteractionsEventHandler.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/browserutilities/downloadmgr/DownloadMgrUiLib/Src/UserInteractionsEventHandler.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -18,13 +18,13 @@
 
 
 // INCLUDE FILES
-#include <platform/mw/Browser_platform_variant.hrh>
+#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>
@@ -623,6 +623,7 @@
                             {
                             CLOG_WRITE_FORMAT(" this deleted: %x", this);
                             CLOG_LEAVEFN("CUserInteractionsEventHandler::HandleInProgressStateL");
+                            CleanupStack::PopAndDestroy( contentType );
                             return;
                             }
                             
diff -r 9a9a761f03f1 -r 0ed94ceaa377 browserutilities/downloadmgr/Group/bld.inf
--- a/browserutilities/downloadmgr/Group/bld.inf	Tue Nov 24 09:02:20 2009 +0200
+++ b/browserutilities/downloadmgr/Group/bld.inf	Thu Dec 17 09:20:16 2009 +0200
@@ -17,7 +17,7 @@
 */
 
 #include <platform_paths.hrh>
-#include "../../../web_plat/browser_platform_api/inc/Browser_platform_variant.hrh"
+#include "../../../web_plat/browser_platform_api/inc/browser_platform_variant.hrh"
 
 PRJ_PLATFORMS
 DEFAULT
diff -r 9a9a761f03f1 -r 0ed94ceaa377 browserutilities/favouritesengine/ClientServer/group/BookmarkDump.mmp
--- a/browserutilities/favouritesengine/ClientServer/group/BookmarkDump.mmp	Tue Nov 24 09:02:20 2009 +0200
+++ b/browserutilities/favouritesengine/ClientServer/group/BookmarkDump.mmp	Thu Dec 17 09:20:16 2009 +0200
@@ -19,7 +19,7 @@
 
 
 #include <platform_paths.hrh>
-#include <platform/mw/Browser_platform_variant.hrh>
+#include <platform/mw/browser_platform_variant.hrh>
 
 TARGET      BookmarkDump.exe
 TARGETTYPE  exe
diff -r 9a9a761f03f1 -r 0ed94ceaa377 browserutilities/favouritesengine/ClientServer/group/BookmarkImport.mmp
--- a/browserutilities/favouritesengine/ClientServer/group/BookmarkImport.mmp	Tue Nov 24 09:02:20 2009 +0200
+++ b/browserutilities/favouritesengine/ClientServer/group/BookmarkImport.mmp	Thu Dec 17 09:20:16 2009 +0200
@@ -18,7 +18,7 @@
 */
 
 #include <platform_paths.hrh>
-#include <platform/mw/Browser_platform_variant.hrh>
+#include <platform/mw/browser_platform_variant.hrh>
 
 TARGET      BookmarkImport.exe
 TARGETTYPE  exe
diff -r 9a9a761f03f1 -r 0ed94ceaa377 browserutilities/favouritesengine/ClientServer/group/FavouritesEngine.mmp
--- a/browserutilities/favouritesengine/ClientServer/group/FavouritesEngine.mmp	Tue Nov 24 09:02:20 2009 +0200
+++ b/browserutilities/favouritesengine/ClientServer/group/FavouritesEngine.mmp	Thu Dec 17 09:20:16 2009 +0200
@@ -19,7 +19,7 @@
 
 
 #include <platform_paths.hrh>
-#include <platform/mw/Browser_platform_variant.hrh>
+#include <platform/mw/browser_platform_variant.hrh>
 
 TARGET          FavouritesEngine.dll
 TARGETTYPE      dll
diff -r 9a9a761f03f1 -r 0ed94ceaa377 browserutilities/favouritesengine/ClientServer/group/FavouritesSrv.mmp
--- a/browserutilities/favouritesengine/ClientServer/group/FavouritesSrv.mmp	Tue Nov 24 09:02:20 2009 +0200
+++ b/browserutilities/favouritesengine/ClientServer/group/FavouritesSrv.mmp	Thu Dec 17 09:20:16 2009 +0200
@@ -19,7 +19,7 @@
 
 
 #include <platform_paths.hrh>
-#include <platform/mw/Browser_platform_variant.hrh>
+#include <platform/mw/browser_platform_variant.hrh>
 
 TARGET          FavouritesSrv.exe
 TARGETTYPE      exe
diff -r 9a9a761f03f1 -r 0ed94ceaa377 browserutilities/favouritesengine/ClientServer/group/bld.inf
--- a/browserutilities/favouritesengine/ClientServer/group/bld.inf	Tue Nov 24 09:02:20 2009 +0200
+++ b/browserutilities/favouritesengine/ClientServer/group/bld.inf	Thu Dec 17 09:20:16 2009 +0200
@@ -18,7 +18,7 @@
 */
 
 #include <platform_paths.hrh>
-#include "../../../../web_plat/browser_platform_api/inc/Browser_platform_variant.hrh"
+#include "../../../../web_plat/browser_platform_api/inc/browser_platform_variant.hrh"
 
 PRJ_PLATFORMS
 DEFAULT
diff -r 9a9a761f03f1 -r 0ed94ceaa377 browserutilities/favouritesengine/ClientServer/inc/FavouritesBuf.h
--- a/browserutilities/favouritesengine/ClientServer/inc/FavouritesBuf.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/browserutilities/favouritesengine/ClientServer/inc/FavouritesBuf.h	Thu Dec 17 09:20:16 2009 +0200
@@ -25,7 +25,7 @@
 
 #include <e32base.h>
 #include <s32buf.h>
-#include <FavouritesHandle.h>
+#include <favouriteshandle.h>
 
 // CONSTANTS
 
diff -r 9a9a761f03f1 -r 0ed94ceaa377 browserutilities/favouritesengine/ClientServer/inc/FavouritesFilter.h
--- a/browserutilities/favouritesengine/ClientServer/inc/FavouritesFilter.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/browserutilities/favouritesengine/ClientServer/inc/FavouritesFilter.h	Thu Dec 17 09:20:16 2009 +0200
@@ -24,7 +24,7 @@
 //  INCLUDES
 
 #include <e32base.h>
-#include <FavouritesItem.h>
+#include <favouritesitem.h>
 
 // CLASS DECLARATION
 
diff -r 9a9a761f03f1 -r 0ed94ceaa377 browserutilities/favouritesengine/ClientServer/inc/FavouritesItemImpl.h
--- a/browserutilities/favouritesengine/ClientServer/inc/FavouritesItemImpl.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/browserutilities/favouritesengine/ClientServer/inc/FavouritesItemImpl.h	Thu Dec 17 09:20:16 2009 +0200
@@ -25,9 +25,9 @@
 
 #include <e32base.h>
 #include <s32strm.h>
-#include <FavouritesItem.h>
-#include <FavouritesLimits.h>
-#include <FavouritesWapAp.h>
+#include <favouritesitem.h>
+#include <favouriteslimits.h>
+#include <favouriteswapap.h>
 
 // CLASS DECLARATION
 
diff -r 9a9a761f03f1 -r 0ed94ceaa377 browserutilities/favouritesengine/ClientServer/src/ActiveFavouritesDbNotifier.cpp
--- a/browserutilities/favouritesengine/ClientServer/src/ActiveFavouritesDbNotifier.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/browserutilities/favouritesengine/ClientServer/src/ActiveFavouritesDbNotifier.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -20,8 +20,8 @@
 
 // INCLUDE FILES
 
-#include "ActiveFavouritesDbNotifier.h"
-#include "FavouritesDbObserver.h"
+#include "activefavouritesdbnotifier.h"
+#include "favouritesdbobserver.h"
 
 // ================= MEMBER FUNCTIONS =======================
 
diff -r 9a9a761f03f1 -r 0ed94ceaa377 browserutilities/favouritesengine/ClientServer/src/FavouritesDb.cpp
--- a/browserutilities/favouritesengine/ClientServer/src/FavouritesDb.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/browserutilities/favouritesengine/ClientServer/src/FavouritesDb.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -21,13 +21,13 @@
 // 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" 
diff -r 9a9a761f03f1 -r 0ed94ceaa377 browserutilities/favouritesengine/ClientServer/src/FavouritesDbIncremental.cpp
--- a/browserutilities/favouritesengine/ClientServer/src/FavouritesDbIncremental.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/browserutilities/favouritesengine/ClientServer/src/FavouritesDbIncremental.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -20,8 +20,8 @@
 
 // INCLUDE FILES
 
-#include "FavouritesDbIncremental.h"
-#include "FavouritesDb.h"
+#include "favouritesdbincremental.h"
+#include "favouritesdb.h"
 #include "FavouritesMsg.h"
 
 // ================= MEMBER FUNCTIONS =======================
diff -r 9a9a761f03f1 -r 0ed94ceaa377 browserutilities/favouritesengine/ClientServer/src/FavouritesDbNotifier.cpp
--- a/browserutilities/favouritesengine/ClientServer/src/FavouritesDbNotifier.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/browserutilities/favouritesengine/ClientServer/src/FavouritesDbNotifier.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -20,8 +20,8 @@
 
 // INCLUDE FILES
 
-#include "FavouritesDbNotifier.h"
-#include "FavouritesDb.h"
+#include "favouritesdbnotifier.h"
+#include "favouritesdb.h"
 #include "FavouritesMsg.h"
 
 // ================= MEMBER FUNCTIONS =======================
diff -r 9a9a761f03f1 -r 0ed94ceaa377 browserutilities/favouritesengine/ClientServer/src/FavouritesFile.cpp
--- a/browserutilities/favouritesengine/ClientServer/src/FavouritesFile.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/browserutilities/favouritesengine/ClientServer/src/FavouritesFile.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -20,10 +20,10 @@
 
 // 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
diff -r 9a9a761f03f1 -r 0ed94ceaa377 browserutilities/favouritesengine/ClientServer/src/FavouritesHandle.cpp
--- a/browserutilities/favouritesengine/ClientServer/src/FavouritesHandle.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/browserutilities/favouritesengine/ClientServer/src/FavouritesHandle.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -18,7 +18,7 @@
 
 // INCLUDE FILES
 
-#include "FavouritesHandle.h"
+#include "favouriteshandle.h"
 #include "FavouritesMsg.h"
 #include "FavouritesPanic.h"
 #include "FavouritesLogger.h" 
diff -r 9a9a761f03f1 -r 0ed94ceaa377 browserutilities/favouritesengine/ClientServer/src/FavouritesItem.cpp
--- a/browserutilities/favouritesengine/ClientServer/src/FavouritesItem.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/browserutilities/favouritesengine/ClientServer/src/FavouritesItem.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -20,7 +20,7 @@
 
 // INCLUDE FILES
 
-#include "FavouritesItem.h"
+#include "favouritesitem.h"
 #include "FavouritesItemImpl.h"
 #include "FavouritesPanic.h"
 
diff -r 9a9a761f03f1 -r 0ed94ceaa377 browserutilities/favouritesengine/ClientServer/src/FavouritesItemList.cpp
--- a/browserutilities/favouritesengine/ClientServer/src/FavouritesItemList.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/browserutilities/favouritesengine/ClientServer/src/FavouritesItemList.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -21,8 +21,8 @@
 // INCLUDE FILES
 
 #include <s32strm.h>
-#include "FavouritesItemList.h"
-#include "FavouritesItem.h"
+#include "favouritesitemlist.h"
+#include "favouritesitem.h"
 
 // CONSTANTS
 
diff -r 9a9a761f03f1 -r 0ed94ceaa377 browserutilities/favouritesengine/ClientServer/src/FavouritesSession.cpp
--- a/browserutilities/favouritesengine/ClientServer/src/FavouritesSession.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/browserutilities/favouritesengine/ClientServer/src/FavouritesSession.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -20,7 +20,7 @@
 
 // INCLUDE FILES
 
-#include "FavouritesSession.h"
+#include "favouritessession.h"
 #include "FavouritesSrv.h"
 #include "FavouritesVersion.h"
 #include "FavouritesDef.h"
diff -r 9a9a761f03f1 -r 0ed94ceaa377 browserutilities/favouritesengine/ClientServer/src/FavouritesWapAp.cpp
--- a/browserutilities/favouritesengine/ClientServer/src/FavouritesWapAp.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/browserutilities/favouritesengine/ClientServer/src/FavouritesWapAp.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -20,7 +20,7 @@
 
 // INCLUDE FILES
 
-#include "FavouritesWapAp.h"
+#include "favouriteswapap.h"
 #include "FavouritesPanic.h"
 
 // CONSTANTS
diff -r 9a9a761f03f1 -r 0ed94ceaa377 browserutilities/favouritesengine/ClientServer/srvinc/FavouritesSrvDb.h
--- a/browserutilities/favouritesengine/ClientServer/srvinc/FavouritesSrvDb.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/browserutilities/favouritesengine/ClientServer/srvinc/FavouritesSrvDb.h	Thu Dec 17 09:20:16 2009 +0200
@@ -26,10 +26,10 @@
 #include <e32base.h>
 #include <d32dbms.h>
 #include <f32file.h>
-#include <FavouritesLimits.h>
+#include <favouriteslimits.h>
 #include "FavouritesSrvTable.h"
 #include "UnicodeFile.h"
-#include <FavouritesDb.h>
+#include <favouritesdb.h>
 
 
 // FORWARD DECLARATIONS
diff -r 9a9a761f03f1 -r 0ed94ceaa377 browserutilities/favouritesengine/ClientServer/srvsrc/FavouritesSrv.cpp
--- a/browserutilities/favouritesengine/ClientServer/srvsrc/FavouritesSrv.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/browserutilities/favouritesengine/ClientServer/srvsrc/FavouritesSrv.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -20,7 +20,7 @@
 
 // INCLUDE FILES
 
-#include "FavouritesSession.h"
+#include "favouritessession.h"
 #include "FavouritesSrv.h"
 #include "FavouritesSrvSession.h"
 #include "FavouritesDef.h"
diff -r 9a9a761f03f1 -r 0ed94ceaa377 browserutilities/favouritesengine/ClientServer/srvsrc/FavouritesSrvDb.cpp
--- a/browserutilities/favouritesengine/ClientServer/srvsrc/FavouritesSrvDb.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/browserutilities/favouritesengine/ClientServer/srvsrc/FavouritesSrvDb.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -29,8 +29,8 @@
 #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" 
diff -r 9a9a761f03f1 -r 0ed94ceaa377 browserutilities/favouritesengine/ClientServer/srvsrc/FavouritesSrvTable.cpp
--- a/browserutilities/favouritesengine/ClientServer/srvsrc/FavouritesSrvTable.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/browserutilities/favouritesengine/ClientServer/srvsrc/FavouritesSrvTable.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -23,7 +23,7 @@
 #include <s32strm.h>
 #include "FavouritesSrvTable.h"
 #include "FavouritesPanic.h"
-#include "FavouritesItemData.h"
+#include "favouritesitemdata.h"
 #include "FavouritesFilter.h"
 
 // CONSTANTS
diff -r 9a9a761f03f1 -r 0ed94ceaa377 browserutilities/favouritesengine/ClientServer/utilinc/BookmarkFileImporter.h
--- a/browserutilities/favouritesengine/ClientServer/utilinc/BookmarkFileImporter.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/browserutilities/favouritesengine/ClientServer/utilinc/BookmarkFileImporter.h	Thu Dec 17 09:20:16 2009 +0200
@@ -25,7 +25,7 @@
 
 #include <e32base.h>
 #include <f32file.h>
-#include <FavouritesDb.h>
+#include <favouritesdb.h>
 #include "UnicodeFile.h"
 
 // FORWARD DECLARATIONS
diff -r 9a9a761f03f1 -r 0ed94ceaa377 browserutilities/favouritesengine/ClientServer/utilsrc/BookmarkDumpMain.cpp
--- a/browserutilities/favouritesengine/ClientServer/utilsrc/BookmarkDumpMain.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/browserutilities/favouritesengine/ClientServer/utilsrc/BookmarkDumpMain.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -21,9 +21,9 @@
 // INCLUDE FILES
 
 #include <bacline.h>
-#include <FavouritesDb.h>
-#include <FavouritesLimits.h>
-#include <FavouritesItemList.h>
+#include <favouritesdb.h>
+#include <favouriteslimits.h>
+#include <favouritesitemlist.h>
 #include "UnicodeFile.h"
 
 // CONSTANTS
diff -r 9a9a761f03f1 -r 0ed94ceaa377 browserutilities/favouritesengine/ClientServer/utilsrc/BookmarkFileImporter.cpp
--- a/browserutilities/favouritesengine/ClientServer/utilsrc/BookmarkFileImporter.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/browserutilities/favouritesengine/ClientServer/utilsrc/BookmarkFileImporter.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -21,7 +21,7 @@
 // INCLUDE FILES
 
 #include "BookmarkFileImporter.h"
-#include <FavouritesLimits.h>
+#include <favouriteslimits.h>
 // TEMP
 #include <s32file.h>
 // END TEMP
diff -r 9a9a761f03f1 -r 0ed94ceaa377 browserutilities/feedsengine/FeedsServer/Api/group/FeedsServerApi.mmp
--- a/browserutilities/feedsengine/FeedsServer/Api/group/FeedsServerApi.mmp	Tue Nov 24 09:02:20 2009 +0200
+++ b/browserutilities/feedsengine/FeedsServer/Api/group/FeedsServerApi.mmp	Thu Dec 17 09:20:16 2009 +0200
@@ -18,7 +18,7 @@
 
 #include <data_caging_paths.hrh>
 #include <platform_paths.hrh>
-#include <platform/mw/Browser_platform_variant.hrh>
+#include <platform/mw/browser_platform_variant.hrh>
 
 CAPABILITY        CAP_CLIENT_DLL 
 VENDORID          VID_DEFAULT
diff -r 9a9a761f03f1 -r 0ed94ceaa377 browserutilities/feedsengine/FeedsServer/Api/group/bld.inf
--- a/browserutilities/feedsengine/FeedsServer/Api/group/bld.inf	Tue Nov 24 09:02:20 2009 +0200
+++ b/browserutilities/feedsengine/FeedsServer/Api/group/bld.inf	Thu Dec 17 09:20:16 2009 +0200
@@ -16,7 +16,7 @@
 */
 
 #include <platform_paths.hrh>
-#include "../../../../../web_plat/browser_platform_api/inc/Browser_platform_variant.hrh"
+#include "../../../../../web_plat/browser_platform_api/inc/browser_platform_variant.hrh"
 
 PRJ_PLATFORMS
 ARMV5 WINSCW
diff -r 9a9a761f03f1 -r 0ed94ceaa377 browserutilities/feedsengine/FeedsServer/Api/src/FeedsEntity.cpp
--- a/browserutilities/feedsengine/FeedsServer/Api/src/FeedsEntity.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/browserutilities/feedsengine/FeedsServer/Api/src/FeedsEntity.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -16,15 +16,15 @@
 */
 
 
-#include "FeedsEntity.h"
-#include "FeedsMap.h"
+#include "feedsentity.h"
+#include "feedsmap.h"
 #include "PackedAttributes.h"
-#include "FeedAttributes.h"
-#include <FolderAttributes.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");
diff -r 9a9a761f03f1 -r 0ed94ceaa377 browserutilities/feedsengine/FeedsServer/Api/src/FeedsInterface.cpp
--- a/browserutilities/feedsengine/FeedsServer/Api/src/FeedsInterface.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/browserutilities/feedsengine/FeedsServer/Api/src/FeedsInterface.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -16,11 +16,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>
 
diff -r 9a9a761f03f1 -r 0ed94ceaa377 browserutilities/feedsengine/FeedsServer/Api/src/FeedsMap.cpp
--- a/browserutilities/feedsengine/FeedsServer/Api/src/FeedsMap.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/browserutilities/feedsengine/FeedsServer/Api/src/FeedsMap.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -16,7 +16,7 @@
 */
 
 
-#include "FeedsMap.h"
+#include "feedsmap.h"
 // -----------------------------------------------------------------------------
 // CFeedsMap::NewL
 //
diff -r 9a9a761f03f1 -r 0ed94ceaa377 browserutilities/feedsengine/FeedsServer/Api/src/Transaction.cpp
--- a/browserutilities/feedsengine/FeedsServer/Api/src/Transaction.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/browserutilities/feedsengine/FeedsServer/Api/src/Transaction.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -16,13 +16,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"
diff -r 9a9a761f03f1 -r 0ed94ceaa377 browserutilities/feedsengine/FeedsServer/Client/inc/ClientRequestHandlers.h
--- a/browserutilities/feedsengine/FeedsServer/Client/inc/ClientRequestHandlers.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/browserutilities/feedsengine/FeedsServer/Client/inc/ClientRequestHandlers.h	Thu Dec 17 09:20:16 2009 +0200
@@ -23,8 +23,8 @@
 #warning This header file has been deprecated. Will be removed in one of the next SDK releases.
 
 // INCLUDES
-#include <FeedsServerMsg.h>
-#include <FeedsServerRequestHandler.h>
+#include <feedsservermsg.h>
+#include <feedsserverrequesthandler.h>
 
 
 // CONSTANTS
diff -r 9a9a761f03f1 -r 0ed94ceaa377 browserutilities/feedsengine/FeedsServer/Client/inc/FeedRequestHandlers.h
--- a/browserutilities/feedsengine/FeedsServer/Client/inc/FeedRequestHandlers.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/browserutilities/feedsengine/FeedsServer/Client/inc/FeedRequestHandlers.h	Thu Dec 17 09:20:16 2009 +0200
@@ -23,9 +23,9 @@
 #warning This header file has been deprecated. Will be removed in one of the next SDK releases.
 
 // INCLUDES
-#include <FeedsServerMsg.h>
+#include <feedsservermsg.h>
 
-#include "FeedsServerRequestHandler.h"
+#include "feedsserverrequesthandler.h"
 
 // CONSTANTS
 
diff -r 9a9a761f03f1 -r 0ed94ceaa377 browserutilities/feedsengine/FeedsServer/Client/inc/FolderItemRequestHandlers.h
--- a/browserutilities/feedsengine/FeedsServer/Client/inc/FolderItemRequestHandlers.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/browserutilities/feedsengine/FeedsServer/Client/inc/FolderItemRequestHandlers.h	Thu Dec 17 09:20:16 2009 +0200
@@ -24,9 +24,9 @@
 
 // INCLUDES
 #include <f32file.h>
-#include <FeedsServerMsg.h>
-#include "FeedsEntity.h"
-#include "FeedsServerRequestHandler.h"
+#include <feedsservermsg.h>
+#include "feedsentity.h"
+#include "feedsserverrequesthandler.h"
 
 // CONSTANTS
 
diff -r 9a9a761f03f1 -r 0ed94ceaa377 browserutilities/feedsengine/FeedsServer/Client/src/ClientRequestHandlers.cpp
--- a/browserutilities/feedsengine/FeedsServer/Client/src/ClientRequestHandlers.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/browserutilities/feedsengine/FeedsServer/Client/src/ClientRequestHandlers.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -16,7 +16,7 @@
 */
 
 
-#include <FeedsServerClient.h>
+#include <feedsserverclient.h>
 #include <S32Mem.h>
 
 #include "ClientRequestHandlers.h"
@@ -111,4 +111,4 @@
 void CClientRequestHandler::SetFeedsServerFolderItem(RFolderItem* aFeedsServerFolderItem)
     {
     iFeedsServerFolderItem = aFeedsServerFolderItem;
-    }
\ No newline at end of file
+    }
diff -r 9a9a761f03f1 -r 0ed94ceaa377 browserutilities/feedsengine/FeedsServer/Client/src/Enclosure.cpp
--- a/browserutilities/feedsengine/FeedsServer/Client/src/Enclosure.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/browserutilities/feedsengine/FeedsServer/Client/src/Enclosure.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -16,8 +16,8 @@
 */
 
 
-#include "FeedAttributes.h"
-#include "FeedsServerFeed.h"
+#include "feedattributes.h"
+#include "feedsserverfeed.h"
 #include "Logger.h"
 
 // -----------------------------------------------------------------------------
diff -r 9a9a761f03f1 -r 0ed94ceaa377 browserutilities/feedsengine/FeedsServer/Client/src/Feed.cpp
--- a/browserutilities/feedsengine/FeedsServer/Client/src/Feed.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/browserutilities/feedsengine/FeedsServer/Client/src/Feed.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -20,8 +20,8 @@
 #include <f32file.h>
 //#endif
 
-#include "FeedAttributes.h"
-#include "FeedsServerFeed.h"
+#include "feedattributes.h"
+#include "feedsserverfeed.h"
 #include "Logger.h"
 
 // -----------------------------------------------------------------------------
diff -r 9a9a761f03f1 -r 0ed94ceaa377 browserutilities/feedsengine/FeedsServer/Client/src/FeedRequestHandlers.cpp
--- a/browserutilities/feedsengine/FeedsServer/Client/src/FeedRequestHandlers.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/browserutilities/feedsengine/FeedsServer/Client/src/FeedRequestHandlers.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -16,7 +16,7 @@
 */
 
 
-#include <FeedsServerFeed.h>
+#include <feedsserverfeed.h>
 #include <S32Mem.h>
 #include <es_sock.h>
 
@@ -102,4 +102,4 @@
  void CFeedRequestHandler::SetOperationRequested(TInt aOperationRequested)
     {
     iOperationRequested = aOperationRequested;
-    }
\ No newline at end of file
+    }
diff -r 9a9a761f03f1 -r 0ed94ceaa377 browserutilities/feedsengine/FeedsServer/Client/src/FeedsServerClient.cpp
--- a/browserutilities/feedsengine/FeedsServer/Client/src/FeedsServerClient.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/browserutilities/feedsengine/FeedsServer/Client/src/FeedsServerClient.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -16,9 +16,9 @@
 */
 
 
-#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"
diff -r 9a9a761f03f1 -r 0ed94ceaa377 browserutilities/feedsengine/FeedsServer/Client/src/FeedsServerFeed.cpp
--- a/browserutilities/feedsengine/FeedsServer/Client/src/FeedsServerFeed.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/browserutilities/feedsengine/FeedsServer/Client/src/FeedsServerFeed.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -16,8 +16,8 @@
 */
 
 
-#include "FeedsServerClient.h"
-#include "FeedsServerFeed.h" 
+#include "feedsserverclient.h"
+#include "feedsserverfeed.h" 
 #include "FeedRequestHandlers.h"
 #include "ClientRequestHandlers.h"
 
diff -r 9a9a761f03f1 -r 0ed94ceaa377 browserutilities/feedsengine/FeedsServer/Client/src/FeedsServerFolderItem.cpp
--- a/browserutilities/feedsengine/FeedsServer/Client/src/FeedsServerFolderItem.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/browserutilities/feedsengine/FeedsServer/Client/src/FeedsServerFolderItem.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -16,8 +16,8 @@
 */
 
 
-#include "FeedsServerClient.h"
-#include "FeedsServerFolderItem.h"
+#include "feedsserverclient.h"
+#include "feedsserverfolderitem.h"
 #include "FolderItemRequestHandlers.h"
 #include "FeedRequestHandlers.h"
 #include "ClientRequestHandlers.h"
diff -r 9a9a761f03f1 -r 0ed94ceaa377 browserutilities/feedsengine/FeedsServer/Client/src/FolderItem.cpp
--- a/browserutilities/feedsengine/FeedsServer/Client/src/FolderItem.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/browserutilities/feedsengine/FeedsServer/Client/src/FolderItem.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -17,9 +17,9 @@
 */
 
 
-#include "FeedsServerFolderItem.h"
-#include "FolderAttributes.h"
-#include "FeedAttributes.h"
+#include "feedsserverfolderitem.h"
+#include "folderattributes.h"
+#include "feedattributes.h"
 #include "PackedFolder.h"
 
 // -----------------------------------------------------------------------------
diff -r 9a9a761f03f1 -r 0ed94ceaa377 browserutilities/feedsengine/FeedsServer/Client/src/FolderItemRequestHandlers.cpp
--- a/browserutilities/feedsengine/FeedsServer/Client/src/FolderItemRequestHandlers.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/browserutilities/feedsengine/FeedsServer/Client/src/FolderItemRequestHandlers.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -17,7 +17,7 @@
 
 
 #include <e32base.h>
-#include <FeedsServerFolderItem.h>
+#include <feedsserverfolderitem.h>
 #include <S32Mem.h>
 #include <es_sock.h>
 
@@ -103,4 +103,4 @@
  void CFolderItemRequestHandler::SetOperationRequested(TInt aOperationRequested)
     {
     iOperationRequested = aOperationRequested;
-    }
\ No newline at end of file
+    }
diff -r 9a9a761f03f1 -r 0ed94ceaa377 browserutilities/feedsengine/FeedsServer/Client/src/Item.cpp
--- a/browserutilities/feedsengine/FeedsServer/Client/src/Item.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/browserutilities/feedsengine/FeedsServer/Client/src/Item.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -16,8 +16,8 @@
 */
 
 
-#include "FeedAttributes.h"
-#include "FeedsServerFeed.h"
+#include "feedattributes.h"
+#include "feedsserverfeed.h"
 #include "Logger.h"
 
 // Constants
diff -r 9a9a761f03f1 -r 0ed94ceaa377 browserutilities/feedsengine/FeedsServer/Client/src/RequestHandler.cpp
--- a/browserutilities/feedsengine/FeedsServer/Client/src/RequestHandler.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/browserutilities/feedsengine/FeedsServer/Client/src/RequestHandler.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -16,7 +16,7 @@
 */
 
 
-#include "FeedsServerRequestHandler.h"
+#include "feedsserverrequesthandler.h"
 
 // -----------------------------------------------------------------------------
 // CRequestHandler::CRequestHandler
@@ -35,4 +35,4 @@
 // -----------------------------------------------------------------------------
 CRequestHandler::~CRequestHandler() 
     {
-    }
\ No newline at end of file
+    }
diff -r 9a9a761f03f1 -r 0ed94ceaa377 browserutilities/feedsengine/FeedsServer/Common/inc/PackedFeed.h
--- a/browserutilities/feedsengine/FeedsServer/Common/inc/PackedFeed.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/browserutilities/feedsengine/FeedsServer/Common/inc/PackedFeed.h	Thu Dec 17 09:20:16 2009 +0200
@@ -24,7 +24,7 @@
 // INCLUDES
 #include <e32base.h>
 
-#include "LeakTracker.h"
+#include "leaktracker.h"
 #include "Packed.h"
 
 // CONSTANTS
diff -r 9a9a761f03f1 -r 0ed94ceaa377 browserutilities/feedsengine/FeedsServer/Common/inc/PackedFolder.h
--- a/browserutilities/feedsengine/FeedsServer/Common/inc/PackedFolder.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/browserutilities/feedsengine/FeedsServer/Common/inc/PackedFolder.h	Thu Dec 17 09:20:16 2009 +0200
@@ -24,7 +24,7 @@
 // INCLUDES
 #include <e32base.h>
 
-#include "LeakTracker.h"
+#include "leaktracker.h"
 #include "Packed.h"
 
 // CONSTANTS
diff -r 9a9a761f03f1 -r 0ed94ceaa377 browserutilities/feedsengine/FeedsServer/Common/src/LeakTracker.cpp
--- a/browserutilities/feedsengine/FeedsServer/Common/src/LeakTracker.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/browserutilities/feedsengine/FeedsServer/Common/src/LeakTracker.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -17,7 +17,7 @@
 
 
 
-#include "LeakTracker.h"
+#include "leaktracker.h"
 #include "Logger.h"
 
 // Globals
diff -r 9a9a761f03f1 -r 0ed94ceaa377 browserutilities/feedsengine/FeedsServer/Common/src/PackedFeed.cpp
--- a/browserutilities/feedsengine/FeedsServer/Common/src/PackedFeed.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/browserutilities/feedsengine/FeedsServer/Common/src/PackedFeed.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -18,7 +18,7 @@
 
 
 #include "PackedAttributes.h"
-#include "FeedAttributes.h"
+#include "feedattributes.h"
 #include "PackedFeed.h"
 #include "Logger.h"
 
diff -r 9a9a761f03f1 -r 0ed94ceaa377 browserutilities/feedsengine/FeedsServer/Common/src/PackedFolder.cpp
--- a/browserutilities/feedsengine/FeedsServer/Common/src/PackedFolder.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/browserutilities/feedsengine/FeedsServer/Common/src/PackedFolder.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -17,8 +17,8 @@
 */
 
 #include "PackedAttributes.h"
-#include "FeedAttributes.h"
-#include "FolderAttributes.h"
+#include "feedattributes.h"
+#include "folderattributes.h"
 #include "PackedFolder.h"
 #include "Logger.h"
 
diff -r 9a9a761f03f1 -r 0ed94ceaa377 browserutilities/feedsengine/FeedsServer/FeedHandler/inc/FeedHandler.h
--- a/browserutilities/feedsengine/FeedsServer/FeedHandler/inc/FeedHandler.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/browserutilities/feedsengine/FeedsServer/FeedHandler/inc/FeedHandler.h	Thu Dec 17 09:20:16 2009 +0200
@@ -25,7 +25,7 @@
 #include <e32base.h>
 
 #include "FeedParser.h"
-#include "LeakTracker.h"
+#include "leaktracker.h"
 
 // CONSTANTS
 
diff -r 9a9a761f03f1 -r 0ed94ceaa377 browserutilities/feedsengine/FeedsServer/FeedHandler/src/AtomFeedParser.cpp
--- a/browserutilities/feedsengine/FeedsServer/FeedHandler/src/AtomFeedParser.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/browserutilities/feedsengine/FeedsServer/FeedHandler/src/AtomFeedParser.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -16,9 +16,9 @@
 */
 
 
-#include "FeedAttributes.h"
+#include "feedattributes.h"
 #include "FeedParserObserver.h"
-#include "LeakTracker.h"
+#include "leaktracker.h"
 #include "AtomFeedParser.h"
 #include "XmlUtils.h"
 
diff -r 9a9a761f03f1 -r 0ed94ceaa377 browserutilities/feedsengine/FeedsServer/FeedHandler/src/FeedHandler.cpp
--- a/browserutilities/feedsengine/FeedsServer/FeedHandler/src/FeedHandler.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/browserutilities/feedsengine/FeedsServer/FeedHandler/src/FeedHandler.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -19,7 +19,7 @@
 
 #include "CleanupLibXml2.h"
 #include "FeedHandler.h"
-#include "LeakTracker.h"
+#include "leaktracker.h"
 #include "RssFeedParser.h"
 #include "AtomFeedParser.h"
 #include "XmlUtils.h"
diff -r 9a9a761f03f1 -r 0ed94ceaa377 browserutilities/feedsengine/FeedsServer/FeedHandler/src/FeedParser.cpp
--- a/browserutilities/feedsengine/FeedsServer/FeedHandler/src/FeedParser.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/browserutilities/feedsengine/FeedsServer/FeedHandler/src/FeedParser.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -20,7 +20,7 @@
 
 #include "FeedParser.h"
 #include "FeedParserObserver.h"
-#include "LeakTracker.h"
+#include "leaktracker.h"
 #include "XmlUtils.h"
 
 
diff -r 9a9a761f03f1 -r 0ed94ceaa377 browserutilities/feedsengine/FeedsServer/FeedHandler/src/RssFeedParser.cpp
--- a/browserutilities/feedsengine/FeedsServer/FeedHandler/src/RssFeedParser.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/browserutilities/feedsengine/FeedsServer/FeedHandler/src/RssFeedParser.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -16,9 +16,9 @@
 */
 
 
-#include "FeedAttributes.h"
+#include "feedattributes.h"
 #include "FeedParserObserver.h"
-#include "LeakTracker.h"
+#include "leaktracker.h"
 #include "RssFeedParser.h"
 #include "XmlUtils.h"
 
diff -r 9a9a761f03f1 -r 0ed94ceaa377 browserutilities/feedsengine/FeedsServer/FolderHandler/inc/OpmlParser.h
--- a/browserutilities/feedsengine/FeedsServer/FolderHandler/inc/OpmlParser.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/browserutilities/feedsengine/FeedsServer/FolderHandler/inc/OpmlParser.h	Thu Dec 17 09:20:16 2009 +0200
@@ -24,7 +24,7 @@
 #include <e32base.h>
 #include <xmlengdom.h>
 
-#include "LeakTracker.h"
+#include "leaktracker.h"
 
 // CONSTANTS
 
diff -r 9a9a761f03f1 -r 0ed94ceaa377 browserutilities/feedsengine/FeedsServer/FolderHandler/src/OpmlParser.cpp
--- a/browserutilities/feedsengine/FeedsServer/FolderHandler/src/OpmlParser.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/browserutilities/feedsengine/FeedsServer/FolderHandler/src/OpmlParser.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -18,7 +18,7 @@
 
 #include "OpmlParser.h"
 #include "CleanupLibXml2.h"
-#include "LeakTracker.h"
+#include "leaktracker.h"
 #include "PackedFolder.h"
 #include "XmlUtils.h"
 
diff -r 9a9a761f03f1 -r 0ed94ceaa377 browserutilities/feedsengine/FeedsServer/Reconizer/group/FeedsRec.mmp
--- a/browserutilities/feedsengine/FeedsServer/Reconizer/group/FeedsRec.mmp	Tue Nov 24 09:02:20 2009 +0200
+++ b/browserutilities/feedsengine/FeedsServer/Reconizer/group/FeedsRec.mmp	Thu Dec 17 09:20:16 2009 +0200
@@ -16,7 +16,7 @@
 */
 
 #include <platform_paths.hrh>
-#include <platform/mw/Browser_platform_variant.hrh>
+#include <platform/mw/browser_platform_variant.hrh>
 
 TARGET          FeedsRec.DLL
 TARGETTYPE      PLUGIN
diff -r 9a9a761f03f1 -r 0ed94ceaa377 browserutilities/feedsengine/FeedsServer/Server/inc/FeedsDatabase.h
--- a/browserutilities/feedsengine/FeedsServer/Server/inc/FeedsDatabase.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/browserutilities/feedsengine/FeedsServer/Server/inc/FeedsDatabase.h	Thu Dec 17 09:20:16 2009 +0200
@@ -24,7 +24,7 @@
 #include <e32base.h>
 #include <f32file.h>
 
-#include "LeakTracker.h"
+#include "leaktracker.h"
 
 // CONSTANTS
 const TInt KUnassignedId = -1;
diff -r 9a9a761f03f1 -r 0ed94ceaa377 browserutilities/feedsengine/FeedsServer/Server/inc/FeedsServer.h
--- a/browserutilities/feedsengine/FeedsServer/Server/inc/FeedsServer.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/browserutilities/feedsengine/FeedsServer/Server/inc/FeedsServer.h	Thu Dec 17 09:20:16 2009 +0200
@@ -23,7 +23,7 @@
 //  INCLUDES
 #include <e32base.h>
 
-#include "LeakTracker.h"
+#include "leaktracker.h"
 #include "UpdateAllFeedsTask.h"
 #include "etel3rdparty.h"
 
diff -r 9a9a761f03f1 -r 0ed94ceaa377 browserutilities/feedsengine/FeedsServer/Server/inc/FeedsServerSession.h
--- a/browserutilities/feedsengine/FeedsServer/Server/inc/FeedsServerSession.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/browserutilities/feedsengine/FeedsServer/Server/inc/FeedsServerSession.h	Thu Dec 17 09:20:16 2009 +0200
@@ -22,7 +22,7 @@
 // INCLUDES
 #include <e32base.h>
 
-#include "LeakTracker.h"
+#include "leaktracker.h"
 #include "UpdateFeedTask.h"
 #include "UpdateAllFeedsTask.h"
 #include "ImportFeedsTask.h"
diff -r 9a9a761f03f1 -r 0ed94ceaa377 browserutilities/feedsengine/FeedsServer/Server/inc/ImportFeedsTask.h
--- a/browserutilities/feedsengine/FeedsServer/Server/inc/ImportFeedsTask.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/browserutilities/feedsengine/FeedsServer/Server/inc/ImportFeedsTask.h	Thu Dec 17 09:20:16 2009 +0200
@@ -28,7 +28,7 @@
 #include "PackedFolder.h"
 #include "PackedAttributes.h"
 #include "FeedsDatabase.h"
-#include "FolderAttributes.h"
+#include "folderattributes.h"
 
 // CONSTANTS
 
diff -r 9a9a761f03f1 -r 0ed94ceaa377 browserutilities/feedsengine/FeedsServer/Server/inc/UpdateAllFeedsTask.h
--- a/browserutilities/feedsengine/FeedsServer/Server/inc/UpdateAllFeedsTask.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/browserutilities/feedsengine/FeedsServer/Server/inc/UpdateAllFeedsTask.h	Thu Dec 17 09:20:16 2009 +0200
@@ -23,7 +23,7 @@
 // INCLUDES
 #include <e32base.h>
 
-#include "LeakTracker.h"
+#include "leaktracker.h"
 #include "UpdateFeedTask.h"
 #include "Task.h"
 #include "f32file.h"
diff -r 9a9a761f03f1 -r 0ed94ceaa377 browserutilities/feedsengine/FeedsServer/Server/inc/UpdateFeedTask.h
--- a/browserutilities/feedsengine/FeedsServer/Server/inc/UpdateFeedTask.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/browserutilities/feedsengine/FeedsServer/Server/inc/UpdateFeedTask.h	Thu Dec 17 09:20:16 2009 +0200
@@ -24,7 +24,7 @@
 #include <e32base.h>
 
 #include "FeedParserObserver.h"
-#include "LeakTracker.h"
+#include "leaktracker.h"
 #include "LoadObserver.h"
 #include "Task.h"
 
diff -r 9a9a761f03f1 -r 0ed94ceaa377 browserutilities/feedsengine/FeedsServer/Server/src/FeedsDatabase.cpp
--- a/browserutilities/feedsengine/FeedsServer/Server/src/FeedsDatabase.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/browserutilities/feedsengine/FeedsServer/Server/src/FeedsDatabase.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -19,11 +19,11 @@
 #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"
diff -r 9a9a761f03f1 -r 0ed94ceaa377 browserutilities/feedsengine/FeedsServer/Server/src/FeedsServer.cpp
--- a/browserutilities/feedsengine/FeedsServer/Server/src/FeedsServer.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/browserutilities/feedsengine/FeedsServer/Server/src/FeedsServer.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -19,7 +19,7 @@
 #include "FeedsDatabase.h"
 #include "FeedHandler.h"
 #include "FeedsServer.h"
-#include "FeedsServerMsg.h"
+#include "feedsservermsg.h"
 #include "FeedsServerSession.h"
 #include "OpmlParser.h"
 #include "OpmlWriter.h"
diff -r 9a9a761f03f1 -r 0ed94ceaa377 browserutilities/feedsengine/FeedsServer/Server/src/FeedsServerMain.cpp
--- a/browserutilities/feedsengine/FeedsServer/Server/src/FeedsServerMain.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/browserutilities/feedsengine/FeedsServer/Server/src/FeedsServerMain.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -19,7 +19,7 @@
 #include <e32std.h>
 
 #include "FeedsServer.h"
-#include "LeakTracker.h"
+#include "leaktracker.h"
 
 // -----------------------------------------------------------------------------
 // E32Main
diff -r 9a9a761f03f1 -r 0ed94ceaa377 browserutilities/feedsengine/FeedsServer/Server/src/FeedsServerSession.cpp
--- a/browserutilities/feedsengine/FeedsServer/Server/src/FeedsServerSession.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/browserutilities/feedsengine/FeedsServer/Server/src/FeedsServerSession.cpp	Thu Dec 17 09:20:16 2009 +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"
diff -r 9a9a761f03f1 -r 0ed94ceaa377 browserutilities/feedsengine/FeedsServer/Server/src/ImportFeedsTask.cpp
--- a/browserutilities/feedsengine/FeedsServer/Server/src/ImportFeedsTask.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/browserutilities/feedsengine/FeedsServer/Server/src/ImportFeedsTask.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -21,7 +21,7 @@
 #include "ImportFeedsTask.h"
 #include "FeedsDatabase.h"
 #include "FeedsServer.h"
-#include "FeedsServerMsg.h"
+#include "feedsservermsg.h"
 
 // Root folder related.
 const TInt  KRootFolderId = 0;
diff -r 9a9a761f03f1 -r 0ed94ceaa377 browserutilities/feedsengine/FeedsServer/Server/src/UpdateAllFeedsTask.cpp
--- a/browserutilities/feedsengine/FeedsServer/Server/src/UpdateAllFeedsTask.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/browserutilities/feedsengine/FeedsServer/Server/src/UpdateAllFeedsTask.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -16,10 +16,10 @@
 */
 
 
-#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"
@@ -254,6 +254,9 @@
                 // Get feed's url from the datbase.
                 (void) iFeedsServer.Database().UrlFromFeedIdL(
                         iFeedIds[iNextFeedIndex], feedUrl);
+                
+                User::LeaveIfNull(feedUrl);
+                
                 CleanupStack::PushL(feedUrl);
                 
                 // Create a new task to update the feed.
diff -r 9a9a761f03f1 -r 0ed94ceaa377 browserutilities/feedsengine/FeedsServer/Server/src/UpdateFeedTask.cpp
--- a/browserutilities/feedsengine/FeedsServer/Server/src/UpdateFeedTask.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/browserutilities/feedsengine/FeedsServer/Server/src/UpdateFeedTask.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -16,10 +16,10 @@
 */
 
 
-#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"
diff -r 9a9a761f03f1 -r 0ed94ceaa377 browserutilities/feedsengine/FeedsServer/UrlHandler/inc/FileHandler.h
--- a/browserutilities/feedsengine/FeedsServer/UrlHandler/inc/FileHandler.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/browserutilities/feedsengine/FeedsServer/UrlHandler/inc/FileHandler.h	Thu Dec 17 09:20:16 2009 +0200
@@ -23,7 +23,7 @@
 // INCLUDES
 #include <e32base.h>
 
-#include "LeakTracker.h"
+#include "leaktracker.h"
 #include "UrlHandler.h"
 
 // CONSTANTS
diff -r 9a9a761f03f1 -r 0ed94ceaa377 browserutilities/feedsengine/FeedsServer/UrlHandler/inc/HttpConnection.h
--- a/browserutilities/feedsengine/FeedsServer/UrlHandler/inc/HttpConnection.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/browserutilities/feedsengine/FeedsServer/UrlHandler/inc/HttpConnection.h	Thu Dec 17 09:20:16 2009 +0200
@@ -25,7 +25,7 @@
 #include <http/RHTTPSession.h>
 #include <mconnectioncallback.h>
 
-#include "LeakTracker.h"
+#include "leaktracker.h"
 
 // CONSTANTS
 
diff -r 9a9a761f03f1 -r 0ed94ceaa377 browserutilities/feedsengine/FeedsServer/UrlHandler/inc/HttpHandler.h
--- a/browserutilities/feedsengine/FeedsServer/UrlHandler/inc/HttpHandler.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/browserutilities/feedsengine/FeedsServer/UrlHandler/inc/HttpHandler.h	Thu Dec 17 09:20:16 2009 +0200
@@ -27,7 +27,7 @@
 #include <http/rhttptransaction.h>
 
 #include "HttpConnection.h"
-#include "LeakTracker.h"
+#include "leaktracker.h"
 #include "UrlHandler.h"
 
 // CONSTANTS
diff -r 9a9a761f03f1 -r 0ed94ceaa377 browserutilities/feedsengine/FeedsServer/UrlHandler/src/FileHandler.cpp
--- a/browserutilities/feedsengine/FeedsServer/UrlHandler/src/FileHandler.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/browserutilities/feedsengine/FeedsServer/UrlHandler/src/FileHandler.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -21,7 +21,7 @@
 #include <f32file.h>
 
 #include "FileHandler.h"
-#include "LeakTracker.h"
+#include "leaktracker.h"
 #include "Logger.h"
 
 
diff -r 9a9a761f03f1 -r 0ed94ceaa377 browserutilities/feedsengine/FeedsServer/UrlHandler/src/HttpConnection.cpp
--- a/browserutilities/feedsengine/FeedsServer/UrlHandler/src/HttpConnection.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/browserutilities/feedsengine/FeedsServer/UrlHandler/src/HttpConnection.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -17,13 +17,13 @@
 
 
 #include <http.h>
-#include <HttpFilterCommonStringsExt.h>
-#include <HttpFilterConnHandlerInterface.h>
-#include <InternetConnectionManager.h>
-#include <HttpFilterCommonStringsAddition.h>
+#include <httpfiltercommonstringsext.h>
+#include <httpfilterconnhandlerinterface.h>
+#include <internetconnectionmanager.h>
+#include <httpfiltercommonstringsaddition.h>
 
 #include "HttpConnection.h"
-#include "LeakTracker.h"
+#include "leaktracker.h"
 #include "Logger.h"
 
 
diff -r 9a9a761f03f1 -r 0ed94ceaa377 browserutilities/feedsengine/FeedsServer/UrlHandler/src/HttpHandler.cpp
--- a/browserutilities/feedsengine/FeedsServer/UrlHandler/src/HttpHandler.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/browserutilities/feedsengine/FeedsServer/UrlHandler/src/HttpHandler.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -19,14 +19,14 @@
 #include <EscapeUtils.h>
 #include <http.h>
 #include <http/mhttpdatasupplier.h>
-#include <HttpFilterCommonStringsAddition.h>
+#include <httpfiltercommonstringsaddition.h>
 
 #include "HttpConnection.h"
 #include "HttpHandler.h"
-#include "LeakTracker.h"
+#include "leaktracker.h"
 #include "Logger.h"
 
-#include "CUserAgent.h"
+#include "cuseragent.h"
 
 // -----------------------------------------------------------------------------
 // CHttpHandler::NewL
diff -r 9a9a761f03f1 -r 0ed94ceaa377 browserutilities/feedsengine/FeedsServer/UrlHandler/src/ServerHttpConnection.cpp
--- a/browserutilities/feedsengine/FeedsServer/UrlHandler/src/ServerHttpConnection.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/browserutilities/feedsengine/FeedsServer/UrlHandler/src/ServerHttpConnection.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -17,7 +17,7 @@
 
 
 #include <aputils.h> 
-#include <InternetConnectionManager.h>
+#include <internetconnectionmanager.h>
 
 #include "ServerHttpConnection.h"
 #include "Logger.h"
diff -r 9a9a761f03f1 -r 0ed94ceaa377 browserutilities/feedsengine/FeedsServer/XmlUtils/src/XmlEncoding.cpp
--- a/browserutilities/feedsengine/FeedsServer/XmlUtils/src/XmlEncoding.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/browserutilities/feedsengine/FeedsServer/XmlUtils/src/XmlEncoding.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -18,7 +18,7 @@
 
 #include <charconv.h>
 
-#include "XmlEncoding.h"
+#include "xmlencoding.h"
 
 
 // -----------------------------------------------------------------------------
diff -r 9a9a761f03f1 -r 0ed94ceaa377 browserutilities/feedsengine/FeedsServer/XmlUtils/src/XmlEntity.cpp
--- a/browserutilities/feedsengine/FeedsServer/XmlUtils/src/XmlEntity.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/browserutilities/feedsengine/FeedsServer/XmlUtils/src/XmlEntity.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -22,7 +22,7 @@
 #include <libxml2_globals.h>
 
 #include "CleanupLibXml2.h"
-#include "LeakTracker.h"
+#include "leaktracker.h"
 #include "XmlEntity.h"
 
 
diff -r 9a9a761f03f1 -r 0ed94ceaa377 browserutilities/feedsengine/FeedsServer/XmlUtils/src/XmlUtils.cpp
--- a/browserutilities/feedsengine/FeedsServer/XmlUtils/src/XmlUtils.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/browserutilities/feedsengine/FeedsServer/XmlUtils/src/XmlUtils.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -22,9 +22,9 @@
 #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"
 
diff -r 9a9a761f03f1 -r 0ed94ceaa377 browserutilities/feedsengine/FeedsUI/FeedsApp/src/FeedsAppUI.cpp
--- a/browserutilities/feedsengine/FeedsUI/FeedsApp/src/FeedsAppUI.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/browserutilities/feedsengine/FeedsUI/FeedsApp/src/FeedsAppUI.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -19,7 +19,7 @@
 
 #include "FeedsApp.hrh"
 #include "FeedsAppUi.h"
-#include "LeakTracker.h"
+#include "leaktracker.h"
 #include "TestHarnessView.h"
 
 #include "Logger.h"
diff -r 9a9a761f03f1 -r 0ed94ceaa377 browserutilities/feedsengine/FeedsUI/FeedsApp/src/FeedsApplication.cpp
--- a/browserutilities/feedsengine/FeedsUI/FeedsApp/src/FeedsApplication.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/browserutilities/feedsengine/FeedsUI/FeedsApp/src/FeedsApplication.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -19,7 +19,7 @@
 #include "FeedsApplication.h"
 #include "FeedsDocument.h"
 #include "FeedsViews.h"
-#include "LeakTracker.h"
+#include "leaktracker.h"
 
 
 // -----------------------------------------------------------------------------
diff -r 9a9a761f03f1 -r 0ed94ceaa377 browserutilities/feedsengine/FeedsUI/FeedsApp/src/FeedsDocument.cpp
--- a/browserutilities/feedsengine/FeedsUI/FeedsApp/src/FeedsDocument.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/browserutilities/feedsengine/FeedsUI/FeedsApp/src/FeedsDocument.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -23,7 +23,7 @@
 
 #include "FeedsAppUi.h"
 #include "FeedsDocument.h"
-#include "LeakTracker.h"
+#include "leaktracker.h"
 #include "Logger.h"
 
 
diff -r 9a9a761f03f1 -r 0ed94ceaa377 browserutilities/feedsengine/FeedsUI/TestHarness/inc/TestHarness.h
--- a/browserutilities/feedsengine/FeedsUI/TestHarness/inc/TestHarness.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/browserutilities/feedsengine/FeedsUI/TestHarness/inc/TestHarness.h	Thu Dec 17 09:20:16 2009 +0200
@@ -25,10 +25,10 @@
 #include <e32std.h>
 #include <f32file.h>
 
-#include <FeedsServerClient.h>
-#include <FeedsServerFeed.h>
-#include <FeedsServerFolderItem.h>
-#include <FeedsServerSettings.h>
+#include <feedsserverclient.h>
+#include <feedsserverfeed.h>
+#include <feedsserverfolderitem.h>
+#include <feedsserversettings.h>
 #include "FeedsWaitDialog.h"
 
 // CONSTANTS
diff -r 9a9a761f03f1 -r 0ed94ceaa377 browserutilities/feedsengine/FeedsUI/TestHarness/src/TestHarness.cpp
--- a/browserutilities/feedsengine/FeedsUI/TestHarness/src/TestHarness.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/browserutilities/feedsengine/FeedsUI/TestHarness/src/TestHarness.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -16,11 +16,11 @@
 */
 
 
-#include "LeakTracker.h"
+#include "leaktracker.h"
 #include "Logger.h"
 #include "StatusPane.h"
 #include "TestHarness.h"
-#include <InternetConnectionManager.h>
+#include <internetconnectionmanager.h>
 #include "FeedsWaitDialog.h"
 
 #include <FeedsApp.Rsg>
diff -r 9a9a761f03f1 -r 0ed94ceaa377 browserutilities/feedsengine/FeedsUI/TestHarness/src/TestHarnessContainer.cpp
--- a/browserutilities/feedsengine/FeedsUI/TestHarness/src/TestHarnessContainer.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/browserutilities/feedsengine/FeedsUI/TestHarness/src/TestHarnessContainer.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -18,7 +18,7 @@
 
 #include "TestHarnessContainer.h"
 #include "TestHarnessView.h"
-#include "LeakTracker.h"
+#include "leaktracker.h"
 
 
 // -----------------------------------------------------------------------------
diff -r 9a9a761f03f1 -r 0ed94ceaa377 browserutilities/feedsengine/FeedsUI/TestHarness/src/TestHarnessView.cpp
--- a/browserutilities/feedsengine/FeedsUI/TestHarness/src/TestHarnessView.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/browserutilities/feedsengine/FeedsUI/TestHarness/src/TestHarnessView.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -25,7 +25,7 @@
 #include "FeedsApp.hrh"
 
 #include "FeedsAppUi.h"
-#include "LeakTracker.h"
+#include "leaktracker.h"
 #include "TestHarness.h"
 #include "TestHarnessView.h"
 #include "TestHarnessContainer.h"
diff -r 9a9a761f03f1 -r 0ed94ceaa377 browserutilities/feedsengine/group/FeedsApp.mmp
--- a/browserutilities/feedsengine/group/FeedsApp.mmp	Tue Nov 24 09:02:20 2009 +0200
+++ b/browserutilities/feedsengine/group/FeedsApp.mmp	Thu Dec 17 09:20:16 2009 +0200
@@ -19,7 +19,7 @@
 #include <bldvariant.hrh>
 #include <data_caging_paths.hrh>
 #include <platform_paths.hrh>
-#include <platform/mw/Browser_platform_variant.hrh>
+#include <platform/mw/browser_platform_variant.hrh>
 
 
 TARGET          FeedsApp.exe
diff -r 9a9a761f03f1 -r 0ed94ceaa377 browserutilities/feedsengine/group/FeedsServer.mmp
--- a/browserutilities/feedsengine/group/FeedsServer.mmp	Tue Nov 24 09:02:20 2009 +0200
+++ b/browserutilities/feedsengine/group/FeedsServer.mmp	Thu Dec 17 09:20:16 2009 +0200
@@ -19,7 +19,7 @@
 #include <bldvariant.hrh>
 #include <data_caging_paths.hrh>
 #include <platform_paths.hrh>
-#include <platform/mw/Browser_platform_variant.hrh>
+#include <platform/mw/browser_platform_variant.hrh>
 
 
 TARGET          FeedsServer.exe
diff -r 9a9a761f03f1 -r 0ed94ceaa377 browserutilities/feedsengine/group/FeedsServerClient.mmp
--- a/browserutilities/feedsengine/group/FeedsServerClient.mmp	Tue Nov 24 09:02:20 2009 +0200
+++ b/browserutilities/feedsengine/group/FeedsServerClient.mmp	Thu Dec 17 09:20:16 2009 +0200
@@ -18,7 +18,7 @@
 
 #include <data_caging_paths.hrh>
 #include <platform_paths.hrh>
-#include <platform/mw/Browser_platform_variant.hrh>
+#include <platform/mw/browser_platform_variant.hrh>
 
 CAPABILITY        CAP_CLIENT_DLL 
 VENDORID          VID_DEFAULT
diff -r 9a9a761f03f1 -r 0ed94ceaa377 browserutilities/feedsengine/group/bld.inf
--- a/browserutilities/feedsengine/group/bld.inf	Tue Nov 24 09:02:20 2009 +0200
+++ b/browserutilities/feedsengine/group/bld.inf	Thu Dec 17 09:20:16 2009 +0200
@@ -18,7 +18,7 @@
 /*New Api INF file*/
 #include "../FeedsServer/Api/group/bld.inf"
 #include <platform_paths.hrh>
-#include "../../../web_plat/browser_platform_api/inc/Browser_platform_variant.hrh"
+#include "../../../web_plat/browser_platform_api/inc/browser_platform_variant.hrh"
 
 PRJ_PLATFORMS
 ARMV5 WINSCW
diff -r 9a9a761f03f1 -r 0ed94ceaa377 browserutilities/multipartparser/group/MultipartParser.mmp
--- a/browserutilities/multipartparser/group/MultipartParser.mmp	Tue Nov 24 09:02:20 2009 +0200
+++ b/browserutilities/multipartparser/group/MultipartParser.mmp	Thu Dec 17 09:20:16 2009 +0200
@@ -17,7 +17,7 @@
 
 
 #include <platform_paths.hrh>
-#include <platform/mw/Browser_platform_variant.hrh>
+#include <platform/mw/browser_platform_variant.hrh>
 
 TARGET          MultipartParser.dll
 TARGETTYPE      DLL
diff -r 9a9a761f03f1 -r 0ed94ceaa377 browserutilities/multipartparser/group/bld.inf
--- a/browserutilities/multipartparser/group/bld.inf	Tue Nov 24 09:02:20 2009 +0200
+++ b/browserutilities/multipartparser/group/bld.inf	Thu Dec 17 09:20:16 2009 +0200
@@ -16,7 +16,7 @@
 */
 
 #include <platform_paths.hrh>
-#include "../../../web_plat/browser_platform_api/inc/Browser_platform_variant.hrh"
+#include "../../../web_plat/browser_platform_api/inc/browser_platform_variant.hrh"
 
 #ifdef BRDO_MULTIPART_PARSER_FF
 
diff -r 9a9a761f03f1 -r 0ed94ceaa377 browserutilities/multipartparser/src/BodyPart.cpp
--- a/browserutilities/multipartparser/src/BodyPart.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/browserutilities/multipartparser/src/BodyPart.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -17,7 +17,7 @@
 
 
 // INCLUDE FILES
-#include "BodyPart.h"
+#include "bodypart.h"
 
 // CONSTANTS
 
diff -r 9a9a761f03f1 -r 0ed94ceaa377 browserutilities/multipartparser/src/MultipartParser.cpp
--- a/browserutilities/multipartparser/src/MultipartParser.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/browserutilities/multipartparser/src/MultipartParser.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -26,7 +26,7 @@
 #include <Uri16.h>
 #include <UriCommon.h>
 
-#include "MultipartParser.h"
+#include "multipartparser.h"
 #include "GZipBufMgr.h"
 #include "tinternetdate.h"
 
diff -r 9a9a761f03f1 -r 0ed94ceaa377 browserutilities/recenturlstore/RecentUrlSrc/RecentUrlStore.cpp
--- a/browserutilities/recenturlstore/RecentUrlSrc/RecentUrlStore.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/browserutilities/recenturlstore/RecentUrlSrc/RecentUrlStore.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -20,7 +20,7 @@
 
 
 // INCLUDE FILES
-#include "RecentUrlStore.h"
+#include "recenturlstore.h"
 
 // EXTERNAL DATA STRUCTURES
 
diff -r 9a9a761f03f1 -r 0ed94ceaa377 browserutilities/recenturlstore/group/RecentUrlStore.mmp
--- a/browserutilities/recenturlstore/group/RecentUrlStore.mmp	Tue Nov 24 09:02:20 2009 +0200
+++ b/browserutilities/recenturlstore/group/RecentUrlStore.mmp	Thu Dec 17 09:20:16 2009 +0200
@@ -16,7 +16,7 @@
 */
 
 #include <platform_paths.hrh>
-#include <platform/mw/Browser_platform_variant.hrh>
+#include <platform/mw/browser_platform_variant.hrh>
 
 TARGET          RECENTURLSTORE.DLL
 TARGETTYPE      DLL
diff -r 9a9a761f03f1 -r 0ed94ceaa377 browserutilities/recenturlstore/group/bld.inf
--- a/browserutilities/recenturlstore/group/bld.inf	Tue Nov 24 09:02:20 2009 +0200
+++ b/browserutilities/recenturlstore/group/bld.inf	Thu Dec 17 09:20:16 2009 +0200
@@ -18,7 +18,7 @@
 */
 
 #include <platform_paths.hrh>
-#include "../../../web_plat/browser_platform_api/inc/Browser_platform_variant.hrh"
+#include "../../../web_plat/browser_platform_api/inc/browser_platform_variant.hrh"
 
 PRJ_PLATFORMS
 DEFAULT
diff -r 9a9a761f03f1 -r 0ed94ceaa377 browserutilities/schemehandler/SchemeApp/data/SchemeAppAif.rss
--- a/browserutilities/schemehandler/SchemeApp/data/SchemeAppAif.rss	Tue Nov 24 09:02:20 2009 +0200
+++ b/browserutilities/schemehandler/SchemeApp/data/SchemeAppAif.rss	Thu Dec 17 09:20:16 2009 +0200
@@ -21,7 +21,7 @@
 //  INCLUDES
 
 #include <aiftool.rh>
-#include <SchemeDefs.hrh>
+#include <schemedefs.hrh>
 
 //  RESOURCE DEFINITIONS 
 
diff -r 9a9a761f03f1 -r 0ed94ceaa377 browserutilities/schemehandler/SchemeApp/group/SchemeApp.mmp
--- a/browserutilities/schemehandler/SchemeApp/group/SchemeApp.mmp	Tue Nov 24 09:02:20 2009 +0200
+++ b/browserutilities/schemehandler/SchemeApp/group/SchemeApp.mmp	Thu Dec 17 09:20:16 2009 +0200
@@ -19,10 +19,10 @@
 
 
 #include <platform_paths.hrh>
-#include <platform/mw/SchemeDefs.hrh>
+#include <platform/mw/schemedefs.hrh>
 #include <data_caging_paths.hrh>
 #include <bldvariant.hrh>
-#include <platform/mw/Browser_platform_variant.hrh>
+#include <platform/mw/browser_platform_variant.hrh>
 
 TARGET        SchemeApp.exe
 EPOCSTACKSIZE 0x5000
diff -r 9a9a761f03f1 -r 0ed94ceaa377 browserutilities/schemehandler/SchemeApp/group/bld.inf
--- a/browserutilities/schemehandler/SchemeApp/group/bld.inf	Tue Nov 24 09:02:20 2009 +0200
+++ b/browserutilities/schemehandler/SchemeApp/group/bld.inf	Thu Dec 17 09:20:16 2009 +0200
@@ -18,7 +18,7 @@
 */
 
 #include <platform_paths.hrh>
-#include "../../../../web_plat/browser_platform_api/inc/Browser_platform_variant.hrh"
+#include "../../../../web_plat/browser_platform_api/inc/browser_platform_variant.hrh"
 
 PRJ_PLATFORMS
 DEFAULT
diff -r 9a9a761f03f1 -r 0ed94ceaa377 browserutilities/schemehandler/SchemeApp/inc/SchemeApp.h
--- a/browserutilities/schemehandler/SchemeApp/inc/SchemeApp.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/browserutilities/schemehandler/SchemeApp/inc/SchemeApp.h	Thu Dec 17 09:20:16 2009 +0200
@@ -23,7 +23,7 @@
 
 #include <e32base.h>
 #include <eikapp.h>
-#include <SchemeDefs.hrh>
+#include <schemedefs.hrh>
 
 // CONSTANTS
 
diff -r 9a9a761f03f1 -r 0ed94ceaa377 browserutilities/schemehandler/SchemeApp/src/SchemeAppUi.cpp
--- a/browserutilities/schemehandler/SchemeApp/src/SchemeAppUi.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/browserutilities/schemehandler/SchemeApp/src/SchemeAppUi.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -20,7 +20,7 @@
 #include "SchemeDocument.h"
 #include "SchemeAppLogger.h"
 #include "SchemeDialog.h" 
-#include <SchemeHandler.h>
+#include <schemehandler.h>
 #include "SchemeAppUi.h"
 #include "Scheme.hrh"
 #include <SchemeApp.rsg>
diff -r 9a9a761f03f1 -r 0ed94ceaa377 browserutilities/schemehandler/SchemeApp/src/SchemeDocument.cpp
--- a/browserutilities/schemehandler/SchemeApp/src/SchemeDocument.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/browserutilities/schemehandler/SchemeApp/src/SchemeDocument.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -22,7 +22,7 @@
 
 #include "SchemeDocument.h"
 #include "SchemeAppUi.h"
-#include "SchemeHandler.h"
+#include "schemehandler.h"
 #include "SchemeAppLogger.h"
 
 // ================= MEMBER FUNCTIONS =======================
diff -r 9a9a761f03f1 -r 0ed94ceaa377 browserutilities/schemehandler/SchemeDispatcher/data/101f8531.rss
--- a/browserutilities/schemehandler/SchemeDispatcher/data/101f8531.rss	Tue Nov 24 09:02:20 2009 +0200
+++ b/browserutilities/schemehandler/SchemeDispatcher/data/101f8531.rss	Thu Dec 17 09:20:16 2009 +0200
@@ -16,7 +16,7 @@
 */
 
 
-#include "SchemeDefs.hrh"
+#include "schemedefs.hrh"
 #include "RegistryInfo.rh"
 
 RESOURCE REGISTRY_INFO theInfo
diff -r 9a9a761f03f1 -r 0ed94ceaa377 browserutilities/schemehandler/SchemeDispatcher/group/SchemeDispatcher.mmp
--- a/browserutilities/schemehandler/SchemeDispatcher/group/SchemeDispatcher.mmp	Tue Nov 24 09:02:20 2009 +0200
+++ b/browserutilities/schemehandler/SchemeDispatcher/group/SchemeDispatcher.mmp	Thu Dec 17 09:20:16 2009 +0200
@@ -18,8 +18,8 @@
 */
 
 #include <platform_paths.hrh>
-#include <platform/mw/Browser_platform_variant.hrh>
-#include    <platform/mw/SchemeDefs.hrh>
+#include <platform/mw/browser_platform_variant.hrh>
+#include    <platform/mw/schemedefs.hrh>
 
 TARGET      SchemeDispatcher.dll
 TARGETTYPE  PLUGIN
@@ -71,7 +71,7 @@
 LIBRARY     BrowserLauncher.lib
 LIBRARY     avkon.lib
 LIBRARY Centralrepository.lib
-
+LIBRARY     charconv.lib
 // Define this macro if you wish to enable logging
 //#define __TEST_SCHEMEDISP_LOG_ENABLED
 
@@ -81,3 +81,4 @@
 #endif	// __TEST_SCHEMEDISP_LOG_ENABLED
 
 
+
diff -r 9a9a761f03f1 -r 0ed94ceaa377 browserutilities/schemehandler/SchemeDispatcher/group/bld.inf
--- a/browserutilities/schemehandler/SchemeDispatcher/group/bld.inf	Tue Nov 24 09:02:20 2009 +0200
+++ b/browserutilities/schemehandler/SchemeDispatcher/group/bld.inf	Thu Dec 17 09:20:16 2009 +0200
@@ -19,7 +19,7 @@
 
 
 #include <platform_paths.hrh>
-#include "../../../../web_plat/browser_platform_api/inc/Browser_platform_variant.hrh"
+#include "../../../../web_plat/browser_platform_api/inc/browser_platform_variant.hrh"
 
 PRJ_PLATFORMS
 DEFAULT
diff -r 9a9a761f03f1 -r 0ed94ceaa377 browserutilities/schemehandler/SchemeDispatcher/inc/BaseHandler.h
--- a/browserutilities/schemehandler/SchemeDispatcher/inc/BaseHandler.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/browserutilities/schemehandler/SchemeDispatcher/inc/BaseHandler.h	Thu Dec 17 09:20:16 2009 +0200
@@ -23,7 +23,7 @@
 
 // INCLUDES
 
-#include "SchemeHandler.h"
+#include "schemehandler.h"
 #include <e32base.h>
 
 // FORWARD DECLARATION
diff -r 9a9a761f03f1 -r 0ed94ceaa377 browserutilities/schemehandler/SchemeDispatcher/inc/FileHandler.h
--- a/browserutilities/schemehandler/SchemeDispatcher/inc/FileHandler.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/browserutilities/schemehandler/SchemeDispatcher/inc/FileHandler.h	Thu Dec 17 09:20:16 2009 +0200
@@ -28,7 +28,7 @@
 #include <documentHandler.h>
 #include <eikdoc.h>
 #include <apparc.h>
-#include <BrowserLauncher.h>
+#include <browserlauncher.h>
 
 // FORWARD DECLARATION
 
diff -r 9a9a761f03f1 -r 0ed94ceaa377 browserutilities/schemehandler/SchemeDispatcher/inc/HttpHandler.h
--- a/browserutilities/schemehandler/SchemeDispatcher/inc/HttpHandler.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/browserutilities/schemehandler/SchemeDispatcher/inc/HttpHandler.h	Thu Dec 17 09:20:16 2009 +0200
@@ -27,7 +27,7 @@
 #include <e32base.h>
 #include <eikdoc.h>
 #include <apparc.h>
-#include <BrowserLauncher.h>
+#include <browserlauncher.h>
 // FORWARD DECLARATION
 
 // CLASS DECLARATION
diff -r 9a9a761f03f1 -r 0ed94ceaa377 browserutilities/schemehandler/SchemeDispatcher/src/BaseHandler.cpp
--- a/browserutilities/schemehandler/SchemeDispatcher/src/BaseHandler.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/browserutilities/schemehandler/SchemeDispatcher/src/BaseHandler.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -28,7 +28,7 @@
 #include <stringloader.h>
 #include <bautils.h>
 #include <EscapeUtils.h>
-#include <BrowserUiSDKCRKeys.h>
+#include <browseruisdkcrkeys.h>
 #include <centralrepository.h>
 
 #include <apgcli.h>
diff -r 9a9a761f03f1 -r 0ed94ceaa377 browserutilities/schemehandler/SchemeDispatcher/src/HttpHandler.cpp
--- a/browserutilities/schemehandler/SchemeDispatcher/src/HttpHandler.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/browserutilities/schemehandler/SchemeDispatcher/src/HttpHandler.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -32,7 +32,7 @@
 #include <f32file.h>
 #include <APGTASK.H>
 #include <w32std.h>
-#include <BrowserOverriddenSettings.h>
+#include <browseroverriddensettings.h>
 
 _LIT( KBrowserPrefix, "4 " );
 LOCAL_C const TUid KUidBrowser = { 0x10008D39 };
diff -r 9a9a761f03f1 -r 0ed94ceaa377 browserutilities/schemehandler/SchemeDispatcher/src/MailToHandler.cpp
--- a/browserutilities/schemehandler/SchemeDispatcher/src/MailToHandler.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/browserutilities/schemehandler/SchemeDispatcher/src/MailToHandler.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -30,7 +30,7 @@
 #include <eikdoc.h>
 #include <eikproc.h>
 #include <f32file.h>
-
+#include <utf.h> 
 
 // ================= CONSTANTS =======================
 
@@ -109,9 +109,16 @@
 void CMailToHandler::HandleUrlEmbeddedL()
 	{
 	CLOG_ENTERFN( "CMailToHandler::HandleUrlEmbeddedL()" );
-
-    //TPtrC path = iParsedUrl->Des();
-
+    /* Convert to UCS-2, conversion from HBufC16 to HBufC8 should do no harm because the original string is HBufC8 */ 
+    HBufC8 *tempbuf8 =  HBufC8::NewLC(iParsedUrl->Length());
+    tempbuf8->Des().Copy(iParsedUrl->Des());
+    TInt errEncode = CnvUtfConverter::ConvertToUnicodeFromUtf8( *static_cast<TDes16*>(&iParsedUrl->Des()),*tempbuf8);
+    if (errEncode != KErrNone)
+        {
+        iParsedUrl->Des().Copy(tempbuf8->Des());
+        }
+    CleanupStack::PopAndDestroy(tempbuf8); 
+    
 	iTelService = CBrowserTelService::NewL();
 	iTelService->AddObserver( this );
 
diff -r 9a9a761f03f1 -r 0ed94ceaa377 browserutilities/schemehandler/SchemeDispatcher/src/SchemeProxy.cpp
--- a/browserutilities/schemehandler/SchemeDispatcher/src/SchemeProxy.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/browserutilities/schemehandler/SchemeDispatcher/src/SchemeProxy.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -27,7 +27,7 @@
 #include "CtiHandler.h"
 #include "MmsHandler.h"
 #include <e32std.h>
-#include <SchemeDefs.hrh>
+#include <schemedefs.hrh>
 #include <ImplementationProxy.h>
 
 // Exported proxy for instantiation method resolution
diff -r 9a9a761f03f1 -r 0ed94ceaa377 browserutilities/webutils/conf/webutils.confml
Binary file browserutilities/webutils/conf/webutils.confml has changed
diff -r 9a9a761f03f1 -r 0ed94ceaa377 browserutilities/webutils/conf/webutils_101F8731.crml
Binary file browserutilities/webutils/conf/webutils_101F8731.crml has changed
diff -r 9a9a761f03f1 -r 0ed94ceaa377 browserutilities/webutils/group/bld.inf
--- a/browserutilities/webutils/group/bld.inf	Tue Nov 24 09:02:20 2009 +0200
+++ b/browserutilities/webutils/group/bld.inf	Thu Dec 17 09:20:16 2009 +0200
@@ -16,7 +16,7 @@
 */
 
 #include <platform_paths.hrh>
-#include "../../../web_plat/browser_platform_api/inc/Browser_platform_variant.hrh"
+#include "../../../web_plat/browser_platform_api/inc/browser_platform_variant.hrh"
 
 PRJ_PLATFORMS
 DEFAULT -ARMI
diff -r 9a9a761f03f1 -r 0ed94ceaa377 browserutilities/webutils/group/webutils.mmp
--- a/browserutilities/webutils/group/webutils.mmp	Tue Nov 24 09:02:20 2009 +0200
+++ b/browserutilities/webutils/group/webutils.mmp	Thu Dec 17 09:20:16 2009 +0200
@@ -18,7 +18,7 @@
 
 #include <platform_paths.hrh>
 #include <data_caging_paths.hrh>
-#include <platform/mw/Browser_platform_variant.hrh>
+#include <platform/mw/browser_platform_variant.hrh>
 
 // Build target
 TARGET		webutils.dll
diff -r 9a9a761f03f1 -r 0ed94ceaa377 browserutilities/webutils/src/CUserAgent.cpp
--- a/browserutilities/webutils/src/CUserAgent.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/browserutilities/webutils/src/CUserAgent.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -21,12 +21,12 @@
 #include <f32file.h>
 #include <eikenv.h>
 
-#include <Browser_platform_variant.hrh>
+#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")
@@ -692,7 +692,8 @@
     TInt ret(0);
     TBuf<64> BrowserVersionMajor(0);
     TBuf<64> BrowserVersionMinor(0);
-    TBuf<64> BrowserVersionSVNRev(0);
+    TBuf<64> BrowserVersionFeatureRev(0);
+    TBuf<64> BrowserVersionPatchRev(0);
     
 	iBrowserVersionStr = HBufC::NewL(KMaxBrowserVersionStringLength);
 	
@@ -701,21 +702,37 @@
    
     ret = iRepository->Get(KWebUtilsBrowserVersionMajor, BrowserVersionMajor);
     if(ret == KErrNone)
-    	{   
-	    ret = iRepository->Get(KWebUtilsBrowserVersionMinor, BrowserVersionMinor);
-	    if(ret == KErrNone)
-	    	{
-			    ret = iRepository->Get(KWebUtilsBrowserVersionSVNRev, BrowserVersionSVNRev);
-			    if(ret == KErrNone)
-			    {
-			   	BrowserVersionPtr.Append(BrowserVersionMajor);
-    			BrowserVersionPtr.Append(KPlaceHolderPeriod);    
-    	       	BrowserVersionPtr.Append(BrowserVersionMinor);  	
-    			BrowserVersionPtr.Append(KPlaceHolderPeriod);  
-    	    	BrowserVersionPtr.Append(BrowserVersionSVNRev); 	;	   		
-			    }
-	    	}
-	    }
+      {   
+        ret = iRepository->Get(KWebUtilsBrowserVersionMinor, BrowserVersionMinor);
+        if(ret == KErrNone)
+         {
+          ret = iRepository->Get(KWebUtilsBrowserVersionFeatureRev, BrowserVersionFeatureRev);
+          if(ret == KErrNone)
+            {
+             ret = iRepository->Get(KWebUtilsBrowserVersionPatchRev, BrowserVersionPatchRev);
+             if(ret == KErrNone)
+               {
+                BrowserVersionPtr.Append(BrowserVersionMajor);
+                BrowserVersionPtr.Append(KPlaceHolderPeriod);    
+                BrowserVersionPtr.Append(BrowserVersionMinor);  	
+                BrowserVersionPtr.Append(KPlaceHolderPeriod);  
+                BrowserVersionPtr.Append(BrowserVersionFeatureRev);
+                //Incase of Feature releases we do not show Patch number.
+                //Therefore, if the patch version is 0 or empty then we do not show the content
+                if( (BrowserVersionPatchRev.CompareF(_L("0")) == 0)
+                    || (BrowserVersionPatchRev.CompareF(KNullDesC) == 0))
+                 {
+                  //Do Nothing 
+                 }
+                 else
+                 {
+                  BrowserVersionPtr.Append(KPlaceHolderPeriod);  
+                  BrowserVersionPtr.Append(BrowserVersionPatchRev);
+                 }
+                }	   		
+              }
+            }
+           }
 	    
 	if(ret != KErrNone)
 	{		
diff -r 9a9a761f03f1 -r 0ed94ceaa377 browserutilities/webutils/tsrc/public/adv/group/WebUtilsBCTest.mmp
--- a/browserutilities/webutils/tsrc/public/adv/group/WebUtilsBCTest.mmp	Tue Nov 24 09:02:20 2009 +0200
+++ b/browserutilities/webutils/tsrc/public/adv/group/WebUtilsBCTest.mmp	Thu Dec 17 09:20:16 2009 +0200
@@ -19,7 +19,7 @@
 #if defined(__S60_)
         // To get the MW_LAYER_SYSTEMINCLUDE-definition
         #include <platform_paths.hrh>
-        #include <platform/mw/Browser_platform_variant.hrh>
+        #include <platform/mw/browser_platform_variant.hrh>
 #endif
 
 TARGET          WebUtilsBCTest.dll
diff -r 9a9a761f03f1 -r 0ed94ceaa377 browserutilities/webutils/tsrc/public/adv/inc/WebUtilsBCTest.h
--- a/browserutilities/webutils/tsrc/public/adv/inc/WebUtilsBCTest.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/browserutilities/webutils/tsrc/public/adv/inc/WebUtilsBCTest.h	Thu Dec 17 09:20:16 2009 +0200
@@ -23,7 +23,7 @@
 // INCLUDES
 #include "StifTestModule.h"
 #include <StifLogger.h>
-#include <CUserAgent.h>
+#include <cuseragent.h>
 
 // CONSTANTS
 //const ?type ?constant_var = ?constant;
diff -r 9a9a761f03f1 -r 0ed94ceaa377 browserutilities/xmlparser/group/XMLInterface.mmp
--- a/browserutilities/xmlparser/group/XMLInterface.mmp	Tue Nov 24 09:02:20 2009 +0200
+++ b/browserutilities/xmlparser/group/XMLInterface.mmp	Thu Dec 17 09:20:16 2009 +0200
@@ -16,7 +16,7 @@
 */
 
 #include <platform_paths.hrh>
-#include <platform/mw/Browser_platform_variant.hrh>
+#include <platform/mw/browser_platform_variant.hrh>
 
 TARGET          XMLInterface.dll
 TARGETTYPE      dll
diff -r 9a9a761f03f1 -r 0ed94ceaa377 browserutilities/xmlparser/group/bld.inf
--- a/browserutilities/xmlparser/group/bld.inf	Tue Nov 24 09:02:20 2009 +0200
+++ b/browserutilities/xmlparser/group/bld.inf	Thu Dec 17 09:20:16 2009 +0200
@@ -19,7 +19,7 @@
 
 
 #include <platform_paths.hrh>
-#include "../../../web_plat/browser_platform_api/inc/Browser_platform_variant.hrh"
+#include "../../../web_plat/browser_platform_api/inc/browser_platform_variant.hrh"
 
 PRJ_PLATFORMS
 
diff -r 9a9a761f03f1 -r 0ed94ceaa377 browserutilities/xmlparser/inc/CXMLAttributes.h
--- a/browserutilities/xmlparser/inc/CXMLAttributes.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/browserutilities/xmlparser/inc/CXMLAttributes.h	Thu Dec 17 09:20:16 2009 +0200
@@ -23,7 +23,7 @@
 //  INCLUDES
 #include <e32std.h>
 #include <eikenv.h>  
-#include "MXMLAttributes.h"
+#include "mxmlattributes.h"
 
 
 // CLASS DECLARATION
diff -r 9a9a761f03f1 -r 0ed94ceaa377 browserutilities/xmlparser/inc/CXMLObserver.h
--- a/browserutilities/xmlparser/inc/CXMLObserver.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/browserutilities/xmlparser/inc/CXMLObserver.h	Thu Dec 17 09:20:16 2009 +0200
@@ -24,8 +24,8 @@
 #include <e32std.h>
 #include <eikenv.h>
 #include "CXMLAttributes.h"
-#include "MXMLContentHandler.h"
-#include "MWBXMLContentHandler.h"
+#include "mxmlcontenthandler.h"
+#include "mwbxmlcontenthandler.h"
 
 
 // CLASS DECLARATION
diff -r 9a9a761f03f1 -r 0ed94ceaa377 browserutilities/xmlparser/inc/CXMLReader.h
--- a/browserutilities/xmlparser/inc/CXMLReader.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/browserutilities/xmlparser/inc/CXMLReader.h	Thu Dec 17 09:20:16 2009 +0200
@@ -24,13 +24,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
diff -r 9a9a761f03f1 -r 0ed94ceaa377 browserutilities/xmlparser/src/RXMLReader.cpp
--- a/browserutilities/xmlparser/src/RXMLReader.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/browserutilities/xmlparser/src/RXMLReader.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -18,7 +18,7 @@
 
 
 // INCLUDE FILES
-#include "RXMLReader.h"
+#include "rxmlreader.h"
 #include "CXMLReader.h"
 
 
diff -r 9a9a761f03f1 -r 0ed94ceaa377 codhandler/coddownload/group/CodDownload.mmp
--- a/codhandler/coddownload/group/CodDownload.mmp	Tue Nov 24 09:02:20 2009 +0200
+++ b/codhandler/coddownload/group/CodDownload.mmp	Thu Dec 17 09:20:16 2009 +0200
@@ -16,7 +16,7 @@
 */
 
 #include <platform_paths.hrh>
-#include <platform/mw/Browser_platform_variant.hrh>
+#include <platform/mw/browser_platform_variant.hrh>
 #include "../../CodEng/inc/CodDefs.h"
 
 TARGET          CodDownload.dll
diff -r 9a9a761f03f1 -r 0ed94ceaa377 codhandler/coddownload/group/bld.inf
--- a/codhandler/coddownload/group/bld.inf	Tue Nov 24 09:02:20 2009 +0200
+++ b/codhandler/coddownload/group/bld.inf	Thu Dec 17 09:20:16 2009 +0200
@@ -16,7 +16,7 @@
 */
 
 #include <platform_paths.hrh>
-#include "../../../web_plat/browser_platform_api/inc/Browser_platform_variant.hrh"
+#include "../../../web_plat/browser_platform_api/inc/browser_platform_variant.hrh"
 
 PRJ_PLATFORMS
 DEFAULT
diff -r 9a9a761f03f1 -r 0ed94ceaa377 codhandler/coddownload/src/CodDownload.cpp
--- a/codhandler/coddownload/src/CodDownload.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/codhandler/coddownload/src/CodDownload.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -18,7 +18,7 @@
 
 // INCLUDE FILES
 
-#include "CodDownload.h"
+#include "coddownload.h"
 #include "CodDownloadImpl.h"
 
 // ================= MEMBER FUNCTIONS =======================
diff -r 9a9a761f03f1 -r 0ed94ceaa377 codhandler/codeng/group/CodEng.mmp
--- a/codhandler/codeng/group/CodEng.mmp	Tue Nov 24 09:02:20 2009 +0200
+++ b/codhandler/codeng/group/CodEng.mmp	Thu Dec 17 09:20:16 2009 +0200
@@ -18,7 +18,7 @@
 */
 
 #include <platform_paths.hrh>
-#include <platform/mw/Browser_platform_variant.hrh>
+#include <platform/mw/browser_platform_variant.hrh>
 #include    "../inc/CodDefs.h"
 
 TARGET      CodEng.dll
diff -r 9a9a761f03f1 -r 0ed94ceaa377 codhandler/codeng/group/bld.inf
--- a/codhandler/codeng/group/bld.inf	Tue Nov 24 09:02:20 2009 +0200
+++ b/codhandler/codeng/group/bld.inf	Thu Dec 17 09:20:16 2009 +0200
@@ -19,7 +19,7 @@
 
 
 #include <platform_paths.hrh>
-#include "../../../web_plat/browser_platform_api/inc/Browser_platform_variant.hrh"
+#include "../../../web_plat/browser_platform_api/inc/browser_platform_variant.hrh"
 
 PRJ_PLATFORMS
 DEFAULT
diff -r 9a9a761f03f1 -r 0ed94ceaa377 codhandler/codeng/inc/CodEngBase.h
--- a/codhandler/codeng/inc/CodEngBase.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/codhandler/codeng/inc/CodEngBase.h	Thu Dec 17 09:20:16 2009 +0200
@@ -28,7 +28,7 @@
 #include <apmrec.h>
 #include <apparc.h>
 #include "CodSaver.h"
-#include <CodDownload.h>
+#include <coddownload.h>
 
 // FORWARD DECLARATION
 
diff -r 9a9a761f03f1 -r 0ed94ceaa377 codhandler/codeng/inc/DownloadDataClient.h
--- a/codhandler/codeng/inc/DownloadDataClient.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/codhandler/codeng/inc/DownloadDataClient.h	Thu Dec 17 09:20:16 2009 +0200
@@ -24,7 +24,7 @@
 // INCLUDES
 
 #include <e32base.h>
-#include "HttpDownloadData.h"
+#include "httpdownloaddata.h"
 
 // ================= CONSTANTS =======================
 
diff -r 9a9a761f03f1 -r 0ed94ceaa377 codhandler/codeng/inc/HeaderField.h
--- a/codhandler/codeng/inc/HeaderField.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/codhandler/codeng/inc/HeaderField.h	Thu Dec 17 09:20:16 2009 +0200
@@ -22,7 +22,7 @@
 
 //  INCLUDES
 #include <e32base.h>
-#include <HttpDownloadMgrCommon.h>
+#include <httpdownloadmgrcommon.h>
 #include <http.h>
 
 // CONSTANTS
diff -r 9a9a761f03f1 -r 0ed94ceaa377 codhandler/codeng/inc/MediaObject.h
--- a/codhandler/codeng/inc/MediaObject.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/codhandler/codeng/inc/MediaObject.h	Thu Dec 17 09:20:16 2009 +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.
diff -r 9a9a761f03f1 -r 0ed94ceaa377 codhandler/codeng/src/CodData.cpp
--- a/codhandler/codeng/src/CodData.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/codhandler/codeng/src/CodData.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -25,7 +25,7 @@
 #include "CodUtil.h"
 #include <badesca.h>
 #include "FileExt.h"
-#include "HttpDownloadData.h"
+#include "httpdownloaddata.h"
 
 
 // ================= MEMBER FUNCTIONS =======================
diff -r 9a9a761f03f1 -r 0ed94ceaa377 codhandler/codeng/src/CodEngBase.cpp
--- a/codhandler/codeng/src/CodEngBase.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/codhandler/codeng/src/CodEngBase.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -44,7 +44,7 @@
 #include <Oma2Agent.h>
 #include <RoapDef.h>
 #include <f32file.h>
-#include <BodyPart.h>
+#include <bodypart.h>
 #include <SysUtil.h>
 #include <pathinfo.h>
 #include "CodDefs.h"
@@ -66,7 +66,7 @@
 #ifdef RD_MULTIPLE_DRIVE
 #include <centralrepository.h>
 #include <driveinfo.h>
-#include <BrowserUiSDKCRKeys.h>
+#include <browseruisdkcrkeys.h>
 #endif //RD_MULTIPLE_DRIVE
 
 #include <bldvariant.hrh>
diff -r 9a9a761f03f1 -r 0ed94ceaa377 codhandler/codeng/src/CodUtil.cpp
--- a/codhandler/codeng/src/CodUtil.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/codhandler/codeng/src/CodUtil.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -29,7 +29,7 @@
 #include <f32file.h>
 #include <commdb.h>
 #include <ApSelect.h>
-#include <BodyPart.h>
+#include <bodypart.h>
 #include <AiwGenericParam.h>
 #include <caf/caf.h>
 
diff -r 9a9a761f03f1 -r 0ed94ceaa377 codhandler/codeng/src/DdParser.cpp
--- a/codhandler/codeng/src/DdParser.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/codhandler/codeng/src/DdParser.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -27,7 +27,7 @@
 #include "CodLogger.h"
 #include "NwUtil.h"
 #include "DdDummyDict.h"
-#include "HttpDownloadData.h"
+#include "httpdownloaddata.h"
 #include <nw_dom_document.h>
 #include <utf.h>
 
diff -r 9a9a761f03f1 -r 0ed94ceaa377 codhandler/codeng/src/FileSaver.cpp
--- a/codhandler/codeng/src/FileSaver.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/codhandler/codeng/src/FileSaver.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -19,7 +19,7 @@
 
 
 // INCLUDE FILES
-#include <platform/mw/Browser_platform_variant.hrh>
+#include <browser_platform_variant.hrh>
 #include "FileSaver.h"
 #include "CodBuffStorage.h"
 #include "CodLoadObserver.h"
@@ -32,7 +32,7 @@
 #include "CodData.h"
 
 #include <f32file.h>
-#include <HttpDownloadMgrCommon.h>
+#include <httpdownloadmgrcommon.h>
 #include <DocumentHandler.h>
 #include <pathinfo.h>
 
diff -r 9a9a761f03f1 -r 0ed94ceaa377 codhandler/codeng/src/HttpLoader.cpp
--- a/codhandler/codeng/src/HttpLoader.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/codhandler/codeng/src/HttpLoader.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -33,9 +33,9 @@
 #include "CodProgress.h"
 #include "CodEngbase.h"
 
-#include <CookieFilterInterface.h>
+#include <cookiefilterinterface.h>
 #include <uaproffilter_interface.h>
-#include <DeflateFilterInterface.h>
+#include <deflatefilterinterface.h>
 #include <httperr.h>
 #include <bldvariant.hrh>
 #include <ECom.h>
@@ -43,7 +43,7 @@
 #include <EscapeUtils.h>
 #include <http/rhttpheaders.h>
 #include <Oma2Agent.h>
-#include <HttpDownloadMgrCommon.h>
+#include <httpdownloadmgrcommon.h>
 #include    "HeaderField.h"
 #include    "FileExt.h"
 #include    "CodData.h"
diff -r 9a9a761f03f1 -r 0ed94ceaa377 codhandler/codeng/src/HttpTcpSession.cpp
--- a/codhandler/codeng/src/HttpTcpSession.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/codhandler/codeng/src/HttpTcpSession.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -20,7 +20,7 @@
 
 // INCLUDE FILES
 
-#include <HttpFilterCommonStringsExt.h>
+#include <httpfiltercommonstringsext.h>
 #include "HttpTcpSession.h"
 #include "CodLogger.h"
 #include "CodPanic.h"
diff -r 9a9a761f03f1 -r 0ed94ceaa377 codhandler/codeng/src/HttpWapSession.cpp
--- a/codhandler/codeng/src/HttpWapSession.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/codhandler/codeng/src/HttpWapSession.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -20,7 +20,7 @@
 
 // INCLUDE FILES
 
-#include <HttpFilterCommonStringsExt.h>
+#include <httpfiltercommonstringsext.h>
 #include "HttpWapSession.h"
 #include "CodError.h"
 #include "CodLogger.h"
diff -r 9a9a761f03f1 -r 0ed94ceaa377 codhandler/codrecog/group/CodRecog.mmp
--- a/codhandler/codrecog/group/CodRecog.mmp	Tue Nov 24 09:02:20 2009 +0200
+++ b/codhandler/codrecog/group/CodRecog.mmp	Thu Dec 17 09:20:16 2009 +0200
@@ -18,7 +18,7 @@
 */
 
 #include <platform_paths.hrh>
-#include <platform/mw/Browser_platform_variant.hrh>
+#include <platform/mw/browser_platform_variant.hrh>
 
 TARGET          CodRecog.dll
 TARGETTYPE      PLUGIN
diff -r 9a9a761f03f1 -r 0ed94ceaa377 codhandler/codui/group/CodUi.mmp
--- a/codhandler/codui/group/CodUi.mmp	Tue Nov 24 09:02:20 2009 +0200
+++ b/codhandler/codui/group/CodUi.mmp	Thu Dec 17 09:20:16 2009 +0200
@@ -17,7 +17,7 @@
 
 #include <platform_paths.hrh>
 #include <data_caging_paths.hrh>
-#include <platform/mw/Browser_platform_variant.hrh>
+#include <platform/mw/browser_platform_variant.hrh>
 #include "../../CodEng/inc/CodDefs.h"
 
 TARGET      CodUi.dll
diff -r 9a9a761f03f1 -r 0ed94ceaa377 codhandler/codui/inc/CodDialog.h
--- a/codhandler/codui/inc/CodDialog.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/codhandler/codui/inc/CodDialog.h	Thu Dec 17 09:20:16 2009 +0200
@@ -23,7 +23,7 @@
 
 #include <e32base.h>
 #include <centralrepository.h>
-#include <BrowserUiSDKCRKeys.h>
+#include <browseruisdkcrkeys.h>
 
 
 // FORWARD DECLARATION
diff -r 9a9a761f03f1 -r 0ed94ceaa377 codhandler/codui/inc/CodDownloadImpl.h
--- a/codhandler/codui/inc/CodDownloadImpl.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/codhandler/codui/inc/CodDownloadImpl.h	Thu Dec 17 09:20:16 2009 +0200
@@ -32,7 +32,7 @@
 
 #include <e32std.h>
 #include <f32file.h>
-#include <CodDownload.h>
+#include <coddownload.h>
 #include <CodLoadObserver.h>
 #include <AknServerApp.h>
 
diff -r 9a9a761f03f1 -r 0ed94ceaa377 codhandler/codui/src/CodDownloadImpl.cpp
--- a/codhandler/codui/src/CodDownloadImpl.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/codhandler/codui/src/CodDownloadImpl.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -30,7 +30,7 @@
 #include <DRMCommon.h>
 #include <aknmessagequerydialog.h>
 #include <hlplch.h>             
-#include <MultipartParser.h>
+#include <multipartparser.h>
 #include <AknQueryDialog.h>
 #include "CodDownloadImpl.h"
 #include "CodUiPanic.h"
diff -r 9a9a761f03f1 -r 0ed94ceaa377 codhandler/codviewer/group/CodViewer.mmp
--- a/codhandler/codviewer/group/CodViewer.mmp	Tue Nov 24 09:02:20 2009 +0200
+++ b/codhandler/codviewer/group/CodViewer.mmp	Thu Dec 17 09:20:16 2009 +0200
@@ -18,7 +18,7 @@
 */
 #include <platform_paths.hrh>
 #include <data_caging_paths.hrh>
-#include <platform/mw/Browser_platform_variant.hrh>
+#include <platform/mw/browser_platform_variant.hrh>
 #include "../../CodEng/inc/CodDefs.h"
 
 TARGET          CodViewer.exe
diff -r 9a9a761f03f1 -r 0ed94ceaa377 codhandler/ddrecog/group/DdRecog.mmp
--- a/codhandler/ddrecog/group/DdRecog.mmp	Tue Nov 24 09:02:20 2009 +0200
+++ b/codhandler/ddrecog/group/DdRecog.mmp	Thu Dec 17 09:20:16 2009 +0200
@@ -18,7 +18,7 @@
 */
 
 #include <platform_paths.hrh>
-#include <platform/mw/Browser_platform_variant.hrh>
+#include <platform/mw/browser_platform_variant.hrh>
 
 TARGET          DdRecog.dll
 TARGETTYPE      PLUGIN
diff -r 9a9a761f03f1 -r 0ed94ceaa377 codhandler/ddviewer/group/DdViewer.mmp
--- a/codhandler/ddviewer/group/DdViewer.mmp	Tue Nov 24 09:02:20 2009 +0200
+++ b/codhandler/ddviewer/group/DdViewer.mmp	Thu Dec 17 09:20:16 2009 +0200
@@ -18,7 +18,7 @@
 */
 #include <platform_paths.hrh>
 #include <data_caging_paths.hrh>
-#include <platform/mw/Browser_platform_variant.hrh>
+#include <platform/mw/browser_platform_variant.hrh>
 #include "../../CodEng/inc/CodDefs.h"
 
 TARGET          DdViewer.exe
diff -r 9a9a761f03f1 -r 0ed94ceaa377 codhandler/group/bld.inf
--- a/codhandler/group/bld.inf	Tue Nov 24 09:02:20 2009 +0200
+++ b/codhandler/group/bld.inf	Thu Dec 17 09:20:16 2009 +0200
@@ -19,7 +19,7 @@
 
 #include <platform_paths.hrh>
 //#include <data_caging_paths_strings.hrh>
-#include "../../web_plat/browser_platform_api/inc/Browser_platform_variant.hrh"
+#include "../../web_plat/browser_platform_api/inc/browser_platform_variant.hrh"
 
 PRJ_EXPORTS
 ../loc/CodViewer.loc  				MW_LAYER_LOC_EXPORT_PATH(CodViewer.loc)
diff -r 9a9a761f03f1 -r 0ed94ceaa377 codhandler/roapapp/group/RoapApp.mmp
--- a/codhandler/roapapp/group/RoapApp.mmp	Tue Nov 24 09:02:20 2009 +0200
+++ b/codhandler/roapapp/group/RoapApp.mmp	Thu Dec 17 09:20:16 2009 +0200
@@ -19,7 +19,7 @@
 
 #include <platform_paths.hrh>
 #include <data_caging_paths.hrh>
-#include <platform/mw/Browser_platform_variant.hrh>
+#include <platform/mw/browser_platform_variant.hrh>
 
 TARGET          RoapApp.exe
 TARGETTYPE      exe
diff -r 9a9a761f03f1 -r 0ed94ceaa377 codhandler/roapapp/inc/RoapAppUi.h
--- a/codhandler/roapapp/inc/RoapAppUi.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/codhandler/roapapp/inc/RoapAppUi.h	Thu Dec 17 09:20:16 2009 +0200
@@ -28,7 +28,7 @@
 #include <AknAppUi.h>
 #include <AknServerApp.h>
 #include <RoapObserver.h>
-#include <DownloadMgrClient.h>
+#include <downloadmgrclient.h>
 #include "RoapAppWaitDialog.h"
 #include <CentralRepository.h>
 
diff -r 9a9a761f03f1 -r 0ed94ceaa377 codhandler/roapapp/src/RoapAppUi.cpp
--- a/codhandler/roapapp/src/RoapAppUi.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/codhandler/roapapp/src/RoapAppUi.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -45,7 +45,7 @@
 #include "RoapAppPanic.h"
 #include "RequestCompleteCallback.h"
 #include "RoapAppLogger.h"
-#include <HttpDownloadMgrCommon.h>
+#include <httpdownloadmgrcommon.h>
 
 #ifdef __SERIES60_HELP
 // Context-Sensitve Help File
diff -r 9a9a761f03f1 -r 0ed94ceaa377 web_plat/aiw_browser_provider_api/group/bld.inf
--- a/web_plat/aiw_browser_provider_api/group/bld.inf	Tue Nov 24 09:02:20 2009 +0200
+++ b/web_plat/aiw_browser_provider_api/group/bld.inf	Thu Dec 17 09:20:16 2009 +0200
@@ -19,13 +19,13 @@
 
 
 #include <platform_paths.hrh>
-#include "../../../web_plat/browser_platform_api/inc/Browser_platform_variant.hrh"
+#include "../../../web_plat/browser_platform_api/inc/browser_platform_variant.hrh"
 
 PRJ_PLATFORMS
 DEFAULT
 
 PRJ_EXPORTS
-../inc/AiwBrowserCommands.hrh MW_LAYER_PLATFORM_EXPORT_PATH(AiwBrowserCommands.hrh)
+../inc/AiwBrowserCommands.hrh MW_LAYER_PLATFORM_EXPORT_PATH(aiwbrowsercommands.hrh)
 
 PRJ_MMPFILES
 
diff -r 9a9a761f03f1 -r 0ed94ceaa377 web_plat/browser_dialogs_provider_api/group/bld.inf
--- a/web_plat/browser_dialogs_provider_api/group/bld.inf	Tue Nov 24 09:02:20 2009 +0200
+++ b/web_plat/browser_dialogs_provider_api/group/bld.inf	Thu Dec 17 09:20:16 2009 +0200
@@ -18,15 +18,15 @@
 */
 
 #include <platform_paths.hrh>
-#include "../../../web_plat/browser_platform_api/inc/Browser_platform_variant.hrh"
+#include "../../../web_plat/browser_platform_api/inc/browser_platform_variant.hrh"
 
 PRJ_PLATFORMS
 
 DEFAULT
 
 PRJ_EXPORTS
-../inc/BrowserDialogsProviderObserver.h     MW_LAYER_PLATFORM_EXPORT_PATH(BrowserDialogsProviderObserver.h)
-../inc/BrowserDialogsProvider.h             MW_LAYER_PLATFORM_EXPORT_PATH(BrowserDialogsProvider.h)
+../inc/browserdialogsproviderobserver.h     MW_LAYER_PLATFORM_EXPORT_PATH(browserdialogsproviderobserver.h)
+../inc/browserdialogsprovider.h             MW_LAYER_PLATFORM_EXPORT_PATH(browserdialogsprovider.h)
 
 PRJ_MMPFILES
 
diff -r 9a9a761f03f1 -r 0ed94ceaa377 web_plat/browser_dialogs_provider_api/inc/BrowserDialogsProvider.h
--- a/web_plat/browser_dialogs_provider_api/inc/BrowserDialogsProvider.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/web_plat/browser_dialogs_provider_api/inc/BrowserDialogsProvider.h	Thu Dec 17 09:20:16 2009 +0200
@@ -20,7 +20,7 @@
 
 //  INCLUDES
 // System Includes
-#include <BrCtlDialogsProvider.h>
+#include <brctldialogsprovider.h>
 #include <eikenv.h>
 #include <coneresloader.h> 
 #include <e32std.h>
diff -r 9a9a761f03f1 -r 0ed94ceaa377 web_plat/browser_platform_api/group/bld.inf
--- a/web_plat/browser_platform_api/group/bld.inf	Tue Nov 24 09:02:20 2009 +0200
+++ b/web_plat/browser_platform_api/group/bld.inf	Thu Dec 17 09:20:16 2009 +0200
@@ -15,26 +15,26 @@
 *
 */
 #include <platform_paths.hrh>
-#include "../../../web_plat/browser_platform_api/inc/Browser_platform_variant.hrh"
+#include "../../../web_plat/browser_platform_api/inc/browser_platform_variant.hrh"
 
 PRJ_PLATFORMS
 DEFAULT
 
 PRJ_EXPORTS
 
-../inc/Browser_platform_variant.hrh  MW_LAYER_PLATFORM_EXPORT_PATH(Browser_platform_variant.hrh)
+../inc/browser_platform_variant.hrh  MW_LAYER_PLATFORM_EXPORT_PATH(browser_platform_variant.hrh)
 
 #ifdef BRDO_ADDED_EXPORT_LOCATION
-../inc/Browser_platform_variant.hrh  BRDO_ADDED_EXPORT_LOCATION(Browser_platform_variant.hrh)
+../inc/browser_platform_variant.hrh  BRDO_ADDED_EXPORT_LOCATION(browser_platform_variant.hrh)
 #endif
 
 #ifdef __PLATFORM_VERSION_50_TUBE__
-../inc/Browser_platform_variant.hrh  /epoc32/include/oem/Browser_platform_variant.hrh
-../inc/Browser_platform_variant.hrh  /epoc32/include/oem/platform/mw/Browser_platform_variant.hrh
+../inc/browser_platform_variant.hrh  /epoc32/include/oem/browser_platform_variant.hrh
+../inc/browser_platform_variant.hrh  /epoc32/include/oem/platform/mw/browser_platform_variant.hrh
 #endif
 
 #ifdef __PLATFORM_VERSION_50__
-../inc/Browser_platform_variant.hrh  /epoc32/include/oem/Browser_platform_variant.hrh
+../inc/browser_platform_variant.hrh  /epoc32/include/oem/browser_platform_variant.hrh
 #endif
 
 PRJ_MMPFILES
diff -r 9a9a761f03f1 -r 0ed94ceaa377 web_plat/browser_platform_api/inc/Browser_platform_variant.hrh
--- a/web_plat/browser_platform_api/inc/Browser_platform_variant.hrh	Tue Nov 24 09:02:20 2009 +0200
+++ b/web_plat/browser_platform_api/inc/Browser_platform_variant.hrh	Thu Dec 17 09:20:16 2009 +0200
@@ -189,16 +189,16 @@
 
 // Location, where the middleware layer localization .loc file should be exported
 #if __GNUC__ >= 3
-#define MW_LAYER_LOC_EXPORT_PATH(exported) MW_LAYER_PUBLIC_EXPORT_PATH(exported)
+#define MW_LAYER_LOC_EXPORT_PATH(exported) MW_LAYER_PUBLIC_EXPORT_PATH(oem/exported)
 #else
-#define MW_LAYER_LOC_EXPORT_PATH(exported) MW_LAYER_PUBLIC_EXPORT_PATH(##exported)
+#define MW_LAYER_LOC_EXPORT_PATH(exported) MW_LAYER_PUBLIC_EXPORT_PATH(oem/##exported)
 #endif
 
 // Location, where the middleware layer localization .loc file should be exported
 #if __GNUC__ >= 3
-#define APP_LAYER_LOC_EXPORT_PATH(exported) APP_LAYER_PUBLIC_EXPORT_PATH(exported)
+#define APP_LAYER_LOC_EXPORT_PATH(exported) APP_LAYER_PUBLIC_EXPORT_PATH(oem/exported)
 #else
-#define APP_LAYER_LOC_EXPORT_PATH(exported) APP_LAYER_PUBLIC_EXPORT_PATH(##exported)
+#define APP_LAYER_LOC_EXPORT_PATH(exported) APP_LAYER_PUBLIC_EXPORT_PATH(oem/##exported)
 #endif
 
 #if __GNUC__ >= 3
@@ -354,6 +354,8 @@
 *        S60 5.2
 * ===================
 */ 
+//Flag provieded to not fix the problem for Multiple heap created for in application startup
+#undef BRDO_STATIC_DATA_CLEANUP_SUPPORT_FF
 #elif defined(__PLATFORM_VERSION_52__)
 
 // Defines whether SAPI Security Manager Prompt Enhancement is available
@@ -392,6 +394,8 @@
 // Platform contains new Symbian Libxml implementation
 #define BRDO_SYMBIAN_LIBXML_FF
 
+// Static data initializtion on start up in E32Main() 
+#define BRDO_STATIC_DATA_CLEANUP_SUPPORT_FF
 #endif // PLATFORM VERSION ID's
 
 // Generic run-time definitions -- see WmlBrowserBuild.h for similar feature related definitions
diff -r 9a9a761f03f1 -r 0ed94ceaa377 web_plat/cod_handler_api/group/bld.inf
--- a/web_plat/cod_handler_api/group/bld.inf	Tue Nov 24 09:02:20 2009 +0200
+++ b/web_plat/cod_handler_api/group/bld.inf	Thu Dec 17 09:20:16 2009 +0200
@@ -16,14 +16,14 @@
 */
 
 #include <platform_paths.hrh>
-#include "../../../web_plat/browser_platform_api/inc/Browser_platform_variant.hrh"
+#include "../../../web_plat/browser_platform_api/inc/browser_platform_variant.hrh"
 
 PRJ_PLATFORMS
 DEFAULT
 
 PRJ_EXPORTS
-../inc/CodDownload.h       MW_LAYER_PLATFORM_EXPORT_PATH(CodDownload.h)
-../inc/HttpDownloadData.h  MW_LAYER_PLATFORM_EXPORT_PATH(HttpDownloadData.h)
+../inc/coddownload.h       MW_LAYER_PLATFORM_EXPORT_PATH(coddownload.h)
+../inc/httpdownloaddata.h  MW_LAYER_PLATFORM_EXPORT_PATH(httpdownloaddata.h)
 
 PRJ_MMPFILES
 
diff -r 9a9a761f03f1 -r 0ed94ceaa377 web_plat/connection_manager_api/group/bld.inf
--- a/web_plat/connection_manager_api/group/bld.inf	Tue Nov 24 09:02:20 2009 +0200
+++ b/web_plat/connection_manager_api/group/bld.inf	Thu Dec 17 09:20:16 2009 +0200
@@ -15,17 +15,17 @@
 *
 */
 #include <platform_paths.hrh>
-#include "../../../web_plat/browser_platform_api/inc/Browser_platform_variant.hrh"
+#include "../../../web_plat/browser_platform_api/inc/browser_platform_variant.hrh"
 
 PRJ_PLATFORMS
 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)
-../inc/IdPair.h                        MW_LAYER_PLATFORM_EXPORT_PATH(IdPair.h)
-../inc/ApChangeObserver.h              MW_LAYER_PLATFORM_EXPORT_PATH(ApChangeObserver.h)
+../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)
+../inc/idpair.h                        MW_LAYER_PLATFORM_EXPORT_PATH(idpair.h)
+../inc/apchangeobserver.h              MW_LAYER_PLATFORM_EXPORT_PATH(apchangeobserver.h)
 
 PRJ_MMPFILES
diff -r 9a9a761f03f1 -r 0ed94ceaa377 web_plat/cxml_library_api/group/bld.inf
--- a/web_plat/cxml_library_api/group/bld.inf	Tue Nov 24 09:02:20 2009 +0200
+++ b/web_plat/cxml_library_api/group/bld.inf	Thu Dec 17 09:20:16 2009 +0200
@@ -15,7 +15,7 @@
 *
 */
 #include <platform_paths.hrh>
-#include "../../../web_plat/browser_platform_api/inc/Browser_platform_variant.hrh"
+#include "../../../web_plat/browser_platform_api/inc/browser_platform_variant.hrh"
 
 PRJ_PLATFORMS
 DEFAULT
@@ -23,7 +23,7 @@
 PRJ_EXPORTS
 
 // All in one header file for clients.
-../inc/nw_cXML_Parser.h          MW_LAYER_PLATFORM_EXPORT_PATH(nw_cXML_Parser.h)
+../inc/nw_cxml_parser.h          MW_LAYER_PLATFORM_EXPORT_PATH(nw_cxml_parser.h)
 
 // Individual header files for cXML Parser
 ../inc/cxml_proj.h               MW_LAYER_PLATFORM_EXPORT_PATH(cxml_proj.h)
diff -r 9a9a761f03f1 -r 0ed94ceaa377 web_plat/download_mgr_client_api_extn/group/bld.inf
--- a/web_plat/download_mgr_client_api_extn/group/bld.inf	Tue Nov 24 09:02:20 2009 +0200
+++ b/web_plat/download_mgr_client_api_extn/group/bld.inf	Thu Dec 17 09:20:16 2009 +0200
@@ -15,12 +15,12 @@
 *
 */
 #include <platform_paths.hrh>
-#include "../../../web_plat/browser_platform_api/inc/Browser_platform_variant.hrh"
+#include "../../../web_plat/browser_platform_api/inc/browser_platform_variant.hrh"
 
 PRJ_PLATFORMS
 DEFAULT
 
 PRJ_EXPORTS
-../inc/DownloadMgrClientApiExt.h MW_LAYER_PLATFORM_EXPORT_PATH(DownloadMgrClientApiExt.h)
+../inc/downloadmgrclientapiext.h MW_LAYER_PLATFORM_EXPORT_PATH(downloadmgrclientapiext.h)
 
 PRJ_MMPFILES
diff -r 9a9a761f03f1 -r 0ed94ceaa377 web_plat/download_mgr_client_api_extn/inc/DownloadMgrClientApiExt.h
--- a/web_plat/download_mgr_client_api_extn/inc/DownloadMgrClientApiExt.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/web_plat/download_mgr_client_api_extn/inc/DownloadMgrClientApiExt.h	Thu Dec 17 09:20:16 2009 +0200
@@ -21,7 +21,7 @@
 #define __RHTTPDOWNLOADMGRAPIEXT_H__
 
 
-#include "DownloadMgrClient.h"
+#include "downloadmgrclient.h"
 
 
 /**
diff -r 9a9a761f03f1 -r 0ed94ceaa377 web_plat/feeds_engine_api/group/bld.inf
--- a/web_plat/feeds_engine_api/group/bld.inf	Tue Nov 24 09:02:20 2009 +0200
+++ b/web_plat/feeds_engine_api/group/bld.inf	Thu Dec 17 09:20:16 2009 +0200
@@ -15,29 +15,29 @@
 *
 */
 #include <platform_paths.hrh>
-#include "../../../web_plat/browser_platform_api/inc/Browser_platform_variant.hrh"
+#include "../../../web_plat/browser_platform_api/inc/browser_platform_variant.hrh"
 
 PRJ_PLATFORMS
 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)
+../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)
 
-../inc/FeedsServerMsg.h             MW_LAYER_PLATFORM_EXPORT_PATH(FeedsServerMsg.h)
-../inc/Transaction.h                MW_LAYER_PLATFORM_EXPORT_PATH(Transaction.h)
-../inc/FeedsEntity.h                MW_LAYER_PLATFORM_EXPORT_PATH(FeedsEntity.h)
-../inc/FeedsMap.h                   MW_LAYER_PLATFORM_EXPORT_PATH(FeedsMap.h)
-../inc/FeedsInterface.h             MW_LAYER_PLATFORM_EXPORT_PATH(FeedsInterface.h)
-../inc/FeedAttributes.h             MW_LAYER_PLATFORM_EXPORT_PATH(FeedAttributes.h)
-../inc/FolderAttributes.h           MW_LAYER_PLATFORM_EXPORT_PATH(FolderAttributes.h)
+../inc/feedsservermsg.h             MW_LAYER_PLATFORM_EXPORT_PATH(feedsservermsg.h)
+../inc/transaction.h                MW_LAYER_PLATFORM_EXPORT_PATH(transaction.h)
+../inc/feedsentity.h                MW_LAYER_PLATFORM_EXPORT_PATH(feedsentity.h)
+../inc/feedsmap.h                   MW_LAYER_PLATFORM_EXPORT_PATH(feedsmap.h)
+../inc/feedsinterface.h             MW_LAYER_PLATFORM_EXPORT_PATH(feedsinterface.h)
+../inc/feedattributes.h             MW_LAYER_PLATFORM_EXPORT_PATH(feedattributes.h)
+../inc/folderattributes.h           MW_LAYER_PLATFORM_EXPORT_PATH(folderattributes.h)
 
-../inc/FeedsServerRequestHandler.h  MW_LAYER_PLATFORM_EXPORT_PATH(FeedsServerRequestHandler.h)
-../inc/FeedsServerSettings.h        MW_LAYER_PLATFORM_EXPORT_PATH(FeedsServerSettings.h)
-../inc/ConnectionObserver.h         MW_LAYER_PLATFORM_EXPORT_PATH(ConnectionObserver.h)
-../inc/LeakTracker.h                MW_LAYER_PLATFORM_EXPORT_PATH(LeakTracker.h)
-../inc/XmlEncoding.h                MW_LAYER_PLATFORM_EXPORT_PATH(XmlEncoding.h)
+../inc/feedsserverrequesthandler.h  MW_LAYER_PLATFORM_EXPORT_PATH(feedsserverrequesthandler.h)
+../inc/feedsserversettings.h        MW_LAYER_PLATFORM_EXPORT_PATH(feedsserversettings.h)
+../inc/connectionobserver.h         MW_LAYER_PLATFORM_EXPORT_PATH(connectionobserver.h)
+../inc/leaktracker.h                MW_LAYER_PLATFORM_EXPORT_PATH(leaktracker.h)
+../inc/xmlencoding.h                MW_LAYER_PLATFORM_EXPORT_PATH(xmlencoding.h)
 
 PRJ_MMPFILES
diff -r 9a9a761f03f1 -r 0ed94ceaa377 web_plat/group/bld.inf
--- a/web_plat/group/bld.inf	Tue Nov 24 09:02:20 2009 +0200
+++ b/web_plat/group/bld.inf	Thu Dec 17 09:20:16 2009 +0200
@@ -15,7 +15,7 @@
 *
 */
 
-#include "../browser_platform_api/inc/Browser_platform_variant.hrh"
+#include "../browser_platform_api/inc/browser_platform_variant.hrh"
 
 
 #include "../aiw_browser_provider_api/group/bld.inf"
diff -r 9a9a761f03f1 -r 0ed94ceaa377 web_plat/launcher_api/group/bld.inf
--- a/web_plat/launcher_api/group/bld.inf	Tue Nov 24 09:02:20 2009 +0200
+++ b/web_plat/launcher_api/group/bld.inf	Thu Dec 17 09:20:16 2009 +0200
@@ -18,7 +18,7 @@
 */
 
 #include <platform_paths.hrh>
-#include "../../../web_plat/browser_platform_api/inc/Browser_platform_variant.hrh"
+#include "../../../web_plat/browser_platform_api/inc/browser_platform_variant.hrh"
 
 PRJ_PLATFORMS
 
@@ -26,10 +26,10 @@
 
 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)
+../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
diff -r 9a9a761f03f1 -r 0ed94ceaa377 web_plat/launcher_api/inc/BrowserLauncher.h
--- a/web_plat/launcher_api/inc/BrowserLauncher.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/web_plat/launcher_api/inc/BrowserLauncher.h	Thu Dec 17 09:20:16 2009 +0200
@@ -24,7 +24,7 @@
 //  INCLUDES
 #include <e32std.h>
 #include <e32base.h>
-#include <FavouritesDb.h>
+#include <favouritesdb.h>
 
 // FORWARD DECLARATIONS
 class CBrowserLauncherExtension;
@@ -244,4 +244,4 @@
 										 TBool& aIsOverriddenSettings );
     };
 
-#endif // BROWSERLAUNCHER_H
\ No newline at end of file
+#endif // BROWSERLAUNCHER_H
diff -r 9a9a761f03f1 -r 0ed94ceaa377 web_plat/multipart_parser_api/group/bld.inf
--- a/web_plat/multipart_parser_api/group/bld.inf	Tue Nov 24 09:02:20 2009 +0200
+++ b/web_plat/multipart_parser_api/group/bld.inf	Thu Dec 17 09:20:16 2009 +0200
@@ -16,7 +16,7 @@
 */
 
 #include <platform_paths.hrh>
-#include "../../../web_plat/browser_platform_api/inc/Browser_platform_variant.hrh"
+#include "../../../web_plat/browser_platform_api/inc/browser_platform_variant.hrh"
 
 #ifdef BRDO_MULTIPART_PARSER_FF
 
@@ -24,8 +24,8 @@
 DEFAULT
 
 PRJ_EXPORTS
-../inc/BodyPart.h           MW_LAYER_PLATFORM_EXPORT_PATH(BodyPart.h)
-../inc/MultipartParser.h    MW_LAYER_PLATFORM_EXPORT_PATH(MultipartParser.h)
+../inc/bodypart.h           MW_LAYER_PLATFORM_EXPORT_PATH(bodypart.h)
+../inc/multipartparser.h    MW_LAYER_PLATFORM_EXPORT_PATH(multipartparser.h)
 
 PRJ_MMPFILES
 
diff -r 9a9a761f03f1 -r 0ed94ceaa377 web_plat/recent_url_store_api/group/bld.inf
--- a/web_plat/recent_url_store_api/group/bld.inf	Tue Nov 24 09:02:20 2009 +0200
+++ b/web_plat/recent_url_store_api/group/bld.inf	Thu Dec 17 09:20:16 2009 +0200
@@ -15,13 +15,13 @@
 *
 */
 #include <platform_paths.hrh>
-#include "../../../web_plat/browser_platform_api/inc/Browser_platform_variant.hrh"
+#include "../../../web_plat/browser_platform_api/inc/browser_platform_variant.hrh"
 
 PRJ_PLATFORMS
 DEFAULT
 
 PRJ_EXPORTS
 
-../inc/RecentUrlStore.h  MW_LAYER_PLATFORM_EXPORT_PATH(RecentUrlStore.h)
+../inc/recenturlstore.h  MW_LAYER_PLATFORM_EXPORT_PATH(recenturlstore.h)
 
 PRJ_MMPFILES
diff -r 9a9a761f03f1 -r 0ed94ceaa377 web_plat/rt_gesturehelper_api/group/bld.inf
--- a/web_plat/rt_gesturehelper_api/group/bld.inf	Tue Nov 24 09:02:20 2009 +0200
+++ b/web_plat/rt_gesturehelper_api/group/bld.inf	Thu Dec 17 09:20:16 2009 +0200
@@ -15,7 +15,7 @@
 *
 */
 #include <platform_paths.hrh>
-#include "../../browser_platform_api/inc/Browser_platform_variant.hrh"
+#include "../../browser_platform_api/inc/browser_platform_variant.hrh"
 
 PRJ_PLATFORMS
 DEFAULT
diff -r 9a9a761f03f1 -r 0ed94ceaa377 web_plat/scheme_handler_plugin_api/group/bld.inf
--- a/web_plat/scheme_handler_plugin_api/group/bld.inf	Tue Nov 24 09:02:20 2009 +0200
+++ b/web_plat/scheme_handler_plugin_api/group/bld.inf	Thu Dec 17 09:20:16 2009 +0200
@@ -19,18 +19,18 @@
 
 
 #include <platform_paths.hrh>
-#include "../../../web_plat/browser_platform_api/inc/Browser_platform_variant.hrh"
+#include "../../../web_plat/browser_platform_api/inc/browser_platform_variant.hrh"
 
 PRJ_PLATFORMS
 DEFAULT
 
 PRJ_EXPORTS
-../inc/SchemeHandler.h         MW_LAYER_PLATFORM_EXPORT_PATH(SchemeHandler.h)
-../inc/SchemeHandler.inl       MW_LAYER_PLATFORM_EXPORT_PATH(SchemeHandler.inl)
-../inc/SchemeDefs.hrh          MW_LAYER_PLATFORM_EXPORT_PATH(SchemeDefs.hrh)
+../inc/schemehandler.h         MW_LAYER_PLATFORM_EXPORT_PATH(schemehandler.h)
+../inc/schemehandler.inl       MW_LAYER_PLATFORM_EXPORT_PATH(schemehandler.inl)
+../inc/schemedefs.hrh          MW_LAYER_PLATFORM_EXPORT_PATH(schemedefs.hrh)
 
 #ifdef BRDO_ADDED_EXPORT_LOCATION
-../inc/SchemeDefs.hrh          BRDO_ADDED_EXPORT_LOCATION(SchemeDefs.hrh)
+../inc/schemedefs.hrh          BRDO_ADDED_EXPORT_LOCATION(schemedefs.hrh)
 #endif
 
 PRJ_MMPFILES
diff -r 9a9a761f03f1 -r 0ed94ceaa377 web_plat/scriptable_plugin_api/group/bld.inf
--- a/web_plat/scriptable_plugin_api/group/bld.inf	Tue Nov 24 09:02:20 2009 +0200
+++ b/web_plat/scriptable_plugin_api/group/bld.inf	Thu Dec 17 09:20:16 2009 +0200
@@ -15,7 +15,7 @@
 *
 */
 #include <platform_paths.hrh>
-#include "../../../web_plat/browser_platform_api/inc/Browser_platform_variant.hrh"
+#include "../../../web_plat/browser_platform_api/inc/browser_platform_variant.hrh"
 
 PRJ_PLATFORMS
 DEFAULT
diff -r 9a9a761f03f1 -r 0ed94ceaa377 web_plat/webutils_api/group/bld.inf
--- a/web_plat/webutils_api/group/bld.inf	Tue Nov 24 09:02:20 2009 +0200
+++ b/web_plat/webutils_api/group/bld.inf	Thu Dec 17 09:20:16 2009 +0200
@@ -15,14 +15,14 @@
 *
 */
 #include <platform_paths.hrh>
-#include "../../../web_plat/browser_platform_api/inc/Browser_platform_variant.hrh"
+#include "../../../web_plat/browser_platform_api/inc/browser_platform_variant.hrh"
 
 PRJ_PLATFORMS
 DEFAULT
 
 PRJ_EXPORTS
-../inc/CUserAgent.h             MW_LAYER_PLATFORM_EXPORT_PATH(CUserAgent.h)
-../inc/WebUtilsInternalCRKeys.h MW_LAYER_PLATFORM_EXPORT_PATH(WebUtilsInternalCRKeys.h)
-../inc/WebUtilsSDKCRKeys.h	    MW_LAYER_PLATFORM_EXPORT_PATH(WebUtilsSDKCRKeys.h)
+../inc/cuseragent.h             MW_LAYER_PLATFORM_EXPORT_PATH(cuseragent.h)
+../inc/webutilsinternalcrkeys.h MW_LAYER_PLATFORM_EXPORT_PATH(webutilsinternalcrkeys.h)
+../inc/webutilssdkcrkeys.h	    MW_LAYER_PLATFORM_EXPORT_PATH(webutilssdkcrkeys.h)
 
 PRJ_MMPFILES
diff -r 9a9a761f03f1 -r 0ed94ceaa377 web_plat/webutils_api/inc/WebUtilsInternalCRKeys.h
--- a/web_plat/webutils_api/inc/WebUtilsInternalCRKeys.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/web_plat/webutils_api/inc/WebUtilsInternalCRKeys.h	Thu Dec 17 09:20:16 2009 +0200
@@ -71,8 +71,8 @@
 // Browser Version Minor
 const TUint32 KWebUtilsBrowserVersionMinor =	0x00000010;
 
-// Browser Version SVN Rev 
-const TUint32 KWebUtilsBrowserVersionSVNRev =	0x00000011;
+// Browser Version Feature Rev 
+const TUint32 KWebUtilsBrowserVersionFeatureRev =	0x00000011;
 
 // Browser Name
 const TUint32 KWebUtilsBrowserName =	0x00000012;
@@ -80,5 +80,7 @@
 // Ignore product program config when TRUE 
 const TUint32 KWebUtilsIgnoreConfig =	0x00000013;
 
+// Browser Version Patch Rev 
+const TUint32 KWebUtilsBrowserVersionPatchRev =	0x00000014;
 		
 #endif // WEBUTILSINTERNALCRKEYS_H
diff -r 9a9a761f03f1 -r 0ed94ceaa377 web_plat/widget_registry_api/group/bld.inf
--- a/web_plat/widget_registry_api/group/bld.inf	Tue Nov 24 09:02:20 2009 +0200
+++ b/web_plat/widget_registry_api/group/bld.inf	Thu Dec 17 09:20:16 2009 +0200
@@ -15,16 +15,16 @@
 *
 */
 #include <platform_paths.hrh>
-#include "../../../web_plat/browser_platform_api/inc/Browser_platform_variant.hrh"
+#include "../../../web_plat/browser_platform_api/inc/browser_platform_variant.hrh"
 
 PRJ_PLATFORMS
 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)
-../inc/WidgetRegistryData.h      MW_LAYER_PLATFORM_EXPORT_PATH(WidgetRegistryData.h)
+../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)
+../inc/widgetregistrydata.h      MW_LAYER_PLATFORM_EXPORT_PATH(widgetregistrydata.h)
 
 PRJ_MMPFILES
diff -r 9a9a761f03f1 -r 0ed94ceaa377 web_plat/widget_registry_api/inc/WidgetRegistryConstants.h
--- a/web_plat/widget_registry_api/inc/WidgetRegistryConstants.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/web_plat/widget_registry_api/inc/WidgetRegistryConstants.h	Thu Dec 17 09:20:16 2009 +0200
@@ -125,6 +125,9 @@
     EFileSize,                  // int
     EUid,                       // TUid
     ENokiaWidget,               // int 0 (not Nokia DTD) or 1 (Nokia DTD)
+    // Do not add enums prior to this, if you are adding enums here 
+    // take into consideration the compatibility problems, i.e widgets working after firmware update.  
+
     EMiniViewEnable,            //optional; int internally 0 0r 1
     EBlanketPermGranted,              //optional; int internally 0 0r 1
     EPreInstalled,              // optional; int internally 0 or 1
diff -r 9a9a761f03f1 -r 0ed94ceaa377 web_plat/xml_parser_api/group/bld.inf
--- a/web_plat/xml_parser_api/group/bld.inf	Tue Nov 24 09:02:20 2009 +0200
+++ b/web_plat/xml_parser_api/group/bld.inf	Thu Dec 17 09:20:16 2009 +0200
@@ -23,8 +23,8 @@
 
 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)
diff -r 9a9a761f03f1 -r 0ed94ceaa377 web_pub/browser_control_api/group/bld.inf
--- a/web_pub/browser_control_api/group/bld.inf	Tue Nov 24 09:02:20 2009 +0200
+++ b/web_pub/browser_control_api/group/bld.inf	Thu Dec 17 09:20:16 2009 +0200
@@ -16,7 +16,7 @@
 */
 #ifndef __BROWSER_SDK
 #include <platform_paths.hrh>
-#include "../../../web_plat/browser_platform_api/inc/Browser_platform_variant.hrh"
+#include "../../../web_plat/browser_platform_api/inc/browser_platform_variant.hrh"
 #endif
 
 PRJ_PLATFORMS
@@ -25,27 +25,27 @@
 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/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)
-../inc/BrCtlLayoutObserver.h      MW_LAYER_PUBLIC_EXPORT_PATH(BrCtlLayoutObserver.h)
-../inc/BrCtlLinkResolver.h        MW_LAYER_PUBLIC_EXPORT_PATH(BrCtlLinkResolver.h)
-../inc/BrCtlSoftkeysObserver.h    MW_LAYER_PUBLIC_EXPORT_PATH(BrCtlSoftkeysObserver.h)
-../inc/BrCtlSpecialLoadObserver.h MW_LAYER_PUBLIC_EXPORT_PATH(BrCtlSpecialLoadObserver.h)
-../inc/BrCtlWindowObserver.h      MW_LAYER_PUBLIC_EXPORT_PATH(BrCtlWindowObserver.h)
-../inc/BrCtlDownloadObserver.h    MW_LAYER_PUBLIC_EXPORT_PATH(BrCtlDownloadObserver.h)
+../inc/brctllayoutobserver.h      MW_LAYER_PUBLIC_EXPORT_PATH(brctllayoutobserver.h)
+../inc/brctllinkresolver.h        MW_LAYER_PUBLIC_EXPORT_PATH(brctllinkresolver.h)
+../inc/brctlsoftkeysobserver.h    MW_LAYER_PUBLIC_EXPORT_PATH(brctlsoftkeysobserver.h)
+../inc/brctlspecialloadobserver.h MW_LAYER_PUBLIC_EXPORT_PATH(brctlspecialloadobserver.h)
+../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/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
+../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
 
diff -r 9a9a761f03f1 -r 0ed94ceaa377 web_pub/browser_control_api/inc/BrCtlDefs.h
--- a/web_pub/browser_control_api/inc/BrCtlDefs.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/web_pub/browser_control_api/inc/BrCtlDefs.h	Thu Dec 17 09:20:16 2009 +0200
@@ -33,12 +33,12 @@
 * Usage:
 *
 * @code
-*  #include <BrCtlDefs.h>
+*  #include <brctldefs.h>
 *
 * @see S60 Platform: Browser Control API Developer's Guide Version 2.0
 * @lib BrowserEngine.lib
 * @since 3.0
-* @file BrCtlDefs.h
+* @file brctldefs.h
 * @endcode     *
 */
 class TBrCtlDefs
diff -r 9a9a761f03f1 -r 0ed94ceaa377 web_pub/browser_control_api/inc/BrCtlDialogsProvider.h
--- a/web_pub/browser_control_api/inc/BrCtlDialogsProvider.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/web_pub/browser_control_api/inc/BrCtlDialogsProvider.h	Thu Dec 17 09:20:16 2009 +0200
@@ -73,12 +73,12 @@
 * Usage:
 *
 * @code
-*  #include <BrCtlDialogsProvider.h>
+*  #include <brctldialogsprovider.h>
 *
 *
 * @see S60 Platform: Browser Control API Developer's Guide Version 2.0
 * @lib BrowserEngine.lib
-* @file BrCtlDialogsProvider.h
+* @file brctldialogsprovider.h
 * @endcode     *
 */
 class MBrCtlDialogsProvider
@@ -270,10 +270,10 @@
 * The TBrCtlSelectOptionData class represents a list of elements
 * to display in the list box. This class is used for the List Selection Dialog.
 * @code
-*  #include <BrCtlDialogsProvider.h>
+*  #include <brctldialogsprovider.h>
 * @lib BrowserEngine.lib
 * @since 2.8
-* @file BrCtlDialogsProvider.h
+* @file brctldialogsprovider.h
 * @endcode     *
 */
 class TBrCtlSelectOptionData
@@ -399,10 +399,10 @@
 * The CBrCtlObjectInfo class used to represent the information about the
 * plugin object.
 * @code
-*  #include <BrCtlDialogsProvider.h>
+*  #include <brctldialogsprovider.h>
 * @lib BrowserEngine.lib
 * @since 3.0
-* @file BrCtlDialogsProvider.h
+* @file brctldialogsprovider.h
 * @endcode     *
 */
 class CBrCtlObjectInfo : public CBase
@@ -521,10 +521,10 @@
 * TheTBrCtlImageCarrier class used to give the information about the
 * image.
 * @code
-*  #include <BrCtlDialogsProvider.h>
+*  #include <brctldialogsprovider.h>
 * @lib BrowserEngine.lib
 * @since 2.8
-* @file BrCtlDialogsProvider.h
+* @file brctldialogsprovider.h
 * @endcode     *
 */
 class TBrCtlImageCarrier
diff -r 9a9a761f03f1 -r 0ed94ceaa377 web_pub/browser_control_api/inc/BrCtlDownloadObserver.h
--- a/web_pub/browser_control_api/inc/BrCtlDownloadObserver.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/web_pub/browser_control_api/inc/BrCtlDownloadObserver.h	Thu Dec 17 09:20:16 2009 +0200
@@ -22,7 +22,7 @@
 //  INCLUDES
 #include <e32std.h>
 #include <e32base.h>
-#include <BrCtlDefs.h>
+#include <brctldefs.h>
 
 // CONSTANTS
 
@@ -86,12 +86,12 @@
 * Usage:
 *
 * @code
-*  #include <BrCtlDownloadObserver.h>
+*  #include <brctldownloadobserver.h>
 *
 *  
 * @see S60 Platform: Browser Control API Developer's Guide Version 2.0
 * @lib BrowserEngine.lib
-* @file BrCtlDownloadObserver.h
+* @file brctldownloadobserver.h
 * @endcode     *
 */
 class MBrCtlDownloadObserver
diff -r 9a9a761f03f1 -r 0ed94ceaa377 web_pub/browser_control_api/inc/BrCtlInterface.h
--- a/web_pub/browser_control_api/inc/BrCtlInterface.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/web_pub/browser_control_api/inc/BrCtlInterface.h	Thu Dec 17 09:20:16 2009 +0200
@@ -27,14 +27,14 @@
 #include <eikmenup.h>
 #include <ssl.h>
 
-#include <BrCtlDialogsProvider.h>
-#include <BrCtlLayoutObserver.h>
-#include <BrCtlLinkResolver.h>
-#include <BrCtlSoftkeysObserver.h>
-#include <BrCtlSpecialLoadObserver.h>
-#include <BrCtlWindowObserver.h>
-#include <BrCtlDownloadObserver.h>
-#include <BrCtlDefs.h>
+#include <brctldialogsprovider.h>
+#include <brctllayoutobserver.h>
+#include <brctllinkresolver.h>
+#include <brctlsoftkeysobserver.h>
+#include <brctlspecialloadobserver.h>
+#include <brctlwindowobserver.h>
+#include <brctldownloadobserver.h>
+#include <brctldefs.h>
 
 // DATA TYPES
 
@@ -108,27 +108,27 @@
 * Usage:
 *
 * @code
-*  #include <BrCtlInterface.h>
+*  #include <brctlinterface.h>
 *  // Interface that provides dialogs used by the Browser Control.
-*  #include <BrCtlDialogsProvider.h>
+*  #include <brctldialogsprovider.h>
 *  // Interface used to receive scrolling events.
-*  #include <BrCtlLayoutObserver.h>
+*  #include <brctllayoutobserver.h>
 *  //Interface that provides a callback mechanism for receiving the
 *  //content of an embedded link or the content of a user-initiated
 *  //load request.
-*  #include <BrCtlLinkResolver.h>
+*  #include <brctllinkresolver.h>
 *  //Interface that handles requests to change the softkeys.
-*  #include <BrCtlSoftkeysObserver.h>
+*  #include <brctlsoftkeysobserver.h>
 *  //Interface that handles special load needs.
-*  #include <BrCtlSpecialLoadObserver.h>
+*  #include <brctlspecialloadobserver.h>
 *  //Reserved for future use.
-*  #include <BrCtlWindowObserver.h>
+*  #include <brctlwindowobserver.h>
 *  //Interface that passes download events from the
 *  //Download Manager through the Browser Control to the
 *  //host application.
-*  #include <BrCtlDownloadObserver.h>
+*  #include <brctldownloadobserver.h>
 *  Enum Definition of the Browser Control API.
-*  #include <BrCtlDefs.h>
+*  #include <brctldefs.h>
 *
 *
 *   The following types of things you can do with the Browser Control API.
@@ -148,7 +148,7 @@
 * @see S60 Platform: Browser Control API Developer's Guide Version 2.0
 * @lib BrowserEngine.lib
 * @since 2.8
-* @file BrCtlInterface.h
+* @file brctlinterface.h
 * @endcode     *
 */
 class CBrCtlInterface : public CCoeControl
@@ -625,11 +625,11 @@
 * Usage:
 *
 * @code
-*  #include <BrCtlInterface.h>
+*  #include <brctlinterface.h>
 * @see S60 Platform: Browser Control API Developer's Guide Version 2.0
 * @lib BrowserEngine.lib
 * @since 2.8
-* @file BrCtlInterface.h
+* @file brctlinterface.h
 * @endcode     *
 */
 class MBrCtlDataLoadSupplier
@@ -650,11 +650,11 @@
 * the Browser Control with the ability to receive content incrementally.
 *
 * @code
-*  #include <BrCtlInterface.h>
+*  #include <brctlinterface.h>
 * @see S60 Platform: Browser Control API Developer's Guide Version 2.0
 * @lib BrowserEngine.lib
 * @since 2.8
-* @file BrCtlInterface.h
+* @file brctlinterface.h
 * @endcode     *
 */
 class MBrCtlDataLoadConsumer
@@ -690,11 +690,11 @@
 * The host application can implement this interface.
 *
 * @code
-*  #include <BrCtlInterface.h>
+*  #include <brctlinterface.h>
 * @see S60 Platform: Browser Control API Developer's Guide Version 2.0
 * @lib BrowserEngine.lib
 * @since 2.8
-* @file BrCtlInterface.h
+* @file brctlinterface.h
 * @endcode     *
 */
 class MBrCtlLoadEventObserver
@@ -715,10 +715,10 @@
 * The TBrCtlWmlServiceOption class wraps information about the WML DO elements.
 * For more information about the DO tag, see http://www.w3schools.com/wap/tag_do.asp.
 * @code
-*  #include <BrCtlInterface.h>
+*  #include <brctlinterface.h>
 * @lib BrowserEngine.lib
 * @since 2.8
-* @file BrCtlInterface.h
+* @file brctlinterface.h
 * @endcode     *
 */
 class TBrCtlWmlServiceOption
@@ -777,10 +777,10 @@
 /**
 * The TBrCtlSubscribeTo class provides information of Subscribe to items.
 * @code
-*  #include <BrCtlInterface.h>
+*  #include <brctlinterface.h>
 * @lib BrowserEngine.lib
 * @since 2.8
-* @file BrCtlInterface.h
+* @file brctlinterface.h
 * @endcode     *
 */
 class TBrCtlSubscribeTo
@@ -839,10 +839,10 @@
 * implement this interface in order to find out when the view
 * changes to and from the Image Map view.
 * @code
-*  #include <BrCtlInterface.h>
+*  #include <brctlinterface.h>
 * @lib BrowserEngine.lib
 * @since 2.8
-* @file BrCtlInterface.h
+* @file brctlinterface.h
 * @endcode     *
 */
 class MBrCtlStateChangeObserver
diff -r 9a9a761f03f1 -r 0ed94ceaa377 web_pub/browser_control_api/inc/BrCtlLayoutObserver.h
--- a/web_pub/browser_control_api/inc/BrCtlLayoutObserver.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/web_pub/browser_control_api/inc/BrCtlLayoutObserver.h	Thu Dec 17 09:20:16 2009 +0200
@@ -48,12 +48,12 @@
 * Usage:
 *
 * @code
-*  #include <BrCtlLayoutObserver.h>
+*  #include <brctllayoutobserver.h>
 *
 *  
 * @see S60 Platform: Browser Control API Developer's Guide Version 2.0
 * @lib BrowserEngine.lib
-* @file BrCtlLayoutObserver.h
+* @file brctllayoutobserver.h
 * @endcode     *
 */
 class MBrCtlLayoutObserver
diff -r 9a9a761f03f1 -r 0ed94ceaa377 web_pub/browser_control_api/inc/BrCtlLinkResolver.h
--- a/web_pub/browser_control_api/inc/BrCtlLinkResolver.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/web_pub/browser_control_api/inc/BrCtlLinkResolver.h	Thu Dec 17 09:20:16 2009 +0200
@@ -62,12 +62,12 @@
 * Usage:
 *
 * @code
-*  #include <BrCtlLinkResolver.h>
+*  #include <brctllinkresolver.h>
 *
 *  
 * @see S60 Platform: Browser Control API Developer's Guide Version 2.0
 * @lib BrowserEngine.lib
-* @file BrCtlLinkResolver.h
+* @file brctllinkresolver.h
 * @endcode     *
 */
 class MBrCtlLinkResolver
@@ -124,12 +124,12 @@
 * Usage:
 *
 * @code
-*  #include <BrCtlLinkResolver.h>
+*  #include <brctllinkresolver.h>
 *
 *  
 * @see S60 Platform: Browser Control API Developer's Guide Version 2.0
 * @lib BrowserEngine.lib
-* @file BrCtlLinkResolver.h
+* @file brctllinkresolver.h
 * @endcode     *
 */
 class MBrCtlLinkContent
diff -r 9a9a761f03f1 -r 0ed94ceaa377 web_pub/browser_control_api/inc/BrCtlSoftkeysObserver.h
--- a/web_pub/browser_control_api/inc/BrCtlSoftkeysObserver.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/web_pub/browser_control_api/inc/BrCtlSoftkeysObserver.h	Thu Dec 17 09:20:16 2009 +0200
@@ -45,12 +45,12 @@
 * Usage:
 *
 * @code
-*  #include <BrCtlSoftkeysObserver.h>
+*  #include <brctlsoftkeysobserver.h>
 *
 *  
 * @see S60 Platform: Browser Control API Developer's Guide Version 2.0
 * @lib BrowserEngine.lib
-* @file BrCtlSoftkeysObserver.h
+* @file brctlsoftkeysobserver.h
 * @endcode     *
 */
 class MBrCtlSoftkeysObserver
diff -r 9a9a761f03f1 -r 0ed94ceaa377 web_pub/browser_control_api/inc/BrCtlSpecialLoadObserver.h
--- a/web_pub/browser_control_api/inc/BrCtlSpecialLoadObserver.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/web_pub/browser_control_api/inc/BrCtlSpecialLoadObserver.h	Thu Dec 17 09:20:16 2009 +0200
@@ -63,12 +63,12 @@
 * Usage:
 *
 * @code
-*  #include <BrCtlSpecialLoadObserver.h>
+*  #include <brctlspecialloadobserver.h>
 *
 *  
 * @see S60 Platform: Browser Control API Developer's Guide Version 2.0
 * @lib BrowserEngine.lib
-* @file BrCtlSpecialLoadObserver.h
+* @file brctlspecialloadobserver.h
 * @endcode     *
 */
 class MBrCtlSpecialLoadObserver
diff -r 9a9a761f03f1 -r 0ed94ceaa377 web_pub/browser_control_api/inc/BrCtlWindowObserver.h
--- a/web_pub/browser_control_api/inc/BrCtlWindowObserver.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/web_pub/browser_control_api/inc/BrCtlWindowObserver.h	Thu Dec 17 09:20:16 2009 +0200
@@ -22,7 +22,7 @@
 //  INCLUDES
 #include <e32std.h>
 #include <e32base.h>
-#include <BrCtlDefs.h>
+#include <brctldefs.h>
 
 // CONSTANTS
 
@@ -48,12 +48,12 @@
 * Usage:
 *
 * @code
-*  #include <BrCtlWindowObserver.h>
+*  #include <brctlwindowobserver.h>
 *
 * @see S60 Platform: Browser Control API Developer's Guide Version 2.0
 * @lib BrowserEngine.lib
 * @since 3.0
-* @file BrCtlWindowObserver.h
+* @file brctlwindowobserver.h
 * @endcode     *
 */
 class MBrCtlWindowObserver
diff -r 9a9a761f03f1 -r 0ed94ceaa377 web_pub/browser_control_api/tsrc/group/BrCtlApiTest.mmp
--- a/web_pub/browser_control_api/tsrc/group/BrCtlApiTest.mmp	Tue Nov 24 09:02:20 2009 +0200
+++ b/web_pub/browser_control_api/tsrc/group/BrCtlApiTest.mmp	Thu Dec 17 09:20:16 2009 +0200
@@ -40,9 +40,9 @@
 MW_LAYER_ECOM_SYSTEMINCLUDE
 
 SOURCEPATH      ../src
-SOURCE          BrCtlApiTest.cpp BrCtlApiTestBlocks.cpp
-SOURCE          BrCtlApiTestContainer.cpp BrCtlApiTestObserver.cpp 
-SOURCE          BrCtlApiTestStateChangeObserver.cpp BrCtlApiTestDialogsProvider.cpp
+SOURCE          brctlapitest.cpp brctlapitestblocks.cpp
+SOURCE          brctlapitestcontainer.cpp brbtlapitestobserver.cpp 
+SOURCE          brctlapiteststatechangeobserver.cpp brctlapitestdialogsprovider.cpp
 
 LIBRARY         euser.lib cone.lib eikcore.lib apparc.lib avkon.lib 
 LIBRARY         flogger.lib apmime.lib apgrfx.lib efsrv.lib eikcoctl.lib 
diff -r 9a9a761f03f1 -r 0ed94ceaa377 web_pub/browser_control_api/tsrc/inc/BrCtlApiTest.h
--- a/web_pub/browser_control_api/tsrc/inc/BrCtlApiTest.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/web_pub/browser_control_api/tsrc/inc/BrCtlApiTest.h	Thu Dec 17 09:20:16 2009 +0200
@@ -26,7 +26,7 @@
 #include <StifTestModule.h>
 
 #include <coecntrl.h>
-#include "BrCtlApiTestContainer.h"
+#include "brctlapitestcontainer.h"
 
 // CONSTANTS
 //const ?type ?constant_var = ?constant;
diff -r 9a9a761f03f1 -r 0ed94ceaa377 web_pub/browser_control_api/tsrc/inc/BrCtlApiTestContainer.h
--- a/web_pub/browser_control_api/tsrc/inc/BrCtlApiTestContainer.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/web_pub/browser_control_api/tsrc/inc/BrCtlApiTestContainer.h	Thu Dec 17 09:20:16 2009 +0200
@@ -20,11 +20,11 @@
 
 // INCLUDES
 #include <coecntrl.h>
-#include <BrCtlInterface.h> // interface under test
+#include <brctlinterface.h> // interface under test
 
-#include "BrCtlApiTestObserver.h"
-#include "BrCtlApiTestStateChangeObserver.h"
-#include "BrCtlApiTestDialogsProvider.h"
+#include "brctlapitestobserver.h"
+#include "brctlapiteststatechangeobserver.h"
+#include "brctlapitestdialogsprovider.h"
    
 // CONSTATNS
 const TInt KThisAppUid = 0xA0000181;
diff -r 9a9a761f03f1 -r 0ed94ceaa377 web_pub/browser_control_api/tsrc/inc/BrCtlApiTestDialogsProvider.h
--- a/web_pub/browser_control_api/tsrc/inc/BrCtlApiTestDialogsProvider.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/web_pub/browser_control_api/tsrc/inc/BrCtlApiTestDialogsProvider.h	Thu Dec 17 09:20:16 2009 +0200
@@ -25,7 +25,7 @@
 // User includes
 
 // System Includes
-#include <BrCtlDialogsProvider.h>
+#include <brctldialogsprovider.h>
 //#include <BrowserDialogsProviderProxy.h>
 #include <e32std.h>
 
diff -r 9a9a761f03f1 -r 0ed94ceaa377 web_pub/browser_control_api/tsrc/inc/BrCtlApiTestObserver.h
--- a/web_pub/browser_control_api/tsrc/inc/BrCtlApiTestObserver.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/web_pub/browser_control_api/tsrc/inc/BrCtlApiTestObserver.h	Thu Dec 17 09:20:16 2009 +0200
@@ -21,11 +21,11 @@
 #define BRCTLBCTESTOBSERVER_H
 
 //  INCLUDES
-#include <BrCtlLayoutObserver.h>
-#include <BrCtlSoftkeysObserver.h>
-#include <BrCtlSpecialLoadObserver.h>
-#include <BrCtlDownloadObserver.h>
-#include <BrCtlInterface.h>
+#include <brctllayoutobserver.h>
+#include <brctlsoftkeysobserver.h>
+#include <brctlspecialloadobserver.h>
+#include <brctldownloadobserver.h>
+#include <brctlinterface.h>
 #include <DocumentHandler.h>    
 #include <flogger.h>
 
diff -r 9a9a761f03f1 -r 0ed94ceaa377 web_pub/browser_control_api/tsrc/inc/BrCtlApiTestStateChangeObserver.h
--- a/web_pub/browser_control_api/tsrc/inc/BrCtlApiTestStateChangeObserver.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/web_pub/browser_control_api/tsrc/inc/BrCtlApiTestStateChangeObserver.h	Thu Dec 17 09:20:16 2009 +0200
@@ -21,7 +21,7 @@
 #define BRCTLBCTESTSTATECHANGEOBSERVER_H
 
 // INCLUDES
-#include <BrCtlInterface.h>
+#include <brctlinterface.h>
 
 // FORWARD DECLARATIONS
 class CBrCtlApiTestContainer;
diff -r 9a9a761f03f1 -r 0ed94ceaa377 web_pub/browser_control_api/tsrc/src/BrCtlApiTest.cpp
--- a/web_pub/browser_control_api/tsrc/src/BrCtlApiTest.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/web_pub/browser_control_api/tsrc/src/BrCtlApiTest.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -18,7 +18,7 @@
 
 // INCLUDE FILES
 #include <Stiftestinterface.h>
-#include "BrCtlApiTest.h"
+#include "brctlapitest.h"
 #include <SettingServerClient.h>
 
 // ============================= LOCAL FUNCTIONS ===============================
diff -r 9a9a761f03f1 -r 0ed94ceaa377 web_pub/browser_control_api/tsrc/src/BrCtlApiTestBlocks.cpp
--- a/web_pub/browser_control_api/tsrc/src/BrCtlApiTestBlocks.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/web_pub/browser_control_api/tsrc/src/BrCtlApiTestBlocks.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -21,7 +21,7 @@
 #include <e32svr.h>
 #include <StifParser.h>
 #include <Stiftestinterface.h>
-#include "BrCtlApiTest.h"
+#include "brctlapitest.h"
 
 #define RETURN_FAILURE_ON_ERROR     \
     if ( err )                      \
diff -r 9a9a761f03f1 -r 0ed94ceaa377 web_pub/browser_control_api/tsrc/src/BrCtlApiTestContainer.cpp
--- a/web_pub/browser_control_api/tsrc/src/BrCtlApiTestContainer.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/web_pub/browser_control_api/tsrc/src/BrCtlApiTestContainer.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -16,14 +16,14 @@
 */
 
 // INCLUDE FILES
-#include "BrCtlApiTestContainer.h"
+#include "brctlapitestcontainer.h"
 
 #include <eiklabel.h>  // for example label control
 #include <aknview.h>
 #include <AknGlobalConfirmationQuery.h>
-#include <BrCtlInterface.h>
+#include <brctlinterface.h>
 #include <CHARCONV.H>
-#include "BrCtlApiTestObserver.h"
+#include "brctlapitestobserver.h"
 #include <e32std.h>
 
 _LIT8( KContentDataType, "text/html" );
diff -r 9a9a761f03f1 -r 0ed94ceaa377 web_pub/browser_control_api/tsrc/src/BrCtlApiTestDialogsProvider.cpp
--- a/web_pub/browser_control_api/tsrc/src/BrCtlApiTestDialogsProvider.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/web_pub/browser_control_api/tsrc/src/BrCtlApiTestDialogsProvider.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -23,7 +23,7 @@
 #include <BrowserDialogsProvider.h>
 
 // User includes
-#include "BrCtlApiTestDialogsProvider.h"
+#include "brctlapitestdialogsprovider.h"
 
 
 // CONSTANTS
diff -r 9a9a761f03f1 -r 0ed94ceaa377 web_pub/browser_control_api/tsrc/src/BrCtlApiTestObserver.cpp
--- a/web_pub/browser_control_api/tsrc/src/BrCtlApiTestObserver.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/web_pub/browser_control_api/tsrc/src/BrCtlApiTestObserver.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -21,7 +21,7 @@
 #include <eikappui.h>
 #include <eikenv.h>
 #include <eikbtgpc.h>
-#include "BrCtlApiTestObserver.h"
+#include "brctlapitestobserver.h"
 #include <avkon.hrh>
 #include <aknmessagequerydialog.h>
 
diff -r 9a9a761f03f1 -r 0ed94ceaa377 web_pub/browser_control_api/tsrc/src/BrCtlApiTestStateChangeObserver.cpp
--- a/web_pub/browser_control_api/tsrc/src/BrCtlApiTestStateChangeObserver.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/web_pub/browser_control_api/tsrc/src/BrCtlApiTestStateChangeObserver.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -17,8 +17,8 @@
 
 
 // INCLUDE FILES
-#include "BrCtlApiTestContainer.h"
-#include "BrCtlApiTestStateChangeObserver.h"
+#include "brctlapitestcontainer.h"
+#include "brctlapiteststatechangeobserver.h"
 
 // ================= MEMBER FUNCTIONS =======================
 
diff -r 9a9a761f03f1 -r 0ed94ceaa377 web_pub/browser_plugin_api/group/bld.inf
--- a/web_pub/browser_plugin_api/group/bld.inf	Tue Nov 24 09:02:20 2009 +0200
+++ b/web_pub/browser_plugin_api/group/bld.inf	Thu Dec 17 09:20:16 2009 +0200
@@ -16,7 +16,7 @@
 */
 #ifndef __BROWSER_SDK
 #include <platform_paths.hrh>
-#include "../../../web_plat/browser_platform_api/inc/Browser_platform_variant.hrh"
+#include "../../../web_plat/browser_platform_api/inc/browser_platform_variant.hrh"
 #endif
 
 PRJ_PLATFORMS
@@ -24,14 +24,14 @@
 
 PRJ_EXPORTS
 
-../inc/BrowserPluginInterface.h      MW_LAYER_PUBLIC_EXPORT_PATH(BrowserPluginInterface.h)
-../inc/CEcomBrowserPluginInterface.h MW_LAYER_PUBLIC_EXPORT_PATH(CEcomBrowserPluginInterface.h)
+../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)
 ../inc/np_defines.h                  MW_LAYER_PUBLIC_EXPORT_PATH(np_defines.h)
 ../inc/npupp.h                       MW_LAYER_PUBLIC_EXPORT_PATH(npupp.h)
 ../inc/jri.h                         MW_LAYER_PUBLIC_EXPORT_PATH(jri.h)
 ../inc/prcpucfg.h                    MW_LAYER_PUBLIC_EXPORT_PATH(prcpucfg.h)
-../inc/PluginAdapterInterface.h      MW_LAYER_PUBLIC_EXPORT_PATH(PluginAdapterInterface.h)
+../inc/pluginadapterinterface.h      MW_LAYER_PUBLIC_EXPORT_PATH(pluginadapterinterface.h)
 ../inc/prtypes.h                     MW_LAYER_PUBLIC_EXPORT_PATH(prtypes.h)
 ../inc/obsolete/protypes.h           MW_LAYER_PUBLIC_EXPORT_PATH(obsolete/protypes.h)
                       
diff -r 9a9a761f03f1 -r 0ed94ceaa377 web_pub/browser_plugin_api/inc/CEcomBrowserPluginInterface.h
--- a/web_pub/browser_plugin_api/inc/CEcomBrowserPluginInterface.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/web_pub/browser_plugin_api/inc/CEcomBrowserPluginInterface.h	Thu Dec 17 09:20:16 2009 +0200
@@ -24,7 +24,7 @@
 
 // User includes
 #include "npupp.h"
-#include "BrowserPluginInterface.h"
+#include "browserplugininterface.h"
 
 typedef struct
     {
diff -r 9a9a761f03f1 -r 0ed94ceaa377 web_pub/download_mgr_client_api/group/bld.inf
--- a/web_pub/download_mgr_client_api/group/bld.inf	Tue Nov 24 09:02:20 2009 +0200
+++ b/web_pub/download_mgr_client_api/group/bld.inf	Thu Dec 17 09:20:16 2009 +0200
@@ -15,13 +15,13 @@
 *
 */
 #include <platform_paths.hrh>
-#include "../../../web_plat/browser_platform_api/inc/Browser_platform_variant.hrh"
+#include "../../../web_plat/browser_platform_api/inc/browser_platform_variant.hrh"
 
 PRJ_PLATFORMS
 DEFAULT
 
 PRJ_EXPORTS
-../inc/DownloadMgrClient.h      MW_LAYER_PUBLIC_EXPORT_PATH(DownloadMgrClient.h)
-../inc/HttpDownloadMgrCommon.h  MW_LAYER_PUBLIC_EXPORT_PATH(HttpDownloadMgrCommon.h)
+../inc/downloadmgrclient.h      MW_LAYER_PUBLIC_EXPORT_PATH(downloadmgrclient.h)
+../inc/httpdownloadmgrcommon.h  MW_LAYER_PUBLIC_EXPORT_PATH(httpdownloadmgrcommon.h)
 
 PRJ_MMPFILES
diff -r 9a9a761f03f1 -r 0ed94ceaa377 web_pub/download_mgr_client_api/inc/DownloadMgrClient.h
--- a/web_pub/download_mgr_client_api/inc/DownloadMgrClient.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/web_pub/download_mgr_client_api/inc/DownloadMgrClient.h	Thu Dec 17 09:20:16 2009 +0200
@@ -22,7 +22,7 @@
 //  INCLUDES
 #include <e32base.h>
 #include <f32file.h>
-#include <HttpDownloadMgrCommon.h>
+#include <httpdownloadmgrcommon.h>
 #include <http.h>
 
 // FORWARD DECLARATIONS
diff -r 9a9a761f03f1 -r 0ed94ceaa377 web_pub/download_mgr_client_api/tsrc/group/DownloadMgrClientApiTest.mmp
--- a/web_pub/download_mgr_client_api/tsrc/group/DownloadMgrClientApiTest.mmp	Tue Nov 24 09:02:20 2009 +0200
+++ b/web_pub/download_mgr_client_api/tsrc/group/DownloadMgrClientApiTest.mmp	Thu Dec 17 09:20:16 2009 +0200
@@ -30,9 +30,9 @@
 DEFFILE         DownloadMgrClientApiTest.def
 
 SOURCEPATH      ../src
-SOURCE          DownloadMgrClientApiTest.cpp
-SOURCE          RHttpDownloadTestCases.cpp
-SOURCE          RHttpDownloadMgrTestCases.cpp
+SOURCE          downloadmgrclientapitest.cpp
+SOURCE          rhttpdownloadtestcases.cpp
+SOURCE          rhttpdownloadmgrtestcases.cpp
 
 USERINCLUDE     ../inc 
 MW_LAYER_SYSTEMINCLUDE
diff -r 9a9a761f03f1 -r 0ed94ceaa377 web_pub/download_mgr_client_api/tsrc/inc/DownloadMgrClientApiTest.h
--- a/web_pub/download_mgr_client_api/tsrc/inc/DownloadMgrClientApiTest.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/web_pub/download_mgr_client_api/tsrc/inc/DownloadMgrClientApiTest.h	Thu Dec 17 09:20:16 2009 +0200
@@ -24,8 +24,8 @@
 #include <StifTestModule.h>
 #include <StifLogger.h>
 #include <f32file.h>
-#include <DownloadMgrClient.h>
-#include <CDownloadMgrUiLibRegistry.h>
+#include <downloadmgrclient.h>
+#include <cdownloadmgruilibregistry.h>
 
 // CONSTANTS
 const TInt KThisAppUid = 0x101FB3E7;
diff -r 9a9a761f03f1 -r 0ed94ceaa377 web_pub/download_mgr_client_api/tsrc/src/DownloadMgrClientApiTest.cpp
--- a/web_pub/download_mgr_client_api/tsrc/src/DownloadMgrClientApiTest.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/web_pub/download_mgr_client_api/tsrc/src/DownloadMgrClientApiTest.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -19,7 +19,7 @@
 
 // INCLUDE FILES
 #include <Stiftestinterface.h>
-#include "DownloadMgrClientApiTest.h"
+#include "downloadmgrclientapitest.h"
 
 // EXTERNAL DATA STRUCTURES
 //extern  ?external_data;
diff -r 9a9a761f03f1 -r 0ed94ceaa377 web_pub/download_mgr_client_api/tsrc/src/RHttpDownloadMgrTestCases.cpp
--- a/web_pub/download_mgr_client_api/tsrc/src/RHttpDownloadMgrTestCases.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/web_pub/download_mgr_client_api/tsrc/src/RHttpDownloadMgrTestCases.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -21,7 +21,7 @@
 // INCLUDE FILES
 #include <e32math.h>
 #include <es_sock.h>
-#include "DownloadMgrClientApiTest.h"
+#include "downloadmgrclientapitest.h"
 
 // EXTERNAL DATA STRUCTURES
 // None
diff -r 9a9a761f03f1 -r 0ed94ceaa377 web_pub/download_mgr_client_api/tsrc/src/RHttpDownloadTestCases.cpp
--- a/web_pub/download_mgr_client_api/tsrc/src/RHttpDownloadTestCases.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/web_pub/download_mgr_client_api/tsrc/src/RHttpDownloadTestCases.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -20,7 +20,7 @@
 
 // INCLUDE FILES
 #include <e32math.h>
-#include "DownloadMgrClientApiTest.h"
+#include "downloadmgrclientapitest.h"
 
 // EXTERNAL DATA STRUCTURES
 // None
diff -r 9a9a761f03f1 -r 0ed94ceaa377 web_pub/download_mgr_ui_api/group/Bld.inf
--- a/web_pub/download_mgr_ui_api/group/Bld.inf	Tue Nov 24 09:02:20 2009 +0200
+++ b/web_pub/download_mgr_ui_api/group/Bld.inf	Thu Dec 17 09:20:16 2009 +0200
@@ -15,7 +15,7 @@
 *
 */
 #include <platform_paths.hrh>
-#include "../../../web_plat/browser_platform_api/inc/Browser_platform_variant.hrh"
+#include "../../../web_plat/browser_platform_api/inc/browser_platform_variant.hrh"
 
 PRJ_PLATFORMS
 
@@ -23,12 +23,12 @@
 
 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)
-../Inc/DownloadsListDlgObserver.h           MW_LAYER_PUBLIC_EXPORT_PATH(DownloadsListDlgObserver.h)
-../Inc/CDownloadMgrUiDownloadMenu.h         MW_LAYER_PUBLIC_EXPORT_PATH(CDownloadMgrUiDownloadMenu.h)
-../Inc/CDownloadMgrUiLibRegistry.h          MW_LAYER_PUBLIC_EXPORT_PATH(CDownloadMgrUiLibRegistry.h)
+../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)
+../Inc/downloadslistdlgobserver.h           MW_LAYER_PUBLIC_EXPORT_PATH(downloadslistdlgobserver.h)
+../Inc/cdownloadmgruidownloadmenu.h         MW_LAYER_PUBLIC_EXPORT_PATH(cdownloadmgruidownloadmenu.h)
+../Inc/cdownloadmgruilibregistry.h          MW_LAYER_PUBLIC_EXPORT_PATH(cdownloadmgruilibregistry.h)
 
 PRJ_MMPFILES
 
diff -r 9a9a761f03f1 -r 0ed94ceaa377 web_pub/download_mgr_ui_api/inc/CDownloadMgrUiDownloadsList.h
--- a/web_pub/download_mgr_ui_api/inc/CDownloadMgrUiDownloadsList.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/web_pub/download_mgr_ui_api/inc/CDownloadMgrUiDownloadsList.h	Thu Dec 17 09:20:16 2009 +0200
@@ -21,10 +21,10 @@
 #define CDOWNLOADMGRUIDOWNLOADSLIST_H
 
 //  INCLUDES
-#include <CDownloadMgrUiBase.h>
-#include <DownloadMgrClient.h>
-#include <HttpDownloadMgrCommon.h>
-#include <DownloadsListDlgObserver.h>
+#include <cdownloadmgruibase.h>
+#include <downloadmgrclient.h>
+#include <httpdownloadmgrcommon.h>
+#include <downloadslistdlgobserver.h>
 
 #include <AiwServiceHandler.h>
 #include <AiwCommon.hrh>
@@ -152,12 +152,6 @@
         */
         inline TBool GetDownloadHide() { return iDownloadListHide; }
 
-        /**
-        * Sets the value of downloadlist hide
-        * @return void 
-        */
-        virtual void SetDownloadListHide( TBool aHide );
-
     public: // Functions from CDownloadMgrUiBase
 
         IMPORT_C virtual void GetIntAttributeL( const TUint aAttribute, TInt32& aValue );
@@ -250,6 +244,13 @@
                                       
         void LaunchFileManagerApplication();
 
+    public:
+        /**
+        * Sets the value of downloadlist hide
+        * @return void 
+        */
+        void SetDownloadListHide( TBool aHide );
+
     private:  // Data
         
         CDownloadsListExtension*    iExtension; ///< Extension class. Owned.
diff -r 9a9a761f03f1 -r 0ed94ceaa377 web_pub/download_mgr_ui_api/inc/CDownloadMgrUiUserInteractions.h
--- a/web_pub/download_mgr_ui_api/inc/CDownloadMgrUiUserInteractions.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/web_pub/download_mgr_ui_api/inc/CDownloadMgrUiUserInteractions.h	Thu Dec 17 09:20:16 2009 +0200
@@ -21,8 +21,8 @@
 #define CDOWNLOADMGRUIUSERINTERACTIONS_H
 
 //  INCLUDES
-#include <CDownloadMgrUiBase.h>
-#include <DownloadMgrClient.h>
+#include <cdownloadmgruibase.h>
+#include <downloadmgrclient.h>
 #include <vwsdef.h>
 
 // CONSTANTS
diff -r 9a9a761f03f1 -r 0ed94ceaa377 web_pub/favourites_engine_api/group/bld.inf
--- a/web_pub/favourites_engine_api/group/bld.inf	Tue Nov 24 09:02:20 2009 +0200
+++ b/web_pub/favourites_engine_api/group/bld.inf	Thu Dec 17 09:20:16 2009 +0200
@@ -15,7 +15,7 @@
 *
 */
 #include <platform_paths.hrh>
-#include "../../../web_plat/browser_platform_api/inc/Browser_platform_variant.hrh"
+#include "../../../web_plat/browser_platform_api/inc/browser_platform_variant.hrh"
 
 PRJ_PLATFORMS
 DEFAULT
@@ -23,22 +23,22 @@
 PRJ_EXPORTS
 
 // Common code
-../inc/FavouritesDb.h               MW_LAYER_PUBLIC_EXPORT_PATH(FavouritesDb.h)
-../inc/FavouritesFile.h             MW_LAYER_PUBLIC_EXPORT_PATH(FavouritesFile.h)
-../inc/FavouritesFile.inl           MW_LAYER_PUBLIC_EXPORT_PATH(FavouritesFile.inl)
-../inc/FavouritesDbIncremental.h    MW_LAYER_PUBLIC_EXPORT_PATH(FavouritesDbIncremental.h)
-../inc/FavouritesDbNotifier.h       MW_LAYER_PUBLIC_EXPORT_PATH(FavouritesDbNotifier.h)
-../inc/FavouritesDbObserver.h       MW_LAYER_PUBLIC_EXPORT_PATH(FavouritesDbObserver.h)
-../inc/ActiveFavouritesDbNotifier.h MW_LAYER_PUBLIC_EXPORT_PATH(ActiveFavouritesDbNotifier.h)
-../inc/FavouritesItem.h             MW_LAYER_PUBLIC_EXPORT_PATH(FavouritesItem.h)
-../inc/FavouritesLimits.h           MW_LAYER_PUBLIC_EXPORT_PATH(FavouritesLimits.h)
-../inc/FavouritesWapAp.h            MW_LAYER_PUBLIC_EXPORT_PATH(FavouritesWapAp.h)
-../inc/FavouritesItemList.h         MW_LAYER_PUBLIC_EXPORT_PATH(FavouritesItemList.h)
-../inc/FavouritesItemData.h         MW_LAYER_PUBLIC_EXPORT_PATH(FavouritesItemData.h)
-../inc/FavouritesSession.h          MW_LAYER_PUBLIC_EXPORT_PATH(FavouritesSession.h)
-../inc/FavouritesSession.inl        MW_LAYER_PUBLIC_EXPORT_PATH(FavouritesSession.inl)
-../inc/FavouritesHandle.h           MW_LAYER_PUBLIC_EXPORT_PATH(FavouritesHandle.h)
-../inc/FavouritesHandle.inl         MW_LAYER_PUBLIC_EXPORT_PATH(FavouritesHandle.inl)
+../inc/favouritesdb.h               MW_LAYER_PUBLIC_EXPORT_PATH(favouritesdb.h)
+../inc/favouritesfile.h             MW_LAYER_PUBLIC_EXPORT_PATH(favouritesfile.h)
+../inc/favouritesfile.inl           MW_LAYER_PUBLIC_EXPORT_PATH(favouritesfile.inl)
+../inc/favouritesdbincremental.h    MW_LAYER_PUBLIC_EXPORT_PATH(favouritesdbincremental.h)
+../inc/favouritesdbnotifier.h       MW_LAYER_PUBLIC_EXPORT_PATH(favouritesdbnotifier.h)
+../inc/favouritesdbobserver.h       MW_LAYER_PUBLIC_EXPORT_PATH(favouritesdbobserver.h)
+../inc/activefavouritesdbnotifier.h MW_LAYER_PUBLIC_EXPORT_PATH(activefavouritesdbnotifier.h)
+../inc/favouritesitem.h             MW_LAYER_PUBLIC_EXPORT_PATH(favouritesitem.h)
+../inc/favouriteslimits.h           MW_LAYER_PUBLIC_EXPORT_PATH(favouriteslimits.h)
+../inc/favouriteswapap.h            MW_LAYER_PUBLIC_EXPORT_PATH(favouriteswapap.h)
+../inc/favouritesitemlist.h         MW_LAYER_PUBLIC_EXPORT_PATH(favouritesitemlist.h)
+../inc/favouritesitemdata.h         MW_LAYER_PUBLIC_EXPORT_PATH(favouritesitemdata.h)
+../inc/favouritessession.h          MW_LAYER_PUBLIC_EXPORT_PATH(favouritessession.h)
+../inc/favouritessession.inl        MW_LAYER_PUBLIC_EXPORT_PATH(favouritessession.inl)
+../inc/favouriteshandle.h           MW_LAYER_PUBLIC_EXPORT_PATH(favouriteshandle.h)
+../inc/favouriteshandle.inl         MW_LAYER_PUBLIC_EXPORT_PATH(favouriteshandle.inl)
 
 
 
diff -r 9a9a761f03f1 -r 0ed94ceaa377 web_pub/favourites_engine_api/inc/ActiveFavouritesDbNotifier.h
--- a/web_pub/favourites_engine_api/inc/ActiveFavouritesDbNotifier.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/web_pub/favourites_engine_api/inc/ActiveFavouritesDbNotifier.h	Thu Dec 17 09:20:16 2009 +0200
@@ -23,7 +23,7 @@
 
 #include <e32base.h>
 #include <d32dbms.h>
-#include <FavouritesDbNotifier.h>
+#include <favouritesdbnotifier.h>
 
 // FORWARD DECLARATION
 
diff -r 9a9a761f03f1 -r 0ed94ceaa377 web_pub/favourites_engine_api/inc/FavouritesDb.h
--- a/web_pub/favourites_engine_api/inc/FavouritesDb.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/web_pub/favourites_engine_api/inc/FavouritesDb.h	Thu Dec 17 09:20:16 2009 +0200
@@ -23,10 +23,10 @@
 
 #include <e32base.h>
 #include <d32dbms.h>
-#include <FavouritesItem.h>
-#include <FavouritesLimits.h>
-#include <FavouritesSession.h>
-#include <FavouritesHandle.h>
+#include <favouritesitem.h>
+#include <favouriteslimits.h>
+#include <favouritessession.h>
+#include <favouriteshandle.h>
 
 // FORWARD DECLARATIONS
 
diff -r 9a9a761f03f1 -r 0ed94ceaa377 web_pub/favourites_engine_api/inc/FavouritesDbIncremental.h
--- a/web_pub/favourites_engine_api/inc/FavouritesDbIncremental.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/web_pub/favourites_engine_api/inc/FavouritesDbIncremental.h	Thu Dec 17 09:20:16 2009 +0200
@@ -21,7 +21,7 @@
 
 //  INCLUDES
 
-#include <FavouritesHandle.h>
+#include <favouriteshandle.h>
 
 // FORWARD DECLARATIONS
 
diff -r 9a9a761f03f1 -r 0ed94ceaa377 web_pub/favourites_engine_api/inc/FavouritesDbNotifier.h
--- a/web_pub/favourites_engine_api/inc/FavouritesDbNotifier.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/web_pub/favourites_engine_api/inc/FavouritesDbNotifier.h	Thu Dec 17 09:20:16 2009 +0200
@@ -21,7 +21,7 @@
 
 //  INCLUDES
 
-#include <FavouritesHandle.h>
+#include <favouriteshandle.h>
 
 // FORWARD DECLARATIONS
 
diff -r 9a9a761f03f1 -r 0ed94ceaa377 web_pub/favourites_engine_api/inc/FavouritesFile.h
--- a/web_pub/favourites_engine_api/inc/FavouritesFile.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/web_pub/favourites_engine_api/inc/FavouritesFile.h	Thu Dec 17 09:20:16 2009 +0200
@@ -21,7 +21,7 @@
 
 //  INCLUDES
 
-#include <FavouritesHandle.h>
+#include <favouriteshandle.h>
 
 // FORWARD DECLARATION
 
@@ -118,7 +118,7 @@
 
     };
 
-#include <FavouritesFile.inl>
+#include <favouritesfile.inl>
 
 #endif
 
diff -r 9a9a761f03f1 -r 0ed94ceaa377 web_pub/favourites_engine_api/inc/FavouritesHandle.h
--- a/web_pub/favourites_engine_api/inc/FavouritesHandle.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/web_pub/favourites_engine_api/inc/FavouritesHandle.h	Thu Dec 17 09:20:16 2009 +0200
@@ -22,7 +22,7 @@
 //  INCLUDES
 
 #include <e32base.h>
-#include <FavouritesSession.h>
+#include <favouritessession.h>
 
 // CLASS DECLARATION
 
@@ -126,7 +126,7 @@
 
     };
 
-#include <FavouritesHandle.inl>
+#include <favouriteshandle.inl>
 
 #endif
             
diff -r 9a9a761f03f1 -r 0ed94ceaa377 web_pub/favourites_engine_api/inc/FavouritesItem.h
--- a/web_pub/favourites_engine_api/inc/FavouritesItem.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/web_pub/favourites_engine_api/inc/FavouritesItem.h	Thu Dec 17 09:20:16 2009 +0200
@@ -22,8 +22,8 @@
 //  INCLUDES
 
 #include <e32base.h>
-#include <FavouritesLimits.h>
-#include <FavouritesWapAp.h>
+#include <favouriteslimits.h>
+#include <favouriteswapap.h>
 
 // FORWARD DECLARATION
 
diff -r 9a9a761f03f1 -r 0ed94ceaa377 web_pub/favourites_engine_api/inc/FavouritesSession.h
--- a/web_pub/favourites_engine_api/inc/FavouritesSession.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/web_pub/favourites_engine_api/inc/FavouritesSession.h	Thu Dec 17 09:20:16 2009 +0200
@@ -134,6 +134,6 @@
 
 #endif
 
-#include <FavouritesSession.inl>
+#include <favouritessession.inl>
 
 // End of File
diff -r 9a9a761f03f1 -r 0ed94ceaa377 web_pub/favourites_engine_api/tsrc/group/FavouritesEngineTest.mmp
--- a/web_pub/favourites_engine_api/tsrc/group/FavouritesEngineTest.mmp	Tue Nov 24 09:02:20 2009 +0200
+++ b/web_pub/favourites_engine_api/tsrc/group/FavouritesEngineTest.mmp	Thu Dec 17 09:20:16 2009 +0200
@@ -31,17 +31,17 @@
 DEFFILE         FavouritesEngineTest.def
 
 SOURCEPATH      ../src
-SOURCE          FavouritesEngineTest.cpp
-SOURCE          FavouritesItemTestCases.cpp
-SOURCE          FavouritesItemListTestCases.cpp
-SOURCE          FavouritesDbTestCases.cpp
-SOURCE          FavouritesWapApTestCases.cpp
-SOURCE          FavouritesDbIncrementalTestCases.cpp
-SOURCE          FavouritesFileTestCases.cpp
-SOURCE          FavouritesSessionTestCases.cpp
-SOURCE          FavouritesNotifierTestCases.cpp
-SOURCE          FavouritesItemTestData.cpp
-SOURCE          FavouritesDbTestObserver.cpp
+SOURCE          favouritesenginetest.cpp
+SOURCE          favouritesitemtestcases.cpp
+SOURCE          favouritesitemlisttestcases.cpp
+SOURCE          favouritesdbtestcases.cpp
+SOURCE          favouriteswapaptestcases.cpp
+SOURCE          favouritesdbincrementaltestcases.cpp
+SOURCE          favouritesfiletestcases.cpp
+SOURCE          favouritessessiontestcases.cpp
+SOURCE          favouritesnotifiertestcases.cpp
+SOURCE          favouritesitemtestdata.cpp
+SOURCE          favouritesdbtestobserver.cpp
 
 USERINCLUDE     ../inc 
 SYSTEMINCLUDE   ../../inc
diff -r 9a9a761f03f1 -r 0ed94ceaa377 web_pub/favourites_engine_api/tsrc/inc/FavouritesDbTestObserver.h
--- a/web_pub/favourites_engine_api/tsrc/inc/FavouritesDbTestObserver.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/web_pub/favourites_engine_api/tsrc/inc/FavouritesDbTestObserver.h	Thu Dec 17 09:20:16 2009 +0200
@@ -22,8 +22,8 @@
 //  INCLUDES
 
 #include <e32base.h>
-#include <FavouritesDbObserver.h>
-#include "FavouritesEngineTest.h"
+#include <favouritesdbobserver.h>
+#include "favouritesenginetest.h"
 
 // FORWARD DECLARATION
 
diff -r 9a9a761f03f1 -r 0ed94ceaa377 web_pub/favourites_engine_api/tsrc/inc/FavouritesEngineTest.h
--- a/web_pub/favourites_engine_api/tsrc/inc/FavouritesEngineTest.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/web_pub/favourites_engine_api/tsrc/inc/FavouritesEngineTest.h	Thu Dec 17 09:20:16 2009 +0200
@@ -1,25 +1,22 @@
 /*
-* ==============================================================================
-*  Name        : FavouritesEngineTest.h
-*  Part of     : ?Subsystem_name / FavouritesEngineTest
-*
-*  Description : FavouritesEngineTest test module.
-*  Version:   0.5
+* Copyright (c) 2002 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
-*  Copyright (C) 2002 Nokia Corporation.
-*  This material, including documentation and any related 
-*  computer programs, is protected by copyright controlled by 
-*  Nokia Corporation. All rights are reserved. Copying, 
-*  including reproducing, storing,  adapting or translating, any 
-*  or all of this material requires the prior written consent of 
-*  Nokia Corporation. This material also contains confidential 
-*  information which may not be disclosed to others without the 
-*  prior written consent of Nokia Corporation.
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
 *
-* ============================================================================
+* Description:  FavouritesEngineTest test module.
+*
 */
 
 
+
 #ifndef FAVOURITESENGINETEST_H
 #define FAVOURITESENGINETEST_H
 
@@ -27,16 +24,16 @@
 #include "StifTestModule.h"
 #include <StifLogger.h>
 #include <f32file.h>
-#include <FavouritesSession.h>
-#include <FavouritesItem.h>
-#include <FavouritesItemList.h>
-#include <FavouritesDb.h>
-#include <FavouritesFile.h>
+#include <favouritessession.h>
+#include <favouritesitem.h>
+#include <favouritesitemlist.h>
+#include <favouritesdb.h>
+#include <favouritesfile.h>
 //#include <RfsApMapper.h>
-#include <FavouritesDbIncremental.h>
-#include <FavouritesDbObserver.h>
-#include <ActiveFavouritesDbNotifier.h>
-#include "FavouritesItemTestData.h"
+#include <favouritesdbincremental.h>
+#include <favouritesdbobserver.h>
+#include <activefavouritesdbnotifier.h>
+#include "favouritesitemtestdata.h"
 
 // CONSTANTS
 _LIT( KTestDbName, "Test" );
diff -r 9a9a761f03f1 -r 0ed94ceaa377 web_pub/favourites_engine_api/tsrc/inc/FavouritesItemTestData.h
--- a/web_pub/favourites_engine_api/tsrc/inc/FavouritesItemTestData.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/web_pub/favourites_engine_api/tsrc/inc/FavouritesItemTestData.h	Thu Dec 17 09:20:16 2009 +0200
@@ -22,7 +22,7 @@
 //  INCLUDES
 
 #include <e32base.h>
-#include <FavouritesItemData.h>
+#include <favouritesitemdata.h>
 
 // CLASS DECLARATION
 
diff -r 9a9a761f03f1 -r 0ed94ceaa377 web_pub/favourites_engine_api/tsrc/src/FavouritesDbIncrementalTestCases.cpp
--- a/web_pub/favourites_engine_api/tsrc/src/FavouritesDbIncrementalTestCases.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/web_pub/favourites_engine_api/tsrc/src/FavouritesDbIncrementalTestCases.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -20,7 +20,7 @@
 
 // INCLUDE FILES
 #include <e32math.h>
-#include "FavouritesEngineTest.h"
+#include "favouritesenginetest.h"
 
 // EXTERNAL DATA STRUCTURES
 // None
diff -r 9a9a761f03f1 -r 0ed94ceaa377 web_pub/favourites_engine_api/tsrc/src/FavouritesDbTestCases.cpp
--- a/web_pub/favourites_engine_api/tsrc/src/FavouritesDbTestCases.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/web_pub/favourites_engine_api/tsrc/src/FavouritesDbTestCases.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -20,7 +20,7 @@
 
 // INCLUDE FILES
 #include <e32math.h>
-#include "FavouritesEngineTest.h"
+#include "favouritesenginetest.h"
 
 // EXTERNAL DATA STRUCTURES
 // None
diff -r 9a9a761f03f1 -r 0ed94ceaa377 web_pub/favourites_engine_api/tsrc/src/FavouritesDbTestObserver.cpp
--- a/web_pub/favourites_engine_api/tsrc/src/FavouritesDbTestObserver.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/web_pub/favourites_engine_api/tsrc/src/FavouritesDbTestObserver.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -18,10 +18,10 @@
 
 // INCLUDE FILES
 
-#include <FavouritesDb.h>
-#include "FavouritesDbTestObserver.h"
+#include <favouritesdb.h>
+#include "favouritesdbtestobserver.h"
 //#include "FavouritesDbTester.h"
-#include "ActiveFavouritesDbNotifier.h"
+#include "activefavouritesdbnotifier.h"
 
 // CONSTANTS
 
diff -r 9a9a761f03f1 -r 0ed94ceaa377 web_pub/favourites_engine_api/tsrc/src/FavouritesEngineTest.cpp
--- a/web_pub/favourites_engine_api/tsrc/src/FavouritesEngineTest.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/web_pub/favourites_engine_api/tsrc/src/FavouritesEngineTest.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -1,28 +1,25 @@
 /*
-* ==============================================================================
-*  Name        : FavouritesEngineTest.cpp
-*  Part of     : ?Subsystem_name / FavouritesEngineTest
-*
-*  Description : FavouritesBCTest class member functions
-*  Version:   0.5
+* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
-*  Copyright (C) 2006 Nokia Corporation.
-*  This material, including documentation and any related 
-*  computer programs, is protected by copyright controlled by 
-*  Nokia Corporation. All rights are reserved. Copying, 
-*  including reproducing, storing,  adapting or translating, any 
-*  or all of this material requires the prior written consent of 
-*  Nokia Corporation. This material also contains confidential 
-*  information which may not be disclosed to others without the 
-*  prior written consent of Nokia Corporation.
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
 *
-* ============================================================================
+* Description:  FavouritesBCTest class member functions
+*
 */
 
 
+
 // INCLUDE FILES
 #include <Stiftestinterface.h>
-#include "FavouritesEngineTest.h"
+#include "favouritesenginetest.h"
 
 // EXTERNAL DATA STRUCTURES
 
diff -r 9a9a761f03f1 -r 0ed94ceaa377 web_pub/favourites_engine_api/tsrc/src/FavouritesFileTestCases.cpp
--- a/web_pub/favourites_engine_api/tsrc/src/FavouritesFileTestCases.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/web_pub/favourites_engine_api/tsrc/src/FavouritesFileTestCases.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -20,7 +20,7 @@
 
 // INCLUDE FILES
 #include <e32math.h>
-#include "FavouritesEngineTest.h"
+#include "favouritesenginetest.h"
 
 // EXTERNAL DATA STRUCTURES
 // None
diff -r 9a9a761f03f1 -r 0ed94ceaa377 web_pub/favourites_engine_api/tsrc/src/FavouritesItemListTestCases.cpp
--- a/web_pub/favourites_engine_api/tsrc/src/FavouritesItemListTestCases.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/web_pub/favourites_engine_api/tsrc/src/FavouritesItemListTestCases.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -20,7 +20,7 @@
 
 // INCLUDE FILES
 #include <e32math.h>
-#include "FavouritesEngineTest.h"
+#include "favouritesenginetest.h"
 
 // EXTERNAL DATA STRUCTURES
 // None
diff -r 9a9a761f03f1 -r 0ed94ceaa377 web_pub/favourites_engine_api/tsrc/src/FavouritesItemTestCases.cpp
--- a/web_pub/favourites_engine_api/tsrc/src/FavouritesItemTestCases.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/web_pub/favourites_engine_api/tsrc/src/FavouritesItemTestCases.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -1,29 +1,26 @@
 /*
-* ============================================================================
-*  Name:      FavouritesItemTestCases.cpp
-*  Part of:   FavouritesEngineTest class member functions   
-*
-*  Description:
-*
-*  Version:   1.0
+* Copyright (c) 2008 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
-*  Copyright (C) 2008 Nokia Corporation.
-*  This material, including documentation and any related 
-*  computer programs, is protected by copyright controlled by 
-*  Nokia Corporation. All rights are reserved. Copying, 
-*  including reproducing, storing,  adapting or translating, any 
-*  or all of this material requires the prior written consent of 
-*  Nokia Corporation. This material also contains confidential 
-*  information which may not be disclosed to others without the 
-*  prior written consent of Nokia Corporation.
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
 *
-* ============================================================================
+* Description: 
+*
+*
 */
 
 
+
 // INCLUDE FILES
 #include <e32math.h>
-#include "FavouritesEngineTest.h"
+#include "favouritesenginetest.h"
 
 // EXTERNAL DATA STRUCTURES
 // None
diff -r 9a9a761f03f1 -r 0ed94ceaa377 web_pub/favourites_engine_api/tsrc/src/FavouritesItemTestData.cpp
--- a/web_pub/favourites_engine_api/tsrc/src/FavouritesItemTestData.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/web_pub/favourites_engine_api/tsrc/src/FavouritesItemTestData.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -19,7 +19,7 @@
 // INCLUDE FILES
 
 #include <s32strm.h>
-#include "FavouritesItemTestData.h"
+#include "favouritesitemtestdata.h"
 
 // ================= MEMBER FUNCTIONS =======================
 
diff -r 9a9a761f03f1 -r 0ed94ceaa377 web_pub/favourites_engine_api/tsrc/src/FavouritesNotifierTestCases.cpp
--- a/web_pub/favourites_engine_api/tsrc/src/FavouritesNotifierTestCases.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/web_pub/favourites_engine_api/tsrc/src/FavouritesNotifierTestCases.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -20,8 +20,8 @@
 
 // INCLUDE FILES
 #include <e32math.h>
-#include "FavouritesEngineTest.h"
-#include "FavouritesDbTestObserver.h"
+#include "favouritesenginetest.h"
+#include "favouritesdbtestobserver.h"
 
 // EXTERNAL DATA STRUCTURES
 // None
diff -r 9a9a761f03f1 -r 0ed94ceaa377 web_pub/favourites_engine_api/tsrc/src/FavouritesSessionTestCases.cpp
--- a/web_pub/favourites_engine_api/tsrc/src/FavouritesSessionTestCases.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/web_pub/favourites_engine_api/tsrc/src/FavouritesSessionTestCases.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -20,7 +20,7 @@
 
 // INCLUDE FILES
 #include <e32math.h>
-#include "FavouritesEngineTest.h"
+#include "favouritesenginetest.h"
 
 // EXTERNAL DATA STRUCTURES
 // None
diff -r 9a9a761f03f1 -r 0ed94ceaa377 web_pub/favourites_engine_api/tsrc/src/FavouritesWapApTestCases.cpp
--- a/web_pub/favourites_engine_api/tsrc/src/FavouritesWapApTestCases.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/web_pub/favourites_engine_api/tsrc/src/FavouritesWapApTestCases.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -1,29 +1,26 @@
 /*
-* ============================================================================
-*  Name:      FavouritesWapApTestCases.cpp
-*  Part of:   FavouritesEngineTest class member functions   
-*
-*  Description:
-*
-*  Version:   0.5
+* Copyright (c) 2002 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
-*  Copyright (C) 2002 Nokia Corporation.
-*  This material, including documentation and any related 
-*  computer programs, is protected by copyright controlled by 
-*  Nokia Corporation. All rights are reserved. Copying, 
-*  including reproducing, storing,  adapting or translating, any 
-*  or all of this material requires the prior written consent of 
-*  Nokia Corporation. This material also contains confidential 
-*  information which may not be disclosed to others without the 
-*  prior written consent of Nokia Corporation.
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
 *
-* ============================================================================
+* Description: 
+*
+*
 */
 
 
+
 // INCLUDE FILES
 #include <e32math.h>
-#include "FavouritesEngineTest.h"
+#include "favouritesenginetest.h"
 
 // EXTERNAL DATA STRUCTURES
 // None
diff -r 9a9a761f03f1 -r 0ed94ceaa377 web_pub/settings_api/group/bld.inf
--- a/web_pub/settings_api/group/bld.inf	Tue Nov 24 09:02:20 2009 +0200
+++ b/web_pub/settings_api/group/bld.inf	Thu Dec 17 09:20:16 2009 +0200
@@ -18,15 +18,15 @@
 */
 
 #include <platform_paths.hrh>
-#include "../../../web_plat/browser_platform_api/inc/Browser_platform_variant.hrh"
+#include "../../../web_plat/browser_platform_api/inc/browser_platform_variant.hrh"
 
 PRJ_PLATFORMS
 
 DEFAULT
 
 PRJ_EXPORTS
-../inc/BrowserUiSDKCRKeys.h         MW_LAYER_PUBLIC_EXPORT_PATH(BrowserUiSDKCRKeys.h)
-../inc/BrowserUiInternalCRKeys.h    MW_LAYER_PUBLIC_EXPORT_PATH(BrowserUiInternalCRKeys.h)
+../inc/browseruisdkcrkeys.h         MW_LAYER_PUBLIC_EXPORT_PATH(browseruisdkcrkeys.h)
+../inc/browseruiinternalcrkeys.h    MW_LAYER_PUBLIC_EXPORT_PATH(browseruiinternalcrkeys.h)
 
 PRJ_MMPFILES
 
diff -r 9a9a761f03f1 -r 0ed94ceaa377 web_pub/settings_api/inc/BrowserUiInternalCRKeys.h
--- a/web_pub/settings_api/inc/BrowserUiInternalCRKeys.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/web_pub/settings_api/inc/BrowserUiInternalCRKeys.h	Thu Dec 17 09:20:16 2009 +0200
@@ -17,8 +17,8 @@
 #ifndef BROWSERUIINTERNALCRKEYS_H
 #define BROWSERUIINTERNALCRKEYS_H
 
-#include <BrowserUiSDKCRKeys.h>
+#include <browseruisdkcrkeys.h>
 
-#pragma message ("Please include BrowserUiSDKCRKeys.h in place of BrowserUiInternalCRKeys.h")
+#pragma message ("Please include browseruisdkcrkeys.h in place of browseruiinternalcrkeys.h")
 
 #endif      // BROWSERUIINTERNALCRKEYS_H
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/browserrecognizers/group/BrowserRec.mmp
--- a/webengine/browserrecognizers/group/BrowserRec.mmp	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/browserrecognizers/group/BrowserRec.mmp	Thu Dec 17 09:20:16 2009 +0200
@@ -18,7 +18,7 @@
 TARGET          BrowserRec_sdk.DLL
 #else
 #include <platform_paths.hrh>
-#include <platform/mw/Browser_platform_variant.hrh>
+#include <platform/mw/browser_platform_variant.hrh>
 TARGET          BrowserRec.DLL
 #endif
 
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/browserrecognizers/group/bld.inf
--- a/webengine/browserrecognizers/group/bld.inf	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/browserrecognizers/group/bld.inf	Thu Dec 17 09:20:16 2009 +0200
@@ -16,7 +16,7 @@
 */
 
 #include <platform_paths.hrh>
-#include "../../../web_plat/browser_platform_api/inc/Browser_platform_variant.hrh"
+#include "../../../web_plat/browser_platform_api/inc/browser_platform_variant.hrh"
 
 PRJ_PLATFORMS
 DEFAULT GCCE
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/device/group/Device.mmp
--- a/webengine/device/group/Device.mmp	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/device/group/Device.mmp	Thu Dec 17 09:20:16 2009 +0200
@@ -23,7 +23,7 @@
 #include <bldvariant.hrh>
 #include <data_caging_paths.hrh>
 #include <platform_paths.hrh>
-#include <platform/mw/Browser_platform_variant.hrh>
+#include <platform/mw/browser_platform_variant.hrh>
 MACRO __S60__
 MACRO arm
 MACRO ASSERT_DISABLED
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/device/group/bld.inf
--- a/webengine/device/group/bld.inf	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/device/group/bld.inf	Thu Dec 17 09:20:16 2009 +0200
@@ -16,7 +16,7 @@
 */
 
 #include <platform_paths.hrh>
-#include "../../../web_plat/browser_platform_api/inc/Browser_platform_variant.hrh"
+#include "../../../web_plat/browser_platform_api/inc/browser_platform_variant.hrh"
 
 /*
 *   Order is important
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/device/rom/Device.iby
--- a/webengine/device/rom/Device.iby	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/device/rom/Device.iby	Thu Dec 17 09:20:16 2009 +0200
@@ -18,7 +18,7 @@
 
 #ifndef __DEVICE_IBY__
 #define __DEVICE_IBY__
-#include <platform/mw/Browser_platform_variant.hrh>
+#include <platform/mw/browser_platform_variant.hrh>
 
 
 // bitmaps
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/device/src/DeviceLiwBinding.cpp
--- a/webengine/device/src/DeviceLiwBinding.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/device/src/DeviceLiwBinding.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -26,7 +26,7 @@
 #include <RTSecMgrUtility.h>
 #include <RTSecMgrScriptSession.h>
 #include <RTSecMgrCommonDef.h>
-#include <WidgetRegistryClient.h>
+#include <widgetregistryclient.h>
 #include <PropertyNameArray.h>
 #include <internal.h>
 #include <liwvariant.h>
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/memoryplugin/group/memoryplugin.mmp
--- a/webengine/memoryplugin/group/memoryplugin.mmp	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/memoryplugin/group/memoryplugin.mmp	Thu Dec 17 09:20:16 2009 +0200
@@ -22,7 +22,7 @@
 #include <bldvariant.hrh>
 #include <data_caging_paths.hrh>
 #include <platform_paths.hrh>
-#include <platform/mw/Browser_platform_variant.hrh>
+#include <platform/mw/browser_platform_variant.hrh>
 
 CAPABILITY      CAP_ECOM_PLUGIN
 VENDORID        VID_DEFAULT
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/DerivedSources/JavaScriptCore/chartables.c
--- a/webengine/osswebengine/DerivedSources/JavaScriptCore/chartables.c	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/DerivedSources/JavaScriptCore/chartables.c	Thu Dec 17 09:20:16 2009 +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 "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: 
+*
+*/
 /*************************************************
 *      Perl-Compatible Regular Expressions       *
 *************************************************/
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/DerivedSources/WebCore/ColorData.c
--- a/webengine/osswebengine/DerivedSources/WebCore/ColorData.c	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/DerivedSources/WebCore/ColorData.c	Thu Dec 17 09:20:16 2009 +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 "Eclipse Public License v1.0"
+* which accompanies 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 -CDEot -L ANSI-C -k '*' -N findColor -D -s 2 /cygdrive/x/tot/WebCore/platform/ColorData.gperf  */
 struct NamedColor { const char *name; int RGBValue; };
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/DerivedSources/WebCore/DocTypeStrings.cpp
--- a/webengine/osswebengine/DerivedSources/WebCore/DocTypeStrings.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/DerivedSources/WebCore/DocTypeStrings.cpp	Thu Dec 17 09:20:16 2009 +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 "Eclipse Public License v1.0"
+* which accompanies 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 -CEot -L ANSI-C -k '*' -N findDoctypeEntry -F ,PubIDInfo::eAlmostStandards,PubIDInfo::eAlmostStandards /cygdrive/x/tot/WebCore/html/DocTypeStrings.gperf  */
 struct PubIDInfo {
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/DerivedSources/WebCore/SVGElementFactory.cpp
--- a/webengine/osswebengine/DerivedSources/WebCore/SVGElementFactory.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/DerivedSources/WebCore/SVGElementFactory.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -1,1 +1,18 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: 
+*
+*/
 
+
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/DerivedSources/WebCore/SVGNames.cpp
--- a/webengine/osswebengine/DerivedSources/WebCore/SVGNames.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/DerivedSources/WebCore/SVGNames.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -1,1 +1,18 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: 
+*
+*/
 
+
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/DerivedSources/WebCore/UserAgentStyleSheets.h
--- a/webengine/osswebengine/DerivedSources/WebCore/UserAgentStyleSheets.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/DerivedSources/WebCore/UserAgentStyleSheets.h	Thu Dec 17 09:20:16 2009 +0200
@@ -1,3 +1,20 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: 
+*
+*/
+
 namespace WebCore {
 extern const char html4UserAgentStyleSheet[8527];
 extern const char quirksUserAgentStyleSheet[331];
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/DerivedSources/WebCore/UserAgentStyleSheetsData.cpp
--- a/webengine/osswebengine/DerivedSources/WebCore/UserAgentStyleSheetsData.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/DerivedSources/WebCore/UserAgentStyleSheetsData.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -1,3 +1,20 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: 
+*
+*/
+
 namespace WebCore {
 extern const char html4UserAgentStyleSheet[8527] = {
     64, 110, 97, 109, 101, 115, 112, 97, 99, 101, 32, 34, 104, 116, 116, 112,
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/DerivedSources/WebCore/XLinkNames.cpp
--- a/webengine/osswebengine/DerivedSources/WebCore/XLinkNames.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/DerivedSources/WebCore/XLinkNames.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -1,1 +1,18 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: 
+*
+*/
 
+
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/DerivedSources/WebCore/ksvgcssproperties.h
--- a/webengine/osswebengine/DerivedSources/WebCore/ksvgcssproperties.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/DerivedSources/WebCore/ksvgcssproperties.h	Thu Dec 17 09:20:16 2009 +0200
@@ -1,1 +1,18 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: 
+*
+*/
 
+
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/DerivedSources/WebCore/ksvgcssvalues.h
--- a/webengine/osswebengine/DerivedSources/WebCore/ksvgcssvalues.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/DerivedSources/WebCore/ksvgcssvalues.h	Thu Dec 17 09:20:16 2009 +0200
@@ -1,1 +1,18 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: 
+*
+*/
 
+
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/JavaScriptCore/ForwardingHeaders/JavaScriptCore/APICast.h
--- a/webengine/osswebengine/JavaScriptCore/ForwardingHeaders/JavaScriptCore/APICast.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/JavaScriptCore/ForwardingHeaders/JavaScriptCore/APICast.h	Thu Dec 17 09:20:16 2009 +0200
@@ -1,1 +1,18 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: 
+*
+*/
+
 #include <JavaScriptCore/API/APICast.h>
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/JavaScriptCore/ForwardingHeaders/JavaScriptCore/JSBase.h
--- a/webengine/osswebengine/JavaScriptCore/ForwardingHeaders/JavaScriptCore/JSBase.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/JavaScriptCore/ForwardingHeaders/JavaScriptCore/JSBase.h	Thu Dec 17 09:20:16 2009 +0200
@@ -1,1 +1,18 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: 
+*
+*/
+
 #include <JavaScriptCore/API/JSBase.h>
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/JavaScriptCore/ForwardingHeaders/JavaScriptCore/JSContextRef.h
--- a/webengine/osswebengine/JavaScriptCore/ForwardingHeaders/JavaScriptCore/JSContextRef.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/JavaScriptCore/ForwardingHeaders/JavaScriptCore/JSContextRef.h	Thu Dec 17 09:20:16 2009 +0200
@@ -1,1 +1,18 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: 
+*
+*/
+
 #include <JavaScriptCore/API/JSContextRef.h>
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/JavaScriptCore/ForwardingHeaders/JavaScriptCore/JSLock.h
--- a/webengine/osswebengine/JavaScriptCore/ForwardingHeaders/JavaScriptCore/JSLock.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/JavaScriptCore/ForwardingHeaders/JavaScriptCore/JSLock.h	Thu Dec 17 09:20:16 2009 +0200
@@ -1,1 +1,18 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: 
+*
+*/
+
 #include <kjs/JSLock.h>
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/JavaScriptCore/ForwardingHeaders/JavaScriptCore/JSObjectRef.h
--- a/webengine/osswebengine/JavaScriptCore/ForwardingHeaders/JavaScriptCore/JSObjectRef.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/JavaScriptCore/ForwardingHeaders/JavaScriptCore/JSObjectRef.h	Thu Dec 17 09:20:16 2009 +0200
@@ -1,1 +1,18 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: 
+*
+*/
+
 #include <JavaScriptCore/API/JSObjectRef.h>
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/JavaScriptCore/ForwardingHeaders/JavaScriptCore/JSStringRef.h
--- a/webengine/osswebengine/JavaScriptCore/ForwardingHeaders/JavaScriptCore/JSStringRef.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/JavaScriptCore/ForwardingHeaders/JavaScriptCore/JSStringRef.h	Thu Dec 17 09:20:16 2009 +0200
@@ -1,1 +1,18 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: 
+*
+*/
+
 #include <JavaScriptCore/API/JSStringRef.h>
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/JavaScriptCore/ForwardingHeaders/JavaScriptCore/JSStringRefCF.h
--- a/webengine/osswebengine/JavaScriptCore/ForwardingHeaders/JavaScriptCore/JSStringRefCF.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/JavaScriptCore/ForwardingHeaders/JavaScriptCore/JSStringRefCF.h	Thu Dec 17 09:20:16 2009 +0200
@@ -1,1 +1,18 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: 
+*
+*/
+
 #include <JavaScriptCore/API/JSStringRefCF.h>
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/JavaScriptCore/ForwardingHeaders/JavaScriptCore/JSValueRef.h
--- a/webengine/osswebengine/JavaScriptCore/ForwardingHeaders/JavaScriptCore/JSValueRef.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/JavaScriptCore/ForwardingHeaders/JavaScriptCore/JSValueRef.h	Thu Dec 17 09:20:16 2009 +0200
@@ -1,1 +1,18 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: 
+*
+*/
+
 #include <JavaScriptCore/API/JSValueRef.h>
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/JavaScriptCore/ForwardingHeaders/JavaScriptCore/JavaScriptCore.h
--- a/webengine/osswebengine/JavaScriptCore/ForwardingHeaders/JavaScriptCore/JavaScriptCore.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/JavaScriptCore/ForwardingHeaders/JavaScriptCore/JavaScriptCore.h	Thu Dec 17 09:20:16 2009 +0200
@@ -1,1 +1,18 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: 
+*
+*/
+
 #include <JavaScriptCore/API/JavaScriptCore.h>
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/JavaScriptCore/JavaScriptCore.apolloproj/ForwardingSources/grammar.cpp
--- a/webengine/osswebengine/JavaScriptCore/JavaScriptCore.apolloproj/ForwardingSources/grammar.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/JavaScriptCore/JavaScriptCore.apolloproj/ForwardingSources/grammar.cpp	Thu Dec 17 09:20:16 2009 +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 "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: 
+*
+*/
 // This file includes a derived source file from the build output tree.
 // Since the location of the derived sources depends on which configuration
 // we are building, we need to use the include path ( which can be
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/grammarWrapper.cpp
--- a/webengine/osswebengine/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/grammarWrapper.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/grammarWrapper.cpp	Thu Dec 17 09:20:16 2009 +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 "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: 
+*
+*/
 // This file exists to work around a bug in Visual Studio 2005
 // Occasionally on launch VS05 will fail to correctly find and
 // identify generated files, thereby excluding them from the build
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/JavaScriptCore/JavaScriptCorePrefix.h
--- a/webengine/osswebengine/JavaScriptCore/JavaScriptCorePrefix.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/JavaScriptCore/JavaScriptCorePrefix.h	Thu Dec 17 09:20:16 2009 +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 "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: 
+*
+*/
 #ifdef __cplusplus
 #define new ("if you use new/delete make sure to include config.h at the top of the file"()) 
 #define delete ("if you use new/delete make sure to include config.h at the top of the file"()) 
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/JavaScriptCore/icu/unicode/utf_old.h
--- a/webengine/osswebengine/JavaScriptCore/icu/unicode/utf_old.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/JavaScriptCore/icu/unicode/utf_old.h	Thu Dec 17 09:20:16 2009 +0200
@@ -0,0 +1,17 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: 
+*
+*/
+
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/JavaScriptCore/kjs/array_object.cpp
--- a/webengine/osswebengine/JavaScriptCore/kjs/array_object.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/JavaScriptCore/kjs/array_object.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -34,7 +34,7 @@
 #include <stdio.h>
 
 #if PLATFORM(SYMBIAN)
-#include <Browser_platform_variant.hrh>
+#include <browser_platform_variant.hrh>
 #endif  // PLATFORM(SYMBIAN)
 
 using namespace KJS;
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/JavaScriptCore/pcre/pcre_internal.h
--- a/webengine/osswebengine/JavaScriptCore/pcre/pcre_internal.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/JavaScriptCore/pcre/pcre_internal.h	Thu Dec 17 09:20:16 2009 +0200
@@ -993,12 +993,12 @@
 one of the exported public functions. They have to be "external" in the C
 sense, but are not part of the PCRE public API. */
 
-extern int         _pcre_ord2utf8(int, uschar *);
-extern real_pcre * _pcre_try_flipped(const real_pcre *, real_pcre *,
+PCRE_DATA_SCOPE int         _pcre_ord2utf8(int, uschar *);
+PCRE_DATA_SCOPE real_pcre * _pcre_try_flipped(const real_pcre *, real_pcre *,
                      const pcre_study_data *, pcre_study_data *);
-extern int         _pcre_ucp_findchar(const int, int *, int *);
-extern int         _pcre_valid_utf8(const uschar *, int);
-extern BOOL        _pcre_xclass(int, const uschar *);
+PCRE_DATA_SCOPE int         _pcre_ucp_findchar(const int, int *, int *);
+PCRE_DATA_SCOPE int         _pcre_valid_utf8(const uschar *, int);
+PCRE_DATA_SCOPE BOOL        _pcre_xclass(int, const uschar *);
 
 #endif
 
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/JavaScriptCore/pcre/ucp.h
--- a/webengine/osswebengine/JavaScriptCore/pcre/ucp.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/JavaScriptCore/pcre/ucp.h	Thu Dec 17 09:20:16 2009 +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 "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: 
+*
+*/
 /*************************************************
 *     libucp - Unicode Property Table handler    *
 *************************************************/
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/JavaScriptCore/pcre/ucpinternal.h
--- a/webengine/osswebengine/JavaScriptCore/pcre/ucpinternal.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/JavaScriptCore/pcre/ucpinternal.h	Thu Dec 17 09:20:16 2009 +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 "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: 
+*
+*/
 /*************************************************
 *     libucp - Unicode Property Table handler    *
 *************************************************/
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/JavaScriptGlue/ForwardingHeaders/kjs/ExecState.h
--- a/webengine/osswebengine/JavaScriptGlue/ForwardingHeaders/kjs/ExecState.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/JavaScriptGlue/ForwardingHeaders/kjs/ExecState.h	Thu Dec 17 09:20:16 2009 +0200
@@ -1,1 +1,18 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: 
+*
+*/
+
 #include <JavaScriptCore/ExecState.h>
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/JavaScriptGlue/ForwardingHeaders/wtf/AlwaysInline.h
--- a/webengine/osswebengine/JavaScriptGlue/ForwardingHeaders/wtf/AlwaysInline.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/JavaScriptGlue/ForwardingHeaders/wtf/AlwaysInline.h	Thu Dec 17 09:20:16 2009 +0200
@@ -1,1 +1,18 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: 
+*
+*/
+
 #include <JavaScriptCore/AlwaysInline.h>
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/JavaScriptGlue/ForwardingHeaders/wtf/Assertions.h
--- a/webengine/osswebengine/JavaScriptGlue/ForwardingHeaders/wtf/Assertions.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/JavaScriptGlue/ForwardingHeaders/wtf/Assertions.h	Thu Dec 17 09:20:16 2009 +0200
@@ -1,1 +1,18 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: 
+*
+*/
+
 #include <JavaScriptCore/Assertions.h>
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/JavaScriptGlue/ForwardingHeaders/wtf/FastMalloc.h
--- a/webengine/osswebengine/JavaScriptGlue/ForwardingHeaders/wtf/FastMalloc.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/JavaScriptGlue/ForwardingHeaders/wtf/FastMalloc.h	Thu Dec 17 09:20:16 2009 +0200
@@ -1,1 +1,18 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: 
+*
+*/
+
 #include <JavaScriptCore/FastMalloc.h>
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/JavaScriptGlue/ForwardingHeaders/wtf/Forward.h
--- a/webengine/osswebengine/JavaScriptGlue/ForwardingHeaders/wtf/Forward.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/JavaScriptGlue/ForwardingHeaders/wtf/Forward.h	Thu Dec 17 09:20:16 2009 +0200
@@ -1,1 +1,18 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: 
+*
+*/
+
 #include <JavaScriptCore/Forward.h>
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/JavaScriptGlue/ForwardingHeaders/wtf/HashCountedSet.h
--- a/webengine/osswebengine/JavaScriptGlue/ForwardingHeaders/wtf/HashCountedSet.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/JavaScriptGlue/ForwardingHeaders/wtf/HashCountedSet.h	Thu Dec 17 09:20:16 2009 +0200
@@ -1,1 +1,18 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: 
+*
+*/
+
 #include <JavaScriptCore/HashCountedSet.h>
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/JavaScriptGlue/ForwardingHeaders/wtf/HashSet.h
--- a/webengine/osswebengine/JavaScriptGlue/ForwardingHeaders/wtf/HashSet.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/JavaScriptGlue/ForwardingHeaders/wtf/HashSet.h	Thu Dec 17 09:20:16 2009 +0200
@@ -1,1 +1,18 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: 
+*
+*/
+
 #include <JavaScriptCore/HashSet.h>
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/JavaScriptGlue/ForwardingHeaders/wtf/Noncopyable.h
--- a/webengine/osswebengine/JavaScriptGlue/ForwardingHeaders/wtf/Noncopyable.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/JavaScriptGlue/ForwardingHeaders/wtf/Noncopyable.h	Thu Dec 17 09:20:16 2009 +0200
@@ -1,1 +1,18 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: 
+*
+*/
+
 #include <JavaScriptCore/Noncopyable.h>
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/JavaScriptGlue/ForwardingHeaders/wtf/OwnArrayPtr.h
--- a/webengine/osswebengine/JavaScriptGlue/ForwardingHeaders/wtf/OwnArrayPtr.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/JavaScriptGlue/ForwardingHeaders/wtf/OwnArrayPtr.h	Thu Dec 17 09:20:16 2009 +0200
@@ -1,1 +1,18 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: 
+*
+*/
+
 #include <JavaScriptCore/OwnArrayPtr.h>
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/JavaScriptGlue/ForwardingHeaders/wtf/OwnPtr.h
--- a/webengine/osswebengine/JavaScriptGlue/ForwardingHeaders/wtf/OwnPtr.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/JavaScriptGlue/ForwardingHeaders/wtf/OwnPtr.h	Thu Dec 17 09:20:16 2009 +0200
@@ -1,1 +1,18 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: 
+*
+*/
+
 #include <JavaScriptCore/OwnPtr.h>
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/JavaScriptGlue/ForwardingHeaders/wtf/PassRefPtr.h
--- a/webengine/osswebengine/JavaScriptGlue/ForwardingHeaders/wtf/PassRefPtr.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/JavaScriptGlue/ForwardingHeaders/wtf/PassRefPtr.h	Thu Dec 17 09:20:16 2009 +0200
@@ -1,1 +1,18 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: 
+*
+*/
+
 #include <JavaScriptCore/PassRefPtr.h>
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/JavaScriptGlue/ForwardingHeaders/wtf/Platform.h
--- a/webengine/osswebengine/JavaScriptGlue/ForwardingHeaders/wtf/Platform.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/JavaScriptGlue/ForwardingHeaders/wtf/Platform.h	Thu Dec 17 09:20:16 2009 +0200
@@ -1,1 +1,18 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: 
+*
+*/
+
 #include <JavaScriptCore/Platform.h>
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/JavaScriptGlue/ForwardingHeaders/wtf/RefPtr.h
--- a/webengine/osswebengine/JavaScriptGlue/ForwardingHeaders/wtf/RefPtr.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/JavaScriptGlue/ForwardingHeaders/wtf/RefPtr.h	Thu Dec 17 09:20:16 2009 +0200
@@ -1,1 +1,18 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: 
+*
+*/
+
 #include <JavaScriptCore/RefPtr.h>
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/JavaScriptGlue/ForwardingHeaders/wtf/Vector.h
--- a/webengine/osswebengine/JavaScriptGlue/ForwardingHeaders/wtf/Vector.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/JavaScriptGlue/ForwardingHeaders/wtf/Vector.h	Thu Dec 17 09:20:16 2009 +0200
@@ -1,1 +1,18 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: 
+*
+*/
+
 #include <JavaScriptCore/Vector.h>
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/JavaScriptGlue/config.h
--- a/webengine/osswebengine/JavaScriptGlue/config.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/JavaScriptGlue/config.h	Thu Dec 17 09:20:16 2009 +0200
@@ -1,3 +1,20 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: 
+*
+*/
+
 #ifndef DEPRECATED_IN_MAC_OS_X_VERSION_10_5_AND_LATER
 #define DEPRECATED_IN_MAC_OS_X_VERSION_10_5_AND_LATER
 #endif
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/MemoryManager/BWINS/MEMMANU.DEF
--- a/webengine/osswebengine/MemoryManager/BWINS/MEMMANU.DEF	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/MemoryManager/BWINS/MEMMANU.DEF	Thu Dec 17 09:20:16 2009 +0200
@@ -26,4 +26,6 @@
 	?SetStatus@MemoryManager@@SAXW4TOOMCheckResult@@@Z @ 25 NONAME ; void MemoryManager::SetStatus(enum TOOMCheckResult)
 	?Status@MemoryManager@@SAIXZ @ 26 NONAME ; unsigned int MemoryManager::Status(void)
 	?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)
 
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/MemoryManager/EABI/MemManU.DEF
--- a/webengine/osswebengine/MemoryManager/EABI/MemManU.DEF	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/MemoryManager/EABI/MemManU.DEF	Thu Dec 17 09:20:16 2009 +0200
@@ -38,4 +38,6 @@
 	_ZTV14RFastAllocator @ 37 NONAME ; #<VT>#
 	_ZTV15CFastMemoryPool @ 38 NONAME ; #<VT>#
 	_ZTV18CDefaultMemoryPool @ 39 NONAME ; #<VT>#
+	_ZN13MemoryManager17InitFastAllocatorEv @ 40 NONAME
+	_ZN13MemoryManager19CreateFastAllocatorEv @ 41 NONAME
 
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/MemoryManager/Group/MemMan.mmp
--- a/webengine/osswebengine/MemoryManager/Group/MemMan.mmp	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/MemoryManager/Group/MemMan.mmp	Thu Dec 17 09:20:16 2009 +0200
@@ -19,7 +19,7 @@
 TARGET          MemMan_sdk.dll
 #else
 #include <platform_paths.hrh>
-#include <platform/mw/Browser_platform_variant.hrh>
+#include <platform/mw/browser_platform_variant.hrh>
 TARGET          MemMan.dll
 #endif
 
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/MemoryManager/Group/MemManTest.mmp
--- a/webengine/osswebengine/MemoryManager/Group/MemManTest.mmp	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/MemoryManager/Group/MemManTest.mmp	Thu Dec 17 09:20:16 2009 +0200
@@ -1,46 +1,23 @@
 /*
-* ==============================================================================
-*  Name        : MemManTest.mmp
-*  Part of     : MemMan tool
-*  Description : Project specification file
-*  Version     : 
+* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
-*    Copyright (c) 2006, Nokia Corporation
-*    All rights reserved.
-*  
-*  	Redistribution and use in source and binary forms, with or without
-*  	modification, are permitted provided that the following conditions
-*  	are met:
-*  
-*      * Redistributions of source code must retain the above copyright
-*        notice, this list of conditions and the following disclaimer.
-*      * 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.
-*      * Neither the name of the Nokia Corporation 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 THE COPYRIGHT HOLDERS AND 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 THE COPYRIGHT
-*  	OWNER OR 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.
-*  
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
 *
-* ==============================================================================
+* Description:  Project specification file
+*
 */
+
 #ifndef __BROWSER_SDK
 #include <platform_paths.hrh>
-#include <platform/mw/Browser_platform_variant.hrh>
+#include <platform/mw/browser_platform_variant.hrh>
 #endif
 TARGET		MemManTest.exe
 TARGETTYPE  	exe
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/MemoryManager/Group/bld.inf
--- a/webengine/osswebengine/MemoryManager/Group/bld.inf	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/MemoryManager/Group/bld.inf	Thu Dec 17 09:20:16 2009 +0200
@@ -16,7 +16,7 @@
 */
 
 #include <platform_paths.hrh>
-#include "../../../../web_plat/browser_platform_api/inc/Browser_platform_variant.hrh"
+#include "../../../../web_plat/browser_platform_api/inc/browser_platform_variant.hrh"
 
 PRJ_PLATFORMS
 DEFAULT 
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/MemoryManager/Inc/FastAllocator.h
--- a/webengine/osswebengine/MemoryManager/Inc/FastAllocator.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/MemoryManager/Inc/FastAllocator.h	Thu Dec 17 09:20:16 2009 +0200
@@ -92,6 +92,7 @@
 #ifdef TRACK_ALLOCATIONS
     TUint32 iNextCellId;
 #endif
+    friend class MemoryManager;
   };
 
 #endif //!__FASTALLOCATOR_H__
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/MemoryManager/Inc/MemoryManager.h
--- a/webengine/osswebengine/MemoryManager/Inc/MemoryManager.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/MemoryManager/Inc/MemoryManager.h	Thu Dec 17 09:20:16 2009 +0200
@@ -297,6 +297,26 @@
         * @return
         */
         IMPORT_C static void CloseFastAllocator(RAllocator* aDefaultAllocator);
+
+        /**
+        * Create fast allocator and switch as default heap. Special case if fast allocator
+        * has to be created from SetupThreadHeap().
+        * 
+        * @since 9.2
+        * @param
+        * @return
+        */        
+        IMPORT_C static void MemoryManager::CreateFastAllocator();
+
+        /**
+        * Initialize MemoryManager library. Special case if CreateFastAllocator is
+        * called from SetupThreadHeap().
+        * 
+        * @since 9.2
+        * @param
+        * @return
+        */
+        IMPORT_C static void MemoryManager::InitFastAllocator();
     };
 
 #endif// !_MEMORYMANAGER_H_
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/MemoryManager/Src/MemoryManager.cpp
--- a/webengine/osswebengine/MemoryManager/Src/MemoryManager.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/MemoryManager/Src/MemoryManager.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -21,6 +21,7 @@
 #include "MemoryManager.h"
 #include "MemoryPool.h"
 #include "FastAllocator.h"
+#include "MemoryLogger.h"
 
 // CONSTANTS
 
@@ -58,16 +59,50 @@
     }
 
 //-----------------------------------------------------------------------------
+// MemoryManager::CreateAllocator
+//-----------------------------------------------------------------------------
+EXPORT_C void MemoryManager::CreateFastAllocator()
+    {
+    // create the right memory pool
+    MEM_LOGF(_L8("MemoryManager::CreateFastAllocator - s_pool=%x"), s_pool);
+#ifdef __NEW_ALLOCATOR__
+    CMemoryPool *pool = new CNewSymbianHeapPool();
+    pool->Create();
+    RSymbianDlAllocatorWrapper* allocator = new RSymbianDlAllocatorWrapper((CNewSymbianHeapPool*)pool);
+    MEM_LOGF(_L8("MemoryManager::CreateFastAllocator - new pool=%x, allocator=%x"), pool, allocator);
+    User::SwitchAllocator(allocator);
+#endif
+    }
+
+//-----------------------------------------------------------------------------
+// MemoryManager::InitAllocator
+//-----------------------------------------------------------------------------
+EXPORT_C void MemoryManager::InitFastAllocator()
+    {
+    // Initialize s_pool variable from current allocator, assumption is that main program has already called CreateAllocator()
+    // It is special case when this allocator is created in SetupThreadHeap() where can not initialize static data. It also
+    // solves problems due to static data destruction in Symbian 9.5.
+#ifdef __NEW_ALLOCATOR__    
+    RAllocator &aAllocator = User::Allocator();
+    RSymbianDlAllocatorWrapper* allocator = (RSymbianDlAllocatorWrapper*) &aAllocator;
+    s_pool = allocator->iPool;
+    MEM_LOGF(_L8("MemoryManager::InitFastAllocator - s_pool=%x, allocator=%x"), s_pool, allocator);
+#endif    
+    }
+
+//-----------------------------------------------------------------------------
 // MemoryManager::SwitchToFastAllocator
 //-----------------------------------------------------------------------------
 EXPORT_C RAllocator* MemoryManager::SwitchToFastAllocator()
     {
     // create the right memory pool
-    __ASSERT_DEBUG( s_pool == 0, User::Panic( KMemManPanicDes, 0 ) );
+    //__ASSERT_DEBUG( s_pool == 0, User::Panic( KMemManPanicDes, 0 ) );
+    MEM_LOGF(_L8("MemoryManager::SwitchToFastAllocator - s_pool=%x"), s_pool);
 #ifdef __NEW_ALLOCATOR__
     s_pool = new CNewSymbianHeapPool();
     s_pool->Create();
     RSymbianDlAllocatorWrapper* allocator = new RSymbianDlAllocatorWrapper((CNewSymbianHeapPool*)s_pool);
+    MEM_LOGF(_L8("MemoryManager::SwitchToFastAllocator - new s_pool=%x"), s_pool);
     return User::SwitchAllocator( allocator );
 #else
     s_pool = new CFastMemoryPool();
@@ -96,6 +131,7 @@
 //-----------------------------------------------------------------------------
 EXPORT_C void MemoryManager::AddCollector( MMemoryCollector* aCollector )
     {
+    MEM_LOGF(_L8("MemoryManager::AddCollector - s_pool=%x"), s_pool);
     Pool()->AddCollector( aCollector );
     }
 
@@ -112,6 +148,7 @@
 //-----------------------------------------------------------------------------
 EXPORT_C void MemoryManager::AddStopper( MOOMStopper* aStopper )
     {
+    MEM_LOGF(_L8("MemoryManager::AddStopper - s_pool=%x"), s_pool);
     Pool()->AddStopper( aStopper );
     }
 
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebCore/ForwardingHeaders/bindings/NP_jsobject.h
--- a/webengine/osswebengine/WebCore/ForwardingHeaders/bindings/NP_jsobject.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebCore/ForwardingHeaders/bindings/NP_jsobject.h	Thu Dec 17 09:20:16 2009 +0200
@@ -1,1 +1,18 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: 
+*
+*/
+
 #include <JavaScriptCore/NP_jsobject.h>
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebCore/ForwardingHeaders/bindings/npruntime.h
--- a/webengine/osswebengine/WebCore/ForwardingHeaders/bindings/npruntime.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebCore/ForwardingHeaders/bindings/npruntime.h	Thu Dec 17 09:20:16 2009 +0200
@@ -1,1 +1,18 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: 
+*
+*/
+
 #include <JavaScriptCore/npruntime.h>
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebCore/ForwardingHeaders/bindings/npruntime_impl.h
--- a/webengine/osswebengine/WebCore/ForwardingHeaders/bindings/npruntime_impl.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebCore/ForwardingHeaders/bindings/npruntime_impl.h	Thu Dec 17 09:20:16 2009 +0200
@@ -1,1 +1,18 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: 
+*
+*/
+
 #include <JavaScriptCore/npruntime_impl.h>
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebCore/ForwardingHeaders/bindings/runtime.h
--- a/webengine/osswebengine/WebCore/ForwardingHeaders/bindings/runtime.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebCore/ForwardingHeaders/bindings/runtime.h	Thu Dec 17 09:20:16 2009 +0200
@@ -1,1 +1,18 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: 
+*
+*/
+
 #include <JavaScriptCore/runtime.h>
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebCore/ForwardingHeaders/bindings/runtime_object.h
--- a/webengine/osswebengine/WebCore/ForwardingHeaders/bindings/runtime_object.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebCore/ForwardingHeaders/bindings/runtime_object.h	Thu Dec 17 09:20:16 2009 +0200
@@ -1,1 +1,18 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: 
+*
+*/
+
 #include <JavaScriptCore/runtime_object.h>
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebCore/ForwardingHeaders/bindings/runtime_root.h
--- a/webengine/osswebengine/WebCore/ForwardingHeaders/bindings/runtime_root.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebCore/ForwardingHeaders/bindings/runtime_root.h	Thu Dec 17 09:20:16 2009 +0200
@@ -1,1 +1,18 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: 
+*
+*/
+
 #include <JavaScriptCore/runtime_root.h>
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebCore/ForwardingHeaders/kjs/JSLock.h
--- a/webengine/osswebengine/WebCore/ForwardingHeaders/kjs/JSLock.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebCore/ForwardingHeaders/kjs/JSLock.h	Thu Dec 17 09:20:16 2009 +0200
@@ -1,1 +1,18 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: 
+*
+*/
+
 #include <JavaScriptCore/JSLock.h>
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebCore/ForwardingHeaders/kjs/SavedBuiltins.h
--- a/webengine/osswebengine/WebCore/ForwardingHeaders/kjs/SavedBuiltins.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebCore/ForwardingHeaders/kjs/SavedBuiltins.h	Thu Dec 17 09:20:16 2009 +0200
@@ -1,1 +1,18 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: 
+*
+*/
+
 #include <JavaScriptCore/SavedBuiltins.h>
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebCore/ForwardingHeaders/kjs/collector.h
--- a/webengine/osswebengine/WebCore/ForwardingHeaders/kjs/collector.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebCore/ForwardingHeaders/kjs/collector.h	Thu Dec 17 09:20:16 2009 +0200
@@ -1,1 +1,18 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: 
+*
+*/
+
 #include <JavaScriptCore/collector.h>
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebCore/ForwardingHeaders/kjs/dtoa.h
--- a/webengine/osswebengine/WebCore/ForwardingHeaders/kjs/dtoa.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebCore/ForwardingHeaders/kjs/dtoa.h	Thu Dec 17 09:20:16 2009 +0200
@@ -1,1 +1,18 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: 
+*
+*/
+
 #include <JavaScriptCore/dtoa.h>
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebCore/ForwardingHeaders/kjs/function.h
--- a/webengine/osswebengine/WebCore/ForwardingHeaders/kjs/function.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebCore/ForwardingHeaders/kjs/function.h	Thu Dec 17 09:20:16 2009 +0200
@@ -1,1 +1,18 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: 
+*
+*/
+
 #include <JavaScriptCore/function.h>
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebCore/ForwardingHeaders/kjs/identifier.h
--- a/webengine/osswebengine/WebCore/ForwardingHeaders/kjs/identifier.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebCore/ForwardingHeaders/kjs/identifier.h	Thu Dec 17 09:20:16 2009 +0200
@@ -1,1 +1,18 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: 
+*
+*/
+
 #include <JavaScriptCore/identifier.h>
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebCore/ForwardingHeaders/kjs/internal.h
--- a/webengine/osswebengine/WebCore/ForwardingHeaders/kjs/internal.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebCore/ForwardingHeaders/kjs/internal.h	Thu Dec 17 09:20:16 2009 +0200
@@ -1,1 +1,18 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: 
+*
+*/
+
 #include <JavaScriptCore/internal.h>
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebCore/ForwardingHeaders/kjs/interpreter.h
--- a/webengine/osswebengine/WebCore/ForwardingHeaders/kjs/interpreter.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebCore/ForwardingHeaders/kjs/interpreter.h	Thu Dec 17 09:20:16 2009 +0200
@@ -1,1 +1,18 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: 
+*
+*/
+
 #include <JavaScriptCore/interpreter.h>
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebCore/ForwardingHeaders/kjs/lookup.h
--- a/webengine/osswebengine/WebCore/ForwardingHeaders/kjs/lookup.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebCore/ForwardingHeaders/kjs/lookup.h	Thu Dec 17 09:20:16 2009 +0200
@@ -1,1 +1,18 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: 
+*
+*/
+
 #include <JavaScriptCore/lookup.h>
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebCore/ForwardingHeaders/kjs/object.h
--- a/webengine/osswebengine/WebCore/ForwardingHeaders/kjs/object.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebCore/ForwardingHeaders/kjs/object.h	Thu Dec 17 09:20:16 2009 +0200
@@ -1,1 +1,18 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: 
+*
+*/
+
 #include <JavaScriptCore/object.h>
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebCore/ForwardingHeaders/kjs/operations.h
--- a/webengine/osswebengine/WebCore/ForwardingHeaders/kjs/operations.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebCore/ForwardingHeaders/kjs/operations.h	Thu Dec 17 09:20:16 2009 +0200
@@ -1,1 +1,18 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: 
+*
+*/
+
 #include <JavaScriptCore/operations.h>
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebCore/ForwardingHeaders/kjs/property_map.h
--- a/webengine/osswebengine/WebCore/ForwardingHeaders/kjs/property_map.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebCore/ForwardingHeaders/kjs/property_map.h	Thu Dec 17 09:20:16 2009 +0200
@@ -1,1 +1,18 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: 
+*
+*/
+
 #include <JavaScriptCore/property_map.h>
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebCore/ForwardingHeaders/kjs/protect.h
--- a/webengine/osswebengine/WebCore/ForwardingHeaders/kjs/protect.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebCore/ForwardingHeaders/kjs/protect.h	Thu Dec 17 09:20:16 2009 +0200
@@ -1,1 +1,18 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: 
+*
+*/
+
 #include <JavaScriptCore/protect.h>
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebCore/ForwardingHeaders/kjs/string_object.h
--- a/webengine/osswebengine/WebCore/ForwardingHeaders/kjs/string_object.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebCore/ForwardingHeaders/kjs/string_object.h	Thu Dec 17 09:20:16 2009 +0200
@@ -1,1 +1,18 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: 
+*
+*/
+
 #include <JavaScriptCore/string_object.h>
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebCore/ForwardingHeaders/kjs/ustring.h
--- a/webengine/osswebengine/WebCore/ForwardingHeaders/kjs/ustring.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebCore/ForwardingHeaders/kjs/ustring.h	Thu Dec 17 09:20:16 2009 +0200
@@ -1,1 +1,18 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: 
+*
+*/
+
 #include <JavaScriptCore/ustring.h>
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebCore/ForwardingHeaders/kjs/value.h
--- a/webengine/osswebengine/WebCore/ForwardingHeaders/kjs/value.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebCore/ForwardingHeaders/kjs/value.h	Thu Dec 17 09:20:16 2009 +0200
@@ -1,1 +1,18 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: 
+*
+*/
+
 #include <JavaScriptCore/value.h>
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebCore/ForwardingHeaders/pcre/pcre.h
--- a/webengine/osswebengine/WebCore/ForwardingHeaders/pcre/pcre.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebCore/ForwardingHeaders/pcre/pcre.h	Thu Dec 17 09:20:16 2009 +0200
@@ -1,1 +1,18 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: 
+*
+*/
+
 #include <JavaScriptCore/pcre.h>
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebCore/ForwardingHeaders/wtf/AlwaysInline.h
--- a/webengine/osswebengine/WebCore/ForwardingHeaders/wtf/AlwaysInline.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebCore/ForwardingHeaders/wtf/AlwaysInline.h	Thu Dec 17 09:20:16 2009 +0200
@@ -1,1 +1,18 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: 
+*
+*/
+
 #include <JavaScriptCore/AlwaysInline.h>
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebCore/ForwardingHeaders/wtf/Assertions.h
--- a/webengine/osswebengine/WebCore/ForwardingHeaders/wtf/Assertions.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebCore/ForwardingHeaders/wtf/Assertions.h	Thu Dec 17 09:20:16 2009 +0200
@@ -1,1 +1,18 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: 
+*
+*/
+
 #include <JavaScriptCore/Assertions.h>
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebCore/ForwardingHeaders/wtf/FastMalloc.h
--- a/webengine/osswebengine/WebCore/ForwardingHeaders/wtf/FastMalloc.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebCore/ForwardingHeaders/wtf/FastMalloc.h	Thu Dec 17 09:20:16 2009 +0200
@@ -1,1 +1,18 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: 
+*
+*/
+
 #include <JavaScriptCore/FastMalloc.h>
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebCore/ForwardingHeaders/wtf/Forward.h
--- a/webengine/osswebengine/WebCore/ForwardingHeaders/wtf/Forward.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebCore/ForwardingHeaders/wtf/Forward.h	Thu Dec 17 09:20:16 2009 +0200
@@ -1,1 +1,18 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: 
+*
+*/
+
 #include <JavaScriptCore/Forward.h>
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebCore/ForwardingHeaders/wtf/GetPtr.h
--- a/webengine/osswebengine/WebCore/ForwardingHeaders/wtf/GetPtr.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebCore/ForwardingHeaders/wtf/GetPtr.h	Thu Dec 17 09:20:16 2009 +0200
@@ -1,1 +1,18 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: 
+*
+*/
+
 #include <JavaScriptCore/GetPtr.h>
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebCore/ForwardingHeaders/wtf/HashCountedSet.h
--- a/webengine/osswebengine/WebCore/ForwardingHeaders/wtf/HashCountedSet.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebCore/ForwardingHeaders/wtf/HashCountedSet.h	Thu Dec 17 09:20:16 2009 +0200
@@ -1,1 +1,18 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: 
+*
+*/
+
 #include <JavaScriptCore/HashCountedSet.h>
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebCore/ForwardingHeaders/wtf/HashMap.h
--- a/webengine/osswebengine/WebCore/ForwardingHeaders/wtf/HashMap.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebCore/ForwardingHeaders/wtf/HashMap.h	Thu Dec 17 09:20:16 2009 +0200
@@ -1,1 +1,18 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: 
+*
+*/
+
 #include <JavaScriptCore/HashMap.h>
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebCore/ForwardingHeaders/wtf/HashSet.h
--- a/webengine/osswebengine/WebCore/ForwardingHeaders/wtf/HashSet.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebCore/ForwardingHeaders/wtf/HashSet.h	Thu Dec 17 09:20:16 2009 +0200
@@ -1,1 +1,18 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: 
+*
+*/
+
 #include <JavaScriptCore/HashSet.h>
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebCore/ForwardingHeaders/wtf/HashTable.h
--- a/webengine/osswebengine/WebCore/ForwardingHeaders/wtf/HashTable.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebCore/ForwardingHeaders/wtf/HashTable.h	Thu Dec 17 09:20:16 2009 +0200
@@ -1,1 +1,18 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: 
+*
+*/
+
 #include <JavaScriptCore/HashTable.h>
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebCore/ForwardingHeaders/wtf/HashTraits.h
--- a/webengine/osswebengine/WebCore/ForwardingHeaders/wtf/HashTraits.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebCore/ForwardingHeaders/wtf/HashTraits.h	Thu Dec 17 09:20:16 2009 +0200
@@ -1,1 +1,18 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: 
+*
+*/
+
 #include <JavaScriptCore/HashTraits.h>
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebCore/ForwardingHeaders/wtf/ListHashSet.h
--- a/webengine/osswebengine/WebCore/ForwardingHeaders/wtf/ListHashSet.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebCore/ForwardingHeaders/wtf/ListHashSet.h	Thu Dec 17 09:20:16 2009 +0200
@@ -1,1 +1,18 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: 
+*
+*/
+
 #include <JavaScriptCore/ListHashSet.h>
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebCore/ForwardingHeaders/wtf/MathExtras.h
--- a/webengine/osswebengine/WebCore/ForwardingHeaders/wtf/MathExtras.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebCore/ForwardingHeaders/wtf/MathExtras.h	Thu Dec 17 09:20:16 2009 +0200
@@ -1,1 +1,18 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: 
+*
+*/
+
 #include <JavaScriptCore/MathExtras.h>
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebCore/ForwardingHeaders/wtf/Noncopyable.h
--- a/webengine/osswebengine/WebCore/ForwardingHeaders/wtf/Noncopyable.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebCore/ForwardingHeaders/wtf/Noncopyable.h	Thu Dec 17 09:20:16 2009 +0200
@@ -1,1 +1,18 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: 
+*
+*/
+
 #include <JavaScriptCore/Noncopyable.h>
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebCore/ForwardingHeaders/wtf/OwnArrayPtr.h
--- a/webengine/osswebengine/WebCore/ForwardingHeaders/wtf/OwnArrayPtr.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebCore/ForwardingHeaders/wtf/OwnArrayPtr.h	Thu Dec 17 09:20:16 2009 +0200
@@ -1,1 +1,18 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: 
+*
+*/
+
 #include <JavaScriptCore/OwnArrayPtr.h>
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebCore/ForwardingHeaders/wtf/OwnPtr.h
--- a/webengine/osswebengine/WebCore/ForwardingHeaders/wtf/OwnPtr.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebCore/ForwardingHeaders/wtf/OwnPtr.h	Thu Dec 17 09:20:16 2009 +0200
@@ -1,1 +1,18 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: 
+*
+*/
+
 #include <JavaScriptCore/OwnPtr.h>
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebCore/ForwardingHeaders/wtf/PassRefPtr.h
--- a/webengine/osswebengine/WebCore/ForwardingHeaders/wtf/PassRefPtr.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebCore/ForwardingHeaders/wtf/PassRefPtr.h	Thu Dec 17 09:20:16 2009 +0200
@@ -1,1 +1,18 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: 
+*
+*/
+
 #include <JavaScriptCore/PassRefPtr.h>
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebCore/ForwardingHeaders/wtf/Platform.h
--- a/webengine/osswebengine/WebCore/ForwardingHeaders/wtf/Platform.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebCore/ForwardingHeaders/wtf/Platform.h	Thu Dec 17 09:20:16 2009 +0200
@@ -1,1 +1,18 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: 
+*
+*/
+
 #include <JavaScriptCore/Platform.h>
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebCore/ForwardingHeaders/wtf/RefPtr.h
--- a/webengine/osswebengine/WebCore/ForwardingHeaders/wtf/RefPtr.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebCore/ForwardingHeaders/wtf/RefPtr.h	Thu Dec 17 09:20:16 2009 +0200
@@ -1,1 +1,18 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: 
+*
+*/
+
 #include <JavaScriptCore/RefPtr.h>
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebCore/ForwardingHeaders/wtf/RetainPtr.h
--- a/webengine/osswebengine/WebCore/ForwardingHeaders/wtf/RetainPtr.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebCore/ForwardingHeaders/wtf/RetainPtr.h	Thu Dec 17 09:20:16 2009 +0200
@@ -1,1 +1,18 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: 
+*
+*/
+
 #include <JavaScriptCore/RetainPtr.h>
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebCore/ForwardingHeaders/wtf/StringExtras.h
--- a/webengine/osswebengine/WebCore/ForwardingHeaders/wtf/StringExtras.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebCore/ForwardingHeaders/wtf/StringExtras.h	Thu Dec 17 09:20:16 2009 +0200
@@ -1,1 +1,18 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: 
+*
+*/
+
 #include <JavaScriptCore/StringExtras.h>
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebCore/ForwardingHeaders/wtf/Vector.h
--- a/webengine/osswebengine/WebCore/ForwardingHeaders/wtf/Vector.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebCore/ForwardingHeaders/wtf/Vector.h	Thu Dec 17 09:20:16 2009 +0200
@@ -1,1 +1,18 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: 
+*
+*/
+
 #include <JavaScriptCore/Vector.h>
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebCore/ForwardingHeaders/wtf/unicode/Unicode.h
--- a/webengine/osswebengine/WebCore/ForwardingHeaders/wtf/unicode/Unicode.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebCore/ForwardingHeaders/wtf/unicode/Unicode.h	Thu Dec 17 09:20:16 2009 +0200
@@ -1,1 +1,18 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: 
+*
+*/
+
 #include <JavaScriptCore/Unicode.h>
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebCore/ForwardingHeaders/wtf/unicode/icu/UnicodeIcu.h
--- a/webengine/osswebengine/WebCore/ForwardingHeaders/wtf/unicode/icu/UnicodeIcu.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebCore/ForwardingHeaders/wtf/unicode/icu/UnicodeIcu.h	Thu Dec 17 09:20:16 2009 +0200
@@ -1,1 +1,18 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: 
+*
+*/
+
 #include <JavaScriptCore/UnicodeIcu.h>
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebCore/bindings/js/kjs_window.cpp
--- a/webengine/osswebengine/WebCore/bindings/js/kjs_window.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebCore/bindings/js/kjs_window.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -1543,7 +1543,15 @@
     
 #if PLATFORM(SYMBIAN)
     if (d->m_evt && d->m_evt->type() == "mouseover")  {
-        impl()->frame()->page()->chrome()->setElementVisibilityChanged(true);
+        if (singleShot) {
+            double interval = max(0.001, t * 0.001);
+            if (interval < cMinimumTimerInterval && (timerNestingLevel + 1) >= cMaxTimerNestingLevel) {
+                interval = cMinimumTimerInterval;
+            }
+            impl()->frame()->page()->chrome()->wait(interval);
+            a->execute(this);
+            return lastUsedTimeoutId;
+        }
     }
 #endif        
 
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebCore/css/MediaQuery.cpp
--- a/webengine/osswebengine/WebCore/css/MediaQuery.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebCore/css/MediaQuery.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -1,29 +1,20 @@
 /*
- * CSS Media Query
- *
- * Copyright (C) 2005, 2006 Kimmo Kinnunen <kimmo.t.kinnunen@nokia.com>.
- *
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 COMPUTER, INC. OR
- * 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. 
- */
+* Copyright (c) 2005, 2006 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: 
+*
+*/
+
 
 #include "config.h"
 #include "MediaQuery.h"
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebCore/css/MediaQuery.h
--- a/webengine/osswebengine/WebCore/css/MediaQuery.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebCore/css/MediaQuery.h	Thu Dec 17 09:20:16 2009 +0200
@@ -1,29 +1,20 @@
 /*
- * CSS Media Query
- *
- * Copyright (C) 2006 Kimmo Kinnunen <kimmo.t.kinnunen@nokia.com>.
- *
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 COMPUTER, INC. OR
- * 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. 
- */
+* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: 
+*
+*/
+
 
 #ifndef MediaQuery_h
 #define MediaQuery_h
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebCore/css/MediaQueryEvaluator.cpp
--- a/webengine/osswebengine/WebCore/css/MediaQueryEvaluator.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebCore/css/MediaQueryEvaluator.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -1,29 +1,20 @@
 /*
- * CSS Media Query Evaluator
- *
- * Copyright (C) 2006 Kimmo Kinnunen <kimmo.t.kinnunen@nokia.com>.
- *
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 COMPUTER, INC. OR
- * 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.
- */
+* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: 
+*
+*/
+
 
 #include "config.h"
 #include "MediaQueryEvaluator.h"
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebCore/css/MediaQueryEvaluator.h
--- a/webengine/osswebengine/WebCore/css/MediaQueryEvaluator.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebCore/css/MediaQueryEvaluator.h	Thu Dec 17 09:20:16 2009 +0200
@@ -1,29 +1,20 @@
 /*
- * CSS Media Query Evaluator
- *
- * Copyright (C) 2006 Kimmo Kinnunen <kimmo.t.kinnunen@nokia.com>.
- *
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 COMPUTER, INC. OR
- * 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. 
- */
+* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: 
+*
+*/
+
 
 #ifndef MediaQueryEvaluator_h
 #define MediaQueryEvaluator_h
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebCore/css/MediaQueryExp.cpp
--- a/webengine/osswebengine/WebCore/css/MediaQueryExp.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebCore/css/MediaQueryExp.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -1,29 +1,20 @@
 /*
- * CSS Media Query
- *
- * Copyright (C) 2006 Kimmo Kinnunen <kimmo.t.kinnunen@nokia.com>.
- *
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 COMPUTER, INC. OR
- * 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. 
- */
+* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: 
+*
+*/
+
 
 #include "config.h"
 #include "MediaQueryExp.h"
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebCore/css/MediaQueryExp.h
--- a/webengine/osswebengine/WebCore/css/MediaQueryExp.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebCore/css/MediaQueryExp.h	Thu Dec 17 09:20:16 2009 +0200
@@ -1,29 +1,20 @@
 /*
- * CSS Media Query
- *
- * Copyright (C) 2006 Kimmo Kinnunen <kimmo.t.kinnunen@nokia.com>.
- *
- * 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 COMPUTER, INC. OR
- * 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. 
- */
+* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: 
+*
+*/
+
 
 #ifndef MediaQueryExp_h
 #define MediaQueryExp_h
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebCore/css/cssparser.cpp
--- a/webengine/osswebengine/WebCore/css/cssparser.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebCore/css/cssparser.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -1311,12 +1311,16 @@
         if (id == CSS_VAL_NONE || id == CSS_VAL_BOTH || id == CSS_VAL_HORIZONTAL || id == CSS_VAL_VERTICAL || id == CSS_VAL_AUTO)
             valid_primitive = true;
         break;
+	// webkit-column-count currently not supported
+    #if !PLATFORM(SYMBIAN)
     case CSS_PROP__WEBKIT_COLUMN_COUNT:
         if (id == CSS_VAL_AUTO)
             valid_primitive = true;
         else
             valid_primitive = !id && validUnit(value, FInteger | FNonNeg, false);
+
         break;
+    #endif
     case CSS_PROP__WEBKIT_COLUMN_GAP:         // normal | <length>
         if (id == CSS_VAL_NORMAL)
             valid_primitive = true;
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebCore/icu/unicode/utf_old.h
--- a/webengine/osswebengine/WebCore/icu/unicode/utf_old.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebCore/icu/unicode/utf_old.h	Thu Dec 17 09:20:16 2009 +0200
@@ -0,0 +1,17 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: 
+*
+*/
+
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebCore/loader/CachedImage.cpp
--- a/webengine/osswebengine/WebCore/loader/CachedImage.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebCore/loader/CachedImage.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -25,7 +25,7 @@
 #include "CachedImage.h"
 #include "StaticObjectsContainer.h"
 #include "ResourceLoaderDelegate.h"
-#include "HttpCacheManager.h"
+#include "httpcachemanager.h"
 
 #include "BitmapImage.h"
 #include "Cache.h"
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebCore/page/Chrome.cpp
--- a/webengine/osswebengine/WebCore/page/Chrome.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebCore/page/Chrome.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -352,6 +352,12 @@
 {
     m_client->setElementVisibilityChanged(visibility);
 }
+
+void Chrome::wait(double t)
+{
+    m_client->wait(t);    
+}
+
 #endif    
 PageGroupLoadDeferrer::PageGroupLoadDeferrer(Page* page, bool deferSelf)
 {
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebCore/page/Chrome.h
--- a/webengine/osswebengine/WebCore/page/Chrome.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebCore/page/Chrome.h	Thu Dec 17 09:20:16 2009 +0200
@@ -133,6 +133,7 @@
 
 #if PLATFORM(SYMBIAN)
     void setElementVisibilityChanged(bool visibility);
+    void wait(double t);
 #endif
     private:
         Page* m_page;
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebCore/page/ChromeClient.h
--- a/webengine/osswebengine/WebCore/page/ChromeClient.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebCore/page/ChromeClient.h	Thu Dec 17 09:20:16 2009 +0200
@@ -110,6 +110,7 @@
         virtual bool elementVisibilityChangedByMouse() = 0;
         virtual bool elementVisibilityChangedByKey() = 0;
         virtual void focusedElementChanged(Element*) = 0;
+        virtual void wait(double t) = 0;
 #endif
 };
 
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebCore/page/symbian/WebCoreFrameBridge.h
--- a/webengine/osswebengine/WebCore/page/symbian/WebCoreFrameBridge.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebCore/page/symbian/WebCoreFrameBridge.h	Thu Dec 17 09:20:16 2009 +0200
@@ -20,7 +20,7 @@
 
 #include "Shared.h"
 #include <wtf/Vector.h>
-#include "BrCtlDefs.h"
+#include "brctldefs.h"
 
 namespace WebCore {
     class Node;
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebCore/platform/graphics/cairo/AffineTransformCairo.cpp
--- a/webengine/osswebengine/WebCore/platform/graphics/cairo/AffineTransformCairo.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebCore/platform/graphics/cairo/AffineTransformCairo.cpp	Thu Dec 17 09:20:16 2009 +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 "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: 
+*
+*/
 /*
  *
  * Redistribution and use in source and binary forms, with or without
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebCore/platform/graphics/svg/SVGResourceListener.h
--- a/webengine/osswebengine/WebCore/platform/graphics/svg/SVGResourceListener.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebCore/platform/graphics/svg/SVGResourceListener.h	Thu Dec 17 09:20:16 2009 +0200
@@ -0,0 +1,17 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: 
+*
+*/
+
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebCore/platform/image-decoders/zlib/trees.h
--- a/webengine/osswebengine/WebCore/platform/image-decoders/zlib/trees.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebCore/platform/image-decoders/zlib/trees.h	Thu Dec 17 09:20:16 2009 +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 "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: 
+*
+*/
 /* header created automatically with -DGEN_TREES_H */
 
 local const ct_data static_ltree[L_CODES+2] = {
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebCore/platform/network/symbian/CookieHandler.cpp
--- a/webengine/osswebengine/WebCore/platform/network/symbian/CookieHandler.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebCore/platform/network/symbian/CookieHandler.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -19,7 +19,7 @@
 
 // INCLUDES
 #include "Cookiehandler.h"
-#include <CookieManagerClient.h>
+#include <cookiemanagerclient.h>
 
 // EXTERNAL DATA STRUCTURES
 
@@ -148,10 +148,22 @@
         popAndDestroyCount ++;
     }
     
-    // if the domain is not specified then extract the domain name from the Url
+    // if the path is not specified then extract the domain name from the Url
+    // Why do we duplicate this code here?  It already exists in Cookie's constructl's call to adddefaultpathl?
+    TPtrC8 requestPath;
     if(!cookieRecord.m_pathName.Length()) {
         const TDesC8& pathName= uriParser.Extract(EUriPath);
-        cookieRecord.m_pathName.Set(TPtrC(asciiToUnicodeLC(pathName)->Des()));
+        const TUint8 KCookiePathSeparator = '/';
+        requestPath.Set(pathName);
+        TInt sepPos = requestPath.LocateReverse( KCookiePathSeparator );
+        // if / is not the last character
+        if ( 0 <= sepPos && ( ( sepPos + 1 != requestPath.Length() ) ) )
+            {
+            // then remove characters after the right-most /
+            requestPath.Set( requestPath.Left( sepPos + 1 ) );
+            }
+
+        cookieRecord.m_pathName.Set(TPtrC(asciiToUnicodeLC(requestPath)->Des()));
         popAndDestroyCount ++;
     }
     
@@ -162,6 +174,7 @@
         cookieRecord);
     popAndDestroyCount +=6;
     // create a cookie
+    // Why are we using the stringpool only constructor of cookie?
     CCookie* cookie = CCookie::NewL( (*m_stringPool) );
     
     CleanupStack::PushL( cookie );
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebCore/platform/network/symbian/DataConnection.cpp
--- a/webengine/osswebengine/WebCore/platform/network/symbian/DataConnection.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebCore/platform/network/symbian/DataConnection.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -20,7 +20,7 @@
 #include <EscapeUtils.h>
 #include <apmrec.h>
 #include <apgcli.h>
-#include <imcvcodc.h>
+#include <tconvbase64.h>
 #include "ResourceHandle.h"
 #include "ResourceRequest.h"
 #include "DataConnection.h"
@@ -148,8 +148,7 @@
                 body = HBufC8::NewLC( 2 * data.Length() );
                 TPtr8 decodedBody( body->Des() );
                 // urlPtr8
-                TImCodecB64 codec;
-                codec.Initialise();
+                TBase64 codec; 
                 ok = codec.Decode( data, decodedBody );
             }
             if( !ok ) { // if not base64, simple copy
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebCore/platform/network/symbian/FileConnection.cpp
--- a/webengine/osswebengine/WebCore/platform/network/symbian/FileConnection.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebCore/platform/network/symbian/FileConnection.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -26,7 +26,7 @@
 #include "ResourceHandleManagerSymbian.h"
 #include "StaticObjectsContainer.h"
 #include "ResourceRequest.h"
-#include <BrCtlSpecialLoadObserver.h>
+#include <brctlspecialloadobserver.h>
 #include "brctl.h"
 #include "DeprecatedString.h"
 
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebCore/platform/network/symbian/HttpCacheSupply.cpp
--- a/webengine/osswebengine/WebCore/platform/network/symbian/HttpCacheSupply.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebCore/platform/network/symbian/HttpCacheSupply.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -18,7 +18,7 @@
 
 // INCLUDE FILES
 #include "HttpCacheSupply.h"
-#include "HttpCacheManager.h"
+#include "httpcachemanager.h"
 #include "HttpCacheDataSupplier.h"
 #include "HttpConnection.h"
 #include "ResourceLoaderDelegate.h"
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebCore/platform/network/symbian/HttpCacheSupply.h
--- a/webengine/osswebengine/WebCore/platform/network/symbian/HttpCacheSupply.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebCore/platform/network/symbian/HttpCacheSupply.h	Thu Dec 17 09:20:16 2009 +0200
@@ -21,8 +21,8 @@
 
 //  INCLUDES
 #include <e32base.h>
-#include <BrCtlDefs.h>
-#include "HttpCacheManager.h"
+#include <brctldefs.h>
+#include "httpcachemanager.h"
 
 // CONSTANTS
 
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebCore/platform/network/symbian/HttpConnUtils.cpp
--- a/webengine/osswebengine/WebCore/platform/network/symbian/HttpConnUtils.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebCore/platform/network/symbian/HttpConnUtils.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -17,10 +17,10 @@
 
 // INCLUDE FILES
 #include "HttpConnUtils.h"
-#include "HttpFilterCommonStringsExt.h"
+#include "httpfiltercommonstringsext.h"
 #include <httpstringconstants.h>
 #include <http/rhttpsession.h>
-#include <BrCtlDefs.h>
+#include <brctldefs.h>
 #include <flogger.h>
 #include <sslerr.h>
 #include <httperr.h>
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebCore/platform/network/symbian/HttpConnUtils.h
--- a/webengine/osswebengine/WebCore/platform/network/symbian/HttpConnUtils.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebCore/platform/network/symbian/HttpConnUtils.h	Thu Dec 17 09:20:16 2009 +0200
@@ -20,7 +20,7 @@
 
 //  INCLUDES
 #include <e32base.h>
-#include <BrCtlDefs.h>
+#include <brctldefs.h>
 #include "HttpDefs.h"
 
 // CONSTANTS
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebCore/platform/network/symbian/HttpConnection.cpp
--- a/webengine/osswebengine/WebCore/platform/network/symbian/HttpConnection.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebCore/platform/network/symbian/HttpConnection.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -29,10 +29,10 @@
 #include "ResourceLoaderDelegate.h"
 #include "HttpCacheSupply.h"
 #include "HttpPostDataSupplier.h"
-#include <HttpFilterCommonStringsExt.h>
-#include <BrCtlDefs.h>
+#include <httpfiltercommonstringsext.h>
+#include <brctldefs.h>
 #include "BrCtl.h"
-#include "BrCtlSpecialLoadObserver.h"
+#include "brctlspecialloadobserver.h"
 #include "Frame.h"
 #include "FrameLoader.h"
 #include "DocumentLoader.h"
@@ -648,7 +648,10 @@
                     return;
                     }
                 int statusCode = m_transaction->Response().StatusCode();
-                if ( statusCode != 200) {
+                if ((statusCode == 404) && (aEvent.iStatus == THTTPEvent::EFailed) && (m_accumulatedSize != 0)) {
+                    complete(KErrNone);
+                }	
+                else if ( statusCode != 200) {
                     complete(-25000 - m_transaction->Response().StatusCode());
                 }
                 else if (statusCode == 200 && aEvent.iStatus == THTTPEvent::EFailed) {
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebCore/platform/network/symbian/HttpConnectionConfig.cpp
--- a/webengine/osswebengine/WebCore/platform/network/symbian/HttpConnectionConfig.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebCore/platform/network/symbian/HttpConnectionConfig.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -21,7 +21,7 @@
 #include "HttpConnection.h"
 #include "StaticObjectsContainer.h"
 #include "ResourceLoaderDelegate.h"
-#include <HttpFilterCommonStringsExt.h>
+#include <httpfiltercommonstringsext.h>
 
 using namespace WebCore;
 
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebCore/platform/network/symbian/HttpDlConnection.cpp
--- a/webengine/osswebengine/WebCore/platform/network/symbian/HttpDlConnection.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebCore/platform/network/symbian/HttpDlConnection.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -20,7 +20,7 @@
 #include "HttpDlConnection.h"
 #include "StaticObjectsContainer.h"
 #include "ResourceLoaderDelegate.h"
-#include <HttpFilterCommonStringsExt.h>
+#include <httpfiltercommonstringsext.h>
 
 using namespace WebCore;
 
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebCore/platform/network/symbian/HttpDownload.cpp
--- a/webengine/osswebengine/WebCore/platform/network/symbian/HttpDownload.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebCore/platform/network/symbian/HttpDownload.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -16,8 +16,8 @@
 */
 
 #include "HttpDownload.h"
-#include <CDownloadMgrUiUserInteractions.h>
-#include <CDownloadMgrUiDownloadsList.h>
+#include <cdownloadmgruiuserinteractions.h>
+#include <cdownloadmgruidownloadslist.h>
 #include "HttpDlConnection.h"
 #include "HttpDefs.h"
 #include "HttpSessionManager.h"
@@ -30,15 +30,41 @@
 
 using namespace WebCore;
 
-HttpDownload::HttpDownload(HttpSessionManager* sessionManager)
+// -----------------------------------------------------------------------------
+// HttpDownload::NewL
+//
+// Two-phased constructor.
+// -----------------------------------------------------------------------------
+//
+HttpDownload* HttpDownload::NewL(HttpSessionManager* sessionManager)
+    {
+    HttpDownload* self = new (ELeave) HttpDownload();
+
+    CleanupStack::PushL (self);
+    self->ConstructL ( sessionManager);
+    CleanupStack::Pop ();
+    return self;       
+    }
+
+HttpDownload::HttpDownload()
 {
-    m_sessionManager = sessionManager;
     m_dMgrReady = false;
     m_dMgrUiReg = NULL;
-	m_downloadObserver = StaticObjectsContainer::instance()->brctl()->brCtlDownloadObserver();
-    TRAP_IGNORE(PREPARE_DOWNLOAD_MANAGER)
 }
 
+// -----------------------------------------------------------------------------
+// HttpDownload::ConstructL
+// Symbian 2nd phase constructor can leave.
+// by this method.
+// -----------------------------------------------------------------------------
+//
+void HttpDownload::ConstructL(HttpSessionManager* sessionManager)
+    {
+    m_sessionManager = sessionManager;
+    m_downloadObserver = StaticObjectsContainer::instance()->brctl()->brCtlDownloadObserver();
+    PREPARE_DOWNLOAD_MANAGER;
+    }
+
 HttpDownload::~HttpDownload()
 {
     delete m_dMgrUiReg;
@@ -72,7 +98,10 @@
     if ( errMngr == KErrAlreadyExists && master ) { 
         m_downloadMgr.ConnectL( myProcess.Identity(), *this, EFalse );
     }
-    
+    else
+    {
+        User::LeaveIfError(errMngr);
+    }
     if( !master ){
         // Browser is embedded. Downloads must be paused when the user closes
         // the embedded Browser (that is always started from the Launcher), and
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebCore/platform/network/symbian/HttpDownload.h
--- a/webengine/osswebengine/WebCore/platform/network/symbian/HttpDownload.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebCore/platform/network/symbian/HttpDownload.h	Thu Dec 17 09:20:16 2009 +0200
@@ -18,12 +18,12 @@
 #ifndef __HTTPDOWNLOAD_H__
 #define __HTTPDOWNLOAD_H__
 
-#include <BrCtlSpecialLoadObserver.h>
+#include <brctlspecialloadobserver.h>
 #include "HttpUiCallbacks.h"
 #include "HttpCallbacks.h"
-#include <DownloadMgrClient.h>
-#include <CDownloadMgrUiLibRegistry.h>
-#include <BrCtlDownloadObserver.h>
+#include <downloadmgrclient.h>
+#include <cdownloadmgruilibregistry.h>
+#include <brctldownloadobserver.h>
 
 class HttpDlConnection;
 class RHTTPTransaction;
@@ -33,7 +33,11 @@
 class HttpDownload : public MHttpDownloadMgrObserver, public MHttpDownloadMgrNextUriObserver
 {
 public:
-    HttpDownload(HttpSessionManager* sessionManager);
+    /**
+    * Two-phased constructor.
+    */
+    static HttpDownload* NewL(HttpSessionManager* sessionManager);
+   
     virtual ~HttpDownload();
     void continueDownloadL(RHTTPTransaction* connTransaction, HttpDlConnection* dlConnection);
 
@@ -92,6 +96,13 @@
 
 private:
    /**
+    * By default Symbian 2nd phase constructor is private.
+    */
+    void ConstructL(HttpSessionManager* sessionManager);
+    
+    HttpDownload();
+
+   /**
     * Initialize Download Manager
     */
     void initDownloadMgrL();
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebCore/platform/network/symbian/HttpRequestHeaderManager.cpp
--- a/webengine/osswebengine/WebCore/platform/network/symbian/HttpRequestHeaderManager.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebCore/platform/network/symbian/HttpRequestHeaderManager.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -18,9 +18,9 @@
 
 // INCLUDE FILES
 #include <http.h>
-#include <BrowserUiSDKCRKeys.h>
+#include <browseruisdkcrkeys.h>
 #include "HttpRequestHeaderManager.h"
-#include "HttpFilterCommonStringsExt.h"
+#include "httpfiltercommonstringsext.h"
 #include "ResourceRequest.h"
 #include "StaticObjectsContainer.h"
 #include "ResourceLoaderDelegate.h"
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebCore/platform/network/symbian/HttpRequestHeaderManager.h
--- a/webengine/osswebengine/WebCore/platform/network/symbian/HttpRequestHeaderManager.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebCore/platform/network/symbian/HttpRequestHeaderManager.h	Thu Dec 17 09:20:16 2009 +0200
@@ -21,7 +21,7 @@
 
 //  INCLUDES
 
-//#include "HttpFilterAcceptHeaderInterface.h"
+//#include "httpfilteracceptheaderinterface.h"
 #include <http/rhttpheaders.h>
 #include <centralrepository.h>
 
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebCore/platform/network/symbian/HttpSessionManager.cpp
--- a/webengine/osswebengine/WebCore/platform/network/symbian/HttpSessionManager.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebCore/platform/network/symbian/HttpSessionManager.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -17,17 +17,17 @@
 
 #include "config.h"
 
-#include "HttpFilterCommonStringsExt.h"
-#include "HttpFilterCommonStringsAddition.h"
-#include "HttpFilterConnHandlerInterface.h"
-#include "HttpFilterIopInterface.h"
-#include "HttpFilterAuthenticationInterface.h"
+#include "httpfiltercommonstringsext.h"
+#include "httpfiltercommonstringsaddition.h"
+#include "httpfilterconnhandlerinterface.h"
+#include "httpfilteriopinterface.h"
+#include "httpfilterauthenticationinterface.h"
 #include "cookiefilterinterface.h"
 #include "uaproffilter_interface.h"
 #include "deflatefilterinterface.h"
 #include "HttpSessionManager.h"
 #include "HttpUiCallbacks.h"
-#include "HttpCacheManager.h"
+#include "httpcachemanager.h"
 #include "HttpConnection.h"
 #include "HttpRequestHeaderManager.h"
 #include "CookieHandler.h"
@@ -155,7 +155,11 @@
 HttpDownload* HttpSessionManager::httpDownload(bool aCreate)
 {
     if (!m_httpDownload && aCreate){
-        m_httpDownload = new HttpDownload(this);
+        TRAPD(err, m_httpDownload = HttpDownload::NewL(this));
+        if(err != KErrNone)
+           {
+		   m_httpDownload = NULL;
+           }
     }
     return m_httpDownload;
 }
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebCore/platform/network/symbian/HttpUiCallbacks.cpp
--- a/webengine/osswebengine/WebCore/platform/network/symbian/HttpUiCallbacks.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebCore/platform/network/symbian/HttpUiCallbacks.cpp	Thu Dec 17 09:20:16 2009 +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"
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebCore/platform/network/symbian/HttpUiCallbacks.h
--- a/webengine/osswebengine/WebCore/platform/network/symbian/HttpUiCallbacks.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebCore/platform/network/symbian/HttpUiCallbacks.h	Thu Dec 17 09:20:16 2009 +0200
@@ -21,7 +21,7 @@
 #include <e32base.h>
 #include <ApEngineConsts.h>
 #include <mconnectioncallback.h>
-#include <BrCtlDownloadObserver.h>
+#include <brctldownloadobserver.h>
 #include "HttpConnection.h"
 
 class RHTTPTransaction;
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebCore/platform/network/symbian/MultipartContentHandler.cpp
--- a/webengine/osswebengine/WebCore/platform/network/symbian/MultipartContentHandler.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebCore/platform/network/symbian/MultipartContentHandler.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -18,13 +18,13 @@
 // 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 "httpcachemanager.h"
 #include <http/rhttptransaction.h>
 #include <Uri16.h>
-#include "HttpFilterCommonStringsExt.h"
+#include "httpfiltercommonstringsext.h"
 #include "WebCharsetData.h"
 #include "StaticObjectsContainer.h"
 #include "ResourceLoaderDelegate.h"
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebCore/platform/network/symbian/ResolvedConnection.h
--- a/webengine/osswebengine/WebCore/platform/network/symbian/ResolvedConnection.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebCore/platform/network/symbian/ResolvedConnection.h	Thu Dec 17 09:20:16 2009 +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;
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebCore/platform/network/symbian/ResourceLoaderDelegate.cpp
--- a/webengine/osswebengine/WebCore/platform/network/symbian/ResourceLoaderDelegate.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebCore/platform/network/symbian/ResourceLoaderDelegate.cpp	Thu Dec 17 09:20:16 2009 +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"
 
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebCore/platform/network/symbian/SelfDownloadContentHandler.cpp
--- a/webengine/osswebengine/WebCore/platform/network/symbian/SelfDownloadContentHandler.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebCore/platform/network/symbian/SelfDownloadContentHandler.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -19,8 +19,8 @@
 // INCLUDE FILES
 #include "BrCtl.h"
 #include "SelfDownloadContentHandler.h"
-#include <BrCtlSpecialLoadObserver.h>
-#include <BrCtlDefs.h>
+#include <brctlspecialloadobserver.h>
+#include <brctldefs.h>
 #include <apmstd.h>
 #include <eikenv.h>
 #include "ResourceRequest.h"
@@ -29,7 +29,7 @@
 #include "StaticObjectsContainer.h"
 #include "ResourceLoaderDelegate.h"
 #include "HttpSessionManager.h"
-#include "HttpFilterCommonStringsExt.h"
+#include "httpfiltercommonstringsext.h"
 #include <Uri8.h>
 #include <http/rhttptransaction.h>
 #include <http/mhttpdatasupplier.h>
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebCore/platform/network/symbian/UrlConnection.h
--- a/webengine/osswebengine/WebCore/platform/network/symbian/UrlConnection.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebCore/platform/network/symbian/UrlConnection.h	Thu Dec 17 09:20:16 2009 +0200
@@ -22,7 +22,7 @@
 #include "ResourceHandle.h"
 #include "ResourceHandleInternal.h"
 
-#include "BrCtlDefs.h"
+#include "brctldefs.h"
 
 namespace WebCore {
     class Frame;
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebCore/platform/symbian/FileChooserSymbian.cpp
--- a/webengine/osswebengine/WebCore/platform/symbian/FileChooserSymbian.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebCore/platform/symbian/FileChooserSymbian.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -32,7 +32,7 @@
 #include "WebFrameView.h"
 #include "WebView.h"
 #include "Brctl.h"
-#include <BrCtlDialogsProvider.h>
+#include <brctldialogsprovider.h>
 #include <CommonContentPolicy.h>
 #include <stringloader.h>
 #if defined(__BROWSER_SDK)
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebCore/platform/symbian/Libxml2/Libxml2_modules.h
--- a/webengine/osswebengine/WebCore/platform/symbian/Libxml2/Libxml2_modules.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebCore/platform/symbian/Libxml2/Libxml2_modules.h	Thu Dec 17 09:20:16 2009 +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 "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: 
+*
+*/
 // All new configuration directives are in:
 #include "XmlEngconfig.h"
 
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebCore/platform/symbian/Libxml2/Libxml2_xmlmemory.c
--- a/webengine/osswebengine/WebCore/platform/symbian/Libxml2/Libxml2_xmlmemory.c	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebCore/platform/symbian/Libxml2/Libxml2_xmlmemory.c	Thu Dec 17 09:20:16 2009 +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 "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: 
+*
+*/
 /*
  * xmlmemory.c:  libxml memory allocator wrapper.
  *
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebCore/platform/symbian/Libxml2/Libxml2_xmlwriter.c
--- a/webengine/osswebengine/WebCore/platform/symbian/Libxml2/Libxml2_xmlwriter.c	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebCore/platform/symbian/Libxml2/Libxml2_xmlwriter.c	Thu Dec 17 09:20:16 2009 +0200
@@ -1,4 +1,20 @@
-
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: 
+*
+*/
+
 /*
  * xmlwriter.c: XML text writer implementation
  *
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebCore/platform/symbian/Libxml2/libxml/parser.h
--- a/webengine/osswebengine/WebCore/platform/symbian/Libxml2/libxml/parser.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebCore/platform/symbian/Libxml2/libxml/parser.h	Thu Dec 17 09:20:16 2009 +0200
@@ -1,3 +1,20 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: 
+*
+*/
+
 #include "libxml2/libxml2_parser.h"
 #include "libxml2/Libxml2_SAX2.h"
 #define xmlFree free
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebCore/platform/symbian/Libxml2/libxml/parserinternals.h
--- a/webengine/osswebengine/WebCore/platform/symbian/Libxml2/libxml/parserinternals.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebCore/platform/symbian/Libxml2/libxml/parserinternals.h	Thu Dec 17 09:20:16 2009 +0200
@@ -1,1 +1,18 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: 
+*
+*/
+
 #include "libxml2/libxml2_parserinternals.h"
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebCore/platform/symbian/Libxml2/libxml/tree.h
--- a/webengine/osswebengine/WebCore/platform/symbian/Libxml2/libxml/tree.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebCore/platform/symbian/Libxml2/libxml/tree.h	Thu Dec 17 09:20:16 2009 +0200
@@ -1,1 +1,18 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: 
+*
+*/
+
 #include "libxml2/Libxml2_tree.h"
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebCore/platform/symbian/Libxml2/libxml/xmlstring.h
--- a/webengine/osswebengine/WebCore/platform/symbian/Libxml2/libxml/xmlstring.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebCore/platform/symbian/Libxml2/libxml/xmlstring.h	Thu Dec 17 09:20:16 2009 +0200
@@ -1,1 +1,18 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: 
+*
+*/
+
 #include "libxml2/libxml2_xmlstring.h"
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebCore/platform/symbian/OOMHandler.cpp
--- a/webengine/osswebengine/WebCore/platform/symbian/OOMHandler.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebCore/platform/symbian/OOMHandler.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -1,30 +1,20 @@
 /*
- * 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.
- */
+* 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: 
+*
+*/
+
 
 #include "config.h"
 #include "OOMHandler.h"
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebCore/platform/symbian/OOMHandler.h
--- a/webengine/osswebengine/WebCore/platform/symbian/OOMHandler.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebCore/platform/symbian/OOMHandler.h	Thu Dec 17 09:20:16 2009 +0200
@@ -1,45 +1,21 @@
 /*
-* ==============================================================================
-*  Name        : OOMHandler.h
-*  Part of     : Webcore / Platform
-*  Interface   :
-*  Description :
-*  Version     : %Version%
-*
-*    Copyright (c) 2006, Nokia Corporation
-*    All rights reserved.
-*
-*   Redistribution and use in source and binary forms, with or without
-*   modification, are permitted provided that the following conditions
-*   are met:
+* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
-*      * Redistributions of source code must retain the above copyright
-*        notice, this list of conditions and the following disclaimer.
-*      * 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.
-*      * Neither the name of the Nokia Corporation nor the names of its
-*        contributors may be used to endorse or promote products derived
-*        from this software without specific prior written permission.
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
 *
-*   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 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 THE COPYRIGHT
-*   OWNER OR 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.
+* Description: 
 *
-*
-* ==============================================================================
 */
 
+
 #ifndef __OOMHANDLER_H__
 #define __OOMHANDLER_H__
 
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebCore/platform/symbian/OOMStopper.cpp
--- a/webengine/osswebengine/WebCore/platform/symbian/OOMStopper.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebCore/platform/symbian/OOMStopper.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -1,30 +1,20 @@
 /*
- * 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.
- */
+* 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: 
+*
+*/
+
 
 #include "config.h"
 #include "OOMStopper.h"
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebCore/platform/symbian/OOMStopper.h
--- a/webengine/osswebengine/WebCore/platform/symbian/OOMStopper.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebCore/platform/symbian/OOMStopper.h	Thu Dec 17 09:20:16 2009 +0200
@@ -1,45 +1,21 @@
 /*
-* ==============================================================================
-*  Name        : OOMHandler.h
-*  Part of     : Webcore / Platform
-*  Interface   :
-*  Description :
-*  Version     : %Version%
-*
-*    Copyright (c) 2006, Nokia Corporation
-*    All rights reserved.
-*
-*   Redistribution and use in source and binary forms, with or without
-*   modification, are permitted provided that the following conditions
-*   are met:
+* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
-*      * Redistributions of source code must retain the above copyright
-*        notice, this list of conditions and the following disclaimer.
-*      * 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.
-*      * Neither the name of the Nokia Corporation nor the names of its
-*        contributors may be used to endorse or promote products derived
-*        from this software without specific prior written permission.
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
 *
-*   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 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 THE COPYRIGHT
-*   OWNER OR 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.
+* Description: 
 *
-*
-* ==============================================================================
 */
 
+
 #ifndef __OOMSTOPPER_H__
 #define __OOMSTOPPER_H__
 
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebCore/platform/symbian/PlatformMouseEventSymbian.cpp
--- a/webengine/osswebengine/WebCore/platform/symbian/PlatformMouseEventSymbian.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebCore/platform/symbian/PlatformMouseEventSymbian.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -66,6 +66,7 @@
         case TPointerEvent::EButton2Up:
             return MouseEventReleased;
         case TPointerEvent::EDrag:
+        case TPointerEvent::EMove:
             return MouseEventMoved;
     }
 }
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebCore/platform/symbian/PopupMenuSymbian.cpp
--- a/webengine/osswebengine/WebCore/platform/symbian/PopupMenuSymbian.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebCore/platform/symbian/PopupMenuSymbian.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -34,7 +34,7 @@
 #include "brctl.h"
 
 #include <e32base.h>
-#include <BrCtlDialogsProvider.h>
+#include <brctldialogsprovider.h>
 
 const TInt KDefaultSize(1);
 namespace WebCore {
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebCore/platform/symbian/StaticObjectsContainer.cpp
--- a/webengine/osswebengine/WebCore/platform/symbian/StaticObjectsContainer.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebCore/platform/symbian/StaticObjectsContainer.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -1,30 +1,20 @@
 /*
- * Copyright (C) 2006 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.
- */
+* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: 
+*
+*/
+
 
 #include "config.h"
 #include <../bidi.h>            // work around for multiple bidi.h files
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebCore/platform/symbian/StaticObjectsContainer.h
--- a/webengine/osswebengine/WebCore/platform/symbian/StaticObjectsContainer.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebCore/platform/symbian/StaticObjectsContainer.h	Thu Dec 17 09:20:16 2009 +0200
@@ -1,30 +1,20 @@
 /*
- * Copyright (C) 2006 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.
- */
+* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: 
+*
+*/
+
 
 #ifndef __STATICOBJECTCONTAINER_H__
 #define __STATICOBJECTCONTAINER_H__
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebCore/platform/symbian/WidgetSymbian.cpp
--- a/webengine/osswebengine/WebCore/platform/symbian/WidgetSymbian.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebCore/platform/symbian/WidgetSymbian.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -11,7 +11,7 @@
 *
 * Contributors:
 *
-* Description:  
+* Description:
 *
 */
 
@@ -160,7 +160,7 @@
 
     data->visible = false;
 
-    if( getOuterView() )
+    if( getOuterView() && isFrameView() )
         {
         getOuterView()->makeVisible( EFalse );
         }
@@ -243,8 +243,8 @@
     return false;
     }
 
-void Widget::handleEvent(Event* event) 
-{ 
+void Widget::handleEvent(Event* event)
+{
     if (event->type() == keydownEvent && event->isKeyboardEvent()) {
         KeyboardEvent* kevt = static_cast<KeyboardEvent*>(event);
         if (kevt->keyIdentifier() == "Enter") {
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebCore/platform/symbian/bitmap/AnimationDecoder.cpp
--- a/webengine/osswebengine/WebCore/platform/symbian/bitmap/AnimationDecoder.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebCore/platform/symbian/bitmap/AnimationDecoder.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -1,38 +1,21 @@
 /*
-* ==============================================================================
-*    Copyright (c) 2006, Nokia Corporation
-*    All rights reserved.
-*
-*   Redistribution and use in source and binary forms, with or without
-*   modification, are permitted provided that the following conditions
-*   are met:
+* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
-*      * Redistributions of source code must retain the above copyright
-*        notice, this list of conditions and the following disclaimer.
-*      * 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.
-*      * Neither the name of the Nokia Corporation nor the names of its
-*        contributors may be used to endorse or promote products derived
-*        from this software without specific prior written permission.
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
 *
-*   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 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 THE COPYRIGHT
-*   OWNER OR 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.
+* Description: 
 *
-* ==============================================================================
 */
 
+
 /*
  *  This class is a proxy for CAnimationDecoderWrapped
  *  
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebCore/platform/symbian/bitmap/AnimationDecoder.h
--- a/webengine/osswebengine/WebCore/platform/symbian/bitmap/AnimationDecoder.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebCore/platform/symbian/bitmap/AnimationDecoder.h	Thu Dec 17 09:20:16 2009 +0200
@@ -1,38 +1,21 @@
 /*
-* ==============================================================================
-*    Copyright (c) 2006, Nokia Corporation
-*    All rights reserved.
-*
-*   Redistribution and use in source and binary forms, with or without
-*   modification, are permitted provided that the following conditions
-*   are met:
+* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
-*      * Redistributions of source code must retain the above copyright
-*        notice, this list of conditions and the following disclaimer.
-*      * 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.
-*      * Neither the name of the Nokia Corporation nor the names of its
-*        contributors may be used to endorse or promote products derived
-*        from this software without specific prior written permission.
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
 *
-*   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 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 THE COPYRIGHT
-*   OWNER OR 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.
+* Description: 
 *
-* ==============================================================================
 */
 
+
 #ifndef ANIMATIONDECODER_H
 #define ANIMATIONDECODER_H
 
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebCore/platform/symbian/bitmap/AnimationDecoderWrapped.cpp
--- a/webengine/osswebengine/WebCore/platform/symbian/bitmap/AnimationDecoderWrapped.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebCore/platform/symbian/bitmap/AnimationDecoderWrapped.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -1,38 +1,21 @@
 /*
-* ==============================================================================
-*    Copyright (c) 2006, Nokia Corporation
-*    All rights reserved.
-*
-*   Redistribution and use in source and binary forms, with or without
-*   modification, are permitted provided that the following conditions
-*   are met:
+* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
-*      * Redistributions of source code must retain the above copyright
-*        notice, this list of conditions and the following disclaimer.
-*      * 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.
-*      * Neither the name of the Nokia Corporation nor the names of its
-*        contributors may be used to endorse or promote products derived
-*        from this software without specific prior written permission.
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
 *
-*   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 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 THE COPYRIGHT
-*   OWNER OR 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.
+* Description: 
 *
-* ==============================================================================
 */
 
+
 /*
  *  This class is wrapped by a proxy CAnimationDecoder
  *  
@@ -69,6 +52,8 @@
 
 using namespace WebCore;
 CSynDecodeThread *CAnimationDecoderWrapped::iSyncDecodeThread  = NULL;
+const TInt KDownScaleFactor = 2; // scaling is done by a factor of 2.For ex.2,4,8...( similar to ImageViewer )
+const TInt KMaxDownScaleFactor = 8; // limit scaling to 8
 
 // ============================ MEMBER FUNCTIONS ===============================
 // -----------------------------------------------------------------------------
@@ -369,7 +354,6 @@
     iAnimation = iAnimationFrameCount > 1;
     iFrameInfo = iDecoder->FrameInfo( 0 );
     iSizeAvailable = ETrue;
-
     if (iFrameInfo.iFlags & TFrameInfo::ETransparencyPossible){
         // we only support gray2 and gray256 tiling
         TDisplayMode maskmode = ( (iFrameInfo.iFlags & TFrameInfo::EAlphaChannel) && (iFrameInfo.iFlags & TFrameInfo::ECanDither)) ? EGray256 : EGray2;
@@ -381,11 +365,15 @@
             RunError(KErrNoMemory);
     }
     else {
-        TInt error = iDestination->Create( iFrameInfo.iOverallSizeInPixels, DisplayMode() );
-        if (!error)
-            LoadFrame(0);
-        else
-            RunError(KErrNoMemory);
+         TInt error = ScaleImageIfRequired();
+         if (!error)
+             {
+             LoadFrame(0);
+             }
+         else
+             {
+             RunError(error);	
+             }
     }
 }
 
@@ -614,7 +602,10 @@
         iDestination->SetFrameIndex( iFrameIndex );
         iDestination->SetFrameDelay( 0 );
         //Compress non-animated images via FBServ (losslessly, idle priority) 
-        iDestination->CompressInBackground();     
+        //the 1x1 image is directly fetched before decompressing it which results in a crash in fbsserv and therefore a white background is displayed.
+        //If the Image is of pixel (1,1) do not compress.
+        if( frameSize != TSize(1,1) )
+           iDestination->CompressInBackground();
 
         // Normal image ready
         //iDestination = NULL;
@@ -759,6 +750,42 @@
     User::RequestComplete( status, aError );
 }
 
-
+// -----------------------------------------------------------------------------
+// CAnimationDecoderWrapped::ScaleImageIfRequired
+// Images that are too large to be displayed are scaled down 
+// @return error code
+// -----------------------------------------------------------------------------
+TInt CAnimationDecoderWrapped::ScaleImageIfRequired()
+    {
+    TInt error = iDestination->Create( iFrameInfo.iOverallSizeInPixels, DisplayMode() );
+    // if the image is too large try scaling it down
+    if ( error == KErrNoMemory )
+        {
+        TBool fullyScalable(iFrameInfo.iFlags & TFrameInfo::EFullyScaleable);
+        // check if scaling is possible
+        if ( !fullyScalable )
+            {
+            TInt scalingLevel(KDownScaleFactor);
+            do 
+                {
+                TSize scaledSize( iFrameInfo.iOverallSizeInPixels.iWidth / scalingLevel + ( iFrameInfo.iOverallSizeInPixels.iWidth % scalingLevel ? 1 : 0 ),
+                                  iFrameInfo.iOverallSizeInPixels.iHeight / scalingLevel + ( iFrameInfo.iOverallSizeInPixels.iHeight % scalingLevel ? 1 : 0 ) );
+                error = iDestination->Create( scaledSize, DisplayMode() );
+                // retry only for KErrNoMemory condition
+                if (error == KErrNoMemory)
+                    {
+                    // increase to next down scaling level
+                    scalingLevel *= KDownScaleFactor ;
+                    }
+                else
+                    {
+                    // image scaled to appropriate level
+                    iFrameInfo.iOverallSizeInPixels = scaledSize;
+                    }
+                }while (error == KErrNoMemory &&  scalingLevel <= KMaxDownScaleFactor);// loop until we can scale the image without any error
+            }
+        }
+    return error;
+    }
 
 //  End of File
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebCore/platform/symbian/bitmap/AnimationDecoderWrapped.h
--- a/webengine/osswebengine/WebCore/platform/symbian/bitmap/AnimationDecoderWrapped.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebCore/platform/symbian/bitmap/AnimationDecoderWrapped.h	Thu Dec 17 09:20:16 2009 +0200
@@ -1,38 +1,21 @@
 /*
-* ==============================================================================
-*    Copyright (c) 2006, Nokia Corporation
-*    All rights reserved.
-*
-*   Redistribution and use in source and binary forms, with or without
-*   modification, are permitted provided that the following conditions
-*   are met:
+* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
-*      * Redistributions of source code must retain the above copyright
-*        notice, this list of conditions and the following disclaimer.
-*      * 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.
-*      * Neither the name of the Nokia Corporation nor the names of its
-*        contributors may be used to endorse or promote products derived
-*        from this software without specific prior written permission.
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
 *
-*   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 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 THE COPYRIGHT
-*   OWNER OR 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.
+* Description: 
 *
-* ==============================================================================
 */
 
+
 /*
  *  This class is wrapped by a proxy CAnimationDecoder
  *  
@@ -208,6 +191,7 @@
         void ErrorCleanup();
         void SelfComplete( TInt aError = KErrNone );
         HBufC8* DecodeDRMImageContentL(const TDesC8& aData);
+        TInt ScaleImageIfRequired();
 
   private: // Private constructors
 
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebCore/rendering/RenderObject.cpp
--- a/webengine/osswebengine/WebCore/rendering/RenderObject.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebCore/rendering/RenderObject.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -2174,11 +2174,11 @@
                 }
             }
 #if PLATFORM(SYMBIAN)
-            if (m_style->visibility() != style->visibility()) {            
-                document()->page()->chrome()->setElementVisibilityChanged(style->visibility() == VISIBLE); 
-            }
-                        
-            if (style->position() != StaticPosition) {
+            if (m_style->visibility() == HIDDEN && 
+                style->visibility() == VISIBLE)  {            
+                document()->page()->chrome()->setElementVisibilityChanged(true); 
+            }       
+            else if (style->position() != StaticPosition) {
                 
                 if (style->left() != m_style->left() ||
                     style->right() != m_style->right() ||
@@ -2188,6 +2188,17 @@
                     document()->page()->chrome()->setElementVisibilityChanged(true);
                 }
             }
+            else {
+                bool curr_style_hidden = (m_style->width().isFixed() && m_style->width().value() <= 0) ||
+                                         (m_style->height().isFixed() && m_style->height().value() <= 0);
+                bool new_style_hidden = (style->width().isFixed() && style->width().value() <= 0) ||
+                                        (style->height().isFixed() && style->height().value() <= 0);
+             
+                if (curr_style_hidden && !new_style_hidden) {
+                    document()->page()->chrome()->setElementVisibilityChanged(true);
+                }
+            }
+            
 #endif
         }
         // If we have no layer(), just treat a RepaintLayer hint as a normal Repaint.
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebCore/rendering/RenderText.cpp
--- a/webengine/osswebengine/WebCore/rendering/RenderText.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebCore/rendering/RenderText.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -73,11 +73,9 @@
      , m_isAllASCII(charactersAreAllASCII(m_text.get()))
      
 #if PLATFORM(SYMBIAN)     
-
      , m_securityTimer(this, &RenderText::securityTimerFired)
-     
-#endif
-     
+     , m_offset(0) 
+#endif      
 {
     ASSERT(m_text);
     setRenderText();
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebKit/ForwardingHeaders/wtf/unicode/Unicode.h
--- a/webengine/osswebengine/WebKit/ForwardingHeaders/wtf/unicode/Unicode.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebKit/ForwardingHeaders/wtf/unicode/Unicode.h	Thu Dec 17 09:20:16 2009 +0200
@@ -1,1 +1,18 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: 
+*
+*/
+
 #include <JavaScriptCore/Unicode.h>
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebKit/ForwardingHeaders/wtf/unicode/icu/UnicodeIcu.h
--- a/webengine/osswebengine/WebKit/ForwardingHeaders/wtf/unicode/icu/UnicodeIcu.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebKit/ForwardingHeaders/wtf/unicode/icu/UnicodeIcu.h	Thu Dec 17 09:20:16 2009 +0200
@@ -1,1 +1,18 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: 
+*
+*/
+
 #include <JavaScriptCore/UnicodeIcu.h>
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebKit/s60/formcontrols/PopupSelectListBox.cpp
--- a/webengine/osswebengine/WebKit/s60/formcontrols/PopupSelectListBox.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebKit/s60/formcontrols/PopupSelectListBox.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -26,7 +26,7 @@
 #include "PopupSelectListBox.h"
 #include "WebView.h"
 #include "WebFepTextEditor.h"
-#include "BrCtlDialogsProvider.h"
+#include "brctldialogsprovider.h"
 
 // CONSTANTS
 
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebKit/s60/formcontrols/WebFormFillPopup.cpp
--- a/webengine/osswebengine/WebKit/s60/formcontrols/WebFormFillPopup.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebKit/s60/formcontrols/WebFormFillPopup.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -21,11 +21,13 @@
 #include "WebView.h"
 #include "WebFrame.h"
 #include "WebFrameView.h"
-#include "BrCtlDefs.h"
+#include "brctldefs.h"
 #include "PopupSelectListBox.h"
-#include "BrCtlDialogsProvider.h"
+#include "brctldialogsprovider.h"
 #include "WebFepTextEditor.h"
 #include "FormFillCallback.h"
+#include "Page.h"
+#include "WebChromeClient.h"
 
 #include <aknenv.h>
 #include <coemain.h>
@@ -242,6 +244,9 @@
 
     }
 
+    if (response == EKeyWasConsumed) {
+      m_parent->page()->chrome()->client()->setElementVisibilityChanged(false);
+    }
     return response;
 }
 
@@ -358,6 +363,7 @@
     else {
         m_callback->cancelPopup();
     }
+    m_parent->page()->chrome()->client()->setElementVisibilityChanged(false);
 }
 
 //  End of File
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebKit/s60/group/JavaScriptCore/JavaScriptCore.mmp
--- a/webengine/osswebengine/WebKit/s60/group/JavaScriptCore/JavaScriptCore.mmp	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebKit/s60/group/JavaScriptCore/JavaScriptCore.mmp	Thu Dec 17 09:20:16 2009 +0200
@@ -21,7 +21,7 @@
 UID 0x1000008d 0x10281B70
 
 #include <platform_paths.hrh>
-#include <platform/mw/Browser_platform_variant.hrh>
+#include <platform/mw/browser_platform_variant.hrh>
 
 #ifdef __S60_32__
 LANG sc 
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebKit/s60/group/browserengine/bld.inf
--- a/webengine/osswebengine/WebKit/s60/group/browserengine/bld.inf	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebKit/s60/group/browserengine/bld.inf	Thu Dec 17 09:20:16 2009 +0200
@@ -16,7 +16,7 @@
 */
 
 #include <platform_paths.hrh>
-#include "../../../../../../web_plat/browser_platform_api/inc/Browser_platform_variant.hrh"
+#include "../../../../../../web_plat/browser_platform_api/inc/browser_platform_variant.hrh"
 
 PRJ_PLATFORMS
 DEFAULT 
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebKit/s60/group/browserengine/browserengine.mmp
--- a/webengine/osswebengine/WebKit/s60/group/browserengine/browserengine.mmp	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebKit/s60/group/browserengine/browserengine.mmp	Thu Dec 17 09:20:16 2009 +0200
@@ -15,7 +15,7 @@
 *
 */
 #include "../common.mmpi"
-#include <platform/mw/Browser_platform_variant.hrh>
+#include <platform/mw/browser_platform_variant.hrh>
 
 TARGET          browserengine.dll
 TARGETTYPE      dll
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebKit/s60/group/common.mmpi
--- a/webengine/osswebengine/WebKit/s60/group/common.mmpi	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebKit/s60/group/common.mmpi	Thu Dec 17 09:20:16 2009 +0200
@@ -17,7 +17,7 @@
 
 #include <platform_paths.hrh>
 #include <data_caging_paths.hrh>
-#include <platform/mw/Browser_platform_variant.hrh>
+#include <platform/mw/browser_platform_variant.hrh>
 
 SYSTEMINCLUDE ../../../WebCore/platform/symbian/Libxml2
 MW_LAYER_SYSTEMINCLUDE
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebKit/s60/group/libxml2/bld.inf
--- a/webengine/osswebengine/WebKit/s60/group/libxml2/bld.inf	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebKit/s60/group/libxml2/bld.inf	Thu Dec 17 09:20:16 2009 +0200
@@ -16,7 +16,7 @@
 */
 
 #include <platform_paths.hrh>
-#include "../../../../../../web_plat/browser_platform_api/inc/Browser_platform_variant.hrh"
+#include "../../../../../../web_plat/browser_platform_api/inc/browser_platform_variant.hrh"
 
 PRJ_PLATFORMS
 DEFAULT 
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebKit/s60/group/libxml2/libxml2.mmp
--- a/webengine/osswebengine/WebKit/s60/group/libxml2/libxml2.mmp	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebKit/s60/group/libxml2/libxml2.mmp	Thu Dec 17 09:20:16 2009 +0200
@@ -15,7 +15,7 @@
 *
 */
 #include <platform_paths.hrh>
-#include <platform/mw/Browser_platform_variant.hrh>
+#include <platform/mw/browser_platform_variant.hrh>
 
 TARGET webcore_xmlparser.lib
 TARGETTYPE lib
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebKit/s60/group/plugins/bld.inf
--- a/webengine/osswebengine/WebKit/s60/group/plugins/bld.inf	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebKit/s60/group/plugins/bld.inf	Thu Dec 17 09:20:16 2009 +0200
@@ -15,7 +15,7 @@
 *
 */
 #include <platform_paths.hrh>
-#include "../../../../../../web_plat/browser_platform_api/inc/Browser_platform_variant.hrh"
+#include "../../../../../../web_plat/browser_platform_api/inc/browser_platform_variant.hrh"
 
 PRJ_PLATFORMS
 DEFAULT 
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebKit/s60/group/webcore/DerivedSources/DerivedSources.mmp
--- a/webengine/osswebengine/WebKit/s60/group/webcore/DerivedSources/DerivedSources.mmp	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebKit/s60/group/webcore/DerivedSources/DerivedSources.mmp	Thu Dec 17 09:20:16 2009 +0200
@@ -16,7 +16,7 @@
 
 #include <platform_paths.hrh>
 #include <data_caging_paths.hrh>
-#include <platform/mw/Browser_platform_variant.hrh>
+#include <platform/mw/browser_platform_variant.hrh>
 #include "../../common.mmpi"
 
 TARGET  WebCoreDerivedSources.lib
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebKit/s60/group/webcore/DerivedSources/bld.inf
--- a/webengine/osswebengine/WebKit/s60/group/webcore/DerivedSources/bld.inf	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebKit/s60/group/webcore/DerivedSources/bld.inf	Thu Dec 17 09:20:16 2009 +0200
@@ -16,7 +16,7 @@
 */
 #include <platform_paths.hrh>
 #include <data_caging_paths.hrh>
-#include "../../../../../../../web_plat/browser_platform_api/inc/Browser_platform_variant.hrh"
+#include "../../../../../../../web_plat/browser_platform_api/inc/browser_platform_variant.hrh"
 
 PRJ_PLATFORMS
 DEFAULT 
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebKit/s60/group/webcore/bindings/bindings.mmp
--- a/webengine/osswebengine/WebKit/s60/group/webcore/bindings/bindings.mmp	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebKit/s60/group/webcore/bindings/bindings.mmp	Thu Dec 17 09:20:16 2009 +0200
@@ -17,7 +17,7 @@
 
 #include <platform_paths.hrh>
 #include <data_caging_paths.hrh>
-#include <platform/mw/Browser_platform_variant.hrh>
+#include <platform/mw/browser_platform_variant.hrh>
 #include "../../common.mmpi"
 
 TARGET  WebCorebindings.lib
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebKit/s60/group/webcore/bindings/bld.inf
--- a/webengine/osswebengine/WebKit/s60/group/webcore/bindings/bld.inf	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebKit/s60/group/webcore/bindings/bld.inf	Thu Dec 17 09:20:16 2009 +0200
@@ -16,7 +16,7 @@
 */
 #include <platform_paths.hrh>
 #include <data_caging_paths.hrh>
-#include "../../../../../../../web_plat/browser_platform_api/inc/Browser_platform_variant.hrh"
+#include "../../../../../../../web_plat/browser_platform_api/inc/browser_platform_variant.hrh"
 
 PRJ_PLATFORMS
 DEFAULT 
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebKit/s60/group/webcore/bld.inf
--- a/webengine/osswebengine/WebKit/s60/group/webcore/bld.inf	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebKit/s60/group/webcore/bld.inf	Thu Dec 17 09:20:16 2009 +0200
@@ -16,7 +16,7 @@
 */
 #include <platform_paths.hrh>
 #include <data_caging_paths.hrh>
-#include "../../../../../../web_plat/browser_platform_api/inc/Browser_platform_variant.hrh"
+#include "../../../../../../web_plat/browser_platform_api/inc/browser_platform_variant.hrh"
 
 PRJ_PLATFORMS
 DEFAULT 
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebKit/s60/group/webcore/bridge/bld.inf
--- a/webengine/osswebengine/WebKit/s60/group/webcore/bridge/bld.inf	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebKit/s60/group/webcore/bridge/bld.inf	Thu Dec 17 09:20:16 2009 +0200
@@ -16,7 +16,7 @@
 */
 #include <platform_paths.hrh>
 #include <data_caging_paths.hrh>
-#include "../../../../../../../web_plat/browser_platform_api/inc/Browser_platform_variant.hrh"
+#include "../../../../../../../web_plat/browser_platform_api/inc/browser_platform_variant.hrh"
 
 PRJ_PLATFORMS
 DEFAULT 
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebKit/s60/group/webcore/bridge/bridge.mmp
--- a/webengine/osswebengine/WebKit/s60/group/webcore/bridge/bridge.mmp	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebKit/s60/group/webcore/bridge/bridge.mmp	Thu Dec 17 09:20:16 2009 +0200
@@ -16,7 +16,7 @@
 
 #include <platform_paths.hrh>
 #include <data_caging_paths.hrh>
-#include <platform/mw/Browser_platform_variant.hrh>
+#include <platform/mw/browser_platform_variant.hrh>
 #include "../../common.mmpi"
 
 TARGET  WebCorebridge.lib
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebKit/s60/group/webcore/dom/bld.inf
--- a/webengine/osswebengine/WebKit/s60/group/webcore/dom/bld.inf	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebKit/s60/group/webcore/dom/bld.inf	Thu Dec 17 09:20:16 2009 +0200
@@ -16,7 +16,7 @@
 */
 #include <platform_paths.hrh>
 #include <data_caging_paths.hrh>
-#include "../../../../../../../web_plat/browser_platform_api/inc/Browser_platform_variant.hrh"
+#include "../../../../../../../web_plat/browser_platform_api/inc/browser_platform_variant.hrh"
 
 PRJ_PLATFORMS
 DEFAULT 
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebKit/s60/group/webcore/dom/dom.mmp
--- a/webengine/osswebengine/WebKit/s60/group/webcore/dom/dom.mmp	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebKit/s60/group/webcore/dom/dom.mmp	Thu Dec 17 09:20:16 2009 +0200
@@ -16,7 +16,7 @@
 
 #include <platform_paths.hrh>
 #include <data_caging_paths.hrh>
-#include <platform/mw/Browser_platform_variant.hrh>
+#include <platform/mw/browser_platform_variant.hrh>
 #include "../../common.mmpi"
 
 TARGET  WebCoredom.lib
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebKit/s60/group/webcore/editing/bld.inf
--- a/webengine/osswebengine/WebKit/s60/group/webcore/editing/bld.inf	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebKit/s60/group/webcore/editing/bld.inf	Thu Dec 17 09:20:16 2009 +0200
@@ -16,7 +16,7 @@
 */
 #include <platform_paths.hrh>
 #include <data_caging_paths.hrh>
-#include "../../../../../../../web_plat/browser_platform_api/inc/Browser_platform_variant.hrh"
+#include "../../../../../../../web_plat/browser_platform_api/inc/browser_platform_variant.hrh"
 
 PRJ_PLATFORMS
 DEFAULT 
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebKit/s60/group/webcore/editing/editing.mmp
--- a/webengine/osswebengine/WebKit/s60/group/webcore/editing/editing.mmp	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebKit/s60/group/webcore/editing/editing.mmp	Thu Dec 17 09:20:16 2009 +0200
@@ -16,7 +16,7 @@
 
 #include <platform_paths.hrh>
 #include <data_caging_paths.hrh>
-#include <platform/mw/Browser_platform_variant.hrh>
+#include <platform/mw/browser_platform_variant.hrh>
 #include "../../common.mmpi"
 
 TARGET  WebCoreediting.lib
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebKit/s60/group/webcore/history/bld.inf
--- a/webengine/osswebengine/WebKit/s60/group/webcore/history/bld.inf	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebKit/s60/group/webcore/history/bld.inf	Thu Dec 17 09:20:16 2009 +0200
@@ -16,7 +16,7 @@
 */
 #include <platform_paths.hrh>
 #include <data_caging_paths.hrh>
-#include "../../../../../../../web_plat/browser_platform_api/inc/Browser_platform_variant.hrh"
+#include "../../../../../../../web_plat/browser_platform_api/inc/browser_platform_variant.hrh"
 
 PRJ_PLATFORMS
 DEFAULT 
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebKit/s60/group/webcore/history/history.mmp
--- a/webengine/osswebengine/WebKit/s60/group/webcore/history/history.mmp	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebKit/s60/group/webcore/history/history.mmp	Thu Dec 17 09:20:16 2009 +0200
@@ -16,7 +16,7 @@
 
 #include <platform_paths.hrh>
 #include <data_caging_paths.hrh>
-#include <platform/mw/Browser_platform_variant.hrh>
+#include <platform/mw/browser_platform_variant.hrh>
 #include "../../common.mmpi"
 
 TARGET  WebCorehistory.lib
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebKit/s60/group/webcore/html/bld.inf
--- a/webengine/osswebengine/WebKit/s60/group/webcore/html/bld.inf	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebKit/s60/group/webcore/html/bld.inf	Thu Dec 17 09:20:16 2009 +0200
@@ -16,7 +16,7 @@
 */
 #include <platform_paths.hrh>
 #include <data_caging_paths.hrh>
-#include "../../../../../../../web_plat/browser_platform_api/inc/Browser_platform_variant.hrh"
+#include "../../../../../../../web_plat/browser_platform_api/inc/browser_platform_variant.hrh"
 
 PRJ_PLATFORMS
 DEFAULT 
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebKit/s60/group/webcore/html/html.mmp
--- a/webengine/osswebengine/WebKit/s60/group/webcore/html/html.mmp	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebKit/s60/group/webcore/html/html.mmp	Thu Dec 17 09:20:16 2009 +0200
@@ -16,7 +16,7 @@
 
 #include <platform_paths.hrh>
 #include <data_caging_paths.hrh>
-#include <platform/mw/Browser_platform_variant.hrh>
+#include <platform/mw/browser_platform_variant.hrh>
 #include "../../common.mmpi"
 
 TARGET  WebCorehtml.lib
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebKit/s60/group/webcore/loader/bld.inf
--- a/webengine/osswebengine/WebKit/s60/group/webcore/loader/bld.inf	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebKit/s60/group/webcore/loader/bld.inf	Thu Dec 17 09:20:16 2009 +0200
@@ -16,7 +16,7 @@
 */
 #include <platform_paths.hrh>
 #include <data_caging_paths.hrh>
-#include "../../../../../../../web_plat/browser_platform_api/inc/Browser_platform_variant.hrh"
+#include "../../../../../../../web_plat/browser_platform_api/inc/browser_platform_variant.hrh"
 
 PRJ_PLATFORMS
 DEFAULT 
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebKit/s60/group/webcore/loader/loader.mmp
--- a/webengine/osswebengine/WebKit/s60/group/webcore/loader/loader.mmp	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebKit/s60/group/webcore/loader/loader.mmp	Thu Dec 17 09:20:16 2009 +0200
@@ -16,7 +16,7 @@
 
 #include <platform_paths.hrh>
 #include <data_caging_paths.hrh>
-#include <platform/mw/Browser_platform_variant.hrh>
+#include <platform/mw/browser_platform_variant.hrh>
 #include "../../common.mmpi"
 
 TARGET  WebCoreloader.lib
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebKit/s60/group/webcore/page/bld.inf
--- a/webengine/osswebengine/WebKit/s60/group/webcore/page/bld.inf	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebKit/s60/group/webcore/page/bld.inf	Thu Dec 17 09:20:16 2009 +0200
@@ -16,7 +16,7 @@
 */
 #include <platform_paths.hrh>
 #include <data_caging_paths.hrh>
-#include "../../../../../../../web_plat/browser_platform_api/inc/Browser_platform_variant.hrh"
+#include "../../../../../../../web_plat/browser_platform_api/inc/browser_platform_variant.hrh"
 
 PRJ_PLATFORMS
 DEFAULT 
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebKit/s60/group/webcore/page/page.mmp
--- a/webengine/osswebengine/WebKit/s60/group/webcore/page/page.mmp	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebKit/s60/group/webcore/page/page.mmp	Thu Dec 17 09:20:16 2009 +0200
@@ -16,7 +16,7 @@
 
 #include <platform_paths.hrh>
 #include <data_caging_paths.hrh>
-#include <platform/mw/Browser_platform_variant.hrh>
+#include <platform/mw/browser_platform_variant.hrh>
 #include "../../common.mmpi"
 
 TARGET  WebCorepage.lib
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebKit/s60/group/webcore/platform/bld.inf
--- a/webengine/osswebengine/WebKit/s60/group/webcore/platform/bld.inf	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebKit/s60/group/webcore/platform/bld.inf	Thu Dec 17 09:20:16 2009 +0200
@@ -16,7 +16,7 @@
 */
 #include <platform_paths.hrh>
 #include <data_caging_paths.hrh>
-#include "../../../../../../../web_plat/browser_platform_api/inc/Browser_platform_variant.hrh"
+#include "../../../../../../../web_plat/browser_platform_api/inc/browser_platform_variant.hrh"
 
 PRJ_PLATFORMS
 DEFAULT 
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebKit/s60/group/webcore/platform/platform.mmp
--- a/webengine/osswebengine/WebKit/s60/group/webcore/platform/platform.mmp	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebKit/s60/group/webcore/platform/platform.mmp	Thu Dec 17 09:20:16 2009 +0200
@@ -17,7 +17,7 @@
 #include <platform_paths.hrh>
 #include <data_caging_paths.hrh>
 #include "../../common.mmpi"
-#include <platform/mw/Browser_platform_variant.hrh>
+#include <platform/mw/browser_platform_variant.hrh>
 
 TARGET  WebCoreplatform.lib
 
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebKit/s60/group/webcore/rendering/bld.inf
--- a/webengine/osswebengine/WebKit/s60/group/webcore/rendering/bld.inf	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebKit/s60/group/webcore/rendering/bld.inf	Thu Dec 17 09:20:16 2009 +0200
@@ -16,7 +16,7 @@
 */
 #include <platform_paths.hrh>
 #include <data_caging_paths.hrh>
-#include "../../../../../../../web_plat/browser_platform_api/inc/Browser_platform_variant.hrh"
+#include "../../../../../../../web_plat/browser_platform_api/inc/browser_platform_variant.hrh"
 
 PRJ_PLATFORMS
 DEFAULT 
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebKit/s60/group/webcore/rendering/rendering.mmp
--- a/webengine/osswebengine/WebKit/s60/group/webcore/rendering/rendering.mmp	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebKit/s60/group/webcore/rendering/rendering.mmp	Thu Dec 17 09:20:16 2009 +0200
@@ -16,7 +16,7 @@
 
 #include <platform_paths.hrh>
 #include <data_caging_paths.hrh>
-#include <platform/mw/Browser_platform_variant.hrh>
+#include <platform/mw/browser_platform_variant.hrh>
 #include "../../common.mmpi"
 
 TARGET  WebCorerendering.lib
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebKit/s60/group/webcore/webcorecss/bld.inf
--- a/webengine/osswebengine/WebKit/s60/group/webcore/webcorecss/bld.inf	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebKit/s60/group/webcore/webcorecss/bld.inf	Thu Dec 17 09:20:16 2009 +0200
@@ -16,7 +16,7 @@
 */
 #include <platform_paths.hrh>
 #include <data_caging_paths.hrh>
-#include "../../../../../../../web_plat/browser_platform_api/inc/Browser_platform_variant.hrh"
+#include "../../../../../../../web_plat/browser_platform_api/inc/browser_platform_variant.hrh"
 
 PRJ_PLATFORMS
 DEFAULT 
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebKit/s60/group/webcore/webcorecss/webcorecss.mmp
--- a/webengine/osswebengine/WebKit/s60/group/webcore/webcorecss/webcorecss.mmp	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebKit/s60/group/webcore/webcorecss/webcorecss.mmp	Thu Dec 17 09:20:16 2009 +0200
@@ -16,7 +16,7 @@
 
 #include <platform_paths.hrh>
 #include <data_caging_paths.hrh>
-#include <platform/mw/Browser_platform_variant.hrh>
+#include <platform/mw/browser_platform_variant.hrh>
 #include "../../common.mmpi"
 
 TARGET  WebCorecss.lib
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebKit/s60/group/webcore/xml/bld.inf
--- a/webengine/osswebengine/WebKit/s60/group/webcore/xml/bld.inf	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebKit/s60/group/webcore/xml/bld.inf	Thu Dec 17 09:20:16 2009 +0200
@@ -16,7 +16,7 @@
 */
 #include <platform_paths.hrh>
 #include <data_caging_paths.hrh>
-#include "../../../../../../../web_plat/browser_platform_api/inc/Browser_platform_variant.hrh"
+#include "../../../../../../../web_plat/browser_platform_api/inc/browser_platform_variant.hrh"
 
 PRJ_PLATFORMS
 DEFAULT 
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebKit/s60/group/webcore/xml/xml.mmp
--- a/webengine/osswebengine/WebKit/s60/group/webcore/xml/xml.mmp	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebKit/s60/group/webcore/xml/xml.mmp	Thu Dec 17 09:20:16 2009 +0200
@@ -16,7 +16,7 @@
 
 #include <platform_paths.hrh>
 #include <data_caging_paths.hrh>
-#include <platform/mw/Browser_platform_variant.hrh>
+#include <platform/mw/browser_platform_variant.hrh>
 #include "../../common.mmpi"
 
 TARGET  WebCorexml.lib
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebKit/s60/group/webkit/bld.inf
--- a/webengine/osswebengine/WebKit/s60/group/webkit/bld.inf	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebKit/s60/group/webkit/bld.inf	Thu Dec 17 09:20:16 2009 +0200
@@ -15,7 +15,7 @@
 *
 */
 #include <platform_paths.hrh>
-#include "../../../../../../web_plat/browser_platform_api/inc/Browser_platform_variant.hrh"
+#include "../../../../../../web_plat/browser_platform_api/inc/browser_platform_variant.hrh"
 
 PRJ_PLATFORMS
 DEFAULT 
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebKit/s60/misc/WebTabbedNavigation.cpp
--- a/webengine/osswebengine/WebKit/s60/misc/WebTabbedNavigation.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebKit/s60/misc/WebTabbedNavigation.cpp	Thu Dec 17 09:20:16 2009 +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"
@@ -70,7 +70,7 @@
 
 void WebTabbedNavigation::initializeForPage()
 {
-    if (!m_initializedForPage) {
+    if (!m_initializedForPage && m_webView->IsVisible()) {
         if (navigate(0, 1)) {
             m_initializedForPage = true;
             m_firstNavigationOnPage = false;
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebKit/s60/misc/WebUtil.h
--- a/webengine/osswebengine/WebKit/s60/misc/WebUtil.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebKit/s60/misc/WebUtil.h	Thu Dec 17 09:20:16 2009 +0200
@@ -19,7 +19,7 @@
 #define __WEBUTIL_H__
 
 #include <e32std.h>
-#include "BrCtlDefs.h"
+#include "brctldefs.h"
 
 class WebFrame;
 class WebView;
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebKit/s60/plugins/EcomBrowserPluginInterface.h
--- a/webengine/osswebengine/WebKit/s60/plugins/EcomBrowserPluginInterface.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebKit/s60/plugins/EcomBrowserPluginInterface.h	Thu Dec 17 09:20:16 2009 +0200
@@ -24,7 +24,7 @@
 #include <ecom/ecom.h>
 
 #include <npupp.h>
-#include <BrowserPluginInterface.h>
+#include <browserplugininterface.h>
 
 typedef struct
     {
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebKit/s60/plugins/NpnImplementation.cpp
--- a/webengine/osswebengine/WebKit/s60/plugins/NpnImplementation.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebKit/s60/plugins/NpnImplementation.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -21,7 +21,7 @@
 #include "NpnImplementation.h"
 #include "PluginWin.h"
 #include "PluginSkin.h"
-#include <CUserAgent.h>
+#include <cuseragent.h>
 #include <Element.h>
 #include <HTMLPlugInElement.h>
 #include <HTMLNames.h>
@@ -481,7 +481,19 @@
             {
             PluginWin* pluginWin = (PluginWin*)aInstance->ndata;
             if (pluginWin) {
-                TPoint* cursorPos = static_cast<TPoint*>(aSetValue);
+            TPoint* cursorPos; 
+            
+            //EPMR-7XPHXV aSetValue is set as "(void*) 1" from
+            //"CBrowserPluginControl::GoNormalScreenL" from the flash plugin
+            //to avoid the Invalid pointer access, we are checking for 
+            //aSetValue and setting point as (0,0) and also for NULL Value 
+            if((aSetValue == (void*)1) || (!aSetValue)) {
+                TPoint position(0,0);
+                cursorPos = static_cast<TPoint*>(&position);
+                }
+                else {
+                cursorPos = static_cast<TPoint*>(aSetValue);
+                }
                 pluginWin->pluginDeactivate(*cursorPos);
             }
         }
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebKit/s60/plugins/PluginHandler.h
--- a/webengine/osswebengine/WebKit/s60/plugins/PluginHandler.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebKit/s60/plugins/PluginHandler.h	Thu Dec 17 09:20:16 2009 +0200
@@ -27,7 +27,7 @@
 #include <badesca.h>
 #include <wtf/HashSet.h>
 #include <ECom/ImplementationInformation.h>    // ecom
-#include "EcomBrowserPluginInterface.h"
+#include "Ecombrowserplugininterface.h"
 #include "WebCorePluginHandler.h"
 
 // FORWARD DECLARATIONS
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebKit/s60/plugins/PluginSkin.cpp
--- a/webengine/osswebengine/WebKit/s60/plugins/PluginSkin.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebKit/s60/plugins/PluginSkin.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -20,7 +20,7 @@
 #include "../../bidi.h"
 #include "PlatformString.h"
 #include <centralrepository.h>
-#include <BrowserUiSDKCRKeys.h>
+#include <browseruisdkcrkeys.h>
 #include "PluginSkin.h"
 #include "PluginWin.h"
 #include "PluginHandler.h"
@@ -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>
@@ -47,12 +47,10 @@
 
 #include <ApEngineConsts.h>
 #include <Uri8.h>
-#include <InternetConnectionManager.h>
+#include <internetconnectionmanager.h>
 #include <es_enum.h>
-#include <TextEncoding.h>
-#include "CString.h"
 #include "WidgetExtension.h"
-#include <WidgetRegistryClient.h>
+#include <widgetregistryclient.h>
 
 // CONSTANTS
 using namespace WebCore;
@@ -804,7 +802,7 @@
     if (url.Ptr() == NULL ) {                        
         return KErrArgument;
     }
-
+    _LIT8(KSwfExtn, ".swf");
     _LIT8(KJs, "javascript:");
     if ((url.Length() > KJs().Length() ) &&(url.Left(KJs().Length()).FindF(KJs) == 0)) {
         HBufC* pBuffer = HBufC::NewL(url.Length());
@@ -824,7 +822,7 @@
     HBufC8* absoluteUrl = makeAbsoluteUrlL(*m_url, url); 
     CleanupStack::PushL(absoluteUrl);
 
-    if (loadmode == ELoadModePlugin ) {    
+    if( (loadmode == ELoadModePlugin ) || (url.FindF(KSwfExtn)!= KErrNotFound) ){    
         
         if (m_instance && m_pluginfuncs) {
         
@@ -907,11 +905,9 @@
         int start_content = buffer.Find(KRequestEOH());    
         start_content =  (start_content != KErrNotFound) ? start_content+ KRequestEOH().Length() : 0;                
         
-        HBufC* body = HBufC::NewLC(buffer.Mid(start_content).Length()+1);                
-        body->Des().Copy(buffer.Mid(start_content));
-        TextEncoding *ecoder = new TextEncoding(core(mainFrame(m_frame))->loader()->encoding());
-        CString decoded_body = ecoder->encode(body->Des().PtrZ(),body->Length());
-        FormData* fd = new (ELeave) FormData(decoded_body.data(),decoded_body.length());                                               
+        HBufC8* body = HBufC8::NewLC(buffer.Mid(start_content).Length());                
+        body->Des().Copy(buffer.Mid(start_content));        
+        FormData* fd = new (ELeave) FormData(body->Ptr(),body->Length());                                          
         request.setHTTPBody(fd);                                              
         CleanupStack::PopAndDestroy(); // body
     }
@@ -1050,8 +1046,9 @@
                            frameRectInViewCoord.Intersects(viewRect);
       
     if (m_pluginwin) {
-        m_pluginwin->makeVisible( isFrameVisible && !isPageViewMode && isPluginVisible);
-        if (!m_pluginwin->isPluginInFullscreen()) {
+        TBool visibility = isFrameVisible && !isPageViewMode && isPluginVisible;
+        m_pluginwin->makeVisible(visibility);
+        if (!m_pluginwin->isPluginInFullscreen() && visibility) {
             clipRect.Intersection(fullRect);
             m_pluginwin->SetRect(clipRect);
         }
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebKit/s60/plugins/PluginStreamLoaderClient.cpp
--- a/webengine/osswebengine/WebKit/s60/plugins/PluginStreamLoaderClient.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebKit/s60/plugins/PluginStreamLoaderClient.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -62,6 +62,8 @@
     m_loader = 0; 
     m_request = 0;
     m_pluginstream = 0;
+    m_pluginskin = pluginskin;
+    m_notifydata = notifydata;
     m_frame = frame;
     m_pluginstream = new (ELeave) PluginStream(pluginskin, this, notifydata);
     m_request = new (ELeave) ResourceRequest(m_frame->loader()->completeURL(url));
@@ -84,6 +86,8 @@
     m_loader = 0; 
     m_request = 0;
     m_pluginstream = 0;
+    m_pluginskin = pluginskin;
+    m_notifydata = notifydata;
     m_frame = frame;
     m_pluginstream = new (ELeave) PluginStream(pluginskin, this, notifydata);
     m_request = new (ELeave) ResourceRequest(request.url());
@@ -124,6 +128,8 @@
     
     delete m_request;     
     delete m_pluginstream;    
+    m_pluginskin = NULL;
+    m_notifydata = NULL;
     
 }
 
@@ -147,9 +153,12 @@
 
 void NetscapePlugInStreamLoaderClient::cancelWithError(const ResourceError& error)
 {
-    if (m_loader && !m_loader->isDone()) 
-        m_loader->cancel(error);           
+    if (m_loader && !m_loader->isDone()){
+        if(m_pluginskin && m_pluginskin->getNPPluginFucs())
+            m_pluginskin->getNPPluginFucs()->urlnotify(m_pluginskin->m_instance, error.failingURL(), NPRES_NETWORK_ERR, m_notifydata);
+        m_loader->cancel(error);
     }
+}
 
 void NetscapePlugInStreamLoaderClient::didReceiveResponse(const ResourceResponse& response)
 {
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebKit/s60/plugins/PluginStreamLoaderClient.h
--- a/webengine/osswebengine/WebKit/s60/plugins/PluginStreamLoaderClient.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebKit/s60/plugins/PluginStreamLoaderClient.h	Thu Dec 17 09:20:16 2009 +0200
@@ -77,6 +77,8 @@
     PluginStream* m_pluginstream;
     ResourceRequest* m_request;              
     NetscapePlugInStreamLoader* m_loader;
+    PluginSkin* m_pluginskin; // not owned
+    void* m_notifydata; // not owned
     int m_error;
     
 };
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebKit/s60/plugins/PluginWin.cpp
--- a/webengine/osswebengine/WebKit/s60/plugins/PluginWin.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebKit/s60/plugins/PluginWin.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -28,9 +28,9 @@
 
 #include "WebFrame.h"
 #include "HttpDefs.h"
-#include "BrCtlDefs.h"
+#include "brctldefs.h"
 #include "StaticObjectsContainer.h"
-#include <PluginAdapterInterface.h>
+#include <pluginadapterinterface.h>
 #include "PluginWin.h"
 #include "PluginSkin.h"
 #include "PluginHandler.h"
@@ -272,12 +272,16 @@
         ret = m_control->OfferKeyEventL( aKeyEvent, aType );
     }
     else if (!m_windowedPlugin && m_pluginskin->getNPPluginFucs() && m_pluginskin->getNPPluginFucs()->event) {
+        WebCursor* c = StaticObjectsContainer::instance()->webCursor();
+        TPoint pt = (c->position());
+        pt = m_pluginskin->frame()->frameView()->viewCoordsInFrameCoords(pt);
+        pt -= m_pluginskin->rect().iTl;
         NPEvent event;
         NPEventKey eventKey;
         event.event = ENppEventKey;
         eventKey.keyEvent = &aKeyEvent;
         eventKey.type = aType;
-        eventKey.reserved = NULL;
+        eventKey.reserved = static_cast<void*>(&pt);
         event.param = &eventKey;
         ret = (TKeyResponse)m_pluginskin->getNPPluginFucs()->event(m_pluginskin->getNPP(), static_cast<void*>(&event));
     }
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebKit/s60/plugins/PluginWin.h
--- a/webengine/osswebengine/WebKit/s60/plugins/PluginWin.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebKit/s60/plugins/PluginWin.h	Thu Dec 17 09:20:16 2009 +0200
@@ -23,7 +23,7 @@
 //  INCLUDES
 #include <e32def.h>
 #include <coecntrl.h>
-#include <PluginAdapterInterface.h>
+#include <pluginadapterinterface.h>
 #include <npapi.h>
 #include <rt_gesturehelper.h>
 
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebKit/s60/webcoresupport/WebChromeClient.cpp
--- a/webengine/osswebengine/WebKit/s60/webcoresupport/WebChromeClient.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebKit/s60/webcoresupport/WebChromeClient.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -35,7 +35,7 @@
 
 
 #include <centralrepository.h>
-#include <BrowserUiSDKCRKeys.h>
+#include <browseruisdkcrkeys.h>
 
 const TInt KMaxJavaLogMsgLen = 500;
 const TInt KMaxJavaLogMsgPaddingLen = 0x200; // for paddings in JS log message such as: log type and labels.
@@ -362,3 +362,9 @@
     m_visibilityByMouse = m_visibility && m_webView->isMouseEventFired();
     m_visibilityByKey = m_visibility && m_webView->isKeyEventFired();
 }
+
+
+void WebChromeClient::wait(double t) 
+{ 
+    m_webView->wait(t); 
+} 
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebKit/s60/webcoresupport/WebChromeClient.h
--- a/webengine/osswebengine/WebKit/s60/webcoresupport/WebChromeClient.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebKit/s60/webcoresupport/WebChromeClient.h	Thu Dec 17 09:20:16 2009 +0200
@@ -115,6 +115,8 @@
 		
         virtual void focusedElementChanged(WebCore::Element*);
         
+        void wait(double t); 
+        
 protected: // new functions
         void addMessageToConsoleL(const WebCore::String& aMessage, WebCore::MessageLevel aMessageLevel, unsigned int aLine, const WebCore::String& aSourceURL);
         
@@ -124,6 +126,8 @@
     bool m_visibility;
     bool m_visibilityByMouse;
     bool m_visibilityByKey;
+    
+ 
 };
 
 
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebKit/s60/webcoresupport/WebFrameLoaderClient.cpp
--- a/webengine/osswebengine/WebKit/s60/webcoresupport/WebFrameLoaderClient.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebKit/s60/webcoresupport/WebFrameLoaderClient.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -15,7 +15,7 @@
 *
 */
 
-#include <Browser_platform_variant.hrh>
+#include <browser_platform_variant.hrh>
 #include "config.h"
 #include <../bidi.h>
 #include "WebFrameLoaderClient.h"
@@ -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"
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebKit/s60/webview/BrCtl.cpp
--- a/webengine/osswebengine/WebKit/s60/webview/BrCtl.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebKit/s60/webview/BrCtl.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -16,7 +16,7 @@
 */
 
 // INCLUDE FILES
-#include <Browser_platform_variant.hrh>
+#include <browser_platform_variant.hrh>
 #include <../bidi.h>
 #include <avkon.hrh>
 #include <apmrec.h>
@@ -32,7 +32,7 @@
 #endif
 #include <GULICON.h>
 #include <e32uid.h>
-#include <BrowserDialogsProvider.h>
+#include <browserdialogsprovider.h>
 //tot:fixme
 //#include <oom.h>
 
@@ -68,7 +68,7 @@
 #include "WebCursor.h"
 #include "WebUtil.h"
 #include "WebCharsetData.h"
-#include "HttpCacheManager.h"
+#include "httpcachemanager.h"
 #include "ResourceLoaderDelegate.h"
 #include "EventHandler.h"
 #include "timer.h"
@@ -86,7 +86,7 @@
 #include "HttpUiCallbacks.h"
 #include "PluginWin.h"
 #include <BrowserVersion.h>
-#include <CUserAgent.h>
+#include <cuseragent.h>
 
 #ifndef BRDO_WML_DISABLED_FF
 #include "wmlinterface.h"
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebKit/s60/webview/BrCtl.h
--- a/webengine/osswebengine/WebKit/s60/webview/BrCtl.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebKit/s60/webview/BrCtl.h	Thu Dec 17 09:20:16 2009 +0200
@@ -21,9 +21,9 @@
 #define BRCTL_H
 
 //  INCLUDES
-#include <BrCtlInterface.h>
+#include <brctlinterface.h>
 
-#include "BrCtlDefs.h"
+#include "brctldefs.h"
 #include "HistoryInterface.h"
 
 #include "WmlInterface.h"
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebKit/s60/webview/BrCtlDataLoadInfo.h
--- a/webengine/osswebengine/WebKit/s60/webview/BrCtlDataLoadInfo.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebKit/s60/webview/BrCtlDataLoadInfo.h	Thu Dec 17 09:20:16 2009 +0200
@@ -21,7 +21,7 @@
 #define BRCTLDATALOADINFO_H
 
 //  INCLUDES
-#include <BrCtlInterface.h>
+#include <brctlinterface.h>
 
 //  CONSTANTS
 
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebKit/s60/webview/BrCtlDialogsProviderUtils.cpp
--- a/webengine/osswebengine/WebKit/s60/webview/BrCtlDialogsProviderUtils.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebKit/s60/webview/BrCtlDialogsProviderUtils.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -21,7 +21,7 @@
 #include <e32std.h>
 #include <e32base.h>
 
-#include "BrCtlDialogsProvider.h"
+#include "brctldialogsprovider.h"
 
 
 // ----------------------------------------------------------------------------
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebKit/s60/webview/BrCtlLayoutObserverImpl.h
--- a/webengine/osswebengine/WebKit/s60/webview/BrCtlLayoutObserverImpl.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebKit/s60/webview/BrCtlLayoutObserverImpl.h	Thu Dec 17 09:20:16 2009 +0200
@@ -20,7 +20,7 @@
 #define BRCTLLAYOUTOBSERVERIMPL_H
 
 //  INCLUDES
-#include <BrCtlLayoutObserver.h>
+#include <brctllayoutobserver.h>
 
 /**
 *  This observer is notified of scrolling and tabbing events
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebKit/s60/webview/BrCtlLinkResolver.h
--- a/webengine/osswebengine/WebKit/s60/webview/BrCtlLinkResolver.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebKit/s60/webview/BrCtlLinkResolver.h	Thu Dec 17 09:20:16 2009 +0200
@@ -63,12 +63,12 @@
 * Usage:
 *
 * @code
-*  #include <BrCtlLinkResolver.h>
+*  #include <brctllinkresolver.h>
 *
 *  
 * @see S60 Platform: Browser Control API Developer's Guide Version 2.0
 * @lib BrowserEngine.lib
-* @file BrCtlLinkResolver.h
+* @file brctllinkresolver.h
 * @endcode     *
 */
 class MBrCtlLinkResolver
@@ -125,12 +125,12 @@
 * Usage:
 *
 * @code
-*  #include <BrCtlLinkResolver.h>
+*  #include <brctllinkresolver.h>
 *
 *  
 * @see S60 Platform: Browser Control API Developer's Guide Version 2.0
 * @lib BrowserEngine.lib
-* @file BrCtlLinkResolver.h
+* @file brctllinkresolver.h
 * @endcode     *
 */
 class MBrCtlLinkContent
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebKit/s60/webview/BrCtlSoftkeysObserverImpl.h
--- a/webengine/osswebengine/WebKit/s60/webview/BrCtlSoftkeysObserverImpl.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebKit/s60/webview/BrCtlSoftkeysObserverImpl.h	Thu Dec 17 09:20:16 2009 +0200
@@ -1,51 +1,27 @@
 /*
-* ==============================================================================
-*  Name        : BrCtlBrCtlSoftkeysObserverImpl.h
-*  Part of     : WebKit \ BrowserControl
-*  Interface   : Browser Control API
-*  Description : Handle softkeys updates
-*  Version     : %Version%
+* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
-*    Copyright (c) 2006, Nokia Corporation
-*    All rights reserved.
-*  
-*  	Redistribution and use in source and binary forms, with or without
-*  	modification, are permitted provided that the following conditions
-*  	are met:
-*  
-*      * Redistributions of source code must retain the above copyright
-*        notice, this list of conditions and the following disclaimer.
-*      * 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.
-*      * Neither the name of the Nokia Corporation 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 THE COPYRIGHT HOLDERS AND 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 THE COPYRIGHT
-*  	OWNER OR 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.
-*  
-*    Please see file patentlicense.txt for further grants.
-* ==============================================================================
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:  Handle softkeys updates
+*
 */
 
 
+
 #ifndef CRCTLSOFTKEYSOBSERVERIMPL_H
 #define CRCTLSOFTKEYSOBSERVERIMPL_H
 
 //  INCLUDES
-#include <BrCtlSoftkeysObserver.h>
+#include <brctlsoftkeysobserver.h>
 
 
 /**
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebKit/s60/webview/BrCtlSpecialLoadObserverImpl.h
--- a/webengine/osswebengine/WebKit/s60/webview/BrCtlSpecialLoadObserverImpl.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebKit/s60/webview/BrCtlSpecialLoadObserverImpl.h	Thu Dec 17 09:20:16 2009 +0200
@@ -1,51 +1,27 @@
 /*
-* ==============================================================================
-*  Name        : BrCtlSpecialLoadObserverImpl.h
-*  Part of     : WebKit \ BrowserControl
-*  Interface   : Browser Control API
-*  Description : Handle special load events such as network connection, deal with non-http or non-html requests
-*  Version     : %Version%
+* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
-*    Copyright (c) 2006, Nokia Corporation
-*    All rights reserved.
-*  
-*  	Redistribution and use in source and binary forms, with or without
-*  	modification, are permitted provided that the following conditions
-*  	are met:
-*  
-*      * Redistributions of source code must retain the above copyright
-*        notice, this list of conditions and the following disclaimer.
-*      * 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.
-*      * Neither the name of the Nokia Corporation 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 THE COPYRIGHT HOLDERS AND 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 THE COPYRIGHT
-*  	OWNER OR 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.
-*  
-*    Please see file patentlicense.txt for further grants.
-* ==============================================================================
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:  Handle special load events such as network connection, deal with non-http or non-html requests
+*
 */
 
 
+
 #ifndef BRCTLSPECIALLOADOBSERVERIMPL_H
 #define BRCTLSPECIALLOADOBSERVERIMPL_H
 
 //  INCLUDES
-#include <BrCtlSpecialLoadObserver.h>
+#include <brctlspecialloadobserver.h>
 
 /**
 *  This observer handles special load events such as network connection, deal with non-http(s) or non-html requests
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebKit/s60/webview/BrCtlWindowObserverImpl.h
--- a/webengine/osswebengine/WebKit/s60/webview/BrCtlWindowObserverImpl.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebKit/s60/webview/BrCtlWindowObserverImpl.h	Thu Dec 17 09:20:16 2009 +0200
@@ -1,51 +1,27 @@
 /*
-* ==============================================================================
-*  Name        : BrCtlWinowObserverImpl.h
-*  Part of     : WebKit \ BrowserControl
-*  Interface   : Browser Control API
-*  Description : Handle special load events such as network connection, deal with non-http or non-html requests
-*  Version     : %Version%
+* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
-*    Copyright (c) 2006, Nokia Corporation
-*    All rights reserved.
-*  
-*  	Redistribution and use in source and binary forms, with or without
-*  	modification, are permitted provided that the following conditions
-*  	are met:
-*  
-*      * Redistributions of source code must retain the above copyright
-*        notice, this list of conditions and the following disclaimer.
-*      * 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.
-*      * Neither the name of the Nokia Corporation 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 THE COPYRIGHT HOLDERS AND 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 THE COPYRIGHT
-*  	OWNER OR 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.
-*  
-*    Please see file patentlicense.txt for further grants.
-* ==============================================================================
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:  Handle special load events such as network connection, deal with non-http or non-html requests
+*
 */
 
 
+
 #ifndef BRCTLWINDOWOBSERVERIMPL_H
 #define BRCTLWINDOWOBSERVERIMPL_H
 
 //  INCLUDES
-#include <BrCtlWindowObserver.h>
+#include <brctlwindowobserver.h>
 
 
 /**
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebKit/s60/webview/HistoryInterface.h
--- a/webengine/osswebengine/WebKit/s60/webview/HistoryInterface.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebKit/s60/webview/HistoryInterface.h	Thu Dec 17 09:20:16 2009 +0200
@@ -21,7 +21,7 @@
 
 //  INCLUDES
 #include <e32base.h>
-#include <BrCtlDefs.h>
+#include <brctldefs.h>
 
 // CONSTANTS
 
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebKit/s60/webview/WebFepTextEditor.cpp
--- a/webengine/osswebengine/WebKit/s60/webview/WebFepTextEditor.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebKit/s60/webview/WebFepTextEditor.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -17,6 +17,12 @@
 
 
 
+#ifdef SYMBIAN_ENABLE_SPLIT_HEADERS
+#include <txtetext_internal.h>
+#include <txtclipboard.h>
+#include <txtetext_internal.h>
+#endif
+
 #include "config.h"
 #include "../../bidi.h"
 #include "StaticObjectsContainer.h"
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebKit/s60/webview/WebFepTextEditor.h
--- a/webengine/osswebengine/WebKit/s60/webview/WebFepTextEditor.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebKit/s60/webview/WebFepTextEditor.h	Thu Dec 17 09:20:16 2009 +0200
@@ -17,7 +17,7 @@
 
 
 
-#include <Browser_platform_variant.hrh>
+#include <browser_platform_variant.hrh>
 
 #include <e32base.h>
 #include <fepbase.h>
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebKit/s60/webview/WebPageScrollHandler.cpp
--- a/webengine/osswebengine/WebKit/s60/webview/WebPageScrollHandler.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebKit/s60/webview/WebPageScrollHandler.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -17,7 +17,7 @@
 
 
 // INCLUDE FILES
-#include <Browser_platform_variant.hrh>
+#include <browser_platform_variant.hrh>
 #include <../bidi.h>
 #include "WebPageScrollHandler.h"
 #include "BrCtl.h"
@@ -372,12 +372,14 @@
             bool shouldScrollHorizontally = false;
             WebFrame* frame = kit(m_scrollableView.m_scrollingElement->document()->frame());
             RenderObject* render = m_scrollableView.m_scrollingElement->renderer();
-            __ASSERT_DEBUG(render->isScrollable(), User::Panic(_L(""), KErrGeneral));
-            if (aScrollDelta.iY)
-                shouldScrollVertically = !render->scroll(ScrollDown, ScrollByPixel, frame->frameView()->toDocCoords(aScrollDelta).iY / 100);
-            if (aScrollDelta.iX)
-                shouldScrollHorizontally = !render->scroll(ScrollRight, ScrollByPixel, frame->frameView()->toDocCoords(aScrollDelta).iX / 100);
-
+            if(render) //check if render exits before using it
+                {
+                __ASSERT_DEBUG(render->isScrollable(), User::Panic(_L(""), KErrGeneral));
+                if (aScrollDelta.iY)
+                  shouldScrollVertically = !render->scroll(ScrollDown, ScrollByPixel, frame->frameView()->toDocCoords(aScrollDelta).iY / 100);
+                if (aScrollDelta.iX)
+                  shouldScrollHorizontally = !render->scroll(ScrollRight, ScrollByPixel, frame->frameView()->toDocCoords(aScrollDelta).iX / 100);
+                }
             TPoint scrollPos = frame->frameView()->contentPos();
             TPoint newscrollDelta = frame->frameView()->toDocCoords(aScrollDelta);
             m_currentNormalizedPosition +=  newscrollDelta;     
@@ -559,25 +561,32 @@
     Element* currElement = NULL;
     if(!e) return NULL;
     RenderObject* render = e->renderer();
-    if (render && render->isScrollable()) {
+    if(render) {
         RenderLayer* layer = render->enclosingLayer();
         Element* parent = e;
-        currElement = e;
-        while (!currElement->isControl() && parent && parent->renderer() && parent->renderer()->enclosingLayer() == layer) {
-            currElement = parent;
-            Node* pn = parent;
-            do {
-                pn = pn->parent();
-            } while (pn && !pn->isElementNode());
-            parent = static_cast<Element*>(pn);
+
+        if (e->isControl()) {
+            if (render->isScrollable()) {
+            currElement = e;
+            }
+        }
+        else {
+            while (parent && parent->renderer()) {
+                if (parent->renderer()->isScrollable()) {
+                    currElement = parent;
+                    break;
+                    }
+                parent = static_cast<Element*>(parent->parent());
+                }
         }
         if (currElement) {
+            //check for current element which is scrollable
             currElement->ref();
-            m_scrollableView.m_scrollingElement = currElement; 
+            m_scrollableView.m_scrollingElement = currElement;
             m_scrollableView.m_frameView = NULL;
             return true;
+            }
         }
-    }
     return false;
 }
 
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebKit/s60/webview/WebPointerEventHandler.cpp
--- a/webengine/osswebengine/WebKit/s60/webview/WebPointerEventHandler.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebKit/s60/webview/WebPointerEventHandler.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -15,7 +15,7 @@
 *
 */
 
-#include <Browser_platform_variant.hrh>
+#include <browser_platform_variant.hrh>
 #include "config.h"
 #include "../../bidi.h"
 #include <AknUtils.h>
@@ -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"
@@ -44,6 +44,7 @@
 #include "EventHandler.h"
 #include "EventNames.h"
 #include "HitTestResult.h"
+#include "HitTestRequest.h"
 #include "MouseEvent.h"
 #include "WebPageFullScreenHandler.h"
 #include "PluginSkin.h"
@@ -56,6 +57,13 @@
 #include "WebTabbedNavigation.h"
 #include "SettingsContainer.h"
 #include "PluginHandler.h"
+#include "WebCoreGraphicsContext.h"
+#include "GraphicsContext.h"
+#include "RenderStyle.h"
+#include "RenderObject.h"
+#include "CSSStyleSelector.h"
+#include "CSSValueKeywords.h"
+#include "Settings.h"
 
 #include "WebKitLogger.h"
 using namespace WebCore;
@@ -137,8 +145,9 @@
 void WebPointerEventHandler::HandleGestureL( const TGestureEvent& aEvent )
 {
     TGestureCode gtype = aEvent.Code(EAxisBoth);
-    TPoint gpos = aEvent.CurrentPos();
     
+    m_highlightPos = aEvent.CurrentPos();
+
     TBrCtlDefs::TBrCtlElementType elType = m_webview->focusedElementType();
     
     PluginSkin* plugin = m_webview->mainFrame()->focusedPlugin();
@@ -149,7 +158,7 @@
     }
     updateCursor(aEvent.CurrentPos());
     if (IS_TABBED_NAVIGATION) {
-        m_webview->tabbedNavigation()->updateCursorPosition(m_highlightPos);
+        m_webview->tabbedNavigation()->updateCursorPosition(aEvent.CurrentPos());
     }
     switch (gtype) {
       // sent on touch down
@@ -260,7 +269,6 @@
     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);        
@@ -293,7 +301,7 @@
      * timer callback first.  
      */    
     if ( m_buttonDownTimer.isActive()){
-    	m_waiter->Start();	
+        m_waiter->Start();	
     }
 }
 
@@ -484,12 +492,16 @@
            }
     }
 #endif // BRDO_TOUCH_ENABLED_FF
-    
+     
+    if (!IS_NAVIGATION_NONE) {
+         m_webview->sendMouseEventToEngine(TPointerEvent::EMove, m_highlightPos, coreFrame);
+     }
+     
      /*
       * We assume that if element visibility has been changed  
       * between "up" and "down" that means that some node event 
       * listener (onMouseOver etc) handling happened and we don't 
-      * want to send a click (mouse press = mouse release) event.
+      * want to send a click (mouse press + mouse release) event.
       * The exception is editable element, since we want VKB anyway
       */
      if (!IS_NAVIGATION_NONE &&
@@ -498,14 +510,18 @@
          m_webview->page()->chrome()->client()->elementVisibilityChangedByMouse()) {
          return;
      }
-
+     
      m_lastTapEvent.iPosition = m_buttonDownEvent.iPosition;
      m_lastTapEvent.iType = TPointerEvent::EButton1Up;
      m_lastTapEvent.iModifiers = 0;
 
     // don't pass the event if the text input is not in valid format
-    if (isHighlitableElement(elType) || m_webview->fepTextEditor()->validateTextFormat()) {
-        m_webview->sendMouseEventToEngine(TPointerEvent::EButton1Up,  m_lastTapEvent.iPosition, coreFrame);
+    if (m_webview->fepTextEditor()->validateTextFormat()) {
+        if (!IS_NAVIGATION_NONE) {
+            // in case of navigation none button down was sent in buttonDownTimerCB()
+            m_webview->sendMouseEventToEngine(TPointerEvent::EButton1Down, m_highlightPos, coreFrame);
+        }
+        m_webview->sendMouseEventToEngine(TPointerEvent::EButton1Up,  m_highlightPos, coreFrame);
     }
 
     // special handling for broken image (why is this here??)
@@ -584,7 +600,6 @@
 void WebPointerEventHandler::buttonDownTimerCB(Timer<WebPointerEventHandler>* t)
 {
     m_buttonDownTimer.stop();
-
     
     Frame* coreFrame = core(m_webview->mainFrame());
     TPointerEvent event;
@@ -596,14 +611,12 @@
     }
     m_isHighlighted = (m_highlightedNode != NULL) && (elType != TBrCtlDefs::EElementNone) ;
     
-    m_webview->page()->chrome()->client()->setElementVisibilityChanged(false);
-    
     /*
      * Tabbed navigation might already set the focused node.
      * If it's the same as m_highlightedNode FocuseController::setFocusedNode()
      * wouldn't do anything and setEditable won't be called.
      * So we are setting focused node to NULL here and let mouse event handler
-     * set it through ocuseController::setFocusedNode()
+     * set it through FocuseController::setFocusedNode()
      */
     if (IS_TABBED_NAVIGATION &&
         elType == TBrCtlDefs::EElementInputBox || 
@@ -611,10 +624,21 @@
         coreFrame->document()->setFocusedNode(NULL);
     }
          
-    m_webview->sendMouseEventToEngine(TPointerEvent::EButton1Down, m_highlightPos, coreFrame);
-
-    m_webview->sendMouseEventToEngine(TPointerEvent::EMove, m_highlightPos, coreFrame);
-    m_waiter->AsyncStop();
+    if (!IS_NAVIGATION_NONE) {
+        m_webview->page()->chrome()->client()->setElementVisibilityChanged(false);
+        //to initiate hover 
+        if (m_isHighlighted) {
+            setFocusRing();
+        }
+        
+    }
+    else {
+        m_webview->sendMouseEventToEngine(TPointerEvent::EButton1Down, m_highlightPos, coreFrame);
+    }
+    
+    if (m_waiter->IsStarted()) {    
+        m_waiter->AsyncStop();
+    }
 }
 
 
@@ -635,3 +659,23 @@
         }
     }
 }
+
+//-----------------------------------------------------------------------------
+// WebPointerEventHandler::setFocusRing
+//----------------------------------------------------------------------------
+void WebPointerEventHandler::setFocusRing()
+{
+    Element* e = static_cast<Element*>(m_highlightedNode);
+    RenderStyle* rs = e->renderStyle();
+    RenderStyle* style = new (e->document()->renderArena()) RenderStyle(*rs);
+    Color col(0xffaaaaff);
+
+    style->ref();   
+    style->setOutlineColor(col);
+    style->setOutlineStyle(DOTTED, true);
+    style->setOutlineWidth(4);
+    style->setOutlineOffset(2);
+    e->setRenderStyle(style);
+    style->deref(e->document()->renderArena());
+    e->setChanged();
+}
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebKit/s60/webview/WebPointerEventHandler.h
--- a/webengine/osswebengine/WebKit/s60/webview/WebPointerEventHandler.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebKit/s60/webview/WebPointerEventHandler.h	Thu Dec 17 09:20:16 2009 +0200
@@ -61,6 +61,7 @@
     void handleMove(const RT_GestureHelper::TGestureEvent& aEvent);
     void doTapL();
     void updateCursor(const TPoint& pos);
+    void setFocusRing();
 private:
     WebPointerEventHandler(WebView* view);            
     WebView* m_webview;
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebKit/s60/webview/WebPolicyManager.cpp
--- a/webengine/osswebengine/WebKit/s60/webview/WebPolicyManager.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebKit/s60/webview/WebPolicyManager.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -37,7 +37,6 @@
 
 // CONSTANTS
 const char* typeTextHtml = "text/html";
-const char* typeTextXml = "text/xml";
 const char* typeApplicationXhtml = "application/xhtml+xml";
 const char* typeTextPlain = "text/plain";
 const char* typeApplicationWapXhtml = "application/vnd.wap.xhtml+xml";
@@ -161,8 +160,7 @@
     if (MIMEType == typeTextHtml ||
         MIMEType == typeApplicationXhtml ||
         MIMEType == typeApplicationWapXhtml ||
-        MIMEType == typeMultipartMixed || 
-        MIMEType == typeTextXml) {
+        MIMEType == typeMultipartMixed) {
         found = true;
     }
     //Check if the image type can be handled by the browser. If not
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebKit/s60/webview/WebToolBarInterface.h
--- a/webengine/osswebengine/WebKit/s60/webview/WebToolBarInterface.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebKit/s60/webview/WebToolBarInterface.h	Thu Dec 17 09:20:16 2009 +0200
@@ -29,7 +29,7 @@
 #include <AknsConstants.h>
 #include <AknsItemID.h>
 #include <AknsConstants.h>
-#include "BrCtlDefs.h"
+#include "brctldefs.h"
 #include "ToolBar.h"
 /*
 #include "Favicon.h"
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebKit/s60/webview/WebView.cpp
--- a/webengine/osswebengine/WebKit/s60/webview/WebView.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebKit/s60/webview/WebView.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -28,7 +28,7 @@
 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-#include <Browser_platform_variant.hrh>
+#include <browser_platform_variant.hrh>
 #include "config.h"
 #include "../../bidi.h"
 #include "brctl.h"
@@ -90,7 +90,7 @@
 using namespace HTMLNames;
 
 #include <AknUtils.h>
-#include <CUserAgent.h>
+#include <cuseragent.h>
 #include "WebPageZoomHandler.h"
 
 #include "PlatformFontCache.h"
@@ -200,6 +200,7 @@
 , m_allowRepaints(true)
 , m_prevEditMode(false)
 , m_firedEvent(0)
+, m_waitTimer(0)
 {
 }
 
@@ -241,6 +242,8 @@
     delete m_pageScrollHandler;
     delete m_pluginplayer;
     delete m_fepTimer;
+    delete m_waitTimer;
+    delete m_waiter;
     delete m_popupDrawer;
     delete m_tabbedNavigation;
     delete m_userAgent;
@@ -359,6 +362,8 @@
     CCoeControl::SetFocus(ETrue);
 
     cache()->setCapacities(0, 0, defaultCacheCapacity);
+    
+    m_waiter = new(ELeave) CActiveSchedulerWait();
 }
 
 void WebView::initializePageScalerL()
@@ -515,6 +520,7 @@
 
     if ( visible ) {
       clearOffScreenBitmap();
+      m_tabbedNavigation->initializeForPage();
       syncRepaint( mainFrame()->frameView()->visibleRect() );
     }
 
@@ -1465,6 +1471,18 @@
 
     if (m_popupDrawer)
         return m_popupDrawer->handleOfferKeyEventL(keyevent, eventcode );
+    
+    if (m_focusedElementType == TBrCtlDefs::EElementObjectBox 
+        || m_focusedElementType == TBrCtlDefs::EElementActivatedObjectBox) {
+        
+        Node* node = static_cast<Node*>(cursor->getElementUnderCursor());
+        MWebCoreObjectWidget* view = widget(node);
+        PluginSkin* plugin = static_cast<PluginSkin*>(view);
+        if (plugin && plugin->pluginWin() && !(plugin->pluginWin()->Windowed())) {
+            if (EKeyWasConsumed == plugin->pluginWin()->OfferKeyEventL(keyevent, eventcode))
+                return EKeyWasConsumed;
+        }
+    }    
 
     if ( m_webFormFillPopup && m_webFormFillPopup->IsVisible() && AknLayoutUtils::PenEnabled() ) {
 	    if (EKeyWasConsumed == m_webFormFillPopup->HandleKeyEventL(keyevent, eventcode)) {
@@ -1703,6 +1721,8 @@
 void WebView::setEditable(TBool editable)
 {
     Frame* frame = core(mainFrame());
+    
+    page()->chrome()->client()->setElementVisibilityChanged(false);
     if (!frame || m_isEditable == editable)
         return;
 
@@ -2012,10 +2032,6 @@
 
     TInt numPnts = Window().RetrievePointerMoveBuffer(ptr);
     int i = 0;
-    if (m_brctl->settings()->getNavigationType() == SettingsContainer::NavigationTypeNone) {
-        if (numPnts > 20)
-            i = numPnts - 20;
-    }
     for (; i < numPnts; i++) {
         TPointerEvent pe;
         pe.iType = TPointerEvent::EDrag;
@@ -2886,4 +2902,27 @@
     }
 }
 
+void WebView::wait(double t)
+{
+    if (!m_waitTimer) {
+        m_waitTimer = new WebCore::Timer<WebView>(this, &WebView::waitTimerCB);
+    }
+    
+    if (!m_waitTimer->isActive()) {
+        m_waitTimer->startOneShot(t);
+    }
+    
+    if (!m_waitTimer->isActive() && !m_waiter->IsStarted()) {
+        m_waiter->Start();  
+    }
+}
+
+void WebView::waitTimerCB(WebCore::Timer<WebView>* t)
+{
+    if (m_waiter->IsStarted()) {
+        m_waiter->AsyncStop();
+    }
+}
+
+
 // END OF FILE
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebKit/s60/webview/WebView.h
--- a/webengine/osswebengine/WebKit/s60/webview/WebView.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebKit/s60/webview/WebView.h	Thu Dec 17 09:20:16 2009 +0200
@@ -23,7 +23,7 @@
 #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"
@@ -472,6 +472,7 @@
         bool handleMSK(const TKeyEvent& keyevent, TEventCode eventcode, WebCore::Frame* frame);
 	    void sendMouseEventToEngineIfNeeded(TPointerEvent::TType eventType, TPoint pos, WebCore::Frame* frame);
 	    void setFocusedNodeUnderCursor(WebCore::Frame* frame);
+	    void waitTimerCB(WebCore::Timer<WebView>* t);
 	    
     public:
         void sendMouseEventToEngine(TPointerEvent::TType eventType, TPoint pos, WebCore::Frame* frame);
@@ -493,6 +494,7 @@
         void clearKeyEventFired() { m_firedEvent &= ~KKeyEventFired; }
         void clearEventFired() { m_firedEvent = 0; }
         
+        void wait(double t); 
     private:
         WebCore::Page*          m_page;
         WebFrameView*           m_frameView;
@@ -576,6 +578,9 @@
         bool                m_allowRepaints;
         bool                m_prevEditMode;
         int                 m_firedEvent;
+        
+        CActiveSchedulerWait*    m_waiter; 
+        WebCore::Timer<WebView>* m_waitTimer;
     };
 
 #endif
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebKit/s60/webview/WmlDispatcher.h
--- a/webengine/osswebengine/WebKit/s60/webview/WmlDispatcher.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebKit/s60/webview/WmlDispatcher.h	Thu Dec 17 09:20:16 2009 +0200
@@ -21,7 +21,7 @@
 //  INCLUDES
 #include <e32base.h>
 #include <w32std.h>
-#include "BrCtlDefs.h"
+#include "brctldefs.h"
 
 #include "BrCtl.h"
 #include "SelfDownloadContentHandler.h"
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebKit/s60/webview/WmlInterface.h
--- a/webengine/osswebengine/WebKit/s60/webview/WmlInterface.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebKit/s60/webview/WmlInterface.h	Thu Dec 17 09:20:16 2009 +0200
@@ -23,7 +23,7 @@
 //  INCLUDES
 #include <e32std.h>
 #include <e32base.h>
-#include "BrCtlDefs.h"
+#include "brctldefs.h"
 #include "BrCtl.h" 
 
 class CWmlContentInterface;
@@ -90,7 +90,7 @@
 
     /**
         * Set the WKScrollingProviderNotifyLayoutChange.
-    * Function BrCtlDialogsProvider.h
+    * Function brctldialogsprovider.h
     * void CBrCtlScrollingProvider::NotifyLayoutChange(..)
         * @since 3.1.
         * @return void
@@ -100,7 +100,7 @@
 
     /**
         * Set the SetWKScrollingProviderUpdateVScrollBarL.
-    * Function BrCtlDialogsProvider.h
+    * Function brctldialogsprovider.h
     * void CBrCtlScrollingProvider::UpdateVScrollBarL(..)
         * @since 3.1.
         * @return void
@@ -113,7 +113,7 @@
 
     /**
         * Set the SetWKScrollingProviderUpdateHScrollBarL
-    * Function BrCtlDialogsProvider.h
+    * Function brctldialogsprovider.h
     * void CBrCtlScrollingProvider::UpdateHScrollBarL(..)
         * @since 3.1.
         * @return void
@@ -129,7 +129,7 @@
 
      /**
         * Used by and defined in support of CWKDialogProvider
-    * Function BrCtlDialogsProvider.h
+    * Function brctldialogsprovider.h
     * CBrCtlObjectInfo::CWKObjectInfo() in
     * [WEBKIT\BrowserControl\src\WKDialogsProviderUtils.cpp]
         * @since 3.1.
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebKit/s60/webview/WmlInterfaceImpl.h
--- a/webengine/osswebengine/WebKit/s60/webview/WmlInterfaceImpl.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebKit/s60/webview/WmlInterfaceImpl.h	Thu Dec 17 09:20:16 2009 +0200
@@ -25,7 +25,7 @@
 #include <e32base.h>
 #include "WmlInterface.h"
 
-#include "BrCtlDialogsProvider.h"
+#include "brctldialogsprovider.h"
 
 class CBrCtlObjectInfo;
 class CWmlContentInterface;
@@ -119,7 +119,7 @@
 
     /**
         * Set the WKScrollingProviderNotifyLayoutChange.
-    * Function \S60\WebEngine\WEBKIT\BrowserControl\inc\BrCtlDialogsProvider.h
+    * Function \S60\WebEngine\WEBKIT\BrowserControl\inc\brctldialogsprovider.h
     * void CBrCtlScrollingProvider::NotifyLayoutChange(..)
         * @since 3.1.
         * @return void
@@ -129,7 +129,7 @@
 
     /**
         * Set the SetWKScrollingProviderUpdateVScrollBarL.
-    * Function \S60\WebEngine\WEBKIT\BrowserControl\inc\BrCtlDialogsProvider.h
+    * Function \S60\WebEngine\WEBKIT\BrowserControl\inc\brctldialogsprovider.h
     * void CBrCtlScrollingProvider::UpdateVScrollBarL(..)
         * @since 3.1.
         * @return void
@@ -141,7 +141,7 @@
                 TInt aDisplayPosY);
     /**
         * Set the SetWKScrollingProviderUpdateHScrollBarL
-    * Function \S60\WebEngine\WEBKIT\BrowserControl\inc\BrCtlDialogsProvider.h
+    * Function \S60\WebEngine\WEBKIT\BrowserControl\inc\brctldialogsprovider.h
     * void CBrCtlScrollingProvider::UpdateHScrollBarL(..)
         * @since 3.1.
         * @return void
@@ -159,7 +159,7 @@
 
     /**
         * Used by and defined in support of CWKDialogProvider
-    * Function \S60\WebEngine\WEBKIT\BrowserControl\inc\BrCtlDialogsProvider.h
+    * Function \S60\WebEngine\WEBKIT\BrowserControl\inc\brctldialogsprovider.h
     * CBrCtlObjectInfo::CWKObjectInfo() in
     * [WEBKIT\BrowserControl\src\WKDialogsProviderUtils.cpp]
         * @since 3.1.
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebKit/s60/webview/WmlResourceLoaderClient.h
--- a/webengine/osswebengine/WebKit/s60/webview/WmlResourceLoaderClient.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebKit/s60/webview/WmlResourceLoaderClient.h	Thu Dec 17 09:20:16 2009 +0200
@@ -21,7 +21,7 @@
 //  INCLUDES
 #include <e32base.h>
 #include <w32std.h>
-#include "BrCtlDefs.h"
+#include "brctldefs.h"
 
 #include "BrCtl.h"
 #include "SelfDownloadContentHandler.h"
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebKit/s60/webview/webview_api_test/group/bld.inf
--- a/webengine/osswebengine/WebKit/s60/webview/webview_api_test/group/bld.inf	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebKit/s60/webview/webview_api_test/group/bld.inf	Thu Dec 17 09:20:16 2009 +0200
@@ -17,7 +17,7 @@
 
 #ifndef __BROWSER_SDK
 #include <platform_paths.hrh>
-#include "../../../../../../../web_plat/browser_platform_api/inc/Browser_platform_variant.hrh"
+#include "../../../../../../../web_plat/browser_platform_api/inc/browser_platform_variant.hrh"
 #endif
 
 PRJ_PLATFORMS
@@ -26,10 +26,10 @@
 PRJ_EXPORTS
 
 #ifndef __BROWSER_SDK
-../inc/BrCtlDefs.h                MW_LAYER_PUBLIC_EXPORT_PATH(BrCtlDefs.h)
+../inc/brctldefs.h                MW_LAYER_PUBLIC_EXPORT_PATH(brctldefs.h)
 ../inc/brctlinterface.h           MW_LAYER_PUBLIC_EXPORT_PATH(brctlinterface.h)
 #else
-../inc/BrCtlDefs.h                /epoc32/include/BrCtlDefs.h
+../inc/brctldefs.h                /epoc32/include/brctldefs.h
 ../inc/brctlinterface.h           /epoc32/include/brctlinterface.h
 #endif //#ifndef __BROWSER_SDK
 
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebKit/s60/webview/webview_api_test/inc/BrCtlDefs.h
--- a/webengine/osswebengine/WebKit/s60/webview/webview_api_test/inc/BrCtlDefs.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebKit/s60/webview/webview_api_test/inc/BrCtlDefs.h	Thu Dec 17 09:20:16 2009 +0200
@@ -34,12 +34,12 @@
 * Usage:
 *
 * @code
-*  #include <BrCtlDefs.h>
+*  #include <brctldefs.h>
 *
 * @see S60 Platform: Browser Control API Developer's Guide Version 2.0
 * @lib BrowserEngine.lib
 * @since 3.0
-* @file BrCtlDefs.h
+* @file brctldefs.h
 * @endcode     *
 */
 class TBrCtlDefs
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebKit/s60/webview/webview_api_test/inc/BrCtlInterface.h
--- a/webengine/osswebengine/WebKit/s60/webview/webview_api_test/inc/BrCtlInterface.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebKit/s60/webview/webview_api_test/inc/BrCtlInterface.h	Thu Dec 17 09:20:16 2009 +0200
@@ -28,14 +28,14 @@
 #include <eikmenup.h>
 #include <ssl.h>
 
-#include <BrCtlDialogsProvider.h>
-#include <BrCtlLayoutObserver.h>
-#include <BrCtlLinkResolver.h>
-#include <BrCtlSoftkeysObserver.h>
-#include <BrCtlSpecialLoadObserver.h>
-#include <BrCtlWindowObserver.h>
-#include <BrCtlDownloadObserver.h>
-#include <BrCtlDefs.h>
+#include <brctldialogsprovider.h>
+#include <brctllayoutobserver.h>
+#include <brctllinkresolver.h>
+#include <brctlsoftkeysobserver.h>
+#include <brctlspecialloadobserver.h>
+#include <brctlwindowobserver.h>
+#include <brctldownloadobserver.h>
+#include <brctldefs.h>
 
 // DATA TYPES
 
@@ -109,27 +109,27 @@
 * Usage:
 *
 * @code
-*  #include <BrCtlInterface.h>
+*  #include <brctlinterface.h>
 *  // Interface that provides dialogs used by the Browser Control.
-*  #include <BrCtlDialogsProvider.h>
+*  #include <brctldialogsprovider.h>
 *  // Interface used to receive scrolling events.
-*  #include <BrCtlLayoutObserver.h>
+*  #include <brctllayoutobserver.h>
 *  //Interface that provides a callback mechanism for receiving the
 *  //content of an embedded link or the content of a user-initiated
 *  //load request.
-*  #include <BrCtlLinkResolver.h>
+*  #include <brctllinkresolver.h>
 *  //Interface that handles requests to change the softkeys.
-*  #include <BrCtlSoftkeysObserver.h>
+*  #include <brctlsoftkeysobserver.h>
 *  //Interface that handles special load needs.
-*  #include <BrCtlSpecialLoadObserver.h>
+*  #include <brctlspecialloadobserver.h>
 *  //Reserved for future use.
-*  #include <BrCtlWindowObserver.h>
+*  #include <brctlwindowobserver.h>
 *  //Interface that passes download events from the
 *  //Download Manager through the Browser Control to the
 *  //host application.
-*  #include <BrCtlDownloadObserver.h>
+*  #include <brctldownloadobserver.h>
 *  Enum Definition of the Browser Control API.
-*  #include <BrCtlDefs.h>
+*  #include <brctldefs.h>
 *
 *
 *   The following types of things you can do with the Browser Control API.
@@ -149,7 +149,7 @@
 * @see S60 Platform: Browser Control API Developer's Guide Version 2.0
 * @lib BrowserEngine.lib
 * @since 2.8
-* @file BrCtlInterface.h
+* @file brctlinterface.h
 * @endcode     *
 */
 class CBrCtlInterface : public CCoeControl
@@ -619,11 +619,11 @@
 * Usage:
 *
 * @code
-*  #include <BrCtlInterface.h>
+*  #include <brctlinterface.h>
 * @see S60 Platform: Browser Control API Developer's Guide Version 2.0
 * @lib BrowserEngine.lib
 * @since 2.8
-* @file BrCtlInterface.h
+* @file brctlinterface.h
 * @endcode     *
 */
 class MBrCtlDataLoadSupplier
@@ -644,11 +644,11 @@
 * the Browser Control with the ability to receive content incrementally.
 *
 * @code
-*  #include <BrCtlInterface.h>
+*  #include <brctlinterface.h>
 * @see S60 Platform: Browser Control API Developer's Guide Version 2.0
 * @lib BrowserEngine.lib
 * @since 2.8
-* @file BrCtlInterface.h
+* @file brctlinterface.h
 * @endcode     *
 */
 class MBrCtlDataLoadConsumer
@@ -684,11 +684,11 @@
 * The host application can implement this interface.
 *
 * @code
-*  #include <BrCtlInterface.h>
+*  #include <brctlinterface.h>
 * @see S60 Platform: Browser Control API Developer's Guide Version 2.0
 * @lib BrowserEngine.lib
 * @since 2.8
-* @file BrCtlInterface.h
+* @file brctlinterface.h
 * @endcode     *
 */
 class MBrCtlLoadEventObserver
@@ -709,10 +709,10 @@
 * The TBrCtlWmlServiceOption class wraps information about the WML DO elements.
 * For more information about the DO tag, see http://www.w3schools.com/wap/tag_do.asp.
 * @code
-*  #include <BrCtlInterface.h>
+*  #include <brctlinterface.h>
 * @lib BrowserEngine.lib
 * @since 2.8
-* @file BrCtlInterface.h
+* @file brctlinterface.h
 * @endcode     *
 */
 class TBrCtlWmlServiceOption
@@ -771,10 +771,10 @@
 /**
 * The TBrCtlSubscribeTo class provides information of Subscribe to items.
 * @code
-*  #include <BrCtlInterface.h>
+*  #include <brctlinterface.h>
 * @lib BrowserEngine.lib
 * @since 2.8
-* @file BrCtlInterface.h
+* @file brctlinterface.h
 * @endcode     *
 */
 class TBrCtlSubscribeTo
@@ -833,10 +833,10 @@
 * implement this interface in order to find out when the view
 * changes to and from the Image Map view.
 * @code
-*  #include <BrCtlInterface.h>
+*  #include <brctlinterface.h>
 * @lib BrowserEngine.lib
 * @since 2.8
-* @file BrCtlInterface.h
+* @file brctlinterface.h
 * @endcode     *
 */
 class MBrCtlStateChangeObserver
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebKit/s60/webview/webview_api_test/tsrc/group/WebViewApiTest.mcp
Binary file webengine/osswebengine/WebKit/s60/webview/webview_api_test/tsrc/group/WebViewApiTest.mcp has changed
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebKit/s60/webview/webview_api_test/tsrc/group/WebViewApiTest.mmp
--- a/webengine/osswebengine/WebKit/s60/webview/webview_api_test/tsrc/group/WebViewApiTest.mmp	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebKit/s60/webview/webview_api_test/tsrc/group/WebViewApiTest.mmp	Thu Dec 17 09:20:16 2009 +0200
@@ -18,7 +18,7 @@
 #include <domain/osextensions/platform_paths.hrh>
 #include <data_caging_paths.hrh>
 //#include "/../../../../WebEngine/OssWebEngine/WebKit/s60/group/common.mmpi"
-#include <platform/mw/Browser_platform_variant.hrh>
+#include <platform/mw/browser_platform_variant.hrh>
 
 TARGET          WebViewApiTest.dll
 TARGETTYPE      dll
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebKit/s60/webview/webview_api_test/tsrc/group/WebViewApiTest.xml
--- a/webengine/osswebengine/WebKit/s60/webview/webview_api_test/tsrc/group/WebViewApiTest.xml	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebKit/s60/webview/webview_api_test/tsrc/group/WebViewApiTest.xml	Thu Dec 17 09:20:16 2009 +0200
@@ -1684,7 +1684,7 @@
 <FILE><PATHTYPE>Name</PATHTYPE><PATH>HTMLFormElement.h</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Text</FILEKIND></FILE>
 <FILE><PATHTYPE>Name</PATHTYPE><PATH>HTMLGenericFormElement.h</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Text</FILEKIND></FILE>
 <FILE><PATHTYPE>Name</PATHTYPE><PATH>HTMLInputElement.h</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Text</FILEKIND></FILE>
-<FILE><PATHTYPE>Name</PATHTYPE><PATH>HttpCacheManager.h</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Text</FILEKIND></FILE>
+<FILE><PATHTYPE>Name</PATHTYPE><PATH>httpcachemanager.h</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Text</FILEKIND></FILE>
 <FILE><PATHTYPE>Name</PATHTYPE><PATH>HttpCallbacks.h</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Text</FILEKIND></FILE>
 <FILE><PATHTYPE>Name</PATHTYPE><PATH>HttpConnection.h</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Text</FILEKIND></FILE>
 <FILE><PATHTYPE>Name</PATHTYPE><PATH>httpDownload.h</PATH><PATHFORMAT>Windows</PATHFORMAT><FILEKIND>Text</FILEKIND></FILE>
@@ -1980,7 +1980,7 @@
 <FILEREF><PATHTYPE>Name</PATHTYPE><PATH>HTMLFormElement.h</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
 <FILEREF><PATHTYPE>Name</PATHTYPE><PATH>HTMLGenericFormElement.h</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
 <FILEREF><PATHTYPE>Name</PATHTYPE><PATH>HTMLInputElement.h</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>HttpCacheManager.h</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
+<FILEREF><PATHTYPE>Name</PATHTYPE><PATH>httpcachemanager.h</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
 <FILEREF><PATHTYPE>Name</PATHTYPE><PATH>HttpCallbacks.h</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
 <FILEREF><PATHTYPE>Name</PATHTYPE><PATH>HttpConnection.h</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
 <FILEREF><PATHTYPE>Name</PATHTYPE><PATH>httpDownload.h</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
@@ -7114,7 +7114,7 @@
 <FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>HTMLFormElement.h</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
 <FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>HTMLGenericFormElement.h</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
 <FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>HTMLInputElement.h</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
-<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>HttpCacheManager.h</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
+<FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>httpcachemanager.h</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
 <FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>HttpCallbacks.h</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
 <FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>HttpConnection.h</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
 <FILEREF><TARGETNAME>WINSCW UDEB</TARGETNAME><PATHTYPE>Name</PATHTYPE><PATH>httpDownload.h</PATH><PATHFORMAT>Windows</PATHFORMAT></FILEREF>
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebKit/s60/webview/webview_api_test/tsrc/group/WebViewApiTest_Data/WINSCW_UDEB/TargetDataWindows.tdt
Binary file webengine/osswebengine/WebKit/s60/webview/webview_api_test/tsrc/group/WebViewApiTest_Data/WINSCW_UDEB/TargetDataWindows.tdt has changed
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebKit/s60/webview/webview_api_test/tsrc/inc/BrCtl.h
--- a/webengine/osswebengine/WebKit/s60/webview/webview_api_test/tsrc/inc/BrCtl.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebKit/s60/webview/webview_api_test/tsrc/inc/BrCtl.h	Thu Dec 17 09:20:16 2009 +0200
@@ -1,53 +1,29 @@
 /*
-* ==============================================================================
-*  Name        : BrCtl.h
-*  Part of     : WebKit \ BrowserControl
-*  Interface   : Browser Control API
-*  Description : Implementation of the Browser Control
-*  Version     : 3.1
-*
-*    Copyright (c) 2006, Nokia Corporation
-*    All rights reserved.
-*
-*   Redistribution and use in source and binary forms, with or without
-*   modification, are permitted provided that the following conditions
-*   are met:
+* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
-*      * Redistributions of source code must retain the above copyright
-*        notice, this list of conditions and the following disclaimer.
-*      * 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.
-*      * Neither the name of the Nokia Corporation nor the names of its
-*        contributors may be used to endorse or promote products derived
-*        from this software without specific prior written permission.
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
 *
-*   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 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 THE COPYRIGHT
-*   OWNER OR 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.
+* Description:  Implementation of the Browser Control
 *
-*    Please see file patentlicense.txt for further grants.
-* ==============================================================================
 */
 
 
+
 #ifndef BRCTL_H
 #define BRCTL_H
 
 //  INCLUDES
-#include <BrCtlInterface.h>
+#include <brctlinterface.h>
 
-#include "BrCtlDefs.h"
+#include "brctldefs.h"
 #include "HistoryInterface.h"
 
 #include "WmlInterface.h"
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebKit/s60/webview/webview_api_test/tsrc/inc/BrCtlApiTestContainer.h
--- a/webengine/osswebengine/WebKit/s60/webview/webview_api_test/tsrc/inc/BrCtlApiTestContainer.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebKit/s60/webview/webview_api_test/tsrc/inc/BrCtlApiTestContainer.h	Thu Dec 17 09:20:16 2009 +0200
@@ -15,11 +15,11 @@
 
 // INCLUDES
 //#include <coecntrl.h>
-#include <BrCtlInterface.h> // interface under test
+#include <brctlinterface.h> // interface under test
 
-//#include "BrCtlApiTestObserver.h"
-//#include "BrCtlApiTestStateChangeObserver.h"
-#include "BrCtlApiTestDialogsProvider.h"
+//#include "brctlapitestobserver.h"
+//#include "brctlapiteststatechangeobserver.h"
+#include "brctlapitestdialogsprovider.h"
    
 // CONSTATNS
 //const TInt KThisAppUid = 0xA0000181;
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebKit/s60/webview/webview_api_test/tsrc/inc/BrCtlApiTestDialogsProvider.h
--- a/webengine/osswebengine/WebKit/s60/webview/webview_api_test/tsrc/inc/BrCtlApiTestDialogsProvider.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebKit/s60/webview/webview_api_test/tsrc/inc/BrCtlApiTestDialogsProvider.h	Thu Dec 17 09:20:16 2009 +0200
@@ -25,7 +25,7 @@
 // User includes
 
 // System Includes
-#include <BrCtlDialogsProvider.h>
+#include <brctldialogsprovider.h>
 //#include <BrowserDialogsProviderProxy.h>
 #include <e32std.h>
 
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebKit/s60/webview/webview_api_test/tsrc/inc/BrCtlApiTestObserver.h
--- a/webengine/osswebengine/WebKit/s60/webview/webview_api_test/tsrc/inc/BrCtlApiTestObserver.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebKit/s60/webview/webview_api_test/tsrc/inc/BrCtlApiTestObserver.h	Thu Dec 17 09:20:16 2009 +0200
@@ -21,11 +21,11 @@
 #define BRCTLBCTESTOBSERVER_H
 
 //  INCLUDES
-#include <BrCtlLayoutObserver.h>
-#include <BrCtlSoftkeysObserver.h>
-#include <BrCtlSpecialLoadObserver.h>
-#include <BrCtlDownloadObserver.h>
-#include <BrCtlInterface.h>
+#include <brctllayoutobserver.h>
+#include <brctlsoftkeysobserver.h>
+#include <brctlspecialloadobserver.h>
+#include <brctldownloadobserver.h>
+#include <brctlinterface.h>
 #include <DocumentHandler.h>    
 #include <flogger.h>
 
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebKit/s60/webview/webview_api_test/tsrc/inc/BrCtlApiTestStateChangeObserver.h
--- a/webengine/osswebengine/WebKit/s60/webview/webview_api_test/tsrc/inc/BrCtlApiTestStateChangeObserver.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebKit/s60/webview/webview_api_test/tsrc/inc/BrCtlApiTestStateChangeObserver.h	Thu Dec 17 09:20:16 2009 +0200
@@ -21,7 +21,7 @@
 #define BRCTLBCTESTSTATECHANGEOBSERVER_H
 
 // INCLUDES
-#include <BrCtlInterface.h>
+#include <brctlinterface.h>
 
 // FORWARD DECLARATIONS
 class CBrCtlApiTestContainer;
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebKit/s60/webview/webview_api_test/tsrc/inc/WebView.h
--- a/webengine/osswebengine/WebKit/s60/webview/webview_api_test/tsrc/inc/WebView.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebKit/s60/webview/webview_api_test/tsrc/inc/WebView.h	Thu Dec 17 09:20:16 2009 +0200
@@ -1,45 +1,21 @@
 /*
-* ==============================================================================
-*  Name        : WebKitView.h
-*  Part of     : WEBKIT / Browser View
-*  Interface   : Implemetation of CWebKitView
-*  Description :
-*  Version     : 3.1
-*
-*    Copyright (c) 2006, Nokia Corporation
-*    All rights reserved.
-*
-*   Redistribution and use in source and binary forms, with or without
-*   modification, are permitted provided that the following conditions
-*   are met:
+* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
-*      * Redistributions of source code must retain the above copyright
-*        notice, this list of conditions and the following disclaimer.
-*      * 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.
-*      * Neither the name of the Nokia Corporation nor the names of its
-*        contributors may be used to endorse or promote products derived
-*        from this software without specific prior written permission.
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
 *
-*   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 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 THE COPYRIGHT
-*   OWNER OR 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.
+* Description: 
 *
-*    Please see file patentlicense.txt for further grants.
-* ==============================================================================
 */
 
+
 #ifndef WEBKITVIEW_H
 #define WEBKITVIEW_H
 
@@ -47,7 +23,7 @@
 #include <e32std.h>
 #include <eikscrlb.h>
 #include "Shared.h"
-#include "BrCtlDefs.h"
+#include "brctldefs.h"
 #include "PageScaler.h"
 #include "Timer.h"
 #include "MemoryManager.h"
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebKit/s60/webview/webview_api_test/tsrc/inc/WebViewApiTestContainer.h
--- a/webengine/osswebengine/WebKit/s60/webview/webview_api_test/tsrc/inc/WebViewApiTestContainer.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebKit/s60/webview/webview_api_test/tsrc/inc/WebViewApiTestContainer.h	Thu Dec 17 09:20:16 2009 +0200
@@ -15,10 +15,10 @@
 
 // INCLUDES
 //#include <coecntrl.h>
-#include <BrCtlInterface.h>
+#include <brctlinterface.h>
 
-#include "BrCtlApiTestObserver.h"
-#include "BrCtlApiTestDialogsProvider.h"
+#include "brctlapitestobserver.h"
+#include "brctlapitestdialogsprovider.h"
 
 #include <WebView.h> // interface under test
 
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebKit/s60/webview/webview_api_test/tsrc/inc/WebViewApiTestObserver.h
--- a/webengine/osswebengine/WebKit/s60/webview/webview_api_test/tsrc/inc/WebViewApiTestObserver.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebKit/s60/webview/webview_api_test/tsrc/inc/WebViewApiTestObserver.h	Thu Dec 17 09:20:16 2009 +0200
@@ -21,11 +21,11 @@
 #define BRCTLBCTESTOBSERVER_H
 
 //  INCLUDES
-#include <BrCtlLayoutObserver.h>
-#include <BrCtlSoftkeysObserver.h>
-#include <BrCtlSpecialLoadObserver.h>
-#include <BrCtlDownloadObserver.h>
-#include <BrCtlInterface.h>
+#include <brctllayoutobserver.h>
+#include <brctlsoftkeysobserver.h>
+#include <brctlspecialloadobserver.h>
+#include <brctldownloadobserver.h>
+#include <brctlinterface.h>
 #include <DocumentHandler.h>    
 #include <flogger.h>
 
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebKit/s60/webview/webview_api_test/tsrc/inc/WebViewApiTestStateChangeObserver.h
--- a/webengine/osswebengine/WebKit/s60/webview/webview_api_test/tsrc/inc/WebViewApiTestStateChangeObserver.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebKit/s60/webview/webview_api_test/tsrc/inc/WebViewApiTestStateChangeObserver.h	Thu Dec 17 09:20:16 2009 +0200
@@ -21,7 +21,7 @@
 #define BRCTLBCTESTSTATECHANGEOBSERVER_H
 
 // INCLUDES
-#include <BrCtlInterface.h>
+#include <brctlinterface.h>
 
 // FORWARD DECLARATIONS
 class CWebViewApiTestContainer;
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebKit/s60/webview/webview_api_test/tsrc/mock/inc/BrCtl.h
--- a/webengine/osswebengine/WebKit/s60/webview/webview_api_test/tsrc/mock/inc/BrCtl.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebKit/s60/webview/webview_api_test/tsrc/mock/inc/BrCtl.h	Thu Dec 17 09:20:16 2009 +0200
@@ -1,53 +1,29 @@
 /*
-* ==============================================================================
-*  Name        : BrCtl.h
-*  Part of     : WebKit \ BrowserControl
-*  Interface   : Browser Control API
-*  Description : Implementation of the Browser Control
-*  Version     : 3.1
-*
-*    Copyright (c) 2006, Nokia Corporation
-*    All rights reserved.
-*
-*   Redistribution and use in source and binary forms, with or without
-*   modification, are permitted provided that the following conditions
-*   are met:
+* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
-*      * Redistributions of source code must retain the above copyright
-*        notice, this list of conditions and the following disclaimer.
-*      * 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.
-*      * Neither the name of the Nokia Corporation nor the names of its
-*        contributors may be used to endorse or promote products derived
-*        from this software without specific prior written permission.
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
 *
-*   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 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 THE COPYRIGHT
-*   OWNER OR 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.
+* Description:  Implementation of the Browser Control
 *
-*    Please see file patentlicense.txt for further grants.
-* ==============================================================================
 */
 
 
+
 #ifndef BRCTL_H
 #define BRCTL_H
 
 //  INCLUDES
-#include <BrCtlInterface.h>
+#include <brctlinterface.h>
 
-#include "BrCtlDefs.h"
+#include "brctldefs.h"
 #include "HistoryInterface.h"
 
 #include "WmlInterface.h"
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebKit/s60/webview/webview_api_test/tsrc/mock/src/BrCtl.cpp
--- a/webengine/osswebengine/WebKit/s60/webview/webview_api_test/tsrc/mock/src/BrCtl.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebKit/s60/webview/webview_api_test/tsrc/mock/src/BrCtl.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -1,45 +1,22 @@
 /*
-* ==============================================================================
-*  Name        : BrCtl.cpp
-*  Part of     : WebKit \ BrowserControl
-*  Description : Implementation of the Browser Control
-*  Version     : 3.1
-*
-*    Copyright (c) 2006, Nokia Corporation
-*    All rights reserved.
-*
-*   Redistribution and use in source and binary forms, with or without
-*   modification, are permitted provided that the following conditions
-*   are met:
+* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
-*      * Redistributions of source code must retain the above copyright
-*        notice, this list of conditions and the following disclaimer.
-*      * 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.
-*      * Neither the name of the Nokia Corporation nor the names of its
-*        contributors may be used to endorse or promote products derived
-*        from this software without specific prior written permission.
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
 *
-*   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 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 THE COPYRIGHT
-*   OWNER OR 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 SUHC
-*   DAMAGE.
+* Description:  Implementation of the Browser Control
 *
-*    Please see file patentlicense.txt for further grants.
-* ==============================================================================
 */
+
 // INCLUDE FILES
-#include <Browser_platform_variant.hrh>
+#include <browser_platform_variant.hrh>
 #include <../bidi.h>
 #include <avkon.hrh>
 #include <apmrec.h>
@@ -55,7 +32,7 @@
 #endif
 #include <GULICON.h>
 #include <e32uid.h>
-#include <BrowserDialogsProvider.h>
+#include <browserdialogsprovider.h>
 //tot:fixme
 //#include <oom.h>
 
@@ -91,7 +68,7 @@
 #include "WebCursor.h"
 #include "WebUtil.h"
 #include "WebCharsetData.h"
-#include "HttpCacheManager.h"
+#include "httpcachemanager.h"
 #include "ResourceLoaderDelegate.h"
 #include "EventHandler.h"
 #include "timer.h"
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebKit/s60/webview/webview_api_test/tsrc/src/BrCtlApiTestContainer.cpp
--- a/webengine/osswebengine/WebKit/s60/webview/webview_api_test/tsrc/src/BrCtlApiTestContainer.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebKit/s60/webview/webview_api_test/tsrc/src/BrCtlApiTestContainer.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -11,16 +11,16 @@
 */
 
 // INCLUDE FILES
-#include "BrCtlApiTestContainer.h"
+#include "brctlapitestcontainer.h"
 
 #include <eiklabel.h>  // for example label control
 #include <aknview.h>
 //#include <AknGlobalConfirmationQuery.h>
-#include <BrCtlInterface.h>
+#include <brctlinterface.h>
 #include <BrCtl.h>
 #include <CHARCONV.H>
-#include "BrCtlApiTestObserver.h"
-#include "BrCtlApiTestStateChangeObserver.h"
+#include "brctlapitestobserver.h"
+#include "brctlapiteststatechangeobserver.h"
 #include <e32std.h>
 
 _LIT8( KContentDataType, "text/html" );
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebKit/s60/webview/webview_api_test/tsrc/src/BrCtlApiTestDialogsProvider.cpp
--- a/webengine/osswebengine/WebKit/s60/webview/webview_api_test/tsrc/src/BrCtlApiTestDialogsProvider.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebKit/s60/webview/webview_api_test/tsrc/src/BrCtlApiTestDialogsProvider.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -19,11 +19,11 @@
 // INCLUDE Files
 
 // System includes
-#include <BrowserDialogsProviderObserver.h>
-//#include <BrowserDialogsProvider.h>
+#include <browserdialogsproviderobserver.h>
+//#include <browserdialogsprovider.h>
 
 // User includes
-#include "BrCtlApiTestDialogsProvider.h"
+#include "brctlapitestdialogsprovider.h"
 
 
 // CONSTANTS
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebKit/s60/webview/webview_api_test/tsrc/src/BrCtlApiTestObserver.cpp
--- a/webengine/osswebengine/WebKit/s60/webview/webview_api_test/tsrc/src/BrCtlApiTestObserver.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebKit/s60/webview/webview_api_test/tsrc/src/BrCtlApiTestObserver.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -17,7 +17,7 @@
 //#include <eikenv.h>
 //#include <eikbtgpc.h>
 //#include <avkon.hrh>
-#include "BrCtlApiTestObserver.h"
+#include "brctlapitestobserver.h"
 #include <aknmessagequerydialog.h>
 
 #ifndef RD_PF_SEC_APPARC
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebKit/win/WebKit.vcproj/resource.h
--- a/webengine/osswebengine/WebKit/win/WebKit.vcproj/resource.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebKit/win/WebKit.vcproj/resource.h	Thu Dec 17 09:20:16 2009 +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 "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: 
+*
+*/
 //{{NO_DEPENDENCIES}}
 // Microsoft Visual C++ generated include file.
 // Used by WebKit.rc
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebKitTools/Drosera/win/resource.h
--- a/webengine/osswebengine/WebKitTools/Drosera/win/resource.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebKitTools/Drosera/win/resource.h	Thu Dec 17 09:20:16 2009 +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 "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: 
+*
+*/
 //{{NO_DEPENDENCIES}}
 // Microsoft Visual C++ generated include file.
 // Used by Drosera.rc
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebKitTools/DumpRenderTree/TestNetscapePlugIn.subproj/PluginObject.c
--- a/webengine/osswebengine/WebKitTools/DumpRenderTree/TestNetscapePlugIn.subproj/PluginObject.c	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebKitTools/DumpRenderTree/TestNetscapePlugIn.subproj/PluginObject.c	Thu Dec 17 09:20:16 2009 +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 "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: 
+*
+*/
 /*
  IMPORTANT:  This Apple software is supplied to you by Apple Computer, Inc. ("Apple") in
  consideration of your agreement to the following terms, and your use, installation, 
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebKitTools/DumpRenderTree/TestNetscapePlugIn.subproj/PluginObject.h
--- a/webengine/osswebengine/WebKitTools/DumpRenderTree/TestNetscapePlugIn.subproj/PluginObject.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebKitTools/DumpRenderTree/TestNetscapePlugIn.subproj/PluginObject.h	Thu Dec 17 09:20:16 2009 +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 "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: 
+*
+*/
 /*
  IMPORTANT:  This Apple software is supplied to you by Apple Computer, Inc. ("Apple") in
  consideration of your agreement to the following terms, and your use, installation, 
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebKitTools/DumpRenderTree/TestNetscapePlugIn.subproj/TestObject.c
--- a/webengine/osswebengine/WebKitTools/DumpRenderTree/TestNetscapePlugIn.subproj/TestObject.c	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebKitTools/DumpRenderTree/TestNetscapePlugIn.subproj/TestObject.c	Thu Dec 17 09:20:16 2009 +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 "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: 
+*
+*/
 /*
  IMPORTANT:  This Apple software is supplied to you by Apple Computer, Inc. ("Apple") in
  consideration of your agreement to the following terms, and your use, installation, 
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebKitTools/DumpRenderTree/TestNetscapePlugIn.subproj/TestObject.h
--- a/webengine/osswebengine/WebKitTools/DumpRenderTree/TestNetscapePlugIn.subproj/TestObject.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebKitTools/DumpRenderTree/TestNetscapePlugIn.subproj/TestObject.h	Thu Dec 17 09:20:16 2009 +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 "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: 
+*
+*/
 /*
  IMPORTANT:  This Apple software is supplied to you by Apple Computer, Inc. ("Apple") in
  consideration of your agreement to the following terms, and your use, installation, 
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebKitTools/DumpRenderTree/TestNetscapePlugIn.subproj/main.c
--- a/webengine/osswebengine/WebKitTools/DumpRenderTree/TestNetscapePlugIn.subproj/main.c	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebKitTools/DumpRenderTree/TestNetscapePlugIn.subproj/main.c	Thu Dec 17 09:20:16 2009 +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 "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: 
+*
+*/
 /*
  IMPORTANT:  This Apple software is supplied to you by Apple Computer, Inc. ("Apple") in
  consideration of your agreement to the following terms, and your use, installation, 
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebKitTools/DumpRenderTree/qt/DumpRenderTree.pro
--- a/webengine/osswebengine/WebKitTools/DumpRenderTree/qt/DumpRenderTree.pro	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebKitTools/DumpRenderTree/qt/DumpRenderTree.pro	Thu Dec 17 09:20:16 2009 +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 "Eclipse Public License v1.0"
+# which accompanies this distribution, and is available
+# at the URL "http://www.eclipse.org/legal/epl-v10.html".
+#
+# Initial Contributors:
+# Nokia Corporation - initial contribution.
+#
+# Contributors:
+#
+# Description: 
+#
+
 TARGET = DumpRenderTree
 
 include(../../../WebKit.pri)
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebKitTools/DumpRenderTree/win/TestNetscapePlugin/main.c
--- a/webengine/osswebengine/WebKitTools/DumpRenderTree/win/TestNetscapePlugin/main.c	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebKitTools/DumpRenderTree/win/TestNetscapePlugin/main.c	Thu Dec 17 09:20:16 2009 +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 "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: 
+*
+*/
 /*
  IMPORTANT:  This Apple software is supplied to you by Apple Computer, Inc. ("Apple") in
  consideration of your agreement to the following terms, and your use, installation, 
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/WebKitTools/DumpRenderTree/win/TestNetscapePlugin/resource.h
--- a/webengine/osswebengine/WebKitTools/DumpRenderTree/win/TestNetscapePlugin/resource.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/WebKitTools/DumpRenderTree/win/TestNetscapePlugin/resource.h	Thu Dec 17 09:20:16 2009 +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 "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: 
+*
+*/
 //{{NO_DEPENDENCIES}}
 // Microsoft Visual C++ generated include file.
 // Used by TestNetscapePlugin.rc
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/cache/cache_check.pl
--- a/webengine/osswebengine/cache/cache_check.pl	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/cache/cache_check.pl	Thu Dec 17 09:20:16 2009 +0200
@@ -1,3 +1,18 @@
+#
+# Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+# All rights reserved.
+# This component and the accompanying materials are made available
+# under the terms of "Eclipse Public License v1.0"
+# which accompanies this distribution, and is available
+# at the URL "http://www.eclipse.org/legal/epl-v10.html".
+#
+# Initial Contributors:
+# Nokia Corporation - initial contribution.
+#
+# Contributors:
+#
+# Description: 
+#
 #!/usr/bin/perl
 
 #use Encode;
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/cache/filter_emulator_output.bat
--- a/webengine/osswebengine/cache/filter_emulator_output.bat	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/cache/filter_emulator_output.bat	Thu Dec 17 09:20:16 2009 +0200
@@ -1,2 +1,18 @@
+@rem
+@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 which accompanies this distribution, and is available
+@rem at the URL "http://www.eclipse.org/legal/epl-v10.html".
+@rem
+@rem Initial Contributors:
+@rem Nokia Corporation - initial contribution.
+@rem
+@rem Contributors:
+@rem
+@rem Description: 
+@rem
+
 filter_log.pl %tmp%\epocwind.out log.txt"
 log.txt
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/cache/filter_log.pl
--- a/webengine/osswebengine/cache/filter_log.pl	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/cache/filter_log.pl	Thu Dec 17 09:20:16 2009 +0200
@@ -1,3 +1,18 @@
+#
+# Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+# All rights reserved.
+# This component and the accompanying materials are made available
+# under the terms of "Eclipse Public License v1.0"
+# which accompanies this distribution, and is available
+# at the URL "http://www.eclipse.org/legal/epl-v10.html".
+#
+# Initial Contributors:
+# Nokia Corporation - initial contribution.
+#
+# Contributors:
+#
+# Description: 
+#
 #!/usr/bin/perl
 
 open INH,"<",$ARGV[0];
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/cache/group/BrowserCache.mmp
--- a/webengine/osswebengine/cache/group/BrowserCache.mmp	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/cache/group/BrowserCache.mmp	Thu Dec 17 09:20:16 2009 +0200
@@ -18,7 +18,7 @@
 TARGET          BrowserCache_sdk.dll
 #else
 #include <platform_paths.hrh>
-#include <platform/mw/Browser_platform_variant.hrh>
+#include <platform/mw/browser_platform_variant.hrh>
 TARGET          BrowserCache.dll
 #endif
 TARGETTYPE      dll
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/cache/group/bld.inf
--- a/webengine/osswebengine/cache/group/bld.inf	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/cache/group/bld.inf	Thu Dec 17 09:20:16 2009 +0200
@@ -15,7 +15,7 @@
 *
 */
 #include <platform_paths.hrh>
-#include "../../../../web_plat/browser_platform_api/inc/Browser_platform_variant.hrh"
+#include "../../../../web_plat/browser_platform_api/inc/browser_platform_variant.hrh"
 
 PRJ_PLATFORMS
 DEFAULT
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/cache/inc/HttpCacheHandler.h
--- a/webengine/osswebengine/cache/inc/HttpCacheHandler.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/cache/inc/HttpCacheHandler.h	Thu Dec 17 09:20:16 2009 +0200
@@ -20,7 +20,7 @@
 
 //  INCLUDES
 #include <e32base.h>
-#include <BrCtlDefs.h>
+#include <brctldefs.h>
 #include <http/rhttpsession.h>
 #include <stringpool.h>
 
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/cache/inc/HttpCacheManager.h
--- a/webengine/osswebengine/cache/inc/HttpCacheManager.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/cache/inc/HttpCacheManager.h	Thu Dec 17 09:20:16 2009 +0200
@@ -21,7 +21,7 @@
 //  INCLUDES
 #include <e32base.h>
 #include <CenRepNotifyHandler.h>
-#include <BrCtlDefs.h>
+#include <brctldefs.h>
 #include <http/rhttpsession.h>
 
 // CONSTANTS
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/cache/inc/HttpCachePostponeWriteUtilities.h
--- a/webengine/osswebengine/cache/inc/HttpCachePostponeWriteUtilities.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/cache/inc/HttpCachePostponeWriteUtilities.h	Thu Dec 17 09:20:16 2009 +0200
@@ -69,6 +69,7 @@
     MHttpCacheWriteSource* iSource;
     TInt iBodyPart;
     TBool iDone;
+    TPtrC8  iCurrentBuf; 
     };
 
 
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/cache/src/HttpCacheFileWriteHandler.cpp
--- a/webengine/osswebengine/cache/src/HttpCacheFileWriteHandler.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/cache/src/HttpCacheFileWriteHandler.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -23,7 +23,7 @@
 #include "HttpCachePostponeWriteUtilities.h"
 #include "HttpCacheUtil.h"
 #include "HttpCacheObserver.h"
-#include <HttpCacheManagerInternalCRKeys.h>
+#include <httpcachemanagerinternalcrkeys.h>
 #include <centralrepository.h>
 #include <hal.h>
 #include <f32file.h>
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/cache/src/HttpCacheHandler.cpp
--- a/webengine/osswebengine/cache/src/HttpCacheHandler.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/cache/src/HttpCacheHandler.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -17,7 +17,7 @@
 
 // INCLUDE FILES
 #include "HttpCacheHandler.h"
-#include "HttpCacheManager.h"
+#include "httpcachemanager.h"
 #include "HttpCacheEntry.h"
 #include "HttpCacheLookupTable.h"
 #include "HttpCacheStreamHandler.h"
@@ -32,7 +32,7 @@
 #include <httperr.h>
 #include <s32file.h>
 #include <s32mem.h>
-#include <BrCtlDefs.h>
+#include <brctldefs.h>
 
 // EXTERNAL DATA STRUCTURES
 
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/cache/src/HttpCacheManager.cpp
--- a/webengine/osswebengine/cache/src/HttpCacheManager.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/cache/src/HttpCacheManager.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -16,12 +16,12 @@
 */
 
 // INCLUDE FILES
-#include "HttpCacheManager.h"
+#include "httpcachemanager.h"
 #include "HttpCacheHandler.h"
 #include "HttpCacheUtil.h"
 #include "HttpCacheFileWriteHandler.h"
 #include <CenRepNotifyHandler.h>
-#include <HttpCacheManagerInternalCRKeys.h>
+#include <httpcachemanagerinternalcrkeys.h>
 #include <CoreApplicationUIsSDKCRKeys.h>
 #include <centralrepository.h>
 #include <FeatMgr.h>
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/cache/src/HttpCachePostponeWriteUtilities.cpp
--- a/webengine/osswebengine/cache/src/HttpCachePostponeWriteUtilities.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/cache/src/HttpCachePostponeWriteUtilities.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -99,8 +99,8 @@
     HttpCacheUtil::WriteFormatLog(0, _L("CACHEPOSTPONE: CHttpCacheEntryAsyncWriteHelper::WriteNextBodyBlock called on object %08x for block %d"), this, iBodyPart );
 #endif
 
-    TPtrC8 bufferPtr( iSource->BodyData().GetSegmentData(iBodyPart) );
-    iSource->BodyFile().Write(bufferPtr, iStatus);
+    iCurrentBuf.Set( iSource->BodyData().GetSegmentData(iBodyPart) );    
+    iSource->BodyFile().Write(iCurrentBuf, iStatus);
     }
 
 // -----------------------------------------------------------------------------
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/cache/src/HttpCacheUtil.cpp
--- a/webengine/osswebengine/cache/src/HttpCacheUtil.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/cache/src/HttpCacheUtil.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -25,7 +25,7 @@
 #include <stringpool.h>
 #include <flogger.h>
 #include "TInternetdate.h"
-#include "HttpFilterCommonStringsExt.h"
+#include "httpfiltercommonstringsext.h"
 #include "HttpCacheEntry.h"
 
 // EXTERNAL DATA STRUCTURES
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/npscript/group/bld.inf
--- a/webengine/osswebengine/npscript/group/bld.inf	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/npscript/group/bld.inf	Thu Dec 17 09:20:16 2009 +0200
@@ -16,7 +16,7 @@
 */
 
 #include <platform_paths.hrh>
-#include "../../../../web_plat/browser_platform_api/inc/Browser_platform_variant.hrh"
+#include "../../../../web_plat/browser_platform_api/inc/browser_platform_variant.hrh"
 
 PRJ_PLATFORMS
 DEFAULT
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/npscript/group/npscript.mmp
--- a/webengine/osswebengine/npscript/group/npscript.mmp	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/npscript/group/npscript.mmp	Thu Dec 17 09:20:16 2009 +0200
@@ -20,7 +20,7 @@
 
 #include <platform_paths.hrh>
 #include <data_caging_paths.hrh>
-#include <platform/mw/Browser_platform_variant.hrh>
+#include <platform/mw/browser_platform_variant.hrh>
 
 UID 0x1000008D  0x2000B19E  
 
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/osswebengine/npscript/npscript/npscript.cpp
--- a/webengine/osswebengine/npscript/npscript/npscript.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/osswebengine/npscript/npscript/npscript.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -19,7 +19,7 @@
 // INCLUDE FILES
 #include <e32base.h>
 #include <npruntime.h>
-#include <Browser_platform_variant.hrh>
+#include <browser_platform_variant.hrh>
 
 // EXTERNAL DATA STRUCTURES
 
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/pagescaler/group/minimap.mmp
--- a/webengine/pagescaler/group/minimap.mmp	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/pagescaler/group/minimap.mmp	Thu Dec 17 09:20:16 2009 +0200
@@ -17,7 +17,7 @@
 
 
 #include <platform_paths.hrh>
-#include <platform/mw/Browser_platform_variant.hrh>
+#include <platform/mw/browser_platform_variant.hrh>
 
 TARGET          pagescaler.dll
 TARGETTYPE      dll
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/webkitutils/HistoryProvider/HistoryController.cpp
--- a/webengine/webkitutils/HistoryProvider/HistoryController.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/webkitutils/HistoryProvider/HistoryController.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -19,10 +19,10 @@
 // INCLUDE FILES
 #include <../bidi.h>
 #include "HistoryController.h"
-#include "BrCtlDefs.h"
+#include "brctldefs.h"
 #include "HistoryView.h"
 #include "HistoryEntry.h"
-#include "BrCtlDialogsProvider.h"
+#include "brctldialogsprovider.h"
 
 // EXTERNAL DATA STRUCTURES
 
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/webkitutils/HistoryProvider/HistoryController.h
--- a/webengine/webkitutils/HistoryProvider/HistoryController.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/webkitutils/HistoryProvider/HistoryController.h	Thu Dec 17 09:20:16 2009 +0200
@@ -21,7 +21,7 @@
 
 //  INCLUDES
 #include <e32base.h>
-#include <BrCtlDefs.h>
+#include <brctldefs.h>
 #include "HistoryInterface.h"
 
 // CONSTANTS
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/webkitutils/SqliteSymbian/keywordhash.h
--- a/webengine/webkitutils/SqliteSymbian/keywordhash.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/webkitutils/SqliteSymbian/keywordhash.h	Thu Dec 17 09:20:16 2009 +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 "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: 
+*
+*/
 /* Hash score: 159 */
 static int keywordCode(const char *z, int n){
   static const char zText[537] =
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/webkitutils/SqliteSymbian/parse.h
--- a/webengine/webkitutils/SqliteSymbian/parse.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/webkitutils/SqliteSymbian/parse.h	Thu Dec 17 09:20:16 2009 +0200
@@ -1,3 +1,20 @@
+/*
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: 
+*
+*/
+
 #define TK_SEMI                            1
 #define TK_EXPLAIN                         2
 #define TK_QUERY                           3
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/webkitutils/SqliteSymbian/printf.c
--- a/webengine/webkitutils/SqliteSymbian/printf.c	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/webkitutils/SqliteSymbian/printf.c	Thu Dec 17 09:20:16 2009 +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 "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: 
+*
+*/
 /*
 ** The "printf" code that follows dates from the 1980's.  It is in
 ** the public domain.  The original comments are included here for
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/webkitutils/ToolBar/ToolBar.cpp
--- a/webengine/webkitutils/ToolBar/ToolBar.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/webkitutils/ToolBar/ToolBar.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -31,7 +31,7 @@
 
 #include "ToolBar.h"
 #include "ToolBarButton.h"
-#include "BrCtlDefs.h"
+#include "brctldefs.h"
 
 #include "eikon.hrh"
 
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/webkitutils/ToolBar/ToolBar.h
--- a/webengine/webkitutils/ToolBar/ToolBar.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/webkitutils/ToolBar/ToolBar.h	Thu Dec 17 09:20:16 2009 +0200
@@ -27,7 +27,7 @@
 #include <AknsConstants.h>
 #include <AknsItemID.h>
 #include <AknsConstants.h>
-#include "BrCtlDefs.h"
+#include "brctldefs.h"
 #include <eikmobs.h>
 #include <webkitutils.rsg>
 // CONSTANTS
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/webkitutils/ToolBar/ToolBarButton.cpp
--- a/webengine/webkitutils/ToolBar/ToolBarButton.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/webkitutils/ToolBar/ToolBarButton.cpp	Thu Dec 17 09:20:16 2009 +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>
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/webkitutils/group/WebKitUtils.mmp
--- a/webengine/webkitutils/group/WebKitUtils.mmp	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/webkitutils/group/WebKitUtils.mmp	Thu Dec 17 09:20:16 2009 +0200
@@ -23,7 +23,7 @@
 #include <bldvariant.hrh>
 #include <data_caging_paths.hrh>
 #include <platform_paths.hrh>
-#include <platform/mw/Browser_platform_variant.hrh>
+#include <platform/mw/browser_platform_variant.hrh>
 
 #include "SqliteMacros.mmpi"
 
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/webkitutils/group/bld.inf
--- a/webengine/webkitutils/group/bld.inf	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/webkitutils/group/bld.inf	Thu Dec 17 09:20:16 2009 +0200
@@ -16,7 +16,7 @@
 */
 
 #include <platform_paths.hrh>
-#include "../../../web_plat/browser_platform_api/inc/Browser_platform_variant.hrh"
+#include "../../../web_plat/browser_platform_api/inc/browser_platform_variant.hrh"
 
 #ifdef BRDO_USE_GESTURE_HELPER
 #include "../rt_gesturehelper/group/bld.inf"
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/webkitutils/rt_gesturehelper/group/bld.inf
--- a/webengine/webkitutils/rt_gesturehelper/group/bld.inf	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/webkitutils/rt_gesturehelper/group/bld.inf	Thu Dec 17 09:20:16 2009 +0200
@@ -18,7 +18,7 @@
 
 
 #include <platform_paths.hrh>
-#include "../../../../web_plat/browser_platform_api/inc/Browser_platform_variant.hrh"
+#include "../../../../web_plat/browser_platform_api/inc/browser_platform_variant.hrh"
 
 PRJ_PLATFORMS
 DEFAULT
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/webkitutils/rt_gesturehelper/rom/rt_gesturehelper.iby
--- a/webengine/webkitutils/rt_gesturehelper/rom/rt_gesturehelper.iby	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/webkitutils/rt_gesturehelper/rom/rt_gesturehelper.iby	Thu Dec 17 09:20:16 2009 +0200
@@ -19,7 +19,7 @@
 #ifndef _RT_GESTUREHELPER_IBY_
 #define _RT_GESTUREHELPER_IBY_
 
-#include <platform/mw/Browser_platform_variant.hrh>
+#include <platform/mw/browser_platform_variant.hrh>
 
 #ifdef BRDO_USE_GESTURE_HELPER
 
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/widgetbackuprestore/group/WidgetBackupRestore.mmp
--- a/webengine/widgetbackuprestore/group/WidgetBackupRestore.mmp	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/widgetbackuprestore/group/WidgetBackupRestore.mmp	Thu Dec 17 09:20:16 2009 +0200
@@ -25,7 +25,7 @@
 #include <bldvariant.hrh>
 #include <data_caging_paths.hrh>
 #include <platform_paths.hrh>
-#include <platform/mw/Browser_platform_variant.hrh>
+#include <platform/mw/browser_platform_variant.hrh>
 
 // Capability assignment.
 CAPABILITY      CAP_APPLICATION AllFiles -Location
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/widgetbackuprestore/group/bld.inf
--- a/webengine/widgetbackuprestore/group/bld.inf	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/widgetbackuprestore/group/bld.inf	Thu Dec 17 09:20:16 2009 +0200
@@ -16,7 +16,7 @@
 */
 
 #include <platform_paths.hrh>
-#include "../../../web_plat/browser_platform_api/inc/Browser_platform_variant.hrh"
+#include "../../../web_plat/browser_platform_api/inc/browser_platform_variant.hrh"
 
 PRJ_PLATFORMS
 DEFAULT GCCE
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/widgetengine/group/WidgetEngine.mmp
--- a/webengine/widgetengine/group/WidgetEngine.mmp	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/widgetengine/group/WidgetEngine.mmp	Thu Dec 17 09:20:16 2009 +0200
@@ -22,7 +22,7 @@
 #include <bldvariant.hrh>
 #include <data_caging_paths.hrh>
 #include <platform_paths.hrh>
-#include <platform/mw/Browser_platform_variant.hrh>
+#include <platform/mw/browser_platform_variant.hrh>
 
 MW_LAYER_SYSTEMINCLUDE
 USERINCLUDE ../../osswebengine/Webkit/S60/WebView
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/widgetengine/group/bld.inf
--- a/webengine/widgetengine/group/bld.inf	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/widgetengine/group/bld.inf	Thu Dec 17 09:20:16 2009 +0200
@@ -16,7 +16,7 @@
 */
 
 #include <platform_paths.hrh>
-#include "../../../web_plat/browser_platform_api/inc/Browser_platform_variant.hrh"
+#include "../../../web_plat/browser_platform_api/inc/browser_platform_variant.hrh"
 
 PRJ_PLATFORMS
 DEFAULT
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/widgetengine/inc/MenuClient.h
--- a/webengine/widgetengine/inc/MenuClient.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/widgetengine/inc/MenuClient.h	Thu Dec 17 09:20:16 2009 +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"
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/widgetengine/inc/MenuItemClient.h
--- a/webengine/widgetengine/inc/MenuItemClient.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/widgetengine/inc/MenuItemClient.h	Thu Dec 17 09:20:16 2009 +0200
@@ -20,7 +20,7 @@
 
 //  INCLUDES
 #include <e32base.h>
-#include "BrCtlInterface.h"
+#include "brctlinterface.h"
 
 // CONSTANTS
 
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/widgetengine/inc/WidgetClient.h
--- a/webengine/widgetengine/inc/WidgetClient.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/widgetengine/inc/WidgetClient.h	Thu Dec 17 09:20:16 2009 +0200
@@ -20,7 +20,7 @@
 
 //  INCLUDES
 #include <e32base.h>
-#include "BrCtlInterface.h"
+#include "brctlinterface.h"
 #include "WidgetCallbacks.h"
 #include "WidgetEngineCallbacks.h"
 
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/widgetengine/inc/WidgetEngineBridge.h
--- a/webengine/widgetengine/inc/WidgetEngineBridge.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/widgetengine/inc/WidgetEngineBridge.h	Thu Dec 17 09:20:16 2009 +0200
@@ -24,7 +24,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"
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/widgetengine/src/WidgetEngineBridge.cpp
--- a/webengine/widgetengine/src/WidgetEngineBridge.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/widgetengine/src/WidgetEngineBridge.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -25,7 +25,7 @@
 #include <eikmenub.h>
 #include <gdi.h>
 #include <bitdev.h>
-#include "BrCtlInterface.h"
+#include "brctlinterface.h"
 #include "WidgetEngineCallbacks.h"
 
 #include "WidgetClient.h"
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/widgetengine/src/Wrt.cpp
--- a/webengine/widgetengine/src/Wrt.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/widgetengine/src/Wrt.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -21,7 +21,7 @@
 
 #include "Wrt.h"
 #include "WrtPlatform.h"
-#include <CUserAgent.h>
+#include <cuseragent.h>
 //#include "WrtFuncs.h"
 
 // EXTERNAL DATA STRUCTURES
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/widgetinstaller/Inc/WidgetBackupRegistryXml.h
--- a/webengine/widgetinstaller/Inc/WidgetBackupRegistryXml.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/widgetinstaller/Inc/WidgetBackupRegistryXml.h	Thu Dec 17 09:20:16 2009 +0200
@@ -1,32 +1,30 @@
 /*
-* ==============================================================================
-*  Name        : WidgetRegistryXml.h
-*  Part of     : Widget Registry
-*  Interface   : Widget Registry API
-*  Description : This file contains the header file of the CWidgetBackupRegistryXml class.
+* Copyright (c) 2008 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:  This file contains the header file of the CWidgetBackupRegistryXml class.
 *
 *                This class processes persistent registry data in XML.
-*  Version     : %version: 7 %
 *
-*  Copyright © 2008 Nokia Corporation.
-*  This material, including documentation and any related
-*  computer programs, is protected by copyright controlled by
-*  Nokia Corporation. All rights are reserved. Copying,
-*  including reproducing, storing, adapting or translating, any
-*  or all of this material requires the prior written consent of
-*  Nokia Corporation. This material also contains confidential
-*  information which may not be disclosed to others without the
-*  prior written consent of Nokia Corporation.
-* ==============================================================================
 */
 
+
 #ifndef WIDGETBACKUPREGISTRYXML_H
 #define WIDGETBACKUPREGISTRYXML_H
 
 // INCLUDES
 #include <libxml2_tree.h>
-#include "WidgetRegistryConstants.h"
-#include "WidgetPropertyValue.h"
+#include "widgetregistryconstants.h"
+#include "widgetpropertyvalue.h"
 
 class RFs;
 /**
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/widgetinstaller/Inc/WidgetConfigHandler.h
--- a/webengine/widgetinstaller/Inc/WidgetConfigHandler.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/widgetinstaller/Inc/WidgetConfigHandler.h	Thu Dec 17 09:20:16 2009 +0200
@@ -21,8 +21,8 @@
 
 // INCLUDES
 #include <libxml2_tree.h>
-#include <WidgetRegistryConstants.h>
-#include <WidgetPropertyValue.h>
+#include <widgetregistryconstants.h>
+#include <widgetpropertyvalue.h>
 
 // FORWARD DECLARATION
 
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/widgetinstaller/Inc/WidgetInstaller.h
--- a/webengine/widgetinstaller/Inc/WidgetInstaller.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/widgetinstaller/Inc/WidgetInstaller.h	Thu Dec 17 09:20:16 2009 +0200
@@ -23,7 +23,7 @@
 
 //  INCLUDES
 #include <e32base.h>
-#include <WidgetRegistryClient.h>
+#include <widgetregistryclient.h>
 #ifdef _DEBUG
 #include <flogger.h>
 #endif
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/widgetinstaller/Src/WidgetBackupRegistryXml.cpp
--- a/webengine/widgetinstaller/Src/WidgetBackupRegistryXml.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/widgetinstaller/Src/WidgetBackupRegistryXml.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -1,24 +1,20 @@
-//
-// ==============================================================================
-//  Name        : WidgetBackupRegistryXml.cpp
-//  Part of     : WidgetRegistry
-//  Interface   :
-//  Description : Processes registry persistent data in XML.
-//  Version     : 5.0
-//
-//  Copyright © 2008 Nokia Corporation.
-//  This material, including documentation and any related
-//  computer programs, is protected by copyright controlled by
-//  Nokia Corporation. All rights are reserved. Copying,
-//  including reproducing, storing, adapting or translating, any
-//  or all of this material requires the prior written consent of
-//  Nokia Corporation. This material also contains confidential
-//  information which may not be disclosed to others without the
-//  prior written consent of Nokia Corporation.
-// ==============================================================================
-///
+/*
+* Copyright (c) 2008 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:  Processes registry persistent data in XML.
+*
+*/
 
-// INCLUDE FILES
 
 #include <e32base.h>
 #include <f32file.h>
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/widgetinstaller/Src/WidgetConfigHandler.cpp
--- a/webengine/widgetinstaller/Src/WidgetConfigHandler.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/widgetinstaller/Src/WidgetConfigHandler.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -25,7 +25,7 @@
 #include "SWInstWidgetUid.h"
 #include "WidgetInstallerInternalCRKeys.h"
 #include <charconv.h>
-#include <WidgetRegistryConstants.h>
+#include <widgetregistryconstants.h>
 
 
 // DTD
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/widgetinstaller/Src/WidgetInstaller.cpp
--- a/webengine/widgetinstaller/Src/WidgetInstaller.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/widgetinstaller/Src/WidgetInstaller.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -28,7 +28,7 @@
 #include <libxml2_parser.h>
 #include <libxml2_tree.h>
 
-#include "Browser_platform_variant.hrh"
+#include "browser_platform_variant.hrh"
 
 #ifdef BRDO_SYMBIAN_LIBXML_FF
 #include <xmlengxestd.h>
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/widgetinstaller/Src/WidgetRegistrationManager.cpp
--- a/webengine/widgetinstaller/Src/WidgetRegistrationManager.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/widgetinstaller/Src/WidgetRegistrationManager.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -20,8 +20,12 @@
 #include "WidgetInstaller.h"
 #include <apgcli.h>
 #include <APGICNFL.h>
+#ifdef SYMBIAN_ENABLE_SPLIT_HEADERS
+#include <apgicnflpartner.h>
+//#include <apgicnflinternal.h> // missing 
+#endif
 #include <S32MEM.H>
-#include <WidgetRegistryData.h>
+#include <widgetregistrydata.h>
 
 // CONSTANTS
 _LIT(KMBMExt, ".mbm");
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/widgetinstaller/group/WidgetInstaller.mmp
--- a/webengine/widgetinstaller/group/WidgetInstaller.mmp	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/widgetinstaller/group/WidgetInstaller.mmp	Thu Dec 17 09:20:16 2009 +0200
@@ -25,7 +25,7 @@
 #include <bldvariant.hrh>
 #include <data_caging_paths.hrh>
 #include <platform_paths.hrh>
-#include <platform/mw/Browser_platform_variant.hrh>
+#include <platform/mw/browser_platform_variant.hrh>
 
 
 // Capability assignment.
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/widgetinstaller/group/bld.inf
--- a/webengine/widgetinstaller/group/bld.inf	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/widgetinstaller/group/bld.inf	Thu Dec 17 09:20:16 2009 +0200
@@ -16,7 +16,7 @@
 */
 
 #include <platform_paths.hrh>
-#include "../../../web_plat/browser_platform_api/inc/Browser_platform_variant.hrh"
+#include "../../../web_plat/browser_platform_api/inc/browser_platform_variant.hrh"
 
 PRJ_PLATFORMS
 DEFAULT GCCE
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/widgetmemoryplugin/group/widgetmemoryplugin.mmp
--- a/webengine/widgetmemoryplugin/group/widgetmemoryplugin.mmp	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/widgetmemoryplugin/group/widgetmemoryplugin.mmp	Thu Dec 17 09:20:16 2009 +0200
@@ -22,7 +22,7 @@
 #include <bldvariant.hrh>
 #include <data_caging_paths.hrh>
 #include <platform_paths.hrh>
-#include <platform/mw/Browser_platform_variant.hrh>
+#include <platform/mw/browser_platform_variant.hrh>
 
 CAPABILITY      CAP_ECOM_PLUGIN
 VENDORID        VID_DEFAULT
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/widgetregistry/Client/src/WidgetRegistryClient.cpp
--- a/webengine/widgetregistry/Client/src/WidgetRegistryClient.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/widgetregistry/Client/src/WidgetRegistryClient.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -19,7 +19,7 @@
 #include <e32base.h>
 #include <f32file.h>
 #include <s32mem.h>
-#include "WidgetRegistryClient.h"
+#include "widgetregistryclient.h"
 
 
 // ============================================================================
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/widgetregistry/Rom/WidgetRegistry.iby
--- a/webengine/widgetregistry/Rom/WidgetRegistry.iby	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/widgetregistry/Rom/WidgetRegistry.iby	Thu Dec 17 09:20:16 2009 +0200
@@ -19,7 +19,7 @@
 #ifndef __WIDGETREGISTRY_IBY__
 #define __WIDGETREGISTRY_IBY__
 
-#include <platform/mw/Browser_platform_variant.hrh>
+#include <platform/mw/browser_platform_variant.hrh>
 
 // app exe
 S60_APP_EXE(WidgetRegistry)
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/widgetregistry/Server/inc/UidAllocator.h
--- a/webengine/widgetregistry/Server/inc/UidAllocator.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/widgetregistry/Server/inc/UidAllocator.h	Thu Dec 17 09:20:16 2009 +0200
@@ -20,7 +20,7 @@
 #define UIDALLOCATOR_H
 
 // INCLUDE FILES
-#include "WidgetRegistryConstants.h"
+#include "widgetregistryconstants.h"
 
 /**
  * This class allows clients to allocate a UID from a given range.
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/widgetregistry/Server/inc/WidgetEntry.h
--- a/webengine/widgetregistry/Server/inc/WidgetEntry.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/widgetregistry/Server/inc/WidgetEntry.h	Thu Dec 17 09:20:16 2009 +0200
@@ -22,7 +22,7 @@
 #define WIDGETENTRY_H
 
 // INCLUDES
-#include "WidgetPropertyValue.h"
+#include "widgetpropertyvalue.h"
 #include "WidgetRegistryXml.h"
 
 // FORWARD DECLARATIONS
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/widgetregistry/Server/inc/WidgetMMCHandler.h
--- a/webengine/widgetregistry/Server/inc/WidgetMMCHandler.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/widgetregistry/Server/inc/WidgetMMCHandler.h	Thu Dec 17 09:20:16 2009 +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 the License "Eclipse Public License v1.0"
+* under the terms of "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
@@ -23,6 +23,7 @@
 #include <e32std.h>
 #include <e32base.h>
 #include <f32file.h>
+#include <apgnotif.h>
 #include "WidgetRegistryLog.h"
 
 // FORWARD DECLARATION
@@ -33,7 +34,7 @@
  *
  * @since 3.1
  */
-class CWidgetMMCHandler : public CActive
+class CWidgetMMCHandler : public CActive, public MApaAppListServObserver
     {
 public:
 
@@ -42,6 +43,9 @@
     virtual ~CWidgetMMCHandler();
 
     void Start();
+    
+    //from MApaAppListServObserver
+    void HandleAppListEvent(TInt aEvent);
 
 protected:
 
@@ -68,6 +72,10 @@
     RFs iFs;
 
     TInt iDriveFlags;
+    
+    TInt iDeltaDriveFlags;
+    
+    CApaAppListNotifier* iApaAppListNotifier;
 
 public:
 
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/widgetregistry/Server/inc/WidgetRegistry.h
--- a/webengine/widgetregistry/Server/inc/WidgetRegistry.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/widgetregistry/Server/inc/WidgetRegistry.h	Thu Dec 17 09:20:16 2009 +0200
@@ -23,11 +23,10 @@
 // INCLUDES
 #include <e32hashtab.h>
 #include <apgcli.h>
-#include <Browser_platform_variant.hrh>
-#include <apgnotif.h>
-#include "WidgetRegistryData.h"
-#include "WidgetRegistryConstants.h"
-#include "WidgetPropertyValue.h"
+#include <browser_platform_variant.hrh>
+#include "widgetregistrydata.h"
+#include "widgetregistryconstants.h"
+#include "widgetpropertyvalue.h"
 #include "WidgetRegistryLog.h"
 
 // CONSTANTS
@@ -37,6 +36,7 @@
 
 // FORWARD DECLARATIONS
 class RFs;
+class CWidgetMMCHandler;
 class CWidgetEntry;
 class CWidgetInstaller;
 class CWidgetRegistryXml;
@@ -58,7 +58,7 @@
 *  @since 3.1
 */
 
-class CWidgetRegistry : public CBase, public MApaAppListServObserver
+class CWidgetRegistry : public CBase
     {
 public:
     /**
@@ -214,10 +214,7 @@
      * Returns security policyId.
      */
      TInt SecurityPolicyId() { return FetchSecurityPolicyIdL(); }
-
-		//from MApaAppListServObserver
-		void HandleAppListEvent(TInt aEvent);
-
+     
 private:
 
     /**
@@ -234,6 +231,11 @@
      * Get widget entry with a particular UId
      */
     TInt GetWidgetEntry( const TUid& aUid, CWidgetEntry*& aEntry ) const;
+    
+    /**
+     * Get widget entry with a particular UId
+     */
+    TInt GetWidgetOldEntry( const TUid& aUid, CWidgetEntry*& aEntry ) const;
 
     /**
      * Get widget entry with a particular bundle Id
@@ -355,6 +357,7 @@
     RWidgetArray                iEntries;
     RUidArray                   iUsedUids;
     RFs                         iFs; // not owned
+    RPointerArray<CWidgetEntry>        iOldEntries; // Hold the earlier entries from iEntries
 
     // added for validation purpose
     RApaLsSession               iAppArch;
@@ -367,9 +370,9 @@
 
     // map of language code to lproj dir
     RPtrHashMap<TInt,HBufC8>    iLangDirList;
+    CWidgetMMCHandler*          iMMCHandler;
     TInt                        iPolicyId;
     CWidgetRegistryXml*         iXmlProcessor;
-    CApaAppListNotifier* iApaAppListNotifier;
 public:
     LOG_MEMBER_VARS
     };
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/widgetregistry/Server/inc/WidgetRegistryServer.h
--- a/webengine/widgetregistry/Server/inc/WidgetRegistryServer.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/widgetregistry/Server/inc/WidgetRegistryServer.h	Thu Dec 17 09:20:16 2009 +0200
@@ -23,7 +23,7 @@
 #define WIDGETREGISTRYSERVER_H
 
 // INCLUDES
-#include <WidgetRegistryConstants.h>
+#include <widgetregistryconstants.h>
 
 // FORWARD DECLARATIONS
 
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/widgetregistry/Server/inc/WidgetRegistrySession.h
--- a/webengine/widgetregistry/Server/inc/WidgetRegistrySession.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/widgetregistry/Server/inc/WidgetRegistrySession.h	Thu Dec 17 09:20:16 2009 +0200
@@ -22,7 +22,7 @@
 #define WIDGETREGISTRYSESSION_H
 
 // INCLUDES
-#include "WidgetRegistryData.h"
+#include "widgetregistrydata.h"
 
 // FORWARD DECLARATIONS
 
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/widgetregistry/Server/inc/WidgetRegistryXml.h
--- a/webengine/widgetregistry/Server/inc/WidgetRegistryXml.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/widgetregistry/Server/inc/WidgetRegistryXml.h	Thu Dec 17 09:20:16 2009 +0200
@@ -23,8 +23,8 @@
 
 // INCLUDES
 #include <libxml2_tree.h>
-#include "WidgetRegistryConstants.h"
-#include "WidgetPropertyValue.h"
+#include "widgetregistryconstants.h"
+#include "widgetpropertyvalue.h"
 
 class RFs;
 /**
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/widgetregistry/Server/src/WidgetEntry.cpp
--- a/webengine/widgetregistry/Server/src/WidgetEntry.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/widgetregistry/Server/src/WidgetEntry.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -17,7 +17,7 @@
 */
 
 #include "WidgetEntry.h"
-#include "WidgetRegistryConstants.h"
+#include "widgetregistryconstants.h"
 #include <s32file.h>
 #include <f32file.h>
 #include <APGTASK.H>
@@ -174,9 +174,10 @@
         {
         User::Leave( KErrCorrupt );
         }
-
+    // Read only until the ENokiaWidget for the 3.2 widgets 
+    TInt propertyIdCount =  (*this)[EWidgetPropertyListVersion] == KWidgetPropertyListVersion32 ? ENokiaWidget+1 : EWidgetPropertyIdCount; 
     // fill property values array
-    for ( TInt i = 1; i < EWidgetPropertyIdCount; ++i )
+    for ( TInt i = 1; i < propertyIdCount; ++i )
         {
         (*this)[i].DeserializeL( aReadStream );
         }
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/widgetregistry/Server/src/WidgetMMCHandler.cpp
--- a/webengine/widgetregistry/Server/src/WidgetMMCHandler.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/widgetregistry/Server/src/WidgetMMCHandler.cpp	Thu Dec 17 09:20:16 2009 +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 the License "Eclipse Public License v1.0"
+* under the terms of "Eclipse Public License v1.0"
 * which accompanies this distribution, and is available
 * at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
@@ -76,6 +76,8 @@
         {
         iDriveFlags = 0;
         }
+    iDeltaDriveFlags = 0;
+    iApaAppListNotifier = CApaAppListNotifier::NewL(this,CActive::EPriorityStandard);
     }
 
 // ============================================================================
@@ -122,34 +124,10 @@
             LOG1( " iDriveFlags 0x%x", iDriveFlags );
             LOG1( "  driveFlags 0x%x", driveFlags );
             deltaDriveFlags = iDriveFlags ^ driveFlags;
+            iDeltaDriveFlags = deltaDriveFlags;
             LOG1( " deltaDriveFlags 0x%x", deltaDriveFlags );
             iDriveFlags = driveFlags;
           }
-        if ( deltaDriveFlags )
-          {
-            LOG( " mmc start internalize" );
-
-            LOG( " delay for appArch to sync with card" );
-            // delay for appArch to sync with card (if don't wait then
-            // when query AppArch about installed widgets, it doesn't
-            // report any on card)
-            User::After( 8000000 ); // 8 sec in microseconds
-
-            TBool dirtyFlag = EFalse;
-            TRAPD( error,
-                   iRegistry->InternalizeL( dirtyFlag ) );
-            LOG1( " mmc end internalize, error %d", error );
-            if ( KErrNone == error )
-                {
-                LOG( " mmc notification internalize completed" );
-                // internalize consistency enforcement may have altered
-                // registry
-                if ( dirtyFlag )
-                    {
-                    TRAP_IGNORE( iRegistry->ExternalizeL(); );
-                    }
-                }
-          }
       }
     LOG( "MMC notification done" );
     LOG_CLOSE;
@@ -232,3 +210,28 @@
     LOG_CLOSE;
     return error;
     }
+
+void CWidgetMMCHandler::HandleAppListEvent(TInt aEvent)
+    {
+    TBool dirtyFlag = EFalse;
+    TInt parseError = KErrNone;
+    
+    if ( iDeltaDriveFlags )
+        {
+        // Assume usual case and things are consistent
+        // and the registry entry file can be parsed and used.
+        TRAPD( error, iRegistry->InternalizeL( ETrue,
+                                    ETrue,
+                                    dirtyFlag,
+                                    parseError ) );
+        if ( KErrNone == error )
+            {
+            // internalize consistency enforcement may have altered registry
+            if ( dirtyFlag )
+                {
+                TRAP_IGNORE( iRegistry->ExternalizeL(); );
+                }
+            }
+        iDeltaDriveFlags = 0;
+        }
+    }
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/widgetregistry/Server/src/WidgetRegistry.cpp
--- a/webengine/widgetregistry/Server/src/WidgetRegistry.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/widgetregistry/Server/src/WidgetRegistry.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -29,6 +29,7 @@
 #include <libc/stdlib.h>
 #include <libxml2_parser.h>
 #include <libxml2_tree.h>
+#include "WidgetMMCHandler.h"
 #include <xmlengxestd.h>
 #include "UidAllocator.h"
 #if defined( BRDO_WRT_SECURITY_MGR_FF )
@@ -183,13 +184,14 @@
 CWidgetRegistry::~CWidgetRegistry()
     {
     iEntries.ResetAndDestroy();
+    iOldEntries.ResetAndDestroy();
     iUsedUids.Close();
     // iFs not owned
     iAppArch.Close();
     delete iInstaller;
     iLangDirList.ResetAndDestroy();
+    delete iMMCHandler;
     delete iXmlProcessor;
-	delete iApaAppListNotifier;
     iFs.Close();
     LOG_DESTRUCT;
     }
@@ -250,7 +252,8 @@
     LOG1( "ConstructL internalize done, registry count %d",
               iEntries.Count() );
     LOG_CLOSE;
-    iApaAppListNotifier = CApaAppListNotifier::NewL(this,CActive::EPriorityStandard);
+    iMMCHandler = CWidgetMMCHandler::NewL( *this, iFs );
+    iMMCHandler->Start();
     }
 
 // ============================================================================
@@ -384,6 +387,29 @@
     }
 
 // ============================================================================
+// CWidgetRegistry::GetWidgetOldEntry()
+// Get the widget entry from iOldEntrys array
+//
+// @since 3.1
+// ============================================================================
+//
+TInt CWidgetRegistry::GetWidgetOldEntry(
+    const TUid& aUid,
+    CWidgetEntry*& aEntry) const
+    {
+    for(TInt i = 0;i < iOldEntries.Count();i++)
+        {
+        CWidgetEntry* entry = iOldEntries[i];
+        if ( TUid::Uid( (*entry)[EUid] ) == aUid )
+            {
+            aEntry = entry;
+            return i;
+            }
+        }
+    return -1;
+    }
+
+// ============================================================================
 // CWidgetRegistry::GetWidgetEntry()
 // Get the widget entry
 //
@@ -527,9 +553,15 @@
     // internal dirty flag, will be copied to arg dirty flag at
     // end if no leave occurs
     TBool dirtyFlag = EFalse;
-
-    // empty the registry
-    iEntries.ResetAndDestroy();
+    
+    // Copy the entries so we are able to use them later
+    // iOldEntries owns the data and is responcible to ResetAndDestroy()
+    for ( TInt i = 0; i < iEntries.Count(); i++ )
+        {
+        iOldEntries.Append( iEntries[i] );
+        }
+    // Only reset here as the iOldEntries owns the data
+    iEntries.Reset();
     iUsedUids.Reset();
 
     CleanupClosePushL( appArchList );
@@ -682,6 +714,8 @@
     CleanupStack::PopAndDestroy( 2, &appArchList );//appArchListFlags, appArchList
 
     aDirtyFlag = dirtyFlag;
+    // Reset and Destroy entries in iOldEntries array
+    iOldEntries.ResetAndDestroy();
     LOG1( "Internalize done, dirty flag %d", (TInt)dirtyFlag );
     LOG_CLOSE;
     }
@@ -712,15 +746,15 @@
     readStream.Attach( file );
 
     TInt error = KErrNone;
-    TInt entryCount = 0;
+    TInt entryCount = 0,errorCount =0;
     TRAP( error, entryCount = readStream.ReadInt32L() );
     // TODO should limit entryCount to something like 1024
     // for each entry in the registry file
     for ( TInt i = 0 ; i < entryCount; i++ )
         {
         CWidgetEntry* entry = CWidgetEntry::NewL();
-        CleanupStack::PushL( entry );
-
+        // push as delete entry so if we leave it will be handled
+        CleanupDeletePushL( entry );
         // extract one entry
         TRAP( error,
               entry->InternalizeBinaryL( readStream ) );
@@ -764,6 +798,12 @@
                               uidInt, uidInt );
                     }
                 }
+            else
+                {
+                // Pop and delete the un-needed entry so it is not left behind.
+                errorCount++; 
+                CleanupStack::PopAndDestroy( entry );                
+                }
             }
         else
             {
@@ -773,6 +813,10 @@
         } // for
 
     CleanupStack::PopAndDestroy( 2, &file ); // readStream, file
+    if ( errorCount != 0 )
+        {
+        User::Leave(KErrGeneral);
+        }
     }
 
 // ============================================================================
@@ -867,7 +911,16 @@
                                                   aDirtyFlag );
                         }
                     if ( NULL != entry )
-                        {
+                        { 
+                        CWidgetEntry* entry1 = NULL;
+                        TInt uid = (*entry)[EUid];
+                        TInt pos  = GetWidgetOldEntry( TUid::Uid( uid ), entry1 );
+                        if ( pos != -1 )
+                            {
+                            entry->SetActive((iOldEntries[pos]->ActiveL()));
+                            entry->SetFullView((iOldEntries[pos]->GetFullViewState()));
+                            entry->SetMiniView((iOldEntries[pos]->GetMiniViewState()));
+                            }
                         TRAP( error, InsertL( entry ) );
                         if ( KErrNone != error )
                             {
@@ -2244,24 +2297,4 @@
         }
     LOG( "AppArchListConsistency done" );
     }
-
-void CWidgetRegistry::HandleAppListEvent(TInt aEvent)
-    {
-    TBool dirtyFlag = EFalse;
-    TInt parseError = KErrNone;
-    // Assume usual case and things are consistent
-    // and the registry entry file can be parsed and used.
-    TRAPD( error, InternalizeL( EFalse,
-                                EFalse,
-                                dirtyFlag,
-                                parseError ) );
-    if ( KErrNone == error )
-        {
-        // internalize consistency enforcement may have altered registry
-        if ( dirtyFlag )
-            {
-            TRAP_IGNORE( ExternalizeL(); );
-            }
-        }
-    }
 // End of File
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/widgetregistry/Server/src/WidgetRegistryServer.cpp
--- a/webengine/widgetregistry/Server/src/WidgetRegistryServer.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/widgetregistry/Server/src/WidgetRegistryServer.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -19,7 +19,7 @@
 #include <e32base.h>
 #include <w32std.h>
 #include <apgcli.h>
-#include "WidgetRegistryConstants.h"
+#include "widgetregistryconstants.h"
 #include "widgetregistryserver.h"
 #include "widgetregistrysession.h"
 
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/widgetregistry/Server/src/WidgetRegistrySession.cpp
--- a/webengine/widgetregistry/Server/src/WidgetRegistrySession.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/widgetregistry/Server/src/WidgetRegistrySession.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -20,9 +20,9 @@
 
 // User includes
 #include "WidgetRegistry.h"
-#include "WidgetRegistryConstants.h"
+#include "widgetregistryconstants.h"
 #include "widgetregistryserver.h"
-#include "WidgetRegistryConstants.h"
+#include "widgetregistryconstants.h"
 #include "WidgetRegistrySession.h"
 
 
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/widgetregistry/group/BLD.INF
--- a/webengine/widgetregistry/group/BLD.INF	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/widgetregistry/group/BLD.INF	Thu Dec 17 09:20:16 2009 +0200
@@ -16,7 +16,7 @@
 */
 
 #include <platform_paths.hrh>
-#include "../../../web_plat/browser_platform_api/inc/Browser_platform_variant.hrh"
+#include "../../../web_plat/browser_platform_api/inc/browser_platform_variant.hrh"
 
 PRJ_PLATFORMS
 DEFAULT
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/widgetregistry/group/WidgetRegistryClient.mmp
--- a/webengine/widgetregistry/group/WidgetRegistryClient.mmp	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/widgetregistry/group/WidgetRegistryClient.mmp	Thu Dec 17 09:20:16 2009 +0200
@@ -24,7 +24,7 @@
 #include <bldvariant.hrh>
 #include <data_caging_paths.hrh>
 #include <platform_paths.hrh>
-#include <platform/mw/Browser_platform_variant.hrh>
+#include <platform/mw/browser_platform_variant.hrh>
 
 CAPABILITY        CAP_CLIENT_DLL
 VENDORID          VID_DEFAULT
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/widgetregistry/group/WidgetRegistryServer.mmp
--- a/webengine/widgetregistry/group/WidgetRegistryServer.mmp	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/widgetregistry/group/WidgetRegistryServer.mmp	Thu Dec 17 09:20:16 2009 +0200
@@ -23,12 +23,15 @@
 UID             0x1000008d 0x10282F06
 
 EPOCSTACKSIZE   0x5000
+
+#ifndef WINS
 EPOCHEAPSIZE    0x5000 0x1000000
+#endif
 
 #include <bldvariant.hrh>
 #include <data_caging_paths.hrh>
 #include <platform_paths.hrh>
-#include <platform/mw/Browser_platform_variant.hrh>
+#include <platform/mw/browser_platform_variant.hrh>
 
 VENDORID        VID_DEFAULT
 CAPABILITY      CAP_SERVER AllFiles
@@ -41,6 +44,7 @@
 SOURCE WidgetRegistrySession.cpp
 SOURCE WidgetRegistryServer.cpp
 SOURCE UidAllocator.cpp
+SOURCE WidgetMMCHandler.cpp
 
 USERINCLUDE       ../Server/inc
 USERINCLUDE       ../Common/inc
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/widgetregistry/tsrc/public/basic/inc/WidgetRegistrySTIF.h
--- a/webengine/widgetregistry/tsrc/public/basic/inc/WidgetRegistrySTIF.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/widgetregistry/tsrc/public/basic/inc/WidgetRegistrySTIF.h	Thu Dec 17 09:20:16 2009 +0200
@@ -21,7 +21,7 @@
 #define WIDGETREGISTRYSTIF_H
 
 // INCLUDES
-#include <WidgetRegistryClient.h>
+#include <widgetregistryclient.h>
 #include <StifTestModule.h>
 #include <StifLogger.h>
 #include <f32file.h>
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/wmlengine/group/BLD.INF
--- a/webengine/wmlengine/group/BLD.INF	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/wmlengine/group/BLD.INF	Thu Dec 17 09:20:16 2009 +0200
@@ -17,7 +17,7 @@
 
 
 #include <platform_paths.hrh>
-#include "../../../web_plat/browser_platform_api/inc/Browser_platform_variant.hrh"
+#include "../../../web_plat/browser_platform_api/inc/browser_platform_variant.hrh"
 
 PRJ_PLATFORMS
 DEFAULT 
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/wmlengine/group/Msg/Msg.mmp
--- a/webengine/wmlengine/group/Msg/Msg.mmp	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/wmlengine/group/Msg/Msg.mmp	Thu Dec 17 09:20:16 2009 +0200
@@ -16,7 +16,7 @@
 */
 
 #include <platform_paths.hrh>
-#include <platform/mw/Browser_platform_variant.hrh>
+#include <platform/mw/browser_platform_variant.hrh>
 
 TARGET          Msg.lib
 TARGETTYPE      lib
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/wmlengine/group/Msg/bld.inf
--- a/webengine/wmlengine/group/Msg/bld.inf	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/wmlengine/group/Msg/bld.inf	Thu Dec 17 09:20:16 2009 +0200
@@ -17,7 +17,7 @@
 
 
 #include <platform_paths.hrh>
-#include "../../../../web_plat/browser_platform_api/inc/Browser_platform_variant.hrh"
+#include "../../../../web_plat/browser_platform_api/inc/browser_platform_variant.hrh"
 
 PRJ_PLATFORMS
 DEFAULT 
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/wmlengine/group/Plugin.mmp
--- a/webengine/wmlengine/group/Plugin.mmp	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/wmlengine/group/Plugin.mmp	Thu Dec 17 09:20:16 2009 +0200
@@ -16,7 +16,7 @@
 */
 
 #include <platform_paths.hrh>
-#include <platform/mw/Browser_platform_variant.hrh>
+#include <platform/mw/browser_platform_variant.hrh>
 
 TARGET          Plugin.lib
 TARGETTYPE      lib
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/wmlengine/group/Unicode/Unicode.mmp
--- a/webengine/wmlengine/group/Unicode/Unicode.mmp	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/wmlengine/group/Unicode/Unicode.mmp	Thu Dec 17 09:20:16 2009 +0200
@@ -16,7 +16,7 @@
 */
 
 #include <platform_paths.hrh>
-#include <platform/mw/Browser_platform_variant.hrh>
+#include <platform/mw/browser_platform_variant.hrh>
 
 TARGET          unicode.lib
 TARGETTYPE      lib
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/wmlengine/group/Unicode/bld.inf
--- a/webengine/wmlengine/group/Unicode/bld.inf	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/wmlengine/group/Unicode/bld.inf	Thu Dec 17 09:20:16 2009 +0200
@@ -17,7 +17,7 @@
 
 
 #include <platform_paths.hrh>
-#include "../../../../web_plat/browser_platform_api/inc/Browser_platform_variant.hrh"
+#include "../../../../web_plat/browser_platform_api/inc/browser_platform_variant.hrh"
 
 PRJ_PLATFORMS
 DEFAULT 
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/wmlengine/group/adt/adt.mmp
--- a/webengine/wmlengine/group/adt/adt.mmp	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/wmlengine/group/adt/adt.mmp	Thu Dec 17 09:20:16 2009 +0200
@@ -16,7 +16,7 @@
 */
 
 #include <platform_paths.hrh>
-#include <platform/mw/Browser_platform_variant.hrh>
+#include <platform/mw/browser_platform_variant.hrh>
 
 TARGET          adt.lib
 TARGETTYPE      lib
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/wmlengine/group/adt/bld.inf
--- a/webengine/wmlengine/group/adt/bld.inf	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/wmlengine/group/adt/bld.inf	Thu Dec 17 09:20:16 2009 +0200
@@ -17,7 +17,7 @@
 
 
 #include <platform_paths.hrh>
-#include "../../../../web_plat/browser_platform_api/inc/Browser_platform_variant.hrh"
+#include "../../../../web_plat/browser_platform_api/inc/browser_platform_variant.hrh"
 
 PRJ_PLATFORMS
 DEFAULT 
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/wmlengine/group/browser/bld.inf
--- a/webengine/wmlengine/group/browser/bld.inf	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/wmlengine/group/browser/bld.inf	Thu Dec 17 09:20:16 2009 +0200
@@ -17,7 +17,7 @@
 
 
 #include <platform_paths.hrh>
-#include "../../../../web_plat/browser_platform_api/inc/Browser_platform_variant.hrh"
+#include "../../../../web_plat/browser_platform_api/inc/browser_platform_variant.hrh"
 
 PRJ_PLATFORMS
 DEFAULT 
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/wmlengine/group/browser/browser.mmp
--- a/webengine/wmlengine/group/browser/browser.mmp	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/wmlengine/group/browser/browser.mmp	Thu Dec 17 09:20:16 2009 +0200
@@ -16,7 +16,7 @@
 */
 
 #include <platform_paths.hrh>
-#include <platform/mw/Browser_platform_variant.hrh>
+#include <platform/mw/browser_platform_variant.hrh>
 
 TARGET          RbBrowser.lib
 TARGETTYPE      lib
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/wmlengine/group/css/bld.inf
--- a/webengine/wmlengine/group/css/bld.inf	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/wmlengine/group/css/bld.inf	Thu Dec 17 09:20:16 2009 +0200
@@ -17,7 +17,7 @@
 
 
 #include <platform_paths.hrh>
-#include "../../../../web_plat/browser_platform_api/inc/Browser_platform_variant.hrh"
+#include "../../../../web_plat/browser_platform_api/inc/browser_platform_variant.hrh"
 
 PRJ_PLATFORMS
 DEFAULT 
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/wmlengine/group/css/css.mmp
--- a/webengine/wmlengine/group/css/css.mmp	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/wmlengine/group/css/css.mmp	Thu Dec 17 09:20:16 2009 +0200
@@ -16,7 +16,7 @@
 */
 
 #include <platform_paths.hrh>
-#include <platform/mw/Browser_platform_variant.hrh>
+#include <platform/mw/browser_platform_variant.hrh>
 
 TARGET          css.lib
 TARGETTYPE      lib
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/wmlengine/group/evt/bld.inf
--- a/webengine/wmlengine/group/evt/bld.inf	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/wmlengine/group/evt/bld.inf	Thu Dec 17 09:20:16 2009 +0200
@@ -17,7 +17,7 @@
 
 
 #include <platform_paths.hrh>
-#include "../../../../web_plat/browser_platform_api/inc/Browser_platform_variant.hrh"
+#include "../../../../web_plat/browser_platform_api/inc/browser_platform_variant.hrh"
 
 PRJ_PLATFORMS
 DEFAULT 
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/wmlengine/group/evt/evt.mmp
--- a/webengine/wmlengine/group/evt/evt.mmp	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/wmlengine/group/evt/evt.mmp	Thu Dec 17 09:20:16 2009 +0200
@@ -16,7 +16,7 @@
 */
 
 #include <platform_paths.hrh>
-#include <platform/mw/Browser_platform_variant.hrh>
+#include <platform/mw/browser_platform_variant.hrh>
 
 TARGET          evt.lib
 TARGETTYPE      lib
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/wmlengine/group/fbox/bld.inf
--- a/webengine/wmlengine/group/fbox/bld.inf	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/wmlengine/group/fbox/bld.inf	Thu Dec 17 09:20:16 2009 +0200
@@ -17,7 +17,7 @@
 
 
 #include <platform_paths.hrh>
-#include "../../../../web_plat/browser_platform_api/inc/Browser_platform_variant.hrh"
+#include "../../../../web_plat/browser_platform_api/inc/browser_platform_variant.hrh"
 
 PRJ_PLATFORMS
 DEFAULT 
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/wmlengine/group/fbox/fbox.mmp
--- a/webengine/wmlengine/group/fbox/fbox.mmp	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/wmlengine/group/fbox/fbox.mmp	Thu Dec 17 09:20:16 2009 +0200
@@ -16,7 +16,7 @@
 */
 
 #include <platform_paths.hrh>
-#include <platform/mw/Browser_platform_variant.hrh>
+#include <platform/mw/browser_platform_variant.hrh>
 
 TARGET          fbox.lib
 TARGETTYPE      lib
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/wmlengine/group/fileloader/bld.inf
--- a/webengine/wmlengine/group/fileloader/bld.inf	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/wmlengine/group/fileloader/bld.inf	Thu Dec 17 09:20:16 2009 +0200
@@ -17,7 +17,7 @@
 
 
 #include <platform_paths.hrh>
-#include "../../../../web_plat/browser_platform_api/inc/Browser_platform_variant.hrh"
+#include "../../../../web_plat/browser_platform_api/inc/browser_platform_variant.hrh"
 
 PRJ_PLATFORMS
 DEFAULT 
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/wmlengine/group/fileloader/fileloader.mmp
--- a/webengine/wmlengine/group/fileloader/fileloader.mmp	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/wmlengine/group/fileloader/fileloader.mmp	Thu Dec 17 09:20:16 2009 +0200
@@ -16,7 +16,7 @@
 */
 
 #include <platform_paths.hrh>
-#include <platform/mw/Browser_platform_variant.hrh>
+#include <platform/mw/browser_platform_variant.hrh>
 
 TARGET          fileloader.lib
 TARGETTYPE      lib
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/wmlengine/group/gdi/bld.inf
--- a/webengine/wmlengine/group/gdi/bld.inf	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/wmlengine/group/gdi/bld.inf	Thu Dec 17 09:20:16 2009 +0200
@@ -17,7 +17,7 @@
 
 
 #include <platform_paths.hrh>
-#include "../../../../web_plat/browser_platform_api/inc/Browser_platform_variant.hrh"
+#include "../../../../web_plat/browser_platform_api/inc/browser_platform_variant.hrh"
 
 PRJ_PLATFORMS
 DEFAULT 
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/wmlengine/group/gdi/gdi.mmp
--- a/webengine/wmlengine/group/gdi/gdi.mmp	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/wmlengine/group/gdi/gdi.mmp	Thu Dec 17 09:20:16 2009 +0200
@@ -16,7 +16,7 @@
 */
 
 #include <platform_paths.hrh>
-#include <platform/mw/Browser_platform_variant.hrh>
+#include <platform/mw/browser_platform_variant.hrh>
 
 TARGET          RbGdi.lib
 TARGETTYPE      lib
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/wmlengine/group/hed/bld.inf
--- a/webengine/wmlengine/group/hed/bld.inf	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/wmlengine/group/hed/bld.inf	Thu Dec 17 09:20:16 2009 +0200
@@ -17,7 +17,7 @@
 
 
 #include <platform_paths.hrh>
-#include "../../../../web_plat/browser_platform_api/inc/Browser_platform_variant.hrh"
+#include "../../../../web_plat/browser_platform_api/inc/browser_platform_variant.hrh"
 
 PRJ_PLATFORMS
 DEFAULT 
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/wmlengine/group/hed/hed.mmp
--- a/webengine/wmlengine/group/hed/hed.mmp	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/wmlengine/group/hed/hed.mmp	Thu Dec 17 09:20:16 2009 +0200
@@ -16,7 +16,7 @@
 */
 
 #include <platform_paths.hrh>
-#include <platform/mw/Browser_platform_variant.hrh>
+#include <platform/mw/browser_platform_variant.hrh>
 
 MACRO NOKIA_MOBILE_BROWSER
 #define NOKIA_MOBILE_BROWSER 1
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/wmlengine/group/htmlp/bld.inf
--- a/webengine/wmlengine/group/htmlp/bld.inf	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/wmlengine/group/htmlp/bld.inf	Thu Dec 17 09:20:16 2009 +0200
@@ -17,7 +17,7 @@
 
 
 #include <platform_paths.hrh>
-#include "../../../../web_plat/browser_platform_api/inc/Browser_platform_variant.hrh"
+#include "../../../../web_plat/browser_platform_api/inc/browser_platform_variant.hrh"
 
 PRJ_PLATFORMS
 DEFAULT 
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/wmlengine/group/htmlp/htmlp.mmp
--- a/webengine/wmlengine/group/htmlp/htmlp.mmp	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/wmlengine/group/htmlp/htmlp.mmp	Thu Dec 17 09:20:16 2009 +0200
@@ -16,7 +16,7 @@
 */
 
 #include <platform_paths.hrh>
-#include <platform/mw/Browser_platform_variant.hrh>
+#include <platform/mw/browser_platform_variant.hrh>
 
 TARGET          htmlp.lib
 TARGETTYPE      lib
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/wmlengine/group/image/bld.inf
--- a/webengine/wmlengine/group/image/bld.inf	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/wmlengine/group/image/bld.inf	Thu Dec 17 09:20:16 2009 +0200
@@ -17,7 +17,7 @@
 
 
 #include <platform_paths.hrh>
-#include "../../../../web_plat/browser_platform_api/inc/Browser_platform_variant.hrh"
+#include "../../../../web_plat/browser_platform_api/inc/browser_platform_variant.hrh"
 
 PRJ_PLATFORMS
 DEFAULT 
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/wmlengine/group/image/image.mmp
--- a/webengine/wmlengine/group/image/image.mmp	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/wmlengine/group/image/image.mmp	Thu Dec 17 09:20:16 2009 +0200
@@ -17,7 +17,7 @@
 
 #include <platform_paths.hrh>
 #include <data_caging_paths.hrh>
-#include <platform/mw/Browser_platform_variant.hrh>
+#include <platform/mw/browser_platform_variant.hrh>
 
 TARGET          image.lib
 TARGETTYPE      lib
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/wmlengine/group/imagech/bld.inf
--- a/webengine/wmlengine/group/imagech/bld.inf	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/wmlengine/group/imagech/bld.inf	Thu Dec 17 09:20:16 2009 +0200
@@ -17,7 +17,7 @@
 
 
 #include <platform_paths.hrh>
-#include "../../../../web_plat/browser_platform_api/inc/Browser_platform_variant.hrh"
+#include "../../../../web_plat/browser_platform_api/inc/browser_platform_variant.hrh"
 
 PRJ_PLATFORMS
 DEFAULT 
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/wmlengine/group/imagech/imagech.mmp
--- a/webengine/wmlengine/group/imagech/imagech.mmp	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/wmlengine/group/imagech/imagech.mmp	Thu Dec 17 09:20:16 2009 +0200
@@ -16,7 +16,7 @@
 */
 
 #include <platform_paths.hrh>
-#include <platform/mw/Browser_platform_variant.hrh>
+#include <platform/mw/browser_platform_variant.hrh>
 
 TARGET          imagech.lib
 TARGETTYPE      lib
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/wmlengine/group/lmgr/bld.inf
--- a/webengine/wmlengine/group/lmgr/bld.inf	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/wmlengine/group/lmgr/bld.inf	Thu Dec 17 09:20:16 2009 +0200
@@ -17,7 +17,7 @@
 
 
 #include <platform_paths.hrh>
-#include "../../../../web_plat/browser_platform_api/inc/Browser_platform_variant.hrh"
+#include "../../../../web_plat/browser_platform_api/inc/browser_platform_variant.hrh"
 
 PRJ_PLATFORMS
 DEFAULT 
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/wmlengine/group/lmgr/lmgr.mmp
--- a/webengine/wmlengine/group/lmgr/lmgr.mmp	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/wmlengine/group/lmgr/lmgr.mmp	Thu Dec 17 09:20:16 2009 +0200
@@ -16,7 +16,7 @@
 */
 
 #include <platform_paths.hrh>
-#include <platform/mw/Browser_platform_variant.hrh>
+#include <platform/mw/browser_platform_variant.hrh>
 
 TARGET          lmgr.lib
 TARGETTYPE      lib
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/wmlengine/group/markup/bld.inf
--- a/webengine/wmlengine/group/markup/bld.inf	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/wmlengine/group/markup/bld.inf	Thu Dec 17 09:20:16 2009 +0200
@@ -17,7 +17,7 @@
 
 
 #include <platform_paths.hrh>
-#include "../../../../web_plat/browser_platform_api/inc/Browser_platform_variant.hrh"
+#include "../../../../web_plat/browser_platform_api/inc/browser_platform_variant.hrh"
 
 PRJ_PLATFORMS
 DEFAULT 
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/wmlengine/group/markup/markup.mmp
--- a/webengine/wmlengine/group/markup/markup.mmp	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/wmlengine/group/markup/markup.mmp	Thu Dec 17 09:20:16 2009 +0200
@@ -16,7 +16,7 @@
 */
 
 #include <platform_paths.hrh>
-#include <platform/mw/Browser_platform_variant.hrh>
+#include <platform/mw/browser_platform_variant.hrh>
 
 TARGET          markup.lib
 TARGETTYPE      lib
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/wmlengine/group/object/bld.inf
--- a/webengine/wmlengine/group/object/bld.inf	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/wmlengine/group/object/bld.inf	Thu Dec 17 09:20:16 2009 +0200
@@ -17,7 +17,7 @@
 
 
 #include <platform_paths.hrh>
-#include "../../../../web_plat/browser_platform_api/inc/Browser_platform_variant.hrh"
+#include "../../../../web_plat/browser_platform_api/inc/browser_platform_variant.hrh"
 
 PRJ_PLATFORMS
 DEFAULT 
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/wmlengine/group/object/object.mmp
--- a/webengine/wmlengine/group/object/object.mmp	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/wmlengine/group/object/object.mmp	Thu Dec 17 09:20:16 2009 +0200
@@ -16,7 +16,7 @@
 */
 
 #include <platform_paths.hrh>
-#include <platform/mw/Browser_platform_variant.hrh>
+#include <platform/mw/browser_platform_variant.hrh>
 
 TARGET          object.lib
 TARGETTYPE      lib
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/wmlengine/group/script/bld.inf
--- a/webengine/wmlengine/group/script/bld.inf	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/wmlengine/group/script/bld.inf	Thu Dec 17 09:20:16 2009 +0200
@@ -17,7 +17,7 @@
 
 
 #include <platform_paths.hrh>
-#include "../../../../web_plat/browser_platform_api/inc/Browser_platform_variant.hrh"
+#include "../../../../web_plat/browser_platform_api/inc/browser_platform_variant.hrh"
 
 PRJ_PLATFORMS
 DEFAULT 
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/wmlengine/group/script/script.mmp
--- a/webengine/wmlengine/group/script/script.mmp	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/wmlengine/group/script/script.mmp	Thu Dec 17 09:20:16 2009 +0200
@@ -16,7 +16,7 @@
 */
 
 #include <platform_paths.hrh>
-#include <platform/mw/Browser_platform_variant.hrh>
+#include <platform/mw/browser_platform_variant.hrh>
 
 TARGET          script.lib
 TARGETTYPE      lib
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/wmlengine/group/system/bld.inf
--- a/webengine/wmlengine/group/system/bld.inf	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/wmlengine/group/system/bld.inf	Thu Dec 17 09:20:16 2009 +0200
@@ -17,7 +17,7 @@
 
 
 #include <platform_paths.hrh>
-#include "../../../../web_plat/browser_platform_api/inc/Browser_platform_variant.hrh"
+#include "../../../../web_plat/browser_platform_api/inc/browser_platform_variant.hrh"
 
 PRJ_PLATFORMS
 DEFAULT 
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/wmlengine/group/system/system.mmp
--- a/webengine/wmlengine/group/system/system.mmp	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/wmlengine/group/system/system.mmp	Thu Dec 17 09:20:16 2009 +0200
@@ -16,7 +16,7 @@
 */
 
 #include <platform_paths.hrh>
-#include <platform/mw/Browser_platform_variant.hrh>
+#include <platform/mw/browser_platform_variant.hrh>
 
 TARGET          System.lib
 TARGETTYPE      lib
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/wmlengine/group/text/bld.inf
--- a/webengine/wmlengine/group/text/bld.inf	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/wmlengine/group/text/bld.inf	Thu Dec 17 09:20:16 2009 +0200
@@ -17,7 +17,7 @@
 
 
 #include <platform_paths.hrh>
-#include "../../../../web_plat/browser_platform_api/inc/Browser_platform_variant.hrh"
+#include "../../../../web_plat/browser_platform_api/inc/browser_platform_variant.hrh"
 
 PRJ_PLATFORMS
 DEFAULT 
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/wmlengine/group/text/text.mmp
--- a/webengine/wmlengine/group/text/text.mmp	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/wmlengine/group/text/text.mmp	Thu Dec 17 09:20:16 2009 +0200
@@ -16,7 +16,7 @@
 */
 
 #include <platform_paths.hrh>
-#include <platform/mw/Browser_platform_variant.hrh>
+#include <platform/mw/browser_platform_variant.hrh>
 
 TARGET          text.lib
 TARGETTYPE      lib
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/wmlengine/group/unknownch.mmp
--- a/webengine/wmlengine/group/unknownch.mmp	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/wmlengine/group/unknownch.mmp	Thu Dec 17 09:20:16 2009 +0200
@@ -16,7 +16,7 @@
 */
 
 #include <platform_paths.hrh>
-#include <platform/mw/Browser_platform_variant.hrh>
+#include <platform/mw/browser_platform_variant.hrh>
 
 TARGET          unknownch.lib
 TARGETTYPE      lib
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/wmlengine/group/urlloader/bld.inf
--- a/webengine/wmlengine/group/urlloader/bld.inf	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/wmlengine/group/urlloader/bld.inf	Thu Dec 17 09:20:16 2009 +0200
@@ -17,7 +17,7 @@
 
 
 #include <platform_paths.hrh>
-#include "../../../../web_plat/browser_platform_api/inc/Browser_platform_variant.hrh"
+#include "../../../../web_plat/browser_platform_api/inc/browser_platform_variant.hrh"
 
 PRJ_PLATFORMS
 DEFAULT 
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/wmlengine/group/urlloader/urlloader.mmp
--- a/webengine/wmlengine/group/urlloader/urlloader.mmp	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/wmlengine/group/urlloader/urlloader.mmp	Thu Dec 17 09:20:16 2009 +0200
@@ -17,7 +17,7 @@
 
 
 #include <platform_paths.hrh>
-#include <platform/mw/Browser_platform_variant.hrh>
+#include <platform/mw/browser_platform_variant.hrh>
 
 TARGET          urlloader.lib
 TARGETTYPE      lib
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/wmlengine/group/wml/bld.inf
--- a/webengine/wmlengine/group/wml/bld.inf	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/wmlengine/group/wml/bld.inf	Thu Dec 17 09:20:16 2009 +0200
@@ -17,7 +17,7 @@
 
 
 #include <platform_paths.hrh>
-#include "../../../../web_plat/browser_platform_api/inc/Browser_platform_variant.hrh"
+#include "../../../../web_plat/browser_platform_api/inc/browser_platform_variant.hrh"
 
 PRJ_PLATFORMS
 DEFAULT 
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/wmlengine/group/wml/wml.mmp
--- a/webengine/wmlengine/group/wml/wml.mmp	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/wmlengine/group/wml/wml.mmp	Thu Dec 17 09:20:16 2009 +0200
@@ -16,7 +16,7 @@
 */
 
 #include <platform_paths.hrh>
-#include <platform/mw/Browser_platform_variant.hrh>
+#include <platform/mw/browser_platform_variant.hrh>
 
 TARGET          wml.lib
 TARGETTYPE      lib
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/wmlengine/group/wml1x/bld.inf
--- a/webengine/wmlengine/group/wml1x/bld.inf	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/wmlengine/group/wml1x/bld.inf	Thu Dec 17 09:20:16 2009 +0200
@@ -17,7 +17,7 @@
 
 
 #include <platform_paths.hrh>
-#include "../../../../web_plat/browser_platform_api/inc/Browser_platform_variant.hrh"
+#include "../../../../web_plat/browser_platform_api/inc/browser_platform_variant.hrh"
 
 PRJ_PLATFORMS
 DEFAULT 
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/wmlengine/group/wml1x/wml1x.mmp
--- a/webengine/wmlengine/group/wml1x/wml1x.mmp	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/wmlengine/group/wml1x/wml1x.mmp	Thu Dec 17 09:20:16 2009 +0200
@@ -16,7 +16,7 @@
 */
 
 #include <platform_paths.hrh>
-#include <platform/mw/Browser_platform_variant.hrh>
+#include <platform/mw/browser_platform_variant.hrh>
 
 TARGET          wml1x.lib
 TARGETTYPE      lib
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/wmlengine/group/wmlengine/bld.inf
--- a/webengine/wmlengine/group/wmlengine/bld.inf	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/wmlengine/group/wmlengine/bld.inf	Thu Dec 17 09:20:16 2009 +0200
@@ -17,7 +17,7 @@
 
 
 #include <platform_paths.hrh>
-#include "../../../../web_plat/browser_platform_api/inc/Browser_platform_variant.hrh"
+#include "../../../../web_plat/browser_platform_api/inc/browser_platform_variant.hrh"
 
 PRJ_PLATFORMS
 DEFAULT 
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/wmlengine/group/wmlengine/utils.mmp
--- a/webengine/wmlengine/group/wmlengine/utils.mmp	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/wmlengine/group/wmlengine/utils.mmp	Thu Dec 17 09:20:16 2009 +0200
@@ -16,7 +16,7 @@
 */
 
 #include <platform_paths.hrh>
-#include <platform/mw/Browser_platform_variant.hrh>
+#include <platform/mw/browser_platform_variant.hrh>
 
 #ifndef INCLUDE_UTILS_MMP
 
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/wmlengine/group/wmlengine/wmlengine.mmp
--- a/webengine/wmlengine/group/wmlengine/wmlengine.mmp	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/wmlengine/group/wmlengine/wmlengine.mmp	Thu Dec 17 09:20:16 2009 +0200
@@ -16,7 +16,7 @@
 */
 
 #include <platform_paths.hrh>
-#include <platform/mw/Browser_platform_variant.hrh>
+#include <platform/mw/browser_platform_variant.hrh>
 
 TARGET          wmlEngine.dll
 TARGETTYPE      dll
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/wmlengine/group/wmlscriptch/bld.inf
--- a/webengine/wmlengine/group/wmlscriptch/bld.inf	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/wmlengine/group/wmlscriptch/bld.inf	Thu Dec 17 09:20:16 2009 +0200
@@ -17,7 +17,7 @@
 
 
 #include <platform_paths.hrh>
-#include "../../../../web_plat/browser_platform_api/inc/Browser_platform_variant.hrh"
+#include "../../../../web_plat/browser_platform_api/inc/browser_platform_variant.hrh"
 
 PRJ_PLATFORMS
 DEFAULT 
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/wmlengine/group/wmlscriptch/wmlscriptch.mmp
--- a/webengine/wmlengine/group/wmlscriptch/wmlscriptch.mmp	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/wmlengine/group/wmlscriptch/wmlscriptch.mmp	Thu Dec 17 09:20:16 2009 +0200
@@ -16,7 +16,7 @@
 */
 
 #include <platform_paths.hrh>
-#include <platform/mw/Browser_platform_variant.hrh>
+#include <platform/mw/browser_platform_variant.hrh>
 
 TARGET          wmlscriptch.lib
 TARGETTYPE      lib
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/wmlengine/group/xhtml/bld.inf
--- a/webengine/wmlengine/group/xhtml/bld.inf	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/wmlengine/group/xhtml/bld.inf	Thu Dec 17 09:20:16 2009 +0200
@@ -17,7 +17,7 @@
 
 
 #include <platform_paths.hrh>
-#include "../../../../web_plat/browser_platform_api/inc/Browser_platform_variant.hrh"
+#include "../../../../web_plat/browser_platform_api/inc/browser_platform_variant.hrh"
 
 PRJ_PLATFORMS
 DEFAULT 
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/wmlengine/group/xhtml/xhtml.mmp
--- a/webengine/wmlengine/group/xhtml/xhtml.mmp	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/wmlengine/group/xhtml/xhtml.mmp	Thu Dec 17 09:20:16 2009 +0200
@@ -16,7 +16,7 @@
 */
 
 #include <platform_paths.hrh>
-#include <platform/mw/Browser_platform_variant.hrh>
+#include <platform/mw/browser_platform_variant.hrh>
 
 TARGET          xhtml.lib
 TARGETTYPE      lib
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/wmlengine/src/MVC/include/MVCShell.h
--- a/webengine/wmlengine/src/MVC/include/MVCShell.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/wmlengine/src/MVC/include/MVCShell.h	Thu Dec 17 09:20:16 2009 +0200
@@ -31,7 +31,7 @@
 #include <f32file.h>
 #include <ApEngineConsts.h>
 
-#include "BrCtlDialogsProvider.h"
+#include "brctldialogsprovider.h"
 
 #include "HEDDocumentListener.h"
 #include "httploader_mlinkresolvercallbacks.h"
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/wmlengine/src/MVC/include/MVCView.h
--- a/webengine/wmlengine/src/MVC/include/MVCView.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/wmlengine/src/MVC/include/MVCView.h	Thu Dec 17 09:20:16 2009 +0200
@@ -32,8 +32,8 @@
 #include <aknpictographinterface.h>
 #include <aknpictographdrawerinterface.h>
 
-#include <BrCtlDefs.h>
-#include <BrCtlDialogsProvider.h>
+#include <brctldefs.h>
+#include <brctldialogsprovider.h>
 #include "BrsrStatusCodes.h"
 #include "ImageUtils.h"
 #include "LMgrBoxTreeListener.h"
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/wmlengine/src/MVC/include/httploader_mlinkresolvercallbacks.h
--- a/webengine/wmlengine/src/MVC/include/httploader_mlinkresolvercallbacks.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/wmlengine/src/MVC/include/httploader_mlinkresolvercallbacks.h	Thu Dec 17 09:20:16 2009 +0200
@@ -22,7 +22,7 @@
 
 
 #include "BrsrStatusCodes.h"
-#include "BrCtlDefs.h"
+#include "brctldefs.h"
 #include "urlloader_urlresponse.h"
 
 
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/wmlengine/src/MVC/src/MVCShell.cpp
--- a/webengine/wmlengine/src/MVC/src/MVCShell.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/wmlengine/src/MVC/src/MVCShell.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -90,7 +90,7 @@
 #include "urlloader_urlresponse.h"
 #include "CSSVariableStyleSheet.h"
 #include "TEncodingMapping.h"
-#include "BrCtlDialogsProvider.h"
+#include "brctldialogsprovider.h"
 #include "WmlInterface.h"
 
 
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/wmlengine/src/MVC/src/MVCView.cpp
--- a/webengine/wmlengine/src/MVC/src/MVCView.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/wmlengine/src/MVC/src/MVCView.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -33,7 +33,7 @@
 
 #include <CenRepNotifyHandler.h>
 #include <centralrepository.h>
-#include <HttpCacheManagerInternalCRKeys.h>
+#include <httpcachemanagerinternalcrkeys.h>
 
 #include <stringloader.h>
 #include <webkit.rsg>
@@ -116,8 +116,8 @@
 
 #include "TEncodingMapping.h"
 #include "urlloader_urlloaderint.h"
-#include <BrCtlInterface.h>
-#include "BrCtlDialogsProvider.h"
+#include <brctlinterface.h>
+#include "brctldialogsprovider.h"
 
 #include "HistoryController.h"
 #include "WmlInterface.h"
@@ -1804,6 +1804,7 @@
   iVScrollPosition(0), iFormatPriority( ((CActive::TPriority)( CActive::EPriorityLow + 2 )) )
 {
     iBrCtl = aBrCtl;
+    iDrag = EFalse;
 }
 
 // -----------------------------------------------------------------------------
@@ -4208,7 +4209,8 @@
     {
     switch (aPointerEvent.iType) {
         case TPointerEvent::EButton1Down:
-        	iLastPosition = aPointerEvent.iPosition;        	        	
+        	iLastPosition = aPointerEvent.iPosition;
+            iDrag = EFalse;
 			break;
 		case TPointerEvent::EDrag:
 			TPoint  currPosition;
@@ -4221,8 +4223,21 @@
 				currPosition.iX = iDeviceContext->Origin()->x;
 				currPosition.iY = iDeviceContext->Origin()->y;
 				ScrollTo(currPosition+nextPosition);
-			}
-            iDrag = ETrue;
+
+                //This is for Drag event
+                //Introducing 10 pixel offset. This is introduced to tackle problem that occurs if user clicks
+                //link but still causes a very small pixel move. This gives a small difference in previous
+                //and next position. As a side effect iDrag will be true and request will not be sent even if
+                //there is very small pixel difference.
+                //Following logic tries to handle such scenario.
+                TInt nOffset = 10;
+                TBool bXOffset = ((nextPosition.iX > nOffset) || (nextPosition.iX < -nOffset));
+                TBool bYOffset = ((nextPosition.iY > nOffset) || (nextPosition.iY < -nOffset));
+                if(bXOffset || bYOffset)
+                {
+                    iDrag = ETrue;
+                }
+            } 
             break;
     }
     
@@ -4301,20 +4316,13 @@
                 NW_LMgr_RootBox_SetFocusBox(iRootBox, tempBox);
                 Draw (NW_TRUE /*DrawNow*/);
                 }
-            if (aPointerEvent.iType == TPointerEvent::EButton1Up)
+            if ((aPointerEvent.iType == TPointerEvent::EButton1Up) && (iShouldActivate))
                 {
-                if (iShouldActivate)
+                    if((!iDrag))
                     {
-                      if(!iDrag)
-                        {
-                         NW_Evt_ActivateEvent_t actEvent;
-                         NW_Evt_ActivateEvent_Initialize (&actEvent);
-                         ProcessEvent (NW_Evt_EventOf(&actEvent));
-                        }
-                    else
-                        {
-                        iDrag = EFalse;
-                        }
+                        NW_Evt_ActivateEvent_t actEvent;
+                        NW_Evt_ActivateEvent_Initialize (&actEvent);
+                        ProcessEvent (NW_Evt_EventOf(&actEvent));
                     }
                 }
             break;
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/wmlengine/src/Scrolling/inc/ScrollBarFrame.h
--- a/webengine/wmlengine/src/Scrolling/inc/ScrollBarFrame.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/wmlengine/src/Scrolling/inc/ScrollBarFrame.h	Thu Dec 17 09:20:16 2009 +0200
@@ -27,7 +27,7 @@
 #include <coecntrl.h>
 
 // Browser as a Plugin includes
-#include <BrCtlInterface.h>
+#include <brctlinterface.h>
 
 //----------------------------------------------------------------------
 // CONSTANTS
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/wmlengine/src/css/src/CSSProcessor.cpp
--- a/webengine/wmlengine/src/css/src/CSSProcessor.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/wmlengine/src/css/src/CSSProcessor.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -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"
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/wmlengine/src/fbox/src/FBOXWmlFormattedEditor.cpp
--- a/webengine/wmlengine/src/fbox/src/FBOXWmlFormattedEditor.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/wmlengine/src/fbox/src/FBOXWmlFormattedEditor.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -24,7 +24,12 @@
 #include <eikedwin.h>
 #include <e32std.h>
 #include <PtiDefs.h>
+#ifndef SYMBIAN_ENABLE_SPLIT_HEADERS
 #include <txtrich.h>
+#else
+#include <txtrich.h>
+#include <txtclipboard.h>
+#endif
 #include <bautils.h>
 #include <webkit.rsg>
 #include <PUAcodes.hrh>
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/wmlengine/src/hed/src/HEDCompositeContentHandler.cpp
--- a/webengine/wmlengine/src/hed/src/HEDCompositeContentHandler.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/wmlengine/src/hed/src/HEDCompositeContentHandler.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -32,7 +32,7 @@
 #include <nwx_http_defs.h>
 #include "stringutils.h"
 #include "TEncodingMapping.h"
-#include "BodyPart.h"
+#include "bodypart.h"
 #include "MemoryManager.h"
 
 
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/wmlengine/src/hed/src/HistoryStack.cpp
--- a/webengine/wmlengine/src/hed/src/HistoryStack.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/wmlengine/src/hed/src/HistoryStack.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -30,7 +30,7 @@
 #include "WmlControl.h"
 #include "HistoryController.h"
 #include "HistoryStack.h"
-#include "BrCtlDefs.h"
+#include "brctldefs.h"
 #include "HistoryEntry.h"
 #include "WmlInterface.h"
 
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/wmlengine/src/hed/src/contentLoader.cpp
--- a/webengine/wmlengine/src/hed/src/contentLoader.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/wmlengine/src/hed/src/contentLoader.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -28,7 +28,7 @@
 #include "ContentLoader.h"
 #include "MVCShell.h"
 #include "BrsrStatusCodes.h"
-#include <BrCtlSpecialLoadObserver.h>
+#include <brctlspecialloadobserver.h>
 #include "StringUtils.h"
 
 // CONSTANTS
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/wmlengine/src/urlloader/include/urlloader_curlloader.h
--- a/webengine/wmlengine/src/urlloader/include/urlloader_curlloader.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/wmlengine/src/urlloader/include/urlloader_curlloader.h	Thu Dec 17 09:20:16 2009 +0200
@@ -23,7 +23,7 @@
 //  INCLUDES
 #include "urlloader_murlschemehandler.h"
 #include "BrsrStatusCodes.h"
-#include "BrCtlDefs.h"
+#include "brctldefs.h"
 
 
 // CONSTANTS
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/wmlengine/src/urlloader/include/urlloader_urlloaderI.h
--- a/webengine/wmlengine/src/urlloader/include/urlloader_urlloaderI.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/wmlengine/src/urlloader/include/urlloader_urlloaderI.h	Thu Dec 17 09:20:16 2009 +0200
@@ -24,7 +24,7 @@
 #include "urlloader_urlloaderint.h"
 #include "httploader_mlinkresolvercallbacks.h"
 #include "BrsrStatusCodes.h"
-#include "BrCtlDefs.h"
+#include "brctldefs.h"
 
 #ifdef __cplusplus
 extern "C" {
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/wmlengine/src/urlloader/include/urlloader_urlloaderint.h
--- a/webengine/wmlengine/src/urlloader/include/urlloader_urlloaderint.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/wmlengine/src/urlloader/include/urlloader_urlloaderint.h	Thu Dec 17 09:20:16 2009 +0200
@@ -40,7 +40,7 @@
     
 // The "TEnterStatus", relates to what security state the page is going to.
 // This "page loading" status, is passed in HandleBrowserLoadEventL() using the
-// TBrCtlLoadEvent enum. (see BrCtlDefs.h)  
+// TBrCtlLoadEvent enum. (see brctldefs.h)  
 // These constants must stay in sync with viewshellobserver.h
 //R
 
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/wmlengine/src/urlloader/src/urlloader_curlloader.cpp
--- a/webengine/wmlengine/src/urlloader/src/urlloader_curlloader.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/wmlengine/src/urlloader/src/urlloader_curlloader.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -28,7 +28,7 @@
 #include "urlloader_loaderutils.h"
 #include "fileloader_cfileloader.h"
 #include "BrsrStatusCodes.h"
-#include <BrCtlSpecialLoadObserver.h>
+#include <brctlspecialloadobserver.h>
 #include "StringUtils.h"
 #include "nwx_defs.h"
 #include "httploader_mlinkresolvercallbacks.h"
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/wmlengine/src/utils/src/CBrowserSettings.cpp
--- a/webengine/wmlengine/src/utils/src/CBrowserSettings.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/wmlengine/src/utils/src/CBrowserSettings.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -19,7 +19,7 @@
 #include <bldvariant.hrh>
 #include "CBrowserSettings.h"
 
-#include <BrowserUiSDKCRKeys.h>
+#include <browseruisdkcrkeys.h>
 #include <centralrepository.h>
 
 #include <eikenv.h>
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/wmlengine/src/utils/src/nw_nvpair.c
--- a/webengine/wmlengine/src/utils/src/nw_nvpair.c	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/wmlengine/src/utils/src/nw_nvpair.c	Thu Dec 17 09:20:16 2009 +0200
@@ -146,7 +146,7 @@
   NW_ASSERT( thisObj->strTable == NULL );
   NW_ASSERT( name != NULL ); 
   
-  if (name[0] == '\0') {
+  if (name[0] == '\0' ||  value[0] == '\0') {
 
       return KBrsrSuccess;
   }
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/wmlengine/src/wml1x/src/WML1XApi.cpp
--- a/webengine/wmlengine/src/wml1x/src/WML1XApi.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/wmlengine/src/wml1x/src/WML1XApi.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -67,7 +67,7 @@
 #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"
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/wmlengine/src/wmlcontrol/include/WmlControl.h
--- a/webengine/wmlengine/src/wmlcontrol/include/WmlControl.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/wmlengine/src/wmlcontrol/include/WmlControl.h	Thu Dec 17 09:20:16 2009 +0200
@@ -21,7 +21,7 @@
 //  INCLUDES
 #include <e32base.h>
 #include <w32std.h>
-#include "BrCtlDefs.h"
+#include "brctldefs.h"
 
 #include "BrCtl.h"
 #include "WmlEngineInterface.h"
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/wmlengine/src/wmlcontrol/include/WmlEngineDefs.h
--- a/webengine/wmlengine/src/wmlcontrol/include/WmlEngineDefs.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/wmlengine/src/wmlcontrol/include/WmlEngineDefs.h	Thu Dec 17 09:20:16 2009 +0200
@@ -21,7 +21,7 @@
 //  INCLUDES
 //#include <e32base.h>
 //#include <w32std.h>
-//#include "BrCtlDefs.h"
+//#include "brctldefs.h"
 
 //#include "BrCtl.h"
 //#include "WebKitLoader.h"
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/wmlengine/src/wmlcontrol/include/WmlEngineInterface.h
--- a/webengine/wmlengine/src/wmlcontrol/include/WmlEngineInterface.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/wmlengine/src/wmlcontrol/include/WmlEngineInterface.h	Thu Dec 17 09:20:16 2009 +0200
@@ -22,7 +22,7 @@
 
 #include <e32base.h>
 #include <COEDEF.H>
-#include "BrCtlDefs.h"
+#include "brctldefs.h"
 #include "WmlEngineDefs.h"
 
 
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/wmlengine/src/wmlcontrol/src/WmlControl.cpp
--- a/webengine/wmlengine/src/wmlcontrol/src/WmlControl.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/wmlengine/src/wmlcontrol/src/WmlControl.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -18,7 +18,7 @@
 
 //  INCLUDES
 #include "WmlControl.h"
-#include "MultipartParser.h"
+#include "multipartparser.h"
 #include "MVCView.h"
 #include "MVCShell.h"
 #include "WmlInterface.h"
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/wmlengine/src/xhtml/src/BasicForms/XHTMLFormLiaison.cpp
--- a/webengine/wmlengine/src/xhtml/src/BasicForms/XHTMLFormLiaison.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/wmlengine/src/xhtml/src/BasicForms/XHTMLFormLiaison.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -23,7 +23,7 @@
 #include <commoncontentpolicy.h>
 
 #include "BrCtl.h"
-#include "BrCtlDialogsProvider.h"
+#include "brctldialogsprovider.h"
 
 #include "BrsrStatusCodes.h"
 #include "MVCShell.h"
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/wmlengine/src/xhtml/src/XHTMLContentHandler.cpp
--- a/webengine/wmlengine/src/xhtml/src/XHTMLContentHandler.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/wmlengine/src/xhtml/src/XHTMLContentHandler.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -91,7 +91,7 @@
 #include "nw_structure_scriptelementhandler.h"
 #include "XhtmlObjectElementHandlerOOCi.h"
 #include "XHTMLMessageListener.h"
-#include "BodyPart.h"
+#include "bodypart.h"
 #include "MVCShell.h"
 #include "BrCtl.h"
 
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/wrtharvester/group/bld.inf
--- a/webengine/wrtharvester/group/bld.inf	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/wrtharvester/group/bld.inf	Thu Dec 17 09:20:16 2009 +0200
@@ -16,7 +16,7 @@
 */
 
 #include <platform_paths.hrh>
-#include "../../../web_plat/browser_platform_api/inc/Browser_platform_variant.hrh"
+#include "../../../web_plat/browser_platform_api/inc/browser_platform_variant.hrh"
 
 #ifdef BRDO_WRT_HS_FF
 
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/wrtharvester/group/wrtharvester.mmp
--- a/webengine/wrtharvester/group/wrtharvester.mmp	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/wrtharvester/group/wrtharvester.mmp	Thu Dec 17 09:20:16 2009 +0200
@@ -20,7 +20,7 @@
 UID			    0x10009D8D 0x2001FE2C
 
 #include <platform_paths.hrh>
-#include <platform/mw/Browser_platform_variant.hrh>
+#include <platform/mw/browser_platform_variant.hrh>
 
 CAPABILITY      CAP_ECOM_PLUGIN
 
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/wrtharvester/inc/wrtharvesterregistryaccess.h
--- a/webengine/wrtharvester/inc/wrtharvesterregistryaccess.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/wrtharvester/inc/wrtharvesterregistryaccess.h	Thu Dec 17 09:20:16 2009 +0200
@@ -20,7 +20,7 @@
 #define WRHARVESTERREGISTRYACCESS_H 
 
 // INCLUDES
-#include <WidgetRegistryClient.h>
+#include <widgetregistryclient.h>
 #include <badesca.h>
 
 // FORWARD DECLARATIONS
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/wrtharvester/inc/wrtusbhandler.h
--- a/webengine/wrtharvester/inc/wrtusbhandler.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/wrtharvester/inc/wrtusbhandler.h	Thu Dec 17 09:20:16 2009 +0200
@@ -1,22 +1,21 @@
 /*
-* ============================================================================
-*  Name        : WidgetMMCHandler.h
-*  Part of     : Widget Registry
-*  Description : Acts on MMC card insertion/removal
-*  Version     : 3.1
+* Copyright (c) 2008 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
-*  Copyright © 2008 Nokia Corporation.
-*  This material, including documentation and any related
-*  computer programs, is protected by copyright controlled by
-*  Nokia Corporation. All rights are reserved. Copying,
-*  including reproducing, storing, adapting or translating, any
-*  or all of this material requires the prior written consent of
-*  Nokia Corporation. This material also contains confidential
-*  information which may not be disclosed to others without the
-*  prior written consent of Nokia Corporation.
-* =============================================================================
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:  Acts on MMC card insertion/removal
+*
 */
 
+
 #ifndef WIDGETMMCHANDLER_H
 #define WIDGETMMCHANDLER_H
 
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/wrtharvester/rom/wrtharvester.iby
--- a/webengine/wrtharvester/rom/wrtharvester.iby	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/wrtharvester/rom/wrtharvester.iby	Thu Dec 17 09:20:16 2009 +0200
@@ -19,7 +19,7 @@
 #ifndef WRTHARVESTER_IBY
 #define WRTHARVESTER_IBY
 #include <bldvariant.hrh>
-#include <platform/mw/Browser_platform_variant.hrh>
+#include <platform/mw/browser_platform_variant.hrh>
 
 #ifdef BRDO_WRT_HS_FF
 ECOM_PLUGIN(wrtharvester.dll, wrtharvester.rsc)
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/wrtharvester/rom/wrtharvesterResources.iby
--- a/webengine/wrtharvester/rom/wrtharvesterResources.iby	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/wrtharvester/rom/wrtharvesterResources.iby	Thu Dec 17 09:20:16 2009 +0200
@@ -1,26 +1,26 @@
 /*
-* =============================================================================
-*  Name        : wrtharvesterResources.iby
-*  Part of     :  
-*  Description : The resource iby file contains resource that needs to be  
-*                localized for wrtharvester
-*  Version     : %version: 1 % 
+* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
 *
-*  Copyright (c) 2009 Nokia.  All rights reserved.
-*  This material, including documentation and any related computer
-*  programs, is protected by copyright controlled by Nokia.  All
-*  rights are reserved.  Copying, including reproducing, storing,
-*  adapting or translating, any or all of this material requires the
-*  prior written consent of Nokia.  This material also contains
-*  confidential information which may not be disclosed to others
-*  without the prior written consent of Nokia.
-* ============================================================================
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:  The resource iby file contains resource that needs to be  
+*                localized for wrtharvester
+*
 */
 
+
 #ifndef WRTHARVESTERRESOURCES_IBY
 #define WRTHARVESTERRESOURCES_IBY
 
-#include <platform/mw/Browser_platform_variant.hrh>
+#include <platform/mw/browser_platform_variant.hrh>
 
 #ifdef BRDO_WRT_HS_FF
 data=ZRESOURCE\wrtharvester.rsc		RESOURCE_FILES_DIR\wrtharvester.rsc
diff -r 9a9a761f03f1 -r 0ed94ceaa377 webengine/wrtharvester/src/wrtusbhandler.cpp
--- a/webengine/wrtharvester/src/wrtusbhandler.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/webengine/wrtharvester/src/wrtusbhandler.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -1,26 +1,22 @@
-//
-// ============================================================================
-//  Name     : WidgetMMCHandler.cpp
-//  Part of  : SW Installer UIs / WidgetInstallerUI
-//
-//  Description: Handle notifications of MMC events.
-//
-//
-//  Version     : 3.1
-//
-//  Copyright © 2006 Nokia Corporation.
-//  This material, including documentation and any related
-//  computer programs, is protected by copyright controlled by
-//  Nokia Corporation. All rights are reserved. Copying,
-//  including reproducing, storing, adapting or translating, any
-//  or all of this material requires the prior written consent of
-//  Nokia Corporation. This material also contains confidential
-//  information which may not be disclosed to others without the
-//  prior written consent of Nokia Corporation.
-// ==============================================================================
-///
+/*
+* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:  Handle notifications of MMC events.
+*
+*
+*
+*/
 
-// INCLUDE FILES
 #include "wrtusbhandler.h"
 #include "wrtharvester.h"
 #include "wrtusbhandler.h"
diff -r 9a9a761f03f1 -r 0ed94ceaa377 widgets/group/bld.inf
--- a/widgets/group/bld.inf	Tue Nov 24 09:02:20 2009 +0200
+++ b/widgets/group/bld.inf	Thu Dec 17 09:20:16 2009 +0200
@@ -16,7 +16,7 @@
 */
 
 #include <platform_paths.hrh>
-#include "../../web_plat/browser_platform_api/inc/Browser_platform_variant.hrh"
+#include "../../web_plat/browser_platform_api/inc/browser_platform_variant.hrh"
 
 #ifdef  __WEB_WIDGETS
 #include "../widgetrecognizer/group/bld.inf"
diff -r 9a9a761f03f1 -r 0ed94ceaa377 widgets/widgetapp/group/WidgetUi.mmp
--- a/widgets/widgetapp/group/WidgetUi.mmp	Tue Nov 24 09:02:20 2009 +0200
+++ b/widgets/widgetapp/group/WidgetUi.mmp	Thu Dec 17 09:20:16 2009 +0200
@@ -18,7 +18,7 @@
 #include <data_caging_paths.hrh>
 #include <platform_paths.hrh>
 #include <bldvariant.hrh>
-#include <platform/mw/Browser_platform_variant.hrh>
+#include <platform/mw/browser_platform_variant.hrh>
 
 // TARGET INFO
 
@@ -27,7 +27,10 @@
 UID         0x100039CE 0x10282822
 
 epocstacksize 0x14000
-EPOCHEAPSIZE 0x5000 0x1000000
+// There is no need to set a custom heap size as a custom allocator is used so the default values of 1 KB for
+// minimum and 1 MB for maximum should be used instead.  These will be used for a short time at startup for
+// the default heap, which in turn is used to create the custom allocator. no gain in functionality 
+//EPOCHEAPSIZE 0x5000 0x1000000
 
 VENDORID    VID_DEFAULT
 CAPABILITY CAP_APPLICATION NetworkControl
diff -r 9a9a761f03f1 -r 0ed94ceaa377 widgets/widgetapp/group/bld.inf
--- a/widgets/widgetapp/group/bld.inf	Tue Nov 24 09:02:20 2009 +0200
+++ b/widgets/widgetapp/group/bld.inf	Thu Dec 17 09:20:16 2009 +0200
@@ -17,7 +17,7 @@
 
 
 #include <platform_paths.hrh>
-#include "../../../web_plat/browser_platform_api/inc/Browser_platform_variant.hrh"
+#include "../../../web_plat/browser_platform_api/inc/browser_platform_variant.hrh"
 
 PRJ_PLATFORMS
 DEFAULT gcce
diff -r 9a9a761f03f1 -r 0ed94ceaa377 widgets/widgetapp/inc/WidgetUiDialogsProviderProxy.h
--- a/widgets/widgetapp/inc/WidgetUiDialogsProviderProxy.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/widgets/widgetapp/inc/WidgetUiDialogsProviderProxy.h	Thu Dec 17 09:20:16 2009 +0200
@@ -25,8 +25,8 @@
 // User includes
 
 // System Includes
-#include <BrCtlDialogsProvider.h>
-#include <BrowserDialogsProvider.h>
+#include <brctldialogsprovider.h>
+#include <browserdialogsprovider.h>
 #include <e32std.h>
 
 // CONSTANTS
diff -r 9a9a761f03f1 -r 0ed94ceaa377 widgets/widgetapp/inc/WidgetUiNetworkListener.h
--- a/widgets/widgetapp/inc/WidgetUiNetworkListener.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/widgets/widgetapp/inc/WidgetUiNetworkListener.h	Thu Dec 17 09:20:16 2009 +0200
@@ -1,29 +1,35 @@
-//
-//==============================================================================
-// Name        : WidgetUiNetworkListener.h
-// Part of     : WidgetUI
-// Interface   :
-// Description :
-// Version      : %version: 5 %
-//
-// Copyright  2008, 2009 Nokia Corporation.
-// This material, including documentation and any related
-// computer programs, is protected by copyright controlled by
-// Nokia Corporation. All rights are reserved. Copying,
-// including reproducing, storing, adapting or translating, any
-// or all of this material requires the prior written consent of
-// Nokia Corporation. This material also contains confidential
-// information which may not be disclosed to others without the
-// prior written consent of Nokia Corporation.
-//==============================================================================
-//
+/*
+* 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: 
+*
+*/
+
 
 #ifndef WIDGETUINETWORKLISTENER_H_
 #define WIDGETUINETWORKLISTENER_H_
 
 // INCLUDES
 #include <in_sock.h>
+
+#ifndef SYMBIAN_ENABLE_SPLIT_HEADERS
 #include <es_enum.h>
+#else
+#include <es_enum.h>
+#include <es_enum_internal.h>
+#include <es_enum_partner.h>
+#endif
+
 #include "WidgetUiWindowManager.h"
 
 // CLASS DECLARATION
diff -r 9a9a761f03f1 -r 0ed94ceaa377 widgets/widgetapp/inc/WidgetUiObserver.h
--- a/widgets/widgetapp/inc/WidgetUiObserver.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/widgets/widgetapp/inc/WidgetUiObserver.h	Thu Dec 17 09:20:16 2009 +0200
@@ -20,12 +20,12 @@
 #define WIDGETUIOBSERVER_H_
 
 //  INCLUDES
-#include <BrCtlLayoutObserver.h>
-#include <BrCtlSoftkeysObserver.h>
-#include <BrCtlSpecialLoadObserver.h>
-#include <BrCtlDownloadObserver.h>
-#include <BrCtlWindowObserver.h>
-#include <BrCtlInterface.h>
+#include <brctllayoutobserver.h>
+#include <brctlsoftkeysobserver.h>
+#include <brctlspecialloadobserver.h>
+#include <brctldownloadobserver.h>
+#include <brctlwindowobserver.h>
+#include <brctlinterface.h>
 #include <DocumentHandler.h>
 #include <flogger.h>
 
diff -r 9a9a761f03f1 -r 0ed94ceaa377 widgets/widgetapp/inc/WidgetUiWindow.h
--- a/widgets/widgetapp/inc/WidgetUiWindow.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/widgets/widgetapp/inc/WidgetUiWindow.h	Thu Dec 17 09:20:16 2009 +0200
@@ -21,8 +21,8 @@
 
 // INCLUDES FILES
 #include <e32base.h>
-#include <BrCtlDefs.h>
-#include <BrCtlInterface.h> // for MWidgetCallback
+#include <brctldefs.h>
+#include <brctlinterface.h> // for MWidgetCallback
 #include <AknServerApp.h>
 #include <coecntrl.h>
 #include "WidgetUiObserver.h"
diff -r 9a9a761f03f1 -r 0ed94ceaa377 widgets/widgetapp/inc/WidgetUiWindowManager.h
--- a/widgets/widgetapp/inc/WidgetUiWindowManager.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/widgets/widgetapp/inc/WidgetUiWindowManager.h	Thu Dec 17 09:20:16 2009 +0200
@@ -21,11 +21,11 @@
 
 // INCLUDES FILES
 
-#include <WidgetRegistryClient.h>
+#include <widgetregistryclient.h>
 #include <aknglobalconfirmationquery.h>
 #include <coecntrl.h>
 #include "WidgetUiObserver.h"
-#include "Browser_platform_variant.hrh"
+#include "browser_platform_variant.hrh"
 // CONSTANTS
 
 enum TNetworkMode
@@ -400,7 +400,18 @@
         * @return TBool
         */  		
 		TBool AnyWidgetPublishing();
-        
+		
+        /**
+        * Returns a reference to the Appui of WidgetUi
+        * @return reference to CWidgetUiAppUi 
+        */
+        CWidgetUiAppUi& AppUi(){ return iAppUi; }
+
+        /**
+        * Returns the count of the windows in the widget
+        * @return count of the windows
+        */
+        TInt WindowListCount(){ return iWindowList.Count(); }
         
 #ifdef  OOM_WIDGET_CLOSEALL
         /**
diff -r 9a9a761f03f1 -r 0ed94ceaa377 widgets/widgetapp/inc/WidgetUiWindowView.h
--- a/widgets/widgetapp/inc/WidgetUiWindowView.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/widgets/widgetapp/inc/WidgetUiWindowView.h	Thu Dec 17 09:20:16 2009 +0200
@@ -21,7 +21,7 @@
 
 //  INCLUDES
 #include <aknview.h>
-#include <BrCtlInterface.h>
+#include <brctlinterface.h>
 
 // CONSTANTS
 
diff -r 9a9a761f03f1 -r 0ed94ceaa377 widgets/widgetapp/src/WidgetUiApp.cpp
--- a/widgets/widgetapp/src/WidgetUiApp.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/widgets/widgetapp/src/WidgetUiApp.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -15,12 +15,12 @@
 *
 */
 
-
 #include    "WidgetUiApp.h"
 #include    "WidgetUiDocument.h"
 #include    "MemoryManager.h"
 #include    "widgetappdefs.rh"
 #include    <eikstart.h>
+#include <u32std.h>
 
 // EXTERNAL DATA STRUCTURES
 
@@ -88,18 +88,48 @@
     }
 
 // -----------------------------------------------------------------------------
+// SetupThreadHeap - Called for heap creation of thread in this process.
+// This approach used to keep correct heap for pointers held in static data objects
+// when they are destructed after E32Main() by OS.
+// -----------------------------------------------------------------------------
+//
+EXPORT_C TInt UserHeap::SetupThreadHeap(TBool aSubThread, SStdEpocThreadCreateInfo& aInfo)
+    {
+    TInt r = KErrNone;
+    if (!aInfo.iAllocator && aInfo.iHeapInitialSize>0)
+        {
+        // new heap required
+        RHeap* pH = NULL;
+        r = CreateThreadHeap(aInfo, pH);
+        if (r == KErrNone && !aSubThread)
+            {
+            // main thread - new allocator created and set as default heap      
+            MemoryManager::CreateFastAllocator();
+            }
+        }
+    else if (aInfo.iAllocator)
+        {
+        // sharing a heap
+        RAllocator* pA = aInfo.iAllocator;
+        pA->Open();
+        User::SwitchAllocator(pA);
+        }
+
+    return r;
+    }
+    
+    
+// -----------------------------------------------------------------------------
 // E32Main
 //
 // -----------------------------------------------------------------------------
 //
 GLDEF_C TInt E32Main()
     {
-    RAllocator* oldAllocator = MemoryManager::SwitchToFastAllocator();
-    __UHEAP_MARK;
-    TInt result = EikStart::RunApplication( NewApplication );
-    __UHEAP_MARKEND;
-    MemoryManager::CloseFastAllocator(oldAllocator);
-    return result;
+        // initialize MemmoryManager
+        MemoryManager::InitFastAllocator();    
+        
+    	return EikStart::RunApplication(NewApplication); 
     }
-
+        
 // End of File  
diff -r 9a9a761f03f1 -r 0ed94ceaa377 widgets/widgetapp/src/WidgetUiAppUi.cpp
--- a/widgets/widgetapp/src/WidgetUiAppUi.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/widgets/widgetapp/src/WidgetUiAppUi.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -29,7 +29,7 @@
 #include <e32std.h>
 #include <bautils.h>
 #include <oommonitorplugin.h>
-#include <BrowserDialogsProvider.h>
+#include <browserdialogsprovider.h>
 #include <e32property.h>
 
 #ifdef BRDO_WRT_HS_FF
diff -r 9a9a761f03f1 -r 0ed94ceaa377 widgets/widgetapp/src/WidgetUiDialogsProviderProxy.cpp
--- a/widgets/widgetapp/src/WidgetUiDialogsProviderProxy.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/widgets/widgetapp/src/WidgetUiDialogsProviderProxy.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -25,8 +25,8 @@
 #include "WidgetUiWindowView.h"
 
 // System includes
-#include <BrowserDialogsProviderObserver.h>
-#include <BrowserDialogsProvider.h>
+#include <browserdialogsproviderobserver.h>
+#include <browserdialogsprovider.h>
 
 // CONSTANTS
 
diff -r 9a9a761f03f1 -r 0ed94ceaa377 widgets/widgetapp/src/WidgetUiNetworkListener.cpp
--- a/widgets/widgetapp/src/WidgetUiNetworkListener.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/widgets/widgetapp/src/WidgetUiNetworkListener.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -1,22 +1,20 @@
-//
-//==============================================================================
-// Name        : WidgetUiNetworkListener.cpp
-// Part of     : WidgetUI
-// Interface   :
-// Description :
-// Version      : %version: 5 %
-//
-// Copyright  2008, 2009 Nokia Corporation.
-// This material, including documentation and any related
-// computer programs, is protected by copyright controlled by
-// Nokia Corporation. All rights are reserved. Copying,
-// including reproducing, storing, adapting or translating, any
-// or all of this material requires the prior written consent of
-// Nokia Corporation. This material also contains confidential
-// information which may not be disclosed to others without the
-// prior written consent of Nokia Corporation.
-//==============================================================================
-//
+/*
+* 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"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: 
+*
+*/
+
 
 #include "WidgetUiNetworkListener.h"
 
diff -r 9a9a761f03f1 -r 0ed94ceaa377 widgets/widgetapp/src/WidgetUiObserver.cpp
--- a/widgets/widgetapp/src/WidgetUiObserver.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/widgets/widgetapp/src/WidgetUiObserver.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -27,7 +27,7 @@
 #include <ActiveApDb.h>
 #include <EscapeUtils.h>
 #include <Uri16.h>
-#include <BrCtlDefs.h>
+#include <brctldefs.h>
 #include "WidgetUiObserver.h"
 #include "WidgetUiWindow.h"
 #include "WidgetUiWindowView.h"
diff -r 9a9a761f03f1 -r 0ed94ceaa377 widgets/widgetapp/src/WidgetUiWindow.cpp
--- a/widgets/widgetapp/src/WidgetUiWindow.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/widgets/widgetapp/src/WidgetUiWindow.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -21,8 +21,8 @@
 #include "WidgetUiWindowContainer.h"
 #include "WidgetUiWindowManager.h"
 #include "WidgetUiDialogsProviderProxy.h"
-#include "WidgetRegistryConstants.h"
-#include "Browser_platform_variant.hrh"
+#include "widgetregistryconstants.h"
+#include "browser_platform_variant.hrh"
 #ifdef BRDO_WRT_HS_FF
 #include "cpspublisher.h"
 #endif
@@ -31,9 +31,9 @@
 #include <WidgetUi.rsg>
 
 #include <schemehandler.h>
-#include <InternetConnectionManager.h>
+#include <internetconnectionmanager.h>
 #include "WidgetInstallerInternalCRKeys.h"
-#include <BrowserUiSDKCRKeys.h>
+#include <browseruisdkcrkeys.h>
 #include <StringLoader.h>
 #include <centralrepository.h>
 #include <ApUtils.h>
diff -r 9a9a761f03f1 -r 0ed94ceaa377 widgets/widgetapp/src/WidgetUiWindowContainer.cpp
--- a/widgets/widgetapp/src/WidgetUiWindowContainer.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/widgets/widgetapp/src/WidgetUiWindowContainer.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -23,11 +23,11 @@
 
 #include <WidgetUi.rsg>
 
-#include <WidgetRegistryConstants.h>
+#include <widgetregistryconstants.h>
 
-#include <BrCtlInterface.h>
+#include <brctlinterface.h>
 #include <ApUtils.h>
-#include <InternetConnectionManager.h>
+#include <internetconnectionmanager.h>
 #include <ActiveApDb.h>
 #include <avkon.hrh>
 #include <aknsdrawutils.h>
@@ -37,7 +37,7 @@
 #include <AknMessageQueryDialog.h>
 #include <aknnotewrappers.h>
 #include <AknNoteDialog.h>
-#include <BrowserDialogsProvider.h>
+#include <browserdialogsprovider.h>
 
 // EXTERNAL DATA STRUCTURES
 
diff -r 9a9a761f03f1 -r 0ed94ceaa377 widgets/widgetapp/src/WidgetUiWindowManager.cpp
--- a/widgets/widgetapp/src/WidgetUiWindowManager.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/widgets/widgetapp/src/WidgetUiWindowManager.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -25,23 +25,23 @@
 #include "WidgetInstallerInternalCRKeys.h"
 #include "SWInstWidgetUid.h"
 #include "widgetappdefs.rh"
-#include "Browser_platform_variant.hrh"
+#include "browser_platform_variant.hrh"
 #ifdef BRDO_WRT_HS_FF
 #include "cpspublisher.h"
 #endif
 
 #include <WidgetUi.rsg>
-#include <BrCtlInterface.h>
-#include <WidgetRegistryConstants.h>
+#include <brctlinterface.h>
+#include <widgetregistryconstants.h>
 #include <centralrepository.h>
 #include <StringLoader.h>
 #include <AknNoteDialog.h>
-#include <BrowserDialogsProvider.h>
+#include <browserdialogsprovider.h>
 #include <S32FILE.H>
 #include <aknnotewrappers.h>
 #include "cpglobals.h" // CPS string definitions.
 
-#include <InternetConnectionManager.h>
+#include <internetconnectionmanager.h>
 #include <ActiveApDb.h>
 #include <oommonitorsession.h>
 #include <aknglobalnote.h>
@@ -343,34 +343,40 @@
             {
             iNetworkMode = EOnlineMode;
             CWidgetUiWindow* wdgt_window( GetWindow( aUid ) );
-#ifdef BRDO_WRT_HS_FF
-            if ( wdgt_window->NetworkModeWait()->IsStarted() )
+            if (wdgt_window)
                 {
-                wdgt_window->NetworkModeWait()->AsyncStop();
+#ifdef BRDO_WRT_HS_FF
+                if ( wdgt_window->NetworkModeWait()->IsStarted() )
+                    {
+                    wdgt_window->NetworkModeWait()->AsyncStop();
+                    }
+#endif
+                wdgt_window->DetermineNetworkState();
                 }
-#endif
-            wdgt_window->DetermineNetworkState();
             }
             break;
        case WidgetOffline:
             {
             iNetworkMode = EOfflineMode;
             CWidgetUiWindow* wdgt_window( GetWindow( aUid ) );
+            if (wdgt_window)
+            	{
 #ifdef BRDO_WRT_HS_FF
-            if ( wdgt_window->NetworkModeWait()->IsStarted() )
-                {
-                wdgt_window->NetworkModeWait()->AsyncStop();
-                }
+                if ( wdgt_window->NetworkModeWait()->IsStarted() )
+                    {
+                    wdgt_window->NetworkModeWait()->AsyncStop();
+                    }
 #endif
-            // if no full view widgets open, then close the network connection
-            if ( ( !FullViewWidgetsOpen() ) && ( iConnection->Connected() ) )
-                {
-                wdgt_window->Engine()->HandleCommandL( 
-                        (TInt)TBrCtlDefs::ECommandIdBase +
-                        (TInt)TBrCtlDefs::ECommandDisconnect );
-                iConnection->StopConnectionL();
+                // if no full view widgets open, then close the network connection
+                if ( ( !FullViewWidgetsOpen() ) && ( iConnection->Connected() ) )
+                    {
+                    wdgt_window->Engine()->HandleCommandL( 
+                            (TInt)TBrCtlDefs::ECommandIdBase +
+                            (TInt)TBrCtlDefs::ECommandDisconnect );
+                    iConnection->StopConnectionL();
+                    }
+                wdgt_window->DetermineNetworkState();
                 }
-            wdgt_window->DetermineNetworkState();
             }
             break;
        case WidgetRestart:
@@ -997,6 +1003,9 @@
 #ifdef BRDO_WRT_HS_FF 
         wdgt_window->Engine()->MakeVisible( EFalse );
         wdgt_window->Engine()->SetRect( iCpsPublisher->BitmapSize());
+        //When HS comes to foreground show the latest updatd content on HS.
+        //Relayout can sometimes happen only when widget in FullView.
+        wdgt_window->PublishSnapShot();
 #endif
         }
     }
@@ -1397,6 +1406,11 @@
     else
         {
         NotifyCommandHandled();
+        TBool lastOne( iWidgetUiWindowManager->WindowListCount() == 0 );
+        if( lastOne )
+            {
+            iWidgetUiWindowManager->AppUi().Exit();
+            }
         iWidgetUiWindowManager->SendAppToBackground();  
         iWidgetUiWindowManager->WidgetUIClientSession().SetActive( iUid, EFalse );
         }        
diff -r 9a9a761f03f1 -r 0ed94ceaa377 widgets/widgetapp/src/WidgetUiWindowView.cpp
--- a/widgets/widgetapp/src/WidgetUiWindowView.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/widgets/widgetapp/src/WidgetUiWindowView.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -37,7 +37,7 @@
 #include <AknSgcc.h>
 #include <akntitle.h>
 #include <centralrepository.h>
-#include <BrowserUiSDKCRKeys.h>
+#include <browseruisdkcrkeys.h>
 #ifdef RD_SCALABLE_UI_V2
 #include <LayoutMetaData.cdl.h> // For Layout_Meta_Data landscape/portrait status
 #include <akntoolbar.h>
@@ -323,13 +323,6 @@
 
     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)
diff -r 9a9a761f03f1 -r 0ed94ceaa377 widgets/widgetinstaller/data/WidgetInstallerUI.rss
--- a/widgets/widgetinstaller/data/WidgetInstallerUI.rss	Tue Nov 24 09:02:20 2009 +0200
+++ b/widgets/widgetinstaller/data/WidgetInstallerUI.rss	Thu Dec 17 09:20:16 2009 +0200
@@ -26,7 +26,6 @@
 #include <avkon.rh>
 #include <avkon.mbg>
 #include <avkon.loc>
-#include <swinstcommonui.rsg>
 #include <WidgetInstallerUI.loc>
 
 RESOURCE RSS_SIGNATURE { }
diff -r 9a9a761f03f1 -r 0ed94ceaa377 widgets/widgetinstaller/group/WidgetInstallerUI.mmp
--- a/widgets/widgetinstaller/group/WidgetInstallerUI.mmp	Tue Nov 24 09:02:20 2009 +0200
+++ b/widgets/widgetinstaller/group/WidgetInstallerUI.mmp	Thu Dec 17 09:20:16 2009 +0200
@@ -20,7 +20,7 @@
 #include <data_caging_paths.hrh>
 #include <platform_paths.hrh>
 #include <bldvariant.hrh>
-#include <platform/mw/Browser_platform_variant.hrh>
+#include <platform/mw/browser_platform_variant.hrh>
 
 // TARGET INFO
 TARGET          WidgetInstallerUI.dll
@@ -38,7 +38,6 @@
 
 START RESOURCE  ../data/WidgetInstallerUI.rss
 DEPENDS avkon.rsg
-DEPENDS swinstcommonui.rsg
 HEADER
 TARGETPATH      Resource
 #ifdef __S60_32__
diff -r 9a9a761f03f1 -r 0ed94ceaa377 widgets/widgetinstaller/group/bld.inf
--- a/widgets/widgetinstaller/group/bld.inf	Tue Nov 24 09:02:20 2009 +0200
+++ b/widgets/widgetinstaller/group/bld.inf	Thu Dec 17 09:20:16 2009 +0200
@@ -18,7 +18,7 @@
 */
 
 #include <platform_paths.hrh>
-#include "../../../web_plat/browser_platform_api/inc/Browser_platform_variant.hrh"
+#include "../../../web_plat/browser_platform_api/inc/browser_platform_variant.hrh"
 
 PRJ_PLATFORMS
 DEFAULT GCCE
diff -r 9a9a761f03f1 -r 0ed94ceaa377 widgets/widgetinstaller/inc/WidgetUIConfigHandler.h
--- a/widgets/widgetinstaller/inc/WidgetUIConfigHandler.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/widgets/widgetinstaller/inc/WidgetUIConfigHandler.h	Thu Dec 17 09:20:16 2009 +0200
@@ -21,8 +21,8 @@
 
 // INCLUDES
 #include <libxml2_tree.h>
-#include <WidgetRegistryConstants.h>
-#include <WidgetPropertyValue.h>
+#include <widgetregistryconstants.h>
+#include <widgetpropertyvalue.h>
 
 // FORWARD DECLARATION
 
diff -r 9a9a761f03f1 -r 0ed94ceaa377 widgets/widgetinstaller/inc/WidgetUIOperationsWatcher.h
--- a/widgets/widgetinstaller/inc/WidgetUIOperationsWatcher.h	Tue Nov 24 09:02:20 2009 +0200
+++ b/widgets/widgetinstaller/inc/WidgetUIOperationsWatcher.h	Thu Dec 17 09:20:16 2009 +0200
@@ -28,7 +28,7 @@
 #include <SWInstDefs.h>
 #include <SWInstTaskManager.h>
 #include <SWInstLogTaskParam.h>
-#include <WidgetRegistryClient.h>
+#include <widgetregistryclient.h>
 #include <apgcli.h> // RApaLsSession
 #include "cuicanceltimer.h"
 #include "WidgetUIHandler.h"
diff -r 9a9a761f03f1 -r 0ed94ceaa377 widgets/widgetinstaller/src/WidgetRegistrationManager.cpp
--- a/widgets/widgetinstaller/src/WidgetRegistrationManager.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/widgets/widgetinstaller/src/WidgetRegistrationManager.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -21,7 +21,13 @@
 #include <apgcli.h>
 #include <APGICNFL.h>
 #include <S32MEM.H>
-#include <WidgetRegistryConstants.h>
+#include <widgetregistryconstants.h>
+
+#ifdef SYMBIAN_ENABLE_SPLIT_HEADERS
+#include <apgicnflpartner.h>
+//#include <apgicnflinternal.h>
+#endif
+
 
 // CONSTANTS
 _LIT(KMBMExt, ".mbm");
diff -r 9a9a761f03f1 -r 0ed94ceaa377 widgets/widgetinstaller/src/WidgetUIConfigHandler.cpp
--- a/widgets/widgetinstaller/src/WidgetUIConfigHandler.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/widgets/widgetinstaller/src/WidgetUIConfigHandler.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -25,7 +25,7 @@
 #include "SWInstWidgetUid.h"
 #include "WidgetInstallerInternalCRKeys.h"
 #include <charconv.h>
-#include <WidgetRegistryConstants.h>
+#include <widgetregistryconstants.h>
 
 
 // DTD
diff -r 9a9a761f03f1 -r 0ed94ceaa377 widgets/widgetlauncher/group/WidgetLauncher.mmp
--- a/widgets/widgetlauncher/group/WidgetLauncher.mmp	Tue Nov 24 09:02:20 2009 +0200
+++ b/widgets/widgetlauncher/group/WidgetLauncher.mmp	Thu Dec 17 09:20:16 2009 +0200
@@ -19,7 +19,7 @@
 
 
 #include <platform_paths.hrh>
-#include <platform/mw/Browser_platform_variant.hrh>
+#include <platform/mw/browser_platform_variant.hrh>
 
 target widgetlauncher.exe
 targettype exe
diff -r 9a9a761f03f1 -r 0ed94ceaa377 widgets/widgetlauncher/src/WidgetLauncher.cpp
--- a/widgets/widgetlauncher/src/WidgetLauncher.cpp	Tue Nov 24 09:02:20 2009 +0200
+++ b/widgets/widgetlauncher/src/WidgetLauncher.cpp	Thu Dec 17 09:20:16 2009 +0200
@@ -32,7 +32,7 @@
 #include <oommonitorsession.h>
 #include <e32property.h>
 #include <systemwarninglevels.hrh>
-#include "Browser_platform_variant.hrh"
+#include "browser_platform_variant.hrh"
 
 // CONSTANTS
 #define KUidWidgetOOMPlugin 0x10282855
diff -r 9a9a761f03f1 -r 0ed94ceaa377 widgets/widgetpreinstaller/Group/WidgetPreInstaller.mmp
--- a/widgets/widgetpreinstaller/Group/WidgetPreInstaller.mmp	Tue Nov 24 09:02:20 2009 +0200
+++ b/widgets/widgetpreinstaller/Group/WidgetPreInstaller.mmp	Thu Dec 17 09:20:16 2009 +0200
@@ -20,7 +20,7 @@
 #include <defaultcaps.hrh>
 #include <data_caging_paths.hrh>
 #include <platform_paths.hrh>
-#include <platform/mw/Browser_platform_variant.hrh>
+#include <platform/mw/browser_platform_variant.hrh>
 
 TARGET		    WidgetPreInstaller.exe
 TARGETTYPE	    exe
diff -r 9a9a761f03f1 -r 0ed94ceaa377 widgets/widgetrecognizer/group/WidgetRecognizer.mmp
--- a/widgets/widgetrecognizer/group/WidgetRecognizer.mmp	Tue Nov 24 09:02:20 2009 +0200
+++ b/widgets/widgetrecognizer/group/WidgetRecognizer.mmp	Thu Dec 17 09:20:16 2009 +0200
@@ -17,7 +17,7 @@
 
 
 #include <platform_paths.hrh>
-#include <platform/mw/Browser_platform_variant.hrh>
+#include <platform/mw/browser_platform_variant.hrh>
 
 TARGET          WidgetRecognizer.DLL
 TARGETTYPE      PLUGIN
diff -r 9a9a761f03f1 -r 0ed94ceaa377 widgets/widgetstartup/Group/WidgetStartup.mmp
--- a/widgets/widgetstartup/Group/WidgetStartup.mmp	Tue Nov 24 09:02:20 2009 +0200
+++ b/widgets/widgetstartup/Group/WidgetStartup.mmp	Thu Dec 17 09:20:16 2009 +0200
@@ -20,7 +20,7 @@
 #include <defaultcaps.hrh>
 #include <data_caging_paths.hrh>
 #include <platform_paths.hrh>
-#include <platform/mw/Browser_platform_variant.hrh>
+#include <platform/mw/browser_platform_variant.hrh>
 
 TARGET		    WidgetStartup.exe
 TARGETTYPE	    exe