# HG changeset patch # User Dremov Kirill (Nokia-D-MSW/Tampere) # Date 1286147118 -10800 # Node ID 1218a829abb5da2137898a249a568a4899573bb8 # Parent 12b27423e739626eb9da1295bfc89e904f070220 Revision: 201037 Kit: 201039 diff -r 12b27423e739 -r 1218a829abb5 web_plat/feeds_engine_api/group/bld.inf --- a/web_plat/feeds_engine_api/group/bld.inf Fri Sep 17 08:35:41 2010 +0300 +++ b/web_plat/feeds_engine_api/group/bld.inf Mon Oct 04 02:05:18 2010 +0300 @@ -15,7 +15,7 @@ * */ #include -#include "../../../web_plat/browser_platform_api/inc/Browser_platform_variant.hrh" +#include "../../../web_plat/browser_platform_api/inc/browser_platform_variant.hrh" PRJ_PLATFORMS DEFAULT diff -r 12b27423e739 -r 1218a829abb5 web_plat/webutils_api/group/bld.inf --- a/web_plat/webutils_api/group/bld.inf Fri Sep 17 08:35:41 2010 +0300 +++ b/web_plat/webutils_api/group/bld.inf Mon Oct 04 02:05:18 2010 +0300 @@ -15,14 +15,14 @@ * */ #include -#include "../../../web_plat/browser_platform_api/inc/Browser_platform_variant.hrh" +#include "../../../web_plat/browser_platform_api/inc/browser_platform_variant.hrh" PRJ_PLATFORMS DEFAULT PRJ_EXPORTS -../inc/CUserAgent.h MW_LAYER_PLATFORM_EXPORT_PATH(CUserAgent.h) +../inc/cuseragent.h MW_LAYER_PLATFORM_EXPORT_PATH(cuseragent.h) ../inc/WebUtilsInternalCRKeys.h MW_LAYER_PLATFORM_EXPORT_PATH(WebUtilsInternalCRKeys.h) -../inc/WebUtilsSDKCRKeys.h MW_LAYER_PLATFORM_EXPORT_PATH(WebUtilsSDKCRKeys.h) +../inc/webutilssdkcrkeys.h MW_LAYER_PLATFORM_EXPORT_PATH(webutilssdkcrkeys.h) PRJ_MMPFILES diff -r 12b27423e739 -r 1218a829abb5 web_plat/webutils_api/inc/WebUtilsInternalCRKeys.h --- a/web_plat/webutils_api/inc/WebUtilsInternalCRKeys.h Fri Sep 17 08:35:41 2010 +0300 +++ b/web_plat/webutils_api/inc/WebUtilsInternalCRKeys.h Mon Oct 04 02:05:18 2010 +0300 @@ -20,7 +20,7 @@ #warning The Web Utils API will be removed wk25. Please see http://wikis.in.nokia.com/Browser/APIMigration for more information -#include +#include // AppName fragment of useragent string const TUint32 KWebUtilsUsrAg1 = 0x00000000; diff -r 12b27423e739 -r 1218a829abb5 web_pub/favourites_engine_api/group/bld.inf --- a/web_pub/favourites_engine_api/group/bld.inf Fri Sep 17 08:35:41 2010 +0300 +++ b/web_pub/favourites_engine_api/group/bld.inf Mon Oct 04 02:05:18 2010 +0300 @@ -15,7 +15,7 @@ * */ #include -#include "../../../web_plat/browser_platform_api/inc/Browser_platform_variant.hrh" +#include "../../../web_plat/browser_platform_api/inc/browser_platform_variant.hrh" PRJ_PLATFORMS DEFAULT @@ -23,22 +23,22 @@ PRJ_EXPORTS // Common code -../inc/FavouritesDb.h MW_LAYER_PUBLIC_EXPORT_PATH(FavouritesDb.h) -../inc/FavouritesFile.h MW_LAYER_PUBLIC_EXPORT_PATH(FavouritesFile.h) -../inc/FavouritesFile.inl MW_LAYER_PUBLIC_EXPORT_PATH(FavouritesFile.inl) -../inc/FavouritesDbIncremental.h MW_LAYER_PUBLIC_EXPORT_PATH(FavouritesDbIncremental.h) -../inc/FavouritesDbNotifier.h MW_LAYER_PUBLIC_EXPORT_PATH(FavouritesDbNotifier.h) -../inc/FavouritesDbObserver.h MW_LAYER_PUBLIC_EXPORT_PATH(FavouritesDbObserver.h) -../inc/ActiveFavouritesDbNotifier.h MW_LAYER_PUBLIC_EXPORT_PATH(ActiveFavouritesDbNotifier.h) -../inc/FavouritesItem.h MW_LAYER_PUBLIC_EXPORT_PATH(FavouritesItem.h) -../inc/FavouritesLimits.h MW_LAYER_PUBLIC_EXPORT_PATH(FavouritesLimits.h) -../inc/FavouritesWapAp.h MW_LAYER_PUBLIC_EXPORT_PATH(FavouritesWapAp.h) -../inc/FavouritesItemList.h MW_LAYER_PUBLIC_EXPORT_PATH(FavouritesItemList.h) -../inc/FavouritesItemData.h MW_LAYER_PUBLIC_EXPORT_PATH(FavouritesItemData.h) -../inc/FavouritesSession.h MW_LAYER_PUBLIC_EXPORT_PATH(FavouritesSession.h) -../inc/FavouritesSession.inl MW_LAYER_PUBLIC_EXPORT_PATH(FavouritesSession.inl) -../inc/FavouritesHandle.h MW_LAYER_PUBLIC_EXPORT_PATH(FavouritesHandle.h) -../inc/FavouritesHandle.inl MW_LAYER_PUBLIC_EXPORT_PATH(FavouritesHandle.inl) +../inc/favouritesdb.h MW_LAYER_PUBLIC_EXPORT_PATH(favouritesdb.h) +../inc/favouritesfile.h MW_LAYER_PUBLIC_EXPORT_PATH(favouritesfile.h) +../inc/favouritesfile.inl MW_LAYER_PUBLIC_EXPORT_PATH(favouritesfile.inl ) +../inc/favouritesdbIncremental.h MW_LAYER_PUBLIC_EXPORT_PATH(favouritesdbIncremental.h) +../inc/favouritesdbnotifier.h MW_LAYER_PUBLIC_EXPORT_PATH(favouritesdbnotifier.h) +../inc/favouritesdbobserver.h MW_LAYER_PUBLIC_EXPORT_PATH(favouritesdbobserver.h) +../inc/activefavouritesdbnotifier.h MW_LAYER_PUBLIC_EXPORT_PATH(activefavouritesdbnotifier.h ) +../inc/favouritesitem.h MW_LAYER_PUBLIC_EXPORT_PATH(favouritesitem.h) +../inc/favouriteslimits.h MW_LAYER_PUBLIC_EXPORT_PATH(favouriteslimits.h) +../inc/favouriteswapap.h MW_LAYER_PUBLIC_EXPORT_PATH(favouriteswapap.h) +../inc/favouritesitemlist.h MW_LAYER_PUBLIC_EXPORT_PATH(favouritesitemlist.h) +../inc/favouritesitemdata.h MW_LAYER_PUBLIC_EXPORT_PATH(favouritesitemdata.h) +../inc/favouritessession.h MW_LAYER_PUBLIC_EXPORT_PATH(favouritessession.h) +../inc/favouritessession.inl MW_LAYER_PUBLIC_EXPORT_PATH(favouritessession.inl) +../inc/favouriteshandle.h MW_LAYER_PUBLIC_EXPORT_PATH(favouriteshandle.h) +../inc/favouriteshandle.inl MW_LAYER_PUBLIC_EXPORT_PATH(favouriteshandle.inl) diff -r 12b27423e739 -r 1218a829abb5 web_pub/favourites_engine_api/inc/ActiveFavouritesDbNotifier.h --- a/web_pub/favourites_engine_api/inc/ActiveFavouritesDbNotifier.h Fri Sep 17 08:35:41 2010 +0300 +++ b/web_pub/favourites_engine_api/inc/ActiveFavouritesDbNotifier.h Mon Oct 04 02:05:18 2010 +0300 @@ -25,7 +25,7 @@ #include #include -#include +#include // FORWARD DECLARATION diff -r 12b27423e739 -r 1218a829abb5 web_pub/favourites_engine_api/inc/FavouritesDb.h --- a/web_pub/favourites_engine_api/inc/FavouritesDb.h Fri Sep 17 08:35:41 2010 +0300 +++ b/web_pub/favourites_engine_api/inc/FavouritesDb.h Mon Oct 04 02:05:18 2010 +0300 @@ -25,10 +25,10 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include // FORWARD DECLARATIONS diff -r 12b27423e739 -r 1218a829abb5 web_pub/favourites_engine_api/inc/FavouritesDbIncremental.h --- a/web_pub/favourites_engine_api/inc/FavouritesDbIncremental.h Fri Sep 17 08:35:41 2010 +0300 +++ b/web_pub/favourites_engine_api/inc/FavouritesDbIncremental.h Mon Oct 04 02:05:18 2010 +0300 @@ -24,7 +24,7 @@ // INCLUDES -#include +#include // FORWARD DECLARATIONS diff -r 12b27423e739 -r 1218a829abb5 web_pub/favourites_engine_api/inc/FavouritesDbNotifier.h --- a/web_pub/favourites_engine_api/inc/FavouritesDbNotifier.h Fri Sep 17 08:35:41 2010 +0300 +++ b/web_pub/favourites_engine_api/inc/FavouritesDbNotifier.h Mon Oct 04 02:05:18 2010 +0300 @@ -24,7 +24,7 @@ // INCLUDES -#include +#include // FORWARD DECLARATIONS diff -r 12b27423e739 -r 1218a829abb5 web_pub/favourites_engine_api/inc/FavouritesFile.h --- a/web_pub/favourites_engine_api/inc/FavouritesFile.h Fri Sep 17 08:35:41 2010 +0300 +++ b/web_pub/favourites_engine_api/inc/FavouritesFile.h Mon Oct 04 02:05:18 2010 +0300 @@ -23,7 +23,7 @@ // INCLUDES -#include +#include // FORWARD DECLARATION @@ -120,7 +120,7 @@ }; -#include +#include #endif diff -r 12b27423e739 -r 1218a829abb5 web_pub/favourites_engine_api/inc/FavouritesHandle.h --- a/web_pub/favourites_engine_api/inc/FavouritesHandle.h Fri Sep 17 08:35:41 2010 +0300 +++ b/web_pub/favourites_engine_api/inc/FavouritesHandle.h Mon Oct 04 02:05:18 2010 +0300 @@ -24,7 +24,7 @@ // INCLUDES #include -#include +#include // CLASS DECLARATION @@ -128,7 +128,7 @@ }; -#include +#include #endif diff -r 12b27423e739 -r 1218a829abb5 web_pub/favourites_engine_api/inc/FavouritesItem.h --- a/web_pub/favourites_engine_api/inc/FavouritesItem.h Fri Sep 17 08:35:41 2010 +0300 +++ b/web_pub/favourites_engine_api/inc/FavouritesItem.h Mon Oct 04 02:05:18 2010 +0300 @@ -24,8 +24,8 @@ // INCLUDES #include -#include -#include +#include +#include // FORWARD DECLARATION diff -r 12b27423e739 -r 1218a829abb5 web_pub/favourites_engine_api/inc/FavouritesSession.h --- a/web_pub/favourites_engine_api/inc/FavouritesSession.h Fri Sep 17 08:35:41 2010 +0300 +++ b/web_pub/favourites_engine_api/inc/FavouritesSession.h Mon Oct 04 02:05:18 2010 +0300 @@ -136,6 +136,6 @@ #endif -#include +#include // End of File diff -r 12b27423e739 -r 1218a829abb5 web_pub/favourites_engine_api/tsrc/group/FavouritesEngineTest.mmp --- a/web_pub/favourites_engine_api/tsrc/group/FavouritesEngineTest.mmp Fri Sep 17 08:35:41 2010 +0300 +++ b/web_pub/favourites_engine_api/tsrc/group/FavouritesEngineTest.mmp Mon Oct 04 02:05:18 2010 +0300 @@ -16,7 +16,7 @@ */ #include -#include +#include TARGET FavouritesEngineTest.dll TARGETTYPE dll @@ -31,17 +31,17 @@ DEFFILE FavouritesEngineTest.def SOURCEPATH ../src -SOURCE FavouritesEngineTest.cpp -SOURCE FavouritesItemTestCases.cpp -SOURCE FavouritesItemListTestCases.cpp -SOURCE FavouritesDbTestCases.cpp -SOURCE FavouritesWapApTestCases.cpp -SOURCE FavouritesDbIncrementalTestCases.cpp -SOURCE FavouritesFileTestCases.cpp -SOURCE FavouritesSessionTestCases.cpp -SOURCE FavouritesNotifierTestCases.cpp -SOURCE FavouritesItemTestData.cpp -SOURCE FavouritesDbTestObserver.cpp +SOURCE favouritesenginetest.cpp +SOURCE favouritesitemtestcases.cpp +SOURCE favouritesitemlisttestcases.cpp +SOURCE favouritesdbtestcases.cpp +SOURCE favouriteswapaptestcases.cpp +SOURCE favouritesdbincrementaltestcases.cpp +SOURCE favouritesfiletestcases.cpp +SOURCE favouritessessiontestcases.cpp +SOURCE favouritesnotifiertestcases.cpp +SOURCE favouritesitemtestdata.cpp +SOURCE favouritesdbtestobserver.cpp USERINCLUDE ../inc SYSTEMINCLUDE ../../inc diff -r 12b27423e739 -r 1218a829abb5 web_pub/favourites_engine_api/tsrc/inc/FavouritesDbTestObserver.h --- a/web_pub/favourites_engine_api/tsrc/inc/FavouritesDbTestObserver.h Fri Sep 17 08:35:41 2010 +0300 +++ b/web_pub/favourites_engine_api/tsrc/inc/FavouritesDbTestObserver.h Mon Oct 04 02:05:18 2010 +0300 @@ -22,8 +22,8 @@ // INCLUDES #include -#include -#include "FavouritesEngineTest.h" +#include +#include "favouritesenginetest.h" // FORWARD DECLARATION diff -r 12b27423e739 -r 1218a829abb5 web_pub/favourites_engine_api/tsrc/inc/FavouritesEngineTest.h --- a/web_pub/favourites_engine_api/tsrc/inc/FavouritesEngineTest.h Fri Sep 17 08:35:41 2010 +0300 +++ b/web_pub/favourites_engine_api/tsrc/inc/FavouritesEngineTest.h Mon Oct 04 02:05:18 2010 +0300 @@ -1,6 +1,6 @@ /* * ============================================================================== -* Name : FavouritesEngineTest.h +* Name : favouritesenginetest.h * Part of : ?Subsystem_name / FavouritesEngineTest * * Description : FavouritesEngineTest test module. @@ -27,16 +27,16 @@ #include "StifTestModule.h" #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include //#include -#include -#include -#include -#include "FavouritesItemTestData.h" +#include +#include +#include +#include "favouritesitemtestdata.h" // CONSTANTS _LIT( KTestDbName, "Test" ); diff -r 12b27423e739 -r 1218a829abb5 web_pub/favourites_engine_api/tsrc/inc/FavouritesItemTestData.h --- a/web_pub/favourites_engine_api/tsrc/inc/FavouritesItemTestData.h Fri Sep 17 08:35:41 2010 +0300 +++ b/web_pub/favourites_engine_api/tsrc/inc/FavouritesItemTestData.h Mon Oct 04 02:05:18 2010 +0300 @@ -22,7 +22,7 @@ // INCLUDES #include -#include +#include // CLASS DECLARATION diff -r 12b27423e739 -r 1218a829abb5 web_pub/favourites_engine_api/tsrc/src/FavouritesDbIncrementalTestCases.cpp --- a/web_pub/favourites_engine_api/tsrc/src/FavouritesDbIncrementalTestCases.cpp Fri Sep 17 08:35:41 2010 +0300 +++ b/web_pub/favourites_engine_api/tsrc/src/FavouritesDbIncrementalTestCases.cpp Mon Oct 04 02:05:18 2010 +0300 @@ -20,7 +20,7 @@ // INCLUDE FILES #include -#include "FavouritesEngineTest.h" +#include "favouritesenginetest.h" // EXTERNAL DATA STRUCTURES // None diff -r 12b27423e739 -r 1218a829abb5 web_pub/favourites_engine_api/tsrc/src/FavouritesDbTestCases.cpp --- a/web_pub/favourites_engine_api/tsrc/src/FavouritesDbTestCases.cpp Fri Sep 17 08:35:41 2010 +0300 +++ b/web_pub/favourites_engine_api/tsrc/src/FavouritesDbTestCases.cpp Mon Oct 04 02:05:18 2010 +0300 @@ -20,7 +20,7 @@ // INCLUDE FILES #include -#include "FavouritesEngineTest.h" +#include "favouritesenginetest.h" // EXTERNAL DATA STRUCTURES // None diff -r 12b27423e739 -r 1218a829abb5 web_pub/favourites_engine_api/tsrc/src/FavouritesDbTestObserver.cpp --- a/web_pub/favourites_engine_api/tsrc/src/FavouritesDbTestObserver.cpp Fri Sep 17 08:35:41 2010 +0300 +++ b/web_pub/favourites_engine_api/tsrc/src/FavouritesDbTestObserver.cpp Mon Oct 04 02:05:18 2010 +0300 @@ -18,10 +18,10 @@ // INCLUDE FILES -#include -#include "FavouritesDbTestObserver.h" +#include +#include "favouritesdbtestobserver.h" //#include "FavouritesDbTester.h" -#include "ActiveFavouritesDbNotifier.h" +#include "activefavouritesdbnotifier.h " // CONSTANTS diff -r 12b27423e739 -r 1218a829abb5 web_pub/favourites_engine_api/tsrc/src/FavouritesEngineTest.cpp --- a/web_pub/favourites_engine_api/tsrc/src/FavouritesEngineTest.cpp Fri Sep 17 08:35:41 2010 +0300 +++ b/web_pub/favourites_engine_api/tsrc/src/FavouritesEngineTest.cpp Mon Oct 04 02:05:18 2010 +0300 @@ -1,6 +1,6 @@ /* * ============================================================================== -* Name : FavouritesEngineTest.cpp +* Name : favouritesenginetest.cpp * Part of : ?Subsystem_name / FavouritesEngineTest * * Description : FavouritesBCTest class member functions @@ -22,7 +22,7 @@ // INCLUDE FILES #include -#include "FavouritesEngineTest.h" +#include "favouritesenginetest.h" // EXTERNAL DATA STRUCTURES diff -r 12b27423e739 -r 1218a829abb5 web_pub/favourites_engine_api/tsrc/src/FavouritesFileTestCases.cpp --- a/web_pub/favourites_engine_api/tsrc/src/FavouritesFileTestCases.cpp Fri Sep 17 08:35:41 2010 +0300 +++ b/web_pub/favourites_engine_api/tsrc/src/FavouritesFileTestCases.cpp Mon Oct 04 02:05:18 2010 +0300 @@ -20,7 +20,7 @@ // INCLUDE FILES #include -#include "FavouritesEngineTest.h" +#include "favouritesenginetest.h" // EXTERNAL DATA STRUCTURES // None diff -r 12b27423e739 -r 1218a829abb5 web_pub/favourites_engine_api/tsrc/src/FavouritesItemListTestCases.cpp --- a/web_pub/favourites_engine_api/tsrc/src/FavouritesItemListTestCases.cpp Fri Sep 17 08:35:41 2010 +0300 +++ b/web_pub/favourites_engine_api/tsrc/src/FavouritesItemListTestCases.cpp Mon Oct 04 02:05:18 2010 +0300 @@ -20,7 +20,7 @@ // INCLUDE FILES #include -#include "FavouritesEngineTest.h" +#include "favouritesenginetest.h" // EXTERNAL DATA STRUCTURES // None diff -r 12b27423e739 -r 1218a829abb5 web_pub/favourites_engine_api/tsrc/src/FavouritesItemTestCases.cpp --- a/web_pub/favourites_engine_api/tsrc/src/FavouritesItemTestCases.cpp Fri Sep 17 08:35:41 2010 +0300 +++ b/web_pub/favourites_engine_api/tsrc/src/FavouritesItemTestCases.cpp Mon Oct 04 02:05:18 2010 +0300 @@ -1,6 +1,6 @@ /* * ============================================================================ -* Name: FavouritesItemTestCases.cpp +* Name: favouritesitemtestcases.cpp * Part of: FavouritesEngineTest class member functions * * Description: @@ -23,7 +23,7 @@ // INCLUDE FILES #include -#include "FavouritesEngineTest.h" +#include "favouritesenginetest.h" // EXTERNAL DATA STRUCTURES // None diff -r 12b27423e739 -r 1218a829abb5 web_pub/favourites_engine_api/tsrc/src/FavouritesItemTestData.cpp --- a/web_pub/favourites_engine_api/tsrc/src/FavouritesItemTestData.cpp Fri Sep 17 08:35:41 2010 +0300 +++ b/web_pub/favourites_engine_api/tsrc/src/FavouritesItemTestData.cpp Mon Oct 04 02:05:18 2010 +0300 @@ -19,7 +19,7 @@ // INCLUDE FILES #include -#include "FavouritesItemTestData.h" +#include "favouritesitemtestdata.h" // ================= MEMBER FUNCTIONS ======================= diff -r 12b27423e739 -r 1218a829abb5 web_pub/favourites_engine_api/tsrc/src/FavouritesNotifierTestCases.cpp --- a/web_pub/favourites_engine_api/tsrc/src/FavouritesNotifierTestCases.cpp Fri Sep 17 08:35:41 2010 +0300 +++ b/web_pub/favourites_engine_api/tsrc/src/FavouritesNotifierTestCases.cpp Mon Oct 04 02:05:18 2010 +0300 @@ -20,8 +20,8 @@ // INCLUDE FILES #include -#include "FavouritesEngineTest.h" -#include "FavouritesDbTestObserver.h" +#include "favouritesenginetest.h" +#include "favouritesdbtestobserver.h" // EXTERNAL DATA STRUCTURES // None diff -r 12b27423e739 -r 1218a829abb5 web_pub/favourites_engine_api/tsrc/src/FavouritesSessionTestCases.cpp --- a/web_pub/favourites_engine_api/tsrc/src/FavouritesSessionTestCases.cpp Fri Sep 17 08:35:41 2010 +0300 +++ b/web_pub/favourites_engine_api/tsrc/src/FavouritesSessionTestCases.cpp Mon Oct 04 02:05:18 2010 +0300 @@ -20,7 +20,7 @@ // INCLUDE FILES #include -#include "FavouritesEngineTest.h" +#include "favouritesenginetest.h" // EXTERNAL DATA STRUCTURES // None diff -r 12b27423e739 -r 1218a829abb5 web_pub/favourites_engine_api/tsrc/src/FavouritesWapApTestCases.cpp --- a/web_pub/favourites_engine_api/tsrc/src/FavouritesWapApTestCases.cpp Fri Sep 17 08:35:41 2010 +0300 +++ b/web_pub/favourites_engine_api/tsrc/src/FavouritesWapApTestCases.cpp Mon Oct 04 02:05:18 2010 +0300 @@ -1,6 +1,6 @@ /* * ============================================================================ -* Name: FavouritesWapApTestCases.cpp +* Name: favouriteswapaptestcases.cpp * Part of: FavouritesEngineTest class member functions * * Description: @@ -23,7 +23,7 @@ // INCLUDE FILES #include -#include "FavouritesEngineTest.h" +#include "favouritesenginetest.h" // EXTERNAL DATA STRUCTURES // None