# HG changeset patch # User Dremov Kirill (Nokia-D-MSW/Tampere) # Date 1272882735 -10800 # Node ID 92a765b5b3e7865dc1d398c9e531bb190796e003 # Parent cacf6ee579685b089372f33e3d72cf22258eed5b Revision: 201015 Kit: 201018 diff -r cacf6ee57968 -r 92a765b5b3e7 browserutilities/aiwbrowserprovider/Group/AiwBrowserProvider.mmp --- a/browserutilities/aiwbrowserprovider/Group/AiwBrowserProvider.mmp Fri Apr 16 16:07:13 2010 +0300 +++ b/browserutilities/aiwbrowserprovider/Group/AiwBrowserProvider.mmp Mon May 03 13:32:15 2010 +0300 @@ -29,7 +29,7 @@ UID 0x10009d8d 0x101FD682 SOURCEPATH ../src -SOURCE DllMain.cpp +SOURCE Dllmain.cpp SOURCE AiwBrowserProviderOpenUrl.cpp SOURCE AiwBrowserProviderSaveUrl.cpp diff -r cacf6ee57968 -r 92a765b5b3e7 browserutilities/aiwbrowserprovider/data/101FD682.rss --- a/browserutilities/aiwbrowserprovider/data/101FD682.rss Fri Apr 16 16:07:13 2010 +0300 +++ b/browserutilities/aiwbrowserprovider/data/101FD682.rss Mon May 03 13:32:15 2010 +0300 @@ -17,7 +17,7 @@ // INCLUDES -#include +#include #include // RESOURCE DEFINITIONS diff -r cacf6ee57968 -r 92a765b5b3e7 browserutilities/aiwbrowserprovider/src/AiwBrowserProviderOpenUrl.cpp --- a/browserutilities/aiwbrowserprovider/src/AiwBrowserProviderOpenUrl.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/browserutilities/aiwbrowserprovider/src/AiwBrowserProviderOpenUrl.cpp Mon May 03 13:32:15 2010 +0300 @@ -28,7 +28,7 @@ #include #include #include -#include +#include #include #include #include "AiwBrowserCommands.hrh" diff -r cacf6ee57968 -r 92a765b5b3e7 browserutilities/aiwbrowserprovider/src/AiwBrowserProviderSaveUrl.cpp --- a/browserutilities/aiwbrowserprovider/src/AiwBrowserProviderSaveUrl.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/browserutilities/aiwbrowserprovider/src/AiwBrowserProviderSaveUrl.cpp Mon May 03 13:32:15 2010 +0300 @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include #include diff -r cacf6ee57968 -r 92a765b5b3e7 browserutilities/aiwbrowserprovider/src/Dllmain.cpp --- a/browserutilities/aiwbrowserprovider/src/Dllmain.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/browserutilities/aiwbrowserprovider/src/Dllmain.cpp Mon May 03 13:32:15 2010 +0300 @@ -16,7 +16,7 @@ */ // INCLUDES #include -#include +#include #include "AiwBrowserProviderOpenUrl.h" #include "AiwBrowserProviderSaveUrl.h" #include "logger.h" diff -r cacf6ee57968 -r 92a765b5b3e7 browserutilities/browserdialogsprovider/Group/bld.inf --- a/browserutilities/browserdialogsprovider/Group/bld.inf Fri Apr 16 16:07:13 2010 +0300 +++ b/browserutilities/browserdialogsprovider/Group/bld.inf Mon May 03 13:32:15 2010 +0300 @@ -31,6 +31,6 @@ ../rom/BrowserDialogsProviderResources.iby LANGUAGE_MW_LAYER_IBY_EXPORT_PATH(BrowserDialogsProviderResources.iby) PRJ_MMPFILES -BrowserDialogsProvider.mmp +browserdialogsprovider.mmp PRJ_TESTMMPFILES diff -r cacf6ee57968 -r 92a765b5b3e7 browserutilities/browserdialogsprovider/Inc/BrowserAuthenticationDialog.h --- a/browserutilities/browserdialogsprovider/Inc/BrowserAuthenticationDialog.h Fri Apr 16 16:07:13 2010 +0300 +++ b/browserutilities/browserdialogsprovider/Inc/BrowserAuthenticationDialog.h Mon May 03 13:32:15 2010 +0300 @@ -23,7 +23,7 @@ // INCLUDE FILES -#include +#include // CLASS DECLARATION diff -r cacf6ee57968 -r 92a765b5b3e7 browserutilities/browserdialogsprovider/Inc/BrowserScriptPromptDialog.h --- a/browserutilities/browserdialogsprovider/Inc/BrowserScriptPromptDialog.h Fri Apr 16 16:07:13 2010 +0300 +++ b/browserutilities/browserdialogsprovider/Inc/BrowserScriptPromptDialog.h Mon May 03 13:32:15 2010 +0300 @@ -21,7 +21,7 @@ #define BROWSERSCRIPTPROMPTDIALOG_H // INCLUDES -#include +#include // CLASS DECLARATION diff -r cacf6ee57968 -r 92a765b5b3e7 browserutilities/browserdialogsprovider/Inc/BrowserSelectElementDlg.h --- a/browserutilities/browserdialogsprovider/Inc/BrowserSelectElementDlg.h Fri Apr 16 16:07:13 2010 +0300 +++ b/browserutilities/browserdialogsprovider/Inc/BrowserSelectElementDlg.h Mon May 03 13:32:15 2010 +0300 @@ -27,7 +27,7 @@ // System includes #include -#include +#include #include // FORWARD DECLARATIONS diff -r cacf6ee57968 -r 92a765b5b3e7 browserutilities/browserdialogsprovider/Inc/BrowserViewImagesListBox.h --- a/browserutilities/browserdialogsprovider/Inc/BrowserViewImagesListBox.h Fri Apr 16 16:07:13 2010 +0300 +++ b/browserutilities/browserdialogsprovider/Inc/BrowserViewImagesListBox.h Mon May 03 13:32:15 2010 +0300 @@ -24,9 +24,9 @@ // INCLUDES #include #include -#include +#include #include -#include +#include // Browser as a Plugin includes #include diff -r cacf6ee57968 -r 92a765b5b3e7 browserutilities/browserdialogsprovider/Inc/BrowserViewImagesPopup.h --- a/browserutilities/browserdialogsprovider/Inc/BrowserViewImagesPopup.h Fri Apr 16 16:07:13 2010 +0300 +++ b/browserutilities/browserdialogsprovider/Inc/BrowserViewImagesPopup.h Mon May 03 13:32:15 2010 +0300 @@ -24,9 +24,9 @@ // INCLUDES #include #include -#include +#include #include -#include +#include // Browser as a Plugin includes #include diff -r cacf6ee57968 -r 92a765b5b3e7 browserutilities/browserdialogsprovider/Src/BrowserAuthenticationDialog.cpp --- a/browserutilities/browserdialogsprovider/Src/BrowserAuthenticationDialog.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/browserutilities/browserdialogsprovider/Src/BrowserAuthenticationDialog.cpp Mon May 03 13:32:15 2010 +0300 @@ -20,7 +20,7 @@ // INCLUDE FILES -#include +#include #include #include "BrowserAuthenticationDialog.h" diff -r cacf6ee57968 -r 92a765b5b3e7 browserutilities/browserdialogsprovider/Src/BrowserDialogsProvider.cpp --- a/browserutilities/browserdialogsprovider/Src/BrowserDialogsProvider.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/browserutilities/browserdialogsprovider/Src/BrowserDialogsProvider.cpp Mon May 03 13:32:15 2010 +0300 @@ -32,7 +32,7 @@ #include "BrowserUploadProgressNote.h" // For UploadProgressNoteL // System Includes -#include // for Object Element Dialog +#include // for Object Element Dialog #include // DialogAlertL #include // File Selection Dialog @@ -47,17 +47,17 @@ #include #include // tooltip -#include -#include +#include +#include #include // Media Fetch // General #include // strings #include -#include +#include #include // Resources -#include +#include #include // Data Caging diff -r cacf6ee57968 -r 92a765b5b3e7 browserutilities/browserdialogsprovider/Src/BrowserSelectElementListBox.cpp --- a/browserutilities/browserdialogsprovider/Src/BrowserSelectElementListBox.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/browserutilities/browserdialogsprovider/Src/BrowserSelectElementListBox.cpp Mon May 03 13:32:15 2010 +0300 @@ -22,7 +22,7 @@ #include "BrowserSelectElementModel.h" #include "BrowserSelectElementItemDrawer.h" -#include +#include // CONSTANTS #include "BrowserDialogsProviderConstants.h" diff -r cacf6ee57968 -r 92a765b5b3e7 browserutilities/browserdialogsprovider/Src/BrowserViewImagesListBox.cpp --- a/browserutilities/browserdialogsprovider/Src/BrowserViewImagesListBox.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/browserutilities/browserdialogsprovider/Src/BrowserViewImagesListBox.cpp Mon May 03 13:32:15 2010 +0300 @@ -24,7 +24,7 @@ #include #include -#include +#include #include using namespace ContentAccess; //----------------------------------------------------------------------------- diff -r cacf6ee57968 -r 92a765b5b3e7 browserutilities/browserdialogsprovider/Src/BrowserViewImagesPopup.cpp --- a/browserutilities/browserdialogsprovider/Src/BrowserViewImagesPopup.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/browserutilities/browserdialogsprovider/Src/BrowserViewImagesPopup.cpp Mon May 03 13:32:15 2010 +0300 @@ -26,12 +26,12 @@ #include "BrowserViewImagesListBox.h" // SYSTEM INCLUDES -#include +#include #include -#include +#include #include #include -#include +#include #include #include diff -r cacf6ee57968 -r 92a765b5b3e7 browserutilities/browserdialogsprovider/SrcData/BrowserDialogsProvider.rss --- a/browserutilities/browserdialogsprovider/SrcData/BrowserDialogsProvider.rss Fri Apr 16 16:07:13 2010 +0300 +++ b/browserutilities/browserdialogsprovider/SrcData/BrowserDialogsProvider.rss Mon May 03 13:32:15 2010 +0300 @@ -27,7 +27,7 @@ #include #include #include -#include +#include NAME BRDP // for Browser Dialogs Provider diff -r cacf6ee57968 -r 92a765b5b3e7 browserutilities/browsertelservice/group/BrowserTelService.mmp --- a/browserutilities/browsertelservice/group/BrowserTelService.mmp Fri Apr 16 16:07:13 2010 +0300 +++ b/browserutilities/browsertelservice/group/BrowserTelService.mmp Mon May 03 13:32:15 2010 +0300 @@ -34,7 +34,7 @@ LANGUAGE_IDS #endif -START RESOURCE ../data/browsertelservice.rss +START RESOURCE ../data/BrowserTelService.rss DEPENDS avkon.rsg HEADER TARGETPATH RESOURCE_FILES_DIR diff -r cacf6ee57968 -r 92a765b5b3e7 browserutilities/browsertelservice/group/bld.inf --- a/browserutilities/browsertelservice/group/bld.inf Fri Apr 16 16:07:13 2010 +0300 +++ b/browserutilities/browsertelservice/group/bld.inf Mon May 03 13:32:15 2010 +0300 @@ -24,7 +24,7 @@ // public api includes ../inc/BrowserTelService.h |../../../inc/BrowserTelService.h ../inc/BrowserTelServiceEtelWatcher.h |../../../inc/BrowserTelServiceEtelWatcher.h -../rom/browsertelservice.iby CORE_MW_LAYER_IBY_EXPORT_PATH(browsertelservice.iby) +../Rom/browsertelservice.iby CORE_MW_LAYER_IBY_EXPORT_PATH(browsertelservice.iby) ../loc/BrowserTelService.loc MW_LAYER_LOC_EXPORT_PATH(BrowserTelService.loc) PRJ_MMPFILES diff -r cacf6ee57968 -r 92a765b5b3e7 browserutilities/browsertelservice/inc/BrowserTelService.h --- a/browserutilities/browsertelservice/inc/BrowserTelService.h Fri Apr 16 16:07:13 2010 +0300 +++ b/browserutilities/browsertelservice/inc/BrowserTelService.h Mon May 03 13:32:15 2010 +0300 @@ -33,7 +33,7 @@ #include #include #include -#include +#include #include #include @@ -42,8 +42,8 @@ #include -#include -#include +#include +#include #endif // __BROWSER_TEL_SERVICES_CALLUI__ diff -r cacf6ee57968 -r 92a765b5b3e7 browserutilities/browsertelservice/inc/BrowserTelServiceDlgs.h --- a/browserutilities/browsertelservice/inc/BrowserTelServiceDlgs.h Fri Apr 16 16:07:13 2010 +0300 +++ b/browserutilities/browsertelservice/inc/BrowserTelServiceDlgs.h Mon May 03 13:32:15 2010 +0300 @@ -26,7 +26,7 @@ #include #include #include -#include +#include // CLASS DECLARATION diff -r cacf6ee57968 -r 92a765b5b3e7 browserutilities/browsertelservice/src/BrowserTelService.cpp --- a/browserutilities/browsertelservice/src/BrowserTelService.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/browserutilities/browsertelservice/src/BrowserTelService.cpp Mon May 03 13:32:15 2010 +0300 @@ -29,9 +29,9 @@ //#include // Phonebook editor // For searching a matching number from contact's db //#include -#include - -#include +#include + +#include // #include #include @@ -57,7 +57,7 @@ #include #include -#include +#include #include #include diff -r cacf6ee57968 -r 92a765b5b3e7 browserutilities/browsertelservice/src/BrowserTelServiceDlgs.cpp --- a/browserutilities/browsertelservice/src/BrowserTelServiceDlgs.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/browserutilities/browsertelservice/src/BrowserTelServiceDlgs.cpp Mon May 03 13:32:15 2010 +0300 @@ -22,7 +22,7 @@ #include #include -#include +#include #include #include "BrowserTelServiceDlgs.h" diff -r cacf6ee57968 -r 92a765b5b3e7 browserutilities/connectionmanager/Data/connectionmanager.rss --- a/browserutilities/connectionmanager/Data/connectionmanager.rss Fri Apr 16 16:07:13 2010 +0300 +++ b/browserutilities/connectionmanager/Data/connectionmanager.rss Mon May 03 13:32:15 2010 +0300 @@ -23,7 +23,7 @@ // INCLUDES #include #include -#include +#include #include "eikon.rsg" #include #include diff -r cacf6ee57968 -r 92a765b5b3e7 browserutilities/connectionmanager/Group/ConnectionManager.mmp --- a/browserutilities/connectionmanager/Group/ConnectionManager.mmp Fri Apr 16 16:07:13 2010 +0300 +++ b/browserutilities/connectionmanager/Group/ConnectionManager.mmp Mon May 03 13:32:15 2010 +0300 @@ -26,23 +26,23 @@ TARGET ConnectionManager.dll TARGETTYPE dll UID 0x1000008d 0x10008D3F -SOURCEPATH ../src +SOURCEPATH ../Src VENDORID VID_DEFAULT CAPABILITY CAP_GENERAL_DLL -USERINCLUDE ../inc +USERINCLUDE ../Inc USERINCLUDE ../../inc MW_LAYER_SYSTEMINCLUDE -START RESOURCE ../data/ConnectionManager.rss +START RESOURCE ../Data/connectionmanager.rss DEPENDS avkon.rsg HEADER TARGETPATH RESOURCE_FILES_DIR END -SOURCE IdPair.cpp +SOURCE Idpair.cpp SOURCE InternetConnectionManager.cpp SOURCE ConnectionObservers.cpp SOURCE ConnManActiveConnector.cpp diff -r cacf6ee57968 -r 92a765b5b3e7 browserutilities/connectionmanager/Group/bld.inf --- a/browserutilities/connectionmanager/Group/bld.inf Fri Apr 16 16:07:13 2010 +0300 +++ b/browserutilities/connectionmanager/Group/bld.inf Mon May 03 13:32:15 2010 +0300 @@ -24,8 +24,8 @@ DEFAULT PRJ_EXPORTS -../rom/ConnectionManager.iby CORE_MW_LAYER_IBY_EXPORT_PATH(ConnectionManager.iby) -../rom/ConnectionManagerResources.iby LANGUAGE_MW_LAYER_IBY_EXPORT_PATH(ConnectionManagerResources.iby) +../rom/Connectionmanager.iby CORE_MW_LAYER_IBY_EXPORT_PATH(ConnectionManager.iby) +../rom/connectionmanagerresources.iby LANGUAGE_MW_LAYER_IBY_EXPORT_PATH(ConnectionManagerResources.iby) ../loc/connectionmanager.loc MW_LAYER_LOC_EXPORT_PATH(connectionmanager.loc) #ifdef __SERIES60_32__ diff -r cacf6ee57968 -r 92a765b5b3e7 browserutilities/connectionmanager/Src/ConnManActiveConnector.cpp --- a/browserutilities/connectionmanager/Src/ConnManActiveConnector.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/browserutilities/connectionmanager/Src/ConnManActiveConnector.cpp Mon May 03 13:32:15 2010 +0300 @@ -24,7 +24,7 @@ #include "ConnectionManagerLogger.h" #include -#include +#include //-------------------------------------------------------------------------- //CConnManActiveConnector::CConnManActiveConnector() diff -r cacf6ee57968 -r 92a765b5b3e7 browserutilities/connectionmanager/Src/InternetConnectionManager.cpp --- a/browserutilities/connectionmanager/Src/InternetConnectionManager.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/browserutilities/connectionmanager/Src/InternetConnectionManager.cpp Mon May 03 13:32:15 2010 +0300 @@ -25,7 +25,7 @@ #include #include -#include +#include #include #include #include @@ -35,41 +35,41 @@ #include #include #include -#include +#include #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include #include #include -#include -#include +#include +#include #include #include #include #include #include #include -#include +#include #include #include #include #include -#include +#include #include #include #include -#include +#include //User Includes #include "InternetConnectionManager.h" -#include "connman.hrh" -#include "connectionmanagerlogger.h" -#include "connectionobservers.h" -#include "connmanactiveconnector.h" +#include "ConnMan.hrh" +#include "ConnectionManagerLogger.h" +#include "ConnectionObservers.h" +#include "ConnManActiveConnector.h" using namespace CMManager; diff -r cacf6ee57968 -r 92a765b5b3e7 browserutilities/cxmllibrary/group/cXmlParser.mmp --- a/browserutilities/cxmllibrary/group/cXmlParser.mmp Fri Apr 16 16:07:13 2010 +0300 +++ b/browserutilities/cxmllibrary/group/cXmlParser.mmp Mon May 03 13:32:15 2010 +0300 @@ -24,13 +24,13 @@ #if defined(ARMCC) UID 0x1000008D 0x101F8710 -deffile EABI/cXmlParser.def +deffile eabi/CXMLPARSER.DEF #elif defined( WINSCW ) -deffile Bwinscw/cXmlParser.def +deffile BWINSCW/CXMLPARSER.DEF #elif defined( WINS ) deffile Bwins/cXmlParser.def #else -deffile Bmarm/cXmlParser.def +deffile bmarm/CXMLPARSER.DEF #endif CAPABILITY CAP_GENERAL_DLL @@ -51,7 +51,7 @@ SOURCE tinydom/src/tiny_dom_write.c SOURCE tinytree/src/EBuffer.c SOURCE tinytree/src/tree.c -SOURCE tinyTree/src/TreeVector.c +SOURCE tinytree/src/TreeVector.c SOURCE wbxmlp/src/dictionary.c SOURCE wbxmlp/src/DictionaryContext.cpp SOURCE wbxmlp/src/doc.c @@ -70,7 +70,7 @@ SOURCE utils/src/cxml_mem.c SOURCE utils/src/cxml_vector.c SOURCE utils/src/cxml_str.c -SOURCE utils/src/E32XMLPARSERDLLEntryPoint.cpp +SOURCE utils/src/E32XMLParserDllEntryPoint.cpp SOURCE utils/src/cxml_file_if.cpp diff -r cacf6ee57968 -r 92a765b5b3e7 browserutilities/cxmllibrary/src/utils/src/cxml_file_if.cpp --- a/browserutilities/cxmllibrary/src/utils/src/cxml_file_if.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/browserutilities/cxmllibrary/src/utils/src/cxml_file_if.cpp Mon May 03 13:32:15 2010 +0300 @@ -17,7 +17,7 @@ -#include +#include #include "cxml_file_if.h" #include "nw_string_char.h" diff -r cacf6ee57968 -r 92a765b5b3e7 browserutilities/cxmllibrary/src/utils/src/cxml_str.c --- a/browserutilities/cxmllibrary/src/utils/src/cxml_str.c Fri Apr 16 16:07:13 2010 +0300 +++ b/browserutilities/cxmllibrary/src/utils/src/cxml_str.c Mon May 03 13:32:15 2010 +0300 @@ -28,7 +28,7 @@ */ #include "cxml_internal.h" -#include "cxml_nw2cxmlTypes.h" +#include "cxml_nw2cxmltypes.h" static NW_Uint16 CXML_Str_Strlen(const CXML_Ucs2 *string) diff -r cacf6ee57968 -r 92a765b5b3e7 browserutilities/cxmllibrary/src/wbxmlp/src/DictionaryContext.cpp --- a/browserutilities/cxmllibrary/src/wbxmlp/src/DictionaryContext.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/browserutilities/cxmllibrary/src/wbxmlp/src/DictionaryContext.cpp Mon May 03 13:32:15 2010 +0300 @@ -17,7 +17,7 @@ #include #include "DictionaryContext.h" #include "cxml_internal.h" -#include "FeatMgr.h" +#include "featmgr.h" #include "nw_wbxml_dictionary.h" /* There is possibility that dictionary initialize is called by the embedded diff -r cacf6ee57968 -r 92a765b5b3e7 browserutilities/downloadmgr/DownloadMgrClntSrv/group/DownloadMgrClntSrv.mmp --- a/browserutilities/downloadmgr/DownloadMgrClntSrv/group/DownloadMgrClntSrv.mmp Fri Apr 16 16:07:13 2010 +0300 +++ b/browserutilities/downloadmgr/DownloadMgrClntSrv/group/DownloadMgrClntSrv.mmp Mon May 03 13:32:15 2010 +0300 @@ -47,7 +47,7 @@ SOURCE DownloadMgrCod.cpp SOURCE DownloadMgrLogger.cpp SOURCE DownloadMgrClientApiExt.cpp -SOURCE ../../DownloadMgrServEng/src/DownloadDataServ.cpp +SOURCE ../../DownloadMgrServEng/Src/DownloadDataServ.cpp USERINCLUDE ../inc diff -r cacf6ee57968 -r 92a765b5b3e7 browserutilities/downloadmgr/DownloadMgrClntSrv/src/DownloadMgrClntSession.cpp --- a/browserutilities/downloadmgr/DownloadMgrClntSrv/src/DownloadMgrClntSession.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/browserutilities/downloadmgr/DownloadMgrClntSrv/src/DownloadMgrClntSession.cpp Mon May 03 13:32:15 2010 +0300 @@ -26,7 +26,7 @@ #include "DownloadMgrDefAttrib.h" #include "DownloadMgrHandler.h" #include -#include +#include #include #include "DownloadMgrCRKeys.h" #include diff -r cacf6ee57968 -r 92a765b5b3e7 browserutilities/downloadmgr/DownloadMgrClntSrv/src/DownloadMgrClntSubSession.cpp --- a/browserutilities/downloadmgr/DownloadMgrClntSrv/src/DownloadMgrClntSubSession.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/browserutilities/downloadmgr/DownloadMgrClntSrv/src/DownloadMgrClntSubSession.cpp Mon May 03 13:32:15 2010 +0300 @@ -34,8 +34,8 @@ #include #include #include -#include -#include +#include +#include // CONSTANTS _LIT8( KTransactionCallback, "TransactionCallback" ); diff -r cacf6ee57968 -r 92a765b5b3e7 browserutilities/downloadmgr/DownloadMgrServEng/Group/HttpDMServEng.mmp --- a/browserutilities/downloadmgr/DownloadMgrServEng/Group/HttpDMServEng.mmp Fri Apr 16 16:07:13 2010 +0300 +++ b/browserutilities/downloadmgr/DownloadMgrServEng/Group/HttpDMServEng.mmp Mon May 03 13:32:15 2010 +0300 @@ -37,7 +37,7 @@ DEFFILE ../BWinsCw/HTTPDMSERVENGU_EKA2.def #endif -SOURCEPATH ../src +SOURCEPATH ../Src //APP_LAYER_SYSTEMINCLUDE /* SF TODO: resolve APP LAYER DEPENDENCY: @@ -50,7 +50,7 @@ MW_LAYER_HTTP_SYSTEMINCLUDE -USERINCLUDE ../inc +USERINCLUDE ../Inc SOURCE HttpDownloadManagerServerEngine.cpp SOURCE HttpClientApp.cpp diff -r cacf6ee57968 -r 92a765b5b3e7 browserutilities/downloadmgr/DownloadMgrServEng/Group/bld.inf --- a/browserutilities/downloadmgr/DownloadMgrServEng/Group/bld.inf Fri Apr 16 16:07:13 2010 +0300 +++ b/browserutilities/downloadmgr/DownloadMgrServEng/Group/bld.inf Mon May 03 13:32:15 2010 +0300 @@ -23,6 +23,6 @@ PRJ_EXPORTS PRJ_MMPFILES -../group/HttpDMServEng.mmp +../Group/HttpDMServEng.mmp // End of File diff -r cacf6ee57968 -r 92a765b5b3e7 browserutilities/downloadmgr/DownloadMgrServEng/Inc/HttpConnHandler.h --- a/browserutilities/downloadmgr/DownloadMgrServEng/Inc/HttpConnHandler.h Fri Apr 16 16:07:13 2010 +0300 +++ b/browserutilities/downloadmgr/DownloadMgrServEng/Inc/HttpConnHandler.h Mon May 03 13:32:15 2010 +0300 @@ -24,7 +24,7 @@ #include #include #include -#include +#include // CONSTANTS //const ?type ?constant_var = ?constant; diff -r cacf6ee57968 -r 92a765b5b3e7 browserutilities/downloadmgr/DownloadMgrServEng/Src/BuffStorage.cpp --- a/browserutilities/downloadmgr/DownloadMgrServEng/Src/BuffStorage.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/browserutilities/downloadmgr/DownloadMgrServEng/Src/BuffStorage.cpp Mon May 03 13:32:15 2010 +0300 @@ -28,9 +28,9 @@ #include "HttpDownloadMgrLogger.h" #include "HeaderField.h" -#include +#include #include -#include +#include #include "HttpDownloadMgrLogger.h" diff -r cacf6ee57968 -r 92a765b5b3e7 browserutilities/downloadmgr/DownloadMgrServEng/Src/HttpConnHandler.cpp --- a/browserutilities/downloadmgr/DownloadMgrServEng/Src/HttpConnHandler.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/browserutilities/downloadmgr/DownloadMgrServEng/Src/HttpConnHandler.cpp Mon May 03 13:32:15 2010 +0300 @@ -27,13 +27,13 @@ #include "HttpDownloadMgrLogger.h" #include -#include -#include +#include +#include #include -#include +#include #include //#include -#include +#include // EXTERNAL DATA STRUCTURES //extern ?external_data; diff -r cacf6ee57968 -r 92a765b5b3e7 browserutilities/downloadmgr/DownloadMgrServEng/Src/HttpDownload.cpp --- a/browserutilities/downloadmgr/DownloadMgrServEng/Src/HttpDownload.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/browserutilities/downloadmgr/DownloadMgrServEng/Src/HttpDownload.cpp Mon May 03 13:32:15 2010 +0300 @@ -29,13 +29,13 @@ #include "HttpDownloadMgrLogger.h" #include "bautils.h" -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include -#include +#include // following line is temporary: AVKON dependency removal #undef BRDO_APP_GALLERY_SUPPORTED_FF diff -r cacf6ee57968 -r 92a765b5b3e7 browserutilities/downloadmgr/DownloadMgrServEng/Src/HttpDownloadManagerServerEngine.cpp --- a/browserutilities/downloadmgr/DownloadMgrServEng/Src/HttpDownloadManagerServerEngine.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/browserutilities/downloadmgr/DownloadMgrServEng/Src/HttpDownloadManagerServerEngine.cpp Mon May 03 13:32:15 2010 +0300 @@ -30,7 +30,7 @@ #include #include #include -#include +#include #ifdef RD_MULTIPLE_DRIVE #include diff -r cacf6ee57968 -r 92a765b5b3e7 browserutilities/downloadmgr/DownloadMgrServEng/Src/HttpStorage.cpp --- a/browserutilities/downloadmgr/DownloadMgrServEng/Src/HttpStorage.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/browserutilities/downloadmgr/DownloadMgrServEng/Src/HttpStorage.cpp Mon May 03 13:32:15 2010 +0300 @@ -30,9 +30,9 @@ #include "HeaderField.h" #include "BuffStorage.h" -#include +#include #include -#include +#include #ifdef __SYNCML_DM_FOTA #include diff -r cacf6ee57968 -r 92a765b5b3e7 browserutilities/downloadmgr/DownloadMgrUiLib/Data/DownloadMgrUiLib.rss --- a/browserutilities/downloadmgr/DownloadMgrUiLib/Data/DownloadMgrUiLib.rss Fri Apr 16 16:07:13 2010 +0300 +++ b/browserutilities/downloadmgr/DownloadMgrUiLib/Data/DownloadMgrUiLib.rss Mon May 03 13:32:15 2010 +0300 @@ -30,7 +30,7 @@ #include #include #include -#include +#include #include #include #include diff -r cacf6ee57968 -r 92a765b5b3e7 browserutilities/downloadmgr/DownloadMgrUiLib/Inc/CUserInteractionsUtils.h --- a/browserutilities/downloadmgr/DownloadMgrUiLib/Inc/CUserInteractionsUtils.h Fri Apr 16 16:07:13 2010 +0300 +++ b/browserutilities/downloadmgr/DownloadMgrUiLib/Inc/CUserInteractionsUtils.h Mon May 03 13:32:15 2010 +0300 @@ -22,7 +22,7 @@ // INCLUDES #include -#include +#include #include #include #include diff -r cacf6ee57968 -r 92a765b5b3e7 browserutilities/downloadmgr/DownloadMgrUiLib/Src/CDownloadMgrUiDownloadsList.cpp --- a/browserutilities/downloadmgr/DownloadMgrUiLib/Src/CDownloadMgrUiDownloadsList.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/browserutilities/downloadmgr/DownloadMgrUiLib/Src/CDownloadMgrUiDownloadsList.cpp Mon May 03 13:32:15 2010 +0300 @@ -40,7 +40,7 @@ #include #include #include -#include +#include // following line is temporary: AVKON dependency removal #undef BRDO_APP_GALLERY_SUPPORTED_FF @@ -2565,7 +2565,7 @@ } #ifdef __WINS__ #include -#include +#include // ---------------------------------------------------------------------------- // AskIapId(TUint32& aId) // Ask IAP id from the user. Used due to efficiency only on WINS* platforms. diff -r cacf6ee57968 -r 92a765b5b3e7 browserutilities/downloadmgr/DownloadMgrUiLib/Src/CDownloadUtils.cpp --- a/browserutilities/downloadmgr/DownloadMgrUiLib/Src/CDownloadUtils.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/browserutilities/downloadmgr/DownloadMgrUiLib/Src/CDownloadUtils.cpp Mon May 03 13:32:15 2010 +0300 @@ -27,7 +27,7 @@ #include #include #include -#include +#include // LOCAL CONSTANTS AND MACROS #ifdef BRDO_WML_DISABLED_FF diff -r cacf6ee57968 -r 92a765b5b3e7 browserutilities/downloadmgr/DownloadMgrUiLib/Src/CUserInteractionsUtils.cpp --- a/browserutilities/downloadmgr/DownloadMgrUiLib/Src/CUserInteractionsUtils.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/browserutilities/downloadmgr/DownloadMgrUiLib/Src/CUserInteractionsUtils.cpp Mon May 03 13:32:15 2010 +0300 @@ -42,11 +42,11 @@ #include #include #include -#include +#include #include #include -#include -#include +#include +#include #include #include #include @@ -54,7 +54,7 @@ #include #include "bautils.h" #include -#include +#include #include #include #include diff -r cacf6ee57968 -r 92a765b5b3e7 browserutilities/downloadmgr/DownloadMgrUiLib/Src/UserInteractionsEventHandler.cpp --- a/browserutilities/downloadmgr/DownloadMgrUiLib/Src/UserInteractionsEventHandler.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/browserutilities/downloadmgr/DownloadMgrUiLib/Src/UserInteractionsEventHandler.cpp Mon May 03 13:32:15 2010 +0300 @@ -35,11 +35,11 @@ #include #include #include -#include +#include #include #include -#include -#include +#include +#include // following line is temporary: AVKON dependency removal diff -r cacf6ee57968 -r 92a765b5b3e7 browserutilities/downloadmgr/Group/bld.inf --- a/browserutilities/downloadmgr/Group/bld.inf Fri Apr 16 16:07:13 2010 +0300 +++ b/browserutilities/downloadmgr/Group/bld.inf Mon May 03 13:32:15 2010 +0300 @@ -23,14 +23,14 @@ DEFAULT PRJ_EXPORTS -../rom/DownloadMgr.iby CORE_MW_LAYER_IBY_EXPORT_PATH(DownloadMgr.iby) +../Rom/DownloadMgr.iby CORE_MW_LAYER_IBY_EXPORT_PATH(DownloadMgr.iby) PRJ_MMPFILES // None -#include "../DownloadMgrServEng/group/bld.inf" +#include "../DownloadMgrServEng/Group/bld.inf" #include "../DownloadMgrClntSrv/group/bld.inf" -#include "../DownloadMgruilib/group/bld.inf" +#include "../DownloadMgrUiLib/Group/Bld.inf" // End of File diff -r cacf6ee57968 -r 92a765b5b3e7 browserutilities/favouritesengine/ClientServer/group/FavouritesEngine.mmp --- a/browserutilities/favouritesengine/ClientServer/group/FavouritesEngine.mmp Fri Apr 16 16:07:13 2010 +0300 +++ b/browserutilities/favouritesengine/ClientServer/group/FavouritesEngine.mmp Mon May 03 13:32:15 2010 +0300 @@ -86,7 +86,7 @@ DEBUGLIBRARY flogger.lib #if defined(ARMCC) - DEFFILE ../EABI/FAVOURITESENGINE.def + DEFFILE ../EABI/FavouritesEngine.DEF #elif defined( WINSCW ) DEFFILE ../BWinsCw/FAVOURITESENGINE.def #elif defined( WINS ) diff -r cacf6ee57968 -r 92a765b5b3e7 browserutilities/favouritesengine/ClientServer/srvsrc/FavouritesSrvSession.cpp --- a/browserutilities/favouritesengine/ClientServer/srvsrc/FavouritesSrvSession.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/browserutilities/favouritesengine/ClientServer/srvsrc/FavouritesSrvSession.cpp Mon May 03 13:32:15 2010 +0300 @@ -35,7 +35,7 @@ #include "FavouritesItemImplList.h" #include "FavouritesUtil.h" #include "UidMap.h" -#include "favouriteslogger.h" +#include "FavouritesLogger.h" #include // CONSTANTS diff -r cacf6ee57968 -r 92a765b5b3e7 browserutilities/feedsengine/FeedsServer/Api/src/Transaction.cpp --- a/browserutilities/feedsengine/FeedsServer/Api/src/Transaction.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/browserutilities/feedsengine/FeedsServer/Api/src/Transaction.cpp Mon May 03 13:32:15 2010 +0300 @@ -20,7 +20,7 @@ #include "Transaction.h" #include "FeedsEntity.h" #include "FeedsInterface.h" -#include +#include #include #include "FeedsMap.h" #include "Packed.h" diff -r cacf6ee57968 -r 92a765b5b3e7 browserutilities/feedsengine/FeedsServer/Client/src/ClientRequestHandlers.cpp --- a/browserutilities/feedsengine/FeedsServer/Client/src/ClientRequestHandlers.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/browserutilities/feedsengine/FeedsServer/Client/src/ClientRequestHandlers.cpp Mon May 03 13:32:15 2010 +0300 @@ -17,7 +17,7 @@ #include -#include +#include #include "ClientRequestHandlers.h" diff -r cacf6ee57968 -r 92a765b5b3e7 browserutilities/feedsengine/FeedsServer/Client/src/FeedRequestHandlers.cpp --- a/browserutilities/feedsengine/FeedsServer/Client/src/FeedRequestHandlers.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/browserutilities/feedsengine/FeedsServer/Client/src/FeedRequestHandlers.cpp Mon May 03 13:32:15 2010 +0300 @@ -17,7 +17,7 @@ #include -#include +#include #include #include "FeedRequestHandlers.h" diff -r cacf6ee57968 -r 92a765b5b3e7 browserutilities/feedsengine/FeedsServer/Client/src/FolderItemRequestHandlers.cpp --- a/browserutilities/feedsengine/FeedsServer/Client/src/FolderItemRequestHandlers.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/browserutilities/feedsengine/FeedsServer/Client/src/FolderItemRequestHandlers.cpp Mon May 03 13:32:15 2010 +0300 @@ -18,7 +18,7 @@ #include #include -#include +#include #include #include "FolderItemRequestHandlers.h" diff -r cacf6ee57968 -r 92a765b5b3e7 browserutilities/feedsengine/FeedsServer/Common/inc/Logger.h --- a/browserutilities/feedsengine/FeedsServer/Common/inc/Logger.h Fri Apr 16 16:07:13 2010 +0300 +++ b/browserutilities/feedsengine/FeedsServer/Common/inc/Logger.h Mon May 03 13:32:15 2010 +0300 @@ -20,7 +20,7 @@ #define LOGGER_H #ifdef _DEBUG -#include +#include #define FEED_LOG(a, b, c, d) RFileLogger::WriteFormat((a), (b), (c), (d)) #define FEED_LOG1(a, b, c, d, e) RFileLogger::WriteFormat((a), (b), (c), (d), (e)) diff -r cacf6ee57968 -r 92a765b5b3e7 browserutilities/feedsengine/FeedsServer/FeedHandler/src/FeedParser.cpp --- a/browserutilities/feedsengine/FeedsServer/FeedHandler/src/FeedParser.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/browserutilities/feedsengine/FeedsServer/FeedHandler/src/FeedParser.cpp Mon May 03 13:32:15 2010 +0300 @@ -16,7 +16,7 @@ */ -#include +#include #include "FeedParser.h" #include "FeedParserObserver.h" diff -r cacf6ee57968 -r 92a765b5b3e7 browserutilities/feedsengine/FeedsServer/FolderHandler/src/OpmlWriter.cpp --- a/browserutilities/feedsengine/FeedsServer/FolderHandler/src/OpmlWriter.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/browserutilities/feedsengine/FeedsServer/FolderHandler/src/OpmlWriter.cpp Mon May 03 13:32:15 2010 +0300 @@ -18,7 +18,7 @@ #include "OpmlWriter.h" -#include +#include _LIT(KTempDirName, "c:\\system\\temp\\"); diff -r cacf6ee57968 -r 92a765b5b3e7 browserutilities/feedsengine/FeedsServer/Server/src/BackRestoreHandler.cpp --- a/browserutilities/feedsengine/FeedsServer/Server/src/BackRestoreHandler.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/browserutilities/feedsengine/FeedsServer/Server/src/BackRestoreHandler.cpp Mon May 03 13:32:15 2010 +0300 @@ -19,7 +19,7 @@ #include "BackRestoreHandler.h" #include "FeedsServer.h" #include // For RProperty Object; -#include // For KUidBackupRestoreKey global variable +#include // For KUidBackupRestoreKey global variable #include // for conn Namespace diff -r cacf6ee57968 -r 92a765b5b3e7 browserutilities/feedsengine/FeedsServer/Server/src/FeedsServerSession.cpp --- a/browserutilities/feedsengine/FeedsServer/Server/src/FeedsServerSession.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/browserutilities/feedsengine/FeedsServer/Server/src/FeedsServerSession.cpp Mon May 03 13:32:15 2010 +0300 @@ -16,8 +16,8 @@ */ -#include -#include +#include +#include #include "FeedsDatabase.h" #include "FeedsServer.h" @@ -27,7 +27,7 @@ #include "Logger.h" #include "PackedFeed.h" #include "PackedFolder.h" -#include +#include _LIT(KTempDirName, "c:\\system\\temp\\"); diff -r cacf6ee57968 -r 92a765b5b3e7 browserutilities/feedsengine/FeedsServer/Server/src/ImportFeedsTask.cpp --- a/browserutilities/feedsengine/FeedsServer/Server/src/ImportFeedsTask.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/browserutilities/feedsengine/FeedsServer/Server/src/ImportFeedsTask.cpp Mon May 03 13:32:15 2010 +0300 @@ -16,7 +16,7 @@ */ -#include +#include #include "ImportFeedsTask.h" #include "FeedsDatabase.h" diff -r cacf6ee57968 -r 92a765b5b3e7 browserutilities/feedsengine/FeedsServer/Server/src/UpdateAllFeedsTask.cpp --- a/browserutilities/feedsengine/FeedsServer/Server/src/UpdateAllFeedsTask.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/browserutilities/feedsengine/FeedsServer/Server/src/UpdateAllFeedsTask.cpp Mon May 03 13:32:15 2010 +0300 @@ -24,7 +24,7 @@ #include "PackedFeed.h" #include "PackedFolder.h" #include "UpdateAllFeedsTask.h" -#include +#include // ----------------------------------------------------------------------------- diff -r cacf6ee57968 -r 92a765b5b3e7 browserutilities/feedsengine/FeedsServer/UrlHandler/inc/HttpConnection.h --- a/browserutilities/feedsengine/FeedsServer/UrlHandler/inc/HttpConnection.h Fri Apr 16 16:07:13 2010 +0300 +++ b/browserutilities/feedsengine/FeedsServer/UrlHandler/inc/HttpConnection.h Mon May 03 13:32:15 2010 +0300 @@ -22,7 +22,7 @@ // INCLUDES #include -#include +#include #include #include "LeakTracker.h" diff -r cacf6ee57968 -r 92a765b5b3e7 browserutilities/feedsengine/FeedsServer/UrlHandler/inc/ServerHttpConnection.h --- a/browserutilities/feedsengine/FeedsServer/UrlHandler/inc/ServerHttpConnection.h Fri Apr 16 16:07:13 2010 +0300 +++ b/browserutilities/feedsengine/FeedsServer/UrlHandler/inc/ServerHttpConnection.h Mon May 03 13:32:15 2010 +0300 @@ -21,7 +21,7 @@ // INCLUDES -#include "httpconnection.h" +#include "HttpConnection.h" // CONSTANTS diff -r cacf6ee57968 -r 92a765b5b3e7 browserutilities/feedsengine/FeedsServer/UrlHandler/inc/SessionHttpConnection.h --- a/browserutilities/feedsengine/FeedsServer/UrlHandler/inc/SessionHttpConnection.h Fri Apr 16 16:07:13 2010 +0300 +++ b/browserutilities/feedsengine/FeedsServer/UrlHandler/inc/SessionHttpConnection.h Mon May 03 13:32:15 2010 +0300 @@ -24,7 +24,7 @@ #include //#include -#include "httpconnection.h" +#include "HttpConnection.h" // CONSTANTS diff -r cacf6ee57968 -r 92a765b5b3e7 browserutilities/feedsengine/FeedsServer/UrlHandler/src/HttpConnection.cpp --- a/browserutilities/feedsengine/FeedsServer/UrlHandler/src/HttpConnection.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/browserutilities/feedsengine/FeedsServer/UrlHandler/src/HttpConnection.cpp Mon May 03 13:32:15 2010 +0300 @@ -17,10 +17,10 @@ #include -#include -#include +#include +#include #include -#include +#include #include "HttpConnection.h" #include "LeakTracker.h" diff -r cacf6ee57968 -r 92a765b5b3e7 browserutilities/feedsengine/FeedsServer/UrlHandler/src/HttpHandler.cpp --- a/browserutilities/feedsengine/FeedsServer/UrlHandler/src/HttpHandler.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/browserutilities/feedsengine/FeedsServer/UrlHandler/src/HttpHandler.cpp Mon May 03 13:32:15 2010 +0300 @@ -16,10 +16,10 @@ */ -#include +#include #include #include -#include +#include #include "HttpConnection.h" #include "HttpHandler.h" diff -r cacf6ee57968 -r 92a765b5b3e7 browserutilities/feedsengine/FeedsServer/UrlHandler/src/ServerHttpConnection.cpp --- a/browserutilities/feedsengine/FeedsServer/UrlHandler/src/ServerHttpConnection.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/browserutilities/feedsengine/FeedsServer/UrlHandler/src/ServerHttpConnection.cpp Mon May 03 13:32:15 2010 +0300 @@ -16,7 +16,7 @@ */ -#include +#include #include #include "ServerHttpConnection.h" diff -r cacf6ee57968 -r 92a765b5b3e7 browserutilities/feedsengine/FeedsServer/UrlHandler/src/UrlHandlerFactory.cpp --- a/browserutilities/feedsengine/FeedsServer/UrlHandler/src/UrlHandlerFactory.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/browserutilities/feedsengine/FeedsServer/UrlHandler/src/UrlHandlerFactory.cpp Mon May 03 13:32:15 2010 +0300 @@ -17,8 +17,8 @@ -#include -#include +#include +#include #include "FileHandler.h" #include "HttpHandler.h" diff -r cacf6ee57968 -r 92a765b5b3e7 browserutilities/feedsengine/FeedsServer/XmlUtils/src/XmlEntity.cpp --- a/browserutilities/feedsengine/FeedsServer/XmlUtils/src/XmlEntity.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/browserutilities/feedsengine/FeedsServer/XmlUtils/src/XmlEntity.cpp Mon May 03 13:32:15 2010 +0300 @@ -17,7 +17,7 @@ -#include +#include #include #include diff -r cacf6ee57968 -r 92a765b5b3e7 browserutilities/feedsengine/FeedsServer/XmlUtils/src/XmlUtils.cpp --- a/browserutilities/feedsengine/FeedsServer/XmlUtils/src/XmlUtils.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/browserutilities/feedsengine/FeedsServer/XmlUtils/src/XmlUtils.cpp Mon May 03 13:32:15 2010 +0300 @@ -18,7 +18,7 @@ #include -#include +#include #include #include "CleanupLibXml2.h" diff -r cacf6ee57968 -r 92a765b5b3e7 browserutilities/group/bld.inf --- a/browserutilities/group/bld.inf Fri Apr 16 16:07:13 2010 +0300 +++ b/browserutilities/group/bld.inf Mon May 03 13:32:15 2010 +0300 @@ -15,21 +15,21 @@ * */ -#include "../browserdialogsprovider/group/bld.inf" +#include "../browserdialogsprovider/Group/bld.inf" #include "../recenturlstore/group/bld.inf" #include "../xmlparser/group/bld.inf" -#include "../cxmllibrary/group/bld.inf" -#include "../downloadmgr/group/bld.inf" -#include "../connectionmanager/group/bld.inf" +#include "../cxmllibrary/group/BLD.INF" +#include "../downloadmgr/Group/bld.inf" +#include "../connectionmanager/Group/bld.inf" #include "../browsertelservice/group/bld.inf" #include "../favouritesengine/group/bld.inf" #include "../feedsengine/group/bld.inf" #ifdef BRDO_MULTIPART_PARSER_FF #include "../multipartparser/group/bld.inf" #endif -#include "../schemehandler/group/bld.inf" +#include "../schemehandler/Group/bld.inf" #include "../webutils/group/bld.inf" -#include "../aiwbrowserprovider/group/bld.inf" +#include "../aiwbrowserprovider/Group/bld.inf" PRJ_PLATFORMS diff -r cacf6ee57968 -r 92a765b5b3e7 browserutilities/recenturlstore/group/RecentUrlStore.mmp --- a/browserutilities/recenturlstore/group/RecentUrlStore.mmp Fri Apr 16 16:07:13 2010 +0300 +++ b/browserutilities/recenturlstore/group/RecentUrlStore.mmp Mon May 03 13:32:15 2010 +0300 @@ -29,7 +29,7 @@ #if defined(ARMCC) DEFFILE ../EABI/RecentUrlStore.def #elif defined( WINSCW ) - DEFFILE ../BWinsCw/RecentUrlStore.def + DEFFILE ../BWINSCW/RecentUrlStore.def #endif #include diff -r cacf6ee57968 -r 92a765b5b3e7 browserutilities/schemehandler/SchemeApp/group/bld.inf --- a/browserutilities/schemehandler/SchemeApp/group/bld.inf Fri Apr 16 16:07:13 2010 +0300 +++ b/browserutilities/schemehandler/SchemeApp/group/bld.inf Mon May 03 13:32:15 2010 +0300 @@ -24,8 +24,8 @@ DEFAULT PRJ_EXPORTS -../../rom/SchemeHandler.iby CORE_MW_LAYER_IBY_EXPORT_PATH(SchemeHandler.iby) -../../rom/SchemeHandlerResources.iby LANGUAGE_MW_LAYER_IBY_EXPORT_PATH(SchemeHandlerResources.iby) +../../Rom/SchemeHandler.iby CORE_MW_LAYER_IBY_EXPORT_PATH(SchemeHandler.iby) +../../Rom/SchemeHandlerResources.iby LANGUAGE_MW_LAYER_IBY_EXPORT_PATH(SchemeHandlerResources.iby) ../loc/SchemeApp.loc MW_LAYER_LOC_EXPORT_PATH(SchemeApp.loc) #ifdef __SERIES60_32__ diff -r cacf6ee57968 -r 92a765b5b3e7 browserutilities/schemehandler/SchemeApp/src/SchemeApp.cpp --- a/browserutilities/schemehandler/SchemeApp/src/SchemeApp.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/browserutilities/schemehandler/SchemeApp/src/SchemeApp.cpp Mon May 03 13:32:15 2010 +0300 @@ -21,7 +21,7 @@ // INCLUDE FILES #include "SchemeApp.h" #include "SchemeDocument.h" -#include "BldVariant.hrh" +#include "bldvariant.hrh" #include // ================= MEMBER FUNCTIONS ======================= diff -r cacf6ee57968 -r 92a765b5b3e7 browserutilities/schemehandler/SchemeApp/src/SchemeDialog.cpp --- a/browserutilities/schemehandler/SchemeApp/src/SchemeDialog.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/browserutilities/schemehandler/SchemeApp/src/SchemeDialog.cpp Mon May 03 13:32:15 2010 +0300 @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include "SchemeDialog.h" #include "Scheme.hrh" diff -r cacf6ee57968 -r 92a765b5b3e7 browserutilities/schemehandler/SchemeDispatcher/data/101f8531.rss --- a/browserutilities/schemehandler/SchemeDispatcher/data/101f8531.rss Fri Apr 16 16:07:13 2010 +0300 +++ b/browserutilities/schemehandler/SchemeDispatcher/data/101f8531.rss Mon May 03 13:32:15 2010 +0300 @@ -17,7 +17,7 @@ #include "SchemeDefs.hrh" -#include "RegistryInfo.rh" +#include "registryinfo.rh" RESOURCE REGISTRY_INFO theInfo { diff -r cacf6ee57968 -r 92a765b5b3e7 browserutilities/schemehandler/SchemeDispatcher/inc/FileHandler.h --- a/browserutilities/schemehandler/SchemeDispatcher/inc/FileHandler.h Fri Apr 16 16:07:13 2010 +0300 +++ b/browserutilities/schemehandler/SchemeDispatcher/inc/FileHandler.h Mon May 03 13:32:15 2010 +0300 @@ -25,7 +25,7 @@ #include "BaseHandler.h" #include -#include +#include #include #include #include diff -r cacf6ee57968 -r 92a765b5b3e7 browserutilities/schemehandler/SchemeDispatcher/src/BaseHandler.cpp --- a/browserutilities/schemehandler/SchemeDispatcher/src/BaseHandler.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/browserutilities/schemehandler/SchemeDispatcher/src/BaseHandler.cpp Mon May 03 13:32:15 2010 +0300 @@ -24,10 +24,10 @@ #include "BrowserTelService.h" #include "SchemeDispLogger.h" #include -#include -#include +#include +#include #include -#include +#include #include #include diff -r cacf6ee57968 -r 92a765b5b3e7 browserutilities/schemehandler/SchemeDispatcher/src/CtiHandler.cpp --- a/browserutilities/schemehandler/SchemeDispatcher/src/CtiHandler.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/browserutilities/schemehandler/SchemeDispatcher/src/CtiHandler.cpp Mon May 03 13:32:15 2010 +0300 @@ -22,7 +22,7 @@ #include "CtiHandler.h" #include "SchemeDispLogger.h" -#include // For REComSession +#include // For REComSession #include #include #include diff -r cacf6ee57968 -r 92a765b5b3e7 browserutilities/schemehandler/SchemeDispatcher/src/FileHandler.cpp --- a/browserutilities/schemehandler/SchemeDispatcher/src/FileHandler.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/browserutilities/schemehandler/SchemeDispatcher/src/FileHandler.cpp Mon May 03 13:32:15 2010 +0300 @@ -22,13 +22,13 @@ #include "FileHandler.h" #include "SchemeDispLogger.h" -#include // For REComSession +#include // For REComSession #include #include #include #include #include -#include +#include #include // ================= CONSTANTS ======================= diff -r cacf6ee57968 -r 92a765b5b3e7 browserutilities/schemehandler/SchemeDispatcher/src/HttpHandler.cpp --- a/browserutilities/schemehandler/SchemeDispatcher/src/HttpHandler.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/browserutilities/schemehandler/SchemeDispatcher/src/HttpHandler.cpp Mon May 03 13:32:15 2010 +0300 @@ -22,7 +22,7 @@ #include "HttpHandler.h" #include "SchemeDispLogger.h" -#include // For REComSession +#include // For REComSession #include #include #include @@ -30,7 +30,7 @@ #include #include #include -#include +#include #include #include diff -r cacf6ee57968 -r 92a765b5b3e7 browserutilities/schemehandler/SchemeDispatcher/src/MailToHandler.cpp --- a/browserutilities/schemehandler/SchemeDispatcher/src/MailToHandler.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/browserutilities/schemehandler/SchemeDispatcher/src/MailToHandler.cpp Mon May 03 13:32:15 2010 +0300 @@ -22,7 +22,7 @@ #include "MailToHandler.h" #include "SchemeDispLogger.h" -#include // For REComSession +#include // For REComSession #include #include #include diff -r cacf6ee57968 -r 92a765b5b3e7 browserutilities/schemehandler/SchemeDispatcher/src/MmsHandler.cpp --- a/browserutilities/schemehandler/SchemeDispatcher/src/MmsHandler.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/browserutilities/schemehandler/SchemeDispatcher/src/MmsHandler.cpp Mon May 03 13:32:15 2010 +0300 @@ -22,7 +22,7 @@ #include "MmsHandler.h" #include "SchemeDispLogger.h" -#include // For REComSession +#include // For REComSession #include #include #include diff -r cacf6ee57968 -r 92a765b5b3e7 browserutilities/schemehandler/SchemeDispatcher/src/RtspHandler.cpp --- a/browserutilities/schemehandler/SchemeDispatcher/src/RtspHandler.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/browserutilities/schemehandler/SchemeDispatcher/src/RtspHandler.cpp Mon May 03 13:32:15 2010 +0300 @@ -22,7 +22,7 @@ #include "RtspHandler.h" #include "SchemeDispLogger.h" -#include // For REComSession +#include // For REComSession #include #include #include diff -r cacf6ee57968 -r 92a765b5b3e7 browserutilities/schemehandler/SchemeDispatcher/src/SchemeProxy.cpp --- a/browserutilities/schemehandler/SchemeDispatcher/src/SchemeProxy.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/browserutilities/schemehandler/SchemeDispatcher/src/SchemeProxy.cpp Mon May 03 13:32:15 2010 +0300 @@ -28,7 +28,7 @@ #include "MmsHandler.h" #include #include -#include +#include // Exported proxy for instantiation method resolution // Define the interface UIDs diff -r cacf6ee57968 -r 92a765b5b3e7 browserutilities/schemehandler/SchemeDispatcher/src/TelHandler.cpp --- a/browserutilities/schemehandler/SchemeDispatcher/src/TelHandler.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/browserutilities/schemehandler/SchemeDispatcher/src/TelHandler.cpp Mon May 03 13:32:15 2010 +0300 @@ -22,7 +22,7 @@ #include "SchemeDispLogger.h" #include "TelHandler.h" -#include // For REComSession +#include // For REComSession #include #include #include diff -r cacf6ee57968 -r 92a765b5b3e7 browserutilities/schemehandler/SchemeDispatcher/src/WtaiHandler.cpp --- a/browserutilities/schemehandler/SchemeDispatcher/src/WtaiHandler.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/browserutilities/schemehandler/SchemeDispatcher/src/WtaiHandler.cpp Mon May 03 13:32:15 2010 +0300 @@ -22,7 +22,7 @@ #include "WtaiHandler.h" #include "SchemeDispLogger.h" -#include // For REComSession +#include // For REComSession #include #include #include diff -r cacf6ee57968 -r 92a765b5b3e7 browserutilities/webutils/group/webutils.mmp --- a/browserutilities/webutils/group/webutils.mmp Fri Apr 16 16:07:13 2010 +0300 +++ b/browserutilities/webutils/group/webutils.mmp Mon May 03 13:32:15 2010 +0300 @@ -35,7 +35,7 @@ // Include paths -USERINCLUDE . ../INC +USERINCLUDE . ../inc MW_LAYER_SYSTEMINCLUDE MW_LAYER_LIBC_SYSTEMINCLUDE diff -r cacf6ee57968 -r 92a765b5b3e7 browserutilities/webutils/src/CUserAgent.cpp --- a/browserutilities/webutils/src/CUserAgent.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/browserutilities/webutils/src/CUserAgent.cpp Mon May 03 13:32:15 2010 +0300 @@ -22,7 +22,7 @@ #include #include -#include "webUtilsCommon.h" +#include "WebUtilsCommon.h" #include "CUserAgent.h" #include "WebUtilsLogger.h" diff -r cacf6ee57968 -r 92a765b5b3e7 browserutilities/xmlparser/group/XMLInterface.mmp --- a/browserutilities/xmlparser/group/XMLInterface.mmp Fri Apr 16 16:07:13 2010 +0300 +++ b/browserutilities/xmlparser/group/XMLInterface.mmp Mon May 03 13:32:15 2010 +0300 @@ -32,10 +32,10 @@ #elif defined(WINS) DEFFILE ../bwins/xmlinterface.def #else - DEFFILE ../bmarm/xmlinterface.def + DEFFILE ../bmarm/XMLINTERFACE.DEF #endif -SOURCEPATH ../SRC +SOURCEPATH ../src SOURCE RXMLReader.cpp SOURCE wml_1_3_dict.c SOURCE syncml_1_0_dict.c @@ -48,7 +48,7 @@ // RESOURCE resource_file // RESOURCE resource_file2 -USERINCLUDE ../INC +USERINCLUDE ../inc MW_LAYER_SYSTEMINCLUDE MW_LAYER_LIBC_SYSTEMINCLUDE diff -r cacf6ee57968 -r 92a765b5b3e7 browserutilities/xmlparser/group/bld.inf --- a/browserutilities/xmlparser/group/bld.inf Fri Apr 16 16:07:13 2010 +0300 +++ b/browserutilities/xmlparser/group/bld.inf Mon May 03 13:32:15 2010 +0300 @@ -30,7 +30,7 @@ // Move the includes into "Public Nokia implemented" in CORE_MW_LAYER_IBY_EXPORT_PATH -../rom/Xmlinterface.iby CORE_MW_LAYER_IBY_EXPORT_PATH(Xmlinterface.iby) +../rom/xmlinterface.iby CORE_MW_LAYER_IBY_EXPORT_PATH(Xmlinterface.iby) PRJ_MMPFILES diff -r cacf6ee57968 -r 92a765b5b3e7 browserutilities/xmlparser/inc/CXMLReader.h --- a/browserutilities/xmlparser/inc/CXMLReader.h Fri Apr 16 16:07:13 2010 +0300 +++ b/browserutilities/xmlparser/inc/CXMLReader.h Mon May 03 13:32:15 2010 +0300 @@ -22,7 +22,7 @@ // INCLUDES #include -#include +#include #include #include "nw_cXML_Parser.h" diff -r cacf6ee57968 -r 92a765b5b3e7 codhandler/coddownload/group/CodDownload.mmp --- a/codhandler/coddownload/group/CodDownload.mmp Fri Apr 16 16:07:13 2010 +0300 +++ b/codhandler/coddownload/group/CodDownload.mmp Mon May 03 13:32:15 2010 +0300 @@ -17,7 +17,7 @@ #include #include -#include "../../CodEng/inc/CodDefs.h" +#include "../../codeng/inc/CodDefs.h" TARGET CodDownload.dll TARGETTYPE dll @@ -31,8 +31,8 @@ USERINCLUDE ../inc -SYSTEMINCLUDE ../../CodUi/inc -SYSTEMINCLUDE ../../CodEng/inc +SYSTEMINCLUDE ../../codui/inc +SYSTEMINCLUDE ../../codeng/inc MW_LAYER_SYSTEMINCLUDE diff -r cacf6ee57968 -r 92a765b5b3e7 codhandler/codeng/inc/Connection.h --- a/codhandler/codeng/inc/Connection.h Fri Apr 16 16:07:13 2010 +0300 +++ b/codhandler/codeng/inc/Connection.h Mon May 03 13:32:15 2010 +0300 @@ -25,7 +25,7 @@ #include #include -#include +#include // CLASS DECLARATION diff -r cacf6ee57968 -r 92a765b5b3e7 codhandler/codeng/src/CodBuffStorage.cpp --- a/codhandler/codeng/src/CodBuffStorage.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/codhandler/codeng/src/CodBuffStorage.cpp Mon May 03 13:32:15 2010 +0300 @@ -23,9 +23,9 @@ #include "CodBuffStorage.h" #include "CodLogger.h" #include "HeaderField.h" -#include +#include #include -#include +#include #include diff -r cacf6ee57968 -r 92a765b5b3e7 codhandler/codeng/src/CodEngBase.cpp --- a/codhandler/codeng/src/CodEngBase.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/codhandler/codeng/src/CodEngBase.cpp Mon May 03 13:32:15 2010 +0300 @@ -40,17 +40,17 @@ #include #include -#include +#include #include #include #include -#include -#include +#include +#include #include #include "CodDefs.h" #include #include -#include +#include #include #include "FileExt.h" diff -r cacf6ee57968 -r 92a765b5b3e7 codhandler/codeng/src/CodUtil.cpp --- a/codhandler/codeng/src/CodUtil.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/codhandler/codeng/src/CodUtil.cpp Mon May 03 13:32:15 2010 +0300 @@ -25,11 +25,11 @@ #include "CodPanic.h" #include #include -#include +#include #include #include #include -#include +#include #include #include diff -r cacf6ee57968 -r 92a765b5b3e7 codhandler/codeng/src/Connection.cpp --- a/codhandler/codeng/src/Connection.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/codhandler/codeng/src/Connection.cpp Mon May 03 13:32:15 2010 +0300 @@ -25,7 +25,7 @@ #include "CodUtil.h" #include "CodError.h" #include "CodLogger.h" -#include +#include #include #include diff -r cacf6ee57968 -r 92a765b5b3e7 codhandler/codeng/src/HttpLoader.cpp --- a/codhandler/codeng/src/HttpLoader.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/codhandler/codeng/src/HttpLoader.cpp Mon May 03 13:32:15 2010 +0300 @@ -31,16 +31,16 @@ #include "Connection.h" #include "Timeout.h" #include "CodProgress.h" -#include "CodEngbase.h" +#include "CodEngBase.h" -#include +#include #include -#include +#include #include #include -#include +#include #include -#include +#include #include #include #include diff -r cacf6ee57968 -r 92a765b5b3e7 codhandler/codeng/src/HttpTcpSession.cpp --- a/codhandler/codeng/src/HttpTcpSession.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/codhandler/codeng/src/HttpTcpSession.cpp Mon May 03 13:32:15 2010 +0300 @@ -20,7 +20,7 @@ // INCLUDE FILES -#include +#include #include "HttpTcpSession.h" #include "CodLogger.h" #include "CodPanic.h" diff -r cacf6ee57968 -r 92a765b5b3e7 codhandler/codeng/src/HttpWapSession.cpp --- a/codhandler/codeng/src/HttpWapSession.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/codhandler/codeng/src/HttpWapSession.cpp Mon May 03 13:32:15 2010 +0300 @@ -20,7 +20,7 @@ // INCLUDE FILES -#include +#include #include "HttpWapSession.h" #include "CodError.h" #include "CodLogger.h" diff -r cacf6ee57968 -r 92a765b5b3e7 codhandler/codeng/src/MediaObject.cpp --- a/codhandler/codeng/src/MediaObject.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/codhandler/codeng/src/MediaObject.cpp Mon May 03 13:32:15 2010 +0300 @@ -27,7 +27,7 @@ #include "FileExt.h" #include "CodStatus.h" #include "HeaderField.h" -#include +#include // ================= MEMBER FUNCTIONS ======================= diff -r cacf6ee57968 -r 92a765b5b3e7 codhandler/codeng/src/RFeatMgr.cpp --- a/codhandler/codeng/src/RFeatMgr.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/codhandler/codeng/src/RFeatMgr.cpp Mon May 03 13:32:15 2010 +0300 @@ -20,7 +20,7 @@ // INCLUDE FILES -#include +#include #include "RFeatMgr.h" #include "CodPanic.h" diff -r cacf6ee57968 -r 92a765b5b3e7 codhandler/codeng/src/RoapSaver.cpp --- a/codhandler/codeng/src/RoapSaver.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/codhandler/codeng/src/RoapSaver.cpp Mon May 03 13:32:15 2010 +0300 @@ -19,7 +19,7 @@ // INCLUDE FILES #include -#include +#include #include "RoapSaver.h" #include "RoapData.h" #include "CodLoadObserver.h" diff -r cacf6ee57968 -r 92a765b5b3e7 codhandler/codrecog/group/CodRecog.mmp --- a/codhandler/codrecog/group/CodRecog.mmp Fri Apr 16 16:07:13 2010 +0300 +++ b/codhandler/codrecog/group/CodRecog.mmp Mon May 03 13:32:15 2010 +0300 @@ -37,7 +37,7 @@ USERINCLUDE ../inc -SYSTEMINCLUDE ../../CodEng/inc +SYSTEMINCLUDE ../../codeng/inc MW_LAYER_SYSTEMINCLUDE MW_LAYER_ECOM_SYSTEMINCLUDE diff -r cacf6ee57968 -r 92a765b5b3e7 codhandler/codrecog/src/10008d49.rss --- a/codhandler/codrecog/src/10008d49.rss Fri Apr 16 16:07:13 2010 +0300 +++ b/codhandler/codrecog/src/10008d49.rss Mon May 03 13:32:15 2010 +0300 @@ -20,7 +20,7 @@ // INCLUDES -#include "RegistryInfo.rh" +#include "registryinfo.rh" // RESOURCE DEFINITIONS diff -r cacf6ee57968 -r 92a765b5b3e7 codhandler/codrecog/src/CodRecog.cpp --- a/codhandler/codrecog/src/CodRecog.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/codhandler/codrecog/src/CodRecog.cpp Mon May 03 13:32:15 2010 +0300 @@ -25,8 +25,8 @@ #include #include #include -#include -#include +#include +#include #include "CodRecog.h" #include "CodRecogLogger.h" diff -r cacf6ee57968 -r 92a765b5b3e7 codhandler/codui/data/CodUi.rss --- a/codhandler/codui/data/CodUi.rss Fri Apr 16 16:07:13 2010 +0300 +++ b/codhandler/codui/data/CodUi.rss Mon May 03 13:32:15 2010 +0300 @@ -35,8 +35,8 @@ #include #include #include -#include -#include +#include +#include // RESOURCE DEFINITIONS diff -r cacf6ee57968 -r 92a765b5b3e7 codhandler/codui/group/CodUi.mmp --- a/codhandler/codui/group/CodUi.mmp Fri Apr 16 16:07:13 2010 +0300 +++ b/codhandler/codui/group/CodUi.mmp Mon May 03 13:32:15 2010 +0300 @@ -18,7 +18,7 @@ #include #include #include -#include "../../CodEng/inc/CodDefs.h" +#include "../../codeng/inc/CodDefs.h" TARGET CodUi.dll TARGETTYPE dll @@ -57,7 +57,7 @@ USERINCLUDE ../inc -SYSTEMINCLUDE ../../CodEng/inc +SYSTEMINCLUDE ../../codeng/inc MW_LAYER_SYSTEMINCLUDE MW_LAYER_ECOM_SYSTEMINCLUDE diff -r cacf6ee57968 -r 92a765b5b3e7 codhandler/codui/inc/CodAppUi.h --- a/codhandler/codui/inc/CodAppUi.h Fri Apr 16 16:07:13 2010 +0300 +++ b/codhandler/codui/inc/CodAppUi.h Mon May 03 13:32:15 2010 +0300 @@ -22,7 +22,7 @@ // INCLUDES #include -#include +#include #include #include #include "CodWaitDialog.h" diff -r cacf6ee57968 -r 92a765b5b3e7 codhandler/codui/inc/CodViewerApp.h --- a/codhandler/codui/inc/CodViewerApp.h Fri Apr 16 16:07:13 2010 +0300 +++ b/codhandler/codui/inc/CodViewerApp.h Mon May 03 13:32:15 2010 +0300 @@ -22,7 +22,7 @@ // INCLUDES #include -#include +#include // CLASS DECLARATION diff -r cacf6ee57968 -r 92a765b5b3e7 codhandler/codui/inc/DdViewerApp.h --- a/codhandler/codui/inc/DdViewerApp.h Fri Apr 16 16:07:13 2010 +0300 +++ b/codhandler/codui/inc/DdViewerApp.h Mon May 03 13:32:15 2010 +0300 @@ -22,7 +22,7 @@ // INCLUDES #include -#include +#include // CLASS DECLARATION diff -r cacf6ee57968 -r 92a765b5b3e7 codhandler/codui/src/CodAppUi.cpp --- a/codhandler/codui/src/CodAppUi.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/codhandler/codui/src/CodAppUi.cpp Mon May 03 13:32:15 2010 +0300 @@ -23,8 +23,8 @@ #include #include #include -#include -#include +#include +#include #include #include #include diff -r cacf6ee57968 -r 92a765b5b3e7 codhandler/codui/src/CodConfirm.cpp --- a/codhandler/codui/src/CodConfirm.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/codhandler/codui/src/CodConfirm.cpp Mon May 03 13:32:15 2010 +0300 @@ -28,7 +28,7 @@ #include "CodConfirm.h" #include "CodLogger.h" #include -#include +#include #include diff -r cacf6ee57968 -r 92a765b5b3e7 codhandler/codui/src/CodDialog.cpp --- a/codhandler/codui/src/CodDialog.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/codhandler/codui/src/CodDialog.cpp Mon May 03 13:32:15 2010 +0300 @@ -17,14 +17,14 @@ #include -#include +#include #include #include #include #include "CodDialog.h" #include "CodLogger.h" #include -#include +#include #ifndef RD_MULTIPLE_DRIVE _LIT(KBackSlash,"\\"); diff -r cacf6ee57968 -r 92a765b5b3e7 codhandler/codui/src/CodDownloadImpl.cpp --- a/codhandler/codui/src/CodDownloadImpl.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/codhandler/codui/src/CodDownloadImpl.cpp Mon May 03 13:32:15 2010 +0300 @@ -24,13 +24,13 @@ #include #include #include -#include +#include #include #include #include #include #include -#include +#include #include #include "CodDownloadImpl.h" #include "CodUiPanic.h" diff -r cacf6ee57968 -r 92a765b5b3e7 codhandler/codui/src/CodView.cpp --- a/codhandler/codui/src/CodView.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/codhandler/codui/src/CodView.cpp Mon May 03 13:32:15 2010 +0300 @@ -32,7 +32,7 @@ #include "CodLogger.h" #include #include -#include +#include #include "eikon.hrh" diff -r cacf6ee57968 -r 92a765b5b3e7 codhandler/codui/src/CodViewDialog.cpp --- a/codhandler/codui/src/CodViewDialog.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/codhandler/codui/src/CodViewDialog.cpp Mon May 03 13:32:15 2010 +0300 @@ -22,7 +22,7 @@ #include "CodView.h" #include "CodUi.hrh" #include "CodUiPanic.h" -#include +#include #include // ================= MEMBER FUNCTIONS ======================= diff -r cacf6ee57968 -r 92a765b5b3e7 codhandler/codviewer/group/CodViewer.mmp --- a/codhandler/codviewer/group/CodViewer.mmp Fri Apr 16 16:07:13 2010 +0300 +++ b/codhandler/codviewer/group/CodViewer.mmp Mon May 03 13:32:15 2010 +0300 @@ -19,7 +19,7 @@ #include #include #include -#include "../../CodEng/inc/CodDefs.h" +#include "../../codeng/inc/CodDefs.h" TARGET CodViewer.exe TARGETTYPE exe @@ -43,8 +43,8 @@ #endif END -SYSTEMINCLUDE ../../CodEng/inc -SYSTEMINCLUDE ../../CodUi/inc +SYSTEMINCLUDE ../../codeng/inc +SYSTEMINCLUDE ../../codui/inc MW_LAYER_SYSTEMINCLUDE diff -r cacf6ee57968 -r 92a765b5b3e7 codhandler/ddrecog/group/DdRecog.mmp --- a/codhandler/ddrecog/group/DdRecog.mmp Fri Apr 16 16:07:13 2010 +0300 +++ b/codhandler/ddrecog/group/DdRecog.mmp Mon May 03 13:32:15 2010 +0300 @@ -37,7 +37,7 @@ USERINCLUDE ../inc -SYSTEMINCLUDE ../../CodEng/inc +SYSTEMINCLUDE ../../codeng/inc MW_LAYER_SYSTEMINCLUDE MW_LAYER_ECOM_SYSTEMINCLUDE diff -r cacf6ee57968 -r 92a765b5b3e7 codhandler/ddrecog/src/10008d55.rss --- a/codhandler/ddrecog/src/10008d55.rss Fri Apr 16 16:07:13 2010 +0300 +++ b/codhandler/ddrecog/src/10008d55.rss Mon May 03 13:32:15 2010 +0300 @@ -20,7 +20,7 @@ // INCLUDES -#include "RegistryInfo.rh" +#include "registryinfo.rh" // RESOURCE DEFINITIONS diff -r cacf6ee57968 -r 92a765b5b3e7 codhandler/ddrecog/src/DdRecog.cpp --- a/codhandler/ddrecog/src/DdRecog.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/codhandler/ddrecog/src/DdRecog.cpp Mon May 03 13:32:15 2010 +0300 @@ -25,8 +25,8 @@ #include #include #include -#include -#include +#include +#include #include "DdRecog.h" #include "DdRecogLogger.h" diff -r cacf6ee57968 -r 92a765b5b3e7 codhandler/ddviewer/group/DdViewer.mmp --- a/codhandler/ddviewer/group/DdViewer.mmp Fri Apr 16 16:07:13 2010 +0300 +++ b/codhandler/ddviewer/group/DdViewer.mmp Mon May 03 13:32:15 2010 +0300 @@ -19,7 +19,7 @@ #include #include #include -#include "../../CodEng/inc/CodDefs.h" +#include "../../codeng/inc/CodDefs.h" TARGET DdViewer.exe TARGETTYPE exe @@ -43,8 +43,8 @@ #endif END -SYSTEMINCLUDE ../../CodEng/inc -SYSTEMINCLUDE ../../CodUi/inc +SYSTEMINCLUDE ../../codeng/inc +SYSTEMINCLUDE ../../codui/inc MW_LAYER_SYSTEMINCLUDE diff -r cacf6ee57968 -r 92a765b5b3e7 codhandler/group/bld.inf --- a/codhandler/group/bld.inf Fri Apr 16 16:07:13 2010 +0300 +++ b/codhandler/group/bld.inf Mon May 03 13:32:15 2010 +0300 @@ -22,7 +22,7 @@ #include "../../web_plat/browser_platform_api/inc/Browser_platform_variant.hrh" PRJ_EXPORTS -../loc/CodViewer.loc MW_LAYER_LOC_EXPORT_PATH(CodViewer.loc) +../Loc/CodViewer.loc MW_LAYER_LOC_EXPORT_PATH(CodViewer.loc) ../rom/CodHandler.iby CORE_MW_LAYER_IBY_EXPORT_PATH(CodHandler.iby) ../rom/CodHandlerResources.iby LANGUAGE_MW_LAYER_IBY_EXPORT_PATH(CodHandlerResources.iby) diff -r cacf6ee57968 -r 92a765b5b3e7 codhandler/roapapp/data/RoapApp.rss --- a/codhandler/roapapp/data/RoapApp.rss Fri Apr 16 16:07:13 2010 +0300 +++ b/codhandler/roapapp/data/RoapApp.rss Mon May 03 13:32:15 2010 +0300 @@ -25,7 +25,7 @@ // INCLUDES #include -#include +#include #include "RoapApp.hrh" #include "eikon.rsg" #include diff -r cacf6ee57968 -r 92a765b5b3e7 codhandler/roapapp/inc/RoapApp.h --- a/codhandler/roapapp/inc/RoapApp.h Fri Apr 16 16:07:13 2010 +0300 +++ b/codhandler/roapapp/inc/RoapApp.h Mon May 03 13:32:15 2010 +0300 @@ -24,7 +24,7 @@ // INCLUDES #include -#include +#include // CLASS DECLARATION diff -r cacf6ee57968 -r 92a765b5b3e7 codhandler/roapapp/inc/RoapAppUi.h --- a/codhandler/roapapp/inc/RoapAppUi.h Fri Apr 16 16:07:13 2010 +0300 +++ b/codhandler/roapapp/inc/RoapAppUi.h Mon May 03 13:32:15 2010 +0300 @@ -25,12 +25,12 @@ #include #include -#include +#include #include #include #include #include "RoapAppWaitDialog.h" -#include +#include // FORWARD DECLARATIONS diff -r cacf6ee57968 -r 92a765b5b3e7 codhandler/roapapp/src/RoapAppDocument.cpp --- a/codhandler/roapapp/src/RoapAppDocument.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/codhandler/roapapp/src/RoapAppDocument.cpp Mon May 03 13:32:15 2010 +0300 @@ -21,14 +21,14 @@ // INCLUDE FILES #include -#include +#include #include #include "RoapAppDocument.h" #include "RoapAppData.h" #include "RoapAppUi.h" #include "RequestCompleteCallback.h" #include "RoapAppLogger.h" -#include "DrmRights.h" +#include "DRMRights.h" // ================= CONSTANTS ======================= _LIT8( KRoResponseHeader, " #include #include -#include +#include #include #include #include @@ -32,8 +32,8 @@ #include #include #include -#include -#include +#include +#include #include #include #include "RoapAppUi.h" diff -r cacf6ee57968 -r 92a765b5b3e7 web_plat/cxml_library_api/group/bld.inf --- a/web_plat/cxml_library_api/group/bld.inf Fri Apr 16 16:07:13 2010 +0300 +++ b/web_plat/cxml_library_api/group/bld.inf Mon May 03 13:32:15 2010 +0300 @@ -28,7 +28,7 @@ // Individual header files for cXML Parser ../inc/cxml_proj.h MW_LAYER_PLATFORM_EXPORT_PATH(cxml_proj.h) ../inc/cxml_file_if.h MW_LAYER_PLATFORM_EXPORT_PATH(cxml_file_if.h) -../inc/cxml_nw2cxmltypes.h MW_LAYER_PLATFORM_EXPORT_PATH(cxml_nw2cxmltypes.h) +../inc/cxml_nw2cxmlTypes.h MW_LAYER_PLATFORM_EXPORT_PATH(cxml_nw2cxmltypes.h) ../inc/cxml_str.h MW_LAYER_PLATFORM_EXPORT_PATH(cxml_str.h) ../inc/cxml_type_def.h MW_LAYER_PLATFORM_EXPORT_PATH(cxml_type_def.h) ../inc/nw_dom.h MW_LAYER_PLATFORM_EXPORT_PATH(nw_dom.h) diff -r cacf6ee57968 -r 92a765b5b3e7 web_pub/browser_control_api/group/bld.inf --- a/web_pub/browser_control_api/group/bld.inf Fri Apr 16 16:07:13 2010 +0300 +++ b/web_pub/browser_control_api/group/bld.inf Mon May 03 13:32:15 2010 +0300 @@ -27,7 +27,7 @@ ../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/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) diff -r cacf6ee57968 -r 92a765b5b3e7 web_pub/download_mgr_ui_api/group/Bld.inf --- a/web_pub/download_mgr_ui_api/group/Bld.inf Fri Apr 16 16:07:13 2010 +0300 +++ b/web_pub/download_mgr_ui_api/group/Bld.inf Mon May 03 13:32:15 2010 +0300 @@ -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 cacf6ee57968 -r 92a765b5b3e7 web_pub/group/bld.inf --- a/web_pub/group/bld.inf Fri Apr 16 16:07:13 2010 +0300 +++ b/web_pub/group/bld.inf Mon May 03 13:32:15 2010 +0300 @@ -19,7 +19,7 @@ #include "../browser_control_api/group/bld.inf" #include "../download_mgr_client_api/group/bld.inf" -#include "../download_mgr_ui_api/group/bld.inf" +#include "../download_mgr_ui_api/group/Bld.inf" #include "../favourites_engine_api/group/bld.inf" #include "../browser_plugin_api/group/bld.inf" #include "../settings_api/group/bld.inf" diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/browserrecognizers/data/01005A02.rss --- a/webengine/browserrecognizers/data/01005A02.rss Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/browserrecognizers/data/01005A02.rss Mon May 03 13:32:15 2010 +0300 @@ -15,7 +15,7 @@ * */ -#include +#include RESOURCE REGISTRY_INFO r_registry { dll_uid = 0x01005A02; // Should match the name of this file diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/browserrecognizers/group/BrowserRec.mmp --- a/webengine/browserrecognizers/group/BrowserRec.mmp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/browserrecognizers/group/BrowserRec.mmp Mon May 03 13:32:15 2010 +0300 @@ -28,7 +28,7 @@ CAPABILITY CAP_ECOM_PLUGIN -SOURCEPATH ../Data +SOURCEPATH ../data START RESOURCE 01005A02.rss #if defined(__BROWSER_SDK) diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/browserrecognizers/group/bld.inf --- a/webengine/browserrecognizers/group/bld.inf Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/browserrecognizers/group/bld.inf Mon May 03 13:32:15 2010 +0300 @@ -23,7 +23,7 @@ PRJ_EXPORTS -../Rom/BrowserRecognizers.iby CORE_MW_LAYER_IBY_EXPORT_PATH(BrowserRecognizers.iby) +../rom/BrowserRecognizers.iby CORE_MW_LAYER_IBY_EXPORT_PATH(BrowserRecognizers.iby) PRJ_MMPFILES BrowserRec.mmp diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/browserrecognizers/inc/BrowserRec.h --- a/webengine/browserrecognizers/inc/BrowserRec.h Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/browserrecognizers/inc/BrowserRec.h Mon May 03 13:32:15 2010 +0300 @@ -20,7 +20,7 @@ // includes #include // For CApaDataRecognizerType -#include +#include // constants const TUid KUidMimeBrowserRecognizer = { 0x1005A02 }; diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/browserrecognizers/src/BrowserRec.cpp --- a/webengine/browserrecognizers/src/BrowserRec.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/browserrecognizers/src/BrowserRec.cpp Mon May 03 13:32:15 2010 +0300 @@ -17,7 +17,7 @@ #include "BrowserRec.h" -#include "ImplementationProxy.h" +#include "implementationproxy.h" // // CBrowserRecognizer diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/device/inc/DeviceLiwBinding.h --- a/webengine/device/inc/DeviceLiwBinding.h Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/device/inc/DeviceLiwBinding.h Mon May 03 13:32:15 2010 +0300 @@ -20,7 +20,7 @@ #define __DEVICELIWBINDING_H #include -#include +#include #include "DeviceLiwMap.h" #include "DeviceBinding.h" #include "DeviceLiwIterable.h" diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/device/inc/DeviceLiwPeer.h --- a/webengine/device/inc/DeviceLiwPeer.h Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/device/inc/DeviceLiwPeer.h Mon May 03 13:32:15 2010 +0300 @@ -19,7 +19,7 @@ #define __DEVICELIWPEER_H #include -#include +#include #include "DeviceBinding.h" namespace KJS diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/device/src/Device.cpp --- a/webengine/device/src/Device.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/device/src/Device.cpp Mon May 03 13:32:15 2010 +0300 @@ -24,7 +24,7 @@ #include "DeviceBridge.h" #include "DeviceBinding.h" #include "DeviceLiwBinding.h" -#include +#include using namespace KJS; diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/device/src/DeviceLiwBinding.cpp --- a/webengine/device/src/DeviceLiwBinding.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/device/src/DeviceLiwBinding.cpp Mon May 03 13:32:15 2010 +0300 @@ -21,11 +21,11 @@ #include #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include #include diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/device/src/DeviceLiwInterface.cpp --- a/webengine/device/src/DeviceLiwInterface.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/device/src/DeviceLiwInterface.cpp Mon May 03 13:32:15 2010 +0300 @@ -20,7 +20,7 @@ #include #include #include -#include "LiwServiceHandler.h" +#include "liwservicehandler.h" #include "DeviceLiwInterface.h" #include "ServiceEventHandler.h" #include "DeviceBinding.h" diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/device/src/DeviceLiwIterable.cpp --- a/webengine/device/src/DeviceLiwIterable.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/device/src/DeviceLiwIterable.cpp Mon May 03 13:32:15 2010 +0300 @@ -19,7 +19,7 @@ // INCLUDE FILES #include #include -#include +#include #include "DeviceLiwIterable.h" #include "DeviceLiwBinding.h" diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/group/bld.inf --- a/webengine/group/bld.inf Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/group/bld.inf Mon May 03 13:32:15 2010 +0300 @@ -21,18 +21,18 @@ */ #include "../osswebengine/cache/group/bld.inf" -#include "../osswebengine/memorymanager/group/bld.inf" +#include "../osswebengine/MemoryManager/Group/bld.inf" -#include "../osswebengine/webkit/s60/group/javascriptcore/bld.inf" +#include "../osswebengine/WebKit/s60/group/JavaScriptCore/bld.inf" #include "../osswebengine/npscript/group/bld.inf" #include "../webkitutils/group/bld.inf" #include "../pagescaler/group/bld.inf" #include "../widgetinstaller/group/bld.inf" -#include "../widgetregistry/group/bld.inf" -#include "../osswebengine/webkit/s60/group/bld.inf" -#include "../wmlengine/group/bld.inf" +#include "../widgetregistry/group/BLD.INF" +#include "../osswebengine/WebKit/s60/group/bld.inf" +#include "../wmlengine/group/BLD.INF" #include "../device/group/bld.inf" diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/memoryplugin/data/10281f93.rss --- a/webengine/memoryplugin/data/10281f93.rss Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/memoryplugin/data/10281f93.rss Mon May 03 13:32:15 2010 +0300 @@ -15,7 +15,7 @@ * */ -#include +#include #include RESOURCE REGISTRY_INFO theInfo diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/osswebengine/MemoryManager/Group/bld.inf --- a/webengine/osswebengine/MemoryManager/Group/bld.inf Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/osswebengine/MemoryManager/Group/bld.inf Mon May 03 13:32:15 2010 +0300 @@ -22,7 +22,7 @@ DEFAULT PRJ_EXPORTS -../inc/MemoryManager.h MW_LAYER_PUBLIC_EXPORT_PATH(MemoryManager.h) +../Inc/MemoryManager.h MW_LAYER_PUBLIC_EXPORT_PATH(MemoryManager.h) PRJ_MMPFILES MemMan.mmp diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/osswebengine/MemoryManager/Src/MemoryPool.cpp --- a/webengine/osswebengine/MemoryManager/Src/MemoryPool.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/osswebengine/MemoryManager/Src/MemoryPool.cpp Mon May 03 13:32:15 2010 +0300 @@ -26,7 +26,7 @@ #include "StopScheduler.h" #include "fast_malloc.h" #include "SymbianDlHeap.h" -#include +#include #include // CONSTANTS diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/osswebengine/MemoryManager/Src/heap.cpp --- a/webengine/osswebengine/MemoryManager/Src/heap.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/osswebengine/MemoryManager/Src/heap.cpp Mon May 03 13:32:15 2010 +0300 @@ -30,7 +30,7 @@ #ifdef __NEW_ALLOCATOR__ #include "MemoryLogger.h" -#include "SymbianDLHeap.h" +#include "SymbianDlHeap.h" _LIT(KDLHeapPanicCategory, "DL Heap"); #define GET_PAGE_SIZE(x) UserHal::PageSizeInBytes(x) diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/osswebengine/WebCore/bindings/js/JSXMLHttpRequest.cpp --- a/webengine/osswebengine/WebCore/bindings/js/JSXMLHttpRequest.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/osswebengine/WebCore/bindings/js/JSXMLHttpRequest.cpp Mon May 03 13:32:15 2010 +0300 @@ -28,7 +28,7 @@ #include "HTMLDocument.h" #include "JSDocument.h" #include "JSEvent.h" -#include "XMLHttpRequest.h" +#include "xmlhttprequest.h" #include "kjs_events.h" #include "kjs_window.h" diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/osswebengine/WebCore/bindings/js/kjs_binding.cpp --- a/webengine/osswebengine/WebCore/bindings/js/kjs_binding.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/osswebengine/WebCore/bindings/js/kjs_binding.cpp Mon May 03 13:32:15 2010 +0300 @@ -36,7 +36,7 @@ #include "PlatformString.h" #include "Range.h" #include "RangeException.h" -#include "XMLHttpRequest.h" +#include "xmlhttprequest.h" #include "kjs_dom.h" #include "kjs_window.h" #include diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/osswebengine/WebCore/bindings/js/kjs_dom.cpp --- a/webengine/osswebengine/WebCore/bindings/js/kjs_dom.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/osswebengine/WebCore/bindings/js/kjs_dom.cpp Mon May 03 13:32:15 2010 +0300 @@ -28,7 +28,7 @@ #include "HTMLPlugInElement.h" #include "JSAttr.h" #include "JSNode.h" -#include "XMLHttpRequest.h" +#include "xmlhttprequest.h" #include "kjs_events.h" #include "kjs_window.h" diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/osswebengine/WebCore/bindings/js/symbian/kjs_console.cpp --- a/webengine/osswebengine/WebCore/bindings/js/symbian/kjs_console.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/osswebengine/WebCore/bindings/js/symbian/kjs_console.cpp Mon May 03 13:32:15 2010 +0300 @@ -18,7 +18,7 @@ // INCLUDE FILES #include "kjs_console.h" -#include "kjs/Lookup.h" +#include "kjs/lookup.h" #include "Chrome.h" #include "PlatformString.h" #include "kjs/context.h" diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/osswebengine/WebCore/bridge/symbian/SoundStartSymbian.cpp --- a/webengine/osswebengine/WebCore/bridge/symbian/SoundStartSymbian.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/osswebengine/WebCore/bridge/symbian/SoundStartSymbian.cpp Mon May 03 13:32:15 2010 +0300 @@ -18,11 +18,11 @@ #include #include "config.h" #include "SoundStartSymbian.h" -#include "KUrl.h" +#include "KURL.h" #include "Frame.h" #include "FrameLoader.h" #include "Widget.h" -#include "HtmlNames.h" +#include "HTMLNames.h" #include "WebCoreWidget.h" #include "WebCoreFrameBridge.h" diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/osswebengine/WebCore/css/CSSMediaRule.cpp --- a/webengine/osswebengine/WebCore/css/CSSMediaRule.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/osswebengine/WebCore/css/CSSMediaRule.cpp Mon May 03 13:32:15 2010 +0300 @@ -25,7 +25,7 @@ #include "config.h" #include "CSSMediaRule.h" -#include "CSSParser.h" +#include "cssparser.h" #include "CSSRuleList.h" #include "ExceptionCode.h" #include "MediaList.h" diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/osswebengine/WebCore/css/CSSMutableStyleDeclaration.cpp --- a/webengine/osswebengine/WebCore/css/CSSMutableStyleDeclaration.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/osswebengine/WebCore/css/CSSMutableStyleDeclaration.cpp Mon May 03 13:32:15 2010 +0300 @@ -24,7 +24,7 @@ #include "CSSMutableStyleDeclaration.h" #include "CSSImageValue.h" -#include "CSSParser.h" +#include "cssparser.h" #include "CSSProperty.h" #include "CSSPropertyNames.h" #include "CSSStyleSheet.h" diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/osswebengine/WebCore/css/CSSPrimitiveValue.cpp --- a/webengine/osswebengine/WebCore/css/CSSPrimitiveValue.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/osswebengine/WebCore/css/CSSPrimitiveValue.cpp Mon May 03 13:32:15 2010 +0300 @@ -23,7 +23,7 @@ #include "config.h" #include "CSSPrimitiveValue.h" -#include "CSSHelper.h" +#include "csshelper.h" #include "CSSValueKeywords.h" #include "Color.h" #include "Counter.h" diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/osswebengine/WebCore/css/CSSStyleSheet.cpp --- a/webengine/osswebengine/WebCore/css/CSSStyleSheet.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/osswebengine/WebCore/css/CSSStyleSheet.cpp Mon May 03 13:32:15 2010 +0300 @@ -23,7 +23,7 @@ #include "CSSImportRule.h" #include "CSSNamespace.h" -#include "CSSParser.h" +#include "cssparser.h" #include "CSSRuleList.h" #include "Document.h" #include "ExceptionCode.h" diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/osswebengine/WebCore/css/MediaList.cpp --- a/webengine/osswebengine/WebCore/css/MediaList.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/osswebengine/WebCore/css/MediaList.cpp Mon May 03 13:32:15 2010 +0300 @@ -22,7 +22,7 @@ #include "config.h" #include "MediaList.h" -#include "CSSParser.h" +#include "cssparser.h" #include "CSSRule.h" #include "CSSStyleSheet.h" #include "ExceptionCode.h" diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/osswebengine/WebCore/css/MediaQueryExp.cpp --- a/webengine/osswebengine/WebCore/css/MediaQueryExp.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/osswebengine/WebCore/css/MediaQueryExp.cpp Mon May 03 13:32:15 2010 +0300 @@ -19,7 +19,7 @@ #include "config.h" #include "MediaQueryExp.h" -#include "CSSParser.h" +#include "cssparser.h" #include "CSSPrimitiveValue.h" #include "CSSValueList.h" diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/osswebengine/WebCore/css/csshelper.cpp --- a/webengine/osswebengine/WebCore/css/csshelper.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/osswebengine/WebCore/css/csshelper.cpp Mon May 03 13:32:15 2010 +0300 @@ -22,7 +22,7 @@ */ #include "config.h" -#include "CSSHelper.h" +#include "csshelper.h" #include "PlatformString.h" #include diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/osswebengine/WebCore/css/cssparser.cpp --- a/webengine/osswebengine/WebCore/css/cssparser.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/osswebengine/WebCore/css/cssparser.cpp Mon May 03 13:32:15 2010 +0300 @@ -22,12 +22,12 @@ */ #include "config.h" -#include "CSSParser.h" +#include "cssparser.h" #include "CSSBorderImageValue.h" #include "CSSCharsetRule.h" #include "CSSCursorImageValue.h" -#include "CSSHelper.h" +#include "csshelper.h" #include "CSSImageValue.h" #include "CSSImportRule.h" #include "CSSInheritedValue.h" diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/osswebengine/WebCore/css/cssstyleselector.cpp --- a/webengine/osswebengine/WebCore/css/cssstyleselector.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/osswebengine/WebCore/css/cssstyleselector.cpp Mon May 03 13:32:15 2010 +0300 @@ -22,7 +22,7 @@ * Boston, MA 02110-1301, USA. */ -#include "CSSStyleSelector.h" +#include "cssstyleselector.h" #include "CSSBorderImageValue.h" #include "CSSCursorImageValue.h" diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/osswebengine/WebCore/dom/Document.cpp --- a/webengine/osswebengine/WebCore/dom/Document.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/osswebengine/WebCore/dom/Document.cpp Mon May 03 13:32:15 2010 +0300 @@ -26,8 +26,8 @@ #include "AXObjectCache.h" #include "CDATASection.h" -#include "CSSHelper.h" -#include "CSSStyleSelector.h" +#include "csshelper.h" +#include "cssstyleselector.h" #include "CSSStyleSheet.h" #include "CSSValueKeywords.h" #include "Comment.h" @@ -100,7 +100,7 @@ #include "TreeWalker.h" #include "UIEvent.h" #include "WheelEvent.h" -#include "XMLHttpRequest.h" +#include "xmlhttprequest.h" #include "XMLTokenizer.h" #include "kjs_binding.h" #include "kjs_proxy.h" diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/osswebengine/WebCore/dom/Element.cpp --- a/webengine/osswebengine/WebCore/dom/Element.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/osswebengine/WebCore/dom/Element.cpp Mon May 03 13:32:15 2010 +0300 @@ -26,7 +26,7 @@ #include "Chrome.h" #include "ChromeClient.h" -#include "CSSStyleSelector.h" +#include "cssstyleselector.h" #include "Document.h" #include "Editor.h" #include "ExceptionCode.h" diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/osswebengine/WebCore/dom/StyledElement.cpp --- a/webengine/osswebengine/WebCore/dom/StyledElement.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/osswebengine/WebCore/dom/StyledElement.cpp Mon May 03 13:32:15 2010 +0300 @@ -27,7 +27,7 @@ #include "HashMap.h" #include "StyledElement.h" -#include "CSSStyleSelector.h" +#include "cssstyleselector.h" #include "CSSStyleSheet.h" #include "CSSValueKeywords.h" #include "Document.h" diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/osswebengine/WebCore/dom/XMLTokenizer.cpp --- a/webengine/osswebengine/WebCore/dom/XMLTokenizer.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/osswebengine/WebCore/dom/XMLTokenizer.cpp Mon May 03 13:32:15 2010 +0300 @@ -50,7 +50,7 @@ #include "ResourceResponse.h" #ifndef USE_QXMLSTREAM #include -#include +#include #else #include #endif diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/osswebengine/WebCore/editing/ApplyStyleCommand.cpp --- a/webengine/osswebengine/WebCore/editing/ApplyStyleCommand.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/osswebengine/WebCore/editing/ApplyStyleCommand.cpp Mon May 03 13:32:15 2010 +0300 @@ -27,7 +27,7 @@ #include "ApplyStyleCommand.h" #include "CSSComputedStyleDeclaration.h" -#include "CSSParser.h" +#include "cssparser.h" #include "CSSProperty.h" #include "CSSPropertyNames.h" #include "Document.h" diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/osswebengine/WebCore/editing/markup.cpp --- a/webengine/osswebengine/WebCore/editing/markup.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/osswebengine/WebCore/editing/markup.cpp Mon May 03 13:32:15 2010 +0300 @@ -32,7 +32,7 @@ #include "CSSRule.h" #include "CSSRuleList.h" #include "CSSStyleRule.h" -#include "CSSStyleSelector.h" +#include "cssstyleselector.h" #include "CSSValueKeywords.h" #include "Comment.h" #include "DeleteButtonController.h" diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/osswebengine/WebCore/html/CanvasGradient.cpp --- a/webengine/osswebengine/WebCore/html/CanvasGradient.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/osswebengine/WebCore/html/CanvasGradient.cpp Mon May 03 13:32:15 2010 +0300 @@ -27,7 +27,7 @@ #include "config.h" #include "CanvasGradient.h" -#include "CSSParser.h" +#include "cssparser.h" #if PLATFORM(CG) #include diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/osswebengine/WebCore/html/CanvasRenderingContext2D.cpp --- a/webengine/osswebengine/WebCore/html/CanvasRenderingContext2D.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/osswebengine/WebCore/html/CanvasRenderingContext2D.cpp Mon May 03 13:32:15 2010 +0300 @@ -29,7 +29,7 @@ #include "CanvasRenderingContext2D.h" #include "AffineTransform.h" -#include "CSSParser.h" +#include "cssparser.h" #include "CachedImage.h" #include "CanvasGradient.h" #include "CanvasPattern.h" diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/osswebengine/WebCore/html/CanvasStyle.cpp --- a/webengine/osswebengine/WebCore/html/CanvasStyle.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/osswebengine/WebCore/html/CanvasStyle.cpp Mon May 03 13:32:15 2010 +0300 @@ -28,7 +28,7 @@ #include "config.h" #include "CanvasStyle.h" -#include "CSSParser.h" +#include "cssparser.h" #include "CanvasGradient.h" #include "CanvasPattern.h" #include "GraphicsContext.h" diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/osswebengine/WebCore/html/HTMLAnchorElement.cpp --- a/webengine/osswebengine/WebCore/html/HTMLAnchorElement.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/osswebengine/WebCore/html/HTMLAnchorElement.cpp Mon May 03 13:32:15 2010 +0300 @@ -24,7 +24,7 @@ #include "config.h" #include "HTMLAnchorElement.h" -#include "CSSHelper.h" +#include "csshelper.h" #include "Document.h" #include "Event.h" #include "EventHandler.h" diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/osswebengine/WebCore/html/HTMLBaseElement.cpp --- a/webengine/osswebengine/WebCore/html/HTMLBaseElement.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/osswebengine/WebCore/html/HTMLBaseElement.cpp Mon May 03 13:32:15 2010 +0300 @@ -25,7 +25,7 @@ #include "config.h" #include "HTMLBaseElement.h" -#include "CSSHelper.h" +#include "csshelper.h" #include "Document.h" #include "Frame.h" #include "FrameLoader.h" diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/osswebengine/WebCore/html/HTMLBodyElement.cpp --- a/webengine/osswebengine/WebCore/html/HTMLBodyElement.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/osswebengine/WebCore/html/HTMLBodyElement.cpp Mon May 03 13:32:15 2010 +0300 @@ -24,10 +24,10 @@ #include "config.h" #include "HTMLBodyElement.h" -#include "CSSHelper.h" +#include "csshelper.h" #include "CSSMutableStyleDeclaration.h" #include "CSSPropertyNames.h" -#include "CSSStyleSelector.h" +#include "cssstyleselector.h" #include "CSSStyleSheet.h" #include "CSSValueKeywords.h" #include "Document.h" diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/osswebengine/WebCore/html/HTMLDocument.cpp --- a/webengine/osswebengine/WebCore/html/HTMLDocument.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/osswebengine/WebCore/html/HTMLDocument.cpp Mon May 03 13:32:15 2010 +0300 @@ -54,7 +54,7 @@ #include "HTMLDocument.h" #include "CSSPropertyNames.h" -#include "CSSStyleSelector.h" +#include "cssstyleselector.h" #include "CString.h" #include "CookieJar.h" #include "DocumentLoader.h" diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/osswebengine/WebCore/html/HTMLEmbedElement.cpp --- a/webengine/osswebengine/WebCore/html/HTMLEmbedElement.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/osswebengine/WebCore/html/HTMLEmbedElement.cpp Mon May 03 13:32:15 2010 +0300 @@ -25,7 +25,7 @@ #include "config.h" #include "HTMLEmbedElement.h" -#include "CSSHelper.h" +#include "csshelper.h" #include "CSSPropertyNames.h" #include "Frame.h" #include "FrameView.h" diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/osswebengine/WebCore/html/HTMLFormElement.cpp --- a/webengine/osswebengine/WebCore/html/HTMLFormElement.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/osswebengine/WebCore/html/HTMLFormElement.cpp Mon May 03 13:32:15 2010 +0300 @@ -26,7 +26,7 @@ #include "HTMLFormElement.h" #include "Base64.h" -#include "CSSHelper.h" +#include "csshelper.h" #include "CString.h" #include "Event.h" #include "EventNames.h" @@ -39,7 +39,7 @@ #include "HTMLImageElement.h" #include "HTMLInputElement.h" #include "HTMLNames.h" -#include "MIMETypeRegistry.h" +#include "MimeTypeRegistry.h" #include "RenderTextControl.h" #if PLATFORM(QT) diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/osswebengine/WebCore/html/HTMLFrameElementBase.cpp --- a/webengine/osswebengine/WebCore/html/HTMLFrameElementBase.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/osswebengine/WebCore/html/HTMLFrameElementBase.cpp Mon May 03 13:32:15 2010 +0300 @@ -25,7 +25,7 @@ #include "config.h" #include "HTMLFrameElementBase.h" -#include "CSSHelper.h" +#include "csshelper.h" #include "Document.h" #include "EventNames.h" #include "FocusController.h" diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/osswebengine/WebCore/html/HTMLImageElement.cpp --- a/webengine/osswebengine/WebCore/html/HTMLImageElement.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/osswebengine/WebCore/html/HTMLImageElement.cpp Mon May 03 13:32:15 2010 +0300 @@ -24,7 +24,7 @@ #include "config.h" #include "HTMLImageElement.h" -#include "CSSHelper.h" +#include "csshelper.h" #include "CSSPropertyNames.h" #include "CSSValueKeywords.h" #include "EventNames.h" diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/osswebengine/WebCore/html/HTMLImageLoader.cpp --- a/webengine/osswebengine/WebCore/html/HTMLImageLoader.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/osswebengine/WebCore/html/HTMLImageLoader.cpp Mon May 03 13:32:15 2010 +0300 @@ -22,7 +22,7 @@ #include "config.h" #include "HTMLImageLoader.h" -#include "CSSHelper.h" +#include "csshelper.h" #include "CachedImage.h" #include "DocLoader.h" #include "Document.h" diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/osswebengine/WebCore/html/HTMLLinkElement.cpp --- a/webengine/osswebengine/WebCore/html/HTMLLinkElement.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/osswebengine/WebCore/html/HTMLLinkElement.cpp Mon May 03 13:32:15 2010 +0300 @@ -24,7 +24,7 @@ #include "config.h" #include "HTMLLinkElement.h" -#include "CSSHelper.h" +#include "csshelper.h" #include "CachedCSSStyleSheet.h" #include "DocLoader.h" #include "Document.h" diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/osswebengine/WebCore/html/HTMLObjectElement.cpp --- a/webengine/osswebengine/WebCore/html/HTMLObjectElement.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/osswebengine/WebCore/html/HTMLObjectElement.cpp Mon May 03 13:32:15 2010 +0300 @@ -24,7 +24,7 @@ #include "config.h" #include "HTMLObjectElement.h" -#include "CSSHelper.h" +#include "csshelper.h" #include "EventNames.h" #include "ExceptionCode.h" #include "Frame.h" @@ -40,7 +40,7 @@ #include "WebCoreWidget.h" #endif #include "Image.h" -#include "MIMETypeRegistry.h" +#include "MimeTypeRegistry.h" #include "RenderImage.h" #include "RenderPartObject.h" #include "RenderWidget.h" diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/osswebengine/WebCore/html/HTMLOptGroupElement.cpp --- a/webengine/osswebengine/WebCore/html/HTMLOptGroupElement.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/osswebengine/WebCore/html/HTMLOptGroupElement.cpp Mon May 03 13:32:15 2010 +0300 @@ -27,7 +27,7 @@ #include "config.h" #include "HTMLOptGroupElement.h" -#include "CSSStyleSelector.h" +#include "cssstyleselector.h" #include "Document.h" #include "HTMLNames.h" #include "HTMLSelectElement.h" diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/osswebengine/WebCore/html/HTMLOptionElement.cpp --- a/webengine/osswebengine/WebCore/html/HTMLOptionElement.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/osswebengine/WebCore/html/HTMLOptionElement.cpp Mon May 03 13:32:15 2010 +0300 @@ -27,7 +27,7 @@ #include "config.h" #include "HTMLOptionElement.h" -#include "CSSStyleSelector.h" +#include "cssstyleselector.h" #include "Document.h" #include "EventNames.h" #include "ExceptionCode.h" diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/osswebengine/WebCore/html/HTMLSelectElement.cpp --- a/webengine/osswebengine/WebCore/html/HTMLSelectElement.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/osswebengine/WebCore/html/HTMLSelectElement.cpp Mon May 03 13:32:15 2010 +0300 @@ -26,7 +26,7 @@ #include "HTMLSelectElement.h" #include "CSSPropertyNames.h" -#include "CSSStyleSelector.h" +#include "cssstyleselector.h" #include "CharacterNames.h" #include "Document.h" #include "Event.h" diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/osswebengine/WebCore/html/HTMLTableElement.cpp --- a/webengine/osswebengine/WebCore/html/HTMLTableElement.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/osswebengine/WebCore/html/HTMLTableElement.cpp Mon May 03 13:32:15 2010 +0300 @@ -26,7 +26,7 @@ #include "config.h" #include "HTMLTableElement.h" -#include "CSSHelper.h" +#include "csshelper.h" #include "CSSPropertyNames.h" #include "CSSStyleSheet.h" #include "CSSValueKeywords.h" diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/osswebengine/WebCore/html/HTMLTablePartElement.cpp --- a/webengine/osswebengine/WebCore/html/HTMLTablePartElement.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/osswebengine/WebCore/html/HTMLTablePartElement.cpp Mon May 03 13:32:15 2010 +0300 @@ -26,7 +26,7 @@ #include "config.h" #include "HTMLTablePartElement.h" -#include "CSSHelper.h" +#include "csshelper.h" #include "CSSPropertyNames.h" #include "CSSValueKeywords.h" #include "Document.h" diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/osswebengine/WebCore/html/HTMLTokenizer.cpp --- a/webengine/osswebengine/WebCore/html/HTMLTokenizer.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/osswebengine/WebCore/html/HTMLTokenizer.cpp Mon May 03 13:32:15 2010 +0300 @@ -29,7 +29,7 @@ #include "config.h" #include "HTMLTokenizer.h" -#include "CSSHelper.h" +#include "csshelper.h" #include "Cache.h" #include "CachedScript.h" #include "DocLoader.h" diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/osswebengine/WebCore/html/PreloadScanner.cpp --- a/webengine/osswebengine/WebCore/html/PreloadScanner.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/osswebengine/WebCore/html/PreloadScanner.cpp Mon May 03 13:32:15 2010 +0300 @@ -33,7 +33,7 @@ #include "CachedResource.h" #include "CachedResourceClient.h" #include "CachedScript.h" -#include "CSSHelper.h" +#include "csshelper.h" #include "CString.h" #include "DocLoader.h" #include "Document.h" diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/osswebengine/WebCore/loader/CachedImage.cpp --- a/webengine/osswebengine/WebCore/loader/CachedImage.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/osswebengine/WebCore/loader/CachedImage.cpp Mon May 03 13:32:15 2010 +0300 @@ -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 cacf6ee57968 -r 92a765b5b3e7 webengine/osswebengine/WebCore/loader/FrameLoader.cpp --- a/webengine/osswebengine/WebCore/loader/FrameLoader.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/osswebengine/WebCore/loader/FrameLoader.cpp Mon May 03 13:32:15 2010 +0300 @@ -62,7 +62,7 @@ #include "IconLoader.h" #include "InspectorController.h" #include "Logging.h" -#include "MIMETypeRegistry.h" +#include "MimeTypeRegistry.h" #include "MainResourceLoader.h" #include "Page.h" #include "PageCache.h" @@ -77,7 +77,7 @@ #include "SystemTime.h" #include "TextResourceDecoder.h" #include "WindowFeatures.h" -#include "XMLHttpRequest.h" +#include "xmlhttprequest.h" #include "XMLTokenizer.h" #include "kjs_binding.h" #include "kjs_proxy.h" diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/osswebengine/WebCore/page/ChromeClient.h --- a/webengine/osswebengine/WebCore/page/ChromeClient.h Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/osswebengine/WebCore/page/ChromeClient.h Mon May 03 13:32:15 2010 +0300 @@ -22,7 +22,7 @@ #define ChromeClient_h #include "FocusDirection.h" -#include "chrome.h" +#include "Chrome.h" namespace WebCore { diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/osswebengine/WebCore/page/DOMWindow.cpp --- a/webengine/osswebengine/WebCore/page/DOMWindow.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/osswebengine/WebCore/page/DOMWindow.cpp Mon May 03 13:32:15 2010 +0300 @@ -29,7 +29,7 @@ #include "BarInfo.h" #include "CSSComputedStyleDeclaration.h" #include "CSSRuleList.h" -#include "CSSStyleSelector.h" +#include "cssstyleselector.h" #include "Chrome.h" #include "DOMSelection.h" #include "Document.h" diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/osswebengine/WebCore/page/EventHandler.cpp --- a/webengine/osswebengine/WebCore/page/EventHandler.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/osswebengine/WebCore/page/EventHandler.cpp Mon May 03 13:32:15 2010 +0300 @@ -52,7 +52,7 @@ #include "MouseEventWithHitTestResults.h" #include "Page.h" #include "PlatformKeyboardEvent.h" -#include "PlatformScrollBar.h" +#include "PlatformScrollbar.h" #include "PlatformWheelEvent.h" #include "RenderWidget.h" #include "SelectionController.h" diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/osswebengine/WebCore/page/symbian/EventHandlerSymbian.cpp --- a/webengine/osswebengine/WebCore/page/symbian/EventHandlerSymbian.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/osswebengine/WebCore/page/symbian/EventHandlerSymbian.cpp Mon May 03 13:32:15 2010 +0300 @@ -43,7 +43,7 @@ #include "MouseEventWithHitTestResults.h" #include "Page.h" #include "PlatformKeyboardEvent.h" -#include "PlatformScrollBar.h" +#include "PlatformScrollbar.h" #include "PlatformWheelEvent.h" #include "RenderWidget.h" #include "DebugStream.h" diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/osswebengine/WebCore/page/symbian/WebCoreFrameBridge.cpp --- a/webengine/osswebengine/WebCore/page/symbian/WebCoreFrameBridge.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/osswebengine/WebCore/page/symbian/WebCoreFrameBridge.cpp Mon May 03 13:32:15 2010 +0300 @@ -18,7 +18,7 @@ #include <../bidi.h> #include "config.h" #include "WebCoreFrameBridge.h" -#include "frame.h" +#include "Frame.h" #include "FrameLoader.h" #include "FrameTree.h" #include "FrameView.h" @@ -26,8 +26,8 @@ #include "runtime.h" #include "kjs_window.h" #include "DOMWindow.h" -#include "document.h" -#include "documentloader.h" +#include "Document.h" +#include "DocumentLoader.h" #include "RenderPart.h" #include "HTMLNames.h" #include "EventNames.h" @@ -35,8 +35,8 @@ #include "WebFrameView.h" #include "WebView.h" #include "WebUtil.h" -#include "brctl.h" -#include "settingsContainer.h" +#include "BrCtl.h" +#include "SettingsContainer.h" #include "RenderView.h" #include "Page.h" #include "HTMLImageElement.h" diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/osswebengine/WebCore/platform/FontCache.cpp --- a/webengine/osswebengine/WebCore/platform/FontCache.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/osswebengine/WebCore/platform/FontCache.cpp Mon May 03 13:32:15 2010 +0300 @@ -33,7 +33,7 @@ #include "FontFallbackList.h" #include "FontPlatformData.h" #include "StringHash.h" -#include "staticobjectscontainer.h" +#include "StaticObjectsContainer.h" #include namespace WebCore { diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/osswebengine/WebCore/platform/MimeTypeRegistry.cpp --- a/webengine/osswebengine/WebCore/platform/MimeTypeRegistry.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/osswebengine/WebCore/platform/MimeTypeRegistry.cpp Mon May 03 13:32:15 2010 +0300 @@ -24,7 +24,7 @@ */ #include "config.h" -#include "MIMETypeRegistry.h" +#include "MimeTypeRegistry.h" #include "StringHash.h" #include diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/osswebengine/WebCore/platform/graphics/Image.cpp --- a/webengine/osswebengine/WebCore/platform/graphics/Image.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/osswebengine/WebCore/platform/graphics/Image.cpp Mon May 03 13:32:15 2010 +0300 @@ -30,7 +30,7 @@ #include "AffineTransform.h" #include "GraphicsContext.h" #include "IntRect.h" -#include "MIMETypeRegistry.h" +#include "MimeTypeRegistry.h" #include diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/osswebengine/WebCore/platform/graphics/symbian/ImageSymbian.cpp --- a/webengine/osswebengine/WebCore/platform/graphics/symbian/ImageSymbian.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/osswebengine/WebCore/platform/graphics/symbian/ImageSymbian.cpp Mon May 03 13:32:15 2010 +0300 @@ -38,7 +38,7 @@ #include "WebCoreGraphicsContext.h" #include "bitmap/MaskedBitmap.h" #include "bitmap/AnimationDecoder.h" -#include "String.h" +#include "string.h" #include "StringHash.h" #include "DebugStream.h" #include "ZoomFactor.h" diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/osswebengine/WebCore/platform/network/symbian/CookieHandler.cpp --- a/webengine/osswebengine/WebCore/platform/network/symbian/CookieHandler.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/osswebengine/WebCore/platform/network/symbian/CookieHandler.cpp Mon May 03 13:32:15 2010 +0300 @@ -18,8 +18,8 @@ // INCLUDES -#include "Cookiehandler.h" -#include +#include "CookieHandler.h" +#include // EXTERNAL DATA STRUCTURES diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/osswebengine/WebCore/platform/network/symbian/DataConnection.cpp --- a/webengine/osswebengine/WebCore/platform/network/symbian/DataConnection.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/osswebengine/WebCore/platform/network/symbian/DataConnection.cpp Mon May 03 13:32:15 2010 +0300 @@ -17,7 +17,7 @@ #include #include -#include +#include #include #include //#include diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/osswebengine/WebCore/platform/network/symbian/FileConnection.cpp --- a/webengine/osswebengine/WebCore/platform/network/symbian/FileConnection.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/osswebengine/WebCore/platform/network/symbian/FileConnection.cpp Mon May 03 13:32:15 2010 +0300 @@ -17,7 +17,7 @@ #include #include -#include +#include #include #include #include "ResourceHandle.h" @@ -27,7 +27,7 @@ #include "StaticObjectsContainer.h" #include "ResourceRequest.h" #include -#include "brctl.h" +#include "BrCtl.h" #include "DeprecatedString.h" const TInt KFileReadChunkSize = 23920; // bytes diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/osswebengine/WebCore/platform/network/symbian/HttpCacheDataSupplier.h --- a/webengine/osswebengine/WebCore/platform/network/symbian/HttpCacheDataSupplier.h Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/osswebengine/WebCore/platform/network/symbian/HttpCacheDataSupplier.h Mon May 03 13:32:15 2010 +0300 @@ -20,7 +20,7 @@ #define CHTTPCACHEDATASUPPLIER_H // INCLUDES -#include +#include // CONSTANTS diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/osswebengine/WebCore/platform/network/symbian/HttpCacheSupply.cpp --- a/webengine/osswebengine/WebCore/platform/network/symbian/HttpCacheSupply.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/osswebengine/WebCore/platform/network/symbian/HttpCacheSupply.cpp Mon May 03 13:32:15 2010 +0300 @@ -18,13 +18,13 @@ // INCLUDE FILES #include "HttpCacheSupply.h" -#include "HttpCacheManager.h" +#include "httpcachemanager.h" #include "HttpCacheDataSupplier.h" #include "HttpConnection.h" #include "ResourceLoaderDelegate.h" #include "StaticObjectsContainer.h" -#include +#include #include #include #include diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/osswebengine/WebCore/platform/network/symbian/HttpCacheSupply.h --- a/webengine/osswebengine/WebCore/platform/network/symbian/HttpCacheSupply.h Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/osswebengine/WebCore/platform/network/symbian/HttpCacheSupply.h Mon May 03 13:32:15 2010 +0300 @@ -22,7 +22,7 @@ // INCLUDES #include #include -#include "HttpCacheManager.h" +#include "httpcachemanager.h" // CONSTANTS diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/osswebengine/WebCore/platform/network/symbian/HttpConnUtils.cpp --- a/webengine/osswebengine/WebCore/platform/network/symbian/HttpConnUtils.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/osswebengine/WebCore/platform/network/symbian/HttpConnUtils.cpp Mon May 03 13:32:15 2010 +0300 @@ -17,7 +17,7 @@ // INCLUDE FILES #include "HttpConnUtils.h" -#include "HttpFilterCommonStringsExt.h" +#include "httpfiltercommonstringsext.h" #include #include #include diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/osswebengine/WebCore/platform/network/symbian/HttpConnection.cpp --- a/webengine/osswebengine/WebCore/platform/network/symbian/HttpConnection.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/osswebengine/WebCore/platform/network/symbian/HttpConnection.cpp Mon May 03 13:32:15 2010 +0300 @@ -15,8 +15,8 @@ * */ -#include -#include +#include +#include #include #include #include @@ -29,7 +29,7 @@ #include "ResourceLoaderDelegate.h" #include "HttpCacheSupply.h" #include "HttpPostDataSupplier.h" -#include +#include #include #include "BrCtl.h" #include "BrCtlSpecialLoadObserver.h" diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/osswebengine/WebCore/platform/network/symbian/HttpConnectionConfig.cpp --- a/webengine/osswebengine/WebCore/platform/network/symbian/HttpConnectionConfig.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/osswebengine/WebCore/platform/network/symbian/HttpConnectionConfig.cpp Mon May 03 13:32:15 2010 +0300 @@ -21,7 +21,7 @@ #include "HttpConnection.h" #include "StaticObjectsContainer.h" #include "ResourceLoaderDelegate.h" -#include +#include using namespace WebCore; diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/osswebengine/WebCore/platform/network/symbian/HttpDlConnection.cpp --- a/webengine/osswebengine/WebCore/platform/network/symbian/HttpDlConnection.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/osswebengine/WebCore/platform/network/symbian/HttpDlConnection.cpp Mon May 03 13:32:15 2010 +0300 @@ -20,7 +20,7 @@ #include "HttpDlConnection.h" #include "StaticObjectsContainer.h" #include "ResourceLoaderDelegate.h" -#include +#include using namespace WebCore; diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/osswebengine/WebCore/platform/network/symbian/HttpDlConnection.h --- a/webengine/osswebengine/WebCore/platform/network/symbian/HttpDlConnection.h Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/osswebengine/WebCore/platform/network/symbian/HttpDlConnection.h Mon May 03 13:32:15 2010 +0300 @@ -20,7 +20,7 @@ #include #include -#include +#include class HttpSessionManager; diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/osswebengine/WebCore/platform/network/symbian/HttpDownload.cpp --- a/webengine/osswebengine/WebCore/platform/network/symbian/HttpDownload.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/osswebengine/WebCore/platform/network/symbian/HttpDownload.cpp Mon May 03 13:32:15 2010 +0300 @@ -21,7 +21,7 @@ #include "HttpDlConnection.h" #include "HttpDefs.h" #include "HttpSessionManager.h" -#include "brctl.h" +#include "BrCtl.h" #include "StaticObjectsContainer.h" // CONSTANTS diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/osswebengine/WebCore/platform/network/symbian/HttpPostDataSupplier.cpp --- a/webengine/osswebengine/WebCore/platform/network/symbian/HttpPostDataSupplier.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/osswebengine/WebCore/platform/network/symbian/HttpPostDataSupplier.cpp Mon May 03 13:32:15 2010 +0300 @@ -24,7 +24,7 @@ #include "HttpPostDataSupplier.h" #include "PostDataItem.h" #include "FormData.h" -#include "brctl.h" +#include "BrCtl.h" using namespace WebCore; diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/osswebengine/WebCore/platform/network/symbian/HttpPostDataSupplier.h --- a/webengine/osswebengine/WebCore/platform/network/symbian/HttpPostDataSupplier.h Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/osswebengine/WebCore/platform/network/symbian/HttpPostDataSupplier.h Mon May 03 13:32:15 2010 +0300 @@ -21,8 +21,8 @@ // INCLUDES #include #include -#include -#include +#include +#include // CONSTANTS diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/osswebengine/WebCore/platform/network/symbian/HttpRequestHeaderManager.cpp --- a/webengine/osswebengine/WebCore/platform/network/symbian/HttpRequestHeaderManager.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/osswebengine/WebCore/platform/network/symbian/HttpRequestHeaderManager.cpp Mon May 03 13:32:15 2010 +0300 @@ -20,11 +20,11 @@ #include #include #include "HttpRequestHeaderManager.h" -#include "HttpFilterCommonStringsExt.h" +#include "httpfiltercommonstringsext.h" #include "ResourceRequest.h" #include "StaticObjectsContainer.h" #include "ResourceLoaderDelegate.h" -#include +#include #include "WebCharsetData.h" #include diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/osswebengine/WebCore/platform/network/symbian/HttpSessionManager.cpp --- a/webengine/osswebengine/WebCore/platform/network/symbian/HttpSessionManager.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/osswebengine/WebCore/platform/network/symbian/HttpSessionManager.cpp Mon May 03 13:32:15 2010 +0300 @@ -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" diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/osswebengine/WebCore/platform/network/symbian/HttpUiCallbacks.cpp --- a/webengine/osswebengine/WebCore/platform/network/symbian/HttpUiCallbacks.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/osswebengine/WebCore/platform/network/symbian/HttpUiCallbacks.cpp Mon May 03 13:32:15 2010 +0300 @@ -19,7 +19,7 @@ #include "Page.h" #include <../bidi.h> #include -#include +#include #include #include #include "WebFrame.h" @@ -32,7 +32,7 @@ #include "ResourceLoaderDelegate.h" #include "HttpDefs.h" #include "HttpConnection.h" -#include "CDBCols.h" +#include "cdbcols.h" using namespace WebCore; diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/osswebengine/WebCore/platform/network/symbian/MultipartContentHandler.cpp --- a/webengine/osswebengine/WebCore/platform/network/symbian/MultipartContentHandler.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/osswebengine/WebCore/platform/network/symbian/MultipartContentHandler.cpp Mon May 03 13:32:15 2010 +0300 @@ -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 -#include -#include "HttpFilterCommonStringsExt.h" +#include +#include "httpfiltercommonstringsext.h" #include "WebCharsetData.h" #include "StaticObjectsContainer.h" #include "ResourceLoaderDelegate.h" diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/osswebengine/WebCore/platform/network/symbian/ResolvedConnection.cpp --- a/webengine/osswebengine/WebCore/platform/network/symbian/ResolvedConnection.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/osswebengine/WebCore/platform/network/symbian/ResolvedConnection.cpp Mon May 03 13:32:15 2010 +0300 @@ -20,7 +20,7 @@ #include "ResolvedConnection.h" #include "ResourceRequest.h" -#include "Brctl.h" +#include "BrCtl.h" #include "WebFrame.h" // EXTERNAL DATA STRUCTURES diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/osswebengine/WebCore/platform/network/symbian/ResourceHandleManagerSymbian.cpp --- a/webengine/osswebengine/WebCore/platform/network/symbian/ResourceHandleManagerSymbian.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/osswebengine/WebCore/platform/network/symbian/ResourceHandleManagerSymbian.cpp Mon May 03 13:32:15 2010 +0300 @@ -17,7 +17,7 @@ #include "config.h" -#include "hashmap.h" +#include "HashMap.h" #include "CString.h" #include "CookieJar.h" #include "ResourceHandle.h" diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/osswebengine/WebCore/platform/network/symbian/ResourceLoaderDelegate.cpp --- a/webengine/osswebengine/WebCore/platform/network/symbian/ResourceLoaderDelegate.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/osswebengine/WebCore/platform/network/symbian/ResourceLoaderDelegate.cpp Mon May 03 13:32:15 2010 +0300 @@ -17,7 +17,7 @@ #include "config.h" #include <../bidi.h> -#include +#include #include #include "ResourceLoaderDelegate.h" @@ -30,13 +30,13 @@ #include "ResourceHandleInternal.h" #include "DocumentLoader.h" #include "ResourceHandle.h" -#include "KUrl.h" +#include "KURL.h" #include "FrameLoader.h" #include "DocumentLoader.h" #include "Frame.h" -#include "brctl.h" -#include "page.h" +#include "BrCtl.h" +#include "Page.h" #include "WebUtil.h" #include "WebFrame.h" #include "SettingsContainer.h" diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/osswebengine/WebCore/platform/network/symbian/SelfDownloadContentHandler.cpp --- a/webengine/osswebengine/WebCore/platform/network/symbian/SelfDownloadContentHandler.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/osswebengine/WebCore/platform/network/symbian/SelfDownloadContentHandler.cpp Mon May 03 13:32:15 2010 +0300 @@ -29,8 +29,8 @@ #include "StaticObjectsContainer.h" #include "ResourceLoaderDelegate.h" #include "HttpSessionManager.h" -#include "HttpFilterCommonStringsExt.h" -#include +#include "httpfiltercommonstringsext.h" +#include #include #include #include diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/osswebengine/WebCore/platform/network/symbian/SelfDownloadContentHandler.h --- a/webengine/osswebengine/WebCore/platform/network/symbian/SelfDownloadContentHandler.h Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/osswebengine/WebCore/platform/network/symbian/SelfDownloadContentHandler.h Mon May 03 13:32:15 2010 +0300 @@ -22,7 +22,7 @@ #include #include #include -#include +#include #include // FORWARD DECLARATIONS diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/osswebengine/WebCore/platform/network/symbian/UnknownContentHandler.cpp --- a/webengine/osswebengine/WebCore/platform/network/symbian/UnknownContentHandler.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/osswebengine/WebCore/platform/network/symbian/UnknownContentHandler.cpp Mon May 03 13:32:15 2010 +0300 @@ -19,7 +19,7 @@ #include "UnknownContentHandler.h" #include "HttpConnection.h" #include "PlatformString.h" -#include +#include #include using namespace WebCore; diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/osswebengine/WebCore/platform/symbian/FileChooserSymbian.cpp --- a/webengine/osswebengine/WebCore/platform/symbian/FileChooserSymbian.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/osswebengine/WebCore/platform/symbian/FileChooserSymbian.cpp Mon May 03 13:32:15 2010 +0300 @@ -31,10 +31,10 @@ #include "WebFrame.h" #include "WebFrameView.h" #include "WebView.h" -#include "Brctl.h" +#include "BrCtl.h" #include #include -#include +#include #if defined(__BROWSER_SDK) #include #else diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/osswebengine/WebCore/platform/symbian/FontCacheSymbian.cpp --- a/webengine/osswebengine/WebCore/platform/symbian/FontCacheSymbian.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/osswebengine/WebCore/platform/symbian/FontCacheSymbian.cpp Mon May 03 13:32:15 2010 +0300 @@ -28,10 +28,10 @@ #include #include #include -#include +#include #include -#include -#include +#include +#include #include #include diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/osswebengine/WebCore/platform/symbian/FontSymbian.cpp --- a/webengine/osswebengine/WebCore/platform/symbian/FontSymbian.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/osswebengine/WebCore/platform/symbian/FontSymbian.cpp Mon May 03 13:32:15 2010 +0300 @@ -25,7 +25,7 @@ #include "IntRect.h" #include "WebCoreGraphicsContext.h" #include -#include +#include #include #include "StaticObjectsContainer.h" #include "PictographSymbian.h" diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/osswebengine/WebCore/platform/symbian/FormFillController.cpp --- a/webengine/osswebengine/WebCore/platform/symbian/FormFillController.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/osswebengine/WebCore/platform/symbian/FormFillController.cpp Mon May 03 13:32:15 2010 +0300 @@ -19,7 +19,7 @@ #include "FormFillController.h" #include "Event.h" #include "Timer.h" -#include "String.h" +#include "string.h" #include "HTMLInputElement.h" #include "HTMLFormElement.h" #include "FontCache.h" diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/osswebengine/WebCore/platform/symbian/Libxml2/libxml/parser.h --- a/webengine/osswebengine/WebCore/platform/symbian/Libxml2/libxml/parser.h Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/osswebengine/WebCore/platform/symbian/Libxml2/libxml/parser.h Mon May 03 13:32:15 2010 +0300 @@ -15,7 +15,7 @@ * */ -#include "libxml2/libxml2_parser.h" -#include "libxml2/Libxml2_SAX2.h" +#include "Libxml2/Libxml2_parser.h" +#include "Libxml2/Libxml2_SAX2.h" #define xmlFree free #define xmlMalloc malloc diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/osswebengine/WebCore/platform/symbian/Libxml2/libxml/parserinternals.h --- a/webengine/osswebengine/WebCore/platform/symbian/Libxml2/libxml/parserinternals.h Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/osswebengine/WebCore/platform/symbian/Libxml2/libxml/parserinternals.h Mon May 03 13:32:15 2010 +0300 @@ -15,4 +15,4 @@ * */ -#include "libxml2/libxml2_parserinternals.h" +#include "Libxml2/Libxml2_parserInternals.h" diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/osswebengine/WebCore/platform/symbian/Libxml2/libxml/tree.h --- a/webengine/osswebengine/WebCore/platform/symbian/Libxml2/libxml/tree.h Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/osswebengine/WebCore/platform/symbian/Libxml2/libxml/tree.h Mon May 03 13:32:15 2010 +0300 @@ -15,4 +15,4 @@ * */ -#include "libxml2/Libxml2_tree.h" +#include "Libxml2/Libxml2_tree.h" diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/osswebengine/WebCore/platform/symbian/Libxml2/libxml/xmlstring.h --- a/webengine/osswebengine/WebCore/platform/symbian/Libxml2/libxml/xmlstring.h Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/osswebengine/WebCore/platform/symbian/Libxml2/libxml/xmlstring.h Mon May 03 13:32:15 2010 +0300 @@ -15,4 +15,4 @@ * */ -#include "libxml2/libxml2_xmlstring.h" +#include "Libxml2/Libxml2_xmlstring.h" diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/osswebengine/WebCore/platform/symbian/PictographSymbian.cpp --- a/webengine/osswebengine/WebCore/platform/symbian/PictographSymbian.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/osswebengine/WebCore/platform/symbian/PictographSymbian.cpp Mon May 03 13:32:15 2010 +0300 @@ -20,7 +20,7 @@ #include "config.h" #include "PictographSymbian.h" #include "WebCoreGraphicsContext.h" -#include +#include // DEFINES using namespace WebCore; diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/osswebengine/WebCore/platform/symbian/PictographSymbian.h --- a/webengine/osswebengine/WebCore/platform/symbian/PictographSymbian.h Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/osswebengine/WebCore/platform/symbian/PictographSymbian.h Mon May 03 13:32:15 2010 +0300 @@ -22,8 +22,8 @@ // INCLUDES #include #include -#include -#include +#include +#include // CONSTANTS diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/osswebengine/WebCore/platform/symbian/PlatformScrollbar.h --- a/webengine/osswebengine/WebCore/platform/symbian/PlatformScrollbar.h Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/osswebengine/WebCore/platform/symbian/PlatformScrollbar.h Mon May 03 13:32:15 2010 +0300 @@ -20,7 +20,7 @@ #define PlatformScrollbar_h #include "Widget.h" -#include "Scrollbar.h" +#include "ScrollBar.h" #include "IntRect.h" const int KScrollbarWidth = 4; diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/osswebengine/WebCore/platform/symbian/PopupMenuSymbian.cpp --- a/webengine/osswebengine/WebCore/platform/symbian/PopupMenuSymbian.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/osswebengine/WebCore/platform/symbian/PopupMenuSymbian.cpp Mon May 03 13:32:15 2010 +0300 @@ -31,7 +31,7 @@ #include "RenderMenuList.h" #include "WebFrame.h" #include "WebView.h" -#include "brctl.h" +#include "BrCtl.h" #include #include diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/osswebengine/WebCore/platform/symbian/RenderThemeSymbian.cpp --- a/webengine/osswebengine/WebCore/platform/symbian/RenderThemeSymbian.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/osswebengine/WebCore/platform/symbian/RenderThemeSymbian.cpp Mon May 03 13:32:15 2010 +0300 @@ -16,7 +16,7 @@ */ #include "RenderThemeSymbian.h" -#include "staticobjectscontainer.h" +#include "StaticObjectsContainer.h" // implement Symbian theme here diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/osswebengine/WebCore/platform/symbian/RenderThemeSymbian.h --- a/webengine/osswebengine/WebCore/platform/symbian/RenderThemeSymbian.h Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/osswebengine/WebCore/platform/symbian/RenderThemeSymbian.h Mon May 03 13:32:15 2010 +0300 @@ -27,7 +27,7 @@ #include <../bidi.h> #include #include "RenderBox.h" -#include +#include #include "WebCoreGraphicsContext.h" #include "MaskedBitmap.h" #include "BitmapImage.h" diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/osswebengine/WebCore/platform/symbian/StaticObjectsContainer.cpp --- a/webengine/osswebengine/WebCore/platform/symbian/StaticObjectsContainer.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/osswebengine/WebCore/platform/symbian/StaticObjectsContainer.cpp Mon May 03 13:32:15 2010 +0300 @@ -19,15 +19,15 @@ #include "config.h" #include <../bidi.h> // work around for multiple bidi.h files #include "StaticObjectsContainer.h" -#include "Brctl.h" +#include "BrCtl.h" #include "AtomicString.h" #include "PlatformFontCache.h" #include "PictographSymbian.h" #include "FontCache.h" #include "FormFillController.h" #include "ResourceLoaderDelegate.h" -#include "webkitLogger.h" -#include "brctldefs.h" +#include "WebKitLogger.h" +#include "BrCtlDefs.h" #include "WebIconDatabase.h" #include "WebSurface.h" #include "WebCursor.h" @@ -38,7 +38,7 @@ #include "SharedTimer.h" #include "TextEncoding.h" #include "TextEncodingRegistry.h" -#include "CSSStyleSelector.h" +#include "cssstyleselector.h" #include "RenderStyle.h" #include "Page.h" #include "Cache.h" @@ -49,14 +49,14 @@ #include "EventNames.h" #include "FontCache.h" #include "RenderThemeSymbian.h" -#include "qualifiedname.h" +#include "QualifiedName.h" #include "XMLTokenizer.h" #include "Document.h" #include "StyleElement.h" #include "bidi.h" #include "RenderBox.h" #include "FontCache.h" -#include "MIMETypeRegistry.h" +#include "MimeTypeRegistry.h" #include "ResourceHandleManagerSymbian.h" #include "TextBreakIteratorSymbian.h" #include "ImageSymbian.h" diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/osswebengine/WebCore/platform/symbian/StaticObjectsContainer.h --- a/webengine/osswebengine/WebCore/platform/symbian/StaticObjectsContainer.h Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/osswebengine/WebCore/platform/symbian/StaticObjectsContainer.h Mon May 03 13:32:15 2010 +0300 @@ -19,13 +19,13 @@ #ifndef __STATICOBJECTCONTAINER_H__ #define __STATICOBJECTCONTAINER_H__ -#include +#include #include #include #include #include #include <../bidi.h> -#include +#include class ResourceLoaderDelegate; class LogStream; diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/osswebengine/WebCore/platform/symbian/StreamingTextCodecSymbian.cpp --- a/webengine/osswebengine/WebCore/platform/symbian/StreamingTextCodecSymbian.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/osswebengine/WebCore/platform/symbian/StreamingTextCodecSymbian.cpp Mon May 03 13:32:15 2010 +0300 @@ -23,7 +23,7 @@ #include "PlatformString.h" #include "TextEncoding.h" #include "TextEncodingRegistry.h" -#include +#include #include using std::auto_ptr; diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/osswebengine/WebCore/platform/symbian/TemporaryLinkStubsSymbian.cpp --- a/webengine/osswebengine/WebCore/platform/symbian/TemporaryLinkStubsSymbian.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/osswebengine/WebCore/platform/symbian/TemporaryLinkStubsSymbian.cpp Mon May 03 13:32:15 2010 +0300 @@ -29,8 +29,8 @@ #include "Cursor.h" #include "loader.h" #include "KURL.h" -#include "Scrollbar.h" -#include "Scrollbar.h" +#include "ScrollBar.h" +#include "ScrollBar.h" #include "Path.h" #include "PlatformScrollbar.h" #include "PlatformMouseEvent.h" @@ -66,7 +66,7 @@ #include "DocumentFragment.h" #include "../bidi.h" -#include +#include #include diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/osswebengine/WebCore/platform/symbian/TextBreakIteratorSymbian.cpp --- a/webengine/osswebengine/WebCore/platform/symbian/TextBreakIteratorSymbian.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/osswebengine/WebCore/platform/symbian/TextBreakIteratorSymbian.cpp Mon May 03 13:32:15 2010 +0300 @@ -24,7 +24,7 @@ #include "TextBreakIteratorSymbian.h" #include "TextBreakIterator.h" #include -#include +#include namespace WebCore { diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/osswebengine/WebCore/platform/symbian/bitmap/SyncDecodeThread.cpp --- a/webengine/osswebengine/WebCore/platform/symbian/bitmap/SyncDecodeThread.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/osswebengine/WebCore/platform/symbian/bitmap/SyncDecodeThread.cpp Mon May 03 13:32:15 2010 +0300 @@ -20,13 +20,13 @@ #include #include "SyncDecodeThread.h" #include "MaskedBitmap.h" -#include +#include namespace TBidirectionalState { class TRunInfo; }; -#include +#include #define KMaxHeapSize 0x1000000 diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/osswebengine/WebCore/rendering/HitTestResult.cpp --- a/webengine/osswebengine/WebCore/rendering/HitTestResult.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/osswebengine/WebCore/rendering/HitTestResult.cpp Mon May 03 13:32:15 2010 +0300 @@ -23,7 +23,7 @@ #include "config.h" #include "HitTestResult.h" -#include "CSSHelper.h" +#include "csshelper.h" #include "Document.h" #include "Frame.h" #include "FrameTree.h" @@ -33,7 +33,7 @@ #include "HTMLInputElement.h" #include "HTMLNames.h" #include "KURL.h" -#include "PlatformScrollBar.h" +#include "PlatformScrollbar.h" #include "RenderImage.h" #include "RenderObject.h" #include "SelectionController.h" diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/osswebengine/WebCore/rendering/RenderFrame.cpp --- a/webengine/osswebengine/WebCore/rendering/RenderFrame.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/osswebengine/WebCore/rendering/RenderFrame.cpp Mon May 03 13:32:15 2010 +0300 @@ -32,7 +32,7 @@ #if PLATFORM(SYMBIAN) #include "Document.h" #include "Frame.h" -#include "renderView.h" +#include "RenderView.h" #include "FrameView.h" #include "ScrollTypes.h" #endif diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/osswebengine/WebCore/rendering/RenderLayer.cpp --- a/webengine/osswebengine/WebCore/rendering/RenderLayer.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/osswebengine/WebCore/rendering/RenderLayer.cpp Mon May 03 13:32:15 2010 +0300 @@ -59,7 +59,7 @@ #include "HitTestResult.h" #include "OverflowEvent.h" #include "PlatformMouseEvent.h" -#include "PlatformScrollBar.h" +#include "PlatformScrollbar.h" #include "RenderArena.h" #include "RenderInline.h" #include "RenderTheme.h" diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/osswebengine/WebCore/rendering/RenderListBox.cpp --- a/webengine/osswebengine/WebCore/rendering/RenderListBox.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/osswebengine/WebCore/rendering/RenderListBox.cpp Mon May 03 13:32:15 2010 +0300 @@ -42,7 +42,7 @@ #include "HTMLOptionElement.h" #include "HTMLSelectElement.h" #include "HitTestResult.h" -#include "PlatformScrollBar.h" +#include "PlatformScrollbar.h" #include "RenderTheme.h" #include "RenderView.h" #include "TextStyle.h" diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/osswebengine/WebCore/rendering/RenderObject.cpp --- a/webengine/osswebengine/WebCore/rendering/RenderObject.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/osswebengine/WebCore/rendering/RenderObject.cpp Mon May 03 13:32:15 2010 +0300 @@ -27,7 +27,7 @@ #include "AXObjectCache.h" #include "AffineTransform.h" -#include "CSSStyleSelector.h" +#include "cssstyleselector.h" #include "CachedImage.h" #include "Chrome.h" #include "Document.h" diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/osswebengine/WebCore/rendering/RenderPartObject.cpp --- a/webengine/osswebengine/WebCore/rendering/RenderPartObject.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/osswebengine/WebCore/rendering/RenderPartObject.cpp Mon May 03 13:32:15 2010 +0300 @@ -42,7 +42,7 @@ #include "HTMLObjectElement.h" #include "HTMLParamElement.h" #include "KURL.h" -#include "MIMETypeRegistry.h" +#include "MimeTypeRegistry.h" #include "Page.h" #include "RenderView.h" #include "Text.h" diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/osswebengine/WebCore/rendering/RenderStyle.cpp --- a/webengine/osswebengine/WebCore/rendering/RenderStyle.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/osswebengine/WebCore/rendering/RenderStyle.cpp Mon May 03 13:32:15 2010 +0300 @@ -21,7 +21,7 @@ #include "RenderStyle.h" -#include "CSSStyleSelector.h" +#include "cssstyleselector.h" #include "RenderArena.h" namespace WebCore { diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/osswebengine/WebCore/rendering/RenderTextControl.cpp --- a/webengine/osswebengine/WebCore/rendering/RenderTextControl.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/osswebengine/WebCore/rendering/RenderTextControl.cpp Mon May 03 13:32:15 2010 +0300 @@ -36,7 +36,7 @@ #include "HitTestResult.h" #include "LocalizedStrings.h" #include "MouseEvent.h" -#include "PlatformScrollBar.h" +#include "PlatformScrollbar.h" #include "RenderTheme.h" #include "SearchPopupMenu.h" #include "SelectionController.h" diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/osswebengine/WebCore/xml/xmlhttprequest.cpp --- a/webengine/osswebengine/WebCore/xml/xmlhttprequest.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/osswebengine/WebCore/xml/xmlhttprequest.cpp Mon May 03 13:32:15 2010 +0300 @@ -19,7 +19,7 @@ */ #include "config.h" -#include "XMLHttpRequest.h" +#include "xmlhttprequest.h" #include "CString.h" #include "Cache.h" diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/osswebengine/WebKit/s60/formcontrols/PopupSelectListBox.h --- a/webengine/osswebengine/WebKit/s60/formcontrols/PopupSelectListBox.h Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/osswebengine/WebKit/s60/formcontrols/PopupSelectListBox.h Mon May 03 13:32:15 2010 +0300 @@ -20,7 +20,7 @@ #define POPUPSELECTLISTBOX_H // INCLUDES -#include +#include #include #include //CFormattedCellListBox diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/osswebengine/WebKit/s60/formcontrols/WebFormFill.cpp --- a/webengine/osswebengine/WebKit/s60/formcontrols/WebFormFill.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/osswebengine/WebKit/s60/formcontrols/WebFormFill.cpp Mon May 03 13:32:15 2010 +0300 @@ -21,12 +21,12 @@ #include "WebFormFill.h" #include "WebFormFillPopup.h" #include "WebView.h" -#include "brctl.h" +#include "BrCtl.h" #include "SettingsContainer.h" #include "StaticObjectsContainer.h" #include "FormFillController.h" #include "FormState.h" -#include "HtmlInputElement.h" +#include "HTMLInputElement.h" #include #include diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/osswebengine/WebKit/s60/group/JavaScriptCore/JavaScriptCore.mmp --- a/webengine/osswebengine/WebKit/s60/group/JavaScriptCore/JavaScriptCore.mmp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/osswebengine/WebKit/s60/group/JavaScriptCore/JavaScriptCore.mmp Mon May 03 13:32:15 2010 +0300 @@ -41,9 +41,9 @@ deffile ../Bwinscw/JavaScriptCore_3_2.def #endif #elif defined(ARMCC) -deffile ../EABI/JavaScriptCore.def +deffile ../eabi/JavaScriptCore.def #elif defined( WINSCW ) -deffile ../Bwinscw/JavaScriptCore.def +deffile ../bwinscw/JavaScriptCore.def #endif MACRO __S60__ @@ -78,7 +78,7 @@ SOURCEPATH ../../../../DerivedSources/JavaScriptCore SOURCE grammar.cpp -SOURCEPATH ../../../../JavaScriptCore/Api +SOURCEPATH ../../../../JavaScriptCore/API SOURCE JSCallbackConstructor.cpp SOURCE JSCallbackFunction.cpp SOURCE JSCallbackObject.cpp diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/osswebengine/WebKit/s60/group/browserengine/browserengine.mmp --- a/webengine/osswebengine/WebKit/s60/group/browserengine/browserengine.mmp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/osswebengine/WebKit/s60/group/browserengine/browserengine.mmp Mon May 03 13:32:15 2010 +0300 @@ -37,7 +37,7 @@ MACRO NOKIA_MOBILE_BROWSER #define NOKIA_MOBILE_BROWSER -SOURCEPATH ../../WebView +SOURCEPATH ../../webview SOURCE BrCtl.cpp STATICLIBRARY WebKit.lib diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/osswebengine/WebKit/s60/group/common.mmpi --- a/webengine/osswebengine/WebKit/s60/group/common.mmpi Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/osswebengine/WebKit/s60/group/common.mmpi Mon May 03 13:32:15 2010 +0300 @@ -38,15 +38,15 @@ USERINCLUDE ../../../WebCore/platform/symbian USERINCLUDE ../../../WebCore/platform/graphics/symbian USERINCLUDE ../../../WebCore/platform/symbian/bitmap -USERINCLUDE ../../../WebCore/loader/symbian +USERINCLUDE ../../../WebCore/loader/Symbian USERINCLUDE ../../../WebCore/loader USERINCLUDE ../../../WebCore/loader/icon USERINCLUDE ../../../WebCore/loader/wml -USERINCLUDE ../WebView -USERINCLUDE ../Plugins -USERINCLUDE ../WebCoreSupport -USERINCLUDE ../FormControls -USERINCLUDE ../Misc +USERINCLUDE ../webview +USERINCLUDE ../plugins +USERINCLUDE ../webcoresupport +USERINCLUDE ../formcontrols +USERINCLUDE ../misc USERINCLUDE ../../../../../inc USERINCLUDE ../../../MemoryManager/Inc @@ -81,12 +81,12 @@ MW_LAYER_STDAPIS_SYSTEMINCLUDE -SYSTEMINCLUDE ../../../../PageScaler/inc -SYSTEMINCLUDE ../../../../WidgetEngine/inc +SYSTEMINCLUDE ../../../../pagescaler/inc +SYSTEMINCLUDE ../../../../widgetengine/inc SYSTEMINCLUDE ../../../../device/inc -SYSTEMINCLUDE ../../../../WebKitUtils/ToolBar -SYSTEMINCLUDE ../../../../WebKitUtils/HistoryProvider -SYSTEMINCLUDE ../../../../WebKitUtils/SqliteSymbian +SYSTEMINCLUDE ../../../../webkitutils/ToolBar +SYSTEMINCLUDE ../../../../webkitutils/HistoryProvider +SYSTEMINCLUDE ../../../../webkitutils/SqliteSymbian MACRO __S60__ MACRO __OOM__ diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/osswebengine/WebKit/s60/group/libxml2/libxml2.mmp --- a/webengine/osswebengine/WebKit/s60/group/libxml2/libxml2.mmp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/osswebengine/WebKit/s60/group/libxml2/libxml2.mmp Mon May 03 13:32:15 2010 +0300 @@ -20,7 +20,7 @@ TARGET webcore_xmlparser.lib TARGETTYPE lib -SOURCEPATH ../../../../WebCore/platform/symbian/libxml2 +SOURCEPATH ../../../../WebCore/platform/symbian/Libxml2 SOURCE XmlEnglibxml2dll.cpp SOURCE Libxml2_chvalid.c diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/osswebengine/WebKit/s60/group/plugins/plugins.mmp --- a/webengine/osswebengine/WebKit/s60/group/plugins/plugins.mmp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/osswebengine/WebKit/s60/group/plugins/plugins.mmp Mon May 03 13:32:15 2010 +0300 @@ -28,11 +28,11 @@ SYSTEMINCLUDE ../../../../WebCore/dom SYSTEMINCLUDE ../../../../DerivedSources/WebCore -SOURCEPATH ../../Plugins +SOURCEPATH ../../plugins SOURCE PluginHandler.cpp SOURCE PluginSkin.cpp SOURCE PluginStream.cpp SOURCE PluginPlayer.cpp -SOURCE PlugInStreamLoaderClient.cpp +SOURCE PluginStreamLoaderClient.cpp SOURCE NpnImplementation.cpp SOURCE PluginWin.cpp diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/osswebengine/WebKit/s60/group/webcore/html/html.mmp --- a/webengine/osswebengine/WebKit/s60/group/webcore/html/html.mmp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/osswebengine/WebKit/s60/group/webcore/html/html.mmp Mon May 03 13:32:15 2010 +0300 @@ -110,4 +110,4 @@ SOURCE HTMLTokenizer.cpp SOURCE HTMLUListElement.cpp SOURCE HTMLViewSourceDocument.cpp -SOURCE PreLoadScanner.cpp \ No newline at end of file +SOURCE PreloadScanner.cpp \ No newline at end of file diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/osswebengine/WebKit/s60/group/webcore/loader/loader.mmp --- a/webengine/osswebengine/WebKit/s60/group/webcore/loader/loader.mmp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/osswebengine/WebKit/s60/group/webcore/loader/loader.mmp Mon May 03 13:32:15 2010 +0300 @@ -57,7 +57,7 @@ SOURCE TextResourceDecoder.cpp SOURCE WmlResourceLoader.cpp -SOURCEPATH ../../../../../WebCore/loader/symbian +SOURCEPATH ../../../../../WebCore/loader/Symbian SOURCE DocumentLoaderSymbian.cpp SOURCE IconLoaderSymbian.cpp @@ -69,7 +69,7 @@ SOURCE IconDatabase.cpp SOURCE IconLoader.cpp SOURCE IconRecord.cpp -SOURCE PageUrlRecord.cpp +SOURCE PageURLRecord.cpp SOURCE SQLDatabase.cpp SOURCE SQLStatement.cpp SOURCE SQLTransaction.cpp diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/osswebengine/WebKit/s60/group/webcore/platform/platform.mmp --- a/webengine/osswebengine/WebKit/s60/group/webcore/platform/platform.mmp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/osswebengine/WebKit/s60/group/webcore/platform/platform.mmp Mon May 03 13:32:15 2010 +0300 @@ -25,7 +25,7 @@ VENDORID VID_DEFAULT -START RESOURCE ../../../data/webkit.rss +START RESOURCE ../../../data/Webkit.rss DEPENDS avkon.rsg DEPENDS eikon.rsg HEADER @@ -48,7 +48,7 @@ // Masks SOURCEPATH . - SOURCE 1 ../../../data/SelectMultimask.bmp + SOURCE 1 ../../../data/SelectMultiMask.bmp END diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/osswebengine/WebKit/s60/group/webkit/webkit.mmp --- a/webengine/osswebengine/WebKit/s60/group/webkit/webkit.mmp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/osswebengine/WebKit/s60/group/webkit/webkit.mmp Mon May 03 13:32:15 2010 +0300 @@ -22,7 +22,7 @@ VENDORID VID_DEFAULT -SOURCEPATH ../../WebView +SOURCEPATH ../../webview SOURCE WebFrame.cpp SOURCE WebFrameView.cpp SOURCE WebView.cpp @@ -53,12 +53,12 @@ SOURCE WebScrollbarDrawer.cpp SOURCE WebSprite.cpp -SOURCEPATH ../../FormControls +SOURCEPATH ../../formcontrols SOURCE WebFormFill.cpp SOURCE WebFormFillPopup.cpp SOURCE PopupSelectListBox.cpp -SOURCEPATH ../../WebCoreSupport +SOURCEPATH ../../webcoresupport SOURCE WebChromeClient.cpp SOURCE WebContextMenuClient.cpp SOURCE WebDragClient.cpp @@ -67,7 +67,7 @@ SOURCE WebFrameBridge.cpp SOURCE WebInspectorClient.cpp -SOURCEPATH ../../Misc +SOURCEPATH ../../misc SOURCE WebIconDatabase.cpp SOURCE WebKitLogger.cpp SOURCE WebUtil.cpp diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/osswebengine/WebKit/s60/misc/WebCharsetData.h --- a/webengine/osswebengine/WebKit/s60/misc/WebCharsetData.h Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/osswebengine/WebKit/s60/misc/WebCharsetData.h Mon May 03 13:32:15 2010 +0300 @@ -18,7 +18,7 @@ #ifndef __CHARSETDATA_H #define __CHARSETDATA_H -#include +#include struct TCharsetEntry { TUint32 uid; diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/osswebengine/WebKit/s60/misc/WebIconDatabase.cpp --- a/webengine/osswebengine/WebKit/s60/misc/WebIconDatabase.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/osswebengine/WebKit/s60/misc/WebIconDatabase.cpp Mon May 03 13:32:15 2010 +0300 @@ -24,8 +24,8 @@ #include "PlatformString.h" #include "KURL.h" #include "IntRect.h" -#include -#include +#include +#include #include "WebKitUtilsSqlite.h" using namespace WebCore; diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/osswebengine/WebKit/s60/misc/WebKitLogger.cpp --- a/webengine/osswebengine/WebKit/s60/misc/WebKitLogger.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/osswebengine/WebKit/s60/misc/WebKitLogger.cpp Mon May 03 13:32:15 2010 +0300 @@ -20,7 +20,7 @@ #include "config.h" #include "WebKitLogger.h" #include -#include +#include // EXTERNAL DATA STRUCTURES diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/osswebengine/WebKit/s60/misc/WebKitLogger.h --- a/webengine/osswebengine/WebKit/s60/misc/WebKitLogger.h Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/osswebengine/WebKit/s60/misc/WebKitLogger.h Mon May 03 13:32:15 2010 +0300 @@ -21,7 +21,7 @@ #include #include #include -#include "staticobjectscontainer.h" +#include "StaticObjectsContainer.h" // CONSTANTS // MACROS diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/osswebengine/WebKit/s60/misc/WebTabbedNavigation.cpp --- a/webengine/osswebengine/WebKit/s60/misc/WebTabbedNavigation.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/osswebengine/WebKit/s60/misc/WebTabbedNavigation.cpp Mon May 03 13:32:15 2010 +0300 @@ -36,7 +36,7 @@ #include "WebFrameView.h" #include #include "EventHandler.h" -#include "webkitlogger.h" +#include "WebKitLogger.h" #include "FocusController.h" #include "RenderListBox.h" #include "HTMLSelectElement.h" diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/osswebengine/WebKit/s60/misc/WebUtil.cpp --- a/webengine/osswebengine/WebKit/s60/misc/WebUtil.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/osswebengine/WebKit/s60/misc/WebUtil.cpp Mon May 03 13:32:15 2010 +0300 @@ -22,7 +22,7 @@ #include "Cache.h" #include "DocLoader.h" #include "IntPoint.h" -#include "String.h" +#include "string.h" #include "HTMLNames.h" #include "EventNames.h" #include "HTMLInputElement.h" @@ -40,13 +40,13 @@ #include "StaticObjectsContainer.h" #include "SelectionController.h" #include "WebUtil.h" -#include "errordefs.h" +#include "ErrorDefs.h" #include "RenderListBox.h" #include "RenderTextControl.h" #include "RenderView.h" #include "PlatformScrollbar.h" #include "HTMLSelectElement.h" -#include "webkitlogger.h" +#include "WebKitLogger.h" #include #include #include diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/osswebengine/WebKit/s60/plugins/PluginHandler.cpp --- a/webengine/osswebengine/WebKit/s60/plugins/PluginHandler.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/osswebengine/WebKit/s60/plugins/PluginHandler.cpp Mon May 03 13:32:15 2010 +0300 @@ -31,7 +31,7 @@ // INCLUDES #include "WebCorePluginHandler.h" -#include "NPNImplementation.h" +#include "NpnImplementation.h" #include "PluginHandler.h" // CONSTANTS diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/osswebengine/WebKit/s60/plugins/PluginHandler.h --- a/webengine/osswebengine/WebKit/s60/plugins/PluginHandler.h Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/osswebengine/WebKit/s60/plugins/PluginHandler.h Mon May 03 13:32:15 2010 +0300 @@ -26,7 +26,7 @@ #include #include #include -#include // ecom +#include // ecom #include "EcomBrowserPluginInterface.h" #include "WebCorePluginHandler.h" diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/osswebengine/WebKit/s60/plugins/PluginSkin.cpp --- a/webengine/osswebengine/WebKit/s60/plugins/PluginSkin.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/osswebengine/WebKit/s60/plugins/PluginSkin.cpp Mon May 03 13:32:15 2010 +0300 @@ -16,7 +16,7 @@ */ //INCLUDES -#include +#include #include "../../bidi.h" #include "PlatformString.h" #include @@ -35,7 +35,7 @@ #include "StaticObjectsContainer.h" #include "BrCtlDefs.h" #include "SettingsContainer.h" -#include +#include #include #include #include "Frame.h" @@ -43,10 +43,10 @@ #include "DocumentLoader.h" #include "ResourceRequest.h" #include "Widget.h" -#include "PlatformScrollBar.h" +#include "PlatformScrollbar.h" #include -#include +#include #include #include #include diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/osswebengine/WebKit/s60/plugins/PluginStream.cpp --- a/webengine/osswebengine/WebKit/s60/plugins/PluginStream.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/osswebengine/WebKit/s60/plugins/PluginStream.cpp Mon May 03 13:32:15 2010 +0300 @@ -15,7 +15,7 @@ * */ -#include +#include #include "../../bidi.h" #include "Frame.h" diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/osswebengine/WebKit/s60/plugins/PluginStreamLoaderClient.cpp --- a/webengine/osswebengine/WebKit/s60/plugins/PluginStreamLoaderClient.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/osswebengine/WebKit/s60/plugins/PluginStreamLoaderClient.cpp Mon May 03 13:32:15 2010 +0300 @@ -31,7 +31,7 @@ #include "PluginStream.h" #include "PluginHandler.h" -#include "NetScapePlugInStreamLoader.h" +#include "NetscapePlugInStreamLoader.h" using namespace WebCore; diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/osswebengine/WebKit/s60/plugins/PluginWin.cpp --- a/webengine/osswebengine/WebKit/s60/plugins/PluginWin.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/osswebengine/WebKit/s60/plugins/PluginWin.cpp Mon May 03 13:32:15 2010 +0300 @@ -23,7 +23,7 @@ #include #include #include -#include +#include #include #include "WebFrame.h" diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/osswebengine/WebKit/s60/webcoresupport/WebChromeClient.cpp --- a/webengine/osswebengine/WebKit/s60/webcoresupport/WebChromeClient.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/osswebengine/WebKit/s60/webcoresupport/WebChromeClient.cpp Mon May 03 13:32:15 2010 +0300 @@ -29,7 +29,7 @@ #include "FrameLoadRequest.h" #include "kjs_proxy.h" #include "kjs_binding.h" -#include +#include #include diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/osswebengine/WebKit/s60/webcoresupport/WebEditorClient.cpp --- a/webengine/osswebengine/WebKit/s60/webcoresupport/WebEditorClient.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/osswebengine/WebKit/s60/webcoresupport/WebEditorClient.cpp Mon May 03 13:32:15 2010 +0300 @@ -31,9 +31,9 @@ #include "WebView.h" #include "WebFrame.h" #include "WebFormFill.h" -#include "HtmlNames.h" +#include "HTMLNames.h" #include "WebFepTextEditor.h" -#include +#include #include diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/osswebengine/WebKit/s60/webcoresupport/WebFrameLoaderClient.cpp --- a/webengine/osswebengine/WebKit/s60/webcoresupport/WebFrameLoaderClient.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/osswebengine/WebKit/s60/webcoresupport/WebFrameLoaderClient.cpp Mon May 03 13:32:15 2010 +0300 @@ -25,7 +25,7 @@ #include "Frame.h" #include "FrameLoader.h" #include "HTMLFrameOwnerElement.h" -#include "HtmlNames.h" +#include "HTMLNames.h" #include "HTMLFrameElement.h" #include "WebCoreFrameBridge.h" #include "HTMLFormElement.h" @@ -38,8 +38,8 @@ #include "WebFrameView.h" #include "WebFrameBridge.h" #include "WebDocumentLoader.h" -#include "brctl.h" -#include "page.h" +#include "BrCtl.h" +#include "Page.h" #include "ProgressTracker.h" #include "WebPolicyManager.h" #include "StaticObjectsContainer.h" @@ -47,7 +47,7 @@ #include "BrCtlWindowObserver.h" #include "WmlDispatcher.h" #include "WebUtil.h" -#include "errordefs.h" +#include "ErrorDefs.h" #include "WebFepTextEditor.h" #include "SettingsContainer.h" #include "WebTabbedNavigation.h" @@ -56,7 +56,7 @@ #include "WebCharsetData.h" #include "WebKitLogger.h" #include "PluginHandler.h" -#include "MIMETypeRegistry.h" +#include "MimeTypeRegistry.h" #include "WidgetExtension.h" using namespace WebCore; diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/osswebengine/WebKit/s60/webview/BrCtl.cpp --- a/webengine/osswebengine/WebKit/s60/webview/BrCtl.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/osswebengine/WebKit/s60/webview/BrCtl.cpp Mon May 03 13:32:15 2010 +0300 @@ -30,7 +30,7 @@ #else #include #endif -#include +#include #include #include //tot:fixme @@ -44,7 +44,7 @@ #include "WebDataLoadConsumer.h" #include "WebFormFillPopup.h" #include "WebPageFullScreenHandler.h" -#include "PageScaler.h" +#include "pagescaler.h" #include "HistoryController.h" #include "HistoryEntry.h" #include "HistoryInterface.h" @@ -68,15 +68,15 @@ #include "WebCursor.h" #include "WebUtil.h" #include "WebCharsetData.h" -#include "HttpCacheManager.h" +#include "httpcachemanager.h" #include "ResourceLoaderDelegate.h" #include "EventHandler.h" -#include "timer.h" -#include "page.h" -#include "range.h" -#include "focusController.h" +#include "Timer.h" +#include "Page.h" +#include "Range.h" +#include "FocusController.h" #include "IconDatabase.h" -#include "httpDownload.h" +#include "HttpDownload.h" #include "BrCtlSoftkeysObserverImpl.h" #include "BrCtlSpecialLoadObserverImpl.h" #include "BrCtlLayoutObserverImpl.h" @@ -89,7 +89,7 @@ #include #ifndef BRDO_WML_DISABLED_FF -#include "wmlinterface.h" +#include "WmlInterface.h" #include "WmlInterfaceImpl.h" #include "WmlEngineInterface.h" #endif diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/osswebengine/WebKit/s60/webview/BrCtl.h --- a/webengine/osswebengine/WebKit/s60/webview/BrCtl.h Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/osswebengine/WebKit/s60/webview/BrCtl.h Mon May 03 13:32:15 2010 +0300 @@ -21,7 +21,7 @@ #define BRCTL_H // INCLUDES -#include +#include #include "BrCtlDefs.h" #include "HistoryInterface.h" diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/osswebengine/WebKit/s60/webview/PageView.cpp --- a/webengine/osswebengine/WebKit/s60/webview/PageView.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/osswebengine/WebKit/s60/webview/PageView.cpp Mon May 03 13:32:15 2010 +0300 @@ -23,7 +23,7 @@ #include #include "pagescaler.h" #include "WebView.h" -#include "brctl.h" +#include "BrCtl.h" // EXTERNAL DATA STRUCTURES //extern ?external_data; diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/osswebengine/WebKit/s60/webview/SettingsContainer.cpp --- a/webengine/osswebengine/WebKit/s60/webview/SettingsContainer.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/osswebengine/WebKit/s60/webview/SettingsContainer.cpp Mon May 03 13:32:15 2010 +0300 @@ -22,16 +22,16 @@ #include "BrCtl.h" #include "WebUtil.h" #include "Page.h" -#include "frame.h" -#include "frametree.h" -#include "frameview.h" -#include "document.h" +#include "Frame.h" +#include "FrameTree.h" +#include "FrameView.h" +#include "Document.h" #include "Settings.h" #include "HttpSessionManager.h" #include "StaticObjectsContainer.h" #include "ResourceLoaderDelegate.h" #include "HistoryInterface.h" -#include "brctldefs.h" +#include "BrCtlDefs.h" #include "WebDocumentLoader.h" #include "Frame.h" #include "FrameLoader.h" diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/osswebengine/WebKit/s60/webview/SettingsContainer.h --- a/webengine/osswebengine/WebKit/s60/webview/SettingsContainer.h Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/osswebengine/WebKit/s60/webview/SettingsContainer.h Mon May 03 13:32:15 2010 +0300 @@ -20,7 +20,7 @@ #define __SETTINGSCONTAINER_H__ #include -#include "brctldefs.h" +#include "BrCtlDefs.h" class WebView; class HistoryControllerInterface; diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/osswebengine/WebKit/s60/webview/WebCannedImages.cpp --- a/webengine/osswebengine/WebKit/s60/webview/WebCannedImages.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/osswebengine/WebKit/s60/webview/WebCannedImages.cpp Mon May 03 13:32:15 2010 +0300 @@ -31,7 +31,7 @@ #include #endif // tot:move ibeam from bitmap to svg -#include +#include // EXTERNAL DATA STRUCTURES diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/osswebengine/WebKit/s60/webview/WebFepTextEditor.cpp --- a/webengine/osswebengine/WebKit/s60/webview/WebFepTextEditor.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/osswebengine/WebKit/s60/webview/WebFepTextEditor.cpp Mon May 03 13:32:15 2010 +0300 @@ -38,10 +38,10 @@ #include "Frame.h" #include "Editor.h" -#include "HtmlNames.h" +#include "HTMLNames.h" #include "EventHandler.h" -#include "HtmlInputElement.h" -#include "HtmlTextAreaElement.h" +#include "HTMLInputElement.h" +#include "HTMLTextAreaElement.h" #include "PlatformKeyboardEvent.h" #include "CSSPropertyNames.h" #include "CSSValueKeywords.h" @@ -49,7 +49,7 @@ #include #include #include -#include +#include #include "Text.h" using namespace WebCore; diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/osswebengine/WebKit/s60/webview/WebFepTextEditor.h --- a/webengine/osswebengine/WebKit/s60/webview/WebFepTextEditor.h Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/osswebengine/WebKit/s60/webview/WebFepTextEditor.h Mon May 03 13:32:15 2010 +0300 @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include #include diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/osswebengine/WebKit/s60/webview/WebFrame.cpp --- a/webengine/osswebengine/WebKit/s60/webview/WebFrame.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/osswebengine/WebKit/s60/webview/WebFrame.cpp Mon May 03 13:32:15 2010 +0300 @@ -41,8 +41,8 @@ #include "GraphicsContext.h" #include "HTMLFormElement.h" #include "ResourceRequest.h" -#include "webkitlogger.h" -#include "webutil.h" +#include "WebKitLogger.h" +#include "WebUtil.h" #include "PluginSkin.h" #include "PluginHandler.h" #include "kjs_proxy.h" diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/osswebengine/WebKit/s60/webview/WebFrameView.cpp --- a/webengine/osswebengine/WebKit/s60/webview/WebFrameView.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/osswebengine/WebKit/s60/webview/WebFrameView.cpp Mon May 03 13:32:15 2010 +0300 @@ -26,8 +26,8 @@ #include "WebCoreGraphicsContext.h" #include "GraphicsContext.h" #include "PlatformScrollbar.h" -#include "PageScaler.h" -#include "webkitlogger.h" +#include "pagescaler.h" +#include "WebKitLogger.h" #include "BrCtl.h" #include "SettingsContainer.h" #include "StaticObjectsContainer.h" diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/osswebengine/WebKit/s60/webview/WebPageFullScreenHandler.cpp --- a/webengine/osswebengine/WebKit/s60/webview/WebPageFullScreenHandler.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/osswebengine/WebKit/s60/webview/WebPageFullScreenHandler.cpp Mon May 03 13:32:15 2010 +0300 @@ -18,8 +18,8 @@ // INCLUDE FILES #include <../bidi.h> -#include -#include +#include +#include #include "StaticObjectsContainer.h" #include "WebCannedImages.h" #include "WebPageFullScreenHandler.h" diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/osswebengine/WebKit/s60/webview/WebPageZoomHandler.cpp --- a/webengine/osswebengine/WebKit/s60/webview/WebPageZoomHandler.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/osswebengine/WebKit/s60/webview/WebPageZoomHandler.cpp Mon May 03 13:32:15 2010 +0300 @@ -18,7 +18,7 @@ // INCLUDE FILES #include <../bidi.h> -#include +#include #include "WebPageZoomHandler.h" #include "SettingsContainer.h" #include diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/osswebengine/WebKit/s60/webview/WebPointerEventHandler.cpp --- a/webengine/osswebengine/WebKit/s60/webview/WebPointerEventHandler.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/osswebengine/WebKit/s60/webview/WebPointerEventHandler.cpp Mon May 03 13:32:15 2010 +0300 @@ -22,7 +22,7 @@ #ifdef BRDO_TOUCH_ENABLED_FF #include #endif // BRDO_TOUCH_ENABLED_FF -#include "brctl.h" +#include "BrCtl.h" #include "BrCtlDefs.h" #include "WebPointerEventHandler.h" #include "WebView.h" diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/osswebengine/WebKit/s60/webview/WebPolicyManager.cpp --- a/webengine/osswebengine/WebKit/s60/webview/WebPolicyManager.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/osswebengine/WebKit/s60/webview/WebPolicyManager.cpp Mon May 03 13:32:15 2010 +0300 @@ -29,8 +29,8 @@ #include "WebUtil.h" #include "StaticObjectsContainer.h" #include "PlugInInfoStore.h" -#include "MIMETypeRegistry.h" -#include +#include "MimeTypeRegistry.h" +#include #include using namespace WebCore; diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/osswebengine/WebKit/s60/webview/WebPopupDrawer.cpp --- a/webengine/osswebengine/WebKit/s60/webview/WebPopupDrawer.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/osswebengine/WebKit/s60/webview/WebPopupDrawer.cpp Mon May 03 13:32:15 2010 +0300 @@ -18,7 +18,7 @@ // INCLUDE FILES #include <../bidi.h> -#include +#include #include #include "WebPopupDrawer.h" #include "WebView.h" diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/osswebengine/WebKit/s60/webview/WebTextFormatMask.cpp --- a/webengine/osswebengine/WebKit/s60/webview/WebTextFormatMask.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/osswebengine/WebKit/s60/webview/WebTextFormatMask.cpp Mon May 03 13:32:15 2010 +0300 @@ -22,9 +22,9 @@ #include "Frame.h" #include "Editor.h" -#include "String.h" -#include "HtmlNames.h" -#include "HtmlInputElement.h" +#include "string.h" +#include "HTMLNames.h" +#include "HTMLInputElement.h" #include "Text.h" #include "CString.h" diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/osswebengine/WebKit/s60/webview/WebToolBarInterface.cpp --- a/webengine/osswebengine/WebKit/s60/webview/WebToolBarInterface.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/osswebengine/WebKit/s60/webview/WebToolBarInterface.cpp Mon May 03 13:32:15 2010 +0300 @@ -25,7 +25,7 @@ #include "WebToolBarInterface.h" #include "SettingsContainer.h" -#include "KUrl.h" +#include "KURL.h" #include "BrCtl.h" #include "Frame.h" #include "FrameLoader.h" diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/osswebengine/WebKit/s60/webview/WebToolBarInterface.h --- a/webengine/osswebengine/WebKit/s60/webview/WebToolBarInterface.h Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/osswebengine/WebKit/s60/webview/WebToolBarInterface.h Mon May 03 13:32:15 2010 +0300 @@ -24,8 +24,8 @@ // INCLUDES #include #include -#include -#include +#include +#include #include #include #include diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/osswebengine/WebKit/s60/webview/WebView.cpp --- a/webengine/osswebengine/WebKit/s60/webview/WebView.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/osswebengine/WebKit/s60/webview/WebView.cpp Mon May 03 13:32:15 2010 +0300 @@ -31,7 +31,7 @@ #include #include "config.h" #include "../../bidi.h" -#include "brctl.h" +#include "BrCtl.h" #include "HistoryController.h" #include "PageView.h" #include "SettingsContainer.h" diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/osswebengine/WebKit/s60/webview/WebView.h --- a/webengine/osswebengine/WebKit/s60/webview/WebView.h Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/osswebengine/WebKit/s60/webview/WebView.h Mon May 03 13:32:15 2010 +0300 @@ -24,7 +24,7 @@ #include #include "platform/Shared.h" #include "BrCtlDefs.h" -#include "PageScaler.h" +#include "pagescaler.h" #include "Timer.h" #include "MemoryManager.h" diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/osswebengine/WebKit/s60/webview/WidgetExtension.h --- a/webengine/osswebengine/WebKit/s60/webview/WidgetExtension.h Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/osswebengine/WebKit/s60/webview/WidgetExtension.h Mon May 03 13:32:15 2010 +0300 @@ -22,8 +22,8 @@ // INCLUDES #include #include -#include -#include +#include +#include #include #include "WidgetEngineCallbacks.h" diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/osswebengine/WebKit/s60/webview/WmlDispatcher.cpp --- a/webengine/osswebengine/WebKit/s60/webview/WmlDispatcher.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/osswebengine/WebKit/s60/webview/WmlDispatcher.cpp Mon May 03 13:32:15 2010 +0300 @@ -17,7 +17,7 @@ // INCLUDES -#include +#include #include "WmlDispatcher.h" #ifndef BRDO_WML_DISABLED_FF diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/osswebengine/cache/group/BrowserCache.mmp --- a/webengine/osswebengine/cache/group/BrowserCache.mmp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/osswebengine/cache/group/BrowserCache.mmp Mon May 03 13:32:15 2010 +0300 @@ -62,7 +62,7 @@ SYSTEMINCLUDE /epoc32/include /epoc32/include/oem #endif SYSTEMINCLUDE /Epoc32/include/http -SYSTEMINCLUDE /Epoc32/include/libc +SYSTEMINCLUDE /epoc32/include/libc diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/osswebengine/cache/inc/HttpCacheManager.h --- a/webengine/osswebengine/cache/inc/HttpCacheManager.h Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/osswebengine/cache/inc/HttpCacheManager.h Mon May 03 13:32:15 2010 +0300 @@ -20,7 +20,7 @@ // INCLUDES #include -#include +#include #include #include diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/osswebengine/cache/src/HttpCacheFileWriteHandler.cpp --- a/webengine/osswebengine/cache/src/HttpCacheFileWriteHandler.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/osswebengine/cache/src/HttpCacheFileWriteHandler.cpp Mon May 03 13:32:15 2010 +0300 @@ -23,7 +23,7 @@ #include "HttpCachePostponeWriteUtilities.h" #include "HttpCacheUtil.h" #include "HttpCacheObserver.h" -#include +#include #include #include #include diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/osswebengine/cache/src/HttpCacheHandler.cpp --- a/webengine/osswebengine/cache/src/HttpCacheHandler.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/osswebengine/cache/src/HttpCacheHandler.cpp Mon May 03 13:32:15 2010 +0300 @@ -25,10 +25,10 @@ #include "HttpCacheEvictionHandler.h" #include "HttpCacheObserver.h" #include "HttpCacheFileWriteHandler.h" -#include +#include #include #include -#include +#include #include #include #include diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/osswebengine/cache/src/HttpCacheManager.cpp --- a/webengine/osswebengine/cache/src/HttpCacheManager.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/osswebengine/cache/src/HttpCacheManager.cpp Mon May 03 13:32:15 2010 +0300 @@ -20,13 +20,13 @@ #include "HttpCacheHandler.h" #include "HttpCacheUtil.h" #include "HttpCacheFileWriteHandler.h" -#include -#include +#include +#include #include #include -#include -#include -#include +#include +#include +#include #include #include #include diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/osswebengine/cache/src/HttpCacheStreamHandler.cpp --- a/webengine/osswebengine/cache/src/HttpCacheStreamHandler.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/osswebengine/cache/src/HttpCacheStreamHandler.cpp Mon May 03 13:32:15 2010 +0300 @@ -22,7 +22,7 @@ #include "HttpCacheUtil.h" #include "HttpCacheHandler.h" #include -#include +#include // EXTERNAL DATA STRUCTURES diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/osswebengine/cache/src/HttpCacheUtil.cpp --- a/webengine/osswebengine/cache/src/HttpCacheUtil.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/osswebengine/cache/src/HttpCacheUtil.cpp Mon May 03 13:32:15 2010 +0300 @@ -18,14 +18,14 @@ // INCLUDE FILES #include "HttpCacheUtil.h" #include -#include +#include #include #include #include #include #include -#include "TInternetdate.h" -#include "HttpFilterCommonStringsExt.h" +#include "tinternetdate.h" +#include "httpfiltercommonstringsext.h" #include "HttpCacheEntry.h" // EXTERNAL DATA STRUCTURES diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/osswebengine/npscript/group/npscript.mmp --- a/webengine/osswebengine/npscript/group/npscript.mmp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/osswebengine/npscript/group/npscript.mmp Mon May 03 13:32:15 2010 +0300 @@ -29,7 +29,7 @@ #if defined(WINSCW) -deffile BWINSCW/npscript.def +deffile Bwinscw/npscript.def #elif defined(ARMCC) deffile EABI/npscript.def #endif @@ -41,7 +41,7 @@ MW_LAYER_SYSTEMINCLUDE -SYSTEMINCLUDE ../../javascriptcore/bindings -SYSTEMINCLUDE ../../javascriptcore/wtf/symbian +SYSTEMINCLUDE ../../JavaScriptCore/bindings +SYSTEMINCLUDE ../../JavaScriptCore/wtf/symbian LIBRARY javascriptcore.lib diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/pagescaler/group/minimap.mmp --- a/webengine/pagescaler/group/minimap.mmp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/pagescaler/group/minimap.mmp Mon May 03 13:32:15 2010 +0300 @@ -41,7 +41,7 @@ MW_LAYER_SYSTEMINCLUDE MW_LAYER_LIBC_SYSTEMINCLUDE -SYSTEMINCLUDE ../../osswebengine/memorymanager/inc +SYSTEMINCLUDE ../../osswebengine/MemoryManager/Inc LIBRARY euser.lib diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/pagescaler/src/minimapscaler.cpp --- a/webengine/pagescaler/src/minimapscaler.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/pagescaler/src/minimapscaler.cpp Mon May 03 13:32:15 2010 +0300 @@ -22,7 +22,7 @@ #include "minimapscaler.h" #include -#include +#include // EXTERNAL DATA STRUCTURES diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/webkitutils/HistoryProvider/HistoryEntry.cpp --- a/webengine/webkitutils/HistoryProvider/HistoryEntry.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/webkitutils/HistoryProvider/HistoryEntry.cpp Mon May 03 13:32:15 2010 +0300 @@ -20,7 +20,7 @@ // INCLUDE FILES -#include "historyentry.h" +#include "HistoryEntry.h" #include #include #include diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/webkitutils/SqliteSymbian/os_symbian.cpp --- a/webengine/webkitutils/SqliteSymbian/os_symbian.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/webkitutils/SqliteSymbian/os_symbian.cpp Mon May 03 13:32:15 2010 +0300 @@ -35,7 +35,7 @@ #include #include #include -#include +#include /////////////////////////////////////////////////////////////////////////////////////////// diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/webkitutils/ToolBar/ToolBar.h --- a/webengine/webkitutils/ToolBar/ToolBar.h Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/webkitutils/ToolBar/ToolBar.h Mon May 03 13:32:15 2010 +0300 @@ -22,8 +22,8 @@ // INCLUDES #include #include -#include -#include +#include +#include #include #include #include diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/webkitutils/ToolBar/ToolBarButton.cpp --- a/webengine/webkitutils/ToolBar/ToolBarButton.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/webkitutils/ToolBar/ToolBarButton.cpp Mon May 03 13:32:15 2010 +0300 @@ -18,19 +18,19 @@ // INCLUDE FILES #include #include -#include +#include #include "ToolBarButton.h" #include "ToolBar.h" -#include "W32STD.H" +#include "w32std.h" #include "RecentUrlStore.h" -#include -#include +#include +#include #include -#include "BrCtlInterface.h" -#include -#include -#include -#include +#include "brctlinterface.h" +#include +#include +#include +#include #include "eikon.hrh" diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/webkitutils/data/WebKitUtils.rss --- a/webengine/webkitutils/data/WebKitUtils.rss Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/webkitutils/data/WebKitUtils.rss Mon May 03 13:32:15 2010 +0300 @@ -19,5 +19,5 @@ // RESOURCE IDENTIFIER NAME WKUS -#include "ToolBar.rssi" +#include "toolbar.rssi" diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/webkitutils/data/toolbar.rssi --- a/webengine/webkitutils/data/toolbar.rssi Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/webkitutils/data/toolbar.rssi Mon May 03 13:32:15 2010 +0300 @@ -25,7 +25,7 @@ #include #include #include -#include +#include RESOURCE RSS_SIGNATURE { } diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/webkitutils/group/WebKitUtils.mmp --- a/webengine/webkitutils/group/WebKitUtils.mmp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/webkitutils/group/WebKitUtils.mmp Mon May 03 13:32:15 2010 +0300 @@ -34,12 +34,12 @@ MACRO __OOM__ #if defined(WINSCW) -deffile BWINSCW/WebKitUtils.def +deffile Bwinscw/WebKitUtils.def #elif defined(ARMCC) deffile EABI/WebKitUtils.def #endif -START RESOURCE ../data/webkitutils.rss +START RESOURCE ../data/WebKitUtils.rss HEADER TARGETPATH RESOURCE_FILES_DIR #ifdef __S60_32__ @@ -50,8 +50,8 @@ END SOURCEPATH ../ToolBar -SOURCE toolbar.cpp -SOURCE toolbarbutton.cpp +SOURCE ToolBar.cpp +SOURCE ToolBarButton.cpp SOURCEPATH ../HistoryProvider SOURCE HistoryEntry.cpp @@ -101,9 +101,9 @@ SOURCE vtab.c SOURCE where.c -USERINCLUDE ../../osswebengine/WebKit/s60/WebView +USERINCLUDE ../../osswebengine/WebKit/s60/webview -USERINCLUDE ../toolbar +USERINCLUDE ../ToolBar USERINCLUDE ../HistoryProvider USERINCLUDE ../SqliteSymbian diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/webkitutils/group/bld.inf --- a/webengine/webkitutils/group/bld.inf Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/webkitutils/group/bld.inf Mon May 03 13:32:15 2010 +0300 @@ -26,7 +26,7 @@ DEFAULT PRJ_EXPORTS -../loc/Toolbar.loc MW_LAYER_LOC_EXPORT_PATH(Toolbar.loc) +../loc/toolbar.loc MW_LAYER_LOC_EXPORT_PATH(Toolbar.loc) #ifdef __SERIES60_32__ @@ -44,7 +44,7 @@ END PRJ_MMPFILES -webkitutils.mmp +WebKitUtils.mmp #endif diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/widgetbackuprestore/Src/WidgetBackupRestore.cpp --- a/webengine/widgetbackuprestore/Src/WidgetBackupRestore.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/widgetbackuprestore/Src/WidgetBackupRestore.cpp Mon May 03 13:32:15 2010 +0300 @@ -18,7 +18,7 @@ #include #include -#include "widgetbackuprestore.h" +#include "WidgetBackupRestore.h" #include "WidgetActiveCallback.h" diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/widgetengine/group/WidgetEngine.mmp --- a/webengine/widgetengine/group/WidgetEngine.mmp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/widgetengine/group/WidgetEngine.mmp Mon May 03 13:32:15 2010 +0300 @@ -25,11 +25,11 @@ #include MW_LAYER_SYSTEMINCLUDE -USERINCLUDE ../../osswebengine/Webkit/S60/WebView -USERINCLUDE ../../osswebengine/Webkit/S60/Plugins -USERINCLUDE ../../osswebengine/Webkit/S60/WebCoreSupport -USERINCLUDE ../../osswebengine/Webkit/S60/FormControls -USERINCLUDE ../../osswebengine/Webkit/S60/Misc +USERINCLUDE ../../osswebengine/WebKit/s60/webview +USERINCLUDE ../../osswebengine/WebKit/s60/plugins +USERINCLUDE ../../osswebengine/WebKit/s60/webcoresupport +USERINCLUDE ../../osswebengine/WebKit/s60/formcontrols +USERINCLUDE ../../osswebengine/WebKit/s60/misc USERINCLUDE ../../osswebengine/cache/inc USERINCLUDE ../../osswebengine/WebCore @@ -115,7 +115,7 @@ SOURCE MenuItemClient.cpp SOURCE WidgetEngineBridge.cpp -START RESOURCE ../Src/WidgetMenu.rss +START RESOURCE ../src/WidgetMenu.rss DEPENDS avkon.rsg HEADER TARGETPATH RESOURCE_FILES_DIR diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/widgetengine/group/bld.inf --- a/webengine/widgetengine/group/bld.inf Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/widgetengine/group/bld.inf Mon May 03 13:32:15 2010 +0300 @@ -22,8 +22,8 @@ DEFAULT PRJ_EXPORTS -../Rom/WidgetEngine.iby CORE_MW_LAYER_IBY_EXPORT_PATH(WidgetEngine.iby) -../Rom/WidgetEngineResources.iby LANGUAGE_MW_LAYER_IBY_EXPORT_PATH(WidgetEngineResources.iby) +../rom/WidgetEngine.iby CORE_MW_LAYER_IBY_EXPORT_PATH(WidgetEngine.iby) +../rom/WidgetEngineResources.iby LANGUAGE_MW_LAYER_IBY_EXPORT_PATH(WidgetEngineResources.iby) PRJ_MMPFILES WidgetEngine.mmp diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/widgetengine/inc/MenuClient.h --- a/webengine/widgetengine/inc/MenuClient.h Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/widgetengine/inc/MenuClient.h Mon May 03 13:32:15 2010 +0300 @@ -23,7 +23,7 @@ #include #include -#include "BrCtlInterface.h" +#include "brctlinterface.h" #include "MenuCallbacks.h" #include "MenuItemCallbacks.h" #include "WidgetEngineCallbacks.h" diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/widgetengine/inc/MenuItemClient.h --- a/webengine/widgetengine/inc/MenuItemClient.h Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/widgetengine/inc/MenuItemClient.h Mon May 03 13:32:15 2010 +0300 @@ -20,7 +20,7 @@ // INCLUDES #include -#include "BrCtlInterface.h" +#include "brctlinterface.h" // CONSTANTS diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/widgetengine/inc/WidgetClient.h --- a/webengine/widgetengine/inc/WidgetClient.h Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/widgetengine/inc/WidgetClient.h Mon May 03 13:32:15 2010 +0300 @@ -20,7 +20,7 @@ // INCLUDES #include -#include "BrCtlInterface.h" +#include "brctlinterface.h" #include "WidgetCallbacks.h" #include "WidgetEngineCallbacks.h" diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/widgetengine/src/Preferences.cpp --- a/webengine/widgetengine/src/Preferences.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/widgetengine/src/Preferences.cpp Mon May 03 13:32:15 2010 +0300 @@ -17,7 +17,7 @@ // INCLUDE FILES #include -#include +#include #include #include #include diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/widgetengine/src/Widget.cpp --- a/webengine/widgetengine/src/Widget.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/widgetengine/src/Widget.cpp Mon May 03 13:32:15 2010 +0300 @@ -18,9 +18,9 @@ // INCLUDE FILES -#include +#include #include "../../bidi.h" -#include +#include #include "Widget.h" #include "WidgetFuncs.h" diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/widgetengine/src/WidgetClient.cpp --- a/webengine/widgetengine/src/WidgetClient.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/widgetengine/src/WidgetClient.cpp Mon May 03 13:32:15 2010 +0300 @@ -20,7 +20,7 @@ #include #include #include -#include +#include #include #include diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/widgetengine/src/WidgetEngineBridge.cpp --- a/webengine/widgetengine/src/WidgetEngineBridge.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/widgetengine/src/WidgetEngineBridge.cpp Mon May 03 13:32:15 2010 +0300 @@ -25,7 +25,7 @@ #include #include #include -#include "BrCtlInterface.h" +#include "brctlinterface.h" #include "WidgetEngineCallbacks.h" #include "WidgetClient.h" diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/widgetinstaller/Src/Iconconverter.cpp --- a/webengine/widgetinstaller/Src/Iconconverter.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/widgetinstaller/Src/Iconconverter.cpp Mon May 03 13:32:15 2010 +0300 @@ -18,8 +18,8 @@ */ #include -#include -#include +#include +#include #include "IconConverter.h" #include "WidgetInstaller.h" diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/widgetinstaller/Src/WidgetRegistrationManager.cpp --- a/webengine/widgetinstaller/Src/WidgetRegistrationManager.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/widgetinstaller/Src/WidgetRegistrationManager.cpp Mon May 03 13:32:15 2010 +0300 @@ -19,14 +19,14 @@ #include "WidgetRegistrationManager.h" #include "WidgetInstaller.h" #include -#include +#include #ifdef SYMBIAN_ENABLE_SPLIT_HEADERS #include //#include // missing #endif -#include +#include #include // CONSTANTS diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/widgetinstaller/group/WidgetInstaller.mmp --- a/webengine/widgetinstaller/group/WidgetInstaller.mmp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/widgetinstaller/group/WidgetInstaller.mmp Mon May 03 13:32:15 2010 +0300 @@ -40,7 +40,7 @@ SOURCE WidgetInstaller.cpp SOURCE WidgetConfigHandler.cpp SOURCE WidgetRegistrationManager.cpp -SOURCE IconConverter.cpp +SOURCE Iconconverter.cpp SOURCE WidgetBackupRegistryXml.cpp // Includes diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/widgetinstaller/group/bld.inf --- a/webengine/widgetinstaller/group/bld.inf Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/widgetinstaller/group/bld.inf Mon May 03 13:32:15 2010 +0300 @@ -22,7 +22,7 @@ DEFAULT GCCE PRJ_EXPORTS -../inc/WidgetInstaller.h |../../../inc/WidgetInstaller.h +../Inc/WidgetInstaller.h |../../../inc/WidgetInstaller.h ../Rom/WidgetInstaller.iby CORE_MW_LAYER_IBY_EXPORT_PATH(WidgetInstaller.iby) PRJ_MMPFILES diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/widgetmemoryplugin/data/10282855.rss --- a/webengine/widgetmemoryplugin/data/10282855.rss Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/widgetmemoryplugin/data/10282855.rss Mon May 03 13:32:15 2010 +0300 @@ -15,7 +15,7 @@ * */ -#include +#include #include RESOURCE REGISTRY_INFO theInfo diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/widgetregistry/Server/src/WidgetEntry.cpp --- a/webengine/widgetregistry/Server/src/WidgetEntry.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/widgetregistry/Server/src/WidgetEntry.cpp Mon May 03 13:32:15 2010 +0300 @@ -20,7 +20,7 @@ #include "WidgetRegistryConstants.h" #include #include -#include +#include //#include // EXTERNAL DATA STRUCTURES diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/widgetregistry/Server/src/WidgetRegistry.cpp --- a/webengine/widgetregistry/Server/src/WidgetRegistry.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/widgetregistry/Server/src/WidgetRegistry.cpp Mon May 03 13:32:15 2010 +0300 @@ -32,7 +32,7 @@ #include #include "UidAllocator.h" #if defined( BRDO_WRT_SECURITY_MGR_FF ) -#include +#include #endif #include diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/widgetregistry/Server/src/WidgetRegistryServer.cpp --- a/webengine/widgetregistry/Server/src/WidgetRegistryServer.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/widgetregistry/Server/src/WidgetRegistryServer.cpp Mon May 03 13:32:15 2010 +0300 @@ -20,8 +20,8 @@ #include #include #include "WidgetRegistryConstants.h" -#include "widgetregistryserver.h" -#include "widgetregistrysession.h" +#include "WidgetRegistryServer.h" +#include "WidgetRegistrySession.h" // ============================ MEMBER FUNCTIONS =============================== diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/widgetregistry/Server/src/WidgetRegistrySession.cpp --- a/webengine/widgetregistry/Server/src/WidgetRegistrySession.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/widgetregistry/Server/src/WidgetRegistrySession.cpp Mon May 03 13:32:15 2010 +0300 @@ -16,12 +16,12 @@ */ -#include +#include // User includes #include "WidgetRegistry.h" #include "WidgetRegistryConstants.h" -#include "widgetregistryserver.h" +#include "WidgetRegistryServer.h" #include "WidgetRegistryConstants.h" #include "WidgetRegistrySession.h" diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/widgetregistry/group/BLD.INF --- a/webengine/widgetregistry/group/BLD.INF Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/widgetregistry/group/BLD.INF Mon May 03 13:32:15 2010 +0300 @@ -23,10 +23,10 @@ PRJ_EXPORTS -../data/Widget_lproj.xml /epoc32/data/z/private/10282f06/Widget_lproj.xml -../data/Widget_lproj.xml /epoc32/winscw/c/private/10282f06/Widget_lproj.xml -../data/WidgetAccessPolicy.xml /epoc32/data/z/private/10282f06/WidgetAccessPolicy.xml -../data/WidgetAccessPolicy.xml /epoc32/winscw/c/private/10282f06/WidgetAccessPolicy.xml +../Data/Widget_lproj.xml /epoc32/data/z/private/10282f06/Widget_lproj.xml +../Data/Widget_lproj.xml /epoc32/winscw/c/private/10282f06/Widget_lproj.xml +../Data/WidgetAccessPolicy.xml /epoc32/data/z/private/10282f06/WidgetAccessPolicy.xml +../Data/WidgetAccessPolicy.xml /epoc32/winscw/c/private/10282f06/WidgetAccessPolicy.xml ../Rom/WidgetRegistry.iby CORE_MW_LAYER_IBY_EXPORT_PATH(WidgetRegistry.iby) PRJ_MMPFILES diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/widgetregistry/group/WidgetRegistryClient.mmp --- a/webengine/widgetregistry/group/WidgetRegistryClient.mmp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/widgetregistry/group/WidgetRegistryClient.mmp Mon May 03 13:32:15 2010 +0300 @@ -30,7 +30,7 @@ VENDORID VID_DEFAULT #if defined(WINSCW) -deffile ../Bwinscw/WidgetRegistryClient.def +deffile ../BWINSCW/WidgetRegistryClient.def #elif defined(ARMCC) deffile ../EABI/WidgetRegistryClient.def #endif @@ -39,7 +39,7 @@ SOURCE WidgetRegistryClient.cpp USERINCLUDE ../Client/inc -USERINCLUDE ../Common/inc +USERINCLUDE ../common/inc USERINCLUDE ../../../inc MW_LAYER_SYSTEMINCLUDE diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/widgetregistry/group/WidgetRegistryServer.mmp --- a/webengine/widgetregistry/group/WidgetRegistryServer.mmp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/widgetregistry/group/WidgetRegistryServer.mmp Mon May 03 13:32:15 2010 +0300 @@ -43,7 +43,7 @@ SOURCE UidAllocator.cpp USERINCLUDE ../Server/inc -USERINCLUDE ../Common/inc +USERINCLUDE ../common/inc USERINCLUDE ../../../inc MW_LAYER_SYSTEMINCLUDE MW_LAYER_LIBC_SYSTEMINCLUDE diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/wmlengine/group/Msg/Msg.mmp --- a/webengine/wmlengine/group/Msg/Msg.mmp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/wmlengine/group/Msg/Msg.mmp Mon May 03 13:32:15 2010 +0300 @@ -30,8 +30,8 @@ USERINCLUDE . USERINCLUDE ../../src/Msg/include -USERINCLUDE ../../src/Object/include -USERINCLUDE ../../src/Hed/include +USERINCLUDE ../../src/object/include +USERINCLUDE ../../src/hed/include SYSTEMINCLUDE ../../src/utils/include MW_LAYER_SYSTEMINCLUDE diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/wmlengine/group/Unicode/Unicode.mmp --- a/webengine/wmlengine/group/Unicode/Unicode.mmp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/wmlengine/group/Unicode/Unicode.mmp Mon May 03 13:32:15 2010 +0300 @@ -65,7 +65,7 @@ USERINCLUDE . USERINCLUDE ../../src/adt/include -USERINCLUDE ../../src/evt/include +USERINCLUDE ../../src/Evt/include USERINCLUDE ../../src/fbox/include USERINCLUDE ../../src/gdi/include USERINCLUDE ../../src/hed/include diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/wmlengine/group/browser/browser.mmp --- a/webengine/wmlengine/group/browser/browser.mmp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/wmlengine/group/browser/browser.mmp Mon May 03 13:32:15 2010 +0300 @@ -39,19 +39,19 @@ USERINCLUDE ../../src/adt/include USERINCLUDE ../../src/css/include -USERINCLUDE ../../src/evt/include +USERINCLUDE ../../src/Evt/include USERINCLUDE ../../src/fbox/include USERINCLUDE ../../src/gdi/include USERINCLUDE ../../src/hed/include USERINCLUDE ../../src/image/include -USERINCLUDE ../../src/imagech/include +USERINCLUDE ../../src/ImageCH/include USERINCLUDE ../../src/lmgr/include USERINCLUDE ../../src/markup/include USERINCLUDE ../../src/Msg/include -USERINCLUDE ../../src/mvc/include +USERINCLUDE ../../src/MVC/include USERINCLUDE ../../src/object/include USERINCLUDE ../../src/text/include -USERINCLUDE ../../src/system/include +USERINCLUDE ../../src/System/include USERINCLUDE ../../src/wml1x/include USERINCLUDE ../../src/browser/include USERINCLUDE ../../src/wmlscriptch/include diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/wmlengine/group/css/css.mmp --- a/webengine/wmlengine/group/css/css.mmp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/wmlengine/group/css/css.mmp Mon May 03 13:32:15 2010 +0300 @@ -55,7 +55,7 @@ USERINCLUDE ../../src/adt/include USERINCLUDE ../../src/css/include USERINCLUDE ../../src/htmlp/include -USERINCLUDE ../../src/evt/include +USERINCLUDE ../../src/Evt/include USERINCLUDE ../../src/gdi/include USERINCLUDE ../../src/hed/include USERINCLUDE ../../src/markup/include @@ -63,14 +63,14 @@ USERINCLUDE ../../src/image/include USERINCLUDE ../../src/lmgr/include USERINCLUDE ../../src/object/include -USERINCLUDE ../../src/system/include +USERINCLUDE ../../src/System/include USERINCLUDE ../../src/text/include USERINCLUDE ../../src/xhtml/include USERINCLUDE ../../src/wml/src USERINCLUDE ../../src/wml/include -USERINCLUDE ../../src/imagech/include -USERINCLUDE ../../src/mvc/include -USERINCLUDE ../../src/msg/include +USERINCLUDE ../../src/ImageCH/include +USERINCLUDE ../../src/MVC/include +USERINCLUDE ../../src/Msg/include USERINCLUDE ../../src/wmlcontrol/include MW_LAYER_SYSTEMINCLUDE diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/wmlengine/group/evt/evt.mmp --- a/webengine/wmlengine/group/evt/evt.mmp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/wmlengine/group/evt/evt.mmp Mon May 03 13:32:15 2010 +0300 @@ -20,7 +20,7 @@ TARGET evt.lib TARGETTYPE lib -SOURCEPATH ../../src/evt/src/ +SOURCEPATH ../../src/Evt/src/ CAPABILITY CAP_GENERAL_DLL VENDORID VID_DEFAULT @@ -43,7 +43,7 @@ SOURCE UnicodeKeyEvent.c SOURCE OpenViewerEvent.c -USERINCLUDE ../../src/evt/include +USERINCLUDE ../../src/Evt/include USERINCLUDE ../../src/object/include USERINCLUDE ../../src/gdi/include USERINCLUDE ../../src/utils/include diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/wmlengine/group/fbox/fbox.mmp --- a/webengine/wmlengine/group/fbox/fbox.mmp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/wmlengine/group/fbox/fbox.mmp Mon May 03 13:32:15 2010 +0300 @@ -53,7 +53,7 @@ SOURCE FBOXInputSkin.cpp SOURCE FBOXInteractor.cpp SOURCE KeyBoardEvent.c -SOURCE FBOXOptgrpBox.cpp +SOURCE FBOXOptGrpBox.cpp SOURCE FBOXOptGrpSkin.cpp SOURCE FBOXOptionBox.cpp SOURCE FBOXOptionBoxSkin.cpp @@ -83,21 +83,21 @@ USERINCLUDE . USERINCLUDE ../../src/adt/include -USERINCLUDE ../../src/evt/include +USERINCLUDE ../../src/Evt/include USERINCLUDE ../../src/fbox/include USERINCLUDE ../../src/gdi/include USERINCLUDE ../../src/hed/include USERINCLUDE ../../src/image/include USERINCLUDE ../../src/ImageCH/include USERINCLUDE ../../src/lmgr/include -USERINCLUDE ../../src/msg/include -USERINCLUDE ../../src/mvc/include +USERINCLUDE ../../src/Msg/include +USERINCLUDE ../../src/MVC/include USERINCLUDE ../../src/object/include -USERINCLUDE ../../src/system/include +USERINCLUDE ../../src/System/include USERINCLUDE ../../src/text/include USERINCLUDE ../../src/Unicode/include USERINCLUDE ../../src/urlloader/include -USERINCLUDE ../../src/fileloader/include +USERINCLUDE ../../src/FileLoader/include USERINCLUDE ../../src/utils/include USERINCLUDE ../../src/wml/src USERINCLUDE ../../src/wml/include diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/wmlengine/group/fileloader/fileloader.mmp --- a/webengine/wmlengine/group/fileloader/fileloader.mmp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/wmlengine/group/fileloader/fileloader.mmp Mon May 03 13:32:15 2010 +0300 @@ -25,13 +25,13 @@ VENDORID VID_DEFAULT -SOURCEPATH ../../src/fileloader/src +SOURCEPATH ../../src/FileLoader/src SOURCE fileloader_cfileloader.cpp SOURCE fileloader_cfilehandler.cpp SOURCE fileloader_csaveddeckhandler.cpp USERINCLUDE ../../src/urlloader/include -USERINCLUDE ../../src/fileloader/include +USERINCLUDE ../../src/FileLoader/include USERINCLUDE ../../src/utils/include diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/wmlengine/group/gdi/gdi.mmp --- a/webengine/wmlengine/group/gdi/gdi.mmp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/wmlengine/group/gdi/gdi.mmp Mon May 03 13:32:15 2010 +0300 @@ -37,21 +37,21 @@ USERINCLUDE . USERINCLUDE ../../src/gdi/include USERINCLUDE ../../src/htmlp/include -USERINCLUDE ../../src/mvc/include +USERINCLUDE ../../src/MVC/include USERINCLUDE ../../src/object/include -USERINCLUDE ../../src/system/include +USERINCLUDE ../../src/System/include USERINCLUDE ../../src/text/include USERINCLUDE ../../src/browser/include USERINCLUDE ../../src/hed/include -USERINCLUDE ../../src/evt/include +USERINCLUDE ../../src/Evt/include USERINCLUDE ../../src/lmgr/include USERINCLUDE ../../src/image/include USERINCLUDE ../../src/adt/include USERINCLUDE ../../src/wml/include USERINCLUDE ../../src/wml/src USERINCLUDE ../../src/wmlcontrol/include -USERINCLUDE ../../../OssWebengine/MemoryManager/Inc -USERINCLUDE ../../../PageScaler/Inc +USERINCLUDE ../../../osswebengine/MemoryManager/Inc +USERINCLUDE ../../../pagescaler/inc SYSTEMINCLUDE ../../src/urlloader/include SYSTEMINCLUDE ../../src/utils/include diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/wmlengine/group/hed/hed.mmp --- a/webengine/wmlengine/group/hed/hed.mmp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/wmlengine/group/hed/hed.mmp Mon May 03 13:32:15 2010 +0300 @@ -36,7 +36,7 @@ SOURCE HEDDocumentRoot.cpp SOURCE DomHelper.c SOURCE DomTree.c -SOURCE DomVisitor.c +SOURCE DOMVisitor.c SOURCE EntitySet.c SOURCE HEDEventHandler.cpp SOURCE HistoryEntry.c @@ -54,7 +54,7 @@ SOURCE UrlResponse.c -SOURCE ContentLoader.cpp +SOURCE contentLoader.cpp SOURCE TextReverse.cpp SOURCE urlloader_urlresponse.cpp @@ -63,17 +63,17 @@ USERINCLUDE . USERINCLUDE ../../src/utils/include USERINCLUDE ../../src/adt/include -USERINCLUDE ../../src/evt/include +USERINCLUDE ../../src/Evt/include USERINCLUDE ../../src/htmlp/include USERINCLUDE ../../src/gdi/include USERINCLUDE ../../src/hed/include -USERINCLUDE ../../src/msg/include +USERINCLUDE ../../src/Msg/include USERINCLUDE ../../src/markup/include USERINCLUDE ../../src/image/include -USERINCLUDE ../../src/imagech/include +USERINCLUDE ../../src/ImageCH/include USERINCLUDE ../../src/lmgr/include USERINCLUDE ../../src/object/include -USERINCLUDE ../../src/system/include +USERINCLUDE ../../src/System/include USERINCLUDE ../../src/text/include USERINCLUDE ../../src/MVC/include USERINCLUDE ../../src/wml1x/include diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/wmlengine/group/image/image.mmp --- a/webengine/wmlengine/group/image/image.mmp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/wmlengine/group/image/image.mmp Mon May 03 13:32:15 2010 +0300 @@ -85,22 +85,22 @@ USERINCLUDE . USERINCLUDE ../../src/adt/include -USERINCLUDE ../../src/evt/include +USERINCLUDE ../../src/Evt/include USERINCLUDE ../../src/gdi/include USERINCLUDE ../../src/hed/include USERINCLUDE ../../src/htmlp/include USERINCLUDE ../../src/markup/include USERINCLUDE ../../src/image/include -USERINCLUDE ../../src/imagech/include +USERINCLUDE ../../src/ImageCH/include USERINCLUDE ../../src/lmgr/include USERINCLUDE ../../src/fbox/include USERINCLUDE ../../src/object/include -USERINCLUDE ../../src/system/include +USERINCLUDE ../../src/System/include USERINCLUDE ../../src/text/include USERINCLUDE ../../src/wml/src USERINCLUDE ../../src/wml/include -USERINCLUDE ../../src/mvc/include -USERINCLUDE ../../src/msg/include +USERINCLUDE ../../src/MVC/include +USERINCLUDE ../../src/Msg/include USERINCLUDE ../../src/wmlcontrol/include diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/wmlengine/group/imagech/imagech.mmp --- a/webengine/wmlengine/group/imagech/imagech.mmp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/wmlengine/group/imagech/imagech.mmp Mon May 03 13:32:15 2010 +0300 @@ -20,7 +20,7 @@ TARGET imagech.lib TARGETTYPE lib -SOURCEPATH ../../src/imagech/src/ +SOURCEPATH ../../src/ImageCH/src/ CAPABILITY CAP_GENERAL_DLL @@ -34,16 +34,16 @@ #include "../webkitcommon.mmpi" USERINCLUDE ../../src/adt/include -USERINCLUDE ../../src/evt/include +USERINCLUDE ../../src/Evt/include USERINCLUDE ../../src/gdi/include USERINCLUDE ../../src/hed/include USERINCLUDE ../../src/htmlp/include USERINCLUDE ../../src/markup/include USERINCLUDE ../../src/image/include -USERINCLUDE ../../src/imagech/include +USERINCLUDE ../../src/ImageCH/include USERINCLUDE ../../src/lmgr/include USERINCLUDE ../../src/object/include -USERINCLUDE ../../src/system/include +USERINCLUDE ../../src/System/include USERINCLUDE ../../src/text/include USERINCLUDE ../../src/fbox/include USERINCLUDE ../../src/wml1x/include @@ -51,8 +51,8 @@ USERINCLUDE ../../src/browser/include USERINCLUDE ../../src/wml/src USERINCLUDE ../../src/wml/include -USERINCLUDE ../../src/mvc/include -USERINCLUDE ../../src/msg/include +USERINCLUDE ../../src/MVC/include +USERINCLUDE ../../src/Msg/include SYSTEMINCLUDE ../../src/urlloader/include SYSTEMINCLUDE ../../src/utils/include diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/wmlengine/group/lmgr/lmgr.mmp --- a/webengine/wmlengine/group/lmgr/lmgr.mmp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/wmlengine/group/lmgr/lmgr.mmp Mon May 03 13:32:15 2010 +0300 @@ -90,7 +90,7 @@ USERINCLUDE . USERINCLUDE ../../src/adt/include -USERINCLUDE ../../src/evt/include +USERINCLUDE ../../src/Evt/include USERINCLUDE ../../src/fbox/include USERINCLUDE ../../src/gdi/include USERINCLUDE ../../src/hed/include @@ -98,14 +98,14 @@ USERINCLUDE ../../src/image/include USERINCLUDE ../../src/lmgr/include USERINCLUDE ../../src/object/include -USERINCLUDE ../../src/system/include +USERINCLUDE ../../src/System/include USERINCLUDE ../../src/text/include USERINCLUDE ../../src/wml/src USERINCLUDE ../../src/wml/include USERINCLUDE ../../src/css/include USERINCLUDE ../../src/markup/include -USERINCLUDE ../../src/mvc/include -USERINCLUDE ../../src/msg/include +USERINCLUDE ../../src/MVC/include +USERINCLUDE ../../src/Msg/include USERINCLUDE ../../src/utils/include SYSTEMINCLUDE ../../src/utils/include diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/wmlengine/group/markup/markup.mmp --- a/webengine/wmlengine/group/markup/markup.mmp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/wmlengine/group/markup/markup.mmp Mon May 03 13:32:15 2010 +0300 @@ -45,19 +45,19 @@ USERINCLUDE ../../src/fbox/include USERINCLUDE ../../src/gdi/include USERINCLUDE ../../src/hed/include -USERINCLUDE ../../src/imageCH/include +USERINCLUDE ../../src/ImageCH/include USERINCLUDE ../../src/image/include USERINCLUDE ../../src/lmgr/include USERINCLUDE ../../src/markup/include USERINCLUDE ../../src/object/include -USERINCLUDE ../../src/scrolling/inc -USERINCLUDE ../../src/system/include +USERINCLUDE ../../src/Scrolling/inc +USERINCLUDE ../../src/System/include USERINCLUDE ../../src/text/include USERINCLUDE ../../src/wmlscriptch/include USERINCLUDE ../../src/wml/src USERINCLUDE ../../src/wml/include -USERINCLUDE ../../src/mvc/include -USERINCLUDE ../../src/msg/include +USERINCLUDE ../../src/MVC/include +USERINCLUDE ../../src/Msg/include SYSTEMINCLUDE ../../src/urlloader/include diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/wmlengine/group/system/system.mmp --- a/webengine/wmlengine/group/system/system.mmp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/wmlengine/group/system/system.mmp Mon May 03 13:32:15 2010 +0300 @@ -20,7 +20,7 @@ TARGET System.lib TARGETTYPE lib -SOURCEPATH ../../src/system/src/ +SOURCEPATH ../../src/System/src/ CAPABILITY CAP_GENERAL_DLL VENDORID VID_DEFAULT @@ -33,12 +33,12 @@ #include "../webkitcommon.mmpi" USERINCLUDE . -USERINCLUDE ../../src/Object/include -USERINCLUDE ../../src/mvc/include -USERINCLUDE ../../src/system/include +USERINCLUDE ../../src/object/include +USERINCLUDE ../../src/MVC/include +USERINCLUDE ../../src/System/include USERINCLUDE ../../src/utils/include USERINCLUDE ../../src/hed/include -USERINCLUDE ../../src/msg/include +USERINCLUDE ../../src/Msg/include USERINCLUDE ../../src/wml/include USERINCLUDE ../../src/markup/include USERINCLUDE ../../src/wmlcontrol/include diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/wmlengine/group/urlloader/urlloader.mmp --- a/webengine/wmlengine/group/urlloader/urlloader.mmp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/wmlengine/group/urlloader/urlloader.mmp Mon May 03 13:32:15 2010 +0300 @@ -40,11 +40,11 @@ //USERINCLUDE ../../src/httploader/include //USERINCLUDE ../../src/httploader/src -USERINCLUDE ../../src/fileloader/include +USERINCLUDE ../../src/FileLoader/include USERINCLUDE ../../src/urlloader/include USERINCLUDE ../../src/wml/src USERINCLUDE ../../src/wml/include -USERINCLUDE ../../src/mvc/include +USERINCLUDE ../../src/MVC/include USERINCLUDE ../../src/utils/include USERINCLUDE ../../src/wmlcontrol/include diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/wmlengine/group/webkitcommon.mmpi --- a/webengine/wmlengine/group/webkitcommon.mmpi Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/wmlengine/group/webkitcommon.mmpi Mon May 03 13:32:15 2010 +0300 @@ -29,12 +29,12 @@ USERINCLUDE ../../pagescaler/inc USERINCLUDE ../../webkitutils/HistoryProvider -USERINCLUDE ../../osswebengine/WebKit/s60/WebView -USERINCLUDE ../../osswebengine/WEBCORE/bridge/symbian -USERINCLUDE ../../osswebengine/WEBCORE/platform -USERINCLUDE ../../osswebengine/WEBCORE/platform/network/symbian -USERINCLUDE ../../osswebengine/WEBCORE/ForwardingHeaders -USERINCLUDE ../../osswebengine/WEBCORE/ForwardingHeaders/wtf -USERINCLUDE ../../osswebengine/WEBCORE/loader +USERINCLUDE ../../osswebengine/WebKit/s60/webview +USERINCLUDE ../../osswebengine/WebCore/bridge/symbian +USERINCLUDE ../../osswebengine/WebCore/platform +USERINCLUDE ../../osswebengine/WebCore/platform/network/symbian +USERINCLUDE ../../osswebengine/WebCore/ForwardingHeaders +USERINCLUDE ../../osswebengine/WebCore/ForwardingHeaders/wtf +USERINCLUDE ../../osswebengine/WebCore/loader USERINCLUDE ../../osswebengine/JavaScriptCore diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/wmlengine/group/wml/wml.mmp --- a/webengine/wmlengine/group/wml/wml.mmp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/wmlengine/group/wml/wml.mmp Mon May 03 13:32:15 2010 +0300 @@ -38,7 +38,7 @@ SOURCE wml_decoder.c SOURCE wml_event.c SOURCE wml_head.c -SOURCE WMLHistory.cpp +SOURCE WMLhistory.cpp SOURCE wml_input_validation.c SOURCE wml_intrinsic_event.c SOURCE wml_list.c @@ -61,24 +61,24 @@ #include "../webkitcommon.mmpi" USERINCLUDE ../../src/wml/src -USERINCLUDE ../../src/Wml/include +USERINCLUDE ../../src/wml/include USERINCLUDE ../../src/urlloader/include USERINCLUDE ../../src/script/include USERINCLUDE ../../src/utils/include USERINCLUDE ../../src/image/include USERINCLUDE ../../src/adt/include -USERINCLUDE ../../src/mvc/include +USERINCLUDE ../../src/MVC/include USERINCLUDE ../../src/htmlp/include -USERINCLUDE ../../src/evt/include +USERINCLUDE ../../src/Evt/include USERINCLUDE ../../src/fbox/include USERINCLUDE ../../src/gdi/include USERINCLUDE ../../src/hed/include USERINCLUDE ../../src/lmgr/include USERINCLUDE ../../src/markup/include -USERINCLUDE ../../src/msg/include +USERINCLUDE ../../src/Msg/include USERINCLUDE ../../src/object/include -USERINCLUDE ../../src/system/include +USERINCLUDE ../../src/System/include USERINCLUDE ../../src/text/include USERINCLUDE ../../src/Unicode/include USERINCLUDE ../../src/wml1x/include @@ -88,7 +88,7 @@ SYSTEMINCLUDE ../../src/utils/include SYSTEMINCLUDE ../../src/urlloader/include -SYSTEMINCLUDE ../../src/Wml/include +SYSTEMINCLUDE ../../src/wml/include SYSTEMINCLUDE ../../../osswebengine/MemoryManager/Inc MW_LAYER_SYSTEMINCLUDE MW_LAYER_LIBC_SYSTEMINCLUDE diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/wmlengine/group/wml1x/wml1x.mmp --- a/webengine/wmlengine/group/wml1x/wml1x.mmp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/wmlengine/group/wml1x/wml1x.mmp Mon May 03 13:32:15 2010 +0300 @@ -38,7 +38,7 @@ SOURCE WML1XApi.cpp SOURCE WML1XContentHandler.cpp -SOURCE wml1xEntitySet.c +SOURCE Wml1xEntitySet.c SOURCE WML1XEventHandler.cpp SOURCE WML1XFormLiaison.cpp SOURCE Epoc32Wml1xActiveEvent.cpp @@ -59,14 +59,14 @@ USERINCLUDE ../../src/lmgr/include USERINCLUDE ../../src/markup/include USERINCLUDE ../../src/object/include -USERINCLUDE ../../src/system/include +USERINCLUDE ../../src/System/include USERINCLUDE ../../src/text/include USERINCLUDE ../../src/wml1x/include USERINCLUDE ../../src/wmlscriptch/include USERINCLUDE ../../src/wml/src USERINCLUDE ../../src/wml/include USERINCLUDE ../../src/MVC/include -USERINCLUDE ../../src/msg/include +USERINCLUDE ../../src/Msg/include USERINCLUDE ../../src/wmlcontrol/include USERINCLUDE ../../src/utils/include diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/wmlengine/group/wmlengine/mvc.mmpi --- a/webengine/wmlengine/group/wmlengine/mvc.mmpi Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/wmlengine/group/wmlengine/mvc.mmpi Mon May 03 13:32:15 2010 +0300 @@ -19,7 +19,7 @@ #include "../webkitcommon.mmpi" -SOURCEPATH ../../src/mvc/src +SOURCEPATH ../../src/MVC/src SOURCE ILoadListener.c SOURCE MVCShell.cpp @@ -35,26 +35,26 @@ USERINCLUDE ../../src/adt/include USERINCLUDE ../../src/wmlcontrol/include USERINCLUDE ../../src/css/include -USERINCLUDE ../../src/evt/include +USERINCLUDE ../../src/Evt/include USERINCLUDE ../../src/fbox/include USERINCLUDE ../../src/gdi/include USERINCLUDE ../../src/hed/include USERINCLUDE ../../src/image/include -USERINCLUDE ../../src/imagech/include +USERINCLUDE ../../src/ImageCH/include USERINCLUDE ../../src/lmgr/include USERINCLUDE ../../src/markup/include USERINCLUDE ../../src/Msg/include -USERINCLUDE ../../src/mvc/include +USERINCLUDE ../../src/MVC/include USERINCLUDE ../../src/object/include USERINCLUDE ../../src/text/include -USERINCLUDE ../../src/system/include +USERINCLUDE ../../src/System/include USERINCLUDE ../../src/wml1x/include USERINCLUDE ../../src/browser/include USERINCLUDE ../../src/wmlscriptch/include USERINCLUDE ../../src/xhtml/include USERINCLUDE ../../src/urlloader/include //USERINCLUDE /S60/mw/web/WebEngine/WmlEngine/src/wml/include -USERINCLUDE ../../src/fileloader/include +USERINCLUDE ../../src/FileLoader/include //USERINCLUDE ../../MemoryManager/Inc //SYSTEMINCLUDE ../WmlEngine/urlloader/include diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/wmlengine/group/wmlengine/utils.mmp --- a/webengine/wmlengine/group/wmlengine/utils.mmp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/wmlengine/group/wmlengine/utils.mmp Mon May 03 13:32:15 2010 +0300 @@ -58,7 +58,7 @@ SOURCE nwx_url_utils.c SOURCE nwx_time_epoc32.c SOURCE StringUtils.cpp -SOURCE util_CDispatcherEng.cpp +SOURCE util_cdispatchereng.cpp SOURCE ucs2_transformation_epoc32.c SOURCE CReferrerHelper.cpp SOURCE FileNameUtils.cpp diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/wmlengine/group/wmlengine/wmlengine.mmp --- a/webengine/wmlengine/group/wmlengine/wmlengine.mmp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/wmlengine/group/wmlengine/wmlengine.mmp Mon May 03 13:32:15 2010 +0300 @@ -32,7 +32,7 @@ #if defined(WINSCW) -deffile ../Bwinscw/WmlEngine.def +deffile ../BWINSCW/WmlEngine.def #elif defined(ARMCC) deffile ../EABI/WmlEngine.def #endif @@ -74,7 +74,7 @@ //-- USERINCLUDE ../../src/utils/include -USERINCLUDE ../../src/scrolling/inc +USERINCLUDE ../../src/Scrolling/inc USERINCLUDE ../../src/script/include USERINCLUDE ../../src/script/src USERINCLUDE ../../src/htmlp/include diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/wmlengine/group/wmlscriptch/wmlscriptch.mmp --- a/webengine/wmlengine/group/wmlscriptch/wmlscriptch.mmp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/wmlengine/group/wmlscriptch/wmlscriptch.mmp Mon May 03 13:32:15 2010 +0300 @@ -30,8 +30,8 @@ SOURCEPATH ../../src/wmlscriptch/src/ -SOURCE iwmlBrowserLib.c -SOURCE iwmlScriptListener.c +SOURCE IWmlBrowserLib.c +SOURCE IWmlScriptListener.c SOURCE WMLSCRIPTCHScrProxyApi.cpp SOURCE WMLSCRIPTCHContentHandler.cpp @@ -50,11 +50,11 @@ USERINCLUDE ../../src/wmlscriptch/include USERINCLUDE ../../src/wml/src USERINCLUDE ../../src/wml/include -USERINCLUDE ../../src/mvc/include -USERINCLUDE ../../src/msg/include +USERINCLUDE ../../src/MVC/include +USERINCLUDE ../../src/Msg/include USERINCLUDE ../../src/utils/include -USERINCLUDE ../../../osswebengine/MemoryManager/inc +USERINCLUDE ../../../osswebengine/MemoryManager/Inc SYSTEMINCLUDE ../../src/utils/include SYSTEMINCLUDE ../../src/urlloader/include diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/wmlengine/group/xhtml/xhtml.mmp --- a/webengine/wmlengine/group/xhtml/xhtml.mmp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/wmlengine/group/xhtml/xhtml.mmp Mon May 03 13:32:15 2010 +0300 @@ -32,49 +32,49 @@ #include "../webkitcommon.mmpi" -SOURCE structure/XHTMLHeadElementHandler.cpp -SOURCE structure/XHTMLStructureModule.cpp -SOURCE structure/XHTMLTitleElementHandler.cpp +SOURCE Structure/XHTMLHeadElementHandler.cpp +SOURCE Structure/XHTMLStructureModule.cpp +SOURCE Structure/XHTMLTitleElementHandler.cpp //SOURCE structure/scriptElementHandler.cpp -SOURCE structure/noscriptElementHandler.cpp -SOURCE text/XHTMLBrElementHandler.cpp -SOURCE text/XHTMLCoreTextElementHandler.cpp -SOURCE text/XHTMLHrElementHandler.cpp -SOURCE text/XHTMLQElementHandler.cpp -SOURCE text/XHTMLTextModule1.cpp -SOURCE text/XHTMLTextModule2.cpp -SOURCE hypertext/XHTMLAElementHandler.cpp -SOURCE hypertext/XHTMLHypertextModule.cpp -SOURCE basicforms/XHTMLBasicFormsModule.cpp -SOURCE basicforms/XHTMLFormElementHandler.cpp -SOURCE basicforms/XHTMLInputElementHandler.cpp -SOURCE basicforms/XHTMLLabelElementHandler.cpp -SOURCE basicforms/XHTMLOptionElementHandler.cpp -SOURCE basicforms/XHTMLSelectElementHandler.cpp -SOURCE basicforms/XHTMLTextareaElementHandler.cpp -SOURCE basicforms/XHTMLControlSet.cpp -SOURCE basicforms/XHTMLFormLiaison.cpp -SOURCE basictables/XHTMLBasicTablesModule.cpp -SOURCE basictables/XHTMLCaptionElementHandler.cpp -SOURCE basictables/XHTMLCellElementHandler.cpp -SOURCE basictables/XHTMLRowgroupElementHandler.cpp -SOURCE basictables/XHTMLTableElementHandler.cpp -SOURCE basictables/XHTMLTableElementHandlerOOC.cpp -SOURCE basictables/XHTMLTrElementHandler.cpp -SOURCE image/areaElementHandler.cpp -SOURCE image/XHTMLImageModule.cpp -SOURCE image/imgElementHandler.cpp -SOURCE image/mapElementHandler.cpp -SOURCE image/MapElementList.cpp -SOURCE image/ImageMapPopup.cpp -SOURCE metainformation/XHTMLMetaElementHandler.cpp -SOURCE metainformation/XHTMLMetaInformationModule.cpp -SOURCE link/XHTMLLinkElementHandler.cpp -SOURCE link/XHTMLLinkModule.cpp -SOURCE base/XHTMLBASEElementHandler.cpp -SOURCE base/XHTMLBaseModule.cpp -SOURCE style/XHTMLStyleElementHandler.cpp -SOURCE style/XHTMLStyleModule.cpp +SOURCE Structure/noscriptElementHandler.cpp +SOURCE Text/XHTMLBrElementHandler.cpp +SOURCE Text/XHTMLCoreTextElementHandler.cpp +SOURCE Text/XHTMLHrElementHandler.cpp +SOURCE Text/XHTMLQElementHandler.cpp +SOURCE Text/XHTMLTextModule1.cpp +SOURCE Text/XHTMLTextModule2.cpp +SOURCE Hypertext/XHTMLAElementHandler.cpp +SOURCE Hypertext/XHTMLHypertextModule.cpp +SOURCE BasicForms/XHTMLBasicFormsModule.cpp +SOURCE BasicForms/XHTMLFormElementHandler.cpp +SOURCE BasicForms/XHTMLInputElementHandler.cpp +SOURCE BasicForms/XHTMLLabelElementHandler.cpp +SOURCE BasicForms/XHTMLOptionElementHandler.cpp +SOURCE BasicForms/XHTMLSelectElementHandler.cpp +SOURCE BasicForms/XHTMLTextareaElementHandler.cpp +SOURCE BasicForms/XHTMLControlSet.cpp +SOURCE BasicForms/XHTMLFormLiaison.cpp +SOURCE BasicTables/XHTMLBasicTablesModule.cpp +SOURCE BasicTables/XHTMLCaptionElementHandler.cpp +SOURCE BasicTables/XHTMLCellElementHandler.cpp +SOURCE BasicTables/XHTMLRowgroupElementHandler.cpp +SOURCE BasicTables/XHTMLTableElementHandler.cpp +SOURCE BasicTables/XHTMLTableElementHandlerOOC.cpp +SOURCE BasicTables/XHTMLTrElementHandler.cpp +SOURCE Image/areaElementHandler.cpp +SOURCE Image/XHTMLImageModule.cpp +SOURCE Image/imgElementHandler.cpp +SOURCE Image/mapElementHandler.cpp +SOURCE Image/MapElementList.cpp +SOURCE Image/ImageMapPopup.cpp +SOURCE MetaInformation/XHTMLMetaElementHandler.cpp +SOURCE MetaInformation/XHTMLMetaInformationModule.cpp +SOURCE Link/XHTMLLinkElementHandler.cpp +SOURCE Link/XHTMLLinkModule.cpp +SOURCE Base/XHTMLBaseElementHandler.cpp +SOURCE Base/XHTMLBaseModule.cpp +SOURCE Style/XHTMLStyleElementHandler.cpp +SOURCE Style/XHTMLStyleModule.cpp SOURCE XHTMLAttributePropertyTable.cpp SOURCE XHTMLPiElementHandler.cpp SOURCE SaveToPhoneBkEvent.c @@ -85,10 +85,10 @@ SOURCE XHTMLContentHandler.cpp SOURCE XHTMLEpoc32ContentHandler.cpp SOURCE XHTMLEntitySet.c -SOURCE frame/XHTMLFramesetElementHandler.cpp -SOURCE frame/XHTMLFrameModule.cpp -SOURCE frame/XHTMLFrameElementHandler.cpp -SOURCE ignore/XHTMLIgnoreElementHandler.cpp +SOURCE Frame/XHTMLFramesetElementHandler.cpp +SOURCE Frame/XHTMLFrameModule.cpp +SOURCE Frame/XHTMLFrameElementHandler.cpp +SOURCE Ignore/XHTMLIgnoreElementHandler.cpp SOURCE XHTMLMessageListener.cpp @@ -105,10 +105,10 @@ USERINCLUDE ../../src/lmgr/include USERINCLUDE ../../src/markup/include USERINCLUDE ../../src/Msg/include -USERINCLUDE ../../src/mvc/include +USERINCLUDE ../../src/MVC/include USERINCLUDE ../../src/object/include -USERINCLUDE ../../src/scrolling/inc -USERINCLUDE ../../src/system/include +USERINCLUDE ../../src/Scrolling/inc +USERINCLUDE ../../src/System/include USERINCLUDE ../../src/text/include USERINCLUDE ../../src/wmlscriptch/include USERINCLUDE ../../src/xhtml/include diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/wmlengine/src/Evt/include/nw_evt_fontsizechangeeventi.h --- a/webengine/wmlengine/src/Evt/include/nw_evt_fontsizechangeeventi.h Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/wmlengine/src/Evt/include/nw_evt_fontsizechangeeventi.h Mon May 03 13:32:15 2010 +0300 @@ -20,7 +20,7 @@ #define NW_EVT_FONTSIZECHANGEEVENTI_H #include "nw_evt_eventi.h" -#include "nw_evt_FontSizeChangeevent.h" +#include "nw_evt_fontsizechangeevent.h" #include "BrsrStatusCodes.h" #ifdef __cplusplus diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/wmlengine/src/FileLoader/src/fileloader_cfilehandler.cpp --- a/webengine/wmlengine/src/FileLoader/src/fileloader_cfilehandler.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/wmlengine/src/FileLoader/src/fileloader_cfilehandler.cpp Mon May 03 13:32:15 2010 +0300 @@ -23,7 +23,7 @@ #include #include #include -#include +#include #include "fileloader_cfilehandler.h" #include "fileloader_cfileloader.h" diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/wmlengine/src/FileLoader/src/fileloader_cfileloader.cpp --- a/webengine/wmlengine/src/FileLoader/src/fileloader_cfileloader.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/wmlengine/src/FileLoader/src/fileloader_cfileloader.cpp Mon May 03 13:32:15 2010 +0300 @@ -21,7 +21,7 @@ #include #include #include "nwx_http_defs.h" -#include "fileloader_CFileLoader.h" +#include "fileloader_cfileloader.h" #include "urlloader_loaderutils.h" #include "fileloader_cfilehandler.h" diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/wmlengine/src/ImageCH/src/Epoc32ImageContentHandler.cpp --- a/webengine/wmlengine/src/ImageCH/src/Epoc32ImageContentHandler.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/wmlengine/src/ImageCH/src/Epoc32ImageContentHandler.cpp Mon May 03 13:32:15 2010 +0300 @@ -24,7 +24,7 @@ #include "nw_lmgr_imgcontainerbox.h" #include "nw_wml1x_wml1xcontenthandler.h" #include "nw_wml1x_wml1xdefaultstylesheet.h" -#include "GDIDeviceContext.h" +#include "GDIDevicecontext.h" #include "nw_imagech_epoc32contenthandleri.h" #include "nwx_http_defs.h" #include "nw_lmgr_animatedimagebox.h" @@ -33,7 +33,7 @@ #include "HEDDocumentListener.h" #include "nw_lmgr_rootbox.h" #include "nw_image_epoc32simpleimage.h" -#include "epoc32imagedecoder.h" +#include "Epoc32ImageDecoder.h" #include "nw_lmgr_statictablecellbox.h" #include "nwx_logger.h" #include "nwx_settings.h" diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/wmlengine/src/MVC/include/MVCShell.h --- a/webengine/wmlengine/src/MVC/include/MVCShell.h Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/wmlengine/src/MVC/include/MVCShell.h Mon May 03 13:32:15 2010 +0300 @@ -46,9 +46,9 @@ #include "urlloader_urlresponse.h" #include "EmbeddedDocExitObserver.h" //R -#include "historystack.h" +#include "HistoryStack.h" //#include "webkitview.h" -#include "wmlcontrol.h" +#include "WmlControl.h" #ifdef __SERIES60_WIM diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/wmlengine/src/MVC/include/MVCView.h --- a/webengine/wmlengine/src/MVC/include/MVCView.h Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/wmlengine/src/MVC/include/MVCView.h Mon May 03 13:32:15 2010 +0300 @@ -29,8 +29,8 @@ #include #include #include -#include -#include +#include +#include #include #include @@ -47,7 +47,7 @@ #include "pagescaler.h" -#include "wmlcontrol.h" +#include "WmlControl.h" template class CArrayPtrFlat; // CONSTANTS diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/wmlengine/src/MVC/src/MVCScroll.cpp --- a/webengine/wmlengine/src/MVC/src/MVCScroll.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/wmlengine/src/MVC/src/MVCScroll.cpp Mon May 03 13:32:15 2010 +0300 @@ -30,7 +30,7 @@ #include "nw_lmgr_simplepropertylist.h" #include "nw_lmgr_rootbox.h" #include "nwx_logger.h" -#include "GDIDeviceContext.h" +#include "GDIDevicecontext.h" #include "nw_lmgr_areabox.h" #include "nw_evt_scrollevent.h" diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/wmlengine/src/MVC/src/MVCShell.cpp --- a/webengine/wmlengine/src/MVC/src/MVCShell.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/wmlengine/src/MVC/src/MVCShell.cpp Mon May 03 13:32:15 2010 +0300 @@ -21,13 +21,13 @@ #include #include #include -#include +#include #include #include #include #include -#include -#include +#include +#include #include #include #include @@ -36,16 +36,16 @@ #include #include "Oma2Agent.h" -#include "brctl.h" -#include "brctldefs.h" +#include "BrCtl.h" +#include "BrCtlDefs.h" #include "BrsrStatusCodes.h" #include "MVCShell.h" -#include "contentloader.h" -#include "GDIDeviceContext.h" -#include "kimonolocalizationstrings.h" +#include "contentLoader.h" +#include "GDIDevicecontext.h" +#include "KimonoLocalizationStrings.h" #include "MVCView.h" -#include "nw_adt_resizableVector.h" +#include "nw_adt_resizablevector.h" #include "nw_browser_browsermimetable.h" #include "nw_evlog_api.h" #include "nw_hed_appservices.h" @@ -83,7 +83,7 @@ #include "nwx_string.h" #include "nwx_time.h" #include "nwx_ui_callbacks_register.h" -#include "stringutils.h" +#include "StringUtils.h" #include "urlloader_loaderutils.h" #include "urlloader_urlloaderint.h" #include "urlloader_urlloaderI.h" diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/wmlengine/src/MVC/src/MVCView.cpp --- a/webengine/wmlengine/src/MVC/src/MVCView.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/wmlengine/src/MVC/src/MVCView.cpp Mon May 03 13:32:15 2010 +0300 @@ -25,17 +25,17 @@ #include #include #include -#include +#include #include #include #include #include -#include +#include #include -#include - -#include +#include + +#include #include #include "BoxFormatHandler.h" @@ -43,7 +43,7 @@ #include "BrCtl.h" #include "BrsrStatusCodes.h" #include "CBrowserSettings.h" -#include "GDIDeviceContext.h" +#include "GDIDevicecontext.h" #include "LMgrMarkerText.h" #include "LMgrMarkerImage.h" #include "LMgrAnonBlock.h" @@ -73,7 +73,7 @@ #include "nw_fbox_formbox.h" #include "nw_fbox_formboxutils.h" #include "nw_fbox_checkbox.h" -#include "nw_fbox_WmlFormattedEditor.h" +#include "nw_fbox_wmlformattededitor.h" #include "nw_fbox_radiobox.h" #include "nw_fbox_epoc32inputskin.h" #include "nw_fbox_selectbox.h" @@ -116,7 +116,7 @@ #include "TEncodingMapping.h" #include "urlloader_urlloaderint.h" -#include +#include #include "BrCtlDialogsProvider.h" #include "HistoryController.h" diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/wmlengine/src/css/include/CSSParser.h --- a/webengine/wmlengine/src/css/include/CSSParser.h Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/wmlengine/src/css/include/CSSParser.h Mon May 03 13:32:15 2010 +0300 @@ -21,7 +21,7 @@ // INCLUDES #include "nw_object_dynamic.h" -#include "nw_css_export.h" +#include "NW_CSS_EXPORT.h" #include "CSSEventListener.h" #include "CSSReader.h" diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/wmlengine/src/css/include/nw_css_processor.h --- a/webengine/wmlengine/src/css/include/nw_css_processor.h Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/wmlengine/src/css/include/nw_css_processor.h Mon May 03 13:32:15 2010 +0300 @@ -30,7 +30,7 @@ #include "nw_hed_iloadrecipient.h" #include "nw_image_iimageobserver.h" -#include "nw_css_export.h" +#include "NW_CSS_EXPORT.h" #include "nw_image_abstractimage.h" #include "nwx_osu_file.h" #include "BrsrStatusCodes.h" diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/wmlengine/src/css/include/nw_css_tokentoint.h --- a/webengine/wmlengine/src/css/include/nw_css_tokentoint.h Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/wmlengine/src/css/include/nw_css_tokentoint.h Mon May 03 13:32:15 2010 +0300 @@ -19,7 +19,7 @@ #ifndef NW_CSS_TOKENTOINT_H #define NW_CSS_TOKENTOINT_H -#include "nw_css_export.h" +#include "NW_CSS_EXPORT.h" #include "nw_object_base.h" #include "nw_lmgr_box.h" diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/wmlengine/src/css/src/CSSHandler.cpp --- a/webengine/wmlengine/src/css/src/CSSHandler.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/wmlengine/src/css/src/CSSHandler.cpp Mon May 03 13:32:15 2010 +0300 @@ -21,7 +21,7 @@ #include "CSSHandler.h" #include "nw_lmgr_simplepropertylist.h" #include "nw_hed_documentroot.h" -#include "nw_hed_CompositeContentHandler.h" +#include "nw_hed_compositecontenthandler.h" #include "nw_lmgr_statictablebox.h" #include "nw_fbox_inputbox.h" #include "HEDDocumentListener.h" diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/wmlengine/src/css/src/CSSImageList.cpp --- a/webengine/wmlengine/src/css/src/CSSImageList.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/wmlengine/src/css/src/CSSImageList.cpp Mon May 03 13:32:15 2010 +0300 @@ -23,7 +23,7 @@ #include "CSSImageList.h" #include "nw_text_ucs2.h" #include "nw_image_virtualimage.h" -#include "epoc32imagedecoder.h" +#include "Epoc32ImageDecoder.h" #include "nwx_multipart_generator.h" #include "nwx_string.h" #include "nwx_http_defs.h" diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/wmlengine/src/css/src/CSSProcessor.cpp --- a/webengine/wmlengine/src/css/src/CSSProcessor.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/wmlengine/src/css/src/CSSProcessor.cpp Mon May 03 13:32:15 2010 +0300 @@ -45,8 +45,8 @@ #include "nw_lmgr_statictablecellbox.h" #include "nwx_settings.h" #include "nwx_http_defs.h" -#include "GDIDeviceContext.h" -#include "BodyPart.h" +#include "GDIDevicecontext.h" +#include "bodypart.h" #include "nw_xhtml_xhtmlcontenthandler.h" #include "MVCShell.h" //#include "BrCtl.h" diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/wmlengine/src/css/src/CSSTokenToInt.cpp --- a/webengine/wmlengine/src/css/src/CSSTokenToInt.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/wmlengine/src/css/src/CSSTokenToInt.cpp Mon May 03 13:32:15 2010 +0300 @@ -24,7 +24,7 @@ #include #include #include "BrsrStatusCodes.h" -#include "aknutils.h" +#include "AknUtils.h" /* ------------------------------------------------------------------------- * private data type diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/wmlengine/src/fbox/include/nw_fbox_CEpoc32InputBox.h --- a/webengine/wmlengine/src/fbox/include/nw_fbox_CEpoc32InputBox.h Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/wmlengine/src/fbox/include/nw_fbox_CEpoc32InputBox.h Mon May 03 13:32:15 2010 +0300 @@ -20,7 +20,7 @@ #define CEPOC32INPUTBOX_H // INCLUDES -#include +#include #include #include #include @@ -28,7 +28,7 @@ #include #include #include -#include "nw_fbox_validator.h" +#include "NW_FBox_Validator.h" #include #include diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/wmlengine/src/fbox/include/nw_fbox_wmlformathandler.h --- a/webengine/wmlengine/src/fbox/include/nw_fbox_wmlformathandler.h Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/wmlengine/src/fbox/include/nw_fbox_wmlformathandler.h Mon May 03 13:32:15 2010 +0300 @@ -21,7 +21,7 @@ // INCLUDES -#include +#include // CONSTANTS diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/wmlengine/src/fbox/include/nw_fbox_wmlformattededitor.h --- a/webengine/wmlengine/src/fbox/include/nw_fbox_wmlformattededitor.h Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/wmlengine/src/fbox/include/nw_fbox_wmlformattededitor.h Mon May 03 13:32:15 2010 +0300 @@ -22,7 +22,7 @@ // INCLUDES #include #include -#include +#include #include #include #include @@ -30,7 +30,7 @@ #include #include -#include "nw_fbox_WmlFormatHandler.h" +#include "nw_fbox_wmlformathandler.h" // DATA TYPES diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/wmlengine/src/fbox/src/Epoc32ButtonBoxSkin.cpp --- a/webengine/wmlengine/src/fbox/src/Epoc32ButtonBoxSkin.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/wmlengine/src/fbox/src/Epoc32ButtonBoxSkin.cpp Mon May 03 13:32:15 2010 +0300 @@ -21,7 +21,7 @@ #include "nw_lmgr_rootbox.h" #include "nw_fbox_buttonbox.h" #include "nw_fbox_epoc32formimages.h" -#include "GDIDeviceContext.h" +#include "GDIDevicecontext.h" #include "nw_fbox_formboxutils.h" #include "BrsrStatusCodes.h" diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/wmlengine/src/fbox/src/Epoc32ImageButtonBoxSkin.cpp --- a/webengine/wmlengine/src/fbox/src/Epoc32ImageButtonBoxSkin.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/wmlengine/src/fbox/src/Epoc32ImageButtonBoxSkin.cpp Mon May 03 13:32:15 2010 +0300 @@ -23,7 +23,7 @@ #include "nw_fbox_epoc32formimages.h" #include "nw_fbox_formboxutils.h" #include "nw_image_epoc32cannedimage.h" -#include "GDIDeviceContext.h" +#include "GDIDevicecontext.h" #include "nw_lmgr_imgcontainerboxi.h" #include "nw_image_cannedimages.h" #include "BrsrStatusCodes.h" diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/wmlengine/src/fbox/src/Epoc32InputSkin.cpp --- a/webengine/wmlengine/src/fbox/src/Epoc32InputSkin.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/wmlengine/src/fbox/src/Epoc32InputSkin.cpp Mon May 03 13:32:15 2010 +0300 @@ -34,7 +34,7 @@ #include "nw_lmgr_textbox.h" #include "nw_lmgr_rootbox.h" #include "LMgrBoxTreeListener.h" -#include "GDIDeviceContext.h" +#include "GDIDevicecontext.h" #include "nw_fbox_formboxutils.h" #include "BrsrStatusCodes.h" #include "nw_lmgr_statictablecellbox.h" diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/wmlengine/src/fbox/src/Epoc32SelectSkin.cpp --- a/webengine/wmlengine/src/fbox/src/Epoc32SelectSkin.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/wmlengine/src/fbox/src/Epoc32SelectSkin.cpp Mon May 03 13:32:15 2010 +0300 @@ -24,7 +24,7 @@ #include "nwx_string.h" #include "nw_fbox_epoc32formimages.h" #include "nw_gdi_types.h" -#include "GDIDeviceContext.h" +#include "GDIDevicecontext.h" #include "nw_adt_resizablevector.h" #include "nw_fbox_formboxutils.h" #include "KimonoLocalizationStrings.h" diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/wmlengine/src/fbox/src/FBOXButtonBox.cpp --- a/webengine/wmlengine/src/fbox/src/FBOXButtonBox.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/wmlengine/src/fbox/src/FBOXButtonBox.cpp Mon May 03 13:32:15 2010 +0300 @@ -24,7 +24,7 @@ #include "nw_evt_focusevent.h" #include "nw_evt_accesskeyevent.h" #include "nw_lmgr_rootbox.h" -#include "GDIDeviceContext.h" +#include "GDIDevicecontext.h" #include "KimonoLocalizationStrings.h" #include "BrsrStatusCodes.h" diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/wmlengine/src/fbox/src/FBOXButtonBoxSkin.cpp --- a/webengine/wmlengine/src/fbox/src/FBOXButtonBoxSkin.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/wmlengine/src/fbox/src/FBOXButtonBoxSkin.cpp Mon May 03 13:32:15 2010 +0300 @@ -19,7 +19,7 @@ #include "nw_fbox_buttonboxskini.h" #include "nw_fbox_buttonbox.h" #include "nw_lmgr_rootbox.h" -#include "GDIDeviceContext.h" +#include "GDIDevicecontext.h" #include "BrsrStatusCodes.h" /* ------------------------------------------------------------------------- */ diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/wmlengine/src/fbox/src/FBOXCEpoc32InputBox.cpp --- a/webengine/wmlengine/src/fbox/src/FBOXCEpoc32InputBox.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/wmlengine/src/fbox/src/FBOXCEpoc32InputBox.cpp Mon May 03 13:32:15 2010 +0300 @@ -17,19 +17,19 @@ // INCLUDE FILES -#include -#include -#include +#include +#include +#include #include "nw_fbox_CEpoc32InputBox.h" -#include "nw_fbox_WmlFormatHandler.h" +#include "nw_fbox_wmlformathandler.h" #include "nw_fbox_formboxutils.h" -#include "nw_fbox_WmlFormattedEditor.h" +#include "nw_fbox_wmlformattededitor.h" #include "nw_wml1x_wml_1_3_tokens.h" #include -#include -#include -#include +#include +#include +#include #include // for resource reader #include @@ -41,11 +41,11 @@ #include #include #include -#include "NW_Fbox_InputBox.h" -#include "NW_Fbox_inputskini.h" -#include "NW_Fbox_InputSkin.h" -#include "NW_Fbox_Epoc32InputSkin.h" -#include "NW_Fbox_textareabox.h" +#include "nw_fbox_inputbox.h" +#include "nw_fbox_inputskini.h" +#include "nw_fbox_inputskin.h" +#include "nw_fbox_epoc32inputskin.h" +#include "nw_fbox_textareabox.h" #include "BrsrStatusCodes.h" #include "eikon.hrh" diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/wmlengine/src/fbox/src/FBOXEpoc32InlineCheckBoxSkin.cpp --- a/webengine/wmlengine/src/fbox/src/FBOXEpoc32InlineCheckBoxSkin.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/wmlengine/src/fbox/src/FBOXEpoc32InlineCheckBoxSkin.cpp Mon May 03 13:32:15 2010 +0300 @@ -20,7 +20,7 @@ #include "nw_fbox_checkbox.h" #include "nw_fbox_epoc32formimages.h" -#include "GDIDeviceContext.h" +#include "GDIDevicecontext.h" #include "BrsrStatusCodes.h" /* ------------------------------------------------------------------------- */ diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/wmlengine/src/fbox/src/FBOXFileSelectionBoxSkin.cpp --- a/webengine/wmlengine/src/fbox/src/FBOXFileSelectionBoxSkin.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/wmlengine/src/fbox/src/FBOXFileSelectionBoxSkin.cpp Mon May 03 13:32:15 2010 +0300 @@ -18,7 +18,7 @@ // INCLUDE FILES -#include +#include #include #include #include diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/wmlengine/src/fbox/src/FBOXFormBoxUtils.cpp --- a/webengine/wmlengine/src/fbox/src/FBOXFormBoxUtils.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/wmlengine/src/fbox/src/FBOXFormBoxUtils.cpp Mon May 03 13:32:15 2010 +0300 @@ -20,7 +20,7 @@ #include "nwx_defs.h" #include "nwx_string.h" #include "nw_fbox_formbox.h" -#include "GDIDeviceContext.h" +#include "GDIDevicecontext.h" #include "BrsrStatusCodes.h" diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/wmlengine/src/fbox/src/FBOXImageButtonBox.cpp --- a/webengine/wmlengine/src/fbox/src/FBOXImageButtonBox.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/wmlengine/src/fbox/src/FBOXImageButtonBox.cpp Mon May 03 13:32:15 2010 +0300 @@ -24,7 +24,7 @@ #include "nw_evt_focusevent.h" #include "nw_evt_accesskeyevent.h" #include "nw_lmgr_rootbox.h" -#include "GDIDeviceContext.h" +#include "GDIDevicecontext.h" #include "nw_image_virtualimage.h" #include "BrsrStatusCodes.h" diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/wmlengine/src/fbox/src/FBOXImageButtonBoxSkin.cpp --- a/webengine/wmlengine/src/fbox/src/FBOXImageButtonBoxSkin.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/wmlengine/src/fbox/src/FBOXImageButtonBoxSkin.cpp Mon May 03 13:32:15 2010 +0300 @@ -21,7 +21,7 @@ #include "nw_lmgr_rootbox.h" #include "nw_image_epoc32cannedimage.h" #include "nwx_settings.h" -#include "GDIDeviceContext.h" +#include "GDIDevicecontext.h" #include "BrsrStatusCodes.h" const diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/wmlengine/src/fbox/src/FBOXInputBox.cpp --- a/webengine/wmlengine/src/fbox/src/FBOXInputBox.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/wmlengine/src/fbox/src/FBOXInputBox.cpp Mon May 03 13:32:15 2010 +0300 @@ -25,7 +25,7 @@ //#include "nw_fbox_passwordbox.h" #include "nw_hed_documentroot.h" #include "nw_fbox_formboxutils.h" -#include "GDIDeviceContext.h" +#include "GDIDevicecontext.h" #include "BrsrStatusCodes.h" #include "nw_wml1x_wml1xformliaison.h" #include "wml_elm_attr.h" diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/wmlengine/src/fbox/src/FBOXInputSkin.cpp --- a/webengine/wmlengine/src/fbox/src/FBOXInputSkin.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/wmlengine/src/fbox/src/FBOXInputSkin.cpp Mon May 03 13:32:15 2010 +0300 @@ -20,7 +20,7 @@ #include "nw_lmgr_rootbox.h" #include "nw_text_ucs2.h" #include "nw_fbox_inputbox.h" -#include "GDIDeviceContext.h" +#include "GDIDevicecontext.h" #include "BrsrStatusCodes.h" /* ------------------------------------------------------------------------- * private methods diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/wmlengine/src/fbox/src/FBOXSelectBox.cpp --- a/webengine/wmlengine/src/fbox/src/FBOXSelectBox.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/wmlengine/src/fbox/src/FBOXSelectBox.cpp Mon May 03 13:32:15 2010 +0300 @@ -33,7 +33,7 @@ #include "nw_adt_resizablevector.h" #include "nw_fbox_formboxutils.h" #include "nw_hed_documentroot.h" -#include "GDIDeviceContext.h" +#include "GDIDevicecontext.h" #include "BrsrStatusCodes.h" /* ------------------------------------------------------------------------- * diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/wmlengine/src/fbox/src/FBOXSelectSkin.cpp --- a/webengine/wmlengine/src/fbox/src/FBOXSelectSkin.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/wmlengine/src/fbox/src/FBOXSelectSkin.cpp Mon May 03 13:32:15 2010 +0300 @@ -19,7 +19,7 @@ #include "nw_fbox_selectskini.h" #include "nw_lmgr_rootbox.h" #include "nw_text_ucs2.h" -#include "GDIDeviceContext.h" +#include "GDIDevicecontext.h" #include "BrsrStatusCodes.h" /* ------------------------------------------------------------------------- * diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/wmlengine/src/fbox/src/FBOXSkin.cpp --- a/webengine/wmlengine/src/fbox/src/FBOXSkin.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/wmlengine/src/fbox/src/FBOXSkin.cpp Mon May 03 13:32:15 2010 +0300 @@ -21,7 +21,7 @@ #include "nw_fbox_formbox.h" #include "nwx_string.h" #include "nw_text_ucs2.h" -#include "GDIDeviceContext.h" +#include "GDIDevicecontext.h" #include "BrsrStatusCodes.h" static const NW_Ucs2 _NW_LMgr_Text_Truncate[] = {'.','.','.','\0'}; diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/wmlengine/src/fbox/src/FBOXWmlFormatHandler.cpp --- a/webengine/wmlengine/src/fbox/src/FBOXWmlFormatHandler.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/wmlengine/src/fbox/src/FBOXWmlFormatHandler.cpp Mon May 03 13:32:15 2010 +0300 @@ -17,8 +17,8 @@ // INCLUDE FILES -#include -#include "nw_fbox_WmlFormatHandler.h" +#include +#include "nw_fbox_wmlformathandler.h" #include "NW_Unicode_LetterOther.h" #include "NW_Unicode_LetterChina.h" #include "NW_Unicode_LetterThai.h" diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/wmlengine/src/fbox/src/FBOXWmlFormattedEditor.cpp --- a/webengine/wmlengine/src/fbox/src/FBOXWmlFormattedEditor.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/wmlengine/src/fbox/src/FBOXWmlFormattedEditor.cpp Mon May 03 13:32:15 2010 +0300 @@ -36,12 +36,12 @@ #include #include #include -#include +#include #include #include // User includes -#include "nw_fbox_WmlFormattedEditor.h" +#include "nw_fbox_wmlformattededitor.h" // CONSTANTS static const TInt KWmlDefaultTextColor = 215; ///< black (plain text) diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/wmlengine/src/gdi/src/GDIDeviceContext.cpp --- a/webengine/wmlengine/src/gdi/src/GDIDeviceContext.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/wmlengine/src/gdi/src/GDIDeviceContext.cpp Mon May 03 13:32:15 2010 +0300 @@ -18,7 +18,7 @@ // INCLUDE FILES #include // First to avoid NULL redefine warning (no #ifndef NULL). -#include "GDIDeviceContext.h" +#include "GDIDevicecontext.h" #include "nw_object_dynamici.h" #include "GDIFont.h" #include "nw_gdi_utils.h" @@ -27,7 +27,7 @@ #include #include "nwx_logger.h" #include "nwx_http_defs.h" -#include "MVCview.h" +#include "MVCView.h" #include #include #include @@ -36,11 +36,11 @@ #include #include #include -#include -#include +#include +#include #include #include "BrsrStatusCodes.h" -#include "FeatMgr.h" +#include "featmgr.h" #include #include diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/wmlengine/src/gdi/src/GDIFont.cpp --- a/webengine/wmlengine/src/gdi/src/GDIFont.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/wmlengine/src/gdi/src/GDIFont.cpp Mon May 03 13:32:15 2010 +0300 @@ -21,7 +21,7 @@ #include // First to avoid NULL redefine warning (no #ifndef NULL). #include "nw_object_dynamici.h" #include "GDIFont.h" -#include "GDIDeviceContext.h" +#include "GDIDevicecontext.h" #include "nw_text_ucs2.h" #include "nwx_string.h" #include diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/wmlengine/src/hed/src/DomHelper.c --- a/webengine/wmlengine/src/hed/src/DomHelper.c Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/wmlengine/src/hed/src/DomHelper.c Mon May 03 13:32:15 2010 +0300 @@ -26,7 +26,7 @@ #include "nwx_string.h" #include "nwx_url_utils.h" #include "nwx_logger.h" -#include "textreverse.h" +#include "TextReverse.h" #include "nwx_settings.h" #include #include "nwx_statuscodeconvert.h" diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/wmlengine/src/hed/src/HEDCompositeContentHandler.cpp --- a/webengine/wmlengine/src/hed/src/HEDCompositeContentHandler.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/wmlengine/src/hed/src/HEDCompositeContentHandler.cpp Mon May 03 13:32:15 2010 +0300 @@ -30,9 +30,9 @@ #include "BrsrStatusCodes.h" #include "nwx_settings.h" #include -#include "stringutils.h" +#include "StringUtils.h" #include "TEncodingMapping.h" -#include "BodyPart.h" +#include "bodypart.h" #include "MemoryManager.h" diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/wmlengine/src/hed/src/HEDDocumentRoot.cpp --- a/webengine/wmlengine/src/hed/src/HEDDocumentRoot.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/wmlengine/src/hed/src/HEDDocumentRoot.cpp Mon May 03 13:32:15 2010 +0300 @@ -41,7 +41,7 @@ #include "nwx_logger.h" #include "nwx_http_defs.h" #include -#include +#include #include "BrsrStatusCodes.h" #include "HEDDocumentListener.h" diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/wmlengine/src/hed/src/TextReverse.cpp --- a/webengine/wmlengine/src/hed/src/TextReverse.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/wmlengine/src/hed/src/TextReverse.cpp Mon May 03 13:32:15 2010 +0300 @@ -20,8 +20,8 @@ // INCLUDE FILES #include #include -#include "textreverse.h" -#include +#include "TextReverse.h" +#include #include "nwx_settings.h" #include "nwx_statuscodeconvert.h" #include "BrsrStatusCodes.h" diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/wmlengine/src/hed/src/contentLoader.cpp --- a/webengine/wmlengine/src/hed/src/contentLoader.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/wmlengine/src/hed/src/contentLoader.cpp Mon May 03 13:32:15 2010 +0300 @@ -20,12 +20,12 @@ // document handler. #include -#include +#include #include // for TDataType -#include // for Series60 error notes +#include // for Series60 error notes #include #include "nwx_http_defs.h" -#include "ContentLoader.h" +#include "contentLoader.h" #include "MVCShell.h" #include "BrsrStatusCodes.h" #include diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/wmlengine/src/image/include/Epoc32ImageDecoder.h --- a/webengine/wmlengine/src/image/include/Epoc32ImageDecoder.h Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/wmlengine/src/image/include/Epoc32ImageDecoder.h Mon May 03 13:32:15 2010 +0300 @@ -37,7 +37,7 @@ // INCLUDES #include -#include +#include #include "nw_image_epoc32simpleimage.h" diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/wmlengine/src/image/include/nw_image_abstractimage.h --- a/webengine/wmlengine/src/image/include/nw_image_abstractimage.h Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/wmlengine/src/image/include/nw_image_abstractimage.h Mon May 03 13:32:15 2010 +0300 @@ -23,7 +23,7 @@ #include "nw_adt_dynamicvector.h" #include "nw_gdi_types.h" #include "BrsrTypes.h" -#include "nw_image_imageObserver.h" +#include "nw_image_imageobserver.h" #include "NW_Image_EXPORT.h" #include "BrsrStatusCodes.h" diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/wmlengine/src/image/include/nw_image_iimageobserver.h --- a/webengine/wmlengine/src/image/include/nw_image_iimageobserver.h Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/wmlengine/src/image/include/nw_image_iimageobserver.h Mon May 03 13:32:15 2010 +0300 @@ -24,7 +24,7 @@ #include "NW_LMgr_EXPORT.h" #include "nw_object_interface.h" #include "nw_object_dynamic.h" -#include "nw_image_imageObserver.h" +#include "nw_image_imageobserver.h" #include "nw_image_abstractimage.h" #ifdef __cplusplus diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/wmlengine/src/image/src/Epoc32ImageDecoder.cpp --- a/webengine/wmlengine/src/image/src/Epoc32ImageDecoder.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/wmlengine/src/image/src/Epoc32ImageDecoder.cpp Mon May 03 13:32:15 2010 +0300 @@ -38,8 +38,8 @@ #include "nw_imagech_epoc32contenthandler.h" #include "nw_lmgr_boxvisitor.h" #include "nw_lmgr_rootbox.h" -#include "GDIDeviceContext.h" -#include "MvcShell.h" +#include "GDIDevicecontext.h" +#include "MVCShell.h" #include "nw_lmgr_slavepropertylist.h" #include "nw_fbox_imagebuttonbox.h" #include "nw_lmgr_imgcontainerbox.h" diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/wmlengine/src/image/src/Epoc32SimpleImage.cpp --- a/webengine/wmlengine/src/image/src/Epoc32SimpleImage.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/wmlengine/src/image/src/Epoc32SimpleImage.cpp Mon May 03 13:32:15 2010 +0300 @@ -25,7 +25,7 @@ #include "nw_hed_contenthandler.h" #include "nw_image_iimageobserver.h" #include "nw_adt_resizablevector.h" -#include "GDIDeviceContext.h" +#include "GDIDevicecontext.h" #include "nw_gdi_types.h" diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/wmlengine/src/image/src/IMAGEVirtualImage.cpp --- a/webengine/wmlengine/src/image/src/IMAGEVirtualImage.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/wmlengine/src/image/src/IMAGEVirtualImage.cpp Mon May 03 13:32:15 2010 +0300 @@ -20,7 +20,7 @@ #include "BrsrStatusCodes.h" #include "nw_image_virtualimage.h" #include "nw_object_interface.h" -#include "GDIDeviceContext.h" +#include "GDIDevicecontext.h" NW_Bool _NW_Image_VirtualImage_IImageObserver_IsVisible(NW_Image_IImageObserver_t* aImageObserver) diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/wmlengine/src/lmgr/include/BoxFormatHandler.h --- a/webengine/wmlengine/src/lmgr/include/BoxFormatHandler.h Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/wmlengine/src/lmgr/include/BoxFormatHandler.h Mon May 03 13:32:15 2010 +0300 @@ -20,7 +20,7 @@ #define BOX_FORMAT_HANDLER_H #include "e32base.h" -#include "CStack.h" +#include "cstack.h" #include "nw_gdi_utils.h" #include "BoxFormat.h" diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/wmlengine/src/lmgr/include/LMgrObjectBox.h --- a/webengine/wmlengine/src/lmgr/include/LMgrObjectBox.h Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/wmlengine/src/lmgr/include/LMgrObjectBox.h Mon May 03 13:32:15 2010 +0300 @@ -26,7 +26,7 @@ #include "nw_gdi_types.h" #include "nw_lmgr_propertylist.h" -#include "GDIDeviceContext.h" +#include "GDIDevicecontext.h" // FORWARD DECLARATIONS #ifdef __cplusplus diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/wmlengine/src/lmgr/include/nw_lmgr_verticaltablecellbox.h --- a/webengine/wmlengine/src/lmgr/include/nw_lmgr_verticaltablecellbox.h Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/wmlengine/src/lmgr/include/nw_lmgr_verticaltablecellbox.h Mon May 03 13:32:15 2010 +0300 @@ -19,7 +19,7 @@ #ifndef NW_LMGR_VERTICALTABLECELLBOX_H #define NW_LMGR_VERTICALTABLECELLBOX_H -#include "nw_lmgr_Verticaltablebox.h" +#include "nw_lmgr_verticaltablebox.h" #ifdef __cplusplus extern "C" diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/wmlengine/src/lmgr/src/BoxFormat.cpp --- a/webengine/wmlengine/src/lmgr/src/BoxFormat.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/wmlengine/src/lmgr/src/BoxFormat.cpp Mon May 03 13:32:15 2010 +0300 @@ -17,7 +17,7 @@ -#include "CStack.h" +#include "cstack.h" #include "nwx_logger.h" #include "nw_lmgr_linebox.h" #include "nw_lmgr_nobrbox.h" @@ -28,7 +28,7 @@ #include "LMgrMarkerText.h" #include "LMgrMarkerImage.h" #include "LMgrAnonBlock.h" -#include "GDIDeviceContext.h" +#include "GDIDevicecontext.h" #include "nw_lmgr_accesskey.h" #include "nw_lmgr_verticaltablecellbox.h" diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/wmlengine/src/lmgr/src/BoxFormatHandler.cpp --- a/webengine/wmlengine/src/lmgr/src/BoxFormatHandler.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/wmlengine/src/lmgr/src/BoxFormatHandler.cpp Mon May 03 13:32:15 2010 +0300 @@ -21,7 +21,7 @@ #include "BoxFormatHandler.h" #include "nwx_logger.h" #include "nwx_settings.h" -#include "GDIDeviceContext.h" +#include "GDIDevicecontext.h" #include "LMgrMarkerText.h" #include "LMgrMarkerImage.h" #include "LMgrAnonBlock.h" diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/wmlengine/src/lmgr/src/BoxRender.cpp --- a/webengine/wmlengine/src/lmgr/src/BoxRender.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/wmlengine/src/lmgr/src/BoxRender.cpp Mon May 03 13:32:15 2010 +0300 @@ -23,7 +23,7 @@ #include "nwx_logger.h" #include "nwx_settings.h" -#include "CStack.h" +#include "cstack.h" struct RenderContext { diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/wmlengine/src/lmgr/src/ImageMapBox.cpp --- a/webengine/wmlengine/src/lmgr/src/ImageMapBox.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/wmlengine/src/lmgr/src/ImageMapBox.cpp Mon May 03 13:32:15 2010 +0300 @@ -28,7 +28,7 @@ #include "nw_lmgr_activecontainerbox.h" #include "nw_lmgr_areabox.h" #include "nwx_settings.h" -#include "GDIDeviceContext.h" +#include "GDIDevicecontext.h" #include "nw_evt_controlkeyevent.h" #include "nw_evt_focusevent.h" #include "nw_evt_scrollevent.h" diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/wmlengine/src/lmgr/src/ImgContainerBox.cpp --- a/webengine/wmlengine/src/lmgr/src/ImgContainerBox.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/wmlengine/src/lmgr/src/ImgContainerBox.cpp Mon May 03 13:32:15 2010 +0300 @@ -27,7 +27,7 @@ #include "nw_lmgr_activecontainerbox.h" #include "nw_lmgr_statictablecellbox.h" #include "nwx_settings.h" -#include "GDIDeviceContext.h" +#include "GDIDevicecontext.h" #include "BrsrStatusCodes.h" // CONSTANTS diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/wmlengine/src/lmgr/src/LMgrAbstractTextBox.cpp --- a/webengine/wmlengine/src/lmgr/src/LMgrAbstractTextBox.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/wmlengine/src/lmgr/src/LMgrAbstractTextBox.cpp Mon May 03 13:32:15 2010 +0300 @@ -29,7 +29,7 @@ #include "urlloader_urlloaderint.h" #include "nw_lmgr_verticaltablecellbox.h" #include "nw_lmgr_statictablecellbox.h" -#include "GDIDeviceContext.h" +#include "GDIDevicecontext.h" #include "BrsrStatusCodes.h" #include "nwx_http_defs.h" diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/wmlengine/src/lmgr/src/LMgrAnimatedImageAggregate.cpp --- a/webengine/wmlengine/src/lmgr/src/LMgrAnimatedImageAggregate.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/wmlengine/src/lmgr/src/LMgrAnimatedImageAggregate.cpp Mon May 03 13:32:15 2010 +0300 @@ -19,7 +19,7 @@ #include "nw_lmgr_animatedimageaggregatei.h" #include "nw_lmgr_animatedimagebox.h" #include "nw_lmgr_rootbox.h" -#include "GDIDeviceContext.h" +#include "GDIDevicecontext.h" #include "BrsrStatusCodes.h" #include "nw_image_epoc32simpleimagei.h" #include "nw_image_virtualimagei.h" diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/wmlengine/src/lmgr/src/LMgrBox.cpp --- a/webengine/wmlengine/src/lmgr/src/LMgrBox.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/wmlengine/src/lmgr/src/LMgrBox.cpp Mon May 03 13:32:15 2010 +0300 @@ -37,7 +37,7 @@ #include "nw_lmgr_verticaltablecellbox.h" #include "urlloader_urlloaderint.h" #include "nwx_settings.h" -#include "GDIDeviceContext.h" +#include "GDIDevicecontext.h" #include "nw_lmgr_imgcontainerbox.h" #include "LMgrMarkerImage.h" @@ -46,7 +46,7 @@ #include "LMgrAnonBlock.h" #include "nw_css_tokentoint.h" #include "bitdev.h" -#include "aknutils.h" +#include "AknUtils.h" #include "LMgrObjectBoxOOC.h" /* ------------------------------------------------------------------------- * diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/wmlengine/src/lmgr/src/LMgrBreakBox.cpp --- a/webengine/wmlengine/src/lmgr/src/LMgrBreakBox.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/wmlengine/src/lmgr/src/LMgrBreakBox.cpp Mon May 03 13:32:15 2010 +0300 @@ -26,7 +26,7 @@ #include "nwx_settings.h" #include "nw_lmgr_verticaltablecellbox.h" #include "nw_lmgr_containerbox.h" -#include "GDIDeviceContext.h" +#include "GDIDevicecontext.h" #include "BrsrStatusCodes.h" /* ------------------------------------------------------------------------- * diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/wmlengine/src/lmgr/src/LMgrContainerBox.cpp --- a/webengine/wmlengine/src/lmgr/src/LMgrContainerBox.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/wmlengine/src/lmgr/src/LMgrContainerBox.cpp Mon May 03 13:32:15 2010 +0300 @@ -28,7 +28,7 @@ #include "nw_lmgr_cssproperties.h" #include "nw_adt_resizablevector.h" #include "nw_lmgr_eventhandler.h" -#include "GDIDeviceContext.h" +#include "GDIDevicecontext.h" #include "nw_lmgr_slavepropertylist.h" #include "nw_adt_vectoriterator.h" #include "BrsrStatusCodes.h" diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/wmlengine/src/lmgr/src/LMgrFlowBox.cpp --- a/webengine/wmlengine/src/lmgr/src/LMgrFlowBox.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/wmlengine/src/lmgr/src/LMgrFlowBox.cpp Mon May 03 13:32:15 2010 +0300 @@ -23,7 +23,7 @@ #include "nw_lmgr_statictablecellbox.h" #include "nw_lmgr_statictablerowbox.h" #include "nw_lmgr_cssproperties.h" -#include "GDIDeviceContext.h" +#include "GDIDevicecontext.h" #include "nw_fbox_inputbox.h" #include "nw_lmgr_imgcontainerbox.h" #include "BrsrStatusCodes.h" diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/wmlengine/src/lmgr/src/LMgrImageBox.cpp --- a/webengine/wmlengine/src/lmgr/src/LMgrImageBox.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/wmlengine/src/lmgr/src/LMgrImageBox.cpp Mon May 03 13:32:15 2010 +0300 @@ -22,7 +22,7 @@ #include "nw_image_virtualimage.h" #include "nw_lmgr_rootbox.h" #include "nwx_settings.h" -#include "GDIDeviceContext.h" +#include "GDIDevicecontext.h" #include "nw_lmgr_activecontainerbox.h" #include "BrsrStatusCodes.h" diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/wmlengine/src/lmgr/src/LMgrObjectBox.cpp --- a/webengine/wmlengine/src/lmgr/src/LMgrObjectBox.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/wmlengine/src/lmgr/src/LMgrObjectBox.cpp Mon May 03 13:32:15 2010 +0300 @@ -31,7 +31,7 @@ #include "LMgrBoxTreeListener.h" #include "nw_lmgr_rootbox.h" #include "nw_text_ucs2.h" -#include "nw_text_abstracti.h" +#include "NW_Text_AbstractI.h" // ============================ LOCAL DEFINES ================================== diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/wmlengine/src/lmgr/src/LMgrPosFlowBox.cpp --- a/webengine/wmlengine/src/lmgr/src/LMgrPosFlowBox.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/wmlengine/src/lmgr/src/LMgrPosFlowBox.cpp Mon May 03 13:32:15 2010 +0300 @@ -20,8 +20,8 @@ #include "nw_lmgr_formatcontext.h" #include "nw_lmgr_rootbox.h" #include "nw_lmgr_cssproperties.h" -#include "nw_lmgr_ieventlistener.h" -#include "gdidevicecontext.h" +#include "NW_LMgr_IEventListener.h" +#include "GDIDevicecontext.h" #include "nw_lmgr_verticaltablecellboxi.h" #include "nw_lmgr_abstracttextboxi.h" #include "nw_lmgr_statictablebox.h" diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/wmlengine/src/lmgr/src/LMgrRootBox.cpp --- a/webengine/wmlengine/src/lmgr/src/LMgrRootBox.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/wmlengine/src/lmgr/src/LMgrRootBox.cpp Mon May 03 13:32:15 2010 +0300 @@ -23,7 +23,7 @@ #include "nw_lmgr_activecontainerbox.h" #include "nw_lmgr_statictablecellbox.h" #include "nw_adt_resizablevector.h" -#include "GDIDeviceContext.h" +#include "GDIDevicecontext.h" #include "nw_lmgr_breakbox.h" #include "nwx_settings.h" #include "nw_lmgr_simplepropertylist.h" diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/wmlengine/src/lmgr/src/LMgrRuleBox.cpp --- a/webengine/wmlengine/src/lmgr/src/LMgrRuleBox.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/wmlengine/src/lmgr/src/LMgrRuleBox.cpp Mon May 03 13:32:15 2010 +0300 @@ -18,7 +18,7 @@ #include "nw_lmgr_ruleboxi.h" #include "nw_lmgr_cssproperties.h" -#include "GDIDeviceContext.h" +#include "GDIDevicecontext.h" #include "BrsrStatusCodes.h" /*#define NW_HR_WIDTH_DEFAULT (NW_GDI_Metric_t)100*/ diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/wmlengine/src/lmgr/src/LMgrStaticTableCellBox.cpp --- a/webengine/wmlengine/src/lmgr/src/LMgrStaticTableCellBox.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/wmlengine/src/lmgr/src/LMgrStaticTableCellBox.cpp Mon May 03 13:32:15 2010 +0300 @@ -22,7 +22,7 @@ #include "nw_lmgr_cssproperties.h" #include "nw_lmgr_boxvisitor.h" #include "nw_lmgr_rootbox.h" -#include "GDIDeviceContext.h" +#include "GDIDevicecontext.h" #include "nwx_math.h" #include "nw_lmgr_eventhandler.h" #include "nw_lmgr_activecontainerbox.h" diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/wmlengine/src/lmgr/src/Marquee_BoxFormat.cpp --- a/webengine/wmlengine/src/lmgr/src/Marquee_BoxFormat.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/wmlengine/src/lmgr/src/Marquee_BoxFormat.cpp Mon May 03 13:32:15 2010 +0300 @@ -16,7 +16,7 @@ */ -#include "CStack.h" +#include "cstack.h" #include "BoxFormat.h" TBrowserStatusCode diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/wmlengine/src/markup/include/nw_markup_imageviewer.h --- a/webengine/wmlengine/src/markup/include/nw_markup_imageviewer.h Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/wmlengine/src/markup/include/nw_markup_imageviewer.h Mon May 03 13:32:15 2010 +0300 @@ -21,7 +21,7 @@ #include "NW_Markup_EXPORT.h" #include "nw_object_aggregate.h" -#include "nw_hed_iimageViewer.h" +#include "nw_hed_iimageviewer.h" #include "nw_lmgr_box.h" #include "BrsrStatusCodes.h" diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/wmlengine/src/markup/include/nw_markup_imagevieweri.h --- a/webengine/wmlengine/src/markup/include/nw_markup_imagevieweri.h Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/wmlengine/src/markup/include/nw_markup_imagevieweri.h Mon May 03 13:32:15 2010 +0300 @@ -20,8 +20,8 @@ #define _NW_Markup_ImageViewerI_h_ #include "nw_object_aggregatei.h" -#include "nw_hed_iimageVieweri.h" -#include "nw_markup_imageViewer.h" +#include "nw_hed_iimagevieweri.h" +#include "nw_markup_imageviewer.h" #include "BrsrStatusCodes.h" #ifdef __cplusplus diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/wmlengine/src/urlloader/src/urlloader_curlloader.cpp --- a/webengine/wmlengine/src/urlloader/src/urlloader_curlloader.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/wmlengine/src/urlloader/src/urlloader_curlloader.cpp Mon May 03 13:32:15 2010 +0300 @@ -24,7 +24,7 @@ #include #include #include "urlloader_urlloaderint.h" -#include "urlloader_CUrlLoader.h" +#include "urlloader_curlloader.h" #include "urlloader_loaderutils.h" #include "fileloader_cfileloader.h" #include "BrsrStatusCodes.h" diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/wmlengine/src/urlloader/src/urlloader_urlloaderint.cpp --- a/webengine/wmlengine/src/urlloader/src/urlloader_urlloaderint.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/wmlengine/src/urlloader/src/urlloader_urlloaderint.cpp Mon May 03 13:32:15 2010 +0300 @@ -19,8 +19,8 @@ // INCLUDE FILES #include #include -#include "urlloader_urlloaderi.h" -#include "urlloader_CUrlLoader.h" +#include "urlloader_urlloaderI.h" +#include "urlloader_curlloader.h" #include "urlloader_loaderutils.h" #include "httploader_mlinkresolvercallbacks.h" #include "nwx_defs.h" diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/wmlengine/src/utils/src/nwx_msg_dsp_epoc32.cpp --- a/webengine/wmlengine/src/utils/src/nwx_msg_dsp_epoc32.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/wmlengine/src/utils/src/nwx_msg_dsp_epoc32.cpp Mon May 03 13:32:15 2010 +0300 @@ -31,7 +31,7 @@ #include "nwx_logger.h" #include "nwx_msg_dsp_api_epoc32.h" #include "nwx_string.h" -#include "util_CDispatcherEng.h" +#include "util_cdispatchereng.h" #include "BrsrStatusCodes.h" diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/wmlengine/src/utils/src/nwx_osu_file_epoc32.cpp --- a/webengine/wmlengine/src/utils/src/nwx_osu_file_epoc32.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/wmlengine/src/utils/src/nwx_osu_file_epoc32.cpp Mon May 03 13:32:15 2010 +0300 @@ -28,7 +28,7 @@ #include "nwx_settings.h" #include -#include +#include #include "BrsrStatusCodes.h" diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/wmlengine/src/utils/src/util_cdispatchereng.cpp --- a/webengine/wmlengine/src/utils/src/util_cdispatchereng.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/wmlengine/src/utils/src/util_cdispatchereng.cpp Mon May 03 13:32:15 2010 +0300 @@ -22,7 +22,7 @@ #include "nwx_msg_types.h" #include "nwx_msg_dsp_api_epoc32.h" #include "nwx_logger.h" -#include "util_CDispatcherEng.h" +#include "util_cdispatchereng.h" #include "BrsrStatusCodes.h" /* Active Object ID */ diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/wmlengine/src/wml/src/WMLUrlNavigation.cpp --- a/webengine/wmlengine/src/wml/src/WMLUrlNavigation.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/wmlengine/src/wml/src/WMLUrlNavigation.cpp Mon May 03 13:32:15 2010 +0300 @@ -39,7 +39,7 @@ #include "wml_decoder.h" #include "nw_hed_documentroot.h" -#include "mvcshell.h" +#include "MVCShell.h" #include "nw_lmgr_rootbox.h" #include "nw_wml1x_wml1xcontenthandler.h" #include "BrsrStatusCodes.h" diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/wmlengine/src/wml1x/src/WML1XApi.cpp --- a/webengine/wmlengine/src/wml1x/src/WML1XApi.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/wmlengine/src/wml1x/src/WML1XApi.cpp Mon May 03 13:32:15 2010 +0300 @@ -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 cacf6ee57968 -r 92a765b5b3e7 webengine/wmlengine/src/wml1x/src/WML1XContentHandler.cpp --- a/webengine/wmlengine/src/wml1x/src/WML1XContentHandler.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/wmlengine/src/wml1x/src/WML1XContentHandler.cpp Mon May 03 13:32:15 2010 +0300 @@ -59,12 +59,12 @@ #include #include "nwx_http_defs.h" -#include "GDIDeviceContext.h" +#include "GDIDevicecontext.h" #include "BrsrStatusCodes.h" #include "HEDDocumentListener.h" -#include "wmlcontrol.h" +#include "WmlControl.h" /* ------------------------------------------------------------------------- * private methods diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/wmlengine/src/wmlcontrol/include/WmlEngineInterface.h --- a/webengine/wmlengine/src/wmlcontrol/include/WmlEngineInterface.h Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/wmlengine/src/wmlcontrol/include/WmlEngineInterface.h Mon May 03 13:32:15 2010 +0300 @@ -21,7 +21,7 @@ // INCLUDES #include -#include +#include #include "BrCtlDefs.h" #include "WmlEngineDefs.h" diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/wmlengine/src/wmlcontrol/src/WmlControl.cpp --- a/webengine/wmlengine/src/wmlcontrol/src/WmlControl.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/wmlengine/src/wmlcontrol/src/WmlControl.cpp Mon May 03 13:32:15 2010 +0300 @@ -18,11 +18,11 @@ // INCLUDES #include "WmlControl.h" -#include "MultipartParser.h" +#include "multipartparser.h" #include "MVCView.h" #include "MVCShell.h" #include "WmlInterface.h" -#include "GDIDeviceContext.h" +#include "GDIDevicecontext.h" #include "HistoryController.h" #include "HistoryInterface.h" diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/wmlengine/src/xhtml/include/ImageMapPopup.h --- a/webengine/wmlengine/src/xhtml/include/ImageMapPopup.h Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/wmlengine/src/xhtml/include/ImageMapPopup.h Mon May 03 13:32:15 2010 +0300 @@ -23,11 +23,11 @@ #include #include -#include +#include #include #include #include -#include +#include #include class CCoeControl; diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/wmlengine/src/xhtml/include/MapElementList.h --- a/webengine/wmlengine/src/xhtml/include/MapElementList.h Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/wmlengine/src/xhtml/include/MapElementList.h Mon May 03 13:32:15 2010 +0300 @@ -22,7 +22,7 @@ // INCLUDES #include "nw_xhtml_elementhandler.h" #include "BrsrStatusCodes.h" -#include "NW_LMgr_ImageMapBox.h" +#include "nw_lmgr_imagemapbox.h" #include #include "nwx_string.h" diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/wmlengine/src/xhtml/include/nw_image_imgelementhandler.h --- a/webengine/wmlengine/src/xhtml/include/nw_image_imgelementhandler.h Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/wmlengine/src/xhtml/include/nw_image_imgelementhandler.h Mon May 03 13:32:15 2010 +0300 @@ -20,7 +20,7 @@ #define NW_XHTML_IMAGE_IMGELEMENTHANDLER_H #include "nw_xhtml_elementhandler.h" -#include "NW_LMgr_Box.h" +#include "nw_lmgr_box.h" #ifdef __cplusplus extern "C" { diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/wmlengine/src/xhtml/src/BasicForms/XHTMLFormLiaison.cpp --- a/webengine/wmlengine/src/xhtml/src/BasicForms/XHTMLFormLiaison.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/wmlengine/src/xhtml/src/BasicForms/XHTMLFormLiaison.cpp Mon May 03 13:32:15 2010 +0300 @@ -20,7 +20,7 @@ #include #include #include -#include +#include #include "BrCtl.h" #include "BrCtlDialogsProvider.h" @@ -35,7 +35,7 @@ #include "nw_dom_domvisitor.h" #include "nw_fbox_formbox.h" #include "nw_fbox_optgrpbox.h" -#include "nw_fbox_validator.h" +#include "NW_FBox_Validator.h" #include "nw_hed_documentroot.h" #include "nw_loadreq.h" #include "nw_nvpair.h" diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/wmlengine/src/xhtml/src/BasicTables/XHTMLTableElementHandler.cpp --- a/webengine/wmlengine/src/xhtml/src/BasicTables/XHTMLTableElementHandler.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/wmlengine/src/xhtml/src/BasicTables/XHTMLTableElementHandler.cpp Mon May 03 13:32:15 2010 +0300 @@ -19,7 +19,7 @@ #include "XhtmlTableElementHandler.h" #include "BrsrStatusCodes.h" -#include "GDIDeviceContext.h" +#include "GDIDevicecontext.h" #include "HEDDocumentListener.h" #include "LMgrAnonTableBox.h" diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/wmlengine/src/xhtml/src/Image/ImageMapPopup.cpp --- a/webengine/wmlengine/src/xhtml/src/Image/ImageMapPopup.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/wmlengine/src/xhtml/src/Image/ImageMapPopup.cpp Mon May 03 13:32:15 2010 +0300 @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include #include diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/wmlengine/src/xhtml/src/XHTMLAttributePropertyTable.cpp --- a/webengine/wmlengine/src/xhtml/src/XHTMLAttributePropertyTable.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/wmlengine/src/xhtml/src/XHTMLAttributePropertyTable.cpp Mon May 03 13:32:15 2010 +0300 @@ -30,8 +30,8 @@ #include "nw_lmgr_rootbox.h" #include "nw_lmgr_animatedimagebox.h" #include "nw_lmgr_activecontainerbox.h" -#include "nw_lmgr_Verticaltablebox.h" -#include "nw_lmgr_Verticaltablecellbox.h" +#include "nw_lmgr_verticaltablebox.h" +#include "nw_lmgr_verticaltablecellbox.h" #include "nw_fbox_inputbox.h" #include "nw_xhtml_attributepropertytablei.h" #include "nw_xhtml_xhtml_1_0_tokens.h" @@ -40,7 +40,7 @@ #include "XhtmlTableElementHandlerOOC.h" #include "nw_hed_domhelper.h" #include "HEDDocumentListener.h" -#include "GDIDeviceContext.h" +#include "GDIDevicecontext.h" #include "CSSImageList.h" /* ------------------------------------------------------------------------- */ diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/wmlengine/src/xhtml/src/XHTMLContentHandler.cpp --- a/webengine/wmlengine/src/xhtml/src/XHTMLContentHandler.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/wmlengine/src/xhtml/src/XHTMLContentHandler.cpp Mon May 03 13:32:15 2010 +0300 @@ -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 cacf6ee57968 -r 92a765b5b3e7 webengine/wrtharvester/inc/wrtharvesterpublisherobserver.h --- a/webengine/wrtharvester/inc/wrtharvesterpublisherobserver.h Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/wrtharvester/inc/wrtharvesterpublisherobserver.h Mon May 03 13:32:15 2010 +0300 @@ -20,7 +20,7 @@ #define WRTHARVESTERPUBLISHEROBSERVER_H #include -#include +#include // FORWARD DECLARATIONS class CWrtHarvester; diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/wrtharvester/src/wrtharvester.cpp --- a/webengine/wrtharvester/src/wrtharvester.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/wrtharvester/src/wrtharvester.cpp Mon May 03 13:32:15 2010 +0300 @@ -23,26 +23,26 @@ #include "wrtharvesterpublisherobserver.h" #include "wrtharvesterconst.h" -#include +#include #include #include -#include -#include -#include +#include +#include +#include #include //Publish & Subscribe #include #include #include #include -#include +#include #include #include #include #include #include -#include +#include #include #include diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/wrtharvester/src/wrtharvesterpublisherobserver.cpp --- a/webengine/wrtharvester/src/wrtharvesterpublisherobserver.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/wrtharvester/src/wrtharvesterpublisherobserver.cpp Mon May 03 13:32:15 2010 +0300 @@ -23,9 +23,9 @@ #include "wrtharvesterconst.h" -#include -#include -#include +#include +#include +#include _LIT8( KCPContentInterface, "IContentPublishing" ); _LIT8( KCPService, "Service.ContentPublishing" ); diff -r cacf6ee57968 -r 92a765b5b3e7 webengine/wrtharvester/src/wrtusbhandler.cpp --- a/webengine/wrtharvester/src/wrtusbhandler.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/webengine/wrtharvester/src/wrtusbhandler.cpp Mon May 03 13:32:15 2010 +0300 @@ -20,7 +20,7 @@ #include "wrtusbhandler.h" #include "wrtharvester.h" #include "wrtusbhandler.h" -#include +#include // CONSTANTS diff -r cacf6ee57968 -r 92a765b5b3e7 widgets/widgetapp/group/WidgetUi.mmp --- a/widgets/widgetapp/group/WidgetUi.mmp Fri Apr 16 16:07:13 2010 +0300 +++ b/widgets/widgetapp/group/WidgetUi.mmp Mon May 03 13:32:15 2010 +0300 @@ -36,7 +36,7 @@ // RESOURCE INFO -START RESOURCE ../Data/WidgetUi.rss +START RESOURCE ../data/WidgetUi.rss DEPENDS avkon.rsg HEADER TARGETPATH APP_RESOURCE_DIR @@ -66,7 +66,7 @@ SOURCE cpspublisher.cpp #endif -START RESOURCE ../Data/WidgetUi_reg.rss +START RESOURCE ../data/WidgetUi_reg.rss DEPENDS widgetui.rsg // Do not change the UID below. TARGETPATH /private/10003a3f/apps @@ -77,7 +77,7 @@ USERINCLUDE . USERINCLUDE ../inc -USERINCLUDE ../../WidgetInstaller/inc +USERINCLUDE ../../widgetinstaller/inc MW_LAYER_SYSTEMINCLUDE MW_LAYER_LIBC_SYSTEMINCLUDE diff -r cacf6ee57968 -r 92a765b5b3e7 widgets/widgetapp/inc/WidgetUiAppUi.h --- a/widgets/widgetapp/inc/WidgetUiAppUi.h Fri Apr 16 16:07:13 2010 +0300 +++ b/widgets/widgetapp/inc/WidgetUiAppUi.h Mon May 03 13:32:15 2010 +0300 @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include "ApiProvider.h" // CONSTANTS diff -r cacf6ee57968 -r 92a765b5b3e7 widgets/widgetapp/inc/WidgetUiDocument.h --- a/widgets/widgetapp/inc/WidgetUiDocument.h Fri Apr 16 16:07:13 2010 +0300 +++ b/widgets/widgetapp/inc/WidgetUiDocument.h Mon May 03 13:32:15 2010 +0300 @@ -21,7 +21,7 @@ // INCLUDES -#include +#include // CONSTANTS diff -r cacf6ee57968 -r 92a765b5b3e7 widgets/widgetapp/inc/WidgetUiObserver.h --- a/widgets/widgetapp/inc/WidgetUiObserver.h Fri Apr 16 16:07:13 2010 +0300 +++ b/widgets/widgetapp/inc/WidgetUiObserver.h Mon May 03 13:32:15 2010 +0300 @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include diff -r cacf6ee57968 -r 92a765b5b3e7 widgets/widgetapp/inc/WidgetUiWindow.h --- a/widgets/widgetapp/inc/WidgetUiWindow.h Fri Apr 16 16:07:13 2010 +0300 +++ b/widgets/widgetapp/inc/WidgetUiWindow.h Mon May 03 13:32:15 2010 +0300 @@ -22,7 +22,7 @@ // INCLUDES FILES #include #include -#include // for MWidgetCallback +#include // for MWidgetCallback #include #include #include "WidgetUiObserver.h" diff -r cacf6ee57968 -r 92a765b5b3e7 widgets/widgetapp/inc/WidgetUiWindowManager.h --- a/widgets/widgetapp/inc/WidgetUiWindowManager.h Fri Apr 16 16:07:13 2010 +0300 +++ b/widgets/widgetapp/inc/WidgetUiWindowManager.h Mon May 03 13:32:15 2010 +0300 @@ -22,7 +22,7 @@ // INCLUDES FILES #include -#include +#include #include #include "WidgetUiObserver.h" #include "Browser_platform_variant.hrh" diff -r cacf6ee57968 -r 92a765b5b3e7 widgets/widgetapp/inc/WidgetUiWindowView.h --- a/widgets/widgetapp/inc/WidgetUiWindowView.h Fri Apr 16 16:07:13 2010 +0300 +++ b/widgets/widgetapp/inc/WidgetUiWindowView.h Mon May 03 13:32:15 2010 +0300 @@ -21,7 +21,7 @@ // INCLUDES #include -#include +#include // CONSTANTS diff -r cacf6ee57968 -r 92a765b5b3e7 widgets/widgetapp/src/WidgetUiAppUi.cpp --- a/widgets/widgetapp/src/WidgetUiAppUi.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/widgets/widgetapp/src/WidgetUiAppUi.cpp Mon May 03 13:32:15 2010 +0300 @@ -24,7 +24,7 @@ #include "widgetappdefs.rh" #include #include "WidgetUi.hrh" -#include +#include #include #include #include @@ -33,7 +33,7 @@ #include #ifdef BRDO_WRT_HS_FF -#include +#include #endif // EXTERNAL DATA STRUCTURES diff -r cacf6ee57968 -r 92a765b5b3e7 widgets/widgetapp/src/WidgetUiObserver.cpp --- a/widgets/widgetapp/src/WidgetUiObserver.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/widgets/widgetapp/src/WidgetUiObserver.cpp Mon May 03 13:32:15 2010 +0300 @@ -25,8 +25,8 @@ #include #include #include -#include -#include +#include +#include #include #include "WidgetUiObserver.h" #include "WidgetUiWindow.h" diff -r cacf6ee57968 -r 92a765b5b3e7 widgets/widgetapp/src/WidgetUiWindow.cpp --- a/widgets/widgetapp/src/WidgetUiWindow.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/widgets/widgetapp/src/WidgetUiWindow.cpp Mon May 03 13:32:15 2010 +0300 @@ -27,10 +27,10 @@ #include "cpspublisher.h" #endif #include -#include +#include #include -#include +#include #include #include "WidgetInstallerInternalCRKeys.h" #include @@ -39,7 +39,7 @@ #include #include #include -#include +#include #include "SWInstWidgetUid.h" diff -r cacf6ee57968 -r 92a765b5b3e7 widgets/widgetapp/src/WidgetUiWindowContainer.cpp --- a/widgets/widgetapp/src/WidgetUiWindowContainer.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/widgets/widgetapp/src/WidgetUiWindowContainer.cpp Mon May 03 13:32:15 2010 +0300 @@ -25,18 +25,18 @@ #include -#include +#include #include #include #include #include -#include +#include #include // CAknMessageQueryDialog -#include +#include #include -#include +#include #include // EXTERNAL DATA STRUCTURES diff -r cacf6ee57968 -r 92a765b5b3e7 widgets/widgetapp/src/WidgetUiWindowManager.cpp --- a/widgets/widgetapp/src/WidgetUiWindowManager.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/widgets/widgetapp/src/WidgetUiWindowManager.cpp Mon May 03 13:32:15 2010 +0300 @@ -31,20 +31,20 @@ #endif #include -#include +#include #include #include #include -#include +#include #include -#include +#include #include #include "cpglobals.h" // CPS string definitions. #include #include #include -#include +#include // LOCAL FUNCTION PROTOTYPES TInt doDestructOOMNotifyTimer( TAny* ptr ); diff -r cacf6ee57968 -r 92a765b5b3e7 widgets/widgetapp/src/WidgetUiWindowView.cpp --- a/widgets/widgetapp/src/WidgetUiWindowView.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/widgets/widgetapp/src/WidgetUiWindowView.cpp Mon May 03 13:32:15 2010 +0300 @@ -24,22 +24,22 @@ #include "WidgetUiWindow.h" #include #include -#include +#include #include #include "WidgetUi.hrh" #include -#include +#include #include #include #include -#include +#include #include #include #include #include #include #ifdef RD_SCALABLE_UI_V2 -#include // For Layout_Meta_Data landscape/portrait status +#include // For Layout_Meta_Data landscape/portrait status #include #endif diff -r cacf6ee57968 -r 92a765b5b3e7 widgets/widgetapp/src/cpspublisher.cpp --- a/widgets/widgetapp/src/cpspublisher.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/widgets/widgetapp/src/cpspublisher.cpp Mon May 03 13:32:15 2010 +0300 @@ -18,14 +18,14 @@ #include "cpspublisher.h" -#include -#include -#include -#include +#include +#include +#include +#include #include #include #include -#include +#include // TODO use global definitions! diff -r cacf6ee57968 -r 92a765b5b3e7 widgets/widgetinstaller/data/1028281F.rss --- a/widgets/widgetinstaller/data/1028281F.rss Fri Apr 16 16:07:13 2010 +0300 +++ b/widgets/widgetinstaller/data/1028281F.rss Mon May 03 13:32:15 2010 +0300 @@ -15,7 +15,7 @@ * */ -#include +#include #include #include "SWInstWidgetUid.h" diff -r cacf6ee57968 -r 92a765b5b3e7 widgets/widgetinstaller/group/WidgetInstallerUI.mmp --- a/widgets/widgetinstaller/group/WidgetInstallerUI.mmp Fri Apr 16 16:07:13 2010 +0300 +++ b/widgets/widgetinstaller/group/WidgetInstallerUI.mmp Mon May 03 13:32:15 2010 +0300 @@ -51,7 +51,7 @@ // Sources SOURCEPATH ../src SOURCE WidgetUIMain.cpp -SOURCE WidgetInstallerUI.cpp +SOURCE WidgetInstallerUi.cpp SOURCE WidgetUIOperationsWatcher.cpp SOURCE WidgetUIHandler.cpp SOURCE WidgetUIConfigHandler.cpp @@ -59,8 +59,8 @@ SOURCE Iconconverter.cpp // Includes -USERINCLUDE ../Inc -USERINCLUDE ../../../Inc +USERINCLUDE ../inc +USERINCLUDE ../../../inc MW_LAYER_SYSTEMINCLUDE MW_LAYER_LIBC_SYSTEMINCLUDE diff -r cacf6ee57968 -r 92a765b5b3e7 widgets/widgetinstaller/inc/WidgetUIOperationsWatcher.h --- a/widgets/widgetinstaller/inc/WidgetUIOperationsWatcher.h Fri Apr 16 16:07:13 2010 +0300 +++ b/widgets/widgetinstaller/inc/WidgetUIOperationsWatcher.h Mon May 03 13:32:15 2010 +0300 @@ -30,7 +30,7 @@ #include #include #include // RApaLsSession -#include "cuicanceltimer.h" +#include "CUICancelTimer.h" #include "WidgetUIHandler.h" #include "IconConverter.h" diff -r cacf6ee57968 -r 92a765b5b3e7 widgets/widgetinstaller/src/Iconconverter.cpp --- a/widgets/widgetinstaller/src/Iconconverter.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/widgets/widgetinstaller/src/Iconconverter.cpp Mon May 03 13:32:15 2010 +0300 @@ -18,8 +18,8 @@ */ #include -#include -#include +#include +#include #include "IconConverter.h" #include "WidgetUIOperationsWatcher.h" diff -r cacf6ee57968 -r 92a765b5b3e7 widgets/widgetinstaller/src/WidgetInstallerUi.cpp --- a/widgets/widgetinstaller/src/WidgetInstallerUi.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/widgets/widgetinstaller/src/WidgetInstallerUi.cpp Mon May 03 13:32:15 2010 +0300 @@ -24,9 +24,9 @@ #include "CUIUtils.h" -#include "WidgetInstallerUI.h" +#include "WidgetInstallerUi.h" #include "WidgetUIOperationsWatcher.h" -#include "BAUTILS.H" +#include "bautils.h" using namespace SwiUI; diff -r cacf6ee57968 -r 92a765b5b3e7 widgets/widgetinstaller/src/WidgetRegistrationManager.cpp --- a/widgets/widgetinstaller/src/WidgetRegistrationManager.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/widgets/widgetinstaller/src/WidgetRegistrationManager.cpp Mon May 03 13:32:15 2010 +0300 @@ -19,11 +19,11 @@ #include "WidgetRegistrationManager.h" #include "WidgetUIOperationsWatcher.h" #include -#include +#include #ifdef SYMBIAN_ENABLE_SPLIT_HEADERS #include #endif //SYMBIAN_ENABLE_SPLIT_HEADERS -#include +#include #include // CONSTANTS diff -r cacf6ee57968 -r 92a765b5b3e7 widgets/widgetinstaller/src/WidgetUIHandler.cpp --- a/widgets/widgetinstaller/src/WidgetUIHandler.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/widgets/widgetinstaller/src/WidgetUIHandler.cpp Mon May 03 13:32:15 2010 +0300 @@ -20,8 +20,8 @@ #include #include -#include -#include +#include +#include #include #include "SWInstWidgetUid.h" #include "WidgetInstallerInternalCRKeys.h" diff -r cacf6ee57968 -r 92a765b5b3e7 widgets/widgetinstaller/src/WidgetUIMain.cpp --- a/widgets/widgetinstaller/src/WidgetUIMain.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/widgets/widgetinstaller/src/WidgetUIMain.cpp Mon May 03 13:32:15 2010 +0300 @@ -21,7 +21,7 @@ #include #include -#include "WidgetInstallerUI.h" +#include "WidgetInstallerUi.h" #include "SWInstWidgetUid.h" using namespace SwiUI; diff -r cacf6ee57968 -r 92a765b5b3e7 widgets/widgetlauncher/src/WidgetLauncher.cpp --- a/widgets/widgetlauncher/src/WidgetLauncher.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/widgets/widgetlauncher/src/WidgetLauncher.cpp Mon May 03 13:32:15 2010 +0300 @@ -21,14 +21,14 @@ // INCLUDE FILES #include "widgetappdefs.rh" -#include +#include #include #include #include #include #include -#include -#include +#include +#include #include #include #include diff -r cacf6ee57968 -r 92a765b5b3e7 widgets/widgetrecognizer/data/10282820.rss --- a/widgets/widgetrecognizer/data/10282820.rss Fri Apr 16 16:07:13 2010 +0300 +++ b/widgets/widgetrecognizer/data/10282820.rss Mon May 03 13:32:15 2010 +0300 @@ -16,7 +16,7 @@ */ -#include +#include RESOURCE REGISTRY_INFO r_registry { dll_uid = 0x10282820; // Should match the name of this file diff -r cacf6ee57968 -r 92a765b5b3e7 widgets/widgetrecognizer/group/WidgetRecognizer.mmp --- a/widgets/widgetrecognizer/group/WidgetRecognizer.mmp Fri Apr 16 16:07:13 2010 +0300 +++ b/widgets/widgetrecognizer/group/WidgetRecognizer.mmp Mon May 03 13:32:15 2010 +0300 @@ -26,7 +26,7 @@ CAPABILITY CAP_ECOM_PLUGIN -SOURCEPATH ../Data +SOURCEPATH ../data START RESOURCE 10282820.rss TARGET WidgetRecognizer.rsc diff -r cacf6ee57968 -r 92a765b5b3e7 widgets/widgetrecognizer/src/WidgetRecognizer.cpp --- a/widgets/widgetrecognizer/src/WidgetRecognizer.cpp Fri Apr 16 16:07:13 2010 +0300 +++ b/widgets/widgetrecognizer/src/WidgetRecognizer.cpp Mon May 03 13:32:15 2010 +0300 @@ -16,7 +16,7 @@ */ #include "WidgetRecognizer.h" -#include "ImplementationProxy.h" +#include "implementationproxy.h" // CONSTANTS _LIT(KWidgetExtension, ".wgz");