# HG changeset patch # User Dremov Kirill (Nokia-D-MSW/Tampere) # Date 1259045793 -7200 # Node ID 50974a8b132e3c7b0abe7345e54b6e9c26096a95 # Parent 8d692d9f828f5df16ae430b9e8bde5d7c3c1e22a Revision: 200945 Kit: 200948 diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/group/sapiincludes.mmpi --- a/serviceproviders/group/sapiincludes.mmpi Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/group/sapiincludes.mmpi Tue Nov 24 08:56:33 2009 +0200 @@ -12,8 +12,8 @@ * Contributors: * * Description: Sapi include path dependencies. -* %created_by: vahegde % -* %date_created: Wed Jun 24 18:02:52 2009 % +* %created_by: slathia % +* %date_created: Sat Oct 31 14:39:55 2009 % * Copyright © 2006-2007 Nokia. All rights reserved. * This material, including documentation and any related computer * programs, is protected by copyright controlled by Nokia. All @@ -30,8 +30,8 @@ #include #include -SYSTEMINCLUDE \Epoc32\include\icl -SYSTEMINCLUDE \Epoc32\include\libc +SYSTEMINCLUDE /epoc32/include/icl +SYSTEMINCLUDE /epoc32/include/libc APP_LAYER_SYSTEMINCLUDE diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_applicationmanager/appmanagerservice/inc/appinfo.h --- a/serviceproviders/sapi_applicationmanager/appmanagerservice/inc/appinfo.h Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_applicationmanager/appmanagerservice/inc/appinfo.h Tue Nov 24 08:56:33 2009 +0200 @@ -22,8 +22,8 @@ #ifndef _APPINFO_H__ #define _APPINFO_H__ #include -#include // For TApaAppInfo -#include // CDesC16Array +#include // For TApaAppInfo +#include // CDesC16Array #include "appmanagercommon.h" _LIT8(KCaption,"Caption"); diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_applicationmanager/appmanagerservice/inc/pkginfo.h --- a/serviceproviders/sapi_applicationmanager/appmanagerservice/inc/pkginfo.h Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_applicationmanager/appmanagerservice/inc/pkginfo.h Tue Nov 24 08:56:33 2009 +0200 @@ -29,10 +29,10 @@ #include #include -#include -#include // CDesC16Array +#include +#include // CDesC16Array -#include "appManagercommon.h" +#include "appmanagercommon.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_applicationmanager/appmanagerservice/src/appiterator.cpp --- a/serviceproviders/sapi_applicationmanager/appmanagerservice/src/appiterator.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_applicationmanager/appmanagerservice/src/appiterator.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -18,9 +18,9 @@ #include -#include -#include -#include +#include +#include +#include #include "appiterator.h" #include "appinfo.h" #include "appmanagercommon.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_applicationmanager/inc/appinfomap.h --- a/serviceproviders/sapi_applicationmanager/inc/appinfomap.h Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_applicationmanager/inc/appinfomap.h Tue Nov 24 08:56:33 2009 +0200 @@ -19,7 +19,7 @@ #ifndef __CAPPINFOMAP_H #define __CAPPINFOMAP_H -#include +#include class MInfoMap; diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_applicationmanager/inc/appitemslist.h --- a/serviceproviders/sapi_applicationmanager/inc/appitemslist.h Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_applicationmanager/inc/appitemslist.h Tue Nov 24 08:56:33 2009 +0200 @@ -19,7 +19,7 @@ #ifndef __CAPPITEMSLIST_H #define __CAPPITEMSLIST_H -#include +#include class MIterator; diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_applicationmanager/inc/appmanagerinterface.h --- a/serviceproviders/sapi_applicationmanager/inc/appmanagerinterface.h Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_applicationmanager/inc/appmanagerinterface.h Tue Nov 24 08:56:33 2009 +0200 @@ -26,7 +26,7 @@ class CAppManagerService; class CAppManagerServiceObserver; -#include +#include // CLASS DECLARATION diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_applicationmanager/inc/appmanagerservicehandler.h --- a/serviceproviders/sapi_applicationmanager/inc/appmanagerservicehandler.h Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_applicationmanager/inc/appmanagerservicehandler.h Tue Nov 24 08:56:33 2009 +0200 @@ -20,7 +20,7 @@ #ifndef __CAPPMANAGERSERVICEHANDLER_H #define __CAPPMANAGERSERVICEHANDLER_H -#include +#include class CAppManagerServiceHandler : public CLiwServiceIfBase diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_applicationmanager/src/appmanagerinterface.cpp --- a/serviceproviders/sapi_applicationmanager/src/appmanagerinterface.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_applicationmanager/src/appmanagerinterface.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -19,8 +19,8 @@ -#include -#include +#include +#include #include #include "appmanagerinterface.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_applicationmanager/src/appserviceobserver.cpp --- a/serviceproviders/sapi_applicationmanager/src/appserviceobserver.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_applicationmanager/src/appserviceobserver.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -16,7 +16,7 @@ */ -#include +#include #include "appserviceobserver.h" #include "serviceerrno.h" //Output Keys/arguments diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_applicationmanager/tsrc/dev/tappmanagerprovidertest/inc/testappobserver.h --- a/serviceproviders/sapi_applicationmanager/tsrc/dev/tappmanagerprovidertest/inc/testappobserver.h Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_applicationmanager/tsrc/dev/tappmanagerprovidertest/inc/testappobserver.h Tue Nov 24 08:56:33 2009 +0200 @@ -21,7 +21,7 @@ -#include +#include #include "e32base.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_applicationmanager/tsrc/dev/tappmanagerprovidertest/src/appmanager_testblocks.cpp --- a/serviceproviders/sapi_applicationmanager/tsrc/dev/tappmanagerprovidertest/src/appmanager_testblocks.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_applicationmanager/tsrc/dev/tappmanagerprovidertest/src/appmanager_testblocks.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -20,9 +20,9 @@ // INCLUDE FILES #include #include -#include -#include -#include +#include +#include +#include #include "appmanagertest.h" #include "appmanagerservice.h" #include "appmanagercommon.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_applicationmanager/tsrc/dev/tappmanagerprovidertest/src/appmanagertest.cpp --- a/serviceproviders/sapi_applicationmanager/tsrc/dev/tappmanagerprovidertest/src/appmanagertest.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_applicationmanager/tsrc/dev/tappmanagerprovidertest/src/appmanagertest.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -18,7 +18,7 @@ // INCLUDE FILES -#include +#include #include "appmanagertest.h" // EXTERNAL DATA STRUCTURES diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_applicationmanager/tsrc/dev/tappmanagertest/src/appmanager_testblocks.cpp --- a/serviceproviders/sapi_applicationmanager/tsrc/dev/tappmanagertest/src/appmanager_testblocks.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_applicationmanager/tsrc/dev/tappmanagertest/src/appmanager_testblocks.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -20,7 +20,7 @@ // INCLUDE FILES #include #include -#include +#include #include "appmanagertest.h" #include "appmanagerservice.h" #include "appmanagercommon.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_applicationmanager/tsrc/dev/tappmanagertest/src/appmanagertest.cpp --- a/serviceproviders/sapi_applicationmanager/tsrc/dev/tappmanagertest/src/appmanagertest.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_applicationmanager/tsrc/dev/tappmanagertest/src/appmanagertest.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -18,7 +18,7 @@ // INCLUDE FILES -#include +#include #include "appmanagertest.h" // EXTERNAL DATA STRUCTURES diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_applicationmanager/tsrc/dev/tappmanprovidernegativetest/inc/tprovidertest.h --- a/serviceproviders/sapi_applicationmanager/tsrc/dev/tappmanprovidernegativetest/inc/tprovidertest.h Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_applicationmanager/tsrc/dev/tappmanprovidernegativetest/inc/tprovidertest.h Tue Nov 24 08:56:33 2009 +0200 @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_applicationmanager/tsrc/dev/tappmanprovidernegativetest/inc/tprovidertestobserver.h --- a/serviceproviders/sapi_applicationmanager/tsrc/dev/tappmanprovidernegativetest/inc/tprovidertestobserver.h Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_applicationmanager/tsrc/dev/tappmanprovidernegativetest/inc/tprovidertestobserver.h Tue Nov 24 08:56:33 2009 +0200 @@ -21,7 +21,7 @@ -#include +#include #include "e32base.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_applicationmanager/tsrc/dev/tappmanprovidernegativetest/src/tprovidertest.cpp --- a/serviceproviders/sapi_applicationmanager/tsrc/dev/tappmanprovidernegativetest/src/tprovidertest.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_applicationmanager/tsrc/dev/tappmanprovidernegativetest/src/tprovidertest.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -18,7 +18,7 @@ // INCLUDE FILES -#include +#include #include #include #include "tprovidertest.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_applicationmanager/tsrc/dev/tappmanprovidernegativetest/src/tprovidertest_testblocks.cpp --- a/serviceproviders/sapi_applicationmanager/tsrc/dev/tappmanprovidernegativetest/src/tprovidertest_testblocks.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_applicationmanager/tsrc/dev/tappmanprovidernegativetest/src/tprovidertest_testblocks.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -20,9 +20,9 @@ // INCLUDE FILES #include #include -#include -#include -#include +#include +#include +#include #include "tprovidertest.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_applicationmanager/tsrc/dev/tappmanprovidernegativetest/src/txmlconvertor.cpp --- a/serviceproviders/sapi_applicationmanager/tsrc/dev/tappmanprovidernegativetest/src/txmlconvertor.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_applicationmanager/tsrc/dev/tappmanprovidernegativetest/src/txmlconvertor.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -20,12 +20,12 @@ // INCLUDE FILES #include -#include -#include +#include +#include #include #include #include -#include +#include #include #include "txmlconvertor.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_applicationmanager/tsrc/dev/testappmngui/group/testappmngui.mmp --- a/serviceproviders/sapi_applicationmanager/tsrc/dev/testappmngui/group/testappmngui.mmp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_applicationmanager/tsrc/dev/testappmngui/group/testappmngui.mmp Tue Nov 24 08:56:33 2009 +0200 @@ -41,12 +41,12 @@ LANG SC SOURCEPATH ../src -DOCUMENT Series_60_APP_ReadMe.txt +DOCUMENT series_60_app_readme.txt SOURCE testappmngui.cpp -SOURCE testappmnguiApplication.cpp -SOURCE testappmnguiAppView.cpp -SOURCE testappmnguiAppUi.cpp -SOURCE testappmnguiDocument.cpp +SOURCE testappmnguiapplication.cpp +SOURCE testappmnguiappview.cpp +SOURCE testappmnguiappui.cpp +SOURCE testappmnguidocument.cpp SOURCE testappobserver.cpp SOURCEPATH ../group @@ -73,7 +73,7 @@ LIBRARY liwServiceHandler.lib #ifdef __UI_FRAMEWORKS_V2__ -START RESOURCE testappmngui.RSS +START RESOURCE testappmngui.rss HEADER targetpath /resource/apps @@ -93,7 +93,7 @@ #endif END -start resource testappmngui_loc.RSS +start resource testappmngui_loc.rss targetpath /resource/apps lang sc end diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_applicationmanager/tsrc/dev/testappmngui/inc/testappmnguidocument.h --- a/serviceproviders/sapi_applicationmanager/tsrc/dev/testappmngui/inc/testappmnguidocument.h Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_applicationmanager/tsrc/dev/testappmngui/inc/testappmnguidocument.h Tue Nov 24 08:56:33 2009 +0200 @@ -20,7 +20,7 @@ #define __TESTAPPMNGUI_DOCUMENT_H__ -#include +#include // Forward references class CtestappmnguiAppUi; diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_applicationmanager/tsrc/dev/testappmngui/src/testappmngui.cpp --- a/serviceproviders/sapi_applicationmanager/tsrc/dev/testappmngui/src/testappmngui.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_applicationmanager/tsrc/dev/testappmngui/src/testappmngui.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -16,7 +16,7 @@ */ -#include "testappmnguiApplication.h" +#include "testappmnguiapplication.h" #include #pragma message("Please ensure that you read the ReadMe file.") diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_applicationmanager/tsrc/dev/testappmngui/src/testappmnguiapplication.cpp --- a/serviceproviders/sapi_applicationmanager/tsrc/dev/testappmngui/src/testappmnguiapplication.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_applicationmanager/tsrc/dev/testappmngui/src/testappmnguiapplication.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -16,8 +16,8 @@ */ -#include "testappmnguiDocument.h" -#include "testappmnguiApplication.h" +#include "testappmnguidocument.h" +#include "testappmnguiapplication.h" // UID for the application, this should correspond to the uid defined in the mmp file static const TUid KUidtestappmnguiApp = {0x03AB7FB5}; diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_applicationmanager/tsrc/dev/testappmngui/src/testappmnguiappui.cpp --- a/serviceproviders/sapi_applicationmanager/tsrc/dev/testappmngui/src/testappmnguiappui.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_applicationmanager/tsrc/dev/testappmngui/src/testappmnguiappui.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -20,8 +20,8 @@ #include #include #include -#include -#include +#include +#include #include "appmanagerservice.h" #include "appmanagercommon.h" #include @@ -31,8 +31,8 @@ #include "appmanagerservice.h" #include "testappmngui.pan" -#include "testappmnguiAppUi.h" -#include "testappmnguiAppView.h" +#include "testappmnguiappui.h" +#include "testappmnguiappview.h" #include "testappmngui.hrh" #include "testappobserver.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_applicationmanager/tsrc/dev/testappmngui/src/testappmnguiappview.cpp --- a/serviceproviders/sapi_applicationmanager/tsrc/dev/testappmngui/src/testappmnguiappview.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_applicationmanager/tsrc/dev/testappmngui/src/testappmnguiappview.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -19,7 +19,7 @@ #include #include -#include "testappmnguiAppView.h" +#include "testappmnguiappview.h" // Standard construction sequence CtestappmnguiAppView* CtestappmnguiAppView::NewL(const TRect& aRect) diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_applicationmanager/tsrc/dev/testappmngui/src/testappmnguidocument.cpp --- a/serviceproviders/sapi_applicationmanager/tsrc/dev/testappmngui/src/testappmnguidocument.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_applicationmanager/tsrc/dev/testappmngui/src/testappmnguidocument.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -16,8 +16,8 @@ */ -#include "testappmnguiAppUi.h" -#include "testappmnguiDocument.h" +#include "testappmnguiappui.h" +#include "testappmnguidocument.h" // Standard Symbian OS construction sequence CtestappmnguiDocument* CtestappmnguiDocument::NewL(CEikApplication& aApp) diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_applicationmanager/tsrc/testing/tappmgrprovider/group/tappmgrprovider.mmp --- a/serviceproviders/sapi_applicationmanager/tsrc/testing/tappmgrprovider/group/tappmgrprovider.mmp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_applicationmanager/tsrc/testing/tappmgrprovider/group/tappmgrprovider.mmp Tue Nov 24 08:56:33 2009 +0200 @@ -35,7 +35,7 @@ SOURCEPATH ../src SOURCE tappmgrprovider.cpp -SOURCE tappmgrproviderBlocks.cpp +SOURCE tappmgrproviderblocks.cpp SOURCE testappobserver.cpp USERINCLUDE ../inc diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_applicationmanager/tsrc/testing/tappmgrprovider/inc/testappobserver.h --- a/serviceproviders/sapi_applicationmanager/tsrc/testing/tappmgrprovider/inc/testappobserver.h Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_applicationmanager/tsrc/testing/tappmgrprovider/inc/testappobserver.h Tue Nov 24 08:56:33 2009 +0200 @@ -21,7 +21,7 @@ -#include +#include #include "e32base.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_applicationmanager/tsrc/testing/tappmgrprovider/src/tappmgrprovider.cpp --- a/serviceproviders/sapi_applicationmanager/tsrc/testing/tappmgrprovider/src/tappmgrprovider.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_applicationmanager/tsrc/testing/tappmgrprovider/src/tappmgrprovider.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -18,7 +18,7 @@ // INCLUDE FILES -#include +#include #include "tappmgrprovider.h" // EXTERNAL DATA STRUCTURES diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_applicationmanager/tsrc/testing/tappmgrprovider/src/tappmgrproviderblocks.cpp --- a/serviceproviders/sapi_applicationmanager/tsrc/testing/tappmgrprovider/src/tappmgrproviderblocks.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_applicationmanager/tsrc/testing/tappmgrprovider/src/tappmgrproviderblocks.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -20,9 +20,9 @@ // INCLUDE FILES #include #include -#include -#include -#include +#include +#include +#include #include "tappmgrprovider.h" #include "appmanagerservice.h" #include "appmanagercommon.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_applicationmanager/tsrc/testing/tappmgrtest/group/tappmgrtest.mmp --- a/serviceproviders/sapi_applicationmanager/tsrc/testing/tappmgrtest/group/tappmgrtest.mmp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_applicationmanager/tsrc/testing/tappmgrtest/group/tappmgrtest.mmp Tue Nov 24 08:56:33 2009 +0200 @@ -33,7 +33,7 @@ SOURCEPATH ../src SOURCE tappmgrtest.cpp -SOURCE tappmgr_testBlocks.cpp +SOURCE tappmgr_testblocks.cpp SOURCE testappobserver.cpp //RESOURCE resource_file //RESOURCE resource_file2 diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_applicationmanager/tsrc/testing/tappmgrtest/src/tappmgr_testblocks.cpp --- a/serviceproviders/sapi_applicationmanager/tsrc/testing/tappmgrtest/src/tappmgr_testblocks.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_applicationmanager/tsrc/testing/tappmgrtest/src/tappmgr_testblocks.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -20,7 +20,7 @@ // INCLUDE FILES #include #include -#include +#include //#include"appmanagertest.h" #include "tappmgrtest.h" #include "appmanagerservice.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_applicationmanager/tsrc/testing/tappmgrtest/src/tappmgrtest.cpp --- a/serviceproviders/sapi_applicationmanager/tsrc/testing/tappmgrtest/src/tappmgrtest.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_applicationmanager/tsrc/testing/tappmgrtest/src/tappmgrtest.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -18,7 +18,7 @@ // INCLUDE FILES -#include +#include //#include "appmanagertest.h" #include "tappmgrtest.h" // EXTERNAL DATA STRUCTURES diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_calendar/calendarservice/src/addentry.cpp --- a/serviceproviders/sapi_calendar/calendarservice/src/addentry.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_calendar/calendarservice/src/addentry.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include #include #include @@ -525,14 +525,38 @@ User::Leave( KErrNotSupported ); } - TDateTime stTime; - stTime = aEntry->StartTimeL().TimeUtcL().DateTime(); - alTime.MinutesFrom( stTime, minutes );// calculate the offset between alarm time and start time - CCalAlarm* alarm = CCalAlarm::NewL(); - CleanupStack::PushL( alarm ); - alarm->SetTimeOffset(-minutes.Int()); - aEntry->SetAlarmL(alarm); // set the alarm for the entry - CleanupStack::PopAndDestroy( alarm ); + if( aEntry->EntryTypeL() != CCalEntry::ETodo ) + { + TDateTime stTime; + stTime = aEntry->StartTimeL().TimeUtcL().DateTime(); + alTime.MinutesFrom( stTime, minutes );// calculate the offset between alarm time and start time + CCalAlarm* alarm = CCalAlarm::NewL(); + CleanupStack::PushL( alarm ); + alarm->SetTimeOffset(-minutes.Int()); + aEntry->SetAlarmL(alarm); // set the alarm for the entry + CleanupStack::PopAndDestroy( alarm ); + } + else + { + TTime endTime; + endTime = aEntry->EndTimeL().TimeUtcL(); + if ( endTime != Time::NullTTime() ) + { + alTime.MinutesFrom( endTime, minutes );// calculate the offset between alarm time and start time + if(minutes.Int() < 0 ) + { + CCalAlarm* alarm = CCalAlarm::NewL(); + CleanupStack::PushL( alarm ); + alarm->SetTimeOffset(-minutes.Int()); + aEntry->SetAlarmL(alarm); // set the alarm for the entry + CleanupStack::PopAndDestroy( alarm ); + } + else + { + User::Leave( KErrNotSupported ); + } + } + } } } diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_calendar/calendarservice/src/calendarexport.cpp --- a/serviceproviders/sapi_calendar/calendarservice/src/calendarexport.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_calendar/calendarservice/src/calendarexport.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -29,7 +29,7 @@ #include "calendarheader.h" #include "calendarconstants.h" #include "asyncreqobserver.h" -#include "CalendarExport.h" +#include "calendarexport.h" void CleanupCCalEntryArray(TAny* aPointer); diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_calendar/calendarservice/src/calendarheader.cpp --- a/serviceproviders/sapi_calendar/calendarservice/src/calendarheader.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_calendar/calendarservice/src/calendarheader.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -22,7 +22,7 @@ #include #include #include -#include +#include #include "calendarheader.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_calendar/calendarservice/src/calendarnotify.cpp --- a/serviceproviders/sapi_calendar/calendarservice/src/calendarnotify.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_calendar/calendarservice/src/calendarnotify.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -21,8 +21,8 @@ #include -#include "Calendarheader.h" -#include "Calendarnotify.h" +#include "calendarheader.h" +#include "calendarnotify.h" #include "asyncreqobserver.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_calendar/calendarservice/src/calendarservice.cpp --- a/serviceproviders/sapi_calendar/calendarservice/src/calendarservice.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_calendar/calendarservice/src/calendarservice.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -28,7 +28,7 @@ #include "calendarconstants.h" #include "entryattributes.h" #include "calendarservice.h" -#include "Calendarnotify.h" +#include "calendarnotify.h" #include "calendardeleteentry.h" #include "calendarimport.h" #include "calendarexport.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_calendar/data/2000CFB4.rss --- a/serviceproviders/sapi_calendar/data/2000CFB4.rss Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_calendar/data/2000CFB4.rss Tue Nov 24 08:56:33 2009 +0200 @@ -16,9 +16,9 @@ */ -#include -#include "ecom/RegistryInfoV2.rh" -#include +#include +#include "ecom/registryinfov2.rh" +#include RESOURCE REGISTRY_INFO theInfo { diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_calendar/inc/calendarcallback.h --- a/serviceproviders/sapi_calendar/inc/calendarcallback.h Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_calendar/inc/calendarcallback.h Tue Nov 24 08:56:33 2009 +0200 @@ -19,9 +19,9 @@ #ifndef __CALENDARCALLBACK_H #define __CALENDARCALLBACK_H -#include -#include -#include +#include +#include +#include #include diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_calendar/inc/calendarinterface.h --- a/serviceproviders/sapi_calendar/inc/calendarinterface.h Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_calendar/inc/calendarinterface.h Tue Nov 24 08:56:33 2009 +0200 @@ -19,9 +19,9 @@ #ifndef __CALENDARINTERFACE_H #define __CALENDARINTERFACE_H -#include -#include -#include +#include +#include +#include #include #include diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_calendar/inc/calendariterableimpl.h --- a/serviceproviders/sapi_calendar/inc/calendariterableimpl.h Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_calendar/inc/calendariterableimpl.h Tue Nov 24 08:56:33 2009 +0200 @@ -19,9 +19,9 @@ #ifndef __CALENDARITERABLEIMPL_H #define __CALENDARITERABLEIMPL_H -#include -#include -#include +#include +#include +#include #include #include diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_calendar/inc/calendarservicehandler.h --- a/serviceproviders/sapi_calendar/inc/calendarservicehandler.h Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_calendar/inc/calendarservicehandler.h Tue Nov 24 08:56:33 2009 +0200 @@ -19,8 +19,8 @@ #ifndef __CALENDARSERVICEHANDLER_H #define __CALENDARSERVICEHANDLER_H -#include -#include +#include +#include /** * Provides implementation to CLiwServiceIfBase interface. diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_calendar/src/calendarservicehandler.cpp --- a/serviceproviders/sapi_calendar/src/calendarservicehandler.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_calendar/src/calendarservicehandler.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -17,7 +17,7 @@ -#include +#include #include "calendarinterface.h" #include "calendarservicehandler.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendaradditer3/inc/teststartconsolealarmserver2.h --- a/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendaradditer3/inc/teststartconsolealarmserver2.h Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendaradditer3/inc/teststartconsolealarmserver2.h Tue Nov 24 08:56:33 2009 +0200 @@ -21,13 +21,13 @@ #include #include -#include -#include -#include +#include +#include +#include #include "calendarconstants.h" #include "calendarheader.h" -#include "EntryAttributes.h" +#include "entryattributes.h" #include "calendarservice.h" extern void GetGlobalUid( const TDesC& aGlobalUid, TDes8& aOutGlobalUid ); diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendaradditer3/src/tcalendaraddtest.cpp --- a/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendaradditer3/src/tcalendaraddtest.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendaradditer3/src/tcalendaraddtest.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -23,8 +23,8 @@ //#include //#include //#include -#include -#include +#include +#include #include "tcalendaraddtest.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendaradditer3/src/tcalendaraddtestblocks.cpp --- a/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendaradditer3/src/tcalendaraddtestblocks.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendaradditer3/src/tcalendaraddtestblocks.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -22,10 +22,10 @@ #include #include //#include -#include -#include -#include -#include +#include +#include +#include +#include #include "tcalendaraddtest.h" #include "calendarheader.h" #include "calendarconstants.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendaradditer3/src/tcalendaraddtestblocksdirect.cpp --- a/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendaradditer3/src/tcalendaraddtestblocksdirect.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendaradditer3/src/tcalendaraddtestblocksdirect.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -16,9 +16,9 @@ */ -#include -#include -#include +#include +#include +#include #include "tcalendaraddtest.h" #include "calendarheader.h" #include "calendarconstants.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendarchangenotifyiter3/inc/calendarinterface.h --- a/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendarchangenotifyiter3/inc/calendarinterface.h Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendarchangenotifyiter3/inc/calendarinterface.h Tue Nov 24 08:56:33 2009 +0200 @@ -20,9 +20,9 @@ #ifndef __CALENDARINTERFACE_H #define __CALENDARINTERFACE_H -#include -#include -#include +#include +#include +#include #include #include diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendarchangenotifyiter3/inc/notify.h --- a/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendarchangenotifyiter3/inc/notify.h Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendarchangenotifyiter3/inc/notify.h Tue Nov 24 08:56:33 2009 +0200 @@ -17,8 +17,8 @@ #include //#include -#include -#include +#include +#include #include class CLiwServiceHandler; diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendarchangenotifyiter3/src/notify.cpp --- a/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendarchangenotifyiter3/src/notify.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendarchangenotifyiter3/src/notify.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -17,9 +17,9 @@ #include "calendarinterface.h" -#include -#include -#include +#include +#include +#include #include"notify.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendarchangenotifyiter3/src/tcalendarchangenotifytest.cpp --- a/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendarchangenotifyiter3/src/tcalendarchangenotifytest.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendarchangenotifyiter3/src/tcalendarchangenotifytest.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -24,7 +24,7 @@ #include #include -#include +#include #include "tcalendarchangenotifytest.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendarchangenotifyiter3/src/tcalendarchangenotifytestblocks.cpp --- a/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendarchangenotifyiter3/src/tcalendarchangenotifytestblocks.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendarchangenotifyiter3/src/tcalendarchangenotifytestblocks.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -22,11 +22,11 @@ #include #include //#include -#include +#include #include -#include -#include +#include +#include #include "tcalendarchangenotifytest.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendardeleteiter3/inc/delete.h --- a/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendardeleteiter3/inc/delete.h Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendardeleteiter3/inc/delete.h Tue Nov 24 08:56:33 2009 +0200 @@ -16,8 +16,8 @@ */ #include -#include -#include +#include +#include #include class CLiwServiceHandler; diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendardeleteiter3/inc/deleteguid.h --- a/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendardeleteiter3/inc/deleteguid.h Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendardeleteiter3/inc/deleteguid.h Tue Nov 24 08:56:33 2009 +0200 @@ -16,8 +16,8 @@ */ #include -#include -#include +#include +#include #include class CLiwServiceHandler; diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendardeleteiter3/inc/deleteluid.h --- a/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendardeleteiter3/inc/deleteluid.h Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendardeleteiter3/inc/deleteluid.h Tue Nov 24 08:56:33 2009 +0200 @@ -16,8 +16,8 @@ */ #include -#include -#include +#include +#include #include class CLiwServiceHandler; diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendardeleteiter3/inc/teststartconsolealarmserver2.h --- a/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendardeleteiter3/inc/teststartconsolealarmserver2.h Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendardeleteiter3/inc/teststartconsolealarmserver2.h Tue Nov 24 08:56:33 2009 +0200 @@ -21,13 +21,13 @@ #include #include -#include -#include -#include +#include +#include +#include #include "calendarconstants.h" #include "calendarheader.h" -#include "EntryAttributes.h" +#include "entryattributes.h" #include "calendarservice.h" extern void GetGlobalUid( const TDesC& aGlobalUid, TDes8& aOutGlobalUid ); diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendardeleteiter3/src/delete.cpp --- a/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendardeleteiter3/src/delete.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendardeleteiter3/src/delete.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -16,9 +16,9 @@ */ -#include -#include -#include +#include +#include +#include #include "tcalendardeletetest.h" #include "delete.h" #include "calendarheader.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendardeleteiter3/src/deleteguid.cpp --- a/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendardeleteiter3/src/deleteguid.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendardeleteiter3/src/deleteguid.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -16,9 +16,9 @@ */ -#include -#include -#include +#include +#include +#include #include "tcalendardeletetest.h" #include "deleteguid.h" #include "calendarheader.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendardeleteiter3/src/deleteluid.cpp --- a/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendardeleteiter3/src/deleteluid.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendardeleteiter3/src/deleteluid.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -16,9 +16,9 @@ */ -#include -#include -#include +#include +#include +#include #include "tcalendardeletetest.h" #include "deleteluid.h" #include "calendarheader.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendardeleteiter3/src/tcalendardeletetest.cpp --- a/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendardeleteiter3/src/tcalendardeletetest.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendardeleteiter3/src/tcalendardeletetest.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -19,7 +19,7 @@ // INCLUDE FILES -#include +#include #include "tcalendardeletetest.h" //#include diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendardeleteiter3/src/tcalendardeletetestblocks.cpp --- a/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendardeleteiter3/src/tcalendardeletetestblocks.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendardeleteiter3/src/tcalendardeletetestblocks.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -21,10 +21,10 @@ // INCLUDE FILES #include #include -#include +#include #include //#include -#include +#include //#include #include "delete.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendarexportiter3/inc/teststartconsolealarmserver2.h --- a/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendarexportiter3/inc/teststartconsolealarmserver2.h Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendarexportiter3/inc/teststartconsolealarmserver2.h Tue Nov 24 08:56:33 2009 +0200 @@ -21,13 +21,13 @@ #include #include -#include -#include -#include +#include +#include +#include #include "calendarconstants.h" #include "calendarheader.h" -#include "EntryAttributes.h" +#include "entryattributes.h" #include "calendarservice.h" extern void GetGlobalUid( const TDesC& aGlobalUid, TDes8& aOutGlobalUid ); diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendarexportiter3/src/tcalendarexporttest.cpp --- a/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendarexportiter3/src/tcalendarexporttest.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendarexportiter3/src/tcalendarexporttest.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -24,7 +24,7 @@ #include #include -#include +#include #include "tcalendarexporttest.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendarexportiter3/src/tcalendarexporttestblocks.cpp --- a/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendarexportiter3/src/tcalendarexporttestblocks.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendarexportiter3/src/tcalendarexporttestblocks.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -22,11 +22,11 @@ #include #include //#include -#include +#include #include -#include +#include #include "tcalendarexporttest.h" #include "teststartconsolealarmserver2.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendargenerictest/inc/tprovidertest.h --- a/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendargenerictest/inc/tprovidertest.h Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendargenerictest/inc/tprovidertest.h Tue Nov 24 08:56:33 2009 +0200 @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendargenerictest/inc/tprovidertestobserver.h --- a/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendargenerictest/inc/tprovidertestobserver.h Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendargenerictest/inc/tprovidertestobserver.h Tue Nov 24 08:56:33 2009 +0200 @@ -22,7 +22,7 @@ -#include +#include #include "e32base.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendargenerictest/inc/txmlconvertor.h --- a/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendargenerictest/inc/txmlconvertor.h Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendargenerictest/inc/txmlconvertor.h Tue Nov 24 08:56:33 2009 +0200 @@ -23,7 +23,7 @@ // INCLUDES -#include +#include #include diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendargenerictest/src/tprovidertest.cpp --- a/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendargenerictest/src/tprovidertest.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendargenerictest/src/tprovidertest.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -19,7 +19,7 @@ // INCLUDE FILES -#include +#include #include #include #include "tprovidertest.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendargenerictest/src/tprovidertest_testblocks.cpp --- a/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendargenerictest/src/tprovidertest_testblocks.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendargenerictest/src/tprovidertest_testblocks.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -21,9 +21,9 @@ // INCLUDE FILES #include #include -#include -#include -#include +#include +#include +#include #include "tprovidertest.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendargenerictest/src/txmlconvertor.cpp --- a/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendargenerictest/src/txmlconvertor.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendargenerictest/src/txmlconvertor.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -21,12 +21,12 @@ // INCLUDE FILES #include -#include -#include +#include +#include #include #include #include -#include +#include #include #include "txmlconvertor.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendargetlistiter3/src/tcalendargetlisttest.cpp --- a/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendargetlistiter3/src/tcalendargetlisttest.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendargetlistiter3/src/tcalendargetlisttest.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -24,7 +24,7 @@ #include #include -#include +#include #include "tcalendargetlisttest.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendargetlistiter3/src/tcalendargetlisttestblocks.cpp --- a/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendargetlistiter3/src/tcalendargetlisttestblocks.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendargetlistiter3/src/tcalendargetlisttestblocks.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -22,11 +22,11 @@ #include #include //#include -#include - - -#include -#include +#include + + +#include +#include diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendarimportiter3/src/tcalendarimporttest.cpp --- a/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendarimportiter3/src/tcalendarimporttest.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendarimportiter3/src/tcalendarimporttest.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -24,7 +24,7 @@ #include #include -#include +#include #include "tcalendarimporttest.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendarimportiter3/src/tcalendarimporttestblocks.cpp --- a/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendarimportiter3/src/tcalendarimporttestblocks.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendarimportiter3/src/tcalendarimporttestblocks.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -22,12 +22,12 @@ #include #include //#include -#include +#include #include //#include "teststartconsolealarmserver3.h" -#include +#include #include "tcalendarimporttest.h" @@ -166,7 +166,7 @@ } -#include +#include class CTestAsync; diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendarupdateiter3/inc/teststartconsolealarmserver2.h --- a/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendarupdateiter3/inc/teststartconsolealarmserver2.h Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendarupdateiter3/inc/teststartconsolealarmserver2.h Tue Nov 24 08:56:33 2009 +0200 @@ -21,13 +21,13 @@ #include #include -#include -#include -#include +#include +#include +#include #include "calendarconstants.h" #include "calendarheader.h" -#include "EntryAttributes.h" +#include "entryattributes.h" #include "calendarservice.h" extern void GetGlobalUid( const TDesC& aGlobalUid, TDes8& aOutGlobalUid ); diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendarupdateiter3/src/tcalendarupdatetest.cpp --- a/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendarupdateiter3/src/tcalendarupdatetest.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendarupdateiter3/src/tcalendarupdatetest.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -24,7 +24,7 @@ //#include //#include -#include +#include #include "tcalendarupdatetest.h" #include "teststartconsolealarmserver2.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendarupdateiter3/src/tcalendarupdatetestblocks.cpp --- a/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendarupdateiter3/src/tcalendarupdatetestblocks.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_calendar/tsrc/dev/tcalendarprovidertest/tcalendarupdateiter3/src/tcalendarupdatetestblocks.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -22,10 +22,10 @@ #include #include //#include -#include -#include -#include -#include +#include +#include +#include +#include #include "tcalendarupdatetest.h" #include "calendarheader.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_calendar/tsrc/dev/tcalendartest/tcalendaradditer1/inc/teststartconsolealarmserver.h --- a/serviceproviders/sapi_calendar/tsrc/dev/tcalendartest/tcalendaradditer1/inc/teststartconsolealarmserver.h Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_calendar/tsrc/dev/tcalendartest/tcalendaradditer1/inc/teststartconsolealarmserver.h Tue Nov 24 08:56:33 2009 +0200 @@ -26,7 +26,7 @@ #include "calendarconstants.h" #include "calendarheader.h" -#include "EntryAttributes.h" +#include "entryattributes.h" #include "calendarservice.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_calendar/tsrc/dev/tcalendartest/tcalendaradditer1/src/tcalendaraddtest.cpp --- a/serviceproviders/sapi_calendar/tsrc/dev/tcalendartest/tcalendaradditer1/src/tcalendaraddtest.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_calendar/tsrc/dev/tcalendartest/tcalendaradditer1/src/tcalendaraddtest.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -24,7 +24,7 @@ #include #include -#include +#include #include "tcalendaraddtest.h" //#include diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_calendar/tsrc/dev/tcalendartest/tcalendaradditer1/src/tcalendaraddtestblocks.cpp --- a/serviceproviders/sapi_calendar/tsrc/dev/tcalendartest/tcalendaradditer1/src/tcalendaraddtestblocks.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_calendar/tsrc/dev/tcalendartest/tcalendaradditer1/src/tcalendaraddtestblocks.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -21,7 +21,7 @@ // INCLUDE FILES #include #include -#include +#include #include "calendarheader.h" #include "calendarservice.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_calendar/tsrc/dev/tcalendartest/tcalendarchangenotifyiter1/inc/teststartconsolealarmserver.h --- a/serviceproviders/sapi_calendar/tsrc/dev/tcalendartest/tcalendarchangenotifyiter1/inc/teststartconsolealarmserver.h Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_calendar/tsrc/dev/tcalendartest/tcalendarchangenotifyiter1/inc/teststartconsolealarmserver.h Tue Nov 24 08:56:33 2009 +0200 @@ -26,7 +26,7 @@ #include "calendarconstants.h" #include "calendarheader.h" -#include "EntryAttributes.h" +#include "entryattributes.h" #include "calendarservice.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_calendar/tsrc/dev/tcalendartest/tcalendarchangenotifyiter1/src/tcalendarchangenotifytest.cpp --- a/serviceproviders/sapi_calendar/tsrc/dev/tcalendartest/tcalendarchangenotifyiter1/src/tcalendarchangenotifytest.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_calendar/tsrc/dev/tcalendartest/tcalendarchangenotifyiter1/src/tcalendarchangenotifytest.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -21,7 +21,7 @@ // INCLUDE FILES #include -#include +#include #include "tcalendarchangenotifytest.h" //#include diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_calendar/tsrc/dev/tcalendartest/tcalendarchangenotifyiter1/src/tcalendarchangenotifytestblocks.cpp --- a/serviceproviders/sapi_calendar/tsrc/dev/tcalendartest/tcalendarchangenotifyiter1/src/tcalendarchangenotifytestblocks.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_calendar/tsrc/dev/tcalendartest/tcalendarchangenotifyiter1/src/tcalendarchangenotifytestblocks.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -22,7 +22,7 @@ #include #include //#include -#include +#include #include "calendarheader.h" #include "calendarservice.h" #include "entryattributes.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_calendar/tsrc/dev/tcalendartest/tcalendardeleteiter1/inc/teststartconsolealarmserver.h --- a/serviceproviders/sapi_calendar/tsrc/dev/tcalendartest/tcalendardeleteiter1/inc/teststartconsolealarmserver.h Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_calendar/tsrc/dev/tcalendartest/tcalendardeleteiter1/inc/teststartconsolealarmserver.h Tue Nov 24 08:56:33 2009 +0200 @@ -26,7 +26,7 @@ #include "calendarconstants.h" #include "calendarheader.h" -#include "EntryAttributes.h" +#include "entryattributes.h" #include "calendarservice.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_calendar/tsrc/dev/tcalendartest/tcalendardeleteiter1/src/caldeltestcases.cpp --- a/serviceproviders/sapi_calendar/tsrc/dev/tcalendartest/tcalendardeleteiter1/src/caldeltestcases.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_calendar/tsrc/dev/tcalendartest/tcalendardeleteiter1/src/caldeltestcases.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -33,7 +33,7 @@ #include "calendarheader.h" #include "calendarservice.h" #include "entryattributes.h" -#include +#include #include "teststartconsolealarmserver.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_calendar/tsrc/dev/tcalendartest/tcalendardeleteiter1/src/tcalendardeletetest.cpp --- a/serviceproviders/sapi_calendar/tsrc/dev/tcalendartest/tcalendardeleteiter1/src/tcalendardeletetest.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_calendar/tsrc/dev/tcalendartest/tcalendardeleteiter1/src/tcalendardeletetest.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -24,7 +24,7 @@ #include #include -#include +#include #include "tcalendardeletetest.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_calendar/tsrc/dev/tcalendartest/tcalendardeleteiter1/src/tcalendardeletetestblocks.cpp --- a/serviceproviders/sapi_calendar/tsrc/dev/tcalendartest/tcalendardeleteiter1/src/tcalendardeletetestblocks.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_calendar/tsrc/dev/tcalendartest/tcalendardeleteiter1/src/tcalendardeletetestblocks.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -22,7 +22,7 @@ #include #include //#include -#include +#include #include "tcalendardeletetest.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_calendar/tsrc/dev/tcalendartest/tcalendarexportiter1/inc/teststartconsolealarmserver.h --- a/serviceproviders/sapi_calendar/tsrc/dev/tcalendartest/tcalendarexportiter1/inc/teststartconsolealarmserver.h Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_calendar/tsrc/dev/tcalendartest/tcalendarexportiter1/inc/teststartconsolealarmserver.h Tue Nov 24 08:56:33 2009 +0200 @@ -26,7 +26,7 @@ #include "calendarconstants.h" #include "calendarheader.h" -#include "EntryAttributes.h" +#include "entryattributes.h" #include "calendarservice.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_calendar/tsrc/dev/tcalendartest/tcalendarexportiter1/src/calexptestcases.cpp --- a/serviceproviders/sapi_calendar/tsrc/dev/tcalendartest/tcalendarexportiter1/src/calexptestcases.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_calendar/tsrc/dev/tcalendartest/tcalendarexportiter1/src/calexptestcases.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -32,7 +32,7 @@ #include "calendarservice.h" -#include +#include diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_calendar/tsrc/dev/tcalendartest/tcalendarexportiter1/src/tcalendarexporttest.cpp --- a/serviceproviders/sapi_calendar/tsrc/dev/tcalendartest/tcalendarexportiter1/src/tcalendarexporttest.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_calendar/tsrc/dev/tcalendartest/tcalendarexportiter1/src/tcalendarexporttest.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -24,7 +24,7 @@ #include #include -#include +#include #include "tcalendarexporttest.h" //#include "teststartconsolealarmserver.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_calendar/tsrc/dev/tcalendartest/tcalendarexportiter1/src/tcalendarexporttestblocks.cpp --- a/serviceproviders/sapi_calendar/tsrc/dev/tcalendartest/tcalendarexportiter1/src/tcalendarexporttestblocks.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_calendar/tsrc/dev/tcalendartest/tcalendarexportiter1/src/tcalendarexporttestblocks.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -22,7 +22,7 @@ #include #include //#include -#include +#include #include "tcalendarexporttest.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_calendar/tsrc/dev/tcalendartest/tcalendargetlistiter1/inc/teststartconsolealarmserver.h --- a/serviceproviders/sapi_calendar/tsrc/dev/tcalendartest/tcalendargetlistiter1/inc/teststartconsolealarmserver.h Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_calendar/tsrc/dev/tcalendartest/tcalendargetlistiter1/inc/teststartconsolealarmserver.h Tue Nov 24 08:56:33 2009 +0200 @@ -26,7 +26,7 @@ #include "calendarconstants.h" #include "calendarheader.h" -#include "EntryAttributes.h" +#include "entryattributes.h" #include "calendarservice.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_calendar/tsrc/dev/tcalendartest/tcalendargetlistiter1/src/tcalendargetlisttest.cpp --- a/serviceproviders/sapi_calendar/tsrc/dev/tcalendartest/tcalendargetlistiter1/src/tcalendargetlisttest.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_calendar/tsrc/dev/tcalendartest/tcalendargetlistiter1/src/tcalendargetlisttest.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -24,7 +24,7 @@ #include #include -#include +#include #include "tcalendargetlisttest.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_calendar/tsrc/dev/tcalendartest/tcalendargetlistiter1/src/tcalendargetlisttestblocks.cpp --- a/serviceproviders/sapi_calendar/tsrc/dev/tcalendartest/tcalendargetlistiter1/src/tcalendargetlisttestblocks.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_calendar/tsrc/dev/tcalendartest/tcalendargetlistiter1/src/tcalendargetlisttestblocks.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -24,7 +24,7 @@ #include //for RFile and Rfs #include //#include -#include +#include #include "calendarheader.h" #include "calendarservice.h" #include //for CCalEntry diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_calendar/tsrc/dev/tcalendartest/tcalendarimportiter1/inc/teststartconsolealarmserver.h --- a/serviceproviders/sapi_calendar/tsrc/dev/tcalendartest/tcalendarimportiter1/inc/teststartconsolealarmserver.h Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_calendar/tsrc/dev/tcalendartest/tcalendarimportiter1/inc/teststartconsolealarmserver.h Tue Nov 24 08:56:33 2009 +0200 @@ -26,7 +26,7 @@ #include "calendarconstants.h" #include "calendarheader.h" -#include "EntryAttributes.h" +#include "entryattributes.h" #include "calendarservice.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_calendar/tsrc/dev/tcalendartest/tcalendarimportiter1/src/calimptestcases.cpp --- a/serviceproviders/sapi_calendar/tsrc/dev/tcalendartest/tcalendarimportiter1/src/calimptestcases.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_calendar/tsrc/dev/tcalendartest/tcalendarimportiter1/src/calimptestcases.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -29,7 +29,7 @@ #include "calimptestcases.h" #include "teststartconsolealarmserver.h" -#include +#include _LIT(KCalName ,"c:Calendar"); diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_calendar/tsrc/dev/tcalendartest/tcalendarimportiter1/src/tcalendarimporttest.cpp --- a/serviceproviders/sapi_calendar/tsrc/dev/tcalendartest/tcalendarimportiter1/src/tcalendarimporttest.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_calendar/tsrc/dev/tcalendartest/tcalendarimportiter1/src/tcalendarimporttest.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -24,7 +24,7 @@ #include #include -#include +#include #include "tcalendarimporttest.h" #if __WINS__ diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_calendar/tsrc/dev/tcalendartest/tcalendarimportiter1/src/tcalendarimporttestblocks.cpp --- a/serviceproviders/sapi_calendar/tsrc/dev/tcalendartest/tcalendarimportiter1/src/tcalendarimporttestblocks.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_calendar/tsrc/dev/tcalendartest/tcalendarimportiter1/src/tcalendarimporttestblocks.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -22,7 +22,7 @@ #include #include //#include -#include +#include #include "tcalendarimporttest.h" #include "calendarheader.h" #include "calendarservice.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_calendar/tsrc/dev/tcalendartest/tcalendarupdateiter1/inc/teststartconsolealarmserver.h --- a/serviceproviders/sapi_calendar/tsrc/dev/tcalendartest/tcalendarupdateiter1/inc/teststartconsolealarmserver.h Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_calendar/tsrc/dev/tcalendartest/tcalendarupdateiter1/inc/teststartconsolealarmserver.h Tue Nov 24 08:56:33 2009 +0200 @@ -26,7 +26,7 @@ #include "calendarconstants.h" #include "calendarheader.h" -#include "EntryAttributes.h" +#include "entryattributes.h" #include "calendarservice.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_calendar/tsrc/dev/tcalendartest/tcalendarupdateiter1/src/tcalendarupdatetest.cpp --- a/serviceproviders/sapi_calendar/tsrc/dev/tcalendartest/tcalendarupdateiter1/src/tcalendarupdatetest.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_calendar/tsrc/dev/tcalendartest/tcalendarupdateiter1/src/tcalendarupdatetest.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -24,7 +24,7 @@ #include #include -#include +#include #include "tcalendarupdatetest.h" //#include diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_calendar/tsrc/dev/tcalendartest/tcalendarupdateiter1/src/tcalendarupdatetestblocks.cpp --- a/serviceproviders/sapi_calendar/tsrc/dev/tcalendartest/tcalendarupdateiter1/src/tcalendarupdatetestblocks.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_calendar/tsrc/dev/tcalendartest/tcalendarupdateiter1/src/tcalendarupdatetestblocks.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -21,7 +21,7 @@ // INCLUDE FILES #include #include -#include +#include #include "calendarheader.h" #include "calendarservice.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_calendar/tsrc/testing/tcal_providertest/group/tcal_providertest.mmp --- a/serviceproviders/sapi_calendar/tsrc/testing/tcal_providertest/group/tcal_providertest.mmp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_calendar/tsrc/testing/tcal_providertest/group/tcal_providertest.mmp Tue Nov 24 08:56:33 2009 +0200 @@ -56,7 +56,7 @@ SOURCEPATH ../src SOURCE tcal_providertest.cpp -SOURCE tcal_providertestBlocks.cpp +SOURCE tcal_providertestblocks.cpp SOURCE notify.cpp //RESOURCE resource_file diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_calendar/tsrc/testing/tcal_providertest/inc/calendarinterface.h --- a/serviceproviders/sapi_calendar/tsrc/testing/tcal_providertest/inc/calendarinterface.h Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_calendar/tsrc/testing/tcal_providertest/inc/calendarinterface.h Tue Nov 24 08:56:33 2009 +0200 @@ -18,9 +18,9 @@ #ifndef __CALENDARINTERFACE_H #define __CALENDARINTERFACE_H -#include -#include -#include +#include +#include +#include #include #include diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_calendar/tsrc/testing/tcal_providertest/inc/messaginginterface.h --- a/serviceproviders/sapi_calendar/tsrc/testing/tcal_providertest/inc/messaginginterface.h Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_calendar/tsrc/testing/tcal_providertest/inc/messaginginterface.h Tue Nov 24 08:56:33 2009 +0200 @@ -20,9 +20,9 @@ #ifndef __MESSAGINGINTERFACE_H #define __MESSAGINGINTERFACE_H -#include -#include -#include +#include +#include +#include #include "messageheader.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_calendar/tsrc/testing/tcal_providertest/inc/notify.h --- a/serviceproviders/sapi_calendar/tsrc/testing/tcal_providertest/inc/notify.h Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_calendar/tsrc/testing/tcal_providertest/inc/notify.h Tue Nov 24 08:56:33 2009 +0200 @@ -17,8 +17,8 @@ #include //#include -#include -#include +#include +#include #include class CLiwServiceHandler; diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_calendar/tsrc/testing/tcal_providertest/inc/tcal_providertest.h --- a/serviceproviders/sapi_calendar/tsrc/testing/tcal_providertest/inc/tcal_providertest.h Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_calendar/tsrc/testing/tcal_providertest/inc/tcal_providertest.h Tue Nov 24 08:56:33 2009 +0200 @@ -26,12 +26,12 @@ #include #include -#include -#include -#include +#include +#include +#include #include "calendarheader.h" #include "calendarconstants.h" -#include +#include // CONSTANTS //const ?type ?constant_var = ?constant; diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_calendar/tsrc/testing/tcal_providertest/src/notify.cpp --- a/serviceproviders/sapi_calendar/tsrc/testing/tcal_providertest/src/notify.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_calendar/tsrc/testing/tcal_providertest/src/notify.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -17,9 +17,9 @@ #include "calendarinterface.h" -#include -#include -#include +#include +#include +#include #include "tcal_providertest.h" #include"notify.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_calendar/tsrc/testing/tcal_providertest/src/tcal_providertest.cpp --- a/serviceproviders/sapi_calendar/tsrc/testing/tcal_providertest/src/tcal_providertest.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_calendar/tsrc/testing/tcal_providertest/src/tcal_providertest.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -19,7 +19,7 @@ // INCLUDE FILES -#include +#include #include "tcal_providertest.h" //#include diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_calendar/tsrc/testing/tcal_providertest/src/tcal_providertestblocks.cpp --- a/serviceproviders/sapi_calendar/tsrc/testing/tcal_providertest/src/tcal_providertestblocks.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_calendar/tsrc/testing/tcal_providertest/src/tcal_providertestblocks.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -21,14 +21,14 @@ // INCLUDE FILES #include #include -#include +#include #include "tcal_providertest.h" -#include -#include -#include +#include +#include +#include #include "calendarheader.h" #include "calendarconstants.h" -#include +#include #include "notify.h" //#include #include "messaginginterface.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_add/group/tcal_add.mmp --- a/serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_add/group/tcal_add.mmp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_add/group/tcal_add.mmp Tue Nov 24 08:56:33 2009 +0200 @@ -54,7 +54,7 @@ SOURCEPATH ../src SOURCE tcal_add.cpp -SOURCE tcal_addBlocks.cpp +SOURCE tcal_addblocks.cpp //RESOURCE resource_file //RESOURCE resource_file2 diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_add/inc/teststartconsolealarmserver.h --- a/serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_add/inc/teststartconsolealarmserver.h Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_add/inc/teststartconsolealarmserver.h Tue Nov 24 08:56:33 2009 +0200 @@ -26,7 +26,7 @@ #include "calendarconstants.h" #include "calendarheader.h" -#include "EntryAttributes.h" +#include "entryattributes.h" #include "calendarservice.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_add/src/tcal_add.cpp --- a/serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_add/src/tcal_add.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_add/src/tcal_add.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -19,7 +19,7 @@ // INCLUDE FILES -#include +#include #include "tcal_add.h" //#include diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_add/src/tcal_addblocks.cpp --- a/serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_add/src/tcal_addblocks.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_add/src/tcal_addblocks.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -21,7 +21,7 @@ // INCLUDE FILES #include #include -#include +#include #include "tcal_add.h" #include "calendarheader.h" #include "calendarservice.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_changenotify/group/tcal_changenotify.mmp --- a/serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_changenotify/group/tcal_changenotify.mmp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_changenotify/group/tcal_changenotify.mmp Tue Nov 24 08:56:33 2009 +0200 @@ -54,7 +54,7 @@ SOURCEPATH ../src SOURCE tcal_changenotify.cpp -SOURCE tcal_changenotifyBlocks.cpp +SOURCE tcal_changenotifyblocks.cpp //RESOURCE resource_file //RESOURCE resource_file2 diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_changenotify/inc/teststartconsolealarmserver.h --- a/serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_changenotify/inc/teststartconsolealarmserver.h Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_changenotify/inc/teststartconsolealarmserver.h Tue Nov 24 08:56:33 2009 +0200 @@ -26,7 +26,7 @@ #include "calendarconstants.h" #include "calendarheader.h" -#include "EntryAttributes.h" +#include "entryattributes.h" #include "calendarservice.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_changenotify/src/tcal_changenotify.cpp --- a/serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_changenotify/src/tcal_changenotify.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_changenotify/src/tcal_changenotify.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -19,7 +19,7 @@ // INCLUDE FILES -#include +#include #include "tcal_changenotify.h" //#include diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_changenotify/src/tcal_changenotifyblocks.cpp --- a/serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_changenotify/src/tcal_changenotifyblocks.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_changenotify/src/tcal_changenotifyblocks.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -21,7 +21,7 @@ // INCLUDE FILES #include #include -#include +#include #include "tcal_changenotify.h" #include "calendarheader.h" #include "calendarservice.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_delete/group/tcal_delete.mmp --- a/serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_delete/group/tcal_delete.mmp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_delete/group/tcal_delete.mmp Tue Nov 24 08:56:33 2009 +0200 @@ -56,7 +56,7 @@ SOURCEPATH ../src SOURCE tcal_delete.cpp -SOURCE tcal_deleteBlocks.cpp +SOURCE tcal_deleteblocks.cpp SOURCE cal_delete.cpp //RESOURCE resource_file diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_delete/inc/teststartconsolealarmserver.h --- a/serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_delete/inc/teststartconsolealarmserver.h Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_delete/inc/teststartconsolealarmserver.h Tue Nov 24 08:56:33 2009 +0200 @@ -26,7 +26,7 @@ #include "calendarconstants.h" #include "calendarheader.h" -#include "EntryAttributes.h" +#include "entryattributes.h" #include "calendarservice.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_delete/src/cal_delete.cpp --- a/serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_delete/src/cal_delete.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_delete/src/cal_delete.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -33,7 +33,7 @@ #include "calendarheader.h" #include "calendarservice.h" #include "entryattributes.h" -#include +#include #include "teststartconsolealarmserver.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_delete/src/tcal_delete.cpp --- a/serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_delete/src/tcal_delete.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_delete/src/tcal_delete.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -19,7 +19,7 @@ // INCLUDE FILES -#include +#include #include "tcal_delete.h" //#include diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_delete/src/tcal_deleteblocks.cpp --- a/serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_delete/src/tcal_deleteblocks.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_delete/src/tcal_deleteblocks.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -21,7 +21,7 @@ // INCLUDE FILES #include #include -#include +#include #include "tcal_delete.h" #include "cal_delete.h" #include "calendarservice.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_export/group/tcal_export.mmp --- a/serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_export/group/tcal_export.mmp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_export/group/tcal_export.mmp Tue Nov 24 08:56:33 2009 +0200 @@ -55,7 +55,7 @@ SOURCEPATH ../src SOURCE tcal_export.cpp -SOURCE tcal_exportBlocks.cpp +SOURCE tcal_exportblocks.cpp SOURCE exportestcases.cpp //RESOURCE resource_file diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_export/inc/teststartconsolealarmserver.h --- a/serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_export/inc/teststartconsolealarmserver.h Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_export/inc/teststartconsolealarmserver.h Tue Nov 24 08:56:33 2009 +0200 @@ -26,7 +26,7 @@ #include "calendarconstants.h" #include "calendarheader.h" -#include "EntryAttributes.h" +#include "entryattributes.h" #include "calendarservice.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_export/src/exportestcases.cpp --- a/serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_export/src/exportestcases.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_export/src/exportestcases.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -32,7 +32,7 @@ #include "calendarservice.h" -#include +#include _LIT(KCalName ,"c:Calendar"); diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_export/src/tcal_export.cpp --- a/serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_export/src/tcal_export.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_export/src/tcal_export.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -19,7 +19,7 @@ // INCLUDE FILES -#include +#include #include "tcal_export.h" //#include diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_export/src/tcal_exportblocks.cpp --- a/serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_export/src/tcal_exportblocks.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_export/src/tcal_exportblocks.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -21,7 +21,7 @@ // INCLUDE FILES #include #include -#include +#include #include "tcal_export.h" #include "calendarheader.h" #include "calendarservice.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_getlist/group/tcal_getlist.mmp --- a/serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_getlist/group/tcal_getlist.mmp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_getlist/group/tcal_getlist.mmp Tue Nov 24 08:56:33 2009 +0200 @@ -56,7 +56,7 @@ SOURCEPATH ../src SOURCE tcal_getlist.cpp -SOURCE tcal_getlistBlocks.cpp +SOURCE tcal_getlistblocks.cpp SOURCE calgetlisttestcases.cpp //RESOURCE resource_file diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_getlist/inc/teststartconsolealarmserver.h --- a/serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_getlist/inc/teststartconsolealarmserver.h Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_getlist/inc/teststartconsolealarmserver.h Tue Nov 24 08:56:33 2009 +0200 @@ -26,7 +26,7 @@ #include "calendarconstants.h" #include "calendarheader.h" -#include "EntryAttributes.h" +#include "entryattributes.h" #include "calendarservice.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_getlist/src/tcal_getlist.cpp --- a/serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_getlist/src/tcal_getlist.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_getlist/src/tcal_getlist.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -19,7 +19,7 @@ // INCLUDE FILES -#include +#include #include "tcal_getlist.h" //#include diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_getlist/src/tcal_getlistblocks.cpp --- a/serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_getlist/src/tcal_getlistblocks.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_getlist/src/tcal_getlistblocks.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -23,7 +23,7 @@ #include #include //for RFile and Rfs #include -#include +#include #include "tcal_getlist.h" #include "calendarheader.h" #include "calendarservice.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_import/group/tcal_import.mmp --- a/serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_import/group/tcal_import.mmp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_import/group/tcal_import.mmp Tue Nov 24 08:56:33 2009 +0200 @@ -55,7 +55,7 @@ SOURCEPATH ../src SOURCE tcal_import.cpp -SOURCE tcal_importBlocks.cpp +SOURCE tcal_importblocks.cpp SOURCE importestcases.cpp //RESOURCE resource_file diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_import/inc/teststartconsolealarmserver.h --- a/serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_import/inc/teststartconsolealarmserver.h Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_import/inc/teststartconsolealarmserver.h Tue Nov 24 08:56:33 2009 +0200 @@ -26,7 +26,7 @@ #include "calendarconstants.h" #include "calendarheader.h" -#include "EntryAttributes.h" +#include "entryattributes.h" #include "calendarservice.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_import/src/importestcases.cpp --- a/serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_import/src/importestcases.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_import/src/importestcases.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -29,7 +29,7 @@ #include "importestcases.h" #include "teststartconsolealarmserver.h" -#include +#include _LIT(KCalName ,"c:Calendar"); diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_import/src/tcal_import.cpp --- a/serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_import/src/tcal_import.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_import/src/tcal_import.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -19,7 +19,7 @@ // INCLUDE FILES -#include +#include #include "tcal_import.h" //#include diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_import/src/tcal_importblocks.cpp --- a/serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_import/src/tcal_importblocks.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_import/src/tcal_importblocks.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -21,7 +21,7 @@ // INCLUDE FILES #include #include -#include +#include #include "tcal_import.h" #include "calendarheader.h" #include "calendarservice.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_update/group/tcal_update.mmp --- a/serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_update/group/tcal_update.mmp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_update/group/tcal_update.mmp Tue Nov 24 08:56:33 2009 +0200 @@ -55,7 +55,7 @@ SOURCEPATH ../src SOURCE tcal_update.cpp -SOURCE tcal_updateBlocks.cpp +SOURCE tcal_updateblocks.cpp //RESOURCE resource_file //RESOURCE resource_file2 diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_update/inc/teststartconsolealarmserver.h --- a/serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_update/inc/teststartconsolealarmserver.h Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_update/inc/teststartconsolealarmserver.h Tue Nov 24 08:56:33 2009 +0200 @@ -26,7 +26,7 @@ #include "calendarconstants.h" #include "calendarheader.h" -#include "EntryAttributes.h" +#include "entryattributes.h" #include "calendarservice.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_update/src/tcal_update.cpp --- a/serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_update/src/tcal_update.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_update/src/tcal_update.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -19,7 +19,7 @@ // INCLUDE FILES -#include +#include #include "tcal_update.h" //#include diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_update/src/tcal_updateblocks.cpp --- a/serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_update/src/tcal_updateblocks.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_calendar/tsrc/testing/tcalendarservice/tcal_update/src/tcal_updateblocks.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -21,7 +21,7 @@ // INCLUDE FILES #include #include -#include +#include #include "tcal_update.h" #include "calendarheader.h" #include "calendarservice.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_contacts_vpbk/contactservice/inc/addcontactobserver.h --- a/serviceproviders/sapi_contacts_vpbk/contactservice/inc/addcontactobserver.h Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_contacts_vpbk/contactservice/inc/addcontactobserver.h Tue Nov 24 08:56:33 2009 +0200 @@ -21,8 +21,8 @@ #include -#include -#include +#include +#include #include #include diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_contacts_vpbk/contactservice/inc/contactservice.h --- a/serviceproviders/sapi_contacts_vpbk/contactservice/inc/contactservice.h Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_contacts_vpbk/contactservice/inc/contactservice.h Tue Nov 24 08:56:33 2009 +0200 @@ -21,13 +21,13 @@ //System includes #include // Used for RFileReadStream and RFileWriteStream -#include //base class for vCardEng -#include //base class for vCardEng -#include //base class -#include //base class for vCardEng +#include //base class for vCardEng +#include //base class for vCardEng +#include //base class +#include //base class for vCardEng #include //Used to specify search fields #include -#include +#include //User Includes #include "contactcallback.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_contacts_vpbk/contactservice/inc/deletecontactobserver.h --- a/serviceproviders/sapi_contacts_vpbk/contactservice/inc/deletecontactobserver.h Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_contacts_vpbk/contactservice/inc/deletecontactobserver.h Tue Nov 24 08:56:33 2009 +0200 @@ -21,10 +21,10 @@ #include // Used for RFileReadStream and RFileWriteStream -#include //base class for vCardExEng -#include -#include -#include +#include //base class for vCardExEng +#include +#include +#include #include "contactservice.h" #include "cancelasyncrquest.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_contacts_vpbk/contactservice/inc/exportstorelistobserver.h --- a/serviceproviders/sapi_contacts_vpbk/contactservice/inc/exportstorelistobserver.h Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_contacts_vpbk/contactservice/inc/exportstorelistobserver.h Tue Nov 24 08:56:33 2009 +0200 @@ -21,9 +21,9 @@ #include // Used for RFileWriteStream -#include //base class for vCardEng -#include //base class for vCardEng -#include //base class for vCardEng +#include //base class for vCardEng +#include //base class for vCardEng +#include //base class for vCardEng #include #include #include "contactcallback.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_contacts_vpbk/contactservice/inc/importstorelistobserver.h --- a/serviceproviders/sapi_contacts_vpbk/contactservice/inc/importstorelistobserver.h Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_contacts_vpbk/contactservice/inc/importstorelistobserver.h Tue Nov 24 08:56:33 2009 +0200 @@ -20,9 +20,9 @@ #define C_IMPORTSTORELISTOBSERVER_H #include // Used for RFileReadStream -#include //base class for vCardEng -#include //base class for vCardEng -#include //base class for vCardEng +#include //base class for vCardEng +#include //base class for vCardEng +#include //base class for vCardEng #include #include diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_contacts_vpbk/contactservice/inc/organisegroupsobserver.h --- a/serviceproviders/sapi_contacts_vpbk/contactservice/inc/organisegroupsobserver.h Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_contacts_vpbk/contactservice/inc/organisegroupsobserver.h Tue Nov 24 08:56:33 2009 +0200 @@ -21,10 +21,10 @@ #include // Used for RFileReadStream and RFileWriteStream -#include //base class for vCardExEng -#include //base class for vCardExEng -#include -#include +#include //base class for vCardExEng +#include //base class for vCardExEng +#include +#include #include "contactservice.h" class CVPbkContactManager; diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_contacts_vpbk/contactservice/inc/storelistobserver.h --- a/serviceproviders/sapi_contacts_vpbk/contactservice/inc/storelistobserver.h Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_contacts_vpbk/contactservice/inc/storelistobserver.h Tue Nov 24 08:56:33 2009 +0200 @@ -20,7 +20,7 @@ #define C_STORELISTOBSERVER_H -#include //base class for vCardEng +#include //base class for vCardEng #include #include diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_contacts_vpbk/contactservice/src/addcontactobserver.cpp --- a/serviceproviders/sapi_contacts_vpbk/contactservice/src/addcontactobserver.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_contacts_vpbk/contactservice/src/addcontactobserver.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -22,10 +22,10 @@ //System include #include "contactservice.h"// for iContactService -#include // for iContactStore -#include // used in many function to get the store contact -#include //for observer -#include //for param in ContactsSaved() +#include // for iContactStore +#include // used in many function to get the store contact +#include //for observer +#include //for param in ContactsSaved() #include #include #include diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_contacts_vpbk/contactservice/src/contactiter.cpp --- a/serviceproviders/sapi_contacts_vpbk/contactservice/src/contactiter.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_contacts_vpbk/contactservice/src/contactiter.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -23,11 +23,11 @@ #include "getliststorelistobserver.h" #include #include -#include +#include #include #include #include -#include +#include //Initialize the class variable with the result of ReadContactL diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_contacts_vpbk/contactservice/src/contactservice.cpp --- a/serviceproviders/sapi_contacts_vpbk/contactservice/src/contactservice.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_contacts_vpbk/contactservice/src/contactservice.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -18,25 +18,25 @@ //System includes -#include //for the vcard engin -#include // for iContactManager -#include // for iContactStore -#include //used in SetupL -#include //used in SetupL to get contact stores -#include //used in AddFieldToContactL -#include // used in many function to get the store contact -#include //for the field text data -#include //used in CreateFieldTypeL() -#include //return type of CreateFieldTypeL() -#include //for observer -#include //Used in AddDateFieldToContactL -#include //for param in ContactsSaved() -#include //used in SetupL -#include // used in many function to get the store contact +#include //for the vcard engin +#include // for iContactManager +#include // for iContactStore +#include //used in SetupL +#include //used in SetupL to get contact stores +#include //used in AddFieldToContactL +#include // used in many function to get the store contact +#include //for the field text data +#include //used in CreateFieldTypeL() +#include //return type of CreateFieldTypeL() +#include //for observer +#include //Used in AddDateFieldToContactL +#include //for param in ContactsSaved() +#include //used in SetupL +#include // used in many function to get the store contact #include #include -#include -#include +#include +#include #include //User includes. diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_contacts_vpbk/contactservice/src/deletecontactobserver.cpp --- a/serviceproviders/sapi_contacts_vpbk/contactservice/src/deletecontactobserver.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_contacts_vpbk/contactservice/src/deletecontactobserver.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -21,12 +21,12 @@ #include "contactcallback.h" //System Includes -#include // for iContactManager -#include // for iContactStore -#include // used in many function to get the store contact -#include //for observer -#include //for param in ContactsSaved() -#include //for getting store uri in StoreReady() +#include // for iContactManager +#include // for iContactStore +#include // used in many function to get the store contact +#include //for observer +#include //for param in ContactsSaved() +#include //for getting store uri in StoreReady() //------------------------------------------------------------------------------------- // Static method to create instance of delete contact observer. diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_contacts_vpbk/contactservice/src/exportstorelistobserver.cpp --- a/serviceproviders/sapi_contacts_vpbk/contactservice/src/exportstorelistobserver.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_contacts_vpbk/contactservice/src/exportstorelistobserver.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -19,20 +19,20 @@ #include "exportstorelistobserver.h" -#include //for the vcard engin -#include // for iContactManager -#include // for iContactStore -#include //used in SetupL -#include //used in SetupL to get contact stores -#include //used in AddFieldToContactL -#include // used in many function to get the store contact -#include //for the field text data -#include //used in CreateFieldTypeL() -#include //return type of CreateFieldTypeL() -#include //for observer -#include //Used in AddDateFieldToContactL -#include //for param in ContactsSaved() -#include //used in SetupL +#include //for the vcard engin +#include // for iContactManager +#include // for iContactStore +#include //used in SetupL +#include //used in SetupL to get contact stores +#include //used in AddFieldToContactL +#include // used in many function to get the store contact +#include //for the field text data +#include //used in CreateFieldTypeL() +#include //return type of CreateFieldTypeL() +#include //for observer +#include //Used in AddDateFieldToContactL +#include //for param in ContactsSaved() +#include //used in SetupL // --------------------------------------------------------------------------- diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_contacts_vpbk/contactservice/src/getliststorelistobserver.cpp --- a/serviceproviders/sapi_contacts_vpbk/contactservice/src/getliststorelistobserver.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_contacts_vpbk/contactservice/src/getliststorelistobserver.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -23,9 +23,9 @@ #include "contactiter.h" #include #include -#include +#include #include -#include +#include #include #include "contactviewobserver.h" #include "getliststorelistobserver.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_contacts_vpbk/contactservice/src/importstorelistobserver.cpp --- a/serviceproviders/sapi_contacts_vpbk/contactservice/src/importstorelistobserver.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_contacts_vpbk/contactservice/src/importstorelistobserver.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -20,20 +20,20 @@ #include "importstorelistobserver.h" -#include //for the vcard engin -#include // for iContactManager -#include // for iContactStore -#include //used in SetupL -#include //used in SetupL to get contact stores -#include //used in AddFieldToContactL -#include // used in many function to get the store contact -#include //for the field text data -#include //used in CreateFieldTypeL() -#include //return type of CreateFieldTypeL() -#include //for observer -#include //Used in AddDateFieldToContactL -#include //for param in ContactsSaved() -#include //used in SetupL +#include //for the vcard engin +#include // for iContactManager +#include // for iContactStore +#include //used in SetupL +#include //used in SetupL to get contact stores +#include //used in AddFieldToContactL +#include // used in many function to get the store contact +#include //for the field text data +#include //used in CreateFieldTypeL() +#include //return type of CreateFieldTypeL() +#include //for observer +#include //Used in AddDateFieldToContactL +#include //for param in ContactsSaved() +#include //used in SetupL diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_contacts_vpbk/contactservice/src/organisegroupsobserver.cpp --- a/serviceproviders/sapi_contacts_vpbk/contactservice/src/organisegroupsobserver.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_contacts_vpbk/contactservice/src/organisegroupsobserver.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -21,11 +21,11 @@ #include "contactcallback.h" //System include -#include // for iContactManager -#include // for iContactStore -#include // used in many function to get the store contact -#include //for observer -#include //for param in ContactsSaved() +#include // for iContactManager +#include // for iContactStore +#include // used in many function to get the store contact +#include //for observer +#include //for param in ContactsSaved() #include #include diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_contacts_vpbk/data/0x102833A7.rss --- a/serviceproviders/sapi_contacts_vpbk/data/0x102833A7.rss Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_contacts_vpbk/data/0x102833A7.rss Tue Nov 24 08:56:33 2009 +0200 @@ -15,10 +15,10 @@ * */ -#include -#include +#include +#include -#include "ecom/RegistryInfoV2.rh" +#include "ecom/registryinfov2.rh" RESOURCE REGISTRY_INFO theInfo { diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_contacts_vpbk/inc/contactinterface.h --- a/serviceproviders/sapi_contacts_vpbk/inc/contactinterface.h Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_contacts_vpbk/inc/contactinterface.h Tue Nov 24 08:56:33 2009 +0200 @@ -19,7 +19,7 @@ #define C_CCONTACTINTERFACE_H //System includes -#include +#include // User Includes #include "contactinterface.hrh" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_contacts_vpbk/inc/contactiterator.h --- a/serviceproviders/sapi_contacts_vpbk/inc/contactiterator.h Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_contacts_vpbk/inc/contactiterator.h Tue Nov 24 08:56:33 2009 +0200 @@ -20,8 +20,8 @@ #define C_CCONTACTITERATOR_H //System includes -#include -#include +#include +#include //User include #include "contactiter.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_contacts_vpbk/src/contactinterface.cpp --- a/serviceproviders/sapi_contacts_vpbk/src/contactinterface.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_contacts_vpbk/src/contactinterface.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -15,9 +15,9 @@ * */ -#include -#include -#include +#include +#include +#include #include #include diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_contacts_vpbk/src/contactinterfacecallback.cpp --- a/serviceproviders/sapi_contacts_vpbk/src/contactinterfacecallback.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_contacts_vpbk/src/contactinterfacecallback.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -16,8 +16,8 @@ */ -#include -#include +#include +#include // User Includes #include "contactinterfacecallback.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_contacts_vpbk/src/contactprovider.cpp --- a/serviceproviders/sapi_contacts_vpbk/src/contactprovider.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_contacts_vpbk/src/contactprovider.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -16,7 +16,7 @@ */ -#include +#include #include "contactprovider.h" #include "contactinterface.h" #include "../../inc/serviceerrno.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_contacts_vpbk/tsrc/dev/tcontactprovidertest/group/tcontactprovidertest.mmp --- a/serviceproviders/sapi_contacts_vpbk/tsrc/dev/tcontactprovidertest/group/tcontactprovidertest.mmp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_contacts_vpbk/tsrc/dev/tcontactprovidertest/group/tcontactprovidertest.mmp Tue Nov 24 08:56:33 2009 +0200 @@ -35,8 +35,8 @@ DEFFILE tcontactprovidertest.def SOURCEPATH ../src -SOURCE Tcomplugin.cpp -SOURCE TcompluginBlocks.cpp +SOURCE tcomplugin.cpp +SOURCE tcompluginblocks.cpp //RESOURCE resource_file //RESOURCE resource_file2 diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_contacts_vpbk/tsrc/dev/tcontactprovidertest/inc/tcomplugin.h --- a/serviceproviders/sapi_contacts_vpbk/tsrc/dev/tcontactprovidertest/inc/tcomplugin.h Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_contacts_vpbk/tsrc/dev/tcontactprovidertest/inc/tcomplugin.h Tue Nov 24 08:56:33 2009 +0200 @@ -28,9 +28,9 @@ #include "serviceerrno.h" -#include -#include -#include +#include +#include +#include #include #include diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_contacts_vpbk/tsrc/dev/tcontactprovidertest/src/tcomplugin.cpp --- a/serviceproviders/sapi_contacts_vpbk/tsrc/dev/tcontactprovidertest/src/tcomplugin.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_contacts_vpbk/tsrc/dev/tcontactprovidertest/src/tcomplugin.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -19,8 +19,8 @@ // INCLUDE FILES -#include -#include "Tcomplugin.h" +#include +#include "tcomplugin.h" #include #include #include diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_contacts_vpbk/tsrc/dev/tcontactprovidertest/src/tcompluginblocks.cpp --- a/serviceproviders/sapi_contacts_vpbk/tsrc/dev/tcontactprovidertest/src/tcompluginblocks.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_contacts_vpbk/tsrc/dev/tcontactprovidertest/src/tcompluginblocks.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -21,10 +21,10 @@ // INCLUDE FILES #include #include -#include +#include -#include -#include +#include +#include #include #include @@ -43,7 +43,7 @@ #include #include -#include "Tcomplugin.h" +#include "tcomplugin.h" _LIT(LogFileName , "C:\\Notifications.txt") ; diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_contacts_vpbk/tsrc/dev/tcontactprovidertest_sync/group/tcontactprovidertest_sync.mmp --- a/serviceproviders/sapi_contacts_vpbk/tsrc/dev/tcontactprovidertest_sync/group/tcontactprovidertest_sync.mmp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_contacts_vpbk/tsrc/dev/tcontactprovidertest_sync/group/tcontactprovidertest_sync.mmp Tue Nov 24 08:56:33 2009 +0200 @@ -35,8 +35,8 @@ DEFFILE tcontactprovidertest_sync.def SOURCEPATH ../src -SOURCE Tcomplugin.cpp -SOURCE TcompluginBlocks.cpp +SOURCE tcomplugin.cpp +SOURCE tcompluginblocks.cpp //RESOURCE resource_file //RESOURCE resource_file2 diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_contacts_vpbk/tsrc/dev/tcontactprovidertest_sync/inc/tcomplugin.h --- a/serviceproviders/sapi_contacts_vpbk/tsrc/dev/tcontactprovidertest_sync/inc/tcomplugin.h Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_contacts_vpbk/tsrc/dev/tcontactprovidertest_sync/inc/tcomplugin.h Tue Nov 24 08:56:33 2009 +0200 @@ -28,9 +28,9 @@ #include "serviceerrno.h" -#include -#include -#include +#include +#include +#include #include #include #include diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_contacts_vpbk/tsrc/dev/tcontactprovidertest_sync/src/tcomplugin.cpp --- a/serviceproviders/sapi_contacts_vpbk/tsrc/dev/tcontactprovidertest_sync/src/tcomplugin.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_contacts_vpbk/tsrc/dev/tcontactprovidertest_sync/src/tcomplugin.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -19,8 +19,8 @@ // INCLUDE FILES -#include -#include "Tcomplugin.h" +#include +#include "tcomplugin.h" #include #include #include diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_contacts_vpbk/tsrc/dev/tcontactprovidertest_sync/src/tcompluginblocks.cpp --- a/serviceproviders/sapi_contacts_vpbk/tsrc/dev/tcontactprovidertest_sync/src/tcompluginblocks.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_contacts_vpbk/tsrc/dev/tcontactprovidertest_sync/src/tcompluginblocks.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -21,9 +21,9 @@ // INCLUDE FILES #include #include -#include -#include -#include +#include +#include +#include #include @@ -42,7 +42,7 @@ #include -#include "Tcomplugin.h" +#include "tcomplugin.h" _LIT(LogFileName , "C:\\Notifications.txt") ; _LIT(KError,"Error code is"); diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_contacts_vpbk/tsrc/dev/tcontacts_async/inc/tcontacts_async.h --- a/serviceproviders/sapi_contacts_vpbk/tsrc/dev/tcontacts_async/inc/tcontacts_async.h Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_contacts_vpbk/tsrc/dev/tcontacts_async/inc/tcontacts_async.h Tue Nov 24 08:56:33 2009 +0200 @@ -32,8 +32,8 @@ #include #include #include -#include -#include +#include +#include #include "contactcallback.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_contacts_vpbk/tsrc/dev/tcontacts_async/src/tcontacts_async.cpp --- a/serviceproviders/sapi_contacts_vpbk/tsrc/dev/tcontacts_async/src/tcontacts_async.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_contacts_vpbk/tsrc/dev/tcontacts_async/src/tcontacts_async.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -19,15 +19,15 @@ // INCLUDE FILES -#include -#include +#include +#include #include #include #include #include #include -#include +#include #include "contactservice.h" #include "tcontacts_async.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_contacts_vpbk/tsrc/dev/tcontacts_async/src/tcontacts_async_blocks.cpp --- a/serviceproviders/sapi_contacts_vpbk/tsrc/dev/tcontacts_async/src/tcontacts_async_blocks.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_contacts_vpbk/tsrc/dev/tcontacts_async/src/tcontacts_async_blocks.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -21,7 +21,7 @@ // INCLUDE FILES #include #include -#include +#include #include #include diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_contacts_vpbk/tsrc/dev/tcontacts_sim/src/tcontacts_sim.cpp --- a/serviceproviders/sapi_contacts_vpbk/tsrc/dev/tcontacts_sim/src/tcontacts_sim.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_contacts_vpbk/tsrc/dev/tcontacts_sim/src/tcontacts_sim.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -19,7 +19,7 @@ // INCLUDE FILES -#include +#include diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_contacts_vpbk/tsrc/dev/tcontacts_sim/src/tcontacts_sim_blocks.cpp --- a/serviceproviders/sapi_contacts_vpbk/tsrc/dev/tcontacts_sim/src/tcontacts_sim_blocks.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_contacts_vpbk/tsrc/dev/tcontacts_sim/src/tcontacts_sim_blocks.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -21,7 +21,7 @@ // INCLUDE FILES #include #include -#include +#include #include #include diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_contacts_vpbk/tsrc/dev/tcontacts_sync/inc/tcontacts_sync.h --- a/serviceproviders/sapi_contacts_vpbk/tsrc/dev/tcontacts_sync/inc/tcontacts_sync.h Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_contacts_vpbk/tsrc/dev/tcontacts_sync/inc/tcontacts_sync.h Tue Nov 24 08:56:33 2009 +0200 @@ -32,8 +32,8 @@ #include #include #include -#include -#include +#include +#include #include "contactcallback.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_contacts_vpbk/tsrc/dev/tcontacts_sync/src/tcontacts_sync.cpp --- a/serviceproviders/sapi_contacts_vpbk/tsrc/dev/tcontacts_sync/src/tcontacts_sync.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_contacts_vpbk/tsrc/dev/tcontacts_sync/src/tcontacts_sync.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -19,15 +19,15 @@ // INCLUDE FILES -#include -#include +#include +#include #include #include #include #include #include -#include +#include #include "contactservice.h" #include "tcontacts_sync.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_contacts_vpbk/tsrc/dev/tcontacts_sync/src/tcontacts_sync_blocks.cpp --- a/serviceproviders/sapi_contacts_vpbk/tsrc/dev/tcontacts_sync/src/tcontacts_sync_blocks.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_contacts_vpbk/tsrc/dev/tcontacts_sync/src/tcontacts_sync_blocks.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -21,7 +21,7 @@ // INCLUDE FILES #include #include -#include +#include #include #include diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_contacts_vpbk/tsrc/dev/tcontactsgetidsprovidertest/inc/tcontactsgetidsprovidertest.h --- a/serviceproviders/sapi_contacts_vpbk/tsrc/dev/tcontactsgetidsprovidertest/inc/tcontactsgetidsprovidertest.h Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_contacts_vpbk/tsrc/dev/tcontactsgetidsprovidertest/inc/tcontactsgetidsprovidertest.h Tue Nov 24 08:56:33 2009 +0200 @@ -28,9 +28,9 @@ #include #include -#include -#include -#include +#include +#include +#include #include // CBase #include // TBuf diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_contacts_vpbk/tsrc/dev/tcontactsgetidsprovidertest/src/tcontactsgetidsprovidertest.cpp --- a/serviceproviders/sapi_contacts_vpbk/tsrc/dev/tcontactsgetidsprovidertest/src/tcontactsgetidsprovidertest.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_contacts_vpbk/tsrc/dev/tcontactsgetidsprovidertest/src/tcontactsgetidsprovidertest.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -20,7 +20,7 @@ #include "tcontactsgetidsprovidertest.h" // Ctcontactsgetidsprovidertest #include "tcontactsgetidsprovidertest.hrh" -#include +#include #include // Member Functions diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_contacts_vpbk/tsrc/dev/tcontactsgetidsprovidertest/src/tcontactsgetidsprovidertestblocks.cpp --- a/serviceproviders/sapi_contacts_vpbk/tsrc/dev/tcontactsgetidsprovidertest/src/tcontactsgetidsprovidertestblocks.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_contacts_vpbk/tsrc/dev/tcontactsgetidsprovidertest/src/tcontactsgetidsprovidertestblocks.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -23,8 +23,8 @@ #include "tcontactsgetidsprovidertest.hrh" #include #include -#include -#include +#include +#include diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_contacts_vpbk/tsrc/dev/tcontactsprovidetest_sim/group/bld.inf --- a/serviceproviders/sapi_contacts_vpbk/tsrc/dev/tcontactsprovidetest_sim/group/bld.inf Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_contacts_vpbk/tsrc/dev/tcontactsprovidetest_sim/group/bld.inf Tue Nov 24 08:56:33 2009 +0200 @@ -25,7 +25,7 @@ PRJ_TESTEXPORTS ../conf/tcontactsprovider_sim.cfg /epoc32/WINSCW/C/TestFramework/tcontactsprovider_sim.cfg //../data/import.vcf /epoc32/WINSCW/C/data/Import.vcf -../data/c/Import1.vcf /epoc32/WINSCW/C/data/Import1.vcf +../data/c/import1.vcf /epoc32/WINSCW/C/data/Import1.vcf PRJ_EXPORTS //All files under this section are been moved to PRJ_TESTEXPORTS diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_contacts_vpbk/tsrc/dev/tcontactsprovidetest_sim/inc/tcontactsprovider_sim.h --- a/serviceproviders/sapi_contacts_vpbk/tsrc/dev/tcontactsprovidetest_sim/inc/tcontactsprovider_sim.h Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_contacts_vpbk/tsrc/dev/tcontactsprovidetest_sim/inc/tcontactsprovider_sim.h Tue Nov 24 08:56:33 2009 +0200 @@ -25,9 +25,9 @@ #include -#include -#include -#include +#include +#include +#include diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_contacts_vpbk/tsrc/dev/tcontactsprovidetest_sim/src/tcontactsprovider_sim.cpp --- a/serviceproviders/sapi_contacts_vpbk/tsrc/dev/tcontactsprovidetest_sim/src/tcontactsprovider_sim.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_contacts_vpbk/tsrc/dev/tcontactsprovidetest_sim/src/tcontactsprovider_sim.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -19,7 +19,7 @@ // INCLUDE FILES -#include +#include diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_contacts_vpbk/tsrc/dev/tcontactsprovidetest_sim/src/tcontactsprovider_sim_blocks.cpp --- a/serviceproviders/sapi_contacts_vpbk/tsrc/dev/tcontactsprovidetest_sim/src/tcontactsprovider_sim_blocks.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_contacts_vpbk/tsrc/dev/tcontactsprovidetest_sim/src/tcontactsprovider_sim_blocks.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -24,14 +24,14 @@ // INCLUDE FILES #include #include -#include +#include #include #include #include -#include -#include +#include +#include #include "serviceerrno.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_contacts_vpbk/tsrc/dev/tprovidertest_vpbk/inc/tprovidertest_vpbk.h --- a/serviceproviders/sapi_contacts_vpbk/tsrc/dev/tprovidertest_vpbk/inc/tprovidertest_vpbk.h Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_contacts_vpbk/tsrc/dev/tprovidertest_vpbk/inc/tprovidertest_vpbk.h Tue Nov 24 08:56:33 2009 +0200 @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_contacts_vpbk/tsrc/dev/tprovidertest_vpbk/inc/tprovidertest_vpbk_observer.h --- a/serviceproviders/sapi_contacts_vpbk/tsrc/dev/tprovidertest_vpbk/inc/tprovidertest_vpbk_observer.h Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_contacts_vpbk/tsrc/dev/tprovidertest_vpbk/inc/tprovidertest_vpbk_observer.h Tue Nov 24 08:56:33 2009 +0200 @@ -22,7 +22,7 @@ -#include +#include #include "e32base.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_contacts_vpbk/tsrc/dev/tprovidertest_vpbk/inc/txmlconvertor.h --- a/serviceproviders/sapi_contacts_vpbk/tsrc/dev/tprovidertest_vpbk/inc/txmlconvertor.h Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_contacts_vpbk/tsrc/dev/tprovidertest_vpbk/inc/txmlconvertor.h Tue Nov 24 08:56:33 2009 +0200 @@ -23,7 +23,7 @@ // INCLUDES -#include +#include #include diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_contacts_vpbk/tsrc/dev/tprovidertest_vpbk/src/tprovidertest_vpbk.cpp --- a/serviceproviders/sapi_contacts_vpbk/tsrc/dev/tprovidertest_vpbk/src/tprovidertest_vpbk.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_contacts_vpbk/tsrc/dev/tprovidertest_vpbk/src/tprovidertest_vpbk.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -19,7 +19,7 @@ // INCLUDE FILES -#include +#include #include #include #include "tprovidertest_vpbk.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_contacts_vpbk/tsrc/dev/tprovidertest_vpbk/src/tprovidertest_vpbk_testblocks.cpp --- a/serviceproviders/sapi_contacts_vpbk/tsrc/dev/tprovidertest_vpbk/src/tprovidertest_vpbk_testblocks.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_contacts_vpbk/tsrc/dev/tprovidertest_vpbk/src/tprovidertest_vpbk_testblocks.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -21,9 +21,9 @@ // INCLUDE FILES #include #include -#include -#include -#include +#include +#include +#include #include "tprovidertest_vpbk.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_contacts_vpbk/tsrc/dev/tprovidertest_vpbk/src/txmlconvertor.cpp --- a/serviceproviders/sapi_contacts_vpbk/tsrc/dev/tprovidertest_vpbk/src/txmlconvertor.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_contacts_vpbk/tsrc/dev/tprovidertest_vpbk/src/txmlconvertor.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -21,12 +21,12 @@ // INCLUDE FILES #include -#include -#include +#include +#include #include #include #include -#include +#include #include #include "txmlconvertor.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_contacts_vpbk/tsrc/testing/group/bld.inf --- a/serviceproviders/sapi_contacts_vpbk/tsrc/testing/group/bld.inf Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_contacts_vpbk/tsrc/testing/group/bld.inf Tue Nov 24 08:56:33 2009 +0200 @@ -18,13 +18,13 @@ -#include "../tContact_add/group/bld.inf" -#include "../tContact_delete/group/bld.inf" -#include "../tContact_edit/group/bld.inf" -#include "../tContact_import/group/bld.inf" -#include "../tContact_export/group/bld.inf" -#include "../tContact_getlist/group/bld.inf" -#include "../tContact_organise/group/bld.inf" +#include "../tcontact_add/group/bld.inf" +#include "../tcontact_delete/group/bld.inf" +#include "../tcontact_edit/group/bld.inf" +#include "../tcontact_import/group/bld.inf" +#include "../tcontact_export/group/bld.inf" +#include "../tcontact_getlist/group/bld.inf" +#include "../tcontact_organise/group/bld.inf" #include "../tcontact_getIds/group/bld.inf" // End of File diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_add/group/bld.inf --- a/serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_add/group/bld.inf Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_add/group/bld.inf Tue Nov 24 08:56:33 2009 +0200 @@ -39,7 +39,7 @@ */ PRJ_TESTMMPFILES -tContact_add.mmp +tcontact_add.mmp // NOTE: If using ARS requirements .mmp file operation should be done under this. // 'abld test build' diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_add/group/tcontact_add.mmp --- a/serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_add/group/tcontact_add.mmp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_add/group/tcontact_add.mmp Tue Nov 24 08:56:33 2009 +0200 @@ -50,11 +50,11 @@ #endif //TARGETPATH ?target_path -DEFFILE tContact_add.def +DEFFILE tcontact_add.def SOURCEPATH ../src -SOURCE tContact_add.cpp -SOURCE tContact_addBlocks.cpp +SOURCE tcontact_add.cpp +SOURCE tcontact_addblocks.cpp diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_add/inc/tcontact_add.h --- a/serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_add/inc/tcontact_add.h Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_add/inc/tcontact_add.h Tue Nov 24 08:56:33 2009 +0200 @@ -24,23 +24,23 @@ #include #include #include -#include //for StringLoaderLC +#include //for StringLoaderLC #include //resource reader #include //for note -#include //for the vcard engin -#include // for iContactManager -#include // for iContactStore -#include //used in SetupL -#include //used in SetupL to get contact stores -#include //used in AddFieldToContactL -#include // used in many function to get the store contact -#include //for the field text data -#include //used in CreateFieldTypeL() -#include //return type of CreateFieldTypeL() -#include //for observer -#include //Used in AddDateFieldToContactL -#include //for param in ContactsSaved() -#include //used in SetupL +#include //for the vcard engin +#include // for iContactManager +#include // for iContactStore +#include //used in SetupL +#include //used in SetupL to get contact stores +#include //used in AddFieldToContactL +#include // used in many function to get the store contact +#include //for the field text data +#include //used in CreateFieldTypeL() +#include //return type of CreateFieldTypeL() +#include //for observer +#include //Used in AddDateFieldToContactL +#include //for param in ContactsSaved() +#include //used in SetupL #include "contactservice.h" #include #include @@ -51,7 +51,7 @@ #include "contactiter.h" #include "contactcallback.h" #include -#include +#include #include #include diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_add/src/tcontact_add.cpp --- a/serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_add/src/tcontact_add.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_add/src/tcontact_add.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -19,8 +19,8 @@ // INCLUDE FILES -#include -#include "tContact_add.h" +#include +#include "tcontact_add.h" // EXTERNAL DATA STRUCTURES //extern ?external_data; diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_add/src/tcontact_addblocks.cpp --- a/serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_add/src/tcontact_addblocks.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_add/src/tcontact_addblocks.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -21,8 +21,8 @@ // INCLUDE FILES #include #include -#include -#include "tContact_add.h" +#include +#include "tcontact_add.h" // EXTERNAL DATA STRUCTURES //extern ?external_data; diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_delete/group/bld.inf --- a/serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_delete/group/bld.inf Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_delete/group/bld.inf Tue Nov 24 08:56:33 2009 +0200 @@ -39,7 +39,7 @@ */ PRJ_TESTMMPFILES -tContact_delete.mmp +tcontact_delete.mmp // NOTE: If using ARS requirements .mmp file operation should be done under this. // 'abld test build' diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_delete/group/tcontact_delete.mmp --- a/serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_delete/group/tcontact_delete.mmp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_delete/group/tcontact_delete.mmp Tue Nov 24 08:56:33 2009 +0200 @@ -50,11 +50,11 @@ #endif //TARGETPATH ?target_path -DEFFILE tContact_delete.def +DEFFILE tcontact_delete.def SOURCEPATH ../src -SOURCE tContact_delete.cpp -SOURCE tContact_deleteBlocks.cpp +SOURCE tcontact_delete.cpp +SOURCE tcontact_deleteblocks.cpp diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_delete/inc/tcontact_delete.h --- a/serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_delete/inc/tcontact_delete.h Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_delete/inc/tcontact_delete.h Tue Nov 24 08:56:33 2009 +0200 @@ -24,23 +24,23 @@ #include #include #include -#include //for StringLoaderLC +#include //for StringLoaderLC #include //resource reader #include //for note -#include //for the vcard engin -#include // for iContactManager -#include // for iContactStore -#include //used in SetupL -#include //used in SetupL to get contact stores -#include //used in AddFieldToContactL -#include // used in many function to get the store contact -#include //for the field text data -#include //used in CreateFieldTypeL() -#include //return type of CreateFieldTypeL() -#include //for observer -#include //Used in AddDateFieldToContactL -#include //for param in ContactsSaved() -#include //used in SetupL +#include //for the vcard engin +#include // for iContactManager +#include // for iContactStore +#include //used in SetupL +#include //used in SetupL to get contact stores +#include //used in AddFieldToContactL +#include // used in many function to get the store contact +#include //for the field text data +#include //used in CreateFieldTypeL() +#include //return type of CreateFieldTypeL() +#include //for observer +#include //Used in AddDateFieldToContactL +#include //for param in ContactsSaved() +#include //used in SetupL #include "contactservice.h" #include #include @@ -51,7 +51,7 @@ #include "contactiter.h" #include "contactcallback.h" #include -#include +#include #include #include diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_delete/src/tcontact_delete.cpp --- a/serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_delete/src/tcontact_delete.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_delete/src/tcontact_delete.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -19,8 +19,8 @@ // INCLUDE FILES -#include -#include "tContact_delete.h" +#include +#include "tcontact_delete.h" // EXTERNAL DATA STRUCTURES //extern ?external_data; diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_delete/src/tcontact_deleteblocks.cpp --- a/serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_delete/src/tcontact_deleteblocks.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_delete/src/tcontact_deleteblocks.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -21,8 +21,8 @@ // INCLUDE FILES #include #include -#include -#include "tContact_delete.h" +#include +#include "tcontact_delete.h" // EXTERNAL DATA STRUCTURES //extern ?external_data; diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_edit/group/bld.inf --- a/serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_edit/group/bld.inf Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_edit/group/bld.inf Tue Nov 24 08:56:33 2009 +0200 @@ -39,7 +39,7 @@ */ PRJ_TESTMMPFILES -tContact_edit.mmp +tcontact_edit.mmp // NOTE: If using ARS requirements .mmp file operation should be done under this. // 'abld test build' diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_edit/group/tcontact_edit.mmp --- a/serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_edit/group/tcontact_edit.mmp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_edit/group/tcontact_edit.mmp Tue Nov 24 08:56:33 2009 +0200 @@ -50,11 +50,11 @@ #endif //TARGETPATH ?target_path -DEFFILE tContact_edit.def +DEFFILE tcontact_edit.def SOURCEPATH ../src -SOURCE tContact_edit.cpp -SOURCE tContact_editBlocks.cpp +SOURCE tcontact_edit.cpp +SOURCE tcontact_editblocks.cpp diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_edit/inc/tcontact_edit.h --- a/serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_edit/inc/tcontact_edit.h Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_edit/inc/tcontact_edit.h Tue Nov 24 08:56:33 2009 +0200 @@ -24,23 +24,23 @@ #include #include #include -#include //for StringLoaderLC +#include //for StringLoaderLC #include //resource reader #include //for note -#include //for the vcard engin -#include // for iContactManager -#include // for iContactStore -#include //used in SetupL -#include //used in SetupL to get contact stores -#include //used in AddFieldToContactL -#include // used in many function to get the store contact -#include //for the field text data -#include //used in CreateFieldTypeL() -#include //return type of CreateFieldTypeL() -#include //for observer -#include //Used in AddDateFieldToContactL -#include //for param in ContactsSaved() -#include //used in SetupL +#include //for the vcard engin +#include // for iContactManager +#include // for iContactStore +#include //used in SetupL +#include //used in SetupL to get contact stores +#include //used in AddFieldToContactL +#include // used in many function to get the store contact +#include //for the field text data +#include //used in CreateFieldTypeL() +#include //return type of CreateFieldTypeL() +#include //for observer +#include //Used in AddDateFieldToContactL +#include //for param in ContactsSaved() +#include //used in SetupL #include "contactservice.h" #include #include @@ -51,7 +51,7 @@ #include "contactiter.h" #include "contactcallback.h" #include -#include +#include #include #include diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_edit/src/tcontact_edit.cpp --- a/serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_edit/src/tcontact_edit.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_edit/src/tcontact_edit.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -19,8 +19,8 @@ // INCLUDE FILES -#include -#include "tContact_edit.h" +#include +#include "tcontact_edit.h" // EXTERNAL DATA STRUCTURES //extern ?external_data; diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_edit/src/tcontact_editblocks.cpp --- a/serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_edit/src/tcontact_editblocks.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_edit/src/tcontact_editblocks.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -21,8 +21,8 @@ // INCLUDE FILES #include #include -#include -#include "tContact_edit.h" +#include +#include "tcontact_edit.h" // EXTERNAL DATA STRUCTURES //extern ?external_data; diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_export/group/bld.inf --- a/serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_export/group/bld.inf Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_export/group/bld.inf Tue Nov 24 08:56:33 2009 +0200 @@ -39,7 +39,7 @@ */ PRJ_TESTMMPFILES -tContact_export.mmp +tcontact_export.mmp // NOTE: If using ARS requirements .mmp file operation should be done under this. // 'abld test build' diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_export/group/tcontact_export.mmp --- a/serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_export/group/tcontact_export.mmp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_export/group/tcontact_export.mmp Tue Nov 24 08:56:33 2009 +0200 @@ -49,11 +49,11 @@ #endif //TARGETPATH ?target_path -DEFFILE tContact_export.def +DEFFILE tcontact_export.def SOURCEPATH ../src -SOURCE tContact_export.cpp -SOURCE tContact_exportBlocks.cpp +SOURCE tcontact_export.cpp +SOURCE tcontact_exportblocks.cpp EPOCALLOWDLLDATA diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_export/inc/tcontact_export.h --- a/serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_export/inc/tcontact_export.h Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_export/inc/tcontact_export.h Tue Nov 24 08:56:33 2009 +0200 @@ -25,23 +25,23 @@ #include #include #include -#include //for StringLoaderLC +#include //for StringLoaderLC #include //resource reader #include //for note -#include //for the vcard engin -#include // for iContactManager -#include // for iContactStore -#include //used in SetupL -#include //used in SetupL to get contact stores -#include //used in AddFieldToContactL -#include // used in many function to get the store contact -#include //for the field text data -#include //used in CreateFieldTypeL() -#include //return type of CreateFieldTypeL() -#include //for observer -#include //Used in AddDateFieldToContactL -#include //for param in ContactsSaved() -#include //used in SetupL +#include //for the vcard engin +#include // for iContactManager +#include // for iContactStore +#include //used in SetupL +#include //used in SetupL to get contact stores +#include //used in AddFieldToContactL +#include // used in many function to get the store contact +#include //for the field text data +#include //used in CreateFieldTypeL() +#include //return type of CreateFieldTypeL() +#include //for observer +#include //Used in AddDateFieldToContactL +#include //for param in ContactsSaved() +#include //used in SetupL #include "contactservice.h" #include #include @@ -52,7 +52,7 @@ #include "contactiter.h" #include "contactcallback.h" #include -#include +#include #include #include diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_export/src/tcontact_export.cpp --- a/serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_export/src/tcontact_export.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_export/src/tcontact_export.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -19,8 +19,8 @@ // INCLUDE FILES -#include -#include "tContact_export.h" +#include +#include "tcontact_export.h" // EXTERNAL DATA STRUCTURES //extern ?external_data; diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_export/src/tcontact_exportblocks.cpp --- a/serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_export/src/tcontact_exportblocks.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_export/src/tcontact_exportblocks.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -21,8 +21,8 @@ // INCLUDE FILES #include #include -#include -#include "tContact_export.h" +#include +#include "tcontact_export.h" // EXTERNAL DATA STRUCTURES //extern ?external_data; diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_getIds/group/tcontact_getIds.mmp --- a/serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_getIds/group/tcontact_getIds.mmp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_getIds/group/tcontact_getIds.mmp Tue Nov 24 08:56:33 2009 +0200 @@ -54,7 +54,7 @@ SOURCEPATH ../src SOURCE tcontact_getIds.cpp -SOURCE tContact_getIdsBlocks.cpp +SOURCE tcontact_getIdsblocks.cpp //RESOURCE resource_file //RESOURCE resource_file2 diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_getIds/inc/tcontact_getIds.h --- a/serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_getIds/inc/tcontact_getIds.h Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_getIds/inc/tcontact_getIds.h Tue Nov 24 08:56:33 2009 +0200 @@ -25,23 +25,23 @@ #include #include #include -#include //for StringLoaderLC +#include //for StringLoaderLC #include //resource reader #include //for note -#include //for the vcard engin -#include // for iContactManager -#include // for iContactStore -#include //used in SetupL -#include //used in SetupL to get contact stores -#include //used in AddFieldToContactL -#include // used in many function to get the store contact -#include //for the field text data -#include //used in CreateFieldTypeL() -#include //return type of CreateFieldTypeL() -#include //for observer -#include //Used in AddDateFieldToContactL -#include //for param in ContactsSaved() -#include //used in SetupL +#include //for the vcard engin +#include // for iContactManager +#include // for iContactStore +#include //used in SetupL +#include //used in SetupL to get contact stores +#include //used in AddFieldToContactL +#include // used in many function to get the store contact +#include //for the field text data +#include //used in CreateFieldTypeL() +#include //return type of CreateFieldTypeL() +#include //for observer +#include //Used in AddDateFieldToContactL +#include //for param in ContactsSaved() +#include //used in SetupL #include "contactservice.h" #include #include @@ -51,7 +51,7 @@ #include "contactiter.h" #include "contactcallback.h" #include -#include +#include #include #include diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_getIds/src/tcontact_getIds.cpp --- a/serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_getIds/src/tcontact_getIds.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_getIds/src/tcontact_getIds.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -19,7 +19,7 @@ // INCLUDE FILES -#include +#include #include "tcontact_getIds.h" // EXTERNAL DATA STRUCTURES diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_getIds/src/tcontact_getIdsblocks.cpp --- a/serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_getIds/src/tcontact_getIdsblocks.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_getIds/src/tcontact_getIdsblocks.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -21,7 +21,7 @@ // INCLUDE FILES #include #include -#include +#include #include "tcontact_getIds.h" // EXTERNAL DATA STRUCTURES diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_getlist/group/bld.inf --- a/serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_getlist/group/bld.inf Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_getlist/group/bld.inf Tue Nov 24 08:56:33 2009 +0200 @@ -39,7 +39,7 @@ */ PRJ_TESTMMPFILES -tContact_getlist.mmp +tcontact_getlist.mmp // NOTE: If using ARS requirements .mmp file operation should be done under this. // 'abld test build' diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_getlist/group/tcontact_getlist.mmp --- a/serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_getlist/group/tcontact_getlist.mmp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_getlist/group/tcontact_getlist.mmp Tue Nov 24 08:56:33 2009 +0200 @@ -50,11 +50,11 @@ #endif //TARGETPATH ?target_path -DEFFILE tContact_getlist.def +DEFFILE tcontact_getlist.def SOURCEPATH ../src -SOURCE tContact_getlist.cpp -SOURCE tContact_getlistBlocks.cpp +SOURCE tcontact_getlist.cpp +SOURCE tcontact_getlistblocks.cpp //RESOURCE resource_file //RESOURCE resource_file2 diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_getlist/inc/tcontact_getlist.h --- a/serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_getlist/inc/tcontact_getlist.h Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_getlist/inc/tcontact_getlist.h Tue Nov 24 08:56:33 2009 +0200 @@ -25,23 +25,23 @@ #include #include #include -#include //for StringLoaderLC +#include //for StringLoaderLC #include //resource reader #include //for note -#include //for the vcard engin -#include // for iContactManager -#include // for iContactStore -#include //used in SetupL -#include //used in SetupL to get contact stores -#include //used in AddFieldToContactL -#include // used in many function to get the store contact -#include //for the field text data -#include //used in CreateFieldTypeL() -#include //return type of CreateFieldTypeL() -#include //for observer -#include //Used in AddDateFieldToContactL -#include //for param in ContactsSaved() -#include //used in SetupL +#include //for the vcard engin +#include // for iContactManager +#include // for iContactStore +#include //used in SetupL +#include //used in SetupL to get contact stores +#include //used in AddFieldToContactL +#include // used in many function to get the store contact +#include //for the field text data +#include //used in CreateFieldTypeL() +#include //return type of CreateFieldTypeL() +#include //for observer +#include //Used in AddDateFieldToContactL +#include //for param in ContactsSaved() +#include //used in SetupL #include "contactservice.h" #include #include @@ -51,7 +51,7 @@ #include "contactiter.h" #include "contactcallback.h" #include -#include +#include #include #include diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_getlist/src/tcontact_getlist.cpp --- a/serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_getlist/src/tcontact_getlist.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_getlist/src/tcontact_getlist.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -19,8 +19,8 @@ // INCLUDE FILES -#include -#include "tContact_getlist.h" +#include +#include "tcontact_getlist.h" // EXTERNAL DATA STRUCTURES //extern ?external_data; diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_getlist/src/tcontact_getlistblocks.cpp --- a/serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_getlist/src/tcontact_getlistblocks.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_getlist/src/tcontact_getlistblocks.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -21,8 +21,8 @@ // INCLUDE FILES #include #include -#include -#include "tContact_getlist.h" +#include +#include "tcontact_getlist.h" // EXTERNAL DATA STRUCTURES //extern ?external_data; diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_import/group/bld.inf --- a/serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_import/group/bld.inf Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_import/group/bld.inf Tue Nov 24 08:56:33 2009 +0200 @@ -39,7 +39,7 @@ */ PRJ_TESTMMPFILES -tContact_import.mmp +tcontact_import.mmp // NOTE: If using ARS requirements .mmp file operation should be done under this. // 'abld test build' diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_import/group/tcontact_import.mmp --- a/serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_import/group/tcontact_import.mmp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_import/group/tcontact_import.mmp Tue Nov 24 08:56:33 2009 +0200 @@ -50,11 +50,11 @@ #endif //TARGETPATH ?target_path -DEFFILE tContact_import.def +DEFFILE tcontact_import.def SOURCEPATH ../src -SOURCE tContact_import.cpp -SOURCE tContact_importBlocks.cpp +SOURCE tcontact_import.cpp +SOURCE tcontact_importblocks.cpp EPOCALLOWDLLDATA diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_import/inc/tcontact_import.h --- a/serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_import/inc/tcontact_import.h Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_import/inc/tcontact_import.h Tue Nov 24 08:56:33 2009 +0200 @@ -25,23 +25,23 @@ #include #include #include -#include //for StringLoaderLC +#include //for StringLoaderLC #include //resource reader #include //for note -#include //for the vcard engin -#include // for iContactManager -#include // for iContactStore -#include //used in SetupL -#include //used in SetupL to get contact stores -#include //used in AddFieldToContactL -#include // used in many function to get the store contact -#include //for the field text data -#include //used in CreateFieldTypeL() -#include //return type of CreateFieldTypeL() -#include //for observer -#include //Used in AddDateFieldToContactL -#include //for param in ContactsSaved() -#include //used in SetupL +#include //for the vcard engin +#include // for iContactManager +#include // for iContactStore +#include //used in SetupL +#include //used in SetupL to get contact stores +#include //used in AddFieldToContactL +#include // used in many function to get the store contact +#include //for the field text data +#include //used in CreateFieldTypeL() +#include //return type of CreateFieldTypeL() +#include //for observer +#include //Used in AddDateFieldToContactL +#include //for param in ContactsSaved() +#include //used in SetupL #include "contactservice.h" #include #include @@ -52,7 +52,7 @@ #include "contactiter.h" #include "contactcallback.h" #include -#include +#include #include #include diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_import/src/tcontact_import.cpp --- a/serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_import/src/tcontact_import.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_import/src/tcontact_import.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -19,8 +19,8 @@ // INCLUDE FILES -#include -#include "tContact_import.h" +#include +#include "tcontact_import.h" // EXTERNAL DATA STRUCTURES //extern ?external_data; diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_import/src/tcontact_importblocks.cpp --- a/serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_import/src/tcontact_importblocks.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_import/src/tcontact_importblocks.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -21,8 +21,8 @@ // INCLUDE FILES #include #include -#include -#include "tContact_import.h" +#include +#include "tcontact_import.h" // EXTERNAL DATA STRUCTURES //extern ?external_data; diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_organise/group/bld.inf --- a/serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_organise/group/bld.inf Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_organise/group/bld.inf Tue Nov 24 08:56:33 2009 +0200 @@ -39,7 +39,7 @@ */ PRJ_TESTMMPFILES -tContact_organise.mmp +tcontact_organise.mmp // NOTE: If using ARS requirements .mmp file operation should be done under this. // 'abld test build' diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_organise/group/tcontact_organise.mmp --- a/serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_organise/group/tcontact_organise.mmp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_organise/group/tcontact_organise.mmp Tue Nov 24 08:56:33 2009 +0200 @@ -50,11 +50,11 @@ #endif //TARGETPATH ?target_path -DEFFILE tContact_organise.def +DEFFILE tcontact_organise.def SOURCEPATH ../src -SOURCE tContact_organise.cpp -SOURCE tContact_organiseBlocks.cpp +SOURCE tcontact_organise.cpp +SOURCE tcontact_organiseblocks.cpp diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_organise/inc/tcontact_organise.h --- a/serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_organise/inc/tcontact_organise.h Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_organise/inc/tcontact_organise.h Tue Nov 24 08:56:33 2009 +0200 @@ -25,23 +25,23 @@ #include #include #include -#include //for StringLoaderLC +#include //for StringLoaderLC #include //resource reader #include //for note -#include //for the vcard engin -#include // for iContactManager -#include // for iContactStore -#include //used in SetupL -#include //used in SetupL to get contact stores -#include //used in AddFieldToContactL -#include // used in many function to get the store contact -#include //for the field text data -#include //used in CreateFieldTypeL() -#include //return type of CreateFieldTypeL() -#include //for observer -#include //Used in AddDateFieldToContactL -#include //for param in ContactsSaved() -#include //used in SetupL +#include //for the vcard engin +#include // for iContactManager +#include // for iContactStore +#include //used in SetupL +#include //used in SetupL to get contact stores +#include //used in AddFieldToContactL +#include // used in many function to get the store contact +#include //for the field text data +#include //used in CreateFieldTypeL() +#include //return type of CreateFieldTypeL() +#include //for observer +#include //Used in AddDateFieldToContactL +#include //for param in ContactsSaved() +#include //used in SetupL #include "contactservice.h" #include #include @@ -52,7 +52,7 @@ #include "contactiter.h" #include "contactcallback.h" #include -#include +#include #include #include diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_organise/src/tcontact_organise.cpp --- a/serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_organise/src/tcontact_organise.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_organise/src/tcontact_organise.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -19,8 +19,8 @@ // INCLUDE FILES -#include -#include "tContact_organise.h" +#include +#include "tcontact_organise.h" // EXTERNAL DATA STRUCTURES //extern ?external_data; diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_organise/src/tcontact_organiseblocks.cpp --- a/serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_organise/src/tcontact_organiseblocks.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_contacts_vpbk/tsrc/testing/tcontact_organise/src/tcontact_organiseblocks.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -21,8 +21,8 @@ // INCLUDE FILES #include #include -#include -#include "tContact_organise.h" +#include +#include "tcontact_organise.h" TInt handleiter_cnt; diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_landmarks/landmarksservice/inc/clandmarkfilter.h --- a/serviceproviders/sapi_landmarks/landmarksservice/inc/clandmarkfilter.h Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_landmarks/landmarksservice/inc/clandmarkfilter.h Tue Nov 24 08:56:33 2009 +0200 @@ -21,7 +21,7 @@ // INCLUDES #include -#include +#include //FORWARD DECLARARTION class CPosLmSearchCriteria; diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_landmarks/landmarksservice/src/clandmarkcmdgetcategories.cpp --- a/serviceproviders/sapi_landmarks/landmarksservice/src/clandmarkcmdgetcategories.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_landmarks/landmarksservice/src/clandmarkcmdgetcategories.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -16,8 +16,8 @@ */ -#include -#include +#include +#include #include "clandmarkcmdgetcategories.h" #include "mlandmarkobserver.h" #include "clandmarkmanagehandlers.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_landmarks/landmarksservice/src/clandmarkcmdgetlandmarks.cpp --- a/serviceproviders/sapi_landmarks/landmarksservice/src/clandmarkcmdgetlandmarks.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_landmarks/landmarksservice/src/clandmarkcmdgetlandmarks.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -16,8 +16,8 @@ */ -#include -#include +#include +#include #include "clandmarkcmdgetlandmarks.h" #include "mlandmarkobserver.h" #include "clandmarkmanagehandlers.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_landmarks/landmarksservice/src/clandmarkfilter.cpp --- a/serviceproviders/sapi_landmarks/landmarksservice/src/clandmarkfilter.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_landmarks/landmarksservice/src/clandmarkfilter.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -16,10 +16,10 @@ */ -#include -#include -#include -#include +#include +#include +#include +#include #include "clandmarkfilter.h" _LIT(KGetAll,"*"); diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_landmarks/landmarksservice/src/clandmarkmanagehandlers.cpp --- a/serviceproviders/sapi_landmarks/landmarksservice/src/clandmarkmanagehandlers.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_landmarks/landmarksservice/src/clandmarkmanagehandlers.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -16,10 +16,10 @@ */ -#include -#include -#include -#include +#include +#include +#include +#include #include "clandmarkmanagehandlers.h" //class CLandmarkManageHandlers diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_landmarks/landmarksservice/src/landmarkservice.cpp --- a/serviceproviders/sapi_landmarks/landmarksservice/src/landmarkservice.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_landmarks/landmarksservice/src/landmarkservice.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -16,14 +16,14 @@ */ -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #include "landmarkservice.h" #include "clandmarkcmdgetcategories.h" #include "clandmarkcmdgetlandmarks.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_landmarks/src/clandmarkcategoryiterable.cpp --- a/serviceproviders/sapi_landmarks/src/clandmarkcategoryiterable.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_landmarks/src/clandmarkcategoryiterable.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -16,10 +16,10 @@ */ -#include -#include -#include -#include +#include +#include +#include +#include #include "clandmarkcategoryiterable.h" #include "landmarkliwparams.hrh" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_landmarks/src/clandmarkdatabaseiterable.cpp --- a/serviceproviders/sapi_landmarks/src/clandmarkdatabaseiterable.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_landmarks/src/clandmarkdatabaseiterable.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -16,7 +16,7 @@ */ #include -#include +#include #include "clandmarkdatabaseiterable.h" #include "landmarkliwparams.hrh" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_landmarks/src/clandmarkiterable.cpp --- a/serviceproviders/sapi_landmarks/src/clandmarkiterable.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_landmarks/src/clandmarkiterable.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -17,9 +17,9 @@ #include -#include -#include -#include +#include +#include +#include #include #include "clandmarkiterable.h" #include "landmarkliwparams.hrh" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_landmarks/src/landmarkinterface.cpp --- a/serviceproviders/sapi_landmarks/src/landmarkinterface.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_landmarks/src/landmarkinterface.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -18,17 +18,17 @@ //INCLUDES #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 "landmarkliwparams.hrh" #include "landmarkinterface.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_landmarks/tsrc/dev/tlandmarksprovidertest/tlandmarkprovider/group/bld.inf --- a/serviceproviders/sapi_landmarks/tsrc/dev/tlandmarksprovidertest/tlandmarkprovider/group/bld.inf Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_landmarks/tsrc/dev/tlandmarksprovidertest/tlandmarkprovider/group/bld.inf Tue Nov 24 08:56:33 2009 +0200 @@ -23,6 +23,6 @@ ../conf/tlandmarkprovider.cfg /epoc32/WINSCW/C/TestFramework/tlandmarkprovider.cfg PRJ_TESTMMPFILES -TLandmarkProvider.mmp +tlandmarkprovider.mmp // End of File \ No newline at end of file diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_landmarks/tsrc/dev/tlandmarksprovidertest/tlandmarkprovider/group/tlandmarkprovider.mmp --- a/serviceproviders/sapi_landmarks/tsrc/dev/tlandmarksprovidertest/tlandmarkprovider/group/tlandmarkprovider.mmp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_landmarks/tsrc/dev/tlandmarksprovidertest/tlandmarkprovider/group/tlandmarkprovider.mmp Tue Nov 24 08:56:33 2009 +0200 @@ -32,11 +32,11 @@ #endif //TARGETPATH ?target_path -DEFFILE TLandmarkProvider.def +DEFFILE tlandmarkprovider.def SOURCEPATH ../src -SOURCE TLandmarkProvider.cpp -SOURCE TLandmarkProviderBlocks.cpp +SOURCE tlandmarkprovider.cpp +SOURCE tlandmarkproviderblocks.cpp //RESOURCE resource_file //RESOURCE resource_file2 diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_landmarks/tsrc/dev/tlandmarksprovidertest/tlandmarkprovider/src/tlandmarkprovider.cpp --- a/serviceproviders/sapi_landmarks/tsrc/dev/tlandmarksprovidertest/tlandmarkprovider/src/tlandmarkprovider.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_landmarks/tsrc/dev/tlandmarksprovidertest/tlandmarkprovider/src/tlandmarkprovider.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -18,13 +18,13 @@ // INCLUDE FILES -#include +#include #include #include -#include +#include #include #include -#include "TLandmarkProvider.h" +#include "tlandmarkprovider.h" #include "landmarkliwparams.hrh" // EXTERNAL DATA STRUCTURES diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_landmarks/tsrc/dev/tlandmarksprovidertest/tlandmarkprovider/src/tlandmarkproviderblocks.cpp --- a/serviceproviders/sapi_landmarks/tsrc/dev/tlandmarksprovidertest/tlandmarkprovider/src/tlandmarkproviderblocks.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_landmarks/tsrc/dev/tlandmarksprovidertest/tlandmarkprovider/src/tlandmarkproviderblocks.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -23,18 +23,18 @@ #include #include #include -#include +#include #include #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include #include -#include "TLandmarkProvider.h" +#include "tlandmarkprovider.h" #include "landmarkliwparams.hrh" // EXTERNAL DATA STRUCTURES diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_landmarks/tsrc/dev/tlandmarksprovidertest/tlmprovidercategorytests/src/tlmprovidercategorytestblocks.cpp --- a/serviceproviders/sapi_landmarks/tsrc/dev/tlandmarksprovidertest/tlmprovidercategorytests/src/tlmprovidercategorytestblocks.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_landmarks/tsrc/dev/tlandmarksprovidertest/tlmprovidercategorytests/src/tlmprovidercategorytestblocks.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -20,14 +20,14 @@ #include #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include -#include -#include -#include +#include +#include +#include #include "tlmprovidercategorytests.h" #include "landmarkliwparams.hrh" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_landmarks/tsrc/dev/tlandmarksprovidertest/tlmprovidercategorytests/src/tlmprovidercategorytests.cpp --- a/serviceproviders/sapi_landmarks/tsrc/dev/tlandmarksprovidertest/tlmprovidercategorytests/src/tlmprovidercategorytests.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_landmarks/tsrc/dev/tlandmarksprovidertest/tlmprovidercategorytests/src/tlmprovidercategorytests.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -19,12 +19,12 @@ // INCLUDE FILES -#include -#include +#include +#include #include #include -#include -#include +#include +#include #include "tlmprovidercategorytests.h" #include "landmarkliwparams.hrh" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_landmarks/tsrc/dev/tlandmarksprovidertest/tlmproviderdbtests/src/tlmproviderdbtestblocks.cpp --- a/serviceproviders/sapi_landmarks/tsrc/dev/tlandmarksprovidertest/tlmproviderdbtests/src/tlmproviderdbtestblocks.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_landmarks/tsrc/dev/tlandmarksprovidertest/tlmproviderdbtests/src/tlmproviderdbtestblocks.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -19,15 +19,15 @@ #include #include -#include +#include #include #include #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include "tlmproviderdbtests.h" #include "landmarkliwparams.hrh" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_landmarks/tsrc/dev/tlandmarksprovidertest/tlmproviderdbtests/src/tlmproviderdbtests.cpp --- a/serviceproviders/sapi_landmarks/tsrc/dev/tlandmarksprovidertest/tlmproviderdbtests/src/tlmproviderdbtests.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_landmarks/tsrc/dev/tlandmarksprovidertest/tlmproviderdbtests/src/tlmproviderdbtests.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -19,12 +19,12 @@ // INCLUDE FILES -#include -#include +#include +#include #include #include -#include -#include +#include +#include #include "tlmproviderdbtests.h" #include "landmarkliwparams.hrh" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_landmarks/tsrc/dev/tlandmarkstest/tlmcategorytests/group/tlmcategorytests.mmp --- a/serviceproviders/sapi_landmarks/tsrc/dev/tlandmarkstest/tlmcategorytests/group/tlmcategorytests.mmp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_landmarks/tsrc/dev/tlandmarkstest/tlmcategorytests/group/tlmcategorytests.mmp Tue Nov 24 08:56:33 2009 +0200 @@ -37,7 +37,7 @@ SOURCEPATH ../src SOURCE clmcategoriestest.cpp -SOURCE clmcategoriestestBlocks.cpp +SOURCE clmcategoriestestblocks.cpp USERINCLUDE ../inc diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_landmarks/tsrc/dev/tlandmarkstest/tlmcategorytests/inc/clandmarkfilter.h --- a/serviceproviders/sapi_landmarks/tsrc/dev/tlandmarkstest/tlmcategorytests/inc/clandmarkfilter.h Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_landmarks/tsrc/dev/tlandmarkstest/tlmcategorytests/inc/clandmarkfilter.h Tue Nov 24 08:56:33 2009 +0200 @@ -22,7 +22,7 @@ // INCLUDES #include -#include +#include //FORWARD DECLARARTION class CPosLmSearchCriteria; diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_landmarks/tsrc/dev/tlandmarkstest/tlmcategorytests/inc/clmcategoriestest.h --- a/serviceproviders/sapi_landmarks/tsrc/dev/tlandmarkstest/tlmcategorytests/inc/clmcategoriestest.h Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_landmarks/tsrc/dev/tlandmarkstest/tlmcategorytests/inc/clmcategoriestest.h Tue Nov 24 08:56:33 2009 +0200 @@ -27,11 +27,11 @@ #include #include #include -#include +#include #include #include -#include -#include +#include +#include #include "landmarkservice.h" #include "mlandmarkobserver.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_landmarks/tsrc/dev/tlandmarkstest/tlmcategorytests/src/clmcategoriestest.cpp --- a/serviceproviders/sapi_landmarks/tsrc/dev/tlandmarkstest/tlmcategorytests/src/clmcategoriestest.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_landmarks/tsrc/dev/tlandmarkstest/tlmcategorytests/src/clmcategoriestest.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -19,10 +19,10 @@ // INCLUDE FILES -#include -#include "Clmcategoriestest.h" -#include -#include +#include +#include "clmcategoriestest.h" +#include +#include // ============================ MEMBER FUNCTIONS =============================== diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_landmarks/tsrc/dev/tlandmarkstest/tlmcategorytests/src/clmcategoriestestblocks.cpp --- a/serviceproviders/sapi_landmarks/tsrc/dev/tlandmarkstest/tlmcategorytests/src/clmcategoriestestblocks.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_landmarks/tsrc/dev/tlandmarkstest/tlmcategorytests/src/clmcategoriestestblocks.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -21,13 +21,13 @@ // INCLUDE FILES #include #include -#include +#include #include #include -#include -#include -#include -#include "Clmcategoriestest.h" +#include +#include +#include +#include "clmcategoriestest.h" #include "landmarkservice.h" #include "clandmarkfilter.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_landmarks/tsrc/dev/tlandmarkstest/tlmdatabasetests/group/bld.inf --- a/serviceproviders/sapi_landmarks/tsrc/dev/tlandmarkstest/tlmdatabasetests/group/bld.inf Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_landmarks/tsrc/dev/tlandmarkstest/tlmdatabasetests/group/bld.inf Tue Nov 24 08:56:33 2009 +0200 @@ -22,9 +22,9 @@ WINSCW ARMV5 PRJ_TESTEXPORTS -../conf/Tlmdatabasetests.cfg /epoc32/WINSCW/C/TestFramework/Tlmdatabasetests.cfg +../conf/tlmdatabasetests.cfg /epoc32/WINSCW/C/TestFramework/tlmdatabasetests.cfg PRJ_TESTMMPFILES -Tlmdatabasetests.mmp +tlmdatabasetests.mmp // End of File \ No newline at end of file diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_landmarks/tsrc/dev/tlandmarkstest/tlmdatabasetests/inc/tlmdatabasestest.h --- a/serviceproviders/sapi_landmarks/tsrc/dev/tlandmarkstest/tlmdatabasetests/inc/tlmdatabasestest.h Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_landmarks/tsrc/dev/tlandmarkstest/tlmdatabasetests/inc/tlmdatabasestest.h Tue Nov 24 08:56:33 2009 +0200 @@ -27,7 +27,7 @@ #include #include #include -#include +#include // MACROS // Logging path diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_landmarks/tsrc/dev/tlandmarkstest/tlmdatabasetests/src/tlmdatabasestest.cpp --- a/serviceproviders/sapi_landmarks/tsrc/dev/tlandmarkstest/tlmdatabasetests/src/tlmdatabasestest.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_landmarks/tsrc/dev/tlandmarkstest/tlmdatabasetests/src/tlmdatabasestest.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -19,8 +19,8 @@ // INCLUDE FILES -#include -#include "TLmDatabasesTest.h" +#include +#include "tlmdatabasestest.h" // ============================ MEMBER FUNCTIONS =============================== diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_landmarks/tsrc/dev/tlandmarkstest/tlmdatabasetests/src/tlmtestblocks.cpp --- a/serviceproviders/sapi_landmarks/tsrc/dev/tlandmarkstest/tlmdatabasetests/src/tlmtestblocks.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_landmarks/tsrc/dev/tlandmarkstest/tlmdatabasetests/src/tlmtestblocks.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -21,8 +21,8 @@ // INCLUDE FILES #include #include -#include -#include "TLmDatabasesTest.h" +#include +#include "tlmdatabasestest.h" #include "landmarkservice.h" // CONSTANTS diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_landmarks/tsrc/dev/tlandmarkstest/tlmlandmarktests/group/tlmlandmarktests.mmp --- a/serviceproviders/sapi_landmarks/tsrc/dev/tlandmarkstest/tlmlandmarktests/group/tlmlandmarktests.mmp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_landmarks/tsrc/dev/tlandmarkstest/tlmlandmarktests/group/tlmlandmarktests.mmp Tue Nov 24 08:56:33 2009 +0200 @@ -36,7 +36,7 @@ SOURCEPATH ../src SOURCE clmlandmarkstest.cpp -SOURCE clmlandmarkstestBlocks.cpp +SOURCE clmlandmarkstestblocks.cpp SOURCE clandmarkasynctests.cpp diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_landmarks/tsrc/dev/tlandmarkstest/tlmlandmarktests/inc/clandmarkasynctests.h --- a/serviceproviders/sapi_landmarks/tsrc/dev/tlandmarkstest/tlmlandmarktests/inc/clandmarkasynctests.h Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_landmarks/tsrc/dev/tlandmarkstest/tlmlandmarktests/inc/clandmarkasynctests.h Tue Nov 24 08:56:33 2009 +0200 @@ -20,7 +20,7 @@ #include #include "mlandmarkobserver.h" -#include "Clmlandmarkstest.h" +#include "clmlandmarkstest.h" class CLandmarkService; class CPosLmItemIterator; diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_landmarks/tsrc/dev/tlandmarkstest/tlmlandmarktests/inc/clandmarkfilter.h --- a/serviceproviders/sapi_landmarks/tsrc/dev/tlandmarkstest/tlmlandmarktests/inc/clandmarkfilter.h Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_landmarks/tsrc/dev/tlandmarkstest/tlmlandmarktests/inc/clandmarkfilter.h Tue Nov 24 08:56:33 2009 +0200 @@ -22,7 +22,7 @@ // INCLUDES #include -#include +#include //FORWARD DECLARARTION class CPosLmSearchCriteria; diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_landmarks/tsrc/dev/tlandmarkstest/tlmlandmarktests/inc/clmlandmarkstest.h --- a/serviceproviders/sapi_landmarks/tsrc/dev/tlandmarkstest/tlmlandmarktests/inc/clmlandmarkstest.h Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_landmarks/tsrc/dev/tlandmarkstest/tlmlandmarktests/inc/clmlandmarkstest.h Tue Nov 24 08:56:33 2009 +0200 @@ -27,10 +27,10 @@ #include #include #include -#include +#include #include #include -#include +#include #include "mlandmarkobserver.h" #include "landmarkservice.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_landmarks/tsrc/dev/tlandmarkstest/tlmlandmarktests/src/clandmarkasynctests.cpp --- a/serviceproviders/sapi_landmarks/tsrc/dev/tlandmarkstest/tlmlandmarktests/src/clandmarkasynctests.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_landmarks/tsrc/dev/tlandmarkstest/tlmlandmarktests/src/clandmarkasynctests.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -15,15 +15,15 @@ * */ -#include -#include +#include +#include #include #include -#include -#include +#include +#include #include "clandmarkfilter.h" #include "landmarkservice.h" -#include "CLandmarkAsyncTests.h" +#include "clandmarkasynctests.h" _LIT(KLmName1, "lm1"); _LIT(KLmName2, "lm2"); diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_landmarks/tsrc/dev/tlandmarkstest/tlmlandmarktests/src/clmlandmarkstest.cpp --- a/serviceproviders/sapi_landmarks/tsrc/dev/tlandmarkstest/tlmlandmarktests/src/clmlandmarkstest.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_landmarks/tsrc/dev/tlandmarkstest/tlmlandmarktests/src/clmlandmarkstest.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -19,9 +19,9 @@ // INCLUDE FILES -#include -#include "Clmlandmarkstest.h" -#include +#include +#include "clmlandmarkstest.h" +#include // ============================ MEMBER FUNCTIONS =============================== diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_landmarks/tsrc/dev/tlandmarkstest/tlmlandmarktests/src/clmlandmarkstestblocks.cpp --- a/serviceproviders/sapi_landmarks/tsrc/dev/tlandmarkstest/tlmlandmarktests/src/clmlandmarkstestblocks.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_landmarks/tsrc/dev/tlandmarkstest/tlmlandmarktests/src/clmlandmarkstestblocks.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -21,19 +21,19 @@ // INCLUDE FILES #include #include -#include -#include -#include +#include +#include +#include #include #include #include -#include -#include -#include +#include +#include +#include #include "clandmarkfilter.h" -#include "CLandmarkAsyncTests.h" +#include "clandmarkasynctests.h" #include "landmarkservice.h" -#include "Clmlandmarkstest.h" +#include "clmlandmarkstest.h" _LIT(KLmName1, "lm1"); _LIT(KLmName2, "lm2"); diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_landmarks/tsrc/testing/tlandmark_provider/group/tlandmark_provider.mmp --- a/serviceproviders/sapi_landmarks/tsrc/testing/tlandmark_provider/group/tlandmark_provider.mmp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_landmarks/tsrc/testing/tlandmark_provider/group/tlandmark_provider.mmp Tue Nov 24 08:56:33 2009 +0200 @@ -48,7 +48,7 @@ SOURCEPATH ../src SOURCE tlandmark_provider.cpp -SOURCE tlandmark_providerBlocks.cpp +SOURCE tlandmark_providerblocks.cpp SOURCE tgetlist.cpp //RESOURCE resource_file diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_landmarks/tsrc/testing/tlandmark_provider/inc/getlist.h --- a/serviceproviders/sapi_landmarks/tsrc/testing/tlandmark_provider/inc/getlist.h Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_landmarks/tsrc/testing/tlandmark_provider/inc/getlist.h Tue Nov 24 08:56:33 2009 +0200 @@ -23,7 +23,7 @@ #include #include #include -#include +#include class CLiwServiceHandler; class CLiwGenericParamList; diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_landmarks/tsrc/testing/tlandmark_provider/src/tgetlist.cpp --- a/serviceproviders/sapi_landmarks/tsrc/testing/tlandmark_provider/src/tgetlist.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_landmarks/tsrc/testing/tlandmark_provider/src/tgetlist.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -18,17 +18,17 @@ #include -#include -#include +#include +#include #include #include "getlist.h" -#include -#include +#include +#include #include "landmarkliwparams.hrh" -#include -#include -#include -#include +#include +#include +#include +#include #include "tlandmark_provider.h" #include #include diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_landmarks/tsrc/testing/tlandmark_provider/src/tlandmark_provider.cpp --- a/serviceproviders/sapi_landmarks/tsrc/testing/tlandmark_provider/src/tlandmark_provider.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_landmarks/tsrc/testing/tlandmark_provider/src/tlandmark_provider.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -19,7 +19,7 @@ // INCLUDE FILES -#include +#include #include "tlandmark_provider.h" //#include diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_landmarks/tsrc/testing/tlandmark_provider/src/tlandmark_providerblocks.cpp --- a/serviceproviders/sapi_landmarks/tsrc/testing/tlandmark_provider/src/tlandmark_providerblocks.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_landmarks/tsrc/testing/tlandmark_provider/src/tlandmark_providerblocks.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -23,14 +23,14 @@ #include #include #include -#include +#include #include #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include #include diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_landmarks/tsrc/testing/tproviderlmarktest/group/tproviderlmarktest.mmp --- a/serviceproviders/sapi_landmarks/tsrc/testing/tproviderlmarktest/group/tproviderlmarktest.mmp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_landmarks/tsrc/testing/tproviderlmarktest/group/tproviderlmarktest.mmp Tue Nov 24 08:56:33 2009 +0200 @@ -51,7 +51,7 @@ SOURCEPATH ../src SOURCE tproviderlmarktest.cpp -SOURCE tproviderlmarktestBlocks.cpp +SOURCE tproviderlmarktestblocks.cpp SOURCE tprovidertestobserver.cpp SOURCE txmlconvertor.cpp diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_landmarks/tsrc/testing/tproviderlmarktest/inc/tproviderlmarktest.h --- a/serviceproviders/sapi_landmarks/tsrc/testing/tproviderlmarktest/inc/tproviderlmarktest.h Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_landmarks/tsrc/testing/tproviderlmarktest/inc/tproviderlmarktest.h Tue Nov 24 08:56:33 2009 +0200 @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include class CLiwGenericParamList; diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_landmarks/tsrc/testing/tproviderlmarktest/inc/tprovidertestobserver.h --- a/serviceproviders/sapi_landmarks/tsrc/testing/tproviderlmarktest/inc/tprovidertestobserver.h Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_landmarks/tsrc/testing/tproviderlmarktest/inc/tprovidertestobserver.h Tue Nov 24 08:56:33 2009 +0200 @@ -22,7 +22,7 @@ -#include +#include #include "e32base.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_landmarks/tsrc/testing/tproviderlmarktest/inc/txmlconvertor.h --- a/serviceproviders/sapi_landmarks/tsrc/testing/tproviderlmarktest/inc/txmlconvertor.h Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_landmarks/tsrc/testing/tproviderlmarktest/inc/txmlconvertor.h Tue Nov 24 08:56:33 2009 +0200 @@ -23,7 +23,7 @@ // INCLUDES -#include +#include #include diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_landmarks/tsrc/testing/tproviderlmarktest/src/tproviderlmarktest.cpp --- a/serviceproviders/sapi_landmarks/tsrc/testing/tproviderlmarktest/src/tproviderlmarktest.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_landmarks/tsrc/testing/tproviderlmarktest/src/tproviderlmarktest.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -20,7 +20,7 @@ // INCLUDE FILES #include "tproviderlmarktest.h" -#include +#include #include #include diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_landmarks/tsrc/testing/tproviderlmarktest/src/tproviderlmarktestblocks.cpp --- a/serviceproviders/sapi_landmarks/tsrc/testing/tproviderlmarktest/src/tproviderlmarktestblocks.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_landmarks/tsrc/testing/tproviderlmarktest/src/tproviderlmarktestblocks.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -21,9 +21,9 @@ // INCLUDE FILES #include #include -#include -#include -#include +#include +#include +#include #include "txmlconvertor.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_landmarks/tsrc/testing/tproviderlmarktest/src/txmlconvertor.cpp --- a/serviceproviders/sapi_landmarks/tsrc/testing/tproviderlmarktest/src/txmlconvertor.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_landmarks/tsrc/testing/tproviderlmarktest/src/txmlconvertor.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -21,12 +21,12 @@ // INCLUDE FILES #include -#include -#include +#include +#include #include #include #include -#include +#include #include #include "txmlconvertor.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_location/data/102833ab.rss --- a/serviceproviders/sapi_location/data/102833ab.rss Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_location/data/102833ab.rss Tue Nov 24 08:56:33 2009 +0200 @@ -16,9 +16,9 @@ */ -#include -#include "ecom/RegistryInfoV2.rh" -#include +#include +#include "ecom/registryinfov2.rh" +#include RESOURCE REGISTRY_INFO theInfo { diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_location/group/locationprovider.mmp --- a/serviceproviders/sapi_location/group/locationprovider.mmp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_location/group/locationprovider.mmp Tue Nov 24 08:56:33 2009 +0200 @@ -37,7 +37,7 @@ SOURCEPATH ../src SOURCE locationinterface.cpp -SOURCE locationCallBack.cpp +SOURCE locationcallBack.cpp SOURCE locationservicehandler.cpp diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_location/inc/locationcb.h --- a/serviceproviders/sapi_location/inc/locationcb.h Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_location/inc/locationcb.h Tue Nov 24 08:56:33 2009 +0200 @@ -18,7 +18,7 @@ #ifndef C_LOCATIONCB_H #define C_LOCATIONCB_H -#include +#include #include "locationservice.h" const TInt KGetLocationCB = 0 ; diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_location/inc/locationinterface.h --- a/serviceproviders/sapi_location/inc/locationinterface.h Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_location/inc/locationinterface.h Tue Nov 24 08:56:33 2009 +0200 @@ -19,7 +19,7 @@ #define C_LOCINTERFACE_H -#include +#include #include "locationcb.h" #include "locationservice.h" #include "serviceerrno.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_location/inc/locationservicehandler.h --- a/serviceproviders/sapi_location/inc/locationservicehandler.h Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_location/inc/locationservicehandler.h Tue Nov 24 08:56:33 2009 +0200 @@ -20,7 +20,7 @@ #include -#include +#include /** * InerfaceName ILocation diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_location/locationservice/inc/locationcoreimp.h --- a/serviceproviders/sapi_location/locationservice/inc/locationcoreimp.h Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_location/locationservice/inc/locationcoreimp.h Tue Nov 24 08:56:33 2009 +0200 @@ -20,7 +20,7 @@ #define C_LOCATIONCOREIMP_H #include -#include +#include #include "locationservice.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_location/locationservice/src/locationcoreimp.cpp --- a/serviceproviders/sapi_location/locationservice/src/locationcoreimp.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_location/locationservice/src/locationcoreimp.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -83,7 +83,7 @@ } //CleanupStack ::Pop(this->iGenericPosInfo ); - CleanupStack::Pop(&iPositioner); + //CleanupStack::Pop(&iPositioner); } /** * Function name: NewL , diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_location/src/locationcallBack.cpp --- a/serviceproviders/sapi_location/src/locationcallBack.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_location/src/locationcallBack.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -17,7 +17,7 @@ */ #include -#include +#include #include "locationinterface.h" #include "locationservice.h" #include "locationcb.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_location/src/locationinterface.cpp --- a/serviceproviders/sapi_location/src/locationinterface.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_location/src/locationinterface.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -16,9 +16,9 @@ */ #include -#include +#include #include -#include +#include #include #include diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_location/src/locationservicehandler.cpp --- a/serviceproviders/sapi_location/src/locationservicehandler.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_location/src/locationservicehandler.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -18,8 +18,8 @@ #include -#include -#include +#include +#include #include "locationservicehandler.h" #include "locationcb.h" #include "locationinterface.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_location/tsrc/dev/tlocationprovidertest/group/tlocationprovidertest.mmp --- a/serviceproviders/sapi_location/tsrc/dev/tlocationprovidertest/group/tlocationprovidertest.mmp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_location/tsrc/dev/tlocationprovidertest/group/tlocationprovidertest.mmp Tue Nov 24 08:56:33 2009 +0200 @@ -32,11 +32,11 @@ #endif //TARGETPATH ?target_path -DEFFILE Tcomplugin.def +DEFFILE tcomplugin.def SOURCEPATH ../src -SOURCE Tcomplugin.cpp -SOURCE TcompluginBlocks.cpp +SOURCE tcomplugin.cpp +SOURCE tcompluginblocks.cpp SOURCE ttrace.cpp SOURCE tgetlocationasync.cpp SOURCE tservicefailedtest.cpp diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_location/tsrc/dev/tlocationprovidertest/src/TraceTO.cpp --- a/serviceproviders/sapi_location/tsrc/dev/tlocationprovidertest/src/TraceTO.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_location/tsrc/dev/tlocationprovidertest/src/TraceTO.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -21,10 +21,10 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include "tcomplugin.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_location/tsrc/dev/tlocationprovidertest/src/tcomplugin.cpp --- a/serviceproviders/sapi_location/tsrc/dev/tlocationprovidertest/src/tcomplugin.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_location/tsrc/dev/tlocationprovidertest/src/tcomplugin.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -19,8 +19,8 @@ // INCLUDE FILES -#include -#include "Tcomplugin.h" +#include +#include "tcomplugin.h" // EXTERNAL DATA STRUCTURES //extern ?external_data; diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_location/tsrc/dev/tlocationprovidertest/src/tcompluginblocks.cpp --- a/serviceproviders/sapi_location/tsrc/dev/tlocationprovidertest/src/tcompluginblocks.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_location/tsrc/dev/tlocationprovidertest/src/tcompluginblocks.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -21,13 +21,13 @@ // INCLUDE FILES #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include -#include "Tcomplugin.h" +#include "tcomplugin.h" using namespace LIW; diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_location/tsrc/dev/tlocationprovidertest/src/tconcurrentgetlocation.cpp --- a/serviceproviders/sapi_location/tsrc/dev/tlocationprovidertest/src/tconcurrentgetlocation.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_location/tsrc/dev/tlocationprovidertest/src/tconcurrentgetlocation.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -21,10 +21,10 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include "tcomplugin.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_location/tsrc/dev/tlocationprovidertest/src/tenableHighAcc.cpp --- a/serviceproviders/sapi_location/tsrc/dev/tlocationprovidertest/src/tenableHighAcc.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_location/tsrc/dev/tlocationprovidertest/src/tenableHighAcc.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -22,10 +22,10 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include "tcomplugin.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_location/tsrc/dev/tlocationprovidertest/src/tgetlocationasync.cpp --- a/serviceproviders/sapi_location/tsrc/dev/tlocationprovidertest/src/tgetlocationasync.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_location/tsrc/dev/tlocationprovidertest/src/tgetlocationasync.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -17,10 +17,10 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include "tcomplugin.h" using namespace LIW; diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_location/tsrc/dev/tlocationprovidertest/src/tgetlocationcancel.cpp --- a/serviceproviders/sapi_location/tsrc/dev/tlocationprovidertest/src/tgetlocationcancel.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_location/tsrc/dev/tlocationprovidertest/src/tgetlocationcancel.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -17,10 +17,10 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include "tcomplugin.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_location/tsrc/dev/tlocationprovidertest/src/tgetlocstraytest.cpp --- a/serviceproviders/sapi_location/tsrc/dev/tlocationprovidertest/src/tgetlocstraytest.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_location/tsrc/dev/tlocationprovidertest/src/tgetlocstraytest.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -21,10 +21,10 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include "tcomplugin.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_location/tsrc/dev/tlocationprovidertest/src/tgetlocwrongcancel.cpp --- a/serviceproviders/sapi_location/tsrc/dev/tlocationprovidertest/src/tgetlocwrongcancel.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_location/tsrc/dev/tlocationprovidertest/src/tgetlocwrongcancel.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -17,10 +17,10 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include "tcomplugin.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_location/tsrc/dev/tlocationprovidertest/src/tservicefailedtest.cpp --- a/serviceproviders/sapi_location/tsrc/dev/tlocationprovidertest/src/tservicefailedtest.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_location/tsrc/dev/tlocationprovidertest/src/tservicefailedtest.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -17,10 +17,10 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include "tcomplugin.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_location/tsrc/dev/tlocationprovidertest/src/tstraysignaltest.cpp --- a/serviceproviders/sapi_location/tsrc/dev/tlocationprovidertest/src/tstraysignaltest.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_location/tsrc/dev/tlocationprovidertest/src/tstraysignaltest.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -20,10 +20,10 @@ */ #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include "tcomplugin.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_location/tsrc/dev/tlocationprovidertest/src/ttrace.cpp --- a/serviceproviders/sapi_location/tsrc/dev/tlocationprovidertest/src/ttrace.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_location/tsrc/dev/tlocationprovidertest/src/ttrace.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -17,10 +17,10 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include "tcomplugin.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_location/tsrc/dev/tlocationprovidertest/src/ttraceconcurrentcalls.cpp --- a/serviceproviders/sapi_location/tsrc/dev/tlocationprovidertest/src/ttraceconcurrentcalls.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_location/tsrc/dev/tlocationprovidertest/src/ttraceconcurrentcalls.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -21,10 +21,10 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include "tcomplugin.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_location/tsrc/dev/tlocationprovidertest/src/ttracelocationcancel.cpp --- a/serviceproviders/sapi_location/tsrc/dev/tlocationprovidertest/src/ttracelocationcancel.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_location/tsrc/dev/tlocationprovidertest/src/ttracelocationcancel.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -17,10 +17,10 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include "tcomplugin.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_location/tsrc/dev/tlocationprovidertest/src/ttracelocwrongcancel.cpp --- a/serviceproviders/sapi_location/tsrc/dev/tlocationprovidertest/src/ttracelocwrongcancel.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_location/tsrc/dev/tlocationprovidertest/src/ttracelocwrongcancel.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -17,10 +17,10 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include "tcomplugin.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_location/tsrc/dev/tlocmanualtest/src/tlocmanualtest.cpp --- a/serviceproviders/sapi_location/tsrc/dev/tlocmanualtest/src/tlocmanualtest.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_location/tsrc/dev/tlocmanualtest/src/tlocmanualtest.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -21,7 +21,7 @@ // INCLUDE FILES #include "tlocmanualtest.h" -#include +#include diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_location/tsrc/dev/tlocmanualtest/src/tlocmanualtestblocks.cpp --- a/serviceproviders/sapi_location/tsrc/dev/tlocmanualtest/src/tlocmanualtestblocks.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_location/tsrc/dev/tlocmanualtest/src/tlocmanualtestblocks.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -23,7 +23,7 @@ #include #include -#include +#include #include #include diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_location/tsrc/dev/tlocservicetest/group/tlocservicetest.mmp --- a/serviceproviders/sapi_location/tsrc/dev/tlocservicetest/group/tlocservicetest.mmp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_location/tsrc/dev/tlocservicetest/group/tlocservicetest.mmp Tue Nov 24 08:56:33 2009 +0200 @@ -31,11 +31,11 @@ #endif //TARGETPATH ?target_path -DEFFILE TLocTest.def +DEFFILE tloctest.def SOURCEPATH ../src -SOURCE TLocTest.cpp -SOURCE TLocTestBlocks.cpp +SOURCE tloctest.cpp +SOURCE tloctestblocks.cpp SOURCE tfunctionthread.cpp SOURCE tstraysignaltest.cpp SOURCE tstraygetlocationtest.cpp diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_location/tsrc/dev/tlocservicetest/src/loccancel.cpp --- a/serviceproviders/sapi_location/tsrc/dev/tlocservicetest/src/loccancel.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_location/tsrc/dev/tlocservicetest/src/loccancel.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -12,12 +12,12 @@ * Contributors: * * Description: contains test case implementation for CancelOngoingService location-SAPI -* V ersion : %version: 5 % << Don't touch! Updated by Synergy at check-out. +* V ersion : %version: 6 % << Don't touch! Updated by Synergy at check-out. * */ -#include "TLocTest.h" +#include "tloctest.h" #include "locationservice.h" #include #include @@ -30,12 +30,12 @@ _LIT(KRequestor,"testapp"); // INCLUDE FILES -#include "TLocTest.h" +#include "tloctest.h" #include #include -#include +#include //#include #include diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_location/tsrc/dev/tlocservicetest/src/tfunctionthread.cpp --- a/serviceproviders/sapi_location/tsrc/dev/tlocservicetest/src/tfunctionthread.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_location/tsrc/dev/tlocservicetest/src/tfunctionthread.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -16,7 +16,7 @@ */ class CGetLoc ; //Forward declaration -#include "TLocTest.h" +#include "tloctest.h" #include "locationservice.h" #include #include diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_location/tsrc/dev/tlocservicetest/src/tloctest.cpp --- a/serviceproviders/sapi_location/tsrc/dev/tlocservicetest/src/tloctest.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_location/tsrc/dev/tlocservicetest/src/tloctest.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -20,8 +20,8 @@ // INCLUDE FILES -#include "TLocTest.h" -#include +#include "tloctest.h" +#include diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_location/tsrc/dev/tlocservicetest/src/tloctestblocks.cpp --- a/serviceproviders/sapi_location/tsrc/dev/tlocservicetest/src/tloctestblocks.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_location/tsrc/dev/tlocservicetest/src/tloctestblocks.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -19,11 +19,11 @@ // INCLUDE FILES -#include "TLocTest.h" +#include "tloctest.h" #include #include -#include +#include #include #include diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_location/tsrc/testing/tsapiloctest/group/tsapiloctest.mmp --- a/serviceproviders/sapi_location/tsrc/testing/tsapiloctest/group/tsapiloctest.mmp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_location/tsrc/testing/tsapiloctest/group/tsapiloctest.mmp Tue Nov 24 08:56:33 2009 +0200 @@ -32,7 +32,7 @@ //TARGETPATH ?target_path -DEFFILE SAPILocTest.def +DEFFILE sapiloctest.def SOURCEPATH ../src SOURCE sapiloctest.cpp diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_location/tsrc/testing/tsapiloctest/src/sapiloctest.cpp --- a/serviceproviders/sapi_location/tsrc/testing/tsapiloctest/src/sapiloctest.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_location/tsrc/testing/tsapiloctest/src/sapiloctest.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -19,8 +19,8 @@ // INCLUDE FILES -#include -#include "SAPILocTest.h" +#include +#include "sapiloctest.h" //#include #include "locationservice.h" // EXTERNAL DATA STRUCTURES diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_location/tsrc/testing/tsapiloctest/src/sapiloctestblocks.cpp --- a/serviceproviders/sapi_location/tsrc/testing/tsapiloctest/src/sapiloctestblocks.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_location/tsrc/testing/tsapiloctest/src/sapiloctestblocks.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -21,12 +21,12 @@ // INCLUDE FILES #include #include -#include -#include "SAPILocTest.h" +#include +#include "sapiloctest.h" #include -#include -#include -#include +#include +#include +#include _LIT(LogFileName , "C:\\tsapiloctest.txt") ; diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_location/tsrc/testing/tsapiloctotest/group/tsapiloctotest.mmp --- a/serviceproviders/sapi_location/tsrc/testing/tsapiloctotest/group/tsapiloctotest.mmp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_location/tsrc/testing/tsapiloctotest/group/tsapiloctotest.mmp Tue Nov 24 08:56:33 2009 +0200 @@ -35,7 +35,7 @@ SOURCEPATH ../src SOURCE sapiloctotest.cpp -SOURCE sapiloctotestBlocks.cpp +SOURCE sapiloctotestblocks.cpp //RESOURCE resource_file //RESOURCE resource_file2 diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_location/tsrc/testing/tsapiloctotest/src/sapiloctotest.cpp --- a/serviceproviders/sapi_location/tsrc/testing/tsapiloctotest/src/sapiloctotest.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_location/tsrc/testing/tsapiloctotest/src/sapiloctotest.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -19,7 +19,7 @@ // INCLUDE FILES -#include +#include #include "sapiloctotest.h" // EXTERNAL DATA STRUCTURES diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_location/tsrc/testing/tsapiloctotest/src/sapiloctotestblocks.cpp --- a/serviceproviders/sapi_location/tsrc/testing/tsapiloctotest/src/sapiloctotestblocks.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_location/tsrc/testing/tsapiloctotest/src/sapiloctotestblocks.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -21,10 +21,10 @@ // INCLUDE FILES #include #include -#include +#include #include "sapiloctotest.h" #include -#include +#include _LIT(LogFileName , "C:\\Notifications.txt") ; diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_logging/data/2000CFBC.rss --- a/serviceproviders/sapi_logging/data/2000CFBC.rss Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_logging/data/2000CFBC.rss Tue Nov 24 08:56:33 2009 +0200 @@ -16,9 +16,9 @@ */ -#include -#include "ecom/RegistryInfoV2.rh" -#include +#include +#include "ecom/registryinfov2.rh" +#include RESOURCE REGISTRY_INFO theInfo { diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_logging/inc/logginginterface.h --- a/serviceproviders/sapi_logging/inc/logginginterface.h Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_logging/inc/logginginterface.h Tue Nov 24 08:56:33 2009 +0200 @@ -18,7 +18,7 @@ #ifndef C_LOGINTERFACE_H #define C_LOGINTERFACE_H -#include +#include #include "serviceerrno.h" /** diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_logging/inc/loggingservicehandler.h --- a/serviceproviders/sapi_logging/inc/loggingservicehandler.h Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_logging/inc/loggingservicehandler.h Tue Nov 24 08:56:33 2009 +0200 @@ -20,7 +20,7 @@ #include -#include +#include /** * InterfaceName ILogging diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_logging/loggingservice/inc/loggingevent.h --- a/serviceproviders/sapi_logging/loggingservice/inc/loggingevent.h Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_logging/loggingservice/inc/loggingevent.h Tue Nov 24 08:56:33 2009 +0200 @@ -19,7 +19,7 @@ #define SAPIEVENT_H #include -#include +#include /** * CLogsEvent:this is a wrapper class for the symbian CLogEvent class. diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_logging/src/loggingcallback.cpp --- a/serviceproviders/sapi_logging/src/loggingcallback.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_logging/src/loggingcallback.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -17,9 +17,9 @@ */ #include -#include +#include #include -#include +#include #include "logiter.h" #include "logginginterface.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_logging/src/loggingservicehandler.cpp --- a/serviceproviders/sapi_logging/src/loggingservicehandler.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_logging/src/loggingservicehandler.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -17,10 +17,10 @@ */ #include -#include +#include #include -#include -#include "LOGCLIENTCHANGEOBSERVER.H" +#include +#include "logclientchangeobserver.h" #include "logiter.h" #include "loggingservicehandler.h" #include "logginginterface.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_logging/tsrc/dev/tloggingprovidertest/group/tloggingprovidertest.mmp --- a/serviceproviders/sapi_logging/tsrc/dev/tloggingprovidertest/group/tloggingprovidertest.mmp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_logging/tsrc/dev/tloggingprovidertest/group/tloggingprovidertest.mmp Tue Nov 24 08:56:33 2009 +0200 @@ -55,14 +55,14 @@ SOURCEPATH ../src SOURCE tprovidertest.cpp -SOURCE tprovidertestBlocks.cpp +SOURCE tprovidertestblocks.cpp SOURCE taddtest1.cpp SOURCE tlogresults.cpp SOURCE teventdetails.cpp -SOURCE taddgenericL.cpp +SOURCE taddgenericl.cpp SOURCE tprovidercallback.cpp SOURCE tdeletetest.cpp -SOURCE tgetlistgenericL.cpp +SOURCE tgetlistgenericl.cpp SOURCE tfilterdetails.cpp SOURCE tgetlistgenericpos.cpp diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_logging/tsrc/dev/tloggingprovidertest/inc/tprovidertest.h --- a/serviceproviders/sapi_logging/tsrc/dev/tloggingprovidertest/inc/tprovidertest.h Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_logging/tsrc/dev/tloggingprovidertest/inc/tprovidertest.h Tue Nov 24 08:56:33 2009 +0200 @@ -26,8 +26,8 @@ #include #include -#include -#include +#include +#include diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_logging/tsrc/dev/tloggingprovidertest/src/taddgenericl.cpp --- a/serviceproviders/sapi_logging/tsrc/dev/tloggingprovidertest/src/taddgenericl.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_logging/tsrc/dev/tloggingprovidertest/src/taddgenericl.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -16,10 +16,10 @@ */ #include -#include +#include -#include -#include +#include +#include #include "tconstants.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_logging/tsrc/dev/tloggingprovidertest/src/taddgenericpos.cpp --- a/serviceproviders/sapi_logging/tsrc/dev/tloggingprovidertest/src/taddgenericpos.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_logging/tsrc/dev/tloggingprovidertest/src/taddgenericpos.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -16,10 +16,10 @@ */ #include -#include +#include -#include -#include +#include +#include #include "tconstants.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_logging/tsrc/dev/tloggingprovidertest/src/taddtest1.cpp --- a/serviceproviders/sapi_logging/tsrc/dev/tloggingprovidertest/src/taddtest1.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_logging/tsrc/dev/tloggingprovidertest/src/taddtest1.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -16,9 +16,9 @@ */ #include -#include -#include -#include +#include +#include +#include #include "tconstants.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_logging/tsrc/dev/tloggingprovidertest/src/tdeletegenericpos.cpp --- a/serviceproviders/sapi_logging/tsrc/dev/tloggingprovidertest/src/tdeletegenericpos.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_logging/tsrc/dev/tloggingprovidertest/src/tdeletegenericpos.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -16,10 +16,10 @@ */ #include -#include +#include -#include -#include +#include +#include #include "tconstants.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_logging/tsrc/dev/tloggingprovidertest/src/tdeletetest.cpp --- a/serviceproviders/sapi_logging/tsrc/dev/tloggingprovidertest/src/tdeletetest.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_logging/tsrc/dev/tloggingprovidertest/src/tdeletetest.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -16,10 +16,10 @@ */ #include -#include +#include -#include -#include +#include +#include #include "tconstants.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_logging/tsrc/dev/tloggingprovidertest/src/tgetlistgenericl.cpp --- a/serviceproviders/sapi_logging/tsrc/dev/tloggingprovidertest/src/tgetlistgenericl.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_logging/tsrc/dev/tloggingprovidertest/src/tgetlistgenericl.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -16,10 +16,10 @@ */ #include -#include +#include -#include -#include +#include +#include #include "tconstants.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_logging/tsrc/dev/tloggingprovidertest/src/tgetlistgenericpos.cpp --- a/serviceproviders/sapi_logging/tsrc/dev/tloggingprovidertest/src/tgetlistgenericpos.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_logging/tsrc/dev/tloggingprovidertest/src/tgetlistgenericpos.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -16,10 +16,10 @@ */ #include -#include +#include -#include -#include +#include +#include #include "tconstants.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_logging/tsrc/dev/tloggingprovidertest/src/tlogresults.cpp --- a/serviceproviders/sapi_logging/tsrc/dev/tloggingprovidertest/src/tlogresults.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_logging/tsrc/dev/tloggingprovidertest/src/tlogresults.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -15,8 +15,8 @@ * */ -#include -#include +#include +#include #include #include "tprovidertest.h" #include "tconstants.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_logging/tsrc/dev/tloggingprovidertest/src/tprovidercallback.cpp --- a/serviceproviders/sapi_logging/tsrc/dev/tloggingprovidertest/src/tprovidercallback.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_logging/tsrc/dev/tloggingprovidertest/src/tprovidercallback.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -18,11 +18,11 @@ #include #include #include -#include +#include #include #include -#include -#include +#include +#include #include "tprovidertest.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_logging/tsrc/dev/tloggingprovidertest/src/tprovidertest.cpp --- a/serviceproviders/sapi_logging/tsrc/dev/tloggingprovidertest/src/tprovidertest.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_logging/tsrc/dev/tloggingprovidertest/src/tprovidertest.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -19,7 +19,7 @@ // INCLUDE FILES -#include +#include #include "tprovidertest.h" #include "teventdetails.h" #include "tfilterdetails.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_logging/tsrc/dev/tloggingprovidertest/src/tprovidertestblocks.cpp --- a/serviceproviders/sapi_logging/tsrc/dev/tloggingprovidertest/src/tprovidertestblocks.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_logging/tsrc/dev/tloggingprovidertest/src/tprovidertestblocks.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -21,7 +21,7 @@ // INCLUDE FILES #include #include -#include +#include #include "tprovidertest.h" #include "teventdetails.h" #include "tfilterdetails.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_logging/tsrc/dev/tloggingservice/group/tloggingservice.mmp --- a/serviceproviders/sapi_logging/tsrc/dev/tloggingservice/group/tloggingservice.mmp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_logging/tsrc/dev/tloggingservice/group/tloggingservice.mmp Tue Nov 24 08:56:33 2009 +0200 @@ -56,7 +56,7 @@ SOURCEPATH ../src SOURCE tlogging.cpp -SOURCE tloggingBlocks.cpp +SOURCE tloggingblocks.cpp SOURCE taddtest.cpp SOURCE taddtest1.cpp SOURCE taddtest2.cpp diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_logging/tsrc/dev/tloggingservice/inc/loggingevent.h --- a/serviceproviders/sapi_logging/tsrc/dev/tloggingservice/inc/loggingevent.h Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_logging/tsrc/dev/tloggingservice/inc/loggingevent.h Tue Nov 24 08:56:33 2009 +0200 @@ -20,7 +20,7 @@ #define SAPIEVENT_H #include -#include +#include /** * CLogsEvent:this is a wrapper class for the symbian CLogEvent class. diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_logging/tsrc/dev/tloggingservice/src/taddtest.cpp --- a/serviceproviders/sapi_logging/tsrc/dev/tloggingservice/src/taddtest.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_logging/tsrc/dev/tloggingservice/src/taddtest.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -18,7 +18,7 @@ #include #include #include -#include +#include #include #include diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_logging/tsrc/dev/tloggingservice/src/taddtest1.cpp --- a/serviceproviders/sapi_logging/tsrc/dev/tloggingservice/src/taddtest1.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_logging/tsrc/dev/tloggingservice/src/taddtest1.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -19,7 +19,7 @@ #include #include #include -#include +#include #include #include diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_logging/tsrc/dev/tloggingservice/src/taddtest2.cpp --- a/serviceproviders/sapi_logging/tsrc/dev/tloggingservice/src/taddtest2.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_logging/tsrc/dev/tloggingservice/src/taddtest2.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -18,7 +18,7 @@ #include #include #include -#include +#include #include #include diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_logging/tsrc/dev/tloggingservice/src/taddtest3.cpp --- a/serviceproviders/sapi_logging/tsrc/dev/tloggingservice/src/taddtest3.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_logging/tsrc/dev/tloggingservice/src/taddtest3.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -18,7 +18,7 @@ #include #include #include -#include +#include #include #include diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_logging/tsrc/dev/tloggingservice/src/taddtest4.cpp --- a/serviceproviders/sapi_logging/tsrc/dev/tloggingservice/src/taddtest4.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_logging/tsrc/dev/tloggingservice/src/taddtest4.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -18,7 +18,7 @@ #include #include #include -#include +#include #include #include diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_logging/tsrc/dev/tloggingservice/src/tconcurrenttest1.cpp --- a/serviceproviders/sapi_logging/tsrc/dev/tloggingservice/src/tconcurrenttest1.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_logging/tsrc/dev/tloggingservice/src/tconcurrenttest1.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -18,7 +18,7 @@ #include #include #include -#include +#include #include #include diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_logging/tsrc/dev/tloggingservice/src/tconcurrenttest2.cpp --- a/serviceproviders/sapi_logging/tsrc/dev/tloggingservice/src/tconcurrenttest2.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_logging/tsrc/dev/tloggingservice/src/tconcurrenttest2.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -18,7 +18,7 @@ #include #include #include -#include +#include #include #include diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_logging/tsrc/dev/tloggingservice/src/tconcurrenttest3.cpp --- a/serviceproviders/sapi_logging/tsrc/dev/tloggingservice/src/tconcurrenttest3.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_logging/tsrc/dev/tloggingservice/src/tconcurrenttest3.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -18,7 +18,7 @@ #include #include #include -#include +#include #include #include diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_logging/tsrc/dev/tloggingservice/src/tconcurrenttest4.cpp --- a/serviceproviders/sapi_logging/tsrc/dev/tloggingservice/src/tconcurrenttest4.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_logging/tsrc/dev/tloggingservice/src/tconcurrenttest4.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -18,7 +18,7 @@ #include #include #include -#include +#include #include #include diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_logging/tsrc/dev/tloggingservice/src/tconcurrenttest5.cpp --- a/serviceproviders/sapi_logging/tsrc/dev/tloggingservice/src/tconcurrenttest5.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_logging/tsrc/dev/tloggingservice/src/tconcurrenttest5.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -18,7 +18,7 @@ #include #include #include -#include +#include #include #include diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_logging/tsrc/dev/tloggingservice/src/tconcurrenttest6.cpp --- a/serviceproviders/sapi_logging/tsrc/dev/tloggingservice/src/tconcurrenttest6.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_logging/tsrc/dev/tloggingservice/src/tconcurrenttest6.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -18,7 +18,7 @@ #include #include #include -#include +#include #include #include diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_logging/tsrc/dev/tloggingservice/src/tdeletetest1.cpp --- a/serviceproviders/sapi_logging/tsrc/dev/tloggingservice/src/tdeletetest1.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_logging/tsrc/dev/tloggingservice/src/tdeletetest1.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -18,7 +18,7 @@ #include #include #include -#include +#include #include #include diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_logging/tsrc/dev/tloggingservice/src/tdeletetest2.cpp --- a/serviceproviders/sapi_logging/tsrc/dev/tloggingservice/src/tdeletetest2.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_logging/tsrc/dev/tloggingservice/src/tdeletetest2.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -18,7 +18,7 @@ #include #include #include -#include +#include #include #include diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_logging/tsrc/dev/tloggingservice/src/tgetevent1.cpp --- a/serviceproviders/sapi_logging/tsrc/dev/tloggingservice/src/tgetevent1.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_logging/tsrc/dev/tloggingservice/src/tgetevent1.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -18,7 +18,7 @@ #include #include #include -#include +#include #include #include diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_logging/tsrc/dev/tloggingservice/src/tgetevent2.cpp --- a/serviceproviders/sapi_logging/tsrc/dev/tloggingservice/src/tgetevent2.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_logging/tsrc/dev/tloggingservice/src/tgetevent2.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -18,7 +18,7 @@ #include #include #include -#include +#include #include #include diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_logging/tsrc/dev/tloggingservice/src/tgetevent3.cpp --- a/serviceproviders/sapi_logging/tsrc/dev/tloggingservice/src/tgetevent3.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_logging/tsrc/dev/tloggingservice/src/tgetevent3.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -18,7 +18,7 @@ #include #include #include -#include +#include #include #include diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_logging/tsrc/dev/tloggingservice/src/tgetlist1.cpp --- a/serviceproviders/sapi_logging/tsrc/dev/tloggingservice/src/tgetlist1.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_logging/tsrc/dev/tloggingservice/src/tgetlist1.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -19,7 +19,7 @@ #include #include #include -#include +#include #include #include diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_logging/tsrc/dev/tloggingservice/src/tgetrecentlist1.cpp --- a/serviceproviders/sapi_logging/tsrc/dev/tloggingservice/src/tgetrecentlist1.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_logging/tsrc/dev/tloggingservice/src/tgetrecentlist1.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -18,7 +18,7 @@ #include #include #include -#include +#include #include #include diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_logging/tsrc/dev/tloggingservice/src/tgetrecentlist2.cpp --- a/serviceproviders/sapi_logging/tsrc/dev/tloggingservice/src/tgetrecentlist2.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_logging/tsrc/dev/tloggingservice/src/tgetrecentlist2.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -18,7 +18,7 @@ #include #include #include -#include +#include #include #include diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_logging/tsrc/dev/tloggingservice/src/tgetrecentlist3.cpp --- a/serviceproviders/sapi_logging/tsrc/dev/tloggingservice/src/tgetrecentlist3.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_logging/tsrc/dev/tloggingservice/src/tgetrecentlist3.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -18,7 +18,7 @@ #include #include #include -#include +#include #include #include diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_logging/tsrc/dev/tloggingservice/src/tgetrecentlist4.cpp --- a/serviceproviders/sapi_logging/tsrc/dev/tloggingservice/src/tgetrecentlist4.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_logging/tsrc/dev/tloggingservice/src/tgetrecentlist4.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -18,7 +18,7 @@ #include #include #include -#include +#include #include #include diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_logging/tsrc/dev/tloggingservice/src/tlogcallback.cpp --- a/serviceproviders/sapi_logging/tsrc/dev/tloggingservice/src/tlogcallback.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_logging/tsrc/dev/tloggingservice/src/tlogcallback.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -18,7 +18,7 @@ #include #include #include -#include +#include #include #include diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_logging/tsrc/dev/tloggingservice/src/tlogging.cpp --- a/serviceproviders/sapi_logging/tsrc/dev/tloggingservice/src/tlogging.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_logging/tsrc/dev/tloggingservice/src/tlogging.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -22,7 +22,7 @@ #include #include #include -#include +#include #include #include diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_logging/tsrc/dev/tloggingservice/src/tloggingblocks.cpp --- a/serviceproviders/sapi_logging/tsrc/dev/tloggingservice/src/tloggingblocks.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_logging/tsrc/dev/tloggingservice/src/tloggingblocks.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -22,7 +22,7 @@ #include #include #include -#include +#include #include #include diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_logging/tsrc/dev/tlogtypeidtest/inc/tprovidertest.h --- a/serviceproviders/sapi_logging/tsrc/dev/tlogtypeidtest/inc/tprovidertest.h Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_logging/tsrc/dev/tlogtypeidtest/inc/tprovidertest.h Tue Nov 24 08:56:33 2009 +0200 @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_logging/tsrc/dev/tlogtypeidtest/inc/tprovidertestobserver.h --- a/serviceproviders/sapi_logging/tsrc/dev/tlogtypeidtest/inc/tprovidertestobserver.h Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_logging/tsrc/dev/tlogtypeidtest/inc/tprovidertestobserver.h Tue Nov 24 08:56:33 2009 +0200 @@ -22,7 +22,7 @@ -#include +#include #include "e32base.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_logging/tsrc/dev/tlogtypeidtest/inc/txmlconvertor.h --- a/serviceproviders/sapi_logging/tsrc/dev/tlogtypeidtest/inc/txmlconvertor.h Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_logging/tsrc/dev/tlogtypeidtest/inc/txmlconvertor.h Tue Nov 24 08:56:33 2009 +0200 @@ -23,7 +23,7 @@ // INCLUDES -#include +#include #include diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_logging/tsrc/dev/tlogtypeidtest/src/tprovidertest.cpp --- a/serviceproviders/sapi_logging/tsrc/dev/tlogtypeidtest/src/tprovidertest.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_logging/tsrc/dev/tlogtypeidtest/src/tprovidertest.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -19,7 +19,7 @@ // INCLUDE FILES -#include +#include #include #include #include "tprovidertest.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_logging/tsrc/dev/tlogtypeidtest/src/tprovidertest_testblocks.cpp --- a/serviceproviders/sapi_logging/tsrc/dev/tlogtypeidtest/src/tprovidertest_testblocks.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_logging/tsrc/dev/tlogtypeidtest/src/tprovidertest_testblocks.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -21,9 +21,9 @@ // INCLUDE FILES #include #include -#include -#include -#include +#include +#include +#include #include "tprovidertest.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_logging/tsrc/dev/tlogtypeidtest/src/txmlconvertor.cpp --- a/serviceproviders/sapi_logging/tsrc/dev/tlogtypeidtest/src/txmlconvertor.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_logging/tsrc/dev/tlogtypeidtest/src/txmlconvertor.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -21,12 +21,12 @@ // INCLUDE FILES #include -#include -#include +#include +#include #include #include #include -#include +#include #include #include "txmlconvertor.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_logging/tsrc/testing/tloggingservicetest/group/tloggingservicetest.mmp --- a/serviceproviders/sapi_logging/tsrc/testing/tloggingservicetest/group/tloggingservicetest.mmp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_logging/tsrc/testing/tloggingservicetest/group/tloggingservicetest.mmp Tue Nov 24 08:56:33 2009 +0200 @@ -58,7 +58,7 @@ SOURCEPATH ../src SOURCE tloggingservicetest.cpp -SOURCE tloggingservicetestBlocks.cpp +SOURCE tloggingservicetestblocks.cpp SOURCE taddeventsync.cpp SOURCE taddeventasync.cpp SOURCE tgetlist.cpp diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_logging/tsrc/testing/tloggingservicetest/inc/loggingevent.h --- a/serviceproviders/sapi_logging/tsrc/testing/tloggingservicetest/inc/loggingevent.h Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_logging/tsrc/testing/tloggingservicetest/inc/loggingevent.h Tue Nov 24 08:56:33 2009 +0200 @@ -20,7 +20,7 @@ #define SAPIEVENT_H #include -#include +#include /** * CLogsEvent:this is a wrapper class for the symbian CLogEvent class. diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_logging/tsrc/testing/tloggingservicetest/src/tloggingservicetest.cpp --- a/serviceproviders/sapi_logging/tsrc/testing/tloggingservicetest/src/tloggingservicetest.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_logging/tsrc/testing/tloggingservicetest/src/tloggingservicetest.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -19,7 +19,7 @@ // INCLUDE FILES -#include +#include #include "tloggingservicetest.h" //#include diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_logging/tsrc/testing/tloggingservicetest/src/tloggingservicetestblocks.cpp --- a/serviceproviders/sapi_logging/tsrc/testing/tloggingservicetest/src/tloggingservicetestblocks.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_logging/tsrc/testing/tloggingservicetest/src/tloggingservicetestblocks.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -21,7 +21,7 @@ // [INCLUDE FILES] - do not remove #include #include -#include +#include #include "tloggingservicetest.h" #include diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_logging/tsrc/testing/tlogprovidertest/group/tlogprovidertest.mmp --- a/serviceproviders/sapi_logging/tsrc/testing/tlogprovidertest/group/tlogprovidertest.mmp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_logging/tsrc/testing/tlogprovidertest/group/tlogprovidertest.mmp Tue Nov 24 08:56:33 2009 +0200 @@ -55,7 +55,7 @@ SOURCEPATH ../src SOURCE tlogprovidertest.cpp -SOURCE tlogprovidertestBlocks.cpp +SOURCE tlogprovidertestblocks.cpp SOURCE taddtest.cpp SOURCE tcallback.cpp SOURCE teventdetails.cpp diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_logging/tsrc/testing/tlogprovidertest/inc/tlogprovidertest.h --- a/serviceproviders/sapi_logging/tsrc/testing/tlogprovidertest/inc/tlogprovidertest.h Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_logging/tsrc/testing/tlogprovidertest/inc/tlogprovidertest.h Tue Nov 24 08:56:33 2009 +0200 @@ -25,8 +25,8 @@ #include #include #include -#include -#include +#include +#include diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_logging/tsrc/testing/tlogprovidertest/src/taddtest.cpp --- a/serviceproviders/sapi_logging/tsrc/testing/tlogprovidertest/src/taddtest.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_logging/tsrc/testing/tlogprovidertest/src/taddtest.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -15,8 +15,8 @@ * */ -#include -#include +#include +#include #include #include #include "tlogprovidertest.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_logging/tsrc/testing/tlogprovidertest/src/tcallback.cpp --- a/serviceproviders/sapi_logging/tsrc/testing/tlogprovidertest/src/tcallback.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_logging/tsrc/testing/tlogprovidertest/src/tcallback.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -18,11 +18,11 @@ #include #include #include -#include +#include #include #include -#include -#include +#include +#include #include "tlogprovidertest.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_logging/tsrc/testing/tlogprovidertest/src/tcancel.cpp --- a/serviceproviders/sapi_logging/tsrc/testing/tlogprovidertest/src/tcancel.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_logging/tsrc/testing/tlogprovidertest/src/tcancel.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -15,8 +15,8 @@ * */ -#include -#include +#include +#include #include #include #include "tlogprovidertest.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_logging/tsrc/testing/tlogprovidertest/src/tdelete.cpp --- a/serviceproviders/sapi_logging/tsrc/testing/tlogprovidertest/src/tdelete.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_logging/tsrc/testing/tlogprovidertest/src/tdelete.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -15,8 +15,8 @@ * */ -#include -#include +#include +#include #include #include #include "tlogprovidertest.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_logging/tsrc/testing/tlogprovidertest/src/terror.cpp --- a/serviceproviders/sapi_logging/tsrc/testing/tlogprovidertest/src/terror.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_logging/tsrc/testing/tlogprovidertest/src/terror.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -15,8 +15,8 @@ * */ -#include -#include +#include +#include #include #include #include "tlogprovidertest.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_logging/tsrc/testing/tlogprovidertest/src/tgetlist.cpp --- a/serviceproviders/sapi_logging/tsrc/testing/tlogprovidertest/src/tgetlist.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_logging/tsrc/testing/tlogprovidertest/src/tgetlist.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -15,8 +15,8 @@ * */ -#include -#include +#include +#include #include #include #include "tlogprovidertest.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_logging/tsrc/testing/tlogprovidertest/src/tlogprovidertest.cpp --- a/serviceproviders/sapi_logging/tsrc/testing/tlogprovidertest/src/tlogprovidertest.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_logging/tsrc/testing/tlogprovidertest/src/tlogprovidertest.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -19,7 +19,7 @@ // INCLUDE FILES -#include +#include #include "tlogprovidertest.h" //#include diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_logging/tsrc/testing/tlogprovidertest/src/tlogprovidertestblocks.cpp --- a/serviceproviders/sapi_logging/tsrc/testing/tlogprovidertest/src/tlogprovidertestblocks.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_logging/tsrc/testing/tlogprovidertest/src/tlogprovidertestblocks.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -21,7 +21,7 @@ // [INCLUDE FILES] - do not remove #include #include -#include +#include #include "tlogprovidertest.h" #include "teventdetails.h" #include "tfilterdetails.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_logging/tsrc/testing/tlogprovidertest/src/tmisc.cpp --- a/serviceproviders/sapi_logging/tsrc/testing/tlogprovidertest/src/tmisc.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_logging/tsrc/testing/tlogprovidertest/src/tmisc.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -15,8 +15,8 @@ * */ -#include -#include +#include +#include #include #include #include "tlogprovidertest.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_mediamanagement/inc/mgitemslist.h --- a/serviceproviders/sapi_mediamanagement/inc/mgitemslist.h Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_mediamanagement/inc/mgitemslist.h Tue Nov 24 08:56:33 2009 +0200 @@ -15,7 +15,6 @@ * */ - #ifndef __CMGITEMSLIST_H #define __CMGITEMSLIST_H @@ -25,6 +24,8 @@ class MCLFItemListModel; class MgMediaItemFactory; class CMgMediaItem; +class CClfOperationObserver; + /** * This class implements the abstract methods of CLiwIterable * class so that the user may iterate over the result @@ -42,7 +43,7 @@ * @param aCmdId specifies whether the SAPI is GetFiles or GetFilesInfo * @return A pointer of type CMgItemsList */ - static CMgItemsList* NewL( MCLFItemListModel* aItemListModel, TMgCmdId aCmdId ); + static CMgItemsList* NewL( MCLFItemListModel* aItemListModel, CClfOperationObserver* aOperationObserver, TMgCmdId aCmdId ); /** * Destructor. @@ -74,7 +75,7 @@ * @param aCmdId specifies whether the SAPI is GetFiles or GetFilesInfo */ - CMgItemsList( MCLFItemListModel* aItemListModel, TMgCmdId aCmdId ); + CMgItemsList( MCLFItemListModel* aItemListModel, CClfOperationObserver* aOperationObserver, TMgCmdId aCmdId ); private: // data @@ -82,6 +83,9 @@ * A pointer to MCLFItemListModel class */ MCLFItemListModel* iItemListModel; + + CClfOperationObserver* iOperationObserver; + /** * Indicates whether GetFiles or GetFilesInfo SAPI is being processed */ diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_mediamanagement/inc/mgserviceobserver.h --- a/serviceproviders/sapi_mediamanagement/inc/mgserviceobserver.h Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_mediamanagement/inc/mgserviceobserver.h Tue Nov 24 08:56:33 2009 +0200 @@ -24,6 +24,7 @@ class CLiwGenericParamList; class MCLFItemListModel; +class CClfOperationObserver; @@ -70,6 +71,7 @@ */ virtual void MgNotifyL(TUint aTransactionID, MCLFItemListModel* aListModel, + CClfOperationObserver* aOperationObserver, TMgOperationEvent& aOperationEvent , const TInt& aError ); diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_mediamanagement/mediamanagementservice/inc/mgclfoperationobserver.h --- a/serviceproviders/sapi_mediamanagement/mediamanagementservice/inc/mgclfoperationobserver.h Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_mediamanagement/mediamanagementservice/inc/mgclfoperationobserver.h Tue Nov 24 08:56:33 2009 +0200 @@ -20,7 +20,7 @@ #define __MGCLFOPERATIONOBSERVER_H -#include +#include #include class MCLFItemListModel; diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_mediamanagement/mediamanagementservice/inc/mgimageresolution.h --- a/serviceproviders/sapi_mediamanagement/mediamanagementservice/inc/mgimageresolution.h Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_mediamanagement/mediamanagementservice/inc/mgimageresolution.h Tue Nov 24 08:56:33 2009 +0200 @@ -19,7 +19,7 @@ #define MGIMAGERESOLUTION_H_ #include -#include +#include #include #include diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_mediamanagement/mediamanagementservice/inc/mgmediacontainer.h --- a/serviceproviders/sapi_mediamanagement/mediamanagementservice/inc/mgmediacontainer.h Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_mediamanagement/mediamanagementservice/inc/mgmediacontainer.h Tue Nov 24 08:56:33 2009 +0200 @@ -20,8 +20,8 @@ #define MGMEDIACONTAINER_H_ -#include -#include +#include +#include #include #include // CLASS DECLARATION diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_mediamanagement/mediamanagementservice/inc/mgoperationobserver.h --- a/serviceproviders/sapi_mediamanagement/mediamanagementservice/inc/mgoperationobserver.h Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_mediamanagement/mediamanagementservice/inc/mgoperationobserver.h Tue Nov 24 08:56:33 2009 +0200 @@ -22,6 +22,7 @@ class MCLFItemListModel; +class CClfOperationObserver; // CLASS DECLARATION /** @@ -49,6 +50,7 @@ */ virtual void MgNotifyL(TUint aTransactionID, MCLFItemListModel* aListModel, + CClfOperationObserver* aOperationObserver, TMgOperationEvent& aOperationEvent, const TInt& aError ) = 0; diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_mediamanagement/mediamanagementservice/inc/mgpostfilter.h --- a/serviceproviders/sapi_mediamanagement/mediamanagementservice/inc/mgpostfilter.h Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_mediamanagement/mediamanagementservice/inc/mgpostfilter.h Tue Nov 24 08:56:33 2009 +0200 @@ -21,7 +21,7 @@ #ifndef __CMGPOSTFILTER_H #define __CMGPOSTFILTER_H -#include +#include #include diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_mediamanagement/mediamanagementservice/inc/mgservice.h --- a/serviceproviders/sapi_mediamanagement/mediamanagementservice/inc/mgservice.h Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_mediamanagement/mediamanagementservice/inc/mgservice.h Tue Nov 24 08:56:33 2009 +0200 @@ -21,7 +21,7 @@ #ifndef __CMGSERVICE_H #define __CMGSERVICE_H #include -#include +#include #include "mgservice.hrh" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_mediamanagement/mediamanagementservice/inc/mgvideoresolution.h --- a/serviceproviders/sapi_mediamanagement/mediamanagementservice/inc/mgvideoresolution.h Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_mediamanagement/mediamanagementservice/inc/mgvideoresolution.h Tue Nov 24 08:56:33 2009 +0200 @@ -19,7 +19,7 @@ #define MGVIDEORESOLUTION_H_ -#include +#include #include #include diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_mediamanagement/mediamanagementservice/src/mgclfoperationobserver.cpp --- a/serviceproviders/sapi_mediamanagement/mediamanagementservice/src/mgclfoperationobserver.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_mediamanagement/mediamanagementservice/src/mgclfoperationobserver.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -16,8 +16,8 @@ */ -#include -#include +#include +#include #include "mgclfoperationobserver.h" #include "mgservice.h" @@ -58,23 +58,23 @@ iMGService->Clear(); } - if( NULL != iServiceObserver ) //Asynchronous + if( NULL != iServiceObserver && (mgEvent == ECLFRefreshComplete)) //Asynchronous { - iServiceObserver->MgNotifyL( iTransactionID,iListModel, mgEvent, aError ); + iServiceObserver->MgNotifyL( iTransactionID,iListModel,this,mgEvent, aError ); // calling request complete on asyncrequestmanager iAsyncRequestManager->RequestComplete( iTransactionID ); - //Ownership of the List model is transfered to the Iterator class + //Ownership of the List model and the observer are transferred to the Iterator class iListModel = NULL; //In future at the time of supporting back to back call //call delete this iServiceObserver = NULL; iMGService = NULL; - delete this; - + //delete this; + } } @@ -118,7 +118,7 @@ iListModel = NULL; } - iServiceObserver->MgNotifyL(iTransactionID, NULL , mgEvent, KErrNone ); + iServiceObserver->MgNotifyL(iTransactionID, NULL, NULL, mgEvent, KErrNone ); iMGService = NULL; iTransactionID = 0; //In future at the time of supporting back to back call @@ -136,16 +136,7 @@ CClfOperationObserver::~CClfOperationObserver() { - - // If this observer is waiting for response - // then cancel the request - if( iListModel ) - { - /*iListModel->CancelRefresh(); - delete iListModel; - iListModel = NULL;*/ - CancelL(); - } + iListModel = NULL; if(iAsyncRequestManager) { iAsyncRequestManager = NULL; diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_mediamanagement/mediamanagementservice/src/mgpostfilter.cpp --- a/serviceproviders/sapi_mediamanagement/mediamanagementservice/src/mgpostfilter.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_mediamanagement/mediamanagementservice/src/mgpostfilter.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -17,7 +17,7 @@ -#include +#include #include "mgpostfilter.h" const TInt32 KLargestSigned32 = 0x7fffffff; diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_mediamanagement/mediamanagementservice/src/mgservice.cpp --- a/serviceproviders/sapi_mediamanagement/mediamanagementservice/src/mgservice.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_mediamanagement/mediamanagementservice/src/mgservice.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -18,10 +18,10 @@ -#include -#include -#include -#include +#include +#include +#include +#include #include "mgservice.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_mediamanagement/mediamanagementservice/src/mgthumbnailgeneration.cpp --- a/serviceproviders/sapi_mediamanagement/mediamanagementservice/src/mgthumbnailgeneration.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_mediamanagement/mediamanagementservice/src/mgthumbnailgeneration.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -20,9 +20,9 @@ #include #include -#include -#include // For TDataRecognitionResult -#include +#include +#include // For TDataRecognitionResult +#include #include #include"mgthumbnailgeneration.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_mediamanagement/mediamanagementservice/src/mgthumbobserver.cpp --- a/serviceproviders/sapi_mediamanagement/mediamanagementservice/src/mgthumbobserver.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_mediamanagement/mediamanagementservice/src/mgthumbobserver.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -18,8 +18,8 @@ #include -#include -#include +#include +#include #include"mgthumbobserver.h" #include"mgthumbnailobserver.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_mediamanagement/src/mgitemslist.cpp --- a/serviceproviders/sapi_mediamanagement/src/mgitemslist.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_mediamanagement/src/mgitemslist.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -16,12 +16,13 @@ */ -#include -#include +#include +#include #include "mgitemslist.h" #include "mgmediaitemfactory.h" #include "mgmediaitem.h" +#include "mgclfoperationobserver.h" _LIT8( KMgFileNameAndPath, "FileNameAndPath" ); @@ -34,8 +35,9 @@ // --------------------------------------------------------------------------- // -CMgItemsList::CMgItemsList( MCLFItemListModel* aItemListModel, TMgCmdId aCmdId ) +CMgItemsList::CMgItemsList( MCLFItemListModel* aItemListModel, CClfOperationObserver* aOperationObserver, TMgCmdId aCmdId ) : iItemListModel(aItemListModel), + iOperationObserver(aOperationObserver), iCmdId(aCmdId), iCount(iItemListModel->ItemCount()), iCurrent(KStartItemIndex), @@ -49,9 +51,9 @@ // --------------------------------------------------------------------------- // -CMgItemsList* CMgItemsList::NewL( MCLFItemListModel* aItemListModel, TMgCmdId aCmdId ) +CMgItemsList* CMgItemsList::NewL( MCLFItemListModel* aItemListModel, CClfOperationObserver* aOperationObserver, TMgCmdId aCmdId ) { - return new( ELeave ) CMgItemsList( aItemListModel, aCmdId ); + return new( ELeave ) CMgItemsList( aItemListModel, aOperationObserver, aCmdId ); } @@ -63,11 +65,23 @@ CMgItemsList::~CMgItemsList() { - delete iItemListModel; - - delete iMediaItem; - - } + if(iItemListModel) + { + iItemListModel->CancelRefresh(); + delete iItemListModel; + iItemListModel = NULL; + } + if(iOperationObserver) + { + delete iOperationObserver; + iOperationObserver = NULL; + } + if(iMediaItem) + { + delete iMediaItem; + iMediaItem = NULL; + } + } // --------------------------------------------------------------------------- // CMgItemsList::Reset // Resets the iterator to point to the beginning of list @@ -89,8 +103,8 @@ { iCurrent++; - - if( iCurrentItem( iCurrent ); diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_mediamanagement/src/mglinkfile.cpp --- a/serviceproviders/sapi_mediamanagement/src/mglinkfile.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_mediamanagement/src/mglinkfile.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -16,7 +16,7 @@ */ -#include +#include #include #include diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_mediamanagement/src/mgmediafile.cpp --- a/serviceproviders/sapi_mediamanagement/src/mgmediafile.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_mediamanagement/src/mgmediafile.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -16,7 +16,7 @@ */ -#include +#include #include #include "mgmediafile.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_mediamanagement/src/mgmediaitem.cpp --- a/serviceproviders/sapi_mediamanagement/src/mgmediaitem.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_mediamanagement/src/mgmediaitem.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -16,7 +16,7 @@ */ -#include +#include #include #include #include "mgmresolution.h" @@ -100,13 +100,18 @@ if ( mediaType == ECLFMediaTypeImage ) { TSize imageRes( 0,0 ); - MResolution* mediaResObj = MediaResolutionFactory::CreateMediaResolutionobjL( mediaImage,fullName ); - CleanupStack::PushL( mediaResObj ); - mediaResObj->GetresolutionL( imageRes ); - aOutputMap->InsertL( KXPixels,(TInt32)imageRes.iWidth ); - aOutputMap->InsertL( KYPixels,(TInt32)imageRes.iHeight ); - CleanupStack::Pop( mediaResObj ); - delete mediaResObj; + MResolution* mediaResObj=NULL; + TInt err =KErrNone; + TRAP(err,mediaResObj = MediaResolutionFactory::CreateMediaResolutionobjL( mediaImage,fullName )); + + if(err == KErrNone){ + CleanupStack::PushL( mediaResObj ); + mediaResObj->GetresolutionL( imageRes ); + aOutputMap->InsertL( KXPixels,(TInt32)imageRes.iWidth ); + aOutputMap->InsertL( KYPixels,(TInt32)imageRes.iHeight ); + CleanupStack::Pop( mediaResObj ); + delete mediaResObj; + } } } diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_mediamanagement/src/mgmediaitemfactory.cpp --- a/serviceproviders/sapi_mediamanagement/src/mgmediaitemfactory.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_mediamanagement/src/mgmediaitemfactory.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -17,7 +17,7 @@ #include -#include +#include #include "mgmediaitemfactory.h" #include "mglinkfile.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_mediamanagement/src/mgmusicfile.cpp --- a/serviceproviders/sapi_mediamanagement/src/mgmusicfile.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_mediamanagement/src/mgmusicfile.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -16,7 +16,7 @@ */ -#include +#include #include #include "mgmusicfile.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_mediamanagement/src/mgserviceobserver.cpp --- a/serviceproviders/sapi_mediamanagement/src/mgserviceobserver.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_mediamanagement/src/mgserviceobserver.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -16,12 +16,14 @@ */ #include -#include +#include #include "mgserviceobserver.h" #include "mgitemslist.h" #include "mginterface.h" #include "serviceerrno.h" +#include "mgclfoperationobserver.h" + //using namespace LIW; //Output Keys/arguments _LIT8(KResponse,"ReturnValue"); @@ -52,6 +54,7 @@ // ----------------------------------------------------------------------------- void CMgServiceObserver :: MgNotifyL( TUint aTransactionID, MCLFItemListModel* aListModel, + CClfOperationObserver* aOperationObserver, TMgOperationEvent& aOperationEvent, const TInt& aError ) @@ -98,17 +101,21 @@ // it will become the owner of iListModel,Ownership of // Iterator is transfered to consumer - CMgItemsList *iterator = CMgItemsList::NewL( aListModel, iCmdId ); + CMgItemsList *iterator = CMgItemsList::NewL( aListModel, aOperationObserver, iCmdId ); CleanupStack::PushL( iterator ); response.Set( iterator ); iOutput->AppendL( TLiwGenericParam ( KResponse, response ) ); CleanupStack::Pop( iterator ); - iterator->DecRef(); + // iterator->DecRef(); //This code is commented because the when the iterator is passed to user by using + //AsIterable() call refCount is not getting increased. As the iterator control is + //with the user we dont need to decrement the ref count here. } else { delete aListModel; + delete aOperationObserver; aListModel = NULL; + aOperationObserver = NULL; } if( NULL != iCallBack ) diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_mediamanagement/src/mgservicethumbnailobserver.cpp --- a/serviceproviders/sapi_mediamanagement/src/mgservicethumbnailobserver.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_mediamanagement/src/mgservicethumbnailobserver.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -15,7 +15,7 @@ * * */ -#include +#include #include "serviceerrno.h" #include "mgservicethumbnailobserver.h" #include"mginterface.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_mediamanagement/src/mgvideofile.cpp --- a/serviceproviders/sapi_mediamanagement/src/mgvideofile.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_mediamanagement/src/mgvideofile.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -16,7 +16,7 @@ */ -#include +#include #include #include diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_mediamanagement/tsrc/dev/tmediamgmtprovidertest/conf/tmediamgmtprovidertest.cfg --- a/serviceproviders/sapi_mediamanagement/tsrc/dev/tmediamgmtprovidertest/conf/tmediamgmtprovidertest.cfg Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_mediamanagement/tsrc/dev/tmediamgmtprovidertest/conf/tmediamgmtprovidertest.cfg Tue Nov 24 08:56:33 2009 +0200 @@ -52,7 +52,7 @@ foobar InterfaceClass GetList FileInfo Video NULL NULL NULL FileName Ascending 0 0 delete foobar [Endtest] - +/* [Test] title MG_GetFilesInfo_Video_NULL_NULL_NULL_FileName_Ascending_0 create tmediamgmtprovidertest foobar @@ -66,7 +66,7 @@ foobar InterfaceClass GetList FileInfo StreamingURL FileDate 20070220: 20070323: NULL Ascending 0 0 delete foobar [Endtest] - +*/ [Test] title MG_GetFilesInfo_Music_Artist_NULL_NULL_Artist_Ascending_-1 create tmediamgmtprovidertest foobar @@ -215,7 +215,7 @@ foobar InterfaceClass GetList FileInfo Video FileDate 20070221: NULL FileSize Descending 0 0 delete foobar [Endtest] - +/* [Test] title MG_GetFilesInfo_StreamingURL_FileSize_NULL_2000_NULL_Ascending_0 create tmediamgmtprovidertest foobar @@ -236,7 +236,7 @@ foobar InterfaceClass GetList FileInfo StreamingURL FileNameAndPath C:\Data\Dlink.ram NULL NULL Ascending 0 0 delete foobar [Endtest] - +*/ [Test] title MG_GetFilesInfo_Image_FileSize_0_1100000_FileName_Ascending_0 create tmediamgmtprovidertest foobar diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_mediamanagement/tsrc/dev/tmediamgmtprovidertest/src/mediamgmt.cpp --- a/serviceproviders/sapi_mediamanagement/tsrc/dev/tmediamgmtprovidertest/src/mediamgmt.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_mediamanagement/tsrc/dev/tmediamgmtprovidertest/src/mediamgmt.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -19,7 +19,7 @@ // INCLUDE FILES -#include +#include #include "mediamgmt.h" // EXTERNAL DATA STRUCTURES diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_mediamanagement/tsrc/dev/tmediamgmtprovidertest/src/mediamgmtblocks.cpp --- a/serviceproviders/sapi_mediamanagement/tsrc/dev/tmediamgmtprovidertest/src/mediamgmtblocks.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_mediamanagement/tsrc/dev/tmediamgmtprovidertest/src/mediamgmtblocks.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -21,8 +21,8 @@ // INCLUDE FILES #include #include -#include -#include +#include +#include #include "mediamgmt.h" using namespace LIW; diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_mediamanagement/tsrc/dev/tmediamgmttest/conf/tmediamgmttest.cfg --- a/serviceproviders/sapi_mediamanagement/tsrc/dev/tmediamgmttest/conf/tmediamgmttest.cfg Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_mediamanagement/tsrc/dev/tmediamgmttest/conf/tmediamgmttest.cfg Tue Nov 24 08:56:33 2009 +0200 @@ -36,7 +36,7 @@ foobar GetFilesInfo Video NULL NULL NULL FileName 0 delete foobar [Endtest] - +/* [Test] title MG_GetFilesInfo_Video_NULL_NULL_NULL_FileName_0 create tmediamgmttest foobar @@ -50,7 +50,7 @@ foobar GetFilesInfo StreamingURL FileDate 20070220: 20070323: NULL 0 delete foobar [Endtest] - +*/ [Test] title MG_GetFilesInfo_Music_Artist_NULL_NULL_Artist_0 create tmediamgmttest foobar @@ -200,7 +200,7 @@ foobar GetFilesInfo Video FileDate 20070221: NULL FileSize 1 delete foobar [Endtest] - +/* [Test] title MG_GetFilesInfo_StreamingURL_FileSize_NULL_2000_NULL_0 create tmediamgmttest foobar @@ -220,6 +220,7 @@ foobar GetFilesInfo StreamingURL FileNameAndPath C:\Data\Dlink.ram NULL NULL 0 delete foobar [Endtest] +*/ [Test] title MG_GetFilesInfo_Image_FileSize_0_1100000_FileName_0 create tmediamgmttest foobar diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_mediamanagement/tsrc/dev/tmediamgmttest/inc/mediamgmt.h --- a/serviceproviders/sapi_mediamanagement/tsrc/dev/tmediamgmttest/inc/mediamgmt.h Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_mediamanagement/tsrc/dev/tmediamgmttest/inc/mediamgmt.h Tue Nov 24 08:56:33 2009 +0200 @@ -204,6 +204,7 @@ TInt HandleNotifyL(TInt aCmdId,TInt aEventId,CLiwGenericParamList& aEventParamList,const CLiwGenericParamList& aInParamList); virtual void MgNotifyL(TUint aTransactionID, MCLFItemListModel* aListModel, + CClfOperationObserver* aOperationObserver, TMgOperationEvent& aOperationEvent, const TInt& aError ); }; diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_mediamanagement/tsrc/dev/tmediamgmttest/src/mediamgmt.cpp --- a/serviceproviders/sapi_mediamanagement/tsrc/dev/tmediamgmttest/src/mediamgmt.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_mediamanagement/tsrc/dev/tmediamgmttest/src/mediamgmt.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -19,7 +19,7 @@ // INCLUDE FILES -#include +#include #include "mediamgmt.h" // EXTERNAL DATA STRUCTURES diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_mediamanagement/tsrc/dev/tmediamgmttest/src/mediamgmtblocks.cpp --- a/serviceproviders/sapi_mediamanagement/tsrc/dev/tmediamgmttest/src/mediamgmtblocks.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_mediamanagement/tsrc/dev/tmediamgmttest/src/mediamgmtblocks.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -21,9 +21,9 @@ // INCLUDE FILES #include #include -#include +#include #include -#include "MediaMgmt.h" +#include "mediamgmt.h" #include "mgitemslist.h" using namespace LIW; @@ -209,6 +209,7 @@ void Callback::MgNotifyL(TUint /*aTransactionID*/, MCLFItemListModel* aListModel, + CClfOperationObserver* aOperationObserver, TMgOperationEvent& aOperationEvent, const TInt& aError ) @@ -247,6 +248,8 @@ { delete aListModel; aListModel = NULL; + delete aOperationObserver; + aOperationObserver = NULL; } diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_mediamanagement/tsrc/dev/tmediamgmttest/src/mgitemslist.cpp --- a/serviceproviders/sapi_mediamanagement/tsrc/dev/tmediamgmttest/src/mgitemslist.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_mediamanagement/tsrc/dev/tmediamgmttest/src/mgitemslist.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -17,8 +17,8 @@ -#include -#include +#include +#include #include "mgitemslist.h" #include "mgmediaitemfactory.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_mediamanagement/tsrc/dev/tmediamgmttest/src/mglinkfile.cpp --- a/serviceproviders/sapi_mediamanagement/tsrc/dev/tmediamgmttest/src/mglinkfile.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_mediamanagement/tsrc/dev/tmediamgmttest/src/mglinkfile.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -17,7 +17,7 @@ -#include +#include #include #include diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_mediamanagement/tsrc/dev/tmediamgmttest/src/mgmediafile.cpp --- a/serviceproviders/sapi_mediamanagement/tsrc/dev/tmediamgmttest/src/mgmediafile.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_mediamanagement/tsrc/dev/tmediamgmttest/src/mgmediafile.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -17,7 +17,7 @@ -#include +#include #include #include "mgmediafile.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_mediamanagement/tsrc/dev/tmediamgmttest/src/mgmediaitem.cpp --- a/serviceproviders/sapi_mediamanagement/tsrc/dev/tmediamgmttest/src/mgmediaitem.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_mediamanagement/tsrc/dev/tmediamgmttest/src/mgmediaitem.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -17,7 +17,7 @@ -#include +#include #include #include diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_mediamanagement/tsrc/dev/tmediamgmttest/src/mgmediaitemfactory.cpp --- a/serviceproviders/sapi_mediamanagement/tsrc/dev/tmediamgmttest/src/mgmediaitemfactory.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_mediamanagement/tsrc/dev/tmediamgmttest/src/mgmediaitemfactory.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -18,7 +18,7 @@ #include -#include +#include #include "mgmediaitemfactory.h" #include "mglinkfile.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_mediamanagement/tsrc/dev/tmediamgmttest/src/mgmusicfile.cpp --- a/serviceproviders/sapi_mediamanagement/tsrc/dev/tmediamgmttest/src/mgmusicfile.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_mediamanagement/tsrc/dev/tmediamgmttest/src/mgmusicfile.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -17,7 +17,7 @@ -#include +#include #include #include "mgmusicfile.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_mediamanagement/tsrc/dev/tmediamgmttest/src/mgvideofile.cpp --- a/serviceproviders/sapi_mediamanagement/tsrc/dev/tmediamgmttest/src/mgvideofile.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_mediamanagement/tsrc/dev/tmediamgmttest/src/mgvideofile.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -17,7 +17,7 @@ -#include +#include #include #include diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_mediamanagement/tsrc/dev/tmediathumbnailprovidertest/inc/imageresolution.h --- a/serviceproviders/sapi_mediamanagement/tsrc/dev/tmediathumbnailprovidertest/inc/imageresolution.h Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_mediamanagement/tsrc/dev/tmediathumbnailprovidertest/inc/imageresolution.h Tue Nov 24 08:56:33 2009 +0200 @@ -25,7 +25,7 @@ #define MGIMAGERESOLUTION_H_ #include -#include +#include #include #include diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_mediamanagement/tsrc/dev/tmediathumbnailprovidertest/inc/ttestmediathumbobserver.h --- a/serviceproviders/sapi_mediamanagement/tsrc/dev/tmediathumbnailprovidertest/inc/ttestmediathumbobserver.h Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_mediamanagement/tsrc/dev/tmediathumbnailprovidertest/inc/ttestmediathumbobserver.h Tue Nov 24 08:56:33 2009 +0200 @@ -21,7 +21,7 @@ -#include +#include #include "e32base.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_mediamanagement/tsrc/dev/tmediathumbnailprovidertest/src/tmediathumb_testblocks.cpp --- a/serviceproviders/sapi_mediamanagement/tsrc/dev/tmediathumbnailprovidertest/src/tmediathumb_testblocks.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_mediamanagement/tsrc/dev/tmediathumbnailprovidertest/src/tmediathumb_testblocks.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -20,9 +20,9 @@ // INCLUDE FILES #include #include -#include -#include -#include +#include +#include +#include #include #include #include diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_mediamanagement/tsrc/dev/tmediathumbnailprovidertest/src/tmediathumbnailtest.cpp --- a/serviceproviders/sapi_mediamanagement/tsrc/dev/tmediathumbnailprovidertest/src/tmediathumbnailtest.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_mediamanagement/tsrc/dev/tmediathumbnailprovidertest/src/tmediathumbnailtest.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -18,7 +18,7 @@ // INCLUDE FILES -#include +#include #include "tmediathumbnailtest.h" // EXTERNAL DATA STRUCTURES diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_mediamanagement/tsrc/testing/tmediaprovidertest/inc/tmediaprovidertest.h --- a/serviceproviders/sapi_mediamanagement/tsrc/testing/tmediaprovidertest/inc/tmediaprovidertest.h Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_mediamanagement/tsrc/testing/tmediaprovidertest/inc/tmediaprovidertest.h Tue Nov 24 08:56:33 2009 +0200 @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_mediamanagement/tsrc/testing/tmediaprovidertest/inc/tprovidertestobserver.h --- a/serviceproviders/sapi_mediamanagement/tsrc/testing/tmediaprovidertest/inc/tprovidertestobserver.h Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_mediamanagement/tsrc/testing/tmediaprovidertest/inc/tprovidertestobserver.h Tue Nov 24 08:56:33 2009 +0200 @@ -22,7 +22,7 @@ -#include +#include #include "e32base.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_mediamanagement/tsrc/testing/tmediaprovidertest/inc/txmlconvertor.h --- a/serviceproviders/sapi_mediamanagement/tsrc/testing/tmediaprovidertest/inc/txmlconvertor.h Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_mediamanagement/tsrc/testing/tmediaprovidertest/inc/txmlconvertor.h Tue Nov 24 08:56:33 2009 +0200 @@ -23,7 +23,7 @@ // INCLUDES -#include +#include #include diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_mediamanagement/tsrc/testing/tmediaprovidertest/src/tmediaprovidertest.cpp --- a/serviceproviders/sapi_mediamanagement/tsrc/testing/tmediaprovidertest/src/tmediaprovidertest.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_mediamanagement/tsrc/testing/tmediaprovidertest/src/tmediaprovidertest.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -19,7 +19,7 @@ // INCLUDE FILES -#include +#include #include #include #include "tmediaprovidertest.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_mediamanagement/tsrc/testing/tmediaprovidertest/src/tmediaprovidertest_testblocks.cpp --- a/serviceproviders/sapi_mediamanagement/tsrc/testing/tmediaprovidertest/src/tmediaprovidertest_testblocks.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_mediamanagement/tsrc/testing/tmediaprovidertest/src/tmediaprovidertest_testblocks.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -21,9 +21,9 @@ // INCLUDE FILES #include #include -#include -#include -#include +#include +#include +#include #include "tmediaprovidertest.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_mediamanagement/tsrc/testing/tmediaprovidertest/src/txmlconvertor.cpp --- a/serviceproviders/sapi_mediamanagement/tsrc/testing/tmediaprovidertest/src/txmlconvertor.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_mediamanagement/tsrc/testing/tmediaprovidertest/src/txmlconvertor.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -21,12 +21,12 @@ // INCLUDE FILES #include -#include -#include +#include +#include #include #include #include -#include +#include #include #include "txmlconvertor.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_mediamanagement/tsrc/testing/tmediaprovidertesting/inc/tmediaobserver.h --- a/serviceproviders/sapi_mediamanagement/tsrc/testing/tmediaprovidertesting/inc/tmediaobserver.h Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_mediamanagement/tsrc/testing/tmediaprovidertesting/inc/tmediaobserver.h Tue Nov 24 08:56:33 2009 +0200 @@ -18,9 +18,9 @@ #ifndef _TMEDIAPROVIDERTESTING_H__ #define _TMEDIAPROVIDERTESTING_H__ -#include -#include -#include +#include +#include +#include #include extern TInt count; class CMediaObserver : public CBase , public MLiwNotifyCallback diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_mediamanagement/tsrc/testing/tmediaprovidertesting/inc/tmediaprovidertesting.h --- a/serviceproviders/sapi_mediamanagement/tsrc/testing/tmediaprovidertesting/inc/tmediaprovidertesting.h Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_mediamanagement/tsrc/testing/tmediaprovidertesting/inc/tmediaprovidertesting.h Tue Nov 24 08:56:33 2009 +0200 @@ -26,9 +26,9 @@ #include #include -#include -#include -#include +#include +#include +#include // CONSTANTS //const ?type ?constant_var = ?constant; diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_mediamanagement/tsrc/testing/tmediaprovidertesting/src/tmediaobserver.cpp --- a/serviceproviders/sapi_mediamanagement/tsrc/testing/tmediaprovidertesting/src/tmediaobserver.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_mediamanagement/tsrc/testing/tmediaprovidertesting/src/tmediaobserver.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -19,8 +19,8 @@ // [INCLUDE FILES] - do not remove #include #include -#include -#include +#include +#include #include diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_mediamanagement/tsrc/testing/tmediaprovidertesting/src/tmediaprovidertesting.cpp --- a/serviceproviders/sapi_mediamanagement/tsrc/testing/tmediaprovidertesting/src/tmediaprovidertesting.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_mediamanagement/tsrc/testing/tmediaprovidertesting/src/tmediaprovidertesting.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -18,7 +18,7 @@ // INCLUDE FILES -#include +#include #include "tmediaprovidertesting.h" #include diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_mediamanagement/tsrc/testing/tmediaprovidertesting/src/tmediaprovidertestingBlocks.cpp --- a/serviceproviders/sapi_mediamanagement/tsrc/testing/tmediaprovidertesting/src/tmediaprovidertestingBlocks.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_mediamanagement/tsrc/testing/tmediaprovidertesting/src/tmediaprovidertestingBlocks.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -19,8 +19,8 @@ // [INCLUDE FILES] - do not remove #include #include -#include -#include +#include +#include #include #include "tmediaprovidertesting.h" #include "tmediaprovidertesting.hrh" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_mediamanagement/tsrc/testing/tmediaprovidertesting/src/tmediaprovidertestingImpl.cpp --- a/serviceproviders/sapi_mediamanagement/tsrc/testing/tmediaprovidertesting/src/tmediaprovidertestingImpl.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_mediamanagement/tsrc/testing/tmediaprovidertesting/src/tmediaprovidertestingImpl.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -19,8 +19,8 @@ // [INCLUDE FILES] - do not remove #include #include -#include -#include +#include +#include #include "tmediaprovidertesting.h" #include "tmediaprovidertesting.hrh" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_messaging/data/102833AF.rss --- a/serviceproviders/sapi_messaging/data/102833AF.rss Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_messaging/data/102833AF.rss Tue Nov 24 08:56:33 2009 +0200 @@ -16,9 +16,9 @@ */ -#include -#include "ecom/RegistryInfoV2.rh" -#include +#include +#include "ecom/registryinfov2.rh" +#include RESOURCE REGISTRY_INFO theInfo { diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_messaging/inc/messaginginterface.h --- a/serviceproviders/sapi_messaging/inc/messaginginterface.h Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_messaging/inc/messaginginterface.h Tue Nov 24 08:56:33 2009 +0200 @@ -19,9 +19,9 @@ #ifndef __MESSAGINGINTERFACE_H #define __MESSAGINGINTERFACE_H -#include -#include -#include +#include +#include +#include #include "messageheader.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_messaging/inc/messagingservicehandler.h --- a/serviceproviders/sapi_messaging/inc/messagingservicehandler.h Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_messaging/inc/messagingservicehandler.h Tue Nov 24 08:56:33 2009 +0200 @@ -19,8 +19,8 @@ #ifndef __MESSAGINGSERVICEHANDLER_H #define __MESSAGINGSERVICEHANDLER_H -#include -#include +#include +#include /** * Provides implementation to CLiwServiceIfBase interface. diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_messaging/messagingservice/src/accessfolder.cpp --- a/serviceproviders/sapi_messaging/messagingservice/src/accessfolder.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_messaging/messagingservice/src/accessfolder.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -20,8 +20,8 @@ #include #include #include -#include -#include +#include +#include #include "messageheader.h" #include "accessfolder.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_messaging/messagingservice/src/changestatus.cpp --- a/serviceproviders/sapi_messaging/messagingservice/src/changestatus.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_messaging/messagingservice/src/changestatus.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -20,7 +20,7 @@ #include #include "messageheader.h" -#include "ChangeStatus.h" +#include "changestatus.h" // --------------------------------------------------------------------------- // two-phased constructor diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_messaging/messagingservice/src/messagedetail.cpp --- a/serviceproviders/sapi_messaging/messagingservice/src/messagedetail.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_messaging/messagingservice/src/messagedetail.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -21,14 +21,14 @@ #include #include -#include -#include +#include +#include #include -#include -#include +#include +#include #include #include -#include +#include #include #include diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_messaging/messagingservice/src/messageheader.cpp --- a/serviceproviders/sapi_messaging/messagingservice/src/messageheader.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_messaging/messagingservice/src/messageheader.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -16,8 +16,8 @@ */ -#include -#include +#include +#include #include "messageheader.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_messaging/messagingservice/src/messagingservice.cpp --- a/serviceproviders/sapi_messaging/messagingservice/src/messagingservice.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_messaging/messagingservice/src/messagingservice.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -20,7 +20,7 @@ #include #include #include -#include +#include #include "messageheader.h" #include "messagingservice.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_messaging/messagingservice/src/sendmessage.cpp --- a/serviceproviders/sapi_messaging/messagingservice/src/sendmessage.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_messaging/messagingservice/src/sendmessage.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -17,17 +17,17 @@ #include -#include +#include #include -#include +#include #include -#include -#include +#include +#include #include #include -#include +#include #include -#include +#include #include #include #include diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_messaging/src/messagingservicehandler.cpp --- a/serviceproviders/sapi_messaging/src/messagingservicehandler.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_messaging/src/messagingservicehandler.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -17,7 +17,7 @@ -#include +#include #include "messaginginterface.h" #include "messagingservicehandler.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/manual/tmsg_notificationiter3/group/tmsg_notificationiter3.mmp --- a/serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/manual/tmsg_notificationiter3/group/tmsg_notificationiter3.mmp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/manual/tmsg_notificationiter3/group/tmsg_notificationiter3.mmp Tue Nov 24 08:56:33 2009 +0200 @@ -38,7 +38,7 @@ SOURCEPATH ../src SOURCE messagenotificationtest.cpp -SOURCE messagenotificationtestBlocks.cpp +SOURCE messagenotificationtestblocks.cpp SOURCE notify.cpp USERINCLUDE ../inc diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/manual/tmsg_notificationiter3/inc/messaginginterface.h --- a/serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/manual/tmsg_notificationiter3/inc/messaginginterface.h Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/manual/tmsg_notificationiter3/inc/messaginginterface.h Tue Nov 24 08:56:33 2009 +0200 @@ -20,9 +20,9 @@ #ifndef __MESSAGINGINTERFACE_H #define __MESSAGINGINTERFACE_H -#include -#include -#include +#include +#include +#include #include "messageheader.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/manual/tmsg_notificationiter3/inc/notify.h --- a/serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/manual/tmsg_notificationiter3/inc/notify.h Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/manual/tmsg_notificationiter3/inc/notify.h Tue Nov 24 08:56:33 2009 +0200 @@ -17,8 +17,8 @@ #include ////#include -#include -#include +#include +#include #include class CLiwServiceHandler; diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/manual/tmsg_notificationiter3/src/messagenotificationtest.cpp --- a/serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/manual/tmsg_notificationiter3/src/messagenotificationtest.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/manual/tmsg_notificationiter3/src/messagenotificationtest.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -19,7 +19,7 @@ // INCLUDE FILES -#include +#include #include "messagenotificationtest.h" //#include diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/manual/tmsg_notificationiter3/src/messagenotificationtestblocks.cpp --- a/serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/manual/tmsg_notificationiter3/src/messagenotificationtestblocks.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/manual/tmsg_notificationiter3/src/messagenotificationtestblocks.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -21,10 +21,10 @@ // INCLUDE FILES #include #include -#include +#include #include ////#include -#include +#include #include "messaginginterface.h" #include "notify.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/manual/tmsg_notificationiter3/src/notify.cpp --- a/serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/manual/tmsg_notificationiter3/src/notify.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/manual/tmsg_notificationiter3/src/notify.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -17,9 +17,9 @@ #include "messaginginterface.h" -#include -#include -#include +#include +#include +#include #include"notify.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_changestatusiter3/inc/messagingservicehandler.h --- a/serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_changestatusiter3/inc/messagingservicehandler.h Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_changestatusiter3/inc/messagingservicehandler.h Tue Nov 24 08:56:33 2009 +0200 @@ -20,8 +20,8 @@ #ifndef __MESSAGINGSERVICEHANDLER_H #define __MESSAGINGSERVICEHANDLER_H -#include -#include +#include +#include /** * Provides implementation to CLiwServiceIfBase interface. diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_changestatusiter3/src/tchangestatustest.cpp --- a/serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_changestatusiter3/src/tchangestatustest.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_changestatusiter3/src/tchangestatustest.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -19,7 +19,7 @@ // INCLUDE FILES -#include +#include #include "tchangestatustest.h" //#include diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_changestatusiter3/src/tchangestatustestblocks.cpp --- a/serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_changestatusiter3/src/tchangestatustestblocks.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_changestatusiter3/src/tchangestatustestblocks.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -21,11 +21,11 @@ // INCLUDE FILES #include #include -#include +#include #include ////#include -#include -#include +#include +#include #include "messagingservicehandler.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_deletemessageiter3/inc/messaginginterface.h --- a/serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_deletemessageiter3/inc/messaginginterface.h Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_deletemessageiter3/inc/messaginginterface.h Tue Nov 24 08:56:33 2009 +0200 @@ -20,9 +20,9 @@ #ifndef __MESSAGINGINTERFACE_H #define __MESSAGINGINTERFACE_H -#include -#include -#include +#include +#include +#include #include "messageheader.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_deletemessageiter3/src/tdeletemessagetest.cpp --- a/serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_deletemessageiter3/src/tdeletemessagetest.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_deletemessageiter3/src/tdeletemessagetest.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -19,8 +19,8 @@ // INCLUDE FILES -#include -#include "TDeleteMessageTest.h" +#include +#include "tdeletemessagetest.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_deletemessageiter3/src/tdeletemessagetestblocks.cpp --- a/serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_deletemessageiter3/src/tdeletemessagetestblocks.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_deletemessageiter3/src/tdeletemessagetestblocks.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -21,14 +21,14 @@ // INCLUDE FILES #include #include -#include +#include #include ////#include -#include +#include #include "messaginginterface.h" -#include +#include -#include "TDeleteMessageTest.h" +#include "tdeletemessagetest.h" // ----------------------------------------------------------------------------- // CTDeleteMessageTest::Delete diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_getheaderlistiter3/inc/messaginginterface.h --- a/serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_getheaderlistiter3/inc/messaginginterface.h Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_getheaderlistiter3/inc/messaginginterface.h Tue Nov 24 08:56:33 2009 +0200 @@ -20,9 +20,9 @@ #ifndef __MESSAGINGINTERFACE_H #define __MESSAGINGINTERFACE_H -#include -#include -#include +#include +#include +#include #include "messageheader.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_getheaderlistiter3/src/get_headerblocks.cpp --- a/serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_getheaderlistiter3/src/get_headerblocks.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_getheaderlistiter3/src/get_headerblocks.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -21,7 +21,7 @@ // INCLUDE FILES #include #include -#include +#include #include "getheader.h" // EXTERNAL DATA STRUCTURES diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_getheaderlistiter3/src/getheader.cpp --- a/serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_getheaderlistiter3/src/getheader.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_getheaderlistiter3/src/getheader.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -19,7 +19,7 @@ // INCLUDE FILES -#include +#include #include "getheader.h" // EXTERNAL DATA STRUCTURES diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_getheaderlistiter3/src/tgetheaderlist1.cpp --- a/serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_getheaderlistiter3/src/tgetheaderlist1.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_getheaderlistiter3/src/tgetheaderlist1.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -19,11 +19,11 @@ #include ////#include #include "messaginginterface.h" -#include +#include #include "getheader.h" #include -#include -#include +#include +#include #include "messageheader.h" #ifdef MAIN #define getheader_test1 main diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_getheaderlistiter3/src/tgetheaderlist2.cpp --- a/serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_getheaderlistiter3/src/tgetheaderlist2.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_getheaderlistiter3/src/tgetheaderlist2.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -20,11 +20,11 @@ #include ////#include #include "messaginginterface.h" -#include +#include #include "getheader.h" #include -#include -#include +#include +#include #include "messageheader.h" #ifdef MAIN #define getheader_test2 main diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_getheaderlistiter3/src/tgetheaderlist3.cpp --- a/serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_getheaderlistiter3/src/tgetheaderlist3.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_getheaderlistiter3/src/tgetheaderlist3.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -20,11 +20,11 @@ #include ////#include #include "messaginginterface.h" -#include +#include #include "getheader.h" #include -#include -#include +#include +#include #include "messageheader.h" #ifdef MAIN #define getheader_test3 main diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_getheaderlistiter3/src/tgetheaderlist4.cpp --- a/serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_getheaderlistiter3/src/tgetheaderlist4.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_getheaderlistiter3/src/tgetheaderlist4.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -20,11 +20,11 @@ #include ////#include #include "messaginginterface.h" -#include +#include #include "getheader.h" #include -#include -#include +#include +#include #include "messageheader.h" #ifdef MAIN #define getheader_test4 main diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_getheaderlistiter3/src/tgetheaderlist5.cpp --- a/serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_getheaderlistiter3/src/tgetheaderlist5.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_getheaderlistiter3/src/tgetheaderlist5.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -20,11 +20,11 @@ #include ////#include #include "messaginginterface.h" -#include +#include #include "getheader.h" #include -#include -#include +#include +#include #include "messageheader.h" #ifdef MAIN #define getheader_test5 main diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_getheaderlistiter3/src/tgetheaderlist6.cpp --- a/serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_getheaderlistiter3/src/tgetheaderlist6.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_getheaderlistiter3/src/tgetheaderlist6.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -20,11 +20,11 @@ #include ////#include #include "messaginginterface.h" -#include +#include #include "getheader.h" #include -#include -#include +#include +#include #include "messageheader.h" #ifdef MAIN #define getheader_test6 main diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_getheaderlistiter3/src/tgetheaderlist7.cpp --- a/serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_getheaderlistiter3/src/tgetheaderlist7.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_getheaderlistiter3/src/tgetheaderlist7.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -20,11 +20,11 @@ #include ////#include #include "messaginginterface.h" -#include +#include #include "getheader.h" #include -#include -#include +#include +#include #include "messageheader.h" #ifdef MAIN #define getheader_test7 main diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_misccases/inc/messaginginterface.h --- a/serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_misccases/inc/messaginginterface.h Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_misccases/inc/messaginginterface.h Tue Nov 24 08:56:33 2009 +0200 @@ -20,9 +20,9 @@ #ifndef __MESSAGINGINTERFACE_H #define __MESSAGINGINTERFACE_H -#include -#include -#include +#include +#include +#include #include "messageheader.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_misccases/src/get_headerblocks.cpp --- a/serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_misccases/src/get_headerblocks.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_misccases/src/get_headerblocks.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -21,16 +21,16 @@ // INCLUDE FILES #include #include -#include +#include #include "getheader.h" #include ////#include #include "messaginginterface.h" -#include +#include #include -#include -#include +#include +#include #include "messageheader.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_misccases/src/getheader.cpp --- a/serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_misccases/src/getheader.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_misccases/src/getheader.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -19,7 +19,7 @@ // INCLUDE FILES -#include +#include #include "getheader.h" // EXTERNAL DATA STRUCTURES diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_negitivecases/inc/tprovidertest.h --- a/serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_negitivecases/inc/tprovidertest.h Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_negitivecases/inc/tprovidertest.h Tue Nov 24 08:56:33 2009 +0200 @@ -25,7 +25,7 @@ //#include #include #include -#include +#include #include diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_negitivecases/inc/tprovidertestobserver.h --- a/serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_negitivecases/inc/tprovidertestobserver.h Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_negitivecases/inc/tprovidertestobserver.h Tue Nov 24 08:56:33 2009 +0200 @@ -22,7 +22,7 @@ -#include +#include #include "e32base.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_negitivecases/inc/txmlconvertor.h --- a/serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_negitivecases/inc/txmlconvertor.h Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_negitivecases/inc/txmlconvertor.h Tue Nov 24 08:56:33 2009 +0200 @@ -23,7 +23,7 @@ // INCLUDES -#include +#include #include diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_negitivecases/src/tprovidertest.cpp --- a/serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_negitivecases/src/tprovidertest.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_negitivecases/src/tprovidertest.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -19,7 +19,7 @@ // INCLUDE FILES -#include +#include #include #include #include "tprovidertest.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_negitivecases/src/tprovidertest_testblocks.cpp --- a/serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_negitivecases/src/tprovidertest_testblocks.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_negitivecases/src/tprovidertest_testblocks.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -21,9 +21,9 @@ // INCLUDE FILES #include #include -#include -#include -#include +#include +#include +#include #include "tprovidertest.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_negitivecases/src/txmlconvertor.cpp --- a/serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_negitivecases/src/txmlconvertor.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_negitivecases/src/txmlconvertor.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -21,12 +21,12 @@ // INCLUDE FILES #include -#include -#include +#include +#include #include #include #include -#include +#include #include #include "txmlconvertor.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_sendmessageiter3/inc/messaginginterface.h --- a/serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_sendmessageiter3/inc/messaginginterface.h Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_sendmessageiter3/inc/messaginginterface.h Tue Nov 24 08:56:33 2009 +0200 @@ -20,9 +20,9 @@ #ifndef __MESSAGINGINTERFACE_H #define __MESSAGINGINTERFACE_H -#include -#include -#include +#include +#include +#include #include "messageheader.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_sendmessageiter3/src/send_messageblocks.cpp --- a/serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_sendmessageiter3/src/send_messageblocks.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_sendmessageiter3/src/send_messageblocks.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -21,7 +21,7 @@ // INCLUDE FILES #include #include -#include +#include #include "sendmessage.h" // EXTERNAL DATA STRUCTURES diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_sendmessageiter3/src/sendmessage.cpp --- a/serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_sendmessageiter3/src/sendmessage.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_sendmessageiter3/src/sendmessage.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -19,7 +19,7 @@ // INCLUDE FILES -#include +#include #include "sendmessage.h" // EXTERNAL DATA STRUCTURES diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_sendmessageiter3/src/tsendmessage1.cpp --- a/serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_sendmessageiter3/src/tsendmessage1.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsg_sendmessageiter3/src/tsendmessage1.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -22,11 +22,11 @@ #include ////#include #include "messaginginterface.h" -#include +#include #include "sendmessage.h" #include #include "messageheader.h" -#include +#include #ifdef MAIN #define sendmessage_test1 main #endif diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsgget_async/inc/tmsgget_async.h --- a/serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsgget_async/inc/tmsgget_async.h Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsgget_async/inc/tmsgget_async.h Tue Nov 24 08:56:33 2009 +0200 @@ -24,8 +24,8 @@ #include #include #include -#include -#include +#include +#include // CONSTANTS //const ?type ?constant_var = ?constant; diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsgget_async/src/tmsgget_async.cpp --- a/serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsgget_async/src/tmsgget_async.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsgget_async/src/tmsgget_async.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -17,7 +17,7 @@ // INCLUDE FILES -#include +#include #include "tmsgget_async.h" #include diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsgget_async/src/tmsgget_asyncBlocks.cpp --- a/serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsgget_async/src/tmsgget_asyncBlocks.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_messaging/tsrc/dev/tmessagingprovidertest/tmsgget_async/src/tmsgget_asyncBlocks.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -19,7 +19,7 @@ // [INCLUDE FILES] - do not remove #include #include -#include +#include #include "tmsgget_async.h" // EXTERNAL DATA STRUCTURES diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_messaging/tsrc/dev/tmessagingtest/manual/tmsg_notificationiter1/group/tmsg_notificationiter1.mmp --- a/serviceproviders/sapi_messaging/tsrc/dev/tmessagingtest/manual/tmsg_notificationiter1/group/tmsg_notificationiter1.mmp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_messaging/tsrc/dev/tmessagingtest/manual/tmsg_notificationiter1/group/tmsg_notificationiter1.mmp Tue Nov 24 08:56:33 2009 +0200 @@ -32,7 +32,7 @@ SOURCEPATH ../src SOURCE messagenotificationtest.cpp -SOURCE messagenotificationtestBlocks.cpp +SOURCE messagenotificationtestblocks.cpp SOURCE reqnotification.cpp //SOURCE tfunctionthread.cpp diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_messaging/tsrc/dev/tmessagingtest/manual/tmsg_notificationiter1/src/messagenotificationtest.cpp --- a/serviceproviders/sapi_messaging/tsrc/dev/tmessagingtest/manual/tmsg_notificationiter1/src/messagenotificationtest.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_messaging/tsrc/dev/tmessagingtest/manual/tmsg_notificationiter1/src/messagenotificationtest.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -19,7 +19,7 @@ // INCLUDE FILES -#include +#include //#include #include"messagenotify.h" #include "messagenotificationtest.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_messaging/tsrc/dev/tmessagingtest/manual/tmsg_notificationiter1/src/messagenotificationtestblocks.cpp --- a/serviceproviders/sapi_messaging/tsrc/dev/tmessagingtest/manual/tmsg_notificationiter1/src/messagenotificationtestblocks.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_messaging/tsrc/dev/tmessagingtest/manual/tmsg_notificationiter1/src/messagenotificationtestblocks.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -22,7 +22,7 @@ #include #include //#include -#include +#include #include #include"messageheader.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_messaging/tsrc/dev/tmessagingtest/manual/tmsg_notificationiter1/src/reqnotification.cpp --- a/serviceproviders/sapi_messaging/tsrc/dev/tmessagingtest/manual/tmsg_notificationiter1/src/reqnotification.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_messaging/tsrc/dev/tmessagingtest/manual/tmsg_notificationiter1/src/reqnotification.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -22,7 +22,7 @@ #include ////#include #include "messagingservice.h" -#include +#include #include #include "messageheader.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_messaging/tsrc/dev/tmessagingtest/tmsg_changestatusiter1/src/tchangestatustest.cpp --- a/serviceproviders/sapi_messaging/tsrc/dev/tmessagingtest/tmsg_changestatusiter1/src/tchangestatustest.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_messaging/tsrc/dev/tmessagingtest/tmsg_changestatusiter1/src/tchangestatustest.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -24,7 +24,7 @@ #include #include -#include +#include //#include #include "messageheader.h" #include "messagingservice.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_messaging/tsrc/dev/tmessagingtest/tmsg_changestatusiter1/src/tchangestatustestblocks.cpp --- a/serviceproviders/sapi_messaging/tsrc/dev/tmessagingtest/tmsg_changestatusiter1/src/tchangestatustestblocks.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_messaging/tsrc/dev/tmessagingtest/tmsg_changestatusiter1/src/tchangestatustestblocks.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -22,7 +22,7 @@ #include #include //#include -#include +#include #include #include #include diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_messaging/tsrc/dev/tmessagingtest/tmsg_deletemessageiter1/src/tdeletemessagetest.cpp --- a/serviceproviders/sapi_messaging/tsrc/dev/tmessagingtest/tmsg_deletemessageiter1/src/tdeletemessagetest.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_messaging/tsrc/dev/tmessagingtest/tmsg_deletemessageiter1/src/tdeletemessagetest.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -19,11 +19,11 @@ // INCLUDE FILES -#include +#include //#include //#include //#include -#include "TDeleteMessageTest.h" +#include "tdeletemessagetest.h" //#include diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_messaging/tsrc/dev/tmessagingtest/tmsg_deletemessageiter1/src/tdeletemessagetestblocks.cpp --- a/serviceproviders/sapi_messaging/tsrc/dev/tmessagingtest/tmsg_deletemessageiter1/src/tdeletemessagetestblocks.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_messaging/tsrc/dev/tmessagingtest/tmsg_deletemessageiter1/src/tdeletemessagetestblocks.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -22,13 +22,13 @@ #include #include //#include -#include +#include #include #include #include "messageheader.h" #include "messagingservice.h" ////#include -#include "TDeleteMessageTest.h" +#include "tdeletemessagetest.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_messaging/tsrc/dev/tmessagingtest/tmsg_getheaderlistiter1/src/get_headerblocks.cpp --- a/serviceproviders/sapi_messaging/tsrc/dev/tmessagingtest/tmsg_getheaderlistiter1/src/get_headerblocks.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_messaging/tsrc/dev/tmessagingtest/tmsg_getheaderlistiter1/src/get_headerblocks.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -21,7 +21,7 @@ // INCLUDE FILES #include #include -#include +#include #include "getheader.h" // EXTERNAL DATA STRUCTURES diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_messaging/tsrc/dev/tmessagingtest/tmsg_getheaderlistiter1/src/getheader.cpp --- a/serviceproviders/sapi_messaging/tsrc/dev/tmessagingtest/tmsg_getheaderlistiter1/src/getheader.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_messaging/tsrc/dev/tmessagingtest/tmsg_getheaderlistiter1/src/getheader.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -19,7 +19,7 @@ // INCLUDE FILES -#include +#include #include "getheader.h" // EXTERNAL DATA STRUCTURES diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_messaging/tsrc/dev/tmessagingtest/tmsg_getheaderlistiter1/src/tgetheaderlistmms1.cpp --- a/serviceproviders/sapi_messaging/tsrc/dev/tmessagingtest/tmsg_getheaderlistiter1/src/tgetheaderlistmms1.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_messaging/tsrc/dev/tmessagingtest/tmsg_getheaderlistiter1/src/tgetheaderlistmms1.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -20,7 +20,7 @@ #include ////#include #include "messagingservice.h" -#include +#include #include "getheader.h" #include #include "messageheader.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_messaging/tsrc/dev/tmessagingtest/tmsg_getheaderlistiter1/src/tgetheaderlistmms2.cpp --- a/serviceproviders/sapi_messaging/tsrc/dev/tmessagingtest/tmsg_getheaderlistiter1/src/tgetheaderlistmms2.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_messaging/tsrc/dev/tmessagingtest/tmsg_getheaderlistiter1/src/tgetheaderlistmms2.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -20,7 +20,7 @@ #include ////#include #include "messagingservice.h" -#include +#include #include "getheader.h" #include #include "messageheader.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_messaging/tsrc/dev/tmessagingtest/tmsg_getheaderlistiter1/src/tgetheaderlistmms3.cpp --- a/serviceproviders/sapi_messaging/tsrc/dev/tmessagingtest/tmsg_getheaderlistiter1/src/tgetheaderlistmms3.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_messaging/tsrc/dev/tmessagingtest/tmsg_getheaderlistiter1/src/tgetheaderlistmms3.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -20,7 +20,7 @@ #include ////#include #include "messagingservice.h" -#include +#include #include "getheader.h" #include //#include "messageheader.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_messaging/tsrc/dev/tmessagingtest/tmsg_getheaderlistiter1/src/tgetheaderlistsms1.cpp --- a/serviceproviders/sapi_messaging/tsrc/dev/tmessagingtest/tmsg_getheaderlistiter1/src/tgetheaderlistsms1.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_messaging/tsrc/dev/tmessagingtest/tmsg_getheaderlistiter1/src/tgetheaderlistsms1.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -20,7 +20,7 @@ #include ////#include #include "messagingservice.h" -#include +#include #include "getheader.h" #include #include "messageheader.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_messaging/tsrc/dev/tmessagingtest/tmsg_getheaderlistiter1/src/tgetheaderlistsms2.cpp --- a/serviceproviders/sapi_messaging/tsrc/dev/tmessagingtest/tmsg_getheaderlistiter1/src/tgetheaderlistsms2.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_messaging/tsrc/dev/tmessagingtest/tmsg_getheaderlistiter1/src/tgetheaderlistsms2.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -21,7 +21,7 @@ #include ////#include #include "messagingservice.h" -#include +#include #include "getheader.h" #include #include "messageheader.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_messaging/tsrc/dev/tmessagingtest/tmsg_getheaderlistiter1/src/tgetheaderlistsms3.cpp --- a/serviceproviders/sapi_messaging/tsrc/dev/tmessagingtest/tmsg_getheaderlistiter1/src/tgetheaderlistsms3.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_messaging/tsrc/dev/tmessagingtest/tmsg_getheaderlistiter1/src/tgetheaderlistsms3.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -21,7 +21,7 @@ #include ////#include #include "messagingservice.h" -#include +#include #include "getheader.h" #include #include "messageheader.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_messaging/tsrc/dev/tmessagingtest/tmsg_getheaderlistiter1/src/tgetheaderlistsms4.cpp --- a/serviceproviders/sapi_messaging/tsrc/dev/tmessagingtest/tmsg_getheaderlistiter1/src/tgetheaderlistsms4.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_messaging/tsrc/dev/tmessagingtest/tmsg_getheaderlistiter1/src/tgetheaderlistsms4.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -20,7 +20,7 @@ #include ////#include #include "messagingservice.h" -#include +#include #include "getheader.h" #include //#include "messageheader.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_messaging/tsrc/dev/tmessagingtest/tmsg_sendmessageiter1/src/send_messageblocks.cpp --- a/serviceproviders/sapi_messaging/tsrc/dev/tmessagingtest/tmsg_sendmessageiter1/src/send_messageblocks.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_messaging/tsrc/dev/tmessagingtest/tmsg_sendmessageiter1/src/send_messageblocks.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -21,7 +21,7 @@ // INCLUDE FILES #include #include -#include +#include #include "sendmessage.h" // EXTERNAL DATA STRUCTURES diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_messaging/tsrc/dev/tmessagingtest/tmsg_sendmessageiter1/src/sendmessage.cpp --- a/serviceproviders/sapi_messaging/tsrc/dev/tmessagingtest/tmsg_sendmessageiter1/src/sendmessage.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_messaging/tsrc/dev/tmessagingtest/tmsg_sendmessageiter1/src/sendmessage.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -19,7 +19,7 @@ // INCLUDE FILES -#include +#include #include "sendmessage.h" // EXTERNAL DATA STRUCTURES diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_messaging/tsrc/dev/tmessagingtest/tmsg_sendmessageiter1/src/sendmessage10.cpp --- a/serviceproviders/sapi_messaging/tsrc/dev/tmessagingtest/tmsg_sendmessageiter1/src/sendmessage10.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_messaging/tsrc/dev/tmessagingtest/tmsg_sendmessageiter1/src/sendmessage10.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -23,7 +23,7 @@ #include "messagingservice.h" #include "sendmessage.h" -#include +#include #ifdef MAIN #define sendmessage_test10 main diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_messaging/tsrc/dev/tmessagingtest/tmsg_sendmessageiter1/src/sendmessage4.cpp --- a/serviceproviders/sapi_messaging/tsrc/dev/tmessagingtest/tmsg_sendmessageiter1/src/sendmessage4.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_messaging/tsrc/dev/tmessagingtest/tmsg_sendmessageiter1/src/sendmessage4.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -21,7 +21,7 @@ #include #include -#include +#include #include "messagingservice.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_messaging/tsrc/dev/tmessagingtest/tmsg_sendmessageiter1/src/sendmessage5.cpp --- a/serviceproviders/sapi_messaging/tsrc/dev/tmessagingtest/tmsg_sendmessageiter1/src/sendmessage5.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_messaging/tsrc/dev/tmessagingtest/tmsg_sendmessageiter1/src/sendmessage5.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -22,7 +22,7 @@ #include #include "messagingservice.h" -#include +#include #include "sendmessage.h" #ifdef MAIN diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_messaging/tsrc/dev/tmessagingtest/tmsg_sendmessageiter1/src/sendmessage7.cpp --- a/serviceproviders/sapi_messaging/tsrc/dev/tmessagingtest/tmsg_sendmessageiter1/src/sendmessage7.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_messaging/tsrc/dev/tmessagingtest/tmsg_sendmessageiter1/src/sendmessage7.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -23,7 +23,7 @@ #include "messagingservice.h" #include "sendmessage.h" -#include +#include #ifdef MAIN #define sendmessage_test7 main diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_messaging/tsrc/dev/tmessagingtest/tmsg_sendmessageiter1/src/sendmessage8.cpp --- a/serviceproviders/sapi_messaging/tsrc/dev/tmessagingtest/tmsg_sendmessageiter1/src/sendmessage8.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_messaging/tsrc/dev/tmessagingtest/tmsg_sendmessageiter1/src/sendmessage8.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -23,7 +23,7 @@ #include "messagingservice.h" #include "sendmessage.h" -#include +#include #ifdef MAIN #define sendmessage_test8 main diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_messaging/tsrc/dev/tmessagingtest/tmsg_sendmessageiter1/src/sendmessage9.cpp --- a/serviceproviders/sapi_messaging/tsrc/dev/tmessagingtest/tmsg_sendmessageiter1/src/sendmessage9.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_messaging/tsrc/dev/tmessagingtest/tmsg_sendmessageiter1/src/sendmessage9.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -23,7 +23,7 @@ #include "messagingservice.h" #include "sendmessage.h" -#include +#include #ifdef MAIN #define sendmessage_test9 main diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_messaging/tsrc/testing/tmessagingtest/async_send_message/group/async_send_message.mmp --- a/serviceproviders/sapi_messaging/tsrc/testing/tmessagingtest/async_send_message/group/async_send_message.mmp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_messaging/tsrc/testing/tmessagingtest/async_send_message/group/async_send_message.mmp Tue Nov 24 08:56:33 2009 +0200 @@ -45,7 +45,7 @@ SOURCEPATH ../src SOURCE async_send_message.cpp -SOURCE async_send_messageBlocks.cpp +SOURCE async_send_messageblocks.cpp //RESOURCE resource_file //RESOURCE resource_file2 diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_messaging/tsrc/testing/tmessagingtest/async_send_message/inc/async.h --- a/serviceproviders/sapi_messaging/tsrc/testing/tmessagingtest/async_send_message/inc/async.h Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_messaging/tsrc/testing/tmessagingtest/async_send_message/inc/async.h Tue Nov 24 08:56:33 2009 +0200 @@ -17,9 +17,9 @@ #include #include -#include +#include //#include -#include +#include #include "messagingservice.h" #include "messageheader.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_messaging/tsrc/testing/tmessagingtest/async_send_message/src/async_send_message.cpp --- a/serviceproviders/sapi_messaging/tsrc/testing/tmessagingtest/async_send_message/src/async_send_message.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_messaging/tsrc/testing/tmessagingtest/async_send_message/src/async_send_message.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -19,7 +19,7 @@ // INCLUDE FILES -#include +#include #include "async_send_message.h" // EXTERNAL DATA STRUCTURES diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_messaging/tsrc/testing/tmessagingtest/async_send_message/src/async_send_messageblocks.cpp --- a/serviceproviders/sapi_messaging/tsrc/testing/tmessagingtest/async_send_message/src/async_send_messageblocks.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_messaging/tsrc/testing/tmessagingtest/async_send_message/src/async_send_messageblocks.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -21,10 +21,10 @@ // INCLUDE FILES #include #include -#include +#include #include "async_send_message.h" //#include -#include +#include #include "messagingservice.h" #include "messageheader.h" #include "async.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_messaging/tsrc/testing/tmessagingtest/change_status_message/group/change_status_message.mmp --- a/serviceproviders/sapi_messaging/tsrc/testing/tmessagingtest/change_status_message/group/change_status_message.mmp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_messaging/tsrc/testing/tmessagingtest/change_status_message/group/change_status_message.mmp Tue Nov 24 08:56:33 2009 +0200 @@ -44,7 +44,7 @@ SOURCEPATH ../src SOURCE change_status_message.cpp -SOURCE change_status_messageBlocks.cpp +SOURCE change_status_messageblocks.cpp //RESOURCE resource_file //RESOURCE resource_file2 diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_messaging/tsrc/testing/tmessagingtest/change_status_message/src/change_status_message.cpp --- a/serviceproviders/sapi_messaging/tsrc/testing/tmessagingtest/change_status_message/src/change_status_message.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_messaging/tsrc/testing/tmessagingtest/change_status_message/src/change_status_message.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -19,7 +19,7 @@ // INCLUDE FILES -#include +#include #include "change_status_message.h" // EXTERNAL DATA STRUCTURES diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_messaging/tsrc/testing/tmessagingtest/change_status_message/src/change_status_messageblocks.cpp --- a/serviceproviders/sapi_messaging/tsrc/testing/tmessagingtest/change_status_message/src/change_status_messageblocks.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_messaging/tsrc/testing/tmessagingtest/change_status_message/src/change_status_messageblocks.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -23,10 +23,10 @@ #include #include #include -#include +#include #include "change_status_message.h" //#include -#include +#include #include "messagingservice.h" #include "messageheader.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_messaging/tsrc/testing/tmessagingtest/delete_message/group/delete_message.mmp --- a/serviceproviders/sapi_messaging/tsrc/testing/tmessagingtest/delete_message/group/delete_message.mmp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_messaging/tsrc/testing/tmessagingtest/delete_message/group/delete_message.mmp Tue Nov 24 08:56:33 2009 +0200 @@ -43,7 +43,7 @@ SOURCEPATH ../src SOURCE delete_message.cpp -SOURCE delete_messageBlocks.cpp +SOURCE delete_messageblocks.cpp //RESOURCE resource_file //RESOURCE resource_file2 diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_messaging/tsrc/testing/tmessagingtest/delete_message/src/delete_message.cpp --- a/serviceproviders/sapi_messaging/tsrc/testing/tmessagingtest/delete_message/src/delete_message.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_messaging/tsrc/testing/tmessagingtest/delete_message/src/delete_message.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -19,7 +19,7 @@ // INCLUDE FILES -#include +#include #include "delete_message.h" // EXTERNAL DATA STRUCTURES diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_messaging/tsrc/testing/tmessagingtest/delete_message/src/delete_messageblocks.cpp --- a/serviceproviders/sapi_messaging/tsrc/testing/tmessagingtest/delete_message/src/delete_messageblocks.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_messaging/tsrc/testing/tmessagingtest/delete_message/src/delete_messageblocks.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -21,10 +21,10 @@ // INCLUDE FILES #include #include -#include +#include #include "delete_message.h" //#include -#include +#include #include "messagingservice.h" #include "messageheader.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_messaging/tsrc/testing/tmessagingtest/get_header_message/group/get_header_message.mmp --- a/serviceproviders/sapi_messaging/tsrc/testing/tmessagingtest/get_header_message/group/get_header_message.mmp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_messaging/tsrc/testing/tmessagingtest/get_header_message/group/get_header_message.mmp Tue Nov 24 08:56:33 2009 +0200 @@ -43,7 +43,7 @@ SOURCEPATH ../src SOURCE get_header_message.cpp -SOURCE get_header_messageBlocks.cpp +SOURCE get_header_messageblocks.cpp //RESOURCE resource_file //RESOURCE resource_file2 diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_messaging/tsrc/testing/tmessagingtest/get_header_message/src/get_header_message.cpp --- a/serviceproviders/sapi_messaging/tsrc/testing/tmessagingtest/get_header_message/src/get_header_message.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_messaging/tsrc/testing/tmessagingtest/get_header_message/src/get_header_message.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -19,7 +19,7 @@ // INCLUDE FILES -#include +#include #include "get_header_message.h" // EXTERNAL DATA STRUCTURES diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_messaging/tsrc/testing/tmessagingtest/get_header_message/src/get_header_messageblocks.cpp --- a/serviceproviders/sapi_messaging/tsrc/testing/tmessagingtest/get_header_message/src/get_header_messageblocks.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_messaging/tsrc/testing/tmessagingtest/get_header_message/src/get_header_messageblocks.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -22,9 +22,9 @@ #include #include #include -#include +#include //#include -#include +#include #include "messagingservice.h" #include "messageheader.h" #include "get_header_message.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_messaging/tsrc/testing/tmessagingtest/get_message_async/inc/async.h --- a/serviceproviders/sapi_messaging/tsrc/testing/tmessagingtest/get_message_async/inc/async.h Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_messaging/tsrc/testing/tmessagingtest/get_message_async/inc/async.h Tue Nov 24 08:56:33 2009 +0200 @@ -17,9 +17,9 @@ #include #include -#include +#include //#include -#include +#include #include "messagingservice.h" #include "messageheader.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_messaging/tsrc/testing/tmessagingtest/get_message_async/src/get_message_async.cpp --- a/serviceproviders/sapi_messaging/tsrc/testing/tmessagingtest/get_message_async/src/get_message_async.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_messaging/tsrc/testing/tmessagingtest/get_message_async/src/get_message_async.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -16,7 +16,7 @@ */ // INCLUDE FILES -#include +#include #include "get_message_async.h" #include diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_messaging/tsrc/testing/tmessagingtest/get_message_async/src/get_message_asyncBlocks.cpp --- a/serviceproviders/sapi_messaging/tsrc/testing/tmessagingtest/get_message_async/src/get_message_asyncBlocks.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_messaging/tsrc/testing/tmessagingtest/get_message_async/src/get_message_asyncBlocks.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -19,8 +19,8 @@ #include #include #include -#include -#include +#include +#include #include "get_message_async.h" #include "messagingservice.h" #include "messageheader.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_messaging/tsrc/testing/tmessagingtest/register_message/group/register_message.mmp --- a/serviceproviders/sapi_messaging/tsrc/testing/tmessagingtest/register_message/group/register_message.mmp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_messaging/tsrc/testing/tmessagingtest/register_message/group/register_message.mmp Tue Nov 24 08:56:33 2009 +0200 @@ -46,7 +46,7 @@ SOURCEPATH ../src SOURCE register_message.cpp -SOURCE register_messageBlocks.cpp +SOURCE register_messageblocks.cpp //RESOURCE resource_file //RESOURCE resource_file2 diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_messaging/tsrc/testing/tmessagingtest/register_message/inc/async.h --- a/serviceproviders/sapi_messaging/tsrc/testing/tmessagingtest/register_message/inc/async.h Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_messaging/tsrc/testing/tmessagingtest/register_message/inc/async.h Tue Nov 24 08:56:33 2009 +0200 @@ -17,9 +17,9 @@ #include #include -#include +#include //#include -#include +#include #include "messagingservice.h" #include "messageheader.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_messaging/tsrc/testing/tmessagingtest/register_message/src/register_message.cpp --- a/serviceproviders/sapi_messaging/tsrc/testing/tmessagingtest/register_message/src/register_message.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_messaging/tsrc/testing/tmessagingtest/register_message/src/register_message.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -19,7 +19,7 @@ // INCLUDE FILES -#include +#include #include "register_message.h" // EXTERNAL DATA STRUCTURES diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_messaging/tsrc/testing/tmessagingtest/register_message/src/register_messageblocks.cpp --- a/serviceproviders/sapi_messaging/tsrc/testing/tmessagingtest/register_message/src/register_messageblocks.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_messaging/tsrc/testing/tmessagingtest/register_message/src/register_messageblocks.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -21,10 +21,10 @@ // INCLUDE FILES #include #include -#include +#include #include "register_message.h" //#include -#include +#include #include "messagingservice.h" #include "messageheader.h" #include "async.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_messaging/tsrc/testing/tmessagingtest/send_message/group/send_message.mmp --- a/serviceproviders/sapi_messaging/tsrc/testing/tmessagingtest/send_message/group/send_message.mmp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_messaging/tsrc/testing/tmessagingtest/send_message/group/send_message.mmp Tue Nov 24 08:56:33 2009 +0200 @@ -50,7 +50,7 @@ SOURCEPATH ../src SOURCE send_message.cpp -SOURCE send_messageBlocks.cpp +SOURCE send_messageblocks.cpp //RESOURCE resource_file //RESOURCE resource_file2 diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_messaging/tsrc/testing/tmessagingtest/send_message/src/send_message.cpp --- a/serviceproviders/sapi_messaging/tsrc/testing/tmessagingtest/send_message/src/send_message.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_messaging/tsrc/testing/tmessagingtest/send_message/src/send_message.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -19,7 +19,7 @@ // INCLUDE FILES -#include +#include #include "send_message.h" // EXTERNAL DATA STRUCTURES diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_messaging/tsrc/testing/tmessagingtest/send_message/src/send_messageblocks.cpp --- a/serviceproviders/sapi_messaging/tsrc/testing/tmessagingtest/send_message/src/send_messageblocks.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_messaging/tsrc/testing/tmessagingtest/send_message/src/send_messageblocks.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -22,9 +22,9 @@ #include #include #include -#include +#include //#include -#include +#include #include "messagingservice.h" #include "messageheader.h" #include "send_message.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_sensor/data/2000CFB6.rss --- a/serviceproviders/sapi_sensor/data/2000CFB6.rss Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_sensor/data/2000CFB6.rss Tue Nov 24 08:56:33 2009 +0200 @@ -15,10 +15,10 @@ * */ -#include -#include +#include +#include -#include "ecom/RegistryInfoV2.rh" +#include "ecom/registryinfov2.rh" RESOURCE REGISTRY_INFO theInfo { diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_sensor/inc/sensorcallback.h --- a/serviceproviders/sapi_sensor/inc/sensorcallback.h Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_sensor/inc/sensorcallback.h Tue Nov 24 08:56:33 2009 +0200 @@ -20,8 +20,8 @@ #define CSENSORCALLBACK_H -#include -#include +#include +#include #include #include #include diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_sensor/inc/sensorinterface.h --- a/serviceproviders/sapi_sensor/inc/sensorinterface.h Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_sensor/inc/sensorinterface.h Tue Nov 24 08:56:33 2009 +0200 @@ -18,7 +18,7 @@ #ifndef C_CSENSORINTERFACE_H #define C_CSENSORINTERFACE_H -#include +#include #include // User Includes diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_sensor/inc/sensorservicehandler.h --- a/serviceproviders/sapi_sensor/inc/sensorservicehandler.h Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_sensor/inc/sensorservicehandler.h Tue Nov 24 08:56:33 2009 +0200 @@ -18,7 +18,7 @@ #ifndef C_CSENSORSERVICEHANDLER_H #define C_CSENSORSERVICEHANDLER_H -#include +#include /** * CsensorProvider - inherits the CLiwServiceIfBase to Load the sensor diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_sensor/src/sensorinterface.cpp --- a/serviceproviders/sapi_sensor/src/sensorinterface.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_sensor/src/sensorinterface.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -16,9 +16,9 @@ */ //system include -#include -#include -#include +#include +#include +#include #include #include diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_sensor/src/sensorprovider.cpp --- a/serviceproviders/sapi_sensor/src/sensorprovider.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_sensor/src/sensorprovider.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -16,7 +16,7 @@ */ -#include +#include #include "sensorservicehandler.h" #include "sensorinterface.h" #include "serviceerrno.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_sensor/tsrc/dev/sensrprovidertest/inc/sensrprovidertest.h --- a/serviceproviders/sapi_sensor/tsrc/dev/sensrprovidertest/inc/sensrprovidertest.h Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_sensor/tsrc/dev/sensrprovidertest/inc/sensrprovidertest.h Tue Nov 24 08:56:33 2009 +0200 @@ -31,10 +31,10 @@ #include #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include /*#include "sensorservice.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_sensor/tsrc/dev/sensrprovidertest/src/sensrprovidertest.cpp --- a/serviceproviders/sapi_sensor/tsrc/dev/sensrprovidertest/src/sensrprovidertest.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_sensor/tsrc/dev/sensrprovidertest/src/sensrprovidertest.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -19,9 +19,9 @@ // INCLUDE FILES -#include -#include -#include +#include +#include +#include #include "sensrprovidertest.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_sensor/tsrc/dev/sensrservicetest/src/sensrservicetest.cpp --- a/serviceproviders/sapi_sensor/tsrc/dev/sensrservicetest/src/sensrservicetest.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_sensor/tsrc/dev/sensrservicetest/src/sensrservicetest.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -21,7 +21,7 @@ // INCLUDE FILES #include "sensrservicetest.h" -#include +#include diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_sensor/tsrc/dev/sensrservicetest/src/sensrservicetestblocks.cpp --- a/serviceproviders/sapi_sensor/tsrc/dev/sensrservicetest/src/sensrservicetestblocks.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_sensor/tsrc/dev/sensrservicetest/src/sensrservicetestblocks.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -18,7 +18,7 @@ #include #include -#include +#include #include //#include diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_sensor/tsrc/dev/tsnsrprovidertest/inc/tsnsrprovidertest.h --- a/serviceproviders/sapi_sensor/tsrc/dev/tsnsrprovidertest/inc/tsnsrprovidertest.h Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_sensor/tsrc/dev/tsnsrprovidertest/inc/tsnsrprovidertest.h Tue Nov 24 08:56:33 2009 +0200 @@ -23,7 +23,7 @@ #include #include #include -#include +#include #include diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_sensor/tsrc/dev/tsnsrprovidertest/inc/tsnsrprovidertestobserver.h --- a/serviceproviders/sapi_sensor/tsrc/dev/tsnsrprovidertest/inc/tsnsrprovidertestobserver.h Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_sensor/tsrc/dev/tsnsrprovidertest/inc/tsnsrprovidertestobserver.h Tue Nov 24 08:56:33 2009 +0200 @@ -15,7 +15,7 @@ * */ -#include +#include #include "e32base.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_sensor/tsrc/dev/tsnsrprovidertest/inc/txmlconvertor.h --- a/serviceproviders/sapi_sensor/tsrc/dev/tsnsrprovidertest/inc/txmlconvertor.h Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_sensor/tsrc/dev/tsnsrprovidertest/inc/txmlconvertor.h Tue Nov 24 08:56:33 2009 +0200 @@ -23,7 +23,7 @@ // INCLUDES -#include +#include #include diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_sensor/tsrc/dev/tsnsrprovidertest/src/tsnsrprovidertest.cpp --- a/serviceproviders/sapi_sensor/tsrc/dev/tsnsrprovidertest/src/tsnsrprovidertest.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_sensor/tsrc/dev/tsnsrprovidertest/src/tsnsrprovidertest.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -19,7 +19,7 @@ // INCLUDE FILES -#include +#include #include #include #include "tsnsrprovidertest.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_sensor/tsrc/dev/tsnsrprovidertest/src/tsnsrprovidertest_testblocks.cpp --- a/serviceproviders/sapi_sensor/tsrc/dev/tsnsrprovidertest/src/tsnsrprovidertest_testblocks.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_sensor/tsrc/dev/tsnsrprovidertest/src/tsnsrprovidertest_testblocks.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -21,9 +21,9 @@ // INCLUDE FILES #include #include -#include -#include -#include +#include +#include +#include #include "tsnsrprovidertest.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_sensor/tsrc/dev/tsnsrprovidertest/src/txmlconvertor.cpp --- a/serviceproviders/sapi_sensor/tsrc/dev/tsnsrprovidertest/src/txmlconvertor.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_sensor/tsrc/dev/tsnsrprovidertest/src/txmlconvertor.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -21,12 +21,12 @@ // INCLUDE FILES #include -#include -#include +#include +#include #include #include #include -#include +#include #include #include "txmlconvertor.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_sensor/tsrc/testing/tsensorservice_test/src/tsensorservice_test.cpp --- a/serviceproviders/sapi_sensor/tsrc/testing/tsensorservice_test/src/tsensorservice_test.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_sensor/tsrc/testing/tsensorservice_test/src/tsensorservice_test.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -19,7 +19,7 @@ // INCLUDE FILES -#include +#include #include "tsensorservice_test.h" #include diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_sensor/tsrc/testing/tsensorservice_test/src/tsensorservice_testblocks.cpp --- a/serviceproviders/sapi_sensor/tsrc/testing/tsensorservice_test/src/tsensorservice_testblocks.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_sensor/tsrc/testing/tsensorservice_test/src/tsensorservice_testblocks.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -21,7 +21,7 @@ // INCLUDE FILES #include #include -#include +#include #include #include #include diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_serviceregistry/data/102833a9.rss --- a/serviceproviders/sapi_serviceregistry/data/102833a9.rss Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_serviceregistry/data/102833a9.rss Tue Nov 24 08:56:33 2009 +0200 @@ -17,7 +17,7 @@ #include -#include +#include #include // Declares the interface implementation provided: a custom resolver diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_serviceregistry/inc/serviceinterface.h --- a/serviceproviders/sapi_serviceregistry/inc/serviceinterface.h Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_serviceregistry/inc/serviceinterface.h Tue Nov 24 08:56:33 2009 +0200 @@ -20,9 +20,9 @@ #define SERVICEINTERFACE_H #include -#include -#include -#include +#include +#include +#include // CLASS DECLARATION diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_serviceregistry/inc/serviceregistryiterator.h --- a/serviceproviders/sapi_serviceregistry/inc/serviceregistryiterator.h Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_serviceregistry/inc/serviceregistryiterator.h Tue Nov 24 08:56:33 2009 +0200 @@ -21,7 +21,7 @@ #include #include -#include +#include /** * This class implements the abstract methods of CLiwIterable diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_serviceregistry/src/serviceregistryservicehandler.cpp --- a/serviceproviders/sapi_serviceregistry/src/serviceregistryservicehandler.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_serviceregistry/src/serviceregistryservicehandler.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -17,7 +17,7 @@ */ -#include +#include #include "serviceregistryservicehandler.h" // Including a copy of common constants for this compilation unit #include "serviceregistryservice.hrh" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_serviceregistry/tsrc/dev/tserviceregistryprovidertest/group/tserviceregistrytest.mmp --- a/serviceproviders/sapi_serviceregistry/tsrc/dev/tserviceregistryprovidertest/group/tserviceregistrytest.mmp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_serviceregistry/tsrc/dev/tserviceregistryprovidertest/group/tserviceregistrytest.mmp Tue Nov 24 08:56:33 2009 +0200 @@ -40,7 +40,7 @@ SYSTEMINCLUDE /epoc32/include SYSTEMINCLUDE /epoc32/include/internal -SYSTEMINCLUDE /epoc32/include/ECom +SYSTEMINCLUDE /epoc32/include/ecom SYSTEMINCLUDE /epoc32/include/applications SYSTEMINCLUDE /epoc32/include/internal diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_serviceregistry/tsrc/dev/tserviceregistryprovidertest/inc/tserviceregistrytest.h --- a/serviceproviders/sapi_serviceregistry/tsrc/dev/tserviceregistryprovidertest/inc/tserviceregistrytest.h Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_serviceregistry/tsrc/dev/tserviceregistryprovidertest/inc/tserviceregistrytest.h Tue Nov 24 08:56:33 2009 +0200 @@ -25,9 +25,9 @@ #include #include -#include -#include -#include +#include +#include +#include // CONSTANTS //const ?type ?constant_var = ?constant; diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_serviceregistry/tsrc/dev/tserviceregistryprovidertest/src/tserviceregistrytest.cpp --- a/serviceproviders/sapi_serviceregistry/tsrc/dev/tserviceregistryprovidertest/src/tserviceregistrytest.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_serviceregistry/tsrc/dev/tserviceregistryprovidertest/src/tserviceregistrytest.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -18,7 +18,7 @@ // INCLUDE FILES -#include +#include #include "tserviceregistrytest.h" #include diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_serviceregistry/tsrc/dev/tserviceregistryprovidertest/src/tserviceregistrytestblocks.cpp --- a/serviceproviders/sapi_serviceregistry/tsrc/dev/tserviceregistryprovidertest/src/tserviceregistrytestblocks.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_serviceregistry/tsrc/dev/tserviceregistryprovidertest/src/tserviceregistrytestblocks.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -20,7 +20,7 @@ // [INCLUDE FILES] - do not remove #include #include -#include +#include #include #include "tserviceregistrytest.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_sysinfo/src/sysinfointerface.cpp --- a/serviceproviders/sapi_sysinfo/src/sysinfointerface.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_sysinfo/src/sysinfointerface.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -19,7 +19,7 @@ #include #include #include -#include +#include #include #include "errormsgs.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_sysinfo/sysinfoservice/inc/sysinfo.h --- a/serviceproviders/sapi_sysinfo/sysinfoservice/inc/sysinfo.h Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_sysinfo/sysinfoservice/inc/sysinfo.h Tue Nov 24 08:56:33 2009 +0200 @@ -19,7 +19,7 @@ #ifndef __SYSINFO_H__ #define __SYSINFO_H__ -#include +#include #include #include #include diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_sysinfo/sysinfoservice/src/activerequests.cpp --- a/serviceproviders/sapi_sysinfo/sysinfoservice/src/activerequests.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_sysinfo/sysinfoservice/src/activerequests.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -18,22 +18,22 @@ #include #include -#include -#include -#include +#include +#include +#include #include -#include +#include #include #include -#include +#include #include -#include +#include #include "activerequests.h" #include "sysinfoservice.h" #include "entitykeys.h" -#include "SysInfoUtils.h" +#include "sysinfoutils.h" using namespace SysInfo; _LIT(KDriveSeperator,":\\"); diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_sysinfo/sysinfoservice/src/deviceinfo.cpp --- a/serviceproviders/sapi_sysinfo/sysinfoservice/src/deviceinfo.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_sysinfo/sysinfoservice/src/deviceinfo.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -16,10 +16,10 @@ */ #include -#include +#include #include "sysinfoservice.h" -#include "SysInfoUtils.h" +#include "sysinfoutils.h" #include "entitykeys.h" #include "deviceinfo.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_sysinfo/sysinfoservice/src/sysinfo.cpp --- a/serviceproviders/sapi_sysinfo/sysinfoservice/src/sysinfo.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_sysinfo/sysinfoservice/src/sysinfo.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -20,10 +20,10 @@ #include #include #include -#include +#include #include "sysinfo.h" -#include "SysInfoUtils.h" +#include "sysinfoutils.h" // -------------------------------------------------------------------- // CSysData::CSysData() diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_sysinfo/sysinfoservice/src/sysinfoservice.cpp --- a/serviceproviders/sapi_sysinfo/sysinfoservice/src/sysinfoservice.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_sysinfo/sysinfoservice/src/sysinfoservice.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -16,27 +16,27 @@ */ -#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 @@ -47,7 +47,7 @@ #include "sysinfoservice.h" #include "sysinfo.h" -#include "SysInfoUtils.h" +#include "sysinfoutils.h" #include "entitykeys.h" #include "activerequests.h" #include "deviceinfo.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_sysinfo/sysinfoservice/src/sysinfoutils.cpp --- a/serviceproviders/sapi_sysinfo/sysinfoservice/src/sysinfoutils.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_sysinfo/sysinfoservice/src/sysinfoutils.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -18,10 +18,10 @@ #include #include -#include +#include #include -#include "SysInfoUtils.h" +#include "sysinfoutils.h" // --------------------------------------------------------------------------- // RPhoneInstance::Connect diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_sysinfo/sysinfoservice/src/sysnetworkrequest.cpp --- a/serviceproviders/sapi_sysinfo/sysinfoservice/src/sysnetworkrequest.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_sysinfo/sysinfoservice/src/sysnetworkrequest.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -17,13 +17,13 @@ #include #include -#include +#include #include "sysinfoservice.h" #include "sysnetworkrequest.h" #include "entitykeys.h" #include "sysrequest.h" -#include "SysInfoUtils.h" +#include "sysinfoutils.h" // -------------------------------------------------------------------- // CNetwork::CNetwork() diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_sysinfo/tsrc/dev/providertests/manual/tsysinfoprovidergeneraltests/src/taccessorylist.cpp --- a/serviceproviders/sapi_sysinfo/tsrc/dev/providertests/manual/tsysinfoprovidergeneraltests/src/taccessorylist.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_sysinfo/tsrc/dev/providertests/manual/tsysinfoprovidergeneraltests/src/taccessorylist.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -15,8 +15,8 @@ * */ -#include -#include +#include +#include #include "tsysinfoprovidergeneraltests.h" #include "sysinfointerface.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_sysinfo/tsrc/dev/providertests/manual/tsysinfoprovidergeneraltests/src/tconnectionlist.cpp --- a/serviceproviders/sapi_sysinfo/tsrc/dev/providertests/manual/tsysinfoprovidergeneraltests/src/tconnectionlist.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_sysinfo/tsrc/dev/providertests/manual/tsysinfoprovidergeneraltests/src/tconnectionlist.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -15,8 +15,8 @@ * */ -#include -#include +#include +#include #include "tsysinfoprovidergeneraltests.h" #include "sysinfointerface.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_sysinfo/tsrc/dev/providertests/manual/tsysinfoprovidergeneraltests/src/tconnectionnotify.cpp --- a/serviceproviders/sapi_sysinfo/tsrc/dev/providertests/manual/tsysinfoprovidergeneraltests/src/tconnectionnotify.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_sysinfo/tsrc/dev/providertests/manual/tsysinfoprovidergeneraltests/src/tconnectionnotify.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -15,8 +15,8 @@ * */ -#include -#include +#include +#include #include"tsysinfoprovidergeneraltests.h" #include "sysinfointerface.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_sysinfo/tsrc/dev/providertests/manual/tsysinfoprovidergeneraltests/src/tcriticalmemnoti.cpp --- a/serviceproviders/sapi_sysinfo/tsrc/dev/providertests/manual/tsysinfoprovidergeneraltests/src/tcriticalmemnoti.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_sysinfo/tsrc/dev/providertests/manual/tsysinfoprovidergeneraltests/src/tcriticalmemnoti.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -17,10 +17,10 @@ #include -#include +#include #include "tsysinfoprovidergeneraltests.h" -#include "Tcriticalmemnoti.h" +#include "tcriticalmemnoti.h" #include "watchtimer.h" #include "entitykeys.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_sysinfo/tsrc/dev/providertests/manual/tsysinfoprovidergeneraltests/src/tmemnotifier.cpp --- a/serviceproviders/sapi_sysinfo/tsrc/dev/providertests/manual/tsysinfoprovidergeneraltests/src/tmemnotifier.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_sysinfo/tsrc/dev/providertests/manual/tsysinfoprovidergeneraltests/src/tmemnotifier.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -17,7 +17,7 @@ #include -#include +#include #include "tsysinfoprovidergeneraltests.h" #include "tmemnotifier.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_sysinfo/tsrc/dev/providertests/manual/tsysinfoprovidergeneraltests/src/tsysinfoprovidergeneraltests.cpp --- a/serviceproviders/sapi_sysinfo/tsrc/dev/providertests/manual/tsysinfoprovidergeneraltests/src/tsysinfoprovidergeneraltests.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_sysinfo/tsrc/dev/providertests/manual/tsysinfoprovidergeneraltests/src/tsysinfoprovidergeneraltests.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -19,7 +19,7 @@ // INCLUDE FILES -#include +#include #include "tsysinfoprovidergeneraltests.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_sysinfo/tsrc/dev/providertests/manual/tsysinfoprovidergeneraltests/src/tsysinfoprovidergeneraltestsblocks.cpp --- a/serviceproviders/sapi_sysinfo/tsrc/dev/providertests/manual/tsysinfoprovidergeneraltests/src/tsysinfoprovidergeneraltestsblocks.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_sysinfo/tsrc/dev/providertests/manual/tsysinfoprovidergeneraltests/src/tsysinfoprovidergeneraltestsblocks.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -21,15 +21,15 @@ // INCLUDE FILES #include #include -#include +#include #include -#include -#include +#include +#include #include "tsysinfoprovidergeneraltests.h" #include "tuseractivitynotifier.h" -#include "Tmemnotifier.h" -#include "Tcriticalmemnoti.h" +#include "tmemnotifier.h" +#include "tcriticalmemnoti.h" #include "sysinfoservice.h" #include "sysinfointerface.h" #include"entitykeys.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_sysinfo/tsrc/dev/providertests/manual/tsysinfoprovidergeneraltests/src/tuseractivitynotifier.cpp --- a/serviceproviders/sapi_sysinfo/tsrc/dev/providertests/manual/tsysinfoprovidergeneraltests/src/tuseractivitynotifier.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_sysinfo/tsrc/dev/providertests/manual/tsysinfoprovidergeneraltests/src/tuseractivitynotifier.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -17,7 +17,7 @@ #include -#include +#include #include "tsysinfoprovidergeneraltests.h" #include "tuseractivitynotifier.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_sysinfo/tsrc/dev/providertests/manual/tsysinfoprovidergeneraltests/src/tvibra.cpp --- a/serviceproviders/sapi_sysinfo/tsrc/dev/providertests/manual/tsysinfoprovidergeneraltests/src/tvibra.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_sysinfo/tsrc/dev/providertests/manual/tsysinfoprovidergeneraltests/src/tvibra.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -15,8 +15,8 @@ * */ -#include -#include +#include +#include #include "sysinfointerface.h" #include"entitykeys.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_sysinfo/tsrc/dev/providertests/manual/tsysinfoprovidernetworktests/inc/tsignalstrengthasyn.h --- a/serviceproviders/sapi_sysinfo/tsrc/dev/providertests/manual/tsysinfoprovidernetworktests/inc/tsignalstrengthasyn.h Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_sysinfo/tsrc/dev/providertests/manual/tsysinfoprovidernetworktests/inc/tsignalstrengthasyn.h Tue Nov 24 08:56:33 2009 +0200 @@ -19,7 +19,7 @@ #ifndef __CTSIGSTRENGTHASYNC_H__ #define __CTSIGSTRENGTHASYNC_H__ -#include +#include #include "watchtimer.h" #include "sysinfoservice.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_sysinfo/tsrc/dev/providertests/manual/tsysinfoprovidernetworktests/src/tcurrentnetworknotify.cpp --- a/serviceproviders/sapi_sysinfo/tsrc/dev/providertests/manual/tsysinfoprovidernetworktests/src/tcurrentnetworknotify.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_sysinfo/tsrc/dev/providertests/manual/tsysinfoprovidernetworktests/src/tcurrentnetworknotify.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -17,8 +17,8 @@ -#include -#include +#include +#include #include"tsysinfoprovidernetworktests.h" #include "sysinfointerface.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_sysinfo/tsrc/dev/providertests/manual/tsysinfoprovidernetworktests/src/thomenetworkasync.cpp --- a/serviceproviders/sapi_sysinfo/tsrc/dev/providertests/manual/tsysinfoprovidernetworktests/src/thomenetworkasync.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_sysinfo/tsrc/dev/providertests/manual/tsysinfoprovidernetworktests/src/thomenetworkasync.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -17,8 +17,8 @@ -#include -#include +#include +#include #include"tsysinfoprovidernetworktests.h" #include "sysinfointerface.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_sysinfo/tsrc/dev/providertests/manual/tsysinfoprovidernetworktests/src/tsignalstrengthasyn.cpp --- a/serviceproviders/sapi_sysinfo/tsrc/dev/providertests/manual/tsysinfoprovidernetworktests/src/tsignalstrengthasyn.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_sysinfo/tsrc/dev/providertests/manual/tsysinfoprovidernetworktests/src/tsignalstrengthasyn.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -17,8 +17,8 @@ -#include -#include +#include +#include #include"tsysinfoprovidernetworktests.h" #include "sysinfointerface.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_sysinfo/tsrc/dev/providertests/manual/tsysinfoprovidernetworktests/src/tsignalstrengthnotify.cpp --- a/serviceproviders/sapi_sysinfo/tsrc/dev/providertests/manual/tsysinfoprovidernetworktests/src/tsignalstrengthnotify.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_sysinfo/tsrc/dev/providertests/manual/tsysinfoprovidernetworktests/src/tsignalstrengthnotify.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -17,8 +17,8 @@ -#include -#include +#include +#include #include"tsysinfoprovidernetworktests.h" #include "sysinfointerface.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_sysinfo/tsrc/dev/providertests/manual/tsysinfoprovidernetworktests/src/tsysinfoprovidernetworktests.cpp --- a/serviceproviders/sapi_sysinfo/tsrc/dev/providertests/manual/tsysinfoprovidernetworktests/src/tsysinfoprovidernetworktests.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_sysinfo/tsrc/dev/providertests/manual/tsysinfoprovidernetworktests/src/tsysinfoprovidernetworktests.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -19,7 +19,7 @@ // INCLUDE FILES -#include +#include #include "tsysinfoprovidernetworktests.h" // ============================ MEMBER FUNCTIONS =============================== diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_sysinfo/tsrc/dev/providertests/manual/tsysinfoprovidernetworktests/src/tsysinfoprovidernetworktestsblocks.cpp --- a/serviceproviders/sapi_sysinfo/tsrc/dev/providertests/manual/tsysinfoprovidernetworktests/src/tsysinfoprovidernetworktestsblocks.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_sysinfo/tsrc/dev/providertests/manual/tsysinfoprovidernetworktests/src/tsysinfoprovidernetworktestsblocks.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -21,10 +21,10 @@ // INCLUDE FILES #include #include -#include +#include #include -#include -#include +#include +#include #include "../../../inc/serviceerrno.h" #include "tsysinfoprovidernetworktests.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_sysinfo/tsrc/dev/providertests/tsysinfoprovidernegativetests/group/tsysinfoprovidernegativetests.mmp --- a/serviceproviders/sapi_sysinfo/tsrc/dev/providertests/tsysinfoprovidernegativetests/group/tsysinfoprovidernegativetests.mmp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_sysinfo/tsrc/dev/providertests/tsysinfoprovidernegativetests/group/tsysinfoprovidernegativetests.mmp Tue Nov 24 08:56:33 2009 +0200 @@ -49,7 +49,7 @@ SOURCEPATH ../src SOURCE tsysinfoprovidertests.cpp -SOURCE tsysinfoprovidertestsBlocks.cpp +SOURCE tsysinfoprovidertestsblocks.cpp SOURCE tuseractivitynotifier.cpp SOURCE watchtimer.cpp SOURCE tvibra.cpp diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_sysinfo/tsrc/dev/providertests/tsysinfoprovidernegativetests/src/tactiveconnections.cpp --- a/serviceproviders/sapi_sysinfo/tsrc/dev/providertests/tsysinfoprovidernegativetests/src/tactiveconnections.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_sysinfo/tsrc/dev/providertests/tsysinfoprovidernegativetests/src/tactiveconnections.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -14,8 +14,8 @@ * Description: * */ -#include -#include +#include +#include #include"tsysinfoprovidertests.h" #include "sysinfointerface.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_sysinfo/tsrc/dev/providertests/tsysinfoprovidernegativetests/src/tactiveconnectionsreqcancel.cpp --- a/serviceproviders/sapi_sysinfo/tsrc/dev/providertests/tsysinfoprovidernegativetests/src/tactiveconnectionsreqcancel.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_sysinfo/tsrc/dev/providertests/tsysinfoprovidernegativetests/src/tactiveconnectionsreqcancel.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -15,8 +15,8 @@ * */ -#include -#include +#include +#include #include"tsysinfoprovidertests.h" #include "sysinfointerface.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_sysinfo/tsrc/dev/providertests/tsysinfoprovidernegativetests/src/tsysinfoprovidertests.cpp --- a/serviceproviders/sapi_sysinfo/tsrc/dev/providertests/tsysinfoprovidernegativetests/src/tsysinfoprovidertests.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_sysinfo/tsrc/dev/providertests/tsysinfoprovidernegativetests/src/tsysinfoprovidertests.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -19,7 +19,7 @@ // INCLUDE FILES -#include +#include #include "tsysinfoprovidertests.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_sysinfo/tsrc/dev/providertests/tsysinfoprovidernegativetests/src/tsysinfoprovidertestsblocks.cpp --- a/serviceproviders/sapi_sysinfo/tsrc/dev/providertests/tsysinfoprovidernegativetests/src/tsysinfoprovidertestsblocks.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_sysinfo/tsrc/dev/providertests/tsysinfoprovidernegativetests/src/tsysinfoprovidertestsblocks.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -21,12 +21,12 @@ // INCLUDE FILES #include #include -#include +#include #include #include #include -#include -#include +#include +#include #include "tsysinfoprovidertests.h" #include "entitykeys.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_sysinfo/tsrc/dev/providertests/tsysinfoprovidernegativetests/src/tuseractivitynotifier.cpp --- a/serviceproviders/sapi_sysinfo/tsrc/dev/providertests/tsysinfoprovidernegativetests/src/tuseractivitynotifier.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_sysinfo/tsrc/dev/providertests/tsysinfoprovidernegativetests/src/tuseractivitynotifier.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -15,8 +15,8 @@ * */ -#include -#include +#include +#include #include"tsysinfoprovidertests.h" #include "sysinfointerface.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_sysinfo/tsrc/dev/providertests/tsysinfoprovidernegativetests/src/tvibra.cpp --- a/serviceproviders/sapi_sysinfo/tsrc/dev/providertests/tsysinfoprovidernegativetests/src/tvibra.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_sysinfo/tsrc/dev/providertests/tsysinfoprovidernegativetests/src/tvibra.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -15,8 +15,8 @@ * */ -#include -#include +#include +#include #include"tsysinfoprovidertests.h" #include"watchtimer.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_sysinfo/tsrc/dev/providertests/tsysinfoprovidernegativetests/src/tvibranotify.cpp --- a/serviceproviders/sapi_sysinfo/tsrc/dev/providertests/tsysinfoprovidernegativetests/src/tvibranotify.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_sysinfo/tsrc/dev/providertests/tsysinfoprovidernegativetests/src/tvibranotify.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -15,8 +15,8 @@ * */ -#include -#include +#include +#include #include"tsysinfoprovidertests.h" #include"watchtimer.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_sysinfo/tsrc/dev/providertests/tsysinfoprovidernegativetests/src/tvibranotifyreqcancel.cpp --- a/serviceproviders/sapi_sysinfo/tsrc/dev/providertests/tsysinfoprovidernegativetests/src/tvibranotifyreqcancel.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_sysinfo/tsrc/dev/providertests/tsysinfoprovidernegativetests/src/tvibranotifyreqcancel.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -15,8 +15,8 @@ * */ -#include -#include +#include +#include #include "sysinfointerface.h" #include"entitykeys.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_sysinfo/tsrc/dev/providertests/tsysinfoprovidertests/group/tsysinfoprovidertests.mmp --- a/serviceproviders/sapi_sysinfo/tsrc/dev/providertests/tsysinfoprovidertests/group/tsysinfoprovidertests.mmp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_sysinfo/tsrc/dev/providertests/tsysinfoprovidertests/group/tsysinfoprovidertests.mmp Tue Nov 24 08:56:33 2009 +0200 @@ -49,7 +49,7 @@ SOURCEPATH ../src SOURCE tsysinfoprovidertests.cpp -SOURCE tsysinfoprovidertestsBlocks.cpp +SOURCE tsysinfoprovidertestsblocks.cpp SOURCE tuseractivitynotifier.cpp SOURCE watchtimer.cpp SOURCE tautolocknotifier.cpp diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_sysinfo/tsrc/dev/providertests/tsysinfoprovidertests/src/tactiveconnections.cpp --- a/serviceproviders/sapi_sysinfo/tsrc/dev/providertests/tsysinfoprovidertests/src/tactiveconnections.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_sysinfo/tsrc/dev/providertests/tsysinfoprovidertests/src/tactiveconnections.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -15,8 +15,8 @@ * */ -#include -#include +#include +#include #include"tsysinfoprovidertests.h" #include "sysinfointerface.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_sysinfo/tsrc/dev/providertests/tsysinfoprovidertests/src/tactiveconnectionsreqcancel.cpp --- a/serviceproviders/sapi_sysinfo/tsrc/dev/providertests/tsysinfoprovidertests/src/tactiveconnectionsreqcancel.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_sysinfo/tsrc/dev/providertests/tsysinfoprovidertests/src/tactiveconnectionsreqcancel.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -15,8 +15,8 @@ * */ -#include -#include +#include +#include #include"tsysinfoprovidertests.h" #include "sysinfointerface.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_sysinfo/tsrc/dev/providertests/tsysinfoprovidertests/src/tautolocknotifier.cpp --- a/serviceproviders/sapi_sysinfo/tsrc/dev/providertests/tsysinfoprovidertests/src/tautolocknotifier.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_sysinfo/tsrc/dev/providertests/tsysinfoprovidertests/src/tautolocknotifier.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -18,10 +18,10 @@ #include -#include +#include #include "tsysinfoprovidertests.h" -#include "Tautolocknotifier.h" +#include "tautolocknotifier.h" #include "watchtimer.h" #include "entitykeys.h" #include "sysinfoaiwparams.hrh" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_sysinfo/tsrc/dev/providertests/tsysinfoprovidertests/src/tbluetoothnotify.cpp --- a/serviceproviders/sapi_sysinfo/tsrc/dev/providertests/tsysinfoprovidertests/src/tbluetoothnotify.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_sysinfo/tsrc/dev/providertests/tsysinfoprovidertests/src/tbluetoothnotify.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -15,8 +15,8 @@ * */ -#include -#include +#include +#include #include #include "sysinfointerface.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_sysinfo/tsrc/dev/providertests/tsysinfoprovidertests/src/tbluetoothnotifyreqcancel.cpp --- a/serviceproviders/sapi_sysinfo/tsrc/dev/providertests/tsysinfoprovidertests/src/tbluetoothnotifyreqcancel.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_sysinfo/tsrc/dev/providertests/tsysinfoprovidertests/src/tbluetoothnotifyreqcancel.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -15,8 +15,8 @@ * */ -#include -#include +#include +#include #include #include "sysinfointerface.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_sysinfo/tsrc/dev/providertests/tsysinfoprovidertests/src/tsysinfoprovidertests.cpp --- a/serviceproviders/sapi_sysinfo/tsrc/dev/providertests/tsysinfoprovidertests/src/tsysinfoprovidertests.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_sysinfo/tsrc/dev/providertests/tsysinfoprovidertests/src/tsysinfoprovidertests.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -19,7 +19,7 @@ // INCLUDE FILES -#include +#include #include "tsysinfoprovidertests.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_sysinfo/tsrc/dev/providertests/tsysinfoprovidertests/src/tsysinfoprovidertestsblocks.cpp --- a/serviceproviders/sapi_sysinfo/tsrc/dev/providertests/tsysinfoprovidertests/src/tsysinfoprovidertestsblocks.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_sysinfo/tsrc/dev/providertests/tsysinfoprovidertests/src/tsysinfoprovidertestsblocks.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -21,12 +21,12 @@ // INCLUDE FILES #include #include -#include +#include #include #include #include -#include -#include +#include +#include #include "tsysinfoprovidertests.h" #include "entitykeys.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_sysinfo/tsrc/dev/providertests/tsysinfoprovidertests/src/tuseractivitynotifier.cpp --- a/serviceproviders/sapi_sysinfo/tsrc/dev/providertests/tsysinfoprovidertests/src/tuseractivitynotifier.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_sysinfo/tsrc/dev/providertests/tsysinfoprovidertests/src/tuseractivitynotifier.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -17,7 +17,7 @@ #include -#include +#include #include #include "tsysinfoprovidertests.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_sysinfo/tsrc/dev/providertests/tsysinfoprovidertests/src/tvibra.cpp --- a/serviceproviders/sapi_sysinfo/tsrc/dev/providertests/tsysinfoprovidertests/src/tvibra.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_sysinfo/tsrc/dev/providertests/tsysinfoprovidertests/src/tvibra.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -15,8 +15,8 @@ * */ -#include -#include +#include +#include #include "sysinfointerface.h" #include"entitykeys.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/manual/tsysinfobattery/src/tbatstrnoti.cpp --- a/serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/manual/tsysinfobattery/src/tbatstrnoti.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/manual/tsysinfobattery/src/tbatstrnoti.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -17,7 +17,7 @@ -#include "TSysBattery.h" +#include "tsysbattery.h" #include "sysinfoservice.h" #include "entitykeys.h" #include "tbatstrnoti.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/manual/tsysinfobattery/src/tbatterystrengthasyn.cpp --- a/serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/manual/tsysinfobattery/src/tbatterystrengthasyn.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/manual/tsysinfobattery/src/tbatterystrengthasyn.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -17,7 +17,7 @@ -#include "TSysBattery.h" +#include "tsysbattery.h" #include "sysinfoservice.h" #include "entitykeys.h" #include "tbatterystrengthasyn.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/manual/tsysinfobattery/src/tchargernoti.cpp --- a/serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/manual/tsysinfobattery/src/tchargernoti.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/manual/tsysinfobattery/src/tchargernoti.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -17,7 +17,7 @@ -#include "TSysBattery.h" +#include "tsysbattery.h" #include "sysinfoservice.h" #include "entitykeys.h" #include "tchargernoti.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/manual/tsysinfobattery/src/tsysbattery.cpp --- a/serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/manual/tsysinfobattery/src/tsysbattery.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/manual/tsysinfobattery/src/tsysbattery.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -19,8 +19,8 @@ // INCLUDE FILES -#include -#include "TSysBattery.h" +#include +#include "tsysbattery.h" // ============================ MEMBER FUNCTIONS =============================== diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/manual/tsysinfobattery/src/tsysbatterytestblocks.cpp --- a/serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/manual/tsysinfobattery/src/tsysbatterytestblocks.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/manual/tsysinfobattery/src/tsysbatterytestblocks.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -20,16 +20,16 @@ // INCLUDE FILES #include #include -#include +#include #include #include -#include "TSysBattery.h" +#include "tsysbattery.h" #include "sysinfoservice.h" #include "entitykeys.h" -#include "TBatteryStrengthAsyn.h" -#include "TBatLvlNoti.h" -#include "TChargerNoti.h" +#include "tbatterystrengthasyn.h" +#include "tbatlvlnoti.h" +#include "tchargernoti.h" #include "tbatstrnoti.h" using namespace SysInfo; diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/manual/tsysinfogeneraltests/src/tautolocknotifier.cpp --- a/serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/manual/tsysinfogeneraltests/src/tautolocknotifier.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/manual/tsysinfogeneraltests/src/tautolocknotifier.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -18,7 +18,7 @@ #include "tsysinfogeneraltests.h" #include "sysinfoservice.h" -#include "Tautolocknotifier.h" +#include "tautolocknotifier.h" #include "entitykeys.h" #include "watchtimer.h" #include diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/manual/tsysinfogeneraltests/src/tcriticalmemnoti.cpp --- a/serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/manual/tsysinfogeneraltests/src/tcriticalmemnoti.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/manual/tsysinfogeneraltests/src/tcriticalmemnoti.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -18,7 +18,7 @@ #include "tsysinfogeneraltests.h" #include "sysinfoservice.h" -#include "Tcriticalmemnoti.h" +#include "tcriticalmemnoti.h" #include "entitykeys.h" #include "watchtimer.h" #include diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/manual/tsysinfogeneraltests/src/tsysinfogeneraltests.cpp --- a/serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/manual/tsysinfogeneraltests/src/tsysinfogeneraltests.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/manual/tsysinfogeneraltests/src/tsysinfogeneraltests.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -19,7 +19,7 @@ // INCLUDE FILES -#include +#include #include "tsysinfogeneraltests.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/manual/tsysinfogeneraltests/src/tsysinfogeneraltestsblocks.cpp --- a/serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/manual/tsysinfogeneraltests/src/tsysinfogeneraltestsblocks.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/manual/tsysinfogeneraltests/src/tsysinfogeneraltestsblocks.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -21,14 +21,14 @@ // INCLUDE FILES #include #include -#include +#include #include #include "tsysinfogeneraltests.h" #include "tuseractivitynotifier.h" -#include "Tcriticalmemnoti.h" -#include "Tmemnotifier.h" -#include"Tautolocknotifier.h" +#include "tcriticalmemnoti.h" +#include "tmemnotifier.h" +#include"tautolocknotifier.h" #include "sysinfoservice.h" #include"entitykeys.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/manual/tsysinfonetworktests/src/tsysinfonetworktests.cpp --- a/serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/manual/tsysinfonetworktests/src/tsysinfonetworktests.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/manual/tsysinfonetworktests/src/tsysinfonetworktests.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -19,7 +19,7 @@ // INCLUDE FILES -#include +#include #include "tsysinfonetworktests.h" // ============================ MEMBER FUNCTIONS =============================== diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/manual/tsysinfonetworktests/src/tsysinfonetworktestsblocks.cpp --- a/serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/manual/tsysinfonetworktests/src/tsysinfonetworktestsblocks.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/manual/tsysinfonetworktests/src/tsysinfonetworktestsblocks.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -21,7 +21,7 @@ // INCLUDE FILES #include #include -#include +#include #include #include "tsysinfonetworktests.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/tsysinfoservicetests/group/tsysinfoservicetests.mmp --- a/serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/tsysinfoservicetests/group/tsysinfoservicetests.mmp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/tsysinfoservicetests/group/tsysinfoservicetests.mmp Tue Nov 24 08:56:33 2009 +0200 @@ -55,7 +55,7 @@ SOURCEPATH ../src SOURCE tsysinfoservicetests.cpp -SOURCE tsysinfoservicetestsBlocks.cpp +SOURCE tsysinfoservicetestsblocks.cpp SOURCE tsysinfobatteryasync.cpp SOURCE watchtimer.cpp diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/tsysinfoservicetests/src/tautolocknotifier.cpp --- a/serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/tsysinfoservicetests/src/tautolocknotifier.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/tsysinfoservicetests/src/tautolocknotifier.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -18,7 +18,7 @@ #include "tsysinfoservicetests.h" #include "sysinfoservice.h" -#include "Tautolocknotifier.h" +#include "tautolocknotifier.h" #include "entitykeys.h" #include "watchtimer.h" #include diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/tsysinfoservicetests/src/tsysinfoinfraredstatus.cpp --- a/serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/tsysinfoservicetests/src/tsysinfoinfraredstatus.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/tsysinfoservicetests/src/tsysinfoinfraredstatus.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -20,7 +20,7 @@ #include "sysinfoservice.h" #include"entitykeys.h" -#include +#include #include using namespace SysInfo; diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/tsysinfoservicetests/src/tsysinfoservicetests.cpp --- a/serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/tsysinfoservicetests/src/tsysinfoservicetests.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/tsysinfoservicetests/src/tsysinfoservicetests.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -19,7 +19,7 @@ // INCLUDE FILES -#include +#include #include "tsysinfoservicetests.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/tsysinfoservicetests/src/tsysinfoservicetestsblocks.cpp --- a/serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/tsysinfoservicetests/src/tsysinfoservicetestsblocks.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_sysinfo/tsrc/dev/servicetests/tsysinfoservicetests/src/tsysinfoservicetestsblocks.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -21,16 +21,16 @@ // INCLUDE FILES #include #include -#include +#include #include #include "tsysinfoservicetests.h" #include "tbatterystrengthasyn.h" #include "tuseractivitynotifier.h" -#include "Tautolocknotifier.h" +#include "tautolocknotifier.h" #include "sysinfoservice.h" #include "entitykeys.h" -#include +#include using namespace SysInfo; _LIT(KROMInstallDir,"\\system\\install\\"); diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_sysinfo/tsrc/testing/tsysbattery/src/tsysbattery.cpp --- a/serviceproviders/sapi_sysinfo/tsrc/testing/tsysbattery/src/tsysbattery.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_sysinfo/tsrc/testing/tsysbattery/src/tsysbattery.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -19,7 +19,7 @@ // INCLUDE FILES -#include +#include #include "tsysbattery.h" // EXTERNAL DATA STRUCTURES diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_sysinfo/tsrc/testing/tsysbattery/src/tsysbatteryblocks.cpp --- a/serviceproviders/sapi_sysinfo/tsrc/testing/tsysbattery/src/tsysbatteryblocks.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_sysinfo/tsrc/testing/tsysbattery/src/tsysbatteryblocks.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -21,7 +21,7 @@ // INCLUDE FILES #include #include -#include +#include #include "tsysbattery.h" #include "tsysbatterystrengthasync.h" #include "tsysbatterynot.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_sysinfo/tsrc/testing/tsysbattery/src/tsysbatterynot.cpp --- a/serviceproviders/sapi_sysinfo/tsrc/testing/tsysbattery/src/tsysbatterynot.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_sysinfo/tsrc/testing/tsysbattery/src/tsysbatterynot.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -17,7 +17,7 @@ -#include "TSysBattery.h" +#include "tsysbattery.h" #include "sysinfoservice.h" #include "entitykeys.h" #include "tsysbatterynot.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_sysinfo/tsrc/testing/tsysbattery/src/tsysbatterystrengthasync.cpp --- a/serviceproviders/sapi_sysinfo/tsrc/testing/tsysbattery/src/tsysbatterystrengthasync.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_sysinfo/tsrc/testing/tsysbattery/src/tsysbatterystrengthasync.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -17,7 +17,7 @@ -#include "TSysBattery.h" +#include "tsysbattery.h" #include "sysinfoservice.h" #include "entitykeys.h" #include "tsysbatterystrengthasync.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_sysinfo/tsrc/testing/tsysconnectivity/inc/tsysconnectivity.h --- a/serviceproviders/sapi_sysinfo/tsrc/testing/tsysconnectivity/inc/tsysconnectivity.h Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_sysinfo/tsrc/testing/tsysconnectivity/inc/tsysconnectivity.h Tue Nov 24 08:56:33 2009 +0200 @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include "sysinfoservice.h" #include "sysinfo.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_sysinfo/tsrc/testing/tsysconnectivity/src/tsysconnectivity.cpp --- a/serviceproviders/sapi_sysinfo/tsrc/testing/tsysconnectivity/src/tsysconnectivity.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_sysinfo/tsrc/testing/tsysconnectivity/src/tsysconnectivity.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -19,7 +19,7 @@ // INCLUDE FILES -#include +#include #include "tsysconnectivity.h" // EXTERNAL DATA STRUCTURES diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_sysinfo/tsrc/testing/tsysconnectivity/src/tsysconnectivityblocks.cpp --- a/serviceproviders/sapi_sysinfo/tsrc/testing/tsysconnectivity/src/tsysconnectivityblocks.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_sysinfo/tsrc/testing/tsysconnectivity/src/tsysconnectivityblocks.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -21,7 +21,7 @@ // INCLUDE FILES #include #include -#include +#include #include "tsysconnectivity.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_sysinfo/tsrc/testing/tsysdevice/src/tsysdevice.cpp --- a/serviceproviders/sapi_sysinfo/tsrc/testing/tsysdevice/src/tsysdevice.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_sysinfo/tsrc/testing/tsysdevice/src/tsysdevice.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -19,7 +19,7 @@ // INCLUDE FILES -#include +#include #include "tsysdevice.h" // EXTERNAL DATA STRUCTURES diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_sysinfo/tsrc/testing/tsysdevice/src/tsysdeviceblocks.cpp --- a/serviceproviders/sapi_sysinfo/tsrc/testing/tsysdevice/src/tsysdeviceblocks.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_sysinfo/tsrc/testing/tsysdevice/src/tsysdeviceblocks.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -21,7 +21,7 @@ // INCLUDE FILES #include #include -#include +#include #include "tsysdevice.h" #include diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_sysinfo/tsrc/testing/tsysdisplay/src/tsysdisplay.cpp --- a/serviceproviders/sapi_sysinfo/tsrc/testing/tsysdisplay/src/tsysdisplay.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_sysinfo/tsrc/testing/tsysdisplay/src/tsysdisplay.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -19,7 +19,7 @@ // INCLUDE FILES -#include +#include #include "tsysdisplay.h" // EXTERNAL DATA STRUCTURES diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_sysinfo/tsrc/testing/tsysdisplay/src/tsysdisplayblocks.cpp --- a/serviceproviders/sapi_sysinfo/tsrc/testing/tsysdisplay/src/tsysdisplayblocks.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_sysinfo/tsrc/testing/tsysdisplay/src/tsysdisplayblocks.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -21,8 +21,8 @@ // INCLUDE FILES #include #include -#include -#include +#include +#include #include "tsysdisplay.h" #include "tsysdisplaynot.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_sysinfo/tsrc/testing/tsysfeatures/inc/tsysfeatures.h --- a/serviceproviders/sapi_sysinfo/tsrc/testing/tsysfeatures/inc/tsysfeatures.h Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_sysinfo/tsrc/testing/tsysfeatures/inc/tsysfeatures.h Tue Nov 24 08:56:33 2009 +0200 @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include "sysinfoservice.h" #include "sysinfo.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_sysinfo/tsrc/testing/tsysfeatures/src/tsysfeatures.cpp --- a/serviceproviders/sapi_sysinfo/tsrc/testing/tsysfeatures/src/tsysfeatures.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_sysinfo/tsrc/testing/tsysfeatures/src/tsysfeatures.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -19,7 +19,7 @@ // INCLUDE FILES -#include +#include #include "tsysfeatures.h" // EXTERNAL DATA STRUCTURES diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_sysinfo/tsrc/testing/tsysfeatures/src/tsysfeaturesblocks.cpp --- a/serviceproviders/sapi_sysinfo/tsrc/testing/tsysfeatures/src/tsysfeaturesblocks.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_sysinfo/tsrc/testing/tsysfeatures/src/tsysfeaturesblocks.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -21,7 +21,7 @@ // INCLUDE FILES #include #include -#include +#include #include "tsysfeatures.h" #include "entitykeys.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_sysinfo/tsrc/testing/tsysgeneral/src/tsysgeneral.cpp --- a/serviceproviders/sapi_sysinfo/tsrc/testing/tsysgeneral/src/tsysgeneral.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_sysinfo/tsrc/testing/tsysgeneral/src/tsysgeneral.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -19,7 +19,7 @@ // INCLUDE FILES -#include +#include #include "tsysgeneral.h" // EXTERNAL DATA STRUCTURES diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_sysinfo/tsrc/testing/tsysgeneral/src/tsysgeneralblocks.cpp --- a/serviceproviders/sapi_sysinfo/tsrc/testing/tsysgeneral/src/tsysgeneralblocks.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_sysinfo/tsrc/testing/tsysgeneral/src/tsysgeneralblocks.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -21,9 +21,9 @@ // INCLUDE FILES #include #include -#include +#include #include "tsysgeneral.h" -#include +#include // EXTERNAL DATA STRUCTURES //extern ?external_data; diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_sysinfo/tsrc/testing/tsysmanualtest/group/tsysmanualtest.mmp --- a/serviceproviders/sapi_sysinfo/tsrc/testing/tsysmanualtest/group/tsysmanualtest.mmp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_sysinfo/tsrc/testing/tsysmanualtest/group/tsysmanualtest.mmp Tue Nov 24 08:56:33 2009 +0200 @@ -49,7 +49,7 @@ SOURCEPATH ../src SOURCE tsysmanualtest.cpp -SOURCE tsysmanualtestBlocks.cpp +SOURCE tsysmanualtestblocks.cpp SOURCE tasyncaccandvibra.cpp SOURCE tsysbatterynot.cpp SOURCE tmemnot.cpp diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_sysinfo/tsrc/testing/tsysmanualtest/src/tsysmanualtest.cpp --- a/serviceproviders/sapi_sysinfo/tsrc/testing/tsysmanualtest/src/tsysmanualtest.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_sysinfo/tsrc/testing/tsysmanualtest/src/tsysmanualtest.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -19,7 +19,7 @@ // INCLUDE FILES -#include +#include #include "tsysmanualtest.h" // EXTERNAL DATA STRUCTURES diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_sysinfo/tsrc/testing/tsysmanualtest/src/tsysmanualtestblocks.cpp --- a/serviceproviders/sapi_sysinfo/tsrc/testing/tsysmanualtest/src/tsysmanualtestblocks.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_sysinfo/tsrc/testing/tsysmanualtest/src/tsysmanualtestblocks.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -21,7 +21,7 @@ // INCLUDE FILES #include #include -#include +#include #include "tsysmanualtest.h" #include "tmemnot.h" #include "tsysbatterynot.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_sysinfo/tsrc/testing/tsysmemory/src/tsysmemory.cpp --- a/serviceproviders/sapi_sysinfo/tsrc/testing/tsysmemory/src/tsysmemory.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_sysinfo/tsrc/testing/tsysmemory/src/tsysmemory.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -19,7 +19,7 @@ // INCLUDE FILES -#include +#include #include "tsysmemory.h" // EXTERNAL DATA STRUCTURES diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_sysinfo/tsrc/testing/tsysmemory/src/tsysmemoryblocks.cpp --- a/serviceproviders/sapi_sysinfo/tsrc/testing/tsysmemory/src/tsysmemoryblocks.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_sysinfo/tsrc/testing/tsysmemory/src/tsysmemoryblocks.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -21,7 +21,7 @@ // INCLUDE FILES #include #include -#include +#include #include "tsysmemory.h" #include "tsysmemorynot.h" diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_sysinfo/tsrc/testing/tsysnetwork/src/tsysnetwork.cpp --- a/serviceproviders/sapi_sysinfo/tsrc/testing/tsysnetwork/src/tsysnetwork.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_sysinfo/tsrc/testing/tsysnetwork/src/tsysnetwork.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -19,7 +19,7 @@ // INCLUDE FILES -#include +#include #include "tsysnetwork.h" // EXTERNAL DATA STRUCTURES diff -r 8d692d9f828f -r 50974a8b132e serviceproviders/sapi_sysinfo/tsrc/testing/tsysnetwork/src/tsysnetworkblocks.cpp --- a/serviceproviders/sapi_sysinfo/tsrc/testing/tsysnetwork/src/tsysnetworkblocks.cpp Fri Nov 06 13:05:00 2009 +0200 +++ b/serviceproviders/sapi_sysinfo/tsrc/testing/tsysnetwork/src/tsysnetworkblocks.cpp Tue Nov 24 08:56:33 2009 +0200 @@ -21,7 +21,7 @@ // INCLUDE FILES #include #include -#include +#include #include "tsysnetwork.h" // EXTERNAL DATA STRUCTURES